diff --git a/App.xaml.cs b/App.xaml.cs
index 532adfa..6de3409 100644
--- a/App.xaml.cs
+++ b/App.xaml.cs
@@ -25,7 +25,7 @@ public partial class App : Application
//打开数据库连接
//读取数据库多语言配置
DataBaseHelper.CreateConnection();
- string LanguageId = Settings.SelectValueByName("LanguageId");
+ string LanguageId = Settings.SelectValueById("LanguageId");
if (LanguageId.Length == 0)
{
LanguageId = "zh-cn";
diff --git a/LoginWindow.xaml.cs b/LoginWindow.xaml.cs
index 4d30970..a1683a7 100644
--- a/LoginWindow.xaml.cs
+++ b/LoginWindow.xaml.cs
@@ -15,8 +15,8 @@ public partial class LoginWindow : Window
{
InitializeComponent();
WindowStartupLocation = WindowStartupLocation.CenterScreen;
- AccountTextBox.Text = Settings.SelectValueByName("SAVE_ACCOUNT");
- PasswordBox.Password = Settings.SelectValueByName("SAVE_PASSWORD");
+ AccountTextBox.Text = Settings.SelectValueById("SAVE_ACCOUNT");
+ PasswordBox.Password = Settings.SelectValueById("SAVE_PASSWORD");
checkCUDA();
// 检测MSVCRuntime是否安装
checkMSVCRuntime();
diff --git a/Model/Entity/JsonEntity.cs b/Model/Entity/JsonEntity.cs
index a0464bc..393f991 100644
--- a/Model/Entity/JsonEntity.cs
+++ b/Model/Entity/JsonEntity.cs
@@ -10,6 +10,9 @@ using System.Windows.Shapes;
namespace EncryptFileTool.Entity
{
+ ///
+ /// 定级配置导入数据
+ ///
public class JsonEntity
{
public string SHAPE_ID { get; set; }
diff --git a/SparkClient.csproj b/SparkClient.csproj
index 429e771..999d941 100644
--- a/SparkClient.csproj
+++ b/SparkClient.csproj
@@ -52,9 +52,9 @@
-
+
Always
-
+
diff --git a/ViewModel/BaseWindow/BaseControlVM.cs b/ViewModel/BaseWindow/BaseControlVM.cs
index f8dfdb7..bc874a5 100644
--- a/ViewModel/BaseWindow/BaseControlVM.cs
+++ b/ViewModel/BaseWindow/BaseControlVM.cs
@@ -64,11 +64,17 @@ public class BaseControlVM : BaseViewModel
{
if(Content is GradingResultVM)
{
- MessageBox message = new MessageBox();
- MessageBoxResult result = message.ShowAsk(MultilingualHelper.getString("DiamodResultCloseConfirm"));
- if (MessageBoxResult.OK.Equals(result))
- {
+ bool isSaved = (Content as GradingResultVM).isSaved;
+ if (isSaved) {
WindowManager.mainViewModel.Content = WindowManager.PreviousVM();
+ }
+ else {
+ MessageBox message = new MessageBox();
+ MessageBoxResult result = message.ShowAsk(MultilingualHelper.getString("DiamodResultCloseConfirm"));
+ if (MessageBoxResult.OK.Equals(result))
+ {
+ WindowManager.mainViewModel.Content = WindowManager.PreviousVM();
+ }
}
}
else
diff --git a/ViewModel/Configuration/AlgorithmConfigVM.cs b/ViewModel/Configuration/AlgorithmConfigVM.cs
index a8f0ca1..a35a5b2 100644
--- a/ViewModel/Configuration/AlgorithmConfigVM.cs
+++ b/ViewModel/Configuration/AlgorithmConfigVM.cs
@@ -122,7 +122,7 @@ public class AlgorithmConfigVM : BaseViewModel
}
}
private void IsEnabledByRole (){
- string PERMISSIONS = Settings.SelectValueByName("PERMISSIONS");
+ string PERMISSIONS = Settings.SelectValueById("PERMISSIONS");
if ("admin".Equals(PERMISSIONS))
{
IsEnabled = true;
diff --git a/ViewModel/Configuration/CutConfigVM.cs b/ViewModel/Configuration/CutConfigVM.cs
index 59118fb..ec59a0d 100644
--- a/ViewModel/Configuration/CutConfigVM.cs
+++ b/ViewModel/Configuration/CutConfigVM.cs
@@ -147,7 +147,7 @@ public class CutConfigVM: BaseViewModel
}
private void IsEnabledByRole()
{
- string PERMISSIONS = Settings.SelectValueByName("PERMISSIONS");
+ string PERMISSIONS = Settings.SelectValueById("PERMISSIONS");
if ("admin".Equals(PERMISSIONS))
{
IsEnabled = true;
diff --git a/ViewModel/Configuration/SettingsPages/ModelColorSetPageVM.cs b/ViewModel/Configuration/SettingsPages/ModelColorSetPageVM.cs
index 540eace..f182cda 100644
--- a/ViewModel/Configuration/SettingsPages/ModelColorSetPageVM.cs
+++ b/ViewModel/Configuration/SettingsPages/ModelColorSetPageVM.cs
@@ -1,9 +1,14 @@
+using log4net;
using SparkClient.Model.Helper;
+using SparkClient.ViewModel.Grading;
namespace SparkClient.ViewModel.Configuration.SettingsPages;
-
+///
+/// 系统配置中颜色配置页面VM
+///
public class ModelColorSetPageVM : BaseViewModel
{
+ private static readonly ILog Logger = LogManager.GetLogger(typeof(ModelColorSetPageVM));
private string _FACET_COLOR;
private string _BORDER_COLOR;
private string _SELECTED_FACET_COLOR;
@@ -21,22 +26,73 @@ public class ModelColorSetPageVM : BaseViewModel
private string _PAVILION_MAIN_FACET_COLOR;
private string _LOWER_GIRDLE_FACET_COLOR;
private string _CULET_COLOR;
+ ///
+ /// 面部颜色
+ ///
public string FACET_COLOR { get { return _FACET_COLOR; } set { _FACET_COLOR = value; OnPropertyChanged(nameof(FACET_COLOR)); } }
+ ///
+ /// 边框颜色
+ ///
public string BORDER_COLOR { get { return _BORDER_COLOR; } set { _BORDER_COLOR = value; OnPropertyChanged(nameof(BORDER_COLOR)); } }
+ ///
+ /// 选中面颜色
+ ///
public string SELECTED_FACET_COLOR { get { return _SELECTED_FACET_COLOR; } set { _SELECTED_FACET_COLOR = value; OnPropertyChanged(nameof(SELECTED_FACET_COLOR)); } }
+ ///
+ /// 选中面边框颜色
+ ///
public string SELECTED_BORDER_COLOR { get { return _SELECTED_BORDER_COLOR; } set { _SELECTED_BORDER_COLOR = value; OnPropertyChanged(nameof(SELECTED_BORDER_COLOR)); } }
+ ///
+ /// 选中面同类面颜色
+ ///
public string SELECTED_TYPE_COLOR { get { return _SELECTED_TYPE_COLOR; } set { _SELECTED_TYPE_COLOR = value; OnPropertyChanged(nameof(SELECTED_TYPE_COLOR)); } }
+ ///
+ /// 选中面文字信息颜色
+ ///
public string SELECTED_FONT_COLOR { get { return _SELECTED_FONT_COLOR; } set { _SELECTED_FONT_COLOR = value; OnPropertyChanged(nameof(SELECTED_FONT_COLOR)); } }
+ ///
+ /// 标识线条颜色
+ ///
public string RULER_COLOR { get { return _RULER_COLOR; } set { _RULER_COLOR = value; OnPropertyChanged(nameof(RULER_COLOR)); } }
+ ///
+ /// 正方向标记颜色
+ ///
public string ARROW_COLOR { get { return _ARROW_COLOR; } set { _ARROW_COLOR = value; OnPropertyChanged(nameof(ARROW_COLOR)); } }
+ ///
+ /// 瑕疵面颜色
+ ///
public string BLEMISH_FACET_COLOR { get { return _BLEMISH_FACET_COLOR; } set { _BLEMISH_FACET_COLOR = value; OnPropertyChanged(nameof(BLEMISH_FACET_COLOR)); } }
+ ///
+ /// 台面颜色
+ ///
public string TABLE_FACET_COLOR { get { return _TABLE_FACET_COLOR; } set { _TABLE_FACET_COLOR = value; OnPropertyChanged(nameof(TABLE_FACET_COLOR)); } }
+ ///
+ /// 风筝面颜色
+ ///
public string UPPER_MAIN_FACET_COLOR { get { return _UPPER_MAIN_FACET_COLOR; } set { _UPPER_MAIN_FACET_COLOR = value; OnPropertyChanged(nameof(UPPER_MAIN_FACET_COLOR)); } }
+ ///
+ /// 星刻面颜色
+ ///
public string STAR_FACET_COLOR { get { return _STAR_FACET_COLOR; } set { _STAR_FACET_COLOR = value; OnPropertyChanged(nameof(STAR_FACET_COLOR)); } }
+ ///
+ /// 上腰面颜色
+ ///
public string UPPER_GIRDLE_FACET_COLOR { get { return _UPPER_GIRDLE_FACET_COLOR; } set { _UPPER_GIRDLE_FACET_COLOR = value; OnPropertyChanged(nameof(UPPER_GIRDLE_FACET_COLOR)); } }
+ ///
+ /// 腰面颜色
+ ///
public string GIRDLE_FACET_COLOR { get { return _GIRDLE_FACET_COLOR; } set { _GIRDLE_FACET_COLOR = value; OnPropertyChanged(nameof(GIRDLE_FACET_COLOR)); } }
+ ///
+ /// 亭部主刻面颜色
+ ///
public string PAVILION_MAIN_FACET_COLOR { get { return _PAVILION_MAIN_FACET_COLOR; } set { _PAVILION_MAIN_FACET_COLOR = value; OnPropertyChanged(nameof(PAVILION_MAIN_FACET_COLOR)); } }
+ ///
+ /// 下腰面颜色
+ ///
public string LOWER_GIRDLE_FACET_COLOR { get { return _LOWER_GIRDLE_FACET_COLOR; } set { _LOWER_GIRDLE_FACET_COLOR = value; OnPropertyChanged(nameof(LOWER_GIRDLE_FACET_COLOR)); } }
+ ///
+ /// 底面颜色
+ ///
public string CULET_COLOR { get { return _CULET_COLOR; } set { _CULET_COLOR = value; OnPropertyChanged(nameof(CULET_COLOR)); } }
private Dictionary colors;
@@ -44,44 +100,64 @@ public class ModelColorSetPageVM : BaseViewModel
{
InitSetting();
}
-
+ ///
+ /// 页面初始化参数赋值
+ ///
private void InitSetting()
{
- colors = new Dictionary();
- 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", "底面颜色");
-
+ try
+ {
+ colors = new Dictionary();
+ 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)
+ foreach (var color in colors)
+ {
+ setColor(color.Key);
+ }
+ }
+ catch (Exception ex)
{
- setColor(color.Key);
+ Logger.Error($"全局异常捕获：{ex.Message}", ex);
}
}
-
+ ///
+ /// 颜色数据更新
+ ///
+ ///
+ ///
public bool SaveUpdate(object param)
{
- DataBaseHelper.BeginTransaction();
- foreach(var color in colors)
+ try
+ {
+ DataBaseHelper.BeginTransaction();
+ foreach (var color in colors)
+ {
+ updateDataBase(color.Key);
+ }
+ DataBaseHelper.commit();
+ return true;
+ }
+ catch (Exception ex)
{
- updateDataBase(color.Key);
+ Logger.Error($"全局异常捕获：{ex.Message}", ex);
+ return false;
}
- DataBaseHelper.commit();
- return true;
}
private void updateDataBase(string SETTING_ID)
{
@@ -94,9 +170,13 @@ public class ModelColorSetPageVM : BaseViewModel
};
colorData.insert();
}
+ ///
+ /// 画面中颜色属性赋值
+ ///
+ ///
private void setColor(string SETTING_ID)
{
- var value = Settings.SelectValueByName(SETTING_ID);
+ var value = Settings.SelectValueById(SETTING_ID);
if (value == null || string.IsNullOrEmpty(value))
{
value = "#FF000000";
diff --git a/ViewModel/Configuration/SettingsPages/SettingsVM.cs b/ViewModel/Configuration/SettingsPages/SettingsVM.cs
index 1bbd7ec..6e3d507 100644
--- a/ViewModel/Configuration/SettingsPages/SettingsVM.cs
+++ b/ViewModel/Configuration/SettingsPages/SettingsVM.cs
@@ -1,4 +1,5 @@
using HandyControl.Controls;
+using log4net;
using Newtonsoft.Json.Linq;
using SparkClient.Model.Entity.Base;
using SparkClient.Model.Helper;
@@ -17,6 +18,7 @@ namespace SparkClient.ViewModel.Configuration.SettingsPages
{
public class SettingsVM : BaseViewModel
{
+ private static readonly ILog Logger = LogManager.GetLogger(typeof(ModelColorSetPageVM));
public ICommand SelectFileCommand { get; }
public string _languageId;
@@ -47,119 +49,154 @@ namespace SparkClient.ViewModel.Configuration.SettingsPages
public DataTable Rules { get { return _rules; } set { _rules = value; OnPropertyChanged(nameof(Rules)); } }
public SettingsVM()
{
- SelectFileCommand = new RelayCommand(SelectFile);
- InitSetting();
+ try {
+ SelectFileCommand = new RelayCommand(SelectFile);
+ InitSetting();
+ }
+ catch (Exception ex)
+ {
+ Logger.Error($"全局异常捕获：{ex.Message}", ex);
+ }
}
private void InitSetting()
{
- Languages = new DataTable();
- Languages.Columns.Add("Key");
- Languages.Columns.Add("Value");
- Languages.Rows.Add("中文", "zh-cn");
- Languages.Rows.Add("English", "en");
- LanguageId = Settings.SelectValueByName("LanguageId");
- if (LanguageId.Length == 0)
+ try
+ {
+ Languages = new DataTable();
+ Languages.Columns.Add("Key");
+ Languages.Columns.Add("Value");
+ Languages.Rows.Add("中文", "zh-cn");
+ Languages.Rows.Add("English", "en");
+ LanguageId = Settings.SelectValueById("LanguageId");
+ if (LanguageId.Length == 0)
+ {
+ LanguageId = "zh-cn";
+ }
+ bool.TryParse( Settings.SelectValueById("TxtFileChecked"), out bool TxtFileChecked);
+ this.TxtFileChecked = TxtFileChecked;
+ bool.TryParse(Settings.SelectValueById("StlFileChecked"), out bool StlFileChecked);
+ this.StlFileChecked = StlFileChecked;
+ bool.TryParse(Settings.SelectValueById("ExcelFileChecked"), out bool ExcelFileChecked);
+ this.ExcelFileChecked = ExcelFileChecked;
+ bool.TryParse(Settings.SelectValueById("DatFileChecked"), out bool DatFileChecked);
+ this.DatFileChecked = DatFileChecked;
+ FilePath = Settings.SelectValueById("FilePath");
+ RuleId = Settings.SelectValueById("RuleId");
+ selectRules();
+ }
+ catch (Exception ex)
{
- LanguageId = "zh-cn";
+ Logger.Error($"全局异常捕获：{ex.Message}", ex);
}
- bool.TryParse( Settings.SelectValueByName("TxtFileChecked"), out bool TxtFileChecked);
- this.TxtFileChecked = TxtFileChecked;
- bool.TryParse(Settings.SelectValueByName("StlFileChecked"), out bool StlFileChecked);
- this.StlFileChecked = StlFileChecked;
- bool.TryParse(Settings.SelectValueByName("ExcelFileChecked"), out bool ExcelFileChecked);
- this.ExcelFileChecked = ExcelFileChecked;
- bool.TryParse(Settings.SelectValueByName("DatFileChecked"), out bool DatFileChecked);
- this.DatFileChecked = DatFileChecked;
- FilePath = Settings.SelectValueByName("FilePath");
- RuleId = Settings.SelectValueByName("RuleId");
- selectRules();
}
private void selectRules()
{
- Rules = new DataTable();
- Rules.Columns.Add("Key");
- Rules.Columns.Add("Value");
- string sql = $"SELECT * FROM RULE WHERE RULE_ID NOT LIKE '%_TA_%';";
- DataTable db = DataBaseHelper.ExecuteQuery(sql);
- foreach (DataRow row in db.Rows)
+ try
{
- Rules.Rows.Add(row[MultilingualHelper.getString("RULE_NAME")].ToString(), row["RULE_ID"].ToString());
+ Rules = new DataTable();
+ Rules.Columns.Add("Key");
+ Rules.Columns.Add("Value");
+ string sql = $"SELECT * FROM RULE WHERE RULE_ID NOT LIKE '%_TA_%';";
+ DataTable db = DataBaseHelper.ExecuteQuery(sql);
+ foreach (DataRow row in db.Rows)
+ {
+ Rules.Rows.Add(row[MultilingualHelper.getString("RULE_NAME")].ToString(), row["RULE_ID"].ToString());
+ }
+ }
+ catch (Exception ex)
+ {
+ Logger.Error($"全局异常捕获：{ex.Message}", ex);
}
//Rules.Rows.Add("IGI 2023", "IGI2023");
}
public bool SaveUpdate(object param)
{
- if (!Directory.Exists(FilePath))
+ try
{
- Growl.Error(MultilingualHelper.getString("SavePathIsnotExists"));
+ if (!Directory.Exists(FilePath))
+ {
+ Growl.Error(MultilingualHelper.getString("SavePathIsnotExists"));
+ return false;
+ }
+ MultilingualHelper.setLanguage(_languageId);
+
+ updateDataBase();
+ Growl.InfoGlobal(MultilingualHelper.getString("Save_successful_message"));
+ return true;
+ }
+ catch (Exception ex)
+ {
+ Logger.Error($"全局异常捕获：{ex.Message}", ex);
return false;
}
- MultilingualHelper.setLanguage(_languageId);
-
- updateDataBase();
- Growl.InfoGlobal(MultilingualHelper.getString("Save_successful_message"));
- return true;
}
private void updateDataBase()
{
- // 语言设置登录
- Settings LanguageData = new Settings()
- {
- Key = "LanguageId",
- ItemName = "语言设置",
- Value = LanguageId,
- };
- LanguageData.insert();
- // 上传文件登录
- Settings TxtFileCheckedData = new Settings()
+ try
{
- Key = "TxtFileChecked",
- ItemName = "上传文件 TXT文件",
- Value = TxtFileChecked.ToString(),
- };
- TxtFileCheckedData.insert();
+ // 语言设置登录
+ Settings LanguageData = new Settings()
+ {
+ Key = "LanguageId",
+ ItemName = "语言设置",
+ Value = LanguageId,
+ };
+ LanguageData.insert();
+ // 上传文件登录
+ Settings TxtFileCheckedData = new Settings()
+ {
+ Key = "TxtFileChecked",
+ ItemName = "上传文件 TXT文件",
+ Value = TxtFileChecked.ToString(),
+ };
+ TxtFileCheckedData.insert();
- Settings StlFileCheckedData = new Settings()
- {
- Key = "StlFileChecked",
- ItemName = "上传文件 STL文件",
- Value = StlFileChecked.ToString(),
- };
- StlFileCheckedData.insert();
+ Settings StlFileCheckedData = new Settings()
+ {
+ Key = "StlFileChecked",
+ ItemName = "上传文件 STL文件",
+ Value = StlFileChecked.ToString(),
+ };
+ StlFileCheckedData.insert();
- Settings ExcelFileCheckedData = new Settings()
- {
- Key = "ExcelFileChecked",
- ItemName = "上传文件 Excel文件",
- Value = ExcelFileChecked.ToString(),
- };
- ExcelFileCheckedData.insert();
+ Settings ExcelFileCheckedData = new Settings()
+ {
+ Key = "ExcelFileChecked",
+ ItemName = "上传文件 Excel文件",
+ Value = ExcelFileChecked.ToString(),
+ };
+ ExcelFileCheckedData.insert();
- Settings DatFileCheckedData = new Settings()
- {
- Key = "DatFileChecked",
- ItemName = "上传文件 Dat文件",
- Value = DatFileChecked.ToString(),
- };
- DatFileCheckedData.insert();
- // 保存路径登录
- Settings FilePathData = new Settings()
- {
- Key = "FilePath",
- ItemName = "保存路径",
- Value = FilePath,
- };
- FilePathData.insert();
- // 定级标准登录
- Settings RuleData = new Settings()
+ Settings DatFileCheckedData = new Settings()
+ {
+ Key = "DatFileChecked",
+ ItemName = "上传文件 Dat文件",
+ Value = DatFileChecked.ToString(),
+ };
+ DatFileCheckedData.insert();
+ // 保存路径登录
+ Settings FilePathData = new Settings()
+ {
+ Key = "FilePath",
+ ItemName = "保存路径",
+ Value = FilePath,
+ };
+ FilePathData.insert();
+ // 定级标准登录
+ Settings RuleData = new Settings()
+ {
+ Key = "RuleId",
+ ItemName = "定级标准",
+ Value = RuleId,
+ };
+ RuleData.insert();
+ }
+ catch (Exception ex)
{
- Key = "RuleId",
- ItemName = "定级标准",
- Value = RuleId,
- };
- RuleData.insert();
+ Logger.Error($"全局异常捕获：{ex.Message}", ex);
+ }
}
public void SelectFile(object param)
{
@@ -182,6 +219,9 @@ namespace SparkClient.ViewModel.Configuration.SettingsPages
}
}
}
+ ///
+ /// 设定表实体
+ ///
public class Settings
{
private static string TABLE_NAME = "SETTING";
@@ -203,7 +243,10 @@ namespace SparkClient.ViewModel.Configuration.SettingsPages
///
[DbField("SETTING_P")]
public required string Value { get; set; }
-
+ ///
+ /// 设定表DB登录
+ ///
+ /// 更新数量
public int insert()
{
string sql = $"SELECT * FROM {TABLE_NAME} WHERE SETTING_ID = '{Key}';";
@@ -219,8 +262,12 @@ namespace SparkClient.ViewModel.Configuration.SettingsPages
return DataBaseHelper.ExecuteNonQuery(insertSql);
}
}
-
- public static string SelectValueByName(string Id)
+ ///
+ /// 设定表值检索
+ ///
+ ///
+ /// value
+ public static string SelectValueById(string Id)
{
string sql = $"SELECT * FROM {TABLE_NAME} WHERE SETTING_ID = '{Id}';";
DataTable db = DataBaseHelper.ExecuteQuery(sql);
diff --git a/ViewModel/Grading/GradingResultVM.cs b/ViewModel/Grading/GradingResultVM.cs
index c5e18db..2e446d5 100644
--- a/ViewModel/Grading/GradingResultVM.cs
+++ b/ViewModel/Grading/GradingResultVM.cs
@@ -46,6 +46,7 @@ public class GradingResultVM : BaseViewModel
private string _ds;
private RowDetail _selRowDataDetail;
private bool _isEnabled;
+ public bool isSaved = false;
public ICommand SaveFileCommand { get; }
public ICommand SaveAsCommand { get; }
public List DtResults { get { return _dtResults; } set { _dtResults = value; OnPropertyChanged(nameof(DtResults)); } }
@@ -87,7 +88,7 @@ public class GradingResultVM : BaseViewModel
algorithmResult = result as AlgorithmResultEntity?? new AlgorithmResultEntity();
InitView(algorithmResult);
machine = algorithmResult.DeviceId;
- username = Settings.SelectValueByName("PERMISSIONS");
+ username = Settings.SelectValueById("PERMISSIONS");
if (ruleId.StartsWith("IGI"))
{
IsEnabled = true;
@@ -139,7 +140,7 @@ public class GradingResultVM : BaseViewModel
Type type = colorConfigEntity.GetType();
foreach (var property in colorProperty)
{
- var value = Settings.SelectValueByName(property.Key);
+ var value = Settings.SelectValueById(property.Key);
PropertyInfo? p = type.GetProperty(property.Value);
if (p != null && !string.IsNullOrEmpty(value))
{
@@ -196,7 +197,7 @@ public class GradingResultVM : BaseViewModel
}
private string getRuleId()
{
- return Settings.SelectValueByName("RuleId");
+ return Settings.SelectValueById("RuleId");
}
#endregion
///
@@ -662,6 +663,7 @@ public class GradingResultVM : BaseViewModel
string fullPath = Path.Combine(getFilePath(), this.DiamondCode);
ExportFile(fullPath);
SaveTestResult(SaveStatus.Save);
+ isSaved = true;
}
private string getFilePath()
{