diff --git a/Language/en_US.xaml b/Language/en_US.xaml
index ea90373..469153c 100644
--- a/Language/en_US.xaml
+++ b/Language/en_US.xaml
@@ -71,6 +71,11 @@
Button
+
+
+ Item Name
+ Operation
+ Del
Button
diff --git a/Language/zh_CN.xaml b/Language/zh_CN.xaml
index 67c1936..fc8f0a6 100644
--- a/Language/zh_CN.xaml
+++ b/Language/zh_CN.xaml
@@ -72,6 +72,11 @@
按钮
+
+ 项目名称
+ 操作
+ 删除
+
按钮
diff --git a/Model/Entity/JsonEntity.cs b/Model/Entity/JsonEntity.cs
index a494e04..fd7dd29 100644
--- a/Model/Entity/JsonEntity.cs
+++ b/Model/Entity/JsonEntity.cs
@@ -1,4 +1,5 @@
-using System;
+using SparkClient.ViewModel.Grading;
+using System;
using System.Collections.Generic;
using System.Data;
using System.Linq;
@@ -80,7 +81,7 @@ namespace EncryptFileTool.Entity
public string TEST_ITEM_ID { get; set; }
public string STANDARD_ID { get; set; }
public string STANDARD_NAME { get; set; }
- public string STANDARD_EN_NAME { get; set; }
+ public string STANDARD_EN_NAME { get{ return getStandEnName(); } set { } }
public string STANDARD_MIN { get; set; }
public string STANDARD_MAX { get; set; }
public string IS_MIN_EXIST { get; set; } = "0";
@@ -93,6 +94,11 @@ namespace EncryptFileTool.Entity
public string MIN_NULL_REPALCE { get; set; } = "←";
public string MAX_NULL_REPALCE { get; set; } = "→";
public int SORT { get; set; }
+ private string getStandEnName()
+ {
+ return Name.getNameById(TEST_ITEM_ID).Trim();
+
+ }
}
public class GradeConfigInfo
{
diff --git a/Resource/Document/Helper_en.pdf b/Resource/Document/Helper_en.pdf
new file mode 100644
index 0000000..2ea5dd9
Binary files /dev/null and b/Resource/Document/Helper_en.pdf differ
diff --git a/SparkClient.csproj b/SparkClient.csproj
index dfac916..f58872c 100644
--- a/SparkClient.csproj
+++ b/SparkClient.csproj
@@ -29,6 +29,7 @@
+
@@ -98,6 +99,9 @@
Always
+
+ Always
+
diff --git a/SparkDB.db b/SparkDB.db
index dc64fef..b73a0d3 100644
Binary files a/SparkDB.db and b/SparkDB.db differ
diff --git a/ViewModel/Configuration/CutConfigVM.cs b/ViewModel/Configuration/CutConfigVM.cs
index b61c7d0..d1c82c6 100644
--- a/ViewModel/Configuration/CutConfigVM.cs
+++ b/ViewModel/Configuration/CutConfigVM.cs
@@ -167,11 +167,11 @@ public class CutConfigVM: BaseViewModel
}
if (insertCount>=0)
{
- Growl.Info("保存成功");
+ Growl.Info(MultilingualHelper.getString("ViewportSaveSucceed"));
}
else
{
- Growl.Error("保存失败");
+ Growl.Error(MultilingualHelper.getString("ViewportSaveFail"));
}
}
catch (Exception ex)
diff --git a/ViewModel/Configuration/LevelConfigVM.cs b/ViewModel/Configuration/LevelConfigVM.cs
index 9a7c9c6..9f6cb3a 100644
--- a/ViewModel/Configuration/LevelConfigVM.cs
+++ b/ViewModel/Configuration/LevelConfigVM.cs
@@ -368,19 +368,20 @@ public class LevelConfigVM : BaseViewModel
string ta = ruleId.Substring(ruleId.Length - 2);
// 国标场合 按照规则id中涵盖信息不同 对测试项目有不同描述
+ string itemName = Name.getNameById("TABLE").Trim();
if (ruleId.StartsWith("GB"))
{
if ("49".Equals(ta))
{
- prefix = "[台宽比<" + ruleId.Substring(ruleId.Length - 2) + "] ";
+ prefix = $"[{itemName}<" + ruleId.Substring(ruleId.Length - 2) + "] ";
}
else if ("71".Equals(ta))
{
- prefix = "[台宽比>" + ruleId.Substring(ruleId.Length - 2) + "] ";
+ prefix = $"[{itemName}>" + ruleId.Substring(ruleId.Length - 2) + "] ";
}
else
{
- prefix = "[台宽比=" + ruleId.Substring(ruleId.Length - 2) + "] ";
+ prefix = $"[{itemName}=" + ruleId.Substring(ruleId.Length - 2) + "] ";
}
}
}
diff --git a/Views/Configuration/CutConfigPage.xaml b/Views/Configuration/CutConfigPage.xaml
index b7f7407..a4ef03e 100644
--- a/Views/Configuration/CutConfigPage.xaml
+++ b/Views/Configuration/CutConfigPage.xaml
@@ -101,7 +101,7 @@
-
+
-
+
-
diff --git a/Views/HelperPage.xaml.cs b/Views/HelperPage.xaml.cs
index 2473f17..09e3dce 100644
--- a/Views/HelperPage.xaml.cs
+++ b/Views/HelperPage.xaml.cs
@@ -1,21 +1,62 @@
using System.Windows;
using System.Windows.Controls;
+using log4net;
using Microsoft.Web.WebView2.Core;
+using SparkClient.Model.Helper;
+using SparkClient.ViewModel.Configuration;
namespace SparkClient.Views;
public partial class HelperPage
{
+ private static readonly ILog Logger = LogManager.GetLogger(typeof(HelperPage));
public HelperPage()
{
InitializeComponent();
-
- PdfWebViewer.Source = new Uri(AppDomain.CurrentDomain.BaseDirectory + @"Resource\Document\Helper.pdf");
-
+ InitializeWebView();
+ }
+
+ private async void InitializeWebView()
+ {
+ try
+ {
+ string language = "";
+ if ("zh-cn".Equals(MultilingualHelper.getLangType()))
+ {
+ language = "zh-CN";
+ }
+ else
+ {
+ language = "en-US";
+ }
+ string userDataFolder = AppDomain.CurrentDomain.BaseDirectory + @"UserData\pdf_"+language;
+ // 设置语言
+ var environment = await CoreWebView2Environment.CreateAsync(
+ browserExecutableFolder: null, // 使用默认的WebView2运行时
+ userDataFolder: userDataFolder, // 使用默认的用户数据文件夹
+ options: new CoreWebView2EnvironmentOptions
+ {
+ Language = language // 设置语言
+ });
+
+ // 初始化WebView2控件
+ await PdfWebViewer.EnsureCoreWebView2Async(environment);
-
+ if ("zh-CN".Equals(language))
+ {
+ PdfWebViewer.Source = new Uri(AppDomain.CurrentDomain.BaseDirectory + @"Resource\Document\Helper.pdf");
+ }
+ else
+ {
+ PdfWebViewer.Source = new Uri(AppDomain.CurrentDomain.BaseDirectory + @"Resource\Document\Helper_en.pdf");
+ }
+
+ }
+ catch (Exception ex)
+ {
+ Logger.Error($"全局异常捕获：{ex.Message}", ex);
+ }
}
-
}
\ No newline at end of file