diff --git a/src/i18n/locales/en-US.ts b/src/i18n/locales/en-US.ts index 755131b1..be7c3d55 100644 --- a/src/i18n/locales/en-US.ts +++ b/src/i18n/locales/en-US.ts @@ -455,7 +455,7 @@ export default { addItemOk: "Add Index as {num} Record Succeeded", addItemErr: "Record addition failure", requireUn: "{display} input value is of unknown type", - requireString: "The {display} parameter value does not make sense.", + 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.", @@ -747,7 +747,7 @@ export default { alarmTitle:'Title', clearUser:'Clear User', clearType:'Clear Type', - ackState: 'Ack Status', + ackState: 'Alarm Status', ackUser:'Ack User', alarmSeq:'Sequence Number', objectName:'Object Name', @@ -1321,7 +1321,7 @@ export default { cmdNoTip: "{num} no optional command operation", require: "Mandatory parameter: {num}", requireUn: "{display} input value is of unknown type", - requireString: "The {display} parameter value does not make sense.", + 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.", diff --git a/src/views/faultManage/active-alarm/index.vue b/src/views/faultManage/active-alarm/index.vue index 167c541c..1023d5ce 100644 --- a/src/views/faultManage/active-alarm/index.vue +++ b/src/views/faultManage/active-alarm/index.vue @@ -18,6 +18,7 @@ import { import useI18n from '@/hooks/useI18n'; import useDictStore from '@/store/modules/dict'; import saveAs from 'file-saver'; +import TableColumnsDnd from '@/components/TableColumnsDnd/index.vue'; import { writeSheet } from '@/utils/execl-utils'; import { RESULT_CODE_SUCCESS } from '@/constants/result-constants'; import { readLoalXlsx } from '@/utils/execl-utils'; @@ -41,6 +42,9 @@ let dict: { activeAlarmSeverity: [], }); +/**表格字段列排序 */ +let tableColumnsDnd = ref([]); + /**记录开始结束时间 */ let queryRangePicker = ref<[string, string]>(['', '']); @@ -930,6 +934,10 @@ onMounted(() => { + @@ -937,7 +945,7 @@ onMounted(() => {