diff --git a/public/alarmHelp/20005.xlsx b/public/alarmHelp/20005.xlsx deleted file mode 100644 index cdbaf1e3..00000000 Binary files a/public/alarmHelp/20005.xlsx and /dev/null differ diff --git a/public/alarmHelp/40001.xlsx b/public/alarmHelp/40001.xlsx deleted file mode 100644 index b4b176ee..00000000 Binary files a/public/alarmHelp/40001.xlsx and /dev/null differ diff --git a/public/alarmHelp/all.xlsx b/public/alarmHelp/all.xlsx deleted file mode 100644 index 7c653f30..00000000 Binary files a/public/alarmHelp/all.xlsx and /dev/null differ diff --git a/public/alarmHelp/30007.xlsx b/public/alarmHelp/en/20001.xlsx similarity index 58% rename from public/alarmHelp/30007.xlsx rename to public/alarmHelp/en/20001.xlsx index 3b001832..6ca73285 100644 Binary files a/public/alarmHelp/30007.xlsx and b/public/alarmHelp/en/20001.xlsx differ diff --git a/public/alarmHelp/en/20002.xlsx b/public/alarmHelp/en/20002.xlsx new file mode 100644 index 00000000..c0dfd539 Binary files /dev/null and b/public/alarmHelp/en/20002.xlsx differ diff --git a/public/alarmHelp/en/20003.xlsx b/public/alarmHelp/en/20003.xlsx new file mode 100644 index 00000000..e3b441e2 Binary files /dev/null and b/public/alarmHelp/en/20003.xlsx differ diff --git a/public/alarmHelp/en/20004.xlsx b/public/alarmHelp/en/20004.xlsx new file mode 100644 index 00000000..ad397e2c Binary files /dev/null and b/public/alarmHelp/en/20004.xlsx differ diff --git a/public/alarmHelp/en/20005.xlsx b/public/alarmHelp/en/20005.xlsx new file mode 100644 index 00000000..5c51cacb Binary files /dev/null and b/public/alarmHelp/en/20005.xlsx differ diff --git a/public/alarmHelp/en/30001.xlsx b/public/alarmHelp/en/30001.xlsx new file mode 100644 index 00000000..cc6878e6 Binary files /dev/null and b/public/alarmHelp/en/30001.xlsx differ diff --git a/public/alarmHelp/en/30002.xlsx b/public/alarmHelp/en/30002.xlsx new file mode 100644 index 00000000..21d6abde Binary files /dev/null and b/public/alarmHelp/en/30002.xlsx differ diff --git a/public/alarmHelp/en/30003.xlsx b/public/alarmHelp/en/30003.xlsx new file mode 100644 index 00000000..361d95ff Binary files /dev/null and b/public/alarmHelp/en/30003.xlsx differ diff --git a/public/alarmHelp/en/30004.xlsx b/public/alarmHelp/en/30004.xlsx new file mode 100644 index 00000000..c48044e5 Binary files /dev/null and b/public/alarmHelp/en/30004.xlsx differ diff --git a/public/alarmHelp/en/30005.xlsx b/public/alarmHelp/en/30005.xlsx new file mode 100644 index 00000000..75efa9a5 Binary files /dev/null and b/public/alarmHelp/en/30005.xlsx differ diff --git a/public/alarmHelp/en/30006.xlsx b/public/alarmHelp/en/30006.xlsx new file mode 100644 index 00000000..f330d158 Binary files /dev/null and b/public/alarmHelp/en/30006.xlsx differ diff --git a/public/alarmHelp/en/30007.xlsx b/public/alarmHelp/en/30007.xlsx new file mode 100644 index 00000000..55358160 Binary files /dev/null and b/public/alarmHelp/en/30007.xlsx differ diff --git a/public/alarmHelp/en/30008.xlsx b/public/alarmHelp/en/30008.xlsx new file mode 100644 index 00000000..0429e3e5 Binary files /dev/null and b/public/alarmHelp/en/30008.xlsx differ diff --git a/public/alarmHelp/en/40001.xlsx b/public/alarmHelp/en/40001.xlsx new file mode 100644 index 00000000..2bd067d3 Binary files /dev/null and b/public/alarmHelp/en/40001.xlsx differ diff --git a/public/alarmHelp/en/40002.xlsx b/public/alarmHelp/en/40002.xlsx new file mode 100644 index 00000000..9beaf9ca Binary files /dev/null and b/public/alarmHelp/en/40002.xlsx differ diff --git a/public/alarmHelp/en/all.xlsx b/public/alarmHelp/en/all.xlsx new file mode 100644 index 00000000..ef95cf5e Binary files /dev/null and b/public/alarmHelp/en/all.xlsx differ diff --git a/public/alarmHelp/20003.xlsx b/public/alarmHelp/zh/20001.xlsx similarity index 60% rename from public/alarmHelp/20003.xlsx rename to public/alarmHelp/zh/20001.xlsx index e0e69404..3c13aa2a 100644 Binary files a/public/alarmHelp/20003.xlsx and b/public/alarmHelp/zh/20001.xlsx differ diff --git a/public/alarmHelp/20002.xlsx b/public/alarmHelp/zh/20002.xlsx similarity index 57% rename from public/alarmHelp/20002.xlsx rename to public/alarmHelp/zh/20002.xlsx index 8f5ff659..a952ec0e 100644 Binary files a/public/alarmHelp/20002.xlsx and b/public/alarmHelp/zh/20002.xlsx differ diff --git a/public/alarmHelp/zh/20003.xlsx b/public/alarmHelp/zh/20003.xlsx new file mode 100644 index 00000000..db11dfe3 Binary files /dev/null and b/public/alarmHelp/zh/20003.xlsx differ diff --git a/public/alarmHelp/40002.xlsx b/public/alarmHelp/zh/20004.xlsx similarity index 58% rename from public/alarmHelp/40002.xlsx rename to public/alarmHelp/zh/20004.xlsx index 481b7126..41fa7789 100644 Binary files a/public/alarmHelp/40002.xlsx and b/public/alarmHelp/zh/20004.xlsx differ diff --git a/public/alarmHelp/20004.xlsx b/public/alarmHelp/zh/20005.xlsx similarity index 58% rename from public/alarmHelp/20004.xlsx rename to public/alarmHelp/zh/20005.xlsx index 5ee567ff..ccd0d4d7 100644 Binary files a/public/alarmHelp/20004.xlsx and b/public/alarmHelp/zh/20005.xlsx differ diff --git a/public/alarmHelp/zh/30001.xlsx b/public/alarmHelp/zh/30001.xlsx new file mode 100644 index 00000000..9318b2a9 Binary files /dev/null and b/public/alarmHelp/zh/30001.xlsx differ diff --git a/public/alarmHelp/30005.xlsx b/public/alarmHelp/zh/30002.xlsx similarity index 58% rename from public/alarmHelp/30005.xlsx rename to public/alarmHelp/zh/30002.xlsx index cf01aa11..15a6607e 100644 Binary files a/public/alarmHelp/30005.xlsx and b/public/alarmHelp/zh/30002.xlsx differ diff --git a/public/alarmHelp/30003.xlsx b/public/alarmHelp/zh/30003.xlsx similarity index 58% rename from public/alarmHelp/30003.xlsx rename to public/alarmHelp/zh/30003.xlsx index 9232febf..36431bdc 100644 Binary files a/public/alarmHelp/30003.xlsx and b/public/alarmHelp/zh/30003.xlsx differ diff --git a/public/alarmHelp/30006.xlsx b/public/alarmHelp/zh/30004.xlsx similarity index 58% rename from public/alarmHelp/30006.xlsx rename to public/alarmHelp/zh/30004.xlsx index e3a1e35d..e785bb03 100644 Binary files a/public/alarmHelp/30006.xlsx and b/public/alarmHelp/zh/30004.xlsx differ diff --git a/public/alarmHelp/zh/30005.xlsx b/public/alarmHelp/zh/30005.xlsx new file mode 100644 index 00000000..7794e03a Binary files /dev/null and b/public/alarmHelp/zh/30005.xlsx differ diff --git a/public/alarmHelp/30002.xlsx b/public/alarmHelp/zh/30006.xlsx similarity index 59% rename from public/alarmHelp/30002.xlsx rename to public/alarmHelp/zh/30006.xlsx index e7d9b767..9e6a9aa2 100644 Binary files a/public/alarmHelp/30002.xlsx and b/public/alarmHelp/zh/30006.xlsx differ diff --git a/public/alarmHelp/30001.xlsx b/public/alarmHelp/zh/30007.xlsx similarity index 58% rename from public/alarmHelp/30001.xlsx rename to public/alarmHelp/zh/30007.xlsx index f52b8573..cacaa663 100644 Binary files a/public/alarmHelp/30001.xlsx and b/public/alarmHelp/zh/30007.xlsx differ diff --git a/public/alarmHelp/20001.xlsx b/public/alarmHelp/zh/30008.xlsx similarity index 59% rename from public/alarmHelp/20001.xlsx rename to public/alarmHelp/zh/30008.xlsx index 2daef158..977d177b 100644 Binary files a/public/alarmHelp/20001.xlsx and b/public/alarmHelp/zh/30008.xlsx differ diff --git a/public/alarmHelp/30008.xlsx b/public/alarmHelp/zh/40001.xlsx similarity index 60% rename from public/alarmHelp/30008.xlsx rename to public/alarmHelp/zh/40001.xlsx index b58edb07..80c4ba5c 100644 Binary files a/public/alarmHelp/30008.xlsx and b/public/alarmHelp/zh/40001.xlsx differ diff --git a/public/alarmHelp/30004.xlsx b/public/alarmHelp/zh/40002.xlsx similarity index 61% rename from public/alarmHelp/30004.xlsx rename to public/alarmHelp/zh/40002.xlsx index 638a2513..35fed30a 100644 Binary files a/public/alarmHelp/30004.xlsx and b/public/alarmHelp/zh/40002.xlsx differ diff --git a/public/alarmHelp/zh/all.xlsx b/public/alarmHelp/zh/all.xlsx new file mode 100644 index 00000000..4b8e2744 Binary files /dev/null and b/public/alarmHelp/zh/all.xlsx differ diff --git a/src/i18n/locales/en-US.ts b/src/i18n/locales/en-US.ts index 6b2e5240..83f7bcc2 100644 --- a/src/i18n/locales/en-US.ts +++ b/src/i18n/locales/en-US.ts @@ -735,7 +735,7 @@ export default { ackTime:'Ack Time', ackError:'Please do not confirm again', syncMyself:'Manual Synchronization', - realTitle:'Title', + realTitle:'English Title', objectNf:'Object NE', helpFile:'Help Documentation', set:'Set', diff --git a/src/utils/execl-utils.ts b/src/utils/execl-utils.ts index 928843b6..fe57d798 100644 --- a/src/utils/execl-utils.ts +++ b/src/utils/execl-utils.ts @@ -19,8 +19,8 @@ export const xlsxUrl = `${ * console.log(res) * }); */ -export async function readLoalXlsx(id: string): Promise[]> { - let result = await fetch(`${xlsxUrl}/${id}.xlsx`); +export async function readLoalXlsx(lang:string,id: string): Promise[]> { + let result = await fetch(`${xlsxUrl}/${lang}/${id}.xlsx`); let fileBuffer = await result.arrayBuffer(); // 判断是否xlsx文件 const data = new Uint8Array(fileBuffer); @@ -30,7 +30,7 @@ export async function readLoalXlsx(id: string): Promise[]> { data[2] === 0x03 && data[3] === 0x04; if (!isXlsxFile) { - result = await fetch(`${xlsxUrl}/all.xlsx`); + result = await fetch(`${xlsxUrl}/${lang}/all.xlsx`); fileBuffer = await result.arrayBuffer(); } return readSheet(fileBuffer, 0); diff --git a/src/views/faultManage/active-alarm/index.vue b/src/views/faultManage/active-alarm/index.vue index 0f366757..f10c4307 100644 --- a/src/views/faultManage/active-alarm/index.vue +++ b/src/views/faultManage/active-alarm/index.vue @@ -22,7 +22,7 @@ import { writeSheet } from '@/utils/execl-utils'; import { RESULT_CODE_SUCCESS } from '@/constants/result-constants'; import { readLoalXlsx } from '@/utils/execl-utils'; const { getDict } = useDictStore(); -const { t } = useI18n(); +const { t,currentLocale } = useI18n(); /**字典数据 */ let dict: { @@ -233,65 +233,68 @@ let tableColumns: ColumnsType = [ }, ]; + + + /**帮助文档表格字段列 */ let alarmTableColumns: ColumnsType = [ { title: t('views.faultManage.activeAlarm.alarmTitle'), - dataIndex: '告警名称', + dataIndex: 'alarmName', align: 'center', width: 3, }, { title: t('views.faultManage.activeAlarm.locationInfo'), - dataIndex: '告警定位信息', + dataIndex: 'alarmInfo', align: 'center', width: 5, }, { title: t('views.faultManage.activeAlarm.addInfo'), - dataIndex: '告警帮助信息', + dataIndex:'helpInfo', align: 'center', width: 8, }, { title: t('views.faultManage.activeAlarm.alarmType'), - dataIndex: '告警类型', + dataIndex: 'alarmType', align: 'center', width: 5, }, { title: t('views.faultManage.activeAlarm.origLevel'), - dataIndex: '告警级别', + dataIndex: 'alarmLevel', align: 'center', width: 3, }, { title: t('views.faultManage.activeAlarm.alarmCode'), - dataIndex: '告警编号', + dataIndex: 'alarmCode', align: 'center', width: 3, }, { title: t('views.faultManage.activeAlarm.specificProblem'), - dataIndex: '告警问题原因', + dataIndex: 'cause', align: 'center', width: 5, }, { title: t('views.faultManage.activeAlarm.clearType'), - dataIndex: '清除类型', + dataIndex: 'clearType', align: 'center', width: 3, }, { title: t('views.faultManage.activeAlarm.realTitle'), - dataIndex: '英文标题', + dataIndex: 'enTitle', align: 'center', width: 5, }, { title: t('views.faultManage.activeAlarm.objectNf'), - dataIndex: '适用网元', + dataIndex:'objNf', align: 'center', width: 2, }, @@ -338,6 +341,8 @@ type ModalStateType = { visibleByEdit: boolean; /**显示过滤设置是否显示 */ visibleByShowSet: boolean; + /**告警帮助文档是否显示 */ + helpShowView: boolean; /**个性化设置置是否显示 */ visibleByMyselfSet: boolean; /**标题 */ @@ -355,6 +360,7 @@ let modalState: ModalStateType = reactive({ visibleByView: false, visibleByEdit: false, visibleByShowSet: false, + helpShowView: false, visibleByMyselfSet: false, title: '全部信息', from: { @@ -410,22 +416,17 @@ function fnModalVisibleByVive(row: Record) { modalState.visibleByView = true; } -/**告警帮助文档抽屉 初始设置 */ -const visible = ref(false); -const closeDrawer = () => { - visible.value = false; -}; -/**抽屉 告警帮助文档详细信息 */ + +/** 告警帮助文档详细信息 */ function fnModalVisibleBy(code: string) { - readLoalXlsx(code) + modalState.helpShowView = false; + const lang=currentLocale.value.split('_')[0]; + modalState.title=t('views.faultManage.activeAlarm.helpFile'); + readLoalXlsx(lang,code) .then(res => { - if (!res.length) { - visible.value = false; - } alarmTableState.data = res; - visible.value = true; - + modalState.helpShowView = true; tableState.loading = false; }) .catch(error => console.error(error)); @@ -660,6 +661,7 @@ function fnModalCancel() { modalState.visibleByEdit = false; modalState.visibleByView = false; modalState.visibleByShowSet = false; + modalState.helpShowView=false; } /**查询列表, pageNum初始页数 */ @@ -1004,12 +1006,18 @@ onMounted(() => { + - { :data-source="alarmTableState.data" :size="alarmTableState.size" :pagination="false" - :scroll="{ x: 2000, y: 560 }" + :scroll="{ x: 1700, y: 560 }" > - + { .table :deep(.ant-pagination) { padding: 0 24px; } +.full-modal { + .ant-modal { + max-width: 100%; + top: 0; + padding-bottom: 0; + margin: 0; + } + .ant-modal-content { + display: flex; + flex-direction: column; + height: calc(100vh); + } + .ant-modal-body { + flex: 1; + } +}