From f5544c66bd72fa0f9beed16adab00769e3d19b9c Mon Sep 17 00:00:00 2001 From: TsMask <340112800@qq.com> Date: Wed, 6 Mar 2024 19:57:32 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E7=BD=91=E5=85=83=E4=B8=BB=E6=9C=BA?= =?UTF-8?q?=E6=93=8D=E4=BD=9CHooks=E5=8C=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/i18n/locales/en-US.ts | 2 +- src/i18n/locales/zh-CN.ts | 2 +- .../monitor/topologyArchitecture/index.vue | 6 +- .../topologyArchitecture/useNeOptions.ts | 90 ------------------- .../ne/neInfo/{ => hooks}/useNeOptions.ts | 12 ++- src/views/ne/neInfo/index.vue | 87 +++++++++--------- 6 files changed, 55 insertions(+), 144 deletions(-) delete mode 100644 src/views/monitor/topologyArchitecture/useNeOptions.ts rename src/views/ne/neInfo/{ => hooks}/useNeOptions.ts (94%) diff --git a/src/i18n/locales/en-US.ts b/src/i18n/locales/en-US.ts index 6619fcbd..7a2b786f 100644 --- a/src/i18n/locales/en-US.ts +++ b/src/i18n/locales/en-US.ts @@ -364,6 +364,7 @@ export default { totalSure:'Confirm the network element with {operator} network element name {msg}', stop: 'Stop', start: 'Start', + log: 'Logs', export: 'Export', import: 'Import', fileForm:'File Source', @@ -1219,7 +1220,6 @@ export default { serialNum: 'Serial Number', expiryDate: 'Expiry Date', switchLayout: "Switch Layout", - viewLogFile: "Viewing Log Files", noData: "Can't find the corresponding plot data", }, topologyBuild: { diff --git a/src/i18n/locales/zh-CN.ts b/src/i18n/locales/zh-CN.ts index 1921b3fc..8e35524b 100644 --- a/src/i18n/locales/zh-CN.ts +++ b/src/i18n/locales/zh-CN.ts @@ -364,6 +364,7 @@ export default { totalSure:'确认{oper}网元名称为 {msg} 的网元', stop: '停止', start: '启动', + log: '日志', export: '导出', import: '导入', fileForm:'文件来源', @@ -1219,7 +1220,6 @@ export default { serialNum: '序列号', expiryDate: '许可证到期日期', switchLayout: "切换布局", - viewLogFile: "查看日志文件", noData: "找不到对应的图组数据", }, topologyBuild: { diff --git a/src/views/monitor/topologyArchitecture/index.vue b/src/views/monitor/topologyArchitecture/index.vue index 01f36663..89e27c02 100644 --- a/src/views/monitor/topologyArchitecture/index.vue +++ b/src/views/monitor/topologyArchitecture/index.vue @@ -21,7 +21,7 @@ import { nodeImageAnimateState, nodeRectAnimateState, } from '../topologyBuild/hooks/registerNode'; -import useNeOptions from './useNeOptions'; +import useNeOptions from '@/views/ne/neInfo/hooks/useNeOptions'; import useI18n from '@/hooks/useI18n'; import { OptionsType, WS } from '@/plugins/ws-websocket'; const { t } = useI18n(); @@ -97,7 +97,7 @@ const graphNodeMenu = new Menu({ > ${t('views.configManage.neManage.stop')}
- > ${t('views.monitor.topology.viewLogFile')} + > ${t('views.configManage.neManage.log')}
`; @@ -450,7 +450,7 @@ function wsMessage(res: Record) { ); } if (neS && notNeNodes.includes(edgeTarget)) { - graphG6.value.setItemState(edge.id, 'line-dash', neS.neState.online); + graphG6.value.setItemState(edge.id, 'line-dash', neS.neState.online); } if (neT && notNeNodes.includes(edgeSource)) { graphG6.value.setItemState(edge.id, 'line-dash', neT.neState.online); diff --git a/src/views/monitor/topologyArchitecture/useNeOptions.ts b/src/views/monitor/topologyArchitecture/useNeOptions.ts deleted file mode 100644 index 3df03b7c..00000000 --- a/src/views/monitor/topologyArchitecture/useNeOptions.ts +++ /dev/null @@ -1,90 +0,0 @@ -import { restartNf, stopNf } from '@/api/configManage/neManage'; -import { RESULT_CODE_SUCCESS } from '@/constants/result-constants'; -import { Modal, message } from 'ant-design-vue/lib'; -import useI18n from '@/hooks/useI18n'; -import { useRouter } from 'vue-router'; - -export default function useNeOptions() { - const router = useRouter(); - const { t } = useI18n(); - - /** - * 网元重启 - * @param row {neName,neType,neId} - */ - function fnNeRestart(row: Record) { - Modal.confirm({ - title: t('common.tipTitle'), - content: t('views.configManage.neManage.totalSure', { - msg: row.neName, - oper: t('views.configManage.neManage.restart'), - }), - onOk() { - const key = 'restartNf'; - message.loading({ content: t('common.loading'), key }); - restartNf(row).then(res => { - if (res.code === RESULT_CODE_SUCCESS) { - message.success({ - content: t('common.msgSuccess', { - msg: t('views.configManage.neManage.restart'), - }), - key, - duration: 3, - }); - } else { - message.error({ - content: `${res.msg}`, - key: key, - duration: 3, - }); - } - }); - }, - }); - } - - /** - * 网元停止 - * @param row {neName,neType,neId} - */ - function fnNeStop(row: Record) { - Modal.confirm({ - title: t('common.tipTitle'), - content: t('views.configManage.neManage.totalSure', { - msg: row.neName, - oper: t('views.configManage.neManage.stop'), - }), - onOk() { - const key = 'restartNf'; - message.loading({ content: t('common.loading'), key }); - stopNf(row).then(res => { - if (res.code === RESULT_CODE_SUCCESS) { - message.success({ - content: t('common.msgSuccess', { - msg: t('views.configManage.neManage.stop'), - }), - key: key, - duration: 3, - }); - } else { - message.error({ - content: `${res.msg}`, - key: key, - duration: 3, - }); - } - }); - }, - }); - } - - /** - * 跳转网元日志文件页面 - * @param row {neType,neId} - */ - function fnNeLogFile(row: Record) { - router.push(`/logManage/neFile?neType=${row.neType}&neId=${row.neId}`); - } - - return { fnNeRestart, fnNeStop, fnNeLogFile }; -} diff --git a/src/views/ne/neInfo/useNeOptions.ts b/src/views/ne/neInfo/hooks/useNeOptions.ts similarity index 94% rename from src/views/ne/neInfo/useNeOptions.ts rename to src/views/ne/neInfo/hooks/useNeOptions.ts index b89468d8..1c94f627 100644 --- a/src/views/ne/neInfo/useNeOptions.ts +++ b/src/views/ne/neInfo/hooks/useNeOptions.ts @@ -13,7 +13,7 @@ export default function useNeOptions() { * 网元启动 * @param row {neName,neType,neId} */ - function fnRecordStart(row: Record) { + function fnNeStart(row: Record) { Modal.confirm({ title: t('common.tipTitle'), content: t('views.configManage.neManage.totalSure', { @@ -154,8 +154,14 @@ export default function useNeOptions() { * @param row {neType,neId} */ function fnNeLogFile(row: Record) { - router.push(`/logManage/neFile?neType=${row.neType}&neId=${row.neId}`); + router.push({ + name: 'NeFile_2123', + query: { + neType: row.neType, + neId: row.neId, + }, + }); } - return { fnNeRestart, fnNeStop, fnNeLogFile }; + return { fnNeStart, fnNeRestart, fnNeStop, fnNeReload, fnNeLogFile }; } diff --git a/src/views/ne/neInfo/index.vue b/src/views/ne/neInfo/index.vue index cca347c5..ad6b950a 100644 --- a/src/views/ne/neInfo/index.vue +++ b/src/views/ne/neInfo/index.vue @@ -12,8 +12,11 @@ import useNeInfoStore from '@/store/modules/neinfo'; import { listNeInfo, delNeInfo } from '@/api/ne/neInfo'; import { NE_TYPE_LIST } from '@/constants/ne-constants'; import useDictStore from '@/store/modules/dict'; +import useNeOptions from './hooks/useNeOptions'; const { getDict } = useDictStore(); const { t } = useI18n(); +const { fnNeStart, fnNeRestart, fnNeStop, fnNeReload, fnNeLogFile } = + useNeOptions(); /**字典数据 */ let dict: { @@ -271,29 +274,28 @@ function fnRecordDelete(id: string) { * 记录多项选择 */ function fnRecordMore(type: string | number, row: Record) { - if (type === 'delete') { - // fnRecordDelete(row); - return; - } - - if (type === 'export') { - // fnRecordExport(row); - } - - if (type === 'start') { - // fnRecordStart(row); - } - - if (type === 'restart') { - // fnRecordRestart(row); - } - - if (type === 'stop') { - // fnRecordStop(row); - } - - if (type === 'reload') { - // fnNeReload(row); + switch (type) { + case 'delete': + fnRecordDelete(row.id); + break; + case 'start': + fnNeStart(row); + break; + case 'restart': + fnNeRestart(row); + break; + case 'stop': + fnNeStop(row); + break; + case 'reload': + fnNeReload(row); + break; + case 'log': + fnNeLogFile(row); + break; + default: + console.warn(type); + break; } } @@ -538,17 +540,6 @@ onMounted(() => { - - - - - -