From d301fb217719995799a17d6dc42b38f94dc15c39 Mon Sep 17 00:00:00 2001 From: fengyuan_yang <1976974459@qq.com> Date: Fri, 18 Apr 2025 17:00:19 +0800 Subject: [PATCH 1/2] =?UTF-8?q?2025-04-18=20=E5=8F=8A=E6=97=B6=E9=80=9A?= =?UTF-8?q?=E7=9F=A5=20-=20=E8=A1=A8=EF=BC=9AmesTypeDesc=20=E5=BE=AA?= =?UTF-8?q?=E7=8E=AF=E6=97=B6=E9=95=BF=EF=BC=9Aeam=5Fobject=E8=A1=A8?= =?UTF-8?q?=E7=9A=84Cycle=5Ftime=5Fsend=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/eam/com_eam_object_add_update.vue | 52 ++++++++++++------- src/views/modules/eam/eam_device_list.vue | 22 ++++++-- 2 files changed, 52 insertions(+), 22 deletions(-) diff --git a/src/views/modules/eam/com_eam_object_add_update.vue b/src/views/modules/eam/com_eam_object_add_update.vue index 2e754ee..2efad46 100644 --- a/src/views/modules/eam/com_eam_object_add_update.vue +++ b/src/views/modules/eam/com_eam_object_add_update.vue @@ -3,7 +3,7 @@ - + - + + + + + + + @@ -65,34 +71,38 @@ - - - - - + + + + + + - + - + - - - - - + + + + + - + + + + - + - + @@ -165,7 +175,10 @@ export default { standardMaintenanceDuration: '', timeOutMaintenanceDuration: '', standardResponseDuration: '', - timeOutResponseDuration: '' + timeOutResponseDuration: '', + cycleTimeSend: undefined, + mesType: '', + mesTypeList: [] }, dataListLoading: false, rules:{ @@ -295,6 +308,7 @@ export default { this.$message.warning("所属部门不能为空!"); return false } + this.pageData.mesType = this.pageData.mesTypeList.join(',') // 判断是否是新增标签自定义 if (this.pageData.addFlag === 'Y') { this.insertEamObjectData() @@ -348,7 +362,7 @@ export default { // 关闭modal closeDialog () { // 刷新报工的页面 - this.$emit('refreshPageTables') + // this.$emit('refreshPageTables') // 关闭当前的页面 this.visible = false }, diff --git a/src/views/modules/eam/eam_device_list.vue b/src/views/modules/eam/eam_device_list.vue index 798bfd4..297183f 100644 --- a/src/views/modules/eam/eam_device_list.vue +++ b/src/views/modules/eam/eam_device_list.vue @@ -68,6 +68,7 @@ highlight-current-row @row-click="setCurrentRow" @current-change="changeCurrentRow" + v-loading="searchLoading" border style="width: 100%;"> { if (data && data.code === 0) { this.dataList = data.page.list @@ -3530,7 +3533,12 @@ //设置选中行 this.$refs.eamObjectTable.setCurrentRow(this.dataList[0]) } + this.searchLoading = false + } else { + this.searchLoading = false } + }).catch(() => { + this.searchLoading = false }) }, @@ -3711,7 +3719,10 @@ standardMaintenanceDuration: '', timeOutMaintenanceDuration: '', standardResponseDuration: '', - timeOutResponseDuration: '' + timeOutResponseDuration: '', + cycleTimeSend: undefined, + mesType: '', + mesTypeList: [] } //打开组件 去做新增业务 this.$nextTick(() => { @@ -3736,8 +3747,13 @@ }, updateEamObjectModal (row) { - let currentData = row - currentData.addFlag = 'N' + let currentData = { + ...row, + addFlag: 'N', + mesType: row.mesType, + mesTypeList: row.mesType == null || row.mesType === '' ? [] : row.mesType.split(','), + cycleTimeSend: row.cycleTimeSend == null || row.cycleTimeSend === '' ? undefined : row.cycleTimeSend, + } //打开组件 去做新增业务 this.$nextTick(() => { this.$refs.comAddUpdateEamObject.init(currentData) From fee34fffdbcd08870a6f9ec22e198b460ebe1cb1 Mon Sep 17 00:00:00 2001 From: fengyuan_yang <1976974459@qq.com> Date: Fri, 18 Apr 2025 17:17:00 +0800 Subject: [PATCH 2/2] =?UTF-8?q?2025-04-18=20=E5=8F=8A=E6=97=B6=E9=80=9A?= =?UTF-8?q?=E7=9F=A5=20-=20=E8=A1=A8=EF=BC=9AmesTypeDesc=20=E5=BE=AA?= =?UTF-8?q?=E7=8E=AF=E6=97=B6=E9=95=BF=EF=BC=9Aeam=5Fobject=E8=A1=A8?= =?UTF-8?q?=E7=9A=84Cycle=5Ftime=5Fsend=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/modules/eam/com_eam_object_add_update.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/modules/eam/com_eam_object_add_update.vue b/src/views/modules/eam/com_eam_object_add_update.vue index 2efad46..5babc28 100644 --- a/src/views/modules/eam/com_eam_object_add_update.vue +++ b/src/views/modules/eam/com_eam_object_add_update.vue @@ -119,7 +119,7 @@ 保存 - 关闭 + 关闭 @@ -362,7 +362,7 @@ export default { // 关闭modal closeDialog () { // 刷新报工的页面 - // this.$emit('refreshPageTables') + this.$emit('refreshPageTables') // 关闭当前的页面 this.visible = false },