diff --git a/SparkDB.db b/SparkDB.db
index 035e56a..2024807 100644
Binary files a/SparkDB.db and b/SparkDB.db differ
diff --git a/ViewModel/Configuration/SettingsPages/ModelColorSetPageVM.cs b/ViewModel/Configuration/SettingsPages/ModelColorSetPageVM.cs
index 00132bb..540eace 100644
--- a/ViewModel/Configuration/SettingsPages/ModelColorSetPageVM.cs
+++ b/ViewModel/Configuration/SettingsPages/ModelColorSetPageVM.cs
@@ -48,23 +48,24 @@ public class ModelColorSetPageVM : BaseViewModel
     private void InitSetting()
     {
         colors = new Dictionary<string, string>();
-        colors.Add("FACET_COLOR", "�沿��ɫ");
-        colors.Add("BORDER_COLOR", "�߿���ɫ");
-        colors.Add("SELECTED_FACET_COLOR", "ѡ������ɫ");
-        colors.Add("SELECTED_BORDER_COLOR", "ѡ����߿���ɫ");
-        colors.Add("SELECTED_TYPE_COLOR", "ѡ����ͬ������ɫ");
-        colors.Add("SELECTED_FONT_COLOR", "ѡ����������Ϣ��ɫ");
-        colors.Add("RULER_COLOR", "��ʶ������ɫ");
-        colors.Add("ARROW_COLOR", "����������ɫ");
-        colors.Add("BLEMISH_FACET_COLOR", "覴�����ɫ");
-        colors.Add("TABLE_FACET_COLOR", "̨����ɫ");
-        colors.Add("UPPER_MAIN_FACET_COLOR", "��������ɫ");
-        colors.Add("STAR_FACET_COLOR", "�ǿ�����ɫ");
-        colors.Add("UPPER_GIRDLE_FACET_COLOR", "��������ɫ");
-        colors.Add("GIRDLE_FACET_COLOR", "������ɫ");
-        colors.Add("PAVILION_MAIN_FACET_COLOR", "ͤ����������ɫ");
-        colors.Add("LOWER_GIRDLE_FACET_COLOR", "��������ɫ");
-        colors.Add("CULET_COLOR", "������ɫ");
+        colors.Add("FACET_COLOR", "面部颜色");
+        colors.Add("BORDER_COLOR", "边框颜色");
+        colors.Add("SELECTED_FACET_COLOR", "选中面颜色");
+        colors.Add("SELECTED_BORDER_COLOR", "选中面边框颜色");
+        colors.Add("SELECTED_TYPE_COLOR", "选中面同类面颜色");
+        colors.Add("SELECTED_FONT_COLOR", "选中面文字信息颜色");
+        colors.Add("RULER_COLOR", "标识线条颜色");
+        colors.Add("ARROW_COLOR", "正方向标记颜色");
+        colors.Add("BLEMISH_FACET_COLOR", "瑕疵面颜色");
+        colors.Add("TABLE_FACET_COLOR", "台面颜色");
+        colors.Add("UPPER_MAIN_FACET_COLOR", "风筝面颜色");
+        colors.Add("STAR_FACET_COLOR", "星刻面颜色");
+        colors.Add("UPPER_GIRDLE_FACET_COLOR", "上腰面颜色");
+        colors.Add("GIRDLE_FACET_COLOR", "腰面颜色");
+        colors.Add("PAVILION_MAIN_FACET_COLOR", "亭部主刻面颜色");
+        colors.Add("LOWER_GIRDLE_FACET_COLOR", "下腰面颜色");
+        colors.Add("CULET_COLOR", "底面颜色");
+
 
         foreach (var color in colors)
         {
@@ -95,7 +96,7 @@ public class ModelColorSetPageVM : BaseViewModel
     }
     private void setColor(string SETTING_ID)
     {
-        var value = Settings.SelectValueByName("SETTING_ID");
+        var value = Settings.SelectValueByName(SETTING_ID);
         if (value == null || string.IsNullOrEmpty(value))
         {
             value = "#FF000000";
diff --git a/ViewModel/Grading/GradingResultVM.cs b/ViewModel/Grading/GradingResultVM.cs
index 4f67610..4820137 100644
--- a/ViewModel/Grading/GradingResultVM.cs
+++ b/ViewModel/Grading/GradingResultVM.cs
@@ -535,10 +535,15 @@ public class GradingResultVM : BaseViewModel
         }
         else
         {
-            string ts = DateTime.Now.ToString("yyyyMMddHHmmss");
-            string fullPath = Path.Combine(getFilePath(), ts + "_" + this.DiamondCode);
-            TxtFile(fullPath);
-            ExcelFile(fullPath);
+            string fullPath = Path.Combine(getFilePath(), this.DiamondCode);
+            if (FileSaveEnabled("Txt"))
+            {
+                TxtFile(fullPath);
+            }
+            if (FileSaveEnabled("Excel"))
+            {
+                ExcelFile(fullPath);
+            }
         }
     }
     public void SaveFile(object param)
@@ -559,8 +564,7 @@ public class GradingResultVM : BaseViewModel
                 return;
             }
         }
-        string ts = DateTime.Now.ToString("yyyyMMddHHmmss");
-        string fullPath = Path.Combine(getFilePath(), ts+ "_" + this.DiamondCode);
+        string fullPath = Path.Combine(getFilePath(), this.DiamondCode);
         ExportFile(fullPath);
     }
     private string getFilePath()
diff --git a/Views/Configuration/SettingPages/ModelColorSetPage.xaml b/Views/Configuration/SettingPages/ModelColorSetPage.xaml
index a3955d9..6070163 100644
--- a/Views/Configuration/SettingPages/ModelColorSetPage.xaml
+++ b/Views/Configuration/SettingPages/ModelColorSetPage.xaml
@@ -60,7 +60,7 @@
                             <ColumnDefinition Width="Auto"/>
                         </Grid.ColumnDefinitions>
                         <Label Grid.Column="0" FontSize="14" Content="{StaticResource SystemSettingModelSetMainFaceColor}" HorizontalAlignment="Right" Width="150" />
-                        <Label Grid.Column="1" FontSize="14" Background="#FF000000" local:LabelContentChangedBehavior.EnableContentChanged="True"  HorizontalAlignment="Left" Content="{Binding FACET_COLOR}" Width="100" MouseLeftButtonDown="LabelsColor_OnMouseLeftButtonDown" />
+                        <Label Grid.Column="1" FontSize="14" Background="#FF000000" local:LabelContentChangedBehavior.EnableContentChanged="True"  HorizontalAlignment="Left" Content="{Binding FACET_COLOR,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" Width="100" MouseLeftButtonDown="LabelsColor_OnMouseLeftButtonDown" />
                     </Grid>
                     <Grid Grid.Column="2">
                         <Grid.ColumnDefinitions>
@@ -68,7 +68,7 @@
                             <ColumnDefinition Width="Auto"/>
                         </Grid.ColumnDefinitions>
                         <Label Grid.Column="0" FontSize="14" Content="{StaticResource SystemSettingModelSetMainBorderColor}" HorizontalAlignment="Right" Width="150" />
-                        <Label Grid.Column="1" FontSize="14" Background="#FF000000"  local:LabelContentChangedBehavior.EnableContentChanged="True" HorizontalAlignment="Left" Content="{Binding BORDER_COLOR}" Width="100" MouseLeftButtonDown="LabelsColor_OnMouseLeftButtonDown" />
+                        <Label Grid.Column="1" FontSize="14" Background="#FF000000"  local:LabelContentChangedBehavior.EnableContentChanged="True" HorizontalAlignment="Left" Content="{Binding BORDER_COLOR,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" Width="100" MouseLeftButtonDown="LabelsColor_OnMouseLeftButtonDown" />
                     </Grid>
                 </Grid>
             </Grid>
@@ -99,7 +99,7 @@
                             <ColumnDefinition Width="Auto"/>
                         </Grid.ColumnDefinitions>
                         <Label Grid.Column="0" FontSize="14" Content="{StaticResource SystemSettingModelSetSelectedColor}" HorizontalAlignment="Right" Width="150" />
-                        <Label Grid.Column="1" FontSize="14" Background="#FF000000"  local:LabelContentChangedBehavior.EnableContentChanged="True" HorizontalAlignment="Left" Content="{Binding SELECTED_FACET_COLOR}"  Width="100" MouseLeftButtonDown="LabelsColor_OnMouseLeftButtonDown" />
+                        <Label Grid.Column="1" FontSize="14" Background="#FF000000"  local:LabelContentChangedBehavior.EnableContentChanged="True" HorizontalAlignment="Left" Content="{Binding SELECTED_FACET_COLOR,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"  Width="100" MouseLeftButtonDown="LabelsColor_OnMouseLeftButtonDown" />
                     </Grid>
                     <Grid Grid.Column="2" Row="0">
                         <Grid.ColumnDefinitions>
@@ -107,7 +107,7 @@
                             <ColumnDefinition Width="Auto"/>
                         </Grid.ColumnDefinitions>
                         <Label Grid.Column="0" FontSize="14" Content="{StaticResource SystemSettingModelSetSelectedBorderColor}" HorizontalAlignment="Right" Width="150" />
-                        <Label Grid.Column="1" FontSize="14" Background="#FF000000"  local:LabelContentChangedBehavior.EnableContentChanged="True" HorizontalAlignment="Left" Content="{Binding SELECTED_BORDER_COLOR}"  Width="100" MouseLeftButtonDown="LabelsColor_OnMouseLeftButtonDown" />
+                        <Label Grid.Column="1" FontSize="14" Background="#FF000000"  local:LabelContentChangedBehavior.EnableContentChanged="True" HorizontalAlignment="Left" Content="{Binding SELECTED_BORDER_COLOR,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"  Width="100" MouseLeftButtonDown="LabelsColor_OnMouseLeftButtonDown" />
                     </Grid>
                     <Grid Grid.Column="4" Row="0">
                         <Grid.ColumnDefinitions>
@@ -115,7 +115,7 @@
                             <ColumnDefinition Width="Auto"/>
                         </Grid.ColumnDefinitions>
                         <Label Grid.Column="0" FontSize="14" Content="{StaticResource SystemSettingModelSetSelectedTypeColor}" HorizontalAlignment="Right" Width="150" />
-                        <Label Grid.Column="1" FontSize="14" Background="#FF000000"  local:LabelContentChangedBehavior.EnableContentChanged="True" HorizontalAlignment="Left" Content="{Binding SELECTED_TYPE_COLOR}"  Width="100" MouseLeftButtonDown="LabelsColor_OnMouseLeftButtonDown" />
+                        <Label Grid.Column="1" FontSize="14" Background="#FF000000"  local:LabelContentChangedBehavior.EnableContentChanged="True" HorizontalAlignment="Left" Content="{Binding SELECTED_TYPE_COLOR,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"  Width="100" MouseLeftButtonDown="LabelsColor_OnMouseLeftButtonDown" />
                     </Grid>
                     <Grid Grid.Column="0" Row="2">
                         <Grid.ColumnDefinitions>
@@ -123,7 +123,7 @@
                             <ColumnDefinition Width="Auto"/>
                         </Grid.ColumnDefinitions>
                         <Label Grid.Column="0" FontSize="14" Content="{StaticResource SystemSettingModelSetSelectedTextColor}" HorizontalAlignment="Right" Width="150" />
-                        <Label Grid.Column="1" FontSize="14" Background="#FF000000" local:LabelContentChangedBehavior.EnableContentChanged="True" HorizontalAlignment="Center" Content="{Binding SELECTED_FONT_COLOR}"  Width="100" MouseLeftButtonDown="LabelsColor_OnMouseLeftButtonDown" Height="28" VerticalAlignment="Top" />
+                        <Label Grid.Column="1" FontSize="14" Background="#FF000000" local:LabelContentChangedBehavior.EnableContentChanged="True" HorizontalAlignment="Center" Content="{Binding SELECTED_FONT_COLOR,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"  Width="100" MouseLeftButtonDown="LabelsColor_OnMouseLeftButtonDown" Height="28" VerticalAlignment="Top" />
                     </Grid>
                     <Grid Grid.Column="2" Row="2">
                         <Grid.ColumnDefinitions>
@@ -131,7 +131,7 @@
                             <ColumnDefinition Width="Auto"/>
                         </Grid.ColumnDefinitions>
                         <Label Grid.Column="0" FontSize="14" Content="{StaticResource SystemSettingModelSetSelectedLineColor}" HorizontalAlignment="Right" Width="150" />
-                        <Label Grid.Column="1" FontSize="14" Background="#FF000000" local:LabelContentChangedBehavior.EnableContentChanged="True" HorizontalAlignment="Left" Content="{Binding RULER_COLOR}"  Width="100" MouseLeftButtonDown="LabelsColor_OnMouseLeftButtonDown" />
+                        <Label Grid.Column="1" FontSize="14" Background="#FF000000" local:LabelContentChangedBehavior.EnableContentChanged="True" HorizontalAlignment="Left" Content="{Binding RULER_COLOR,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"  Width="100" MouseLeftButtonDown="LabelsColor_OnMouseLeftButtonDown" />
                     </Grid>
                     <Grid Grid.Column="4" Row="2">
                         <Grid.ColumnDefinitions>
@@ -139,7 +139,7 @@
                             <ColumnDefinition Width="Auto"/>
                         </Grid.ColumnDefinitions>
                         <Label Grid.Column="0" FontSize="14" Content="{StaticResource SystemSettingModelSetSelectedPosdColor}" HorizontalAlignment="Right" Width="150" />
-                        <Label Grid.Column="1" FontSize="14" Background="#FF000000" local:LabelContentChangedBehavior.EnableContentChanged="True" HorizontalAlignment="Left" Content="{Binding ARROW_COLOR}"  Width="100" MouseLeftButtonDown="LabelsColor_OnMouseLeftButtonDown" />
+                        <Label Grid.Column="1" FontSize="14" Background="#FF000000" local:LabelContentChangedBehavior.EnableContentChanged="True" HorizontalAlignment="Left" Content="{Binding ARROW_COLOR,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"  Width="100" MouseLeftButtonDown="LabelsColor_OnMouseLeftButtonDown" />
                     </Grid>
                 </Grid>
             </Grid>
@@ -172,7 +172,7 @@
                             <ColumnDefinition Width="Auto"/>
                         </Grid.ColumnDefinitions>
                         <Label Grid.Column="0" FontSize="14" Content="{StaticResource SystemSettingModelSetErrorColor}" HorizontalAlignment="Right" Width="150" />
-                        <Label Grid.Column="1" FontSize="14" Background="#FF000000" local:LabelContentChangedBehavior.EnableContentChanged="True" HorizontalAlignment="Left" Content="{Binding BLEMISH_FACET_COLOR}"  Width="100" MouseLeftButtonDown="LabelsColor_OnMouseLeftButtonDown" />
+                        <Label Grid.Column="1" FontSize="14" Background="#FF000000" local:LabelContentChangedBehavior.EnableContentChanged="True" HorizontalAlignment="Left" Content="{Binding BLEMISH_FACET_COLOR,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"  Width="100" MouseLeftButtonDown="LabelsColor_OnMouseLeftButtonDown" />
                     </Grid>
                     <Grid Grid.Column="2" Row="0">
                         <Grid.ColumnDefinitions>
@@ -180,7 +180,7 @@
                             <ColumnDefinition Width="Auto"/>
                         </Grid.ColumnDefinitions>
                         <Label Grid.Column="0" FontSize="14" Content="{StaticResource SystemSettingModelSetTableColor}" HorizontalAlignment="Right" Width="150" />
-                        <Label Grid.Column="1" FontSize="14" Background="#FF000000" local:LabelContentChangedBehavior.EnableContentChanged="True" HorizontalAlignment="Left" Content="{Binding TABLE_FACET_COLOR}"  Width="100" MouseLeftButtonDown="LabelsColor_OnMouseLeftButtonDown" />
+                        <Label Grid.Column="1" FontSize="14" Background="#FF000000" local:LabelContentChangedBehavior.EnableContentChanged="True" HorizontalAlignment="Left" Content="{Binding TABLE_FACET_COLOR,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"  Width="100" MouseLeftButtonDown="LabelsColor_OnMouseLeftButtonDown" />
                     </Grid>
                     <Grid Grid.Column="4" Row="0">
                         <Grid.ColumnDefinitions>
@@ -188,7 +188,7 @@
                             <ColumnDefinition Width="Auto"/>
                         </Grid.ColumnDefinitions>
                         <Label Grid.Column="0" FontSize="14" Content="{StaticResource SystemSettingModelSetUpperColor}" HorizontalAlignment="Right" Width="150" />
-                        <Label Grid.Column="1" FontSize="14" Background="#FF000000" local:LabelContentChangedBehavior.EnableContentChanged="True" HorizontalAlignment="Left" Content="{Binding UPPER_MAIN_FACET_COLOR}"  Width="100" MouseLeftButtonDown="LabelsColor_OnMouseLeftButtonDown" />
+                        <Label Grid.Column="1" FontSize="14" Background="#FF000000" local:LabelContentChangedBehavior.EnableContentChanged="True" HorizontalAlignment="Left" Content="{Binding UPPER_MAIN_FACET_COLOR,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"  Width="100" MouseLeftButtonDown="LabelsColor_OnMouseLeftButtonDown" />
                     </Grid>
                     <Grid Grid.Column="0" Row="2">
                         <Grid.ColumnDefinitions>
@@ -196,7 +196,7 @@
                             <ColumnDefinition Width="Auto"/>
                         </Grid.ColumnDefinitions>
                         <Label Grid.Column="0" FontSize="14" Content="{StaticResource SystemSettingModelSetStarColor}" HorizontalAlignment="Right" Width="150" />
-                        <Label Grid.Column="1" FontSize="14" Background="#FF000000" local:LabelContentChangedBehavior.EnableContentChanged="True" HorizontalAlignment="Left" Content="{Binding STAR_FACET_COLOR}"  Width="100" MouseLeftButtonDown="LabelsColor_OnMouseLeftButtonDown" />
+                        <Label Grid.Column="1" FontSize="14" Background="#FF000000" local:LabelContentChangedBehavior.EnableContentChanged="True" HorizontalAlignment="Left" Content="{Binding STAR_FACET_COLOR,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"  Width="100" MouseLeftButtonDown="LabelsColor_OnMouseLeftButtonDown" />
                     </Grid>
                     <Grid Grid.Column="2" Row="2">
                         <Grid.ColumnDefinitions>
@@ -204,7 +204,7 @@
                             <ColumnDefinition Width="Auto"/>
                         </Grid.ColumnDefinitions>
                         <Label Grid.Column="0" FontSize="14" Content="{StaticResource SystemSettingModelSetUpperGirdleColor}" HorizontalAlignment="Right" Width="150" />
-                        <Label Grid.Column="1" FontSize="14" Background="#FF000000" local:LabelContentChangedBehavior.EnableContentChanged="True" HorizontalAlignment="Left" Content="{Binding UPPER_GIRDLE_FACET_COLOR}"  Width="100" MouseLeftButtonDown="LabelsColor_OnMouseLeftButtonDown" />
+                        <Label Grid.Column="1" FontSize="14" Background="#FF000000" local:LabelContentChangedBehavior.EnableContentChanged="True" HorizontalAlignment="Left" Content="{Binding UPPER_GIRDLE_FACET_COLOR,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"  Width="100" MouseLeftButtonDown="LabelsColor_OnMouseLeftButtonDown" />
                     </Grid>
                     <Grid Grid.Column="4" Row="2">
                         <Grid.ColumnDefinitions>
@@ -212,7 +212,7 @@
                             <ColumnDefinition Width="Auto"/>
                         </Grid.ColumnDefinitions>
                         <Label Grid.Column="0" FontSize="14" Content="{StaticResource SystemSettingModelSetGirdleColor}" HorizontalAlignment="Right" Width="150" />
-                        <Label Grid.Column="1" FontSize="14" Background="#FF000000" local:LabelContentChangedBehavior.EnableContentChanged="True" HorizontalAlignment="Left" Content="{Binding GIRDLE_FACET_COLOR}"  Width="100" MouseLeftButtonDown="LabelsColor_OnMouseLeftButtonDown" />
+                        <Label Grid.Column="1" FontSize="14" Background="#FF000000" local:LabelContentChangedBehavior.EnableContentChanged="True" HorizontalAlignment="Left" Content="{Binding GIRDLE_FACET_COLOR,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"  Width="100" MouseLeftButtonDown="LabelsColor_OnMouseLeftButtonDown" />
                     </Grid>
                     <Grid Grid.Column="0" Row="4">
                         <Grid.ColumnDefinitions>
@@ -220,7 +220,7 @@
                             <ColumnDefinition Width="Auto"/>
                         </Grid.ColumnDefinitions>
                         <Label Grid.Column="0" FontSize="14" Content="{StaticResource SystemSettingModelSetPavilionColor}" HorizontalAlignment="Right" Width="150" />
-                        <Label Grid.Column="1" FontSize="14" Background="#FF000000" local:LabelContentChangedBehavior.EnableContentChanged="True" HorizontalAlignment="Left" Content="{Binding PAVILION_MAIN_FACET_COLOR}"  Width="100" MouseLeftButtonDown="LabelsColor_OnMouseLeftButtonDown" />
+                        <Label Grid.Column="1" FontSize="14" Background="#FF000000" local:LabelContentChangedBehavior.EnableContentChanged="True" HorizontalAlignment="Left" Content="{Binding PAVILION_MAIN_FACET_COLOR,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"  Width="100" MouseLeftButtonDown="LabelsColor_OnMouseLeftButtonDown" />
                     </Grid>
                     <Grid Grid.Column="2" Row="4">
                         <Grid.ColumnDefinitions>
@@ -228,7 +228,7 @@
                             <ColumnDefinition Width="Auto"/>
                         </Grid.ColumnDefinitions>
                         <Label Grid.Column="0" FontSize="14" Content="{StaticResource SystemSettingModelSetLowerGirdleColor}" HorizontalAlignment="Right" Width="150" />
-                        <Label Grid.Column="1" FontSize="14" Background="#FF000000" local:LabelContentChangedBehavior.EnableContentChanged="True" HorizontalAlignment="Left" Content="{Binding LOWER_GIRDLE_FACET_COLOR}"  Width="100" MouseLeftButtonDown="LabelsColor_OnMouseLeftButtonDown" />
+                        <Label Grid.Column="1" FontSize="14" Background="#FF000000" local:LabelContentChangedBehavior.EnableContentChanged="True" HorizontalAlignment="Left" Content="{Binding LOWER_GIRDLE_FACET_COLOR,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"  Width="100" MouseLeftButtonDown="LabelsColor_OnMouseLeftButtonDown" />
                     </Grid>
                     <Grid Grid.Column="4" Row="4">
                         <Grid.ColumnDefinitions>
@@ -236,7 +236,7 @@
                             <ColumnDefinition Width="Auto"/>
                         </Grid.ColumnDefinitions>
                         <Label Grid.Column="0" FontSize="14" Content="{StaticResource SystemSettingModelSetCuletColor}" HorizontalAlignment="Right" Width="150" />
-                        <Label Grid.Column="1" FontSize="14" Background="#FF000000" local:LabelContentChangedBehavior.EnableContentChanged="True" HorizontalAlignment="Left" Content="{Binding CULET_COLOR}"  Width="100" MouseLeftButtonDown="LabelsColor_OnMouseLeftButtonDown" />
+                        <Label Grid.Column="1" FontSize="14" Background="#FF000000" local:LabelContentChangedBehavior.EnableContentChanged="True" HorizontalAlignment="Left" Content="{Binding CULET_COLOR,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"  Width="100" MouseLeftButtonDown="LabelsColor_OnMouseLeftButtonDown" />
                     </Grid>
                 </Grid>
             </Grid>