From 652c8604a64dba6cc33301fc1f0f55af94bdf31f Mon Sep 17 00:00:00 2001
From: sunhonglei <sunhonglei@51dayu.com>
Date: Tue, 14 Jan 2025 15:20:20 +0800
Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E7=94=BB=E9=9D=A2=E6=9D=83?=
 =?UTF-8?q?=E9=99=90=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Language/zh_CN.xaml                  |  3 ++-
 ViewModel/BaseWindow/HomeWindowVM.cs | 33 +++++++++++++++++++++++-----
 2 files changed, 30 insertions(+), 6 deletions(-)

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 @@
     <sys:String x:Key="ViewportRightMenuSelectFaceKind">显示选择面的同类面</sys:String>
     <sys:String x:Key="ViewportRightMenuShowDefectFace">显示瑕疵面</sys:String>
     <sys:String x:Key="ViewportRightMenuShowFront">显示正方向标识</sys:String>
+    <sys:String x:Key="ViewportRightMenuShowMeshLines">显示网格线</sys:String>
     <sys:String x:Key="ViewportSaveSucceed">保存成功</sys:String>
     <sys:String x:Key="ViewportSaveFail">保存失败</sys:String>
     <sys:String x:Key="ViewportSelectPath">选择路径</sys:String>
@@ -166,7 +167,7 @@
     <sys:String x:Key="DiamondResultShape">形状</sys:String>
     <sys:String x:Key="DiamondResultCrown">冠部</sys:String>
     <sys:String x:Key="DiamondResultPavilion">亭部</sys:String>
-    <sys:String x:Key="DiamondResultWeight">重量(ct)</sys:String>
+    <sys:String x:Key="DiamondResultWeight">预估重量(ct)</sys:String>
     <sys:String x:Key="DiamondResultCutGrade">切工等级</sys:String>
     <sys:String x:Key="DiamondResultSymmetryGrade">对称等级</sys:String>
     <sys:String x:Key="DiamondResultGridAvgValue">平均值</sys:String>
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
        {