From 74b55423d590d2b52e0d26dfb8ad243f342359aa Mon Sep 17 00:00:00 2001 From: TsMask <340112800@qq.com> Date: Wed, 15 Jan 2025 21:07:17 +0800 Subject: [PATCH 1/6] =?UTF-8?q?style:=20=E7=A7=BB=E9=99=A4l=E9=83=A8?= =?UTF-8?q?=E5=88=86=E6=97=A0=E7=94=A8=E7=9A=84log=E8=BE=93=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/faultManage/faultSetting.ts | 21 ++++++++++++------- src/views/configManage/neOverview/index.vue | 2 +- .../ne-data/base-station/components/list.vue | 1 - src/views/perfManage/customTarget/index.vue | 1 - src/views/traceManage/pcap/index.vue | 2 +- 5 files changed, 16 insertions(+), 11 deletions(-) diff --git a/src/api/faultManage/faultSetting.ts b/src/api/faultManage/faultSetting.ts index 4b2d1c3e..ce619808 100644 --- a/src/api/faultManage/faultSetting.ts +++ b/src/api/faultManage/faultSetting.ts @@ -63,7 +63,11 @@ export async function getAlarmSet() { } } if (Object.keys(resultData).length === 0) { - return { code: RESULT_CODE_ERROR, msg: RESULT_MSG_ERROR[language], data: {} }; + return { + code: RESULT_CODE_ERROR, + msg: RESULT_MSG_ERROR[language], + data: {}, + }; } return { code: RESULT_CODE_SUCCESS, @@ -117,7 +121,11 @@ export async function updateAlarmSet(data: Record) { } // 无变更时 if (resultNum === 0) { - return { code: RESULT_CODE_ERROR, msg: RESULT_MSG_ERROR[language], data: 0 }; + return { + code: RESULT_CODE_ERROR, + msg: RESULT_MSG_ERROR[language], + data: 0, + }; } return { code: RESULT_CODE_SUCCESS, @@ -166,11 +174,10 @@ export async function getForwardSet() { */ export async function updateForwardSet(data: Record) { // return false; - console.log(data) - let obj:any=[ - {interface:"Email",to_user:data.emailObj}, - {interface:"SMS",to_user:data.smsObj} - ] + let obj: any = [ + { interface: 'Email', to_user: data.emailObj }, + { interface: 'SMS', to_user: data.smsObj }, + ]; const result = await request({ url: `/api/rest/databaseManagement/v1/omc_db/config?WHERE=config_tag='forwardAlarm'`, method: 'put', diff --git a/src/views/configManage/neOverview/index.vue b/src/views/configManage/neOverview/index.vue index fc372d86..b25b934a 100644 --- a/src/views/configManage/neOverview/index.vue +++ b/src/views/configManage/neOverview/index.vue @@ -129,7 +129,7 @@ async function fnGetList(reload: boolean = false) { const res = await listAllNeInfo({ bandStatus: true }); tableState.data = res.data; } catch (error) { - console.log(error); + console.error(error); tableState.data = []; } tableState.loading = false; diff --git a/src/views/ne-data/base-station/components/list.vue b/src/views/ne-data/base-station/components/list.vue index 0d9cad63..89ba53ca 100644 --- a/src/views/ne-data/base-station/components/list.vue +++ b/src/views/ne-data/base-station/components/list.vue @@ -125,7 +125,6 @@ let tableColumns = ref([ width: 150, customRender(opt) { const record = opt.value; - console.log(opt); if (record.state === 'OFF') { return record.offTime || '-'; } diff --git a/src/views/perfManage/customTarget/index.vue b/src/views/perfManage/customTarget/index.vue index 3a627644..655b7490 100644 --- a/src/views/perfManage/customTarget/index.vue +++ b/src/views/perfManage/customTarget/index.vue @@ -438,7 +438,6 @@ function fnModalCancel() { * 选择性能指标,填充进当前计算公式的值 */ function fnSelectPer(s: any, option: any) { - console.log(option); modalState.from.expression += `'${option.label}'`; } diff --git a/src/views/traceManage/pcap/index.vue b/src/views/traceManage/pcap/index.vue index 6db41213..e65fb318 100644 --- a/src/views/traceManage/pcap/index.vue +++ b/src/views/traceManage/pcap/index.vue @@ -532,7 +532,7 @@ function fnModalVisibleByVive(id: string | number) { /**对话框tab查看 */ function fnViveTab(action: any) { - console.log('fnViveTab', action); + // console.log('fnViveTab', action); if (modalState.viewFrom.action === action) return; modalState.viewFrom.action = action; modalState.viewFrom.content = ''; From a20d5ee99f2dc796ca2f3554e005dea2460b4443 Mon Sep 17 00:00:00 2001 From: TsMask <340112800@qq.com> Date: Wed, 15 Jan 2025 21:07:44 +0800 Subject: [PATCH 2/6] =?UTF-8?q?fix:=20=E7=BD=91=E5=85=83=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=B1=80=E9=83=A8=E6=9B=B4=E6=96=B0=E7=8A=B6?= =?UTF-8?q?=E6=80=81=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/ne/neInfo/index.vue | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/views/ne/neInfo/index.vue b/src/views/ne/neInfo/index.vue index 6ec7e61d..c24e2aa0 100644 --- a/src/views/ne/neInfo/index.vue +++ b/src/views/ne/neInfo/index.vue @@ -237,8 +237,13 @@ function fnModalEditOk(from: Record) { item.neName = from.neName; item.ip = from.ip; item.port = from.port; - if (item.status !== '2') { - item.status = res.data.online ? '1' : '0'; + if (res.data.online) { + item.status = '1'; + if (res.data.standby) { + item.status = '3'; + } + } else { + item.status = '0'; } Object.assign(item.serverState, res.data); const resouresUsage = parseResouresUsage(item.serverState); From b2d818fc30db24a47d420f26f9fa29ecb7f8b801 Mon Sep 17 00:00:00 2001 From: TsMask <340112800@qq.com> Date: Wed, 15 Jan 2025 21:08:22 +0800 Subject: [PATCH 3/6] =?UTF-8?q?style:=20=E4=BE=9D=E8=B5=96=E5=BA=93?= =?UTF-8?q?=E6=97=A0=E7=B1=BB=E5=9E=8B=E5=A3=B0=E6=98=8E=E5=AE=9A=E4=B9=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/typings/vite-env.d.ts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/typings/vite-env.d.ts b/src/typings/vite-env.d.ts index 5e910109..efc1d57f 100644 --- a/src/typings/vite-env.d.ts +++ b/src/typings/vite-env.d.ts @@ -7,8 +7,10 @@ declare module '*.vue' { export default component; } +// "vue3-smooth-dnd": "^0.0.6" declare module 'vue3-smooth-dnd'; +// "intl-tel-input": "^25.2.0" declare module 'intl-tel-input/intlTelInputWithUtils' { import intlTelInput from 'intl-tel-input'; export default intlTelInput; From 8586d7f1ce9e505d0a262bad3dd4e24473fd0e90 Mon Sep 17 00:00:00 2001 From: TsMask <340112800@qq.com> Date: Thu, 16 Jan 2025 14:27:51 +0800 Subject: [PATCH 4/6] =?UTF-8?q?fix:=20=E5=9F=BA=E7=AB=99=E7=8A=B6=E6=80=81?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E7=BC=96=E8=BE=91=E5=88=A4=E6=96=AD=E9=94=99?= =?UTF-8?q?=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/ne-data/base-station/components/list.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/ne-data/base-station/components/list.vue b/src/views/ne-data/base-station/components/list.vue index 89ba53ca..6ba05a67 100644 --- a/src/views/ne-data/base-station/components/list.vue +++ b/src/views/ne-data/base-station/components/list.vue @@ -343,7 +343,7 @@ function fnModalOk() { .then(e => { modalState.confirmLoading = true; const hide = message.loading(t('common.loading'), 0); - let result: any = modalState.title.startsWith('Edit') + let result: any = from.state ? editAMFNbState(neID, from) : addAMFNbState(neID, from); result From fa44f6abe06d068d0b353fc6b7452b03196ef82b Mon Sep 17 00:00:00 2001 From: TsMask <340112800@qq.com> Date: Thu, 16 Jan 2025 20:50:50 +0800 Subject: [PATCH 5/6] =?UTF-8?q?fix:=20=E5=9F=BA=E7=AB=99=E7=8A=B6=E6=80=81?= =?UTF-8?q?=E5=88=97=E5=AE=BD=E6=8B=96=E5=8A=A8=EF=BC=8C=E7=8A=B6=E6=80=81?= =?UTF-8?q?=E7=BB=93=E6=9E=9C=E7=BB=9F=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ne-data/base-station/components/list.vue | 59 ++++++++++++++++--- 1 file changed, 50 insertions(+), 9 deletions(-) diff --git a/src/views/ne-data/base-station/components/list.vue b/src/views/ne-data/base-station/components/list.vue index 6ba05a67..b7b130e3 100644 --- a/src/views/ne-data/base-station/components/list.vue +++ b/src/views/ne-data/base-station/components/list.vue @@ -1,5 +1,5 @@