diff --git a/ViewModel/BaseWindow/HomeWindowVM.cs b/ViewModel/BaseWindow/HomeWindowVM.cs
index e9d9114..861ef88 100644
--- a/ViewModel/BaseWindow/HomeWindowVM.cs
+++ b/ViewModel/BaseWindow/HomeWindowVM.cs
@@ -1,16 +1,9 @@
-using System.IO;
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Input;
-using HandyControl.Controls;
+using System.Windows.Input;
 using SparkClient.Model.Helper;
 using SparkClient.Model.Services;
 using SparkClient.ViewModel.Configuration;
-using SparkClient.ViewModel.Dialog;
 using SparkClient.ViewModel.Grading;
-using MessageBox = System.Windows.MessageBox;
-using SparkClient.Views.Dialog;
-using SparkClient.Views.Grading;
+using MessageBox = SparkClient.Views.Dialog.MessageBox;
 
 namespace SparkClient.ViewModel.BaseWindow;
 
@@ -63,9 +56,15 @@ public class HomeWindowVM : BaseViewModel
            //WindowManager.mainViewModel.Content = vm;
            //WindowManager.openContent.Add(vm);
 
-            StartDialog startDialog = new StartDialog();
-            startDialog.ShowDialog();
-
+            MessageBox messageBox = new MessageBox();
+            messageBox.ShowInput(MultilingualHelper.getString("UpdateDiamondCode"),out string inputStr,
+                MultilingualHelper.getString("ok"),
+                MultilingualHelper.getString("Skip")
+                );
+            BaseControlVM vm = new BaseControlVM(new DiamondSelectVM(inputStr), MultilingualHelper.getString("DiamondSelect"));
+            vm.ShowFunctionButton = System.Windows.Visibility.Hidden;
+            WindowManager.mainViewModel.Content = vm;
+            WindowManager.openContent.Add(vm);
        }
        catch (Exception e)
        {
@@ -77,7 +76,8 @@ public class HomeWindowVM : BaseViewModel
 
    private void ShowMessage(string message)
    {
-       MessageBox.Show(message);
+        MessageBox messageBox = new MessageBox();
+        messageBox.Show(message);
    }
 
    private void LogError(Exception e)
diff --git a/ViewModel/Grading/GradingResultVM.cs b/ViewModel/Grading/GradingResultVM.cs
index 042613b..2c56aeb 100644
--- a/ViewModel/Grading/GradingResultVM.cs
+++ b/ViewModel/Grading/GradingResultVM.cs
@@ -14,6 +14,7 @@ using NPOI.XSSF.UserModel;
 using SparkClient.Views.Dialog;
 using NPOI.HPSF;
 using Application = System.Windows.Application;
+using MessageBox = SparkClient.Views.Dialog.MessageBox;
 namespace SparkClient.ViewModel.Grading;
 
 public class GradingResultVM : BaseViewModel
@@ -81,7 +82,6 @@ public class GradingResultVM : BaseViewModel
     {
         // DS下拉列表初始化
         InitDSlist();
-
     }
     private void InitDSlist()
     {
@@ -496,18 +496,22 @@ public class GradingResultVM : BaseViewModel
         {
             string ts = DateTime.Now.ToString("yyyyMMddHHmmss");
             string fullPath = Path.Combine(getFilePath(), ts + "_" + this.DiamondCode);
-            ExportFile(fullPath);
+            TxtFile(fullPath);
+            ExcelFile(fullPath);
         }
     }
     public void SaveFile(object param)
     {
         if (string.IsNullOrEmpty(DiamondCode))
         {
-            SaveDialog saveDialog = new SaveDialog();
-            bool? a = saveDialog.ShowDialog();
-            if (saveDialog.DiamondCode.Text.Length > 0)
+            MessageBox messageBox = new MessageBox();
+            messageBox.ShowInput(MultilingualHelper.getString("UpdateDiamondCode"), out string inputStr,
+                MultilingualHelper.getString("ok"),
+                MultilingualHelper.getString("Cancel")
+                );
+            if (inputStr.Length > 0)
             {
-                this.DiamondCode = saveDialog.DiamondCode.Text;
+                this.DiamondCode = inputStr;
             }
             else
             {
@@ -541,12 +545,15 @@ public class GradingResultVM : BaseViewModel
     {
         if (string.IsNullOrEmpty(DiamondCode))
         {
-            SaveDialog startDialog = new SaveDialog();
-            bool? a = startDialog.ShowDialog();
-            
-            if (startDialog.DiamondCode.Text.Length > 0)
+            MessageBox messageBox = new MessageBox();
+            messageBox.ShowInput(MultilingualHelper.getString("UpdateDiamondCode"), out string inputStr,
+                MultilingualHelper.getString("ok"),
+                MultilingualHelper.getString("Cancel")
+                );
+
+            if (inputStr.Length > 0)
             {
-                this.DiamondCode = startDialog.DiamondCode.Text;
+                this.DiamondCode = inputStr;
             }
             else
             {