diff --git a/Language/zh_CN.xaml b/Language/zh_CN.xaml
index 28b5279..74b3fd0 100644
--- a/Language/zh_CN.xaml
+++ b/Language/zh_CN.xaml
@@ -145,6 +145,7 @@
显示选择面的同类面
显示瑕疵面
显示正方向标识
+ 显示网格线
保存成功
保存失败
选择路径
@@ -166,7 +167,7 @@
形状
冠部
亭部
- 重量(ct)
+ 预估重量(ct)
切工等级
对称等级
平均值
diff --git a/ViewModel/BaseWindow/HomeWindowVM.cs b/ViewModel/BaseWindow/HomeWindowVM.cs
index 226dad8..5e540de 100644
--- a/ViewModel/BaseWindow/HomeWindowVM.cs
+++ b/ViewModel/BaseWindow/HomeWindowVM.cs
@@ -4,6 +4,7 @@ using log4net;
using SparkClient.Model.Helper;
using SparkClient.Model.Services;
using SparkClient.ViewModel.Configuration;
+using SparkClient.ViewModel.Configuration.SettingsPages;
using SparkClient.ViewModel.Grading;
using MessageBox = SparkClient.Views.Dialog.MessageBox;
@@ -34,12 +35,34 @@ public class HomeWindowVM : BaseViewModel
public void ShowConfigPage(object parameter)
{
- ConfigMenuPageVM vm = new ConfigMenuPageVM();
- WindowManager.mainViewModel.Content = vm;
- WindowManager.openContent.Add(vm);
+ if (isPermissions())
+ {
+ ConfigMenuPageVM vm = new ConfigMenuPageVM();
+ WindowManager.mainViewModel.Content = vm;
+ WindowManager.openContent.Add(vm);
+ }
+ else
+ {
+ BaseControlVM vm = new BaseControlVM(new SettingBaseVM(), MultilingualHelper.getString("SystemSetting"));
+ WindowManager.mainViewModel.Content = vm;
+ WindowManager.openContent.Add(vm);
+ }
}
-
- public async void ShowDiamlondSelPage(object parameter)
+ private bool isPermissions()
+ {
+ bool result = false;
+ string PERMISSIONS = Settings.SelectValueById("PERMISSIONS");
+ if ("admin".Equals(PERMISSIONS))
+ {
+ result = true;
+ }
+ else
+ {
+ result = false;
+ }
+ return result;
+ }
+ public async void ShowDiamlondSelPage(object parameter)
{
try
{