From ecd2fac0e92228a46a4616191bab24e53e4aa03a Mon Sep 17 00:00:00 2001 From: mk <2403457699@qq.com> Date: Thu, 1 Aug 2024 10:23:00 +0800 Subject: [PATCH 1/5] 1 --- src/views/modules/base/diyInfo.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/modules/base/diyInfo.vue b/src/views/modules/base/diyInfo.vue index 34cce9089..bf5992052 100644 --- a/src/views/modules/base/diyInfo.vue +++ b/src/views/modules/base/diyInfo.vue @@ -336,7 +336,7 @@ export default { } } if(this.virtualResi){ - params.gridType = 'virtual' + params.searchForm.gridType = 'virtual' } await this.$http({ method: 'POST', From 493d1a3cd6a8faab11a1be78fa0d1ddd9f762170 Mon Sep 17 00:00:00 2001 From: mk <2403457699@qq.com> Date: Thu, 1 Aug 2024 15:20:05 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E9=94=99=E5=88=AB=E5=AD=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/modules/base/smartImport/cpts/executeTask.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/modules/base/smartImport/cpts/executeTask.vue b/src/views/modules/base/smartImport/cpts/executeTask.vue index fb8629611..9c6237ca9 100644 --- a/src/views/modules/base/smartImport/cpts/executeTask.vue +++ b/src/views/modules/base/smartImport/cpts/executeTask.vue @@ -30,7 +30,7 @@ > 操作说明 -

1、导入数据多大，系统需要一定事件处理。

+

1、导入数据过大，系统需要一定事件处理。

2、导入过程中可查看导入明细，如果发现导入数据问题较多，可以取消本次导入，重新整理数据后，重新创建任务导入。

From fb71b3b33fcea4188cb1ce155e3005a0af9c61a3 Mon Sep 17 00:00:00 2001 From: mk <2403457699@qq.com> Date: Thu, 1 Aug 2024 15:54:29 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E5=AD=97=E6=AE=B5=E5=90=8D=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/modules/base/smartImport/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/modules/base/smartImport/index.vue b/src/views/modules/base/smartImport/index.vue index fb69c30a5..0f16f2647 100644 --- a/src/views/modules/base/smartImport/index.vue +++ b/src/views/modules/base/smartImport/index.vue @@ -56,7 +56,7 @@ - + From f661f1c7cb92018fa66b4414abe465e2b6308d36 Mon Sep 17 00:00:00 2001 From: mk <2403457699@qq.com> Date: Thu, 1 Aug 2024 17:11:17 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E5=A4=84=E7=90=86=E5=B1=85=E6=B0=91?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E6=A0=91=E5=BD=A2=E7=BB=93=E6=9E=84=E5=88=B0?= =?UTF-8?q?=E5=B1=85=E6=B0=91=E6=90=9C=E7=B4=A2=E7=9A=84=E5=85=A8=E5=B1=80?= =?UTF-8?q?=E4=BA=8B=E4=BB=B6=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/components/resiSearch.vue | 11 ++++--- src/views/modules/base/resi.vue | 45 +++++++++++++++++++++++++++-- 2 files changed, 49 insertions(+), 7 deletions(-) diff --git a/src/views/components/resiSearch.vue b/src/views/components/resiSearch.vue index 9c9887eb7..5a9aa1396 100644 --- a/src/views/components/resiSearch.vue +++ b/src/views/components/resiSearch.vue @@ -931,17 +931,20 @@ export default { if (this.columnName) this.handleChangeForm(this.columnName) }, mounted(){ - this.$EventBus.$on('handleClickResiTree', (val) => { + this.$EventBus.$on('handleClickResiTree', async (val) => { if(val.type === 'agency'){ this.form.agencyId = val.id; this.optionsV = []; - this.getValiheList(); + this.form.villageId = ''; + this.form.buildId = ''; + await this.getValiheList(); }else if(val.type === 'neighborHood'){ this.form.villageId = val.id; - this.handleChangeV(val.id) + await this.handleChangeV(val.id) + this.form.buildId = ''; }else if(val.type === 'building'){ this.form.buildId = val.id; - this.handleChangeB(val.id) + await this.handleChangeB(val.id) } }) }, diff --git a/src/views/modules/base/resi.vue b/src/views/modules/base/resi.vue index f24cff36a..da46c37f8 100644 --- a/src/views/modules/base/resi.vue +++ b/src/views/modules/base/resi.vue @@ -1300,13 +1300,52 @@ export default { if (!value) return true; return data.label.indexOf(value) !== -1; }, - async handleNodeClick(obj) { + extractData(node) { + const result = []; + let currentNode = node; + while (currentNode) { + result.push({ id: currentNode.data.id, level: currentNode.data.level }); + currentNode = currentNode.parent; + } + return result; + }, + + traverseTree(tree) { + const results = []; + tree.forEach(node => { + results.push(...this.extractData(node)); + if (node.children && node.children.length > 0) { + results.push(...this.traverseTree(node.children)); + } + }); + return results; + }, + async handleNodeClick(obj,node) { this.selObj = JSON.parse(JSON.stringify(obj)); this.selTreeObj = obj; await nextTick(1000); - this.$nextTick(()=>{ + this.$nextTick(async ()=>{ if(obj.level === "building" || obj.level === "neighborHood"){ - this.$EventBus.$emit('handleClickResiTree',{type:obj.level,id:obj.id}) + const gridNode = this.traverseTree([node]); + const gridResult = gridNode.find(item => item.level === 'grid'); + const neighborHoodResult = gridNode.find(item => item.level === "neighborHood"); + const buildingResult = gridNode.find(item => item.level === "building"); + + const gridId = gridResult ? gridResult.id : null; + const neighborHoodId = neighborHoodResult ? neighborHoodResult.id : null; + const buildingId = buildingResult ? buildingResult.id : null; + if (gridId) { + await this.$EventBus.$emit('handleClickResiTree', { type: 'agency', id: gridId }); + } + await nextTick(500); + if (neighborHoodId) { + await this.$EventBus.$emit('handleClickResiTree', { type: 'neighborHood', id: neighborHoodId }); + } + await nextTick(500); + if (buildingId) { + await this.$EventBus.$emit('handleClickResiTree', { type: 'building', id: buildingId }); + } + }else{ this.$EventBus.$emit('handleClickResiTree',{type:'agency',id:obj.id}) } From 33940957e32b075be062ee072fe2574c7e18638f Mon Sep 17 00:00:00 2001 From: mk <2403457699@qq.com> Date: Thu, 1 Aug 2024 17:24:04 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E8=A7=92=E8=89=B2=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E8=BF=9B=E5=85=A5=E9=BB=98=E8=AE=A4=E8=A7=92=E8=89=B2=E5=90=8E?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E8=A1=A8=E5=8D=95=E8=A2=AB=E9=99=90=E5=88=B6?= =?UTF-8?q?=E8=BE=93=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/modules/workSys/role/roleForm.vue | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/views/modules/workSys/role/roleForm.vue b/src/views/modules/workSys/role/roleForm.vue index bb2cd048c..49054d99d 100644 --- a/src/views/modules/workSys/role/roleForm.vue +++ b/src/views/modules/workSys/role/roleForm.vue @@ -136,8 +136,9 @@ export default { this.formData.id = roleId this.defaultRole = defaultRole this.loadFormData() + }else{ + this.defaultRole = '0' } - this.endLoading()