Merge remote-tracking branch 'origin/main' into lichang

src/i18n/locales/en-US.ts

@@ -481,21 +481,21 @@ export default {
         neType: 'NE Type',
         neTypePleace: "Please select the network element type",
         noConfigData: "No data on configuration items",
-        updateValue: "The value of the {num} attribute was modified successfully.",
+        updateValue: "[ {num} ] parameter value modified successfully.",
         updateValueErr: "Attribute value modification failure",
         updateItem: "Modify Index to {num}.",
         updateItemErr: "Record modification failure",
         delItemOk: "Deleting Index as {num} succeeded",
         addItemOk: "Add Index as {num} Record Succeeded",
         addItemErr: "Record addition failure",
-        requireUn: "{display} input value is of unknown type",
-        requireString: "The {display} parameter value is invalid.",
-        requireInt: "{display} Parameter value not in reasonable range {filter}",
-        requireIpv4: "{display} not a legitimate IPV4 address",
-        requireIpv6: "{display} Not a legitimate IPV6 address.",
-        requireEnum: "{display} is not a reasonable enumeration value.",
-        requireBool: "{display} is not a reasonable boolean value.",
-        editOkTip: "Confirm updating the value of this {num} attribute?",
+        requireUn: "[ {display} ] input value is of unknown type",
+        requireString: "[ {display} ] parameter value is invalid.",
+        requireInt: "[ {display} ] parameter value not in reasonable range {filter}",
+        requireIpv4: "[ {display} ] not a legitimate IPV4 address",
+        requireIpv6: "[ {display} ] not a legitimate IPV6 address.",
+        requireEnum: "[ {display} ] is not a reasonable enumeration value.",
+        requireBool: "[ {display} ] is not a reasonable boolean value.",
+        editOkTip: "Confirm updating the value of this [ {num} ] attribute?",
         updateItemTip: "Confirm updating the data item with Index [{num}]?",
         delItemTip: "Confirm deleting the data item with Index [{num}]?",
         arrayMore: "Expand",
@@ -1147,6 +1147,7 @@ export default {
         showSet:'Show filter settings',
         exportSure:'Confirm whether to export all active alarm information',
         viewIdInfo:'View {alarmId} record information',
+        closeModal:'Close',
       },
       historyAlarm:{
         exportSure:'Confirm whether to export all historical alarm information',
@@ -1159,6 +1160,9 @@ export default {
         noChange:'There is no change in the alarm forwarding settings.',
         forwardSet:'Alarm Forwarding Setting',
       },
+      eventAlarm:{
+        exportSure:'Confirm whether to export all event alarm information',
+      }
     },
     logManage:{
       alarm:{
@@ -1955,14 +1959,14 @@ export default {
       cmdOpTip: "Select the item to be operated in the left command navigation!",
       cmdNoTip: "{num} no optional command operation",
       require: "Mandatory parameter: {num}",
-      requireUn: "{display} input value is of unknown type",
-      requireString: "The {display} parameter value is invalid.",
-      requireInt: "{display} Parameter value not in reasonable range {filter}",
-      requireIpv4: "{display} not a legitimate IPV4 address",
-      requireIpv6: "{display} Not a legitimate IPV6 address.",
-      requireEnum: "{display} is not a reasonable enumeration value.",
-      requireBool: "{display} is not a reasonable boolean value.",
-      requireFile: "{display} is not a value that matches the parameter file type.",
+      requireUn: "[ {display} ] input value is of unknown type",
+      requireString: "[ {display} ] parameter value is invalid.",
+      requireInt: "[ {display} ] parameter value not in reasonable range {filter}",
+      requireIpv4: "[ {display} ] not a legitimate IPV4 address",
+      requireIpv6: "[ {display} ] not a legitimate IPV6 address.",
+      requireEnum: "[ {display} ] is not a reasonable enumeration value.",
+      requireBool: "[ {display} ] is not a reasonable boolean value.",
+      requireFile: "[ {display} ] is not a value that matches the parameter file type.",
       cmdQuickEntry: "Command Quick Entry",
       cmdQuickEntryHelp: "Line feed (Shift + Enter), Execute (Enter)",
       cmdParamPanel: "Parameter Panel",

src/i18n/locales/zh-CN.ts

@@ -481,21 +481,21 @@ export default {
         neType: "网元类型",
         neTypePleace: "请选择网元类型",
         noConfigData: "暂无配置项数据",
-        updateValue: "{num} 属性值修改成功",
+        updateValue: "【 {num} 】 属性值修改成功",
         updateValueErr: "属性值修改失败",
         updateItem: "修改 Index 为 {num} 记录成功",
         updateItemErr: "记录修改失败",
         delItemOk: "删除 Index 为 {num} 记录成功",
         addItemOk: "新增 Index 为 {num} 记录成功",
         addItemErr: "记录新增失败",
-        requireUn: "{display} 输入值是未知类型",
-        requireString: "{display} 参数值不合理",
-        requireInt: "{display} 参数值不在合理范围 {filter}",
-        requireIpv4: "{display} 不是合法的IPV4地址",
-        requireIpv6: "{display} 不是合法的IPV6地址",
-        requireEnum: "{display} 不是合理的枚举值",
-        requireBool: "{display} 不是合理的布尔类型的值",
-        editOkTip: "确认更新该{num}属性值吗？",
+        requireUn: "【 {display} 】输入值是未知类型",
+        requireString: "【 {display} 】参数值不合理",
+        requireInt: "【 {display} 】参数值不在合理范围 {filter}",
+        requireIpv4: "【 {display} 】不是合法的IPV4地址",
+        requireIpv6: "【 {display} 】不是合法的IPV6地址",
+        requireEnum: "【 {display} 】不是合理的枚举值",
+        requireBool: "【 {display} 】不是合理的布尔类型的值",
+        editOkTip: "确认更新该【 {num} 】属性值吗？",
         updateItemTip: "确认更新Index为 【{num}】 的数据项？",
         delItemTip: "确认删除Index为 【{num}】 的数据项？",
         arrayMore: "展开",
@@ -1147,6 +1147,7 @@ export default {
         showSet:'显示过滤设置',
         exportSure:'确认是否导出全部活动告警信息',
         viewIdInfo:'查看{alarmId} 记录信息',
+        closeModal:'关闭',
       },
       historyAlarm:{
         exportSure:'确认是否导出全部历史告警信息?',
@@ -1158,6 +1159,9 @@ export default {
         save:'保存设置',
         noChange:'告警前转接口设置无变更',
         forwardSet:'告警前转接口设置',
+      },
+      eventAlarm:{
+        exportSure:'确认是否导出全部事件告警信息?',
       }
     },
     logManage:{
@@ -1955,14 +1959,14 @@ export default {
       cmdOpTip: "左侧命令导航中选择要操作项！",
       cmdNoTip: "{num} 无可选命令操作",
       require: "必填参数：{num}",
-      requireUn: "{display} 输入值是未知类型",
-      requireString: "{display} 参数值不合理",
-      requireInt: "{display} 参数值不在合理范围 {filter}",
-      requireIpv4: "{display} 不是合法的IPV4地址",
-      requireIpv6: "{display} 不是合法的IPV6地址",
-      requireEnum: "{display} 不是合理的枚举值",
-      requireBool: "{display} 不是合理的布尔类型的值",
-      requireFile: "{display} 不是符合参数文件类型的值",
+      requireUn: "【 {display} 】输入值是未知类型",
+      requireString: "【 {display} 】参数值不合理",
+      requireInt: "【 {display} 】参数值不在合理范围 {filter}",
+      requireIpv4: "【 {display} 】不是合法的IPV4地址",
+      requireIpv6: "【 {display} 】不是合法的IPV6地址",
+      requireEnum: "【 {display} 】不是合理的枚举值",
+      requireBool: "【 {display} 】不是合理的布尔类型的值",
+      requireFile: "【 {display} 】不是符合参数文件类型的值",
       cmdQuickEntry: "命令快速输入",
       cmdQuickEntryHelp: "换行(Shift + Enter) 执行发送(Enter)",
       cmdParamPanel: "参数面板",