From b1233917a4acb5252ae2ab26267e6cd0ee0bc81a Mon Sep 17 00:00:00 2001 From: zhangyu Date: Wed, 2 Aug 2023 15:27:50 +0800 Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=20=E5=A4=84=E7=90=86=E5=AF=BC?= =?UTF-8?q?=E5=85=A5=E6=97=B6=20=E5=9B=A0=E4=B8=BAimageId=20=E5=AF=BC?= =?UTF-8?q?=E8=87=B4=E5=9B=BE=E7=89=87=E4=B8=8D=E6=98=BE=E7=A4=BA=E7=9A=84?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/components/common/popBox/topToolMoreOptions.vue | 6 +++++- .../components/common/project/meta2d/js/meta2dMainCalc.js | 3 +++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/nezha-fronted/src/components/common/popBox/topToolMoreOptions.vue b/nezha-fronted/src/components/common/popBox/topToolMoreOptions.vue index 058ff7656..d03e25cc6 100644 --- a/nezha-fronted/src/components/common/popBox/topToolMoreOptions.vue +++ b/nezha-fronted/src/components/common/popBox/topToolMoreOptions.vue @@ -465,6 +465,10 @@ export default { return } try { + fileString.topo.pens.forEach(item => { + item.imageId = '' + }) + console.log(fileString) this.$post(this.importUrl, fileString).then(response => { if (response.code == 200 && response.msg == 'success') { this.$message.success(this.$t('overall.result.success')) @@ -477,7 +481,7 @@ export default { reader = null }) } catch (e) { - this.$message.error(this.$t('IMPORT_FORMAT_ERROR',{ 0: '' })) + this.$message.error(this.$t('IMPORT_FORMAT_ERROR', { 0: '' })) } } } else { diff --git a/nezha-fronted/src/components/common/project/meta2d/js/meta2dMainCalc.js b/nezha-fronted/src/components/common/project/meta2d/js/meta2dMainCalc.js index 63dbfc2f5..db451ace2 100644 --- a/nezha-fronted/src/components/common/project/meta2d/js/meta2dMainCalc.js +++ b/nezha-fronted/src/components/common/project/meta2d/js/meta2dMainCalc.js @@ -584,6 +584,9 @@ export default { this.$get('stat/module/abnormal', { moduleId: item.moduleId }).then(res => { if (res.code == 200) { const module = res.data.list[0] + if (!module) { + return + } item.moduleData.state.error = item.moduleData.error = !module.state item.moduleData.state.asset = !!module.asset item.moduleData.state.alert = !!module.alert