From 15ebd48283ae6e2054cd580a38ba3c6c073fd3a5 Mon Sep 17 00:00:00 2001 From: TsMask <340112800@qq.com> Date: Wed, 26 Feb 2025 17:25:17 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20id=E7=B1=BB=E5=9E=8B=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/ne/neInfo/components/BackConfModal.vue | 2 +- src/views/ne/neLicense/components/EditModal.vue | 8 ++++---- src/views/ne/neLicense/index.vue | 8 ++++---- src/views/ne/neSoftware/components/EditModal.vue | 8 ++++---- .../ne/neSoftware/components/UploadMoreFile.vue | 2 +- src/views/ne/neSoftware/index.vue | 16 ++++++---------- 6 files changed, 20 insertions(+), 24 deletions(-) diff --git a/src/views/ne/neInfo/components/BackConfModal.vue b/src/views/ne/neInfo/components/BackConfModal.vue index 6aeb661c..5e4760b4 100644 --- a/src/views/ne/neInfo/components/BackConfModal.vue +++ b/src/views/ne/neInfo/components/BackConfModal.vue @@ -351,7 +351,7 @@ defineExpose({ showRemoveIcon: true, showDownloadIcon: false, }" - :remove="fnBeforeRemoveFile" + @remove="fnBeforeRemoveFile" :before-upload="fnBeforeUploadFile" :custom-request="fnUploadFile" :disabled="modalState.confirmLoading" diff --git a/src/views/ne/neLicense/components/EditModal.vue b/src/views/ne/neLicense/components/EditModal.vue index d4181459..c1e8af42 100644 --- a/src/views/ne/neLicense/components/EditModal.vue +++ b/src/views/ne/neLicense/components/EditModal.vue @@ -25,8 +25,8 @@ const props = defineProps({ }, /**记录ID 优先级高于neId */ editId: { - type: String, - default: '', + type: Number, + default: 0, }, /**网元ID */ neId: { @@ -219,7 +219,7 @@ function fnDownCode() { * 对话框弹出显示为 ID编辑 * @param id id */ -function fnModalVisibleById(id: string) { +function fnModalVisibleById(id: number) { const hide = message.loading(t('common.loading'), 0); getNeLicense(id) .then(res => { @@ -269,7 +269,7 @@ watch( () => props.open, val => { if (val) { - if (props.editId) { + if (props.editId > 0) { fnModalVisibleById(props.editId); } if (props.neType && props.neId) { diff --git a/src/views/ne/neLicense/index.vue b/src/views/ne/neLicense/index.vue index 068341bf..1208e889 100644 --- a/src/views/ne/neLicense/index.vue +++ b/src/views/ne/neLicense/index.vue @@ -211,7 +211,7 @@ type ModalStateType = { /**新增框或修改框是否显示 */ openByEdit: boolean; /**授权记录ID */ - licenseId: string; + licenseId: number; /**确定按钮 loading */ confirmLoading: boolean; }; @@ -219,7 +219,7 @@ type ModalStateType = { /**对话框对象信息状态 */ let modalState: ModalStateType = reactive({ openByEdit: false, - licenseId: '', + licenseId: 0, confirmLoading: false, }); @@ -227,7 +227,7 @@ let modalState: ModalStateType = reactive({ * 对话框弹出显示为 新增或者修改 * @param licenseId id */ -function fnModalVisibleByEdit(licenseId: string) { +function fnModalVisibleByEdit(licenseId: number) { modalState.licenseId = licenseId; modalState.openByEdit = true; } @@ -247,7 +247,7 @@ function fnModalOk() { */ function fnModalCancel() { modalState.openByEdit = false; - modalState.licenseId = ''; + modalState.licenseId = 0; } /**刷新网元授权状态 */ diff --git a/src/views/ne/neSoftware/components/EditModal.vue b/src/views/ne/neSoftware/components/EditModal.vue index 86de38dc..e5b0da62 100644 --- a/src/views/ne/neSoftware/components/EditModal.vue +++ b/src/views/ne/neSoftware/components/EditModal.vue @@ -21,8 +21,8 @@ const props = defineProps({ default: false, }, editId: { - type: String, - default: '', + type: Number, + default: 0, }, }); @@ -309,8 +309,8 @@ function fnUploadFileDep(up: UploadRequestOption) { * 对话框弹出显示为 新增或者修改 * @param id id */ -function fnModalVisibleByEdit(id?: string) { - if (id) { +function fnModalVisibleByEdit(id: number) { + if (id > 0) { const hide = message.loading(t('common.loading'), 0); getNeSoftware(id) .then(res => { diff --git a/src/views/ne/neSoftware/components/UploadMoreFile.vue b/src/views/ne/neSoftware/components/UploadMoreFile.vue index 61bbad45..35bd99ec 100644 --- a/src/views/ne/neSoftware/components/UploadMoreFile.vue +++ b/src/views/ne/neSoftware/components/UploadMoreFile.vue @@ -485,7 +485,7 @@ onMounted(() => {}); showRemoveIcon: true, showDownloadIcon: false, }" - :remove="fnBeforeRemoveFile" + @remove="fnBeforeRemoveFile" :before-upload="fnBeforeUploadFile" :custom-request="fnUploadFile" :disabled="modalState.confirmLoading" diff --git a/src/views/ne/neSoftware/index.vue b/src/views/ne/neSoftware/index.vue index bfefb2d3..6c3ee20a 100644 --- a/src/views/ne/neSoftware/index.vue +++ b/src/views/ne/neSoftware/index.vue @@ -216,7 +216,7 @@ type ModalStateType = { /**新增框或修改框是否显示 */ openByEdit: boolean; /**新增框或修改框ID */ - editId: string; + editId: number; /**多文件上传 */ openByMoreFile: boolean; /**确定按钮 loading */ @@ -226,7 +226,7 @@ type ModalStateType = { /**对话框对象信息状态 */ let modalState: ModalStateType = reactive({ openByEdit: false, - editId: '', + editId: 0, openByMoreFile: false, confirmLoading: false, }); @@ -235,12 +235,8 @@ let modalState: ModalStateType = reactive({ * 对话框弹出显示为 新增或者修改 * @param noticeId 网元id, 不传为新增 */ -function fnModalVisibleByEdit(id?: string) { - if (!id) { - modalState.editId = ''; - } else { - modalState.editId = id; - } +function fnModalVisibleByEdit(id: number) { + modalState.editId = id; modalState.openByEdit = !modalState.openByEdit; } @@ -257,7 +253,7 @@ function fnModalEditOk() { * 进行表达规则校验 */ function fnModalEditCancel() { - modalState.editId = ''; + modalState.editId = 0; modalState.openByEdit = false; modalState.openByMoreFile = false; } @@ -422,7 +418,7 @@ onMounted(() => {