fix：多语言相关调整

Language/en_US.xaml

@@ -71,6 +71,11 @@
     
     <!-- Grading Configuration Report -->
     <sys:String x:Key="Demo2">Button</sys:String>
+
+    <!-- Cutter Configuration Report -->
+    <sys:String x:Key="CutConfigItemName">Item Name</sys:String>
+    <sys:String x:Key="CutConfigOperation">Operation</sys:String>
+    <sys:String x:Key="CutConfigDel">Del</sys:String>
     
     <!-- Algorithm Configuration Report -->
     <sys:String x:Key="Demo1">Button</sys:String>

Language/zh_CN.xaml

@@ -72,6 +72,11 @@
     <!--定级配置 报表-->
     <sys:String x:Key="Demo2">按钮</sys:String>
     
+    <!-- 切工仪配置画面 -->
+    <sys:String x:Key="CutConfigItemName">项目名称</sys:String>
+    <sys:String x:Key="CutConfigOperation">操作</sys:String>
+    <sys:String x:Key="CutConfigDel">删除</sys:String>
+    
     <!--算法配置 报表-->
     <sys:String x:Key="Demo1">按钮</sys:String>
     <!-- 系统配置 -->

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
     {

SparkClient.csproj

@@ -29,6 +29,7 @@
 
     <ItemGroup>
       <None Remove="ffmpeg.exe" />
+      <None Remove="Resource\Document\Helper_en.pdf" />
       <None Remove="Resource\Images\IGILogo.png" />
       <None Remove="Resource\Images\round_P8-P8.png" />
       <None Remove="Resource\Images\Setting%403x.png" />
@@ -98,6 +99,9 @@
       <Content Include="Resource\Document\Helper.pdf">
         <CopyToOutputDirectory>Always</CopyToOutputDirectory>
       </Content>
+      <Content Include="Resource\Document\Helper_en.pdf">
+        <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+      </Content>
       <None Remove="Resource\Other\Json-Mode-Default.xshd" />
       <EmbeddedResource Include="Resource\Other\Json-Mode-Default.xshd" />
       <None Remove="Resource\DimDemo.txt" />

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)

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) + "] ";
                                     }
                                 }
                             }

Views/Configuration/CutConfigPage.xaml

@@ -101,7 +101,7 @@
                 </Style>
             </DataGrid.RowStyle>
             <DataGrid.Columns>
-                <DataGridTemplateColumn Header="项目名称" Width="2*" >
+                <DataGridTemplateColumn Header="{StaticResource CutConfigItemName}" Width="2*" >
                     <DataGridTemplateColumn.CellTemplate>
                         <DataTemplate>
                             <TextBlock Text="{Binding ItemName}" 
@@ -150,10 +150,10 @@
                         </DataTemplate>
                     </DataGridTemplateColumn.CellEditingTemplate>
                 </DataGridTemplateColumn>
-                <DataGridTemplateColumn Header="操作" Width="*">
+                <DataGridTemplateColumn Header="{StaticResource CutConfigOperation}" Width="*">
                     <DataGridTemplateColumn.CellTemplate>
                         <DataTemplate>
-                            <Button Content="删除" Style="{StaticResource ButtonDanger}" Command="{Binding DataContext.DelCutRowCommand,RelativeSource={RelativeSource AncestorType=DataGrid}}" CommandParameter="{Binding}">
+                            <Button Content="{StaticResource CutConfigDel}" Style="{StaticResource ButtonDanger}" Command="{Binding DataContext.DelCutRowCommand,RelativeSource={RelativeSource AncestorType=DataGrid}}" CommandParameter="{Binding}">
                                 
                             </Button>
                         </DataTemplate> 

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);
+        }
     }
 
-  
 }