From 6859e6c626a101c71eb33cfb52d707b7e057fe16 Mon Sep 17 00:00:00 2001
From: mk <2403457699@qq.com>
Date: Wed, 1 Nov 2023 14:02:37 +0800
Subject: [PATCH 1/9] =?UTF-8?q?=E8=81=94=E5=BB=BA=E5=8D=95=E4=BD=8D?=
 =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E4=BA=8B=E9=A1=B9=E6=AD=A3=E5=88=99=E9=AA=8C?=
 =?UTF-8?q?=E8=AF=81=EF=BC=8C=E6=95=B0=E6=8D=AE=E7=9C=8B=E6=9D=BF=E5=B1=85?=
 =?UTF-8?q?=E6=B0=91=E5=88=86=E7=B1=BB=E7=BB=9F=E8=AE=A1=E4=BD=BF=E7=94=A8?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=E7=AB=AF=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/dataBoard/renfang/index.vue         | 42 ++++++++-----------
 src/views/modules/base/resi.vue               |  1 -
 src/views/modules/base/virtualResi.vue        |  1 -
 .../regionalParty/unitsForm.vue               |  3 ++
 .../portrayal/loudong/cpts/buildingTable.vue  | 28 -------------
 .../modules/portrayal/loudong/cpts/house.vue  | 28 -------------
 .../modules/portrayal/loudong/cpts/unit.vue   | 28 -------------
 7 files changed, 21 insertions(+), 110 deletions(-)
 delete mode 100644 src/views/modules/portrayal/loudong/cpts/buildingTable.vue
 delete mode 100644 src/views/modules/portrayal/loudong/cpts/house.vue
 delete mode 100644 src/views/modules/portrayal/loudong/cpts/unit.vue

diff --git a/src/views/dataBoard/renfang/index.vue b/src/views/dataBoard/renfang/index.vue
index 0664e1ee3..d1704d40a 100644
--- a/src/views/dataBoard/renfang/index.vue
+++ b/src/views/dataBoard/renfang/index.vue
@@ -722,31 +722,25 @@ export default {
 
     //居民分类分析数据
     async getResiCategoryData() {
-      const url = "resident_class_statics";
-
-      const { data, code, msg } = await requestPostBi(
-        url,
-        {
-          queryParam: {
-            org_id: this.orgId,
-          },
-        },
-        {
-          // mockId: 60031937,
-        }
-      );
-
+      const url = "/actual/base/resiCategory/categoryCountList";
+      let params = {
+        // id: this.orgData.id,
+        // level: "agency",
+      };
+      const { data, code, msg } = await requestGet(url, params);
       if (code === 0) {
-        this.resiCategoryData = data.map((item) => {
-          return {
-            code: item.label_id,
-            name: item.label,
-            count: item.count,
-            ratio: item.ratio,
-            growth: item.growth,
-            growthAbs: Math.abs(item.growth),
-          };
-        });
+        if (data) {
+          this.resiCategoryData = data.categoryList.map((item) => {
+            return {
+              code: item.categoryName,
+              name: resiCategoryMap[item.categoryName] || "",
+              count: item.categoryCount,
+              ratio: ((100 * item.categoryCount) / data.resiCount).toFixed(0),
+              growth: 0,
+              growthAbs: Math.abs(item.growth),
+            };
+          });
+        }
       } else {
         this.$message.error(msg);
       }
diff --git a/src/views/modules/base/resi.vue b/src/views/modules/base/resi.vue
index 7d2b4a14c..d7c7b756e 100644
--- a/src/views/modules/base/resi.vue
+++ b/src/views/modules/base/resi.vue
@@ -1092,7 +1092,6 @@ export default {
         },
 
         async getTableData(obj) {
-            console.log(this.currentPage);
             let params = {
                 pageNo: this.currentPage,
                 pageSize: this.pageSize,
diff --git a/src/views/modules/base/virtualResi.vue b/src/views/modules/base/virtualResi.vue
index f44180e0c..240c1fdee 100644
--- a/src/views/modules/base/virtualResi.vue
+++ b/src/views/modules/base/virtualResi.vue
@@ -1083,7 +1083,6 @@ export default {
         },
 
         async getTableData(obj) {
-            console.log(this.currentPage);
             let params = {
                 pageNo: this.currentPage,
                 pageSize: this.pageSize,
diff --git a/src/views/modules/communityParty/regionalParty/unitsForm.vue b/src/views/modules/communityParty/regionalParty/unitsForm.vue
index 0f0b06f59..7f76ce9ce 100644
--- a/src/views/modules/communityParty/regionalParty/unitsForm.vue
+++ b/src/views/modules/communityParty/regionalParty/unitsForm.vue
@@ -480,6 +480,9 @@ export default {
         longitude: [
           { required: true, message: "坐标不能为空", trigger: "blur" },
         ],
+        serviceMatterList:[
+          { required: true, message: "服务事项不能为空", trigger: "blur" },
+        ]
       };
     },
   },
diff --git a/src/views/modules/portrayal/loudong/cpts/buildingTable.vue b/src/views/modules/portrayal/loudong/cpts/buildingTable.vue
deleted file mode 100644
index af3a15433..000000000
--- a/src/views/modules/portrayal/loudong/cpts/buildingTable.vue
+++ /dev/null
@@ -1,28 +0,0 @@
-<template>
-    <div class=''>
-        
-    </div>
-</template>
-
-<script>
-export default {
-    //数据
-    data() {
-        return {};
-    },
-    //创建前
-    created() { },
-    //方法
-    methods: {},
-    //子组件注册
-    components: {},
-    //计算
-    computed: {},
-    //监听
-    watch: {},
-}
-</script>
-
-<style lang="scss" scoped>
-    
-</style>
diff --git a/src/views/modules/portrayal/loudong/cpts/house.vue b/src/views/modules/portrayal/loudong/cpts/house.vue
deleted file mode 100644
index af3a15433..000000000
--- a/src/views/modules/portrayal/loudong/cpts/house.vue
+++ /dev/null
@@ -1,28 +0,0 @@
-<template>
-    <div class=''>
-        
-    </div>
-</template>
-
-<script>
-export default {
-    //数据
-    data() {
-        return {};
-    },
-    //创建前
-    created() { },
-    //方法
-    methods: {},
-    //子组件注册
-    components: {},
-    //计算
-    computed: {},
-    //监听
-    watch: {},
-}
-</script>
-
-<style lang="scss" scoped>
-    
-</style>
diff --git a/src/views/modules/portrayal/loudong/cpts/unit.vue b/src/views/modules/portrayal/loudong/cpts/unit.vue
deleted file mode 100644
index af3a15433..000000000
--- a/src/views/modules/portrayal/loudong/cpts/unit.vue
+++ /dev/null
@@ -1,28 +0,0 @@
-<template>
-    <div class=''>
-        
-    </div>
-</template>
-
-<script>
-export default {
-    //数据
-    data() {
-        return {};
-    },
-    //创建前
-    created() { },
-    //方法
-    methods: {},
-    //子组件注册
-    components: {},
-    //计算
-    computed: {},
-    //监听
-    watch: {},
-}
-</script>
-
-<style lang="scss" scoped>
-    
-</style>

From b486351d81b0bac1408eaf7f4103bd6a5e66b333 Mon Sep 17 00:00:00 2001
From: duanliangtao <dlt0099>
Date: Wed, 1 Nov 2023 15:45:23 +0800
Subject: [PATCH 2/9] =?UTF-8?q?=E5=B1=85=E6=B0=91=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=A5=BC=E9=95=BF=E3=80=81=E5=8D=95=E5=85=83?=
 =?UTF-8?q?=E9=95=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/components/resiForm.vue | 19 +++++++++++++------
 src/views/modules/base/resi.vue   | 15 +++++++++++++++
 2 files changed, 28 insertions(+), 6 deletions(-)

diff --git a/src/views/components/resiForm.vue b/src/views/components/resiForm.vue
index 59d554eb2..7b6431bf8 100644
--- a/src/views/components/resiForm.vue
+++ b/src/views/components/resiForm.vue
@@ -552,8 +552,9 @@ export default {
             { label: '残疾', value: '0', formName: "disabilityFlag" },
             { label: '大病', value: '0', formName: "seriousIllnessFlag" },
             { label: '慢病', value: '0', formName: "chronicDiseaseFlag" },
-            { label: '公益岗人员', value: '0', formName: "publicWelfareFlag" }
-
+            { label: '公益岗人员', value: '0', formName: "publicWelfareFlag" },
+            { label: '楼长', value: '0', formName: "buildingChiefFlag" },
+            { label: '单元长', value: '0', formName: "unitChiefFlag" }
           ]
         }
       ],
@@ -1398,6 +1399,8 @@ export default {
         disabilityFlag: '0',//是否残疾
         seriousIllnessFlag: '0', //大病
         chronicDiseaseFlag: '0', //慢病
+        buildingChiefFlag: '0', //楼长
+        unitChiefFlag: '0', //单元长
 
         eduInfoDto: { // 教育信息
           cultureLevel: '',
@@ -2312,7 +2315,8 @@ export default {
         this.form.floatingFlag = data.categoryInfo.floatingFlag.toString()
         this.form.liveAloneFlag = data.categoryInfo.liveAloneFlag.toString()
         this.form.publicWelfareFlag = data.categoryInfo.publicWelfareFlag.toString()
-        this.form.publicWelfareFlag = data.categoryInfo.publicWelfareFlag.toString()
+        this.form.buildingChiefFlag = data.categoryInfo.buildingChiefFlag.toString()
+        this.form.unitChiefFlag = data.categoryInfo.unitChiefFlag.toString()
 
         if (this.form.partyFlag == '1') this.tabsList.push({ label: '党员', id: '0', groupId: 'parymemberInfoDto' })
         if (this.form.ensureHouseFlag == '1') this.tabsList.push({ label: '保障房信息', id: '1', groupId: 'ensureHouseDto' })
@@ -2331,7 +2335,7 @@ export default {
         villageId, birthday, gender, idType, idNum, localResidenceFlag, mobile, name, nation, nationality, remark,
         partyFlag, subsistenceAllowanceFlag, ensureHouseFlag, unemployedFlag, fertileWomanFlag, veteranFlag, unitedFrontFlag,
         petitionOfficerFlag, volunteerFlag, oldPeopleFlag, emptyNesterFlag, specialSupportFlag, disabledFlag,
-        dementedFlag, disabilityFlag, seriousIllnessFlag, chronicDiseaseFlag, specialCrowdFlag, tenantFlag, floatingFlag, liveAloneFlag, publicWelfareFlag } = this.form
+        dementedFlag, disabilityFlag, seriousIllnessFlag, chronicDiseaseFlag, specialCrowdFlag, tenantFlag, floatingFlag, liveAloneFlag, publicWelfareFlag,buildingChiefFlag, unitChiefFlag} = this.form
       this.newForm = {
         categoryId,
         resiId,
@@ -2375,7 +2379,8 @@ export default {
         floatingFlag,
         liveAloneFlag,
         publicWelfareFlag,
-
+        buildingChiefFlag,
+        unitChiefFlag,
       }
     },
     // 教育信息详情
@@ -2863,7 +2868,9 @@ export default {
         this.newForm.disabilityFlag = this.form.disabilityFlag,
         this.newForm.seriousIllnessFlag = this.form.seriousIllnessFlag,
         this.newForm.chronicDiseaseFlag = this.form.chronicDiseaseFlag,
-        this.newForm.publicWelfareFlag = this.form.publicWelfareFlag
+        this.newForm.publicWelfareFlag = this.form.publicWelfareFlag,
+        this.newForm.buildingChiefFlag = this.form.buildingChiefFlag,
+        this.newForm.unitChiefFlag = this.form.unitChiefFlag
 
       if (this.newForm.eduInfoDto) {
         this.newForm.eduInfoDto = this.form.eduInfoDto
diff --git a/src/views/modules/base/resi.vue b/src/views/modules/base/resi.vue
index 7d2b4a14c..c8ce8c334 100644
--- a/src/views/modules/base/resi.vue
+++ b/src/views/modules/base/resi.vue
@@ -210,6 +210,16 @@
                                         ? "志愿者 "
                                         : ""
                                     }}
+                                    {{
+                                        scope.row.categoryInfo.buildingChiefFlag == 1
+                                        ? "楼长 "
+                                        : ""
+                                    }}
+                                    {{
+                                        scope.row.categoryInfo.unitChiefFlag == 1
+                                        ? "单元长 "
+                                        : ""
+                                    }}
                                 </div>
                             </template>
                         </div>
@@ -975,6 +985,11 @@ export default {
             _baseForm.disabledFlag = parseInt(_baseForm.disabledFlag); //失能老人
             _baseForm.dementedFlag = parseInt(_baseForm.dementedFlag); //失智老人
             _baseForm.disabilityFlag = parseInt(_baseForm.disabilityFlag); //是否残疾
+
+            _baseForm.buildingChiefFlag = parseInt(_baseForm.buildingChiefFlag); //是否楼长
+            _baseForm.unitChiefFlag = parseInt(_baseForm.unitChiefFlag); //是否单元长
+
+
             _baseForm.seriousIllnessFlag = parseInt(
                 _baseForm.seriousIllnessFlag
             ); //大病

From 2adbd7030d5d965b15065e9d0bbb72c3a5c024e9 Mon Sep 17 00:00:00 2001
From: luyan <xgktv007@163.com>
Date: Wed, 1 Nov 2023 18:00:57 +0800
Subject: [PATCH 3/9] =?UTF-8?q?=E7=A7=BB=E9=99=A412345=E5=8C=97=E5=B0=9A?=
 =?UTF-8?q?=E8=AF=89=E5=8A=9E=E7=B1=BB=E5=9E=8B=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/shequzhili/event/eventList.vue | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/views/modules/shequzhili/event/eventList.vue b/src/views/modules/shequzhili/event/eventList.vue
index 79d333d2f..b6deb8152 100644
--- a/src/views/modules/shequzhili/event/eventList.vue
+++ b/src/views/modules/shequzhili/event/eventList.vue
@@ -309,10 +309,6 @@ export default {
                 {
                     value: "3",
                     label: "12345",
-                },
-                {
-                    value: "5",
-                    label: "北尚诉办",
                 }
             ],
 

From 76cd4cdcefd19ed4eb3da8ccd4aaf5e03b106c90 Mon Sep 17 00:00:00 2001
From: duanliangtao <dlt0099>
Date: Thu, 2 Nov 2023 10:27:13 +0800
Subject: [PATCH 4/9] =?UTF-8?q?=E4=BA=8B=E4=BB=B6=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E4=B8=AD=E5=85=AC=E4=BC=97=E5=8F=B7=E4=B8=8A=E4=BC=A0=E7=9A=84?=
 =?UTF-8?q?=E4=BA=8B=E4=BB=B6=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../shequzhili/eventOld/cpts/event-detail.vue        |  2 +-
 .../modules/shequzhili/eventOld/cpts/event-info.vue  | 12 ++++++------
 .../eventOld/cpts/process-form-replay-end.vue        |  2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/views/modules/shequzhili/eventOld/cpts/event-detail.vue b/src/views/modules/shequzhili/eventOld/cpts/event-detail.vue
index e79d6c436..7f4d5ae63 100644
--- a/src/views/modules/shequzhili/eventOld/cpts/event-detail.vue
+++ b/src/views/modules/shequzhili/eventOld/cpts/event-detail.vue
@@ -446,7 +446,7 @@ export default {
           satisfyLevel = "perfect";
         }
       }
-      const url = "/governance/icEvent/comment";
+      const url = "/governance/icEventOld/comment";
 
       let params = {
         icEventId: this.eventId,
diff --git a/src/views/modules/shequzhili/eventOld/cpts/event-info.vue b/src/views/modules/shequzhili/eventOld/cpts/event-info.vue
index 3ad7a4c57..de16dfb1f 100644
--- a/src/views/modules/shequzhili/eventOld/cpts/event-info.vue
+++ b/src/views/modules/shequzhili/eventOld/cpts/event-info.vue
@@ -414,7 +414,7 @@ export default {
 
     //加载组织数据
     async getProjectProcess() {
-      const url = "/governance/icEvent/process";
+      const url = "/governance/icEventOld/process";
       // const url = "http://yapi.elinkservice.cn/mock/245/gov/project/icEvent/process";
 
       const { data, code, msg } = await requestPost(url, {
@@ -549,7 +549,7 @@ export default {
         (this.formData.operationType == 0 && this.eventInfoData.content) ||
         this.formData.operationType == 4
       ) {
-        const url = "/governance/icEvent/add";
+        const url = "/governance/icEventOld/add";
         const { formData } = this;
         const { data, code, msg } = await requestPost(url, {
           ...formData,
@@ -582,7 +582,7 @@ export default {
           this.replayInfo.icEventId = this.eventId;
           console.log("replayInfo", this.replayInfo);
           //回复属性赋值
-          let url = "/governance/icEvent/reply";
+          let url = "/governance/icEventOld/reply";
           await this.submitDispose(url, this.replayInfo);
         } else if (this.formData.operationType === "1") {
           this.replayInfo = {};
@@ -591,7 +591,7 @@ export default {
           //项目的属性同事件一样
           this.project.icEventId = this.eventId;
           console.log("projectInfo", this.project);
-          let url = "/governance/icEvent/icEventToProject";
+          let url = "/governance/icEventOld/icEventToProject";
           await this.submitDispose(url, this.project);
         } else if (this.formData.operationType === "2") {
           this.replayInfo = {};
@@ -600,7 +600,7 @@ export default {
           //需求的属性同事件一样
           this.demand.icEventId = this.eventId;
           console.log("demond", this.demand);
-          let url = "/governance/icEvent/icEventToDemand";
+          let url = "/governance/icEventOld/icEventToDemand";
           await this.submitDispose(url, this.demand);
         } else if (this.formData.operationType === "3") {
           this.replayInfo = {};
@@ -610,7 +610,7 @@ export default {
           //项目的属性同事件一样
 
           console.log("issueInfo", this.issueInfo);
-          let url = "/governance/icEvent/icEventToIssue";
+          let url = "/governance/icEventOld/icEventToIssue";
           await this.submitDispose(url, this.issueInfo);
         } else {
           this.$message.info("请选择一种处理方式");
diff --git a/src/views/modules/shequzhili/eventOld/cpts/process-form-replay-end.vue b/src/views/modules/shequzhili/eventOld/cpts/process-form-replay-end.vue
index 9cad30838..8f9fa93fa 100644
--- a/src/views/modules/shequzhili/eventOld/cpts/process-form-replay-end.vue
+++ b/src/views/modules/shequzhili/eventOld/cpts/process-form-replay-end.vue
@@ -115,7 +115,7 @@ export default {
 
     methods: {
         async getCategoryList() {
-            const url = '/governance/icEvent/getCategoryTree';
+            const url = '/governance/icEventOld/getCategoryTree';
             let params = {};
             const { data, code, msg } = await requestPost(url, params);
             if (code === 0) {

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 5/9] =?UTF-8?q?=E6=BB=A1=E6=84=8F=E5=BA=A6=E8=B0=83?=
 =?UTF-8?q?=E6=9F=A5=E9=A1=B5=E9=9D=A2,=E5=B1=85=E6=B0=91=E5=85=9A?=
 =?UTF-8?q?=E7=BB=84=E7=BB=87=E9=9A=90=E8=97=8F=E9=94=AE=E5=A4=B4,?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=B0=8F=E5=8C=BA=E7=BA=A7=E8=81=94=E6=A1=86?=
 =?UTF-8?q?=E6=9C=80=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
       }
-    }
+    },
   }
 }
 </script>
@@ -2986,4 +2983,7 @@ export default {
 .item-agency {
   width: 400px;
 }
+::v-deep  .no-expand>:nth-child(1) .cell .el-table__expand-icon{
+    display: none;
+}
 </style>
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 @@
 <template>
-    <div class=''>
-        <el-tabs v-model="topTabs" @tab-click="tabClick">
-            <el-tab-pane :label="complainLabel" name="12345">
-                <complain :tableData="complainList" :key="resiId[0]" />
-                <el-row type="flex">
-                    <el-col :span="12" align="left">
-                        <div style="margin-top: 25px;">共{{ complainTotal }}条</div>
-                    </el-col>
-                    <el-col :span="12" align="right">
-                        <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange"
-                            :current-page.sync="pageNo" :page-size="pageSize" layout="prev, pager, next, jumper"
-                            :total="complainTotal">
-                        </el-pagination></el-col>
-                </el-row>
-            </el-tab-pane>
-            <el-tab-pane :label="shengLabel" name="sheng">
-                <sheng :tableData="shengList" :key="resiId[0]" />
-                <el-row type="flex">
-                    <el-col :span="12" align="left">
-                        <div style="margin-top: 25px;">共{{ shengTotal }}条</div>
-                    </el-col>
-                    <el-col :span="12" align="right">
-                        <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange"
-                            :current-page.sync="pageNo" :page-size="pageSize" layout="prev, pager, next, jumper"
-                            :total="shengTotal">
-                        </el-pagination></el-col>
-                </el-row>
-            </el-tab-pane>
-            <el-tab-pane :label="shequLabel" name="shequ">
-                <shequ :tableData="shequList" :key="resiId[0]" />
-                <el-row type="flex">
-                    <el-col :span="12" align="left">
-                        <div style="margin-top: 25px;">共{{ shequTotal }}条</div>
-                    </el-col>
-                    <el-col :span="12" align="right">
-                        <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange"
-                            :current-page.sync="pageNo" :page-size="pageSize" layout="prev, pager, next, jumper"
-                            :total="shequTotal">
-                        </el-pagination></el-col>
-                </el-row>
-            </el-tab-pane>
-            <el-tab-pane :label="shijianLabel" name="shijian">
-                <shijian :tableData="shijianList" :key="resiId[0]" />
-                <el-row type="flex">
-                    <el-col :span="12" align="left">
-                        <div style="margin-top: 25px;">共{{ shijianTotal }}条</div>
-                    </el-col>
-                    <el-col :span="12" align="right">
-                        <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange"
-                            :current-page.sync="pageNo" :page-size="pageSize" layout="prev, pager, next, jumper"
-                            :total="shijianTotal">
-                        </el-pagination></el-col>
-                </el-row>
-            </el-tab-pane>
-            <el-tab-pane :label="xuqiuLabel" name="xuqiu">
-                <xuqiu :tableData="xuqiuList" :key="resiId[0]" />
-                <el-row type="flex">
-                    <el-col :span="12" align="left">
-                        <div style="margin-top: 25px;">共{{ xuqiuTotal }}条</div>
-                    </el-col>
-                    <el-col :span="12" align="right">
-                        <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange"
-                            :current-page.sync="pageNo" :page-size="pageSize" layout="prev, pager, next, jumper"
-                            :total="xuqiuTotal">
-                        </el-pagination></el-col>
-                </el-row>
-            </el-tab-pane>
-            <el-tab-pane :label="fuwuLabel" name="fuwu">
-                <div style="display: flex; flex-direction: column; height: 100%;">
-                    <fuwu :tableData="fuwuList" :key="resiId[0]" style="flex: 1; overflow: auto;" />
-                    <el-row type="flex">
-                        <el-col :span="12" align="left">
-                            <div style="margin-top: 25px;">共{{ fuwuTotal }}条</div>
-                        </el-col>
-                        <el-col :span="12" align="right">
-                            <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange"
-                                :current-page.sync="pageNo" :page-size="pageSize" layout="prev, pager, next, jumper"
-                                :total="fuwuTotal">
-                            </el-pagination>
-                        </el-col>
-                    </el-row>
-                </div>
-            </el-tab-pane>
-
-        </el-tabs>
-    </div>
+  <div class="">
+    <el-tabs v-model="topTabs" @tab-click="tabClick">
+      <el-tab-pane :label="complainLabel" name="12345">
+        <complain :tableData="complainList" :key="resiId[0]" />
+        <el-row type="flex">
+          <el-col :span="12" align="left">
+            <div style="margin-top: 25px">共{{ complainTotal }}条</div>
+          </el-col>
+          <el-col :span="12" align="right">
+            <el-pagination
+              @size-change="handleSizeChange"
+              @current-change="handleCurrentChange"
+              :current-page.sync="pageNo"
+              :page-size="pageSize"
+              layout="prev, pager, next, jumper"
+              :total="complainTotal"
+            >
+            </el-pagination
+          ></el-col>
+        </el-row>
+      </el-tab-pane>
+      <el-tab-pane :label="shengLabel" name="sheng">
+        <sheng :tableData="shengList" :key="resiId[0]" />
+        <el-row type="flex">
+          <el-col :span="12" align="left">
+            <div style="margin-top: 25px">共{{ shengTotal }}条</div>
+          </el-col>
+          <el-col :span="12" align="right">
+            <el-pagination
+              @size-change="handleSizeChange"
+              @current-change="handleCurrentChange"
+              :current-page.sync="pageNo"
+              :page-size="pageSize"
+              layout="prev, pager, next,jumper"
+              :total="shengTotal"
+            >
+            </el-pagination
+          ></el-col>
+        </el-row>
+      </el-tab-pane>
+      <el-tab-pane :label="shequLabel" name="shequ">
+        <shequ :tableData="shequList" :key="resiId[0]" />
+        <el-row type="flex">
+          <el-col :span="12" align="left">
+            <div style="margin-top: 25px">共{{ shequTotal }}条</div>
+          </el-col>
+          <el-col :span="12" align="right">
+            <el-pagination
+              @size-change="handleSizeChange"
+              @current-change="handleCurrentChange"
+              :current-page.sync="pageNo"
+              :page-size="pageSize"
+              layout="prev, pager, next, jumper"
+              :total="shequTotal"
+            >
+            </el-pagination
+          ></el-col>
+        </el-row>
+      </el-tab-pane>
+      <el-tab-pane :label="shijianLabel" name="shijian">
+        <shijian :tableData="shijianList" :key="resiId[0]" />
+        <el-row type="flex">
+          <el-col :span="12" align="left">
+            <div style="margin-top: 25px">共{{ shijianTotal }}条</div>
+          </el-col>
+          <el-col :span="12" align="right">
+            <el-pagination
+              @size-change="handleSizeChange"
+              @current-change="handleCurrentChange"
+              :current-page.sync="pageNo"
+              :page-size="pageSize"
+              layout="prev, pager, next, jumper"
+              :total="shijianTotal"
+            >
+            </el-pagination
+          ></el-col>
+        </el-row>
+      </el-tab-pane>
+      <el-tab-pane :label="xuqiuLabel" name="xuqiu">
+        <xuqiu :tableData="xuqiuList" :key="resiId[0]" />
+        <el-row type="flex">
+          <el-col :span="12" align="left">
+            <div style="margin-top: 25px">共{{ xuqiuTotal }}条</div>
+          </el-col>
+          <el-col :span="12" align="right">
+            <el-pagination
+              @size-change="handleSizeChange"
+              @current-change="handleCurrentChange"
+              :current-page.sync="pageNo"
+              :page-size="pageSize"
+              layout="prev, pager, next, jumper"
+              :total="xuqiuTotal"
+            >
+            </el-pagination
+          ></el-col>
+        </el-row>
+      </el-tab-pane>
+      <el-tab-pane :label="fuwuLabel" name="fuwu">
+        <div style="display: flex; flex-direction: column; height: 100%">
+          <fuwu
+            :tableData="fuwuList"
+            :key="resiId[0]"
+            style="flex: 1; overflow: auto"
+          />
+          <el-row type="flex">
+            <el-col :span="12" align="left">
+              <div style="margin-top: 25px">共{{ fuwuTotal }}条</div>
+            </el-col>
+            <el-col :span="12" align="right">
+              <el-pagination
+                @size-change="handleSizeChange"
+                @current-change="handleCurrentChange"
+                :current-page.sync="pageNo"
+                :page-size="pageSize"
+                layout="prev, pager, next, jumper"
+                :total="fuwuTotal"
+              >
+              </el-pagination>
+            </el-col>
+          </el-row>
+        </div>
+      </el-tab-pane>
+    </el-tabs>
+  </div>
 </template>
 
 <script>
@@ -95,238 +133,249 @@ import shijian from "./table/shijian";
 import xuqiu from "./table/xuqiu";
 import fuwu from "./table/fuwu";
 export default {
-    //数据
-    data() {
-        return {
-            topTabs: '12345',
+  //数据
+  data() {
+    return {
+      topTabs: "12345",
 
-            complainTotal: 0,
-            complainList: [],
-            complainLabel: '',
+      complainTotal: 0,
+      complainList: [],
+      complainLabel: "",
 
-            shengLabel: '',
-            shengList: [],
-            shengTotal: 0,
+      shengLabel: "",
+      shengList: [],
+      shengTotal: 0,
 
-            shequLabel: '',
-            shequList: [],
-            shequTotal: 0,
+      shequLabel: "",
+      shequList: [],
+      shequTotal: 0,
 
-            shijianLabel: '',
-            shijianList: [],
-            shijianTotal: 0,
+      shijianLabel: "",
+      shijianList: [],
+      shijianTotal: 0,
 
-            xuqiuLabel: '',
-            xuqiuList: [],
-            xuqiuTotal: 0,
+      xuqiuLabel: "",
+      xuqiuList: [],
+      xuqiuTotal: 0,
 
-            fuwuLabel: '',
-            fuwuList: [],
-            fuwuTotal: 0,
+      fuwuLabel: "",
+      fuwuList: [],
+      fuwuTotal: 0,
 
-            pageNo: 1,
-            pageSize: 20
-        };
-    },
-    //创建前
-    created() {
-        if (this.type == '0') {
-            this.resiId = [this.userInfo.resiId]
-        } else if (this.type == '1') {
-            this.resiId = this.familyResiList
-        }
+      pageNo: 1,
+      pageSize: 20,
+    };
+  },
+  //创建前
+  created() {
+    if (this.type == "0") {
+      this.resiId = [this.userInfo.resiId];
+    } else if (this.type == "1") {
+      this.resiId = this.familyResiList;
+    }
+  },
+  async mounted() {
+    await this.getComplainList();
+    await this.getShengList();
+    await this.getShequList();
+    await this.getshijianList();
+    await this.getxuqiuList();
+    await this.getfuwuList();
+  },
+  props: {
+    userInfo: {
+      type: Object,
+      default: () => {},
     },
-    async mounted() {
-        await this.getComplainList()
-        await this.getShengList()
-        await this.getShequList()
-        await this.getshijianList()
-        await this.getxuqiuList()
-        await this.getfuwuList()
+    familyResiList: {
+      type: Array,
+      default: () => [],
     },
-    props: {
-        userInfo: {
-            type: Object,
-            default: () => { }
-        },
-        familyResiList: {
-            type: Array,
-            default: () => []
-        },
-        type: {
-            type: String,
-            default: '0'
-        }
+    type: {
+      type: String,
+      default: "0",
     },
-    //方法
-    methods: {
-        tabClick(index) {
-
-        },
-        handleSizeChange() {
-
-        },
-        handleCurrentChange() {
+  },
+  //方法
+  methods: {
+    tabClick(index) {},
+    handleSizeChange() {},
+    handleCurrentChange() {},
+    getComplainList() {
+      if (this.resiId.length == 0) {
+        this.complainList = [];
+        this.complainLabel = `12345投诉（0）`;
+        return;
+      }
+      let parm = {
+        residList: this.resiId,
+        pageNo: this.pageNo,
+        pageSize: this.pageSize,
+        eventType: "3",
+      };
+      const statusArr = {
+        processing: "处理中",
+        closed_case: "已办结",
+      };
+      const marktypes = ["普通事件", "难点读点", "矛盾纠纷", "自身问题"];
 
-        },
-        getComplainList() {
-            if (this.resiId.length == 0) {
-                this.complainList = []
-                this.complainLabel = `12345投诉（0）`
-                return
-            }
-            let parm = {
-                residList: this.resiId,
-                pageNo: this.pageNo,
-                pageSize: this.pageSize,
-                eventType: "3",
-
-            }
-            const statusArr = {
-                processing: "处理中",
-                closed_case: "已办结",
+      // 省满意度列表
+      this.$http
+        .post("/actual/base/peopleRoomOverview/eventPageList", parm)
+        .then(({ data: res }) => {
+          this.complainList = res.data.list.map((item) => {
+            return {
+              ...item,
+              status: item.status ? statusArr[item.status] : null,
+              marktype: marktypes[item.marktype],
             };
-            const marktypes = ["普通事件", "难点读点", "矛盾纠纷", "自身问题"];
-
-            // 省满意度列表
-            this.$http.post("/actual/base/peopleRoomOverview/eventPageList", parm).then(({ data: res }) => {
-                this.complainList = res.data.list.map((item) => {
-                    return {
-                        ...item,
-                        status: item.status ? statusArr[item.status] : null,
-                        marktype: marktypes[item.marktype],
-                    };
-                });
-                this.complainTotal = res.data.total;
+          });
+          this.complainTotal = res.data.total;
 
-                this.complainLabel = `12345投诉（${this.complainTotal}）`
-            });
-        },
-        getShengList() {
-            if (this.resiId.length == 0) {
-                this.shengList = []
-                this.shengLabel = `省满意度调查（0）`
-                return
-            }
-            let parm = {
-                residList: this.resiId,
-                pageNo: this.pageNo,
-                pageSize: this.pageSize
-            }
-            // 省满意度列表
-            this.$http.post("/actual/base/peopleRoomOverview/provincialSatisfactionPageList", parm).then(({ data: res }) => {
-                this.shengList = res.data;
-                this.shengTotal = res.data.length;
-                this.shengLabel = `省满意度调查（${this.shengTotal}）`
-            });
-        },
-        getShequList() {
-            if (this.resiId.length == 0) {
-                this.shequList = []
-                this.shequLabel = `社区满意度自查（0）`
-                return
-            }
-            let parm = {
-                residList: this.resiId,
-                pageNo: this.pageNo,
-                pageSize: this.pageSize
-            }
-            const completeFlags = {
-                "-2": "未知",
-                "-1": "不接受回访",
-                0: "接受回访/待回访",
-                1: "已回访",
+          this.complainLabel = `12345投诉（${this.complainTotal}）`;
+        });
+    },
+    getShengList() {
+      if (this.resiId.length == 0) {
+        this.shengList = [];
+        this.shengLabel = `省满意度调查（0）`;
+        return;
+      }
+      let parm = {
+        residList: this.resiId,
+        pageNo: this.pageNo,
+        pageSize: this.pageSize,
+      };
+      // 省满意度列表
+      this.$http
+        .post(
+          "/actual/base/peopleRoomOverview/provincialSatisfactionPageList",
+          parm
+        )
+        .then(({ data: res }) => {
+          this.shengList = res.data;
+          this.shengTotal = res.data.length;
+          this.shengLabel = `省满意度调查（${this.shengTotal}）`;
+        });
+    },
+    getShequList() {
+      if (this.resiId.length == 0) {
+        this.shequList = [];
+        this.shequLabel = `社区满意度自查（0）`;
+        return;
+      }
+      let parm = {
+        residList: this.resiId,
+        pageNo: this.pageNo,
+        pageSize: this.pageSize,
+      };
+      const completeFlags = {
+        "-2": "未知",
+        "-1": "不接受回访",
+        0: "接受回访/待回访",
+        1: "已回访",
+      };
+      this.$http
+        .post(
+          "/actual/base/peopleRoomOverview/communitySatisfactionPageList",
+          parm
+        )
+        .then(({ data: res }) => {
+          this.shequList = res.data.map((item) => {
+            return {
+              ...item,
+              completeFlag: completeFlags[item.completeFlag],
+            };
+          });
+          this.shequTotal = this.shequList.length;
+          this.shequLabel = `社区满意度自查（${this.shequTotal}）`;
+        });
+    },
+    getshijianList() {
+      if (this.resiId.length == 0) {
+        this.shijianList = [];
+        this.shijianLabel = `上报事件（0）`;
+        return;
+      }
+      let parm = {
+        residList: this.resiId,
+        pageNo: this.pageNo,
+        pageSize: this.pageSize,
+      };
+      const statusArr = {
+        processing: "处理中",
+        closed_case: "已办结",
+      };
+      const marktypes = ["普通事件", "难点读点", "矛盾纠纷", "自身问题"];
+      this.$http
+        .post("/actual/base/peopleRoomOverview/eventPageList", parm)
+        .then(({ data: res }) => {
+          this.shijianList = res.data.list.map((item) => {
+            return {
+              ...item,
+              status: item.status ? statusArr[item.status] : null,
+              marktype: marktypes[item.marktype],
             };
-            this.$http.post("/actual/base/peopleRoomOverview/communitySatisfactionPageList", parm).then(({ data: res }) => {
-                this.shequList = res.data.map((item) => {
-                    return {
-                        ...item,
-                        completeFlag: completeFlags[item.completeFlag],
-                    };
-                });
-                this.shequTotal = this.shequList.length;
-                this.shequLabel = `社区满意度自查（${this.shequTotal}）`
-            });
-        },
-        getshijianList() {
-            if (this.resiId.length == 0) {
-                this.shijianList = []
-                this.shijianLabel = `上报事件（0）`
-                return
-            }
-            let parm = {
-                residList: this.resiId,
-                pageNo: this.pageNo,
-                pageSize: this.pageSize
-            }
-            const statusArr = {
-                processing: "处理中",
-                closed_case: "已办结",
+          });
+          this.shijianTotal = this.shijianList.length;
+          this.shijianLabel = `上报事件（${this.shijianTotal}）`;
+        });
+    },
+    getxuqiuList() {
+      if (this.resiId.length == 0) {
+        this.xuqiuList = [];
+        this.xuqiuLabel = `居民需求（0）`;
+        return;
+      }
+      let parm = {
+        residList: this.resiId,
+        pageNo: this.pageNo,
+        pageSize: this.pageSize,
+      };
+      // 省满意度列表
+      this.$http
+        .post("/actual/base/peopleRoomOverview/demandOfResidentsPageList", parm)
+        .then(({ data: res }) => {
+          this.xuqiuList = res.data.map((item) => {
+            return {
+              ...item,
+            };
+          });
+          this.xuqiuTotal = this.xuqiuList.length;
+          this.xuqiuLabel = `居民需求（${this.xuqiuTotal}）`;
+        });
+    },
+    getfuwuList() {
+      if (this.resiId.length == 0) {
+        this.fuwuList = [];
+        this.fuwuLabel = `社区服务（0）`;
+        return;
+      }
+      let parm = {
+        residList: this.resiId,
+        pageNo: this.pageNo,
+        pageSize: this.pageSize,
+      };
+      this.$http
+        .post("/actual/base/peopleRoomOverview/communityServicePageList", parm)
+        .then(({ data: res }) => {
+          this.fuwuList = res.data.map((item) => {
+            return {
+              ...item,
             };
-            const marktypes = ["普通事件", "难点读点", "矛盾纠纷", "自身问题"];
-            this.$http.post("/actual/base/peopleRoomOverview/eventPageList", parm).then(({ data: res }) => {
-                this.shijianList = res.data.list.map((item) => {
-                    return {
-                        ...item,
-                        status: item.status ? statusArr[item.status] : null,
-                        marktype: marktypes[item.marktype],
-                    };
-                });
-                this.shijianTotal = this.shijianList.length;
-                this.shijianLabel = `上报事件（${this.shijianTotal}）`
-            });
-        },
-        getxuqiuList() {
-            if (this.resiId.length == 0) {
-                this.xuqiuList = []
-                this.xuqiuLabel = `居民需求（0）`
-                return
-            }
-            let parm = {
-                residList: this.resiId,
-                pageNo: this.pageNo,
-                pageSize: this.pageSize
-            }
-            // 省满意度列表
-            this.$http.post("/actual/base/peopleRoomOverview/demandOfResidentsPageList", parm).then(({ data: res }) => {
-                this.xuqiuList = res.data.map((item) => {
-                    return {
-                        ...item,
-                    };
-                });
-                this.xuqiuTotal = this.xuqiuList.length;
-                this.xuqiuLabel = `居民需求（${this.xuqiuTotal}）`
-            });
-        },
-        getfuwuList() {
-            if (this.resiId.length == 0) {
-                this.fuwuList = []
-                this.fuwuLabel = `社区服务（0）`
-                return
-            }
-            let parm = {
-                residList: this.resiId,
-                pageNo: this.pageNo,
-                pageSize: this.pageSize
-            }
-            this.$http.post("/actual/base/peopleRoomOverview/communityServicePageList", parm).then(({ data: res }) => {
-                this.fuwuList = res.data.map((item) => {
-                    return {
-                        ...item,
-                    };
-                });
-                this.fuwuTotal = this.fuwuList.length;
-                this.fuwuLabel = `社区服务（${this.fuwuTotal}）`
-            });
-        },
+          });
+          this.fuwuTotal = this.fuwuList.length;
+          this.fuwuLabel = `社区服务（${this.fuwuTotal}）`;
+        });
     },
-    //子组件注册
-    components: { complain, sheng, fuwu, shijian, xuqiu, shequ },
-    //计算
-    computed: {},
-    //监听
-    watch: {},
-}
+  },
+  //子组件注册
+  components: { complain, sheng, fuwu, shijian, xuqiu, shequ },
+  //计算
+  computed: {},
+  //监听
+  watch: {},
+};
 </script>
 
 <style lang="less" scoped></style>
\ 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 @@
 
 <template>
-    <div class="g-main">
-        <div>
-            <div class="m-search">
-                <el-form :inline="true" :model="formData" ref="ref_searchform" :label-width="'100px'">
-                    <el-form-item label="自评周期">
-                        <el-date-picker v-model="formData.periodStart" type="month" value-format="yyyy-MM" placeholder="选择日期"
-                            style="width: 202px" clearable>
-                        </el-date-picker>
-                    </el-form-item>
-                    <div style="float: right; margin-top:5px">
-                        <el-button style="margin-left: 30px" size="small" type="primary "
-                            @click="handleSearch">查询</el-button>
-                        <el-button style="margin-left: 10px" is-plain class="diy-button--white el-button--default"
-                            size="small" @click="resetSearch">重置</el-button>
-                    </div>
-                </el-form>
-
+  <div class="g-main">
+    <div>
+      <div class="m-search">
+        <el-form
+          :inline="true"
+          :model="formData"
+          ref="ref_searchform"
+          :label-width="'100px'"
+        >
+          <el-form-item label="自评周期">
+            <el-date-picker
+              v-model="formData.periodStart"
+              type="month"
+              value-format="yyyy-MM"
+              placeholder="选择日期"
+              style="width: 202px"
+              clearable
+            >
+            </el-date-picker>
+          </el-form-item>
+          <div style="float: right; margin-top: 5px">
+            <el-button
+              style="margin-left: 30px"
+              size="small"
+              type="primary "
+              @click="handleSearch"
+              >查询</el-button
+            >
+            <el-button
+              style="margin-left: 10px"
+              is-plain
+              class="diy-button--white el-button--default"
+              size="small"
+              @click="resetSearch"
+              >重置</el-button
+            >
+          </div>
+        </el-form>
+      </div>
+      <div class="m-table">
+        <div class="div_btn">
+          <el-upload
+            :headers="$getElUploadHeaders()"
+            ref="upload"
+            class="upload-btn"
+            action="uploadUlr"
+            :limit="1"
+            :accept="'.xls,.xlsx'"
+            :with-credentials="true"
+            :show-file-list="false"
+            :auto-upload="true"
+            :before-upload="beforeExcelUpload"
+            :http-request="uploadHttpRequest"
+          >
+            <el-button
+              type="primary"
+              size="small"
+              class="diy-button--white el-button--default"
+              :loading="importLoading"
+              >导入</el-button
+            >
+          </el-upload>
+          <el-button
+            type="primary"
+            style="margin-left: 10px"
+            size="small"
+            class="diy-button--white el-button--default"
+            @click="handleExportModule"
+            >下载模板</el-button
+          >
+        </div>
+        <el-radio-group
+          v-model="formData.orgCategoryCode"
+          @change="handelChangeCategory"
+          style="margin: 20px 0 0"
+        >
+          <el-radio-button label="province">省满意度调查</el-radio-button>
+          <el-radio-button label="city">市满意度调查</el-radio-button>
+          <el-radio-button label="district">区满意度调查</el-radio-button>
+        </el-radio-group>
+        <section class="content_box">
+          <div class="left">
+            <img
+              src="../../../../assets/img/satisfaction/zhdf.png"
+              alt="Image"
+            />
+            <div class="left_right">
+              <!-- <div>{{ synthesisScore }}</div> -->
+              <div>综合得分</div>
             </div>
-            <div class="m-table">
-                <div class="div_btn">
-                    <el-upload :headers="$getElUploadHeaders()" ref="upload" class="upload-btn" action="uploadUlr"
-                        :limit="1" :accept="'.xls,.xlsx'" :with-credentials="true" :show-file-list="false"
-                        :auto-upload="true" :before-upload="beforeExcelUpload" :http-request="uploadHttpRequest">
-                        <el-button type="primary" size="small" class="diy-button--white el-button--default"
-                            :loading="importLoading">导入</el-button>
-                    </el-upload>
-                    <el-button type="primary" style="margin-left:10px" size="small"
-                        class="diy-button--white el-button--default" @click="handleExportModule">下载模板</el-button>
-                </div>
-                <el-radio-group v-model="formData.orgCategoryCode" @change="handelChangeCategory" style="margin: 20px 0 0;">
-                    <el-radio-button label="province">省满意度调查</el-radio-button>
-                    <el-radio-button label="city">市满意度调查</el-radio-button>
-                    <el-radio-button label="district">区满意度调查</el-radio-button>
-                </el-radio-group>
-                <div class="m-table-item" :style="{ height: maxTableHeight + 'px', width: '100%' }">
-                    <div id="myCharts"></div>
+          </div>
+          <div class="right">
+            <div class="box" v-for="(item, index) in badList" :key="index">
+              <div class="card">
+                <img :src="item.imgUrl" alt="Image" />
+                <div class="right_right">
+                  <div>{{ item.badNum }}</div>
+                  <div>{{ item.satisfactionCategoryName }}</div>
                 </div>
+              </div>
             </div>
-        </div>
-        <el-dialog v-if="showFormList" :visible.sync="showFormList" :close-on-click-modal="false"
-            :close-on-press-escape="false" title="省满意度调查列表" :modal-append-to-body="false" width="820px" top="5vh"
-            class="dialog-h" @closed="showFormList = false">
-            <form-list ref="ref_form_list" @handleClose="handleClose" :satisfactionCategoryStr="satisfactionCategoryStr"
-                :formObj="formData" @handelClickDetail="handelClickDetail"
-                @handelClickEdit="handelClickEdit"></form-list>
-            <el-dialog width="820px" class="dialog-h" title="省满意度调查详情" :close-on-click-modal="false"
-                v-if="showProvinceFollowUpDetail" :visible.sync="showProvinceFollowUpDetail" append-to-body>
-                <follow-detail :detailObj="detailObj" :formType="formType"
-                    @handleCancle="showProvinceFollowUpDetail = false" @handleComfirm="handleComfirm"></follow-detail>
-            </el-dialog>
-        </el-dialog>
+          </div>
+        </section>
+        <el-table :data="tableList" :height="maxTableHeight">
+          <el-table-column label="序号" type="index" width="80" />
+          <el-table-column
+            label="社区"
+            show-overflow-tooltip
+            prop="communityName"
+            width=""
+          />
+          <el-table-column label="不满意总数" prop="badTotal" width="100" />
+          <el-table-column
+            label="文化设施"
+            prop="culturalFacility"
+            width="100"
+          />
+          <el-table-column label="基础教育" prop="basicEducation" width="100" />
+          <el-table-column label="体育设施" prop="sportsFacility" width="100" />
+          <el-table-column label="生态环境" prop="ecologicalEnv" width="100" />
+          <el-table-column label="社会治安" prop="socialSecurity" width="100" />
+          <el-table-column
+            label="社会救助"
+            prop="socialAssistance"
+            width="100"
+          />
+          <el-table-column
+            label="老有所养"
+            prop="oldPeopleProvide"
+            width="100"
+          />
+          <el-table-column label="病有所医" prop="medical" width="100" />
+          <el-table-column label="操作" width="90" align="center" fixed="right">
+            <template slot-scope="data">
+              <el-button type="text" @click="handleView(data.row)"
+                >查看</el-button
+              >
+            </template>
+          </el-table-column>
+        </el-table>
+        <el-row type="flex">
+          <el-col :span="12" align="left">
+            <div style="margin-top: 25px">共{{ shengTotal }}条</div>
+          </el-col>
+          <el-col :span="12" align="right">
+            <el-pagination
+              @size-change="handleSizeChange"
+              @current-change="handleCurrentChange"
+              :current-page.sync="pageNo"
+              :page-size="pageSize"
+              layout="prev, pager, next,jumper"
+              :total="shengTotal"
+            >
+            </el-pagination
+          ></el-col>
+        </el-row>
+      </div>
     </div>
+    <el-dialog
+      v-if="showFormList"
+      :visible.sync="showFormList"
+      :close-on-click-modal="false"
+      :close-on-press-escape="false"
+      title="省满意度调查列表"
+      :modal-append-to-body="false"
+      width="820px"
+      top="5vh"
+      class="dialog-h"
+      @closed="showFormList = false"
+    >
+      <form-list
+        ref="ref_form_list"
+        @handleClose="handleClose"
+        :satisfactionCategoryStr="satisfactionCategoryStr"
+        :formObj="formData"
+        @handelClickDetail="handelClickDetail"
+        @handelClickEdit="handelClickEdit"
+      ></form-list>
+      <el-dialog
+        width="820px"
+        class="dialog-h"
+        title="省满意度调查详情"
+        :close-on-click-modal="false"
+        v-if="showProvinceFollowUpDetail"
+        :visible.sync="showProvinceFollowUpDetail"
+        append-to-body
+      >
+        <follow-detail
+          :detailObj="detailObj"
+          :formType="formType"
+          @handleCancle="showProvinceFollowUpDetail = false"
+          @handleComfirm="handleComfirm"
+        ></follow-detail>
+      </el-dialog>
+    </el-dialog>
+  </div>
 </template>
     
 <script>
 import { requestPost, requestGet } from "@/js/dai/request";
 import { mapGetters } from "vuex";
 import axios from "axios";
-import * as echarts from 'echarts'
+import * as echarts from "echarts";
 import formList from "./formList";
 import util from "@js/util.js";
-import followDetail from "./followDetail"
+import followDetail from "./followDetail";
 export default {
-    components: { formList, followDetail },
+  components: { formList, followDetail },
 
-    data() {
-        return {
-            searchH: 20,
-            showFormList: false,
-            formData: {
-                periodStart: "",
-                orgCategoryCode:"province"
-            },
+  data() {
+    return {
+      searchH: 20,
+      showFormList: false,
+      formData: {
+        periodStart: "",
+        orgCategoryCode: "province",
+      },
 
-            multiSelection: [], // 多选结果
-            importLoading: false,
+      multiSelection: [], // 多选结果
+      importLoading: false,
 
-            dicts: {
-                satisfaction_category: []
-            }, //字典对象
+      dicts: {
+        satisfaction_category: [],
+      }, //字典对象
 
-            myChart: {},
-            option: {
-                tooltip: {
-                    trigger: 'axis'
-                },
-                legend: {
-                    data: ['不满意'],
-                    bottom: '10%',
-                    icon: 'rect',
-                    itemWidth: 20,
-                    itemHeight: 5,
-                    itemGap: 20,
-                },
-                grid: {
-                    left: '3%',
-                    right: '4%',
-                    bottom: '25%',
-                    containLabel: true
-                },
-                toolbox: {},
+      satisfactionCategoryName: [],
+      satisfactionCategory: [],
+      score: [],
+      showProvinceFollowUpDetail: false,
 
+      detailObj: {},
 
-                xAxis: {
-                    type: 'category',
-                    boundaryGap: true,
-                    data: [],
-                },
-                yAxis: {
-                    type: 'value',
-                    name: '单位(个)',
-                    min: 0,
-                },
-                series: [
-                    {
-                        name: '不满意',
-                        type: 'bar',
-                        data: [],
-                        barWidth: 24, // 设置柱子宽度
-                        barCategoryGap: 0, // 设置柱子间的间隔为0
-                        itemStyle: {
-                            color: new echarts.graphic.LinearGradient(
-                                0, 0, 0, 1,
-                                [
-                                    { offset: 0, color: '#2c7cf2' }, // 从顶部开始
-                                    { offset: 1, color: '#80b3ff' } // 到底部结束
-                                ]
-                            )
-                        },
-                        showBackground: true,
-                        backgroundStyle: {
-                            color: '#fafbfc',
-                            opacity: "0.5"
-                        }
-                    },
-                ]
-            },
-            satisfactionCategoryName: [],
-            satisfactionCategory: [],
-            score: [],
-            showProvinceFollowUpDetail: false,
+      formType: "",
 
-            detailObj: {},
+      tableList: [],
+      badList: [],
 
-            formType: ''
-        };
-    },
+      searchH: 86,
+
+      pageSize:20,
+      pageNum: 1,
+    };
+  },
 
-    computed: {
-        maxTableHeight() {
-            const h = this.clientHeight - this.searchH - 330 + this.iframeHeight;
-            const _h = this.clientHeight - 330 - this.searchH;
-            return this.$store.state.inIframe ? h : _h;
-        },
-        ...mapGetters(["clientHeight", "iframeHeight"]),
+  computed: {
+    maxTableHeight() {
+      const _h = this.clientHeight - 520 - this.searchH;
+      return _h;
     },
-    created() {
-        let date = new Date()
-        this.formData.periodStart = util.formatDate(date, 'yyyy-MM')
+    ...mapGetters(["clientHeight"]),
+  },
+  created() {
+    let date = new Date();
+    this.formData.periodStart = util.formatDate(date, "yyyy-MM");
+  },
+
+  async mounted() {
+    this.user = this.$store.state.user;
+    this.agencyId = this.user.agencyId;
+    await this.getDicts();
+    await this.getTableData();
+    // await this.initEcharts()
+  },
+  methods: {
+    // --------------------------------------字典------------------------------------------
+    async getDicts() {
+      try {
+        const requests = [
+          this.$http.post("sys/dict/data/dictlist", {
+            dictType: "satisfaction_category",
+          }),
+        ];
+        const dictKeys = ["satisfaction_category"]; // 对应的键名
+
+        const results = await Promise.all(requests);
+        results.forEach((result, index) => {
+          if (result.data.code === 0) {
+            this.dicts[dictKeys[index]].push(...result.data.data);
+          } else {
+            console.log(`获取${dictKeys[index]}失败: ${result.data.msg}`);
+          }
+        });
+      } catch (error) {
+        console.log("获取字典失败: ", error);
+      }
     },
+    // ------------------------------------事件------------------------------------------
 
-    async mounted() {
-        this.user = this.$store.state.user;
-        this.agencyId = this.user.agencyId;
-        await this.getDicts();
-        await this.getTableData();
-        await this.initEcharts()
+    handleWindowResize() {
+      if (this.myChart) {
+        this.myChart.resize();
+      }
     },
-    methods: {
-        // --------------------------------------字典------------------------------------------
-        async getDicts() {
-            try {
 
-                const requests = [
-                    this.$http.post("sys/dict/data/dictlist", {
-                        dictType: "satisfaction_category",
-                    }),
-                ];
-                const dictKeys = ['satisfaction_category']; // 对应的键名
-
-                const results = await Promise.all(requests);
-                results.forEach((result, index) => {
-                    if (result.data.code === 0) {
-                        this.dicts[dictKeys[index]].push(...result.data.data);
-                    } else {
-                        console.log(`获取${dictKeys[index]}失败: ${result.data.msg}`);
-                    }
-                });
-            } catch (error) {
-                console.log("获取字典失败: ", error);
-            }
-        },
-        // ------------------------------------事件------------------------------------------
-        initEcharts() {
-            this.myChart = echarts.init(document.getElementById('myCharts'));
-            this.myChart.setOption(this.option)
-            let than = this
-            this.myChart.on('click', function (params) {
-                than.handelClickChart(params.name)
-            });
-
-            window.addEventListener('resize', this.handleWindowResize);
-
-        },
-        handleWindowResize() {
-            if (this.myChart) {
-                this.myChart.resize();
-            }
-        },
-        handelClickChart(name) {
-            this.showFormList = true
-            this.satisfactionCategoryStr = this.dicts.satisfaction_category.filter(item => item.label == name)[0].value
-        },
-        handleClose() {
-            this.showFormList = false
-        },
-        handelClickDetail(row) {
-            this.formType = 'detail'
-            this.showProvinceFollowUpDetail = true
-            this.detailObj = row || {}
-        },
-        handelClickEdit(row) {
-            this.formType = 'edit'
-            this.showProvinceFollowUpDetail = true
-            this.detailObj = row || {}
-        },
-        handelChangeCategory(){
-            this.getTableData()
-        },
-        handleComfirm(form) {
-            this.showProvinceFollowUpDetail = false
-            this.save(form)
-        },
-        async save(form) {
-            try {
-                const url = '/governance/provinceEvaluationRecord/updateInfo'
-                form.periodName = null
-                const { code } = await requestPost(url, form)
-                if (code == 0) {
-                    this.getTableData()
-                    this.$refs['ref_form_list'].getTableData()
-                    this.$message.success('保存成功')
-                    this.showProvinceFollowUpDetail = false
-                }
-            } catch (err) {
-                console.log(err);
-            }
-        },
-        // 搜索事件
-        handleSearch(val) {
-            console.log(this.formData);
-            this.getTableData();
-        },
-
-        //   获取列表
-        async getTableData() {
-            try {
-                const allowedCategories = this.dicts.satisfaction_category.map(item => item.value)
-                const { data } = await this.$http.post(
-                    `/governance/provinceEvaluationRecord/staticPeopleNum`,
-                    { ...this.formData }
-                );
-                this.option.series[0].data = []
-                this.option.xAxis.data = []
-                this.tableData = data
-                this.tableData.forEach(item => {
-                    if (allowedCategories.includes(item.scopeId)) {
-                        this.option.series[0].data.push(item.peopleNum)
-                        this.option.xAxis.data.push(item.scopeName)
-                    }
-                });
-                this.myChart.setOption(this.option)
-            } catch (error) {
-                console.log(error);
-            }
-        },
-        async handleExportModule() {
-            let url = "/governance/provinceEvaluationRecord/provinceStatis/downloadImportTemplate";
-            let params = {};
-            await this.$http({
-                method: "get",
-                url,
-                responseType: "blob",
-                data: params,
-            })
-                .then((res) => {
-                    console.log("res----dddd", res);
-                    // this.download(res.data, title + '.xls')
-                    if (res.headers["content-disposition"]) {
-                        let fileName = window.decodeURI(
-                            res.headers["content-disposition"].split(";")[1].split("=")[1]
-                        );
-                        console.log("filename", fileName);
-                        let blob = new Blob([res.data], {
-                            type: "application/vnd.ms-excel",
-                        });
-                        var url = window.URL.createObjectURL(blob);
-                        var aLink = document.createElement("a");
-                        aLink.style.display = "none";
-                        aLink.href = url;
-                        aLink.setAttribute("download", fileName);
-                        document.body.appendChild(aLink);
-                        aLink.click();
-                        document.body.removeChild(aLink); //下载完成移除元素
-                        window.URL.revokeObjectURL(url); //释放掉blob对象
-                    } else this.$message.error("下载失败");
-                })
-                .catch((err) => {
-                    console.log("err", err);
-                    return this.$message.error("网络错误");
-                });
-        },
-        beforeExcelUpload(file) {
-            console.log("file", file);
-            const isType = file.type === "application/vnd.ms-excel";
-            const isTypeComputer =
-                file.type ===
-                "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet";
-            const fileType = isType || isTypeComputer;
-            const isLt1M = file.size / 1024 / 1024 < 10;
-            if (!fileType) {
-                this.$message.error("上传文件只能是xls/xlsx格式！");
-            }
+    handleClose() {
+      this.showFormList = false;
+    },
+    handelClickDetail(row) {
+      this.formType = "detail";
+      this.showProvinceFollowUpDetail = true;
+      this.detailObj = row || {};
+    },
+    handelClickEdit(row) {
+      this.formType = "edit";
+      this.showProvinceFollowUpDetail = true;
+      this.detailObj = row || {};
+    },
+    handelChangeCategory() {
+      this.getTableData();
+    },
+    handleComfirm(form) {
+      this.showProvinceFollowUpDetail = false;
+      this.save(form);
+    },
+    async save(form) {
+      try {
+        const url = "/governance/provinceEvaluationRecord/updateInfo";
+        form.periodName = null;
+        const { code } = await requestPost(url, form);
+        if (code == 0) {
+          this.getTableData();
+          this.$refs["ref_form_list"].getTableData();
+          this.$message.success("保存成功");
+          this.showProvinceFollowUpDetail = false;
+        }
+      } catch (err) {
+        console.log(err);
+      }
+    },
+    // 搜索事件
+    handleSearch(val) {
+      console.log(this.formData);
+      this.getTableData();
+    },
 
-            if (!isLt1M) {
-                this.$message.error("上传文件大小不能超过 10MB!");
-            }
-            return fileType && isLt1M;
-        },
-        async uploadHttpRequest(file) {
-            this.$message({
-                showClose: true,
-                dangerouslyUseHTMLString: true,
-                message:
-                    "导入中，请到系统管理-<a id='clickA' style='cursor: pointer;'>导入记录</a>中查看进度",
-                duration: 3000,
-            });
-            let than = this;
-            document.getElementById("clickA").addEventListener("click", function () {
-                than.$router.replace("/main/importRecord-index");
+    //   获取列表
+    async getTableData() {
+      try {
+        let { data } = await this.$http.post(
+          `/governance/provinceEvaluationRecord/staticPeopleNum`,
+          { ...this.formData }
+        );
+        data = {
+          statistics: [
+            {
+              satisfactionCategoryName: "文化设施",
+              badNum: 80,
+              satisfactionCategory: "culturalFacility",
+            },
+            {
+              satisfactionCategory: "sportsFacility",
+              satisfactionCategoryName: "体育设施",
+              badNum: 5,
+            },
+            {
+              satisfactionCategory: "ecologicalEnv",
+              satisfactionCategoryName: "生态环境",
+              badNum: 5,
+            },
+            {
+              satisfactionCategory: "socialSecurity",
+              satisfactionCategoryName: "社会治安",
+              badNum: 5,
+            },
+            {
+              satisfactionCategory: "socialAssistance",
+              satisfactionCategoryName: "社会救助",
+              badNum: 5,
+            },
+            {
+              satisfactionCategory: "oldPeopleProvide",
+              satisfactionCategoryName: "老有所养",
+              badNum: 5,
+            },
+            {
+              satisfactionCategory: "basicEducation",
+              satisfactionCategoryName: "基础教育",
+              badNum: 5,
+            },
+            {
+              satisfactionCategory: "medical",
+              satisfactionCategoryName: "病有所医",
+              badNum: 5,
+            },
+          ],
+          tableList: [
+            {
+              communityId: "191265465154",
+              socialAssistance: "14",
+              ecologicalEnv: "16",
+              oldPeopleProvide: "15",
+              medical: "18",
+              culturalFacility: "12",
+              socialSecurity: "11",
+              badTotal: "19",
+              basicEducation: "24",
+              communityName: "21",
+              sportsFacility: "28",
+            },
+            {
+              communityId: "191265465154",
+              socialAssistance: "14",
+              ecologicalEnv: "16",
+              oldPeopleProvide: "15",
+              medical: "18",
+              culturalFacility: "12",
+              socialSecurity: "11",
+              badTotal: "19",
+              basicEducation: "24",
+              communityName: "21",
+              sportsFacility: "28",
+            },
+          ],
+          badTotal: 77,
+          total: 83,
+        };
+        this.badList = data.statistics.map((item) => ({
+          ...item,
+          imgUrl: require(`@/assets/img/satisfaction/${item.satisfactionCategory}.png`),
+        }));
+        this.tableList = data.tableList;
+      } catch (error) {
+        console.log(error);
+      }
+    },
+    async handleExportModule() {
+      let url =
+        "/governance/provinceEvaluationRecord/provinceStatis/downloadImportTemplate";
+      let params = {};
+      await this.$http({
+        method: "get",
+        url,
+        responseType: "blob",
+        data: params,
+      })
+        .then((res) => {
+          console.log("res----dddd", res);
+          // this.download(res.data, title + '.xls')
+          if (res.headers["content-disposition"]) {
+            let fileName = window.decodeURI(
+              res.headers["content-disposition"].split(";")[1].split("=")[1]
+            );
+            console.log("filename", fileName);
+            let blob = new Blob([res.data], {
+              type: "application/vnd.ms-excel",
             });
-            const formData = new FormData(); //FormData对象，添加参数只能通过append('key', value)的形式添加
-            formData.append("file", file.file); //添加文件对象
-            formData.append("orgCategory",than.formData.orgCategoryCode); //添加文件对象
-            await this.$http
-                .post(`/governance/provinceEvaluationRecord/importDataByExcel`, formData)
-                .then((res) => {
-                    console.log("res-up", res);
-                    if (res.data.code == 0 && res.data.msg == "success") {
-                        this.$message.success("导入成功");
-                        this.getTableData();
-                        this.$refs.upload.clearFiles();
-                    } else this.$message.error(res.data.msg);
-                })
-                .catch((err) => {
-                    console.log("失败", err);
-                    file.onError(); //上传失败的文件会从文件列表中删除
-                    this.$message.error('导入失败')
-                });
-        },
-        //   重置
-        resetSearch() {
-            this.formData = {};
+            var url = window.URL.createObjectURL(blob);
+            var aLink = document.createElement("a");
+            aLink.style.display = "none";
+            aLink.href = url;
+            aLink.setAttribute("download", fileName);
+            document.body.appendChild(aLink);
+            aLink.click();
+            document.body.removeChild(aLink); //下载完成移除元素
+            window.URL.revokeObjectURL(url); //释放掉blob对象
+          } else this.$message.error("下载失败");
+        })
+        .catch((err) => {
+          console.log("err", err);
+          return this.$message.error("网络错误");
+        });
+    },
+    beforeExcelUpload(file) {
+      console.log("file", file);
+      const isType = file.type === "application/vnd.ms-excel";
+      const isTypeComputer =
+        file.type ===
+        "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet";
+      const fileType = isType || isTypeComputer;
+      const isLt1M = file.size / 1024 / 1024 < 10;
+      if (!fileType) {
+        this.$message.error("上传文件只能是xls/xlsx格式！");
+      }
+
+      if (!isLt1M) {
+        this.$message.error("上传文件大小不能超过 10MB!");
+      }
+      return fileType && isLt1M;
+    },
+    async uploadHttpRequest(file) {
+      this.$message({
+        showClose: true,
+        dangerouslyUseHTMLString: true,
+        message:
+          "导入中，请到系统管理-<a id='clickA' style='cursor: pointer;'>导入记录</a>中查看进度",
+        duration: 3000,
+      });
+      let than = this;
+      document.getElementById("clickA").addEventListener("click", function () {
+        than.$router.replace("/main/importRecord-index");
+      });
+      const formData = new FormData(); //FormData对象，添加参数只能通过append('key', value)的形式添加
+      formData.append("file", file.file); //添加文件对象
+      formData.append("orgCategory", than.formData.orgCategoryCode); //添加文件对象
+      await this.$http
+        .post(
+          `/governance/provinceEvaluationRecord/importDataByExcel`,
+          formData
+        )
+        .then((res) => {
+          console.log("res-up", res);
+          if (res.data.code == 0 && res.data.msg == "success") {
+            this.$message.success("导入成功");
             this.getTableData();
-        },
+            this.$refs.upload.clearFiles();
+          } else this.$message.error(res.data.msg);
+        })
+        .catch((err) => {
+          console.log("失败", err);
+          file.onError(); //上传失败的文件会从文件列表中删除
+          this.$message.error("导入失败");
+        });
     },
-    activated() {
-        this.handleWindowResize()
+    //   重置
+    resetSearch() {
+      this.formData = {};
+      this.getTableData();
     },
-    props: {},
+  },
+  activated() {
+    this.handleWindowResize();
+  },
+  props: {},
 };
 </script>
 <style lang="scss" scoped>
@@ -377,88 +530,86 @@ export default {
 @import "@/assets/scss/modules/management/list-main.scss";
 @import "@/assets/scss/modules/shequzhili/event-info.scss";
 
-.div_btn_left>* {
-    margin-right: 10px;
+.div_btn_left > * {
+  margin-right: 10px;
 }
 
 .m-table-item {
-    display: flex;
-    flex-direction: column;
+  display: flex;
+  flex-direction: column;
 }
 
 .content_box {
-    display: flex;
-    height: 160px;
-    margin-top: 24px;
-
-    .left {
-        background: #f7faff;
-        margin-right: 10px;
-        min-width: 300px;
-        display: flex;
-        align-items: center;
-        justify-content: center;
-        border-radius: 5px;
+  display: flex;
+  height: 160px;
+  margin: 24px 0;
 
-        img {
-            margin-right: 8px;
-        }
-    }
+  .left {
+    background: #f7faff;
+    margin-right: 10px;
+    min-width: 300px;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    border-radius: 5px;
 
     img {
-        width: 50px;
-        height: 50px;
-        margin-right: 15px;
-
+      margin-right: 8px;
     }
+  }
 
-    .left_right,
-    .right_right {
-        display: flex;
-        flex-direction: column;
+  img {
+    width: 50px;
+    height: 50px;
+    margin-right: 15px;
+  }
 
-        :nth-child(1) {
-            font-size: 18px;
-            font-family: PingFang SC;
-            font-weight: bold;
-            color: #333333;
-        }
+  .left_right,
+  .right_right {
+    display: flex;
+    flex-direction: column;
 
-        :nth-child(2) {
-            font-size: 14px;
-            font-family: PingFang SC;
-            color: #333333;
-            opacity: 0.6;
-        }
+    :nth-child(1) {
+      font-size: 18px;
+      font-family: PingFang SC;
+      font-weight: bold;
+      color: #333333;
     }
 
-    .right {
-        flex: 1;
-        display: grid;
-        grid-template-columns: repeat(4, 1fr);
+    :nth-child(2) {
+      font-size: 14px;
+      font-family: PingFang SC;
+      color: #333333;
+      opacity: 0.6;
+    }
+  }
 
-        .box {
-            height: 75px;
-            margin: 0 10px 10px 0;
+  .right {
+    flex: 1;
+    display: grid;
+    grid-template-columns: repeat(4, 1fr);
 
-            .card {
-                background: #f7faff;
-                width: 100%;
-                height: 100%;
-                display: flex;
-                align-items: center;
-                border-radius: 5px;
-                padding: 20px;
-                box-sizing: border-box;
+    .box {
+      height: 75px;
+      margin: 0 10px 10px 0;
 
-            }
-        }
+      .card {
+        background: #f7faff;
+        width: 100%;
+        height: 100%;
+        display: flex;
+        align-items: center;
+        border-radius: 5px;
+        padding: 20px;
+        box-sizing: border-box;
+      }
     }
+  }
 }
 
 #myCharts {
-    width: 100%;
-    flex: 1;
+  width: 100%;
+  flex: 1;
 }
 </style>
     

From 29394a332470005b6af9e8da95ed426f57bce80b Mon Sep 17 00:00:00 2001
From: mk <2403457699@qq.com>
Date: Thu, 2 Nov 2023 14:39:46 +0800
Subject: [PATCH 6/9] =?UTF-8?q?=E4=BA=8B=E4=BB=B6=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E4=B8=8A=E6=8A=A5=E6=B8=A0=E9=81=93=E6=B3=A8=E6=8E=8912345?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/base/community/communityForm.vue  | 1 -
 src/views/modules/shequzhili/eventOld/eventList.vue | 8 ++++----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/views/modules/base/community/communityForm.vue b/src/views/modules/base/community/communityForm.vue
index f1a42c3ea..3dbcd7528 100644
--- a/src/views/modules/base/community/communityForm.vue
+++ b/src/views/modules/base/community/communityForm.vue
@@ -188,7 +188,6 @@ export default {
               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 : '',
diff --git a/src/views/modules/shequzhili/eventOld/eventList.vue b/src/views/modules/shequzhili/eventOld/eventList.vue
index 2569d1a3c..078efbdcd 100644
--- a/src/views/modules/shequzhili/eventOld/eventList.vue
+++ b/src/views/modules/shequzhili/eventOld/eventList.vue
@@ -573,10 +573,10 @@ export default {
           value: "2",
           label: "社区电话",
         },
-        {
-          value: "3",
-          label: "12345",
-        },
+        // {
+        //   value: "3",
+        //   label: "12345",
+        // },
         {
           value: "4",
           label: "网络员手持终端",

From a4092bb373693e3e9c284db01cbb7e3c06fc58c1 Mon Sep 17 00:00:00 2001
From: mk <2403457699@qq.com>
Date: Thu, 2 Nov 2023 14:51:34 +0800
Subject: [PATCH 7/9] =?UTF-8?q?=E5=85=9A=E7=BB=84=E7=BB=87=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E5=9C=B0=E5=9B=BE=E6=9C=AA=E6=98=BE=E7=A4=BA=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/communityParty/partyOrg/update.vue | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/views/modules/communityParty/partyOrg/update.vue b/src/views/modules/communityParty/partyOrg/update.vue
index 1d73a2fc1..759a0d1de 100644
--- a/src/views/modules/communityParty/partyOrg/update.vue
+++ b/src/views/modules/communityParty/partyOrg/update.vue
@@ -168,12 +168,14 @@ export default {
         this.dataForm.principalId = partyOrgInfo.principalId;
         console.log(this.principals)
         console.log(this.dataForm.principalId )
+       this.$nextTick(()=>{
         if (!map) {
           this.initMap(this.dataForm.latitude, this.dataForm.longitude);
         } else {
           map.setCenter(this.dataForm.latitude, this.dataForm.longitude);
           map.setMarker(this.dataForm.latitude, this.dataForm.longitude);
         }
+       })
     },
 
     // 初始化地图

From 4ee7ce57eb4f0018ddfc005c1f22a8aa6070afd1 Mon Sep 17 00:00:00 2001
From: duanliangtao <dlt0099>
Date: Thu, 2 Nov 2023 17:52:12 +0800
Subject: [PATCH 8/9] =?UTF-8?q?=E5=8F=AF=E8=A7=86=E5=8C=96=E8=8F=9C?=
 =?UTF-8?q?=E5=8D=95=E5=90=8D=E7=A7=B0=E6=BB=A1=E6=84=8F=E5=BA=A6=E8=AF=84?=
 =?UTF-8?q?=E4=BB=B7=E6=94=B9=E4=B8=BA=E7=BE=A4=E4=BC=97=E6=BB=A1=E6=84=8F?=
 =?UTF-8?q?=E5=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/router/index.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/router/index.js b/src/router/index.js
index e7e25fd44..cff48399d 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -529,7 +529,7 @@ export const dataBoardRoutes = {
       component: () => import("@/views/dataBoard/satisfactionEval/index"),
       name: "dataBoard-satisfactionEval-index",
       meta: {
-        title: "满意度评价",
+        title: "群众满意度",
         isTab: false,
       },
     },

From d7f3112216dbf6a5d798016626764a9313b6ebc7 Mon Sep 17 00:00:00 2001
From: mk <2403457699@qq.com>
Date: Fri, 3 Nov 2023 10:38:31 +0800
Subject: [PATCH 9/9] =?UTF-8?q?=E4=BA=8B=E4=BB=B6=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E7=B1=BB=E7=9B=AE=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../satisfactionProvince/index.vue            |  913 ++++++-------
 .../shequzhili/event/cpts/event-info.vue      |    2 +-
 .../modules/shequzhili/eventOld/cpts/add.vue  | 1190 ++++++++---------
 .../shequzhili/eventOld/cpts/event-info.vue   |  116 +-
 .../eventOld/cpts/process-form-designate.vue  |  161 ++-
 .../eventOld/cpts/process-form-replay-end.vue |   41 +-
 .../shequzhili/eventOld/cpts/process-form.vue |  253 ++--
 7 files changed, 1287 insertions(+), 1389 deletions(-)

diff --git a/src/views/modules/satisfaction/satisfactionProvince/index.vue b/src/views/modules/satisfaction/satisfactionProvince/index.vue
index d5b45bbeb..0e8a322ee 100644
--- a/src/views/modules/satisfaction/satisfactionProvince/index.vue
+++ b/src/views/modules/satisfaction/satisfactionProvince/index.vue
@@ -1,526 +1,373 @@
 
 <template>
   <div class="g-main">
-    <div>
-      <div class="m-search">
-        <el-form
-          :inline="true"
-          :model="formData"
-          ref="ref_searchform"
-          :label-width="'100px'"
-        >
-          <el-form-item label="自评周期">
-            <el-date-picker
-              v-model="formData.periodStart"
-              type="month"
-              value-format="yyyy-MM"
-              placeholder="选择日期"
-              style="width: 202px"
-              clearable
-            >
-            </el-date-picker>
-          </el-form-item>
-          <div style="float: right; margin-top: 5px">
-            <el-button
-              style="margin-left: 30px"
-              size="small"
-              type="primary "
-              @click="handleSearch"
-              >查询</el-button
-            >
-            <el-button
-              style="margin-left: 10px"
-              is-plain
-              class="diy-button--white el-button--default"
-              size="small"
-              @click="resetSearch"
-              >重置</el-button
-            >
-          </div>
-        </el-form>
-      </div>
-      <div class="m-table">
-        <div class="div_btn">
-          <el-upload
-            :headers="$getElUploadHeaders()"
-            ref="upload"
-            class="upload-btn"
-            action="uploadUlr"
-            :limit="1"
-            :accept="'.xls,.xlsx'"
-            :with-credentials="true"
-            :show-file-list="false"
-            :auto-upload="true"
-            :before-upload="beforeExcelUpload"
-            :http-request="uploadHttpRequest"
-          >
-            <el-button
-              type="primary"
-              size="small"
-              class="diy-button--white el-button--default"
-              :loading="importLoading"
-              >导入</el-button
-            >
-          </el-upload>
-          <el-button
-            type="primary"
-            style="margin-left: 10px"
-            size="small"
-            class="diy-button--white el-button--default"
-            @click="handleExportModule"
-            >下载模板</el-button
-          >
-        </div>
-        <el-radio-group
-          v-model="formData.orgCategoryCode"
-          @change="handelChangeCategory"
-          style="margin: 20px 0 0"
-        >
-          <el-radio-button label="province">省满意度调查</el-radio-button>
-          <el-radio-button label="city">市满意度调查</el-radio-button>
-          <el-radio-button label="district">区满意度调查</el-radio-button>
-        </el-radio-group>
-        <section class="content_box">
-          <div class="left">
-            <img
-              src="../../../../assets/img/satisfaction/zhdf.png"
-              alt="Image"
-            />
-            <div class="left_right">
-              <!-- <div>{{ synthesisScore }}</div> -->
-              <div>综合得分</div>
-            </div>
+      <div>
+          <div class="m-search">
+              <el-form :inline="true" :model="formData" ref="ref_searchform" :label-width="'100px'">
+                  <el-form-item label="自评周期">
+                      <el-date-picker v-model="formData.periodStart" type="month" value-format="yyyy-MM" placeholder="选择日期"
+                          style="width: 202px" clearable>
+                      </el-date-picker>
+                  </el-form-item>
+                  <div style="float: right; margin-top:5px">
+                      <el-button style="margin-left: 30px" size="small" type="primary "
+                          @click="handleSearch">查询</el-button>
+                      <el-button style="margin-left: 10px" is-plain class="diy-button--white el-button--default"
+                          size="small" @click="resetSearch">重置</el-button>
+                  </div>
+              </el-form>
+
           </div>
-          <div class="right">
-            <div class="box" v-for="(item, index) in badList" :key="index">
-              <div class="card">
-                <img :src="item.imgUrl" alt="Image" />
-                <div class="right_right">
-                  <div>{{ item.badNum }}</div>
-                  <div>{{ item.satisfactionCategoryName }}</div>
-                </div>
+          <div class="m-table">
+              <div class="div_btn">
+                  <el-upload :headers="$getElUploadHeaders()" ref="upload" class="upload-btn" action="uploadUlr"
+                      :limit="1" :accept="'.xls,.xlsx'" :with-credentials="true" :show-file-list="false"
+                      :auto-upload="true" :before-upload="beforeExcelUpload" :http-request="uploadHttpRequest">
+                      <el-button type="primary" size="small" class="diy-button--white el-button--default"
+                          :loading="importLoading">导入</el-button>
+                  </el-upload>
+                  <el-button type="primary" style="margin-left:10px" size="small"
+                      class="diy-button--white el-button--default" @click="handleExportModule">下载模板</el-button>
+              </div>
+              <el-radio-group v-model="formData.orgCategoryCode" @change="handelChangeCategory" style="margin: 20px 0 0;">
+                  <el-radio-button label="province">省满意度调查</el-radio-button>
+                  <el-radio-button label="city">市满意度调查</el-radio-button>
+                  <el-radio-button label="district">区满意度调查</el-radio-button>
+              </el-radio-group>
+              <div class="m-table-item" :style="{ height: maxTableHeight + 'px', width: '100%' }">
+                  <div id="myCharts"></div>
               </div>
-            </div>
           </div>
-        </section>
-        <el-table :data="tableList" :height="maxTableHeight">
-          <el-table-column label="序号" type="index" width="80" />
-          <el-table-column
-            label="社区"
-            show-overflow-tooltip
-            prop="communityName"
-            width=""
-          />
-          <el-table-column label="不满意总数" prop="badTotal" width="100" />
-          <el-table-column
-            label="文化设施"
-            prop="culturalFacility"
-            width="100"
-          />
-          <el-table-column label="基础教育" prop="basicEducation" width="100" />
-          <el-table-column label="体育设施" prop="sportsFacility" width="100" />
-          <el-table-column label="生态环境" prop="ecologicalEnv" width="100" />
-          <el-table-column label="社会治安" prop="socialSecurity" width="100" />
-          <el-table-column
-            label="社会救助"
-            prop="socialAssistance"
-            width="100"
-          />
-          <el-table-column
-            label="老有所养"
-            prop="oldPeopleProvide"
-            width="100"
-          />
-          <el-table-column label="病有所医" prop="medical" width="100" />
-          <el-table-column label="操作" width="90" align="center" fixed="right">
-            <template slot-scope="data">
-              <el-button type="text" @click="handleView(data.row)"
-                >查看</el-button
-              >
-            </template>
-          </el-table-column>
-        </el-table>
-        <el-row type="flex">
-          <el-col :span="12" align="left">
-            <div style="margin-top: 25px">共{{ shengTotal }}条</div>
-          </el-col>
-          <el-col :span="12" align="right">
-            <el-pagination
-              @size-change="handleSizeChange"
-              @current-change="handleCurrentChange"
-              :current-page.sync="pageNo"
-              :page-size="pageSize"
-              layout="prev, pager, next,jumper"
-              :total="shengTotal"
-            >
-            </el-pagination
-          ></el-col>
-        </el-row>
       </div>
-    </div>
-    <el-dialog
-      v-if="showFormList"
-      :visible.sync="showFormList"
-      :close-on-click-modal="false"
-      :close-on-press-escape="false"
-      title="省满意度调查列表"
-      :modal-append-to-body="false"
-      width="820px"
-      top="5vh"
-      class="dialog-h"
-      @closed="showFormList = false"
-    >
-      <form-list
-        ref="ref_form_list"
-        @handleClose="handleClose"
-        :satisfactionCategoryStr="satisfactionCategoryStr"
-        :formObj="formData"
-        @handelClickDetail="handelClickDetail"
-        @handelClickEdit="handelClickEdit"
-      ></form-list>
-      <el-dialog
-        width="820px"
-        class="dialog-h"
-        title="省满意度调查详情"
-        :close-on-click-modal="false"
-        v-if="showProvinceFollowUpDetail"
-        :visible.sync="showProvinceFollowUpDetail"
-        append-to-body
-      >
-        <follow-detail
-          :detailObj="detailObj"
-          :formType="formType"
-          @handleCancle="showProvinceFollowUpDetail = false"
-          @handleComfirm="handleComfirm"
-        ></follow-detail>
+      <el-dialog v-if="showFormList" :visible.sync="showFormList" :close-on-click-modal="false"
+          :close-on-press-escape="false" title="省满意度调查列表" :modal-append-to-body="false" width="820px" top="5vh"
+          class="dialog-h" @closed="showFormList = false">
+          <form-list ref="ref_form_list" @handleClose="handleClose" :satisfactionCategoryStr="satisfactionCategoryStr"
+              :formObj="formData" @handelClickDetail="handelClickDetail"
+              @handelClickEdit="handelClickEdit"></form-list>
+          <el-dialog width="820px" class="dialog-h" title="省满意度调查详情" :close-on-click-modal="false"
+              v-if="showProvinceFollowUpDetail" :visible.sync="showProvinceFollowUpDetail" append-to-body>
+              <follow-detail :detailObj="detailObj" :formType="formType"
+                  @handleCancle="showProvinceFollowUpDetail = false" @handleComfirm="handleComfirm"></follow-detail>
+          </el-dialog>
       </el-dialog>
-    </el-dialog>
   </div>
 </template>
-    
+  
 <script>
 import { requestPost, requestGet } from "@/js/dai/request";
 import { mapGetters } from "vuex";
 import axios from "axios";
-import * as echarts from "echarts";
+import * as echarts from 'echarts'
 import formList from "./formList";
 import util from "@js/util.js";
-import followDetail from "./followDetail";
+import followDetail from "./followDetail"
 export default {
   components: { formList, followDetail },
 
   data() {
-    return {
-      searchH: 20,
-      showFormList: false,
-      formData: {
-        periodStart: "",
-        orgCategoryCode: "province",
-      },
-
-      multiSelection: [], // 多选结果
-      importLoading: false,
+      return {
+          searchH: 20,
+          showFormList: false,
+          formData: {
+              periodStart: "",
+              orgCategoryCode:"province"
+          },
 
-      dicts: {
-        satisfaction_category: [],
-      }, //字典对象
+          multiSelection: [], // 多选结果
+          importLoading: false,
 
-      satisfactionCategoryName: [],
-      satisfactionCategory: [],
-      score: [],
-      showProvinceFollowUpDetail: false,
+          dicts: {
+              satisfaction_category: []
+          }, //字典对象
 
-      detailObj: {},
+          myChart: {},
+          option: {
+              tooltip: {
+                  trigger: 'axis'
+              },
+              legend: {
+                  data: ['不满意'],
+                  bottom: '10%',
+                  icon: 'rect',
+                  itemWidth: 20,
+                  itemHeight: 5,
+                  itemGap: 20,
+              },
+              grid: {
+                  left: '3%',
+                  right: '4%',
+                  bottom: '25%',
+                  containLabel: true
+              },
+              toolbox: {},
 
-      formType: "",
 
-      tableList: [],
-      badList: [],
+              xAxis: {
+                  type: 'category',
+                  boundaryGap: true,
+                  data: [],
+              },
+              yAxis: {
+                  type: 'value',
+                  name: '单位(个)',
+                  min: 0,
+              },
+              series: [
+                  {
+                      name: '不满意',
+                      type: 'bar',
+                      data: [],
+                      barWidth: 24, // 设置柱子宽度
+                      barCategoryGap: 0, // 设置柱子间的间隔为0
+                      itemStyle: {
+                          color: new echarts.graphic.LinearGradient(
+                              0, 0, 0, 1,
+                              [
+                                  { offset: 0, color: '#2c7cf2' }, // 从顶部开始
+                                  { offset: 1, color: '#80b3ff' } // 到底部结束
+                              ]
+                          )
+                      },
+                      showBackground: true,
+                      backgroundStyle: {
+                          color: '#fafbfc',
+                          opacity: "0.5"
+                      }
+                  },
+              ]
+          },
+          satisfactionCategoryName: [],
+          satisfactionCategory: [],
+          score: [],
+          showProvinceFollowUpDetail: false,
 
-      searchH: 86,
+          detailObj: {},
 
-      pageSize:20,
-      pageNum: 1,
-    };
+          formType: ''
+      };
   },
 
   computed: {
-    maxTableHeight() {
-      const _h = this.clientHeight - 520 - this.searchH;
-      return _h;
-    },
-    ...mapGetters(["clientHeight"]),
+      maxTableHeight() {
+          const h = this.clientHeight - this.searchH - 330 + this.iframeHeight;
+          const _h = this.clientHeight - 330 - this.searchH;
+          return this.$store.state.inIframe ? h : _h;
+      },
+      ...mapGetters(["clientHeight", "iframeHeight"]),
   },
   created() {
-    let date = new Date();
-    this.formData.periodStart = util.formatDate(date, "yyyy-MM");
+      let date = new Date()
+      this.formData.periodStart = util.formatDate(date, 'yyyy-MM')
   },
 
   async mounted() {
-    this.user = this.$store.state.user;
-    this.agencyId = this.user.agencyId;
-    await this.getDicts();
-    await this.getTableData();
-    // await this.initEcharts()
+      this.user = this.$store.state.user;
+      this.agencyId = this.user.agencyId;
+      await this.getDicts();
+      await this.getTableData();
+      await this.initEcharts()
   },
   methods: {
-    // --------------------------------------字典------------------------------------------
-    async getDicts() {
-      try {
-        const requests = [
-          this.$http.post("sys/dict/data/dictlist", {
-            dictType: "satisfaction_category",
-          }),
-        ];
-        const dictKeys = ["satisfaction_category"]; // 对应的键名
-
-        const results = await Promise.all(requests);
-        results.forEach((result, index) => {
-          if (result.data.code === 0) {
-            this.dicts[dictKeys[index]].push(...result.data.data);
-          } else {
-            console.log(`获取${dictKeys[index]}失败: ${result.data.msg}`);
+      // --------------------------------------字典------------------------------------------
+      async getDicts() {
+          try {
+
+              const requests = [
+                  this.$http.post("sys/dict/data/dictlist", {
+                      dictType: "satisfaction_category",
+                  }),
+              ];
+              const dictKeys = ['satisfaction_category']; // 对应的键名
+
+              const results = await Promise.all(requests);
+              results.forEach((result, index) => {
+                  if (result.data.code === 0) {
+                      this.dicts[dictKeys[index]].push(...result.data.data);
+                  } else {
+                      console.log(`获取${dictKeys[index]}失败: ${result.data.msg}`);
+                  }
+              });
+          } catch (error) {
+              console.log("获取字典失败: ", error);
           }
-        });
-      } catch (error) {
-        console.log("获取字典失败: ", error);
-      }
-    },
-    // ------------------------------------事件------------------------------------------
+      },
+      // ------------------------------------事件------------------------------------------
+      initEcharts() {
+          this.myChart = echarts.init(document.getElementById('myCharts'));
+          this.myChart.setOption(this.option)
+          let than = this
+          this.myChart.on('click', function (params) {
+              than.handelClickChart(params.name)
+          });
 
-    handleWindowResize() {
-      if (this.myChart) {
-        this.myChart.resize();
-      }
-    },
-
-    handleClose() {
-      this.showFormList = false;
-    },
-    handelClickDetail(row) {
-      this.formType = "detail";
-      this.showProvinceFollowUpDetail = true;
-      this.detailObj = row || {};
-    },
-    handelClickEdit(row) {
-      this.formType = "edit";
-      this.showProvinceFollowUpDetail = true;
-      this.detailObj = row || {};
-    },
-    handelChangeCategory() {
-      this.getTableData();
-    },
-    handleComfirm(form) {
-      this.showProvinceFollowUpDetail = false;
-      this.save(form);
-    },
-    async save(form) {
-      try {
-        const url = "/governance/provinceEvaluationRecord/updateInfo";
-        form.periodName = null;
-        const { code } = await requestPost(url, form);
-        if (code == 0) {
+          window.addEventListener('resize', this.handleWindowResize);
+
+      },
+      handleWindowResize() {
+          if (this.myChart) {
+              this.myChart.resize();
+          }
+      },
+      handelClickChart(name) {
+          this.showFormList = true
+          this.satisfactionCategoryStr = this.dicts.satisfaction_category.filter(item => item.label == name)[0].value
+      },
+      handleClose() {
+          this.showFormList = false
+      },
+      handelClickDetail(row) {
+          this.formType = 'detail'
+          this.showProvinceFollowUpDetail = true
+          this.detailObj = row || {}
+      },
+      handelClickEdit(row) {
+          this.formType = 'edit'
+          this.showProvinceFollowUpDetail = true
+          this.detailObj = row || {}
+      },
+      handelChangeCategory(){
+          this.getTableData()
+      },
+      handleComfirm(form) {
+          this.showProvinceFollowUpDetail = false
+          this.save(form)
+      },
+      async save(form) {
+          try {
+              const url = '/governance/provinceEvaluationRecord/updateInfo'
+              form.periodName = null
+              const { code } = await requestPost(url, form)
+              if (code == 0) {
+                  this.getTableData()
+                  this.$refs['ref_form_list'].getTableData()
+                  this.$message.success('保存成功')
+                  this.showProvinceFollowUpDetail = false
+              }
+          } catch (err) {
+              console.log(err);
+          }
+      },
+      // 搜索事件
+      handleSearch(val) {
+          console.log(this.formData);
           this.getTableData();
-          this.$refs["ref_form_list"].getTableData();
-          this.$message.success("保存成功");
-          this.showProvinceFollowUpDetail = false;
-        }
-      } catch (err) {
-        console.log(err);
-      }
-    },
-    // 搜索事件
-    handleSearch(val) {
-      console.log(this.formData);
-      this.getTableData();
-    },
-
-    //   获取列表
-    async getTableData() {
-      try {
-        let { data } = await this.$http.post(
-          `/governance/provinceEvaluationRecord/staticPeopleNum`,
-          { ...this.formData }
-        );
-        data = {
-          statistics: [
-            {
-              satisfactionCategoryName: "文化设施",
-              badNum: 80,
-              satisfactionCategory: "culturalFacility",
-            },
-            {
-              satisfactionCategory: "sportsFacility",
-              satisfactionCategoryName: "体育设施",
-              badNum: 5,
-            },
-            {
-              satisfactionCategory: "ecologicalEnv",
-              satisfactionCategoryName: "生态环境",
-              badNum: 5,
-            },
-            {
-              satisfactionCategory: "socialSecurity",
-              satisfactionCategoryName: "社会治安",
-              badNum: 5,
-            },
-            {
-              satisfactionCategory: "socialAssistance",
-              satisfactionCategoryName: "社会救助",
-              badNum: 5,
-            },
-            {
-              satisfactionCategory: "oldPeopleProvide",
-              satisfactionCategoryName: "老有所养",
-              badNum: 5,
-            },
-            {
-              satisfactionCategory: "basicEducation",
-              satisfactionCategoryName: "基础教育",
-              badNum: 5,
-            },
-            {
-              satisfactionCategory: "medical",
-              satisfactionCategoryName: "病有所医",
-              badNum: 5,
-            },
-          ],
-          tableList: [
-            {
-              communityId: "191265465154",
-              socialAssistance: "14",
-              ecologicalEnv: "16",
-              oldPeopleProvide: "15",
-              medical: "18",
-              culturalFacility: "12",
-              socialSecurity: "11",
-              badTotal: "19",
-              basicEducation: "24",
-              communityName: "21",
-              sportsFacility: "28",
-            },
-            {
-              communityId: "191265465154",
-              socialAssistance: "14",
-              ecologicalEnv: "16",
-              oldPeopleProvide: "15",
-              medical: "18",
-              culturalFacility: "12",
-              socialSecurity: "11",
-              badTotal: "19",
-              basicEducation: "24",
-              communityName: "21",
-              sportsFacility: "28",
-            },
-          ],
-          badTotal: 77,
-          total: 83,
-        };
-        this.badList = data.statistics.map((item) => ({
-          ...item,
-          imgUrl: require(`@/assets/img/satisfaction/${item.satisfactionCategory}.png`),
-        }));
-        this.tableList = data.tableList;
-      } catch (error) {
-        console.log(error);
-      }
-    },
-    async handleExportModule() {
-      let url =
-        "/governance/provinceEvaluationRecord/provinceStatis/downloadImportTemplate";
-      let params = {};
-      await this.$http({
-        method: "get",
-        url,
-        responseType: "blob",
-        data: params,
-      })
-        .then((res) => {
-          console.log("res----dddd", res);
-          // this.download(res.data, title + '.xls')
-          if (res.headers["content-disposition"]) {
-            let fileName = window.decodeURI(
-              res.headers["content-disposition"].split(";")[1].split("=")[1]
-            );
-            console.log("filename", fileName);
-            let blob = new Blob([res.data], {
-              type: "application/vnd.ms-excel",
-            });
-            var url = window.URL.createObjectURL(blob);
-            var aLink = document.createElement("a");
-            aLink.style.display = "none";
-            aLink.href = url;
-            aLink.setAttribute("download", fileName);
-            document.body.appendChild(aLink);
-            aLink.click();
-            document.body.removeChild(aLink); //下载完成移除元素
-            window.URL.revokeObjectURL(url); //释放掉blob对象
-          } else this.$message.error("下载失败");
-        })
-        .catch((err) => {
-          console.log("err", err);
-          return this.$message.error("网络错误");
-        });
-    },
-    beforeExcelUpload(file) {
-      console.log("file", file);
-      const isType = file.type === "application/vnd.ms-excel";
-      const isTypeComputer =
-        file.type ===
-        "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet";
-      const fileType = isType || isTypeComputer;
-      const isLt1M = file.size / 1024 / 1024 < 10;
-      if (!fileType) {
-        this.$message.error("上传文件只能是xls/xlsx格式！");
-      }
+      },
 
-      if (!isLt1M) {
-        this.$message.error("上传文件大小不能超过 10MB!");
-      }
-      return fileType && isLt1M;
-    },
-    async uploadHttpRequest(file) {
-      this.$message({
-        showClose: true,
-        dangerouslyUseHTMLString: true,
-        message:
-          "导入中，请到系统管理-<a id='clickA' style='cursor: pointer;'>导入记录</a>中查看进度",
-        duration: 3000,
-      });
-      let than = this;
-      document.getElementById("clickA").addEventListener("click", function () {
-        than.$router.replace("/main/importRecord-index");
-      });
-      const formData = new FormData(); //FormData对象，添加参数只能通过append('key', value)的形式添加
-      formData.append("file", file.file); //添加文件对象
-      formData.append("orgCategory", than.formData.orgCategoryCode); //添加文件对象
-      await this.$http
-        .post(
-          `/governance/provinceEvaluationRecord/importDataByExcel`,
-          formData
-        )
-        .then((res) => {
-          console.log("res-up", res);
-          if (res.data.code == 0 && res.data.msg == "success") {
-            this.$message.success("导入成功");
-            this.getTableData();
-            this.$refs.upload.clearFiles();
-          } else this.$message.error(res.data.msg);
-        })
-        .catch((err) => {
-          console.log("失败", err);
-          file.onError(); //上传失败的文件会从文件列表中删除
-          this.$message.error("导入失败");
-        });
-    },
-    //   重置
-    resetSearch() {
-      this.formData = {};
-      this.getTableData();
-    },
+      //   获取列表
+      async getTableData() {
+          try {
+              const allowedCategories = this.dicts.satisfaction_category.map(item => item.value)
+              const { data } = await this.$http.post(
+                  `/governance/provinceEvaluationRecord/staticPeopleNum`,
+                  { ...this.formData }
+              );
+              this.option.series[0].data = []
+              this.option.xAxis.data = []
+              this.tableData = data
+              this.tableData.forEach(item => {
+                  if (allowedCategories.includes(item.scopeId)) {
+                      this.option.series[0].data.push(item.peopleNum)
+                      this.option.xAxis.data.push(item.scopeName)
+                  }
+              });
+              this.myChart.setOption(this.option)
+          } catch (error) {
+              console.log(error);
+          }
+      },
+      async handleExportModule() {
+          let url = "/governance/provinceEvaluationRecord/provinceStatis/downloadImportTemplate";
+          let params = {};
+          await this.$http({
+              method: "get",
+              url,
+              responseType: "blob",
+              data: params,
+          })
+              .then((res) => {
+                  console.log("res----dddd", res);
+                  // this.download(res.data, title + '.xls')
+                  if (res.headers["content-disposition"]) {
+                      let fileName = window.decodeURI(
+                          res.headers["content-disposition"].split(";")[1].split("=")[1]
+                      );
+                      console.log("filename", fileName);
+                      let blob = new Blob([res.data], {
+                          type: "application/vnd.ms-excel",
+                      });
+                      var url = window.URL.createObjectURL(blob);
+                      var aLink = document.createElement("a");
+                      aLink.style.display = "none";
+                      aLink.href = url;
+                      aLink.setAttribute("download", fileName);
+                      document.body.appendChild(aLink);
+                      aLink.click();
+                      document.body.removeChild(aLink); //下载完成移除元素
+                      window.URL.revokeObjectURL(url); //释放掉blob对象
+                  } else this.$message.error("下载失败");
+              })
+              .catch((err) => {
+                  console.log("err", err);
+                  return this.$message.error("网络错误");
+              });
+      },
+      beforeExcelUpload(file) {
+          console.log("file", file);
+          const isType = file.type === "application/vnd.ms-excel";
+          const isTypeComputer =
+              file.type ===
+              "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet";
+          const fileType = isType || isTypeComputer;
+          const isLt1M = file.size / 1024 / 1024 < 10;
+          if (!fileType) {
+              this.$message.error("上传文件只能是xls/xlsx格式！");
+          }
+
+          if (!isLt1M) {
+              this.$message.error("上传文件大小不能超过 10MB!");
+          }
+          return fileType && isLt1M;
+      },
+      async uploadHttpRequest(file) {
+          this.$message({
+              showClose: true,
+              dangerouslyUseHTMLString: true,
+              message:
+                  "导入中，请到系统管理-<a id='clickA' style='cursor: pointer;'>导入记录</a>中查看进度",
+              duration: 3000,
+          });
+          let than = this;
+          document.getElementById("clickA").addEventListener("click", function () {
+              than.$router.replace("/main/importRecord-index");
+          });
+          const formData = new FormData(); //FormData对象，添加参数只能通过append('key', value)的形式添加
+          formData.append("file", file.file); //添加文件对象
+          formData.append("orgCategory",than.formData.orgCategoryCode); //添加文件对象
+          await this.$http
+              .post(`/governance/provinceEvaluationRecord/importDataByExcel`, formData)
+              .then((res) => {
+                  console.log("res-up", res);
+                  if (res.data.code == 0 && res.data.msg == "success") {
+                      this.$message.success("导入成功");
+                      this.getTableData();
+                      this.$refs.upload.clearFiles();
+                  } else this.$message.error(res.data.msg);
+              })
+              .catch((err) => {
+                  console.log("失败", err);
+                  file.onError(); //上传失败的文件会从文件列表中删除
+                  this.$message.error('导入失败')
+              });
+      },
+      //   重置
+      resetSearch() {
+          this.formData = {};
+          this.getTableData();
+      },
   },
   activated() {
-    this.handleWindowResize();
+      this.handleWindowResize()
   },
   props: {},
 };
@@ -530,7 +377,7 @@ export default {
 @import "@/assets/scss/modules/management/list-main.scss";
 @import "@/assets/scss/modules/shequzhili/event-info.scss";
 
-.div_btn_left > * {
+.div_btn_left>* {
   margin-right: 10px;
 }
 
@@ -542,68 +389,70 @@ export default {
 .content_box {
   display: flex;
   height: 160px;
-  margin: 24px 0;
+  margin-top: 24px;
 
   .left {
-    background: #f7faff;
-    margin-right: 10px;
-    min-width: 300px;
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    border-radius: 5px;
-
-    img {
-      margin-right: 8px;
-    }
+      background: #f7faff;
+      margin-right: 10px;
+      min-width: 300px;
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      border-radius: 5px;
+
+      img {
+          margin-right: 8px;
+      }
   }
 
   img {
-    width: 50px;
-    height: 50px;
-    margin-right: 15px;
+      width: 50px;
+      height: 50px;
+      margin-right: 15px;
+
   }
 
   .left_right,
   .right_right {
-    display: flex;
-    flex-direction: column;
-
-    :nth-child(1) {
-      font-size: 18px;
-      font-family: PingFang SC;
-      font-weight: bold;
-      color: #333333;
-    }
-
-    :nth-child(2) {
-      font-size: 14px;
-      font-family: PingFang SC;
-      color: #333333;
-      opacity: 0.6;
-    }
+      display: flex;
+      flex-direction: column;
+
+      :nth-child(1) {
+          font-size: 18px;
+          font-family: PingFang SC;
+          font-weight: bold;
+          color: #333333;
+      }
+
+      :nth-child(2) {
+          font-size: 14px;
+          font-family: PingFang SC;
+          color: #333333;
+          opacity: 0.6;
+      }
   }
 
   .right {
-    flex: 1;
-    display: grid;
-    grid-template-columns: repeat(4, 1fr);
-
-    .box {
-      height: 75px;
-      margin: 0 10px 10px 0;
-
-      .card {
-        background: #f7faff;
-        width: 100%;
-        height: 100%;
-        display: flex;
-        align-items: center;
-        border-radius: 5px;
-        padding: 20px;
-        box-sizing: border-box;
+      flex: 1;
+      display: grid;
+      grid-template-columns: repeat(4, 1fr);
+
+      .box {
+          height: 75px;
+          margin: 0 10px 10px 0;
+
+          .card {
+              background: #f7faff;
+              width: 100%;
+              height: 100%;
+              display: flex;
+              align-items: center;
+              border-radius: 5px;
+              padding: 20px;
+              box-sizing: border-box;
+
+          }
       }
-    }
   }
 }
 
@@ -612,5 +461,5 @@ export default {
   flex: 1;
 }
 </style>
-    
-    
\ No newline at end of file
+  
+  
\ No newline at end of file
diff --git a/src/views/modules/shequzhili/event/cpts/event-info.vue b/src/views/modules/shequzhili/event/cpts/event-info.vue
index 018af9492..ab6605a54 100644
--- a/src/views/modules/shequzhili/event/cpts/event-info.vue
+++ b/src/views/modules/shequzhili/event/cpts/event-info.vue
@@ -388,7 +388,7 @@ export default {
                     this.eventInfoData.categoryList.push(this.replayInfo.categoryId);
                 }
             } else if (this.formData.operationType === '5') {
-                this.replayInfo = this.$refs.ref_process_form_designate.replayInfo;
+                this.replayInfo = this.$refs.ref_processinfo_add.replayInfo;
                 //回复属性赋值
                 this.eventInfoData.content = this.replayInfo.content;
                 this.eventInfoData.status = this.replayInfo.status;
diff --git a/src/views/modules/shequzhili/eventOld/cpts/add.vue b/src/views/modules/shequzhili/eventOld/cpts/add.vue
index 575d9367d..1ed27b5d5 100644
--- a/src/views/modules/shequzhili/eventOld/cpts/add.vue
+++ b/src/views/modules/shequzhili/eventOld/cpts/add.vue
@@ -1,705 +1,617 @@
 <template>
-    <div class="g-add">
+  <div class="g-add">
       <div class="g-add-page">
-        <div class="g-left">
-          <el-form ref="ref_form1"
-                   :inline="true"
-                   :model="formData"
-                   :rules="dataRule"
-                   class="form">
-            <el-form-item label="所属网格"
-                          prop="gridId"
-                          label-width="150px"
-                          style="display: block">
-              <el-select v-model.trim="formData.gridId"
-                         placeholder="请选择"
-                         clearable
-                         class="cell-width-1">
-                <el-option v-for="item in gridList"
-                           :key="item.value"
-                           :label="item.label"
-                           :value="item.value">
-                </el-option>
-              </el-select>
-            </el-form-item>
-  
-            <el-form-item label="上报人"
-                          prop="name"
-                          label-width="150px"
-                          style="display: block">
-              <el-input class="cell-width-1"
-                        maxlength="10"
-                        placeholder="请输入上报人姓名"
-                        v-model="formData.name">
-              </el-input>
-              <div>
-                <el-button style="margin-top: 10px"
-                           type="primary"
-                           size="mini"
-                           @click="handleShowPersonList">居民信息中选择</el-button>
-              </div>
-            </el-form-item>
-            <el-form-item label="联系电话"
-                          prop="mobile"
-                          label-width="150px"
-                          style="display: block">
-              <el-input class="cell-width-1"
-                        maxlength="30"
-                        placeholder="请输入联系电话	"
-                        v-model="formData.mobile">
-              </el-input>
-            </el-form-item>
-  
-            <el-form-item label="证件号"
-                          prop="idCard"
-                          label-width="150px"
-                          style="display: block">
-              <el-input class="cell-width-1"
-                        maxlength="30"
-                        placeholder="请输入证件号"
-                        v-model="formData.idCard"></el-input>
-            </el-form-item>
-  
-            <el-form-item label="反应渠道"
-                          label-width="150px"
-                          prop="sourceType">
-              <el-select v-model="formData.sourceType"
-                         placeholder="请选择"
-                         size="small"
-                         clearable
-                         class="cell-width-1">
-                <el-option v-for="item in qudaoArray"
-                           :key="item.value"
-                           :label="item.label"
-                           :value="item.value">
-                </el-option>
-              </el-select>
-            </el-form-item>
-  
-            <el-form-item label="上报时间"
-                          prop="happenTime"
-                          label-width="150px"
-                          style="display: block">
-              <el-date-picker v-model="formData.happenTime"
-                              class="cell-width-1"
-                              type="datetime"
-                              placeholder="上报时间"
-                              value-format="yyyy-MM-dd HH:mm:ss">
-              </el-date-picker>
-            </el-form-item>
-  
-            <el-form-item label="事件内容"
-                          prop="eventContent"
-                          label-width="150px"
-                          style="display: block">
-              <el-input class="cell-width-2"
-                        type="textarea"
-                        maxlength="500"
-                        show-word-limit
-                        :rows="5"
-                        placeholder="请输入事件内容，不超过500字"
-                        v-model="formData.eventContent"></el-input>
-            </el-form-item>
-          </el-form>
-        </div>
-        <div class="g-right">
-          <el-form ref="ref_form2"
-                   :inline="true"
-                   :model="formData"
-                   :rules="dataRule"
-                   class="form">
-            <el-form-item label="图片"
-                          label-width="150px"
-                          style="display: block">
-              <el-upload :headers="$getElUploadHeaders()"
-                         :class="['avatar-uploader', { hide: hideUploadBtn }]"
-                         ref="uploadPic"
-                         :action="uploadUlr"
-                         :disabled="uploadStatus"
-                         list-type="picture-card"
-                         :on-exceed="exceedPic"
-                         :on-remove="removePic"
-                         :file-list="replayImgList"
-                         :on-change="handleEditChange"
-                         :on-success="handleSuccess"
-                         :before-upload="handleBefore"
-                         :limit="3">
-                <span class="font-14" >选择图片</span>
-                <div slot="tip"
-                     class="upload_tip">
-                  最多上传3张图片，图片支持jpg、jpeg、bmp、git或png格式
-                </div>
-              </el-upload>
-            </el-form-item>
-  
-            <el-form-item label="地图位置"
-                          prop="longitude"
-                          label-width="150px"
-                          style="display: block">
-              <div style="width: 500px">
-                <el-form-item prop="location" style="display: block">
-                                  <el-select
-                                      v-model="formData.location"
-                                      filterable
-                                      remote
-                                      :reserve-keyword="true"
-                                      placeholder="请输入关键词"
-                                      :remote-method="remoteMethod"
-                                      :loading="loading"
-                                      @keyup.enter.native="remoteMethod(formData.location)"
-                                  >
-                                      <el-option
-                                          v-for="(item, index) in searchOptions"
-                                          @click.native="handleClickKey(index)"
-                                          :key="item.value"
-                                          :label="item.label"
-                                          :value="item.value"
-                                      ></el-option>
-                                  </el-select>
-                              </el-form-item>
-                <div id="app_event"
-                     class="div_map"></div>
-              </div>
-            </el-form-item>
-  
-            <el-form-item label="详细地址"
-                          prop="address"
-                          label-width="150px"
-                          style="display: block">
-              <el-input class="cell-width-1"
-                        v-model="formData.address">
-              </el-input>
-            </el-form-item>
-          </el-form>
-        </div>
+          <div class="g-left">
+              <el-form ref="ref_form1"
+                 :inline="true"
+                 :model="formData"
+                 :rules="dataRule"
+                 class="form">
+          <el-form-item label="所属网格"
+                        prop="gridId"
+                        label-width="150px"
+                        style="display: block">
+            <el-select v-model.trim="formData.gridId"
+                       placeholder="请选择"
+                       clearable
+                       class="cell-width-1">
+              <el-option v-for="item in gridList"
+                         :key="item.value"
+                         :label="item.label"
+                         :value="item.value">
+              </el-option>
+            </el-select>
+          </el-form-item>
+
+          <el-form-item label="上报人"
+                        prop="name"
+                        label-width="150px"
+                        style="display: block">
+            <el-input class="cell-width-1"
+                      maxlength="10"
+                      placeholder="请输入上报人姓名"
+                      v-model="formData.name">
+            </el-input>
+            <div>
+              <el-button style="margin-top: 10px"
+                         type="primary"
+                         size="mini"
+                         @click="handleShowPersonList">居民信息中选择</el-button>
+            </div>
+          </el-form-item>
+          <el-form-item label="联系电话"
+                        prop="mobile"
+                        label-width="150px"
+                        style="display: block">
+            <el-input class="cell-width-1"
+                      maxlength="30"
+                      placeholder="请输入联系电话	"
+                      v-model="formData.mobile">
+            </el-input>
+          </el-form-item>
+
+          <el-form-item label="证件号"
+                        prop="idCard"
+                        label-width="150px"
+                        style="display: block">
+            <el-input class="cell-width-1"
+                      maxlength="30"
+                      placeholder="请输入证件号"
+                      v-model="formData.idCard"></el-input>
+          </el-form-item>
+
+          <el-form-item label="反应渠道"
+                        label-width="150px"
+                        prop="sourceType">
+            <el-select v-model="formData.sourceType"
+                       placeholder="请选择"
+                       size="small"
+                       clearable
+                       class="cell-width-1">
+              <el-option v-for="item in qudaoArray"
+                         :key="item.value"
+                         :label="item.label"
+                         :value="item.value">
+              </el-option>
+            </el-select>
+          </el-form-item>
+
+          <el-form-item label="上报时间"
+                        prop="happenTime"
+                        label-width="150px"
+                        style="display: block">
+            <el-date-picker v-model="formData.happenTime"
+                            class="cell-width-1"
+                            type="datetime"
+                            placeholder="上报时间"
+                            value-format="yyyy-MM-dd HH:mm:ss">
+            </el-date-picker>
+          </el-form-item>
+
+          <el-form-item label="事件内容"
+                        prop="eventContent"
+                        label-width="150px"
+                        style="display: block">
+            <el-input class="cell-width-2"
+                      type="textarea"
+                      maxlength="500"
+                      show-word-limit
+                      :rows="5"
+                      placeholder="请输入事件内容，不超过500字"
+                      v-model="formData.eventContent"></el-input>
+          </el-form-item>
+        </el-form>
+          </div>
+          <div class="g-right">
+              <el-form ref="ref_form2" :inline="true" :model="formData" :rules="dataRule" class="form">
+                  <el-form-item label="图片" label-width="150px" style="display: block">
+                      <el-upload :headers="$getElUploadHeaders()" :class="['avatar-uploader', { hide: hideUploadBtn }]"
+                          ref="uploadPic" :action="uploadUlr" :disabled="uploadStatus" list-type="picture-card"
+                          :on-exceed="exceedPic" :on-remove="removePic" :file-list="replayImgList"
+                          :on-change="handleEditChange" :on-success="handleSuccess" :before-upload="handleBefore"
+                          :limit="3">
+                          <span class="font-14">选择图片</span>
+                          <div slot="tip" class="upload_tip">
+                              最多上传3张图片，图片支持jpg、jpeg、bmp、git或png格式
+                          </div>
+                      </el-upload>
+                  </el-form-item>
+
+                  <el-form-item label="地图位置" prop="longitude" label-width="150px" style="display: block">
+                      <div style="width: 500px">
+                          <el-form-item prop="location" style="display: block">
+                              <el-select v-model="formData.location" filterable remote :reserve-keyword="true"
+                                  placeholder="请输入关键词" :remote-method="remoteMethod" :loading="loading"
+                                  @keyup.enter.native="remoteMethod(formData.location)">
+                                  <el-option v-for="(item, index) in searchOptions" @click.native="handleClickKey(index)"
+                                      :key="item.value" :label="item.label" :value="item.value"></el-option>
+                              </el-select>
+                          </el-form-item>
+                          <div id="app_event" class="div_map"></div>
+                      </div>
+                  </el-form-item>
+
+                  <el-form-item label="详细地址" prop="address" label-width="150px" style="display: block">
+                      <el-input class="cell-width-1" v-model="formData.address">
+                      </el-input>
+                  </el-form-item>
+              </el-form>
+          </div>
       </div>
-  
+
       <!-- 新增弹出框 -->
-      <el-dialog :visible.sync="personTableShow"
-                 :close-on-click-modal="false"
-                 :close-on-press-escape="false"
-                 :destroy-on-close="true"
-                 title="选择居民"
-                 width="550px"
-                 top="5vh"
-                 class="dialog-h"
-                 @closed="diaClose">
-        <div style="padding: 10px 30px">
-          <el-form :inline="false"
-                   ref="ref_formSearch"
-                   :label-width="'90px'">
-            <el-form-item label="所属网格"
-                          label-width="150px">
-              <el-select class="cell-width-1"
-                         v-model.trim="selGridId"
-                         placeholder="请选择"
-                         clearable>
-                <el-option v-for="item in gridList"
-                           @click.native="handleChangeGrid"
-                           :key=`abc-${value}`
-                           :label="item.label"
-                           :value="item.value">
-                </el-option>
-              </el-select>
-            </el-form-item>
-            <el-form-item label="居民"
-                          label-width="150px"
-                          prop="selPersonIndex">
-              <el-select v-model="selPersonIndex"
-                         class="cell-width-1"
-                         filterable
-                         placeholder="请选择"
-                         clearable>
-                <el-option v-for="(item, index) in demandUserList"
-                           :key="item.demandUserId"
-                           :label="item.label"
-                           :value="index">
-                </el-option>
-              </el-select>
-            </el-form-item>
-          </el-form>
-          <div class="div-btn">
-            <el-button style="margin-left: 20px"
-                       type="primary"
-                       size="small"
-                       @click="handleComfirmSelPerson">确定</el-button>
+      <!-- <el-dialog :visible.sync="personTableShow" :close-on-click-modal="false" :close-on-press-escape="false"
+          :destroy-on-close="true" title="选择居民" width="550px" top="5vh" class="dialog-h" @closed="diaClose">
+          <div style="padding: 10px 30px">
+              <el-form :inline="false" ref="ref_formSearch" :label-width="'90px'">
+                  <el-form-item label="所属网格" label-width="150px">
+                      <el-select class="cell-width-1" v-model.trim="selGridId" placeholder="请选择" clearable>
+                          <el-option v-for="item in gridList" @click.native="handleChangeGrid" :key="`abc-${value}`"
+                              :label="item.label" :value="item.value">
+                          </el-option>
+                      </el-select>
+                  </el-form-item>
+                  <el-form-item label="居民" label-width="150px" prop="selPersonIndex">
+                      <el-select v-model="selPersonIndex" class="cell-width-1" filterable placeholder="请选择" clearable>
+                          <el-option v-for="(item, index) in demandUserList" :key="item.demandUserId" :label="item.label"
+                              :value="index">
+                          </el-option>
+                      </el-select>
+                  </el-form-item>
+              </el-form>
+              <div class="div-btn">
+                  <el-button style="margin-left: 20px" type="primary" size="small"
+                      @click="handleComfirmSelPerson">确定</el-button>
+              </div>
           </div>
-        </div>
-      </el-dialog>
-    </div>
-  </template>
-  
-  <script>
-  import { Loading } from "element-ui"; // 引入Loading服务
-  import { requestPost } from "@/js/dai/request";
-  import formVltHelper from "dai-js/tools/formVltHelper";
-  import daiMap from "@/utils/dai-map";
-  import { isCard } from "@/utils/validate";
-  let loading; // 加载动画
-  var map;
-  var search;
-  var markers;
-  var infoWindowList;
-  var geocoder; // 新建一个正逆地址解析类
-  
-  function iniFmData () {
-    return {
-  
+      </el-dialog> -->
+  </div>
+</template>
+
+<script>
+import { Loading } from "element-ui"; // 引入Loading服务
+import { requestPost } from "@/js/dai/request";
+import formVltHelper from "dai-js/tools/formVltHelper";
+import daiMap from "@/utils/dai-map";
+import { isCard } from "@/utils/validate";
+let loading; // 加载动画
+var map;
+var search;
+var markers;
+var infoWindowList;
+var geocoder; // 新建一个正逆地址解析类
+
+function iniFmData() {
+  return {
       gridId: "", //所属网格
-      reportUserId: "", //	上报人ID
-      name: "", //	上报人姓名
-      mobile: "", //	联系电话
-      idCard: "", //	证件号
-      sourceType: "", //	反映渠道
-      happenTime: "", //上报时间
-      eventContent: "", //	事件内容
-      imageList: [], //	图片集合
-      // categoryList: [],//	二类分类Id
-      address: "", //事件地址
-      latitude: "", //	经度
-      longitude: "", //维度
-      // operationType: '',//	处理方式
+    reportUserId: "", //	上报人ID
+    name: "cc", //	上报人姓名
+    mobile: "17637255555", //	联系电话
+    idCard: "", //	证件号
+    sourceType: "", //	反映渠道
+    happenTime: "", //上报时间
+    eventContent: "", //	事件内容
+    imageList: [], //	图片集合
+    // categoryList: [],//	二类分类Id
+    address: "", //事件地址
+    latitude: "", //	经度
+    longitude: "", //维度
+      // operationType: '0',//	处理方式
       // content: '',//回复内容
       // status: '',//	处理中：processing；已办结：closed_case
-    };
-  }
-  
-  export default {
-    data () {
+  };
+}
+
+export default {
+  data() {
       return {
-        formType: "add", //表单操作类型 add新增，edit编辑，detail详情
-        searchOptions: [],
-        searchValue: '',
-        resultList: [],
-        loading: false,
-  
-        btnDisable: false,
-        gridList: [], //所属网格list--场所区域
-  
-        qudaoArray: [
-          {
-            value: "1",
-            label: "多媒体反应",
-          },
-          {
-            value: "2",
-            label: "社区电话",
-          },
-          {
-            value: "3",
-            label: "12345",
-          },
-          {
-            value: "4",
-            label: "网络员手持终端",
+          formType: "add", //表单操作类型 add新增，edit编辑，detail详情
+          searchOptions: [],
+          searchValue: '',
+          resultList: [],
+          loading: false,
+          btnDisable: false,
+          gridList: [], //所属网格list--场所区域
+          qudaoArray: [
+              {
+                  value: "1",
+                  label: "多媒体反应",
+              },
+              {
+                  value: "2",
+                  label: "社区电话",
+              },
+              {
+                  value: "3",
+                  label: "12345",
+              },
+              {
+                  value: "4",
+                  label: "网络员手持终端",
+              },
+          ],
+
+          formData: iniFmData(),
+
+          //地图相关
+          keyWords: "",
+          isFirst: true, //地图是否首次加载，首次加载不给地址赋值
+
+          //图片相关  oss/file/uploadvariedfile
+          dialogImageUrl: "oss/file/uploadvariedfile",
+          uploadUlr: window.SITE_CONFIG["apiURL"] + "/oss/file/uploadvariedfile",
+          //  upload_url: '', // 上传URL
+          upload_name: "", // 图片或视频名称
+          replayImgList: [],
+
+          okflag: false,
+          uploadStatus: false,
+
+          formDataSearch: {
+              gridId: "",
+              name: "",
           },
-        ],
-  
-        formData: iniFmData(),
-  
-        //地图相关
-        keyWords: "",
-        isFirst: true, //地图是否首次加载，首次加载不给地址赋值
-  
-        //图片相关  oss/file/uploadvariedfile
-        dialogImageUrl: "oss/file/uploadvariedfile",
-        uploadUlr: window.SITE_CONFIG["apiURL"] + "/oss/file/uploadvariedfile",
-        //  upload_url: '', // 上传URL
-        upload_name: "", // 图片或视频名称
-        replayImgList: [],
-  
-        okflag: false,
-        uploadStatus:false,
-  
-        formDataSearch: {
-          gridId: "",
-          name: "",
-        },
-        personTableShow: false,
-        selGridId: "",
-        selPersonIndex: "",
-        selPerson: {},
-        demandUserList: [],
-  
-        hideUploadBtn: false,
+          personTableShow: false,
+          selGridId: "",
+          selPersonIndex: "",
+          selPerson: {},
+          demandUserList: [],
+
+          hideUploadBtn: false,
       };
-    },
-    components: {},
-    computed: {
-      dataRule () {
-        let checkIdCard = (rule, value, callback) => {
-          if (value === "") {
-            callback(new Error("请输入证件号"));
-          } else {
-            if (!isCard(value)) {
-              callback(new Error("证件号格式不正确"));
-            }
-            callback();
-          }
-        };
-  
-        return {
-          gridId: [
-            { required: true, message: "所属网格不能为空", trigger: "blur" },
-          ],
-          name: [{ required: true, message: "上报人不能为空", trigger: "change" }],
-          mobile: [
-            { required: true, message: "联系电话不能为空", trigger: "blur" },
-          ],
-          // idCard: [
-          //   { required: true, message: "证件号不能为空", trigger: "blur" },
-          //   { required: true, validator: checkIdCard, trigger: "blur" },
-          // ],
-          sourceType: [
-            { required: true, message: "反映渠道不能为空", trigger: "blur" },
-          ],
-          eventContent: [
-            { required: true, message: "事件内容不能为空", trigger: "blur" },
-          ],
-          happenTime: [
-            { required: true, message: "上报时间不能为空", trigger: "blur" },
-          ],
-          address: [
-            { required: true, message: "事件地址不能为空", trigger: "blur" },
-          ],
-          longitude: [
-            { required: true, message: "坐标位置不能为空", trigger: "blur" },
-          ],
-        };
+  },
+  components: {},
+  computed: {
+      dataRule() {
+          return {
+              gridId: [
+          { required: true, message: "所属网格不能为空", trigger: "blur" },
+        ],
+        name: [{ required: true, message: "上报人不能为空", trigger: "change" }],
+        mobile: [
+          { required: true, message: "联系电话不能为空", trigger: "blur" },
+        ],
+        // idCard: [
+        //   { required: true, message: "证件号不能为空", trigger: "blur" },
+        //   { required: true, validator: checkIdCard, trigger: "blur" },
+        // ],
+        sourceType: [
+          { required: true, message: "反映渠道不能为空", trigger: "blur" },
+        ],
+        eventContent: [
+          { required: true, message: "事件内容不能为空", trigger: "blur" },
+        ],
+        happenTime: [
+          { required: true, message: "上报时间不能为空", trigger: "blur" },
+        ],
+        address: [
+          { required: true, message: "事件地址不能为空", trigger: "blur" },
+        ],
+        longitude: [
+          { required: true, message: "坐标位置不能为空", trigger: "blur" },
+        ],
+          };
       },
-    },
-    props: {},
-    watch: {
+  },
+  props: {},
+  watch: {
       "formData.name": function (val) {
-        this.$emit("changeName", val);
+          this.$emit("changeName", val);
       },
       "formData.mobile": function (val) {
-        this.$emit("changeMobile", val);
+          this.$emit("changeMobile", val);
       },
       "formData.reportUserId": function (val) {
-        this.$emit("changeUserId", val);
+          this.$emit("changeUserId", val);
       },
       "formData.gridId": function (val) {
-        this.selGridId = val;
-        this.$emit("changeGridId", val);
+          this.selGridId = val;
+          this.$emit("changeGridId", val);
       },
-    },
-  
-    async mounted () {
+  },
+
+  async mounted() {
       const { user } = this.$store.state;
       this.agencyId = user.agencyId;
-  
       let { latitude, longitude } = this.$store.state.user;
       if (!latitude || latitude == "" || latitude == "0") {
-        latitude = 39.9088810666821;
-        longitude = 116.39743841556731;
+          latitude = 39.9088810666821;
+          longitude = 116.39743841556731;
       }
-  
       this.formData.latitude = latitude;
       this.formData.longitude = longitude;
-  
-  
       this.initMap(this.formData.latitude, this.formData.longitude);
-  
-  
       this.loadGrid();
       this.getCategoryList();
-    },
-  
-    methods: {
-      async handleShowPersonList () {
-        if (this.formData.gridId) {
-          await this.handleChangeGrid();
-          this.personTableShow = true;
-        } else {
-          this.$message.info("请先选择网格");
-        }
-      },
-      diaClose () {
-        this.personTableShow = false;
+  },
+
+  methods: {
+      async handleShowPersonList() {
+          if (this.formData.gridId) {
+              await this.handleChangeGrid();
+              this.personTableShow = true;
+          } else {
+              this.$message.info("请先选择网格");
+          }
       },
-      handleComfirmSelPerson () {
-        if (this.selPersonIndex === 0 || this.selPersonIndex) {
-          let selPerson = this.demandUserList[this.selPersonIndex];
-          this.formData.name = selPerson.demandUserName;
-          this.formData.mobile = selPerson.demandUserMobile;
-          this.formData.reportUserId = selPerson.demandUserId;
-          this.formData.idCard = selPerson.idCard;
-  
+      diaClose() {
           this.personTableShow = false;
-        } else {
-          this.$message.info("请选择人员");
-        }
       },
-  
-      async handleChangeGrid () {
-        const url = "/epmetuser/icresiuser/demandusers";
-        // const url = "http://yapi.elinkservice.cn/mock/245/epmetuser/epidemicPrevention/page"
-        let params = {
-          agencyId: "",
-          gridId: this.selGridId,
-          name: "",
-        };
-  
-        const { data, code, msg } = await requestPost(url, params);
-  
-        if (code === 0) {
-          this.demandUserList = data;
-        } else {
-          this.$message.error(msg);
-        }
-        this.tableLoading = false;
+      handleComfirmSelPerson() {
+          if (this.selPersonIndex === 0 || this.selPersonIndex) {
+              let selPerson = this.demandUserList[this.selPersonIndex];
+              this.formData.name = selPerson.demandUserName;
+              this.formData.mobile = selPerson.demandUserMobile;
+              this.formData.reportUserId = selPerson.demandUserId;
+              this.formData.idCard = selPerson.idCard;
+
+              this.personTableShow = false;
+          } else {
+              this.$message.info("请选择人员");
+          }
       },
-  
-      async loadGrid () {
-        const url = "/gov/org/customergrid/gridoption";
-  
-        let params = {
-          agencyId: this.agencyId,
-          purpose: "addorupdate",
-        };
-  
-        const { data, code, msg } = await requestPost(url, params);
-  
-        if (code === 0) {
-          this.gridList = data;
-        } else {
-          this.$message.error(msg);
-        }
+
+      async handleChangeGrid() {
+          const url = "/epmetuser/icresiuser/demandusers";
+          // const url = "http://yapi.elinkservice.cn/mock/245/epmetuser/epidemicPrevention/page"
+          let params = {
+              agencyId: "",
+              gridId: this.selGridId,
+              name: "",
+          };
+
+          const { data, code, msg } = await requestPost(url, params);
+
+          if (code === 0) {
+              this.demandUserList = data;
+          } else {
+              this.$message.error(msg);
+          }
+          this.tableLoading = false;
       },
-      async getCategoryList () {
-        const url = "/governance/issueprojectcategorydict/list";
-  
-        let params = {};
-  
-        const { data, code, msg } = await requestPost(url, params);
-  
-        if (code === 0) {
-          let treeDataNew = this.filterTree(data);
-          // this.categrayList = data
-          //组织级联数据
-          ++this.iscascaderShow;
-          this.casOptions = [];
-          this.selCategoryArray = [];
-  
-          this.casOptions = treeDataNew;
-        } else {
-          this.$message.error(msg);
-        }
+
+      async loadGrid() {
+          const url = "/gov/org/customergrid/gridoption";
+          let params = {
+              agencyId: this.agencyId,
+              purpose: "query",
+          };
+          const { data, code, msg } = await requestPost(url, params);
+          if (code === 0) {
+              this.gridList = data;
+          } else {
+              this.$message.error(msg);
+          }
       },
-  
+      async getCategoryList() {
+          const url = "/governance/icEvent/getCategoryTree";
+          let params = {};
+          const { data, code, msg } = await requestPost(url, params);
+          if (code === 0) {
+              let treeDataNew = this.deepTree(data, "children");
+              // this.categrayList = data
+              //组织级联数据
+              ++this.iscascaderShow;
+              this.casOptions = [];
+              this.selCategoryArray = [];
+              this.casOptions = treeDataNew;
+          } else {
+              this.$message.error(msg);
+          }
+      },
+
       //重构树，去除网格
-      filterTree (arr) {
-        let childs = arr;
-        for (let i = childs.length; i--; i > 0) {
-          if (childs[i].subCategory) {
-            if (childs[i].subCategory.length) {
-              this.filterTree(childs[i].subCategory);
-            } else {
-              delete childs[i].subCategory;
-            }
+      deepTree(arr, children) {
+          if (Array.isArray(arr) && arr.length > 0) {
+              return arr.map((item) => {
+                  return {
+                      ...item,
+                      [children]:
+                          (item[children] &&
+                              item[children].length > 0 &&
+                              this.deepTree(item[children], children)) ||
+                          null,
+                  };
+              });
           }
-        }
-        return arr;
       },
-  
-      handleChangeAgency (value) {
-        // this.agencyName = this.$refs["myCascader"].getCheckedNodes()[0].label
-        // this.orgId = this.selCategoryArray.length > 0 ? this.selCategoryArray[this.selCategoryArray.length - 1] : ''
+
+      handleChangeAgency(value) {
+          // this.agencyName = this.$refs["myCascader"].getCheckedNodes()[0].label
+          // this.orgId = this.selCategoryArray.length > 0 ? this.selCategoryArray[this.selCategoryArray.length - 1] : ''
       },
-  
-      async getEventInfo () {
-        this.okflag = false;
-        this.$refs["ref_form1"].validate((valid, messageObj) => {
-          if (!valid) {
-            app.util.validateRule(messageObj);
-            return false;
-          } else {
-            this.$refs["ref_form2"].validate((valid, messageObj) => {
+
+      async getEventInfo() {
+          this.okflag = false;
+          this.$refs["ref_form1"].validate((valid, messageObj) => {
               if (!valid) {
-                app.util.validateRule(messageObj);
-                return false;
-              } else {
-                if (!formVltHelper.userOrMobile(this.formData.mobile)) {
-                  this.$message({
-                    type: "error",
-                    message: "联系电话格式有误",
-                  });
+                  app.util.validateRule(messageObj);
                   return false;
-                }
-  
-                const regCard = /(^\d{15}$)|(^\d{17}(\d|X)$)/; //证件号码为15位或者18位，15位时全为数字，18位前17位为数字，最后一位是校验位，可能为数字或字符X
-                if (
-                  this.formData.idCard &&
-                  regCard.test(this.formData.idCard) === false
-                ) {
-                  this.$message({
-                    type: "warning",
-                    message: "请输入正确的证件号码",
+              } else {
+                  this.$refs["ref_form2"].validate((valid, messageObj) => {
+                      if (!valid) {
+                          app.util.validateRule(messageObj);
+                          return false;
+                      } else {
+                          if (!formVltHelper.userOrMobile(this.formData.mobile)) {
+                              this.$message({
+                                  type: "error",
+                                  message: "联系电话格式有误",
+                              });
+                              return false;
+                          }
+
+                          const regCard = /(^\d{15}$)|(^\d{17}(\d|X)$)/; //证件号码为15位或者18位，15位时全为数字，18位前17位为数字，最后一位是校验位，可能为数字或字符X
+                          if (
+                              this.formData.idCard &&
+                              regCard.test(this.formData.idCard) === false
+                          ) {
+                              this.$message({
+                                  type: "warning",
+                                  message: "请输入正确的证件号码",
+                              });
+                              return false;
+                          }
+                          this.okflag = true;
+                      }
                   });
-                  return false;
-                }
-                this.okflag = true;
               }
-            });
-          }
-        });
+          });
       },
-  
-      removePic (file, fileList) {
-        this.formData.imageList.splice(
-          this.formData.imageList.findIndex((item) => item === file.url),
-          1
-        );
-        this.replayImgList.splice(
-          this.replayImgList.findIndex((item) => item.uid === file.uid),
-          1
-        );
-        this.hideUploadBtn = fileList.length >= 3;
+
+      removePic(file, fileList) {
+          this.formData.imageList.splice(
+              this.formData.imageList.findIndex((item) => item === file.url),
+              1
+          );
+          this.replayImgList.splice(
+              this.replayImgList.findIndex((item) => item.uid === file.uid),
+              1
+          );
+          this.hideUploadBtn = fileList.length >= 3;
       },
       // 最多上传3张图，超过时隐藏上传按钮
-      handleEditChange (file, fileList) {
-        this.hideUploadBtn = fileList.length >= 3;
+      handleEditChange(file, fileList) {
+          this.hideUploadBtn = fileList.length >= 3;
       },
-      exceedPic () {
-        this.$message.warning("最多上传3张预览图片");
+      exceedPic() {
+          this.$message.warning("最多上传3张预览图片");
       },
-      handleBefore(file){
-        if(this.uploadStatus){
-          return false
-        }
-        this.uploadStatus = true
-        return true
+      handleBefore(file) {
+          if (this.uploadStatus) {
+              return false
+          }
+          this.uploadStatus = true
+          return true
       },
-      handleSuccess (response, file, fileList) {
-        this.uploadStatus = false
-        this.replayImgList.push(file);
-        this.formData.imageList.push(response.data.url);
+      handleSuccess(response, file, fileList) {
+          this.uploadStatus = false
+          this.replayImgList.push(file);
+          this.formData.imageList.push(response.data.url);
       },
-  
+
       // 地图初始化函数，本例取名为init，开发者可根据实际情况定义
-      initMap (latitude, longitude) {
-        this.$nextTick(()=>{
-        map = new daiMap(
-          document.getElementById("app_event"),
-          { latitude, longitude },
-          {
-            zoom: 17.2, // 设置地图缩放级别
-            pitch: 43.5, // 设置俯仰角
-            rotation: 45, // 设置地图旋转角度
-          }
-        );
-  
-        // 监听地图平移结束
-        map.on("dragend", (e) => {
-          this.handleMoveCenter(e);
-        });
-  
-        map.setCenter(latitude, longitude);
-        map.setMarker(latitude, longitude);
-        })
-  
+      initMap(latitude, longitude) {
+          this.$nextTick(() => {
+              map = new daiMap(
+                  document.getElementById("app_event"),
+                  { latitude, longitude },
+                  {
+                      zoom: 17.2, // 设置地图缩放级别
+                      pitch: 43.5, // 设置俯仰角
+                      rotation: 45, // 设置地图旋转角度
+                  }
+              );
+
+              // 监听地图平移结束
+              map.on("dragend", (e) => {
+                  this.handleMoveCenter(e);
+              });
+
+              map.setCenter(latitude, longitude);
+              map.setMarker(latitude, longitude);
+          })
+
       },
-  
-  
-      async handleMoveCenter () {
-        //修改地图中心点
-        const { lat, lng } = map.getCenter();
-        this.formData.latitude = lat;
-        this.formData.longitude = lng;
-        map.setMarker(lat, lng);
-        this.$EventBus.$emit('map',{lat,lng})
-        let { msg, data } = await map.getAddress(lat, lng);
-        if (msg == "success") {
-          this.formData.address = data.address
-          this.searchValue = data.address
-          this.searchOptions = []
-  
-        }
+
+
+      async handleMoveCenter() {
+          //修改地图中心点
+          const { lat, lng } = map.getCenter();
+          this.formData.latitude = lat;
+          this.formData.longitude = lng;
+          map.setMarker(lat, lng);
+          this.$EventBus.$emit('map', { lat, lng })
+          let { msg, data } = await map.getAddress(lat, lng);
+          if (msg == "success") {
+              this.formData.address = data.address
+              this.searchValue = data.address
+              this.searchOptions = []
+
+          }
       },
-  
-      async remoteMethod (query) {
-        if (query !== '') {
-                  this.loading = true;
-                  const { msg, data } = await map.searchNearby(query);
-                  this.loading = false;
-                  this.resultList = [];
-                  if (msg == 'success' && data.resultList && data.resultList.length > 0) {
-                      if (data.resultList && data.resultList.length > 0) {
-                          this.resultList = data.resultList;
-                          this.searchOptions = this.resultList.map(item => {
-                              return { value: `${item.id}`, label: `${item.address + item.name}` };
-                          });
-                      }
-                  } else {
-                      this.searchOptions = [
-                          {
-                              value: '0',
-                              label: '未检索到结果'
-                          }
-                      ];
+
+      async remoteMethod(query) {
+          if (query !== '') {
+              this.loading = true;
+              const { msg, data } = await map.searchNearby(query);
+              this.loading = false;
+              this.resultList = [];
+              if (msg == 'success' && data.resultList && data.resultList.length > 0) {
+                  if (data.resultList && data.resultList.length > 0) {
+                      this.resultList = data.resultList;
+                      this.searchOptions = this.resultList.map(item => {
+                          return { value: `${item.id}`, label: `${item.address + item.name}` };
+                      });
                   }
               } else {
-                  this.searchOptions = [];
+                  this.searchOptions = [
+                      {
+                          value: '0',
+                          label: '未检索到结果'
+                      }
+                  ];
               }
+          } else {
+              this.searchOptions = [];
+          }
       },
-  
-      handleClickKey (index) {
-        let selPosition = this.resultList[index]
-        let lonlat = selPosition.lonlat.split(" ")
-        map.setCenter(lonlat[1], lonlat[0]);
-        map.setMarker(lonlat[1], lonlat[0]);
-        this.formData.latitude = lonlat[1];
-        this.formData.longitude = lonlat[0];
-        this.formData.address = selPosition.address + selPosition.name
+
+      handleClickKey(index) {
+          let selPosition = this.resultList[index]
+          let lonlat = selPosition.lonlat.split(" ")
+          map.setCenter(lonlat[1], lonlat[0]);
+          map.setMarker(lonlat[1], lonlat[0]);
+          this.formData.latitude = lonlat[1];
+          this.formData.longitude = lonlat[0];
+          this.formData.address = selPosition.address + selPosition.name
       },
-  
-      resetData () {
-        this.formData = iniFmData();
-        this.replayImgList = [];
-        this.searchValue = ''
-        this.searchOptions = []
-        this.resultList = []
+
+      resetData() {
+          this.formData = iniFmData();
+          this.replayImgList = [];
+          this.searchValue = ''
+          this.searchOptions = []
+          this.resultList = []
       },
       // 开启加载动画
-      startLoading () {
-        loading = Loading.service({
-          lock: true, // 是否锁定
-          text: "正在加载……", // 加载中需要显示的文字
-          background: "rgba(0,0,0,.7)", // 背景颜色
-        });
+      startLoading() {
+          loading = Loading.service({
+              lock: true, // 是否锁定
+              text: "正在加载……", // 加载中需要显示的文字
+              background: "rgba(0,0,0,.7)", // 背景颜色
+          });
       },
       // 结束加载动画
-      endLoading () {
-        // clearTimeout(timer);
-        if (loading) {
-          loading.close();
-        }
+      endLoading() {
+          // clearTimeout(timer);
+          if (loading) {
+              loading.close();
+          }
       },
-    },
-  };
-  </script>
-  <style lang="scss" scoped>
-  @import "@/assets/scss/modules/shequzhili/event-info.scss";
-  
-  .item_width_4 {
-    width: 350px;
-  }
-  
-  .div_map {
-    margin-top: 10px;
-  }
-  </style>
-  
-  <style lang="scss" scoped>
-  .el-dialog__body {
-    padding: 0 10px 20px !important;
-  }
-  
-  .hide {
-    .el-upload--picture-card {
+  },
+};
+</script>
+<style lang="scss" scoped>
+@import "@/assets/scss/modules/shequzhili/event-info.scss";
+
+.item_width_4 {
+  width: 350px;
+}
+
+.div_map {
+  margin-top: 10px;
+}
+</style>
+
+<style lang="scss" scoped>
+.el-dialog__body {
+  padding: 0 10px 20px !important;
+}
+
+.hide {
+  .el-upload--picture-card {
       display: none !important;
-    }
   }
-  </style>
-  
\ No newline at end of file
+}
+</style>
diff --git a/src/views/modules/shequzhili/eventOld/cpts/event-info.vue b/src/views/modules/shequzhili/eventOld/cpts/event-info.vue
index de16dfb1f..620928a76 100644
--- a/src/views/modules/shequzhili/eventOld/cpts/event-info.vue
+++ b/src/views/modules/shequzhili/eventOld/cpts/event-info.vue
@@ -2,7 +2,15 @@
   <div class="">
     <div v-if="pageTypeCopy == 'add'">
       <el-card>
-        <h3 class="h3-title"><img src="../../../../../assets/images/index/title-icon-zntb.png" width="30px" height="30px" alt=""> 新增事件</h3>
+        <h3 class="h3-title">
+          <img
+            src="../../../../../assets/images/index/title-icon-zntb.png"
+            width="30px"
+            height="30px"
+            alt=""
+          />
+          新增事件
+        </h3>
         <event-add
           ref="ref_add"
           @changeName="changeName"
@@ -14,7 +22,15 @@
 
       <div class="process-form">
         <el-card>
-          <h3 class="h3-title"><img src="../../../../../assets/images/index/title-icon-chuli.png" width="30px" height="30px" alt=""> 处理</h3>
+          <h3 class="h3-title">
+            <img
+              src="../../../../../assets/images/index/title-icon-chuli.png"
+              width="30px"
+              height="30px"
+              alt=""
+            />
+            处理
+          </h3>
           <process-form
             ref="ref_processinfo_add"
             :demandUserId="demandUserId"
@@ -53,7 +69,15 @@
           查看详情</el-button
         >
       </div>
-      <div :class="['g-total', { 'g-left': projectProcess.length > 0,'g-left-top40':pageType =='info' }]">
+      <div
+        :class="[
+          'g-total',
+          {
+            'g-left': projectProcess.length > 0,
+            'g-left-top40': pageType == 'info',
+          },
+        ]"
+      >
         <event-detail
           ref="ref_detail"
           :type="pageType"
@@ -77,7 +101,13 @@
                 { 'process-title-vis': source === 'visiual' },
               ]"
             >
-            <img src="../../../../../assets/images/index/title-icon-chuli.png" width="30px" height="30px" alt=""> 处理 
+              <img
+                src="../../../../../assets/images/index/title-icon-chuli.png"
+                width="30px"
+                height="30px"
+                alt=""
+              />
+              处理
             </div>
             <process-form
               ref="ref_processinfo_dispose"
@@ -100,7 +130,10 @@
         </div>
       </div>
 
-      <div v-if="projectProcess.length > 0" :class="['g-right',pageType == 'info'?'g-right-top40':'']">
+      <div
+        v-if="projectProcess.length > 0"
+        :class="['g-right', pageType == 'info' ? 'g-right-top40' : '']"
+      >
         <el-card
           :class="{ 'box-card': source === 'visiual' }"
           style="min-height: calc(88vh - 50px); overflow: auto"
@@ -463,68 +496,46 @@ export default {
       } else {
         return false;
       }
-
       console.log("eventInfo", this.eventInfoData);
 
       this.$refs.ref_processinfo_add.getProcessInfo();
       // if (this.$refs.ref_processinfo_add.okflag) {
 
+      // this.formData.operationType =
+      //   this.$refs.ref_processinfo_add.operationType;
+      // this.eventInfoData.operationType =
+      //   this.$refs.ref_processinfo_add.operationType;
+      this.$refs.ref_processinfo_add.getProcessInfo();
       this.formData.operationType =
         this.$refs.ref_processinfo_add.operationType;
       this.eventInfoData.operationType =
         this.$refs.ref_processinfo_add.operationType;
-
-      if (this.formData.operationType === "0") {
-        this.project = {};
-        this.demand = {};
+      if (
+        this.formData.operationType === "0" ||
+        this.formData.operationType === "2" ||
+        this.formData.operationType === "6"
+      ) {
         this.replayInfo = this.$refs.ref_processinfo_add.replayInfo;
-        console.log("replayInfo", this.replayInfo);
-
         //回复属性赋值
         this.eventInfoData.content = this.replayInfo.content;
         this.eventInfoData.status = this.replayInfo.status;
+        this.eventInfoData.timeLimit = this.replayInfo.timeLimit;
         if (this.replayInfo.categoryId) {
           this.eventInfoData.categoryList = [];
           this.eventInfoData.categoryList.push(this.replayInfo.categoryId);
         }
-      } else if (this.formData.operationType === "1") {
-        this.replayInfo = {};
-        this.demand = {};
-        this.project = this.$refs.ref_processinfo_add.project;
-        //项目的属性同事件一样
-        this.project.gridId = this.eventInfoData.gridId;
-
-        if (this.project.categoryList && this.project.categoryList.length > 0) {
+      } else if (this.formData.operationType === "5") {
+        this.replayInfo = this.$refs.ref_processinfo_add.replayInfo;
+        //回复属性赋值
+        this.eventInfoData.content = this.replayInfo.content;
+        this.eventInfoData.status = this.replayInfo.status;
+        this.eventInfoData.timeLimit = this.replayInfo.timeLimit;
+        if (this.replayInfo.categoryId) {
           this.eventInfoData.categoryList = [];
-          this.eventInfoData.categoryList.push(this.project.categoryList[0].id);
+          this.eventInfoData.categoryList.push(this.replayInfo.categoryId);
         }
-
-        console.log("projectInfo", this.project);
-      } else if (this.formData.operationType === "2") {
-        this.replayInfo = {};
-        this.project = {};
-        this.demand = this.$refs.ref_processinfo_add.demand;
-        this.demand.gridId = this.eventInfoData.gridId;
-        //需求的属性同事件一样
-        // this.eventInfoData.categoryList = []
-        // this.eventInfoData.categoryList.push(this.demand.categoryId)
-        console.log("demond", this.demand);
-      } else if (this.formData.operationType === "3") {
-        this.project = {};
-        this.demand = {};
+      } else if (this.formData.operationType === "4") {
         this.replayInfo = {};
-        this.issueInfo = this.$refs.ref_processinfo_add.issueInfo;
-
-        if (
-          this.issueInfo.categoryList &&
-          this.issueInfo.categoryList.length > 0
-        ) {
-          this.eventInfoData.categoryList = [];
-          this.eventInfoData.categoryList.push(
-            this.issueInfo.categoryList[0].id
-          );
-        }
-        console.log("issueInfo", this.issueInfo);
       }
 
       // }
@@ -542,12 +553,13 @@ export default {
     },
 
     async submit() {
+      //  (this.formData.operationType == 2 && this.demand.demandUserName) ||(this.formData.operationType == 3 && this.issueInfo.issueTitle) || (this.formData.operationType == 1 && this.project.categoryList) ||(this.formData.operationType == 0 && this.eventInfoData.content) ||
       if (
-        (this.formData.operationType == 3 && this.issueInfo.issueTitle) ||
-        (this.formData.operationType == 2 && this.demand.demandUserName) ||
-        (this.formData.operationType == 1 && this.project.categoryList) ||
-        (this.formData.operationType == 0 && this.eventInfoData.content) ||
-        this.formData.operationType == 4
+        this.formData.operationType == "4" ||
+        this.formData.operationType == "5" ||
+        this.formData.operationType == "6" ||
+        this.formData.operationType == "0" ||
+        this.formData.operationType == "2"
       ) {
         const url = "/governance/icEventOld/add";
         const { formData } = this;
diff --git a/src/views/modules/shequzhili/eventOld/cpts/process-form-designate.vue b/src/views/modules/shequzhili/eventOld/cpts/process-form-designate.vue
index 0c3af3a14..a87027c5c 100644
--- a/src/views/modules/shequzhili/eventOld/cpts/process-form-designate.vue
+++ b/src/views/modules/shequzhili/eventOld/cpts/process-form-designate.vue
@@ -13,7 +13,7 @@
                 prop="categoryList">
                 <div :class="{ 'visiual-form': source === 'visiual' }">
                     <el-cascader class="cell-width-2" ref="myCascader" v-model="selCategoryArray" :key="iscascaderShow"
-                        :options="casOptions" :props="optionProps" :show-all-levels="false"
+                        :options="casOptions" :props="optionProps" :show-all-levels="false" clearable
                         @change="handleChangeCate"></el-cascader>
                 </div>
             </el-form-item>
@@ -28,6 +28,15 @@
                         placeholder="请输入转办意见，不超过500字" v-model="formData.content"></el-input>
                 </div>
             </el-form-item>
+            <el-form-item style="display: block" label="附件" label-width="150px" prop="attach">
+                <el-upload :headers="$getElUploadHeaders()" class="upload-demo" :action="uploadUlr"
+                    accept=".doc,.pdf,.xls,.docx,.xlsx,.jpg,.png,.jpeg,.bmp,.mp4,.wma,.m4a,.mp3"
+                    :on-success="handleFileSuccess" :on-remove="handleFileRemove" :on-preview="handleFileDownload"
+                    :limit="3" :before-upload="beforeUpload" :file-list="fileList">
+                    <el-button size="small" :disabled="fileList.length === 3" type="primary">点击上传</el-button>
+                    <div slot="tip" class="el-upload__tip">支持图片、word、pdf</div>
+                </el-upload>
+            </el-form-item>
             <el-form-item label="办结时限" prop="timeLimit" label-width="150px" :class="{ 'form-item': source === 'visiual' }"
                 style="display: block">
                 <div :class="{ 'visiual-form': source === 'visiual' }">
@@ -55,7 +64,8 @@ export default {
                 categoryId: "",//事件分类
                 deptId: "", //指派部门
                 deptName: "",
-                categoryList: []
+                categoryList: [],
+                files: [] //附件
             },
             orgOptions: [],
             orgOptionProps: {
@@ -71,12 +81,15 @@ export default {
             eventDetailCopy: {},
             selCategoryArray: [],
             casOptions: [],
+            fileList: [],
+            uploadUlr: window.SITE_CONFIG["apiURL"] + "/oss/file/uploadvariedfile",
             iscascaderShow: 0,
             optionProps: {
                 multiple: false,
                 value: "id",
-                label: "name",
-                children: "subCategory",
+                label: "categoryName",
+                children: "children",
+                checkStrictly: true
             },
             dataRule: {
                 content: [
@@ -90,10 +103,13 @@ export default {
                 ],
                 timeLimit: [
                     { required: true, message: "办结时限不能为空", trigger: "blur" },
+                ],
+                categoryList: [
+                    { required: true, message: '事件分类不能为空', trigger: 'blur' },
                 ]
             },
-            selCateObj:{
-                id:""
+            selCateObj: {
+                id: ""
             },
         };
     },
@@ -126,12 +142,11 @@ export default {
         this.getCategoryList();
         if (this.eventId) {
             this.eventDetailCopy = JSON.parse(JSON.stringify(this.eventDetailData));
-            console.log(this.eventDetailCopy);
             // 这一步接收到eventDetailCopy在这里回填
             if (this.eventDetailCopy.parentCategoryId && this.eventDetailCopy.categoryId) {
-                this.selCateObj.id = this.eventDetailCopy.categoryId
-                this.formData.categoryId = this.eventDetailCopy.categoryId
-                this.selCategoryArray.push(this.eventDetailCopy.parentCategoryId, this.eventDetailCopy.categoryId)
+                this.selCategoryArray = this.eventDetailCopy.parentCategoryId.split(",");
+                this.selCategoryArray.push(this.eventDetailCopy.categoryId);
+                this.handleChangeCate(this.selCategoryArray)
             }
         }
     },
@@ -152,18 +167,40 @@ export default {
             }
         },
         async getCategoryList() {
-            const url = "/governance/issueprojectcategorydict/list";
+            const url = '/governance/icEvent/getCategoryTree';
             let params = {};
             const { data, code, msg } = await requestPost(url, params);
             if (code === 0) {
-                let treeDataNew = this.filterTree(data);
-                //组织级联数据
+                let treeDataNew = this.deepTree(data, "children");
                 ++this.iscascaderShow;
                 this.casOptions = [];
                 this.casOptions = treeDataNew;
             } else {
                 this.$message.error(msg);
             }
+            if (this.eventDetailCopy.parentCategoryId) {
+                const pids = this.eventDetailCopy.parentCategoryId.split(',');
+                pids.push(this.eventDetailCopy.categoryId);
+                let nodes = this.casOptions;
+                for (let i = 0; i < pids.length; i++) {
+                    nodes = this.buildNode(nodes, pids[i])
+                }
+                if (nodes) {
+                    this.formData.categoryList.push(nodes)
+                    this.selCateObj = nodes
+                }
+            }
+        },
+        buildNode(nodes, treeId) {
+            for (let i = 0; i < nodes.length; i++) {
+                if (nodes[i].id === treeId) {
+                    if (nodes[i].children) {
+                        return nodes[i].children
+                    } else {
+                        return nodes[i]
+                    }
+                }
+            }
         },
         handleChangeAgency(val) {
             let obj = this.$refs["agencyIdArray"].getCheckedNodes()[0].data
@@ -171,7 +208,6 @@ export default {
                 this.formData.orgType = obj.level === 'grid' ? 'grid' : 'agency'
                 this.formData.deptId = obj.agencyId
                 this.formData.deptName = obj.agencyName
-
             } else {
                 this.form.orgType = ''
                 this.form.orgId = ''
@@ -180,25 +216,26 @@ export default {
         handleChangeCate() {
             if (this.selCateObj = this.$refs["myCascader"].getCheckedNodes()[0]) {
                 this.selCateObj = this.$refs["myCascader"].getCheckedNodes()[0].data
+                this.formData.categoryList = this.selCateObj
                 this.formData.categoryId = this.selCateObj.id
-                console.log(this.formData.categoryId,'this.formData.categoryId');
             } else {
                 this.selCateObj = {}
             }
         },
         //重构树，去除网格
-        filterTree(arr) {
-            let childs = arr;
-            for (let i = childs.length; i--; i > 0) {
-                if (childs[i].subCategory) {
-                    if (childs[i].subCategory.length) {
-                        this.filterTree(childs[i].subCategory);
-                    } else {
-                        delete childs[i].subCategory;
-                    }
-                }
+        deepTree(arr, children) {
+            if (Array.isArray(arr) && arr.length > 0) {
+                return arr.map((item) => {
+                    return {
+                        ...item,
+                        [children]:
+                            (item[children] &&
+                                item[children].length > 0 &&
+                                this.deepTree(item[children], children)) ||
+                            null,
+                    };
+                });
             }
-            return arr;
         },
         async getReplayInfo() {
             this.okflag = false;
@@ -206,11 +243,13 @@ export default {
                 if (!valid) {
                     app.util.validateRule(messageObj);
                 } else {
-                    console.log(this.selCateObj);
                     if (!this.selCateObj || !this.selCateObj.id) {
                         this.$message.error("请选择事件分类");
                         return false;
                     }
+                    if (this.fileList) {
+                        this.formData.files = this.fileList
+                    }
                     this.formData.status = "processing";
                     this.formData.categoryId = this.selCateObj.id;
                     this.formData.categoryList = [];
@@ -222,6 +261,74 @@ export default {
         resetData() {
             this.agencyIdArray = []
         },
+        beforeUpload(file) {
+            const array = file.name.split(".");
+            const extension = array[array.length - 1];
+            const formatarray = [
+                "jpg",
+                "png",
+                "jpeg",
+                "bmp",
+                "mp4",
+                "wma",
+                "m4a",
+                "mp3",
+                "doc",
+                "docx",
+                "xls",
+                "xlsx",
+                "pdf",
+            ];
+            if (formatarray.indexOf(extension) === -1) {
+                this.$message.error("只支持图片、word、pdf");
+                return false;
+            }
+        },
+        handleFileRemove(file) {
+            if (file && file.status === "success") {
+                this.fileList.splice(
+                    this.fileList.findIndex((item) => item.uid === file.uid),
+                    1
+                );
+            }
+        },
+        handleFileSuccess(res, file) {
+            if (res.code === 0 && res.msg === "success") {
+                const array = file.name.split(".");
+                const fileType = array[array.length - 1];
+                const picArray = ["jpg", "png", "jpeg", "bmp"];
+                const videoarray = ["mp4", "wma", "m4a"];
+                const docArray = ["doc", "docx", "xls", "xlsx", "pdf"];
+                const mp3Array = ["mp3"];
+
+                if (picArray.indexOf(fileType) > -1) {
+                    file.attachmentFormat = "image";
+                } else if (videoarray.indexOf(fileType) > -1) {
+                    file.attachmentFormat = "video";
+                } else if (docArray.indexOf(fileType) > -1) {
+                    file.attachmentFormat = "doc";
+                } else if (mp3Array.indexOf(fileType) > -1) {
+                    file.attachmentFormat = "voice";
+                }
+
+                file.url = res.data.url;
+                file.type = fileType;
+
+                file.attachmentName = file.name;
+                file.attachmentType = file.type;
+                file.attachmentUrl = file.url;
+
+                this.fileList.push(file);
+            } else this.$message.error(res.msg);
+        },
+        //下载
+        handleFileDownload(file) {
+            var a = document.createElement("a");
+            var event = new MouseEvent("click");
+            a.download = file.name;
+            a.href = file.url;
+            a.dispatchEvent(event);
+        },
         // 开启加载动画
         startLoading() {
             loading = Loading.service({
diff --git a/src/views/modules/shequzhili/eventOld/cpts/process-form-replay-end.vue b/src/views/modules/shequzhili/eventOld/cpts/process-form-replay-end.vue
index 8f9fa93fa..a7ad2654f 100644
--- a/src/views/modules/shequzhili/eventOld/cpts/process-form-replay-end.vue
+++ b/src/views/modules/shequzhili/eventOld/cpts/process-form-replay-end.vue
@@ -1,8 +1,8 @@
 <!--
  * @Author: yanLu xgktv007@163.com
  * @Date: 2023-09-05 10:21:34
- * @LastEditors: yanLu xgktv007@163.com
- * @LastEditTime: 2023-09-05 10:21:34
+ * @LastEditors: mk 2403457699@qq.com
+ * @LastEditTime: 2023-11-02 18:42:22
  * @Description: 事件回复
  * 
  * 
@@ -14,7 +14,7 @@
                 prop="categoryList">
                 <div :class="{ 'visiual-form': source === 'visiual' }">
                     <el-cascader class="cell-width-2" ref="myCascader" v-model="selCategoryArray" :key="iscascaderShow"
-                        :options="casOptions" :props="optionProps" :show-all-levels="false"
+                        :options="casOptions" :props="optionProps" :show-all-levels="false" clearable
                         @change="handleChangeCate"></el-cascader>
                 </div>
             </el-form-item>
@@ -67,13 +67,14 @@ export default {
                 value: "id",
                 label: "categoryName",
                 children: "children",
+                checkStrictly: true
             },
             dataRule: {
                 content: [
                     { required: true, message: '回复内容不能为空', trigger: 'blur' },
                 ],
                 categoryList: [
-                    //   { required: true, message: '事件分类不能为空', trigger: 'blur' },
+                    { required: true, message: '事件分类不能为空', trigger: 'blur' },
                 ]
             }
         };
@@ -107,15 +108,16 @@ export default {
             this.eventDetailCopy = JSON.parse(JSON.stringify(this.eventDetailData));
             // 这一步接收到eventDetailCopy在这里回填
             if (this.eventDetailCopy.parentCategoryId && this.eventDetailCopy.categoryId) {
-                this.formData.categoryId = this.eventDetailCopy.categoryId
-                this.selCategoryArray.push(this.eventDetailCopy.parentCategoryId, this.eventDetailCopy.categoryId)
+                this.selCategoryArray = this.eventDetailCopy.parentCategoryId.split(",");
+                this.selCategoryArray.push(this.eventDetailCopy.categoryId);
+                this.handleChangeCate(this.selCategoryArray)
             }
         }
     },
 
     methods: {
         async getCategoryList() {
-            const url = '/governance/icEventOld/getCategoryTree';
+            const url = '/governance/icEvent/getCategoryTree';
             let params = {};
             const { data, code, msg } = await requestPost(url, params);
             if (code === 0) {
@@ -127,10 +129,33 @@ export default {
             } else {
                 this.$message.error(msg);
             }
+        if (this.eventDetailCopy.parentCategoryId) {
+                const pids = this.eventDetailCopy.parentCategoryId.split(',');
+                pids.push(this.eventDetailCopy.categoryId);
+                let nodes = this.casOptions;
+                for (let i = 0; i < pids.length; i++) {
+                    nodes = this.buildNode(nodes, pids[i])
+                }
+                if (nodes) {
+                    this.formData.categoryList.push(nodes)
+                }
+            }
+        },
+        buildNode(nodes, treeId) {
+            for (let i = 0; i < nodes.length; i++) {
+                if (nodes[i].id === treeId) {
+                    if (nodes[i].children) {
+                        return nodes[i].children
+                    } else {
+                        return nodes[i]
+                    }
+                }
+            }
         },
         handleChangeCate() {
             if (this.selCateObj = this.$refs['myCascader'].getCheckedNodes()[0]) {
                 this.selCateObj = this.$refs['myCascader'].getCheckedNodes()[0].data
+                this.formData.categoryList = this.selCateObj
             } else {
                 this.selCateObj = {}
             }
@@ -165,7 +190,7 @@ export default {
                     if (!this.formData.categoryId) {
                         this.formData.categoryId = this.selCateObj.id;
                     }
-                    if(this.fileList){
+                    if (this.fileList) {
                         this.formData.files = this.fileList
                     }
                     this.formData.categoryList = [];
diff --git a/src/views/modules/shequzhili/eventOld/cpts/process-form.vue b/src/views/modules/shequzhili/eventOld/cpts/process-form.vue
index d56fefb2f..7f6813484 100644
--- a/src/views/modules/shequzhili/eventOld/cpts/process-form.vue
+++ b/src/views/modules/shequzhili/eventOld/cpts/process-form.vue
@@ -1,67 +1,81 @@
 <template>
   <div class="">
     <div>
-
-      <el-form ref="ref_form1"
-               :inline="false"
-               :rules="dataRule"
-               class="form">
-
-        <el-form-item label="处理方式"
-                      label-width="150px"
-                      :class="{'form-item':source==='visiual'}"
-                      prop="operationType">
-          <el-radio-group :class="{'form-item':source==='visiual'}"
-                          v-model="operationType"
-                          @change="handleChangeOperationType">
-            <el-radio v-if="!eventId"
-                      label="4">暂不处理</el-radio>
+      <el-form ref="ref_form1" :inline="false" :rules="dataRule" class="form">
+        <el-form-item
+          label="处理方式"
+          label-width="150px"
+          :class="{ 'form-item': source === 'visiual' }"
+          prop="operationType"
+        >
+          <el-radio-group
+            :class="{ 'form-item': source === 'visiual' }"
+            v-model="operationType"
+            @change="handleChangeOperationType"
+          >
+            <el-radio v-if="!eventId" label="4">暂不处理</el-radio>
             <el-radio label="0">回复</el-radio>
-            <el-radio label="1">立项</el-radio>
+            <el-radio label="5">指派</el-radio>
+            <el-radio label="6">完成并回复</el-radio>
+            <!-- <el-radio label="1">立项</el-radio> -->
             <el-radio label="2">转服务</el-radio>
-            <el-radio label="3">转议题</el-radio>
-
+            <!-- <el-radio label="3">转议题</el-radio> -->
           </el-radio-group>
         </el-form-item>
-
       </el-form>
 
-      <div v-if="operationType==='0'">
-        <process-form-replay ref="ref_process_form_replay"
-                             :source="source"
-                             :eventDetailData="eventDetailData"
-                             :eventId="eventId"></process-form-replay>
+      <div v-if="operationType === '0'">
+        <process-form-replay
+          ref="ref_process_form_replay"
+          :source="source"
+          :eventDetailData="eventDetailData"
+          :eventId="eventId"
+        ></process-form-replay>
       </div>
-
-      <div v-if="operationType==='1'">
+      <div v-if="operationType === '5'">
+        <process-form-designate
+          ref="ref_process_form_designate"
+          :source="source"
+          :eventDetailData="eventDetailData"
+          :eventId="eventId"
+        ></process-form-designate>
+      </div>
+      <div v-if="operationType === '6'">
+        <process-form-replay-end
+          ref="ref_process_form_replay_end"
+          :source="source"
+          :eventDetailData="eventDetailData"
+          :eventId="eventId"
+        ></process-form-replay-end>
+      </div>
+      <!-- <div v-if="operationType==='1'">
         <process-form-project ref="ref_process_form_project"
                               :source="source"
                               :eventDetailData="eventDetailData"
                               :gridId="gridId"
                               :eventId="eventId"></process-form-project>
+      </div> -->
+
+      <div v-if="operationType === '2'">
+        <process-form-demand
+          ref="ref_process_form_demond"
+          :source="source"
+          :eventId="eventId"
+          :transferObj="transferObj"
+          :demandUserId="demandUserId"
+          :demandUserName="demandUserName"
+          :demandUserMobile="demandUserMobile"
+          :eventDetailData="eventDetailData"
+        ></process-form-demand>
       </div>
-
-      <div v-if="operationType==='2'">
-        <process-form-demand ref="ref_process_form_demond"
-                             :source="source"
-                             :eventId="eventId"
-                             :transferObj="transferObj"
-                             :demandUserId="demandUserId"
-                             :demandUserName="demandUserName"
-                             :demandUserMobile="demandUserMobile"
-                             :eventDetailData="eventDetailData"></process-form-demand>
-
-      </div>
-      <div v-if="operationType==='3'">
+      <!-- <div v-if="operationType==='3'">
         <process-form-issue ref="ref_process_form_issue"
                             :source="source"
                             :eventDetailData="eventDetailData"
                             :eventId="eventId"></process-form-issue>
 
-      </div>
-
+      </div> -->
     </div>
-
   </div>
 </template>
 
@@ -72,27 +86,26 @@ import processFormReplay from "./process-form-replay";
 import processFormProject from "./process-form-project";
 import processFormDemand from "./process-form-demand";
 import processFormIssue from "./process-form-issue";
-
+import processFormReplayEnd from "./process-form-replay-end";
+import processFormDesignate from "./process-form-designate";
 
 let loading; // 加载动画
 
 export default {
-  data () {
+  data() {
     return {
-
       casOptions: [],
       iscascaderShow: 0,
       selCategoryArray: [],
       selCateObj: {},
       optionProps: {
         multiple: false,
-        value: 'id',
-        label: 'name',
-        children: 'subCategory',
+        value: "id",
+        label: "name",
+        children: "subCategory",
       },
 
-      operationType: '',
-
+      operationType: "",
 
       replayInfo: {},
       demand: {},
@@ -101,30 +114,28 @@ export default {
       okflag: false,
 
       eventDetailCopy: {},
-      transferObj:{
-        latitude :"",
-        longitude :""
-      }
+      transferObj: {
+        latitude: "",
+        longitude: "",
+      },
     };
   },
   components: {
     processFormReplay,
     processFormProject,
     processFormDemand,
-    processFormIssue
+    processFormIssue,
+    processFormReplayEnd,
+    processFormDesignate,
   },
   computed: {
-    dataRule () {
+    dataRule() {
       return {
-
         operationType: [
           { required: true, message: "处理方式不能为空", trigger: "blur" },
         ],
-
       };
     },
-
-
   },
   props: {
     demandUserId: {
@@ -149,107 +160,89 @@ export default {
     },
     eventDetailData: {
       type: Object,
-      default () {
-        return {}
-      }
+      default() {
+        return {};
+      },
     },
-    source: {//展示来源：manage  管理平台    visiual  可视化平台
+    source: {
+      //展示来源：manage  管理平台    visiual  可视化平台
       type: String,
-      default: 'manage'
-    }
-  },
-
-  watch: {
-
+      default: "manage",
+    },
   },
 
-  created () {
-
-    console.log(this.source)
+  watch: {},
 
+  created() {
+    console.log(this.source);
   },
 
-  async mounted () {
-    const { user } = this.$store.state
-    this.agencyId = user.agencyId
+  async mounted() {
+    const { user } = this.$store.state;
+    this.agencyId = user.agencyId;
 
     if (this.eventId) {
       this.eventDetailCopy = JSON.parse(JSON.stringify(this.eventDetailData));
-
     }
-    if(this.eventDetailData.operationType){
-      this.operationType = this.eventDetailCopy.operationType
+    if (this.eventDetailData.operationType) {
+      this.operationType = this.eventDetailCopy.operationType;
       // this.getProcessInfo()
     }
-    this.$EventBus.$on('map',(val)=>{
-      this.transferObj.latitude = val.lat
-      this.transferObj.longitude = val.lng
-    })
+    this.$EventBus.$on("map", (val) => {
+      this.transferObj.latitude = val.lat;
+      this.transferObj.longitude = val.lng;
+    });
   },
 
   methods: {
-    handleChangeOperationType (val) {
-
+    handleChangeOperationType(val) {
+      this.operationType = val;
     },
-    async getProcessInfo () {
-      this.okflag = false
-      if (this.operationType === '0') {
-        this.$refs.ref_process_form_replay.getReplayInfo()
+    async getProcessInfo() {
+      this.okflag = false;
+      if (this.operationType === "0") {
+        this.$refs.ref_process_form_replay.getReplayInfo();
         if (this.$refs.ref_process_form_replay.okflag) {
-          this.replayInfo = this.$refs.ref_process_form_replay.formData
-
-          this.okflag = true
-
-        } else {
-          return false
-        }
-
-      } else if (this.operationType === '1') {
-        this.$refs.ref_process_form_project.getProjectInfo()
-        if (this.$refs.ref_process_form_project.okflag) {
-
-          this.project = this.$refs.ref_process_form_project.formData
-
-          //赋值分类信息
-          this.okflag = true
+          this.replayInfo = this.$refs.ref_process_form_replay.formData;
 
+          this.okflag = true;
         } else {
-          return false
+          return false;
         }
-      } else if (this.operationType === '2') {
-        this.$refs.ref_process_form_demond.getDemandInfo()
+      } else if (this.operationType === "2") {
+        this.$refs.ref_process_form_demond.getDemandInfo();
         if (this.$refs.ref_process_form_demond.okflag) {
-          this.demand = this.$refs.ref_process_form_demond.formData
-
-          this.okflag = true
+          this.demand = this.$refs.ref_process_form_demond.formData;
 
+          this.okflag = true;
         } else {
-          return false
+          return false;
         }
-      } else if (this.operationType === '3') {
-        this.$refs.ref_process_form_issue.getIssueInfo()
-        if (this.$refs.ref_process_form_issue.okflag) {
-          this.issueInfo = this.$refs.ref_process_form_issue.formData
-
-          this.okflag = true
-
-        } else {
-          return false
+      } else if (this.operationType === "5") {
+        this.$refs.ref_process_form_designate.getReplayInfo();
+        this.replayInfo = this.$refs.ref_process_form_designate.formData;
+        if (this.$refs.ref_process_form_designate.okflag) {
+          this.replayInfo = this.$refs.ref_process_form_designate.formData;
+          this.okflag = true;
         }
+      } else if (this.operationType === "6") {
+        this.$refs.ref_process_form_replay_end.getReplayInfo();
+        this.replayInfo = this.$refs.ref_process_form_replay_end.formData;
+        if (this.$refs.ref_process_form_replay_end.okflag) {
+          this.replayInfo = this.$refs.ref_process_form_replay_end.formData;
+          this.okflag = true;
+        }
+      } else if (this.formData.operationType === "4") {
+        this.replayInfo = {};
       }
-
     },
 
-
-    handleCancle () {
+    handleCancle() {
       this.resetData();
-
-    },
-    resetData () {
-
     },
+    resetData() {},
     // 开启加载动画
-    startLoading () {
+    startLoading() {
       loading = Loading.service({
         lock: true, // 是否锁定
         text: "正在加载……", // 加载中需要显示的文字
@@ -257,7 +250,7 @@ export default {
       });
     },
     // 结束加载动画
-    endLoading () {
+    endLoading() {
       // clearTimeout(timer);
       if (loading) {
         loading.close();