From c6747682d893387d07a0ff85fd0ab3f800874ba7 Mon Sep 17 00:00:00 2001 From: mk <2403457699@qq.com> Date: Mon, 13 Nov 2023 09:07:04 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E7=A4=BE=E5=8C=BA=E8=87=AA=E6=9F=A5?= =?UTF-8?q?=E7=BB=BC=E5=90=88=E5=BE=97=E5=88=86=E5=A6=82=E6=9E=9C=E4=B8=BA?= =?UTF-8?q?0=E6=98=BE=E7=A4=BA--?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/modules/satisfaction/communitySelfInsp/index.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/modules/satisfaction/communitySelfInsp/index.vue b/src/views/modules/satisfaction/communitySelfInsp/index.vue index ec64e1511..d9f6eac72 100644 --- a/src/views/modules/satisfaction/communitySelfInsp/index.vue +++ b/src/views/modules/satisfaction/communitySelfInsp/index.vue @@ -36,8 +36,8 @@
- - {{synthesisScoreBtLastMonth}} + + {{synthesisScoreBtLastMonth || '--'}}
较上月
From 5c6300cb4a7dff81c325e9ba2b592a568b582c66 Mon Sep 17 00:00:00 2001 From: mk <2403457699@qq.com> Date: Tue, 14 Nov 2023 14:48:47 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E7=A4=BE=E5=8C=BA=E8=87=AA=E6=9F=A5?= =?UTF-8?q?=E5=8F=96=E7=BB=9D=E5=AF=B9=E5=80=BC=EF=BC=8C=E6=A0=87=E7=AD=BE?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../communityService/labelConfig/addForm.vue | 65 +- .../satisfaction/communitySelfInsp/index.vue | 1427 ++++++++++++----- 2 files changed, 1041 insertions(+), 451 deletions(-) diff --git a/src/views/modules/communityService/labelConfig/addForm.vue b/src/views/modules/communityService/labelConfig/addForm.vue index c4e7beb0f..ce2e2bdb9 100644 --- a/src/views/modules/communityService/labelConfig/addForm.vue +++ b/src/views/modules/communityService/labelConfig/addForm.vue @@ -39,7 +39,6 @@ @@ -59,7 +58,6 @@ @@ -77,7 +75,6 @@ @@ -187,7 +189,8 @@ @@ -180,12 +246,15 @@ import axios from "axios"; import * as echarts from "echarts"; import formList from "./formList"; +import areaSameList from "./areaSameList"; +import areaNoSameList from "./areaNoSameList"; +import mobileList from "./mobileList"; import util from "@js/util.js"; import followDetail from "./followDetail"; import eventInfo from "../shequzhili/event/cpts/event-info"; export default { - components: {formList, followDetail,eventInfo}, + components: {formList, followDetail,eventInfo,areaSameList,mobileList,areaNoSameList}, data() { return { @@ -222,6 +291,9 @@ export default { showFormList: false, showFormDetail: false, + showAreaSameEventList: false, + showMobileEventList: false, + showAreaNoSameEventList: false, recId: "", departId:"", @@ -230,6 +302,9 @@ export default { eventDetailData: {}, pageType: "info", + mergeObj: {}, + mergeArr: ['address'], + categoryChartOption: { @@ -618,13 +693,15 @@ export default { } }, handelClickChart(params) { + this.hiddenAllDialog(); this.showFormList = true; - this.departId =''; + this.cleanSearchForm(); this.recId = params.data.id; }, handelClickDepartChart(params) { + this.hiddenAllDialog(); this.showFormList = true; - this.recId =''; + this.cleanSearchForm(); this.departId = params.data.id; }, handleClose() { @@ -642,20 +719,21 @@ export default { } else { this.eventDetailData = { ...data }; this.pageType = "info"; + this.showFormList = true; this.showFormDetail = true; } }, handleClose() { - this.showFormDetail = false; + this.hiddenAllDialog(); this.pageType = "list"; - this.eventId = ""; + this.cleanSearchForm(); this.getTableData(); }, handleOk() { - this.showFormDetail = false; + this.hiddenAllDialog(); this.pageType = "list"; - this.eventId = ""; + this.cleanSearchForm(); this.pageNo = 1; this.getTableData(); }, @@ -809,6 +887,9 @@ export default { }) : []; + // 合并行 + this.getSpanArr(this.addressMobileData); + if (this.report && this.report.categoryCount && Object.keys(this.report.categoryCount).length > 0) { this.categoryCountShow = true; } @@ -827,8 +908,92 @@ export default { }, clickAddressData(row, column){ - console.log("============clickAddressData============"); - console.log(row); + this.hiddenAllDialog(); + this.showFormList = true; + this.recId = row.categoryId; + this.address = row.address; + }, + + handelMoreAddressData(){ + this.hiddenAllDialog(); + this.cleanSearchForm(); + this.showAreaSameEventList = true; + }, + handelMoreMobileData(){ + this.hiddenAllDialog(); + this.cleanSearchForm(); + this.showMobileEventList = true; + }, + handelMoreAddressMobileData(){ + this.hiddenAllDialog(); + this.cleanSearchForm(); + this.showAreaNoSameEventList = true; + }, + + clickMobileData(row, column){ + this.hiddenAllDialog(); + this.showFormList = true; + this.cleanSearchForm(); + this.mobile = row.mobile; + }, + + clickAddressMobileData(row, column){ + this.hiddenAllDialog(); + this.showFormList = true; + this.cleanSearchForm(); + this.address = row.address; + }, + + cleanSearchForm(){ + this.departId =''; + this.eventId = ""; + this.recId =''; + this.address =''; + this.mobile =''; + }, + + hiddenAllDialog(){ + this.showFormList = false; + this.showFormDetail = false; + this.showAreaSameEventList = false; + this.showMobileEventList = false; + this.showAreaNoSameEventList = false; + }, + + getSpanArr(data) { + this.mergeArr.forEach((key, index1) => { + let count = 0; // 用来记录需要合并行的起始位置 + this.mergeObj[key] = []; // 记录每一列的合并信息 + data.forEach((item, index) => { + // index == 0表示数据为第一行，直接 push 一个 1 + if(index === 0) { + this.mergeObj[key].push(1); + } else { + // 判断当前行是否与上一行其值相等 如果相等 在 count 记录的位置其值 +1 表示当前行需要合并 并push 一个 0 作为占位 + if(item[key] === data[index - 1][key]) { + this.mergeObj[key][count] += 1; + this.mergeObj[key].push(0); + } else { + // 如果当前行和上一行其值不相等 + count = index; // 记录当前位置 + this.mergeObj[key].push(1); // 重新push 一个 1 + } + } + }) + }) + }, + // 默认接受四个值 { 当前行的值, 当前列的值, 行的下标, 列的下标 } + objectSpanMethod({ row, column, rowIndex, columnIndex }) { + // 判断列的属性 + if(this.mergeArr.indexOf(column.property) !== -1) { + // 判断其值是不是为0 + if(this.mergeObj[column.property][rowIndex]) { + return [this.mergeObj[column.property][rowIndex], 1] + } else { + // 如果为0则为需要合并的行 + return [0, 0]; + } + } } }, diff --git a/src/views/modules/goverhotline/mobileList.vue b/src/views/modules/goverhotline/mobileList.vue new file mode 100644 index 000000000..c0347a7f0 --- /dev/null +++ b/src/views/modules/goverhotline/mobileList.vue @@ -0,0 +1,90 @@ + + + From b90a6c36511df48e1651a7a70cb148bab816c0bf Mon Sep 17 00:00:00 2001 From: mk <2403457699@qq.com> Date: Wed, 15 Nov 2023 14:59:46 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E7=A4=BE=E5=8C=BA=E8=87=AA=E6=9F=A5?= =?UTF-8?q?=E8=A1=97=E9=81=93=E7=89=88=E5=AE=8C=E6=88=90,=E6=A0=87?= =?UTF-8?q?=E7=AD=BE=E6=9C=80=E7=BB=88=E7=89=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../communityService/labelConfig/addForm.vue | 136 +++--- .../communitySelfInsp/communityDialog.vue | 417 ++++++++++++++++++ .../communitySelfInsp/formList.vue | 5 + .../satisfaction/communitySelfInsp/index.vue | 108 ++++- 4 files changed, 577 insertions(+), 89 deletions(-) create mode 100644 src/views/modules/satisfaction/communitySelfInsp/communityDialog.vue diff --git a/src/views/modules/communityService/labelConfig/addForm.vue b/src/views/modules/communityService/labelConfig/addForm.vue index ce2e2bdb9..c9a13a1b1 100644 --- a/src/views/modules/communityService/labelConfig/addForm.vue +++ b/src/views/modules/communityService/labelConfig/addForm.vue @@ -7,12 +7,8 @@ class="div_form" :rules="rules" > - - + + - （您可以按关键词查找使用已有标签，也可以新建标签） + （您可以按关键词查找使用已有标签，也可以 + 新建标签 ） -

* 设置标签查询条件

+

+ * 设置标签查询条件 +