From 2b1b7c55d57a7a39e5055b74644a4be4bf01de3e Mon Sep 17 00:00:00 2001 From: jiangyy Date: Wed, 13 Jan 2021 15:25:22 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E8=AE=A2=E9=98=85=E6=B6=88=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/customer/init/RegisterList.vue | 12 ++++++++--- .../views/modules/customer/init/TempList.vue | 21 ++++++++++--------- 2 files changed, 20 insertions(+), 13 deletions(-) diff --git a/epmet-oper-web/src/views/modules/customer/init/RegisterList.vue b/epmet-oper-web/src/views/modules/customer/init/RegisterList.vue index 77cb23d..9ec138c 100644 --- a/epmet-oper-web/src/views/modules/customer/init/RegisterList.vue +++ b/epmet-oper-web/src/views/modules/customer/init/RegisterList.vue @@ -281,7 +281,6 @@ export default { selCustomerId: '', diaSubVisible: false, activeName: 'resi', - dataListLoading: false, resiDataList: [], workDataList: [], @@ -425,6 +424,7 @@ export default { this.workDataList = [] this.$nextTick(() => { this.selCustomerId = row.customerId + this.loadSubscribeData() }) @@ -433,7 +433,10 @@ export default { //加载列表数据 async loadSubscribeData () { - this.dataListLoading = true + this.$refs.temp_list_resi_has.setTableLoading() + this.$refs.temp_list_resi_no.setTableLoading() + this.$refs.temp_list_work_has.setTableLoading() + this.$refs.temp_list_work_no.setTableLoading() // const url = 'https://nei.netease.com/api/apimock-v2/e3b1d0eb88e905f6c7ee559b2d6bb7ad/third/subscribe/getcustomerlist' const url = 'https://epmet-cloud.elinkservice.cn/api/third/subscribe/getcustomerlist' let params = { @@ -479,7 +482,10 @@ export default { } else { this.$message.error(msg + "：" + internalMsg) } - this.dataListLoading = false + this.$refs.temp_list_resi_has.setTableLoading() + this.$refs.temp_list_resi_no.setTableLoading() + this.$refs.temp_list_work_has.setTableLoading() + this.$refs.temp_list_work_no.setTableLoading() }, // 订阅消息窗口取消 diff --git a/epmet-oper-web/src/views/modules/customer/init/TempList.vue b/epmet-oper-web/src/views/modules/customer/init/TempList.vue index 1c3c21b..0e75ceb 100644 --- a/epmet-oper-web/src/views/modules/customer/init/TempList.vue +++ b/epmet-oper-web/src/views/modules/customer/init/TempList.vue @@ -8,7 +8,7 @@ @click="tableType==='sync'?delSubSure():syncSubSure()">{{btnName}} { - this.$refs.table.doLayout() // 解决表格错位 - }) + }, mounted () { @@ -88,12 +86,15 @@ export default { this.selList = val }, - getSelTemplIdList () { - let selTempIdList = [] + setTableLoading () { + this.tableLoading = !this.tableLoading + }, + getSelIdList () { + let selIdList = [] this.selList.forEach(element => { - selTempIdList.push(element.tmplId) + selIdList.push(element.id) }) - return selTempIdList + return selIdList }, getSelPersonalIdList () { let personalIdList = [] @@ -117,7 +118,7 @@ export default { cancelButtonText: '取消', type: 'warning' }).then(() => { - let selList = this.getSelTemplIdList() + let selList = this.getSelIdList() if (selList.length === 0) { this.$message.info("请选择要同步的模板") } else { From 1b678d00449e75666fee0ec6ae63e3cf226ad7ef Mon Sep 17 00:00:00 2001 From: jiangyy Date: Mon, 18 Jan 2021 17:25:28 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BB=A3=E5=B0=8F=E7=A8=8B=E5=BA=8F?= =?UTF-8?q?=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/customer/init/RegisterList.vue | 2 +- .../customer/miniProAgent/MiniProList.vue | 107 +++++++++--------- 2 files changed, 55 insertions(+), 54 deletions(-) diff --git a/epmet-oper-web/src/views/modules/customer/init/RegisterList.vue b/epmet-oper-web/src/views/modules/customer/init/RegisterList.vue index 9ec138c..c914509 100644 --- a/epmet-oper-web/src/views/modules/customer/init/RegisterList.vue +++ b/epmet-oper-web/src/views/modules/customer/init/RegisterList.vue @@ -510,7 +510,7 @@ export default { } } -