From 7edcf1703eab144b978e5f9de70bdf513f6a0b2d Mon Sep 17 00:00:00 2001 From: TsMask <340112800@qq.com> Date: Thu, 14 Dec 2023 11:01:19 +0800 Subject: [PATCH 1/3] =?UTF-8?q?fix:=20=E9=9D=99=E6=80=81=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E5=9C=B0=E5=9D=80=E8=BF=BD=E5=8A=A0=E9=9A=8F=E6=9C=BA=E6=88=B3?= =?UTF-8?q?=E9=81=BF=E5=85=8D=E7=BC=93=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/plugins/file-static-url.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/plugins/file-static-url.ts b/src/plugins/file-static-url.ts index 7a434865..f0d1e275 100644 --- a/src/plugins/file-static-url.ts +++ b/src/plugins/file-static-url.ts @@ -17,5 +17,5 @@ export function parseUrlPath(path: string) { const baseUrl = import.meta.env.PROD ? sessionGet('baseUrl') || import.meta.env.VITE_API_BASE_URL : import.meta.env.VITE_API_BASE_URL; - return `${baseUrl}${path}`; + return `${baseUrl}${path}?r=${Math.random().toFixed(2)}`; } From e90bc539e9d7e3150d6f1be3e6b59b74f2837343 Mon Sep 17 00:00:00 2001 From: TsMask <340112800@qq.com> Date: Thu, 14 Dec 2023 11:01:57 +0800 Subject: [PATCH 2/3] =?UTF-8?q?fix:=20udm=E7=AD=BE=E7=BA=A6=E7=94=A8?= =?UTF-8?q?=E6=88=B7=E6=96=B0=E5=A2=9E=E5=BF=85=E5=A1=ABmsisdn?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/neUser/sub/index.vue | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/views/neUser/sub/index.vue b/src/views/neUser/sub/index.vue index 4ad30ee4..b42802ae 100644 --- a/src/views/neUser/sub/index.vue +++ b/src/views/neUser/sub/index.vue @@ -454,6 +454,7 @@ const modalStateFrom = Form.useForm( modalState.from, reactive({ imsi: [{ required: true, message: 'IMSI' + t('common.unableNull') }], + msisdn: [{ required: true, message: 'MSISDN' + t('common.unableNull') }], staticIp: [ { required: true, message: 'static ip' + t('common.unableNull') }, ], @@ -473,7 +474,7 @@ const modalStateFrom = Form.useForm( function fnModalOk() { const from = Object.assign({}, toRaw(modalState.from)); - let validateNames = ['imsi', 'staticIp']; + let validateNames = ['imsi', 'msisdn', 'staticIp']; if (from.id === '') { validateNames.push('smData'); @@ -573,7 +574,7 @@ function fnBatchModalOk() { modalState.confirmLoading = true; let ardArr = [0, 0, 0, 0, 0, 0, 0, 0]; let hplmnArr = [0, 0, 0, 0, 0, 0, 0, 0]; - let odbArr = [0, 0, 0, 0, 0, 0, 0, 0,0]; + let odbArr = [0, 0, 0, 0, 0, 0, 0, 0, 0]; from.ard.forEach((item: any) => { ardArr[item] = 1; From d56c293ef51a32935ea9850a2a055692a5211ccd Mon Sep 17 00:00:00 2001 From: TsMask <340112800@qq.com> Date: Thu, 14 Dec 2023 11:11:02 +0800 Subject: [PATCH 3/3] =?UTF-8?q?fix:=20MML=E5=BF=85=E5=A1=AB=E5=88=9D?= =?UTF-8?q?=E5=A7=8B=E5=80=BC=E7=9A=84=E8=AE=BE=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/mmlManage/neOperate/index.vue | 31 +++++++++++++++++++++--- src/views/mmlManage/omcOperate/index.vue | 31 +++++++++++++++++++++--- src/views/mmlManage/udmOperate/index.vue | 31 +++++++++++++++++++++--- 3 files changed, 81 insertions(+), 12 deletions(-) diff --git a/src/views/mmlManage/neOperate/index.vue b/src/views/mmlManage/neOperate/index.vue index 31e12693..231b770b 100644 --- a/src/views/mmlManage/neOperate/index.vue +++ b/src/views/mmlManage/neOperate/index.vue @@ -64,6 +64,22 @@ let state: StateType = reactive({ function fnTreeSelect(_: any, info: any) { state.mmlSelect = info.node.dataRef; state.from = {}; + // 遍历判断是否有初始value + if (Array.isArray(state.mmlSelect.param)) { + for (const param of state.mmlSelect.param) { + if (typeof param.value !== 'undefined' && param.value != '') { + const valueType = param.type; + if (['enum', 'int'].includes(valueType)) { + state.from[param.name] = Number(param.value); + } else if (valueType === 'bool') { + state.from[param.name] = Boolean(param.value); + } else { + state.from[param.name] = param.value; + } + } + } + } + state.autoCompleteValue = `${state.mmlSelect.operation} ${state.mmlSelect.object}`.trim(); // state.mmlCmdLog = ''; @@ -569,7 +585,7 @@ onMounted(() => { { + - diff --git a/src/views/mmlManage/omcOperate/index.vue b/src/views/mmlManage/omcOperate/index.vue index 3c80fd45..1697d956 100644 --- a/src/views/mmlManage/omcOperate/index.vue +++ b/src/views/mmlManage/omcOperate/index.vue @@ -60,6 +60,22 @@ let state: StateType = reactive({ function fnTreeSelect(_: any, info: any) { state.mmlSelect = info.node.dataRef; state.from = {}; + // 遍历判断是否有初始value + if (Array.isArray(state.mmlSelect.param)) { + for (const param of state.mmlSelect.param) { + if (typeof param.value !== 'undefined' && param.value != '') { + const valueType = param.type; + if (['enum', 'int'].includes(valueType)) { + state.from[param.name] = Number(param.value); + } else if (valueType === 'bool') { + state.from[param.name] = Boolean(param.value); + } else { + state.from[param.name] = param.value; + } + } + } + } + state.autoCompleteValue = `${state.mmlSelect.operation} ${state.mmlSelect.object}`.trim(); // state.mmlCmdLog = ''; @@ -537,7 +553,7 @@ onMounted(() => { { + - diff --git a/src/views/mmlManage/udmOperate/index.vue b/src/views/mmlManage/udmOperate/index.vue index c29726c8..8e40e194 100644 --- a/src/views/mmlManage/udmOperate/index.vue +++ b/src/views/mmlManage/udmOperate/index.vue @@ -60,6 +60,22 @@ let state: StateType = reactive({ function fnTreeSelect(_: any, info: any) { state.mmlSelect = info.node.dataRef; state.from = {}; + // 遍历判断是否有初始value + if (Array.isArray(state.mmlSelect.param)) { + for (const param of state.mmlSelect.param) { + if (typeof param.value !== 'undefined' && param.value != '') { + const valueType = param.type; + if (['enum', 'int'].includes(valueType)) { + state.from[param.name] = Number(param.value); + } else if (valueType === 'bool') { + state.from[param.name] = Boolean(param.value); + } else { + state.from[param.name] = param.value; + } + } + } + } + state.autoCompleteValue = `${state.mmlSelect.operation} ${state.mmlSelect.object}`.trim(); // state.mmlCmdLog = ''; @@ -542,7 +558,7 @@ onMounted(() => { { + -