From 2a483f4030f756a9c6adc1a7efec074aa2195336 Mon Sep 17 00:00:00 2001 From: mk <2403457699@qq.com> Date: Thu, 2 Nov 2023 14:30:46 +0800 Subject: [PATCH] =?UTF-8?q?=E6=BB=A1=E6=84=8F=E5=BA=A6=E8=B0=83=E6=9F=A5?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2,=E5=B1=85=E6=B0=91=E5=85=9A=E7=BB=84?= =?UTF-8?q?=E7=BB=87=E9=9A=90=E8=97=8F=E9=94=AE=E5=A4=B4,=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E5=B0=8F=E5=8C=BA=E7=BA=A7=E8=81=94=E6=A1=86=E6=9C=80?= =?UTF-8?q?=E5=A4=9A=E9=80=89=E4=B8=AD=E7=BD=91=E6=A0=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/components/resiForm.vue | 20 +- .../modules/base/community/communityForm.vue | 14 +- .../modules/portrayal/jumin/cpts/rightTop.vue | 653 ++++++------ .../satisfaction/communitySelfInsp/index.vue | 2 +- .../satisfactionProvince/formList.vue | 9 +- .../satisfactionProvince/index.vue | 947 ++++++++++-------- 6 files changed, 921 insertions(+), 724 deletions(-) diff --git a/src/views/components/resiForm.vue b/src/views/components/resiForm.vue index 7b6431bf8..9b3b20388 100644 --- a/src/views/components/resiForm.vue +++ b/src/views/components/resiForm.vue @@ -436,7 +436,7 @@ export default { this.handleNextOrgTreeClick(node, resolve) }, checkStrictly: true, - multiple: false + multiple: false, }, activeName: 'groupeduInfoDto', validateFlag: null, @@ -1721,25 +1721,22 @@ export default { }) }, async handleNextOrgTreeClick (node,resolve) { - console.log(node,resolve); await this.getTreeChildenList(node,resolve) }, async getTreeChildenList (node, resolve) { - if (node.data.partyOrgLevel === 7) { - resolve([]); // 直接解决为空数组，不执行请求 + if (node.data.partyOrgLevel === 7 ) { + resolve(null); return; - } + } const url = "/actual/base/party/org/listNextLevelPartyOrgTreeNodesByPid" - console.log('级联', node.value) let params = { partyOrgPid: node.data.id } const { data, code, msg } = await requestGet(url, params) if (code === 0) { data.forEach(item => { - if (item.partyOrgLevel === 7) { - item.children = null; // 或 item.children = []; - } + item.children = null; + item.leaf = item.partyOrgLevel === 7 || item.childrenQty === 0 }); resolve(data) } else { @@ -2943,7 +2940,7 @@ export default { this.newForm.specialSupportDto = this.form.specialSupportDto } - } + }, } } @@ -2986,4 +2983,7 @@ export default { .item-agency { width: 400px; } +::v-deep .no-expand>:nth-child(1) .cell .el-table__expand-icon{ + display: none; +} diff --git a/src/views/modules/base/community/communityForm.vue b/src/views/modules/base/community/communityForm.vue index 64dd16dee..f1a42c3ea 100644 --- a/src/views/modules/base/community/communityForm.vue +++ b/src/views/modules/base/community/communityForm.vue @@ -168,7 +168,9 @@ export default { // label: 'agencyName', // value: 'agencyId', lazy: true, - lazyLoad: this.lazyLoadAgency + lazyLoad:(node, resolve) => { + this.lazyLoadAgency(node, resolve) + }, }, userAgencyId: '', } @@ -182,12 +184,11 @@ export default { }, methods: { - lazyLoadAgency(node, resolve) { - setTimeout(() => { - this.getAgency(node, resolve) - }, 200) + async lazyLoadAgency(node, resolve) { + await this.getAgency(node, resolve) }, async getAgency(node, resolve) { + console.log(node); const url = "/gov/org/agency/dynamicOrgTreeWithDepth" let params = { rootOrgId: node.value ? node.value : '', @@ -206,8 +207,9 @@ export default { label: item.name, level: item.agencyLevel, orgType: item.orgType, - leaf: node.level >= 4 // 5层级 + leaf: item.orgType == 'grid' // 5层级 })) + console.log(nodes); resolve(nodes) } else { this.$message.error(msg) diff --git a/src/views/modules/portrayal/jumin/cpts/rightTop.vue b/src/views/modules/portrayal/jumin/cpts/rightTop.vue index 37706683f..c3f28f963 100644 --- a/src/views/modules/portrayal/jumin/cpts/rightTop.vue +++ b/src/views/modules/portrayal/jumin/cpts/rightTop.vue @@ -1,90 +1,128 @@ \ No newline at end of file diff --git a/src/views/modules/satisfaction/communitySelfInsp/index.vue b/src/views/modules/satisfaction/communitySelfInsp/index.vue index bbb4b9fd0..bc38e6ff6 100644 --- a/src/views/modules/satisfaction/communitySelfInsp/index.vue +++ b/src/views/modules/satisfaction/communitySelfInsp/index.vue @@ -344,7 +344,7 @@ export default { this.option.series[2].data.push(item.badQty) this.option.xAxis.data.push(item.satisfactionCategoryName) this.satisfactionCategory.push(item.satisfactionCategory) - this.score.push({ score: item.score, satisfactionCategoryName: item.satisfactionCategoryName, imgUrl: require(`../../../../assets/img/satisfaction/${item.satisfactionCategory}.png`) }); + this.score.push({ score: item.score, satisfactionCategoryName: item.satisfactionCategoryName, imgUrl: require(`@/assets/img/satisfaction/${item.satisfactionCategory}.png`) }); } }); this.myChart.setOption(this.option); diff --git a/src/views/modules/satisfaction/satisfactionProvince/formList.vue b/src/views/modules/satisfaction/satisfactionProvince/formList.vue index 4cb06e463..a15dc566d 100644 --- a/src/views/modules/satisfaction/satisfactionProvince/formList.vue +++ b/src/views/modules/satisfaction/satisfactionProvince/formList.vue @@ -96,11 +96,9 @@ export default { //创建前 created() { }, async mounted() { - if (this.satisfactionCategoryStr) { - this.formData.scopeId = this.satisfactionCategoryStr + this.formData.scopeId = this.formObj.scopeId this.formData.periodStart = this.formObj.periodStart this.formData.orgCategoryCode = this.formObj.orgCategoryCode - } await this.loadAgency(); await this.getDicts() await this.getTableData() @@ -215,10 +213,7 @@ export default { //计算 computed: {}, props: { - satisfactionCategoryStr: { - type: String, - default: '' - }, + formObj: { type: Object, default: () => {} diff --git a/src/views/modules/satisfaction/satisfactionProvince/index.vue b/src/views/modules/satisfaction/satisfactionProvince/index.vue index 487cea591..d5b45bbeb 100644 --- a/src/views/modules/satisfaction/satisfactionProvince/index.vue +++ b/src/views/modules/satisfaction/satisfactionProvince/index.vue @@ -1,375 +1,528 @@