From 1a22013d13f485e73d4760e0e618eb8e304af993 Mon Sep 17 00:00:00 2001
From: 123456 <17862666717>
Date: Mon, 30 May 2022 14:54:58 +0800
Subject: [PATCH 01/21] =?UTF-8?q?fix:=E4=BF=AE=E6=94=B9=E7=BB=84=E7=BB=87?=
 =?UTF-8?q?=E6=9C=BA=E6=9E=84=E7=BA=A7=E8=81=94=E9=80=89=E6=8B=A9=E5=99=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../stats/factagencyuserhousedaily.vue        | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

diff --git a/src/views/modules/plugins/stats/factagencyuserhousedaily.vue b/src/views/modules/plugins/stats/factagencyuserhousedaily.vue
index 42e37b0c..8be6e5eb 100644
--- a/src/views/modules/plugins/stats/factagencyuserhousedaily.vue
+++ b/src/views/modules/plugins/stats/factagencyuserhousedaily.vue
@@ -4,7 +4,7 @@
       <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
         <el-form-item label="组织机构" label-width="100px"
                       prop="agencyId">
-          <el-select
+          <!-- <el-select
                   v-model.trim="dataForm.agencyId"
                   placeholder="请选择"
                   clearable
@@ -16,7 +16,14 @@
                     :value="item.agencyId"
             >
             </el-option>
-          </el-select>
+          </el-select> -->
+          <el-cascader
+            v-model.trim="dataForm.agencyId"
+            :options="optionsA"
+            :props="{ expandTrigger: 'hover',children:'subAgencyList',label:'agencyName',value:'agencyId' }"
+            @change="handleChange"
+            clearable>
+          </el-cascader>
         </el-form-item>
         <el-form-item label="入黑名单时间"
                       prop="startTime">
@@ -104,6 +111,14 @@ export default {
     }
   },
   methods: {
+    handleChange(value){
+      console.log(value[1])
+      if(Array.isArray(value) && value.length > 0){
+        this.dataForm.agencyId = value[1]
+      }else{
+        this.dataForm.agencyId = null
+      }
+    },
     getGridList() {
       const { user } = this.$store.state
       this.$http

From a1efe6df60e28a24ffed16ce587b9e5e5f1d3a4f Mon Sep 17 00:00:00 2001
From: 123456 <17862666717>
Date: Mon, 30 May 2022 15:09:34 +0800
Subject: [PATCH 02/21] =?UTF-8?q?fix:=E5=A2=9E=E5=8A=A0=E8=8A=82=E7=82=B9?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/plugins/stats/factagencyuserhousedaily.vue | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/views/modules/plugins/stats/factagencyuserhousedaily.vue b/src/views/modules/plugins/stats/factagencyuserhousedaily.vue
index 8be6e5eb..b12ab5ff 100644
--- a/src/views/modules/plugins/stats/factagencyuserhousedaily.vue
+++ b/src/views/modules/plugins/stats/factagencyuserhousedaily.vue
@@ -20,6 +20,7 @@
           <el-cascader
             v-model.trim="dataForm.agencyId"
             :options="optionsA"
+            ref="cascaderUnit"
             :props="{ expandTrigger: 'hover',children:'subAgencyList',label:'agencyName',value:'agencyId' }"
             @change="handleChange"
             clearable>
@@ -113,6 +114,8 @@ export default {
   methods: {
     handleChange(value){
       console.log(value[1])
+      const checkedNodes = this.$refs['cascaderUnit'].getCheckedNodes()
+      console.log(checkedNodes) // 获取当前点击的节点
       if(Array.isArray(value) && value.length > 0){
         this.dataForm.agencyId = value[1]
       }else{

From 4b930a06468c0963010e148ad7444bf89573fb28 Mon Sep 17 00:00:00 2001
From: 123456 <17862666717>
Date: Mon, 30 May 2022 16:10:07 +0800
Subject: [PATCH 03/21] =?UTF-8?q?fix:=E5=A2=9E=E5=8A=A0=E5=9B=9E=E6=98=BE?=
 =?UTF-8?q?=E5=92=8C=E4=B8=80=E7=BA=A7=E9=80=89=E6=8B=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../stats/factagencyuserhousedaily.vue        | 36 +++++++++----------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/src/views/modules/plugins/stats/factagencyuserhousedaily.vue b/src/views/modules/plugins/stats/factagencyuserhousedaily.vue
index b12ab5ff..7f0392fd 100644
--- a/src/views/modules/plugins/stats/factagencyuserhousedaily.vue
+++ b/src/views/modules/plugins/stats/factagencyuserhousedaily.vue
@@ -17,13 +17,13 @@
             >
             </el-option>
           </el-select> -->
-          <el-cascader
-            v-model.trim="dataForm.agencyId"
-            :options="optionsA"
-            ref="cascaderUnit"
-            :props="{ expandTrigger: 'hover',children:'subAgencyList',label:'agencyName',value:'agencyId' }"
-            @change="handleChange"
-            clearable>
+          <el-cascader ref="cascaderUnit" v-model.trim="dataForm.agencyId" :options="optionsA" :props="{ checkStrictly: true, expandTrigger: 'hover', emitPath: false,children:'subAgencyList',label:'agencyName',value:'agencyId'}">
+            <template slot-scope="{ node, data }">
+              <div @click="cascaderClick(data)">
+                <span>{{ data.agencyName }}</span>
+                <span v-if="!node.isLeaf"> ({{ data.subAgencyList.length }}) </span>
+              </div>
+            </template>
           </el-cascader>
         </el-form-item>
         <el-form-item label="入黑名单时间"
@@ -90,7 +90,7 @@ export default {
       timeRange: '',
       dataForm: {
         id: ''
-      }
+      },
     }
   },
   components: {
@@ -98,7 +98,7 @@ export default {
   },
   created () {
     this.getGridList()
-    this.getValiheList()
+    // this.getValiheList()
   },
   watch: {
     timeRange (val) {
@@ -112,15 +112,13 @@ export default {
     }
   },
   methods: {
-    handleChange(value){
-      console.log(value[1])
-      const checkedNodes = this.$refs['cascaderUnit'].getCheckedNodes()
-      console.log(checkedNodes) // 获取当前点击的节点
-      if(Array.isArray(value) && value.length > 0){
-        this.dataForm.agencyId = value[1]
-      }else{
-        this.dataForm.agencyId = null
-      }
+    cascaderClick (nodeData) {
+      this.dataForm.agencyId = nodeData.agencyId;
+      this.dataForm.level = nodeData.level
+      this.$refs.cascaderUnit.checkedValue = nodeData.agencyId;
+      this.$refs.cascaderUnit.computePresentText();
+      this.$refs.cascaderUnit.toggleDropDownVisible(false);
+      
     },
     getGridList() {
       const { user } = this.$store.state
@@ -133,6 +131,8 @@ export default {
                   console.log('获取查询详情成功', res.data)
                   // this.optionsA = res.data
                   this.optionsA.push(res.data)
+                  this.dataForm.agencyId = res.data.agencyId
+                  this.dataForm.level = res.data.level
                 }
               })
               .catch(() => {

From 0b5312d0189319d196b8c963954066f8e8c6471c Mon Sep 17 00:00:00 2001
From: 13176889840 <13176889840@163.com>
Date: Tue, 31 May 2022 08:53:24 +0800
Subject: [PATCH 04/21] dd

---
 src/views/modules/visual/communityParty/community.vue  | 6 +++---
 src/views/modules/visual/communityParty/dialogInfo.vue | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/views/modules/visual/communityParty/community.vue b/src/views/modules/visual/communityParty/community.vue
index ac60395b..3e24fb92 100644
--- a/src/views/modules/visual/communityParty/community.vue
+++ b/src/views/modules/visual/communityParty/community.vue
@@ -109,7 +109,7 @@
         </div>
       </div>
 
-      <div class="card-title mt20">
+      <div class="card-title mt40">
         <div class="second-title mt0">
           <div class="second-title-label">联建活动分类统计</div>
 
@@ -1298,7 +1298,7 @@ export default {
 .mt0 {
   margin: 0;
 }
-.mt20 {
-  margin-top: 20px;
+.mt40 {
+  margin-top: 40px;
 }
 </style>
diff --git a/src/views/modules/visual/communityParty/dialogInfo.vue b/src/views/modules/visual/communityParty/dialogInfo.vue
index db6d9541..c4160ff6 100644
--- a/src/views/modules/visual/communityParty/dialogInfo.vue
+++ b/src/views/modules/visual/communityParty/dialogInfo.vue
@@ -46,11 +46,11 @@
               <span class="item-field">活动时间：</span>
               <span>{{ info.activityTime }}</span>
             </div>
-            <div class="item">
+            <!-- <div class="item">
               <span class="item-field">活动坐标：</span>
               <span>经度：{{ info.latitude }} <br /> 
                     纬度：{{ info.longitude }}</span>
-            </div>
+            </div> -->
             <div class="item">
               <span class="item-field">活动地址：</span>
               <span>{{ info.address }}</span>

From 0c9980bd3d2c0fb8f190dfb1887ba046453751aa Mon Sep 17 00:00:00 2001
From: 13176889840 <13176889840@163.com>
Date: Tue, 31 May 2022 09:09:15 +0800
Subject: [PATCH 05/21] dd

---
 src/views/modules/visual/communityParty/community.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/views/modules/visual/communityParty/community.vue b/src/views/modules/visual/communityParty/community.vue
index 3e24fb92..79f533a5 100644
--- a/src/views/modules/visual/communityParty/community.vue
+++ b/src/views/modules/visual/communityParty/community.vue
@@ -1260,6 +1260,7 @@ export default {
 }
 .calc-h {
   height: calc(100vh - 240px);
+  padding-bottom: 20px;
 }
 .wd50 {
   width: 50%;

From 4d40dc1ed5f793472a477476f34880b94623b751 Mon Sep 17 00:00:00 2001
From: 13176889840 <13176889840@163.com>
Date: Tue, 31 May 2022 09:28:09 +0800
Subject: [PATCH 06/21] dd

---
 src/views/modules/communityParty/members/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/modules/communityParty/members/index.vue b/src/views/modules/communityParty/members/index.vue
index d2891de2..3077d9d7 100644
--- a/src/views/modules/communityParty/members/index.vue
+++ b/src/views/modules/communityParty/members/index.vue
@@ -483,7 +483,7 @@ export default {
     handleTimeChange (val) {
       if (val.length > 0) {
         this.searchForm.rdsjStartDate = val[0]
-        this.searchForm.rdsjEndDate = val[0]
+        this.searchForm.rdsjEndDate = val[1]
       } else {
         this.searchForm.rdsjStartDate = ''
         this.searchForm.rdsjEndDate = ''

From 9588eec73b8cbe9c3d4cbbe2c8179877b5181251 Mon Sep 17 00:00:00 2001
From: 123456 <17862666717>
Date: Tue, 31 May 2022 10:21:05 +0800
Subject: [PATCH 07/21] =?UTF-8?q?fix:=E4=BF=AE=E5=A4=8D=E7=BA=A7=E8=81=94?=
 =?UTF-8?q?=E9=80=89=E6=8B=A9=E5=99=A8=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../plugins/stats/factagencyuserhousedaily.vue | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/src/views/modules/plugins/stats/factagencyuserhousedaily.vue b/src/views/modules/plugins/stats/factagencyuserhousedaily.vue
index 7f0392fd..917751d6 100644
--- a/src/views/modules/plugins/stats/factagencyuserhousedaily.vue
+++ b/src/views/modules/plugins/stats/factagencyuserhousedaily.vue
@@ -1,6 +1,6 @@
 <template>
   <el-card shadow="never" class="aui-card--fill">
-    <div class="mod-__factAgencyUserHouseDaily}">
+    <div class="mode-block">
       <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
         <el-form-item label="组织机构" label-width="100px"
                       prop="agencyId">
@@ -17,9 +17,10 @@
             >
             </el-option>
           </el-select> -->
-          <el-cascader ref="cascaderUnit" v-model.trim="dataForm.agencyId" :options="optionsA" :props="{ checkStrictly: true, expandTrigger: 'hover', emitPath: false,children:'subAgencyList',label:'agencyName',value:'agencyId'}">
+          <el-cascader ref="cascaderUnit" v-model.trim="dataForm.agencyId" :options="optionsA" :props="{ checkStrictly: true, expandTrigger: 'hover', emitPath: false,children:'subAgencyList',label:'agencyName',value:'agencyId'}" popper-class="cascader-block">
             <template slot-scope="{ node, data }">
               <div @click="cascaderClick(data)">
+                <!-- <span class="block"></span> -->
                 <span>{{ data.agencyName }}</span>
                 <span v-if="!node.isLeaf"> ({{ data.subAgencyList.length }}) </span>
               </div>
@@ -142,3 +143,16 @@ export default {
   }
 }
 </script>
+<style>
+.block{ 
+  position: absolute;
+  left: 0px;
+  display: inline-block;
+  width: 35px;
+  height: 50px;
+  background: #fff;
+}
+.cascader-block .el-cascader-node>.el-radio{ 
+  display: none;
+}
+</style>

From 428665c5c3a17fca72abddfffb92185039ae4e66 Mon Sep 17 00:00:00 2001
From: ZhaoTongYao <531131322@qq.com>
Date: Tue, 31 May 2022 10:40:32 +0800
Subject: [PATCH 08/21] =?UTF-8?q?=E7=A0=94=E5=88=A4=E5=88=86=E6=9E=90?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3orgId=E5=92=8CorgType?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../visual/communityGovern/shijianfenlei/shijianfenleifenxi.vue | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/views/modules/visual/communityGovern/shijianfenlei/shijianfenleifenxi.vue b/src/views/modules/visual/communityGovern/shijianfenlei/shijianfenleifenxi.vue
index 970060f7..337b8d78 100644
--- a/src/views/modules/visual/communityGovern/shijianfenlei/shijianfenleifenxi.vue
+++ b/src/views/modules/visual/communityGovern/shijianfenlei/shijianfenleifenxi.vue
@@ -104,6 +104,8 @@
     </div>
     <event-info v-if="showProject"
                 :eventId="eventId"
+                :orgId="tableOrgId ? tableOrgId : orgId"
+                :orgType="tableOrgType ? tableOrgType : orgType"
                 @close="showProject = false" />
   </cpt-card>
 </template>

From 2fa1f0e1b6a90c3bb9c0af44bf028287e314351d Mon Sep 17 00:00:00 2001
From: jiangyy <jiang478938504@126.com>
Date: Tue, 31 May 2022 10:45:37 +0800
Subject: [PATCH 09/21] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/shequzhili/event/cpts/add.vue     | 31 ++++++-------------
 .../shequzhili/event/cpts/event-detail.vue    | 27 ++++++++++------
 .../shequzhili/event/cpts/event-info.vue      | 11 +++++--
 .../event/cpts/process-form-demand.vue        | 31 +++++++++----------
 .../event/cpts/process-form-project.vue       | 20 +++++++++---
 .../shequzhili/event/cpts/process-form.vue    |  5 +++
 .../modules/shequzhili/event/eventList.vue    |  6 ++--
 .../shijianchuli/event-info.vue               |  2 +-
 .../shijianchuli/shijianchulifenxi.vue        |  2 ++
 9 files changed, 78 insertions(+), 57 deletions(-)

diff --git a/src/views/modules/shequzhili/event/cpts/add.vue b/src/views/modules/shequzhili/event/cpts/add.vue
index 6c689aca..3bc96785 100644
--- a/src/views/modules/shequzhili/event/cpts/add.vue
+++ b/src/views/modules/shequzhili/event/cpts/add.vue
@@ -201,11 +201,11 @@
           <el-form-item label="所属网格"
                         label-width="150px">
             <el-select class="cell-width-1"
-                       disabled
-                       v-model.trim="formData.gridId"
+                       v-model.trim="selGridId"
                        placeholder="请选择"
                        clearable>
               <el-option v-for="item in gridList"
+                         @click.native="handleChangeGrid"
                          :key="item.value"
                          :label="item.label"
                          :value="item.value">
@@ -307,21 +307,7 @@ export default {
       ],
 
       formData: iniFmData(),
-      formDataTemp: {
-        address: "山东省青岛市市南区徐州路21号戊",
-        // categoryList: ["1015", "1016"],
-        eventContent: "asdfasdfasdfasdf",
-        gridId: "63d5ff92ea981b1c58e4914ac894c610",
-        happenTime: "2022-05-05 12:00:00",
-        idCard: "211103190909090909",
-        imageList: ["https://elink-esua-epdc.oss-cn-qingdao.aliyuncs.com/epmet/test/internal/20220518/0818246db4cc4ac7bcd84bea69a8b38c.png"],
-        latitude: 36.07120507831775,
-        longitude: 120.38806572319174,
-        mobile: "15111111111",
-        name: "张三",
-        reportUserId: "",
-        sourceType: "1",
-      },
+
 
 
       //地图相关
@@ -406,6 +392,10 @@ export default {
     "formData.reportUserId": function (val) {
       this.$emit("changeUserId", val)
     },
+    "formData.gridId": function (val) {
+      this.selGridId = val
+      this.$emit("changeGridId", val)
+    }
   },
 
   async mounted () {
@@ -415,9 +405,7 @@ export default {
     this.getCategoryList()
 
     this.initMap()
-    // this.formData = {
-    //   ...this.formDataTemp
-    // }
+
   },
 
   methods: {
@@ -442,7 +430,6 @@ export default {
         this.formData.mobile = selPerson.demandUserMobile
         this.formData.reportUserId = selPerson.demandUserId
         this.formData.idCard = selPerson.idCard
-        console.log(selPerson)
 
         this.personTableShow = false;
 
@@ -460,7 +447,7 @@ export default {
       // const url = "http://yapi.elinkservice.cn/mock/245/epmetuser/epidemicPrevention/page"
       let params = {
         agencyId: '',
-        gridId: this.formData.gridId,
+        gridId: this.selGridId,
         name: "",
       }
 
diff --git a/src/views/modules/shequzhili/event/cpts/event-detail.vue b/src/views/modules/shequzhili/event/cpts/event-detail.vue
index 2853aa23..4fa2288c 100644
--- a/src/views/modules/shequzhili/event/cpts/event-detail.vue
+++ b/src/views/modules/shequzhili/event/cpts/event-detail.vue
@@ -70,18 +70,29 @@
             <div class="line"
                  @click="handleToDemand">查看需求</div>
           </div>
+          <div v-if="info.satisfactionName"
+               class="info-prop">
+            <span class="info-title-2">满意度：</span>
+            <div @click="handleToDemand">{{info.satisfactionName}}</div>
+          </div>
 
         </div>
       </div>
 
-      <div v-if="info.operationId&&info.status!=='closed_case'"
+      <div v-if="info.operationId||!(info.status==='closed_case'&&!info.satisfactionName && user.id===info.createdUserId)"
            class="div-btn ">
         <el-button size="small"
                    @click="handleCloseEvent">关闭</el-button>
 
       </div>
+      <!-- <div class="div-btn ">
+        <el-button size="small"
+                   @click="handleCloseEvent">关闭</el-button>
+
+      </div> -->
     </el-card>
-    <el-card v-if=" info.status==='closed_case'">
+
+    <el-card v-if="info.status==='closed_case'&&!info.satisfactionName && user.id===info.createdUserId">
       <h3>满意度评价</h3>
       <div class="m-row">
         <div class="m-info">
@@ -106,13 +117,11 @@
         </div>
 
       </div>
-      <div v-if="info.operationId||info.status==='closed_case'"
-           class="div-btn ">
+      <div class="div-btn ">
 
         <el-button size="small"
                    @click="handleCloseEvent">关闭</el-button>
-        <el-button v-if="info.status==='closed_case'&&!info.satisfactionName && user.id===info.createdUserId"
-                   size="small"
+        <el-button size="small"
                    type="primary"
                    @click="handleComfirmSatisfy">确定</el-button>
 
@@ -225,9 +234,9 @@ export default {
       this.info = JSON.parse(JSON.stringify(this.eventDetailData));
 
       //如果已经评价过，进行回显
-      if (this.info.status === 'closed_case' && this.info.satisfactionName) {
-        this.changeSatisfyType(this.info.satisfaction)
-      }
+      // if (this.info.status === 'closed_case' && this.info.satisfactionName) {
+      //   this.changeSatisfyType(this.info.satisfaction)
+      // }
     }
     // this.getApiData();
 
diff --git a/src/views/modules/shequzhili/event/cpts/event-info.vue b/src/views/modules/shequzhili/event/cpts/event-info.vue
index b6569ada..6a1346c8 100644
--- a/src/views/modules/shequzhili/event/cpts/event-info.vue
+++ b/src/views/modules/shequzhili/event/cpts/event-info.vue
@@ -6,7 +6,8 @@
         <event-add ref="ref_add"
                    @changeName="changeName"
                    @changeMobile="changeMobile"
-                   @changeUserId="changeUserId"></event-add>
+                   @changeUserId="changeUserId"
+                   @changeGridId="changeGridId"></event-add>
       </el-card>
 
       <div class="process-form">
@@ -15,7 +16,8 @@
           <process-form ref="ref_processinfo_add"
                         :demandUserId="demandUserId"
                         :demandUserName="demandUserName"
-                        :demandUserMobile="demandUserMobile"></process-form>
+                        :demandUserMobile="demandUserMobile"
+                        :gridId="gridId"></process-form>
 
           <div class="div-btn ">
             <el-button size="small"
@@ -228,6 +230,7 @@ function iniData () {
     demandUserId: '',
     demandUserName: '',
     demandUserMobile: '',
+    gridId: '',
 
     eventDetailCopy: {},
 
@@ -306,6 +309,10 @@ export default {
 
       this.demandUserId = val
     },
+    changeGridId (val) {
+
+      this.gridId = val
+    },
 
     //加载组织数据
     async getProjectProcess () {
diff --git a/src/views/modules/shequzhili/event/cpts/process-form-demand.vue b/src/views/modules/shequzhili/event/cpts/process-form-demand.vue
index 3423c3d8..adc0abe1 100644
--- a/src/views/modules/shequzhili/event/cpts/process-form-demand.vue
+++ b/src/views/modules/shequzhili/event/cpts/process-form-demand.vue
@@ -207,22 +207,6 @@ export default {
       customerId: localStorage.getItem("customerId"),
       demandOptions: [],
       serviceOptions: [
-        {
-          label: "志愿者",
-          value: "volunteer",
-        },
-        //  {
-        //   label: '社会组织',
-        //   value: 'social_org'
-        // },
-        {
-          label: "社区自组织",
-          value: "community_org",
-        },
-        {
-          label: "区域党建单位",
-          value: "party_unit",
-        },
       ],
       serviceOptiondList: [],
 
@@ -331,6 +315,7 @@ export default {
     this.agencyId = user.agencyId
     this.getCategoryList();
     this.getDemandOptions();
+    this.getServiceOption()
     // this.formData = { ...this.formDataTemp }
     this.initMap()
 
@@ -428,6 +413,20 @@ export default {
 
     },
 
+    async getServiceOption () {
+      const url = "/sys/dict/data/dictlist"
+      let params = { dictType: "user_demand_service_type", }
+
+      const { data, code, msg } = await requestPost(url, params)
+      if (code === 0) {
+        this.serviceOptions = data;
+
+      } else {
+        this.$message.error(msg)
+      }
+
+    },
+
     getTreeData (data) {
       if (!Array.isArray(data)) return [];
       let arr = data.map((item) => {
diff --git a/src/views/modules/shequzhili/event/cpts/process-form-project.vue b/src/views/modules/shequzhili/event/cpts/process-form-project.vue
index 7aafae75..8309e930 100644
--- a/src/views/modules/shequzhili/event/cpts/process-form-project.vue
+++ b/src/views/modules/shequzhili/event/cpts/process-form-project.vue
@@ -128,14 +128,15 @@
           </div>
         </fold-text>
 
-        <el-popover placement="bottom"
-                    width="400"
-                    height="400"
+        <el-popover placement="top"
+                    width="450"
+                    height="450"
                     v-model="visibleTagPanel">
           <div class="f"
                style="min-height: 120px">
             <h2>选择标签</h2>
-            <el-select v-model="selectedTagData"
+            <el-select style="width: 350px"
+                       v-model="selectedTagData"
                        multiple
                        allow-create
                        filterable
@@ -298,6 +299,10 @@ export default {
 
   },
   props: {
+    gridId: {//新增是选择的网格id
+      type: String,
+      default: "",
+    },
     eventId: {
       type: String,
       default: "",
@@ -310,6 +315,11 @@ export default {
     },
   },
   watch: {
+    gridId: function (val) {
+
+      this.formData.gridId = val
+
+    },
     "formData.assistanceUnitIndex": function (val) {
 
       if (val === "" || this.assistanceUnitList.length === 0) {
@@ -365,6 +375,7 @@ export default {
     // this.formData = { ...this.formDataTemp }
     if (this.eventId) {
       this.eventDetailCopy = JSON.parse(JSON.stringify(this.eventDetailData));
+      this.formData.gridId = this.eventDetailCopy.gridId
 
       if (this.eventDetailCopy.parentCategoryId && this.eventDetailCopy.categoryId) {
         this.selCategoryArray = []
@@ -380,6 +391,7 @@ export default {
         this.formData.categoryList.push(this.selCateObj)
       }
     } else {
+      this.formData.gridId = this.gridId
 
     }
   },
diff --git a/src/views/modules/shequzhili/event/cpts/process-form.vue b/src/views/modules/shequzhili/event/cpts/process-form.vue
index 4f9e0701..754af4c7 100644
--- a/src/views/modules/shequzhili/event/cpts/process-form.vue
+++ b/src/views/modules/shequzhili/event/cpts/process-form.vue
@@ -32,6 +32,7 @@
       <div v-if="operationType==='1'">
         <process-form-project ref="ref_process_form_project"
                               :eventDetailData="eventDetailData"
+                              :gridId="gridId"
                               :eventId="eventId"></process-form-project>
       </div>
 
@@ -118,6 +119,10 @@ export default {
       type: String,
       default: "",
     },
+    gridId: {
+      type: String,
+      default: "",
+    },
     eventId: {
       type: String,
       default: "",
diff --git a/src/views/modules/shequzhili/event/eventList.vue b/src/views/modules/shequzhili/event/eventList.vue
index c3d146a4..2664af1d 100644
--- a/src/views/modules/shequzhili/event/eventList.vue
+++ b/src/views/modules/shequzhili/event/eventList.vue
@@ -254,11 +254,11 @@
                          size="small"
                          class="div-table-button--edit">处理</el-button>
 
-              <!-- <el-button v-else-if="scope.row.status==='closed_case' && !scope.row.satisfactionName && user.id===scope.row.createdUserId"
-                         @click="handleSatisfy(scope.row)"
+              <el-button v-else-if="scope.row.status==='closed_case' && !scope.row.satisfactionName && user.id===scope.row.createdUserId"
+                         @click="handleWatch(scope.row)"
                          type="text"
                          size="small"
-                         class="div-table-button--edit">评价</el-button> -->
+                         class="div-table-button--edit">去评价</el-button>
               <el-button v-else
                          @click="handleWatch(scope.row)"
                          type="text"
diff --git a/src/views/modules/visual/communityGovern/shijianchuli/event-info.vue b/src/views/modules/visual/communityGovern/shijianchuli/event-info.vue
index e9781601..da7b3889 100644
--- a/src/views/modules/visual/communityGovern/shijianchuli/event-info.vue
+++ b/src/views/modules/visual/communityGovern/shijianchuli/event-info.vue
@@ -18,7 +18,7 @@
               <span>{{ eventInfo.gridName }}</span>
             </div>
             <div class="info-prop">
-              <span>上报时间：</span>
+              <span>发生时间：</span>
               <span>{{ eventInfo.createdTime }}</span>
             </div>
 
diff --git a/src/views/modules/visual/communityGovern/shijianchuli/shijianchulifenxi.vue b/src/views/modules/visual/communityGovern/shijianchuli/shijianchulifenxi.vue
index 8893a3f5..dbd4c55c 100644
--- a/src/views/modules/visual/communityGovern/shijianchuli/shijianchulifenxi.vue
+++ b/src/views/modules/visual/communityGovern/shijianchuli/shijianchulifenxi.vue
@@ -298,6 +298,8 @@ export default {
     await this.getLineChart()
 
     this.dataLoading = false
+    console.log(this.orgType)
+    console.log(this.orgId)
 
     // this.assignData()
 

From aa18a1d871787d4a6dea989d51cb561a81cbae45 Mon Sep 17 00:00:00 2001
From: 13176889840 <13176889840@163.com>
Date: Tue, 31 May 2022 10:59:37 +0800
Subject: [PATCH 10/21] =?UTF-8?q?=E5=B1=85=E6=B0=91=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=E6=A0=A1=E9=AA=8C=E5=BF=97=E6=84=BF=E8=80=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/components/resiForm.vue | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/src/views/components/resiForm.vue b/src/views/components/resiForm.vue
index 57f0397d..7246d608 100644
--- a/src/views/components/resiForm.vue
+++ b/src/views/components/resiForm.vue
@@ -509,6 +509,7 @@ export default {
       this.form.GENDER = sex == 1 ? '1' : '2'
       this.form.IS_OLD_PEOPLE = age >= 60 ? '1' : '0'
       this.form.IS_BDHJ = huji == _id ? '1' : ''
+      this.validateIdcard(this.form.ID_CARD)
       console.log('age-----', age, _id)
     },
     handleOpenSearch () {
@@ -670,6 +671,22 @@ export default {
       if (this.supportAdd) newForm = this.handlerMuscForm()
       return newForm
     },
+    validateIdcard (idCard) {
+      this.$http
+        .post('/epmetuser/icresiuser/getUserRoleByIdCard', { idCard })
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg)
+          } else {
+            console.log('获取查询详情成功', res.data)
+            if (res.data.isVolunteer == '1') this.form.IS_VOLUNTEER = '1'
+            else this.form.IS_VOLUNTEER = '0'
+          }
+        })
+        .catch(() => {
+          return this.$message.error('网络错误')
+        })
+    },
     getGridList () {
       const { user } = this.$store.state
       console.log('agencyId', user)

From aa9a0ba9a9415ff94b855c163c16e99eed2a3ca0 Mon Sep 17 00:00:00 2001
From: jianjun <jianjun4833@163.com>
Date: Tue, 31 May 2022 11:03:17 +0800
Subject: [PATCH 11/21] =?UTF-8?q?=E6=9A=82=E6=97=B6=20=E4=BA=BF=E8=81=94?=
 =?UTF-8?q?=E8=A1=97=E9=81=93=E5=92=8C=20=E5=BE=AE=E7=AC=91=E5=B4=82?=
 =?UTF-8?q?=E5=B1=B1=E6=98=BE=E7=A4=BA=20=E7=A4=BE=E5=8C=BA=E6=B2=BB?=
 =?UTF-8?q?=E7=90=86-=E3=80=8B=E5=A4=9A=E5=85=83=E5=8C=96=E8=8F=9C?=
 =?UTF-8?q?=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/main-shuju/main-navbar.vue | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/src/views/main-shuju/main-navbar.vue b/src/views/main-shuju/main-navbar.vue
index 9fccdcd9..e0715272 100644
--- a/src/views/main-shuju/main-navbar.vue
+++ b/src/views/main-shuju/main-navbar.vue
@@ -164,7 +164,18 @@ export default {
     //   this.showHeader = false;
     // }
     this.changeCustomerName();
-    this.$store.state.mainShuju.menuList = window.SITE_CONFIG["menuShujuList"];
+    const customerId = localStorage.getItem("customerId");
+    let siteconfigElement = window.SITE_CONFIG["menuShujuList"];
+    //暂时 亿联街道和 微笑崂山显示 社区治理-》多元化菜单
+    if ("04c0d396e298f13e57aa5904a657eaa6" != customerId && "3fdd0380deff5b30f45376cdf995d1c1" != customerId){
+      for (let index in siteconfigElement){
+        if (siteconfigElement[index].id == '6'){
+          let newMenuArr =  siteconfigElement[index].children.filter(item =>item.id !== 'duoyuanfuwufenxi');
+          siteconfigElement[index].children = newMenuArr;
+        }
+      }
+    }
+    this.$store.state.mainShuju.menuList = siteconfigElement;
   },
   computed: {},
   methods: {

From 16e83d202b3c7df620ad36c00c23bc9421e13b4c Mon Sep 17 00:00:00 2001
From: zhangyuan <zhangyuan@sarnasea.com>
Date: Tue, 31 May 2022 11:06:07 +0800
Subject: [PATCH 12/21] =?UTF-8?q?=E6=80=BB=E8=AE=A1=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../stats/factagencyuserhousedaily.vue        | 166 ++++++++++++++++--
 1 file changed, 147 insertions(+), 19 deletions(-)

diff --git a/src/views/modules/plugins/stats/factagencyuserhousedaily.vue b/src/views/modules/plugins/stats/factagencyuserhousedaily.vue
index 917751d6..8071612e 100644
--- a/src/views/modules/plugins/stats/factagencyuserhousedaily.vue
+++ b/src/views/modules/plugins/stats/factagencyuserhousedaily.vue
@@ -1,6 +1,7 @@
 <template>
   <el-card shadow="never" class="aui-card--fill">
-    <div class="mode-block">
+    <div class="mode-block resi-container">
+      <el-card ref="searchCard" class="search-card">
       <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
         <el-form-item label="组织机构" label-width="100px"
                       prop="agencyId">
@@ -40,24 +41,34 @@
           </el-date-picker>
         </el-form-item>
         <el-form-item>
-          <el-button @click="getDataList()">{{ $t('query') }}</el-button>
+          <el-button type="primary" @click="getDataList()">{{ $t('query') }}</el-button>
         </el-form-item>
       </el-form>
-      <el-table v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle" style="width: 100%">
+      </el-card>
+      <el-card class="resi-card-table">
+        <div class="resi-row-btn">
+          <el-button @click="handleTotal"
+                     class="diy-button--add"
+                     size="small">总计</el-button>
+          <el-button @click="handleChu"
+                     class="diy-button--reset"
+                     size="small">导出</el-button>
+        </div>
+      <el-table class="resi-table" v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle" style="width: 100%">
         <el-table-column type="selection" header-align="center" align="center" width="50"></el-table-column>
-        <el-table-column prop="agencyName" label="组织结构" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="neighbourhoodsCount" label="小区数" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="houseCount" label="房屋数" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="houseSelfCount" label="自住房屋总" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="houseLeaseCount" label="出租房屋数" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="houseIdleCount" label="闲置房屋数" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="userCount" label="居民总数" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="userResiCount" label="常住人口数" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="userFloatCount" label="流动人口数" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="houseIncr" label="新增房屋数" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="userIncr" label="新增人口数" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="houseModify" label="修改房屋数" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="userModify" label="修改人口数" header-align="center" align="center"></el-table-column>
+        <el-table-column width="160" fixed prop="agencyName" label="组织结构" header-align="center" align="center"></el-table-column>
+        <el-table-column width="80" prop="neighbourhoodsCount" label="小区数" header-align="center" align="center"></el-table-column>
+        <el-table-column width="80" prop="houseCount" label="房屋数" header-align="center" align="center"></el-table-column>
+        <el-table-column width="120" prop="houseSelfCount" label="自住房屋总数" header-align="center" align="center"></el-table-column>
+        <el-table-column width="100" prop="houseLeaseCount" label="出租房屋数" header-align="center" align="center"></el-table-column>
+        <el-table-column width="100" prop="houseIdleCount" label="闲置房屋数" header-align="center" align="center"></el-table-column>
+        <el-table-column width="100" prop="userCount" label="居民总数" header-align="center" align="center"></el-table-column>
+        <el-table-column width="100" prop="userResiCount" label="常住人口数" header-align="center" align="center"></el-table-column>
+        <el-table-column width="100" prop="userFloatCount" label="流动人口数" header-align="center" align="center"></el-table-column>
+        <el-table-column width="100" prop="houseIncr" label="新增房屋数" header-align="center" align="center"></el-table-column>
+        <el-table-column width="100" prop="userIncr" label="新增人口数" header-align="center" align="center"></el-table-column>
+        <el-table-column width="100" prop="houseModify" label="修改房屋数" header-align="center" align="center"></el-table-column>
+        <el-table-column width="100" prop="userModify" label="修改人口数" header-align="center" align="center"></el-table-column>
       </el-table>
       <el-pagination
         :current-page="page"
@@ -68,8 +79,33 @@
         @size-change="pageSizeChangeHandle"
         @current-change="pageCurrentChangeHandle">
       </el-pagination>
+      </el-card>
       <!-- 弹窗, 新增 / 修改 -->
       <add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update>
+      <el-dialog
+              title="总计"
+              :visible.sync="totalVisible"
+              width="60%">
+        <template>
+          <el-table
+                  :data="tableData"
+                  style="width: 100%">
+            <el-table-column width="160" fixed prop="agencyName" label="组织结构" header-align="center" align="center"></el-table-column>
+            <el-table-column width="80" prop="neighbourhoodsCount" label="小区数" header-align="center" align="center"></el-table-column>
+            <el-table-column width="80" prop="houseCount" label="房屋数" header-align="center" align="center"></el-table-column>
+            <el-table-column width="120" prop="houseSelfCount" label="自住房屋总数" header-align="center" align="center"></el-table-column>
+            <el-table-column width="100" prop="houseLeaseCount" label="出租房屋数" header-align="center" align="center"></el-table-column>
+            <el-table-column width="100" prop="houseIdleCount" label="闲置房屋数" header-align="center" align="center"></el-table-column>
+            <el-table-column width="100" prop="userCount" label="居民总数" header-align="center" align="center"></el-table-column>
+            <el-table-column width="100" prop="userResiCount" label="常住人口数" header-align="center" align="center"></el-table-column>
+            <el-table-column width="100" prop="userFloatCount" label="流动人口数" header-align="center" align="center"></el-table-column>
+            <el-table-column width="100" prop="houseIncr" label="新增房屋数" header-align="center" align="center"></el-table-column>
+            <el-table-column width="100" prop="userIncr" label="新增人口数" header-align="center" align="center"></el-table-column>
+            <el-table-column width="100" prop="houseModify" label="修改房屋数" header-align="center" align="center"></el-table-column>
+            <el-table-column width="100" prop="userModify" label="修改人口数" header-align="center" align="center"></el-table-column>
+          </el-table>
+        </template>
+      </el-dialog>
     </div>
   </el-card>
 </template>
@@ -88,10 +124,12 @@ export default {
         deleteIsBatch: true
       },
       optionsA: [],
+      totalVisible: false,
       timeRange: '',
       dataForm: {
         id: ''
       },
+      tableData: []
     }
   },
   components: {
@@ -113,13 +151,30 @@ export default {
     }
   },
   methods: {
+    handleTotal () {
+      this.tableData = []
+      this.$http
+              .get('/data/stats/factAgencyUserHouseDaily/total',{params: this.dataForm})
+              .then(({ data: res }) => {
+                if (res.code !== 0) {
+                  return this.$message.error(res.msg)
+                } else {
+                  console.log('获取查询详情成功', res.data)
+                  this.tableData.push(res.data)
+                }
+              })
+              .catch(() => {
+                return this.$message.error('网络错误')
+              })
+      this.totalVisible = true
+    },
     cascaderClick (nodeData) {
       this.dataForm.agencyId = nodeData.agencyId;
       this.dataForm.level = nodeData.level
       this.$refs.cascaderUnit.checkedValue = nodeData.agencyId;
       this.$refs.cascaderUnit.computePresentText();
       this.$refs.cascaderUnit.toggleDropDownVisible(false);
-      
+
     },
     getGridList() {
       const { user } = this.$store.state
@@ -144,7 +199,7 @@ export default {
 }
 </script>
 <style>
-.block{ 
+.block{
   position: absolute;
   left: 0px;
   display: inline-block;
@@ -152,7 +207,80 @@ export default {
   height: 50px;
   background: #fff;
 }
-.cascader-block .el-cascader-node>.el-radio{ 
+.cascader-block .el-cascader-node>.el-radio{
   display: none;
 }
 </style>
+<style lang="scss" scoped>
+  .blacklist-reason {
+    width: 100%;
+    height: 80px;
+    border: 1px solid #e4e4e4;
+    border-radius: 4px;
+    resize: none;
+    padding: 8px;
+    box-sizing: border-box;
+  }
+</style>
+<style lang="scss" scoped>
+  @import "@/assets/scss/buttonstyle.scss";
+
+  .resi-container .resi-card-table {
+    ::v-deep .el-table th {
+      color: #fff;
+      background-color: rgba(33, 149, 254, 1);
+      // border-right: 1px solid rgba(33, 149, 254, 1);
+    }
+  }
+  .resi-table {
+    ::v-deep .el-button--text {
+      text-decoration: underline;
+    }
+    ::v-deep .btn-color-del {
+      margin-left: 10px;
+      color: rgba(213, 16, 16, 1);
+    }
+    ::v-deep .btn-color-edit {
+      color: rgba(0, 167, 169, 1);
+    }
+  }
+  .form-wr {
+    .input-width {
+      width: 260px;
+
+    }
+    .input-width-textarea {
+      width: 500px;
+    }
+    .imsg-list {
+      display: flex;
+      align-items: center;
+      .imgs-item {
+        position: relative;
+        margin-right: 10px;
+        .el-icon-delete {
+          position: absolute;
+          top: 0;
+          right: 0;
+          font-size: 18px;
+          color: red;
+          z-index: 3;
+          cursor: pointer;
+        }
+      }
+    }
+  }
+  .div-content {
+    width: 100%;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+  }
+  .resi-row-btn {
+    margin-bottom: 13px;
+    .upload-btn {
+      display: inline-block;
+      margin: 0 10px;
+    }
+  }
+</style>

From 8fcdf95cf533f050f63fe273dd7cce89ae9b0655 Mon Sep 17 00:00:00 2001
From: zhangyuan <zhangyuan@sarnasea.com>
Date: Tue, 31 May 2022 11:13:20 +0800
Subject: [PATCH 13/21] =?UTF-8?q?=E5=AF=BC=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../stats/factagencyuserhousedaily.vue        | 37 +++++++++++++++++--
 1 file changed, 33 insertions(+), 4 deletions(-)

diff --git a/src/views/modules/plugins/stats/factagencyuserhousedaily.vue b/src/views/modules/plugins/stats/factagencyuserhousedaily.vue
index 8071612e..597c874b 100644
--- a/src/views/modules/plugins/stats/factagencyuserhousedaily.vue
+++ b/src/views/modules/plugins/stats/factagencyuserhousedaily.vue
@@ -47,10 +47,10 @@
       </el-card>
       <el-card class="resi-card-table">
         <div class="resi-row-btn">
-          <el-button @click="handleTotal"
+          <el-button @click="totalHandle"
                      class="diy-button--add"
                      size="small">总计</el-button>
-          <el-button @click="handleChu"
+          <el-button @click="exportHandle"
                      class="diy-button--reset"
                      size="small">导出</el-button>
         </div>
@@ -121,7 +121,8 @@ export default {
         getDataListURL: '/data/stats/factAgencyUserHouseDaily/page',
         getDataListIsPage: true,
         deleteURL: '/data/stats/factAgencyUserHouseDaily',
-        deleteIsBatch: true
+        deleteIsBatch: true,
+        exportURL: '/data/stats/factAgencyUserHouseDaily/export'
       },
       optionsA: [],
       totalVisible: false,
@@ -151,7 +152,7 @@ export default {
     }
   },
   methods: {
-    handleTotal () {
+    totalHandle () {
       this.tableData = []
       this.$http
               .get('/data/stats/factAgencyUserHouseDaily/total',{params: this.dataForm})
@@ -168,6 +169,34 @@ export default {
               })
       this.totalVisible = true
     },
+    exportHandle () {
+      const url = this.mixinViewModuleOptions.exportURL
+      this.$http({
+        method: 'GET',
+        url,
+        responseType: 'blob',
+        params: this.dataForm
+      }).then(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('网络错误')
+      })
+    },
     cascaderClick (nodeData) {
       this.dataForm.agencyId = nodeData.agencyId;
       this.dataForm.level = nodeData.level

From e56f40e25928710245ea7207a6f95d229d0752c2 Mon Sep 17 00:00:00 2001
From: zhangyuan <zhangyuan@sarnasea.com>
Date: Tue, 31 May 2022 13:25:32 +0800
Subject: [PATCH 14/21] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=87=E5=AD=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/plugins/stats/factagencyuserhousedaily.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/modules/plugins/stats/factagencyuserhousedaily.vue b/src/views/modules/plugins/stats/factagencyuserhousedaily.vue
index 597c874b..d3a6ffe4 100644
--- a/src/views/modules/plugins/stats/factagencyuserhousedaily.vue
+++ b/src/views/modules/plugins/stats/factagencyuserhousedaily.vue
@@ -59,7 +59,7 @@
         <el-table-column width="160" fixed prop="agencyName" label="组织结构" header-align="center" align="center"></el-table-column>
         <el-table-column width="80" prop="neighbourhoodsCount" label="小区数" header-align="center" align="center"></el-table-column>
         <el-table-column width="80" prop="houseCount" label="房屋数" header-align="center" align="center"></el-table-column>
-        <el-table-column width="120" prop="houseSelfCount" label="自住房屋总数" header-align="center" align="center"></el-table-column>
+        <el-table-column width="100" prop="houseSelfCount" label="自住房屋数" header-align="center" align="center"></el-table-column>
         <el-table-column width="100" prop="houseLeaseCount" label="出租房屋数" header-align="center" align="center"></el-table-column>
         <el-table-column width="100" prop="houseIdleCount" label="闲置房屋数" header-align="center" align="center"></el-table-column>
         <el-table-column width="100" prop="userCount" label="居民总数" header-align="center" align="center"></el-table-column>

From 09695537dd4667bf5e08f0a3b4b887059bcb33fe Mon Sep 17 00:00:00 2001
From: jiangyy <jiang478938504@126.com>
Date: Tue, 31 May 2022 13:31:16 +0800
Subject: [PATCH 15/21] =?UTF-8?q?=E5=B0=8F=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../communityGovern/shijianchuli/shijianchulifenxi.vue     | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/views/modules/visual/communityGovern/shijianchuli/shijianchulifenxi.vue b/src/views/modules/visual/communityGovern/shijianchuli/shijianchulifenxi.vue
index dbd4c55c..3eb8819c 100644
--- a/src/views/modules/visual/communityGovern/shijianchuli/shijianchulifenxi.vue
+++ b/src/views/modules/visual/communityGovern/shijianchuli/shijianchulifenxi.vue
@@ -298,8 +298,7 @@ export default {
     await this.getLineChart()
 
     this.dataLoading = false
-    console.log(this.orgType)
-    console.log(this.orgId)
+
 
     // this.assignData()
 
@@ -425,11 +424,11 @@ export default {
 
           {
             name: "已完成",
-            value: data.closedRatio * 100
+            value: Math.floor(data.closedRatio * 10000) / 100
           },
           {
             name: "处理中",
-            value: data.processingRatio * 100
+            value: Math.floor(data.processingRatio * 10000) / 100
           },
         ]
 

From a569f3f7fc28ba7ba438e8a7162cc9a766d8494a Mon Sep 17 00:00:00 2001
From: ZhaoTongYao <531131322@qq.com>
Date: Tue, 31 May 2022 13:51:39 +0800
Subject: [PATCH 16/21] =?UTF-8?q?=E4=BA=8B=E4=BB=B6=E8=AF=A6=E6=83=85?=
 =?UTF-8?q?=E5=AF=B9=E8=AF=9D=E6=A1=86=E5=8F=91=E7=94=9F=E6=97=B6=E9=97=B4?=
 =?UTF-8?q?happenTime?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/visual/communityGovern/shijianchuli/event-info.vue  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/modules/visual/communityGovern/shijianchuli/event-info.vue b/src/views/modules/visual/communityGovern/shijianchuli/event-info.vue
index da7b3889..8e602fee 100644
--- a/src/views/modules/visual/communityGovern/shijianchuli/event-info.vue
+++ b/src/views/modules/visual/communityGovern/shijianchuli/event-info.vue
@@ -19,7 +19,7 @@
             </div>
             <div class="info-prop">
               <span>发生时间：</span>
-              <span>{{ eventInfo.createdTime }}</span>
+              <span>{{ eventInfo.happenTime }}</span>
             </div>
 
             <div class="info-prop">

From 5b14e803bca3c4cab99713d3e6eaaaf33f3c9d0a Mon Sep 17 00:00:00 2001
From: ZhaoTongYao <531131322@qq.com>
Date: Tue, 31 May 2022 13:52:25 +0800
Subject: [PATCH 17/21] =?UTF-8?q?=E4=BA=8B=E4=BB=B6=E8=AF=A6=E6=83=85?=
 =?UTF-8?q?=E5=AF=B9=E8=AF=9D=E6=A1=86=E5=8F=91=E7=94=9F=E6=97=B6=E9=97=B4?=
 =?UTF-8?q?happenTime?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/visual/communityGovern/shijianchuli/event-info.vue  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/modules/visual/communityGovern/shijianchuli/event-info.vue b/src/views/modules/visual/communityGovern/shijianchuli/event-info.vue
index 8e602fee..9713d7e9 100644
--- a/src/views/modules/visual/communityGovern/shijianchuli/event-info.vue
+++ b/src/views/modules/visual/communityGovern/shijianchuli/event-info.vue
@@ -18,7 +18,7 @@
               <span>{{ eventInfo.gridName }}</span>
             </div>
             <div class="info-prop">
-              <span>发生时间：</span>
+              <span>上报时间：</span>
               <span>{{ eventInfo.happenTime }}</span>
             </div>
 

From 9e671efdbb3f53465cfcf2ab77b952370fa7d2b5 Mon Sep 17 00:00:00 2001
From: ZhaoTongYao <531131322@qq.com>
Date: Tue, 31 May 2022 14:47:22 +0800
Subject: [PATCH 18/21] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/visual/communityGovern/shijianchuli/event-info.vue  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/modules/visual/communityGovern/shijianchuli/event-info.vue b/src/views/modules/visual/communityGovern/shijianchuli/event-info.vue
index 9713d7e9..8e602fee 100644
--- a/src/views/modules/visual/communityGovern/shijianchuli/event-info.vue
+++ b/src/views/modules/visual/communityGovern/shijianchuli/event-info.vue
@@ -18,7 +18,7 @@
               <span>{{ eventInfo.gridName }}</span>
             </div>
             <div class="info-prop">
-              <span>上报时间：</span>
+              <span>发生时间：</span>
               <span>{{ eventInfo.happenTime }}</span>
             </div>
 

From a10dd3856cfe09c72eb9b0e893215a41b40af9af Mon Sep 17 00:00:00 2001
From: zhangyuan <zhangyuan@sarnasea.com>
Date: Tue, 31 May 2022 15:59:43 +0800
Subject: [PATCH 19/21] =?UTF-8?q?=E7=A9=BA=E6=A0=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/mixins/view-module.js | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/mixins/view-module.js b/src/mixins/view-module.js
index ebde6a3e..dcfabd2e 100644
--- a/src/mixins/view-module.js
+++ b/src/mixins/view-module.js
@@ -44,16 +44,16 @@ export default {
     query () {
       this.dataListLoading = true
       this.$http.get(
-        this.mixinViewModuleOptions.getDataListURL,
-        {
-          params: {
-            order: this.order,
-            orderField: this.orderField,
-            page: this.mixinViewModuleOptions.getDataListIsPage ? this.page : null,
-            limit: this.mixinViewModuleOptions.getDataListIsPage ? this.limit : null,
-            ...this.dataForm
+          this.mixinViewModuleOptions.getDataListURL,
+          {
+            params: {
+              order: this.order,
+              orderField: this.orderField,
+              page: this.mixinViewModuleOptions.getDataListIsPage ? this.page : null,
+              limit: this.mixinViewModuleOptions.getDataListIsPage ? this.limit : null,
+              ...this.dataForm
+            }
           }
-        }
       ).then(({ data: res }) => {
         this.dataListLoading = false
         if (res.code !== 0) {

From 40f6b2cbe83392325e9aac5bf150f3cfec10af28 Mon Sep 17 00:00:00 2001
From: 13176889840 <13176889840@163.com>
Date: Tue, 31 May 2022 16:22:13 +0800
Subject: [PATCH 20/21] dd

---
 src/mixins/view-post.js                       | 167 ++++++++++++++++++
 .../partymember/icpartymemberpoint.vue        |   4 +-
 2 files changed, 169 insertions(+), 2 deletions(-)
 create mode 100644 src/mixins/view-post.js

diff --git a/src/mixins/view-post.js b/src/mixins/view-post.js
new file mode 100644
index 00000000..ba5b51be
--- /dev/null
+++ b/src/mixins/view-post.js
@@ -0,0 +1,167 @@
+import Cookies from 'js-cookie'
+import qs from 'qs'
+export default {
+  data () {
+    /* eslint-disable */
+    return {
+      // 设置属性
+      mixinViewModuleOptions: {
+        createdIsNeed: true,       // 此页面是否在创建时，调用查询数据列表接口？
+        activatedIsNeed: false,    // 此页面是否在激活（进入）时，调用查询数据列表接口？
+        getDataListURL: '',       // 数据列表接口，API地址
+        getDataListIsPage: false, // 数据列表接口，是否需要分页？
+        deleteURL: '',            // 删除接口，API地址
+        deleteIsBatch: false,     // 删除接口，是否需要批量？
+        deleteIsBatchKey: 'id',   // 删除接口，批量状态下由那个key进行标记操作？比如：pid，uid...
+        exportURL: ''             // 导出接口，API地址
+      },
+      // 默认属性
+      dataForm: {},               // 查询条件
+      dataList: [],               // 数据列表
+      order: '',                  // 排序，asc／desc
+      orderField: '',             // 排序，字段
+      page: 1,                    // 当前页码
+      limit: 10,                  // 每页数
+      total: 0,                   // 总条数
+      dataListLoading: false,     // 数据列表，loading状态
+      dataListSelections: [],     // 数据列表，多选项
+      addOrUpdateVisible: false   // 新增／更新，弹窗visible状态
+    }
+    /* eslint-enable */
+  },
+  created () {
+    if (this.mixinViewModuleOptions.createdIsNeed) {
+      this.query()
+    }
+  },
+  activated () {
+    if (this.mixinViewModuleOptions.activatedIsNeed) {
+      this.query()
+    }
+  },
+  methods: {
+    // 获取数据列表
+    query () {
+      this.dataListLoading = true
+      const params = {
+        order: this.order,
+        orderField: this.orderField,
+        page: this.mixinViewModuleOptions.getDataListIsPage ? this.page : null,
+        limit: this.mixinViewModuleOptions.getDataListIsPage ? this.limit : null,
+        ...this.dataForm
+      }
+      this.$http.post(
+          this.mixinViewModuleOptions.getDataListURL,
+          params
+      ).then(({ data: res }) => {
+        this.dataListLoading = false
+        if (res.code !== 0) {
+          this.dataList = []
+          this.total = 0
+          return this.$message.error(res.msg)
+        }
+        this.dataList = this.mixinViewModuleOptions.getDataListIsPage ? res.data.list : res.data
+        this.total = this.mixinViewModuleOptions.getDataListIsPage ? res.data.total : 0
+        this.dataList.forEach(item => {
+          if (item.gender) {
+            item.gender = item.gender == '0' ? '女' : item.gender == '1' ? '男' : item.gender
+          }
+        })
+      }).catch(() => {
+        this.dataListLoading = false
+      })
+    },
+    // 多选
+    dataListSelectionChangeHandle (val) {
+      this.dataListSelections = val
+    },
+    // 排序
+    dataListSortChangeHandle (data) {
+      if (!data.order || !data.prop) {
+        this.order = ''
+        this.orderField = ''
+        return false
+      }
+      this.order = data.order.replace(/ending$/, '')
+      this.orderField = data.prop.replace(/([A-Z])/g, '_$1').toLowerCase()
+      this.query()
+    },
+    // 分页, 每页条数
+    pageSizeChangeHandle (val) {
+      this.page = 1
+      this.limit = val
+      this.query()
+    },
+    // 分页, 当前页
+    pageCurrentChangeHandle (val) {
+      this.page = val
+      this.query()
+    },
+    getDataList: function () {
+      this.page = 1
+      this.query()
+    },
+    // 新增 / 修改
+    addOrUpdateHandle (id) {
+      this.addOrUpdateVisible = true
+      this.$nextTick(() => {
+        this.$refs.addOrUpdate.dataForm.id = id
+        this.$refs.addOrUpdate.init()
+      })
+    },
+    // 删除
+    deleteHandle (id) {
+      if (this.mixinViewModuleOptions.deleteIsBatch && !id && this.dataListSelections.length <= 0) {
+        return this.$message({
+          message: this.$t('prompt.deleteBatch'),
+          type: 'warning',
+          duration: 500
+        })
+      }
+      this.$confirm(this.$t('prompt.info', { 'handle': this.$t('delete') }), this.$t('prompt.title'), {
+        confirmButtonText: this.$t('confirm'),
+        cancelButtonText: this.$t('cancel'),
+        type: 'warning'
+      }).then(() => {
+        this.$http.delete(
+          `${this.mixinViewModuleOptions.deleteURL}${this.mixinViewModuleOptions.deleteIsBatch ? '' : '/' + id}`,
+          this.mixinViewModuleOptions.deleteIsBatch ? {
+            'data': id ? [id] : this.dataListSelections.map(item => item[this.mixinViewModuleOptions.deleteIsBatchKey])
+          } : {}
+        ).then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg)
+          }
+          this.$message({
+            message: this.$t('prompt.success'),
+            type: 'success',
+            duration: 500,
+            onClose: () => {
+              this.query()
+            }
+          })
+        }).catch(() => {})
+      }).catch(() => {})
+    },
+    // 导出
+    exportHandle () {
+      var params = qs.stringify({
+        'token': localStorage.getItem('token'),
+        ...this.dataForm
+      })
+      window.location.href = `${window.SITE_CONFIG['apiURL']}${this.mixinViewModuleOptions.exportURL}?${params}`
+    },
+    // 时间段控件取值变化事件-清空一个其他都清空
+    changeTime (dateValue) {
+        var startTimeIsNull = this.dataForm.startTime === '' || this.dataForm.startTime === 'null' || this.dataForm.startTime === null
+        var endTimeIsNull = this.dataForm.endTime === '' || this.dataForm.endTime === 'null' || this.dataForm.endTime === null
+        if (dateValue === null || dateValue === '' || dateValue === 'null') {
+            this.dataForm.startTime = ''
+            this.dataForm.endTime = ''
+        } else if (startTimeIsNull || endTimeIsNull) {
+            this.dataForm.startTime = dateValue
+            this.dataForm.endTime = dateValue
+        }
+    }
+  }
+}
diff --git a/src/views/modules/partymember/icpartymemberpoint.vue b/src/views/modules/partymember/icpartymemberpoint.vue
index ff99cfb9..6180d89c 100644
--- a/src/views/modules/partymember/icpartymemberpoint.vue
+++ b/src/views/modules/partymember/icpartymemberpoint.vue
@@ -183,10 +183,10 @@
 </template>
 
 <script>
-import mixinViewModule from '@/mixins/view-module'
+import viewPost from '@/mixins/view-post'
 import { mapGetters } from 'vuex'
 export default {
-  mixins: [mixinViewModule],
+  mixins: [viewPost],
   data() {
     return {
       mixinViewModuleOptions: {

From 881bf5c1765ebe873c9975068f4fd400e5613bd6 Mon Sep 17 00:00:00 2001
From: jiangyy <jiang478938504@126.com>
Date: Wed, 1 Jun 2022 09:41:04 +0800
Subject: [PATCH 21/21] =?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

---
 src/assets/scss/modules/shequzhili/event-info.scss       | 3 ++-
 src/views/modules/shequzhili/event/cpts/event-detail.vue | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/assets/scss/modules/shequzhili/event-info.scss b/src/assets/scss/modules/shequzhili/event-info.scss
index 39f48b60..ad8cad49 100644
--- a/src/assets/scss/modules/shequzhili/event-info.scss
+++ b/src/assets/scss/modules/shequzhili/event-info.scss
@@ -396,7 +396,8 @@
                 display: flex;
 
                 .detail-field {
-                    width: 100px;
+                    flex:0 0 100px;
+              
                     text-align: justify;
                     text-align-last: justify;
                 }
diff --git a/src/views/modules/shequzhili/event/cpts/event-detail.vue b/src/views/modules/shequzhili/event/cpts/event-detail.vue
index 4fa2288c..13709ebd 100644
--- a/src/views/modules/shequzhili/event/cpts/event-detail.vue
+++ b/src/views/modules/shequzhili/event/cpts/event-detail.vue
@@ -79,7 +79,7 @@
         </div>
       </div>
 
-      <div v-if="info.operationId||!(info.status==='closed_case'&&!info.satisfactionName && user.id===info.createdUserId)"
+      <div v-if="info.operationId&&!(info.status==='closed_case'&&!info.satisfactionName && user.id===info.createdUserId)"
            class="div-btn ">
         <el-button size="small"
                    @click="handleCloseEvent">关闭</el-button>