From 185b83ebda57050575c7d085a7ecd74d002bd9d7 Mon Sep 17 00:00:00 2001
From: jianjun <jianjun4833@163.com>
Date: Thu, 23 Dec 2021 14:09:35 +0800
Subject: [PATCH 01/29] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E5=A4=9A=E4=BD=99?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/visual/heart/index.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/modules/visual/heart/index.vue b/src/views/modules/visual/heart/index.vue
index d19a3ad1..a818c773 100644
--- a/src/views/modules/visual/heart/index.vue
+++ b/src/views/modules/visual/heart/index.vue
@@ -85,7 +85,7 @@ export default {
   name: "heart",
   data() {
     return {
-      agencyId: "",
+      agencyId: this.$store.state.user.agencyId,
       areaCode: "",
 
       monthId: "",
@@ -194,7 +194,7 @@ export default {
     handleSearch() {},
 
     async getApiData() {
-      await this.getAgencyInfo();
+      //await this.getAgencyInfo();
       this.getTb1();
       this.getTb2();
       this.getTb3();

From 6952807d1218618f03be4a3550e023a7b6c3f985 Mon Sep 17 00:00:00 2001
From: 13176889840 <13176889840@163.com>
Date: Thu, 23 Dec 2021 15:55:21 +0800
Subject: [PATCH 02/29] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=BB=84=E7=BB=87?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3-=E5=BF=97=E6=84=BF=E8=80=85=E5=88=86?=
 =?UTF-8?q?=E6=9E=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/visual/measure/volunteer.vue | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/views/modules/visual/measure/volunteer.vue b/src/views/modules/visual/measure/volunteer.vue
index 2035625f..34e76f68 100644
--- a/src/views/modules/visual/measure/volunteer.vue
+++ b/src/views/modules/visual/measure/volunteer.vue
@@ -353,16 +353,19 @@ export default {
     },
     async getAgencyList() {
       // const url = "/gov/org/customeragency/staffinagencylist";
-      const url = '/gov/org/customeragency/agencygridtree'
+      // const url = '/gov/org/customeragency/agencygridtree'
+      const url = '/gov/org/customeragency/staffinagencylist'
       // let params = {
       //   agencyId: this.$store.state.user.agencyId,
       // };
       const { data, code, msg } = await requestPost(url);
       if (code === 0) {
         console.log('data-org----o', data)
-        this.selectAgency = [`${data.agencyId}-${data.level}`]
+        let { agencyList, subAgencyList } = data
+        this.selectAgency = [`${agencyList.agencyId}-${agencyList.level}`]
         let arr = []
-        arr.push(data)
+        agencyList.subAgencyList = subAgencyList
+        arr.push(agencyList)
         this.propTree = arr && this.getTreeData(arr)
 
       } else {

From 1749f197524f14b727d8b57bf0c1f5b006a140ba Mon Sep 17 00:00:00 2001
From: 13176889840 <13176889840@163.com>
Date: Tue, 28 Dec 2021 15:23:36 +0800
Subject: [PATCH 03/29] =?UTF-8?q?=E9=9C=80=E6=B1=82=E6=9C=8D=E5=8A=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/communityService/measure/index.vue | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/views/modules/communityService/measure/index.vue b/src/views/modules/communityService/measure/index.vue
index 8da78a93..c324dc42 100644
--- a/src/views/modules/communityService/measure/index.vue
+++ b/src/views/modules/communityService/measure/index.vue
@@ -137,6 +137,7 @@
                 size="small"
                 @click="handleAppoint(scope.row, 'appoint')"
                 >指派</el-button>
+                <!-- v-if="scope.row.status === 'assigned' || scope.row.status === 'have_order'" -->
               <el-button
                 v-if="scope.row.status === 'assigned' || scope.row.status === 'have_order'"
                 type="text"
@@ -738,6 +739,8 @@ export default {
         this.finishServiceTime = row.serviceStartTime && [row.serviceStartTime, row.serviceEndTime] || ''
       }
       if (addType == 'finish') {
+        if (row.serviceStartTime) this.finishServiceTime = [row.serviceStartTime, row.serviceEndTime]
+        
         this.form.finishResult = 'resolved'
       }
       if (addType == 'appoint' && row.serviceType) {

From f9ecf3bd10c24a6655f4650599973697697bb20e Mon Sep 17 00:00:00 2001
From: 13176889840 <13176889840@163.com>
Date: Tue, 28 Dec 2021 16:05:58 +0800
Subject: [PATCH 04/29] =?UTF-8?q?=E9=9C=80=E6=B1=82=E8=AF=84=E4=BB=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/views/modules/communityService/measure/index.vue b/src/views/modules/communityService/measure/index.vue
index c324dc42..7d7b032f 100644
--- a/src/views/modules/communityService/measure/index.vue
+++ b/src/views/modules/communityService/measure/index.vue
@@ -139,7 +139,7 @@
                 >指派</el-button>
                 <!-- v-if="scope.row.status === 'assigned' || scope.row.status === 'have_order'" -->
               <el-button
-                v-if="scope.row.status === 'assigned' || scope.row.status === 'have_order'"
+                v-if="scope.row.status === 'assigned' || scope.row.status === 'have_order' || (scoped.row.status == 'finished' && !scoped.row.evaluateFlag)"
                 type="text"
                 size="small"
                 @click="handleFinish(scope.row, 'finish')"

From 5466fde5868512b1fae43e3722f2b1341180fdd3 Mon Sep 17 00:00:00 2001
From: 13176889840 <13176889840@163.com>
Date: Tue, 28 Dec 2021 16:17:33 +0800
Subject: [PATCH 05/29] =?UTF-8?q?=E9=9C=80=E6=B1=82=E8=B4=AB=E5=AE=B6234?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/views/modules/communityService/measure/index.vue b/src/views/modules/communityService/measure/index.vue
index 7d7b032f..a6b0da72 100644
--- a/src/views/modules/communityService/measure/index.vue
+++ b/src/views/modules/communityService/measure/index.vue
@@ -139,7 +139,7 @@
                 >指派</el-button>
                 <!-- v-if="scope.row.status === 'assigned' || scope.row.status === 'have_order'" -->
               <el-button
-                v-if="scope.row.status === 'assigned' || scope.row.status === 'have_order' || (scoped.row.status == 'finished' && !scoped.row.evaluateFlag)"
+                v-if="scope.row.status === 'assigned' || scope.row.status === 'have_order' || (scope.row.status == 'finished' && !scope.row.evaluateFlag)"
                 type="text"
                 size="small"
                 @click="handleFinish(scope.row, 'finish')"

From 503e69de8a7c907f3b5413d8b7879984794b42c1 Mon Sep 17 00:00:00 2001
From: 13176889840 <13176889840@163.com>
Date: Tue, 28 Dec 2021 16:20:22 +0800
Subject: [PATCH 06/29] =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E8=AF=84=E4=BB=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/communityService/measure/index.vue      | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/views/modules/communityService/measure/index.vue b/src/views/modules/communityService/measure/index.vue
index a6b0da72..00e775ad 100644
--- a/src/views/modules/communityService/measure/index.vue
+++ b/src/views/modules/communityService/measure/index.vue
@@ -342,12 +342,7 @@
           <span>{{ form.cancelTime }}</span>
         </el-form-item>
         <template v-if="addType == 'finish' || (addType == 'look' && form.status == 'finished')">
-          <el-form-item label="完成情况" prop="finishResult">
-            <el-radio v-model="form.finishResult" 
-            label="resolved" :disabled="disabled && addType != 'finish'" >已解决</el-radio>
-            <el-radio v-model="form.finishResult" label="unresolved" 
-            :disabled="disabled && addType != 'finish'" >未解决</el-radio>
-          </el-form-item>
+          
           <el-form-item label="实际服务时间" prop="serviceStartTime">
             <el-date-picker
               v-model="finishServiceTime"
@@ -363,6 +358,12 @@
               >
             </el-date-picker>
           </el-form-item>
+          <el-form-item label="完成情况" prop="finishResult">
+            <el-radio v-model="form.finishResult" 
+            label="resolved" :disabled="disabled && addType != 'finish'" >已解决</el-radio>
+            <el-radio v-model="form.finishResult" label="unresolved" 
+            :disabled="disabled && addType != 'finish'" >未解决</el-radio>
+          </el-form-item>
           <el-form-item label="评价" prop="score" class="form-score">
               <el-rate v-model="form.score" :allow-half="true" :disabled="disabled && addType != 'finish'" ></el-rate>
           </el-form-item>

From 099c7a098398e97a9e4c260f4297896344c88930 Mon Sep 17 00:00:00 2001
From: 13176889840 <13176889840@163.com>
Date: Wed, 29 Dec 2021 09:49:51 +0800
Subject: [PATCH 07/29] =?UTF-8?q?=E9=9C=80=E6=B1=82=E4=B8=8A=E6=8A=A5?=
 =?UTF-8?q?=E7=B1=BB=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/views/modules/communityService/measure/index.vue b/src/views/modules/communityService/measure/index.vue
index 00e775ad..f73c912a 100644
--- a/src/views/modules/communityService/measure/index.vue
+++ b/src/views/modules/communityService/measure/index.vue
@@ -1039,7 +1039,7 @@ export default {
           if (res.code !== 0) {
             return this.$message.error(res.msg)
           } else {
-            this.reportOptions = res.data
+            this.reportOptions = res.data && res.data.filter(item => item.value != 'self_help')
           }
         })
         .catch(() => {

From c49824d155a28dfce8308ea84071d403b6080b60 Mon Sep 17 00:00:00 2001
From: jiangyy <jiang478938504@126.com>
Date: Wed, 29 Dec 2021 15:56:25 +0800
Subject: [PATCH 08/29] =?UTF-8?q?=E5=BF=97=E6=84=BF=E8=80=85=E6=83=85?=
 =?UTF-8?q?=E5=86=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../visual/communityGovern/resibuzz.vue       |  4 +-
 .../modules/visual/measure/volunteer.vue      | 59 ++++++++++---------
 2 files changed, 32 insertions(+), 31 deletions(-)

diff --git a/src/views/modules/visual/communityGovern/resibuzz.vue b/src/views/modules/visual/communityGovern/resibuzz.vue
index 85b78d24..e8a7faf1 100644
--- a/src/views/modules/visual/communityGovern/resibuzz.vue
+++ b/src/views/modules/visual/communityGovern/resibuzz.vue
@@ -453,8 +453,8 @@ export default {
             item.status ? item.status : '',
             item.createdTime ? item.createdTime : '',
             item.issueOriginator ? item.issueOriginator : '',
-            item.voteAccount ? item.voteAccount : '',
-            item.supportCount ? item.supportCount : '',
+            item.voteAccount ? item.voteAccount : 0,
+            item.supportCount ? item.supportCount : 0,
             item.oppositionCount ? item.oppositionCount : '',
             { type: "operate", list: ["查看"] },
           ];
diff --git a/src/views/modules/visual/measure/volunteer.vue b/src/views/modules/visual/measure/volunteer.vue
index 34e76f68..7d757740 100644
--- a/src/views/modules/visual/measure/volunteer.vue
+++ b/src/views/modules/visual/measure/volunteer.vue
@@ -1,16 +1,16 @@
 <template>
   <div class="warning-box">
-    <cpt-card >
+    <cpt-card>
       <div class="card-title">
-        <img class="title-icon" src="../../../../assets/img/shuju/title-tip.png" />
+        <img class="title-icon"
+             src="../../../../assets/img/shuju/title-tip.png" />
         <div class="title-label">
-          <el-cascader 
-            v-model="selectAgency"
-            :options="propTree" 
-            :props="{ checkStrictly: true }" 
-            :show-all-levels="false"
-            clearable 
-            @change="handleCascader">
+          <el-cascader v-model="selectAgency"
+                       :options="propTree"
+                       :props="{ checkStrictly: true }"
+                       :show-all-levels="false"
+                       clearable
+                       @change="handleCascader">
           </el-cascader>
         </div>
       </div>
@@ -18,7 +18,7 @@
         <cpt-card class="card-wr">
           <div class="card-title">
             <img class="title-icon"
-                src="../../../../assets/img/shuju/title-tip.png" />
+                 src="../../../../assets/img/shuju/title-tip.png" />
             <div class="title-label">
               志愿者服务情况
             </div>
@@ -43,7 +43,7 @@
               <div class="echart-wr">
                 <!-- <div class="echart-cicle"></div> -->
                 <div id="echartService"
-                    class="echart-org"></div>
+                     class="echart-org"></div>
               </div>
 
             </div>
@@ -69,7 +69,7 @@
               <div class="echart-wr">
                 <!-- <div class="echart-cicle"></div> -->
                 <div id="echartCount"
-                    class="echart-org"></div>
+                     class="echart-org"></div>
               </div>
 
             </div>
@@ -80,7 +80,7 @@
         <cpt-card class="card-wr card-wr-map">
           <div class="card-title">
             <img class="title-icon"
-                src="../../../../assets/img/shuju/title-tip.png" />
+                 src="../../../../assets/img/shuju/title-tip.png" />
             <div class="title-label">
               多元化治理平面图
             </div>
@@ -97,11 +97,11 @@
           <div class="map-tips">
 
             <div class="map-tips-item"
-                v-for="item in legendArray"
-                :key="item.optionValue">
+                 v-for="item in legendArray"
+                 :key="item.optionValue">
 
               <img class="title-icon"
-                  :src="item.url" />
+                   :src="item.url" />
               <div class="map-tips-label">{{item.optionLabel}}</div>
             </div>
 
@@ -351,7 +351,7 @@ export default {
         this.$message.error(msg)
       }
     },
-    async getAgencyList() {
+    async getAgencyList () {
       // const url = "/gov/org/customeragency/staffinagencylist";
       // const url = '/gov/org/customeragency/agencygridtree'
       const url = '/gov/org/customeragency/staffinagencylist'
@@ -372,25 +372,26 @@ export default {
         this.$message.error(msg)
       }
     },
-    getTreeData(data){
+    getTreeData (data) {
       if (!Array.isArray(data)) return []
       let arr = data.map(item => {
         let _item = {}
         if (item.subAgencyList) {
           if (item.subAgencyList.length === 0) {
-            _item = { 
+            _item = {
               label: item.agencyName,
               value: item.agencyId + '-' + item.level,
               level: item.level,
-              children: undefined 
+              children: undefined
             }
-          } else _item = { 
+          } else _item = {
             label: item.agencyName,
             value: item.agencyId + '-' + item.level,
             level: item.level,
-            children: this.getTreeData(item.subAgencyList)}
+            children: this.getTreeData(item.subAgencyList)
+          }
         } else {
-          _item = { 
+          _item = {
             label: item.agencyName,
             value: item.agencyId + '-' + item.level,
             level: item.level,
@@ -497,16 +498,16 @@ export default {
 
     },
 
-    handleCascader(val) {
+    handleCascader (val) {
       console.log('val-vvv', val)
       if (val.length > 0) {
         const _arr = val[val.length - 1].split('-')
-        const orgType = _arr[1] !== 'grid' ? 'agency': 'grid'
+        const orgType = _arr[1] !== 'grid' ? 'agency' : 'grid'
         // this.getServicePie(_arr[0], orgType)
         this.getPie(_arr[0])
         this.getMapUnitList(_arr[0])
       }
-      
+
     },
     //加载地图数据
     loadMap () {
@@ -514,7 +515,7 @@ export default {
         //mapInfo, polygonArray, polIconUrlArray, iconArrays, iconUrlArray
         this.$refs.map.loadMap(this.agencyInfo, null, null, this.distributionsList, this.iconUrlArray, null)
       } else {
-        this.$refs.map.refreshMap(null, this.unitMapList)
+        this.$refs.map.refreshMap(null, this.distributionsList)
 
       }
     },
@@ -641,7 +642,7 @@ export default {
   .title-label {
     font-size: 16px;
     font-weight: 800;
-    
+
     ::v-deep .el-input {
       width: 180px;
       .el-input__inner {
@@ -652,7 +653,7 @@ export default {
         border: 0;
       }
       .el-icon-arrow-down::before {
-          content: "\e790";
+        content: "\e790";
       }
     }
   }

From 4ab4cd1d47021e01ef577f6d6ccc714cebd6e45c Mon Sep 17 00:00:00 2001
From: dai <851733175@qq.com>
Date: Thu, 30 Dec 2021 09:47:33 +0800
Subject: [PATCH 09/29] =?UTF-8?q?=E5=85=BC=E5=AE=B9=E6=B2=A1=E6=9C=89?=
 =?UTF-8?q?=E8=AF=9D=E9=A2=98=E8=AF=A6=E6=83=85=E7=9A=84=E8=AE=AE=E9=A2=98?=
 =?UTF-8?q?=E8=AF=A6=E6=83=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/visual/communityGovern/cpt/issue-info.vue  |  8 ++++----
 src/views/modules/visual/heart/index.vue               | 10 +++++++++-
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/src/views/modules/visual/communityGovern/cpt/issue-info.vue b/src/views/modules/visual/communityGovern/cpt/issue-info.vue
index 381a871c..6ebd7d49 100644
--- a/src/views/modules/visual/communityGovern/cpt/issue-info.vue
+++ b/src/views/modules/visual/communityGovern/cpt/issue-info.vue
@@ -23,7 +23,7 @@
               <span>{{ info.issueSuggestion }}</span>
             </div>
 
-            <div class="info-prop">
+            <div class="info-prop" v-if="info.topicInfo">
               <span class="info-title-2">话题内容：</span>
               <div>
                 <div>{{ info.topicInfo.topicContent }}</div>
@@ -43,7 +43,7 @@
               <span class="info-title-2">所属网格：</span>
               <span>{{ info.belongsGridName}}</span>
             </div>
-            <div class="info-prop">
+            <div class="info-prop" v-if="info.topicInfo">
               <span class="info-title-2">话题发表人：</span>
               <span>{{ info.topicInfo.publishedUser}}</span>
             </div>
@@ -51,11 +51,11 @@
               <span class="info-title-2">议题发起人：</span>
               <span>{{ info.issueInitiator}}</span>
             </div>
-            <div class="info-prop">
+            <div class="info-prop" v-if="info.topicInfo">
               <span class="info-title-2">话题来源：</span>
               <span>{{ info.topicInfo.groupName}}</span>
             </div>
-            <div class="info-prop">
+            <div class="info-prop" v-if="info.topicInfo">
               <span class="info-title-2">话题发表时间：</span>
               <span>{{ info.topicInfo.publishedTimeShow}}</span>
             </div>
diff --git a/src/views/modules/visual/heart/index.vue b/src/views/modules/visual/heart/index.vue
index d19a3ad1..26bd786d 100644
--- a/src/views/modules/visual/heart/index.vue
+++ b/src/views/modules/visual/heart/index.vue
@@ -80,6 +80,7 @@ import { requestPost } from "@/js/dai/request";
 import cptCard from "@/views/modules/visual/cpts/card";
 import cptTb from "@/views/modules/visual/cpts/tb";
 import nextTick from "dai-js/tools/nextTick";
+import dateFormat from "dai-js/tools/dateFormat";
 
 export default {
   name: "heart",
@@ -88,7 +89,14 @@ export default {
       agencyId: "",
       areaCode: "",
 
-      monthId: "",
+      monthId: dateFormat(
+        new Date(
+          new Date().getFullYear(),
+          new Date().getMonth() - 1,
+          new Date().getDate()
+        ),
+        "yyyyMM"
+      ),
 
       // 先进网格/支部
       tb1: {

From ea8871d93be6cba8dedded9fef6d940921ba994c Mon Sep 17 00:00:00 2001
From: 13176889840 <13176889840@163.com>
Date: Thu, 30 Dec 2021 11:08:02 +0800
Subject: [PATCH 10/29] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E4=B8=80=E4=BA=9B?=
 =?UTF-8?q?=E7=B1=BBbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../visual/communityParty/community.vue       | 136 ++++++++++++++++--
 .../modules/visual/communityParty/party.vue   |  35 ++++-
 .../visual/components/screen-table/index.vue  |   4 +
 3 files changed, 157 insertions(+), 18 deletions(-)

diff --git a/src/views/modules/visual/communityParty/community.vue b/src/views/modules/visual/communityParty/community.vue
index 71601608..e3e9fe84 100644
--- a/src/views/modules/visual/communityParty/community.vue
+++ b/src/views/modules/visual/communityParty/community.vue
@@ -6,13 +6,20 @@
              src="../../../../assets/img/shuju/title-tip.png" />
         <div class="title-label">
           区域化党建
+          <el-cascader 
+            v-model="selectAgency"
+            :options="propTree" 
+            :props="{ checkStrictly: true }" 
+            :show-all-levels="false"
+            clearable 
+            @change="handleCascader">
+          </el-cascader>
         </div>
       </div>
       <div class="second-title">
         <div class="second-title-label">党建单位分类统计</div>
         <div class="second-select">
           <el-select v-model="serviceMatter"
-                     clearable
                      placeholder="请选择"
                      @change="handleSelectChange"
                      @clear="handleSelectChange">
@@ -31,6 +38,7 @@
                           end-placeholder="结束日期"
                           prefix-icon="el-icon-caret-bottom"
                           value-format="yyyy-MM-dd HH:mm:ss"
+                          :clearable="false"
                           :default-time="['00:00:00', '23:59:59']"
                           >
           </el-date-picker>
@@ -147,13 +155,15 @@ export default {
       value2: '',
       timeRange: '',
       visibleLoading: true,
-      serviceMatter: '',
+      serviceMatter: 'all',
       pageNo: 1,
       pageSize: 10,
       total: 0,
       activeIndex: 0,
       activeLevel: "1",
+      selectAgency: '',
       unitList: [],
+      propTree: [],
       partyItem: [
         {
           name: '楼宇党建',
@@ -231,33 +241,37 @@ export default {
   async mounted () {
     const { user } = this.$store.state
     this.agencyId = user.agencyId
+    console.log('agencyId-------', this.agencyId)
+    this.initTime()
     await nextTick(100);
+    await this.getAgencyList()
     this.loadUnit()
-    this.getList();
+    this.getList(this.agencyId)
     this.getCateCount()
     this.getCateType()
+    
     await this.getWorkUserInfo()
-    await this.getMapUnitList()
+    await this.getMapUnitList(this.agencyId)
   },
   watch: {
     timeRange(val) {
       console.log('val-www', val)
-      this.getList();
+      this.getList(this.agencyId);
     }
   },
   methods: {
 
     //具体人员列表
-    async getList () {
+    async getList (agencyId) {
       this.visibleLoading = true
 
       const url = "/heart/icpartyactivity/activitylist"
       // const url = "http://yapi.elinkservice.cn/mock/245/heart/icpartyactivity/list"
       let params = {
-        agencyId: this.agencyId,
+        agencyId,
         pageSize: this.pageSize,
         pageNo: this.pageNo,
-        serviceMatter: this.serviceMatter,
+        serviceMatter: this.serviceMatter == 'all' ? '' : this.serviceMatter,
         startTime: this.timeRange && this.timeRange[0] || '',
         endTime: this.timeRange && this.timeRange[1] || ''
       }
@@ -277,6 +291,55 @@ export default {
       }
       this.visibleLoading = false
     },
+    async getAgencyList() {
+      // const url = "/gov/org/customeragency/staffinagencylist";
+      // const url = '/gov/org/customeragency/agencygridtree'
+      const url = '/gov/org/customeragency/staffinagencylist'
+      // let params = {
+      //   agencyId: this.$store.state.user.agencyId,
+      // };
+      const { data, code, msg } = await requestPost(url);
+      if (code === 0) {
+        console.log('data-org----o', data)
+        let { agencyList, subAgencyList } = data
+        this.selectAgency = [`${agencyList.agencyId}-${agencyList.level}`]
+        let arr = []
+        agencyList.subAgencyList = subAgencyList
+        arr.push(agencyList)
+        this.propTree = arr && this.getTreeData(arr)
+
+      } else {
+        this.$message.error(msg)
+      }
+    },
+    getTreeData(data){
+      if (!Array.isArray(data)) return []
+      let arr = data.map(item => {
+        let _item = {}
+        if (item.subAgencyList) {
+          if (item.subAgencyList.length === 0) {
+            _item = { 
+              label: item.agencyName,
+              value: item.agencyId + '-' + item.level,
+              level: item.level,
+              children: undefined 
+            }
+          } else _item = { 
+            label: item.agencyName,
+            value: item.agencyId + '-' + item.level,
+            level: item.level,
+            children: this.getTreeData(item.subAgencyList)}
+        } else {
+          _item = { 
+            label: item.agencyName,
+            value: item.agencyId + '-' + item.level,
+            level: item.level,
+          }
+        }
+        return _item
+      })
+      return arr
+    },
     async getCateCount () {
 
       const url = "/heart/icpartyactivity/statistics"
@@ -352,7 +415,35 @@ export default {
         this.$message.error(msg)
       }
     },
-    
+    handleCascader(val) {
+      console.log('val-vvv', val)
+      if (val.length > 0) {
+        const _arr = val[val.length - 1].split('-')
+        const orgType = _arr[1] !== 'grid' ? 'agency': 'grid'
+        this.getList(_arr[0])
+        this.getMapUnitList(_arr[0])
+      }
+      
+    },
+    initTime() {
+      const end = new Date();
+      const start = new Date();
+      start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
+      console.log('time-rtt', this.timeFormat(start), this.timeFormat(end))
+      this.timeRange = [this.timeFormat(start), this.timeFormat(end)]
+    },
+    timeFormat(date) {
+      if (!date || typeof date === 'string') {
+        return false
+      }
+      var y = date.getFullYear() //年
+      var m = date.getMonth() + 1 //月
+      if (m < 10) m = '0' + m
+      var d = date.getDate() //日
+      if (d < 10) d = '0' + d
+
+      return y + '-' + m + '-' + d + ' 00:00:00'
+    },
     async loadUnit () {
       const url = "/heart/icresidemanddict/subcodelist"
       // const url = "http://yapi.elinkservice.cn/mock/245/heart/icpartyunit/option"
@@ -365,7 +456,10 @@ export default {
 
       if (code === 0) {
         this.unitList = data
-
+        this.unitList.unshift({
+          label: '全部',
+          value: 'all'
+        })
       } else {
         this.$message.error(msg)
       }
@@ -419,12 +513,12 @@ export default {
     // },
 
     //获取联建单位分布图
-    async getMapUnitList () {
+    async getMapUnitList (agencyId) {
       const url = "/heart/icpartyunit/distribution"
       // const url = "http://yapi.elinkservice.cn/mock/245/heart/icpartyunit/distribution"
 
       let params = {
-        agencyId: this.agencyId
+        agencyId
       }
 
       const { data, code, msg } = await requestPost(url, params)
@@ -492,7 +586,7 @@ export default {
       this.showedMoreInfo = true
     },
 
-    handleSelectChange () {
+    handleSelectChange (val) {
       this.getList();
     },
     pageSizeChangeHandleNew (val) {
@@ -562,8 +656,22 @@ export default {
     margin-right: 6px;
   }
   .title-label {
-    font-size: 16px;
+    font-size: 20px;
     font-weight: 800;
+    ::v-deep .el-input {
+      width: 180px;
+      margin-left: 10px;
+      .el-input__inner {
+        font-size: 18px;
+        font-weight: 800;
+        color: #fff;
+        background: transparent;
+        border: 0;
+      }
+      .el-icon-arrow-down::before {
+          content: "\e790";
+      }
+    }
   }
   ::v-deep .el-dropdown {
     font-size: 16px;
diff --git a/src/views/modules/visual/communityParty/party.vue b/src/views/modules/visual/communityParty/party.vue
index ca13dcae..92019480 100644
--- a/src/views/modules/visual/communityParty/party.vue
+++ b/src/views/modules/visual/communityParty/party.vue
@@ -59,6 +59,7 @@
               :tableData="ageList"
               :visibleLoading="visibleLoading"
               :operate="false"
+              @row="handleClickRow"
             ></screen-table>
             <div class="pagination">
               <el-pagination
@@ -100,6 +101,7 @@
               :tableData="eduList"
               :visibleLoading="visibleLoading"
               :operate="false"
+              @row="handleClickRow"
             ></screen-table>
             <div class="pagination">
               <el-pagination
@@ -454,9 +456,17 @@ export default {
     },
     clickAgePie (seriesIndex) {
       let _code = ''
+      let isClick = false
       this.ageItem.forEach((element, index) => {
         if (index === seriesIndex) {
           _code = element.code
+          
+          if (!this.noInit) isClick = false
+          else {
+            element.isClick = !element.isClick
+            isClick = element.isClick
+          }
+
           element.label = {
             show: true,
 
@@ -492,16 +502,25 @@ export default {
       if (this.noInit) {
         const _arr = this.selectAgency[this.selectAgency.length - 1].split('-')
         const orgType = _arr[1] !== 'grid' ? 'agency': 'grid'
-        this.getAgeList(_arr[0], orgType, _code)
+         console.log('zlcm---isClick', isClick)
+        this.getAgeList(_arr[0], orgType, isClick && _code || '')
       }
       this.noInit = true
 
     },
     clickEduPie (seriesIndex) {
       let _code = ''
+      let isClick = false
       this.eduItem.forEach((element, index) => {
         if (index === seriesIndex) {
           _code = element.code
+
+          if (!this.noEduInit) isClick = false
+          else {
+            element.isClick = !element.isClick
+            isClick = element.isClick
+          }
+
           element.label = {
             show: true,
 
@@ -538,7 +557,7 @@ export default {
         const _arr = this.selectAgency[this.selectAgency.length - 1].split('-')
         const orgType = _arr[1] !== 'grid' ? 'agency': 'grid'
 
-        this.getEduList(_arr[0], orgType, _code)
+        this.getEduList(_arr[0], orgType, isClick && _code || '')
       }
       this.noEduInit = true
       
@@ -555,7 +574,8 @@ export default {
         this.ageItem = data.map(item => {
           return {
             ...item,
-            name: item.label
+            name: item.label,
+            isClick: false
           }
         })
         data.forEach(item => {
@@ -576,7 +596,8 @@ export default {
         this.eduItem = data.map(item => {
           return {
             ...item,
-            name: item.label
+            name: item.label,
+            isClick: false
           }
         })
         data.forEach(item => {
@@ -679,6 +700,12 @@ export default {
       })
       return arr
     },
+    handleClickRow(val) {
+      console.log('click-row----', val)
+      this.$router.push({
+        path: `/main-shuju/visual-basicinfo-people/${val.userId}`,
+      });
+    },
     handleCascader(val) {
       console.log('val-vvv', val)
       const _arr = val[val.length - 1].split('-')
diff --git a/src/views/modules/visual/components/screen-table/index.vue b/src/views/modules/visual/components/screen-table/index.vue
index bfc00da9..cec78934 100644
--- a/src/views/modules/visual/components/screen-table/index.vue
+++ b/src/views/modules/visual/components/screen-table/index.vue
@@ -22,6 +22,7 @@
           class="table-body-tr"
           v-for="(value, index) in tableData"
           :key="index"
+          @click.stop="handleClickRow(value)"
         >
           <div
             class="td"
@@ -201,6 +202,9 @@ export default {
     look(val) {
       console.log('look-----l', val)
       this.$emit('look', val)
+    },
+    handleClickRow(val) {
+      this.$emit('row', val)
     }
   },
 };

From 3cbbdcb0a9c9aec3f008d0b10ffc1a9cf93e7da4 Mon Sep 17 00:00:00 2001
From: 13176889840 <13176889840@163.com>
Date: Thu, 30 Dec 2021 13:30:56 +0800
Subject: [PATCH 11/29] =?UTF-8?q?=E5=85=9A=E5=91=98=E9=A3=8E=E9=87=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/views/modules/communityParty/elegant/index.vue b/src/views/modules/communityParty/elegant/index.vue
index 66453605..9c7b5a18 100644
--- a/src/views/modules/communityParty/elegant/index.vue
+++ b/src/views/modules/communityParty/elegant/index.vue
@@ -120,7 +120,7 @@
     </el-card>
 
     <el-dialog
-      title="居民需求分类"
+      title="党员风采"
       :visible.sync="dialogVisible"
       width="40%"
       append-to-body

From 168353e0ecd3f1b0ced08f21bb5b8f7b1b6c4308 Mon Sep 17 00:00:00 2001
From: 13176889840 <13176889840@163.com>
Date: Thu, 30 Dec 2021 13:46:24 +0800
Subject: [PATCH 12/29] dd

---
 .../modules/visual/communityParty/community.vue    | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/views/modules/visual/communityParty/community.vue b/src/views/modules/visual/communityParty/community.vue
index e3e9fe84..aa3d248c 100644
--- a/src/views/modules/visual/communityParty/community.vue
+++ b/src/views/modules/visual/communityParty/community.vue
@@ -247,8 +247,8 @@ export default {
     await this.getAgencyList()
     this.loadUnit()
     this.getList(this.agencyId)
-    this.getCateCount()
-    this.getCateType()
+    this.getCateCount(this.agencyId)
+    this.getCateType(this.agencyId)
     
     await this.getWorkUserInfo()
     await this.getMapUnitList(this.agencyId)
@@ -340,12 +340,12 @@ export default {
       })
       return arr
     },
-    async getCateCount () {
+    async getCateCount (agencyId) {
 
       const url = "/heart/icpartyactivity/statistics"
       // const url = "http://yapi.elinkservice.cn/mock/245/heart/icpartyactivity/list"
       let params = {
-        agencyId: this.agencyId
+        agencyId
       }
 
       const { data, code, msg } = await requestPost(url, params)
@@ -356,12 +356,12 @@ export default {
         this.$message.error(msg)
       }
     },
-    async getCateType () {
+    async getCateType (agencyId) {
 
       const url = "/heart/icpartyunit/typestatistics"
       // const url = "http://yapi.elinkservice.cn/mock/245/heart/icpartyactivity/list"
       let params = {
-        agencyId: this.agencyId
+        agencyId
       }
 
       const { data, code, msg } = await requestPost(url, params)
@@ -422,6 +422,8 @@ export default {
         const orgType = _arr[1] !== 'grid' ? 'agency': 'grid'
         this.getList(_arr[0])
         this.getMapUnitList(_arr[0])
+        this.getCateCount(_arr[0])
+        this.getCateType(_arr[0])
       }
       
     },

From a13af333a3acd8f112ae83b7316ea96b267fad12 Mon Sep 17 00:00:00 2001
From: 13176889840 <13176889840@163.com>
Date: Thu, 30 Dec 2021 13:57:33 +0800
Subject: [PATCH 13/29] =?UTF-8?q?=E6=98=BE=E7=A4=BA=E6=B1=89=E5=AD=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/visual/communityParty/community.vue      | 2 +-
 src/views/modules/visual/components/screen-table/index.vue | 2 ++
 src/views/modules/visual/measure/service.vue               | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/views/modules/visual/communityParty/community.vue b/src/views/modules/visual/communityParty/community.vue
index aa3d248c..9b3f7204 100644
--- a/src/views/modules/visual/communityParty/community.vue
+++ b/src/views/modules/visual/communityParty/community.vue
@@ -143,7 +143,7 @@ export default {
         { title: "区域化党建单位名称", coulmn: 'unitName' },
         { title: "活动标题", coulmn: 'title' },
         { title: "活动地址", coulmn: 'address' },
-        { title: "服务事项", coulmn: 'serviceMatter' },
+        { title: "服务事项", coulmn: 'serviceMatterName' },
         { title: "服务人数", coulmn: 'peopleCount' },
         { title: "活动时间", coulmn: 'activityTime' }
       ],
diff --git a/src/views/modules/visual/components/screen-table/index.vue b/src/views/modules/visual/components/screen-table/index.vue
index cec78934..c26e00fa 100644
--- a/src/views/modules/visual/components/screen-table/index.vue
+++ b/src/views/modules/visual/components/screen-table/index.vue
@@ -254,6 +254,8 @@ export default {
         .td {
           text-align: center;
           width: calc(100% / 5);
+          box-sizing: border-box;
+          padding: 0 15px;
           cursor: pointer;
           overflow: hidden;
           white-space: nowrap;
diff --git a/src/views/modules/visual/measure/service.vue b/src/views/modules/visual/measure/service.vue
index c2be622e..8fdafe8a 100644
--- a/src/views/modules/visual/measure/service.vue
+++ b/src/views/modules/visual/measure/service.vue
@@ -179,7 +179,7 @@ export default {
         { title: "上报人", coulmn: 'reportUserName' },
         { title: "上报时间", coulmn: 'reportTime' },
         { title: "需求人", coulmn: 'demandUserName' },
-        { title: "服务方", coulmn: 'serviceName' },
+        { title: "服务方", coulmn: 'serviceShowName' },
         { title: "服务时间", coulmn: 'wantServiceTime' },
       ],
       categoryList: [],

From 25a568976bbeb3ce21d48df3d718437a55dd7392 Mon Sep 17 00:00:00 2001
From: 13176889840 <13176889840@163.com>
Date: Thu, 30 Dec 2021 14:38:31 +0800
Subject: [PATCH 14/29] =?UTF-8?q?=E9=A5=BC=E5=9B=BE=E7=82=B9=E5=87=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/visual/communityParty/party.vue   | 47 +++++++++++++++----
 1 file changed, 38 insertions(+), 9 deletions(-)

diff --git a/src/views/modules/visual/communityParty/party.vue b/src/views/modules/visual/communityParty/party.vue
index 92019480..238e8160 100644
--- a/src/views/modules/visual/communityParty/party.vue
+++ b/src/views/modules/visual/communityParty/party.vue
@@ -40,7 +40,7 @@
             <div class="echarts-tips echarts-tips-wd50">
               <div class="tips-lists">
                 <div v-for="(item, index) in ageItem" :key="index" class="tips-items">
-                  <div class="tips-items-title" :class="'tips-items-title' + item.value">
+                  <div class="tips-items-title" :class="'tips-items-title' + item.code">
                     {{ item.name }}
                   </div>
                   <div class="tips-items-num">
@@ -325,7 +325,7 @@ export default {
         this.clickEduPie(params.dataIndex)
       }
       this.$refs.eduChart.handleClick(fun)
-      this.noInit = true
+      // this.noInit = true
       // option && this.$refs.pieChart.setOption(option);
 
     },
@@ -457,6 +457,7 @@ export default {
     clickAgePie (seriesIndex) {
       let _code = ''
       let isClick = false
+      console.log('seriesIndex---', seriesIndex)
       this.ageItem.forEach((element, index) => {
         if (index === seriesIndex) {
           _code = element.code
@@ -480,6 +481,7 @@ export default {
           };
           console.log('zlcm', element)
         } else {
+          element.isClick = false
           element.label = {
             show: false,
 
@@ -534,6 +536,7 @@ export default {
           };
           console.log('zlcm')
         } else {
+          element.isClick = false
           element.label = {
             show: false,
 
@@ -571,11 +574,37 @@ export default {
       };
       const { data, code, msg } = await requestPost(url, params);
       if (code === 0) {
-        this.ageItem = data.map(item => {
+        const colorList = [
+          {
+            name: '50岁以下',
+            value: 1,
+            color: '#FAC126'
+          }, {
+            name: '50-59岁',
+            value: 2,
+            color: '#3DDA83'
+          }, {
+            name: '60-69岁',
+            value: 3,
+            color: '#A800FF'
+          }, {
+            name: '70-79岁',
+            value: 4,
+            color: '#2865FA'
+          }, {
+            name: '80岁以上',
+            value: 5,
+            color: '#00DAD2'
+          }
+        ]
+        this.ageItem = data.map((item, index) => {
           return {
             ...item,
             name: item.label,
-            isClick: false
+            isClick: false,
+            itemStyle: {
+              color: colorList[index].color
+            }
           }
         })
         data.forEach(item => {
@@ -939,18 +968,18 @@ export default {
       padding-left: 6px;
       font-size: 16px;
       color: #EFF0F1;
-      background: url('../../../../assets/img/shuju/measure/zi@2x.png') no-repeat left bottom;
+      background: url('../../../../assets/img/shuju/measure/huang@2x.png') no-repeat left bottom;
       &1 {
-        background: url('../../../../assets/img/shuju/measure/huang@2x.png') no-repeat left bottom;
+        background: url('../../../../assets/img/shuju/measure/lv@2x.png') no-repeat left bottom;
       }
       &2 {
-        background: url('../../../../assets/img/shuju/measure/lan@2x.png') no-repeat left bottom;
+        background: url('../../../../assets/img/shuju/measure/zi@2x.png') no-repeat left bottom;
       }
       &3 {
-        background: url('../../../../assets/img/shuju/measure/lanlv@2x.png') no-repeat left bottom;
+        background: url('../../../../assets/img/shuju/measure/lan@2x.png') no-repeat left bottom;
       }
       &4 {
-        background: url('../../../../assets/img/shuju/measure/lv@2x.png') no-repeat left bottom;
+        background: url('../../../../assets/img/shuju/measure/lanlv@2x.png') no-repeat left bottom;
       }
     }
     .tips-items-num {

From 83cb317e2870f46a7e2f7bc28e3876ab9b5d9679 Mon Sep 17 00:00:00 2001
From: jiangyy <jiang478938504@126.com>
Date: Thu, 30 Dec 2021 15:20:14 +0800
Subject: [PATCH 15/29] =?UTF-8?q?=E7=A4=BE=E5=8C=BA=E6=B2=BB=E7=90=86bug?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/scss/modules/visual/issue-info.scss      |  2 +-
 src/assets/scss/modules/visual/resibuzz.scss        |  7 ++++---
 .../modules/visual/basicinfo/basicInfoMain.vue      |  6 +++---
 .../visual/communityGovern/distributionAnalyze.vue  |  3 ++-
 .../visual/communityGovern/processAnalyze.vue       |  3 ++-
 .../modules/visual/communityGovern/resibuzz.vue     |  5 +++--
 .../modules/visual/communityGovern/typeAnalyze.vue  | 13 +++++--------
 .../modules/visual/components/screen-map/index.vue  |  6 +++---
 8 files changed, 23 insertions(+), 22 deletions(-)

diff --git a/src/assets/scss/modules/visual/issue-info.scss b/src/assets/scss/modules/visual/issue-info.scss
index 43f77201..e4672951 100644
--- a/src/assets/scss/modules/visual/issue-info.scss
+++ b/src/assets/scss/modules/visual/issue-info.scss
@@ -74,7 +74,7 @@
     display: flex;
     padding-left: 15px;
     .info-title-2 {
-      width: 90px;
+      width: 100px;
       flex: 0 0 1;
       font-size: 14px;
     }
diff --git a/src/assets/scss/modules/visual/resibuzz.scss b/src/assets/scss/modules/visual/resibuzz.scss
index 91ff7705..8ea3f5ee 100644
--- a/src/assets/scss/modules/visual/resibuzz.scss
+++ b/src/assets/scss/modules/visual/resibuzz.scss
@@ -52,9 +52,10 @@
     }
   }
   .status-select {
-    position: absolute;
-    top: 20px;
-    right: 10px;
+    margin-left: 10px;
+    // position: absolute;
+    // top: 20px;
+    // right: 10px;
   }
   .second-select:last-child {
     margin-left: 0;
diff --git a/src/views/modules/visual/basicinfo/basicInfoMain.vue b/src/views/modules/visual/basicinfo/basicInfoMain.vue
index 568c453b..e538d41e 100644
--- a/src/views/modules/visual/basicinfo/basicInfoMain.vue
+++ b/src/views/modules/visual/basicinfo/basicInfoMain.vue
@@ -549,11 +549,11 @@ const vueGis = {
     //根据组织层级设置缩放级别
     setZoom (agencyLevel) {
       if (agencyLevel === 'district') {
-        this.zoom = 14
+        this.zoom = 12
       } else if (agencyLevel === 'street') {
-        this.zoom = 15
+        this.zoom = 13
       } else if (agencyLevel === 'community') {
-        this.zoom = 16
+        this.zoom = 14
       }
 
     },
diff --git a/src/views/modules/visual/communityGovern/distributionAnalyze.vue b/src/views/modules/visual/communityGovern/distributionAnalyze.vue
index 5f5e4c79..88094255 100644
--- a/src/views/modules/visual/communityGovern/distributionAnalyze.vue
+++ b/src/views/modules/visual/communityGovern/distributionAnalyze.vue
@@ -349,8 +349,9 @@ export default {
       const { data, code, msg } = await requestPost(url, params);
 
       if (code === 0) {
+        debugger
         this.legendArray = []
-        if (data.above) {
+        if (data.under) {
           this.under = data.under
           this.legendArray.push(
             {
diff --git a/src/views/modules/visual/communityGovern/processAnalyze.vue b/src/views/modules/visual/communityGovern/processAnalyze.vue
index 8ed41ee2..73236c98 100644
--- a/src/views/modules/visual/communityGovern/processAnalyze.vue
+++ b/src/views/modules/visual/communityGovern/processAnalyze.vue
@@ -424,7 +424,8 @@ export default {
     loadMap () {
       if (this.isfirstInit) {
         //mapInfo, polygonArray, polIconUrlArray, iconArrays, iconUrlArray
-        this.$refs.map.loadMap(this.agencyInfo, null, null, this.projectList, this.iconUrlArray, this.iconTextStyle, 3000)
+        // this.$refs.map.loadMap(this.agencyInfo, null, null, this.projectList, this.iconUrlArray, this.iconTextStyle, 3000)
+        this.$refs.map.loadMap(this.agencyInfo, null, null, this.projectList, this.iconUrlArray, this.iconTextStyle)
       } else {
         this.$refs.map.refreshMap(null, this.projectList)
       }
diff --git a/src/views/modules/visual/communityGovern/resibuzz.vue b/src/views/modules/visual/communityGovern/resibuzz.vue
index e8a7faf1..947c6d02 100644
--- a/src/views/modules/visual/communityGovern/resibuzz.vue
+++ b/src/views/modules/visual/communityGovern/resibuzz.vue
@@ -279,6 +279,7 @@ export default {
       let params = {
         orgId: this.orgId,
         orgType: this.orgType,
+        status: this.status,
 
       };
 
@@ -453,9 +454,9 @@ export default {
             item.status ? item.status : '',
             item.createdTime ? item.createdTime : '',
             item.issueOriginator ? item.issueOriginator : '',
-            item.voteAccount ? item.voteAccount : 0,
+            item.voteAccount ? item.voteAccount : '',
             item.supportCount ? item.supportCount : 0,
-            item.oppositionCount ? item.oppositionCount : '',
+            item.oppositionCount ? item.oppositionCount : 0,
             { type: "operate", list: ["查看"] },
           ];
         });
diff --git a/src/views/modules/visual/communityGovern/typeAnalyze.vue b/src/views/modules/visual/communityGovern/typeAnalyze.vue
index a1b3f1b0..0c17367a 100644
--- a/src/views/modules/visual/communityGovern/typeAnalyze.vue
+++ b/src/views/modules/visual/communityGovern/typeAnalyze.vue
@@ -2,7 +2,7 @@
   <cpt-card>
     <div class="title">
       <img src="@/assets/img/shuju/title-tip.png" />
-      <span>事件分类分析</span>
+      <span>项目分类分析</span>
 
       <div class="second-select cascader">
 
@@ -123,10 +123,7 @@ export default {
             align: "center",
             width: "5%",
           },
-          {
-            align: "center",
-            width: "10%",
-          },
+
           {
             align: "center",
             width: "10%",
@@ -145,7 +142,7 @@ export default {
           },
           {
             align: "center",
-            width: "20%",
+            width: "30%",
           },
           {
             align: "center",
@@ -156,7 +153,7 @@ export default {
             width: "10%",
           },
         ],
-        header: ["序号", "项目编号", "类别", "反映渠道", "所属网格", "状态", "项目标题", "转成项目时间", "操作"],
+        header: ["序号", "类别", "反映渠道", "所属网格", "状态", "项目标题", "转成项目时间", "操作"],
         list: [],
         pageSize: 10,
         pageNo: 1,
@@ -427,7 +424,7 @@ export default {
             item.statusShow = item.status === 'pending' ? '待处理' : '已结案'
             return [
               { type: "index" },
-              item.projectCode ? item.projectCode : '',
+              // item.projectCode ? item.projectCode : '',
               item.categoryNames.join(','),
               item.originShow ? item.originShow : '',
               item.gridName ? item.gridName : '',
diff --git a/src/views/modules/visual/components/screen-map/index.vue b/src/views/modules/visual/components/screen-map/index.vue
index 0166c8c3..96348b46 100644
--- a/src/views/modules/visual/components/screen-map/index.vue
+++ b/src/views/modules/visual/components/screen-map/index.vue
@@ -450,11 +450,11 @@ const vueGis = {
     //根据组织层级设置缩放级别
     setZoom (level) {
       if (level === 'district') {
-        this.zoom = 14
+        this.zoom = 12
       } else if (level === 'street') {
-        this.zoom = 15
+        this.zoom = 13
       } else if (level === 'community') {
-        this.zoom = 16
+        this.zoom = 14
       }
 
     },

From 479ef35b306d46ab0751ea9ef8fece7fc1a81808 Mon Sep 17 00:00:00 2001
From: jiangyy <jiang478938504@126.com>
Date: Thu, 30 Dec 2021 15:21:45 +0800
Subject: [PATCH 16/29] =?UTF-8?q?=E7=8E=AF=E5=A2=83=E4=B8=B4=E6=97=B6?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4=EF=BC=88=E5=BF=BD=E7=95=A5=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.development  | 4 +++-
 public/index.html | 4 ++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/.env.development b/.env.development
index b3e49ab5..b23cea2c 100644
--- a/.env.development
+++ b/.env.development
@@ -1,7 +1,9 @@
 NODE_ENV=development
 # VUE_APP_API_SERVER =  https://epmet-test.elinkservice.cn/api
 VUE_APP_API_SERVER =  http://192.168.1.140/api
-# VUE_APP_API_SERVER =  http://192.168.51.36:8080/api
+
+#家中开发连级的后端服务
+# VUE_APP_API_SERVER =  https://epmet-dev.elinkservice.cn:41080/api
 # VUE_APP_API_SERVER =  https://epmet-dev.elinkservice.cn/api
 VUE_APP_NODE_ENV=dev 
 #项目根路径
diff --git a/public/index.html b/public/index.html
index 840ae8cc..ebeef610 100644
--- a/public/index.html
+++ b/public/index.html
@@ -40,8 +40,8 @@
     <script>
      window.SITE_CONFIG['apiURL'] = 'http://192.168.1.140/api'
       // window.SITE_CONFIG['apiURL'] = 'https://epmet-test.elinkservice.cn/api'
-            // window.SITE_CONFIG['apiURL'] = 'http://118.190.150.119:41080/api'
-      // window.SITE_CONFIG['apiURL'] = 'https://epmet-dev.elinkservice.cn/api'
+           //  window.SITE_CONFIG['apiURL'] = 'http://118.190.150.119:41080/api'
+     // window.SITE_CONFIG['apiURL'] = 'https://epmet-dev.elinkservice.cn/api'
     </script>
     <% } %>
       <!-- 集成测试环境 dev -->

From 33bba514ed04b6892763eafcd8eb2280a1904b96 Mon Sep 17 00:00:00 2001
From: jiangyy <jiang478938504@126.com>
Date: Thu, 30 Dec 2021 15:38:07 +0800
Subject: [PATCH 17/29] =?UTF-8?q?=E5=9C=B0=E5=9B=BE=E7=BC=A9=E6=94=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/visual/components/screen-map/index.vue | 6 +++---
 src/views/modules/workSys/mapConfig.vue                  | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/views/modules/visual/components/screen-map/index.vue b/src/views/modules/visual/components/screen-map/index.vue
index 96348b46..f33f095f 100644
--- a/src/views/modules/visual/components/screen-map/index.vue
+++ b/src/views/modules/visual/components/screen-map/index.vue
@@ -450,11 +450,11 @@ const vueGis = {
     //根据组织层级设置缩放级别
     setZoom (level) {
       if (level === 'district') {
-        this.zoom = 12
+        this.zoom = 11
       } else if (level === 'street') {
-        this.zoom = 13
+        this.zoom = 12
       } else if (level === 'community') {
-        this.zoom = 14
+        this.zoom = 13
       }
 
     },
diff --git a/src/views/modules/workSys/mapConfig.vue b/src/views/modules/workSys/mapConfig.vue
index 5853ab39..d60f7930 100644
--- a/src/views/modules/workSys/mapConfig.vue
+++ b/src/views/modules/workSys/mapConfig.vue
@@ -390,11 +390,11 @@ const vueGis = {
     //根据组织层级设置缩放级别
     setZoom (agencyLevel) {
       if (agencyLevel === 'district') {
-        this.zoom = 13
+        this.zoom = 12
       } else if (agencyLevel === 'street') {
-        this.zoom = 14
+        this.zoom = 13
       } else if (agencyLevel === 'community') {
-        this.zoom = 15
+        this.zoom = 14
       }
 
     },

From 08bea873fe4e7b7b6cd1920b3542fb990b8b9b20 Mon Sep 17 00:00:00 2001
From: jiangyy <jiang478938504@126.com>
Date: Fri, 31 Dec 2021 08:11:35 +0800
Subject: [PATCH 18/29] =?UTF-8?q?=E5=88=86=E5=B8=83bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../communityGovern/distributionAnalyze.vue   | 24 ++++++++++---------
 .../visual/communityGovern/resibuzz.vue       |  6 +++--
 2 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/src/views/modules/visual/communityGovern/distributionAnalyze.vue b/src/views/modules/visual/communityGovern/distributionAnalyze.vue
index 88094255..e5c7754d 100644
--- a/src/views/modules/visual/communityGovern/distributionAnalyze.vue
+++ b/src/views/modules/visual/communityGovern/distributionAnalyze.vue
@@ -349,7 +349,7 @@ export default {
       const { data, code, msg } = await requestPost(url, params);
 
       if (code === 0) {
-        debugger
+
         this.legendArray = []
         if (data.under) {
           this.under = data.under
@@ -392,22 +392,24 @@ export default {
               item.longitude = agencyItem.longitude
               item.latitude = agencyItem.latitude
               item.coordinates = agencyItem.coordinates
-
+              debugger
               if (this.under) {
                 if (item.count < this.under || item.count === this.under) {
                   item.color = this.colorArray[0]
                   item.fillColor = this.colorFillArray[0]
-                }
-
-                if (this.above) {
-                  if (item.count > this.under && item.count < this.above) {
-                    item.color = this.colorArray[1]
-                    item.fillColor = this.colorFillArray[1]
-                  } else {
-                    item.color = this.colorArray[2]
-                    item.fillColor = this.colorFillArray[2]
+                } else {
+                  if (this.above) {
+                    if (item.count > this.under && item.count < this.above) {
+                      item.color = this.colorArray[1]
+                      item.fillColor = this.colorFillArray[1]
+                    } else {
+                      item.color = this.colorArray[2]
+                      item.fillColor = this.colorFillArray[2]
+                    }
                   }
                 }
+
+
               }
               break
             }
diff --git a/src/views/modules/visual/communityGovern/resibuzz.vue b/src/views/modules/visual/communityGovern/resibuzz.vue
index 947c6d02..92d1c819 100644
--- a/src/views/modules/visual/communityGovern/resibuzz.vue
+++ b/src/views/modules/visual/communityGovern/resibuzz.vue
@@ -406,8 +406,10 @@ export default {
 
     },
 
-    handleChangeState (index) {
-      this.getTable()
+    async handleChangeState (index) {
+      await this.getApiData()
+      this.assignPieChart()
+
     },
 
     async handleChangeAgency (value) {

From b64c161e66041e697c0db061e102bcd60be9a224 Mon Sep 17 00:00:00 2001
From: jiangyy <jiang478938504@126.com>
Date: Fri, 31 Dec 2021 08:12:24 +0800
Subject: [PATCH 19/29] =?UTF-8?q?=E5=88=86=E5=B8=83bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/views/modules/visual/communityGovern/distributionAnalyze.vue b/src/views/modules/visual/communityGovern/distributionAnalyze.vue
index e5c7754d..1ffc5d06 100644
--- a/src/views/modules/visual/communityGovern/distributionAnalyze.vue
+++ b/src/views/modules/visual/communityGovern/distributionAnalyze.vue
@@ -392,7 +392,7 @@ export default {
               item.longitude = agencyItem.longitude
               item.latitude = agencyItem.latitude
               item.coordinates = agencyItem.coordinates
-              debugger
+
               if (this.under) {
                 if (item.count < this.under || item.count === this.under) {
                   item.color = this.colorArray[0]

From 34509d30944fc9380418a28439fdf90c7fe0ed21 Mon Sep 17 00:00:00 2001
From: 13176889840 <13176889840@163.com>
Date: Fri, 31 Dec 2021 09:29:09 +0800
Subject: [PATCH 20/29] =?UTF-8?q?=E5=8C=BA=E5=9F=9F=E5=85=9A=E5=BB=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../visual/communityParty/community.vue        | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/src/views/modules/visual/communityParty/community.vue b/src/views/modules/visual/communityParty/community.vue
index 9b3f7204..0c2833d5 100644
--- a/src/views/modules/visual/communityParty/community.vue
+++ b/src/views/modules/visual/communityParty/community.vue
@@ -526,16 +526,22 @@ export default {
       const { data, code, msg } = await requestPost(url, params)
 
       if (code === 0) {
-        // this.unitMapList = data
-        this.unitMapList = this.unitMapList1
-
+        console.log('unitMapList----data', data)
+        this.unitMapList = data.map((item, index) => {
+          return {
+            ...item,
+            urlIndex: index
+          }
+        })
+        // this.unitMapList = this.unitMapList1
+        console.log('unitMapList----', this.unitMapList)
         this.unitMapList.forEach(item => {
 
-          if (item.type === '党建楼宇') {
+          if (item.type === '楼宇党建') {
             item.urlIndex = 0
-          } else if (item.type === '两新党建') {
+          } else if (item.type === '两新组织') {
             item.urlIndex = 1
-          } else if (item.type === '辖区单位') {
+          } else if (item.type === '区域单位党建') {
             item.urlIndex = 2
           } else if (item.type === '机关直属部门') {
             item.urlIndex = 3

From 748c466f53ff5062cf3c1fbdc7ead627a9c42e7e Mon Sep 17 00:00:00 2001
From: dai <851733175@qq.com>
Date: Fri, 31 Dec 2021 15:03:36 +0800
Subject: [PATCH 21/29] =?UTF-8?q?=E9=A2=84=E7=BA=A6=E4=BA=8B=E9=A1=B9?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=B0=81=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../communityService/dqfwzx/cpts/edit.vue     | 238 +++++++++++++-----
 1 file changed, 176 insertions(+), 62 deletions(-)

diff --git a/src/views/modules/communityService/dqfwzx/cpts/edit.vue b/src/views/modules/communityService/dqfwzx/cpts/edit.vue
index 74772f22..90ebcff9 100644
--- a/src/views/modules/communityService/dqfwzx/cpts/edit.vue
+++ b/src/views/modules/communityService/dqfwzx/cpts/edit.vue
@@ -173,67 +173,95 @@
               :key="'staff' + index"
               v-for="(item, index) in dataForm.matterList"
             >
-              <el-input
-                class="item_width_1"
-                maxlength="50"
-                show-word-limit
-                placeholder="事项名"
-                v-model="item.matterName"
-                :disabled="item.matterId != undefined"
-              />
-
-              <el-select
-                style="margin-left: 10px"
-                v-model="item.appointmentType"
-                filterable
-                placeholder="预约类型"
-                :disabled="item.matterId != undefined"
-              >
-                <el-option
-                  v-for="item in appointmentTypeOptions"
-                  :key="item.value"
-                  :label="item.label"
-                  :value="item.value"
+              <div class="item-info">
+                <el-input
+                  class="item_width_1"
+                  maxlength="50"
+                  show-word-limit
+                  placeholder="事项名"
+                  v-model="item.matterName"
+                  :disabled="item.matterId != undefined"
+                />
+
+                <el-select
+                  style="margin-left: 10px"
+                  v-model="item.appointmentType"
+                  filterable
+                  placeholder="预约类型"
+                  :disabled="item.matterId != undefined"
                 >
-                </el-option>
-              </el-select>
-
-              <el-time-select
-                style="margin-left: 10px"
-                v-model="item.startTime"
-                :picker-options="{
-                  start: '00:00',
-                  step: '00:30',
-                  end: '24:00',
-                }"
-                placeholder="开始时间"
-                :disabled="item.matterId != undefined"
-              >
-              </el-time-select>
-              <span style="margin: 0 5px">至</span>
-              <el-time-select
-                v-model="item.endTime"
-                :picker-options="{
-                  start: '00:00',
-                  step: '00:30',
-                  end: '24:00',
-                  minTime: item.startTime,
-                }"
-                placeholder="结束时间"
-                :disabled="item.matterId != undefined"
-              >
-              </el-time-select>
-
-              <el-button
-                style="margin-left: 10px"
-                size="small"
-                @click="handleDelStaff(index)"
-                >删除</el-button
-              >
+                  <el-option
+                    v-for="item in appointmentTypeOptions"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.value"
+                  >
+                  </el-option>
+                </el-select>
+
+                <el-time-select
+                  style="margin-left: 10px"
+                  v-model="item.startTime"
+                  :picker-options="{
+                    start: '00:00',
+                    step: '00:30',
+                    end: '24:00',
+                  }"
+                  placeholder="开始时间"
+                  :disabled="item.matterId != undefined"
+                >
+                </el-time-select>
+                <span style="margin: 0 5px">至</span>
+                <el-time-select
+                  v-model="item.endTime"
+                  :picker-options="{
+                    start: '00:00',
+                    step: '00:30',
+                    end: '24:00',
+                    minTime: item.startTime,
+                  }"
+                  placeholder="结束时间"
+                  :disabled="item.matterId != undefined"
+                >
+                </el-time-select>
+              </div>
+              <div class="item-pic">
+                <el-upload
+                  :disabled="item.matterId != undefined"
+                  class="avatar-uploader"
+                  :action="uploadUlr"
+                  :data="{ customerId: customerId }"
+                  :show-file-list="false"
+                  :on-success="
+                    (response, file, fileList) =>
+                      handleImgSuccess(index, response, file, fileList)
+                  "
+                  :before-upload="beforeImgUpload"
+                >
+                  <img
+                    v-if="item.matterImg"
+                    :src="item.matterImg"
+                    style="width: 50px; height: 50px"
+                    class="function-icon"
+                  />
+                  <i v-else class="el-icon-plus avatar-uploader-icon"></i>
+                </el-upload>
+
+                <div class="hint">（事项封面，图片小于1M）</div>
+
+                <el-button
+                  style="margin-left: auto"
+                  size="small"
+                  @click="handleDelStaff(index)"
+                  >删除</el-button
+                >
+              </div>
             </div>
 
             <div class="item-add">
-              <el-button size="small" @click="handleAddStaff">添加</el-button>
+              <el-button size="small" type="warning" @click="handleAddStaff"
+                >添加</el-button
+              >
             </div>
           </div>
         </el-form-item>
@@ -266,6 +294,9 @@ let loading; // 加载动画
 export default {
   data() {
     return {
+      uploadUlr: window.SITE_CONFIG["apiURL"] + "/oss/file/uploadqrcodeV2",
+      customerId: "",
+
       formType: "add", //表单操作类型 add新增，edit编辑，detail详情
 
       btnDisable: false,
@@ -342,14 +373,39 @@ export default {
   watch: {},
 
   async mounted() {
+    this.customerId = localStorage.getItem("customerId");
     this.initMap();
   },
 
   methods: {
+    handleImgSuccess(index, res, file) {
+      if (res.code === 0 && res.msg === "success") {
+        console.log("res.data.url", res.data.url);
+        this.dataForm.matterList[index].matterImg = res.data.url;
+      } else {
+        this.$message.error(res.msg);
+      }
+    },
+
+    beforeImgUpload(file) {
+      const isLt1M = file.size / 1024 / 1024 < 1;
+
+      if (!isLt1M) {
+        this.$message.error("上传图片大小不能超过 1MB!");
+      }
+      return isLt1M;
+    },
+
     handleAddStaff() {
       this.dataForm.matterList = [
         ...this.dataForm.matterList,
-        { matterName: "", appointmentType: "", startTime: "", endTime: "" },
+        {
+          matterName: "",
+          appointmentType: "",
+          matterImg: "",
+          startTime: "",
+          endTime: "",
+        },
       ];
     },
     handleDelStaff(index) {
@@ -482,9 +538,28 @@ export default {
         this.dataForm.partyServiceCenterId = this.partyServiceCenterId;
       }
 
+      const matterList = this.dataForm.matterList.filter(
+        (item) => !item.matterId
+      );
+      if (
+        matterList.some(
+          (item) =>
+            !item.matterImg ||
+            !item.matterName ||
+            !item.appointmentType ||
+            !item.startTime ||
+            !item.endTime
+        )
+      ) {
+        return this.$message({
+          type: "warning",
+          message: "请补充完整可预约事项信息",
+        });
+      }
+
       const { data, code, msg } = await requestPost(url, {
         ...this.dataForm,
-        matterList: this.dataForm.matterList.filter((item) => !item.matterId),
+        matterList,
       });
 
       if (code === 0) {
@@ -580,9 +655,48 @@ export default {
   width: 650px;
 
   .item {
-    display: flex;
-    justify-content: space-around;
-    margin-bottom: 7px;
+    .item-info {
+      display: flex;
+      justify-content: space-around;
+      margin-bottom: 7px;
+    }
+    .item-pic {
+      display: flex;
+      align-items: center;
+      .hint {
+        font-size: 14px;
+        color: #999999;
+        margin-left: 10px;
+      }
+      .avatar-uploader {
+        ::v-deep .el-upload {
+          cursor: pointer;
+          position: relative;
+          overflow: hidden;
+        }
+        img {
+          object-fit: cover;
+        }
+        .el-upload:hover {
+          border-color: #409eff;
+        }
+        .avatar {
+          width: 50px;
+          height: 50px;
+          display: block;
+        }
+        .avatar-uploader-icon {
+          border: 1px dashed #d9d9d9;
+          border-radius: 6px;
+          font-size: 28px;
+          color: #8c939d;
+          width: 50px;
+          height: 50px;
+          line-height: 50px;
+          text-align: center;
+        }
+      }
+    }
   }
   .item-add {
   }

From 4fb93fa5a6436eea02610c6025d3e8f1980a3668 Mon Sep 17 00:00:00 2001
From: jiangyy <jiang478938504@126.com>
Date: Wed, 5 Jan 2022 09:24:29 +0800
Subject: [PATCH 22/29] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=88=86=E5=B8=83?=
 =?UTF-8?q?=E5=88=86=E6=9E=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/visual/distributionAnalyze.scss   | 10 ++--
 .../communityGovern/distributionAnalyze.vue   | 49 ++++++++++---------
 2 files changed, 30 insertions(+), 29 deletions(-)

diff --git a/src/assets/scss/modules/visual/distributionAnalyze.scss b/src/assets/scss/modules/visual/distributionAnalyze.scss
index 438c0e30..c02c6b55 100644
--- a/src/assets/scss/modules/visual/distributionAnalyze.scss
+++ b/src/assets/scss/modules/visual/distributionAnalyze.scss
@@ -28,7 +28,7 @@
     display: block;
     display: flex;
     align-items: center;
-    margin-top: 20px;
+
     .second-title-label {
       position: relative;
       padding-left: 40px;
@@ -117,11 +117,11 @@
   flex-direction: row;
   // flex-wrap: wrap;
   justify-content: space-between;
-  height: calc(100vh - 230px);
+  height: calc(100vh - 190px);
 
   .g-l {
     width: 40%;
-    height: calc(100vh - 240px);
+    height: calc(100vh - 200px);
 
     .echart-line {
       margin-left: 30px;
@@ -140,11 +140,11 @@
 
   .g-r {
     width: 55%;
-    height: calc(100vh - 250px);
+    height: calc(100vh - 210px);
 
     .r-map {
       position: relative;
-      height: calc(100vh - 250px - 50px);
+      height: calc(100vh - 210px - 50px);
       width: 100%;
 
       .map {
diff --git a/src/views/modules/visual/communityGovern/distributionAnalyze.vue b/src/views/modules/visual/communityGovern/distributionAnalyze.vue
index 1ffc5d06..5110fe98 100644
--- a/src/views/modules/visual/communityGovern/distributionAnalyze.vue
+++ b/src/views/modules/visual/communityGovern/distributionAnalyze.vue
@@ -4,31 +4,32 @@
       <div class="card-title">
         <img src="@/assets/img/shuju/title-tip.png" />
         <span>项目分布分析</span>
-      </div>
-      <div class="second-title">
-        <div class="second-title-label">不同事件类别在不同时间段的变化和分布</div>
-        <div class="second-select cascader">
-
-          <el-cascader class="customer_cascader"
-                       ref="myCascader"
-                       v-model="agencyIdArray"
-                       :key="iscascaderShow"
-                       :options="casOptions"
-                       :props="optionProps"
-                       :show-all-levels="false"
-                       @change="handleChangeAgency"></el-cascader>
-        </div>
-        <div class="second-select">
-          <el-date-picker v-model="timeRange"
-                          type="daterange"
-                          range-separator="至"
-                          start-placeholder="开始日期"
-                          end-placeholder="结束日期"
-                          prefix-icon="el-icon-caret-bottom"
-                          value-format="yyyy-MM-dd"
-                          @change="handleSelectChange">
-          </el-date-picker>
 
+        <div class="second-title">
+
+          <div class="second-select cascader">
+
+            <el-cascader class="customer_cascader"
+                         ref="myCascader"
+                         v-model="agencyIdArray"
+                         :key="iscascaderShow"
+                         :options="casOptions"
+                         :props="optionProps"
+                         :show-all-levels="false"
+                         @change="handleChangeAgency"></el-cascader>
+          </div>
+          <div class="second-select">
+            <el-date-picker v-model="timeRange"
+                            type="daterange"
+                            range-separator="至"
+                            start-placeholder="开始日期"
+                            end-placeholder="结束日期"
+                            prefix-icon="el-icon-caret-bottom"
+                            value-format="yyyy-MM-dd"
+                            @change="handleSelectChange">
+            </el-date-picker>
+
+          </div>
         </div>
       </div>
 

From 49e60cfd525fd461adfa9b9e2be4c14497bfa02a Mon Sep 17 00:00:00 2001
From: jiangyy <jiang478938504@126.com>
Date: Wed, 5 Jan 2022 10:47:16 +0800
Subject: [PATCH 23/29] =?UTF-8?q?=E5=8F=91=E5=B8=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/visual/distributionAnalyze.scss   |   9 +
 .../communityGovern/distributionAnalyze.vue   | 173 +++++++++++-------
 2 files changed, 111 insertions(+), 71 deletions(-)

diff --git a/src/assets/scss/modules/visual/distributionAnalyze.scss b/src/assets/scss/modules/visual/distributionAnalyze.scss
index c02c6b55..e341f70f 100644
--- a/src/assets/scss/modules/visual/distributionAnalyze.scss
+++ b/src/assets/scss/modules/visual/distributionAnalyze.scss
@@ -135,6 +135,15 @@
         width: 100%;
         height: 90%;
       }
+
+      > img {
+        position: absolute;
+        top: 0;
+        left: 0;
+        right: 0;
+        bottom: 0;
+        margin: auto;
+      }
     }
   }
 
diff --git a/src/views/modules/visual/communityGovern/distributionAnalyze.vue b/src/views/modules/visual/communityGovern/distributionAnalyze.vue
index 5110fe98..b2ef7685 100644
--- a/src/views/modules/visual/communityGovern/distributionAnalyze.vue
+++ b/src/views/modules/visual/communityGovern/distributionAnalyze.vue
@@ -37,19 +37,21 @@
 
     <div class="g-cpt-resi">
       <div class="g-l">
-        <screen-echarts-frame class="echart-line"
+        <screen-echarts-frame v-if="!showNoData"
+                              class="echart-line"
                               @myChartMethod="lineInitOk"
                               ref="lineChart"></screen-echarts-frame>
+        <div v-else
+             class="echart-line">
+          <img src="../../../../assets/img/modules/visual/noData.png" />
+        </div>
         <!-- <div class="table-status"
              v-if="loading">
           <screen-loading>加载中</screen-loading>
         </div>
         <div class="table-status"
              v-if="lineList.length == 0 && !loading">
-          <div class="no-data">
-            <img src="../../../../assets/img/modules/visual/noData.png"
-                 class="no-data-img" />
-          </div>
+          
         </div> -->
 
       </div>
@@ -209,6 +211,7 @@ export default {
     await this.getAgencylist()//获取组织级别
     await nextTick(500)
     await this.loadOrgData()
+
     await this.getApiData();
 
   },
@@ -238,6 +241,15 @@ export default {
       if (month2 < 10) {
         month2 = '0' + month2;
       }
+      if (month < 10) {
+        month = '0' + month;
+      }
+      if (day < 10) {
+        day = '0' + day;
+      }
+      if (day2 < 10) {
+        day2 = '0' + day2;
+      }
       var t2 = year2 + '-' + month2 + '-' + day2;
       var t1 = year + '-' + month + '-' + day;
       // let t3 = formate(t2, style);
@@ -251,9 +263,19 @@ export default {
     },
 
     async getApiData () {
-
-      await this.getLine()
+      await this.getLineChart()
       await this.loadMapData();
+
+      this.assignData()
+    },
+
+    assignData () {
+      if (!this.showNoData) {
+        this.getLine()
+      }
+
+      this.loadMap()
+      this.isfirstInit = false
     },
 
     // 获取当前登录人员信息及组织信息
@@ -352,17 +374,17 @@ export default {
       if (code === 0) {
 
         this.legendArray = []
-        if (data.under) {
+        if (data.under === 0 || data.under) {
           this.under = data.under
           this.legendArray.push(
             {
               color: this.colorArray[0],
-              name: data.under + '以下'
+              name: data.under + '及以下'
             }
           )
         }
 
-        if (data.above) {
+        if (data.above === 0 || data.above) {
           this.above = data.above
           this.legendArray.push(
             {
@@ -373,7 +395,7 @@ export default {
           this.legendArray.push(
             {
               color: this.colorArray[2],
-              name: data.above + '以上'
+              name: data.above + '及以上'
             }
           )
         }
@@ -394,12 +416,12 @@ export default {
               item.latitude = agencyItem.latitude
               item.coordinates = agencyItem.coordinates
 
-              if (this.under) {
+              if (this.under === 0 || this.under) {
                 if (item.count < this.under || item.count === this.under) {
                   item.color = this.colorArray[0]
                   item.fillColor = this.colorFillArray[0]
                 } else {
-                  if (this.above) {
+                  if (this.above === 0 || this.above) {
                     if (item.count > this.under && item.count < this.above) {
                       item.color = this.colorArray[1]
                       item.fillColor = this.colorFillArray[1]
@@ -410,7 +432,6 @@ export default {
                   }
                 }
 
-
               }
               break
             }
@@ -420,8 +441,7 @@ export default {
         });
 
         console.log(this.mapList)
-        this.loadMap()
-        this.isfirstInit = false
+
 
       } else {
         this.$message.error(msg);
@@ -446,7 +466,7 @@ export default {
     },
     getLine () {
       if (this.lineInitState) {
-        this.getLineChart()
+        this.assignLineChart()
       } else {
         setTimeout(() => {
           this.getLine()
@@ -455,9 +475,13 @@ export default {
     },
     // 获取折线图
     async getLineChart () {
-      this.$refs.lineChart.clear()
+      if (!this.showNoData) {
+        this.$refs.lineChart.clear()
+        this.$refs.lineChart.showLoading()
+      }
+
       const _that = this
-      this.$refs.lineChart.showLoading()
+
       const url = "/gov/project/project/projectdistributionanalysisleft";
       // const url = "http://yapi.elinkservice.cn/mock/245/gov/project/project/projectdistributionanalysisleft";
       let params = {
@@ -467,28 +491,20 @@ export default {
       };
 
       const { data, code, msg } = await requestPost(url, params);
-      this.$refs.lineChart.hideLoading()
+      if (!this.showNoData) {
+        this.$refs.lineChart.hideLoading()
+      }
       if (code === 0) {
-        // 获取pieChart配置
-        this.lineOption = lineOption()
 
         if (data && data.length > 0) {
           this.lineList = data
-          this.loadCategoryData()
-
-
-
-          this.$refs.lineChart.setOption(this.lineOption, true)
-          this.$refs.lineChart.setOption({
-            xAxis: { data: this.xaxis },
-            legend: { data: this.legend },
-            series: this.series
-          }, true)
+          this.showNoData = false
         } else {
           this.lineList = []
+          this.showNoData = true
         }
 
-
+        this.loadCategoryData()
 
       } else {
         this.$message.error(msg);
@@ -496,60 +512,75 @@ export default {
 
     },
 
+    assignLineChart () {
+      // 获取pieChart配置
+      this.lineOption = lineOption()
+
+      this.$refs.lineChart.setOption(this.lineOption, true)
+      this.$refs.lineChart.setOption({
+        xAxis: { data: this.xaxis },
+        legend: { data: this.legend },
+        series: this.series
+      }, true)
+    },
+
     //解析折线图数据
     loadCategoryData () {
 
       this.xaxis = []
       this.series = []
       this.legend = []
-      let num = this.lineList[0].categoryList.length
-
-      let dataArray = new Array(num)
-      //遍历每个分类
-      this.lineList[0].categoryList.forEach((categoryItem, index) => {
-        this.legend.push(categoryItem.categoryName)
-        dataArray[index] = []
-
-      });
+      if (this.lineList.length > 0) {
 
 
-      //遍历每个时间
-      this.lineList.forEach(item => {
-        this.xaxis.push(item.time)
+        let num = this.lineList[0].categoryList.length
 
+        let dataArray = new Array(num)
         //遍历每个分类
-        item.categoryList.forEach((categoryItem, index) => {
-          dataArray[index].push(categoryItem.count)
+        this.lineList[0].categoryList.forEach((categoryItem, index) => {
+          this.legend.push(categoryItem.categoryName)
+          dataArray[index] = []
+
         });
 
-      });
-
-      //遍历第一组的分类
-      this.lineList[0].categoryList.forEach((categoryItem, index) => {
-
-        let object = {
-          name: categoryItem.categoryName,
-          type: 'line',
-          smooth: true,
-          barWidth: 15,
-          areaStyle: {},
-          itemStyle: {
-            color: new echarts.graphic.LinearGradient(
-              0, 1, 0, 0,
-              [
-                { offset: 0, color: 'rgba(121, 55, 255, 0)' },
-                { offset: 1, color: categoryItem.color }
-              ]
-            )
-          },
-          data: dataArray[index]
-        }
 
-        this.series.push(object)
+        //遍历每个时间
+        this.lineList.forEach(item => {
+          this.xaxis.push(item.time)
 
+          //遍历每个分类
+          item.categoryList.forEach((categoryItem, index) => {
+            dataArray[index].push(categoryItem.count)
+          });
 
-      });
+        });
+
+        //遍历第一组的分类
+        this.lineList[0].categoryList.forEach((categoryItem, index) => {
+
+          let object = {
+            name: categoryItem.categoryName,
+            type: 'line',
+            smooth: true,
+            barWidth: 15,
+            areaStyle: {},
+            itemStyle: {
+              color: new echarts.graphic.LinearGradient(
+                0, 1, 0, 0,
+                [
+                  { offset: 0, color: 'rgba(121, 55, 255, 0)' },
+                  { offset: 1, color: categoryItem.color }
+                ]
+              )
+            },
+            data: dataArray[index]
+          }
 
+          this.series.push(object)
+
+
+        });
+      }
     },
 
     handleChangeAgency (value) {

From 614c431ea137ebc6fd507a55afa9aa7acdabbd18 Mon Sep 17 00:00:00 2001
From: 13176889840 <13176889840@163.com>
Date: Thu, 6 Jan 2022 11:06:34 +0800
Subject: [PATCH 24/29] =?UTF-8?q?=E9=9C=80=E6=B1=82=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../communityService/measure/index.vue        | 82 +++++++++++++------
 1 file changed, 57 insertions(+), 25 deletions(-)

diff --git a/src/views/modules/communityService/measure/index.vue b/src/views/modules/communityService/measure/index.vue
index f73c912a..3d1f76e6 100644
--- a/src/views/modules/communityService/measure/index.vue
+++ b/src/views/modules/communityService/measure/index.vue
@@ -138,32 +138,44 @@
                 @click="handleAppoint(scope.row, 'appoint')"
                 >指派</el-button>
                 <!-- v-if="scope.row.status === 'assigned' || scope.row.status === 'have_order'" -->
-              <el-button
-                v-if="scope.row.status === 'assigned' || scope.row.status === 'have_order' || (scope.row.status == 'finished' && !scope.row.evaluateFlag)"
-                type="text"
-                size="small"
-                @click="handleFinish(scope.row, 'finish')"
-                >完成情况</el-button>
-              <el-button
-                  v-if="scope.row.status === 'pending'"
-                  @click="handleEdit(scope.row, 'edit')"
+              <template v-if="(scope.row.serviceShowFlag && scope.row.serviceType !== 'volunteer')">
+                <el-button
+                  v-if="scope.row.status === 'assigned' || scope.row.status === 'have_order' || (scope.row.status == 'finished' && !scope.row.evaluateFlag)"
                   type="text"
                   size="small"
-                  class="btn-color-edit"
-                  >编辑</el-button>
-              <el-popconfirm
-                title="取消之后无法恢复，确认取消？"
-                @onConfirm="handleDel(scope.row)"
-              >
+                  @click="handleFinish(scope.row, 'finish')"
+                  >完成情况</el-button>
+              </template>
+              <!-- <template v-else>
                 <el-button
-                  v-if="scope.row.status !== 'finished' && scope.row.status !== 'canceled'"
-                  slot="reference"
+                  v-if="scope.row.status === 'assigned' || scope.row.status === 'have_order' || (scope.row.status == 'finished' && !scope.row.evaluateFlag)"
                   type="text"
                   size="small"
-                  class="btn-color-del"
-                  >取消</el-button
+                  @click="handleFinish(scope.row, 'finish')"
+                  >完成情况</el-button>
+              </template> -->
+              <template v-if="scope.row.reportType != 'self_help'">
+                <el-button
+                    v-if="scope.row.status === 'pending'"
+                    @click="handleEdit(scope.row, 'edit')"
+                    type="text"
+                    size="small"
+                    class="btn-color-edit"
+                    >编辑</el-button>
+                <el-popconfirm
+                  title="取消之后无法恢复，确认取消？"
+                  @onConfirm="handleDel(scope.row)"
                 >
-              </el-popconfirm>
+                  <el-button
+                    v-if="scope.row.status !== 'finished' && scope.row.status !== 'canceled'"
+                    slot="reference"
+                    type="text"
+                    size="small"
+                    class="btn-color-del"
+                    >取消</el-button
+                  >
+                </el-popconfirm>
+              </template>
             </template>
             <el-button
               @click="handleLook(scope.row, 'look')"
@@ -341,7 +353,8 @@
         <el-form-item v-if="addType == 'look' && form.status == 'canceled'" label="取消时间" prop="cancelTime">
           <span>{{ form.cancelTime }}</span>
         </el-form-item>
-        <template v-if="addType == 'finish' || (addType == 'look' && form.status == 'finished')">
+        <template 
+        v-if="(addType == 'finish' && form.reportType != 'self_help') || (addType == 'look' && form.status == 'finished')">
           
           <el-form-item label="实际服务时间" prop="serviceStartTime">
             <el-date-picker
@@ -375,7 +388,24 @@
               class="input-width-textarea" placeholder="请输入内容"></el-input>
           </el-form-item>
         </template>
-        
+        <template v-if="(addType == 'finish' && form.reportType == 'self_help')">
+          <el-form-item label="实际服务时间" prop="serviceStartTime">
+            <el-date-picker
+              v-model="finishServiceTime"
+              class="input-width-min"
+              clearable
+              :disabled="disabled && addType != 'finish'"
+              type="datetimerange"
+              range-separator="至"
+              start-placeholder="开始日期"
+              end-placeholder="结束日期"
+              value-format="yyyy-MM-dd HH:mm:ss"
+              @change="handelBlurServiceTime"
+              >
+            </el-date-picker>
+          </el-form-item>
+        </template>
+
       </el-form>
       <div class="resi-btns">
         <el-button size="small" @click="handlerCancle">{{ addType != 'look' ? '取消' : '关闭'}}</el-button>
@@ -743,6 +773,7 @@ export default {
         if (row.serviceStartTime) this.finishServiceTime = [row.serviceStartTime, row.serviceEndTime]
         
         this.form.finishResult = 'resolved'
+        this.form.score = 5
       }
       if (addType == 'appoint' && row.serviceType) {
         await this.getServiceuserList(row.serviceType)
@@ -823,14 +854,15 @@ export default {
         this.btnLoading = false
     },
     async finishAjax() {
+      const { reportType, serviceShowFlag, serviceType } = this.form
       const _form = {
         demandRecId: this.form.demandRecId,
         serviceStartTime: this.form.serviceStartTime,
         serviceEndTime: this.form.serviceEndTime,
-        finishResult: this.form.finishResult,
-        finishDesc: this.form.finishDesc,
+        finishResult: reportType == 'self_help' ? '' : this.form.finishResult,
+        finishDesc: reportType == 'self_help' ? '' : this.form.finishDesc,
         serviceId: this.form.serviceId,
-        score: this.form.score
+        score: reportType == 'self_help' ? 0 : this.form.score
       }
       await this.$http
         .post('/heart/userdemand/finish', _form)

From 3f1481ed5d016b25b107076b67d453d15a5808ae Mon Sep 17 00:00:00 2001
From: 13176889840 <13176889840@163.com>
Date: Thu, 6 Jan 2022 11:20:04 +0800
Subject: [PATCH 25/29] =?UTF-8?q?=E5=8E=BB=E9=87=8D=E5=BF=97=E6=84=BF?=
 =?UTF-8?q?=E8=80=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/communityService/measure/index.vue | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/views/modules/communityService/measure/index.vue b/src/views/modules/communityService/measure/index.vue
index 3d1f76e6..4914f5cf 100644
--- a/src/views/modules/communityService/measure/index.vue
+++ b/src/views/modules/communityService/measure/index.vue
@@ -1034,6 +1034,7 @@ export default {
     },
     async getServiceuserList(serviceType, query) {
       if (!serviceType) return false
+      const { demandUserId } = this.form
       const params = {
         serviceName: '',
         serviceType: serviceType,
@@ -1045,7 +1046,7 @@ export default {
           if (res.code !== 0) {
             return this.$message.error(res.msg)
           } else {
-            this.serviceOptiondList = res.data
+            this.serviceOptiondList = res.data.filter(item => item.value != demandUserId)
           }
         })
         .catch(() => {

From 5787640869df6ab4c9d8f6690f63afee486258b7 Mon Sep 17 00:00:00 2001
From: jiangyy <jiang478938504@126.com>
Date: Thu, 6 Jan 2022 13:29:54 +0800
Subject: [PATCH 26/29] =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E5=9B=BE=E7=89=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../communityParty/regionalParty/activitys.vue     | 14 +++++++++++++-
 .../communityParty/regionalParty/activitysForm.vue | 13 ++++++++++++-
 2 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/src/views/modules/communityParty/regionalParty/activitys.vue b/src/views/modules/communityParty/regionalParty/activitys.vue
index 1638a07c..18f9d315 100644
--- a/src/views/modules/communityParty/regionalParty/activitys.vue
+++ b/src/views/modules/communityParty/regionalParty/activitys.vue
@@ -148,6 +148,16 @@
                          label="活动时间"
                          width="230">
         </el-table-column>
+        <el-table-column prop="activityTime"
+                         header-align="center"
+                         align="center"
+                         label="来源"
+                         width="100">
+          <template slot-scope="scope">
+            <span v-if="scope.row.actId">小程序</span>
+            <span v-else>管理平台</span>
+          </template>
+        </el-table-column>
 
         <el-table-column label="操作"
                          fixed="right"
@@ -161,7 +171,8 @@
                        style="color:#1C6AFD;text-decoration: underline;"
                        size="small"
                        @click="handleDetail(scope.row)">查看</el-button>
-            <el-button type="text"
+            <el-button v-if="!scope.row.actId"
+                       type="text"
                        style="color:#00A7A9;text-decoration: underline;"
                        size="small"
                        @click="handleEdit(scope.row)">修改</el-button>
@@ -199,6 +210,7 @@
                       @dialogCancle="addFormCancle"
                       @dialogOk="addFormOk"></activitys-form>
     </el-dialog>
+
     <el-dialog :visible.sync="detailShow"
                :close-on-click-modal="false"
                :close-on-press-escape="false"
diff --git a/src/views/modules/communityParty/regionalParty/activitysForm.vue b/src/views/modules/communityParty/regionalParty/activitysForm.vue
index d90dbbbc..e18bc984 100644
--- a/src/views/modules/communityParty/regionalParty/activitysForm.vue
+++ b/src/views/modules/communityParty/regionalParty/activitysForm.vue
@@ -244,6 +244,8 @@ export default {
       }
       this.endLoading()
 
+
+
     },
 
     //加载组织
@@ -258,7 +260,16 @@ export default {
 
       if (code === 0) {
         this.formData = data
-        map.setCenter(new TMap.LatLng(this.formData.latitude, this.formData.longitude))
+        console.log(this.formData.content)
+        let style_img = "style='width:50px;height:40px;' "
+
+        if (this.formData.content) {
+          this.formData.content = this.formData.content.replace(/<img/g, "<img style='width:200px;height:120px;'")
+          // let array=this.formData.content.split('<img')
+
+        }
+        console.log(this.formData.content)
+        map.setCenter(new TMap.LatLng(parseFloat(this.formData.latitude), parseFloat(this.formData.longitude)))
         this.setMarker(this.formData.latitude, this.formData.longitude)
       } else {
         this.$message.error(msg)

From c8a387aff00a633c9531921632e4882d45544abb Mon Sep 17 00:00:00 2001
From: 13176889840 <13176889840@163.com>
Date: Fri, 7 Jan 2022 10:29:19 +0800
Subject: [PATCH 27/29] =?UTF-8?q?=E9=9C=80=E6=B1=82=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/communityService/measure/index.vue | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/views/modules/communityService/measure/index.vue b/src/views/modules/communityService/measure/index.vue
index 4914f5cf..66af8c1e 100644
--- a/src/views/modules/communityService/measure/index.vue
+++ b/src/views/modules/communityService/measure/index.vue
@@ -138,22 +138,22 @@
                 @click="handleAppoint(scope.row, 'appoint')"
                 >指派</el-button>
                 <!-- v-if="scope.row.status === 'assigned' || scope.row.status === 'have_order'" -->
-              <template v-if="(scope.row.serviceShowFlag && scope.row.serviceType !== 'volunteer')">
+              <template v-if="(scope.row.reportType == 'self_help' && scope.row.serviceShowFlag)">
                 <el-button
-                  v-if="scope.row.status === 'assigned' || scope.row.status === 'have_order' || (scope.row.status == 'finished' && !scope.row.evaluateFlag)"
+                  v-if="scope.row.serviceType !== 'volunteer' && scope.row.status !== 'finished'"
                   type="text"
                   size="small"
                   @click="handleFinish(scope.row, 'finish')"
                   >完成情况</el-button>
               </template>
-              <!-- <template v-else>
+              <template v-else>
                 <el-button
                   v-if="scope.row.status === 'assigned' || scope.row.status === 'have_order' || (scope.row.status == 'finished' && !scope.row.evaluateFlag)"
                   type="text"
                   size="small"
                   @click="handleFinish(scope.row, 'finish')"
                   >完成情况</el-button>
-              </template> -->
+              </template>
               <template v-if="scope.row.reportType != 'self_help'">
                 <el-button
                     v-if="scope.row.status === 'pending'"

From 837f2db76ecbfec5363e9180f7039a1801df13d7 Mon Sep 17 00:00:00 2001
From: dai <851733175@qq.com>
Date: Fri, 7 Jan 2022 16:05:41 +0800
Subject: [PATCH 28/29] ff

---
 .env.development                              |    6 +-
 .env.production.sit                           |    2 +-
 package-lock.json                             |  116 +-
 package.json                                  |    1 +
 public/index.html                             |    7 +-
 src/assets/img/shuju/measure/bg-left.png      |  Bin 0 -> 9103 bytes
 src/assets/img/shuju/measure/dangyuan.png     |  Bin 0 -> 25056 bytes
 src/assets/img/shuju/measure/down-right.png   |  Bin 0 -> 6437 bytes
 src/assets/img/shuju/measure/gantanhao.png    |  Bin 0 -> 540 bytes
 src/assets/img/shuju/measure/huang@2x.png     |  Bin 0 -> 1348 bytes
 src/assets/img/shuju/measure/jgzs@2x.png      |  Bin 0 -> 1603 bytes
 src/assets/img/shuju/measure/jumin.png        |  Bin 0 -> 25003 bytes
 src/assets/img/shuju/measure/lan@2x.png       |  Bin 0 -> 1348 bytes
 src/assets/img/shuju/measure/lanlv@2x.png     |  Bin 0 -> 1261 bytes
 src/assets/img/shuju/measure/lv@2x.png        |  Bin 0 -> 1261 bytes
 src/assets/img/shuju/measure/lxdj@2x.png      |  Bin 0 -> 1426 bytes
 src/assets/img/shuju/measure/ly@2x.png        |  Bin 0 -> 1590 bytes
 src/assets/img/shuju/measure/qita.png         |  Bin 0 -> 1414 bytes
 src/assets/img/shuju/measure/up-right.png     |  Bin 0 -> 6625 bytes
 src/assets/img/shuju/measure/xq@2x.png        |  Bin 0 -> 1913 bytes
 src/assets/img/shuju/measure/you@2x.png       |  Bin 0 -> 1305 bytes
 src/assets/img/shuju/measure/zhuhu@2x.png     |  Bin 0 -> 52448 bytes
 src/assets/img/shuju/measure/zi@2x.png        |  Bin 0 -> 1198 bytes
 src/assets/img/shuju/measure/zuo@2x.png       |  Bin 0 -> 1267 bytes
 src/assets/img/shuju/sight.png                |  Bin 0 -> 52546 bytes
 src/assets/img/shuju/top/1.png                |  Bin 0 -> 1191 bytes
 src/assets/img/shuju/top/2.png                |  Bin 0 -> 1373 bytes
 src/assets/img/shuju/top/3.png                |  Bin 0 -> 1329 bytes
 src/assets/img/shuju/volunteer1.png           |  Bin 0 -> 2333 bytes
 src/assets/img/shuju/volunteer2.png           |  Bin 0 -> 2164 bytes
 src/assets/img/shuju/volunteer3.png           |  Bin 0 -> 2211 bytes
 src/assets/img/shuju/volunteer4.png           |  Bin 0 -> 2440 bytes
 src/assets/img/shuju/volunteer5.png           |  Bin 0 -> 2147 bytes
 src/assets/img/shuju/volunteer6.png           |  Bin 0 -> 2152 bytes
 src/assets/img/shuju/volunteer7.png           |  Bin 0 -> 2508 bytes
 src/assets/img/shuju/volunteer8.png           |  Bin 0 -> 2330 bytes
 src/assets/img/shuju/volunteer9.png           |  Bin 0 -> 2360 bytes
 src/assets/img/shuju/weiwanjie.png            |  Bin 0 -> 2193 bytes
 src/assets/img/shuju/yiwanjie.png             |  Bin 0 -> 2169 bytes
 src/assets/scss/main-shuju.scss               |  100 +-
 src/assets/scss/modules/visual/c/common.scss  |   19 +
 .../modules/visual/distributionAnalyze.scss   |  211 ++++
 src/assets/scss/modules/visual/heart.scss     |   71 ++
 .../scss/modules/visual/incident-info.scss    |  384 +++++++
 .../scss/modules/visual/issue-info.scss       |  139 +++
 .../scss/{ => modules/visual}/people.scss     |  242 +++-
 .../scss/modules/visual/processAnalyze.scss   |  302 +++++
 src/assets/scss/modules/visual/resibuzz.scss  |  144 +++
 .../scss/modules/visual/typeAnalyze.scss      |  141 +++
 src/i18n/zh-CN.js                             |    6 +-
 src/js/ajax.js                                |   18 +-
 src/router/index.js                           |  101 +-
 src/utils/request.js                          |   18 +-
 src/views/components/foldText.vue             |  135 +++
 src/views/main-navbar.vue                     |   12 +-
 src/views/main-shuju/main-navbar.vue          |  168 +--
 .../modules/base/community/buildTable.vue     |    2 +-
 .../modules/base/community/communityTable.vue |    2 +-
 .../modules/base/community/roomTable.vue      |    8 +-
 src/views/modules/base/resi.vue               |   52 +-
 .../modules/communityParty/elegant/index.vue  |   67 +-
 .../regionalParty/activitys.vue               |   22 +-
 .../communityParty/regionalParty/units.vue    |    6 +-
 .../communityService/dqfwzx/cpts/edit.vue     |  238 +++-
 .../communityService/dqfwzx/cpts/order.vue    |  136 ++-
 .../communityService/measure/index.vue        |  155 ++-
 .../ninePlaces/places/placesForm.vue          |   18 +-
 .../communityService/ninePlaces/team/team.vue |    7 +-
 .../customer/feedback/CustomerInfo.vue        |   22 +-
 .../modules/customer/manage/CustomerInfo.vue  |   24 +-
 src/views/modules/home.vue                    |   13 +-
 .../visual/basicinfo/basicInfoMain.vue        |   14 +-
 .../visual/basicinfo/cpts/incident-info.vue   |  550 +++++++++
 .../visual/basicinfo/cpts/people-more.vue     |    2 +-
 .../visual/basicinfo/cpts/topic-info.vue      |  706 ++++++++++++
 src/views/modules/visual/basicinfo/people.vue |  439 ++++++-
 .../components/screen-loading/index.vue       |   68 ++
 .../components/screen-table/index.vue         |  310 +++++
 .../visual/communityGovern/cpt/issue-info.vue |  234 ++++
 .../communityGovern/cpt/project-info.vue      |  696 ++++++++++++
 .../communityGovern/distributionAnalyze.vue   |  605 ++++++++++
 .../communityGovern/distributionLineOption.js |  105 ++
 .../visual/communityGovern/processAnalyze.vue |  738 ++++++++++++
 .../communityGovern/processLineOption.js      |   86 ++
 .../communityGovern/processPieOption.js       |  183 +++
 .../visual/communityGovern/resiPieOption.js   |  179 +++
 .../visual/communityGovern/resibuzz.vue       |  520 +++++++++
 .../visual/communityGovern/typeAnalyze.vue    |  495 ++++++++
 .../visual/communityGovern/typePieOption.js   |  179 +++
 .../visual/communityParty/community.vue       |  847 ++++++++++++++
 .../visual/communityParty/dialogInfo.vue      |  422 +++++++
 .../modules/visual/communityParty/options.js  |  176 +++
 .../modules/visual/communityParty/party.vue   | 1005 +++++++++++++++++
 .../components/screen-echarts-frame/index.vue |  193 ++++
 .../components/screen-loading/index.vue       |   68 ++
 .../visual/components/screen-map/index.vue    |  765 +++++++++++++
 .../visual/components/screen-nodata/index.vue |   34 +
 .../visual/components/screen-table/index.vue  |  336 ++++++
 src/views/modules/visual/cpts/analyse.vue     |  588 ++++++++++
 src/views/modules/visual/cpts/line-chart.vue  |  232 ++++
 src/views/modules/visual/cpts/loading.vue     |   68 ++
 src/views/modules/visual/cpts/tb.vue          |  224 ++++
 src/views/modules/visual/heart/index.vue      |  317 ++++++
 .../modules/visual/measure/dialogInfo.vue     |  305 +++++
 src/views/modules/visual/measure/service.vue  |  800 +++++++++++++
 .../modules/visual/measure/volunteer.vue      |  798 +++++++++++++
 src/views/modules/workSys/demandCate.vue      |   22 +-
 src/views/modules/workSys/mapConfig.vue       |   13 +-
 src/views/pages/{indexWork.vue => index.vue}  |    0
 src/views/pages/login.vue                     |   20 +
 110 files changed, 15963 insertions(+), 494 deletions(-)
 create mode 100644 src/assets/img/shuju/measure/bg-left.png
 create mode 100644 src/assets/img/shuju/measure/dangyuan.png
 create mode 100644 src/assets/img/shuju/measure/down-right.png
 create mode 100644 src/assets/img/shuju/measure/gantanhao.png
 create mode 100644 src/assets/img/shuju/measure/huang@2x.png
 create mode 100644 src/assets/img/shuju/measure/jgzs@2x.png
 create mode 100644 src/assets/img/shuju/measure/jumin.png
 create mode 100644 src/assets/img/shuju/measure/lan@2x.png
 create mode 100644 src/assets/img/shuju/measure/lanlv@2x.png
 create mode 100644 src/assets/img/shuju/measure/lv@2x.png
 create mode 100644 src/assets/img/shuju/measure/lxdj@2x.png
 create mode 100644 src/assets/img/shuju/measure/ly@2x.png
 create mode 100644 src/assets/img/shuju/measure/qita.png
 create mode 100644 src/assets/img/shuju/measure/up-right.png
 create mode 100644 src/assets/img/shuju/measure/xq@2x.png
 create mode 100644 src/assets/img/shuju/measure/you@2x.png
 create mode 100644 src/assets/img/shuju/measure/zhuhu@2x.png
 create mode 100644 src/assets/img/shuju/measure/zi@2x.png
 create mode 100644 src/assets/img/shuju/measure/zuo@2x.png
 create mode 100644 src/assets/img/shuju/sight.png
 create mode 100644 src/assets/img/shuju/top/1.png
 create mode 100644 src/assets/img/shuju/top/2.png
 create mode 100644 src/assets/img/shuju/top/3.png
 create mode 100644 src/assets/img/shuju/volunteer1.png
 create mode 100644 src/assets/img/shuju/volunteer2.png
 create mode 100644 src/assets/img/shuju/volunteer3.png
 create mode 100644 src/assets/img/shuju/volunteer4.png
 create mode 100644 src/assets/img/shuju/volunteer5.png
 create mode 100644 src/assets/img/shuju/volunteer6.png
 create mode 100644 src/assets/img/shuju/volunteer7.png
 create mode 100644 src/assets/img/shuju/volunteer8.png
 create mode 100644 src/assets/img/shuju/volunteer9.png
 create mode 100644 src/assets/img/shuju/weiwanjie.png
 create mode 100644 src/assets/img/shuju/yiwanjie.png
 create mode 100644 src/assets/scss/modules/visual/c/common.scss
 create mode 100644 src/assets/scss/modules/visual/distributionAnalyze.scss
 create mode 100644 src/assets/scss/modules/visual/heart.scss
 create mode 100644 src/assets/scss/modules/visual/incident-info.scss
 create mode 100644 src/assets/scss/modules/visual/issue-info.scss
 rename src/assets/scss/{ => modules/visual}/people.scss (62%)
 create mode 100644 src/assets/scss/modules/visual/processAnalyze.scss
 create mode 100644 src/assets/scss/modules/visual/resibuzz.scss
 create mode 100644 src/assets/scss/modules/visual/typeAnalyze.scss
 create mode 100644 src/views/components/foldText.vue
 create mode 100644 src/views/modules/visual/basicinfo/cpts/incident-info.vue
 create mode 100644 src/views/modules/visual/basicinfo/cpts/topic-info.vue
 create mode 100644 src/views/modules/visual/communityGovern/components/screen-loading/index.vue
 create mode 100644 src/views/modules/visual/communityGovern/components/screen-table/index.vue
 create mode 100644 src/views/modules/visual/communityGovern/cpt/issue-info.vue
 create mode 100644 src/views/modules/visual/communityGovern/cpt/project-info.vue
 create mode 100644 src/views/modules/visual/communityGovern/distributionAnalyze.vue
 create mode 100644 src/views/modules/visual/communityGovern/distributionLineOption.js
 create mode 100644 src/views/modules/visual/communityGovern/processAnalyze.vue
 create mode 100644 src/views/modules/visual/communityGovern/processLineOption.js
 create mode 100644 src/views/modules/visual/communityGovern/processPieOption.js
 create mode 100644 src/views/modules/visual/communityGovern/resiPieOption.js
 create mode 100644 src/views/modules/visual/communityGovern/resibuzz.vue
 create mode 100644 src/views/modules/visual/communityGovern/typeAnalyze.vue
 create mode 100644 src/views/modules/visual/communityGovern/typePieOption.js
 create mode 100644 src/views/modules/visual/communityParty/community.vue
 create mode 100644 src/views/modules/visual/communityParty/dialogInfo.vue
 create mode 100644 src/views/modules/visual/communityParty/options.js
 create mode 100644 src/views/modules/visual/communityParty/party.vue
 create mode 100644 src/views/modules/visual/components/screen-echarts-frame/index.vue
 create mode 100644 src/views/modules/visual/components/screen-loading/index.vue
 create mode 100644 src/views/modules/visual/components/screen-map/index.vue
 create mode 100644 src/views/modules/visual/components/screen-nodata/index.vue
 create mode 100644 src/views/modules/visual/components/screen-table/index.vue
 create mode 100644 src/views/modules/visual/cpts/analyse.vue
 create mode 100644 src/views/modules/visual/cpts/line-chart.vue
 create mode 100644 src/views/modules/visual/cpts/loading.vue
 create mode 100644 src/views/modules/visual/cpts/tb.vue
 create mode 100644 src/views/modules/visual/heart/index.vue
 create mode 100644 src/views/modules/visual/measure/dialogInfo.vue
 create mode 100644 src/views/modules/visual/measure/service.vue
 create mode 100644 src/views/modules/visual/measure/volunteer.vue
 rename src/views/pages/{indexWork.vue => index.vue} (100%)

diff --git a/.env.development b/.env.development
index 5431a9bc..b23cea2c 100644
--- a/.env.development
+++ b/.env.development
@@ -1,7 +1,9 @@
 NODE_ENV=development
-# VUE_APP_API_SERVER =  http://118.190.150.119:41080/api
+# VUE_APP_API_SERVER =  https://epmet-test.elinkservice.cn/api
 VUE_APP_API_SERVER =  http://192.168.1.140/api
-# VUE_APP_API_SERVER =  http://192.168.51.36:8080/api
+
+#家中开发连级的后端服务
+# VUE_APP_API_SERVER =  https://epmet-dev.elinkservice.cn:41080/api
 # VUE_APP_API_SERVER =  https://epmet-dev.elinkservice.cn/api
 VUE_APP_NODE_ENV=dev 
 #项目根路径
diff --git a/.env.production.sit b/.env.production.sit
index 6e5b4e9b..b0c600ea 100644
--- a/.env.production.sit
+++ b/.env.production.sit
@@ -1,5 +1,5 @@
 NODE_ENV=production
-# VUE_APP_API_SERVER =  http://118.190.150.119:41080/api
+# VUE_APP_API_SERVER =  https://epmet-test.elinkservice.cn/api
 VUE_APP_API_SERVER =  http://192.168.1.140/api
 VUE_APP_NODE_ENV=prod:sit
 VUE_APP_PUBLIC_PATH=epmet-oper
\ No newline at end of file
diff --git a/package-lock.json b/package-lock.json
index 3f8baa2d..bf071c79 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1421,14 +1421,12 @@
     "@mapbox/jsonlint-lines-primitives": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/@mapbox/jsonlint-lines-primitives/-/jsonlint-lines-primitives-2.0.2.tgz",
-      "integrity": "sha1-zlblOfg1UrWNENZy6k1vya3HsjQ=",
-      "dev": true
+      "integrity": "sha1-zlblOfg1UrWNENZy6k1vya3HsjQ="
     },
     "@mapbox/mapbox-gl-style-spec": {
       "version": "13.22.0",
       "resolved": "https://registry.npmjs.org/@mapbox/mapbox-gl-style-spec/-/mapbox-gl-style-spec-13.22.0.tgz",
       "integrity": "sha512-35skPiyM1reMRHA+X+DgbT3WG8hXMpqy1Ncs66ZvtVWUvvA9CtERSx5kq+o5S1ZrvDISuyBzrVzyty7PkuStkQ==",
-      "dev": true,
       "requires": {
         "@mapbox/jsonlint-lines-primitives": "~2.0.2",
         "@mapbox/point-geometry": "^0.1.0",
@@ -1443,22 +1441,19 @@
         "minimist": {
           "version": "1.2.5",
           "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
-          "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==",
-          "dev": true
+          "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw=="
         }
       }
     },
     "@mapbox/point-geometry": {
       "version": "0.1.0",
       "resolved": "https://registry.npmjs.org/@mapbox/point-geometry/-/point-geometry-0.1.0.tgz",
-      "integrity": "sha1-ioP5M1x4YO/6Lu7KJUMyqgru2PI=",
-      "dev": true
+      "integrity": "sha1-ioP5M1x4YO/6Lu7KJUMyqgru2PI="
     },
     "@mapbox/unitbezier": {
       "version": "0.0.0",
       "resolved": "https://registry.npmjs.org/@mapbox/unitbezier/-/unitbezier-0.0.0.tgz",
-      "integrity": "sha1-FWUb1VOme4WB+zmIEMmK2Go0Uk4=",
-      "dev": true
+      "integrity": "sha1-FWUb1VOme4WB+zmIEMmK2Go0Uk4="
     },
     "@mrmlnc/readdir-enhanced": {
       "version": "2.2.1",
@@ -1479,8 +1474,7 @@
     "@petamoriken/float16": {
       "version": "3.5.4",
       "resolved": "https://registry.npmjs.org/@petamoriken/float16/-/float16-3.5.4.tgz",
-      "integrity": "sha512-RWVPoDJ3q0vOinFEjEOFP+GPSL9cMZNwD9iSafIRXOOUKCQW0j+RAPH0CojMbaHkWlVBRJ40L9RFuSL/oLd+vg==",
-      "dev": true
+      "integrity": "sha512-RWVPoDJ3q0vOinFEjEOFP+GPSL9cMZNwD9iSafIRXOOUKCQW0j+RAPH0CojMbaHkWlVBRJ40L9RFuSL/oLd+vg=="
     },
     "@soda/friendly-errors-webpack-plugin": {
       "version": "1.7.1",
@@ -5228,8 +5222,7 @@
     "csscolorparser": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/csscolorparser/-/csscolorparser-1.0.3.tgz",
-      "integrity": "sha1-s085HupNqPPpgjHizNjfnAQfFxs=",
-      "dev": true
+      "integrity": "sha1-s085HupNqPPpgjHizNjfnAQfFxs="
     },
     "cssesc": {
       "version": "2.0.0",
@@ -6163,6 +6156,22 @@
         "safer-buffer": "^2.1.0"
       }
     },
+    "echarts": {
+      "version": "5.2.2",
+      "resolved": "https://registry.npmjs.org/echarts/-/echarts-5.2.2.tgz",
+      "integrity": "sha512-yxuBfeIH5c+0FsoRP60w4De6omXhA06c7eUYBsC1ykB6Ys2yK5fSteIYWvkJ4xJVLQgCvAdO8C4mN6MLeJpBaw==",
+      "requires": {
+        "tslib": "2.3.0",
+        "zrender": "5.2.1"
+      },
+      "dependencies": {
+        "tslib": {
+          "version": "2.3.0",
+          "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.3.0.tgz",
+          "integrity": "sha512-N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg=="
+        }
+      }
+    },
     "ee-first": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz",
@@ -6898,7 +6907,6 @@
       "version": "3.2.25",
       "resolved": "https://registry.npmjs.org/esm/-/esm-3.2.25.tgz",
       "integrity": "sha512-U1suiZ2oDVWv4zPO56S0NcR5QriEahGtdN2OR6FiOG4WJvcjBVFB0qI4+eKoWFH483PKGuLuu6V8Z4T5g63UVA==",
-      "dev": true,
       "optional": true
     },
     "espree": {
@@ -8327,7 +8335,6 @@
       "version": "1.0.8",
       "resolved": "https://registry.npmjs.org/geotiff/-/geotiff-1.0.8.tgz",
       "integrity": "sha512-3YA6NpGuuXF+WwwgA7moSHIw1U0XHxBY8W5bjjoSGBCVuw6s+DOgt7Z95Y3bf5k19RHixv6zW8KpW/yrRno43Q==",
-      "dev": true,
       "requires": {
         "@petamoriken/float16": "^3.4.7",
         "lerc": "^3.0.0",
@@ -8342,7 +8349,6 @@
           "version": "6.0.0",
           "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
           "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
-          "dev": true,
           "requires": {
             "yallist": "^4.0.0"
           }
@@ -8350,14 +8356,12 @@
         "pako": {
           "version": "2.0.4",
           "resolved": "https://registry.npmjs.org/pako/-/pako-2.0.4.tgz",
-          "integrity": "sha512-v8tweI900AUkZN6heMU/4Uy4cXRc2AYNRggVmTR+dEncawDJgCdLMximOVA2p4qO57WMynangsfGRb5WD6L1Bg==",
-          "dev": true
+          "integrity": "sha512-v8tweI900AUkZN6heMU/4Uy4cXRc2AYNRggVmTR+dEncawDJgCdLMximOVA2p4qO57WMynangsfGRb5WD6L1Bg=="
         },
         "yallist": {
           "version": "4.0.0",
           "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-          "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
-          "dev": true
+          "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
         }
       }
     },
@@ -9906,8 +9910,7 @@
     "ieee754": {
       "version": "1.1.13",
       "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.1.13.tgz",
-      "integrity": "sha512-4vf7I2LYV/HaWerSo3XmlMkp5eZ83i+/CDluXi/IGTs/O1sejBNhTtnxzmRZfvOUqj7lZjqHkeTvpgSFDlWZTg==",
-      "dev": true
+      "integrity": "sha512-4vf7I2LYV/HaWerSo3XmlMkp5eZ83i+/CDluXi/IGTs/O1sejBNhTtnxzmRZfvOUqj7lZjqHkeTvpgSFDlWZTg=="
     },
     "iferr": {
       "version": "0.1.5",
@@ -10422,8 +10425,7 @@
     "is-observable": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/is-observable/-/is-observable-2.1.0.tgz",
-      "integrity": "sha512-DailKdLb0WU+xX8K5w7VsJhapwHLZ9jjmazqCJq4X12CTgqq73TKnbRcnSLuXYPOoLQgV5IrD7ePiX/h1vnkBw==",
-      "dev": true
+      "integrity": "sha512-DailKdLb0WU+xX8K5w7VsJhapwHLZ9jjmazqCJq4X12CTgqq73TKnbRcnSLuXYPOoLQgV5IrD7ePiX/h1vnkBw=="
     },
     "is-path-cwd": {
       "version": "2.2.0",
@@ -10732,8 +10734,7 @@
     "json-stringify-pretty-compact": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/json-stringify-pretty-compact/-/json-stringify-pretty-compact-2.0.0.tgz",
-      "integrity": "sha512-WRitRfs6BGq4q8gTgOy4ek7iPFXjbra0H3PmDLKm2xnZ+Gh1HUhiKGgCZkSPNULlP7mvfu6FV/mOLhCarspADQ==",
-      "dev": true
+      "integrity": "sha512-WRitRfs6BGq4q8gTgOy4ek7iPFXjbra0H3PmDLKm2xnZ+Gh1HUhiKGgCZkSPNULlP7mvfu6FV/mOLhCarspADQ=="
     },
     "json-stringify-safe": {
       "version": "5.0.1",
@@ -10855,8 +10856,7 @@
     "lerc": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/lerc/-/lerc-3.0.0.tgz",
-      "integrity": "sha512-Rm4J/WaHhRa93nCN2mwWDZFoRVF18G1f47C+kvQWyHGEZxFpTUi73p7lMVSAndyxGt6lJ2/CFbOcf9ra5p8aww==",
-      "dev": true
+      "integrity": "sha512-Rm4J/WaHhRa93nCN2mwWDZFoRVF18G1f47C+kvQWyHGEZxFpTUi73p7lMVSAndyxGt6lJ2/CFbOcf9ra5p8aww=="
     },
     "levn": {
       "version": "0.3.0",
@@ -11349,8 +11349,7 @@
     "mapbox-to-css-font": {
       "version": "2.4.0",
       "resolved": "https://registry.npmjs.org/mapbox-to-css-font/-/mapbox-to-css-font-2.4.0.tgz",
-      "integrity": "sha512-v674D0WtpxCXlA6E+sBlG1QJWdUkz/s9qAD91bJSXBGuBL5lL4tJXpoJEftecphCh2SVQCjWMS2vhylc3AIQTg==",
-      "dev": true
+      "integrity": "sha512-v674D0WtpxCXlA6E+sBlG1QJWdUkz/s9qAD91bJSXBGuBL5lL4tJXpoJEftecphCh2SVQCjWMS2vhylc3AIQTg=="
     },
     "md5.js": {
       "version": "1.3.5",
@@ -12311,8 +12310,7 @@
     "observable-fns": {
       "version": "0.6.1",
       "resolved": "https://registry.npmjs.org/observable-fns/-/observable-fns-0.6.1.tgz",
-      "integrity": "sha512-9gRK4+sRWzeN6AOewNBTLXir7Zl/i3GB6Yl26gK4flxz8BXVpD3kt8amREmWNb0mxYOGDotvE5a4N+PtGGKdkg==",
-      "dev": true
+      "integrity": "sha512-9gRK4+sRWzeN6AOewNBTLXir7Zl/i3GB6Yl26gK4flxz8BXVpD3kt8amREmWNb0mxYOGDotvE5a4N+PtGGKdkg=="
     },
     "obuf": {
       "version": "1.1.2",
@@ -12324,7 +12322,6 @@
       "version": "6.9.0",
       "resolved": "https://registry.npmjs.org/ol/-/ol-6.9.0.tgz",
       "integrity": "sha512-VmU5HKHwO2O1uGgmBcng/dL1PouVB1jKiYUbiXPR5l1i/3B3qatexl4rapZAnsGx0vsOC7lI1GLx7jEZro8C8Q==",
-      "dev": true,
       "requires": {
         "geotiff": "^1.0.8",
         "ol-mapbox-style": "^6.5.1",
@@ -12336,7 +12333,6 @@
       "version": "6.5.1",
       "resolved": "https://registry.npmjs.org/ol-mapbox-style/-/ol-mapbox-style-6.5.1.tgz",
       "integrity": "sha512-diGjCUlYjCA855vJjQjPzxXLn/skm0iQLD2/yDsXaKdNxFd35hNfRm5Li+Vxh/FxraCodxRvd8IplhrhvXoqbQ==",
-      "dev": true,
       "requires": {
         "@mapbox/mapbox-gl-style-spec": "^13.20.1",
         "mapbox-to-css-font": "^2.4.0",
@@ -12622,8 +12618,7 @@
     "parse-headers": {
       "version": "2.0.4",
       "resolved": "https://registry.npmjs.org/parse-headers/-/parse-headers-2.0.4.tgz",
-      "integrity": "sha512-psZ9iZoCNFLrgRjZ1d8mn0h9WRqJwFxM9q3x7iUjN/YT2OksthDJ5TiPCu2F38kS4zutqfW+YdVVkBZZx3/1aw==",
-      "dev": true
+      "integrity": "sha512-psZ9iZoCNFLrgRjZ1d8mn0h9WRqJwFxM9q3x7iUjN/YT2OksthDJ5TiPCu2F38kS4zutqfW+YdVVkBZZx3/1aw=="
     },
     "parse-json": {
       "version": "2.2.0",
@@ -12742,7 +12737,6 @@
       "version": "3.2.1",
       "resolved": "https://registry.npmjs.org/pbf/-/pbf-3.2.1.tgz",
       "integrity": "sha512-ClrV7pNOn7rtmoQVF4TS1vyU0WhYRnP92fzbfF75jAIwpnzdJXf8iTd4CMEqO4yUenH6NDqLiwjqlh6QgZzgLQ==",
-      "dev": true,
       "requires": {
         "ieee754": "^1.1.12",
         "resolve-protobuf-schema": "^2.1.0"
@@ -15431,8 +15425,7 @@
     "protocol-buffers-schema": {
       "version": "3.6.0",
       "resolved": "https://registry.npmjs.org/protocol-buffers-schema/-/protocol-buffers-schema-3.6.0.tgz",
-      "integrity": "sha512-TdDRD+/QNdrCGCE7v8340QyuXd4kIWIgapsE2+n/SaGiSSbomYl4TjHlvIoCWRpE7wFt02EpB35VVA2ImcBVqw==",
-      "dev": true
+      "integrity": "sha512-TdDRD+/QNdrCGCE7v8340QyuXd4kIWIgapsE2+n/SaGiSSbomYl4TjHlvIoCWRpE7wFt02EpB35VVA2ImcBVqw=="
     },
     "proxy-addr": {
       "version": "2.0.5",
@@ -15602,8 +15595,7 @@
     "quickselect": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/quickselect/-/quickselect-2.0.0.tgz",
-      "integrity": "sha512-RKJ22hX8mHe3Y6wH/N3wCM6BWtjaxIyyUIkpHOvfFnxdI4yD4tBXEBKSbriGujF6jnSVkJrffuo6vxACiSSxIw==",
-      "dev": true
+      "integrity": "sha512-RKJ22hX8mHe3Y6wH/N3wCM6BWtjaxIyyUIkpHOvfFnxdI4yD4tBXEBKSbriGujF6jnSVkJrffuo6vxACiSSxIw=="
     },
     "quill": {
       "version": "1.3.6",
@@ -15682,7 +15674,6 @@
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/rbush/-/rbush-3.0.1.tgz",
       "integrity": "sha512-XRaVO0YecOpEuIvbhbpTrZgoiI6xBlz6hnlr6EHhd+0x9ase6EmeN+hdwwUaJvLcsFFQ8iWVF1GAK1yB0BWi0w==",
-      "dev": true,
       "requires": {
         "quickselect": "^2.0.0"
       }
@@ -16059,7 +16050,6 @@
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/resolve-protobuf-schema/-/resolve-protobuf-schema-2.1.0.tgz",
       "integrity": "sha512-kI5ffTiZWmJaS/huM8wZfEMer1eRd7oJQhDuxeCLe3t7N7mX3z94CN0xPxBQxFYQTSNz9T0i+v6inKqSdK8xrQ==",
-      "dev": true,
       "requires": {
         "protocol-buffers-schema": "^3.3.1"
       }
@@ -16173,8 +16163,7 @@
     "rw": {
       "version": "1.3.3",
       "resolved": "https://registry.npmjs.org/rw/-/rw-1.3.3.tgz",
-      "integrity": "sha1-P4Yt+pGrdmsUiF700BEkv9oHT7Q=",
-      "dev": true
+      "integrity": "sha1-P4Yt+pGrdmsUiF700BEkv9oHT7Q="
     },
     "rx-lite": {
       "version": "4.0.8",
@@ -16781,14 +16770,12 @@
     "sort-asc": {
       "version": "0.1.0",
       "resolved": "https://registry.npmjs.org/sort-asc/-/sort-asc-0.1.0.tgz",
-      "integrity": "sha1-q3md9h/HPqCVbHnEtTHtHp53J+k=",
-      "dev": true
+      "integrity": "sha1-q3md9h/HPqCVbHnEtTHtHp53J+k="
     },
     "sort-desc": {
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/sort-desc/-/sort-desc-0.1.1.tgz",
-      "integrity": "sha1-GYuMDN6wlcRjNBhh45JdTuNZqe4=",
-      "dev": true
+      "integrity": "sha1-GYuMDN6wlcRjNBhh45JdTuNZqe4="
     },
     "sort-keys": {
       "version": "2.0.0",
@@ -16803,7 +16790,6 @@
       "version": "0.3.2",
       "resolved": "https://registry.npmjs.org/sort-object/-/sort-object-0.3.2.tgz",
       "integrity": "sha1-mODRme3kDgfGGoRAPGHWw7KQ+eI=",
-      "dev": true,
       "requires": {
         "sort-asc": "^0.1.0",
         "sort-desc": "^0.1.1"
@@ -17961,7 +17947,6 @@
       "version": "1.7.0",
       "resolved": "https://registry.npmjs.org/threads/-/threads-1.7.0.tgz",
       "integrity": "sha512-Mx5NBSHX3sQYR6iI9VYbgHKBLisyB+xROCBGjjWm1O9wb9vfLxdaGtmT/KCjUqMsSNW6nERzCW3T6H43LqjDZQ==",
-      "dev": true,
       "requires": {
         "callsites": "^3.1.0",
         "debug": "^4.2.0",
@@ -17973,14 +17958,12 @@
         "callsites": {
           "version": "3.1.0",
           "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
-          "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==",
-          "dev": true
+          "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ=="
         },
         "debug": {
           "version": "4.3.2",
           "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.2.tgz",
           "integrity": "sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw==",
-          "dev": true,
           "requires": {
             "ms": "2.1.2"
           }
@@ -17988,8 +17971,7 @@
         "ms": {
           "version": "2.1.2",
           "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-          "dev": true
+          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
         }
       }
     },
@@ -18079,7 +18061,6 @@
       "version": "2.3.0",
       "resolved": "https://registry.npmjs.org/tiny-worker/-/tiny-worker-2.3.0.tgz",
       "integrity": "sha512-pJ70wq5EAqTAEl9IkGzA+fN0836rycEuz2Cn6yeZ6FRzlVS5IDOkFHpIoEsksPRQV34GDqXm65+OlnZqUSyK2g==",
-      "dev": true,
       "optional": true,
       "requires": {
         "esm": "^3.2.25"
@@ -18989,8 +18970,7 @@
     "webfont-matcher": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/webfont-matcher/-/webfont-matcher-1.1.0.tgz",
-      "integrity": "sha1-mM6VCXsp4x++czBT4Q5XFkLRxsc=",
-      "dev": true
+      "integrity": "sha1-mM6VCXsp4x++czBT4Q5XFkLRxsc="
     },
     "webidl-conversions": {
       "version": "6.1.0",
@@ -19582,8 +19562,7 @@
     "xml-utils": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/xml-utils/-/xml-utils-1.0.2.tgz",
-      "integrity": "sha512-rEn0FvKi+YGjv9omf22oAf+0d6Ly/sgJ/CUufU/nOzS7SRLmgwSujrewc03KojXxt+aPaTRpm593TgehtUBMSQ==",
-      "dev": true
+      "integrity": "sha512-rEn0FvKi+YGjv9omf22oAf+0d6Ly/sgJ/CUufU/nOzS7SRLmgwSujrewc03KojXxt+aPaTRpm593TgehtUBMSQ=="
     },
     "xmlchars": {
       "version": "2.2.0",
@@ -19714,6 +19693,21 @@
           "dev": true
         }
       }
+    },
+    "zrender": {
+      "version": "5.2.1",
+      "resolved": "https://registry.npmjs.org/zrender/-/zrender-5.2.1.tgz",
+      "integrity": "sha512-M3bPGZuyLTNBC6LiNKXJwSCtglMp8XUEqEBG+2MdICDI3d1s500Y4P0CzldQGsqpRVB7fkvf3BKQQRxsEaTlsw==",
+      "requires": {
+        "tslib": "2.3.0"
+      },
+      "dependencies": {
+        "tslib": {
+          "version": "2.3.0",
+          "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.3.0.tgz",
+          "integrity": "sha512-N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg=="
+        }
+      }
     }
   }
 }
diff --git a/package.json b/package.json
index e2449fc8..3f52cd7e 100644
--- a/package.json
+++ b/package.json
@@ -19,6 +19,7 @@
     "axios": "^0.19.0",
     "babel-eslint": "^8.0.1",
     "babel-plugin-component": "^1.1.1",
+    "echarts": "^5.2.2",
     "element-theme": "^2.0.1",
     "element-ui": "^2.13.0",
     "file-saver": "^2.0.5",
diff --git a/public/index.html b/public/index.html
index e4e6978e..ebeef610 100644
--- a/public/index.html
+++ b/public/index.html
@@ -6,6 +6,8 @@
   <meta http-equiv="X-UA-Compatible" content="ie=edge" />
   <link rel="shortcut icon" href="<%= BASE_URL %>favicon.ico" />
   <script charset="utf-8" src="https://map.qq.com/api/gljs?v=1.exp&libraries=service&key=LWBBZ-TIGC3-VFP3L-YNMWH-FJB7T-JFBLO"></script>
+  <!-- f2图表 -->
+  <script src="https://gw.alipayobjects.com/os/antv/assets/f2/3.4.2/f2.min.js"></script>
 
   <!-- 站点配置 -->
   <script>
@@ -37,8 +39,9 @@
   <% if (process.env.VUE_APP_NODE_ENV==='dev' ) { %>
     <script>
      window.SITE_CONFIG['apiURL'] = 'http://192.168.1.140/api'
-       // window.SITE_CONFIG['apiURL'] = 'http://118.190.150.119:41080/api'
-      // window.SITE_CONFIG['apiURL'] = 'https://epmet-dev.elinkservice.cn/api'
+      // window.SITE_CONFIG['apiURL'] = 'https://epmet-test.elinkservice.cn/api'
+           //  window.SITE_CONFIG['apiURL'] = 'http://118.190.150.119:41080/api'
+     // window.SITE_CONFIG['apiURL'] = 'https://epmet-dev.elinkservice.cn/api'
     </script>
     <% } %>
       <!-- 集成测试环境 dev -->
diff --git a/src/assets/img/shuju/measure/bg-left.png b/src/assets/img/shuju/measure/bg-left.png
new file mode 100644
index 0000000000000000000000000000000000000000..e35c9bc8609f4577a7ccca4ba9409ed0f47d33e8
GIT binary patch
literal 9103
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

literal 0
HcmV?d00001

diff --git a/src/assets/img/shuju/measure/dangyuan.png b/src/assets/img/shuju/measure/dangyuan.png
new file mode 100644
index 0000000000000000000000000000000000000000..74ac72ae6016c252e73ee7c141041ecf9ce6274f
GIT binary patch
literal 25056
zcmYhiby$<{`vyD)BSl7oD2$EnkWym6fDzIl5<0r21!)Gtz!4)9kOrko>5!0?mXvNm
zN$HSxpYQK|kK_Gkd;WNiJ-hGwy3Xso&g*=lb+y$f$?uT^002sLBtjnmAjrdC2a*!w
zKlzb05%@0xFMTy7K*jL=Z2-VBT^*rl==XCsh{VsxXi73JHsYZ^r1eaLW*iC3jp7rt
zax;NDqUq^k^O0`)AOw-3D8!;$=yb7n%q>QoA%Y0mC{@qFe)ZzFO}3wO#%G;IGV$Bl
zkuO<uI<s4gH;caIzU7nUbGL(#EuT^dW2n#myO4=yGmUb$`m)Qc1#*_~rVS}#-|sbN
zdsV;y9{cMx7c=2KIcCbRh06($dv>?$a-I8!23Kd3Z}+CEA|-~IX!|a9bG!z!30dxH
zrFS;bOXn>&I_yc#QO{b+#F0Lu{Ypit@SWu)ZT%3zy+0IZ(N}em5@nW@&etK*<NYcN
z<IaK7r)WSJq?1sU8uVfQle+<B{WA^#cOdpk71e3oVg334y`L&R(38CvaXIV%Iz<}V
zL^yW{M73WzEPi~lk}mM{@^x^4y{pvI%^>$X^VRJ^vXXmDhbHCt2jTzeEd`;K*hLr1
zGm`pqLfREAs)OXu1XQK!FQZu5<X`%(bX1#paQ<&e=fd}y0(c*7Pv`e7&Xp<%>?L2M
zg5(7N6Ng_F517h<af$=P>Vc7BoJ5?mB(jYBSvLRo07}9X$K{_#LT==11buYvD;+ke
zu#zpXnm1%I?iGRr>)Vs_=J_^uSFVG3`nQw4tlK%0AgVx|cqu;nj8!9yjKG12Nj{#7
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%0AY`?W}~`8h!!-K8B-Me^&^Z
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

literal 0
HcmV?d00001

diff --git a/src/assets/img/shuju/measure/down-right.png b/src/assets/img/shuju/measure/down-right.png
new file mode 100644
index 0000000000000000000000000000000000000000..0dbb12d42146b1faa463b44d33d0ed4cb81bd1c5
GIT binary patch
literal 6437
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

literal 0
HcmV?d00001

diff --git a/src/assets/img/shuju/measure/gantanhao.png b/src/assets/img/shuju/measure/gantanhao.png
new file mode 100644
index 0000000000000000000000000000000000000000..8815909679262b4236ab81e6c72d72e5a0589ba5
GIT binary patch
literal 540
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM3?#3wJbMaAF%}28J29*~C-V}>SsmaL;tHf4
z?*F%Z{NMccf8)FV4etNfefZz<%72ra-;HnoFu40e|LzZiTfdC%{4%`z%i!)Wquaj>
z?))|ZqT9cX?))~q{loaqPa`0@{mU3A0v0s7{nO~yPeULHk-GKM_%=u*0^Rv#bPK2$
zqzi_CTsRv$Lrb@HE6}+XB|(0{3>=(%`~rePO3JEg2F50)7FN~{9)1CV1(j9R4J~b*
zUERHXv*ym5zi#`9(`TN(dj0PGhtFSr{`nVtkIxNg#%)g*#}JM4Qv*5qnhXSD1otp}
z+~>bXz;f-OKmSv`ynQm0dS;s#@1C5wd$)`Ip`yPZB!8_7)!n{FhQU70dsY9t4s+Yy
zE%(%p)qYvoZ!Gh5(rfpW$CJt>rcJ74Oyep$+Pc_K<fmkKpV=ifb!U!+a)<RkG}wl+
z+&ZLt;JAa}FAgq_ivcZclbAO3h%^?Ro0Q*od%HQ`jm|p(byr=Lel57VygzU2=S~5?
z)aNNiIy)F^)QW9<GIxF5o}9Ml{lsP7CaE3Q{Ccy_SuxG_TAWv{Va~CB?K>NfiEOXV
c{qGdFS|iJMDSzGqpf?#jUHx3vIVCg!08GFNvj6}9

literal 0
HcmV?d00001

diff --git a/src/assets/img/shuju/measure/huang@2x.png b/src/assets/img/shuju/measure/huang@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..b40cd4c0f2eace8d2c2c37e513042550e0d74036
GIT binary patch
literal 1348
zcmZ9LdsGy46vt-;c?l5~#!KZfk6oUUMhdC0EF$uLY>FpyLm`7o6p6z_5d}pktQ5;f
z2%;!ZfJFu@%RCm5kU$D03)U?&^l&WyNOostVfxK1OOJEz%<s<k+~56v&Yj=ySVCN+
zosEkP1VMID8)Zpg-3cCBD>Lw}Kl?BdETWvGNGa4Z<n{=H7Stxhq(lIb<Ai8}I6Raa
zT*-}kbJt)Fcjx-txIq`L)1Sk=xn7LxhdHGuudDsIJ|C`I%;6|U!Q6E(uG@pJp(Iax
zv1t`Ljl<KV*R<MGr;_M!v5v%aYDBMs^|+Uwl<3uBeJ@7iC`}?X1=GDSjZ0`!Oj8)6
zMi~-jD40=;860B>l%Y^YjW9UO5->}OSqfuulqFD>L|6)DaWP9^EQzrc%Hjx1AS?;9
zl$gaa1A!Vy)IcEyU`@b!5(E8d3Z)67FR;dF0;7RW0ud2l1V<7u0AGY55QfC~01SYH
z{{*6`h8ImWfE)nuR7NmBVxlsl^0b(-fVbl@fTQ3(hh(A>kOTn16gcuBFc`s%Y(_AU
z12A4k7{D->3q#{`)5dunVDKXnIOk~r20s&103PsP`2Ip4zPS)!AV%>&x==P>1CqI+
z30wZ<`wtsmW9$hU{?7vFe8V|H0cqA{unL?}?Y^YAWJt8Y%zUARrIoeKB3rv>?4Na5
z{M_@7OI~ntc5!uEx@@_-ho={epqN<V?c?j`9}xKB%2h7~y}Wu&aL6lb*R2l?lZMM8
zHbicW+7ulV8yBCDn3S9%e|2-}*4MVZzFqM~+K!#+8E?Lonf3NN@9xgtvo~j7?t6Lp
z1%*ZX4-_9PIdr(R?8wpbV-=O}e^7P&!;d~bakBc<C!d}^d+xKE^R;ys>MveuxO}Ct
zsrieR*0!r(e%1c<wQo8)yOiCk9-JU4b?^1Q8~xu7+#LLFX!zF1_dkr@zBBgY-JgCQ
zpU~XX{_^Yn-yZzl%%+8dJDL$C3rlfwUP#upWRy7{8F@NuZC!CD7(P`QnwI6gRUYV3
z-^s2iERG*@(X+~i{>I?3smFh)G?SV_jV}LQt1iE0a%w6c@2P2>+<$)g@Jxs9Mxk!J
z@Xy@5T>0h!wq*OPQX~t6qB}NO<}Kab7&0`m%kM<VioXtM*K^sW)CL==TwD<Fc}jLz
zTZ5IaR7VbTW-H2_>h2`mu5M~_3U^W}An3UL>`c7xE~unFc*3!)`F=yQ(m^hUoF5kH
zAGu~!igtv?`W$|6AtK!uZI@BDed?pdGnoo=H^(SR*LZrBxBQ$=qh6I^2C0gQdK}E4
zg9&x3^8>0C6M@<@wGLs+iVU<XWFburNpEaw*J%7zomUdCmMTOAPwwW494s<hf=0Kc
zoV*x)>$3E5MNEIG<+@_S(3YTZh504-uAJC3Bp4fsJWZIdeL^o<;+f?R?a?;el;kEa
gPA~T$wAQosTlTi4hD8n-!0CdbBI0B%QpKUa0if5;H~;_u

literal 0
HcmV?d00001

diff --git a/src/assets/img/shuju/measure/jgzs@2x.png b/src/assets/img/shuju/measure/jgzs@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..fd3e53c80d1795c1d67a90455181a3a537fd9f42
GIT binary patch
literal 1603
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
B6z%{3

literal 0
HcmV?d00001

diff --git a/src/assets/img/shuju/measure/jumin.png b/src/assets/img/shuju/measure/jumin.png
new file mode 100644
index 0000000000000000000000000000000000000000..74003ab856e773071b9fd9f7a553e3f71c29c0e9
GIT binary patch
literal 25003
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

literal 0
HcmV?d00001

diff --git a/src/assets/img/shuju/measure/lan@2x.png b/src/assets/img/shuju/measure/lan@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..9a078223afa399208a72b44ade6ed0888d37b350
GIT binary patch
literal 1348
zcmeAS@N?(olHy`uVBq!ia0vp^DL~A_!3-o9&wddIq!^2X+?^QKos)UVz`(R1z$e5N
zD9G^tKSTZh&{h8(>i-+h{I6C2Uu6=AZQ1wVxZ%HEH%P>~^S?Pzw&TA+{ePSG|CaUt
z&D#DO_xv|(`)}3#-@Ns|Y1e<_*8hf`|1Deon|J;<Z2>7ZZ251|{@<+mze)Rl<L3WH
z?f=c2K^je({~Ndcw*Z>i_TRMQzey`dG0+e*ARDN%^}jh#SId9X_Wve8bK3r!w}5m3
z%`^d8+5u*F{5J)f12hn*tNp)eD~Js=2c!|`7%&^C7|4ceGy!V_DF$l<$$~Y46hm|Y
z4S{O`8Uj=X){d+NC<rwiq6NqW>w>5RvQcyaO@`P4)&;Q_<UFu0xJtM#WW~sAkV>FA
zKwX#`A#MhH3g|G9N}$7F)&aRtU0}UXM}iFj83=I+HeEnjkX<l@;DWUvYXn+~Vg*bK
zL@z=kSRCj8kT}e>$Qps-Xk3U1+FqYjfJyX0NswPK10xeN3o9Et2PYRd4=*3TfS{1D
zh^Uyjgrt<TjI5lzf})bLimIBrhNhObj;@}*p^>qPshPQjrIodft)0Dtqm#3XtDC!r
zr<b>nub+QFU{G*KXjph;R7`AKd_rPUa!P7idS+I3PHtX)L19sGNoiSmWmR=eZC!ms
zV^ecWYg>CqXIFPmZ(sj}iIXNznL2IyjG43N%$+xX!NNt0mn>bje8tLDtJkhuzhUF1
z&0Dr^+rDGxuHAd~?%RLh;Gx4ujvhOH;^e8*XU?8Gf8pY#%U7;myME*5t=o6*-n;+c
z;iJb-o<3XsJINWCN7FoA977}|Sr0B;m)0uTcJb>!PR_1bRw~oF9g?!OqCyQ77w`OS
zSzYgcUFyg0-OEm_w7UNK?Yq7Ap5Lp!_r3D|`tOzVp1*!wxqsih_0MbP%b)+d<NNXI
z?{})-mzI}?hM)S~82@iKql+Pf_YN=ia@qWq*5~eK=uU1l_)_=4{(nKsAvZ3kP>m}6
zH6aC#8<uhCIDJ2O{y(!phs45b0avH4S|#Buu{(i*p`ZWXUw@qphQ`HKcST!QKVG(a
zw_vCSgXD{vA1|fTx*3xle6^dOE^<xPQQP8ji09bh_WHkB2`n<Ao|?Pvr1oir&iQ`t
zut^#-!`_;jeS*vk4FL-+D)px(+%<eKYk{DnT+N@K(hO`)k=CgzS8cg>PjBze6@eRD
z5*VvK+$?7lWXoD-b|p4s$`bDj%bnhK`J8BBx2ykiF2c+?fn}+}u43OLRV($2?lTXt
y*narQEvA&Mz)<*L*=fzvV4>6w#RCsG|M5o@ZHRPqKlKMx0(!doxvX<aXaWFJlB+lX

literal 0
HcmV?d00001

diff --git a/src/assets/img/shuju/measure/lanlv@2x.png b/src/assets/img/shuju/measure/lanlv@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..190ea2729a1c9c97227097e16ab61655fc55d020
GIT binary patch
literal 1261
zcmeAS@N?(olHy`uVBq!ia0vp^DL~A_!3-o9&wddIq!^2X+?^QKos)UVz`zt2;1l8s
z6lD1SAB<Kp?BCCD<_yD?D-5@9Gu*$=@c0<Rvoj1AFM>pF+yDvQJ;QMSJj26FAd&0W
z8E&3oxP6Y{&P9fMml^I~VYqgU;l??Jn->^vUu3v*nc?mghI`i-uAgVPagpKXC5GFV
z8SY$RxO<-A`UR-St;-Czfp%R0nQ;9Q!;Q-fH?J_<0*io5fQbMNymb*|=Iu)$V{cpm
zS#k3s!!4khFk?YhfNcSp2}EEsftCUhPy{3hGXW$B7J-`yR1XvZ8Hi*iNDyo$&=!zI
zU}GUxfXoCN3o#Sf7Py(nwm{tpwij*-R1jhd#6XCdV5dUO1dG7UgjkAf8pOfKMuF78
z5Y!7WE+i1pOor$M3W9V2g9RJ{2tl9-Tst_lLGDKqft!gC1Zx4t3)oCmjk%!Icd8`F
zFPMRmiJ66!jh%y&i<^g+k6%DgNLWNvOk6@zN?Jx%PF_J#Nm)fzO<hA%OIt@*Pv5}M
z$k@cx%-q7#%G$=(&fdY%$=Su#&E3P(%iG7-&p#kAC^#fEEIcAIDmo@ME<PbKDLExI
zEj=SMD?2AQFTbF$sJNuGth}PKs=B7OuD+qMskx=Kt-YhOtGlPSf5N26Q>IRzF>}`J
zIdkXDU$Ah|;-$-$uUNTi^_sQo)^FIjY4et?+qUo6xoh{Hz5DhbIC$vrk)y|spE!By
z^qI4wcTyUFc`4n~#W6%elJ($5zFcMrw}U^+l(dBAdcBsNV#V94p<;gJ-u}mL>Ss#+
zcz*ii%3Zs5y{@`nTebW9-q-K;R^LB=ckle~wfDb&zW2P={{7$T@0Itzzq?nxdv{fA
z>B~L*HJ?{EZcsH|V>*k|NN<hD@{*MrOrCA`*z5kAnYiU{X%RDy&@^#9>gT#GitmuX
zYq^@g?S^X%-I6yrOg4LDn{+F5N$61)h8mk6Z>>9yvGpWwXx;XlBkc9Mb4o`9R5*8i
z{&01^^fs|hNoJd@Ei9K`^_4tb^LmHZ5uF}>{{1!lrxVNsL~bg$?>geu-e-_2=PdZ(
z>BkyHV;(L>Y0VpQmqnJUMb5qR(nZJNZ~O7{_Geleco*kBYFw<m=-$HB>!z6qcB)=r
zKmSjtO_ym?tmK6mr!?QLTQqN1h!&qqv)zY3UluzaOFN>*lVIF!(Cs}@C2y7Lj0OBQ
y_0q}Ar`g`jbY$4DYRc+WDuK<)5??w0vG1HTEq<|!mjN&#F?hQAxvX<aXaWGS4rYn~

literal 0
HcmV?d00001

diff --git a/src/assets/img/shuju/measure/lv@2x.png b/src/assets/img/shuju/measure/lv@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..6b09fde39c345d2e044897d1b095b3409b222d88
GIT binary patch
literal 1261
zcmYk53se+U9EXR8yaE;o2}DtO1%w7JVk*kAI}a9g17uAt6os&?wM<0Wo!L9cOM<MF
z3^YX9$au7&5$Pfk2ADu%LF~*fEFC>Yv}$&!gPjx7y$h)4%+AdD&3C{5@6MSmNs>`6
zP79nc40Dmj<0<f(34hKGHt?)D^?NeBSnW@t#F+N_!f_0<-k!7}m4G2Oje%((pO%Z-
zfv_)2J_w{ng=iG4zO`@TZ!Gy!wrCK@xE!ew;3EfNp7`@2Y7j{DxgwsG8gt2ER$@{@
zh8j{591!y=NRq=Ud<2MxRPlO1a<qg8Vk1or17e7l=s`S3lRS$XXo(R}Mur?>aXlm9
z0L3$e0pLc4f(AVUZ4#cLct9E$+z2F))UyP~;5;Hp14|egTn{KtO>!*3tKk&VpeA5X
zy&Bp`UQO@-H>gPiAdPBh!y(Bd5{FY@&H;i`;}#O-2AH!Xhe*WmEHccID2Fy48UQ3w
zj%+jJ%oNyd)&@z-6c+WFnF6~#?t{q3HY9{L_@ZDpxDb-)JQrH-(biBh`v^6G<<S9e
z9*2;bmB8|FArhi(T7+oH%mF=5gqFRdg%;q64#<Wik5mYl4J`%cgpX{qeoGE_6kS_1
z06(yv>=fB1%*xuvcAlNRgQL?^&MvM3H+PSxJ?DEp<L$G+ci|$x#Y>j@2LuKMKN}Jn
z_FVX~<<Cb%t`J78j9&G^>NRU))~$~f#fc?2K~nM3gv1RSWiKWrr))}<Z+>aZ)@?7p
zlD2(E`p#V$nXhK;e(m)=Z@j74`_|k0-r1jhAm`wrT&0R;)PT)9oL^8_RD7i5-O{r6
z-v8j(@$!#8uBbeD>XWL|)o0GuXlg$@_jz4?L*p0PFPqL^_^SEqmTxXz(zRZ0`?meN
zjw|1Hc6DF<;aX2`-;eW$Gg<gw+AYQ7QoViVb)0uq*m#p2|K|9Ic~m8s7nQGZDGUi*
zHE3$Tbq7@XJQ(Y}R;SbH%*s(l**e)~zSpK2?H_5Yo@7QRCro2Z?4MJr$=uP&dnQ$D
zt1|7t_+<e-(U8{^By3!H(s9M|#`tsDbs^T$B9py(Iy#C}G#7XYw}eI!T{5C&o9h)f
zvmZTG9N8F2W;BV8N8enx%OL+$-err?F%RypJ<@GgwzH|QWz1o-S$o~T(=E_ZH*x=$
zYTp*G5+9qGJ<YZQe;m!e-Dtj;&>3DP5VX^R-t=fUPksrd>r5y<8lmu$xc_?lFM6ra
z*~!W`l=B<#tPS2;H9U@oi>8XN_Q&=Wur3<K%{)y&jp=NI_C%C>Nze`Z{)Zk#%d9V?
z`P``J3B9YWIju_#bH(%5-~aD#O<Z?YXRvd+ur#7H@x#Eq^+6S91Tnxj!=~5nPGua{
lRA1guADEmU;Qf!|L;Fj|PVCU&2@&u^!lZ-@*NW2*{}0sFT8;n!

literal 0
HcmV?d00001

diff --git a/src/assets/img/shuju/measure/lxdj@2x.png b/src/assets/img/shuju/measure/lxdj@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..2db1aea005d7a6871faeaf8652bf6c47984033e5
GIT binary patch
literal 1426
zcmX|A2~bl<7=9!`l9xat@CZ2|kpZtd6qPFUm_`JVDKb_lGYqxTQUbJ!!$?uA3<Oa?
zP!OpFLB)bVK^UkbkOT!$!WDx-gm8w)DToK*FnKTUbsak0`S;u1Z+8Fx`*wCS4+Z*J
z!CV-EAS?d^K8L|5{Me~vfIejx6<{zsdDzbzs#Wn{K@chNP(ZLRAc<s%sDhMYh$w`J
z28bAO(E>&R5i{KR7KE7Jrb~y2ChMV-5HZRoTIdT+c0?0QOb7@WJX6dfx|pM<DF&&f
zp_#ti%`?jAL(vf0OhaX~p;!o&Q;AvOL<$v?!XPwa2vgZ&a_VRT*(iqz9p5O0rwgs$
zckqoeno&x7Rk^{W<)bnxI0$g9#~w`9ln$sIMtf~h8H`FlX8sRb=!21<1PztbO;b)E
z`DQvmOiIHPEUXy@IF$`!EeuRyg|%B@Z49iPiFGrVp7OB{>p>u<i-jp!SPyIXm>Je<
z^R5xWo*}rFi$Ax;2kh`ZTU=wOS8(wG1Rq4O0ro<b4W>b`VJ-%i|HqI$HfV>9b1;oP
z2IgSHdW>^T;~dkNgK3;MB!)~Aj>E@E6A}tO<pk`nDiG|213oL9yhO+6gy3d?1%rx>
zKBVId&iET=z!2|Ti6z(31aso8%Zl0w*Es@m?uNBiLeW38BbGK{3MRNu(+C&j!RI#;
z`pv}3W>94~mIO|Xoicx!PMJ(KpUttH&4=f*$gl5ME#8FR{z+acChJQr^-BJVjJ2ZV
zf#j=Yq}2hzT9w6Gzte{b(g!KsP(?D_qZ$Tyh7p0Wnq+*;G%69a-U4l;0+H*bu}Pt+
z4>9$#O)uCcjRQ~u%$g>hOfy1!!Vw4tX4kdhuYoBS;=L=O-$X2LwoLl`9C&=i@rMJ0
zAQIWaf<mFvU<PA@jh(#%hr{6tHo9zab9dkE^~IN8ioE>;zB}^6(a1>gvEwJ=emiyM
z_oU=x$+@)i=^0ts*_STo<mBdF$-A1L|3^W=^`fGif0b5LSKqCzZES3m%A1=Xw6wIg
zwY5EIS9ElAc6N1j_b8Rm)aw2hBO_y4t#(4EdpSM3u)Mswx@s^OjVOv?CVai+1&rMS
zpGDyBvp3kYCn8)#+G&m4u)V%7xR6svdYIuQa%X2$Pt|v24XVPL&W>GkEDG6Ps4bOj
z?G1VmJ{`M7Qx~0QbAj}>J#0<b`p^CZk3@B5(ORk~j8`x$52hTHJep5JR}Ze(M1-^S
z1@O;r0(^s5_mc@c<`-7Ou!k^eC%r0Fc8<c_|JYM4Qn~F7wx~&G3U;T*1xSkbeP0RB
z=kUGqsFN-vFTW4pB4vWF&ct7GORJGvb{48Kt6JY_>LW%%Ec|!4AF!wyww%f@HF!4>
z{eNHO4c0C$gvk>oyMihLV{WIH>0dps$T@M8X+DxeF8u7+9NffHL60)Yl)#iZ&c(T<
zfWB+HdYwht9<~=fN{b7N!n(aYqu<Bxx*Flrsh^ihMAL~|qSwsgR!;x8<Qx*7xTm6=
z9{!96>B2HaQ=w0VX9qh|FK3C|?`-cwoPSclAtel*w1Yh}6MsbJQSH&_KJMsT&Ik!-
z=*-!(QBf|ZdfmD@Ri9d4$lyp2PjAoLzJ}14I9g&{OsK(E$J*gnN1{_Z1eL;FTix8Y
z+E%s-oW*7#CDyv8G(;Q~S$-!{9Lc^Q6+P*H1gDiGXbkP*D6_o@cW*iNTW-ww8W}Cw
zc6Tv}Oio&?xxEw%*X8EjKR;i0zrLZN{`~dmPqL`Lnk7{_?P0SWzBvlH%3M4g$8u9j
t%gy(XPv!=zch|?AythLga%C!oPKMIdwDx<_P(FClkiT!BPpx-&>c8Ir-U9#t

literal 0
HcmV?d00001

diff --git a/src/assets/img/shuju/measure/ly@2x.png b/src/assets/img/shuju/measure/ly@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..76303b9c1428b8e885297aa1d720dc8cce4951d0
GIT binary patch
literal 1590
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

literal 0
HcmV?d00001

diff --git a/src/assets/img/shuju/measure/qita.png b/src/assets/img/shuju/measure/qita.png
new file mode 100644
index 0000000000000000000000000000000000000000..82b583cd21e02f2f0a435d5a95e483a75717c3dc
GIT binary patch
literal 1414
zcmX9-3s4hR6y1b`PeLG&eXAf<oQk7j#n#q}IwJxOf)pK4N5vww5;1(`W0i;rh=U*^
zAHg8Mm?AKdY{K6(<hLZ*4F(me9a=@?qZDO2ohjl6w0+Q>yYIbw-ns9dyZ3FuzK9SG
z%aes52q$!Ra3q|)7hXp@I0iQqTHr)Wj|>S!@cUj<2trTa7ruWN1ph@uazxHY_*F<%
z*QzcNBC>eNZJzBFNQEBg^N~{)7r7YWo0q8jfczTk5`hvnRAE9}^AI7qR4GCP7G4X5
zwbZg}`+!o2#9J|(#1ukAKmlBj>cxyy5-6=GE<{dISSQ@QV3&N8b%Q{)B#Kk0Qo@qt
zG0#$q9F^<se8zd)wXqjytw2EnNKjZ&B?T0{;O>G8aO(oNXqfUG{S=AeMqq^DaEk=(
zi=%=9s$9DaE2^NdHVRXiLHj}!z-!qx6ozNf<Ka4+CNP5b#T0lwTT;i7R61TEfDSTA
zR0V}W4zymNx#A!)qU!%$s0uF3pli{EG?)VBg$DUb(;{vL9R%pHfVOkAlLpKnqzS}!
zsYYP9Ku=P*O0~QW_ziQJ8CkS=Js=Fg(CyYjfi@lJ)d3R(djP2gW=Pgy7AfZzlmx*-
zX12&K^)^SM1tcu92UxX$GJsxKy9sDW(0QIF$fhO0C^0>yfO)pqK~!R&UEz4K%Bi5*
zDZkdark;Hjo+jheHMlf2x-=?WDsk63oU3YeQ*>}^)$VuHJPkZk3#>X+uLBkxAocEz
zdR~*BC)Wd=9+(!=@f1d&g|)!E1n&;i20LX!<tET=0&1wl4DMP$hXr(zC~RLVlnS*`
zpcNKqg)IiEn9L`e;I*sDh>VCr=ypt|gQFA6+1bq<#g=+_czCYxUbSX}-^R`U+qQ2H
z2n-EB@O{j&xVSied}7M!jLgiRvV_^9i+PvwFBe`Zx>|hgT1jbX`SprQNmX@qZGB_Y
z9URA19i83X-5QNfZy*T5WVVnbNm={)?%8Y)2L>KJe)42^WMt&|=-Akc$=5S8v$M1B
z-+%ZpH#a~3@#Ck(M~hAW4*wCa(BPf>x7_<NHh@0payv=;X6HJa^C4Oa749uznqH(0
zO_=5U2glTJCf)}nEa{)xPhOwIC7M|}ni&01dHI$h{n@8>M^!^H=ewAOlsSKHe6oF1
z6ZT5BcH_~^4>MDtxXjsEhL?+N!=dpkS#iDprXWBZtUdkGR^_z5nI+#_v&D@yo=5k8
z&DaON{%qSB8)EsAp5~G+Ti5KLHnE#g#B-YP8Vx#7a(?E|fjCcY*Zr@&Pi}RP)5kA5
zxZ;PsysZXr57k*tNmS8Gwz1C6VYcPaFC7};)F2SLcx{muEH8@?zWr;sHOrsd@{D%k
zV4KYMxqR4xQT>~8gduBME4{ZV^l-%RC1fBne9d4{+sowSf^DPHf!_Y3m2N8^{5)w-
zkE^~VeZ0){cs$3-j?Q^8T(hi8yz_=%UW$)%>B(>M{~jj(IkFisn#xj}#r`JWFm9bN
zF!{_u(sDJbuq~bUbmj4|SY{(PBKC&}z94XJBKMK4h6uPUaXOUqc^<E_zP!$TNwwRJ
zvbypW_HOA6UzIp@K8H0pHa<4?tC%&v@;DaD6mX08q$cyTj)a9B$>Jxg*umkPmH<aV
zzIJc;)}^L*LqSR0+;>sSU-=3XqWyO4@QY4p?y26szTw2QbnA3tiy~=Sy7~{RH*xdW
z3OU(tW?BX(Lkc#W{vzbtRnMD!ic8-P`CRYpPkj0`(biGnGc-ydK4nZSZFP(qUS=e8
LS41!#7@PYaC-IVr

literal 0
HcmV?d00001

diff --git a/src/assets/img/shuju/measure/up-right.png b/src/assets/img/shuju/measure/up-right.png
new file mode 100644
index 0000000000000000000000000000000000000000..587bdabff2ce717fbdaf67c4c8dacfa808f4702c
GIT binary patch
literal 6625
zcmWkzc{tSH7yitcF=L-eNXg7tD_aO(*~U_6QE5S0CKQDfvNL1Il5LFaYnIZ+*h2QD
ztVL9oXe@)szKt<s=I8gvz2~{leeQGaeb2e?^WJk~u3DH1@E+v_06@Up%*67*5)RrI
zIQKz+)FArPfdP42ni>J6-y{|QKs?Lb#PEjy*m4e!&&}ED&g*dTE(y6#!GxQ!KgU`h
ze)!;Bz4yLy;B|3A_1Hrgl8pF*h07q!j0ljFU(ZX*cCW_r{sIN$i+mtnx_3zYg}6~y
zE!8uRe_X~-PHFz{AGiHsp6<r9>Lw27_fSoLovP~n((>fzvieUyIq&4kg;+`^OEzAR
z(SBw7X|yNUaOs`8%uAPN5<@PLTg$4(O@+hu>a>z0Nh+g@!Pg+CZ(0~a_FG4Chh$OX
zUO)I5Z(}B7akW9R^_@O-C{P0^HQZo*m08QKop<uOu*Yv+^K7r-cB#+z+A_&}(`SmH
zr>q9?27%naH!<Prue*!&dS_klyzehJWXbBCnw2db+(h`I2{pSD9rh_|`E(!c=KeE`
z%;Xc9Ax&|1p~~ePb6b4M^A;Er*>-zP&cJFXQ@MHB?&SP~S=_rFZ8bGcCE8yNY~5eo
zY6a1kG&FAS^$%~zP4RknOCTe~t3i(ZktnGZt*7DriQf?L)Un3}9#ff&wQKN|wZ{6N
zm<mjL-q}X%R0{bN{JER;x|h$^4}!$TYPr(ppW4n(A}bgSmqrCzmPN(x3!iF{?equo
zB;85wXna-YnNb=%U+*mMOJwk?V(C9P$-6HB(Du+E64^2OHn3|?SJ^xhZnR}aQM&}%
zEhw#vS~KYv-_U7mOMx#`6`m?i(|FN<tMyoh-?vDimd8@*3WNb-3G_}2^XSnN3Z`qH
z+%y^nJfo}6`T7~35FKp#T6$B6a_RzTcN#Fdz4#(QomMjm)^o2InEWL}iSu2%QI~jn
zO;>6JB%_Fgh?!`NKt$aZO3VwYQzq_bL$Q54Bo3b$o;#R-QO6v(T=GJIRiFN^<`VGe
z9VdoK;sE7%<$An&iFX%0$~EHZNu9cHkMuoszZemM$W68O*J-pkuR7SE14M`5%q?Yb
z7PQ2*xgaV?F&Vg*s(sF4I1beS@dX~7JAsLikKV_r)`!-93C&XTig`e_@AeyKp9z4r
z`PE>WlOfnU42Qty={A_O(bl9pagqGW%_{yfPH!6)(}E3*qKy#sEfS%AImS&I#PRY?
z^&Z->jM)u@a}#$flSoE20&m}Nr~v-2owEE`Pko2aJpF{rCzt093Gf}@!RH^RkqPKm
zJ!*P4ogYoQ_wG*M;zEr7h=2R$Db@T|fRQ5)EFX6V1*ZFae{#jVK&k1XZ|Il9;t>1!
z`9|^OZhDkl+c85uS68<73-rfnc3vdww|nToIUR#WTS=d;JgJ)(LXUv|Yhm6BqqlNX
znr$GhkgEcs+9~IXvmcdG1$6Qvga%<=`#Qso*xN{3IBGjxN|qIJSi9Yu6(sCD%*`X9
zffK)Zu3S?7xBp0z=22w?eS7QV23DQH93!Eufq0xkNs(T#z;N$wc5o>Q`}ipW<Q~cD
zthFyQmObBs{FqzZx08~zmeQ?2YOLpCunE9m3hRwpmdX14_^AiQ5{Q)EeU^uz+s}cd
zU;(ksfQjWkh~&LOoax}-%GauudDl+)887Nm6cjhIAQbhSR7x)2Ul-SzS64E&=BWE<
z_5;e-MBpKsZCBb}Rp|<mxI1(_wwEK~FX;{&1hJu%SQ|nbhMAbDRV6XvEPC-2&0es(
znAF@9QrfaQyhaEAp>xGDO$Q&>%Q$o*H$9!`2C$eshAg!ic#FpK$OuLbtS;E%dOIbr
zD^GMUHgk=(w?6l+Yx7-;o8$Fu!qfh-R9>ffjo&_X<#kGT>K2yfci2e7y60c#di|zO
z-?p@3&Y@|~Oqk-f`B6VY0DMmC0YCW&m+1hx>(kH$T4dazjAwxUwT<?}SiL7fB1INp
ztKv)dZ}m6V4*G}SH^M*bgZ+hQTPKoN_X7DVITYFCqVk!tD=JC6T@J9LVY^ZU;AjiC
z$!THR97|=r@MmHo@UlC=Q3m6BgnGDs>t|p20pyv9@;CRqv~}>jPw-IZ;g9kL(SZKv
zi@IN_o-SgjV`_B~?$LSSfM!^8((b-mHa%lM>r($PW?vp*4M`0<il;F}Oip^(?Qvxk
zd%4_?ktpluhHrD$$GkD2YUXq9fzW32dvSf|>l1Dyzc#W|lj~+IvB0*R`WK-;r^sbx
z_vk7{kZ|cYzpKk33@*esI~v%<rg9#h@nyWPdm|*eA9N8bLehlG5!D#-UFYEQe+{oe
zZl1sWFedxOm&Z}EA*MZlSB=@?BrQaN7-8agmyjaiEG3nmTESF_e*2(M+D`M=Q`%9z
zvDu4RGJcbL^M+f>%`}*3$NAI8ZJpXP?BkfpwDce5gDM^stY?|{izBqO|L#p$oKDN3
z_IHnahy^LmsJ!U=VOhtk=JM(a`D=7O$c)bjj+6I?vh<&sC}+n}`!4GkI9LuopCxZ~
zt060_n1@i7K=Mg}i>{lgJqV?l_YY<?3cpz>rFt78%ki?#!+XNmcZk~qGKAZd%;3AH
zhEZ+{u6&EKg(ii+R{6@q(fE@j9F2)=x#jgt9?|mQ8!0lQM)4jw__!skf=MN?xDtTd
zr?q7S35@8MZ|vNjQ18r28XxIQS`r{ErD420k8K$9<#V&b=|Z#K?na$%zZ%UF?hn)D
z*R!Cbzt56Zg_^)8l5V0=LS9Xm|N8e;P4LE~8HGZv`RcZjaO}nQE7ey>XKhM<^jC;%
zlNOfjE|lA1D_vx0c!F5T%qhV(q+xk5_j>>O=7hK~t@mSrqyn8>-RYnhj#<;_q9%_S
zh5Ca_pq`s!2Cu|65!~MUe=h8ySKT_6KyQR+WuvJdXiQ_k@JE<NzAl$gfpPZ763Ggh
z;{r55%ZPo+?2kk=ivVuf_71tw&vPcMN@SZXa=|e$iFLxG;8OTx{Qo0x8d)W5a$FgY
z0oM-4Fg1&&-qfPfZpl!IYqnji0ZbEgiU*tAA%c^T`tP^s52r8K`I843(k4b+)C9W<
zalj*Hf37C{<HX!Td@T4g%CIBLnW3VWVfK(9B6-yT2+E0gLS{ASc!PbLR*Q?uuz{}+
zcUO1pKYziq@nkUqLG$a-hft32U!10N?Xm3D_5*+MZ0KEu=tE$Ih?d*Fp{i3eYR3<k
zpW8+-0^49y^vX>t_$T)8n`LDB0g-uQINbA^%D?yjloyqI9j38$?-le#Zh0utOwojJ
z9P*_TVmR63oZd%f@*8^0z6egeNNbljUysFGV0}wES62X&)VG;cm;XoppMfyQ*^mvx
z5|dU<fp|DhY*zu#eDe)HRuI@V$U7VHLn;6<?QjlqGXWTru0{A7v;RF1&dv?13++Er
zt*zzdTy(exZ#Y+pXq-@Cyo6FR6YhdsxW&fAo1@|+@n?0|QjpVvWGk4AK`nac5Pg0_
zdw5~q=GSUYEmbxkJ6rIHHXMg3T8TFTG`fXpIkcGIFaAx0?|pY<9W0Z^c^N81J?t1-
z0(rRSw#n6!Qim%79yj$IGmDeA9dd0?+`}2eHrj<-?7Q$u6Zq>rwdll0s@_v8D&)$?
zqfinDS#o(to-k=NB9uBXcRUhkx(m~@SB+HtG~cU=2!fS!1ft8XZ%B&(s}tBc2O>}k
z-}<4fE|!_Qk+f^qxq?>=XmE!PN)dM8Qqkc!{g7~W!oM0GRKN3n`9x>8HpxJ8+5qzN
z8a!Wg!-_yGTEDcD8PK^ce>xGyXpYz#ZUIFF<Kc4AQVdAnfDP#NoYrRKy||<^@P<sg
zJD~0?Fd1bFRO65a)OR18f>@a~580K`!!yww1x%fC3BckjklYyFTz#;_-rQd6y7g1R
z#=v{`BvcL9ur~#glJI6g5SjO$GL4$iW!L(VBH6Py${3c5PrlGa<uBrD6K+%6h%$sv
z@iXo1RF>K6UYhmIKmmv6Z6N~7H6oDvnadXGRO1uS@wZP_w5MDqq^6uHM&JtV7E+4P
z!@XPy)tRT0v>QWx6)`won&&0nbD;nT%L*K4L-gkhs=kx&D*Q`%-+Xn?Xzy<k*oOOI
zSP48B8HujC%sQ3#vtNAqV?v(RbQ2lcT4TA_2wsOB-;fr=Dor^lNu`$rL@2#Cy);qv
z$*n67=>B*6Ky6GCN5JehmkCGHMoG1to|jaE+MqDS2%6qC-h8Cute?=6MZe5=zo5^&
zGCb2|7bF!p;jj^b?s!8e0*fFu3-`%EY~8Qx+pA`(ll<?~%gF+a-Y^prHU{)#aw82*
zSgI=bDmd_}sOpg5G%#ZyjYlp$g$xk8A}C1+OCmzKI!ZI>bM$u}r&(~<yNI>;e9Q&V
zkEE@}b4Tioq4)0PiN#&7+b#D}E9DH68X-TbF;o;QnF?sWi8hnzuPn4LbKVaa44()z
zp0>`&c%hPIOh#dWrM-|btro8FywhJKC;y5Md9#aDEzMXC0*i!60STFBv2vjIQ<+ie
zO>Qpx_LS5F>X8N513q-qFU*0gbgg-;KRfev=ZsKdx-aW7Lrj{$LuzVD33iC{hy}nU
zcj;wwtDn!Fez>_Wsd|}(XhBEYkA%c6Y4d}YaPtPeE)%76zLB25qNR&RmC_7H)Nxv_
zYYGH_=qgVT!r=4&$UH2k@}2MOAKfpUrIYshDbaKl!uhMv+<8BPc=3nH`ni;qLYk|u
zJARz)PC0I-upw=v(V<cptcXth>!$E8{?(PVmBLwx%dA74UA$%n{zt$g2|%u;>Vn7g
z$69;Wy~oNz>oo)h!hRx>)%A=bfzfj;ry9pNIOYcDW#ai|I0|TnQ=1Qmv0>>L#^T>t
zZt3JpJ#E=U1SBs>D3uv`-Mk7q5by$z@FMAE|CL`;DRX9T&EtW)iBg2Gq_O||gU%s1
z_%}{7A8Q|JHNH!0&sYiY5~Hbrx3Lm&4~%3S(JN&pKwV%Y?%=4eHus%qUgP+aMfmXx
zp+4Y}scpWN%f4<krkAqxc?xA=ZB&qk2V_7H(^baxZ)E@8<nLdb^z##Wq|+CaBgbEl
zRM!)eP?5k6q1lif@~tW{<6n1TED9qppFoD8IjEOiLdFQU-R$oqd?|0Q=*VnpuEK&$
z=rD<4g`Ja+I!OrhWoNwz<$S1#{k<57*_nS5Zko$4&A7w+kWeM%rRvV5Uj3rV@QO;h
z1tTFf_A%#*;clrW%~YB2kOJAL)OcC-c^f+vHG-FV9oihZ<cD>FflTD0FGmm-j#@13
zJW@GwWs}HycWA@;6zvhOd8jL>0VespKkfRmq=8CDs2aWtMgDJabYJ5x51N90$Rn#V
z2`a4!V(D7$$;OdThSSL%oa5L2Pc2Uu*+^{0@jd@=mUY+OLzY=x+Fbvk0k}!h$p3E)
z*R;cV2z};qLJicn8L*r&{l1BkEhe#_@G+t=gr{dhzX)3>|HvgOQJ7Ag7?K{Gh5GNW
z!U2<B2Vw)3RkFV%PR!4TjTl&l!tdg_^PtiO{Gc<0kV$cSrjyRrllt!&Lq`N`{4`hD
zkypWR<k7b+%pd!O(;EQ|u^IpT@D(dJ$jwrv|Jr5$uQ#EUyCKa**9JQe0H1SaOVes1
z2vD2>=~mox{;x#qmz!K9PhkUl%1ZmJ4$019zd6ip|Ly^)G`y*I$UBC6_b+TPaTl-W
z+z-?6IC$|5NR3<`rOVW|G&K%!W#Gr*+5#Y5{<>ZxGU_&<fzz%t3AL5f3QDj0O^&+Y
z+0~33HW2oziIgQw5_eymAFRC1{QbfHk1H#iH>Q20{GyHw{yPs&qxsmgl5aoF9q-(&
zap8>ZieoAfZTh7G*n&f?7>uIa4mDTpM^k72c06hte}CL;;ff&Tw0(@Hp$~Y#xRA@4
z?Y;Z{q9SAS{2X2~V%~7%s0fzt(3rF?NCKh|!+G|kkap<~F6|f%#WzYP%&!B#bqoQW
zR=#hl6?)YE{a;E}--t`yIIfaS5o}Pz$>{1&%%`LdvVm4sZjWjzwA^ZO1*Xy3C1eFG
zvG4?DRk3?#ld>o4Z$sYB{!CPF5Y~tXosSme$^Z3)BfWc8>)5VOo$B&Clg~oQmR-~l
z9&m~0BlP7N-6@GXxSHYpy6ioHG*~N`GK|Cq9VBRD^pp~0E!skOl($}waZK68*o(&+
z_V8ejcdFvwFFSiE{N}AUU_0=1s}RFOyAy2@3MZt!>*L9uqZ3Ulat6QN>__!BPEJs|
zQIcvXYkqE-S+6xGZ+xjJHn8n#T{O)TTvVE9282D!$2cnw_bz2M*gZPC#$!Vd58!FP
z=OPc!x1TXcANyK?zaoRD#-UCnuL1uIkCSfkC-MeuBY60$mZ*H))YEl`2j?E^4Mej3
zLMhM<RAS{4b(`jQjh+ar)p?ZOAW#Hd4@2YvnH3z{UiO4XaJ-v)DGO-pBx>Zy5^AT$
zb=CSR@N{{6otH#C#{!NQTv`)pxeI^E%_@r&>1EqJTKb`$>BsT9I&lEm@UG`*v#FwQ
zt?d!58@ZsHq=~;*03@$t-Y5Jt{#I~lwzI<0H0{bNJ$xVwvv?VTo+2G^&&Thk>Cn(p
zhht8B%eS2VhUbiFDO+)e&;DPcoi%(9azeI1H5oJaofMC4gmQmRnM}4g+`^m$?Qt9`
zAp@U9^OWQ(Hc_vbbZ+O>O$7oR`dyJQe8c+NP}6&sciDq*?u}lwFPBltsto8xxQq6U
zy_X*-y~5Z-&An(gG+OV7=z-9?CiKhim|XI<ZL8?$#3=rL4aQ3cY<)<BaU4oPDMG@1
zN`8oreb|ASThfIX#;vE&QL@DQ7|LdiR|v7EAa97R;r&K{Y)=a1^5@^s^h*V@y(3<d
z%jS7+vFo&%uXV(<BGmV64?rIOcpzL0gxf52dqchr=`WW$h`DgIFYV7=IB8PmSHby)
z#Bzyzc59%YW%_zrWd-wyh44gtU4Av%Y_L%%9I=DEud_mZh(B1wB`ZLuqO2NA?$pwv
z4q>kg-Q~)2naz8*j0xmud!1iGh(m08ZvxB6VzdukWl$Zev+rF4>srcGurl&FX-%~O
zqhGiW%{ce8fC3%Dl&UT&VJ<cqZO&Wyht1cm0Ml0>NS*?7h+BY1xv!|x(v#Jd>RNa0
z_}x6%I*Q1ZbAoVhY=5X*>KNO{k3rWn;|Pxk9F+i7nfef|jgHhR%^{l>dL>!3v0apD
zj4yNrFKME+Cwrg)&a5#RwHyVfM^$r)Zf>0PR<AP<D(H`(S*VZE2;cqBf+?HsITQ6v
z;jJ}!P18v1ifPUXU|CA@Cr9^c&p{Ag6*?Ht-Zp!i52Kt^1Rd0)PEpb)@-D;w`+P7t
zi%JZ}fLH?lb=sgMMUcCES$aEl^+I1oS&+9UBTYI4gV(i&+C06+)6$IAByQ|tyfjSv
zc8Y}_RgWlYm)-fO8wU73L*M#bo^0PLTACNOpRXSc+#++uP43z0fPCIfeANoBG{)dT
zC9pwmkC=&`ReM>R;K)2N0zT|5nrOotdO4a=kwRGMW7oTa;pSZEogBe~I!8<W5<AIu
zb?R*DzhjF?B79QG-mg;s#+c~u;@P|}oDuhK;!+}ucM_owRj;<`*ayGfXv%uLjDPiT
zSB3;sz3HH;RIlU(K}mv!X~s)36lFMr*&6(~EcvUj<}M?vgZ>@SC`SMUeTKNNCInLt
zph%VNe9QE63`}t6J3(*{K&hyj3B}$<O<%fI_7dApL~UrO{@~3wdFIHsY&kT=FDnXa
zfL>#=NDlo}{qw-}H-|$<=6L?>_2t{veOc!}t^m?A502V3c)>k1>``p@@RLrxVA6DH
zEoVfoq8NG#aNHGD5~}-iXl5Q`vG_+r1^E4&2j{YRskO}KOUtdXiEU0YqOLQIbsuy?
z+eZHhRea`C{fu41S^Y1{sCKv1^|3Kg&>8v2M7M%2OmfJ4*`0r!((u_+MlHctg*ptA
z0YL&CYgnVm@XcRc{uzM)P0TFqNc6NCzcglYJ<A5!I?LuO#Lqb7aC*tVF(Kv(j3~(3
z6RYV^E03u~s~V^pw{GS;_~jkVT{uoVFKJnZpb4TG1!1Ri7O08=kioPXB=+M$)w7Fl
zZ$Zh?(9NH0w9JFuL9IbhyYNZ7*Uq#B$6s8J9hRxZb?oND({dF<!+RwBz&hMUf@<V$
zofjpB7OE9#qi!uoDtnzJ2>ss2m&Wbi=IE>#nC3>VdFZd;WruaA*>#JuZF{<btcH2h
z2D%MOXpOhIzHN`QvIX#1?B~e}84pT52F?)sAJ5=1sx0#&9jn!Y5=q+GS@cgX$K7{B
zTBp5VK3T<&<Ftjz&(R^*)fqawbiT~*owW1pXYmoS$pM`9uL8w4agj6U`fL|KmMIcl
zZ1s*|&3cYswe*O`Y44zMNzrwehh~^LznjzEv{nD`?z4`MVwcYsstW5^D@U!RWpz_u
z$)f7%Z6#5fwJ&e*Sg8;wlCx*q0>HHyOvO-Awo&#fY~8aaHP~j*p|ee>{awctG-0?Y
z?D`=!t|Pu8cX#rtM-096>$gDUs?YvJzZO(VLwoN?&KI&=n!M}AyaebD-@)inv*aL5
zifCgiUxGfn+^&HiFqS@drY>T%nQFEbYItZD4fZ$d2Rll!--?EOG9}3eyB2n@%k3OS
z_yrQ&>p&`x3oAFhXVbATy=#0eeY28i({E3D^y0sN2nm$lioFiim6GrHOFEzRD350{
c){!Fwq~gS%ei76-__G1b&smt18sUil16+~8H~;_u

literal 0
HcmV?d00001

diff --git a/src/assets/img/shuju/measure/xq@2x.png b/src/assets/img/shuju/measure/xq@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..bb4674f9d32846c6a46bbc6479f40536a7103bf9
GIT binary patch
literal 1913
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

literal 0
HcmV?d00001

diff --git a/src/assets/img/shuju/measure/you@2x.png b/src/assets/img/shuju/measure/you@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..db624670722ae4290eacfbb84adb28d82334bcb6
GIT binary patch
literal 1305
zcmV+!1?KvRP)<h;3K|Lk000e1NJLTq002M$001Ni1^@s6ISf3K00001b5ch_0Itp)
z=>Px((@8`@RA@upnomp=cNE9J-}jqY8fyO>h>cBC5+E^6Y>bH}#*<CcOE0F?Qe#sN
zCar0r2Wgt}PZvV!O%F|b>CL1)H1=T9UfLd{2X|!_78Ovi)(A*St0WLgQGtEU?7#}k
zzz)MeaY-h-%*^lo-hAf0_j~XCme}Nf6~F2WrUb3em*UgT-JFhET}CZ1YI$=2#z-V!
zP<?A3hohW>R)fAd1N7hw|B6y@RI+ja1b|>ffWv+J_*+!+X&Ut#C_WNm07SbA90*b~
z&!Q8baWblj!pg}5019R(sO#H<b09UW-1%{gHRz66pqs8U5bgxtCooGvFAN+i9Am?o
zoI)>JIJ4GCS2NxRfTtsHK}vD-#t#0o8hQEmW@CV<*Gm-aUj)E~;9eE)a}LZT1ziLj
zT5v2u``Ag|U5f&R#x4h7PN$nj@ox8S_7#$|+;tB?qaGk|F#v!ph#U~_`+d4@W8heX
zGp$HX9Or0Qh4RN00O0B~0m0GUo%|upoZc!BS1~i_CsCDi0e=hd1K^!oa6oWd1dcLm
zC8^jJblt1wR2T&V0C4A42+o#0Kz-XAt8>xZGH5sH2?f540zg*AVkpxTbh}VoOF;(C
zNI!0(g_%N70s@$K)i%!J{p&mVcOkjCAeg%`u3M~G3{mi6))m%Z0X_hhScz-86m(FK
zf}mY(IKyxAUI-WP;?on?95%#zU9T}21j3?3$U3EGNz`r-fTd6j{&eF>_8=SpsceiY
z!PpY0bAfr@^%e$e60XIayt<uV7lN<|KuKJyGKzi>vH=$02O$5PQt$_5E;cQ6tCazG
z76E)~p2M-um-+9CtH8pG)@i*+;=m>WkRM#1{2v5>=f>Aa97<R5wjYEgwSX1Z{RA!*
z4FE5(8zb;xx{^QnCPMiq?YO2%?D9#30xg39gJ2LBSi1$xXSM<*@kK>BnlF&EOILvf
z6zpcLA#lFP0C<@#@v|}bz<I?>*8I!ixW;T^NQkX@sqoWm0rLRdXBfz2a4=oY&Sm=n
zv1V;0(NvTGJWF^eg5%2ri0f$zT8bI~aAH{(h!J;5Y%5X#g903MUS)?bfLOC00q|Xs
z2Ekv9!I2e%pdHsFiM>SzKtY_TEJu9BWzasQd*J2behrbQbro=%sx|2f{#Y;(vg3Ll
zKur+=xUR&ZtCjq{a4OuOFWD9bLBuuzfD8pUC`eOKv&w2PTrp%dY7-4w|Ce%@7^gvs
z1_@Y5iXwUEEsn3UAu{ix(-72N+s?0om%|^cZEeK>1=}_RfWa*ak{}XdBQcc14ZjXi
z2ms+4BBnvBDfoV!T4Gaf_XmOm-NPU`QqB8?-i~{Hl>pjQak%I8;F~<TJiuyH_igNr
z2*4l&m$Pr!Li^}Lbm3UIeZ7DH+@|QcvInRO)fBbsbe9^WL$<};_LDm{Nec;!NQ{0G
z-Tqww0BdiHn+A1D-<p5`MufOR;tC8B6F>)Q!?nC4aDhIfcxP=JBh6Z79%G2aGd=)j
zA?Oj}vJy!ZBp%iCP7uYTx@X<D#-v`GNVui1TOy7Nk<18^21q<AMLRy{L{twGM$Wo#
zj#`b{qKW|{NIo{`53*Si=0U=aS@-Snu!?QexOM-5#6~?x*m>6bCo=y5=gpigdtyP~
P00000NkvXXu0mjf%h*Fq

literal 0
HcmV?d00001

diff --git a/src/assets/img/shuju/measure/zhuhu@2x.png b/src/assets/img/shuju/measure/zhuhu@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..f96ed131aa129e37631d94483f46347632f7c80b
GIT binary patch
literal 52448
zcmV)lK%c*fP)<h;3K|Lk000e1NJLTq00A@r00A%v1^@s6IS`GB00001b5ch_0Itp)
z=>P!Cnn^@KRCwC#z1xyx*Kwx#xv#Z%L}u0rD4Y+(fjE(11CUHMHuv)kcm>_jOfr*3
zrmF(4#xyo&-DYz)uh3614=`=5o*p$Qo+ObVKpY4Zh{}lAdoB05@U?gBOjHph1)#F3
zV#5-VamcL9$k>1U{`>F03y0$YIb3)f<@*Sr{1zdjTt(Q>kvLwB9Gh|pW$l$qF02!r
zxNwYfgtBsHh103fBXn-`2tCl_Bm}{60Yyj%87BcCRCfwa1#EgOLPgl&3?hs;qd5b@
zC@|n`aZW|pRJbL=Mub}!TNQ5Ylv`9zIb!4{PQiE>2aJEh`Og@LA6^6Z{~?E`-~l;q
z_!{W>f}R!Ky3)DOyR}O=!8uC8u?uTAjuF-f$L<`dum*aE9w7rgMrHywr&|J=3JL*e
z4%%L9hBI1R2B5`J1O^B&Ln$~TFp4uG?9A8*Y!Eg$TTxEM+19vzDsW4jL6lLPVVfA)
zF>;9k82FKF4=;iPpdF6;0myD~Wu-i1aMj_eDwo{33|w~MlEM+rkwb1^r9cL<cw<=;
zK*fEs|J=3RruhE#Bmq{kcszhRR2)C|Ds&J-=KJi-hf~|vRcH)PDeb-@P!Ki-8*#n>
zeka23%=kj!rozpg@hK;KegL)updF5T;rMGmV#OL|y*5^EtSp$;6<4k#c*rL}gA<3#
zz$JGsA*>a010+N602yeY0y1CvIV^Hu`e4Dj?oj!1+tSZn^xP{mzE6!y3qS=&ROX*B
z08?-apxcV@1@MKy?+k7U+!VN3;Zrd_7v*yehPT@)JB%$mw){ug99~2RKsy|FpMmuZ
zT<zgeGagalx*HF>a22@Jz-xuGLg<hv6(=^PLN_xkW_A<+CG&Mee1E&UBO(BzZZlNf
z3BrE=YtI{OYNK%b*QAIzGF{j96HSb7$pC|^DQ3<%v$iN*2U^)Gurs&?d?C(FQGRRA
zC#rlrz(@4l<VP|bUQ`D_I~?B@c-`dqxaYV!N3N_}8TpVpkGS%P!gV(u0<OAntWGyG
zt6(yrU$t^hv@x&7oMg|y&Ri<y0G6ifb7?uj&Gcxw9h3VKL)$YjZ~ura@1IbTs<L>z
zEX!H|pT5roh<k8W1l2tdPE2nU=M=ap%BKdOi1D!r9}9e{a8rzJ5;ms;r(EUq0CERF
zI~-s4@ppc8Wjs<dPpI>R!=r9Iq{?M?j)66>B82-DLZ?QazTBjB7UQEffxb3CTb7Ki
zv@~A=lkV@2>w2~{lt1*9bRN*!b#L%z^(+uhK<AD`!$E~Jh&KbBB8XdbR~xWRnxE>_
zX$7n`9RzknGhzp9ML0F*bAg*8d}z*ZlJWjd`Ivu@n}-+S0niS|pK`qIiSKj5$jQn$
zG3UgcM^t#!g(t;%%;8aoYZ^eNfSJs~x#Lt>l#H`BHi_=>xlN2reC9E&)HIOB*c_L1
zPCIL_9G!qk7fj6-fOqbg0jqtT`CM{N0Cwj3bZO@S&D-~=al8A>&;*$q6pAdgw)PV?
za7^txqy~2J9KuH6bAb<C_)whp&G|@#k7tWW$1VPeTl{CKhZpMs&<@A%FDuta8y+d}
zjKEVaJn8U|wh|KO2sm<BDfCTS^2Wf*#J*bRZ{INtn}o{*Xgc5SO+DM|XM!s>^(U7=
zw+FE41*B*|g`Fug=f|BdJ*U#o;y&>xfX(9DOaNzowtZmpPqAQV3$QW}U4mGYpz70O
zgfrb(XSS0hAnRl~i63of>}`v1D$c1zbKz5Q-go$QhF@)t`1sH@JpkI_SRQ}r9mkv;
z^<1inO9t1q^0*663q0lUc<W5A+Ieh1Z67WyfGPNj116!9xiq#m0hmo7=Vt*;<8t5O
zRGWY)zDJYen;l~bSb~D8#iR5q0Bz5>d}eGO(wA9dic3J-Uq1_Ij`*U}X=l5hGl0z?
zw=YEn5SNA3WDjQQXKg7-nc;fZI;OvI__a9iS>iVepQOqcn}IJl<re>!jE5KX0ni>;
zHn!gJL~))`;aP_#BudH4I43x37mgIV1{P*c0g5^mnH~2P$7Cuc7apz!07esFVrPw!
zsVquRS#&pN?aac^(aK4k0E}Q}+6)ysf!kby+8IVR1KV6m#sjRCm}Y7X#DcLcOVQdi
zf1ee;1;8OHsGaq~%`ELqlVA@}=h>RJGBvf^l1XE3LT+H_7DnF<!WQ9{!0#MB68ONJ
zUuNM~+Z7)iSla>69wZREbiCn8NnA0wuEx_YJdN`#!eatg8)K*qy!K$VC>5KizrVeK
zn=MOBFj<1$0{qTsX$xkS;`&)Y)24|{V3m*=(2|8OY%1+iV{lW2IW-L?fLb!JcHIm^
z)U4nWs7ce>>I7iczGM9|pt*70+`DIK3y^C1Sz-b(S{HPAf4gr6!l`uKe@)V9oJ*(<
zH*r2h_@y}Snev{(C%N+Z=@FmvBl+U+qCWuIeR#O=_dMJ=-w}Axjb|l9{%bhL?wp{k
zn$5zDnTeHFN=_`R$`ZhQfBS6#Y+`4A?*2Ux`pnoSKoguCUCzeHBu%Acu7aW}h_}lC
zF;fLWk|4}(kn`P46E`))JUN1yyNh9F@iUlV7-l5}pt(D>0iXerrt871e6N?C0krn9
z0I*5;zdgXU+g0}W`}xNQbIU;1n50k>MvR>Zx0>GenL8he@=J%GkHWw4zwz6{Ea?Hz
z?guue+~mr7#g%G2?1?ADc}|=cTzI-^W4VD>C1x7WjQz+|PI}YFl+wIprD<igF}HaX
zXbEUCf#Lpfdlm<lWYHvO%q#(Dbrg~!E=Y>gT2*WYG!m+cx}xefv7$X=TQ(4u49$ay
z#qX+am1;B~GfXO0T^%FJ&<fS3-(UhdWKk$foq)+2plK^FZT6%koaE;i+dS$O78iBd
z->%c`j(EWK5&(6fx#d>QW{bb!O>y3H;TJCat5iNn%5S$jKIbZ*^CPjt$#DR*dkxGo
zBade1MKQkX&a)z12d)CgE*xtNcY6c0QJhh3$Hau%MtdBYL9Z-;YU*%WbI99t-Gqu!
zlg>=dS_M~UKuZKa>TtYzN{yEQsR38YQ<+&+6N-weqMAr92wGJ=Zu3@-Vh!A;5>s1O
zb1pO8%#w*=2Gxq!nW5EWNc>!8SRI*wEFjyHP+LiBNS(l|0ouf%rqZ$+2|Z)c$W3Eg
z&aS2j_?Wt&P7cP|%FJ`j&7I^iZP88RW2Tg5-aQ3wy7P$$zjWniMff=#AMqn8hm+(0
zXcxb%{5!6!;c68gRpV(>zKipM!;=~YSWFlRfLfM-6Cjz;Kx_e6!lLwaD!vCak^QiC
z1ILN66^tsnC^KbdYA!ajK2O>JM~f$s7?KLw(EzQ8B3czC5qv5mE;Xe@a*?EtqNq+L
z*Ck8y1(-<#?CNHM)j|<ZwKW9xk1wfWcoj@W_hPshUMhh<1&T#U+<vnqYdWKi0qPCZ
z8kprXz-MIl1)#-1ep-Oo40yV~EiL}7JeRNmqIsIqFyU0-eS}}A@iSB2OU_4IxXC~8
z`Jo&=0NTYYFB>CM<GTjWi|{DUHFu6wIl_@v?u|Od<V?UeF)MFuj0RMDe_5G8YzDWM
zJYhmjq2)Njh~iD#sc8E?i{y%lkx6dMO!1uXd9ENsPDN)hbJSDS)Xk-rAV^A8O(d(3
zJxzdC8=y&;U6+6+Sao-i2HJ)hTD?#Nuhmnff>aE_%qUXbYQ?bZrD9@uDS%}M7-=wV
za|s&YRTrh^Qcv46wXQwBLy_uqIssZ^W6mu8=LT4LQMM+ff!@UQWM+QZ_N*;Bq{c>s
z4H6og!oS#A#&#$}4}f+7j(7a{_>^m-^Oz}5E4+m8qB~D57}>53OwTMy_GM+6OUf3J
zBTz^)V3i5bmO$3nTOl<T7JyhAPpRTFQ>z$Nq?Mbg{o6WgXHG{O_yju0il9YON5avR
zih4qOm3+LGqbo@sKI-hcCOH8U14P2aDxot)(*T*wu9)D0hju2Ihc0ODI`uE9=BJy{
zKe<))w_l8YI#wU6<-!nOQ;M4uY&2Y~^KnMBb{OL0Ien|n+E;K(Yo%h?F;XkI1H6<(
zZA1Hh4%nuT3EXPCT^8WBU~>ND&S_R}UP9qigkR(Q+>D<o{HhZ^JU!+!-jUP8Np%3U
zyL0@nez`YZAoHrhi{d;1JbZ?c1@H_Si4PTNU~^U*E9Y2Onb@1O@^pG!3V<5t$$$yK
z7N5^$X7v98z-$3z(n?Ngr!>&5#@UjAA~~a3NY<4^MN%i}a;AUcNFRCTlD_iziZ@Pr
zc}ksJoYFu|Jf@<i$*A+MuPJND1>7CiP{T4{o9e&*V9WpetBw8my<7J27Xv#hfm=eZ
zWuU54M{}p*10dEr)9CoHA5L$8qFC#OY6F@0jrZlJElNt;>u2gDl&)GZv{ssCk1{g1
zaLarK^rpv6C8_K`x0ZC$Sm2(q!EasoK;h>Uemp3@;D49j9Zs%4?Z}6x;Ez1s_QW$>
zU1c7s&NH5QS)7-}c~0PR(~frLY{jYKv%0fqU$SRdGL@6sfXo?1_pHn!#kG*)u{J$c
z&z7DdQMw{j=>pWy)=3m>>;usH+D<XS=s_yZ3e-D|L8?JIM=eW|jQ5%ur3lHjs#q&e
z^`W(#Jh{?mj*>j)POebgG2esP9b<#q9j=jvkp=3`{i6?e_PbAORR+*ZrMi>x&azvf
zXvVa9(S(tD*C9$-y5P3MIw0N?(l<aGY5-bSN#fCw#SrO89&9b4P5e)LaIywuk|Ju!
z>I_%`XiD|~wGJgqbVIZ4fh`HtiTR1g8<7XtCWKDl63!zyPa-_*nX9?-Q2JZ{)voX<
zzvAX$Ui1KH-zb<Jy}*;B@{++T>OAMhV=i0~<+#ly6`*PW&j{3JxhN(S_nCPWWTB10
z*lrulDXB5Dq<eM-6iF?yHBrPD>};}pM4=P9S!#fm@io{Wn8vB=QW_UY;EI%l^w!G8
z6=-%e#JAdYWL12C`qAjOx^4N@r7mARN_Ns~y1G`@4!Qo3(spXdHyGQSqy6i9JAe0=
z8+-5LjeN1ISeL=Z?4l8KB%N33Fd5yXV$wC)9}vUVz_x31OC^9zI%MUjXOwmu6>%j=
zbSmR<w2U}g=x9RnN)`g_G)m1({H~p9M3Fak)*<b&kj)!=)A%}ZvPVNAiPIT~K~YGe
zoVfEm#>1+-VDN8w#gDre`03_tfByh#2SEFJkH7SeD?HRE9<T5s@CwE&COoP_Z^G!#
zPGknJxf?0UXtDsLy}&=r+L%%h#s-E1PBCqrP+fe@1cd2~&SoN%v1wy{!Ut&{wi@8o
zGRI7gu%R^Obd0YP;suc=@{0o5RaDHU6()<ApyF`TeOFHH1M%WJOFo>CAMNyeM=B37
zbsoL~*i@JX(b<@P_Q_yB{>3f(e}2BH|NU26`{2}cYfT74ixkVQUw-ArG{KY>a)hx3
z>4N9(juA#gGBRwMuGS$G#8+YM=<`_yhm%oMjO4k2TiWYqw$##$u9<90D>FN{{rwWb
z0of<k)_~284#6bY_~6o-43Qdq+2B!u$AK#quJteSv*B<2H+;^ghdI#$pnWZ1w!XqM
zW8(WRyn^$rIM-dm6gvTzPP&&+nno6k%oykN)aEy1S_&eJ4Gc?Ch7@A|c%}*9jg`qB
z*n}qTPk;utiq4@8O&ePmeB0sDH2@1<XVSOp6_;)v5fWEKy6|-k74L*ag4oQc#DHD(
z;l05>EvNPqfzFPw$NTjCb>iVaM3kK#vo${ZXtaO&ms|E<e|l;^et+;!ZWSM-0qB{c
zRa<dAfmxgS6l;K{7{?&HW~DWtM|?!2!^tta;DQ_#WSf!E(bc4}CDh|@qh3i;Nv;d#
z=8c`j(w8g^=$bVnSEEPUb*J-S-&xpeZVlMVg0Tho8E#V`WdPtK65r!VgcnlcpYy}~
zkKJGTFAt!00JJ~txZ!I~xz@o`ro5Ekb%z%mu4&|NRf}yylL5BO8kth8F)+~?p!Pr(
zW#kYXf>Dgo2pflZdwiN31*Q4OiZoO0n5ca#A*YgZVqr*t*iIH;767roUip)JPgxLg
z(W1z$;^qCVeJswqffVG&R{H8ul4~iN17BilDsyhOZ_RIhG}=#oero^q7h8Mx*E{=g
zQ+#wovWSYhcs<j>yz|dogGp}7mmeb??&E&Ll=QHZU~WEQLrd8pH}(eFCv-@`+B`JO
zsl%D(&s*tfN{5j}7+vYC0h)#fFneQaD4hgjs|Hz>UJUbn*Sos2Yiz9-;bDVo0*@rP
z=FUlXm22bQ`mZ_Wv%>)V0nq*^FzW}NM|stR*MMhm9&tF<h^m=1uTl0HWD}5$7)7)J
zmNn37;AO3(Oo_p!(o<SD)As-<lh_}|gDROSH9D6oupzfDCD<9@I?u%R497XA#B2+`
z?!axat;ulAot3z#M_YsJXqlIxBtcB^P4V3a*e9m^!~`{=Jkh7`9VM>I?`3BG*#|p&
z_g^>mk3T!LfBwzRKH3!Dp?KE#9i(FJIF=p5CArIh56<~@D*Rrc3-;z`#;|(uF)St=
zwZ$-vy$R^(=&B%|QE}80#Y<>zZX{vW!!l7qW*0h%se)dGTx(-&v9EMm^Vf;SrG=?E
zb~;3<TG_At6N`3jw%85v3UJ*MFZ9m44E%Vw;s0^~wF97iwN`eO>)nQD5MD!gO^g>s
zxB}qLV9xGLcd=P8OarK7zgKc-pf{ilHi27WklGkrrpS`XE!mj0lCo)IgR}%%*$<UZ
zdeNEU><?vP>8mX}W5H5~i-cR>1ryv9G$~RXIW3gm?CfI&QA0GCnl72z1ZD!hF~9lo
z&VKeUTl;T6-`GFDzw?i`BcltF6};e8+`J`+Xu?JDam4;z9;4-Rk)jM;GB;>hZ#izC
znOk_)YA+<us8o_y3V8;!v5iM{Kz5;6Aqx~&vQ-L7*NnV<7*1OBd6c0QC2O6(-WK~y
zCq3>ma2exal*<^GyA7Adzx7{nlTQw1=<;QKI3`w>S3Td!@Mos{PY6H2d0LdqL0lLG
zMh!Mq6b1>MZ0GU$PLv(6Lt;&u2wO{RUD&3`(b|c!rQIjdNZ3ioPLx4~K@x)|ioz&4
z{=HEt>x9)rl~pjZSwre0MtlBX4o3V6Wj;>i+{Uw|Kv5)F6*?p#f+32CDC(H1peiDg
zl8U*;?kADr)QvF?&PHL#psOU8vdFQ>K1yh7{@HJK_U^x&+CTnuQ-1v6mX9{oH^k3u
z$*5?KhKhN0!)n#4mFgCqP7^mVe6VaX#{8)WK9`$+NHN`>ACX{t^K+Nt4MG4}fpqca
zu@-!AEVm(k0h7Eh6`Q-Qik%rnv(_ZCrj42_rqRT)*<#bapT`@9x3b)jGyWHm=!W)f
z?cgIWT<>6&kJ;7#<(=R0fB)z(X>ed@gs<!+uJv1<a`+y~8v@U}&#Y_|XIQ3INch4=
zYxgz5f54*5oXX8sUJe3-rN+c)mzjY|m9A-JiCT=>3w01|l|v(=X=Fp!tQN9gR`T!F
z#QxBu2$tdm4N$?Wh}SG4BJRaSHr0m@xAh|p_1#s-PpnfuQm!g+YJC3jXg~e8t^K#3
zZSBV&Y~{mEjRrtgcX!-yv+AaCvd2cMdIz@kby>o{g1LzxLj+vPP_Wh=wE=1mItVE%
zRVu|hG9!gVqC```6U87)r8pFerohzT$!_#BFvb|0snSWsy-lc!Q#|}}J+a~bM1-rZ
zT*g`Vx41O?y}#Gi@IBB&@99AYv!fSy65(~=e+J&ddDev!jq#NtlUOf|3S+Zj3_dY3
zWrwpv*^020#MXqZIvZdkiA`f<8xeMr*{R0YsxYYTnOJK6F%xPh)Or*nOVaNboJjg3
znb;q|(8SwYn<Kfa5yw+Odl3^vMO0C(ZUTt9h@w>U{kDOitK-h<Fq)jA>{ddzQoU52
z-G`<A_!qbAzx?FX-u+<fA8xB}1Wd%I*r2MKt2o8*TEWz^nPSzwieh8I)iFtUtvQ~H
z21w<rwuAm5$8DG!7H5fsr_W`DcLlG4XJV*-N&yycGpgD~&2+)o;(Hb`szSB)n92AI
z^Yn&0Gg~uZ`3%QjPNOvKFs>k6N4ctou7sgH@y;#&=|>Oju=|6{&~EsZ)rKc6tQfB&
zye4oR5O;QGv@&m^J|X%`j4>@4*$x<5XLAsr8QCy1vVE6xlz1_hvEO$qSDa;JyN-S0
zS84vL?we<0w>zX@MX}Unky=a?s~x5_RZA7E;TA0}vT@!0rr5{n6c<NNot--J{?>l{
zi;cbe(O@5L+OSfNPN-X=Xi3%Zs)mWhiC!#9w7XJEO$~(@a&;f)OkUX?0V6&$Hqaru
zqc$dL7nTph=A64p^q&}8ks7uhoT6c<?%msJ!Ipt%LZ{7^<L&KBqDwjgNrX!XCk|I|
zj;(OKdV%BJ4S$~>$>$H^Y5ic%a{iTH>v~=TUKin&wvgm%OT#EQgUTL&CchZg%E_=?
zOkg#bGbCxCmRgw^mjQ$wMVcRNDfA=QnA^<d)UBMfpssZ>>lF6<H3L~|3aoS6dpSn(
ztY>7^p(eZ3i6n#6Wz<Acg5;E>N={jlRkDg?BO-)GM^p2)9Vh9pWxf7zCyxPqHu%S%
z6#HajzO5}rC_8RY)l;c>Ri~JHsZLeTr4%eBFJr+J>NvV-T9w_1Npy4PvU}FhzA3<;
z{syV7%p2Re6ZVg2AUN8UHY?f&<Gl^ByV5bXSx}+#N{`TMr3d=ztW@H2kIra(9{#p&
z_O~@(n|YfJ4LgbZ6e{WbGw}b71Ml*m<g)`qdjPta8D0k7M0m~MDK%CWj{L1m8<K*F
zO<LK|w6c-5oOW7L+q#>BMd>++HXzex$52KwDjlT=<x7mL1|t(Wv#4ab!Tj#9GQ&r6
z%PWzwga@s3NXDgBF~miYYROTO8^t>$HLZu!!H3;wAKV=H2w+>ORonn_q}A4%FfFN8
zJjyV<Rtc@H7^YEXnkY8ze81)WE;6?Ew=rLAy^`=HLd8eH&oj2{n2eZrk&M#bwqhKv
znXoac2}LdRHE)}}WFIMIs!?Kl=!=d~JT_Ua)wyPHEW!!SQSRu<-}+A;v@Ym_188r1
zT3_KA6W%o82f*`f-(_!mo5kb<i;<-;xeg+Yl|^%4*K8QOcHjO|n@ywn%49OghUKF6
zjgg69T5vhSW=1A$>92l6jO-34=wxJCci;(Rgq`BOw+>?T<6L@otztqankZ_;O&u-K
zvP+uWUCeT|=GFI|m`zJgia@e(ka@zjq?+8Vy4wV10#z*+sbM&k*3lH&2-nyQ!=?Rf
zy6A3xTcE!zMWZ<(KIvO+CO|i+v`K`%L>#6kDoPTgx{wKb&PdGWj$!L%G+k`<GKvTA
z^%DDHDoRzM!!eZ9{B46pl1FdwqzG$-YrS(_ukerCxBcH9lzGqx1JG{xrGDTUtNZ}v
z&&7D&Lw|5{c9R#Zb(<!wELfQYkO5nnfGn=>Br%}u#2WCmrUA+*i8=~p1!c%zW@NkW
z93$)QE+adC4C2<0!YD3XCyWL0?6`<{1@Dj)KtytJbJX2cJ-K^P6v+`DDf0_WJ%S}Y
zo4Hp3Q^%^f3DjD#+Uyy{Bl}D;K8(0lY-kMcLL5uRHg!fDW7~CY+v$?AWvqAVuE#pZ
zs8o!O0PiY_d21SY_!KJ|z~<J{jGNuVz%*JI*##uDw_?yEWOp7D=NRSKAonk^8gBTn
z9)t~4`2hg4E8QtCdE(CzUdMULg(DTjd`^xX37=WaQck5K4Y-1#ZOs`{V%Nr&b`q>@
zCrTkRNNdN7P{b&*!lX7v)`r9H8YBBd%FK#;1sO2U>##7$&Ly-eqeKdaBd%k{5}qht
z#S@Mt7xn7qn!-nG;O7h$;hzg@M#ZOP$X3a<who|7V5XRkn5dh`${8CwtHI7L60m(G
zV{0?{l5pJxOLJ|VP$-mWK0zd@;E~u;3sqaZx-$n8)HZ3*t79HR@-7y$wkq@%(L~=x
zIKsKso$_DC8~)S#y;+d&V<1xo9_j{OLU{}0Emxk>(0GRCFRRVfA9jp|ZwzatWC~k`
zDO;SuU`JvQW7kHS2FW4%PbnBOjVcK?G;`*euH^+}WVbtZKtEzb=k%js9gGD!cWRcl
zB-n8icR|EmT~HrHa${zGuJKeI7u>|K8mSX55;5DNm<(>C?7?g>cLCpB^!C;7V{B7b
zG`f^7tM;m^b1F*pj8VuQo4krAYMU~cv^5i<dfhM3@#ut_f_sZ6Y4f24=mbtocu|Zs
zO6mr>@$dbo^n7~1Mt<k}7R*k0EGJ%b=P$&0)rCjZNpnK1%n23)+Jyi3d^>ApFj#EK
z9>m#_+U;@wAgOgi6GbvbDwRwfGj(;ob1BV*-hIoO&mXC!tq8U#0Y)Z<lJLRYeH80D
zC<S+S&!c$Fox7n~5fj8~Q5P4J7NWE~Qd?hVxJWj2V)2P$YM8iNX+E=Y#Kb(Z(1zyo
zD)SIN-@118r!Y3a$6#s8u__UC=&(*ODVX;pd`=avUK`wLvkg^>wM|~y7@dc`qr_f@
zXrQ#|11Hje#isNQ;Yo3_8<(?iR8D!98~)+_2x|8qp#9KSM}^16#P@(V1%4nB!_o$u
zIeWi#F-_TFjFJMtaJJ2ku`zF@<@p9cVwBL#%GAAV`3p8}Qrb<Lhcy4#MFg|km7VQp
zoCel+>V||r0Cg!lyz4{(uhq>3%`R$01d&?~aI;a|<ZQVq?&{qPVq&-&UfgZkmOghh
zb2I}6!O*>SwunQz_>65oc`z+)a1mtZfWRoYuUbk<!E%Q&Vk8W3ukjl4G<(siIi~SO
z>>iB)1k56F#MEH!f=<aEaD?zAVF{6(=<}9$w?FjX@PEqg0B9GNnf0qvzEekDSLH2t
zzAG>V4~{a89>s9*V9tm)ai1Biw&v`Tun}(>*#u<DKx*Gdnr0R}WLoGOOk&T<Y_?x?
z7aPcy$F|_>+{S;#wK#Etggs#=qr0<1Tt#}rs=6=+pmiCwB7$~bDiXbI22IHu1B>pZ
zwrHTSdJNq=Ccbi}4(qwD=H#8b@W(lGZXjCI*D~H_G#y7>aGkoL@s-h5nEqpCZB>L)
z9ao`xJa<(R=0-KeTY`tvCV>n_jS}=a&Kn|}m~gUM^WS$j{9pNz3<p5FXvaH#yt>8H
zo_GW2EjL~k;R-@Eo0-|PkYu!Q^zTTmYuT8XIa{3Vtd%jBnnUxH&05*GqO6+e->AMV
z{bct7BfA}#ooNzu&B~Djj8^JlNQqraGB$&$x4iC{iE{BfOj}B<+Vc`x5VCV`uf!1g
z$I#SvZL#nSW{c<WcDZNwguZreR&@5SNgKBU9aea^YqwRZr!Zi<H<ku&6(dZ^rqY;N
z#3~sTw*W^RIs|C}lA|g|;#_y56D4~>SEsOh$KShOwoTn1fOf;z{e~A@`41RxIXvGM
zmQ)M9E3(TXRd#6OOEHHDTOmF-*d}LdX`z!z1GFeh&uC>53rWsvWx>k2dke^xC*1@Z
zM+;^(q0_+HJ>x5zPRLygm~{atv7SZT<qm-6PMmO4Iz|9jV`MwWWo+N9{am8K(l&Px
z;qSHQcpj&^4O<h(C3ZfX(bh=wf@$|i>8NVdDpU=ftvYQnjyF(~V8N~p0G*^lFV1B*
zUTV2+UB96pZurmchkUhsAAs4Ve#5f}Zvt<+@Vvl@!6?SIm4ag%G9S&@Ni5^t5}$7o
zwgy{~0JX`oA;Qq?7=v_-CG@ev>dso(Tw>mfC)~MX1FUbS3zg{Dc@CBau#yH~jj_oB
zlg`$iVNQ@puwW;Rp*2f}ocp(yKg)e{EcLZ%M)P*s+7LjLyI@}4VxF4DX6Etc*>p8)
zx*8}h1{Tv6NPr;X;Kt~&zu=O?3oS%g`wceS@L%5RUbTB0(Ei3xx-H*z;Z2-35T0$V
z>N*dON5=m+jVMin<OFbSP1zD7Pg|H1G=`>;4Pq2YjA9}DOa2P2>|O`5b3gyKq0?Gp
zFSt)bH0vluJqP6N&PQY$cLuZou(QlfFgoUTYb)1%Yi+&EeeecxTeg<Yq~)H~)>fz&
zTuY>Hc*Q-soV8^MM^2nmTNl)nIo8`HDilXBHQZz7Gvla5PTh&a^V4?tZc9J@jsKMY
zLv9@a?QSr$k>|be7Q!1Yd`E?KD<`+pia3dR%dxSsi24ckwKZXbuoYuR3WnD18%5bQ
zAgcmp5K0U6v-?3S`(sZ&*#l4fj=Q-Ay*+N76Yl5d=uYzU6dArEY|E2zc7Mr|0p6Ev
z?RMH)hN0s9B=I+$jOb>%q+oec!L^l|-ZnbZSevz&VUL>|m#zkD6^;#_6XMm}_tX~e
z{lx*$zD;I!%1bW1iSVYwvkFJ%`?)x2ng1rumJv)WG&5;N*=QDQNi8{6*`4WP+QKB;
zhE-;_f4A_J-LF8l0O`#gZa+FYR};1}QO*nZ<qk}+ef?&0j>k>cJMRBup{-384;f=b
z&Nod{Yr7Vx?Ts`R^VK#&71j=?x?`rTV;Wl|B4aJ)rAz^Dz}8~EMd8TcJ0ge|=tlDR
zH~y1*k*VE#fcB0b_osZvg*SjV+<8W|F*6p-Y?&AvNf_HH0^6J|7GaDMM%ta|JcK^B
z?MibObFjwBjv7Nd?<>2PkHznB288;VQHkf6aacJ@+vOSCe35GHdMquD&-FGeYSP2%
zIp(zsJ+12(C-#1e6#}-ct<xEABw?^!{Cu}%h4(0v`;u?%2z&#BK`;2S3pyKVm1*-;
z;8Z12gSAZ%w8b)!3XG`4NZL83wl?FLwztB2XE(g#|9Y==KkqF-`)fbyH@txI2F4o>
z&#G|Tz-$guoS9jG*%ps9Sv0h=L}+KN#N0L4e`sdY{>wXeG54cO_X9H<kqOk6fFMJ=
z?#K$VS5l3fpfGGWN<lr~OQ}fK{ieF*CMg7&fhP=~dk~H522c!}`g&4Y47XreFd3t(
zCraIEuo5Y)F>$-!>3(2pO>>kZ%*U3PyX=CtJp~Qg+#4Hf23u>197c>oxio;AZ5>ky
z8kv5ybLm+DM;ZGKI{dZ&oc}1B1E78Vn%R1F$}<lC0pm@CXH__wnHgu9S(~-oHRu19
z#>{3gOY^dl@Ru#XY*<m6MrQX-7qeUVx|X$_qpqa2p<d$s-h0#qp~UCoNFtG3NLgBd
zVJmvPMzA4@)Ebw~lDh{LTd+3UGl?_T4cAE@60C{k({pbn^7bo*nmVeCGvK)l?emOp
zrzIwGHal$wzIy@eA`D>q`+T_znj?a#-!rvfbk_7ViK&0J=n!bkct*FOJ?9avz7G$O
zmJF=Qkvq>~6a-&ohFx?&w+BG`x{e?EYIVx9t(*Cl!HdeBnVDE*{LjoRx|kc;gW1q-
z3uYGL|G3o4)?nLx@S@Ez*!MUqJHu!U?Tu_BUCCrmWH)k-wQLzBQJ5Ati3n0_11E2w
zwKvd;?@P_IThFJH?)>LV%`BXtKK<X@4u!T$0gdRKxW6<e=K*kIrbvl5vu>oQFb+!L
zZU#brU2H93Q~b9Cz_G6QHuf9rbv2zwsDh~_Fj|~>ByxDOb@*)S&^s`-usyw~@pmYz
zQ`r5`|LtBFle+kT_O_>^BOa~7_YvN5<N4N^DR*RM6PPtiMk_Dlw#1g^F_RpZ#oC~H
z*gYa0<EUvhvRLGMFM!!?n3!i|W?_wyd3>IW2ax4Lb|*V@wQUEVhR$0#xL;JfTu35k
zK0m9E{jp%{3-!&<{#(=4oc2FYV_{XjS!)VoQHm8xiXEw?&5TwNY#Uaadj7e&(9CVg
z*4l2;-4R05)sV1bV34KlbuW#LrC45XjfrXN04$O@xC2uY6^`9`UX<cSIl97j^S1x`
zq6bA@Y(Tr=%E%*Q;Z>Zs1YQ=nWJG4!`EKUzz)WB>gPF$WC318A3!|jg6}?@yf7|(Z
zPqDJ5i7ijm734b77w9a}XQ!jmk;o#b2vQZDBxVQAp_56d$ap>{^cTC$b7Bjf?2kF@
z&R~*n(_nBzQe%uISYmSM&@h;iT2xbw6xdN1wK8;-F(rnbQ<lw;3txsVwYABZ+;lYv
zP0dT&)mq#0uQBkBHpbQh0sMBLc8;mF1Y8s@yYsRrWvqO`%M9G`k1ldb$HfM;9anSZ
z6%ua=d{>;yC{>It(-M<KH*?m^&NDL&9jy(Qhxnf;g*ig#_Wm-t;6QdeHm0$dW2Gcl
zk|pvOIa{kFbXw`E(xc?mdXJ@^*}M+mg%+fJr$fKS-{bcHV7Xm^s<&Zw?YsB_1Z$+K
z6tzebuFhzMT}rWONsPLS4fQekv1Dx*6y)Z82Iu{1AY*j+C8sFdJ%hyCw0HswubQ4=
zYE3q1H;L1_pDp5BoXhTf7x*GqhO%J<etQ74Kc1ak>2|zC;xBN1Ai_iQY^JtkSf7W?
zw{6ILubC~G8SVDOpvI1_<)P(yXX2ij$vxyRTXZNVFzYLQP4uI%&V^p2<)#YB+I#oR
zz-->ld6sqA!q|Gzj|ID%LnYg7NlAsq;DnV#pk$Ruh#kkokcDlk3`5N8UhLfc+xgYJ
z8FHu3+h`hXCf3rF5{!ESi2#8;Q)~8(*8QaEW_Tnz4{i4IAz}|l?N)5Y8(uDI^6kY0
zw0HctyTywn{tV}P0*~Tg&Z$I1b`{z<lQE!kj@g}<*_50yOkg$&MIzPxEHk^v{<3q7
z%pLVg?m@jH8+4<x%Ft0+S6I1_a|%vVY?knE&%l&>?^pou%;wHBxaN|Z^}v=2tCgK5
zx=|UEu+zjSBW0)5rPg*4b+*~B*1{uardFt<;2q#yFtjsFEhAPIOfB}%A`(^`)6m+Y
z55v}ss=~22k2rh};Z}FbIKJcmd=Wir7Z1?h_Ov?XSxfu{#-F+HSR25d^7=<1wwK?*
zXLd(sHqB%X%bCmx%<cu}|56_tkyS^o&Z;;^$yj6bn#i?nD)5BnSWO~w)+%xDFtD$Y
z!A<NfD_WFHMXS?mbg>J{P?T*~*(71N%ZrKAi&TQ%VY0w|&)UWUeQoob^$b(P6D}U}
zqOM4@bjWPJjWH>Se09WNP@!|@F){v(g!MbN!`uFoi`FE#Sb%oJ^LoouCj0>B2h$D!
z^L?IKivSwu?0=fytoh7@v)#-&Eu)Pz4SB!hcfrgqX5`Nu7}?6mmdT^Da%ZK^QFT@h
zU3TP-OiX$3j`Ivo&oMV6B}GciJdOf=HL^jUg`FC87ZOLEyloeTvF$sca}?21QyVh$
zk<Nkm8K#D}g(~i-Don<Y#@G}=#Sm9ioSntemLpT15@(0;+4?(dwm1AeekA1pXtz5~
zdBl`I!})XI$!Q0`#LS2dO@mFD|BEJooHNaevYWP>ONx%>5a!D-F|!NX$-EsSE38N5
zI2kKZdW6mi3r5x`8?v_Y@<C!^e<E``_nbu_B6Ok@jA2xEopYKxw!3lB9la=w?OX@+
zJX0G8P?Oj!7Q0s+Cq;dpCI_3gpmUF|w>6*>YZhq-i+!Ql;YpM~H(}(I9q_>c(9WwI
zf5p`dFPrm*zzZ%MIqanQ%m`o6V0&gZU@=gBZUP|glf@{LP=?5hx;-<yU^>}t8JW<H
zPM<Psb&kwgxdn)oW|lm|K=goFe+Y9s|D3hwv}-=Ml?uHGd35?L3_3F2ma$y`fSWp?
zw_|FZw|Uz!m>MH02{l4XGe<SFxJ2k@$$Tz7CB8j7i;eC_#BSTu48JXZ<y-y}H={{<
z05teJu5`|8z?%rqiEz37Q6^?qn%8X4%$h!CutC_E%w^_Qmdq?Mj^}-57oC~4lVk<C
z2*+b#otz`7bTyHwZ4628vnZX5q{S#wjEo^Q(MjbP7)NE3Gu!N(?qHO1@%Dq>j;W2M
z&AT_I*5+|(69o`kq9o)qKoAK%O*G(tnhZgN9^o?1^9Y}HJ>&Ry{15(tn+HI<;r(jE
z69%uNe9xVSJSP0g#LmPiCW}qxwn)v;U}+LM+D?3)02qId&+K9`vn4AtQlCk+(vQkI
zImb9_Q`YWi1}U;&WCu3(wKKQn^Xf**@y60i1SNKA^dsbKY*S{~S+oCK5Vm$Frgp}s
zrjbh%`&65u+R(<-a6=oYX<LUE^Sy+fgII3-kSO27*sPpScQ<@<w->JDy9{ResPMQ6
zuZZ)iIZrC|=InHu(e&7x32mXt#LN~+vs2cYIJ;?_NfP6id}bG%nYofWSdE3FBpeH@
ztI-o0nI0I~U1w|xtZFP7SqW^%!fB^$MrC&)d~9FA)MlSrZD;=kYBC#ewG9yjQ%fyu
zAesYHKIAm>xoYR^s|X(+6;3xd{QbMxB)GePw&U^$F9WYjbToStYGYy}(a|hsF+|=v
zn>%C?n?22D(o!=LW05w_^ktvf#b9QO?q$mw(=O3jr7xMIWE@vGcB5-2(t(j(B*v!X
zVss9@LM|G!u$mYKW1KSE?shlywoI-0)JTxMfmIE&H3^YAZHYi7^s^+2S|w>Dsiel-
zFd?hcyYiGduh+^gDqjGfK6rq3!*f6Kv=@GW@|wU^6KWe_s=z4IM)OFW4IoptCVMcO
zMw(il+1R#8S6N+rW;P9tca?R4V^xmTSeepIUCRTaTxiDDnR22=k8)I;)9jp%%9ebW
z+1ghzwH+dnND}EO6`|suP^n;ws<-VKAd*lsL^ZUx);}LCc2HkMcn#yU&wM!C@Za4n
zmZo<L%+_D<G{*N3UUKK*7DcyP!~qp!(a~(1%Wc|Z-Y#X@nQ8l^SxL7y&0YwtOxnA*
zl6q&AolDiZBEnUJOXeJTWF}C+%Ipw292bbO#or~EPd4Ys;F1Vet8*ngmwIRAN|Mr2
zLGI@C$v$YoXnL}=-Leuht>YYWx;VGyb8R~RBH&|~we99KAd*`iMtBM1d+RTFnj3ys
z$kN?mXd~A>^9JxH@VJ7SQpDO5%wphtF$rM8E_quyH*If9jI_j!=?_Fl<pR%UPGD9F
z$0}SBVeL*g>14M}vN#+Uovmd+MaVL;D$1>H<g_T8yQ-}<^X+YCKVuF;NOOFUU?d4|
zo+d}CkTe24g=WBQW1!I_aKx0Nk$Cbr@TO<BjBJ75+~*9<g?Ie8D?D3;@4NGY3u|L8
zDP!e*d_;I-D><$01TdPOmKdZv%glyM9nN(#FT`x-^zJw!9jp>uDuv6MxngiBDeEMp
z>D|A@zZ^jA9$;(BzgZGeQq~5S#JN(H%Ly)Zuwq2+CR01Na?t=A1Z$Hsd#2X4b1MZK
zqn&#)McM~j8|U*hG6Z)9JC8T!7pn06uJA1H_%V0d&w5_~+B+Qer#vUZYZ6;#u4tI}
zifT~VIjAv~{Z5p3n^M!w_N(U3j5JL<GuL;T&Af~3ObYIf_OL36%i>&9;i@@DDcvXA
z>kr3#q(pXMt<Dv3u9d{)9#-z?UGc58*Z;YkKU>o#XC_cfa}@n#PTz^gxyQcz+=;f*
zvsFdYxvRlYue5Xfwf>ancxT${bw8Gzx444x3c_nR564h{i*uR$X0cau*3F<z2Y7qu
zkaJ*W^L8dfT5NWA0a7y-|F$W)cUGlxqRu6QBbP93PA>lg4BY$2q^q^Ds_c;`meolm
zp<O};xsAQ!TkL`^w@PiphG7CStSH@%y-h<%B-EW`6?G$P%o=1MNsJ|`Ml{ppPb)wY
zco^X|;CI~OQ{Y=m<@oj(+70i!#FHkx=EjR6T$+VNi8vr4JvQQiU?-{V&zywHDLo@M
zi-tr4U{xdTWiB=EHZ$wmcF+;=O6~@ZOXZpfSIszaCFg_r;{MmxKwZgZoQQC>RIYUc
z$6m?P>*H=RHQDC?#yOOzA{0?Z!p}KJa-nUsaN2LH&Ey`eZfxgpH1vc^ZoFvlY6nko
z!~6RS&~A8M?|4d_m&JKjgeydR$vFGXpv-fc`^zXV(_S~5(=)<nR;B4?yQMwjZZWfN
zu|F~)eWuTu6Ukf==ZeAcRAL^qvIj(4YbB_`u{c*Gb0ud^`b^Jca&51hZ(UPsrRT2c
zX_Bc@8>qFUnn_PP<2G2FqZZXv!6WWmA|7An(lhb$ddE}WR@d{}DLDro8insC=XKzE
zu=3WGoOS|CPgG0L0JawH|9FS+wsJ0n%YCkyeYvA~w?V=k?JIo|j<s^7CXO8X%)wXo
zAhWdstLlgrx{~-^U%53zn8LT4(O>6eVxK#o1sg29k#jmnY@13RgHlNxwFric$n!AR
zrnXc?y+wE%j2dt6k0880I$v;$Q{cmUpP~KGSH1CsI<GoB@3D4%@|&4>>ud%~n?f50
zn|1_D?+_YBTj?l879ow(M)PtPb+d)PthxTz1uiLEG36w|Do5tl>|Z(@50<u8z_KC<
zR;HY2<#K^bU1E(zv*6qAg3e8X63dKfO@bj)i%_JC^0Q6gM1?dZ-e|K`#W_3q(n{0h
z27{d|M-I;myxPMP{LokTHlW?`etpd2z>7G~Iy|J1TZDF*LK`in0_Mmc6Lv`!L+2Cy
zoqT4tPn?~>th@VOGwaFOIV#Q-QLdVDGMi)%-m(L**&GX%O*s+eYAIaK&XM(Zq1!#_
zY25<Urp&+?xDRVa-W%IR<J>f9q(l}3WXdjV+d|bz?pzaimdtn8$2|T`>uKNYlep!m
z7%!l_DsWu|F{t8S>S~Tt3T@jDFxcW9VJ<aO=w__;=@}E4waagxnZ;sPF`?@s$Nxl?
z%kCT{Ar=1vHYgpA2S!_KbD@%iu11%T3Un12Lxe9P*teS6F`YYOD?|n8G1)axt4NC*
zQbG?5vxkzg*7bzk0w9YEDsfKKHspTYoR`h`En99jE$-d}w3Tq(60hRC<Z#uayd2MT
zH5<yqe%yi<t1W(Z=zR8@85O<zlK^w%kCL)+T%AkmoOorG66tUTACBL5Bq3GfNI|QU
zvY<t|B~Yd}%5RCKeQA<Fj7mnNP}(b5sVGi%At59al7_~X(3q4Uk;D+6W<3LAu88w8
ziO*K>%N^fbZrV2kXg6Ge<GSS;6~1Hes6w8%HpM7xurt}SFcw{uxvSE(kth~^vwaib
z?o0wK^2<!<x`CsrTvE8?8V1TKA>+Wz4#ypt+T`~V)@|o6-GGn6M&sQ0)|lFvEm9ro
zB@&)ze;Oq3NQ?|Z_|ZJ@BMW5rSXymPRt?}2XK=?=I5y!Ch3{178E*K8!09)!u=tx|
zXvh7Q7u<Q-;W2f36q9D66>qxPly%m`MbkDM%VHWJ;#i8v8Nb;y#&K7fnF(FaoQQKt
zjgz*_Hx)nVWryRBWNOYz0m(=fv=nZsM<VVw&eYCtk#d}j3)IyJo)A}xjFHXZ9t=%{
zWJ=a3J2OHOV`zrk?6JmJ5nPSl;W2Su?zen8toa4-#k~P&BbO0g5qQPns%eOXBF)-2
zbv5Jmy{OoLZR)B>qDYFa=5hw@OdQa+%*>kR5X{Uul5qZCa_HUBgY*Az{4q=oB36d5
zL97f!9XiLxSo}MFn~Pbb!>72RUBm=Q>_?&G4yBT)3_x~c!08$*%MIu<K1D}HFp-5u
zp2WE-!Yc@$G4k;@0cc-;LG-q#uJV|{OYS@;aDr1b#+Rx<F`Z{MBghekxvM#qnxU`l
zH=KtId8RA#ZBGKs%&aG8;kYW7%{Z}GCwC|=568dja7WEqnQ>B;%UL*{x}V?54Cr(|
zEnNc{pXWWNu4mJ}o4&nElM^9|<59F#TTzWw4YE=MPTYCU;H9qe7;k&J*nsx7C!XWF
z!877Kv6u)b4Y+D!WoHsKZ0~28<~8RiAgSRsJJZ#?OS&1fnCvkU6*QRHYF=i0aQ+{T
zKb5KJY<3lgl@iRq8(F(HS^isk%`g3F%X4orMG(u2(!Q!%PWhavz@WAXf-+AKI8PWn
z!*g8!x<T#hEjeH0Qs=w~yoB%&5z|}61IW(UG^XxmV`|p?EFx{m$v&uY-_^WZ$+PFc
ztkN_yJ!oc!;~Uh}46j1%MkvY#n(=o0<~6nRNw;&?)2S2+9RsD=IHJt#pj}2amJO0Z
z_SjdDnvEkPJfz0U((&8!B0IjuuIJav(AIEOgqMI9+&H!-?xSrYK+hm|nPW&M*Rk(&
zmgaW??qc%na>lM@nbpL}#LVV0^T5mw$Jfl%+|h}t)x^o1skV4y|Hglwb4j-nA7w5*
z;}PSmgYRR%%JN)q=e{vb5E#cOFG%I3HC(-zCFfsySA|C{#+#m2<p}oL8QO-=bwA#O
zFs7*yupDukz$~|}W?s0N@5VI1i1e_kF`F5t*>soyI2_*)j{N`Zz3Gx<*Kw`+E#Lb@
zL=H7is44&i2m&0$K@=(7?zX;W{StbG`%lk6-RHS)(LcJ)+OAqHN|ZPO0!R#n!ceFw
zGb7H~?)_u$6A_t}S*R>9K@bQp3(Fd^V#?U-EMM-vynUupB1f=gg>yx0PcoC3e@Xp~
zNBq;8eqFR~2)QcWEr3O8%Z=90xYtgGm6lfh)3zeG9q>vK*Z6PIeYF7X7m>NjRda4j
zT(epTsPweC&^l|V-U<QUZcRVy+YZg4Pn5;9IsnX%S^}LhBh!?UIu_a3?>hDq^kJl7
z1T!%UEn5vY%xn{9%G6RKM|C;gF2NK)GfIM9Q_5L0wRNkZ(UoH{#rw9C05z6&^gL^o
zZTXtJttuUn!M2R63SQ(YSN~LQ9Df=O?LNDC%Bya?23(+STrR4ugM&mLUWZ)ACR!iU
zOf6k9>%S+4X%!#KqFYS^d}+Gb0=4eu9DUu&l$~vfa}GO6bVCrWads1%ICG|kkxMN?
zWp&Jko;?fpWM@24aCCE2n<AJFlqi^Y3@Y@9M6d`|{mhMQg)V|5k)!S@$WdXsYH78p
z_(F(p=iuYvKKsCDUkO0l+Tq;L^BVB22)3hI0Qsn$xmH`y5&c*QSepnK=vtcTb=rTq
zq2|ld$^aSeVq#OSmf$8}8o1}qeo7<?8q#Jia}!@qsP$h`mz3=EnU^B7<Klr8e(ww3
zOU4}kQa85yLMSq&8!%vqj)6t<P=hWYV{~oKbKKxISdhbTg5K*cf^8YEsPOS@${!ED
z5`gyik%q$6fR_nwnX%=;fwhVIBZYva_gNYT(AD;7j>G4PG6gsA`D(GlnGT+-3YIu@
zWy1B6_<1q@PEJn2ugv%lFYH5`b<@VzY!hEX1cB;?@{+k3nZGW^8zCO_@PBqw{;x9U
z1Dmi=-6ec>`r1GcwfZ?7a0ib>p)6Tijzl8pQXv=UOmtD3YV)!{;B}7MAvdhJ1-x9u
z75+Zn<A139`2g+jBk>{^0&YlL5p3f~wfAIrLOUB7S}?c{|Ghef-tmc=duFpTS&lcI
zVI=5dj%>!|lKEku_&*T;MUa)b=FWBs-U{Pm74}s-sMAtQ+r%dRlnH|~ltc-Tf(t|9
zwkLj2#LvU{e!!k5BzQFGc&s^hG$n>J1hh8m=?KlYAolSNya&%6LzLB7_B99FwVu<#
zSDtC6N>j{WJH(ZM8@$K`{yy%15m5VLfc68nx;<Vd_!iVA+SYgGqre}rd=dS)sFW2m
z8@D#~62l}>`s#D`<;`j~uq=t0!>c9nza#!v;5I^T%m&zr#HHl?$`bE-b<uU$0NN(b
zf(+F(Q{sF{ygp=pT#O%Kyb5f$+uwQOK_A?;Dfc_rJF^j~6J|a8piF9eiBzWt5(A4!
zwJ*V)Y_Nzrz}`jF>S(a0r3H!V#__E#bEp3Szvl~#M13(p>)BD_)ux^8_-Yzp)V~h1
zvzC5potdpUT`tz<HIKfTXA$P~>hU5bZ1HlR`I`_wqfR<V^^vc*@gqcsGmXM5Ie(18
zXBNx=mOyF0L!_|HD!NU4K?YRQ%j$(zFO=7Y%xgp9C!Y8r@CvQUi9ql|1b^ekI~II4
z!0*$XIUOo+HYSSoERJC5R1w^}sQqcc5Nqc;Mybh<;6T;bMlH=1Y|Ho-iM#ZC@Mi<G
z>A*!7FC$(IvE61id#EE4t~UP_t2Oc|wK=a^?X2^fwFK-_@WtAa;Kt6*EG#q7A>f5x
z{Fe~_TLiC&24*WLz2M^e80U((7=>Rd_>I9md}FD-i9Z3DRfvcXnZ%7D@ng^YB;dQi
zbzr)tt<^8$TOt0d2YYG3o~FE|$CQ#eGgsI#^%PaKn}P>8i4vuaL<Ng5x&*m6i#9Eg
zC9>Ckw4vDx^)3iw2Y8X-!|A}k&%eON_2;bDh4@9xO4ZG-2VAh)eplA!x5|3{JhC$%
zdso)Avo<fb7(wi;H#c=l|915~JA-&NjK2->L&WY0k9^+6cii}!A@R4-`HwJeAv!q=
z)vM4ZHt`(Csg8w*F^kO0L-L=N#NQS1lMpWfvlIU3PQVXb{9Q4=vnZU89ZaiC=gdHD
zJfn+7KKklWxUQ9tXT2XMgIH;6h1FblF((IH5L_>btNbEn&%1H``81$^_{ZtYxQX~)
zi0_$mxl!SRHdx-f*0wm+HSzn@?dSWd-#1ss!l2KIq3;+-gaRiB)lB_tm|10xF~Bx6
zzFji^iyQwH@v7>T<K*{C>>@5k=mL;J><RW%wL?>VA2wCcO`L|EMTlAHc-h6@dD4Gz
z<9mq9Pa_@eL$)PBhzBMfcJMfA_7i8~05fJTrIqXqbAw5&{>-=)$}v>?&lJrstu7`u
zi@G(6x@~=;Acb*Y!KYo}{_s=w`G5ZVsq?evOF6fh4dS+f7YVjqZTnIcGyM=d3kKPt
z;y}H%zB4BH!jI9;&M++K!!gTT?%^jx=H~>r6y(nZ(O?pAD-zonv*bPvw_jP$doCWg
zEmoUi!6u#s%nFWVT=2}RZvNw9_EXfv|7W|P%f*dI{G8z4qUV!Tcp$_5%UM&o($eZ4
zg4&nXw+zhbW5fVI!qTFi`Nrf-wTJcgAa1kGJ?bp@*#p{EX15Hy6!0Ro;!;=>1HJAH
z7+W`bM4wi}t932bnmy1|Yuee$P2<ecO$wAPrbWD5GJi|(H&ER{^z5wgq8r}>I~TBn
z@qbIa#XwQJs&4w#Ht|#>GKPTciR&ftGdKHNjGF{or@X5Rf}cd<UV-0-ai@bl{OpV&
z*Nq^TT3V@RUbPs|6Z8@E2^JB{UGam0;#4iI6+rriMcV`~TJXVE=I#CGaN&3kN*XH8
zxd>hWu7{XWH#zmx?M8lxovrtx*($%5Q;yZn&M^14#9(uVq3%MwJtTe*@B`q6g7h3e
z^>Z$6hj;;F3qRZEzlpC|4E3`T(6uq3OK@s18_)6OfbY5SL*V6MV9Vz9^L}Q4JQ9$j
zTAHu=P{%XxtMzs(me#r<8g`V1CD%jTEY7*-(a}y1X#dETJ69#H1za#Et5!9OM*6t2
z*{;54)$goVG<Ieby4rUp@YY9s<}S1<6io>Wt_+F44&!GbUew6UPXDL{_?Y0X;89CA
z384);+r%^EN7exCfeP;s`~m7j%Jb-2A#NAr?;`VaWv<C^%Vz{=>+ZJ0atDD=Qa#%;
zimaab*3Pvup=cP<K+YR>tQQBaxpS3&JUzId4$yuPd8_A=1=mBIw^hnIBJJp#wA9W#
z4ms4Ws+&$(G<No7X=gG#92+t>J@L~JKLpM_FMKNa*n)pc1HZDu#{f|_`q?I)5r+y1
zM>g;&!M`QvpB22{*v<3Aj%wBOr$yXy(P`E`-DmHg=Hq#muOukes+-<0VXYT+i5VjX
zSluRd&VuV(dt5%P3&&|0+V;?MJKz?<4&YuXr9)ev5DcVc`^Jz)7meygUXj}=<ILua
zvv1WHsj-W$@3`WbZ@ckVz{?7z;*{*Ha<4tXJ9+Sb%Z1-X;Q@6i#0Jnd@vNVtgdrJ^
zQ_mmsz^{|@I|Uy%_J7(7YzA(+_^v0u(@(iR6sB~<IInybTH1JaXRVi1sh#n<Qe`xA
z?bB!}WDO%mtf;Tm8<TT_oe;N&l}3L?fVRiBjN3A95zL$_{54kQUWNWA(fRO1z-X;q
z{m#bq^Jl4@WrhU(kl7*gos#%rh?faw&k3Qu1%EK-SLXI+h)-lJLMYP4i(?bd$k3WJ
zp@It@S>X>F_*VtL)AM)BcOhOZnIB1fw}^A8XOYIe=x0S3+F2g8G*zHFbnc(P1g+A}
zMvD4|DKo(>!7cjJrJbjub5q!H=O*HX5L>iL1=d8s+E`m!y4gGQ$=2+6tIK5}QIwjA
z-RP!qhDM3D&k#G91=oA=Q-{9+u8UJuHP^3%AF1%m1iz$kmms3DvrTN`d4Mgo1N})3
z{*B_ZlI&`TbLf;OqiSi_1V6+0L<8?>%BNP&sBfUGrW{)5sH-_~C@9NTjj=f3^ag!+
zYu)hWzLDJa^(w?R@B;9{v}gA;lLODrCjLH>8@nMc2VAh4mHT=>2^?W(v8rw;HKcBZ
zfG<TmYjij!XmF+_akJEEfbYO_v9kak6Z|0szh>Ya1qX-@ou$FiCcf5yW@JPs=;`^;
ziv7-<-vM`@C-np-1h2aIz8klPfh`|h{LWfS%eCUEHV(CZ_MKz(^upM`+P*d&?Lvsl
z4(Cp@8S2>q?KbBkxT@fy)l^NYZ5KtWip60Ik+k*#*7gJ}gipVOF((<Wff$^vLEQAj
zcM#tOF6;ShKKFpP&H1$z-Zk+^V%StQH}R)PKQW|CPw=4y|7O9j6{qjTYFWp57vFN@
z4LV-xJ9Z@e%h1xMBdGbBP4@_9>9D2P2y~-ee{0T{1ycnVBXO12IRC6I9M1-5|1G*{
z#}yOT5Zf(9T(3?Xnh+4jyK2zkT2%C&ukF}8vs80lhvoB>U7zr}S1+j>@O%lb;Gq?M
zlMDZ0@F~Nls=0|jA*eYyoGkH(;LTL{5Bc*I2-*ksnj3#L7~ji1=hEbCwY2dp&&Lf>
z6P#}4!~sXJ;mE|m@@CZs5wUG>ZCbd@FP<#}dNx42#C9=mhPVlAIk>MH<7#zNhi_?B
z09dZQYP<akN7>mK^_|&J`_2aEio}oI_z`gB)O~05+R!WbAiMu24ZIb>ePUD9+{B;u
zBMX=n_RYCt&VNe0BXN(@c1Z>VTtWO8@uOkFReItqwY0YXW84Gcc-yHvP6f4!XKD*m
z4&BmnVBNh+RSs+gyikmr+<&%e=d%Htvt{Cjg6qwbX++$yx;f5q79G*h#zKL>`$_x0
zeD>R$D(Qy7nU>6rV!Q#o0!*Ld(FfqJIsa*H?}qqHL5YNIs+yblQ>LAxbfJN{Id^Q}
zH!8ft^EBK-2fP^Yx{DWvDO)i?hxW~$p_X>&%-dQk?qRl84q?b)AH|u1>n3i{o#;4n
zdO({dwgaxkYShWCJ(1-g`r21-H(DRcSPYneFLGNie}?I%toEG^`^<)p>z;Xq;1z;P
ziqls%6+E!uHx~Tbf{&%<Be020oDHxg3<cZ+{zKvaq2QC}($a!+ZoK5;+k?2(@3F1n
z?E2Ey&b2QxF)6L9Vbs)Z4Ihrd4mE6{`mD_Yu19cvn*M|gErP9ZE(M%79b4V3sH)}2
z)2jC@R!$s?b>qhI>sj!2r<hYp6+&O}#CO8D%JccZ1;MAO@LLLRS@1Xpy6}xl?Iz9&
z(a6mJ@gO<xCFd>G)`j_V-s2Tdydn5bnsDASgZbH{o`<BQadKcaNwmt~R>i`xGvcTg
z?^ZWRosZyRJmbLr=O6HYh^fN`tD{a^)LnZqqN&GndFbkv)^cQ9qH|H9%!VTy(9b|W
zQ=!Ok6PMlizQgySv9r^Os!(S%-<R`_Id@#_H+Hs3H8*jlsiz8qoX6(&A;CKh)cWVR
zzsrKZ0)9|}OZ0^8pTUf0JI~`{@Yzt)&Lu;$Lz>z8<aX_pSj+k(0x*Lu6XzW+@DDNl
zVu1FGFm^c~a4D(_fQ`*_$J~lU@nC4pa?4KPvG)w&2bs~^_Ux*g<664lQo!rLtMF_&
z_>owc^MN^UTkw&bgJzSwY17!mmk|aa=d)CJQ^7mH!E@ZtG~neBueouN4%u0{!jyW(
z4|2=I)<JCqHm_JAtwx`oxK*sNsKtRx>~j9|deWW_Xb+f9;F^hR4G`Qb9jw{;x|MG0
z22N_tbhN1eqx5amiM-Zxmd*eW8r^lr2H5t@jRs~fDCkZ*v#H>|!S4uuXN7w${oXLM
zO?-J;T3{v~B<D?Ye^XIEho{ui3~|McmppN!4|dBo`K*fr>RR$FyiYA#vlTuh9mWnu
z>;5Y9#AqA~%q+M*fouE~)8_}YDKmGj23!HAKIXf2EJGW6NXi<u92bj@dGwjavXOSm
zRxxgr%!@9rEw|;I_VeW2lk=82e+bxX^`VV+wuvt%YD<uLaDa2yf<FpArdsiwHgbq7
zCGk?3aB~>gI<w-y5wbF#|D{jbSTM8`nAzBi*34poX^1O6aE<#<&$R4w2=B~-s|HsH
zrp@Q9i~^rGFQY?7j%(T(wdchriCE-@)@NAVv^wGMDY)Q?*BrhR;^J~<^E7>D;xWM;
zE4*jUN2+@fHpAze`15FKw$#%8AaVE9T3YQ(yM*zEj5jQEQHGyYabVpiZIOvdYEo4>
zM0m=&@naiS_py+;QstPMxNPDITVH^o&75h#rEo5Vn6Um}b}XX0kNTNY)YVSmWp#7C
z%6S%mw$EUhp$wc;;&l?QKV^&4Q-2%^J~Hv1f=^A%mv+XR*u<YhOLIbn`>F7sa{lm~
zTH20+*9EV;*J@{qvzZ)Nb~0$?N==8Ws|~jp#r^46GGa}LN$aw>H1jV2XyHu5xQMt&
zU0xch4>bPrB_kX2V52CSezxiq_AjHlnRe>c#>9mPzK!#$f}Q8k&K@dw+X`=+cn}4R
z?xLI6#Gge=a}>dS#G7*7RPf+A?rJOGm4H_yE&y0MgOqcuc6Rm5&stxaykSDah?aJ)
z+Be2lupktzLRwGm1aUEpi}Bom_KPqNws3YsY+Lo*_owP-D^uQayva#~N~?IBad)y8
zY;dN1;*!@jdsleA4NMO#c-x#mIP4L1#%^=8Ht}cE(nONjw}Cs!c{kuwPCw(BfJ-56
z492Cwn0Yy47mil#R3S)&y2{uNVZ~E)wAN^wLTuygda%VW!cGrpVis`DV8?<Ep{3tZ
z)N1Egay?`XVuv)e7)PDXa&hqJNIL}6VqA{I3y7<5%3?s3GTnktt@l6Tysv@1P2brj
zzA9Rpi3bWkvfxAD0ebdx)h1-Ji>scvHHd3{Vs@5}w#)RhjY3g~Lm07UF~->XRULd*
zts6oXbXFHDpF<}X2J9qu#v^u{C(*c8{z-R@^_(|w*%IV@>^mc$ZO<9B>Zaj?*mmQE
zlDQQ;mv-jBL*Qd!pUQbG+t>qb;wz)1i2)ZpwBQ4Sk9fX{=Q&TjXyT<3?8<QMpK%vL
zS+#I1CkNDQy5mUZ7soO-LQDcK@QB@$SlUUfV=^@^nYh%do8dG|kM#%Fs?#^Em0;B-
z?fbEzc71m9tR@2nBEzmSFS&RLaqiUB&0uc9`zpMv;Gt4Wo;R_HuL4sG3_}(?wBQdo
ze^l`Jbaw&)=L5d&!K=wRuYKIM&Y;>^4s|uSX#HqTSz9db$=0Tfv{opn8hyo{s@YFX
zT$&n}U`e!|4bVJs5x9VuEF0X^?6P@^j@A%X;FC7LxxT;eOfFnQ9jkKK4(B#-n`hrV
zy&n6(yC&WX*o#7njXlsNzDinJAvx?>@V*7_!YKi*#<uE3|0OqeY>RSMwnFRsb{DFc
zpp#kH;oBPCv|;uMaG_z-DFE#elL#(^INz+LM|<sR7o?UCk2;zi8Y->cMjft1Ov_sT
z*;)CX3D=bH%x;Jmffp5QKSy=*k%D)l@UGwyLL0xcO?;)2PD66`!?`2(J8~YjbnG-S
zCAfvSX~qscaVFKyb(WSZ7AO(aV&RIBwX9ECxz;W*W(|7~U5N7$T;S1Z0BuTV&aR1F
zYIScV(2cX4wnAASCj?mT<s1=qIU#VCq9Z^!W_6SK4eDgWX{(aaHt*au=VKM-?fuyl
z12*y1B5H-f3Xja~9`G5}g(FS{j5Y1N62Y#EF80n&S{XC5rLKP1`^>T0P`lL6>=?WO
z$H^vk&Dmvoyo2qrhjlh*5^%2FG7!!4JC;DU{$O64<dz~|Ee`nNtlKpjoh{qsKG+>H
zS1_&vyQie`00(mJS@4ND4;A#AV!$T8QX1O&=dn6eJiz%-@Uc$O!qKXo(-4;j<LV$T
z42kZ{W;@r0)fb~1$2ixi)?n+)Whtv3*Jj1t8f+ul65@b!v-v3)S{NDFA=q6@IoCI{
z#MAV%<?qv%P~EIcP^O-_QjBZB`R8C&1$YqfiK13E&-%G<ViR9D^@RN-?nZEzIK5X|
zh~1L8UM5@}re`?Yxt{!`rS$Z49c>-hRvBN{Flo18)H4EFrjs}yuxlct`a-2ORyGQD
zTBe}&Yu5%*OU;>Qz^orz1CP0V5kT9=nGl}XvBXWpO~lTrcLoG=oDUOxs9-NfF1m?L
zd=;5ms@z3lU(SaXd?=mLqPw1r9fDgH-0Wccx!O0<Q_l9<ZPue%M&#CDJ8Eg`*l`q7
zYR5zc*&s~hfZc#|k)Ju`4276sY*}q!OKT$tV~Tc|p`}I-$6ZPtwFWV^wa#FA1^_Ys
z0J5{?;yQ30p37Nd-|Cg_BUjbVHrt#w@zq5%jKJL4kKnF?k9fY>&aDtPLcCB4JL8%9
zQ$E#MZa}u)3OhN3Kvl*{PgXd6)igX-Mw5w|!B!oCda@MqB*^>&lQw2BV;uLXcRW@$
z!`f|p@FXJH_%<KmMHxk4r24|9flUKjzR)kg+%zRLCEVExxaQ(oR9D^80b{T)xU1l<
zoPAoq&*tQ8;wu^6c6b{5=6nSHkqUdy184>}1TT1EYiv+I6(c(WTu0A$^z9Z{wC`70
z!wRd|k=F2J#1~_2o-+{$8YayGc8*(Z_avZQW=df@IEK=#X=ffS1yy@uP8>>VCrf&)
zHL9!=5&U@=+GCua2xEe{gt+{i3~g=$pUU|}!2z~OIXCf@R?sRi^z;fICb#=Muam8~
z8gMlQQ+mQq$<R(ZzmZU!L{KK{e5Wa9jj5@wu{-Kodo)|l1Y7JsdDagf+Fyk2?64iq
zwmZ48t;*}P6!~Mx($ZSa+tnx489@hO3r*HuP-MiKmbOIhb~}-|Jq^%im7#^0g}6#^
zMZxr0`_D$gs$fs<pIY$Q=zF$dXq))TW}IWSvu-C}$ay5^9@T{OG%{KSu7tP}!Iq{^
z=|>y2up><D=s8}V+rHi+x3j;F1-1|!bR$da)^OzLtznE-%AW%%iET35M@OIzk*c5F
zBK`gWTZkD2BQ5WML;9JuI~S2Sl<O`fG;2sajrwLRgksX>>{}`dpwaB{Iht-Q;a=bB
z8Np@X0;jBS#@MnE_E^EeIPA1(*Vx2ggq9`{>`B}K-UDt>_kTRgrf~r~CeE$RY@aR~
z>4>8&tr3Fh`0oQ^7{`a!1~e<7h*$@)mi<K>n`{e_0%kL3>)->@Iz}A=v=464rF)BQ
z^U1br*-+b9nJ?K{-N<4~1WiVmm2eA~ps=WDYzsw%=+ML)fVC^Yyws-~dA59K0ixN>
zO+o62C68VQyw)odd&no`n6QJm1Xb8PrG9qLf{&>mip{>wP5dP>wS*xB56yYYj1+aT
z@D1Q5pR*XKeb6T^&RJ$>=$WPi24?N7^{XstsfV?5JeJHNkJ(H;snettfF<N3F&LY_
zq{`AtFD4T6=6<FWDTo-sjfOX2Bgl>T1GOJ*$AcYq$PmNWU3Uo3w(ozMAM4y!t4XAG
z4S2d&Yb=+ZkUC^wDPxvpDZ=`0Gy-XO+xXKY>Ju0ZALsedoBUM9rh$lz$~JjO>;{~7
zvBR@_pB*Up%<964cjf%nf`{QG1#Ie@oA`@}I@?)`1I9a6cpTzA;Dt!M8o`TE7aTp6
ztvSpJoU>qeNYC!xu>`XLO-3MVkP}_~`#@Sx-MSttS!Rxv0a=1xkP7j+DVpIpso~Zv
zf-O2Szd-zVo&>aoQc`HURXJ15T_dFSGy`NHt4J9JSg9n?5R!5ZnUq|Se1c~oIl;67
zSl>6MrpC}T4;e8XnHy8bkQR9KFl#@GLriT#XaPfJ>f%z#Tn@GC%IEZ-2_6gHrSR{9
zw{qcq3qCct=OS&kI&I=FC=3G=b1!_D>XgenVeESF`$7B=<7aKY`B)LHeccLirA)bO
z!JdXXbr7j)+E7OeN$aWQ0aHT}s(;_ra}%zrHVMVFtwb3g#*n*GI4QCWM`0)h@@P1c
zlNg$`RR~ok6c!fVSek<5#x`P`nn~K2b{;NFb}5H3!<pIY-(v0UTYoDt1DRwNCc_LY
zG8TsAj2TKwwPq-b=m$I}Oirki11t)GuV7@_!Ms!k*4W$e3=I^SNf;NXcEZo18SE=~
zOU}P$=U)ikvBJH!GD{)SnXK2_#3s%r<rF{(ikv}Ea6%3WKC(>j!NsTt|NMy?%ftk6
zITbEDe3T|UZf7i=0Hc~FDF$>D$hr;-$K0A;-T<&`;OD|@z+9Nmv65s%pp=mh5dOI{
zT#m>%GsFy$`CxTs552$vCAqdRwkku5Lsd;rwKt^J6`aP*%rdfsnPHX&OP0+UlBZ0w
z?M9O4)RsL=BKn5hohrC33X+B6bDJi7&J-3Xx=POuF}0pxi-?|yP1tp@s|IL#x?c8?
zx&Kox_CM))SD8IIeX|Hk%eTumV^5p-i{om+01}}@PjEk+w*!7DF%9@0aPcHS^WdV1
zi<6FN^gN;`W?QSu<&v4%fhHk~K+&Oa*(BB9*Ax@Wl8rt!(KP9zx-}pfsb{cAokbc9
zIwdu&%_PEWkE@!NW`vchsY&uc1|$<(g4uK+J-&G&pjnD)Ei(OF+nh>uD=Z6@y5bEB
zS){?t$Yz5ioRmY3VZ;D|DRRQ4@ZReWqU(sh7b9DnCVZZ2-Q%R4o?Rv{s&=-+)7>=!
zI1s#VZok#Qn=<yJXBNinP(^bCW}EoSWNL{_3P4pZk_~(sncpBTmduO934lg3qj1i9
zVIpeN`jZC^n+&R~tm$K2hsA)xu$*L(Fn27E#kF>}!Vobi3X0rTqts+k*2d7?sPrtg
z6KhY%N3o`+O(K{)7ALoDOdv&KBKai3%vhFEM+}o{rYi}VkmVv77Aed`vP?1~D@)2G
zBZ|u4L#oZU$p{fX&`FZA2u(u$fOj4Ay&MbSbDLVkoEg+6z1m?szS;Y@PnksGoEztW
ziB5*1h2V}k?^xkuiG2-tY?8}Od@T{KUY5;xM9;gzZ-v<dukA=2b516}c_q$;Gm*C}
zXbQ}#&_A^U#ZW7h45;g5;aE_C3?a{0j@|-UP<Pno=J*_esDNV0QP_~wDQP|=w`^pT
z`pVRzZN?3?T4&1+<;%7X3z$euwtCY3rzbEpFEVrQQ0h3^&y^V$@K)_CwLckVMxJ(>
zrWB<l`e<^c70j}v32t6>G=h-iDF&Ca4~b$$bUElNQ={(%7Iop3o@8e-JRp&3`SuwY
z+JS=iB6wH9en1ySgl!4{oA?^ySzCs!dV(Gc`;6crqCY`v&Ia2!JDjxLEJ>lt%$8u5
zu^g&js~@4cl(J!AC?qpOy~aWyE=5dCd5X3ib&m^qUeKz;teyBWX2Va`_}no;XPIt#
z4%<I}0z*qlIgCl|^=~O>t!j!9;k5eYawN3X(OsI6yG~tiq&*|`Q3fZ9r)-pPK~?Aq
zUW6y2h(S@ZWOzX(3k@E09Sn1Vgr-9CjMPJvs-+Emo8g2GW0&fG);&c#d#vDHgLeZS
z$wz43#3sJpp`hUG8+_*QNO0*mKnvInv6G;SNo7OPI{v3yShQVDBba58LNXUA3v(MR
z3`>D|lBKA{!2)It&~gwHvwX4B&JH@aU$DCoi@q=J2+PPL8I{h+s+5Jb8fGlBP9+bz
z*>>rs*L!;<&-C_jfEJFK(>3qzWhwNK*q)FHliW)6bG5D`U6^Tdb&HuMicf~}*+&cA
zd05hY086FA2`PI~xH)bn6@>@GK*@D?LxwJh%G4BnL_8&pq|KX-4DD%E&OLMPYTzRU
z2h_!_8?9^;U;ETEz$6B*+sqzP{Q{5b<GCi6%#QBRI5Yt;fhet$K{8KR28$Rh<=XP(
zQc6~Jv?N(*FejA~C3cf`Z%)$-H>P%FW~5K{<I%&U&puPkTfe`VLHWFC(yGT#lr=eb
zPIh1?rJTO7(5#c_R2?V0c~DnIlg6Q-I!R{jma}YU!uGB6dg<cCu75hjz283O|10}t
zaUd2d$}Zfzgr#t$Tzm)_Dp;Tx9M1^kp}?ZHW%RNrbDvsho@ZkdE}9Y1S3nD~OVldo
z(HYKBFHmqG_j?xhnPBc>rcJWBiLZZ*pYq-+m_72KKMH68Nv&NABWq~mjXh#gwX;wy
z2$Y06L&dNhSkjOpV~$d)15eo`i!>y6nPnyS(oaL_+AO{N-JSf`FKpShgWf-R)bplN
zJPdP#WLE#bmI%|HeN6;WC_+{EHWQs06K9cbY<;SCj|H?Wi%<sg(IFrcV|#6Vpw_a1
zRY9;zbmy{NePN3?E_zyc5JS*^IQRGWax8EZkgUi{E;1z*LKebP5E=~2xUk$ShKQIX
zqBo4bR(_x0$xa@E+GY|bR%HvYudsc=d^4-LiEkLBNzM?k7h;bJXtO82E0_>W!$~I{
z4DV_h86nHn4#=V`!7RB*rjotLQc@}+iW5_5c70;kU)!}Gy}F~HpU-UF4f_pI{ushi
z!Un@s8-;D$<PnZ6o~U8e@`972klnF<V#hPIt_ph@EMv7LLnC-8l!Tg|R%ZcZG8GG<
zTG>#SWf!hZ?VM1D4aoeTKiJp%bHzeZ@`z$WQc;S8=Lj1F7MKr%$f;za3u17b`BEs<
zvM+7Lz!G9gwG4XV=g|IQuHX@3E}ii*)lF>TtCVr7otwm<!al|xbwl}aF$-IcJk}~_
zs<W9ctdq<g>q7DllMR+2d9Gk)B11`rQivpx!YM-e%G7Rrch`RM-R<<ZSEu%xd+a&h
zNp4|b64{a`0-019T0*6Av9UK4bH-@_MV%1HVbamuc`fCXg^^ninmvIIYJWSnZWtCO
zv$~-{3-BReBDQZ#^=ct4`k**Nx_b~G?7I#eu%c{=x&g0LIV*+2BP<vqJX@d$4-1o@
zxa~fcSC+}iG8_AXeS#8Y3CNq+#MeI>5I7Vw4jc~RWI(ILKqqh0=mPVurkY-xt1N-J
zND7&mazGmD$%`&&ay7@b@9fz3zq4h3ePe2`bz<j1ur~x=DhskFere6mN1T*P8HRQK
zls>eUWL7invFD81qM=q&4WU&3Y{lHHT6utxSgRgpV{&z3-v;PlVjA?pfq$?Fn<L~Q
zEJt{hut?#3gl9#H2&uOcofBvR>SL|i386*X^*3z{O-zpcAygZZ{hD$zV6|I$Gkm^@
zZ%Vp}PzuVTaDX_FQBJ_Ci3JmDLx`FY5zTG7)Sj|PjXfEb3uaRCOiD#bDmfq-N<>6P
z`BE2G-#Fj>)$7~#*Ec5V^@(wA{jnv?Q~f`6k}|0@T|R2-$7(d&m%ujCDvKb6q2c}s
zDd!T^dCK~>s-u}z;m%C$fkUI9=cRSVO~lUi3Tj%w5HZ*t{JjIW1NR68DFxvS5tcj!
z=23HWsPkU~Z8`jLPi1r?w-bBN3UI*abG8EQO>E+u1Z*W43x@@qD7&Pf+7T_!n;jl3
z$53TwL)FiOCC5AshO05Nh@3rN%69qN+uiH0ZP`z5PSfjC<5G!b&CW+av)10RROI~-
z_ULor`bazp1X}CSYG#fGkZPr2yhTG&RK+tv@@CT(YtJN$ovRaj^?Sfnbkg8=_IPh!
zIxw(^a0{6U`Km)$QLu11B}73Hb73JCGaY$Jt2xYL04?gs(*a^w?v~jwv`u`2(oU~#
z)4iY%9pA7NW0^0o$S4lbY`1pqcS+_}oiR|aY?4a~tFxTuGBa!l!ce-9?9%JI-FM&E
zwx8Ub+Uqmps)4PU;mC!21T(7y$>ee~lw46v<0RCYd^BQI{r+%^L3+Z{d-*@giq7#Y
zji<qqf{sA9{^%pOZA|S|fIe7I2JS5M{(g!52qGI6MHUejlCV$?<e%S<q6TJm;&%iC
zVo+@Q&NlIlWoY4b8)o6@=fL=!>VK5FNhGzI%}9f}i#`aG=gVEb_^qw<>TBEfqg&JT
z#&+VWN1HL#A?&b_%p%MJ4Pc@5LCYq3J^2i2mP85aM8b&-Eli5h`I{4^xbbE&GBmu_
zK-d3IqnAgST6@q=kKNxth<6u-Asj^-EJ{*#<UUT{SNa<!iO^KiJhuUk6`MSnZ`HZ4
z!npIVY|_n5e1k&Eg_D7BMO!*@@+n9NEp74F(#_7Q0R@ezNhpO(E?Wd4Lzi+s|Lq-n
z^^NWHquUev-nQ|AiR^J?);wA^wl=q!<U&d7L}~3+$g~<>Z`yu}s3~%p>I4m~rjIF}
z&U&8I)SmJd9mCXKOMzTAmj=JH@9!T(><vzILUGz3*wX+l>KZK9@!MlIv59X)M7yx-
z$bQ}904<*Fq92AlA_OGE&UKpIp4si!chiqwo~9peCte8XhB)~F<%b<Pp7{OoXMV&L
z!>~9)QtTN3<M5wVw+dKjbgDi4ug5UESbHv=*t#^a+plc##*0&XWxLbvP@q6*3{fME
z3|syFnV;ivDQ8VP9X1WMoA_p?oHB}Pw(`^q`*=PyJO2A(y^*362x68=m$P<n%yjc=
zXW!n<-0svy5l?=!adVZ{wpi&IQ0a4C>JtdCwixBiE*Q8wp)cw^7R!|KsRR)|S3B6m
zCcfSb4N7gmIGb}2LJGnoJUIIXc7fx#j&#l0aR5>KWS5&(4#Puxs;+7UH2yhQ+stx2
zOC*4W^XQX>|MBeu|Mffj{`SK@9_3Vbtf;nfRNtdYNteHW$`5Mz9Po_|m~CPc&j=Ll
zti-|bnT%rXJf#Fe{XqG29*;hl$9o?w{Pz!r_+uZ{Tv~bx2CkjUL-*^SD`f>xq-r^y
z=BxcG`EX7f<LdRopJ?}yU^yJNa30=W_*-v2F8}h|$HTwhJ>dO)kAnnChK53%>OpPE
zz)pVn+9;UVq?()f#-dcynwyjDQ%-_ED}$3$TM`Twj`t<@-#zg6XYfl&dU<B~T+%HQ
zlatmtg;fxf<2<`&k5<&mj}o54fR>gukyw9W<D<nANh5G7`m~*Sc9fkRamF0M>^G0g
zKmC4h_|?Y)A09*<!;le_?23rN>f&N6)!}voT7sA>LIdHGy0o<Y`*NG|u|G<qYpWVG
zUI{jIZ4=+9sLiS=@>9AOY79hMP*e_sR}Ya?&!ifEDhf9XPcBn|`w<U+7ykBOBqOFT
z&yseeTR<nRfrIL9l2)_}AWB$duh`?Uwsd&Z!76nTK>K%hnJdT1fVReZK0gN@mwyJ~
zG7pG2^qdbfvkw>k)_?AmU;ch?_|=C8e6Vm1l2s!&oFav*X0pNOrJC!{HI_@5({XSX
zLAF}G*%$_G;+xCRv^)cPiZoOB90LcX2ux9go8c<iO~ow1Jfhqic%aArb|<DuO1I4>
zyQb?_S46HqCs%~Ka0l13>TceitB#kF@{w<@FUlH~ThC)FO$(=?YN=b(BZzQ9!Yx!c
ztMeo?`}O1UPjBrH|Ni0J?<~URZV`fF!d>BB8q2GDl%r2Xs)j}NK4Tj6#JDxRT{)`z
zIVV^P*B@Y=$_JBe^t4TUgQ7W8w02nwo!mI93Mz#l#@!wBLQIV4Jv?;^iNLxTe28Qb
za)lJ`79K8dDNwmTlzYE>WWRL>6O)%`NmJvR8pjd!tebGHu`;#Yn`%f<B7)-=e^jks
z6giPE`SBW>S&T^OPq4J3S#Et2p6UQN;WhtOV5yA_>{Vv==39H^U)~y-8MZLPC<;^b
zMHGu%<l&_nO1czo1@8-PPZ#{Xwb?F!?c+F{1zkY5VQ8E9Ca0X1s$bc%+4lH!b12|x
zo#3oY7DG9FkUUv-mBD3r>2NFArBaf}7P194e7exR%<$$`)--|LoThXxb8S4AQT-L&
zSD@x2nQ6_ppQEHvaJ;v}IF*kIecoOeHHAb0QHV%O<c?}EQc=|1-Mu1nOIPcL^x)v`
z+<*V;z4AZbd^G&~M?H5I!NL`ui$ugwjABD79#ISmLzDtuysJx9oajrqjF>y2p>8{f
z14M@yhtJm*s~?FJb&2ZA7R8@p1-Xe$e4V0YBxYD~CT(BHNf-8oi$(S|+x>x1het*d
z-aD2=sNe-k5VAok3Z+O$r7mWwdzpq$ihum;NByq`?}|a1TAFmmg-YbA5^sg#L~&$_
z;zSCs{}$dd!B`n?jD4=&dg=!GQ#7>Ra8<c|I7UYcZ|S6$rI_b9o~l1%Ou#xL7Qy3>
z7XHrfAD4gr&&U3+ANJgtmsoUC7T_rc4+a}j@f3pwN>R887ujX_5aDL{(`uNdKGzY@
zj;oXyG;85%i?m5MH}OqmXsKi-ZCA)im-B_h0;8OC<}}ptsi8xekfgToh$4kNVz9b#
zGFiy>-4>q~?!HCOmb%F#F}prVZ*;;tRdDn$$BWZa&x$CA^s*<}S`Z`#iNS2*uy;J5
zCAvaHPk8TPo|@9%wh33gjBso8FdPr8c)=oYx%GYU*@L;?{q^JWPrrTS|L=!$|6pO!
z3nDziRMCAM%$z928QiiLr`S;Me^H1AYE}E{R{4EolnZ63E9wp!TRUn>X%TEAwnAjp
z7r6noO?*>;tX2>c*~FH^Rvf?XF`)SdIz!}Ugz7La5tESj3gxNPTSQmnSZ4)F8U_^v
z8JrZT5TTGobPzrGXA3_3ot1x)k+dUS?6ie!9ucmH@REu<DLL+8fxG))OJEZaV{h6x
zp&Ila^fJ6#+&G~R&F~NlRZXg}))VUm)HWJdF4#b3sC^`*&_7uC$2_+9q>p=VJsN&_
zXA$on6c%03d8LViE8HR%k0>LUso<tuD1<paC|qjntPoNh%dHd?Idg0YXx)=qC$oTU
zf~?ev85=ci6W^rFGsufzD}pU_ET9!&A7`)aG(Y}+dOQ-Y91N1@Iw<aD5d~4b4HGHJ
zoFNF=)Udh7!JU17KZhnWS-LsZ)&1i4fF8%avNHGeo(1P=bx$W4r0C7UKiOS<XFj3|
z7C8$Vpt+OBO`j6T0aLi-!s}9F4<82fc&@!a?!`NPP~N&fl+QjYd^nFdu*e=7!b)~p
zHB%mLv^3Kh25-#FYC(XO(#j*0r!nuFel|i@R~-QcV?gXhb)_A~=Q)C3bNiTv*a>4A
zrLA<?#3sH0p{Uw-Kxf8osXJ_+05sLJ^H|2?;`9lKIbxf@XQ7TD=Dx^bxhQ%ka^OP(
zA`bzUhC!YPuWG-ACr?Qh1xew9m*JyDdG9w5qQ5`OSEfeZFY%}piU?OId?2C_fdy;7
zqO1s1ZA_)OYKlCFlJ_~G%Gu*G>%Fc>@U>SQYgis0L>eD15esLy*T>?~BR-ic9v;BH
zEBZQ(4(4enQ7fnxL@}HpiU}VqyJA({><3(i_w#Vs=k&xB1}2p%bFx>u0bAg^fo<bF
z#@Y{iGd-}0uY1y2_X^~I9l>rKzrVJZc!cv<g<%~P#zI_G*+3o608+K69unlyTmm9R
zgnL~y>=Cv~6O-nJNAHIY9u@z12c4Vuq(zAZjjYJ=s7<u7ZasEPg6x8Y_blf3!?(9M
zK|_lu4vWUpM&~4jH|8@|F=GTZ3%vM2Papdnn8ks2@hB8?O)RnzD&b*NW|ksUa7#p?
z766J<%<*2~8o{i`l?i%cu4Q#IWW>Qhq=LecCiH@b)U8haF;}Si`i-qHyX?+o%M2<_
zf=nAg+r-y6Ql%xW(tkeSJR%<>-z?mDnBk!k3l_DDK!u17<~=^`s&3u);ayiZ7e_?o
zUQsfUJx2)h7%UXkqQB4#TTv9$3m*nQIOsK>xaPjl<X}NUDc8O;MbJ{uSYu=?vo3*D
z4H#MU`)TpnJ6q-bcTQkv^AxVSUi2_STf%)yJE1nM1(6Hk1H+!8H>2+amLxoiTceW;
z+!NyjfJ+ggixRZ}pcHWk%q(0Zs2x{v>FRneRVMie@u=+^JPFaKE-qW*aun_h9yivx
zQPVc@4ahy2L~tJ1IpH%uARf8%D09L&DiI1f3H5!@b%Ftg9OOY1BfKZD>{(c`LE+T~
zHZPhDSQ}qj1m$2J`@W#~plJ-GX2be~c6Ow7q4w_9RYwb7u$TwF-hp}u&?dbP7P0T7
zeN_r6MceJyT8Yydu%!egQdkLh@aS+Gh7we5j1q%{OWCbeCx=v@t~qWB?*rGORx=kp
zu>!Mc%*T1oa@cApy!xIGuu$;8oCjen){y)#o{3o)*CM!P!5xA}u-VbMiLbAAHqwqT
zW+BdnxB$#f*p9XkJW%jJ&cZWdAF%}-)EV!2o<T=UhB<UZ--m}OI*3xDE^$MF!;naL
zhJtckb60)T%Af!%eMESN`(W;L?zN%Tp-ycB5zWoEAYV-^jb97SelZRZg%3_*Xfq$Y
z>QM(vP3kzEY01)R>S?XRm-fUIl;Sajas@P7O~ogL1N5;3Di`$)QYJ=bHt(04Vf-l?
z+M*Z_NIZBdLxY*a4GXR#CK3a_8B*WG*H$?T3<Y!{&K2{EVB1g0NP6H=5fA#pBIT9^
zJ^5X}u+XGe^{=r|--}6=ZYr>4EcdG037jZ(4?5u}lWVK51{g@S*F&+abPg>qT(_K9
zf$qAU>>%R+Z#Z@H1VEcDhT(z5o`O9O`V<m`(YCZukf(-}ZsCQHJjy^+Q6DdTDiM^V
zC^Cu#MG@YQ&KZU?Amv)gT=cD)X|<tlWM-qUxvYwk2cyq<Awn1nuo(*%_YwC4=7)Ic
zVah!PZj!j^&N&NA>E!bCCN}XGo?_P79kK0+8^~U8J9ad11dF)^pHaB4Ts5?q)H635
zeP@RTOnJt_@TumaM|43S5Pe%cIRaao0q=t7o#+gCksOlsnIaNSl;(d}yiNxwEWA|R
z-x@P>kYUToZb5O_Q?S>jnvQSV*t>9fNFOZ5s$n_ig+JMk--f@U6$(ta2@l~KaHIB=
zDc2{y=o?TqQ??P<MkY4z@#Q|i6MDv?Hj|JB79I`I5{r2H@`v*-Ua;ghJnUU7JZJ`S
zinP(vHu1GeIeV%N*G1r#8@HQ&b`k(C6nv({XDOI_CgV?aO^dllObyYuZ|f@G80JKn
zG-<qIa9jiGt=gDHFaCe_-mS;3>&nvn=3IO46G7@iT`gIXCCg4Zjm);Is)6cXl7FGz
z66gY|QH_4F_*BS30i9^SW&eZ(`ag65<;>3XMUo|1S4yHNQM`#{Fe1*`d#^QTKdiO)
z*(VsJ7$grFl+QB4q<D!4Mw~VFm}8DPrU_~hv(lVPlc3n!>Of0lZNgcIFsCE(UvI(C
zPR)sX(e_2zClT{lRw-NEd>o|8T~8551eM$<NQjcfeZk0JmSmPo&Osj=hs{f^EI#x6
z1uFj?aj!C%Nu9fzBe*T8Zw9oAJ_);GT(`h}k^|to`t!<#=acA9D&>khpNVan1Do?b
zJORg15uP;VM=rdAaPpvj=4J1s82ce|RU+3bq3hyk)bL?QdaJ^`p9auw(N^Sv!idbO
zOn}^55nTEqrKd#(fNLXCN6(JdB2m#7H-&|zMm7LfLY%x6-3E~>%lA=~eO30kN}MJy
zt^nHmkWSdvJVh3G*-5?xASrTO$-lJB#VFka1x;Ca)8MWVvzjdM>#9Bm&`Oc8`X!JJ
zz$NL<#*;K)p`}a0J{7y%Dn@Ae4SdoAZ<upUoNJY25!4fnm%OMATicvRjExOZI&qkT
zaiOxnGal^6F8X7HXK!;adVyULc0*#Jv+OfFl3rIqTkbKM*G&$jW2v<v5=DAJtjEmU
zEtWM@DK`N$F$J~5nB)L<Ce9+X%z1IOl3aBS{|&bFCVQQh+B9!cwoJ@4gZbEPFiDnY
zzC;jGAcCvnv^cZg2~D<XDAq-c;w@YG91k!sDS2m$A@k!l;O6^?oWRxD2fhWa0?%<P
zPo8ta;dKk_1m}E8Tnox|7qpbp8(-SyJc^o`xDdo}ub2VPd*J65^nZ5YHT*W^X6|lY
z6=Qy=k-gl%ydVJI8aA@^h}3uiuE`zU^0q1&Y``p6a(Itos4GtDowgo!l8l*)DTAA+
zAh_n;oi=8;7405D=##MD3VWQETgL|>;!poy-uBnxe%oqqQBg0w1xMUb(XwXPC-iX1
z-by{4snV>2t|=v`W_!lLFVwvpbJSZT&1iuuz-8bROqav2k~-j&!H-4xR+ZW!UkTi>
zz<%+yrQyl9nIzbp<Ic`Jpqe;g!YQjb;mVU9?4_jomnQrac$!<A?o%NG-x{=PsHHov
zP$cECqyy#du&6j!Vogc8Dec8Np*<z?BTg{G4wReAmF7%7e<}YL-Pvb**$6xw(11_=
zmhPqh+xM=2!(!gk8-zhGW72g9uFFp#B2?u~klt`@YwxPE8$e2=c8w3oWm2yK+NhPq
zI|n>(5CS5Jxi}Yqiw-XVjU0GxtjKA?3rYE33|^t)^WdDt`BD;>)!C6eG`pE3*qq~A
zW-g!5TYbgLRQ#1YubJ?yi$3YXQ^4c5lVAkq;#?BAB+h~wxh0@YnOb3MMA$m;-n}0s
zw*1GsvJba7|2xBJYwryYWfObZnyaNo${6FBsTEQo!<xLZif<vt9;a`%YTZ0}FXAWu
zpBwG|wG;FC4hwg-&;#43Zf0jnLX#m{9m0<WP}7`7bSRMB#c@MDB6@;_WOjB5VUFhz
zx!atX3oki5OW=8&=fpUnf@oynM!RViY|b%0mendkf+sE5tET!(ho1va9O3=U&AF_`
zWpNhXA?VRw^TYk!s#fpy81t1z%*c*~DW{5%BBEZv%*vaf6Q-6ie6VXc3!J$s?dlq)
zTLBv2k~*B7;;651WXL0zB}*G9p{D%7L;?~GkyL=L%KtE#%wdjl-w~MDZ2@f?O|UP<
z1$8dCu+J^n*<rwj@RGqy6fouvS8#UNOcHF)aXp3YXvLN*&wJ2U9bR_HU?zUY?`L0y
z3j!C^*|%*}>^m&#x45q>%x!YNM+R3qnide+tcArqI4>z?z|u^PRwe^{AWUAmo3IPq
zka+lKc_<q1U75wM_dSGN$#U2LUNZjAS884b)KmF$u@J+KF;DhhnAk19AKNG$qCImn
zF5+CmZ?3Dq<C|I`Jd5y}zz-d^B#`9x8`(E!a~>{33nYiFs66k^i@+1&M*y>YT5&F_
z^G$U2>B#e!_wg)RY!Qppv|vbDlw#CfVg?hIHk6(+P6rISeP8CbcjXqn*h4@0>ld~<
zTZ9`yxltVT;(3#RjFeEum8A-(8Uaurz)iEh<rT7+qWi(OdpTWx|5e32C>KNIf;u;{
zQx}e)fK?7ZaODLT9`{WI<mMb_4NbBk)$?MY7hL!Oa+^tjL&URE#q5dkjX4*pz}%~Q
z0JOvI_T+vqD2Dh@2Gu86F<{3{KxUbldENpdk{Q|!fg6iinccn<K->S8zHiwzVYeh$
zu6{5kwJxYm5jHJ9QCe~YV-^eVyTCq94D1uDmR&Kf8eA{Wfuo*n;3*e7<#57<Ailb;
zesebGnDDbatErqM+mxQ>=z4Dy;kv-LRmV;!g{D_)xTnM2j|gocJOwL8LbSw~n_1fM
zdrCBC*OXn_Bb1zUbmCkWABVmbmJCeuB)sATcfv%-3kZQkphrC*ZJ2aH?|0WQ2OSB3
zRz!j8m2qC2OK^meu|SpyPkPW72|VwC?UKp9(b6{OcrdeJ&0AjDyX|gIIXs8(__#m!
z&R_1=)VU~$>+1B<mV)kn6OT~te#}_l0ij1p1uHUUWRF^|0>cW%Ot1&17iUL=>pXS@
zhQ`x$s$2uE<8<odJ6zGsZuuq|_&U(WQFoLcSqDplr5{Zq`|g|vzPU@5b}}hHjLM6e
z^VjXWHc4;J<~&elX1FVj1)lPXXI*$Ad-ab<1>iEy1t}|&Y)vwY7m#$%SkMjZOuhp{
z4&aUE|L%b6nz(kW`+dtDeXViToU5fLAv%13DJ2{jnGn*X4t7UTLY*?&0y_HC*5K{3
zir|K-uq)14;4H%K5p^^iPMYwNC@;Hk63sgZH#cc>j>T~jio0^sl$R3vlIJ}EM`e0@
z0_VgzC&nH%;wRStXkp?{EkIT$0!nb7xFl?eBMjteV&9mQqpdktTjT1{0PVCGkFhIo
zU3~nDH?c6Loe4qRN(nlkuon$&%?8!cz9H-?d?ChJa(nlP-)S0wAGq_PD<?N4=jI%%
zk~5G*i3%q~c*T?-9jO_xe4X!79{j<$;fCJt?&hK377={XICO&BvgAAzTP70&l7lF(
z^BB7aN1ncmp@FjyxM8qoGS0+jq!m<s1h3#wDFutIpsW!Hr4EkkD>nf=5a^I9al?DQ
z2#L>dt_|CekMIPn9G*7e1%oGDY0&IY-ZTd`=Qxy{o)cW3aOD+*m&whnqcXkg;+zSI
z&r*{C&GeQFi0@C?84DH!WCbH6V@KH+I#zTpE0Y6m5K;Ea4w1#JKGv-P?X;K*bCg|i
z_Dx960VKVdwS}>;bkwu>CmxWkxCX&-_<~i%z9F;$u1b#CzC_M-J1P)0z^SD6oGYi?
zXa?<KbE7urp)j-IVOoum+NT_zC(kV(6^N1wS0(YaD;KNw9_<?6t=7p_EX{y~cwZ{F
zDOMc75uH?io+G?d37y?lVSX!ic6&erL}|sihL0kgct+2qSH#D<x56?*bD?r8wQ@#&
zU6fkd`>|S<`}swqN2J9=Pbbb5O?)A6{%&B@lqWpskCO0;RXj!x4&E4TH|L>oGjZI6
zEmNNNiXWQr3{W5CF<Ug{t0c~A;&K()3q9$+cQ?!Z_CDYF#h{^S!GwYl7y+XqPa_RD
z5(+~bx|~w5=c+hYMQ?AMzb&9Glvd!XC|8S?rY;lF?huEsYN3)!@E)bl-3^9rXJ&3|
zVQQ%+P$TNx5an~6FW}bn^fu>&!Rw;@Se?g2i4rz|wmA>!c=pySoUn>llJXk*o%70v
zoeua$oO7b=(Bo_EZcgrelbsH^YAYC_dV4GxutuCtl&b<)7xw~a7z-0F8(b;f&MATh
zEy5m>YhaxsZPw5Npj|?mcp#NyO<J0_NQ&%e;*2<FfSsduI}uJGyz0u2O*!Q$=bvwG
z*5*8<k~4{522TR7oAA0HZ3w-*tl4qrQ{apycGlM2%;oXuKWie=rDFFA1se)ZjQW{S
zxfe`XmZ3u}*P8RKIaiq93!t?uRJklUYpm5}X?bfM%~n3)$~6mp{s59IObH$c0d_;=
z3!E>?p!v~BGn_Kv1s8i>gvUKlZJGm{^H9#P!AW__;77m<+&c5`cIR4fK33!7r0kdy
zEFRgzb_b=>>Kz&GziY;Xk?`2f`q=@NRu#-?#krytmw58_71!-S<_X#kE?E}X7i0%-
z7!xFins=y!jVfiQZ{-vn&9WbDuyBm!W?I9rdfC@mc{bRF#94*Qo|m@VIZG>Bnq7G&
zslM7*ygb@CHd@-|JSb+CvUcV$Gvyf*UP5^hc>GA(*>Kqtmn88q@L6pSuDgjB|Cts2
ztl&fPRqTLKM-v1Y4gIh%;bI4uc<){q+G#O%*%7!ZxnpQ6vsJ5a!JVK&HPpxqbaF7*
zIy!bc*Wpbo;%4YcRnMMAE;)QfW|&6?B6l9QioY=BC*nLN6}`x2{oUp~C`2RT^rmbl
z_)!vm?70AxKx@AlaMWtYfE|SMwewA#xK=Ib)-viuDHKb0bM&2M3>d&GpcyNC(g@&Y
z*F@eQ0CRz>?6Si@O1gVM1NgPH3fIlqF_<HyvL7$cTnWKt;`Gh4oGV(|2x@__)^6wU
z-E&lCxC&QD{0aEbVYj5!9_0n~m<z9q@KaNsnQCd9(sOgxj%R{Nzy+Q{_zRT3C>zj^
z`hMoX88tpJ=UYi6pREbVLLPG(x|=ItHqp*V<J?f7V2H{{d_vjlX_iAMcNDJkYx&M-
zFul_+Na-@{SRP^3aj0~OsMToSkc`BhSI3Q$1I@I{xz289-W5<KxL(2g>b!@ra~B^i
z;5==@%O>`cD5qSgrR)>jT)E9z3y=+3ts*9Dx$vA-yl%n|?@~M473WXxd=TKe33ZZN
zM|0nEnK{gDm+t1oEW2cBGO=sqUt3NI6l}4)k!nYTYXy|KFM!r2_605pT$Jq6RhytG
zQa-Wrqn5WEL$@qDJJ2SUl6BqPPDAU+H6kB{#QT!dY>zrQ09nj@KB@jRDX)w0cwTb9
z(b6_&ZO1TNoo!QIu)u5NT^Uc@)nnATEQ$9j_>)DhtyMdl%x*Rj=|WE5DHu>;6MQ%X
zJBpDu+cjVza8ZPdZOTLR_XW^U=9U5BB0|f6vO}EEa)N$|z)Z%`bJ?kNSN>dF^K7T*
z=0KRyRd87%U*dcTT)QhR4Ia0OH)6#bQ8@+J#+SA^Yh!3il#1SjlL)V;z|ZbdI|EpV
zbH0Kvyybl5?5}k)U^r#eX}t5x0rU|cid`eDV8~GI<+p_k7tOgqe`kKuJNrjnWk2Mc
zvGc%OvvxMvH*)@&ufC<>lTK9b<>$pId{f!Et_Hyl1n5KJVsQQheC)!$AN`|k1Ft#!
z1<H#qoNz}sI@;#k?^3hyGxtO=<vA06Zo<!oeE~;%hqS<1oKHxcuZ(?FY+bo$D|fmi
z?vzQP$~|KNP^GC~b*ZThjtSK~->Kwgz&F7-&y)9)q5XsOZO;|Unf?1?6!*dOjfu&2
z{BerLJ?aIqXT!&?*2mUto5~_p5U#58t{U$FH}2viD$ZlBykcUn6L`^;1|f=Vx}KYJ
z|6a1<Bo~4No=RdrGUauI=i#pWV!L9zuZcf~#1(2Jt;2UVEjNML;5+NebO1N8vhl}5
zwD>W48)x6(QXBa8u$6Up4`={iaYKa5E?hHVf#73DLMD#i@}@)0ycGX(lRycLqwU~H
zTW9d261+mJ=UQcapvHRwm&Tm~M=d>-XRXq|N`aq?@HB>RmZ@yceLE>T9YuID27Z!M
z|I&pQiy8H9&UtbEP$_R4Tp5h#Yms>-ce#y7<Jm~-<?fFXR4Ujo0XQ9+hebm}a1&Y=
zu1VrDpR#kO>tF61(Ed@98oT0rD{$R7wA&dtprH*w=V{fG*7yU^(%Re{sJ2<Sb4iUa
zfG-P6J9^HUv+crbuKe7D7rkOuR`uDY{M?*-EjJ~Q5X6LMlJav4ym2=pPUOwGyW)JI
z&d0vsT;=Sq+ekZTXUzfc*>LxD+TC2f1*REjxw{!l7UQ=HH@?ezc6WdVw6G`2c@e%5
zXAT4#%yBlx28A-0RjX5%&c>3Z+1T~CImvdNTH2ge6X!!NJ3kt=w4;5*;KDPe{MZ6N
zLHMCM+vp|;a&zucJ2Tv!$^uVV;71nt8F|cU>n^mjeT<Jwx%pLP>`S-CodJg=(~?Sf
zqfaIQ5|ui&JN2a83|PhxD*z|XzQ8vE-?a77f?AK(={Ui@3tzkOHNrxnCi_{2Zs*|q
zJ&3}UPfAiRqfm{bv-u>6V~tvx8(KxKsPncuZv)rw>RX#j=jT%3uafdcuRMY0B+<>)
z+?=~ZwA|HnIDzt76n<X7?8K2Dx%pfdct?$Qs>l^L)V9~BoehZ^v-!kpnwFD7eh41G
zIE-FRx|?;ul!e3B4qsE>ng8tW01fu5#8(1eBkYlP>Q!U8nF>~?<&0KxYBy?%rskGA
zAD##;=z`J}S+|z9jXGQ<@m@&0EzVai_+79x9G)=c=dSz$<s}bnd&<eSo7=fLM`C8=
zi2%=8`#(s^FH!!dV$-<W_xn}lyj3UuXf@yZ_WDZA>D^s`wt0DQzT?G*N}lVklNTJY
zf)N8&l(JLv?<>NdIA2w84(_bGd3S(zTH^c!-<oi-#B;~V`x#?%$4-V(sT^82kIjK*
zxh!G*TAI+-9Tzq6iNJ?s8_L~?`T^(Jq`Z-^pCi2NN`upvP4k<xId}48Oai?p0u|4u
z+TJkbuS|Fa?#juZfJ^Fpg7c{h7pp+)hI+eZ?X2kHLo?teMkW~x+*TYA%c$*w0YyK%
zVZz1v3BKjD#PtChz?;lfx$Jpz;JPW%%V7FYc9z_<s+6M*(5O?pWVYr;pr`5vEp3{U
zwni<@4AqKQIbVm!?@``H^6r7V`G^iL#!CNf3j9)XBr=<>=jI%xc))N8Je4I3{iRFM
z&F+rt@3`}>8*him`2f8y);NGZ)y|5Mw#z$tb0uc^&KKs@08PP!ils9`3w8w4+zfEI
zq{?O9JX*O4cjavn59&8k<h<umsK%jjp%&;d6kVe7*xeYYrj+JDAk-y+qXF%DL<I2~
zl{M|cG@*77OI!=WJKpnbs(6*WdHU$zbYTm4Jt_NA+oh`0J$J5(6A`4$v2M=h99n9Y
zYUYF~ug1VHOn8I4>uL_{<Py&BgYix+T<xJ2S)U9t?%Va!*>tp~l(%Um7O0vAIpX6&
zrJ=H`$<2TT8B@-Oz>Pb#YTO$`1Ll!kQ@%vT8aEV*oB?dPQN6;caq5&ZLKlWs``{i9
zSxbWlu#i~GjHj|o<cvn%CGoKfSMG|X<uCV>ro0|Se-SI*kie<U4uZ}3u2Qos3_h7^
zUX99MBm5;fxbeuPW_j&i!}+92yuIaolv;MyY15c45N6QM0>ORELd@E^mAhYXVCZP7
zuZ&671w-}`&YAM%Jl@3`%DdLC_E}WUR|4k{_RFy8Am}Xz)+bup!N~#o^55OEGqP?i
zZCs|ZhgCg$!TBs0zeD&C*uRHI*;5wyc?|r!l(W-L1>YpxZq98=&HR9U2IUti@NX@z
zq-*Z-{dEGLsPPAZPYteXT*LB{TVcqcg?B|i?^m?)dWr!YG9jQtGOe&*8X8}*e^<Le
z?h-(LO}CiwjX7V5bIr7rSiWr49x^%5kZ2GZ7aDhJ?{jmYON2TS9*CAkws91Kbv_vX
ztj2GEFYk7Ofb13e5z1esz|T_PMHjX<3AdYbSg9#_a8N`zWy)&^uW~p0HJ9)AD~x{@
z<DXqP4`9`r<c>qMvpVKG?0GR#<ykLpkj%_919f#6Hh7-p6jNfslCKsszTwx0Z$@7a
zpdrp_Sp?^b!$rv%OZ{MygGn^V0sTy;qYzMePgPG)e%%%hfCP1_X{wevJ)cVAcR25m
z(?skpKXT5k5}qQk<rSgu&J9D`oP)PcJTK7gBrpBF&fRs#o$RRpKoh?w@^OIuXv}O)
zd1ou-W}me)igxA`W`>V<y&jGAQ+CGEj6Z1xTnvfJoR-Di=x6r;X!*1i*F-oga85jH
zX(rS|kelXJ?-iwSpwOg5gOx@?@uhg_cCKh?YYc!KOV1fz)$D2FlPd8WoZljRd*o!>
z<sZMH&Q&vZEYV{nbzpNgCu>~-;E7P!+C_DKC+7bmS;9H$CEgKuFBtzCjE^hly0*lL
zwzVEGTN>fBcE-d=>(oxZ<0<7k@6g~hZUqy{?4}LP0Ao+!oCs&zifi}s`Q4j)xMt7y
z`3&WG;CXePFhMa|bS2kl$<j2_O_@&L=l_n4qkZ10Jn9VOjmv9cIToqBLPF1F8vc+1
zPq^~}!s9rzBcNHtI4|%=bv_mNR-iBc64_kk%{lOT2>_b7>c;zZkhaezZ$o$q?&!7W
zYFrTEU&Z)c6Zs~U*Yw&Rp<!hLTBnJ$2PXo?j;0+tC6E&}vZW)qu<y<n7@sj?@8JR3
z`^@{7Ia|$mL7bl<yr4cN*;WpQ=5D5tkz1j$L`3L4kflpV?!?~kMzCIRw)5r}??LLZ
zR=lskW=fC_uN(Gy=d-%w$yoEM2~W82Bgs#e?|yw6--z+AmGe7^oDpFU!#!-++2-7u
zsR@`Ed%&kPSW;`P(tmI8I^0GB6Cg)<{V5o~ZF=7KifayaiQc*YKsK<m3c(TPNbOlW
ztCY$UwU;|i?rJtFg`MSJUp5E}sFkfwkay>P5hG`L|LESc`v++MD2c!E>+%yWc-GVQ
zRoQkY6#8rmm9bJ=*MpWe{dMoD>OdNNX*x&SZNPEwF{#(U(t5-TgQ{BQKI1cs{C`&S
zBpKA6mqDqx1v3-lqBwul3}zpyutUEAvdy`Jlgl&&c5yxtSCd3g!A*IETQ>@BNY3~B
zCpA9sifgimd9~)1bXf|L*&Ma0@2p>CU<y@|a@P<1`q&H*f(T~L0_Tbd7dXfDqa<tG
zcMWX-wcuP4I4jC|vy#F=*3w2ZZARwWOV=YwLGn~Oo=RO(Emvne*SLFNT6$6=%(+;@
z??U1?3ZJ;p-cC;w<ANB!)yO}Eo{v@787BpFQ)+I`ciuih^M(pB<{|P~75R;t{SS3M
zgF|;vCX7$S_<z;;AMT~AxyIr1LVd<<Z7VaId6{@l&?xsgNzu+Spw&|haLL#J1T*F$
zd@XP`I9Ki!%<i3`m9uEsskS*I&a<LCDaLcAM2yZgk2u(%o8_)YL!kFO3!3L2dn&J~
zP*M{ysjx0{qqW-}EK#9&Rk29M*A=`KotF`wM0le-X;%J<I2XlvR};St#)s-$FX^1R
zDK$6eh^1$ZgXGwsGoqR#5eOK<kAah=%uK-N0{;?>e--8P3fgGQ9)RC$gyF_fj|9sh
z6Ql3U8B5FtD`r|b5aO68iE1?}S9XBUJ#c0*XXpOl?)^AVvKxEOG{&<oyoT`nik9XW
zN^~bluB($8y(tl=D_xL?k;F)CgGne`qkBy97?G??OPiFR8lX?c7aIBR8kl)t+u`+<
z($l#ZjNfVEw_<#(#x+r*8}){nZO+{Q+mMMSun38>L2<<vy{e)7b>Va8#raJz{yUK~
zA<`DfWIeCBsdnah#0f{+JP{D;j>=2bRqk+&&}eZnQ2eIoBynfZ&N7%^7w1f`oZ-p4
zn+#YFpq-Y;fAGuxH0Rv7?7~Yb%skI$*-e_+@DI<E^^K961US)!s!k+LB$=TiXzL&~
zUK#{z^L3d}(?PYxZWR6`i4!h7=XrJAa|P6{sq=mTvkw%m0(hj}Ftg3MCr~S6Pm-9s
z@CB|?IZe#5+$S;qq|R?V@?Mp=F?!9`=yV)pAMf%W5O>sD)R@F;3pGBmXe_~PRXZzj
z{UW$I`xuu|&T*N`{DZ{f184yMAbt4HeksA{2+x}FB0_C~h+tw=sx)RKQOu1fLZ5_2
zAbO(5Noam^!H8v5LVgo!7`vWpU}^3sHLi243S1A$pL*rVm|5Dtm+Y;3r!xL2BtAm8
zN+RM^8)mjS_l>CmVsydyn!vx{_O-jtG*9Ndr#+XnBBo*Pa~*+I!xpEij8DZp3FL#1
z%*T1n#*GFo+F8y&%<Rl)RA~n7tbm=GF&E`L&ga3o)c=Frw|~KX6%rS4y$XCHiDyK4
zQk>_FrIses20?D&HX7)yfE$uEH7I2&W3;up<I-bme<t;a&GOg9;7XPFLxL@og&2(*
zf0V=@9d^nyrP?sF&AG3-n$TbfN-L4is!GqMJe7B&Zn<EJnG$H%{1B~H2hc~qnXfqi
z>k+&t;5JRxv59t;0WY|+gYlUMK3N#o@9(F4KhGI<<Ewlc0#B>+D$aA7bNEB?rMU{V
zk+rm<n>9F5h2ESz(V2nENSHwI87|=NAU!tfX=^gvx}g&BpmeF?>lyr0%JXtfmH0Lo
zH(aP)Y05WyGv2g0_fh*8n+3f(d*<vnJ&RswW1tsZ^P=G8j?E>QWdIFcN=@&}v`@;K
zS@PxVCRr!1RkCxTl%-+xojF%c_&D`^$`|)XJ6jK+WnbDAeVua-7l0Q<c+APk69_g;
z3lwy39HI`)Oo$|+D+!1=<`oGrh6#cym!IB)tZPoP_|sewh2H0!(`_zzM+ibNXItP&
zvOpkla8GaMHaF)!02$-~c1gq}v=!|4k-5%DbYlp_+I2G=p<gE9cp!Kz@j!!HK}vwD
zEE@r=P6-6^uzDqeyR++XLE&8b;{I4Qrsw{n{69*nJ;wkGoOReks4S;!<QdPQ?jACd
zph?cmjoBzFrZVU0R78T8G>%~~cHM~_D-W!iu9~x3C$6W&jR3or*b`{uX4})|+~*^L
z3ACo{1=#I7=4$j3*ZjboCTR=-5fLeOFN~#TzMGk$8MBnf1jqaAHg-CPna!ryH}(Y1
zs`E+hT)N+2cK;b#Is4n}G<$sH6{m1csqq+^qjq78=g!?urEw#v5>3iTRNhA3lpwrR
z)tG__sDQVtrRQ4pG>4ENP~)N)9ds3471=WobueWMo8)wCnA+ytB{M^D5jrz=6?XfY
zg&6LU;A#C@?X=V!yPA%g=V>0dtbM!X(sE>Hr7?hwE9%D79hE$i<*?(*M-usH|K$Dg
zojnjh1NJ-Rv&uQ8!fOW4m3@49XQzx>nu!z1=Gmx5EV)RDJl~m6OnS@%shi=m9(X{r
zo;RH?zwoppMq$5pT=Eoyl#I7cb6|7sjhP9Z!mb!MdSR{|(JRC=Yg!*O<K|gScS0Ko
zb(<r#U8y~dwv3s>Os)KPVQ4Ni<!)ESgBk?HgkIsIB|h$z&p6^Xr-ut@r^SF9;eYpY
z24}_jfeFu1GX2FdoJtilXhbm2p0o(WGC>dp5<SsF2DrKfuW<5MluM0LVe9s%O?9>5
zg{My63si!tgJn1OEC^wvscp_tm|3Mr${V0sg*_8?qcB%55cUA30488I#CEBJ*6n1s
zW}XOWRwe?Nm}oOw8}iRW`Sr>migU?@vjNV<|0*}u_3v2g{8#H-sf-U%PKhuRc*=5g
zNbf=|2}el`lLU~|N#-P+<oWj^h5<$ZiP+fnEK>yQ_NU$S&94xNxH^4|?A4B$;tCW!
zVZ+om=Z?<+W(K<wxiJN^wKB89&Zd4d_X1|iu4Ycs$a_E<&z6!I&P-wEgMKzN2+F1>
zoPg432F9x{d;)yfDwo&!wOsE&>lX8B!Dl8s?aqq^r!)_)S3=Hzn#_4N<iXpB5;YNx
z{PQw8WjO8?i4J2n>3a6Ce$VvHY;9y}4PHgW0L}f_t&lUXB-$pmc5`lKW>p?c&tPUO
zOxaV|?Hl&B%lmH2(xCO9YSL&Mx|-djt2r$-6OEPubZmvC4fC4IsBI@$*1oT(^Pvi7
z;?}*z1AW(7FOxVe-C~~$L_T%+QiN+JBuck)h!Pn^#Ua_&bLYfu@&t&v9qieapSzxp
z`W#*9%7h2!*!PkGB1VeNeh_vna6^Q7+Uye8oI7D=!rTHkg0K^veX;zy@#+D*j>D>J
zz~?0?Iug)HS2GsSDt9tDGxg#~@M5Yhb`4*KI|dVy2-h6G#5l9q=K`mtdvpN};MdZ2
z@QuTV0-uX9S4Mk=`ZQ~t$;ia8WFckq-njm*r>dN)8LS*kK&@KuE`mduT4@BR)AxaS
zfL()KarRRw8>(DpZ$_gw%uK3s=aSQlvv05)V7CvGGPA66d|<lS0A^$`Ya*dqb~W?8
zOUorkBLR_ddGIuST1$}YOpLj}=MEos@D0C~cKu}YL7bC(TerMt@EF3=z++lcEIm&E
zxC&<ArNf!SAq_LdB#%KQcZ@(H;VyU+L1uVo;5|O*X=RfCf#_)~Plt}!H_RKyQY5O7
zOgRbEl_GI7QSfJdDjl0jQH?!wcB_j0PH2ZR^MRZ&+KX0nvqlL%)y)oeH8V5Y!kHmi
zM;lY9^MpX1|CvPq5-tPp)xvw}B;P)eJNQ7pfTtxcW_<05j~&jsvxDGHG1khY^qh1|
zCiQtUJ|W_`V5KTGerP71nRRcBx*b#V3K1jqiA4pw7Pz6tUdowOUV&DdhQXg7kd^Oy
zG(178#-0UkRIuA87Gfl?3fq4`uifdQ;MpYOY_cpk%REDc1Pz+yp95XZ<zzsP5vs`(
z0Xq(7J@N5k#@C#d`27L2qNnxnwZey@oN;Hj(A0)J!C#Yd3`r3iXKrk%v4yb(Y&mSX
zvqdZ==#X$52;P_S({uSb>S^J@mwIBPF3?r5>%z5Q+}KPN{CS_4#qqYx0bi?Nw+nQG
zX7<3C*`%vE&T01L4h;#kMopw~&vy>;9n`F$Z6R!tnBjS%rx24NO`~#WSClgfANKI|
zx^=S$Uve%>&mH#p2zVSgrNUz@r}uruaGTAx*>I~Q5uzo`g+$0DC@Dt^js7&pw-Vm2
zS~(tEnOB~!UIRVeK{u<hXjmR7;6zGn5tdKv@>toFqTe&EY$!1!SV}|<EKIUyRw?tg
zFP+T#fowOwSvTvEt%xkb0l!%)_6#po(Xi}9bBQ@tO~pX#lij;2Wr4SI1?K~tk66=0
z!0`aIH<@>D@<qMRNmpLNdCCV+GeiW(F$Fgx37BV(jwQ=0C5oPAK4@(zuPv2`Ik3p@
zV~iSlppyjCQ-HMXi9TbmabimJsw6YEV;<1oGzz}&tjvh2%+1-Y0(+g%rWWHtK4=e4
z0+dp7QJMh672T|HpXg@7R!VHCjE;lZ7!~A22hR<H;Cb?A*M%=JKIl*I1#hm`rtxqA
z4RPLNzyCk{%UR-mhbM4;Dsa-Yc+fJ+8@Xv<BH4$gc|(jVL`x)bl3UqO;MvpGL>P7v
zxPv(Uz$OU}VQOPt-w}Jq8n9Sl>LhozT&Tm)#wZtH0|Sq?RyGJZrHk1MEKJy|B70q;
z)jSoWJYb!7WfEX$0t~v@5ZI{H-cPI;B{V{XEzgaB0qmCBoU(y-raAm^PvCQP-ft_u
z<W1Rs2;YN;aB8lI@ke*IfyWJAQ!5eOUP@0e6CA@(aBy`j<?_?rFbOz`R2mF<^xc<6
z+lMtta43`u);VpHu%z@RoKWLrG9-kD^nKWzwVafQBBNP$ze+4R=tUmF1M3!(0Q95y
zUwJCqnM(4F8#9Eh1Y4RDaI$We^|MBu#`2%9N_tL(V!%b5w?+6PHCG<eL**fy(-If|
z!M|#r;!ij)i1Gx&GvrYU5paj3;6+axY#VtrDpT9!UH~m;csMz}*gfHrbJG|?As^@@
z!NI5FFtlFdeO_!4D<hfYe^1IUlp04%zS>4xd(^Zt!;_G3dM&Ih82eF}8zgGPAJ)Fs
z1Ie>^SwW{0X145R&c?y>V$~S@W`jk;m)p^E!bX;WzQy?z<AcQxU)`@A0Y^O#&qDAI
z(s#l+SKf8!1BdHn8%$HUR_#WuLgOjd?hM@)W6N`=C3ilJnfJ@i=Qv3)?R@qRxAVEe
z){NBGEGl8gYp%L;U4*#^aRjr?d33Zg!$pW9%-y-}HCHQPr$qleoQaWXM{^2heYqRD
z>}Zy|lbKk`cWde{0A`+;6+`X7=E4}M4cE&Z{$rOo$9>!p@Mti!;mo*EM?SX5NjIK0
z;Y6Xcjd)>HMp7wF0>vECu$A2fBw<vzgJBp6uLPF>eMKrsxtXbDw&V|m`WJ1@$y`i~
z)CtLjSPRjdsBpsbwyfHnYS3gh^PtCzl??{jNCC3ETeh`4{<hx>izFnmakyM~2v^+8
zrt=kM76^6DR?F+>%FsD^PBRmQV%2adzO!L+$Cg{$%7|hx=+yXHg?9x$j(gmAnBSg<
z3uvb$&VS_>W<4J{JTJmYb6!BGECY}sxa5TqMo#B&cTg~MaK*?^NOvWtt5po95Ag~Y
zijH=0Cjk#nQv;B^FDgZ0-eg<K!YZ~y<b(+)qU8yL4T>C7RtCKq`>A3-MCMhX>!26I
zB;pTb9`i6}#%fUG$jm@lMrb!4X<V3*XQsCXhNi;S=r^-66<{=FLwYsF0y(X~1y?>2
z<D<nk-#koq_V58MgId@AXaA;l-ow}~F+)En9hC@Ulb|svdYWcNrUE9ITh5D>p*axq
z^Qg);5ATI|+?ZMs^rSQ}tdA^Q>1!h<hykK0Tghm|Q8&WK3^t7I;V?4Gqj||NRXQ~m
z3HB>v-Ycyn(x_MQa9G(bnHgw3X#%*Fj^#82LJFAWEoU>l_|3BKZ0a{_%Io(U@F$FS
zTj84rX`ns6fClh)?DYRDA5=9p!YPasgFlU-^z_{2G{q%v>0C0k+yQk1BxKMkj1IK;
zTq7J;rnaK3DebHxrbO$o6_gW}^3yU}ZW?S*=Ar3iCQhrGfy`l1S9GnB9-3Bmhs><@
z(g0YU(cJQs^|A!p>Jw&`8C%{Bkb_x=QnPZ$B`-Vq9Otdr^8tVVU=6g#8_*Ev@3|KL
zH~+YSr%_Je{6yfSK^RKUvIfsfIhrU2Th(I7H83y<7!mWT09Ak{;ayd{X~%`B9n{vy
zK-@)=SM)RJq7W@Fo$Vd!ls9OF4P$$Nj4TI_MsfNi%uyD#v)=~#lw|`M^Zp-V!F4NU
z)<lBo63oUppuB=^3&t{YISDZA3MdOsibZ2qwxI8c^0_$gbk4{8y<9sk-@fDJe>%Zs
z-Q_I{)Cea`__6xvPs<d`a8)qJBr`X2%RpcblE;i7fF#62*3*V`j*jEc)CPU6b)qYK
zGov+O-vdn$wk)uXGmA#GVQgz<WKon>g?S1rB+=DI-$r7x?1y~lpXhfmvt~L4kcI!5
zJ2OwYi<y{cX2T>vHq$l~b~Z3Gh025^&UuXAYvL^)TW<pGqYY@MB`*HP&ow_~8|Rc5
zGZS7^VauFe4EG!-<Ot@Tb+fWx-Bj~vlw}6ySY~8ife%bA!mXGZ5r3HG+nd;0E}>(W
zmoK+7p-Pd?gczW6rAbhWpkBbu4H3mRUbgRMVvs##)32EbF@dSli_s;g6=%P$ShP;0
z#-;rI(O=j<JTRLsHaU!$O-Gu_!1+=yqjWWGj0D>9$--b?Za$x>P@5CQIFIr!%Daot
zIJb^fbl)F91NcWt-J5>4-s86fRGfhGLxslj@?rP9KF;&dCn9B%KrAyccSNjonLIN!
z%MAjNfYgp0rl~#D+0VmH8P}4Shw$5;=*oO%^j75(pk!2S1GCZ<Wdmk+a1_U~A$Ith
z3H0K$26Kc~l(vq<R*A7EiD1NH#i;QIJ-&1(E2|FinH9}!Qf6jmmKoO;iJ1%AUVNRy
zB!F9P2B>B06hoADp6f*5BFY~~{I)yE+2aOg#}m*1-jx0RSAM2$sS!?k_N6_m%C<Q{
zgt<eld5pl_aVd5V0apW2%p!OmkMe=3NsoJ-htY2GsXeUO&)cvyDBaMT8Jo;%+5|I$
zJ_uW8G$vG{C@H_NE6|%*+n*EIO_G9F*jSl1A&@NZwuq{9$yo$p9)z~-j~OGI>Sc$_
zW**ec=&43#W@V&ln9ZC-axv&<vTOnX!JV1rZYM5WcIN{z-s(?q=3&ffKDvOG%g>$u
zKl-Ot!*&^1|Ajcu6t{BkQkt2bXQSLEB7d2gaz!P9=NV5KnOe#_J#X@<9X9)UjC8eI
zFgBk#o!9K4)aJ}8p|;{7ib_@Kfr*emC+1d|*!Vygz|4puv??qj^jgsZebp0N!J-`_
zMs|B<Cf~`-$|w^#5aGlKX2Xx3rvcQN4Ktc$&E%})oLzBv58?N{@+qff=eT~mkM~gY
z6I_cuA6Ai>C@0-%#CXheTUkZQ&^mY-WY5Oi%+MH_+5l=3rba?;=~K&7p?)knpm)I7
z`iRrhx)Pd1n*xmm`YO@7Q(M+Sf=r&`Q|2}m!XG)%JHWt326K>!36?DXJZN_J$3Ta%
zs1scm=&V>TBp}C)k&XYZ(#b5E*$OjTv1Tw~W-wbZ%yPgut9jsjoY5@vo07rohQJwz
zx1;hQA9L+EzZ{M?pq&=uZ~Suo1|OuJlahyNf2#19m8}7J8XZx<1j)PP3S*lxwc!OI
zWmT7;C{o-*;t7#JLJ*IbY-99r96O)~8QTbMB`MdPICEOB2%bh~_$+94djoZHs-T2J
zXGb3;1~*|~(|=2)<5s08AxHTnqXSwXN=2-V)H*2z>?R-CabRSJF*9FXYBCI(56Ktq
zWu`feV@tWD6t)imvpl!yH0C8rJCCwA#h!6PgpYx@D(8b(bLlwhW{(b_l_tUbZ~fwI
zi}&291S)f0SK)-gmSiUeWzh<zxj8TeHO=LyTV^*%K;2;&ld3`n!qPNIoxyAli(HQ4
zeP(G7y#sm&jE#g#P3&?51rjo=sZyeKrLja)h5Qt^K&APDXnFE$sp4f|a6_4P@I&8r
zi2kU6c$<w_huKo5pI6M8c~;(wl`=7#t&J!ZeawlmU2wV(=-Qr`GS5K*LuXkhU)SSv
z!emEA*2{Ejjx2_yCXwJyC}!E(<Cs~t<%tF>-AoPvvz%krxR3c}L!w4y&b|ttW4tAS
z_ZBlQKB&C_-)}$z__eg{ul&ndhqzH?cLuMiaAKJGJd~+PW@Q56noEdasDVnz?5kWR
z1%yN-AwGje-W+9vt%JIBPeUm|(=lZ+Q=JV!@D_Tnu`Q!>BY1@pP^^?FPF3ZyH0Q$`
zRg%(F(3{!MeFL(CfA0`rJNR)comeb9myqLtxY0)?O12l|ELOqloSl~z^{9>cuw&`i
z=wr8HWqC)&bY-G0@&j4D9a&j5u6mR*&a|8W7_AwT{Q$GWm{~E?R_^Sn@HxU;qP){K
zoaMAE9tEg)bb<v>%c6bL&oy)E0zj1+uN0=nVN4B2hHy18P|b9vOcWrFcxet$5A+S1
z7N|&l1v7zm(A6UDWkuexV{5l#ZMngb+MLVP5C2XCZG_5<+A1pVsJ+U2Pn{ewW0pH<
znv3+Mu4JWrx8+K-@naqWOt%Hb0%#&RXkh#`Urs;_zh`-mgoXV3NgzcbN+e1{AM*OZ
zzLN}QIKxu4yxRVN&+k~VvBO!}u+T(ipsl0zG&Z{oi+f+TF_qcO=>))vHN)8&HM5(U
zS#8F?2<L#eao%aSILDih2ADlsfCliU?00YaXU%?&=$4%P_@iRHy_u<jxPcU=hM_2G
zj$&Cy8-K5KK3!1}R3gy>;_-m4CZnFgvDMaYb4KP?KJ(6TZ%A8)x*$Z<8??ZIQs=Ee
z<Tie&q-?C0Ql83Kst#Y@43#ng4MUQb2Z0|L(<-5yB{9Xy6*d`4$ns+>-~}Y9Nc8#F
zsqnfhf7bCujY*414wG7bnCcOjs5scgEPysH0WR@BzD&%h$Qgi5F~sK7jKd}XmZMFx
zTQM_p<|2HF^A7Nb?gU>PS9`|y1JDLg`%iwh&RI=}pys@+ux%hXU14Qj(l~rD-%<ch
z1u;c@kT(aWQT_}GAwb=N2c#*wn$JPD$?DX@*eZ3uncJk9&_Wtt4L(j-2nn54c}<`x
z!3IEclz_OBTPX$1D#`5@pRzPv`S}21jQX5l1c<SKR45ClQvo@_f|JxpQj^-8YLO#)
zys&E~EQ|@0JkCt)kTbPpOvV2}FRKqM0w!mgWm|@oktStZZ3M6_q^zG)>M1iDx|u~Y
zn+u%7c?ak1&N=(2f!U)8XaN6B_WED>CrwZEn9GrospSG=wfmVb7?N3oxDyoAB#Xh4
z2%a@16;KbQH6HSXCLt~$v#}JgV>wxH51QLe?5)8iM=^P;d1L($R=Aa!Ywi#a7Kb4P
zSaQdB6)_L|w;y5;N!hV4CG&3hT1vnd38%)(=VxNYDb>I<ux4ao$59hI3N!1+rNc@<
zy+z0Te=XsRT6SU%(LX7R{N%LRp`)4i+d8wd$fQ2d&8$@j1<cOkydxFA>uNsdwCp{K
z(C}yvHvcC-SqFX!{1WFE2(Ofcj#!vlE7@b#o6-%x26PAufrTjxU?I+87<VDiiO>mj
zLTUR$?5a}kl&+f8`NAXR=Z`9=-6a6tjtSoL`?=Tm|0sglbV>GL$%upl1LoDRH<Pq<
z{|`yCI_PEDEZdAMY={B!Rc7X}hw~-EJHXq0;uHScqX}k@E<;;oYM(Y8efD&d%=xkA
zqz>@BGRy_h>_Jn@`#%GMxS^VhAhoQW1-J5JNoDtnZkPcjqMi_%>|62@1wIb9XGURv
z7Qi+Im<c#-Z{OKpo5#boy+=apx}QKcl*T?`WwDg<9ZGiohXVuVIpQbp!`yO~O@Lt@
z6KBhvy14yoE2$adE`X^uLwFnItuA*n_a5ah>!ZIu?X>K6|It5dnp_HM*3Vv5cpN2|
z(@CC1Lkua=Lps_zvQVAvYK{g+%!<$*P|2e&&?8k%6hWlT$)vrL4(o!-@Ur<nfm&GY
zU~Ub-Gh6**CU*u%TL&#3P5xmK5B&P~@xgGIQFhwJbOJ5GLs?{!XEN&oX4zks7nIBr
zY^jf9O|!xM?=VxPE)hUOIOCQojTq{1LxnGZKLCI17JSBkk@=(krTu>FgZw{b-o5Fc
z&GzU#(2LN!@l$c0P@%EBjUab0t$>#zVr4T91dO0UNDxQ_k=)fIcR=$Fo!nbf52TyA
zpa<F75JmK;UdjWTv9=B{r_olhwOR`Lo#wL*_Kbnu6=T3wz52&)@(Vo50C!L;JIKlo
zbTR3QVV06Go5z^4$e(CZPR7_O8_lz3X3V@KW_XSOs<D!qp?Ra4!;UDQ0Dq9gJMBrn
z;_n`PFnjbhw1ekY-puxS)dPPG{L*vk?Nj;w<So|4ua-pVEUzSPMaPktPLzc?Z4l<>
zbcFHmbQ0(&dRo!gq6AVW*mr7ckJ@Dn2bkCZWTA-G2TQ{OWV1V55!j~DOzSt5o;5B9
zzE&f1d&D0Ox7EsqeVM}u6I7%zF1slKja%x>QqD7LM)5z}G8)L)W##9=^WWRj;>L5h
zD#EA0+md*<J;4{pVHdy#&~A19)@NHM_(2r@68NP!e=YD#0kye6B&Tln;zSFy7`=qj
zEbszg1E47j$!bO`J_1`mGz_STQHWGI5?qW_@^$kV&H!kcu^s<QIRP@C3h)yq<`sf2
z3V_Lq7Idc!O>APA1={2V;I@1KwSyE*YW$G`w!?g7)9kWAE6YC*m6yn$LHJK)lerY;
zHH<PTvtpKQkRtvkW+=7hth1^l&4!X^wq3yNiVN=oZ&%I-i+wKeYiYkv*T4GS0ot#n
zUHr<=u}@b8I?pD7pSkc{@v23PP6Tm5H7``j%>qy~Urqs0p)$!&Pmx>>h@d4uUI@8d
zsOoIQ9k%`)rmd~`)*dB&Z7E)70BcH_9!DT6V`bUt*U0Tl&jH9f20(KW!yC_=Sf$Rk
zjn<a7jYpE19b(0}6RnJCT=vkVEJ?Fy&N9PGf<^|qyv#($l-V52Xw;+l4^f;;E_?|5
zHYPrZC%DMpiGAO$|M$0}^eb07o~q%e82<+6-?;L_VL7TmkCQ}+IK3#nQLG)TmY_gq
z$^xewZ5>97(2LMXMHHhakcKi;s$7b$l%aWWdU<h=(?vZ{V!9Q^RppVV84KJ+$BU{6
z5ouJ!>XB{8P<qz40JPqgrRLx#(;n;0ovQp=`MQX>wQS`-JAB<VGrD8T)TTg|DMJon
zoRpVMDKUrgl2o*^m`hEZ+LhU8%aC!INweZFW2MBb$v;-)E`42AKPEB0MtBS5tsXw1
z;VP%Ue_;0gWN5?5->@tFue`7K3)nadhaUplo?mLc*vQII5R>eJ7hUE|i4)XN%b|C{
zQpp!{y0W}AdWFic5p+4^ZnH@01eryw-DWhEdOy+EjuB(?zI161TvCrBUVw`%+KA22
zWN4jG50Ym+3y`H-bUTBLrKTgeB=<gGRV_9G+t4iNg;}*^Yb!dG977;W<M&pW*fC~v
zbU_BPHW0i;Cv%vUD^+1(6<&ZUF;i%gm4zkQYnEAAcK#2Y&e}bjWLc)o4tm+1IA5c@
zN8<PW7M~pFaK;ToyK}boSkv(`iN8kqcW%5^_I_Hvdvp|SP4kdUH0UI2Xql~fZXTG>
z;&ce@sI3`2(23AXphxK?ka{7`Aa;Vyz`7ykrYa*nL-XKaGPc_>Ghn6*8JL+HTGyh(
zpRtBeClRl**ROIE>BU{tZvklHnR(&0$1;B@5$l7yb|qj@u`c1FZqj2SZmn&tq=+0F
zrgj)38+5V^{u#)YKUQ^4#|T)7{PCid{r~Nq+mdAEk)=QP|KAarQHKQTz*z_cf>CQU
z>YI5Jy#m*xn~}{G(#?#uZu)xq75Y`i#;n^U8xUtGpeX8;b%>0Jy?^()aNj#3i$aGM
zAW+4R6<KkpsLZI`E0-@{zC3Iep_Ps1SD(OZ4!OZRm;VywWQZ84yFqAj;@lJE1C0Mm
z;dh%ESNM(G`+L9C>mvbZzma>JU-;VxFR(TkTv!VH(BW})4os<pUv1-=9ib8d9T4MC
zgz2_wC}-93wm8M36xFnU#GsJTcc9jxU88xSbzprq59U3xuGn{)v86UPGP4oPyrNw`
zR+Qp`x*}$SR+YGzzsis1xQN(bgBPtPhKph@Vp5Pn+!&zi@V*!5Jo?kRlf>~|XJkFP
zs-dxVkyoZ&i&@xi6#XsdDFcMMbo|eDT>JrEd7H7zDa=$R5G?60n`K#AEhb>DyYPV+
zzf<GiR_}i|7n<w=?XNliDsA<;U*U+8D%=E)MR?8NX?126wB9_1)D1(`DHMu1MdDky
zCTIn)5&7-eldBjT3N<GQiwlE<cdfZH3^2@kbQ80u<|jLhjcN5>tl#^VJ!})hD8bHl
znb|IwRiU_uHbtwWR))C0#SE;8NQoZ+QGT}Rb$x6Kh+#$DqzyKNwM9y+GIU67A~JIs
zHndqm`aYTvv$j@Iw{<;027LN_<!{4i^Y0JM(03SF9|mpjgOP1Ot5a!IkFH~fQ<HUd
zqe(WsWHYs$W&p{|60~wxW;b;)BQd5VlPeaZephkc1paN~{DC{%cvQgb(E>Dpe~})z
zI{Y_Zbu%_NONCcmc}C#~IAe0U3o3@FgtmrJBo>YokB#nCjcQKSr2Q7I><y7h5x~|l
zNS`_Wh1M0CgY7c5-CYLoz()6Pi?JPSyO|TvX$1L>%*;j9N`RRcv^1(0R7<iqjY*3t
z$l!qHwd94OA|mds!?cOX3@gn|1ZxbfQe`NhP4Mc@0IuSw%dRiYYwCQfZyCti^ly`S
zw{R-kf0vOFp0Yan%9M_t>OP70BdeMLvo<dG9hn$A<4uv0(IuD#v)k!n3b+fm)%et%
zw}9Ud8{YgbZ8YC&Xy5etl^@NWr+`-*{DUa33S7Vu3(c&Jo;9FXnY6WDoSqzZ&ratW
z*rX9Rw6~I;wbbV%|GX4>(MVbC3vHI#+Ltu8Z@MeGWA>apXC*ymhR)|}qO2C}I+C49
zF{Rdm7KY-ET9r~9^-3v*x{G=l)J24WZPG@p2t?dnS~UvZnwvsv&=hadutse|!_*iC
z_a=(<Jtpd=PFt_%pb;IEapQh!T<Yrv{y)~We27N2A<9b+7FN<rR;S3G5v*GJ%UUw8
zk(CADO<T*;5L?Yt>`!kQLea2pxWf%M-YW2W;H|ZAm4A}sNAa?*k1U}5lN_(#@Vkd6
z+;5RMuyptl&SjKC6=voPX|fe3d}<jx6vC@c!H0@aHP-D_6KZKxgX)D!Y%f^n$AU4q
zqIHwn+74qAu+4y->WXIk_qQ@mrC~JjA#%oM85Pt?=z&#G_d&g)Hb^N%Mp|i7tPH9q
zY9=(tXNq?5p0IL;Hef|WRhqVjtGF2@7_bRi93KX+rP37bHux~$vx4-VpA&dmL%vzY
z`k;?2=XoFOT6zXA?lLmd6#N6gMj)FL7LA$0tc}9HOi8m{b}(nj;%2%HU>t+OJC_V&
z1aspaa1D4D_?^OACx?9c_iD-5GqgYFyy2A%N3))1DZGa8Glw6#b3UIjNHDRM69!G3
zfkJOFZLmq(WS>5@=$I;-Q@*y6Ol@Rrl?{z19fQC?p$$fx<tWud8QZRd{;!=pc(A+K
zBR)sbmCSY;0d+3Lp;Srm(xH}0G2(VyT&*ZlP*kA|M6~SrDvQfi&H-E-{O+B>mpDEb
zq!}jA3~x$l<_sfKYXhxW9YnF#d=O~E+8Y&@9@~f;cHpw!Hd4NpZs%7x`=>FbhcU87
zsS$D+rDabg<}qhGjI7djME#h#91XBDBmr#;SRHNB$_g=4Tt?F@fCzU4KEU~R8gFho
zK4Hf3_hFIAo}qn{C%yr0Y~JwW`I>teD^u=@@B@qsqMQL{S!!;GF6pSP6^oqPXc}mA
zJ`=dAX4Al#7~3#0wjn?E^xiQ@W2i8gM>o_Pt*f+=vCY8Ov18K55^m~@meX6GzLxhT
z8v&t*iCPVI>KcrsfT|{#iByNu40pj*q+Y0U{+UC4?%8>H7GSYypI$k!E4O<;Ub_zx
zZ(3DE%o`?!Vt5n5i+dGxXi!~raQChg@7=$Cal1TZ=zd2d^Xyu#2V`Po1Eq^*kyhWX
z3Y;{u;WUsb)RtxCB>E?yF{aKE+FF8L8MU%pPd8JclSp5_k8;D|BQ^dX%J0@^_~=mw
zvOS<Z1lZQE`^Oxy?BFwu*F<>DjTc2Yuh1E}`H5&4;0)@yu%$%4d+KXLI<`A)bSPa5
zU8Kk91O|6HY6MZzGobVy+l!jRAQl<=UTB?TE2Bxneb`}b74gjuYlCpr{{_r#r@J}L
zX1Zr1U}rx-b<`QOIBJm&S4n0Tn}S3Kb#tVg@8syEg}(IinewwIXZkWA7dE_is2u*`
zp1pgsaU1tRT~s0q7y{J1gfGw=gI9HL+9?fl5bs5$xX(poZ2{!oPql{sr6A`0cCz71
zZ0uy~>|YgRW)ut4bU6G+@0aCH%+ZDsnPoLg$%->;TT%aXd1;flUp4={rEIaImDOpm
z+_)>k`)<4`%A0HFV{USTf7yfC9?<?s7qtJSAJ01O;oNoQ4$kv97f}v1*xEq2qc*uL
zq^MC)21|`hbn>o^Hjf^mH>0{T6royUa8ITd$sYqceQe$s#3xW|;yC~hwn>I|FyQOD
zvkv6XWp3?($G?K5)iSX&ag8o#QB*}#Oo|J2?KtA5BK7g=PrPuZ{P0I-^gq8a*PouN
z@&f@`lyXKvo1=9#ynm~=8ynLe#{(>-lp<z>dvQ^5*Jh#)UR|^`w^>1khj6qk$NwrO
z1~Bi@Rcs~Kndh#~*q>0$v#hiPvS9+WZuevQ#A*wsRVS-OmXze8=PWg=j`2PLWLtx5
zu(fJJbK@Subyq$X<1K-=HfuiMpZ`80fA)a(O`m_3lg%6cK1*(OjgLfm8Re(I4^22y
zDCW33o~u=i(VrG&#9*O&bYpkZogQb<)X*A}_BIov_hfdlubm;;+TfO~tuf^ON!t|K
ztPhQC1;%E|;Qx!6n{;?a0)>%wK)gd{VJw#1E-$WwRzbv3Gt|paL`Bu5Okg(mCw_d`
zz54P(fBMXU{-?7lPn9UgSrndr{!mqg`GLy8AC~=_H&=3f5bq5sMcj>{xRhXH$qsAm
zJqc@sBHqWSTJ9o<py~ECFtLKHJYIj)$hy$Q)Q1%3ZM&fy%li_La{jWz>6%Za<F@pS
zl5zq*)qFgDpamO?217}pD;8|^ScDIWl#F*a&L=Fm&2PUytL659_T4B!SHRW&b-yux
zg4;u5sfAnO{J@0^z<CuG2%f39QEJAeR#Z?6Kq?Z9s{%t_41?y7j0wFvLxBy(U<rUU
zhU|*w7RCTXH(G6&Wp|WuVT*j3xvhK$#J-BT<pu6FMeo_eS({6mM+;hlooN%?-G@$P
z_IUM6FV4G{Us>qSpFb$C9u}U$slyghyE8?ee(tbjkY?xVz24~M^TB-6!cMHEh?@Jj
zm`3D}6p~&M>A~AJ7;@EirY#<(iS@|A5a4x+iS?n60cvBnGSXMdPA=KD>zKdBQn7h5
zGM_ZDEs!MudTM6M<VP#hW3jMg7QxC44!6X)f$)*QJHYQZbFTb7WtZ&%?Qc|uu3z_$
zxyb#p;UkonOn6n`6@!Z!8b~q0B`=b3ACg3xN6n=zLpBS#1h$T7Gz=1&+r~(*dED1~
z0O5c!(BigeYHZNlX<|{5_L1~qGs8E6ohT-KvdCm_a+u5wpu-P(#4@!POVQg<N5s3_
zkfq6z6mb#3P?tePMIERj-NmYxUOA^fd3m8fdwQ;~E(#YU<_u5Oxe8^WTzd9EOMyC<
zGJkuCUt8Jd&E1N`_>_B5chRaYX35sVwj!<~sLOnVtb@75e-=ht@50`KKClWdHYf=L
zauQ!}FtG%*u4PFXmWwZymPm9RCuWw~SF*9H!puj|@@YVP3w|2xJ-3^WX~-ofN=h<(
zHK7-{?#??Zyv4w~>lvTZacd7|dqDd-wYASTzwqmaKjxM-?jRhi^Sld}#5pg@nf!)q
zkOS+=;Et+i85*T$0Gm!fy@!}yq-vI&7R`o!WM~u61u(WOVVewFaH}oKQB%B@06I$8
z9CEbEHXCf7(+9G|{U8v>J;!$p9aA;j(9UB)uq&aPWpw!_>=iN>Ik?p6lP@jwwI83+
ze|%<MUYRSGYz%vR;B9PiM_s5~dgidG3Tkd9j^60))1}#oL8}(*%soACQl+|R!$T`v
zhg;v1d7?m!k>PpCA1s4)t~cmRlYRBc#?}$6XpK@W?(?yvv>mGiIqDWHs?%U<H5pl_
zl0X+AH$$fNa5e86Mg2Oxu1tSNhcH*Ch+=Nscj21C7cP7Z{6U>}Rv+@oqcpm-2efbV
z{HwH+H~ce<<=pwG8P7`L6@gdWctPM?&eRnHmq?{B5C2*fj|l-_u-sB5V_6w<eFHFP
zl&<6RdOQG4U~r|SBdv{q=lQzsQ+i1A*rVVAM#Dx1XQ{Ih%nfOwq0I_nv*>AdeK`Kx
zEZBqlpl*_u4bkfO4CyW%mM33b=zn=-p+CPo*Ow2J$AXAG-1X{^ZByhxc;czKzNXL}
z2=lj2@T>Rz<BfT97jax2Dei6_V!WGBx()Oq;)45Ts|UJLHu27gm)z982_RdI3@mLI
z7=kAYi+vHA(LH5iRTf$nmL;dtwQa|->I0xP&hsWCE0ZZUfo$Ac0aIyPa$F8K?u+oD
z3vXNF?Naz;E!-OB9Ph#GFFSi<?O${LyPumGFH(8c;3aXMLU`Pbg(`<QVle@@(U|LO
z#GcSL8g<8VbZ5*e%2Q1yw;j0}aE78ZjNZoQ<|<^_`8`Gxo%WeG0mJem7+o&w9W9$c
zH}ALh4Ml2=L3HbeQlJ!->ILm;o1H0o_R?IRd+DtH<kfTKzdkk7muH1DvEBJkTlgja
zR|Gc3>Wj6#^Va?Lf8M!o|9)+0AK&Z!{$RS6hBfoSj6tYv7%*|#Fa%t00I^xP14qz|
zVR)Tlu19Sww6I7*iPE}|<>h3Nuq`uFr=WB#fo%dP-)dq!++tC8jIbqFA{Uc%|3{hW
zW}Jw!#JT0dRfYE$cx$7)&u``K{^Hs*v~U0XR_<<o?e8p>T<@K?4W3isWl>%<=NWYt
z3dKmq7UFbq2^NK6nm}Y@Iq4H?YdhuWAWU7)mKt1}fUhOE1$!GoZHV4xur(3PJvN|A
zk2x7#WTE)jI#u;~FSUV%=wFIU@hCG(tx&a_Uq19_UOT7%_~M!J^Gh@RQKy{oC|$Gl
z_|-otr^k|}bi%>Knf}N@JLu|wT^ZVk$34A+x(V8<4h=J>VeV}Z!#a1vCm&j_*Bb#X
znUziqtOck|EJ-3M7EjGAbgnW2)s(8@IhV-}8yi6^f)&fe$ZP^O{Ypj_v%)8$e1`G9
zIqxW3slv78S#I-dS?({aJ)r&V&aY*;ge7nIReC;?#!WG9AiUtpCE$o%#uhB8pES1U
zikilxfkA>>fKZ!Q+g5*T0)rB4k47`0snEx=K6)HCiP$2d9Bo;S8UxKsbVO+ZYE{5;
zc$~F}Rd7K8Rtu^0#nI;Bs4JCHLC*{4E_ZU_(o8R%EpldKesa>d?*yPtp+0~7INS1*
zBIrWp@bau)x_!_t-d@X%H9p)OXl+2N3}#kM2W)V0Gh8-!iKr#%M?kaWy^;(pbL>)O
z(+pKCC`FAfOV18Pn$zjHu8>n!iZX%N7RX8thu74^bOf^9u4Q`3RFaXohW3i{1;&Ri
zyxS`8wvI3QM|l2n4`|=T^BXbnYs0Tt9SB#Nb6Mb7gCB|TLvx;<7@J@wIJu=Au>6T`
z0+wLaELdEdw6*}Z=AH~J%Gst8d22+@+7M}O3?ty7VeiPxzNPctq(qvBX)?7ChvLc_
zzzXVK6+o;N6=sWtoEMXNZ^O+`8*jT<H-w&tv7IdNZDq->rY59*C%9%Hc~w+Qho$??
zV$?(ANQ}YOtlUep2G+0!7Df?pOBFFh{Vkv|MW>gMsim&BEi;|kLjO_?{Yy1GVFj7G
zj}!Zvm=_a}jb&<?O4|Ut(MNVlBQrP=;i@|yD7=gFNfEBC;F$l(9T4ANKzj}CyM5m9
zx;WwTMtDi!C3l{e@UI;K3l|m|<&9612Tm_Cflp{&r?oaG&9#$$7MJzN;w(LHHr_S~
zP%I;;B~!D!T_lUH++<!#3rH$~2nhjbY2|Du^C!=8^!QxP&1W2zLMQHO3VAWB3o5ep
zeLV<h2<{#${zT&QQO9v<Ks(uRa&zT(zPQiv@y1s+lvaS&FtbRlZ4KPY_)f(Rg8(lb
zK`k{eO>ogRGBck5u1?Hqyv+`vMRP!jvQkcIV_8C`RyWRFcKIAJWe{fxEP-QpZiw))
z!+SI5z2za-_Oq9JK>I#|nsUtfgE{A$@q`zi66XbRUUcDEhof=L*a%9KaG$><K+Cd`
z;A#J`^tIVI4wX%W>HcJMHkGa0=b7!iev#Y_AHYWOyqq<5^-<8GpvAOS>Y`&lD^jIU
zP*63^2yVp?QB>Wg2<~yW!0u4JiJA*00Z=A_xv61bj;(s{S3T=ZPmc%OS(e9bC{D{I
zENM5PC7`v5Eh$RT5#+X|=Qx9@<5!vGq^7@2(-WpC@N4#jB`p`~TR_wueQfG%TKpRx
zi}Q&K@4N7!G_Drq=4#Cyj=00VyxarY_y4%?KX{^ZejxCY8_$by$%V&o7VexunQL^>
zEJ1EiPbT&-=0*zTdH)1pJCBd|kASwr04)c)Z3h~>NUoN{pnyu0kVTrb66w7NqKZ;Q
zlvZ3tHD*^uC2bq|ylGZacGlCy*XKCR92avlXx4B{4aX%K7S>up3~OmKF;g3x0L_vK
zj)}2M%y0`hzN4k>Fsl*Jb^xkm2|7LQ4?aJ-l`$cZ%r3RcwFvhSmg3xY=L^wbWWDea
z|BIXZvT_e-f3K|V?Bay;L*cx^1vQ>^;aQyL5iScHjjM<)n*ex<_{p%cw6s(Aj{rB`
z_8o?|3vkK!Mjh)*fEE(EYXXpp$uue@S-=T`m}p78Oi@)+1yQl>bH9S2A^3nghMB96
zOwD}q$A!}(7@M1qUk#Y)_&S0kmWJR7$i|P7pRIodfMqGFTOizaBxO4WH8MQk{+W`x
zTR~_J$2ivzJ{IQ_Q$A6+Q5$!bhunD-HZAP|ZGT2^J2+VL)Zjd)!t)MK30!hGhjWJ5
zA9|2xPTc{yL4Aj{$qwj^AeFytm!*wBs9QkO3D7M6Tm&MGfJQNrkpWu}6OGMS6R?4Z
za2os`N>t-N37|3ywq?@PC-8C&aBJ~gvjngP=3fT1m^gR{pxF*Ejn;|Nx0P|0^8xV7
zRN^{;SG<?KzzR4)xG!+m;R}JQ=6qa*E2}wIa}Ica_JH;Xp4Yu&!I{GuXB(U|;etAs
z9i9_-#)T&xjx^Sp`3^v}AV3o%+iGE<tyw<q=}oh268Oa6e9O#qyuVm5Gu?rpM1cf4
zK~XIxPL!Zy8Hz?u`IJH8vi<%N-!e4Pe>(zLOADLh*3^kF(&8%!H;CJ`H#A<xRTzPe
z1hfa)8L0Z?OViva9y6-4Q=$gjk{wM<veXO!41@GKwXx3~J{7oP!Zmen6u5h`;T}uw
z=a}67>;Y|m0QjXJ9xk{z^gJu@oC{C7^Mt?=;bmI@2Tp9(&WqA*>sM<sb~|_3ng<ih
z((e>Y%jY>@8cc2CFgi9U6X0Y7w7?yz#@yw|$aMUk(j8#i0kZL<jb5|_v;jBuWME;A
zH7r;A1w9fJZ0rrX$`)=TVn`ogXDRZ>S14a%Wpzg*tGWd>vsiAk23815j1!L-pPLD2
zS8B&6CrhsHGs*UVwm*OB{K5+_adzRHY0APHXT5Myor^9!Ey3U}JDgWI%nQ|Q+s*Ve
z)Q*70q?P%OZpH*~AhGZ_OHU?lm7`Ib-z~bUr2$39)y#R1Om+=FRe1X8iKuBpDrYg9
zXXh{VveeVWw$D4o&|?2{LbE5Rl7sg0K<T+{6p%Vv8dKuqj+Mg<P6X}<Tyx=?IG>qt
zT^iT5aIYB4rEs73xVN9P+ymPF{728P{Ag}mY|7IbtnISHkqYNMSsSrgXqFp>W}~q)
z)UTcHCNvqF3qHjo?x<3@ZW-4phBh&^5mFM+WEar>oH*?5j>}+RyMX2iTs!85)W}Bj
zZrG2v3~l_BqCp@JbSTNC(Wl>wk%etYHYUQ-oI4q+c+H&8i}Bf7x&ElGh1&z#{(N)i
z4WDt$VliXUoI_U*42~QgSLdQD7ZonJ@i@X`lX*88*rdVvq{Ddv8@o&`_>ZxBdo<q4
z2z0`zmIa_a5E`j};!7E^%G*OqQO~t~zQgNAxE-0<mg$}PE4@wpu^`#S-0EvgrdQ{-
zD7Or5h;iM7>jJkFj>T9N;bggC$q~za4%r^i_UGFKxeZ4%xMapf6)w2(ge#9>oK<1r
zFejP{+vObF+^!Cx6sAHgx{$@k5v8rx<|&^$t`WNEq7&T6luh>M96N<c;uf!Amak-|
zP-`q1#Z7k0NO|D<xLHP>%NUO7Y;uGBT3~I?66Ky4w?(;W&J9(rZ{Uku1GfjSJ)rH+
z-~9a251Dg-a&TbG-I$wm=y1;As3?zlu(>0Jb1t04IqS|@!WvT19WFF-BMsF`9!Le!
zvI8{^QXbIC{+MlJ=kbxD89PefmU_8QC8lgk+AWyL&X8y`XC-hC;hs464DJdX3miA&
zcK-gZ3MZnhSIQb=#hTS#+}{J*{(N76?vV5IfyWGvTzSlmvkK>Q#@X4z&WYLKdZUN7
z*3P!W+})HYk;B@~G<f}GW2#Jc2b>+i;S`e^n-snSkYj{)jAi*`E15Q2rQ+7c=?S2z
z=FF-yNTmC&QqaGPb5G!|B@<IPURQ2&!ks;E?E!6nzW2w4H=<F%J!UjI3bXSU>CRl-
zbXsM8=QBBTa=R`Z4vTW=#sWBW<q%_`Vh8TbQ92bmL_6PR=T8~>56Ec6x5B(9Kt(6^
z6bsBXeopV$7(Kp;+u9?nX{-=V1n#4(a`<~K!hID^2I0O8tVQXir(ez4u%_oM8(_n4
zSntP=_JFoOkIMPq-tiub#d#K;t`4>8qKO=;$wJ}KL=N4Vi8Dj26OXM%E_CiP6Ui+`
zHhoWx<3dGaFnnxCj5%*M0-8j**o*i^oZf^%jE$-G(%6WwG4YiuOK-kxYd;w_v!xoV
zWn;-LmU~0%{_Fv5f4+R)aQ(?YP;Vbn7sog2YF6ufrFGM3ogt+m#SE=T@ouALqMe}@
zI|pKS=I9wyiLL8-dnnm(Fn5uyY$k@Qx(#?!otY@{`yMOqt#@zLt*sAiIM@us^8ORU
zr_l2$ZJ%7RKl`&k`?Ej$vp@T@Kl`&k`?Ej$vp?U$`Ty0C(R(e6%LD)b002ovPDHLk
FV1oAq3<dxI

literal 0
HcmV?d00001

diff --git a/src/assets/img/shuju/measure/zi@2x.png b/src/assets/img/shuju/measure/zi@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..6bd33116ce222197c09601d45fc6aff4bd08de62
GIT binary patch
literal 1198
zcmeAS@N?(olHy`uVBq!ia0vp^DL~A_!3-o9&wddIq!^2X+?^QKos)UVz`$f1;1l8s
z6#UQdzn<a$Du)028UD`%Gqy4OpATkiX86Ad%-G2Ae+ihep5gyeFk>CV|7BnXPyvLo
znBo6&un15kgaK3uXRH8A0Y!iepn3=wnE`YFP%%UtD`O?t1fUc$184$71jvAx29$+}
zz)7H)5J5NtC<SK&84xZ+1WqE0!xf-uL^Bqm7flTs7pMi<3anf->(IFP9R`%eG@nQj
z;w^&M65pt@1ek#Kmjw9*GcYnSv#_$Ub8vET^YHTV3kV7ci-?MeOGrvd%gD;fD<~={
ztEj4JXliNe=;|358X23InweWzT3OrJ+SxleIyt+zdU$$y`}ze01_g(NhJ{B($Hc}Z
zB&MXMXJlq&=j7()7Zes1mz0*3S5#J2*VNY4H#9c4w6?W(banUi_VrJkG<nL@=`&`|
znmu>k`~?daEnc#8+42=DSFK*NcHR078#is<vUS_`9XogJ-m`b#{sRXO9X@jO*zpr5
zPn|w<_S|`kKZiPj`6I;B#W6%elJ($5K0POf)`OO_JGxw!hg7l7byD6wp`i59-}?vm
z|DGxN<NN&Zs?hb{ckR7hJOAD8_xFCkdw%!)^MB><ckitR;@|In-??6W_uks;tK+_g
zOfBNC`R*=#!)z*#^7?5<Bd&R~xY{HrI!Nqd-&dn=F!gMhepZBVwt#d4D|@;WBhSL}
z4{zslcqQF%V9T91ZASM@S>`oOj0`n0fBre&W@y*gDzR~i?`<7-<yh_m3<?hCAI{#-
z%d#=E=fMiW+{-*nCSs8SGY<YJ`0@5QCtJ2$f=hFN>C~AIB21Q@&0$z@x^Ukr#kS1K
zfEDfu?<=Ga^&A&4b?i`(m)ZX><q%Vk?9mRzJ#Ql~C>)W9X3%kvpHnN^+}UEpd93?{
zjU%JA3kQ?IhsMvR&$CH7Ut-feVy2uZJzGQ6S(w@90{gl64GbyHH+Z@i9hF`rU?{cC
evEiWl4|%zlW?S6?tbyUnz~JfX=d#Wzp$P!*5Iczg

literal 0
HcmV?d00001

diff --git a/src/assets/img/shuju/measure/zuo@2x.png b/src/assets/img/shuju/measure/zuo@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..3f62fc28d8814c3ec45bbff019b9ae7b35a26464
GIT binary patch
literal 1267
zcmV<P1PuF$P)<h;3K|Lk000e1NJLTq002M$001Ni1^@s6ISf3K00001b5ch_0Itp)
z=>Px(tw}^dRA@uxnmcS;RT#(r|L<JKNu0E)qL9*H=Rru*G%ac#Hg*Tv0X9&FR!D%9
z0VD<xLlHw;(gY<uhERs`P(W%$1_GfK>cUE<QiNSg3>8R)fu)EAS|I`@_(SLVQOj`>
zJGS$1EM0lHSLfXCcfQy8pG#EYH?5vsf_IR>=<hG^b|t1L*O)BVK<ROsKh!oA%s~**
z1e&%LfTj=hQ4pVtpcMjaW&oj|wKY+L{_=Q$Dx1#ZBn;lBz@Y$}3BbW$)o1>~pa_B>
zhA9XEXs6)gk^!{5uMK}M;(`cHSi{rTMgchTwK})=V7~%E2!f<*^nMBqt+fPF|7x5P
zJ)m()d*R?q61~~Rucrs}#<jyCLh2w$ASi-EBz$%OtfB6^r2caN%t!q^x@He(n9}1A
zTp-byYkZ{u^nR<&i3EaTFl<+rc7+8k>G{$IyN0d?05}#6@JjIj#?<lo@D>HHK)}qT
zS?*sB01sT%I`0AwiG$&cD+{_au+yuWnm60v0s!2M`mq;eq9_2qH?%e3!Dj*-Swg)O
z0AnhFLF^NQAdI`hHf|44;K|J^<p2P|%P~LC+tOVyfVwv|4B`t4+A^_~<z~g?fIYM7
zR|mt!W@B;Vb`XL_ntMrfxv(k&fIk-M;J<Mn|121QcS2tjgLlEyilmcE0RZeIo?5r`
zB(rkzx<8+R>jFS96$|jybmO+N2aIcdjlr}K&*o;+LPCIon-n}qn=5icWP<=CAn1t&
z_|vKYykpu8!DR>z<|`)!0?70Qn*xB~O01p7vfKZ>9^gHzPpDvqMALHRWGey?;Apgy
z^UDJ`p{Aw}<4T-y8>SWN=@tYKzuw7#+|A!T4>+aGj=`rCJf3bBs|f&zk$4wp@&fRj
z(IEhrl<o#0(=S&MfLs48pyNhA?=AsgPU&+X-Xl?)?wPC30|b-tE{^8YK4?zs^MDJ$
zTeSdyv+-_D<OSe1DmDa&%L)XxT?k~T*d!>JrNLuW7Xry@_H?|Hv&&Zjd&ic+eRy33
zr>n3GUc27O@X7#EcfDi!q!OQ0TO*_f!|?#4t9F9+0q=x9gaj^CRVxh4#5y@r5CHd~
zajma4_z1)^YupUYh`|7eJ_=;j{Xpfn!*~B(g#Y_){<i97D4UXZQeP6mxwUME?YY3N
zY2E46BW#E;1raNHP_SbOkjewFW{t)=I9U_``*7W)+83WIhaiG6mDY#R=Ohpjg9yY0
z)3Yvm0CB4^fWSPtSg;_Hrd2UX48ZQMw8cZ$OCmIgkQkz%t`d@%08f3_&bguixFC|E
zs67BVSxHfJFshzAcQBAhN@igZ99Bs-YVK8vC<=TNZD(X{08;LdlEp8QXjm^<yyvR6
zS?>T5kz_s@NDHS$s=|Q5K(vkVf<@7Mee^~jj9BS>hYv$GY!cQ>fDi?{3y{UFIWy4!
zM@j-<M@b!xT@=Cb+<4uH!_fmjYL_S?N`!?tOhG>glMb7#qp<}w2$T%K^^8q?IJ)--
zZLIeoB;qF4umwY6X9~n<c>tv1V@n*5t4in>^!`UYA}p5&WF?4g{eeV=gZ)H?I0waR
doBa!s{{be7Vd2gQY_R|U002ovPDHLkV1kT|JUIXW

literal 0
HcmV?d00001

diff --git a/src/assets/img/shuju/sight.png b/src/assets/img/shuju/sight.png
new file mode 100644
index 0000000000000000000000000000000000000000..d1c00c46fcb4a4131f7015ccc14f17a60f31de9d
GIT binary patch
literal 52546
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

literal 0
HcmV?d00001

diff --git a/src/assets/img/shuju/top/1.png b/src/assets/img/shuju/top/1.png
new file mode 100644
index 0000000000000000000000000000000000000000..1f4ddc87ff47aa84a12f45c8f427092aa127ef2e
GIT binary patch
literal 1191
zcmWks2~ZPf6izrQAW(5&N>Pwj(GJCGP11mJ3xOb}fQcY6$tIg@u8jr~u7dR#duWyE
zFjbCH9V0rm9S}PmDYjVZ2!f);YC8yskz_Z??q&&!juJ5a+4=TA-h2P|zW3%GD-z^|
zg~Ws~7>qD}eohJ4<Cp#*f3W6s93KQ5(^Qg|&FH$f+Qne_6&4i=bAizZaOjXvBm$V=
z8*C{eTSW!VLP&+e%@w=Fh9^cNu*{~w&scjLbp{eaNWqc|lOTA#ekL0x(jg)ja){M5
z55}wXWSQCl=_rnvN|oEqdd!H@Su!_E=8|ZzYSd=d+f4?W8J$U%*lPFDT$#NVbttrS
zhK%CFII43BRpbsOR;i=edoe`k+NE*{lr&31X3L3UmA%^FEJqwlt$Uk{W=q|vGJB1|
zUS+`c>&XJe3|C5XBz6;up<3Vt!8BU}0sy~jw+dHlX|5DA=z)bwm4P#O4%nPhHLlg!
zt56U?e5xe#6s}SP*Xu~00=TGbIkr!4uS5Z@-Hd`TK#QR|zys_cFJ{zZ6?&`^#StxF
zz%^RHhU;{I0hHsAfo^CVa*acwaljg&+@aDs_aIAo#fWpS+9^?kEKZr)Ria!fR;Y4`
zR6wn(6aaCRAw(fe?1Tvc473qNN}^avlqiYMkB~e$PzcnL`3jP+0OgYfFu4P!G9W4w
zqOu^MoZ2p@a^zI5oDv(|DN^@V8R#3R+MOnIr$eAQG)GE*A_c9Wlcn@`t#otS%()Iv
zo5l0J#nXP?^TYYs=5w<xmf2Rz^Iw0P>%Z}G=#F<9^V$G#uO0Vd_ySEY&@(=tZ%^0M
zYA{c*xkRvw!SwTgYguq`NLYCIij^xPquz~K9k*spLPBEF7B+{&P1&}MmnSF|mP1NJ
zQ&nA4-*DjA@e_?57cTwOdAX;j_u3zQH;0EuMo0e{8=IJVI_+>0#PhiqFJ8U^-)rx}
z;^LbO_QiEzq}%v8S;FKyoe$uefRCdCt(}I6t4lEHYxEOWuROl`8aC9dZ$)Q2U(ZjO
z&a_T)+2aS}cCI@6<J`?4F6)u()@MxY!a&u(r#kP3wRRO`3|c;_OSv%c1xFNh_vGVP
zw|4hryQ$Z@F!@W9Wt_Nu`r^D`-jjKmwJE(h^zPreneX%&y7yO(9R8-wR3BwzY+p>X
zok&=o2$g$cTc8t39f>!3GueUded$*Y-yi7JZiwE@>wmbGk>uBM_R&z&2LGuQ$;+%^
z-9b>b>A*mHWK+Cx_KnfMY+d*DYZN~~=*f5$`fdOC?X1v<(OW)iOn1DoyJziCc=U9s
zIZztk{par+?}bNOOU=RH(ql>-3D-OYmzJR9lL^<el2(z{xXls9>Ab1!@&El53%ze0
zI~`i4h@JFXA0TLaIDAOBMf7ZA?U(&mGIS5ZKdf8M{A%k5@sYe!h0Mk=-lc@m;^7rR
zD+g-?+_+PPe(!B*7yle{FSs_p;YodjH!|dF_S1O`%NKi*24)4#TR51Oo~|;41;&m0
a&b-|`xk+?1S#uu@1%sa}$mz<4j{FZz2w5-y

literal 0
HcmV?d00001

diff --git a/src/assets/img/shuju/top/2.png b/src/assets/img/shuju/top/2.png
new file mode 100644
index 0000000000000000000000000000000000000000..fc2e96ca409708d24d39714760a3a2e018d46b10
GIT binary patch
literal 1373
zcmWkt3piA17#>>N#Ur+swH0YMs+~kgQ7L1P$~4Rj8TZ?`Gng=}GDDdZB9~%v->p??
z(o!q+uwB;1lP<KR%Y<`g&Y5%0%;YjLmHj=>`+whm`@a8s-{<>J(`lXtE7q(akw^w!
z2dKWlTP%)cOMs=e6g>t`C*9YRLTY=u4k3|rpU@98-NEJpzyfK3MOw()Kb*%JD^HqW
zImvm!@-x8%%bpOi2oYzZHBZeVe@t+b)g{U5_)|XH&^*>Oi>#n+!ZUoK#!Qv>CM3yg
zvXPG^dQ8@E(KH%d%E5!2plU8$&xe1@ku~v=iUe6j0xV9)ID6sdoXPrQu$U(+kC&Bj
zRQ@*VBU{uyWV9ei=|e_xnOK|~)WnyGdCFi%s5x83+^V8)LHIsUeWuFi7bSg*D!`72
zqsT>JSj;{ZgDk5`#8MA}r6P;24BSCP?naOM5kU?}ejwD4g-7jyYtpbJPeuCS#k8dy
zB4nqEu@xK<;m$~&KbR}oc5qcPNDeh-L5+O4k+1Z#k)MfN+_`j2kwF6%s>^`t0Wv`#
zxCU1yfe^Sl1-`(AFQ$Sg;M(*>QY9Q&X^iY#tgI|<k>GhiJW*De2+EV64wn~2fVA?n
zQS#zwc`*mcJBkPb5Fs0siWCGPCxekwAxL2;Qq4my@KC-Fn(d3`FwkF_Xf6woLQnXk
z<;iG8sv_+Wprhb<D~{1Xd5X*<fV<*kghCXpC{4uT-LM2ImgtTpd0@$&Sjqv6>jfmj
zjt66cP%J+jXo5%Y#iLzt&OSV5KOXCf$5C+pQ9OrD1nnS#0UUu!MCdLe%n7JOMC=Bt
z5@~dT#~?CT#F=EGgiDA8O4c?Yl+xc;d33unz)s1wR|YyLubv0GseH*mSQXP+ef^@k
zt!ApDWxBg<y65I}Z~OFM@66rnGyita^xxM!eW-c<So7wk=Izj@C%vCW2It1d<|f|E
zzaO2Kj%wj?tqfp7E1%FJlUfwgDgfZm(1*_|{Htd6>!;a;g@wP=gRen1NAY}V43dt{
zl5f6Ux?Er1(9m$zs@2BECZ?uq)|qek*=n=xc01?YdtLUqAEeV6EOtm}OhQ6pT1K`&
zR8m=4RdeZ5^W_`uw>t0Kf7Cbdbny9$;gQiX=_DkRA((P%W>zydH$Sh{e)$sX{bLOH
zQO~`ouFPHikzoznjOcV$*~CLjax_|9%L;jMP8#1+?9P7X{D+0j-KIaUv~}IHd?V5e
z4smkmu(i3|e(lcv-<vz)C^u?NTf03Dv%_6Rgs)pW;nTTq?R7VnL6s3N8Ac`!vzh^M
z=TQCn4TEbh2;zIMAq*26iRWh9!GZu={)-@q9;14z__m*!m5uq*j)tjMW4BY3=A-~g
z?ANYg^Rsk4E4qGHNcX)=oEY1wbv3ybdMmAP4^v<`B<xQ~(aq(maWjeD)r@5O{BOS-
zSZedGjx;aD#x{lNXC%EJU+L4ZY^rxE#$vtrgw`~o_my{<kzUOe*J&wkEYhnjHT$4T
zenwf@G-~+nT_KzMxo?AuM0ZDvg|i06XNu|iCFU-DEB!3;B~o<kzaOf4taq8}rY;Hm
zen7Z3r5+0`l1R_4c33BFGzrSqM$J_`TBc81OEHdhv(B2I9iI57)ZC@p;HH$<w3(@s
zU^F6hN@<i@J`^%KRU<<J>c=9e-!XaQZp_XhVeIldx>kjb)QxVr-1!!B-=cB#sg|EM
zt{1mcz0Ut#caB-05*XOWw?dMG9-S7H_4bi{T|L&K+eW=L9WBLXxetW*Fy6^4HT62>
WUM&6c2Zt;{Gm*U9Y1B4KnDBp$*WaiB

literal 0
HcmV?d00001

diff --git a/src/assets/img/shuju/top/3.png b/src/assets/img/shuju/top/3.png
new file mode 100644
index 0000000000000000000000000000000000000000..7e89e21541c733cc32f0e98f507c08e8a3e916da
GIT binary patch
literal 1329
zcmV-11<v}3P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px(>q$gGR9M69S6yrrWfVQ%%yiwtmeSTzOQDu7T4)oZf(b|@Rt!;63W|y^CI)#y
zeF5VO5W<6j=mVN)NZ<j3kOuMRg%E^j1dX;O&{CyQKoCSUg>BiAWlMMVJJ*N(nVFqg
zECio)l1aY(neUu??z#871N_%7btexUJGy?V;%L-TtcK7QZ4W53<mZQ5-;e)m1Wt5r
zm<iFZiDtVJ)+-XAh9aRv10)r7pVImhU}VRvwvKCeg~0LS>uSYT8<of^kd`6=$pX7c
zP(x7znRVP?`fb>$4_aRQG<C-Wjvd?dw9@H45UFxS3NH!mBI5c^Ye4HBW!ld*FaP3V
zF$|+P_{J5AdOt*}ln@XCBFL>3B?~NhQjRLw|A3Du+xVe>&(h}GBGA>fu@%I}5V4eq
z157Uo2%%gzM4az(M5rg5kVEG?+H1x{pr>bZwV}|VgdsOb2H1((1Dpl(Dd5~wY}?*B
zCIV@Dbh8q<F9!&bJfJ6P5~f)O(~7_<i3F=c54pu>cP@Iq5YKXd=<ePyO$lGgY$C4c
z-BAn1O^BlQfu)F4Hs+tbIeZy|XTHSs3x{1Qh$}q=$W0>nTq#Jf0yI}a#LDNA;@yPA
zJ>eQO&R&g3Wg~73o<r>X5!{IVig0-y>K=U+6Y8G|@IltJ!j`k!7d&260Yh<lCQ|Vj
z%2^9)AAA<36~@4sgSdKnU$*u&s+(TIq~;~4XnX>Ra|e7r$SMF!upGd*J_WkE*404R
zl#4VcccHl=l~Dk|&~Jx4=Ccz6nGH)y{lMa+52Aw=Flf$DqT!g2aC;%Q>FICQ1ERsv
zxTg|A<0b(B>_jZEKjajFNRtRu&Ie8kl&;A|?rAjQQbP!xisv_-IHeWg@&=eCr6{X=
z2&3^oFwnWRKmjLx+5N_y-!XdvaAMf2fFNr=@k&R3o#%*!CpMsJ`jhz>uKj)-92s<V
z$)HpSLbhr7QXrIsA;ION3d<?$@GHIBF?gy2r4=(VF}e`<&RPbuq!h8Ptxoz}jVotF
z(N@xDLWA~&JaDlblCZ3@yaEt{H;0hC{2gLFnMPM0T~I*Y+esnv=hU^GBR&G*s>m-&
znDq4Xg6>u}X%1#A{t%4|-^~-vk>g0__%}kOFhdots3oshcAwtBR@~CEDFx~yeqiSy
zO8nIYJ2`}Kc^x7(b3Nq7*UbX}j1FA_N3OzM&W^VPigLJUBLZbNgo}|ik;i~pp!kLF
zQQf=*ljp5Q;?i6&m4Hz)9_7*b0D$YKzw$WWdyYuTrrukWz_3~QS%rONixM^j9=9Z7
zr*;D*s+ty|yz#O8vvy(-@l*S8{ij_Xk9hO1cTa!o$1As-h<XpMe!&pE&p+vC-}Doy
zoewiq27PlFBNx9e_?_M~kO>o<F?DU<<$oN>`VOqxtEgAFXFWv?Xz%=2IEsPVRYk6~
z5QcDN{o1~d#xxPxG**Jr?e~EMR)@#1bhq&Qy)6j5D1kXkb|hh@o>9WiTMQUZx1%6%
zZWIELt@p1v`NnMzrL)>Pu7$!wtxEVF$h7}>4IWsWwZs(ga>JV5H{Aos9le<J?`xlK
z*?0%!GEf`t@f)7eoG^q5(cA{4w@h1eGJaQI&Ccy=t0&WK5Y7kFQKfaYB5i;JhSvQM
neKct#5461ApTPgu7_Ywp7p%Wf1wBve00000NkvXXu0mjfS@&~4

literal 0
HcmV?d00001

diff --git a/src/assets/img/shuju/volunteer1.png b/src/assets/img/shuju/volunteer1.png
new file mode 100644
index 0000000000000000000000000000000000000000..2937ab236572a64d02fc0533b6bef8c9df4c1016
GIT binary patch
literal 2333
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
DaLQqf

literal 0
HcmV?d00001

diff --git a/src/assets/img/shuju/volunteer2.png b/src/assets/img/shuju/volunteer2.png
new file mode 100644
index 0000000000000000000000000000000000000000..0128eed821e8f5af2e56d76eba607ac8cbb79c7c
GIT binary patch
literal 2164
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

literal 0
HcmV?d00001

diff --git a/src/assets/img/shuju/volunteer3.png b/src/assets/img/shuju/volunteer3.png
new file mode 100644
index 0000000000000000000000000000000000000000..a070fa692a1af623028a4209dec8bca37ca7b9b8
GIT binary patch
literal 2211
zcmV;U2weAxP)<h;3K|Lk000e1NJLTq001Na0012b1^@s6!gbF500001b5ch_0Itp)
z=>Px-T}ebiR9Hu?mTRnBRTam7d!N^wJ2Q9YzHjesX}L%-eb6=#3Ln%WlIRCOn$Q$$
zj4|PZuMlF4#uyWVAJJgK2PM(OAjUu>0s@Lg8jZ-yVj%J=y?qYtecySWInQm@oEcIO
zr5`%U$v!i4X7Atp*INIz6c_RJqiY`AmAJ_dGAq47fzg@$q!&4N-}%C!qZfLNy3hyZ
zxgYQS%`K^pZ$jZ|V?X<?f873y!SC<A_M!cD>il~8+*WV6JxZ!F>ca~xO`K?;&GmOZ
zfAGkKoOMA!58w8%b@rrsz>W%E8R}F~M$s)a3H;_WR?HVOi`{PQKQlMKm$BwVrXf;L
zh=Ik?)126H<aggZ^7&gY8qocF9{YZ^K7G%IvsX~)4x<IgYqK~x&*H?flU_75cG<CO
zOI}!vR>n`>XUE=*9ed?sFmj8NTGXbFzPf*5>#mCi^w8W(FU_9WcD0o{BzA;R1}n9D
z`>%|i!S9wB>QsZp$@zPX%97NISG;bi<i`HNQfvIW$PM0E_s{M*u(ZAPQBW5YvL{AQ
zzf$ZB?~a{_#12nuV;xqRKA?>D?8FhkM&Pw>&+NDrI-PwAh7{`ULbv=0HyZkKrn5I1
zjiucO*dARJpvT9LAF&f}k5MU&@^alMy}!D$@tm={k0egFGSsbn{l@0_V}BT~e=K%a
zu8*8V8x!v^mib1ZTLSd+H?3T9-ABR5_y1ENgHZ})<e^8W-h4$Fd$;6HVkM+j^2CAK
z_M88RDO!d4)MvWY`Ij+H1a??%7MtGc_qv7FT~=x#8@RFm?VFdk+-oozdLJ>^`-710
z0}=>%;1SSspnXu=QPHE*M}HZ5tuNV$+xxvTIv!b@-FHJU{M-weu^5UrWY?n3JX2h`
zvtC)aPo7Kd2q*M^zJFos9j}A42znB-MacF+CU74Fdk;wH9|0vG^21rMSHal`!HMG9
z)`h8~j{{p&X7#G9QlI|I*!s*@4M=wTDXd3@*1`Jl!ViN&lgMr32bJG$sO`AJfmFj#
z0+EKqhQx>D!@zn#0&_U0*8$i~a9wZ>6dWj|&~6u3chqLycp$aoOQhOLtue+|HvQE}
z3cu2+bv&}dTU(XoudP*UbcX6w*JhubtzCY%i<3wwfj}+=T^B-u%OG|knTPB)$V9Ck
z(8Cz31h%Ns1}}qx{38P;3rZQ3Z0IzKt5=`e^xAj2h1R4O78zgO%*fit!&c(dTIJ<K
zXE(e_ySU2O>gE?VpV{$KJGH_-OhZFE1u6Tc104gM074H!fw~G(h02tu^G~n<Cjifa
zApuY@42)<Pk<~y|GN@5#%^kb+#r^Hl`k0+qY^?2Etk$O|-<f-!`tTAnwe82Zyu0ns
zWID`xhtM!kSFi@G$(rQ%0@k*n+k_BE_Q~@C^g7sU;MqA$Swkg*abQZpcm|VlDcImc
zrQ<i|UcdagsZ^zGs_kT9VxHB}Q(SiX%IwlpyWbVnBS<n>$e^ZS(ZGU&rNIiU8fe(i
zDnNG?!XA)>YXTe_d=E+qR0T%Eh7=|=%-OKZg)KI?8oDBR)9o}Ds%J+|O&`5tdGs_N
zpTFj<ou_skH&BW5KjllpXW+$9kKv63Uei#M7H8m`fmIjk8Fb3f-3CbyXb!v%6ji>_
z7%&5jD!8fyH#+&oHQ6MA#S9v<(Q<Kp^5rXke`tK=lH)ty{^X+?Oq7S+mC)NzRWL2e
z%G!mK0X(JPxPnEwG_19u89?wkh}E+gsenQeN)c3mNe$x`?5)5T1R{XHC9s@9kU=sq
zGYjI5*DiapAK00W63C4ze~GJV2OOX%3K!s05iGUf!3^esB?nd{H9OE=5+HHdCU^pr
z<_SENf?tI17GXyVeilJ3?Uf}u17-CcUhbuYQ?N2{j0|OcCzgA0l>TR8f^G?}^5Eba
z{3M1yS<uK}*@pELI@dw?J|M}TKG3iaw-3W-yYO@f|4JY<kjeq-JRs=>a+<v4e$X1u
zS4xBBK-Gs&E7-aY_ZxUwsxF0P3BLfHkvU32HVR$~iWXGTenJDY9^B-^HUmc^cq_@P
zBuF7Lxncr1;CU}hqNE1f%JWIQY}SFD8H}{y=>+~Ri481BVoOdY5bP5mN$QRLBusMu
z8I?Q|r81atV6O)|?A$EHQv_;VDkFm~5Q}o6n#%pmlW9@qAfqO?3^#_A5ME5-RVy!y
za~3QouwH<+55ap?CN4b*g)S6zZiupxl>AHrV;VMT*lNMFs3;YrAr-q(QmT-cJdC!<
zbIHxXq|lHam%<qXZ;C29SLK|BW%*7FGRn(7?78*87!z<}@Ixp9Ws|$~xPq|^##BF?
z7L1A4NaaX%3WS8HpTH76QB3+)Q{@LPi95@^B(Q)OSjnKSp(VLvK{teW;MD4HF1780
zoA&#dv=0FjkbWBx<;qzO;%o4v-59W>yrsJO`P5U6Je(b%rJyOUEG<M<fwiHnAm~6i
z3DLhHJ%EzX=gn2d4rzoMWYF^5JQrkS7?M>WR9_WwUzK}~)whBkkf<d6OZt+^t5UAO
z>NitqsFHi~nGInGQ2?<Ismw>c=Gq@WlniAPpaQT4vyhdyl-?Mk^StPRs9YJz7fXX4
z*nn6<nkTqGN$6r5#4tk(!Z`2lQlYVo9u-IjGm*gj*9a>U<N08dU?q9mu#<jRML`Fw
zz8MP8`=(9{vLqkK1T2w(Os;0`@QDYhfJlgL>#KVH)cBz@^#DwW2dc?9TL#?)%g&Y5
z9_WE<4~#I%fs9OvWyso)g<uAw>k=3N87T69XX+1rIe0&qwWUAFm@AO-UAeysth^8U
lZKK&=2Zw*uV1NF({{bE(%Ah+ti$(wd002ovPDHLkV1oO1I7I*e

literal 0
HcmV?d00001

diff --git a/src/assets/img/shuju/volunteer4.png b/src/assets/img/shuju/volunteer4.png
new file mode 100644
index 0000000000000000000000000000000000000000..e2fe9f32b4ec327dc21da1c6796148d243926533
GIT binary patch
literal 2440
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
GLSTYT0-1mS

literal 0
HcmV?d00001

diff --git a/src/assets/img/shuju/volunteer5.png b/src/assets/img/shuju/volunteer5.png
new file mode 100644
index 0000000000000000000000000000000000000000..4cc60c134810c6ed779307eb7a8e11adb3be7d29
GIT binary patch
literal 2147
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
Z{te3orT_!`@9+Qs002ovPDHLkV1hCEA7TIi

literal 0
HcmV?d00001

diff --git a/src/assets/img/shuju/volunteer6.png b/src/assets/img/shuju/volunteer6.png
new file mode 100644
index 0000000000000000000000000000000000000000..361d6f510a873b117944eb2193bf42268e8c7589
GIT binary patch
literal 2152
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

literal 0
HcmV?d00001

diff --git a/src/assets/img/shuju/volunteer7.png b/src/assets/img/shuju/volunteer7.png
new file mode 100644
index 0000000000000000000000000000000000000000..7906c624c3b9d4f6bec730e77b908a261f5cd4e6
GIT binary patch
literal 2508
zcmV;-2{ZPIP)<h;3K|Lk000e1NJLTq001Na0012b1^@s6!gbF500001b5ch_0Itp)
z=>Px;hDk(0R9Hu?mTQP*SCz;AYwdj=_ug~s)}yOB-BAgRWWbJ?5GBTE#c1M}D2bLP
z;{y>De1HhP5Rnr77C%G~Q9(fz5lh7f8f=}h#yDYg9G!7!-*gk~j@@;uyXwBqYwx|5
z>|32CiI4P$>@WLV?m1`u&RTo@*Prktt`~gu1J45R5f#1_3}xu|$cB&p<kk27@k+zc
zmEIWdd*Rl5U#WrbP|}PHe*Du{-}{9}o`2ES`|nZ?Ur7fSGn<!CW%#lOH(4Bm=#~dw
zb?+~)B-RxHZG3IRoad)~j;wn#rwu@Wv<bweCm`<iY}4yO{zQKGVI;*^h@}N-F2TZ$
z7SZfn^{xMS)qQt9X+Z1We)oq>UVbcD+y$p?<bn7E?Pw8xvh)yHx00_tTyWC1ZaTP+
zI2>j6ea`Dw5(l{bm0zD&|8gwn6Rs=D(5*js%YSFf!)Jp9Dh5!1Sm!Ty)BYTi)23?2
ziytG9M=%#SX$!Es+jOg&)hB<dtF;@pZ~64}iHNQU=(Y!5`zy}c>opi?uzx1fZIHZ%
zNV5nD=s38}Jrpq2VAfSlmr4FWY5PJl{!Oa-+l2vNzjb`8eNupK|LHxy1ce)7-}tIC
zQo&u>V0uo3w>0p8*uC=y&;R<jZ+~#(>1fkiL`}@!br5<NCoRDGUngGh)tjFPCjS4A
zGo&C;EDmtn_UnHI((B`O>>dgH-G96Fi?6ut|K8A(wmkf!=X~STjlXzXa;)96b!vN6
zX+8vJ-vbWw0L0;aCtm!OPi*QYZ({SH)|cM>c*w^BMF;>JTN`}p*b*P>>`_efOSj+f
zMfLWL@qiwDgE-Es^%Kwg`h&Or?9P>ralPPEx&OJ}JahYl8}F7Tzb}GA7-anCf4Kgo
zw{HAqBN^@td39}7hC4%9UtgCw+~dG514a6iTPG=ktPTFmp$xVw-J~g+iiX9t^<?2Y
z09^x;Ia1P{{yQh`?V5;XrH&}};mqB^<sT1C3iTG8wBN|G-M302ftb3%_gdzux7PZ+
zll#91HV29@+uPfbp6jZ%#+bBZN>k@@2}#bGoB6VPUAw>ZIaPWZk-~OLP;dGZ2EHsL
zr;XB`p-tc6W($xugXzq^mn@7wO60w&T0^!H(#o{Hrj#1*eOpN3PNhr!*r`3)+SrO;
zss|<d+J>3lFtsr&G#g}+H#sZ1CU7B41xqMkeJNG%+0FjS2gE09Y&`732(~lZW)5e4
zo4?NOuOQSplHTNJc5(O_wrCKH1;RLhXUsB{fQc%~T&d)Yo1{vb2zAGeN5dv<3dQVv
z_kSKXNAZ_LQpspaU7v6P)dga+1koj8T@uhDvx9Fs$LitgUFz}`VnVjGvtxU+wR-0$
z+F6ctaN%^iwEH6_G|(gfG6wSqDtjul2d4RMnI|T=S!uJ{PlgQuzrDU4=0GQZbJ8|@
zO$Li@lb~<Gg8)55g2P05C@8H#WetiWHpPH^acp*O?XU`vE$^Zk_2H)j6l-JY9NK+Y
zHNbiDUi^6kISWHOBskAZLj}%5c}Of5!Diezotk`Bw-?)H4iw8ZTpcF8m0riywy=yv
zf*w-Pk>GVzp~uoRc~+L>*BE0{%Un~Ur7L+-j+3S7h5TQdNf(Pp#=l>F>f|(F2T<yh
zQYUDzL44+17&Wf?ZSdj$$?#bSb^tyH4i{PdNJYz{U)0B+aoo>=>SJ~0Iqz|he$aM>
z2}gtKa$=GjyLs`lEJ>{ZXC;JlLEVmbGUmjM%1OF5e(37gWySP#@5s(KiA5ncW5X#M
z)3sz5jiIXy*&_nIs;;Yt%BuXn0H?v&A=VuUwAW2&61(}Pr{Cmg{m1JTYpZ#8HY<ee
zK$+Ia<4}^=n-+@2e<kR-s;wSy&g}+~O2qrv2ytK#)KSR#WJ0CvS`m{zB6JKTC1L}U
zSZjKDmR*x4-51wwJ)F!&UsA{^5*m8wg#bGa<=$*{xaue>Y`?RYMIbWSQV=~X2%W|5
z;DfzRaouRL|Jk~&&Z?>i5d%sbPjgi5`L#5nFf5b^lM-mI#G(>Mu#$?#XN^hHqFdb9
z&3kuW91TBNd-p?2G*-}V8)$zy*z)+z$D79hc{Yni?BM{n(94T^7K+7}*VXL)SzG?E
z1ZkiWVxWj|kck7?c<ed=dUU2@qS7Q?EIP$Yi1^xz;|re(UVfoWdlqK578yk#oIyJ;
zS-PBNK(CipZr~|71PVt;_3B=?xTBNzo}n84*gE(7*0sZ+QXzykjx-Ss(W}Ms9gHW6
zi;0w3$$~hu))ZNiUTsbGOi@{yl%xAy+x#aH?<nCs8GDgzGoD?TRqN~P?fg*VDM&9G
z-^~&#H2CHDIT9QW8jhwWyQ!0PuCq4D4f7bHLl4=9NGXJxM4SL&F0#aifQ-O7ML}g+
zCeWG>A#GiAp=zt2OVD2%;vGQFsnD)Zbzdc$Ep<>`?y{)TZdByNO^-wu65(YfSyeJe
zRs0G-PbIe3TIQ>)O$L^2mx%(HTLL^0d8m+rtUwcprm?in`*9GrFCm<9A^eUF?-1cU
zh|U?%Zk&H1p-F3PIjNSKsMeQ-apXry=CV%Uq(?#fo@FU^8yl=Bu%e;^1r7naLf`?Q
zJq2<GS>;&3xmAhPa{wv;6M^hA(NGn8M7+<ST?KXpxImDRbu!gL%kH#W51XNz3nLV?
zzP)Y$*iNUDhEASysa<2K2!cLS7y!Hg)&)`YLE4L=2i1%~i4Y8_#>P|CxfKYc+Nx@;
zOeLvKl`uh|F<BXrr?D_56zr@etwLd&RiMR5gss<X#WQ&@T<89$-Lq4kCP<46ZODkU
z3(_t@y8+YzNspCt5HbN$0t}I`$Xp4OAgU726M1l)Wz-0?0;p7=w4f5;(vwzbP16j}
zcG9V<&QxLUkK%AW=w47XWy94Wb)M2Om%WfCiK(kJq&8=wRD))LkTN8J8Vlo%2(!7=
z{sE+xG(;#-;~2q-MGHX#&y6PB_@Hg7wTspR1BA<-h&JcV`Ztd8(O`CDjrZP)6qa)s
zkzf<FNgK$JB|`!uF)@!?Hds-kK^+1Sd*a#~Hr^QH_tV6$ju0Y9EYb0e<NA2l`1d{a
zrHsWmk7TVnQ&GR)XR66K>nO`IuBwE+@sD{&-f1NXiONhu-LGXZ8_2L3>Lb>5b-1c?
zkV_f)=brj+W%rUGA7pY9n-pzsgp9u@{cGoY^xknlRV~d`x<C2De7_w035@-t!~PWs
WP>CHsHu19n0000<MNUMnLSTabL)s7k

literal 0
HcmV?d00001

diff --git a/src/assets/img/shuju/volunteer8.png b/src/assets/img/shuju/volunteer8.png
new file mode 100644
index 0000000000000000000000000000000000000000..fc1f354a6558cbb997c1ce2724d973dc2a173a50
GIT binary patch
literal 2330
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
ABme*a

literal 0
HcmV?d00001

diff --git a/src/assets/img/shuju/volunteer9.png b/src/assets/img/shuju/volunteer9.png
new file mode 100644
index 0000000000000000000000000000000000000000..6e2f64027c1d82567a69cf65ab84882bf6d9eb3c
GIT binary patch
literal 2360
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

literal 0
HcmV?d00001

diff --git a/src/assets/img/shuju/weiwanjie.png b/src/assets/img/shuju/weiwanjie.png
new file mode 100644
index 0000000000000000000000000000000000000000..582766fbfe50f5a4437c88552f00cc6242535ff6
GIT binary patch
literal 2193
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
T__22Q00000NkvXXu0mjfS@a#J

literal 0
HcmV?d00001

diff --git a/src/assets/img/shuju/yiwanjie.png b/src/assets/img/shuju/yiwanjie.png
new file mode 100644
index 0000000000000000000000000000000000000000..fe6cafec34b1dd9e0c5c8d46e6dc1bf3c0a8da99
GIT binary patch
literal 2169
zcmV-<2!{8GP)<h;3K|Lk000e1NJLTq001Ze0015c1^@s6Ufo>X00001b5ch_0Itp)
z=>Px-Gf6~2R9Hu?msyNtRT;;B-#K@wt@q7=aS0>H9x()sQ9%<mA<Bb_FY438gqRpf
zH1Z&c@PNjI2lWk?SK|`(!2u;a5DjsHA(2dA1dK2-M5d>ip6=?ZuDZ)P$9(5j^)v&c
zJ;0gVse5at?)}~WxBZXsHm$pkh3mcNUf}WoKlte#a_sH6wY=4v9DO*v+d94hd=1F=
z?kD_G;KvVrR*t`wXS`{^uRI#Mt%7e#;HwCSF9NX({KCWces+hv^kzUW8StLR!rV~!
z0)cygD-Zb4E#ODC=64G%PTu!%sSo%&E(!3)M??3z=XtnDxRr3wM>PL0sbF`G-?}xv
z^vBz!IOwl036MuZe)BPYnAY4?WgrKI4A2>J?)e+|$mws%NkS0hV86aNpx)$ugliF2
z5M~f=mWqc$dh1F4s#kS#038I<0yfvU_r!PP0iFtJ{M8PDKjY*1cL^5*el6gIP$Mk!
z7z!*k79nAitwVi2dG!f?U!}Cd|A~R|;Dx`RxQ$Qk^cXOtjibik=;4{cMc54jcj7Mu
zZEmk%x_*O+YAKk*Vo5M0<Yd%j7*c9d+HAk?IN!ePW$rG|H<s7QsX<Ij%I9w6=qvB#
zPdFBFR3wxXlz3{oROC2b#sQ9#g#C)12UIw)9LBOiLU#fc$Vq6UpL!VDWcXx2{{G`U
z*z0p+rI2rskNFtRT+SoU+`|0?x&$f$V}t_72+tTOXj4&AMP*fA4gGx*!`}ej7Yv`l
z@(L*}QYtbmEj%5BF3^q0%|kjshZaS5ovUv;&ex5n<1Wa@q=q7A^XU)q;CP-5O3gEN
z2@HT?JPf<>sMw`uOiH;2c^gi{EfMZkObn||0tGX)A{5LKn2n#)BgAs)A#}*84?V{R
zuX>hSyalf@(6<g?YWT-ZJic*+6O5t|3Z-z{K%c-CLO)*n3G@_ln<|F;PEFta>NWbc
zDI>rfNz9oggk@kULK>DZtl>3VLq|ZaeM*ij{|Bj?`Xnh~<1pdmE#aRrtWFf<48j>4
z=OP@O#qcVgSF!PWfQ!dC5^PX4fWHo^oFylxMVo{fstH_R6<Cdp1`b;vuF2}Kl-Hq^
zx{#$cK}2?1{ovM~Pp*&(YXbO`aQbTZ(s042cxhJ_SEQyaEyFS~I`UqKb*s>Ubpo$q
zIESInh+P&LQ&4FxHh?SWyKByM@yy~`Kv*NNg5jNc9X{ME{1x4?_w5l|=~zxvhfS%?
zP<$9kpq~%y%~@Y=*YFlI;V<R9dm;px^$8u4Fzd3gR<u~&ZP6KaWH`volU~d-IMyR*
zqvlpr(Xz`DCC6|LV4FOahoy&$a2n1-z`GU;_qq8UzuM{ZLOM48G9%fL!i<cg5|1}E
zPP8ha7RTMd8VL{hKpBKA7)(e=Lgw>2W!AOb;iAhmgE?8;=$Xe#Yo3VVhINEZEPeV6
zDJVEeEj%6)24u8jfzJ|HKsAM>xv@LCy6vxTZ<t5Z9Z|rcDfO-Jv1@5^04Bt`D7<jU
z1Uf!&$_j~>rum2`1cP{s^$BS?>zBt1?xXz$j;znwhw5OSiXm3ez&14l28>?|*rO8x
zRYA==%iPM)eSi6^bNQL%SDkIMZpPGFpvEA|7dxjmj|rqVloIe^zb_0ENFgYwzEsts
zJy>-&jF;V)|Gkv_q{93mwjVnQvoPcwqt`1~#TK#{6%>|xrThHKmit&|(>#%Fn-l5C
z?AVgZ=mgN^Kqe}wLQ&Pp((mJUlcn~+XQVD8uY2yY@x1@U)&lu@H~qO6o{iysLj^Sl
z50lZS9dl5ar;e@U9T*OE3-{^8VYs%t6HccCUa*y{+p!r^Q`p*6;+l}}g<VB8NX$LK
z28(qmS;&3MWntcB?mfkfT(#X3cdla|uB~|*7vZ!GZN^F-vU@%U6|hGVi=>$pvsf0I
zKG#&T4Sb+e*VlE%%(QpIIIlQkYB?uW7$lBDYEvTAS~RLu04tWn8{hJYv|JMAT*mUa
zC5xk$RQ;S+N^Ac{;1t3Jp3{U${<RoTG9shkwrLe>y04HinyA=Jk0#Vwm3l6*s;@LY
ztmZDvr!LH7b&$kSSw~?AwP;NX#!1iuN$Z5Xw%E$bxU^>5S+<<WDd0ssXCs^{r_EX?
zicXf4UGk{kqz_IfNg1tFE7r4)xhbT=HB)2}6Gz`doF>9TR9s^J)IO>u)0B-?xn`(P
z0=h5J(bnV`Y)!`8W(3o)YUS#<3vnE3%PJU9H<LuImO2>?vzmliaz?bGNwCaB$7c8D
zu`1h}ynq@BO$+rhY8BKkYRM>|9$H8Ws1F=XKy?-?><%_U?L^fSPMfohU?qpBqQ+ko
z&F_6~Mpc|zEq!<uM_(s87<D%4VoW?&mDPIX_z0J1XbG73cLS+_b)3ZtsdgkVil6nw
z&8WLc;`ie{IQ`cZyyjoyW~PQ!RlEWd-%TGljAfJIqV>`yo=x_>s+cOA5aM@gYOQ+V
zeRzthU9W*O(MC0D>bZ}K7SR`~U!QuxDctM);1p8#AZoofFnh*TYkEW)>)b}K*nBFO
zw%x{MYj72?d0|D<KiU};Qj=$@s5)vJVO3o<SbFVP#mBI!qn?=6^M-Z5S=XY`rJE&H
zRL8j5|6VMBB))T_o?@D)k7}rmX8%g?R51bk<PMG@Ztq-UqYXyGsr!)&to~lZf6YxV
zytokd#feqbjnqyAhH=zT;<10Jxo_j6lh#8wNSbY`)O3?Hg^E(W@iz3*_Qli9)pR?m
vH`aDOT{<XrDS$3jMwf!<`XAfNiwX5#y@2;nrEw%200000NkvXXu0mjfuazP*

literal 0
HcmV?d00001

diff --git a/src/assets/scss/main-shuju.scss b/src/assets/scss/main-shuju.scss
index ce4ca79d..190f8aef 100644
--- a/src/assets/scss/main-shuju.scss
+++ b/src/assets/scss/main-shuju.scss
@@ -1,5 +1,5 @@
-@import '~@/element-ui/theme-variables.scss';
-@import './variables.scss';
+@import "~@/element-ui/theme-variables.scss";
+@import "./variables.scss";
 
 // $navbar--height: 60px;
 body {
@@ -72,8 +72,8 @@ body {
     background-color: transparent;
   }
   &-add {
-    > span > *[class*='el-icon-'],
-    > span > *[class*='icon'] {
+    > span > *[class*="el-icon-"],
+    > span > *[class*="icon"] {
       vertical-align: middle;
       font-size: 18px;
       margin-right: 5px;
@@ -233,17 +233,13 @@ body {
     font-family: FZZCHJW;
     font-weight: normal;
     color: #ffffff;
-    background: linear-gradient(
-      0deg,
-      #03c7ff 24.609375%,
-      #ffffff 81.0791015625%
-    );
+    background: linear-gradient(0deg, #03c7ff 24.609375%, #ffffff 81.0791015625%);
     -webkit-background-clip: text;
     -webkit-text-fill-color: rgba(#fff, 0.7);
 
     &::before {
       position: absolute;
-      content: '';
+      content: "";
       z-index: 100000;
       display: block;
       bottom: -10px;
@@ -289,13 +285,15 @@ body {
       text-decoration: none;
     }
     &.z-div {
-      .el-menu-item {
+      .el-menu-item,
+      .sub-menu {
         position: relative;
 
-        &.is-active {
+        &.is-active,
+        &.z-on {
           &::before {
             position: absolute;
-            content: '';
+            content: "";
             display: block;
             bottom: -6px;
             left: 0;
@@ -317,7 +315,7 @@ body {
 
         &::after {
           position: absolute;
-          content: '';
+          content: "";
           right: 0;
           top: 0;
           bottom: 0;
@@ -328,8 +326,41 @@ body {
         }
       }
     }
+
+    .sub-menu {
+      position: relative;
+      float: left;
+      cursor: pointer;
+      &:hover {
+        .sub-menu-list {
+          display: block;
+        }
+      }
+
+      .sub-menu-list {
+        position: absolute;
+        display: none;
+        padding: 0 10px;
+        width: 120px;
+        left: -100px;
+        right: -100px;
+        margin: 0 auto;
+        background-color: rgba(#176dec, 0.9);
+        text-align: center;
+        cursor: pointer;
+        > div {
+          border-top: 1px dashed rgba(#fff, 0.4);
+          color: rgba(#fff, 0.7);
+          transition: all ease 0.5s;
+          &:hover {
+            color: #fff;
+          }
+        }
+      }
+    }
+
     .el-menu-item,
-    .el-submenu > .el-submenu__title {
+    .sub-menu {
       height: $navbar--height;
       padding: 0 15px;
       line-height: $navbar--height;
@@ -337,14 +368,12 @@ body {
       color: #fff;
     }
     .el-menu-item.is-active,
-    .el-submenu.is-active > .el-submenu__title {
+    .sub-menu.z-on {
       color: #fff;
       font-weight: bold;
-      &:focus,
-      &:hover {
-      }
     }
-    .el-menu-item {
+    .el-menu-item,
+    .sub-menu {
       i {
         color: #fff;
       }
@@ -388,9 +417,10 @@ body {
       }
     }
   }
+
   .navbar__search {
-    > *[class*='el-icon-'],
-    > *[class*='icon'] {
+    > *[class*="el-icon-"],
+    > *[class*="icon"] {
       display: inline-block;
       vertical-align: middle;
     }
@@ -446,9 +476,7 @@ body {
     min-height: calc(#{$content--fill-height} - 2px);
   }
   > .aui-card--fill > .el-card__header + .el-card__body {
-    min-height: calc(
-      #{$content--fill-height} - #{$content--card-header-height} - 2px
-    );
+    min-height: calc(#{$content--fill-height} - #{$content--card-header-height} - 2px);
   }
   &--tabs {
     padding: $content--tabs-header-height 0 0;
@@ -520,7 +548,7 @@ body {
               position: absolute;
               bottom: 0;
               left: 0;
-              content: '';
+              content: "";
               width: 100%;
               height: 2px;
               background-color: $--color-primary;
@@ -553,15 +581,10 @@ body {
           min-height: calc(#{$content--fill-height-tabs} - 2px);
         }
         > .aui-card--fill > .el-card__header + .el-card__body {
-          min-height: calc(
-            #{$content--fill-height-tabs} - #{$content--card-header-height} -
-              2px
-          );
+          min-height: calc(#{$content--fill-height-tabs} - #{$content--card-header-height} - 2px);
         }
         &.is-iframe {
-          height: calc(
-            #{$content--fill-height-tabs} + #{$content--padding * 2}
-          );
+          height: calc(#{$content--fill-height-tabs} + #{$content--padding * 2});
           margin: -$content--padding;
           min-height: auto;
           > .aui-card--fill {
@@ -580,10 +603,7 @@ body {
             background-color: #fff;
           }
           > .aui-card--fill > .el-card__header + .el-card__body {
-            height: calc(
-              #{$content--fill-height-tabs} - #{$content--card-header-height} -
-                2px
-            );
+            height: calc(#{$content--fill-height-tabs} - #{$content--card-header-height} - 2px);
           }
         }
       }
@@ -613,7 +633,7 @@ body {
 
 /* Page
 ------------------------------ */
-*[class*='aui-page__'] {
+*[class*="aui-page__"] {
   padding-top: 0;
   .aui-content {
     min-height: auto;
@@ -625,9 +645,7 @@ body {
       min-height: calc(100vh - #{$content--padding * 2} - 2px);
     }
     > .aui-card--fill > .el-card__header + .el-card__body {
-      min-height: calc(
-        100vh - #{$content--padding * 2} - #{$content--card-header-height} - 2px
-      );
+      min-height: calc(100vh - #{$content--padding * 2} - #{$content--card-header-height} - 2px);
     }
   }
 }
diff --git a/src/assets/scss/modules/visual/c/common.scss b/src/assets/scss/modules/visual/c/common.scss
new file mode 100644
index 00000000..0f86e52d
--- /dev/null
+++ b/src/assets/scss/modules/visual/c/common.scss
@@ -0,0 +1,19 @@
+@mixin scrollBar {
+    &::-webkit-scrollbar {
+        /*滚动条整体样式*/
+        width: 8px; /*高宽分别对应横竖滚动条的尺寸*/
+        height: 1px;
+    }
+    &::-webkit-scrollbar-thumb {
+        /*滚动条里面小方块*/
+        border-radius: 8px;
+        box-shadow: inset 0 0 5px rgba(#00023f, 0.2);
+        background: linear-gradient(270deg, #0063fe, #0095ff);
+    }
+    &::-webkit-scrollbar-track {
+        /*滚动条里面轨道*/
+        box-shadow: inset 0 0 5px rgba(#00023f, 0.2);
+        border-radius: 8px;
+        background: darken(#0c81fe, 20);
+    }
+}
diff --git a/src/assets/scss/modules/visual/distributionAnalyze.scss b/src/assets/scss/modules/visual/distributionAnalyze.scss
new file mode 100644
index 00000000..438c0e30
--- /dev/null
+++ b/src/assets/scss/modules/visual/distributionAnalyze.scss
@@ -0,0 +1,211 @@
+@import '../../c/config';
+@import '../../c/function';
+@import './c/common';
+
+.title {
+  padding: 10px;
+  font-size: 22px;
+  font-family: PingFang SC;
+  font-weight: 800;
+  color: #ffffff;
+
+  position: relative;
+
+  .card-title {
+    display: flex;
+    align-items: center;
+
+    img {
+      display: block;
+      margin-right: 5px;
+    }
+    span {
+      display: block;
+    }
+  }
+
+  .second-title {
+    display: block;
+    display: flex;
+    align-items: center;
+    margin-top: 20px;
+    .second-title-label {
+      position: relative;
+      padding-left: 40px;
+      font-size: 16px;
+      font-weight: 500;
+      color: #fff;
+    }
+    .second-title-label::after {
+      content: '';
+      position: absolute;
+      top: 50%;
+      left: 20px;
+      width: 12px;
+      height: 12px;
+      box-sizing: border-box;
+      margin-top: -6px;
+      background: #2865fa;
+      border-radius: 50%;
+    }
+    .second-select {
+      margin: 0 10px 0 40px;
+      ::v-deep .el-input {
+        width: 180px;
+        height: 36px;
+        .el-input__inner {
+          height: 100%;
+          padding: 0 10px;
+          color: #fff;
+          line-height: 36px;
+          background: #06186d;
+          border: 1px solid #1a64cc;
+        }
+
+        .el-icon-arrow-up:before {
+          content: '\e78f';
+        }
+        // .el-select__caret:before {
+        //   content: '\E790'
+        // }
+      }
+      ::v-deep .el-date-editor {
+        width: 360px;
+        position: relative;
+        background: #06186d;
+        border: 1px solid #1a64cc;
+        .el-range-input {
+          color: #fff;
+          background: #06186d;
+          margin-left: 10px;
+        }
+        .el-range-separator {
+          color: #fff;
+        }
+        .el-range__icon {
+          position: absolute;
+          right: 5px;
+          // float: right;
+        }
+        .el-input__prefix {
+          left: unset;
+          right: 5px;
+        }
+      }
+    }
+    .second-select:last-child {
+      margin-left: 0;
+    }
+  }
+  .cascader {
+    ::v-deep .el-input {
+      width: 220px;
+    }
+  }
+  .status-select {
+    position: absolute;
+    top: 20px;
+    right: 10px;
+  }
+  .second-select:last-child {
+    margin-left: 0;
+  }
+}
+
+.g-cpt-resi {
+  display: flex;
+  flex-direction: row;
+  // flex-wrap: wrap;
+  justify-content: space-between;
+  height: calc(100vh - 230px);
+
+  .g-l {
+    width: 40%;
+    height: calc(100vh - 240px);
+
+    .echart-line {
+      margin-left: 30px;
+      // margin-top: 100px;
+      text-align: center;
+      position: relative;
+      width: 100%;
+      height: 100%;
+      box-sizing: border-box;
+      .echart-org {
+        width: 100%;
+        height: 90%;
+      }
+    }
+  }
+
+  .g-r {
+    width: 55%;
+    height: calc(100vh - 250px);
+
+    .r-map {
+      position: relative;
+      height: calc(100vh - 250px - 50px);
+      width: 100%;
+
+      .map {
+        height: 100%;
+        width: 100%;
+      }
+    }
+
+    .r-legend {
+      display: flex;
+      justify-content: center;
+      margin-top: 24px;
+      align-items: center;
+
+      .legend_item {
+        margin-left: 40px;
+        display: flex;
+        align-items: center;
+
+        > span {
+          margin-left: 11px;
+          font-size: 16px;
+          font-family: PingFang SC;
+          font-weight: 400;
+          color: #d2e7ff;
+        }
+
+        .color {
+          width: 20px;
+          height: 10px;
+
+          border-radius: 4px;
+        }
+
+        .color0 {
+          background: #dd2719;
+        }
+        .color1 {
+          background: #edbe00;
+        }
+        .color2 {
+          background: #00e5ed;
+        }
+      }
+    }
+  }
+}
+
+.table-status {
+  position: relative;
+  height: 300px;
+
+  // 暂无数据
+  .no-data {
+    &-img {
+      position: absolute;
+      top: 0;
+      left: 0;
+      right: 0;
+      bottom: 0;
+      margin: auto;
+    }
+  }
+}
diff --git a/src/assets/scss/modules/visual/heart.scss b/src/assets/scss/modules/visual/heart.scss
new file mode 100644
index 00000000..f0c964cb
--- /dev/null
+++ b/src/assets/scss/modules/visual/heart.scss
@@ -0,0 +1,71 @@
+@import "../../c/config";
+@import "../../c/function";
+@import "./c/common";
+
+.g-cpt {
+    display: flex;
+    flex-wrap: wrap;
+    justify-content: space-between;
+    margin-top: 5px;
+}
+
+.m-sizer {
+    width: 195px;
+    margin: 10px 0;
+    margin-left: auto;
+
+    > span {
+        font-size: 16px;
+        font-family: PingFang SC;
+        font-weight: 400;
+        color: #ffffff;
+    }
+
+    ::v-deep .el-input {
+        width: 140px;
+        height: 36px;
+        .el-input__inner {
+            height: 100%;
+            padding: 0 10px;
+            color: #fff;
+            line-height: 36px;
+            background: #06186d;
+            border: 1px solid #1a64cc;
+        }
+        .el-icon-arrow-up:before {
+            content: "\e78f";
+        }
+    }
+    ::v-deep .el-date-editor {
+        .el-input__prefix {
+            left: unset;
+            right: 5px;
+        }
+    }
+}
+
+.m-tb {
+    width: 33%;
+    .title {
+        padding: 10px;
+        font-size: 22px;
+        font-family: PingFang SC;
+        font-weight: 800;
+        color: #ffffff;
+        display: flex;
+        align-items: center;
+
+        img {
+            display: block;
+            margin-right: 5px;
+        }
+        span {
+            display: block;
+        }
+    }
+    .tb {
+        height: calc(100vh - 230px);
+        overflow-y: auto;
+        @include scrollBar;
+    }
+}
diff --git a/src/assets/scss/modules/visual/incident-info.scss b/src/assets/scss/modules/visual/incident-info.scss
new file mode 100644
index 00000000..1ca5a43a
--- /dev/null
+++ b/src/assets/scss/modules/visual/incident-info.scss
@@ -0,0 +1,384 @@
+@import '../../c/config';
+@import '../../c/function';
+@import './c/common';
+
+.m-pop {
+  @include shield;
+  background-color: rgba(#000, 0.9);
+  overflow-y: auto;
+
+  .wrap {
+    position: relative;
+    margin: 120px auto;
+    width: 1020px;
+
+    .title {
+      padding: 10px;
+      font-size: 22px;
+      font-family: PingFang SC;
+      font-weight: 800;
+      color: #ffffff;
+      display: flex;
+      align-items: center;
+
+      img {
+        display: block;
+        margin-right: 5px;
+      }
+      span {
+        display: block;
+      }
+    }
+
+    .btn-close {
+      position: absolute;
+      top: -15px;
+      right: -15px;
+      cursor: pointer;
+    }
+
+    .line {
+      margin: 20px auto;
+      width: 900px;
+      height: 1px;
+      border: 1px dashed #1257c9;
+    }
+
+    .tabs {
+      margin-top: 30px;
+      display: flex;
+      align-items: center;
+      padding-left: 20px;
+      padding-left: 58px;
+
+      .tab-btn {
+        width: 30px;
+        text-align: center;
+        cursor: pointer;
+      }
+
+      .tab {
+        margin: 0 5px;
+        min-width: 76px;
+        padding: 0 5px;
+        height: 30px;
+        background: rgba(255, 255, 255, 0);
+        border: 1px solid #1257c9;
+        box-shadow: 0 0 10px 0 inset #1257c9;
+        border-radius: 2px;
+        text-align: center;
+        font-size: 14px;
+        font-family: PingFang SC;
+        font-weight: 400;
+        color: #ffffff;
+        line-height: 30px;
+        cursor: pointer;
+        transition: all ease 0.5s;
+        &.z-on {
+          background: linear-gradient(90deg, #1a5afd, #009cff);
+          box-shadow: none;
+        }
+      }
+    }
+  }
+}
+
+.m-info {
+  padding-left: 62px;
+  font-size: 14px;
+  font-family: PingFang SC;
+  font-weight: 400;
+  color: #ffffff;
+  line-height: 24px;
+  width: 500px;
+
+  .info-title {
+    margin-top: 30px;
+    font-size: 20px;
+    font-family: PingFang SC;
+    font-weight: bold;
+    color: #ffffff;
+    line-height: 30px;
+  }
+  .info-content {
+    margin: 20px 0;
+  }
+  .info-pics {
+    display: flex;
+    margin: 20px 0;
+    img {
+      display: block;
+      width: 32%;
+      height: 90px;
+      margin-right: 9px;
+      object-fit: cover;
+    }
+  }
+
+  .info-prop {
+    position: relative;
+    margin: 10px 0;
+    display: flex;
+    padding-left: 15px;
+    .info-title-2 {
+      width: 70px;
+      flex: 0 0 1;
+      font-size: 14px;
+    }
+
+    > span,
+    > div {
+      display: block;
+      max-width: 300px;
+    }
+
+    &::before {
+      content: '';
+      display: block;
+      position: absolute;
+      top: 9px;
+      left: 0;
+      width: 7px;
+      height: 7px;
+      background: #0c81fe;
+      border-radius: 3px;
+      margin-right: 10px;
+    }
+  }
+}
+
+.m-case {
+  @include scrollBar;
+  height: 600px;
+  padding: 20px 0 20px 0;
+  overflow-y: auto;
+}
+
+.m-row {
+  display: flex;
+  justify-content: space-between;
+}
+
+.m-yanpan {
+  padding-left: 62px;
+  padding-right: 0;
+  min-height: 300px;
+}
+
+.m-hint {
+  position: relative;
+  height: 300px;
+
+  // 暂无数据
+  img {
+    position: absolute;
+    top: 0;
+    left: 0;
+    right: 0;
+    bottom: 0;
+    margin: auto;
+  }
+}
+
+.m-line {
+  min-width: 400px;
+
+  .stat {
+    margin: 20px 0 10px;
+    display: flex;
+    .stat-item {
+      width: 33%;
+      text-align: center;
+
+      div {
+        font-size: 17px;
+        font-family: Source Han Serif SC;
+        font-weight: 500;
+        color: rgba(#fff, 0.5);
+        line-height: 24px;
+        &.z-weak {
+          font-size: 12px;
+          font-family: Source Han Serif SC;
+          font-weight: 500;
+          color: rgba(#fff, 0.5);
+          line-height: 24px;
+        }
+      }
+    }
+  }
+}
+
+.m-tb {
+  padding-left: 62px;
+  padding-right: 40px;
+}
+
+.m-pagination {
+  box-sizing: border-box;
+  margin-top: 20px;
+  width: 100%;
+  height: 40px;
+  display: flex;
+  justify-content: flex-end;
+
+  /deep/ .el-pagination.is-background .el-pager li:not(.disabled).active {
+    background: #0266d1;
+    color: #000d3f;
+  }
+
+  /deep/ .el-pagination .el-pager li {
+    background: #002e74;
+  }
+
+  /deep/ .el-pagination .btn-prev {
+    background: #002e74;
+  }
+
+  /deep/ .el-pagination .btn-next {
+    background: #002e74;
+  }
+}
+
+.m-process {
+  width: 400px;
+
+  .process-title {
+    margin-bottom: 25px;
+    margin-left: -5px;
+    font-size: 16px;
+    font-family: PingFang SC;
+    font-weight: bold;
+    color: #ffffff;
+    line-height: 18px;
+  }
+
+  .list {
+    position: relative;
+    box-sizing: border-box;
+    margin-top: 30px/2;
+    margin-left: 50px/2;
+    padding: 0 0 0 30px/2;
+    width: 680px/2;
+    border-left: 3px solid #0c81fe;
+    padding-right: 10px;
+
+    &::before {
+      content: '';
+      position: absolute;
+      z-index: 1;
+      display: block;
+      top: -2px/2;
+      left: -2px/2;
+      width: 5px/2;
+      height: 20px/2;
+      background-color: #ffffff;
+    }
+
+    .item {
+      position: relative;
+      z-index: 2;
+      margin-bottom: 8px;
+      padding-bottom: 8px;
+      font-size: 16px;
+      font-family: PingFang SC;
+      font-weight: 400;
+      color: #fefefe;
+      line-height: 24px;
+      padding-left: 20px;
+      padding-top: 1px;
+
+      &::before {
+        content: '';
+        display: block;
+        position: absolute;
+        top: -5px;
+        left: -11px;
+        width: 18px;
+        height: 18px;
+        background: #0c81fe;
+        border: 4px solid lighten(#0c81fe, 15);
+        border-radius: 100%;
+      }
+
+      &.z-on {
+        &::before {
+          background: #e08400;
+          border-color: lighten(#e08400, 15);
+        }
+      }
+
+      &:last-child {
+        margin-bottom: 0;
+        padding-bottom: 0;
+        border-bottom: none;
+      }
+
+      .item-row {
+        margin-top: -10px;
+        margin-bottom: 10px;
+        display: flex;
+      }
+
+      .name {
+        position: relative;
+        padding: 0 10px;
+        font-size: 12px;
+        font-family: PingFang SC;
+        font-weight: 500;
+        color: #fefefe;
+        line-height: 22px;
+        height: 22px;
+        border-radius: 10px 0 10px 0;
+        background-color: #0c81fe;
+        // background-color: #e08400;
+      }
+
+      .date {
+        margin-left: 10px;
+        font-size: 12px;
+        font-family: PingFang SC;
+        font-weight: 500;
+        color: #7ca1d2;
+        line-height: 25px;
+      }
+
+      .detail {
+        @include cs;
+        font-size: 16px;
+        line-height: 20px;
+        margin-bottom: 5px;
+        display: flex;
+
+        .detail-field {
+          width: 22%;
+          text-align: justify;
+          text-align-last: justify;
+        }
+        .detail-value {
+          width: 78%;
+          .detail-link {
+            display: inline;
+          }
+        }
+      }
+
+      .attachement-list {
+        padding-left: 80px;
+        a {
+          display: block;
+          cursor: pointer;
+          color: #4df0ff;
+          font-size: 14px;
+
+          i {
+            color: #fff;
+          }
+        }
+      }
+    }
+  }
+}
+
+.m-top {
+  display: flex;
+}
diff --git a/src/assets/scss/modules/visual/issue-info.scss b/src/assets/scss/modules/visual/issue-info.scss
new file mode 100644
index 00000000..e4672951
--- /dev/null
+++ b/src/assets/scss/modules/visual/issue-info.scss
@@ -0,0 +1,139 @@
+@import '../../c/config';
+@import '../../c/function';
+@import './c/common';
+
+.m-pop {
+  @include shield;
+  background-color: rgba(#000, 0.9);
+  overflow-y: auto;
+
+  .wrap {
+    position: relative;
+    margin: 120px auto;
+    width: 1020px;
+
+    .title {
+      padding: 10px;
+      font-size: 22px;
+      font-family: PingFang SC;
+      font-weight: 800;
+      color: #ffffff;
+      display: flex;
+      align-items: center;
+
+      img {
+        display: block;
+        margin-right: 5px;
+      }
+      span {
+        display: block;
+      }
+    }
+
+    .btn-close {
+      position: absolute;
+      top: -10px;
+      right: -10px;
+      cursor: pointer;
+    }
+
+    .line {
+      margin: 20px auto;
+      width: 900px;
+      height: 1px;
+      border: 1px dashed #1257c9;
+    }
+  }
+}
+
+.m-content {
+  display: flex;
+}
+
+.m-info {
+  padding-left: 62px;
+  font-size: 16px;
+  font-family: PingFang SC;
+  font-weight: 400;
+  color: #ffffff;
+  line-height: 24px;
+  width: 50%;
+
+  .info-title {
+    margin-top: 30px;
+    font-size: 20px;
+    font-family: PingFang SC;
+    font-weight: bold;
+    color: #ffffff;
+    line-height: 30px;
+  }
+
+  .info-prop {
+    position: relative;
+    margin: 10px 0;
+    display: flex;
+    padding-left: 15px;
+    .info-title-2 {
+      width: 100px;
+      flex: 0 0 1;
+      font-size: 14px;
+    }
+    .info-pics {
+      display: flex;
+      margin: 10px 0;
+      img {
+        display: block;
+        width: 32%;
+        height: 90px;
+        margin-right: 9px;
+        object-fit: cover;
+      }
+    }
+    > span,
+    > div {
+      display: block;
+      max-width: 300px;
+    }
+
+    &::before {
+      content: '';
+      display: block;
+      position: absolute;
+      top: 9px;
+      left: 0;
+      width: 7px;
+      height: 7px;
+      background: #0c81fe;
+      border-radius: 3px;
+      margin-right: 10px;
+    }
+  }
+}
+
+.m-line {
+  width: 50%;
+
+  .stat {
+    margin: 20px 0 10px;
+    display: flex;
+    .stat-item {
+      width: 33%;
+      text-align: center;
+
+      div {
+        font-size: 17px;
+        font-family: Source Han Serif SC;
+        font-weight: 500;
+        color: rgba(#fff, 0.5);
+        line-height: 24px;
+        &.z-weak {
+          font-size: 12px;
+          font-family: Source Han Serif SC;
+          font-weight: 500;
+          color: rgba(#fff, 0.5);
+          line-height: 24px;
+        }
+      }
+    }
+  }
+}
diff --git a/src/assets/scss/people.scss b/src/assets/scss/modules/visual/people.scss
similarity index 62%
rename from src/assets/scss/people.scss
rename to src/assets/scss/modules/visual/people.scss
index ea88d05f..5a6edb5f 100644
--- a/src/assets/scss/people.scss
+++ b/src/assets/scss/modules/visual/people.scss
@@ -1,22 +1,27 @@
-@import "c/config";
-@import "c/function";
+@import "../../c/config";
+@import "../../c/function";
+@import "./c/common";
 
 .g-cpt {
     display: flex;
     flex-wrap: wrap;
     justify-content: center;
-    // justify-content: space-around;
-    // .g-l {
-    //     margin-right: auto;
-    // }
-    // .g-r {
-    //     margin-left: auto;
-    // }
+    margin-top: 5px;
+
+    .g-l {
+        width: 850px;
+        margin-bottom: 20px;
+    }
+
+    .g-r {
+        margin-left: 6px;
+        width: calc(100% - 850px - 6px);
+        min-width: 850px;
+    }
 }
 
 .m-people {
     position: relative;
-    width: 850px;
 
     .title {
         padding: 10px;
@@ -174,7 +179,7 @@
 .m-pop {
     @include shield;
     background-color: rgba(#000, 0.9);
-    overflow-y: scroll;
+    overflow-y: auto;
 
     .wrap {
         position: relative;
@@ -285,8 +290,7 @@
 
 .m-relation {
     position: relative;
-    margin-top: 20px;
-    width: 850px;
+    margin-top: 10px;
 
     .title {
         padding: 10px;
@@ -432,3 +436,215 @@
         }
     }
 }
+
+.m-tb {
+    .title {
+        padding: 10px;
+        font-size: 22px;
+        font-family: PingFang SC;
+        font-weight: 800;
+        color: #ffffff;
+        display: flex;
+        align-items: center;
+
+        img {
+            display: block;
+            margin-right: 5px;
+        }
+        span {
+            display: block;
+        }
+    }
+    .tb {
+        height: 300px;
+        overflow-y: auto;
+        @include scrollBar;
+    }
+}
+
+.m-row {
+    display: flex;
+    justify-content: space-between;
+    margin-top: 10px;
+
+    .m-list {
+        width: calc(50% - 3px);
+
+        .title {
+            padding: 10px;
+            font-size: 22px;
+            font-family: PingFang SC;
+            font-weight: 800;
+            color: #ffffff;
+            display: flex;
+            align-items: center;
+
+            img {
+                display: block;
+                margin-right: 5px;
+            }
+            span {
+                display: block;
+            }
+
+            a {
+                display: block;
+                color: rgba(#fff, 0.5);
+                font-size: 22px;
+                font-family: PingFang SC;
+                font-weight: 800;
+                margin-right: 10px;
+                cursor: pointer;
+
+                &.z-on {
+                    color: #fff;
+                    cursor: default;
+
+                    &:hover {
+                        color: #fff;
+                        text-decoration: none;
+                    }
+                }
+
+                &:hover {
+                    color: rgba(#fff, 0.5);
+                    text-decoration: underline;
+                }
+            }
+        }
+
+        .list-wrap {
+            height: 480px;
+            overflow-y: auto;
+            @include scrollBar;
+
+            .list {
+                .item {
+                    position: relative;
+                    background-color: #104ba4;
+                    padding: 10px 20px;
+                    margin-bottom: 4px;
+                    cursor: pointer;
+                    transition: all ease 0.1s;
+
+                    .item-row {
+                        display: flex;
+                        justify-content: space-between;
+                        align-items: center;
+
+                        .item-l {
+                            width: 25%;
+                        }
+                        .item-r {
+                            width: 75%;
+                        }
+
+                        &:hover {
+                            &::before {
+                                content: "";
+                                position: absolute;
+                                display: block;
+                                left: 0;
+                                top: 0;
+                                bottom: 0;
+                                width: 6px;
+                                background: linear-gradient(270deg, #0336ff, #01b4ff);
+                                border-radius: 2px;
+                            }
+
+                            &::after {
+                                content: "";
+                                position: absolute;
+                                display: block;
+                                left: 15px;
+                                top: 0;
+                                bottom: 0;
+                                margin: auto 0;
+                                width: 0;
+                                height: 0;
+                                border-width: 10px;
+                                border-style: solid;
+                                border-color: transparent transparent transparent #20edff;
+                            }
+                        }
+                    }
+
+                    .item-point {
+                        text-align: center;
+                        padding-left: 10%;
+                        height: 16px;
+                        font-size: 22px;
+                        font-family: PingFang SC;
+                        font-weight: bold;
+                        color: #ffffff;
+                        line-height: 12px;
+                    }
+
+                    .item-title {
+                        padding: 10px 0;
+                        font-size: 18px;
+                        font-family: PingFang SC;
+                        font-weight: 400;
+                        color: #ffffff;
+                        line-height: 24px;
+                    }
+
+                    .item-date {
+                        padding: 10px 0;
+                        border-top: 1px dashed #8398d9;
+                        font-size: 14px;
+                        font-family: PingFang SC;
+                        font-weight: 400;
+                        color: #ffffff;
+                        opacity: 0.67;
+                    }
+                    &:hover {
+                        box-shadow: 0 0 30px 5px inset #22f;
+                        background-color: darken(#104ba4, 12);
+                    }
+                }
+            }
+        }
+    }
+}
+
+.m-pagination {
+    box-sizing: border-box;
+    margin-top: 20px;
+    width: 100%;
+    height: 40px;
+    display: flex;
+    justify-content: flex-end;
+
+    /deep/ .el-pagination.is-background .el-pager li:not(.disabled).active {
+        background: #0266d1;
+        color: #000d3f;
+    }
+
+    /deep/ .el-pagination .el-pager li {
+        background: #002e74;
+    }
+
+    /deep/ .el-pagination .btn-prev {
+        background: #002e74;
+    }
+
+    /deep/ .el-pagination .btn-next {
+        background: #002e74;
+    }
+}
+
+.m-hint {
+    position: relative;
+    height: 300px;
+
+    // 暂无数据
+    img {
+        position: absolute;
+        top: 0;
+        left: 0;
+        right: 0;
+        bottom: 0;
+        margin: auto;
+    }
+}
diff --git a/src/assets/scss/modules/visual/processAnalyze.scss b/src/assets/scss/modules/visual/processAnalyze.scss
new file mode 100644
index 00000000..098753e0
--- /dev/null
+++ b/src/assets/scss/modules/visual/processAnalyze.scss
@@ -0,0 +1,302 @@
+@import '../../c/config';
+@import '../../c/function';
+@import './c/common';
+
+.title {
+  padding: 10px;
+  font-size: 22px;
+  font-family: PingFang SC;
+  font-weight: 800;
+  color: #ffffff;
+  display: flex;
+  align-items: center;
+  position: relative;
+
+  img {
+    display: block;
+    margin-right: 5px;
+  }
+  span {
+    display: block;
+  }
+
+  .second-title {
+    display: flex;
+    align-items: center;
+
+    .second-select {
+      margin: 0 10px 0 40px;
+
+      ::v-deep .el-input {
+        width: 140px;
+        height: 36px;
+        .el-input__inner {
+          height: 100%;
+          padding: 0 10px;
+          color: #fff;
+          line-height: 36px;
+          background: #06186d;
+          border: 1px solid #1a64cc;
+        }
+        .el-icon-arrow-up:before {
+          content: '\e78f';
+        }
+      }
+      ::v-deep .el-date-editor {
+        .el-input__prefix {
+          left: unset;
+          right: 5px;
+        }
+      }
+    }
+    .cascader {
+      ::v-deep .el-input {
+        width: 220px;
+      }
+    }
+    .second-select:last-child {
+      margin-left: 0;
+    }
+  }
+}
+
+.g-cpt-resi {
+  display: flex;
+  flex-direction: row;
+  height: calc(100vh - 180px);
+
+  .g-l {
+    flex-shrink: 0;
+    width: 700px;
+    height: calc(100vh - 230px);
+
+    .l_top {
+      height: 385px;
+      display: flex;
+      .g-count {
+        width: 100px;
+      }
+      .g-pie {
+        position: relative;
+      }
+    }
+    .l_bottom {
+      height: calc(100vh - 230px - 385px);
+      margin-top: 20px;
+    }
+  }
+
+  .g-r {
+    text-align: center;
+    margin: 20px 10px 20px;
+    width: calc(100vw - 700px);
+    height: calc(100vh - 180px - 20px);
+  }
+}
+
+.l_bottom {
+  .bottom_label {
+    position: relative;
+    padding-left: 40px;
+    font-size: 16px;
+    font-weight: 500;
+    color: #fff;
+  }
+  .bottom_label::after {
+    content: '';
+    position: absolute;
+    top: 50%;
+    left: 20px;
+    width: 12px;
+    height: 12px;
+    box-sizing: border-box;
+    margin-top: -6px;
+    background: #2865fa;
+    border-radius: 50%;
+  }
+  > span {
+    font-size: 18px;
+    font-family: PingFang SC;
+    font-weight: 800;
+    color: #ffffff;
+  }
+  .echart-line {
+    margin-top: 10px;
+    height: 100%;
+  }
+}
+.g-count {
+  margin-top: 104px;
+  margin-left: 52px;
+  .t_count {
+    font-size: 16px;
+    font-family: PingFang SC;
+    font-weight: 400;
+    color: #ffffff;
+    opacity: 0.76;
+  }
+  .c_count {
+    font-size: 48px;
+    font-family: PingFang SC;
+    font-weight: bold;
+    color: #ffffff;
+  }
+  .t_yestoday {
+    margin-top: 59px;
+    font-size: 14px;
+    font-family: PingFang SC;
+    font-weight: 400;
+    color: #ffffff;
+    opacity: 0.76;
+    > span {
+      margin-left: 18px;
+      font-size: 16px;
+      font-family: PingFang SC;
+      font-weight: 500;
+      color: #f42800;
+    }
+  }
+  .t_today {
+    margin-top: 12px;
+    font-size: 14px;
+    font-family: PingFang SC;
+    font-weight: 400;
+    color: #ffffff;
+    opacity: 0.76;
+    > span {
+      margin-left: 18px;
+      font-size: 16px;
+      font-family: PingFang SC;
+      font-weight: 500;
+      color: #3edd7f;
+    }
+  }
+}
+
+.g-r {
+  .r-map {
+    position: relative;
+    height: calc(100vh - 180px - 20px - 70px);
+    width: 100%;
+
+    .map {
+      height: 100%;
+      width: 100%;
+    }
+
+    .r-status {
+      position: absolute;
+      bottom: 0;
+      right: 0;
+      display: flex;
+
+      .status {
+        height: 30px;
+        width: 70px;
+        line-height: 30px;
+        font-size: 12px;
+        font-family: PingFang SC;
+        font-weight: 400;
+        color: #d2e7ff;
+        background-color: #1146c2;
+      }
+
+      .status-closed {
+      }
+
+      .status-pending {
+        border-radius: 5px 0 0 0;
+      }
+      .sel-status {
+        background-color: #082586;
+      }
+    }
+
+    .r-status:hover {
+      cursor: pointer;
+    }
+  }
+
+  .r-legend {
+    display: flex;
+    justify-content: center;
+    margin-top: 14px;
+    align-items: center;
+
+    > img {
+      margin-left: 58px;
+      height: 35px;
+      width: 40px;
+    }
+
+    > span {
+      margin-left: 3px;
+      font-size: 16px;
+      font-family: PingFang SC;
+      font-weight: 400;
+      color: #d2e7ff;
+    }
+  }
+}
+
+.echart-wr {
+  margin-left: 30px;
+  // margin-top: 100px;
+  text-align: center;
+  position: relative;
+  width: 500px;
+  height: 100%;
+  box-sizing: border-box;
+}
+
+.g-pie {
+  position: relative;
+  .pie-legend {
+    margin-left: 30px;
+    margin-top: -40px;
+    display: flex;
+    justify-content: center;
+
+    .legend_item {
+      .item_name {
+        margin-left: 5px;
+        font-size: 10px;
+        font-family: PingFang SC;
+        font-weight: 500;
+        color: #eff0f1;
+      }
+      > img {
+        margin-top: -10px;
+        width: 80px;
+        height: 10px;
+      }
+      .item_num {
+        .item_count {
+          font-size: 17px;
+          font-family: PingFang SC;
+          font-weight: 500;
+          color: #ffffff;
+        }
+
+        .item_percent {
+          margin-left: 12px;
+          font-size: 8px;
+          font-family: PingFang SC;
+          font-weight: 300;
+          color: #ffffff;
+          line-height: 18px;
+        }
+      }
+    }
+
+    .item_last {
+      margin-left: 50px;
+    }
+  }
+}
+
+.table-status {
+  position: relative;
+  width: 600px;
+  margin: auto;
+}
diff --git a/src/assets/scss/modules/visual/resibuzz.scss b/src/assets/scss/modules/visual/resibuzz.scss
new file mode 100644
index 00000000..8ea3f5ee
--- /dev/null
+++ b/src/assets/scss/modules/visual/resibuzz.scss
@@ -0,0 +1,144 @@
+@import '../../c/config';
+@import '../../c/function';
+@import './c/common';
+
+.title {
+  padding: 10px;
+  font-size: 22px;
+  font-family: PingFang SC;
+  font-weight: 800;
+  color: #ffffff;
+  display: flex;
+  align-items: center;
+  position: relative;
+
+  img {
+    display: block;
+    margin-right: 5px;
+  }
+  span {
+    display: block;
+  }
+
+  .second-select {
+    margin: 0 10px 0 40px;
+
+    ::v-deep .el-input {
+      width: 140px;
+      height: 36px;
+      .el-input__inner {
+        height: 100%;
+        padding: 0 10px;
+        color: #fff;
+        line-height: 36px;
+        background: #06186d;
+        border: 1px solid #1a64cc;
+      }
+      .el-icon-arrow-up:before {
+        content: '\e78f';
+      }
+    }
+    ::v-deep .el-date-editor {
+      .el-input__prefix {
+        left: unset;
+        right: 5px;
+      }
+    }
+  }
+
+  .cascader {
+    ::v-deep .el-input {
+      width: 220px;
+    }
+  }
+  .status-select {
+    margin-left: 10px;
+    // position: absolute;
+    // top: 20px;
+    // right: 10px;
+  }
+  .second-select:last-child {
+    margin-left: 0;
+  }
+}
+
+.g-cpt-resi {
+  display: flex;
+  flex-direction: row;
+  // flex-wrap: wrap;
+  // justify-content: center;
+  height: calc(100vh - 180px);
+
+  .g-l {
+    flex-shrink: 0;
+    width: 600px;
+    height: calc(100vh - 180px);
+  }
+
+  .g-r {
+    text-align: center;
+    margin: 40px 0 0 19px;
+    width: calc(100vw - 60px - 600px);
+    // height: calc(100vh - 170px - 20px);
+  }
+}
+
+.g-r {
+  .m-tb {
+    position: relative;
+    height: 100%;
+    .tb {
+      height: calc(100vh - 170px - 50px - 50px);
+      overflow-y: auto;
+      @include scrollBar;
+    }
+    .m-pagination {
+      box-sizing: border-box;
+      position: absolute;
+      right: 5px;
+      bottom: 5px;
+      width: 100%;
+      height: 40px;
+      display: flex;
+      justify-content: flex-end;
+
+      /deep/ .el-pagination.is-background .el-pager li:not(.disabled).active {
+        background: #0266d1;
+        color: #000d3f;
+      }
+
+      /deep/ .el-pagination .el-pager li {
+        background: #002e74;
+      }
+
+      /deep/ .el-pagination .btn-prev {
+        background: #002e74;
+      }
+
+      /deep/ .el-pagination .btn-next {
+        background: #002e74;
+      }
+    }
+  }
+}
+
+.echart-wr {
+  margin-left: 30px;
+  // margin-top: 100px;
+  text-align: center;
+  position: relative;
+  width: 500px;
+  height: 100%;
+  box-sizing: border-box;
+  .echart-org {
+    width: 100%;
+    height: 90%;
+  }
+}
+
+.table-status {
+  position: relative;
+  width: 600px;
+  margin: auto;
+  margin-top: 200px;
+}
diff --git a/src/assets/scss/modules/visual/typeAnalyze.scss b/src/assets/scss/modules/visual/typeAnalyze.scss
new file mode 100644
index 00000000..9e29b79e
--- /dev/null
+++ b/src/assets/scss/modules/visual/typeAnalyze.scss
@@ -0,0 +1,141 @@
+@import '../../c/config';
+@import '../../c/function';
+@import './c/common';
+
+.title {
+  padding: 10px;
+  font-size: 22px;
+  font-family: PingFang SC;
+  font-weight: 800;
+  color: #ffffff;
+  display: flex;
+  align-items: center;
+  position: relative;
+
+  img {
+    display: block;
+    margin-right: 5px;
+  }
+  span {
+    display: block;
+  }
+
+  .second-select {
+    margin: 0 10px 0 40px;
+
+    ::v-deep .el-input {
+      width: 140px;
+      height: 36px;
+      .el-input__inner {
+        height: 100%;
+        padding: 0 10px;
+        color: #fff;
+        line-height: 36px;
+        background: #06186d;
+        border: 1px solid #1a64cc;
+      }
+      .el-icon-arrow-up:before {
+        content: '\e78f';
+      }
+    }
+    ::v-deep .el-date-editor {
+      .el-input__prefix {
+        left: unset;
+        right: 5px;
+      }
+    }
+  }
+
+  .cascader {
+    ::v-deep .el-input {
+      width: 220px;
+    }
+  }
+  .status-select {
+    position: absolute;
+    top: 20px;
+    right: 10px;
+  }
+  .second-select:last-child {
+    margin-left: 0;
+  }
+}
+
+.g-cpt-resi {
+  display: flex;
+  flex-direction: row;
+  // flex-wrap: wrap;
+  // justify-content: center;
+  height: calc(100vh - 180px);
+
+  .g-l {
+    flex-shrink: 0;
+    width: 600px;
+    height: calc(100vh - 180px);
+  }
+
+  .g-r {
+    text-align: center;
+    margin: 40px 0 0 19px;
+    width: calc(100vw - 60px - 600px);
+    // height: calc(100vh - 140px - 20px);
+  }
+}
+
+.g-r {
+  .m-tb {
+    position: relative;
+    height: 100%;
+    .tb {
+      height: calc(100vh - 170px - 50px - 50px);
+      overflow-y: auto;
+      @include scrollBar;
+    }
+
+    .m-pagination {
+      position: absolute;
+      box-sizing: border-box;
+      right: 5px;
+      bottom: 5px;
+      width: 100%;
+      height: 40px;
+      display: flex;
+      justify-content: flex-end;
+
+      /deep/ .el-pagination.is-background .el-pager li:not(.disabled).active {
+        background: #0266d1;
+        color: #000d3f;
+      }
+
+      /deep/ .el-pagination .el-pager li {
+        background: #002e74;
+      }
+
+      /deep/ .el-pagination .btn-prev {
+        background: #002e74;
+      }
+
+      /deep/ .el-pagination .btn-next {
+        background: #002e74;
+      }
+    }
+  }
+}
+
+.echart-wr {
+  margin-left: 30px;
+  // margin-top: 100px;
+  text-align: center;
+  position: relative;
+  width: 500px;
+  height: 100%;
+  box-sizing: border-box;
+  .echart-org {
+    width: 100%;
+    height: 90%;
+  }
+}
+
+.table-status {
+  margin-top: 200px;
+}
diff --git a/src/i18n/zh-CN.js b/src/i18n/zh-CN.js
index 58105013..789f50f8 100644
--- a/src/i18n/zh-CN.js
+++ b/src/i18n/zh-CN.js
@@ -3,9 +3,9 @@ const t = {}
 t.loading = '加载中...'
 
 t.brand = {}
-t.brand.lg = '党群e事通运营平台'
-t.brand.mini = '党群'
-t.brand.work = '党群e事通工作端'
+t.brand.lg = '数字社区工作平台'
+t.brand.mini = '数字'
+t.brand.work = '数字社区工作平台'
 t.brand.workMini = '工作端'
 
 t.add = '新增'
diff --git a/src/js/ajax.js b/src/js/ajax.js
index 19822616..e8f95dc0 100644
--- a/src/js/ajax.js
+++ b/src/js/ajax.js
@@ -88,16 +88,18 @@ axios.interceptors.request.use(
  */
 axios.interceptors.response.use(
   (response) => {
-    if (response.data.code === 401 || response.data.code === 10001 || response.data.code === 10005) {
+    const code = [10007, 401, 10001, 10005]
+    if (code.includes(response.data.code) ) {
       // debugger;
       clearLoginInfo()
-      localStorage.setItem('userType', 'work')
-      let userType = localStorage.getItem("userType");
-      if (userType === 'work'){
-        router.replace({ name: 'loginWork' })
-      }else {
-        router.replace({ name: 'login' })
-      }
+      // localStorage.setItem('userType', 'work')
+      // let userType = localStorage.getItem("userType");
+      // if (userType === 'work'){
+      //   router.replace({ name: 'loginWork' })
+      // }else {
+      //   router.replace({ name: 'login' })
+      // }
+      router.replace({ name: 'login' })
 
       return Promise.reject(response.data.msg)
     }
diff --git a/src/router/index.js b/src/router/index.js
index dbf8448e..edcfb020 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -35,19 +35,13 @@ export const pageRoutes = [
   {
     path: "/",
     name: "index",
-    redirect: {
-      name: "indexWork",
-    },
-    meta: {
-      title: "首页",
-    },
+    component: () => import("@/views/pages/index"),
   },
   {
     path: "/indexWork",
-    component: () => import("@/views/pages/indexWork"),
     name: "indexWork",
-    meta: {
-      title: "工作端首页",
+    redirect: {
+      name: "index",
     },
   },
 ];
@@ -58,7 +52,7 @@ export const moduleRoutes = {
   component: () => import("@/views/main"),
   name: "main",
   redirect: {
-    name: "home",
+    path: "/main/base-resi",
   },
   meta: {
     title: "主入口布局",
@@ -98,7 +92,8 @@ export const moduleShujuRoutes = {
       },
     },
     {
-      path: "/main-shuju/visual-basicinfo-people",
+      path: "/main-shuju/visual-basicinfo-people/:uid",
+      props: true,
       component: () => import("@/views/modules/visual/basicinfo/people"),
       name: "visual-basicinfo-people",
       meta: {
@@ -229,9 +224,21 @@ router.beforeEach((to, from, next) => {
       window.SITE_CONFIG["menuShujuList"] = [
         {
           icon: "icon-setting",
-          id: "2",
+          id: "22213213",
           name: "基础信息",
           url: "visual/basicinfo/basicInfoMain",
+          // children: [
+          //   // {
+          //   //   url: "/visual/basicinfo/basicInfoMain",
+          //   //   name: "基础信息",
+          //   //   id: "5feawfwaefwa5",
+          //   // },
+          //   // {
+          //   //   url: "/visual/basicinfo/basicInfoMain",
+          //   //   name: "人员类别分析",
+          //   //   id: "5fwaefwaefawef5",
+          //   // },
+          // ],
         },
         {
           icon: "icon-setting",
@@ -239,6 +246,76 @@ router.beforeEach((to, from, next) => {
           name: "人员预警",
           url: "visual/warning/index",
         },
+        {
+          icon: "icon-setting",
+          id: "6",
+          name: "社区治理",
+          children: [
+            {
+              url: "visual/communityGovern/processAnalyze",
+              name: "项目处理分析",
+              id: "processAnalyze",
+            },
+            {
+              url: "/visual/communityGovern/typeAnalyze",
+              name: "项目分类分析",
+              id: "typeAnalyze",
+            },
+            {
+              url: "/visual/communityGovern/resibuzz",
+              name: "居民热议",
+              id: "resibuzz",
+            },
+            {
+              url: "/visual/communityGovern/distributionAnalyze",
+              name: "项目分布分析",
+              id: "distributionAnalyze",
+            },
+          ],
+        },
+        {
+          icon: "icon-setting",
+          id: "2221321001",
+          name: "社区党建",
+          // url: "visual/basicinfo/basicInfoMain",
+          children: [
+            {
+              url: "/visual/communityParty/party",
+              name: "党员信息统计",
+              id: "5feawfwaefwa578",
+            },
+            {
+              url: "/visual/communityParty/community",
+              name: "区域化党建",
+              id: "5fwaefwaefawef588",
+            },
+          ],
+        },
+        {
+          icon: "icon-setting",
+          id: "2221321123",
+          name: "措施清单",
+          // url: "visual/basicinfo/basicInfoMain",
+          children: [
+            {
+              url: "/visual/measure/service",
+              name: "服务措施分析",
+              id: "5feawfwaefwa57",
+            },
+            {
+              url: "/visual/measure/volunteer",
+              name: "志愿者服务分析",
+              id: "5fwaefwaefawef58",
+            },
+          ],
+        },
+        {
+          icon: "icon-setting",
+          id: "2221321fefefaewfa123",
+          name: "初心互助",
+          url: "visual/heart/index",
+          children: [],
+        },
       ];
       fnAddDynamicMenuRoutes2(window.SITE_CONFIG["menuShujuList"]);
       // next({ ...to, replace: true })
diff --git a/src/utils/request.js b/src/utils/request.js
index 692bb8ba..419f83ec 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -51,15 +51,17 @@ http.interceptors.request.use(config => {
  * 响应拦截
  */
 http.interceptors.response.use(response => {
-  if (response.data.code === 401 || response.data.code === 10001 || response.data.code === 10005) {
+  const code = [10007, 401, 10001, 10005]
+  if (code.includes(response.data.code)) {
     clearLoginInfo()
-    localStorage.setItem('userType', 'work')
-    let userType = localStorage.getItem("userType");
-    if (userType === 'work'){
-      router.replace({ name: 'loginWork' })
-    }else {
-      router.replace({ name: 'login' })
-    }
+    // localStorage.setItem('userType', 'work')
+    // let userType = localStorage.getItem("userType");
+    // if (userType === 'work'){
+    //   router.replace({ name: 'loginWork' })
+    // }else {
+    //   router.replace({ name: 'login' })
+    // }
+    router.replace({ name: 'login' })
     
     return Promise.reject(response.data.msg)
   }
diff --git a/src/views/components/foldText.vue b/src/views/components/foldText.vue
new file mode 100644
index 00000000..4438e0c7
--- /dev/null
+++ b/src/views/components/foldText.vue
@@ -0,0 +1,135 @@
+<template>
+  <div class="m-fold_text" :class="initOk ? '' : 'z-init'">
+    <div
+      id="cnt"
+      ref="foldSlot"
+      class="fold_text-cnt"
+      :class="isFolded ? 'z-fold-' + row : ''"
+    >
+      <slot></slot>
+    </div>
+    <div v-if="!noNeedFold" class="fold_text-btn" @click="shiftFold">
+      {{ isFolded ? "展开" : "收起" }}
+    </div>
+  </div>
+</template>
+
+<script>
+import nextTick from "dai-js/tools/nextTick";
+
+export default {
+  name: "ResiSearch",
+  props: {
+    row: {
+      type: Number,
+      default: 2,
+    },
+    lineHeight: {
+      type: Number,
+      default: 24,
+    },
+  },
+  data() {
+    return {
+      initOk: false,
+
+      isFolded: false,
+
+      noNeedFold: false,
+    };
+  },
+  computed: {},
+  watch: {},
+  created() {
+    this.init();
+  },
+  methods: {
+    async init() {
+      await nextTick();
+
+      const height = await this.$refs.foldSlot.offsetHeight;
+      const { row, lineHeight } = this;
+
+      let noNeedFold = height / row < lineHeight;
+
+      this.noNeedFold = noNeedFold;
+      this.isFolded = !noNeedFold;
+      this.initOk = true;
+    },
+
+    shiftFold() {
+      let { isFolded } = this;
+      this.isFolded = !isFolded;
+    },
+  },
+};
+</script>
+
+<style lang="scss" scope>
+// 清除容器自身浮动
+@mixin cs {
+  &::after {
+    display: block;
+    visibility: hidden;
+    clear: both;
+    overflow: hidden;
+    height: 0;
+    content: "";
+  }
+}
+
+// 不换行显示省略号
+@mixin toe {
+  overflow: hidden;
+  white-space: nowrap;
+  text-overflow: ellipsis;
+  word-wrap: normal;
+}
+
+// 强制文本换行 多行
+@mixin toeM($num) {
+  display: -webkit-box;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  -webkit-line-clamp: $num;
+  -webkit-box-orient: vertical;
+}
+
+.m-fold_text {
+  @include cs;
+
+  &.z-init {
+    background-color: rgba(#000, 0.05);
+    > view {
+      visibility: hidden;
+    }
+  }
+
+  .fold_text-cnt {
+    &.z-fold-1 {
+      @include toe;
+    }
+    &.z-fold-2 {
+      @include toeM(2);
+    }
+    &.z-fold-3 {
+      @include toeM(3);
+    }
+    &.z-fold-4 {
+      @include toeM(4);
+    }
+    &.z-fold-5 {
+      @include toeM(5);
+    }
+  }
+
+  .fold_text-btn {
+    float: right;
+    margin-right: -4px;
+    padding: 0 5px;
+    line-height: 20px;
+    color: #0c81fe;
+    cursor: pointer;
+  }
+}
+</style>
diff --git a/src/views/main-navbar.vue b/src/views/main-navbar.vue
index 0e9bdce5..24cd80bd 100644
--- a/src/views/main-navbar.vue
+++ b/src/views/main-navbar.vue
@@ -227,12 +227,12 @@ export default {
               }
 
               clearLoginInfo()
-
-              if (localStorage.getItem('userType') === 'work') {
-                this.$router.push({ name: 'loginWork' })
-              } else {
-                this.$router.push({ name: 'login' })
-              }
+              this.$router.push({ name: 'login' })
+              // if (localStorage.getItem('userType') === 'work') {
+              //   this.$router.push({ name: 'loginWork' })
+              // } else {
+              //   this.$router.push({ name: 'login' })
+              // }
             })
             .catch(() => {})
         })
diff --git a/src/views/main-shuju/main-navbar.vue b/src/views/main-shuju/main-navbar.vue
index 181e7d51..19c148a4 100644
--- a/src/views/main-shuju/main-navbar.vue
+++ b/src/views/main-shuju/main-navbar.vue
@@ -1,13 +1,10 @@
 <template>
   <div>
-    <nav
-      v-if="showHeader"
-      class="m-navbar"
-    >
+    <nav v-if="showHeader" class="m-navbar">
       <div class="navbar__header">
         <h1 class="navbar__brand" @click="$router.push({ name: 'home' })">
           <a class="navbar__brand-lg" href="javascript:;">{{
-            userType === 'work' ? customerName : $t('brand.lg')
+            userType === "work" ? customerName : $t("brand.lg")
           }}</a>
           <a class="navbar__brand-mini" href="javascript:;">{{
             customerName.slice(0, 2)
@@ -21,10 +18,7 @@
             @click="$store.state.sidebarFold = !$store.state.sidebarFold"
           >
             <svg
-              class="
-                icon-svg
-                navbar__icon-menu navbar__icon-menu--switch
-              "
+              class="icon-svg navbar__icon-menu navbar__icon-menu--switch"
               aria-hidden="true"
             >
               <use xlink:href="#icon-outdent"></use>
@@ -45,21 +39,39 @@
           mode="horizontal"
           class="navbar__menu mr-auto z-div"
         >
-          <el-menu-item
-            @click="toIndexPage"
-          >
+          <el-menu-item index="index" @click="toIndexPage">
             <span>首页</span>
           </el-menu-item>
 
-          <el-menu-item
-            v-for="(menu, idx) in $store.state.mainShuju.menuList"
-            :key="menu.id"
-            :menu="menu"
-            :index="menu.id"
-            @click="gotoRouteHandle(menu.id, idx)"
-          >
-            <span>{{ menu.name }}</span>
-          </el-menu-item>
+          <template v-for="(menu, idx) in $store.state.mainShuju.menuList">
+            <li
+              class="sub-menu"
+              :class="$store.state.mainShuju.activeName==menu.name ? 'z-on':''"
+              v-if="menu.children"
+              :key="menu.id"
+              @click="gotoRouteHandle(menu.id, idx)"
+            >
+              <span>{{ menu.name }}</span>
+              <div class="sub-menu-list">
+                <div
+                  :key="subMenu.id"
+                  @click="gotoRouteHandle(subMenu.id, subIndex)"
+                  v-for="(subMenu, subIndex) in menu.children"
+                >
+                  {{ subMenu.name }}
+                </div>
+              </div>
+            </li>
+            <el-menu-item
+              v-else
+              :key="menu.id"
+              :menu="menu"
+              :index="menu.id"
+              @click="gotoRouteHandle(menu.id, idx)"
+            >
+              <span>{{ menu.name }}</span>
+            </el-menu-item>
+          </template>
         </el-menu>
 
         <el-menu class="navbar__menu" mode="horizontal">
@@ -83,10 +95,8 @@
               </svg>
             </a>
           </el-menu-item> -->
-          <el-menu-item index="3"
-                        @click="fullscreenHandle()">
-            <svg class="icon-svg navbar__icon-menu"
-                 aria-hidden="true">
+          <el-menu-item index="3" @click="fullscreenHandle()">
+            <svg class="icon-svg navbar__icon-menu" aria-hidden="true">
               <use xlink:href="#icon-fullscreen"></use>
             </svg>
           </el-menu-item>
@@ -99,12 +109,11 @@
                 <i class="el-icon-arrow-down"></i>
               </span>
               <el-dropdown-menu slot="dropdown">
-                <el-dropdown-item
-                  @click.native="updatePasswordHandle()"
-                  >{{ $t('updatePassword.title') }}</el-dropdown-item
-                >
+                <el-dropdown-item @click.native="updatePasswordHandle()">{{
+                  $t("updatePassword.title")
+                }}</el-dropdown-item>
                 <el-dropdown-item @click.native="logoutHandle()">{{
-                  $t('logout')
+                  $t("logout")
                 }}</el-dropdown-item>
               </el-dropdown-menu>
             </el-dropdown>
@@ -122,114 +131,114 @@
 </template>
 
 <script>
-import { messages } from '@/i18n'
-import { mapGetters } from 'vuex'
-import screenfull from 'screenfull'
-import UpdatePasswordWork from './main-navbar-update-password-work'
-import { clearLoginInfo } from '@/utils'
+import { messages } from "@/i18n";
+import { mapGetters } from "vuex";
+import screenfull from "screenfull";
+import UpdatePasswordWork from "./main-navbar-update-password-work";
+import { clearLoginInfo } from "@/utils";
 export default {
-  inject: ['refresh'],
+  inject: ["refresh"],
   data() {
     return {
       showHeader: true,
       i18nMessages: messages,
       updatePassowrdVisible: false,
-      customerName: localStorage.getItem('customerName')
-    }
+      customerName: localStorage.getItem("customerName"),
+    };
   },
   components: {
-    UpdatePasswordWork
+    UpdatePasswordWork,
   },
   created() {
-    let platformToken = localStorage.getItem('showHeader') || ''
+    let platformToken = localStorage.getItem("showHeader") || "";
     if (
-      typeof platformToken !== 'undefined' &&
-      platformToken !== 'undefined' &&
-      platformToken !== ''
+      typeof platformToken !== "undefined" &&
+      platformToken !== "undefined" &&
+      platformToken !== ""
     ) {
-      this.showHeader = false
+      this.showHeader = false;
     }
-    console.log('=============================', this.userType)
-    this.$store.state.mainShuju.menuList = window.SITE_CONFIG['menuShujuList']
+    console.log("=============================", this.userType);
+    this.$store.state.mainShuju.menuList = window.SITE_CONFIG["menuShujuList"];
   },
   computed: {
     userType() {
-      return localStorage.getItem('userType')
-    }
+      return localStorage.getItem("userType");
+    },
   },
   methods: {
-    toIndexPage(){
-      this.$router.replace('/indexWork')
+    toIndexPage() {
+      this.$router.replace("/indexWork");
     },
     // 通过menuId与动态(菜单)路由进行匹配跳转至指定路由
     gotoRouteHandle(menuId, idx) {
-      var route = window.SITE_CONFIG['dynamicMenuRoutesShuju'].filter(
+      var route = window.SITE_CONFIG["dynamicMenuRoutesShuju"].filter(
         (item) => item.meta.menuId === menuId
-      )[0]
+      )[0];
       if (route) {
-        this.$router.push({ name: route.name })
+        this.$router.push({ name: route.name });
       }
-      this.$store.state.mainShuju.activeName = menuId
+      this.$store.state.mainShuju.activeName = menuId;
     },
     changeCustomerName(customerName) {
-      this.customerName = localStorage.getItem('customerName')
+      this.customerName = localStorage.getItem("customerName");
     },
     // 全屏
     fullscreenHandle() {
       if (!screenfull.enabled) {
         return this.$message({
-          message: this.$t('fullscreen.prompt'),
-          type: 'warning',
-          duration: 500
-        })
+          message: this.$t("fullscreen.prompt"),
+          type: "warning",
+          duration: 500,
+        });
       }
-      screenfull.toggle()
+      screenfull.toggle();
     },
     // 修改密码
     updatePasswordHandle() {
-      this.updatePassowrdVisible = true
+      this.updatePassowrdVisible = true;
       this.$nextTick(() => {
-        this.$refs.updatePassowrd.init()
-      })
+        this.$refs.updatePassowrd.init();
+      });
     },
     // 退出
     logoutHandle() {
       this.$confirm(
-        this.$t('prompt.info', { handle: this.$t('logout') }),
-        this.$t('prompt.title'),
+        this.$t("prompt.info", { handle: this.$t("logout") }),
+        this.$t("prompt.title"),
         {
-          confirmButtonText: this.$t('confirm'),
-          cancelButtonText: this.$t('cancel'),
-          type: 'warning'
+          confirmButtonText: this.$t("confirm"),
+          cancelButtonText: this.$t("cancel"),
+          type: "warning",
         }
       )
         .then(() => {
           //关闭所有标签页
           // tabs, 关闭全部
           this.$store.state.contentTabs = this.$store.state.contentTabs.filter(
-            (item) => item.name === 'home2'
-          )
+            (item) => item.name === "home2"
+          );
 
           this.$http
-            .post('/auth/login/logout')
+            .post("/auth/login/logout")
             .then(({ data: res }) => {
               if (res.code !== 0) {
                 //别处登陆时 退出不提示 直接跳登陆页即可
                 if (res.code !== 10007) {
-                  this.$message.error(res.msg)
+                  this.$message.error(res.msg);
                 }
               }
 
-              clearLoginInfo()
+              clearLoginInfo();
 
-              this.$router.push({ name: 'login' })
+              this.$router.push({ name: "login" });
             })
-            .catch(() => {})
+            .catch(() => {});
         })
-        .catch(() => {})
-    }
-  }
-}
+        .catch(() => {});
+    },
+  },
+};
 </script>
 
 <style lang="scss" scoped>
@@ -240,4 +249,3 @@ export default {
 </style>
 
 <style lang="scss" src="@/assets/scss/main-shuju.scss" scoped></style>
-
diff --git a/src/views/modules/base/community/buildTable.vue b/src/views/modules/base/community/buildTable.vue
index 18c4a157..c8a0d7c2 100644
--- a/src/views/modules/base/community/buildTable.vue
+++ b/src/views/modules/base/community/buildTable.vue
@@ -180,7 +180,7 @@ export default {
   computed: {
     tableHeight () {
 
-      return (this.clientHeight - 220)
+      return (this.clientHeight - 300)
 
     },
 
diff --git a/src/views/modules/base/community/communityTable.vue b/src/views/modules/base/community/communityTable.vue
index 4fc23e5e..a57e6a1e 100644
--- a/src/views/modules/base/community/communityTable.vue
+++ b/src/views/modules/base/community/communityTable.vue
@@ -185,7 +185,7 @@ export default {
   computed: {
     tableHeight () {
 
-      return (this.clientHeight - 320)
+      return (this.clientHeight - 300)
 
     },
     rowHeight () {
diff --git a/src/views/modules/base/community/roomTable.vue b/src/views/modules/base/community/roomTable.vue
index 8a065fb7..797b047e 100644
--- a/src/views/modules/base/community/roomTable.vue
+++ b/src/views/modules/base/community/roomTable.vue
@@ -63,6 +63,7 @@
                 :header-cell-style="{background:'#2195FE',color:'#FFFFFF'}"
                 v-loading="tableLoading"
                 border
+                :height="tableHeight"
                 style="width: 100%">
         <el-table-column prop="houseName"
                          label="房屋名称"
@@ -189,9 +190,12 @@ export default {
 
   },
   computed: {
-    rowHeight () {
-      return (this.clientHeight - 200) + 'px'
+    tableHeight () {
+
+      return (this.clientHeight - 300)
+
     },
+
     ...mapGetters(['clientHeight'])
   },
   methods: {
diff --git a/src/views/modules/base/resi.vue b/src/views/modules/base/resi.vue
index 4c6e4ba5..6a4af200 100644
--- a/src/views/modules/base/resi.vue
+++ b/src/views/modules/base/resi.vue
@@ -9,7 +9,7 @@
     <el-card class="resi-card-table">
       <div class="resi-row-btn">
         <el-button type="success" size="small" @click="handleAdd">新增</el-button>
-        <el-button type="warning" size="small" @click="handleExport">导出</el-button>
+        <el-button type="warning" size="small" :loading="exportBtn" @click="handleExport">{{exportBtnTitle}}</el-button>
         <!-- <el-button type="primary" size="small">下载人口模板</el-button> -->
         <el-upload
           ref="upload"
@@ -216,6 +216,8 @@ export default {
   },
   data() {
     return {
+      exportBtn: false,
+      exportBtnTitle: '导出',
       importBtnTitle: '导入人员数据',
       importLoading: false,
       rowVisible: false,
@@ -314,14 +316,16 @@ export default {
         window.URL.revokeObjectURL(url)
       }
     },
-    handleExport() {
+    async handleExport() {
+      this.exportBtn = true
+      this.exportBtnTitle = '正在导出...'
       let params = {
         formCode: 'resi_base_info',
         conditions: this.conditions
       }
 
       // .post('epmetuser/icresiuser/exportExcel', params)
-      axios({
+      await axios({
         url: window.SITE_CONFIG['apiURL'] + '/epmetuser/icresiuser/exportExcel',
         // url: 'epmetuser/icresiuser/exportExcel',
         method: 'post',
@@ -329,6 +333,7 @@ export default {
         responseType: 'blob'
       })
         .then(res => {
+          
           console.log('resllll', res)
           let fileName = window.decodeURI(res.headers["content-disposition"].split(";")[1].split("=")[1])
           console.log('filename', fileName)
@@ -345,8 +350,10 @@ export default {
         })
         .catch((err) => {
           console.log('获取导出情失败', err)
-          return this.$message.error('网络错误')
+          this.$message.error('获取导出失败')
         })
+        this.exportBtnTitle = '导出'
+        this.exportBtn = false
     },
     // 上传大图标成功
     handleExcelSuccess (res, file) {
@@ -377,38 +384,43 @@ export default {
       }
       return fileType && isLt1M
     },
-    uploadHttpRequest(file) {
+    async uploadHttpRequest(file) {
       this.importLoading = true
       this.importBtnTitle = '正在上传中...'
       const formData = new FormData() //FormData对象，添加参数只能通过append('key', value)的形式添加
       formData.append('file', file.file) //添加文件对象
-      axios({
+      await axios({
         url: window.SITE_CONFIG['apiURL'] + '/epmetuser/icresiuser/importExcel',
         method: 'post',
         data: formData,
         responseType: 'blob'
       })
       .then((res) => {
-        this.importLoading = false
-        this.importBtnTitle = '导入人员数据'
-        let fileName = window.decodeURI(res.headers["content-disposition"].split(";")[1].split("=")[1])
+        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对象
+          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对象
+        }
+        
         this.getTableData()
       })
       .catch( err => {
           console.log('失败', err)
-          param.onError() //上传失败的文件会从文件列表中删除
+          file.onError() //上传失败的文件会从文件列表中删除
+          this.$message.error('导入失败')
       })
+      this.importLoading = false
+      this.importBtnTitle = '导入人员数据'
+      this.$refs.upload.clearFiles()
     },
     handleClick(tab, event) {
       console.log(tab, event)
diff --git a/src/views/modules/communityParty/elegant/index.vue b/src/views/modules/communityParty/elegant/index.vue
index 344782e3..9c7b5a18 100644
--- a/src/views/modules/communityParty/elegant/index.vue
+++ b/src/views/modules/communityParty/elegant/index.vue
@@ -3,7 +3,7 @@
     <el-card class="resi-card-table">
       <div class="resi-row-btn">
         <el-form ref="searchForm" :inline="true" :model="searchForm" class="demo-form-inline">
-          <el-form-item label="所属网格">
+          <el-form-item label="所属网格" prop="gridId">
             <el-select v-model="searchForm.gridId" filterable placeholder="请选择" clearable>
               <el-option
                 v-for="item in optionsG"
@@ -13,7 +13,7 @@
               </el-option>
             </el-select>
           </el-form-item>
-          <el-form-item label="党员姓名">
+          <el-form-item label="党员姓名" prop="name">
             <el-select v-model="searchForm.name" filterable placeholder="请选择" clearable>
               <el-option
                 v-for="item in demandOptions"
@@ -23,7 +23,7 @@
               </el-option>
             </el-select>
           </el-form-item>
-          <el-form-item label="主要事迹">
+          <el-form-item label="主要事迹" prop="mainDeed">
             <el-input v-model="searchForm.mainDeed" placeholder="请输入" class="input-width" clearable></el-input>
           </el-form-item>
           <el-form-item>
@@ -34,7 +34,7 @@
       </div>
       <div class="resi-row-btn">
         <el-button type="success" @click="handleAdd">新增</el-button>
-        <el-button type="warning" size="small" @click="handleExport">导出</el-button>
+        <el-button type="warning" size="small" :loading="exportBtn" @click="handleExport">{{ exportBtnTitle }}</el-button>
         <el-upload
           ref="upload"
           class="upload-demo"
@@ -120,14 +120,14 @@
     </el-card>
 
     <el-dialog
-      title="居民需求分类"
+      title="党员风采"
       :visible.sync="dialogVisible"
       width="40%"
       append-to-body
       :close-on-click-modal="false"
       :before-close="handlerCancle"
     >
-      <el-form label-width="100px" :model="form" :rules="rules" ref="ruleForm" class="form-wr">
+      <el-form v-if="dialogVisible" label-width="100px" :model="form" :rules="rules" ref="ruleForm" class="form-wr">
         <el-form-item label="所属网格" prop="gridId">
           <el-select v-model="form.gridId" filterable
           :disabled="disabled" placeholder="请选择" class="input-width" clearable>
@@ -197,6 +197,8 @@ export default {
       uploadUlr: window.SITE_CONFIG['apiURL'] + '/oss/file/uploadqrcodeV2',
       importBtnTitle: '导入人员数据',
       importLoading: false,
+      exportBtn: false,
+      exportBtnTitle: '导出',
       tableLoading: false,
       btnLoading: false,
       uploading: false,
@@ -258,7 +260,9 @@ export default {
         imageList: []
       },
       rules: {
-        categoryName: [{ required: true, message: '分类名称不能为空', trigger: 'blur' }]
+        gridId: [{ required: true, message: '网格不能为空', trigger: 'blur' }],
+        name: [{ required: true, message: '姓名不能为空', trigger: 'blur' }],
+        mainDeed: [{ required: true, message: '主要事迹不能为空', trigger: 'blur' }],
       }
     }
   },
@@ -323,47 +327,53 @@ export default {
       }
       return fileType && isLt1M
     },
-    uploadHttpRequest(file) {
+    async uploadHttpRequest(file) {
       this.importLoading = true
       this.importBtnTitle = '正在上传中...'
       const formData = new FormData() //FormData对象，添加参数只能通过append('key', value)的形式添加
       formData.append('file', file.file) //添加文件对象
-      axios({
+      await axios({
         url: window.SITE_CONFIG['apiURL'] + '/resi/partymember/icpartymemberstyle/import',
         method: 'post',
         data: formData,
         responseType: 'blob'
       })
       .then((res) => {
-        this.importLoading = false
-        this.importBtnTitle = '导入人员数据'
-        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对象
+        // this.importLoading = false
+        // this.importBtnTitle = '导入人员数据'
+        // 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对象
         this.getTableData()
       })
       .catch( err => {
           console.log('失败', err)
-          param.onError() //上传失败的文件会从文件列表中删除
+          file.onError() //上传失败的文件会从文件列表中删除
+          this.$message.error('导入失败')
       })
+      this.importLoading = false
+      this.importBtnTitle = '导入人员数据'
+      this.$refs.upload.clearFiles()
     },
-    handleExport() {
+    async handleExport() {
+      this.exportBtn = true
+      this.exportBtnTitle = '正在导出...'
       let params = {
         agencyId: this.$store.state.user.agencyId,
         pageSize: 9999,
         pageNo: this.currentPage
       }
       // .post('epmetuser/icresiuser/exportExcel', params)
-      axios({
+      await axios({
         url: window.SITE_CONFIG['apiURL'] + '/resi/partymember/icpartymemberstyle/export',
         // url: 'epmetuser/icresiuser/exportExcel',
         method: 'post',
@@ -387,8 +397,10 @@ export default {
         })
         .catch((err) => {
           console.log('获取导出情失败', err)
-          return this.$message.error('网络错误')
+          this.$message.error('获取导出失败')
         })
+        this.exportBtn = false
+        this.exportBtnTitle = '导出'
     },
     beforeImgUpload (file) {
       const isPNG = (file.type === 'image/png') || (file.type === 'image/jpeg')
@@ -424,6 +436,7 @@ export default {
     },
     resetForm(formName) {
       this.$refs[formName].resetFields()
+      this.handleSearch()
     },
     handleAdd() {
       this.dialogVisible = true
diff --git a/src/views/modules/communityParty/regionalParty/activitys.vue b/src/views/modules/communityParty/regionalParty/activitys.vue
index fac50601..1638a07c 100644
--- a/src/views/modules/communityParty/regionalParty/activitys.vue
+++ b/src/views/modules/communityParty/regionalParty/activitys.vue
@@ -78,10 +78,14 @@
     </div>
     <div class="div_table">
       <div class="div_btn">
-        <el-button style="float:left"
+        <el-button style=""
                    type="green"
                    size="small"
                    @click="handleAdd">新增</el-button>
+        <!-- <el-button style="float:left"
+                   type="yellow"
+                   size="small"
+                   @click="handleExport">导出</el-button>
         <el-upload ref="upload"
                    :multiple='false'
                    :show-file-list='false'
@@ -95,12 +99,8 @@
                      size="small"
                      type="red">导入</el-button>
 
-          <el-button style="float:left"
-                     type="yellow"
-                     size="small"
-                     @click="handleExport">导出</el-button>
 
-        </el-upload>
+        </el-upload> -->
 
       </div>
 
@@ -470,14 +470,14 @@ export default {
 
     //导出表格
     async handleExport () {
-      let title = '—联建活动列表'
+      let title = '联建活动列表'
 
       const url = "/heart/icpartyactivity/export"
       let params = {
-        ownerName: this.ownerName,
-        ownerPhone: this.ownerPhone,
-        level: this.agencyObj.level,
-        id: this.agencyObj.id
+        agencyId: this.agencyId,
+
+        ...this.formData
+
       }
 
       app.ajax.exportFilePost(
diff --git a/src/views/modules/communityParty/regionalParty/units.vue b/src/views/modules/communityParty/regionalParty/units.vue
index f1cda8df..a9ff9dc6 100644
--- a/src/views/modules/communityParty/regionalParty/units.vue
+++ b/src/views/modules/communityParty/regionalParty/units.vue
@@ -84,11 +84,11 @@
     </div>
     <div class="div_table">
       <div class="div_btn">
-        <el-button style="float:left"
+        <el-button style=""
                    type="green"
                    size="small"
                    @click="handleAdd">新增</el-button>
-        <el-button style="float:left"
+        <!-- <el-button style="float:left"
                    type="yellow"
                    size="small"
                    @click="handleExport">导出</el-button>
@@ -103,7 +103,7 @@
                    :http-request="uploadFile">
           <el-button style="margin-left:10px"
                      size="small"
-                     type="red">导入</el-button>
+                     type="red">导入</el-button> -->
 
         </el-upload>
 
diff --git a/src/views/modules/communityService/dqfwzx/cpts/edit.vue b/src/views/modules/communityService/dqfwzx/cpts/edit.vue
index 74772f22..90ebcff9 100644
--- a/src/views/modules/communityService/dqfwzx/cpts/edit.vue
+++ b/src/views/modules/communityService/dqfwzx/cpts/edit.vue
@@ -173,67 +173,95 @@
               :key="'staff' + index"
               v-for="(item, index) in dataForm.matterList"
             >
-              <el-input
-                class="item_width_1"
-                maxlength="50"
-                show-word-limit
-                placeholder="事项名"
-                v-model="item.matterName"
-                :disabled="item.matterId != undefined"
-              />
-
-              <el-select
-                style="margin-left: 10px"
-                v-model="item.appointmentType"
-                filterable
-                placeholder="预约类型"
-                :disabled="item.matterId != undefined"
-              >
-                <el-option
-                  v-for="item in appointmentTypeOptions"
-                  :key="item.value"
-                  :label="item.label"
-                  :value="item.value"
+              <div class="item-info">
+                <el-input
+                  class="item_width_1"
+                  maxlength="50"
+                  show-word-limit
+                  placeholder="事项名"
+                  v-model="item.matterName"
+                  :disabled="item.matterId != undefined"
+                />
+
+                <el-select
+                  style="margin-left: 10px"
+                  v-model="item.appointmentType"
+                  filterable
+                  placeholder="预约类型"
+                  :disabled="item.matterId != undefined"
                 >
-                </el-option>
-              </el-select>
-
-              <el-time-select
-                style="margin-left: 10px"
-                v-model="item.startTime"
-                :picker-options="{
-                  start: '00:00',
-                  step: '00:30',
-                  end: '24:00',
-                }"
-                placeholder="开始时间"
-                :disabled="item.matterId != undefined"
-              >
-              </el-time-select>
-              <span style="margin: 0 5px">至</span>
-              <el-time-select
-                v-model="item.endTime"
-                :picker-options="{
-                  start: '00:00',
-                  step: '00:30',
-                  end: '24:00',
-                  minTime: item.startTime,
-                }"
-                placeholder="结束时间"
-                :disabled="item.matterId != undefined"
-              >
-              </el-time-select>
-
-              <el-button
-                style="margin-left: 10px"
-                size="small"
-                @click="handleDelStaff(index)"
-                >删除</el-button
-              >
+                  <el-option
+                    v-for="item in appointmentTypeOptions"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.value"
+                  >
+                  </el-option>
+                </el-select>
+
+                <el-time-select
+                  style="margin-left: 10px"
+                  v-model="item.startTime"
+                  :picker-options="{
+                    start: '00:00',
+                    step: '00:30',
+                    end: '24:00',
+                  }"
+                  placeholder="开始时间"
+                  :disabled="item.matterId != undefined"
+                >
+                </el-time-select>
+                <span style="margin: 0 5px">至</span>
+                <el-time-select
+                  v-model="item.endTime"
+                  :picker-options="{
+                    start: '00:00',
+                    step: '00:30',
+                    end: '24:00',
+                    minTime: item.startTime,
+                  }"
+                  placeholder="结束时间"
+                  :disabled="item.matterId != undefined"
+                >
+                </el-time-select>
+              </div>
+              <div class="item-pic">
+                <el-upload
+                  :disabled="item.matterId != undefined"
+                  class="avatar-uploader"
+                  :action="uploadUlr"
+                  :data="{ customerId: customerId }"
+                  :show-file-list="false"
+                  :on-success="
+                    (response, file, fileList) =>
+                      handleImgSuccess(index, response, file, fileList)
+                  "
+                  :before-upload="beforeImgUpload"
+                >
+                  <img
+                    v-if="item.matterImg"
+                    :src="item.matterImg"
+                    style="width: 50px; height: 50px"
+                    class="function-icon"
+                  />
+                  <i v-else class="el-icon-plus avatar-uploader-icon"></i>
+                </el-upload>
+
+                <div class="hint">（事项封面，图片小于1M）</div>
+
+                <el-button
+                  style="margin-left: auto"
+                  size="small"
+                  @click="handleDelStaff(index)"
+                  >删除</el-button
+                >
+              </div>
             </div>
 
             <div class="item-add">
-              <el-button size="small" @click="handleAddStaff">添加</el-button>
+              <el-button size="small" type="warning" @click="handleAddStaff"
+                >添加</el-button
+              >
             </div>
           </div>
         </el-form-item>
@@ -266,6 +294,9 @@ let loading; // 加载动画
 export default {
   data() {
     return {
+      uploadUlr: window.SITE_CONFIG["apiURL"] + "/oss/file/uploadqrcodeV2",
+      customerId: "",
+
       formType: "add", //表单操作类型 add新增，edit编辑，detail详情
 
       btnDisable: false,
@@ -342,14 +373,39 @@ export default {
   watch: {},
 
   async mounted() {
+    this.customerId = localStorage.getItem("customerId");
     this.initMap();
   },
 
   methods: {
+    handleImgSuccess(index, res, file) {
+      if (res.code === 0 && res.msg === "success") {
+        console.log("res.data.url", res.data.url);
+        this.dataForm.matterList[index].matterImg = res.data.url;
+      } else {
+        this.$message.error(res.msg);
+      }
+    },
+
+    beforeImgUpload(file) {
+      const isLt1M = file.size / 1024 / 1024 < 1;
+
+      if (!isLt1M) {
+        this.$message.error("上传图片大小不能超过 1MB!");
+      }
+      return isLt1M;
+    },
+
     handleAddStaff() {
       this.dataForm.matterList = [
         ...this.dataForm.matterList,
-        { matterName: "", appointmentType: "", startTime: "", endTime: "" },
+        {
+          matterName: "",
+          appointmentType: "",
+          matterImg: "",
+          startTime: "",
+          endTime: "",
+        },
       ];
     },
     handleDelStaff(index) {
@@ -482,9 +538,28 @@ export default {
         this.dataForm.partyServiceCenterId = this.partyServiceCenterId;
       }
 
+      const matterList = this.dataForm.matterList.filter(
+        (item) => !item.matterId
+      );
+      if (
+        matterList.some(
+          (item) =>
+            !item.matterImg ||
+            !item.matterName ||
+            !item.appointmentType ||
+            !item.startTime ||
+            !item.endTime
+        )
+      ) {
+        return this.$message({
+          type: "warning",
+          message: "请补充完整可预约事项信息",
+        });
+      }
+
       const { data, code, msg } = await requestPost(url, {
         ...this.dataForm,
-        matterList: this.dataForm.matterList.filter((item) => !item.matterId),
+        matterList,
       });
 
       if (code === 0) {
@@ -580,9 +655,48 @@ export default {
   width: 650px;
 
   .item {
-    display: flex;
-    justify-content: space-around;
-    margin-bottom: 7px;
+    .item-info {
+      display: flex;
+      justify-content: space-around;
+      margin-bottom: 7px;
+    }
+    .item-pic {
+      display: flex;
+      align-items: center;
+      .hint {
+        font-size: 14px;
+        color: #999999;
+        margin-left: 10px;
+      }
+      .avatar-uploader {
+        ::v-deep .el-upload {
+          cursor: pointer;
+          position: relative;
+          overflow: hidden;
+        }
+        img {
+          object-fit: cover;
+        }
+        .el-upload:hover {
+          border-color: #409eff;
+        }
+        .avatar {
+          width: 50px;
+          height: 50px;
+          display: block;
+        }
+        .avatar-uploader-icon {
+          border: 1px dashed #d9d9d9;
+          border-radius: 6px;
+          font-size: 28px;
+          color: #8c939d;
+          width: 50px;
+          height: 50px;
+          line-height: 50px;
+          text-align: center;
+        }
+      }
+    }
   }
   .item-add {
   }
diff --git a/src/views/modules/communityService/dqfwzx/cpts/order.vue b/src/views/modules/communityService/dqfwzx/cpts/order.vue
index 6452dc55..501266fd 100644
--- a/src/views/modules/communityService/dqfwzx/cpts/order.vue
+++ b/src/views/modules/communityService/dqfwzx/cpts/order.vue
@@ -31,13 +31,22 @@
           label-width="150px"
           style="display: block"
         >
-          <el-date-picker
+          <!-- <el-date-picker
             v-model="dataForm.appointmentDate"
             placeholder="预约日期"
             value-format="yyyy-MM-dd"
             :picker-options="dateOptions"
           >
-          </el-date-picker>
+          </el-date-picker> -->
+          <el-select v-model="dataForm.appointmentDate" placeholder="请选择">
+            <el-option
+              v-for="item in dateList"
+              :key="item"
+              :label="item"
+              :value="item"
+            >
+            </el-option
+          ></el-select>
         </el-form-item>
 
         <el-form-item
@@ -47,18 +56,19 @@
           label-width="150px"
           style="display: block"
         >
-          <el-checkbox-group
-            style="margin-left: auto; width: 600px"
-            v-model="dataForm.timeId"
-          >
+          <div style="margin-left: auto; width: 600px">
             <el-checkbox
               :label="item.timeId"
               :key="item.timeId"
               :disabled="!item.isAppointment"
-              v-for="item in timeList"
+              v-for="(item, index) in timeList"
+              :checked="item.selected"
+              :value="item.selected"
+              @change="selectTime(index)"
+              @onChange="selectTime(index)"
               >{{ item.time }}</el-checkbox
             >
-          </el-checkbox-group>
+          </div>
         </el-form-item>
 
         <el-form-item
@@ -128,7 +138,15 @@
 import { mapGetters } from "vuex";
 import { Loading } from "element-ui"; // 引入Loading服务
 import { requestPost } from "@/js/dai/request";
+import dateFormat from "dai-js/tools/dateFormat";
 
+const deepClone = function (arg) {
+  if (typeof arg == "object" || typeof arg == "array") {
+    return JSON.parse(JSON.stringify(arg));
+  } else {
+    return arg;
+  }
+};
 var map;
 var search;
 var markers;
@@ -154,6 +172,7 @@ export default {
           );
         },
       },
+      dateList: [],
       timeList: [],
 
       dataForm: {
@@ -202,6 +221,100 @@ export default {
       if (item) {
         this.dataForm.matterId = item.matterId;
         this.info.matterName = item.matterName;
+        this.getDateList();
+      }
+    },
+
+    selectTime(index) {
+      // return console.log(index);
+      let list = deepClone(this.timeList);
+      if (!list[index].isAppointment) return false;
+
+      let startIndex = list.findIndex((item) => item.selected);
+      let endIndex = list.findIndex((item, index) => {
+        return (
+          item.selected &&
+          (index == list.length - 1 || !list[index + 1].selected)
+        );
+      });
+      // console.log(startIndex, endIndex);
+      if (startIndex == -1) {
+        list[index].selected = !list[index].selected;
+      } else if (startIndex == endIndex) {
+        let big = Math.max(startIndex, index);
+        let little = Math.min(startIndex, index);
+        if (big == little) {
+          list[index].selected = !list[index].selected;
+        } else {
+          for (let i = little; i <= big; i++) {
+            // console.log(i);
+            if (!list[i].isAppointment) {
+              this.$message({
+                type: "warning",
+                message: "请选择连续的时间",
+              });
+              return false;
+            }
+            list[i].selected = true;
+          }
+        }
+      } else {
+        if (index == startIndex || index == endIndex) {
+          list[index].selected = !list[index].selected;
+        } else if (list[index].selected) {
+          let big = index;
+          let little = index;
+          if (startIndex - index < index - endIndex) {
+            big = endIndex;
+          } else {
+            little = startIndex;
+          }
+          for (let i = little; i <= big; i++) {
+            list[i].selected = false;
+          }
+        } else {
+          let big = index;
+          let little = index;
+          if (index < startIndex) {
+            big = startIndex;
+          } else {
+            little = endIndex;
+          }
+          for (let i = little; i <= big; i++) {
+            // console.log(i);
+            if (!list[i].isAppointment) {
+              this.$message({
+                type: "warning",
+                message: "请选择连续的时间",
+              });
+              return false;
+            }
+            list[i].selected = true;
+          }
+        }
+      }
+      console.log(list);
+      this.timeList = list;
+      return false;
+    },
+
+    async getDateList() {
+      let url = "/gov/org/icpartyservicecenter/appointmenttime";
+
+      const {
+        dataForm: { matterId },
+      } = this;
+      if (!matterId) return;
+
+      const { data, code, msg } = await requestPost(url, {
+        matterId,
+        date: dateFormat(new Date(), "yyyy-MM-dd"),
+      });
+
+      if (code === 0) {
+        this.dateList = data.dateList || [];
+        // this.dataForm.appointmentDate = data.dateList[0];
+      } else {
       }
     },
 
@@ -219,8 +332,11 @@ export default {
       });
 
       if (code === 0) {
-        this.timeList = data.timeDetail || [];
-      } else {
+        let timeList = data.timeDetail || [];
+        this.timeList = timeList.map((item) => {
+          item.selected = false;
+          return item;
+        });
       }
     },
 
diff --git a/src/views/modules/communityService/measure/index.vue b/src/views/modules/communityService/measure/index.vue
index e1104966..66af8c1e 100644
--- a/src/views/modules/communityService/measure/index.vue
+++ b/src/views/modules/communityService/measure/index.vue
@@ -17,7 +17,7 @@
             <el-form-item label="需求分类" prop="categoryCode">
               <el-cascader
                 v-model="searchForm.categoryCode"
-                :options="demandOptions"
+                :options="searchdemandOptions"
                 :props="{ checkStrictly: true }"
                 clearable
                 @change="handleCateCHange"></el-cascader>
@@ -137,32 +137,45 @@
                 size="small"
                 @click="handleAppoint(scope.row, 'appoint')"
                 >指派</el-button>
-              <el-button
-                v-if="scope.row.status === 'assigned' || scope.row.status === 'have_order'"
-                type="text"
-                size="small"
-                @click="handleFinish(scope.row, 'finish')"
-                >完成情况</el-button>
-              <el-button
-                  v-if="scope.row.status === 'pending'"
-                  @click="handleEdit(scope.row, 'edit')"
+                <!-- v-if="scope.row.status === 'assigned' || scope.row.status === 'have_order'" -->
+              <template v-if="(scope.row.reportType == 'self_help' && scope.row.serviceShowFlag)">
+                <el-button
+                  v-if="scope.row.serviceType !== 'volunteer' && scope.row.status !== 'finished'"
                   type="text"
                   size="small"
-                  class="btn-color-edit"
-                  >编辑</el-button>
-              <el-popconfirm
-                title="取消之后无法恢复，确认取消？"
-                @onConfirm="handleDel(scope.row)"
-              >
+                  @click="handleFinish(scope.row, 'finish')"
+                  >完成情况</el-button>
+              </template>
+              <template v-else>
                 <el-button
-                  v-if="scope.row.status !== 'finished' && scope.row.status !== 'canceled'"
-                  slot="reference"
+                  v-if="scope.row.status === 'assigned' || scope.row.status === 'have_order' || (scope.row.status == 'finished' && !scope.row.evaluateFlag)"
                   type="text"
                   size="small"
-                  class="btn-color-del"
-                  >取消</el-button
+                  @click="handleFinish(scope.row, 'finish')"
+                  >完成情况</el-button>
+              </template>
+              <template v-if="scope.row.reportType != 'self_help'">
+                <el-button
+                    v-if="scope.row.status === 'pending'"
+                    @click="handleEdit(scope.row, 'edit')"
+                    type="text"
+                    size="small"
+                    class="btn-color-edit"
+                    >编辑</el-button>
+                <el-popconfirm
+                  title="取消之后无法恢复，确认取消？"
+                  @onConfirm="handleDel(scope.row)"
                 >
-              </el-popconfirm>
+                  <el-button
+                    v-if="scope.row.status !== 'finished' && scope.row.status !== 'canceled'"
+                    slot="reference"
+                    type="text"
+                    size="small"
+                    class="btn-color-del"
+                    >取消</el-button
+                  >
+                </el-popconfirm>
+              </template>
             </template>
             <el-button
               @click="handleLook(scope.row, 'look')"
@@ -299,7 +312,7 @@
           type="textarea" clearable class="input-width-textarea" placeholder="请输入内容"></el-input>
         </el-form-item>
         <el-form-item 
-        v-if="addType === 'appoint' || addType == 'finish' || addType == 'look'" 
+        v-if="addType === 'appoint' || addType == 'finish' || (addType == 'look' && form.serviceShowFlag)" 
         label="服务方" prop="serviceType">
           <template v-if="disabled && addType !== 'appoint'">
             <el-input v-model="form.serviceShowName" :disabled="disabled"  class="input-width"></el-input>
@@ -337,13 +350,12 @@
             </el-select>
           </template>
         </el-form-item>
-        <template v-if="addType == 'finish' || addType == 'look'">
-          <el-form-item label="完成情况" prop="finishResult">
-            <el-radio v-model="form.finishResult" 
-            label="resolved" :disabled="disabled && addType != 'finish'" >已解决</el-radio>
-            <el-radio v-model="form.finishResult" label="unresolved" 
-            :disabled="disabled && addType != 'finish'" >未解决</el-radio>
-          </el-form-item>
+        <el-form-item v-if="addType == 'look' && form.status == 'canceled'" label="取消时间" prop="cancelTime">
+          <span>{{ form.cancelTime }}</span>
+        </el-form-item>
+        <template 
+        v-if="(addType == 'finish' && form.reportType != 'self_help') || (addType == 'look' && form.status == 'finished')">
+          
           <el-form-item label="实际服务时间" prop="serviceStartTime">
             <el-date-picker
               v-model="finishServiceTime"
@@ -355,12 +367,18 @@
               start-placeholder="开始日期"
               end-placeholder="结束日期"
               value-format="yyyy-MM-dd HH:mm:ss"
-              @blur="handelBlurServiceTime"
+              @change="handelBlurServiceTime"
               >
             </el-date-picker>
           </el-form-item>
+          <el-form-item label="完成情况" prop="finishResult">
+            <el-radio v-model="form.finishResult" 
+            label="resolved" :disabled="disabled && addType != 'finish'" >已解决</el-radio>
+            <el-radio v-model="form.finishResult" label="unresolved" 
+            :disabled="disabled && addType != 'finish'" >未解决</el-radio>
+          </el-form-item>
           <el-form-item label="评价" prop="score" class="form-score">
-              <el-rate v-model="form.score" :disabled="disabled && addType != 'finish'" ></el-rate>
+              <el-rate v-model="form.score" :allow-half="true" :disabled="disabled && addType != 'finish'" ></el-rate>
           </el-form-item>
           <el-form-item label="备注" prop="finishDesc">
             <el-input v-model="form.finishDesc" :autosize="{ minRows: 2, maxRows: 10}" 
@@ -370,11 +388,29 @@
               class="input-width-textarea" placeholder="请输入内容"></el-input>
           </el-form-item>
         </template>
-        
+        <template v-if="(addType == 'finish' && form.reportType == 'self_help')">
+          <el-form-item label="实际服务时间" prop="serviceStartTime">
+            <el-date-picker
+              v-model="finishServiceTime"
+              class="input-width-min"
+              clearable
+              :disabled="disabled && addType != 'finish'"
+              type="datetimerange"
+              range-separator="至"
+              start-placeholder="开始日期"
+              end-placeholder="结束日期"
+              value-format="yyyy-MM-dd HH:mm:ss"
+              @change="handelBlurServiceTime"
+              >
+            </el-date-picker>
+          </el-form-item>
+        </template>
+
       </el-form>
       <div class="resi-btns">
-        <el-button size="small" @click="handlerCancle">取消</el-button>
+        <el-button size="small" @click="handlerCancle">{{ addType != 'look' ? '取消' : '关闭'}}</el-button>
         <el-button
+          v-if="addType != 'look'"
           type="primary"
           size="small"
           :loading="btnLoading"
@@ -411,7 +447,7 @@ export default {
           label: '已取消',
           value: 'canceled'
         }, {
-          label: '已派单',
+          label: '已指派',
           value: 'assigned'
         }, {
           label: '已接单',
@@ -448,6 +484,7 @@ export default {
       ],
       reportOptions: [],
       demandOptions: [],
+      searchdemandOptions: [],
       demandUserList: [],
       optionsG: [],
       optionsEditG: [],
@@ -590,7 +627,7 @@ export default {
         serviceType: [{ required: true, message: '服务方不能为空', trigger: 'blur' }],
         serviceStartTime: [{ required: true, message: '实际服务时间不能为空', trigger: 'blur' }],
         score: [{ required: true, message: '评分不能为空', trigger: 'blur' }],
-        finishDesc: [{ required: true, message: '备注不能为空', trigger: 'blur' }],
+        // finishDesc: [{ required: true, message: '备注不能为空', trigger: 'blur' }],
         finishResult: [{ required: true, message: '完成情况不能为空', trigger: 'blur' }],
       }
     }
@@ -637,12 +674,13 @@ export default {
       this.searchForm.reportStartTime = ''
       this.searchForm.reportEndTime = ''
       this.searchForm.wantServiceStartTime = ''
-      this.searchForm.wantServiceTime = ''
+      this.searchForm.wantServiceEndTime = ''
       this.searchForm.categoryCode = ''
       this.searchForm.level = ''
       this.reportTime = ''
       this.serviceTime = ''
       this.$refs[formName].resetFields()
+      this.handleSearch()
     },
     handleCateCHange(val) {
       console.log('val', val)
@@ -663,7 +701,8 @@ export default {
       
     },
     handleDemandChange(val) {
-      console.log('val', val)
+      console.log('val', val, this.selectDemandUser)
+      this.selectDemandUser = val.label
       this.form.demandUserName = val.demandUserName
       this.form.demandUserMobile = val.demandUserMobile
       this.form.demandUserId = val.demandUserId
@@ -683,9 +722,9 @@ export default {
     },
     handelBlurServiceTime(val) {
       console.log('val', val)
-      if (val.value.length > 0) {
-        this.form.serviceStartTime = val.value[0]
-        this.form.serviceEndTime = val.value[1]
+      if (val.length > 0) {
+        this.form.serviceStartTime = val[0]
+        this.form.serviceEndTime = val[1]
       }
       
     },
@@ -711,6 +750,7 @@ export default {
       // this.form.demandUserId = ''
       this.$delete(this.form, 'demandRecId')
       this.selectDemandUser = ''
+      this.finishServiceTime = ''
       for(const n in this.form) {
         this.form[n] = ''
       }
@@ -727,7 +767,13 @@ export default {
         this.disabled = disabled
       }
       if (addType == 'look') {
-        this.finishServiceTime = [row.serviceStartTime, row.serviceEndTime]
+        this.finishServiceTime = row.serviceStartTime && [row.serviceStartTime, row.serviceEndTime] || ''
+      }
+      if (addType == 'finish') {
+        if (row.serviceStartTime) this.finishServiceTime = [row.serviceStartTime, row.serviceEndTime]
+        
+        this.form.finishResult = 'resolved'
+        this.form.score = 5
       }
       if (addType == 'appoint' && row.serviceType) {
         await this.getServiceuserList(row.serviceType)
@@ -738,7 +784,7 @@ export default {
         if (item.value === row.categoryCode) this.form.categoryCode = [row.categoryCode]
       })
         this.demandUserList.forEach(item => {
-          if (item.demandUserId == row.demandUserId) this.selectDemandUser = item
+          if (item.demandUserId == row.demandUserId) this.selectDemandUser = item.label
         })
       }
       
@@ -808,14 +854,15 @@ export default {
         this.btnLoading = false
     },
     async finishAjax() {
+      const { reportType, serviceShowFlag, serviceType } = this.form
       const _form = {
         demandRecId: this.form.demandRecId,
         serviceStartTime: this.form.serviceStartTime,
         serviceEndTime: this.form.serviceEndTime,
-        finishResult: this.form.finishResult,
-        finishDesc: this.form.finishDesc,
+        finishResult: reportType == 'self_help' ? '' : this.form.finishResult,
+        finishDesc: reportType == 'self_help' ? '' : this.form.finishDesc,
         serviceId: this.form.serviceId,
-        score: this.form.score
+        score: reportType == 'self_help' ? 0 : this.form.score
       }
       await this.$http
         .post('/heart/userdemand/finish', _form)
@@ -916,6 +963,16 @@ export default {
       })
       return arr
     },
+    getFlagData(data, flag) {
+      if (!Array.isArray(data)) return []
+      let arr1 = data.filter(item => item[flag])
+      let arr2 = arr1.map(item => {
+        if (item.children) return { ...item, children: this.getFlagData(item.children, flag) }
+        else return item
+      })
+      // console.log('arrr-oppp', arr2)
+      return arr2
+    },
     async getGridList(type, agencyId) {
       const { user } = await this.$store.state
       console.log('user---ppp', user)
@@ -967,7 +1024,8 @@ export default {
           if (res.code !== 0) {
             return this.$message.error(res.msg)
           } else {
-            this.demandOptions = this.getTreeData(res.data)
+            this.searchdemandOptions = this.getTreeData(res.data)
+            this.demandOptions = this.getFlagData(this.getTreeData(res.data), 'usableFlag')
           }
         })
         .catch(() => {
@@ -976,6 +1034,7 @@ export default {
     },
     async getServiceuserList(serviceType, query) {
       if (!serviceType) return false
+      const { demandUserId } = this.form
       const params = {
         serviceName: '',
         serviceType: serviceType,
@@ -987,7 +1046,7 @@ export default {
           if (res.code !== 0) {
             return this.$message.error(res.msg)
           } else {
-            this.serviceOptiondList = res.data
+            this.serviceOptiondList = res.data.filter(item => item.value != demandUserId)
           }
         })
         .catch(() => {
@@ -1013,7 +1072,7 @@ export default {
           if (res.code !== 0) {
             return this.$message.error(res.msg)
           } else {
-            this.reportOptions = res.data
+            this.reportOptions = res.data && res.data.filter(item => item.value != 'self_help')
           }
         })
         .catch(() => {
diff --git a/src/views/modules/communityService/ninePlaces/places/placesForm.vue b/src/views/modules/communityService/ninePlaces/places/placesForm.vue
index 0a18ea44..44fa73cc 100644
--- a/src/views/modules/communityService/ninePlaces/places/placesForm.vue
+++ b/src/views/modules/communityService/ninePlaces/places/placesForm.vue
@@ -196,15 +196,15 @@ export default {
 
     },
     async addPlace () {
-      // const regPhone = /^1(3|4|5|6|7|8|9)\d{9}$/; //手机号码
-      // if (regPhone.test(this.formData.mobile) === false) {
-      //   this.btnDisable = false
-      //   this.$message({
-      //     type: 'warning',
-      //     message: '请输入正确的手机号码'
-      //   })
-      //   return false;
-      // }
+      const regPhone = /^1(3|4|5|6|7|8|9)\d{9}$/; //手机号码
+      if (regPhone.test(this.formData.mobile) === false) {
+        this.btnDisable = false
+        this.$message({
+          type: 'warning',
+          message: '请输入正确的手机号码'
+        })
+        return false;
+      }
 
       let url = ''
 
diff --git a/src/views/modules/communityService/ninePlaces/team/team.vue b/src/views/modules/communityService/ninePlaces/team/team.vue
index a828b7ae..9f93a0a0 100644
--- a/src/views/modules/communityService/ninePlaces/team/team.vue
+++ b/src/views/modules/communityService/ninePlaces/team/team.vue
@@ -304,8 +304,11 @@ export default {
         this.tableData = data.list
 
         this.tableData.forEach(item => {
-          let timeArray = item.time.split(' ')
-          item.time = timeArray[0]
+          if (item.time) {
+            let timeArray = item.time.split(' ')
+            item.time = timeArray[0]
+          }
+
         });
       } else {
         this.$message.error(msg)
diff --git a/src/views/modules/customer/feedback/CustomerInfo.vue b/src/views/modules/customer/feedback/CustomerInfo.vue
index 3e7bb85b..69bcf816 100644
--- a/src/views/modules/customer/feedback/CustomerInfo.vue
+++ b/src/views/modules/customer/feedback/CustomerInfo.vue
@@ -135,24 +135,24 @@ export default {
       uploadUlr: window.SITE_CONFIG['apiURL'] + '/oss/file/function/upload',
       dataForm: {
         rootAgencyDTO: {
-          agencyName: '成都市',
-          level: 'city',
-          areaCode: '123456',
-          province: '四川省',
-          city: '成都市',
-          district: 'SN4FHbIZtK',
+          agencyName: '',
+          level: '',
+          areaCode: '',
+          province: '',
+          city: '',
+          district: '',
 
         },
         customerInfoDTO: {
-          customerName: '成都市',
-          organizationLevel: 'city',
+          customerName: '',
+          organizationLevel: '',
           logo: ''
         },
         managers: [
           {
-            realName: '王显章',
-            gender: '1',
-            mobile: '18560677960'
+            realName: '',
+            gender: '',
+            mobile: ''
           }
         ]
       }
diff --git a/src/views/modules/customer/manage/CustomerInfo.vue b/src/views/modules/customer/manage/CustomerInfo.vue
index a0709b4d..cd4d99c2 100644
--- a/src/views/modules/customer/manage/CustomerInfo.vue
+++ b/src/views/modules/customer/manage/CustomerInfo.vue
@@ -77,7 +77,7 @@
 
         </el-form>
       </el-row>
-      <el-row>
+      <el-row v-if="Array.isArray(dataForm.managers) && dataForm.managers.length>0">
         <el-tag type="info"
                 class="eltag"
                 size="medium"
@@ -136,24 +136,24 @@ export default {
       uploadUlr: window.SITE_CONFIG['apiURL'] + '/oss/file/uploadqrcodeV2',
       dataForm: {
         rootAgencyDTO: {
-          agencyName: '成都市',
-          level: 'city',
-          areaCode: '123456',
-          province: '四川省',
-          city: '成都市',
-          district: 'SN4FHbIZtK',
+          agencyName: '',
+          level: '',
+          areaCode: '',
+          province: '',
+          city: '',
+          district: '',
 
         },
         customerInfoDTO: {
-          customerName: '成都市',
-          organizationLevel: 'city',
+          customerName: '',
+          organizationLevel: '',
           logo: ''
         },
         managers: [
           {
-            realName: '王显章',
-            gender: '1',
-            mobile: '18560677960'
+            realName: '',
+            gender: '',
+            mobile: ''
           }
         ]
       }
diff --git a/src/views/modules/home.vue b/src/views/modules/home.vue
index 9837fa5a..a12130bf 100644
--- a/src/views/modules/home.vue
+++ b/src/views/modules/home.vue
@@ -1,17 +1,6 @@
 <template>
   <div>
-    <el-card v-if="userType==='oper'"
-             shadow="never"
-             class="aui-card--fill">
-      <div class="mod-home">
-        <h3>{{ $t('home.desc.title') }}</h3>
-        <ul>
-          <li v-for="item in $t('home.desc.list')"
-              :key="item"
-              v-html="item"></li>
-        </ul>
-      </div>
-    </el-card>
+
 
     <customer-info @changeCustomerName="changeCustomerName"
                    v-if="userType==='work'"></customer-info>
diff --git a/src/views/modules/visual/basicinfo/basicInfoMain.vue b/src/views/modules/visual/basicinfo/basicInfoMain.vue
index 8c0f4a59..e538d41e 100644
--- a/src/views/modules/visual/basicinfo/basicInfoMain.vue
+++ b/src/views/modules/visual/basicinfo/basicInfoMain.vue
@@ -114,7 +114,7 @@ import BasicInfoCommunity from "./basicInfoCommunity";
 import PeopleSearch from "./peopleSearch";
 import People from "./people";
 import cptCard from "@/views/modules/visual/cpts/card";
-
+var centerPointGlobal = [120.38945519, 36.0722275]
 
 let loading;//加载动画
 
@@ -532,11 +532,15 @@ const vueGis = {
     },
     //设置地图定位的中心点和缩放级别
     setMapLocation () {
-      this.centerPoint = []
+
 
       if (this.orgData.longitude && this.orgData.latitude) {
+        this.centerPoint = []
         this.centerPoint.push(this.orgData.longitude)
         this.centerPoint.push(this.orgData.latitude)
+      } else {
+
+        this.centerPoint = centerPointGlobal
       }
 
       this.setZoom(this.orgData.agencyLevel)
@@ -545,11 +549,11 @@ const vueGis = {
     //根据组织层级设置缩放级别
     setZoom (agencyLevel) {
       if (agencyLevel === 'district') {
-        this.zoom = 14
+        this.zoom = 12
       } else if (agencyLevel === 'street') {
-        this.zoom = 15
+        this.zoom = 13
       } else if (agencyLevel === 'community') {
-        this.zoom = 16
+        this.zoom = 14
       }
 
     },
diff --git a/src/views/modules/visual/basicinfo/cpts/incident-info.vue b/src/views/modules/visual/basicinfo/cpts/incident-info.vue
new file mode 100644
index 00000000..f3a86089
--- /dev/null
+++ b/src/views/modules/visual/basicinfo/cpts/incident-info.vue
@@ -0,0 +1,550 @@
+<template>
+  <div class="m-pop">
+    <div class="wrap">
+      <cpt-card>
+        <div class="title">
+          <img src="@/assets/img/shuju/title-tip.png" />
+          <span>事件详情</span>
+        </div>
+
+        <div class="btn-close" @click="handleClose">
+          <img src="@/assets/img/shuju/people/close.png" />
+        </div>
+
+        <div class="m-info">
+          <div class="info-title">事件内容</div>
+          <div class="info-content">{{ info.eventContent }}</div>
+          <div class="info-pics">
+            <img
+              :src="src"
+              :key="src"
+              v-for="src in info.eventImgs"
+              @click="watchImg(src)"
+            />
+          </div>
+          <div class="info-prop">
+            <span>提交时间：</span>
+            <span>{{ info.eventTime }}</span>
+          </div>
+          <div class="info-prop">
+            <span>报事人：</span>
+            <span>{{ info.eventPeopleName }}</span>
+          </div>
+          <div class="info-prop">
+            <span>所属网格：</span>
+            <span>{{ info.gridName }}</span>
+          </div>
+          <div class="info-prop">
+            <span>提报给：</span>
+            <div>
+              <div :key="item" v-for="item in info.eventOrg">{{ item }}</div>
+              <div :key="item" v-for="item in info.eventPerson">{{ item }}</div>
+            </div>
+          </div>
+        </div>
+
+        <div class="tabs">
+          <div
+            class="tab-btn"
+            @click="subStartGroupIndex"
+            v-if="groupList.length > 9"
+          >
+            <img src="@/assets/img/shuju/people/arrow-double-left.png" />
+          </div>
+          <div
+            v-show="index >= startGroupIndex && index < startGroupIndex + 9"
+            class="tab"
+            :class="groupIndex % groupList.length == index ? 'z-on' : ''"
+            :key="'tab' + index"
+            @click="groupIndex = index"
+            v-for="(item, index) in groupList"
+          >
+            {{ item.label }}
+          </div>
+          <div
+            class="tab-btn"
+            @click="addStartGroupIndex"
+            v-if="groupList.length > 9"
+          >
+            <img src="@/assets/img/shuju/people/arrow-double-right.png" />
+          </div>
+        </div>
+
+        <div class="m-case">
+          <div class="m-yanpan" v-if="groupIndex == 0">
+            <div v-if="info.projectId">
+              <analyse
+                v-if="yanPan.loading"
+                singleTitle="智能随手拍"
+                :userList="yanPan.houseUserList"
+                :userName="yanPan.icUserName"
+                :singleList="yanPan.categoryList"
+                @user="toUserInfo"
+                @project="toProjectInfo"
+              />
+              <screen-loading v-else>加载中</screen-loading>
+            </div>
+            <div v-else class="m-hint">
+              <img
+                src="@/assets/img/modules/visual/noData.png"
+                class="no-data-img"
+              />
+            </div>
+          </div>
+          <div class="m-tb" v-if="groupIndex == 1">
+            <cpt-tb
+              :col-list="comment.colList"
+              :loading="comment.loading"
+              :header="comment.header"
+              :list="comment.list"
+            ></cpt-tb>
+          </div>
+
+          <div v-if="groupIndex == 2">
+            <div class="m-row" v-if="info.projectId">
+              <div class="m-info">
+                <div class="info-prop">
+                  <span>项目标题：</span>
+                  <span>{{ projectInfo.projectTitle }}</span>
+                </div>
+                <div class="info-prop">
+                  <span>项目方案：</span>
+                  <span>{{ projectInfo.backGround }}</span>
+                </div>
+                <div class="info-prop">
+                  <span>内部备注：</span>
+                  <span>{{ projectInfo.internalRemark || "--" }}</span>
+                </div>
+                <div class="info-prop">
+                  <span>当前处理部门：</span>
+                  <span>{{ projectInfo.departmentNameList.join("、") }}</span>
+                </div>
+                <div class="info-prop" v-if="projectCate.length > 0">
+                  <span>分类：</span>
+                  <fold-text :row="3">
+                    <div :key="item.name" v-for="item in projectCate">
+                      {{ item.name }}
+                    </div>
+                  </fold-text>
+                </div>
+                <div class="info-prop" v-if="projectTag.length > 0">
+                  <span>标签：</span>
+                  <fold-text :row="3">
+                    <div :key="item.name" v-for="item in projectTag">
+                      {{ item.name }}
+                    </div>
+                  </fold-text>
+                </div>
+              </div>
+
+              <div class="m-process" v-if="projectProcess.length > 0">
+                <div class="process-title">处理进展</div>
+                <div class="list">
+                  <div
+                    class="item"
+                    :class="index === 0 ? 'z-on' : ''"
+                    :key="item.processId"
+                    v-for="(item, index) in projectProcess"
+                  >
+                    <div class="item-row">
+                      <div class="name">{{ item.processName }}</div>
+                      <div class="date">
+                        {{ item.processTime }}
+                      </div>
+                    </div>
+
+                    <div class="detail">
+                      <div class="detail-field">处理部门：</div>
+                      <div class="detail-value">{{ item.departmentName }}</div>
+                    </div>
+
+                    <div
+                      class="detail"
+                      v-if="item.processName != '转项目' && item.publicReply"
+                    >
+                      <div class="detail-field">说 明：</div>
+                      <div class="detail-value">
+                        <fold-text :row="3">{{ item.publicReply }}</fold-text>
+                      </div>
+                    </div>
+
+                    <div
+                      class="detail"
+                      v-if="item.processName != '转项目' && item.internalRemark"
+                    >
+                      <div class="detail-field">内部备注：</div>
+                      <div class="detail-value">
+                        <fold-text :row="3">{{
+                          item.internalRemark
+                        }}</fold-text>
+                      </div>
+                    </div>
+                    <div class="detail">
+                      <div class="attachement-list">
+                        <a
+                          :href="att.url"
+                          target="_blank"
+                          :key="att.url"
+                          v-for="att in item.internalFile"
+                        >
+                          <i class="el-icon-folder-opened"></i>
+                          {{ att.name }}
+                        </a>
+                      </div>
+                    </div>
+                  </div>
+                </div>
+              </div>
+            </div>
+            <div v-else class="m-hint">
+              <img
+                src="@/assets/img/modules/visual/noData.png"
+                class="no-data-img"
+              />
+            </div>
+          </div>
+        </div>
+      </cpt-card>
+    </div>
+  </div>
+</template>
+
+<script>
+import cptCard from "@/views/modules/visual/cpts/card";
+import screenLoading from "@/views/modules/visual/cpts/loading";
+import { requestPost } from "@/js/dai/request";
+import cptTb from "@/views/modules/visual/cpts/tb";
+import analyse from "@/views/modules/visual/cpts/analyse";
+import foldText from "@/views/components/foldText";
+import dateFormat from "dai-js/tools/dateFormat";
+
+function iniData() {
+  return {
+    groupList: [
+      { label: "研判分析" },
+      { label: "查看回复" },
+      { label: "查看项目" },
+    ],
+    groupIndex: 0,
+    startGroupIndex: 0,
+
+    info: {
+      eventTime: "",
+      eventContent: "",
+      eventAddress: "",
+      gridName: "",
+      isClosed: true,
+      isResolve: true,
+      isRollback: true,
+      eventImgs: [],
+      eventPerson: [],
+      eventOrg: [],
+      eventPeopleName: "",
+      projectInfo: {
+        projectId: "",
+        operationName: "",
+        operationTime: "",
+        projectDeclare: "",
+      },
+    },
+
+    comment: {
+      loading: true,
+      colList: [
+        {
+          align: "center",
+          width: "20%",
+        },
+        {
+          align: "center",
+          width: "30%",
+        },
+        {
+          align: "left",
+          width: "50%",
+        },
+      ],
+      header: ["回复者", "回复时间", "回复内容"],
+      list: [],
+    },
+
+    projectProcess: [],
+
+    projectInfo: {
+      backGround: "",
+      departmentList: [
+        //   { departmentName: "南宁社区-南宁第二网格", staffList: ["周相成"] },
+      ],
+      departmentNameList: [],
+      internalRemark: "",
+      isSend: false,
+      locateAddress: "",
+      locateDimension: "",
+      locateLongitude: "",
+      origin: "",
+      originId: "",
+      platformIds: [],
+      processable: false,
+      projectId: "",
+      projectStatus: "pending",
+      projectTitle: "",
+      publicReply: "",
+      returnable: false,
+    },
+
+    projectCate: [],
+    projectTag: [],
+
+    yanPan: {
+      loading: false,
+
+      icResiUserId: "",
+      houseId: "",
+      icUserName: "",
+      epmetUserIdList: [],
+      houseUserList: [
+        // {
+        //   icResiUserId: '',
+        //   icUserName: '',
+        // }
+      ],
+      categoryList: [],
+      projectData: [
+        // {
+        //   firstCategoryCode: '',
+        //   firstCategoryName: '',
+        //   projectList: [],
+        // }
+      ],
+    },
+  };
+}
+
+export default {
+  name: "demandInfo",
+  props: {
+    resiEventId: {
+      type: String,
+      default: "",
+    },
+    epmetUserIdList: {
+      type: Array,
+      default: [],
+    },
+    icResiUserId: {
+      type: String,
+      default: "",
+    },
+  },
+
+  components: {
+    cptCard,
+    cptTb,
+    analyse,
+    screenLoading,
+    foldText,
+  },
+
+  data: iniData,
+
+  computed: {},
+
+  watch: {
+    resiEventId() {
+      let data = iniData();
+      Object.keys(data).forEach((k) => {
+        this[k] = data[k];
+      });
+      this.getApiData();
+    },
+  },
+
+  mounted() {
+    this.getApiData();
+  },
+
+  methods: {
+    watchImg(src) {
+      window.open(src);
+    },
+
+    addStartGroupIndex() {
+      const { startGroupIndex, groupList } = this;
+      if (startGroupIndex < groupList.length - 9) {
+        this.startGroupIndex = startGroupIndex + 1;
+      } else {
+        this.startGroupIndex = groupList.length - 9;
+      }
+    },
+    subStartGroupIndex() {
+      const { startGroupIndex, groupList } = this;
+      if (startGroupIndex > 0) {
+        this.startGroupIndex = startGroupIndex - 1;
+      } else {
+        this.startGroupIndex = 0;
+      }
+    },
+    handleClose() {
+      this.$emit("close");
+    },
+
+    async getApiData() {
+      this.getComment();
+      await this.getInfo();
+      this.getProjectProcess();
+      this.getProjectInfo();
+      this.getProjectCate();
+      this.getYanPan();
+    },
+
+    //加载组织数据
+    async getInfo() {
+      const url = "/gov/project/resievent/eventdetail-icdata";
+
+      const { data, code, msg } = await requestPost(url, {
+        resiEventId: this.resiEventId,
+      });
+
+      if (code === 0) {
+        this.info = data;
+      } else {
+        this.$message.error(msg);
+      }
+    },
+
+    //加载组织数据
+    async getComment() {
+      const url = "/gov/project/resieventreply/list";
+
+      const { data, code, msg } = await requestPost(url, {
+        resiEventId: this.resiEventId,
+      });
+      this.comment.loading = false;
+
+      if (code === 0) {
+        this.comment.list = data.map((item) => {
+          return [item.replyName, item.replyTime, item.replyContent];
+        });
+      } else {
+        this.$message.error(msg);
+      }
+    },
+
+    //加载组织数据
+    async getProjectProcess() {
+      const {
+        info: { projectInfo },
+      } = this;
+      if (!projectInfo || !projectInfo.projectId) return;
+      const url = "/gov/project/trace/processlist-v2";
+
+      const { data, code, msg } = await requestPost(url, {
+        projectId: projectInfo.projectId,
+      });
+
+      if (code === 0) {
+        this.projectProcess = data.map((item) => {
+          item.processTime = dateFormat(
+            new Date(item.processTime * 1000),
+            "yyyy-MM-dd hh:mm"
+          );
+          return item;
+        });
+      } else {
+        this.$message.error(msg);
+      }
+    },
+
+    //加载组织数据
+    async getProjectInfo() {
+      const {
+        info: { projectInfo },
+      } = this;
+      if (!projectInfo || !projectInfo.projectId) return;
+      const url = "/gov/project/trace/projectdetail";
+
+      const { data, code, msg } = await requestPost(url, {
+        projectId: projectInfo.projectId,
+      });
+
+      if (code === 0) {
+        this.projectInfo = data;
+      } else {
+        this.$message.error(msg);
+      }
+    },
+
+    async getProjectCate() {
+      const {
+        info: { projectInfo },
+      } = this;
+      if (!projectInfo || !projectInfo.projectId) return;
+      const url = "/gov/project/projectcategory/categorytaglist";
+
+      const { data, code, msg } = await requestPost(url, {
+        projectId: projectInfo.projectId,
+      });
+
+      if (code === 0) {
+        this.projectCate = data.categoryList;
+        this.projectTag = data.tagList;
+      } else {
+        this.$message.error(msg);
+      }
+    },
+
+    //加载组织数据
+    async getYanPan() {
+      const url = "/gov/project/resievent/research-analysis";
+
+      const { data, code, msg } = await requestPost(url, {
+        resiEventId: this.resiEventId,
+        epmetUserIdList: this.epmetUserIdList,
+        icResiUserId: this.icResiUserId,
+        projectId: this.info.projectId,
+      });
+
+      if (code === 0) {
+        data.categoryList = data.projectData.map((item) => {
+          return {
+            categoryCode: item.firstCategoryCode,
+            categoryName: item.firstCategoryName,
+            showItem: true,
+            projectList: item.projectList.map((subItem) => {
+              return {
+                title: subItem.projectTitle,
+                status: subItem.projectStatus,
+                statusName:
+                  subItem.projectStatus == "pending" ? "待处理" : "结案",
+                projectId: subItem.projectId,
+                resiEventId: subItem.resiEventId,
+              };
+            }),
+          };
+        });
+        this.yanPan = { ...this.yanPan, ...data };
+        this.yanPan.loading = true;
+      } else {
+        this.$message.error(msg);
+      }
+    },
+
+    toUserInfo(item) {
+      this.$router.push({
+        path: `/main-shuju/visual-basicinfo-people/${item.icResiUserId}`,
+      });
+    },
+
+    toProjectInfo(item) {
+      console.log(item);
+      this.resiEventId = item.resiEventId;
+    },
+  },
+};
+</script>
+
+<style
+  lang="scss"
+  src="@/assets/scss/modules/visual/incident-info.scss"
+  scoped
+></style>
diff --git a/src/views/modules/visual/basicinfo/cpts/people-more.vue b/src/views/modules/visual/basicinfo/cpts/people-more.vue
index a634aade..6198cc91 100644
--- a/src/views/modules/visual/basicinfo/cpts/people-more.vue
+++ b/src/views/modules/visual/basicinfo/cpts/people-more.vue
@@ -500,4 +500,4 @@ export default {
 };
 </script>
 
-<style lang="scss" src="@/assets/scss/people.scss" scoped></style>
+<style lang="scss" src="@/assets/scss/modules/visual/people.scss" scoped></style>
diff --git a/src/views/modules/visual/basicinfo/cpts/topic-info.vue b/src/views/modules/visual/basicinfo/cpts/topic-info.vue
new file mode 100644
index 00000000..bccd5855
--- /dev/null
+++ b/src/views/modules/visual/basicinfo/cpts/topic-info.vue
@@ -0,0 +1,706 @@
+<template>
+  <div class="m-pop">
+    <div class="wrap">
+      <cpt-card>
+        <div class="title">
+          <img src="@/assets/img/shuju/title-tip.png" />
+          <span>话题详情</span>
+        </div>
+
+        <div class="btn-close" @click="handleClose">
+          <img src="@/assets/img/shuju/people/close.png" />
+        </div>
+
+        <div class="m-info">
+          <div class="info-title">话题内容</div>
+          <div class="info-content">{{ info.topicContent }}</div>
+          <div class="info-pics">
+            <img
+              :src="src"
+              :key="src"
+              v-for="src in info.topicImgs"
+              @click="watchImg(src)"
+            />
+          </div>
+          <div class="info-prop">
+            <span>发布时间：</span>
+            <span>{{ info.releaseTime }}</span>
+          </div>
+          <div class="info-prop">
+            <span>话题地址：</span>
+            <span>{{ info.releaseAddress }}</span>
+          </div>
+          <div class="info-prop">
+            <span>所属网格：</span>
+            <span>{{ info.gridName }}</span>
+          </div>
+        </div>
+
+        <div class="tabs">
+          <div
+            class="tab-btn"
+            @click="subStartGroupIndex"
+            v-if="groupList.length > 9"
+          >
+            <img src="@/assets/img/shuju/people/arrow-double-left.png" />
+          </div>
+          <div
+            v-show="index >= startGroupIndex && index < startGroupIndex + 9"
+            class="tab"
+            :class="groupIndex % groupList.length == index ? 'z-on' : ''"
+            :key="'tab' + index"
+            @click="groupIndex = index"
+            v-for="(item, index) in groupList"
+          >
+            {{ item.label }}
+          </div>
+          <div
+            class="tab-btn"
+            @click="addStartGroupIndex"
+            v-if="groupList.length > 9"
+          >
+            <img src="@/assets/img/shuju/people/arrow-double-right.png" />
+          </div>
+        </div>
+
+        <div class="m-case">
+          <div class="m-yanpan" v-if="groupIndex == 0">
+            <div v-if="issueInfo.projectId">
+              <analyse
+                v-if="yanPan.loading"
+                singleTitle="楼院小组"
+                :userList="yanPan.houseUserList"
+                :userName="yanPan.icUserName"
+                :singleList="yanPan.categoryList"
+                @user="toUserInfo"
+                @project="toProjectInfo"
+              />
+              <screen-loading v-else>加载中</screen-loading>
+            </div>
+            <div v-else class="m-hint">
+              <img
+                src="@/assets/img/modules/visual/noData.png"
+                class="no-data-img"
+              />
+            </div>
+          </div>
+          <div class="m-tb" v-if="groupIndex == 1">
+            <cpt-tb
+              :col-list="comment.colList"
+              :loading="comment.loading"
+              :header="comment.header"
+              :list="comment.list"
+              @operate="checkTopicCommentImg"
+            ></cpt-tb>
+          </div>
+
+          <div v-if="groupIndex == 2">
+            <div class="m-row" v-if="info.issueId">
+              <div class="m-info">
+                <div class="info-prop">
+                  <span>议题标题：</span>
+                  <span>{{ issueInfo.issueTitle }}</span>
+                </div>
+                <div class="info-prop">
+                  <span>议题建议：</span>
+                  <span>{{ issueInfo.issueSuggestion }}</span>
+                </div>
+                <div class="info-prop">
+                  <span>所属网格：</span>
+                  <span>{{ issueInfo.belongsGridName || "--" }}</span>
+                </div>
+                <div class="info-prop">
+                  <span>议题发起人：</span>
+                  <span>{{ issueInfo.issueInitiator }}</span>
+                </div>
+                <div class="info-prop">
+                  <span>议题来源：</span>
+                  <span>{{ issueInfo.topicInfo.groupName }}</span>
+                </div>
+                <div class="info-prop">
+                  <span>转议题时间：</span>
+                  <span>{{ issueInfo.shiftIssueTime }}</span>
+                </div>
+              </div>
+
+              <div class="m-line">
+                <div class="stat">
+                  <div class="stat-item">
+                    <div>
+                      {{ issueTrend.realityVoteCount }}/{{
+                        issueTrend.shouldVoteCount
+                      }}
+                    </div>
+                    <div class="z-weak">已表决/应表决</div>
+                  </div>
+                  <div class="stat-item">
+                    <div>{{ issueTrend.supportAmount }}</div>
+                    <div class="z-weak">支持</div>
+                  </div>
+                  <div class="stat-item">
+                    <div>{{ issueTrend.oppositionAmount }}</div>
+                    <div class="z-weak">反对</div>
+                  </div>
+                </div>
+
+                <line-chart
+                  v-if="issueChartData.length > 0"
+                  :list="issueChartData"
+                />
+              </div>
+            </div>
+            <div v-else class="m-hint">
+              <img
+                src="@/assets/img/modules/visual/noData.png"
+                class="no-data-img"
+              />
+            </div>
+          </div>
+
+          <div v-if="groupIndex == 3">
+            <div class="m-row" v-if="issueInfo.projectId">
+              <div class="m-info">
+                <div class="info-prop">
+                  <span>项目标题：</span>
+                  <span>{{ projectInfo.projectTitle }}</span>
+                </div>
+                <div class="info-prop">
+                  <span>项目方案：</span>
+                  <span>{{ projectInfo.backGround }}</span>
+                </div>
+                <div class="info-prop">
+                  <span>内部备注：</span>
+                  <span>{{ projectInfo.internalRemark || "--" }}</span>
+                </div>
+                <div class="info-prop">
+                  <span>当前处理部门：</span>
+                  <span>{{ projectInfo.departmentNameList.join("、") }}</span>
+                </div>
+                <div class="info-prop" v-if="projectCate.length > 0">
+                  <span>分类：</span>
+                  <fold-text :row="3">
+                    <div :key="item.name" v-for="item in projectCate">
+                      {{ item.name }}
+                    </div>
+                  </fold-text>
+                </div>
+                <div class="info-prop" v-if="projectTag.length > 0">
+                  <span>标签：</span>
+                  <fold-text :row="3">
+                    <div :key="item.name" v-for="item in projectTag">
+                      {{ item.name }}
+                    </div>
+                  </fold-text>
+                </div>
+              </div>
+
+              <div class="m-process" v-if="projectProcess.length > 0">
+                <div class="process-title">处理进展</div>
+                <div class="list">
+                  <div
+                    class="item"
+                    :class="index === 0 ? 'z-on' : ''"
+                    :key="item.processId"
+                    v-for="(item, index) in projectProcess"
+                  >
+                    <div class="item-row">
+                      <div class="name">{{ item.processName }}</div>
+                      <div class="date">
+                        {{ item.processTime }}
+                      </div>
+                    </div>
+
+                    <div class="detail">
+                      <div class="detail-field">处理部门：</div>
+                      <div class="detail-value">{{ item.departmentName }}</div>
+                    </div>
+
+                    <div
+                      class="detail"
+                      v-if="item.processName != '转项目' && item.publicReply"
+                    >
+                      <div class="detail-field">说 明：</div>
+                      <div class="detail-value">
+                        <fold-text :row="3">{{ item.publicReply }}</fold-text>
+                      </div>
+                    </div>
+
+                    <div
+                      class="detail"
+                      v-if="item.processName != '转项目' && item.internalRemark"
+                    >
+                      <div class="detail-field">内部备注：</div>
+                      <div class="detail-value">
+                        <fold-text :row="3">{{
+                          item.internalRemark
+                        }}</fold-text>
+                      </div>
+                    </div>
+                    <div class="detail">
+                      <div class="attachement-list">
+                        <a
+                          :href="att.url"
+                          target="_blank"
+                          :key="att.url"
+                          v-for="att in item.internalFile"
+                        >
+                          <i class="el-icon-folder-opened"></i>
+                          {{ att.name }}
+                        </a>
+                      </div>
+                    </div>
+                  </div>
+                </div>
+              </div>
+            </div>
+            <div v-else class="m-hint">
+              <img
+                src="@/assets/img/modules/visual/noData.png"
+                class="no-data-img"
+              />
+            </div>
+          </div>
+        </div>
+      </cpt-card>
+    </div>
+  </div>
+</template>
+
+<script>
+import cptCard from "@/views/modules/visual/cpts/card";
+import screenLoading from "@/views/modules/visual/cpts/loading";
+import { requestPost } from "@/js/dai/request";
+import cptTb from "@/views/modules/visual/cpts/tb";
+import lineChart from "@/views/modules/visual/cpts/line-chart";
+import analyse from "@/views/modules/visual/cpts/analyse";
+import foldText from "@/views/components/foldText";
+import dateFormat from "dai-js/tools/dateFormat";
+
+function iniData() {
+  return {
+    groupList: [
+      { label: "研判分析" },
+      { label: "话题评论" },
+      { label: "查看议题" },
+      { label: "查看项目" },
+    ],
+    groupIndex: 0,
+    startGroupIndex: 0,
+
+    info: {
+      badgeList: [],
+      closeDetail: {
+        closeUserName: "",
+        closeDateTime: "-1",
+        closeReason: "",
+        closeUserHeadPhoto: "",
+      },
+      dimension: "",
+      hiddenDetail: null,
+      issueId: "",
+      longitude: "",
+      releaseAddress: "",
+      releaseTime: "",
+      releaseUserHeadPhoto: "",
+      releaseUserName: "",
+      shiftIssueFlag: true,
+      topicContent: "",
+      topicId: "",
+      topicImgs: [],
+      topicStatus: "discussing",
+    },
+
+    comment: {
+      loading: true,
+      colList: [
+        {
+          align: "center",
+          width: "20%",
+        },
+        {
+          align: "center",
+          width: "20%",
+        },
+        {
+          align: "left",
+          width: "50%",
+        },
+        {
+          align: "left",
+          width: "10%",
+        },
+      ],
+      header: ["评论者", "评论时间", "评论内容", "评论图片"],
+      list: [],
+    },
+
+    issueInfo: {
+      attitude: "",
+      belongsGridName: "",
+      issueIdea: "",
+      issueInitiator: "",
+      issueStatus: "",
+      issueSuggestion: "",
+      issueTitle: "",
+      joinVote: true,
+      projectId: "",
+      projectStatus: false,
+      publishIdeaFlag: false,
+    },
+
+    issueTrend: {},
+    issueChartData: [],
+
+    projectProcess: [],
+
+    projectInfo: {
+      backGround: "",
+      departmentList: [
+        //   { departmentName: "南宁社区-南宁第二网格", staffList: ["周相成"] },
+      ],
+      departmentNameList: [],
+      internalRemark: "",
+      isSend: false,
+      locateAddress: "",
+      locateDimension: "",
+      locateLongitude: "",
+      origin: "",
+      originId: "",
+      platformIds: [],
+      processable: false,
+      projectId: "",
+      projectStatus: "pending",
+      projectTitle: "",
+      publicReply: "",
+      returnable: false,
+    },
+
+    projectCate: [],
+    projectTag: [],
+
+    yanPan: {
+      loading: false,
+
+      icResiUserId: "",
+      houseId: "",
+      icUserName: "",
+      epmetUserIdList: [],
+      houseUserList: [
+        // {
+        //   icResiUserId: '',
+        //   icUserName: '',
+        // }
+      ],
+      categoryList: [],
+      projectData: [
+        // {
+        //   firstCategoryCode: '',
+        //   firstCategoryName: '',
+        //   projectList: [],
+        // }
+      ],
+    },
+  };
+}
+
+export default {
+  name: "demandInfo",
+  props: {
+    topicId: {
+      type: String,
+      default: "",
+    },
+    epmetUserIdList: {
+      type: Array,
+      default: [],
+    },
+    icResiUserId: {
+      type: String,
+      default: "",
+    },
+  },
+
+  components: {
+    cptCard,
+    cptTb,
+    analyse,
+    screenLoading,
+    lineChart,
+    foldText,
+  },
+
+  data: iniData,
+
+  computed: {},
+
+  watch: {
+    topicId() {
+      let data = iniData();
+      Object.keys(data).forEach((k) => {
+        this[k] = data[k];
+      });
+      this.getApiData();
+    },
+  },
+
+  mounted() {
+    this.getApiData();
+  },
+
+  methods: {
+    watchImg(src) {
+      window.open(src);
+    },
+
+    addStartGroupIndex() {
+      const { startGroupIndex, groupList } = this;
+      if (startGroupIndex < groupList.length - 9) {
+        this.startGroupIndex = startGroupIndex + 1;
+      } else {
+        this.startGroupIndex = groupList.length - 9;
+      }
+    },
+    subStartGroupIndex() {
+      const { startGroupIndex, groupList } = this;
+      if (startGroupIndex > 0) {
+        this.startGroupIndex = startGroupIndex - 1;
+      } else {
+        this.startGroupIndex = 0;
+      }
+    },
+    handleClose() {
+      this.$emit("close");
+    },
+
+    async getApiData() {
+      this.getComment();
+      await this.getInfo();
+      await this.getIssueInfo();
+      this.getIssueTrend();
+      this.getProjectProcess();
+      this.getProjectInfo();
+      this.getProjectCate();
+      this.getYanPan();
+    },
+
+    //加载组织数据
+    async getInfo() {
+      const url = "/resi/group/topic/gettopicdetail";
+
+      const { data, code, msg } = await requestPost(url, {
+        topicId: this.topicId,
+      });
+
+      if (code === 0) {
+        this.info = data;
+      } else {
+        this.$message.error(msg);
+      }
+    },
+
+    //加载组织数据
+    async getComment() {
+      const url = "/resi/group/comment/getcommentlistoftopic";
+
+      const { data, code, msg } = await requestPost(url, {
+        topicId: this.topicId,
+        pageNo: 1,
+        pageSize: 100,
+      });
+      this.comment.loading = false;
+
+      if (code === 0) {
+        this.comment.list = data.map((item) => {
+          return [
+            item.commentUserName,
+            item.commentTime,
+            item.commentContent,
+            item.imageList.length > 0
+              ? { type: "operate", list: ["查看"] }
+              : "",
+          ];
+        });
+        this.comment.srcList = data;
+      } else {
+        this.$message.error(msg);
+      }
+    },
+
+    checkTopicCommentImg(index) {
+      const {
+        comment: { srcList },
+      } = this;
+      if (srcList[index] && srcList[index].imageList) {
+        this.watchImg(srcList[index].imageList[0].url);
+      }
+    },
+
+    //加载组织数据
+    async getIssueInfo() {
+      const {
+        info: { issueId },
+      } = this;
+      if (!issueId) return;
+      const url = "/resi/hall/issue/detail";
+
+      const { data, code, msg } = await requestPost(url, {
+        issueId,
+      });
+
+      if (code === 0) {
+        this.issueInfo = data;
+      } else {
+        this.$message.error(msg);
+      }
+    },
+
+    //加载组织数据
+    async getIssueTrend() {
+      const {
+        info: { issueId },
+      } = this;
+      if (!issueId) return;
+      const url = "/resi/hall/issue/votingtrend";
+
+      const { data, code, msg } = await requestPost(url, {
+        issueId,
+      });
+
+      if (code === 0) {
+        this.issueTrend = data;
+        let chartData = [];
+        data.polyLine.forEach((item) => {
+          let date = dateFormat(new Date(item.voteDate * 1000), "yyyy-MM-dd");
+          console.log("date:" + date);
+          chartData.push(
+            {
+              date,
+              value: item.supportIncrement,
+              type: "支持",
+            },
+            {
+              date,
+              value: item.oppositionIncrement,
+              type: "反对",
+            }
+          );
+        });
+        this.issueChartData = chartData;
+      } else {
+        this.$message.error(msg);
+      }
+    },
+
+    //加载组织数据
+    async getProjectProcess() {
+      const { issueInfo } = this;
+      if (!issueInfo || !issueInfo.projectId) return;
+      const url = "/gov/project/trace/processlist-v2";
+
+      const { data, code, msg } = await requestPost(url, {
+        projectId: issueInfo.projectId,
+      });
+
+      if (code === 0) {
+        this.projectProcess = data.map((item) => {
+          item.processTime = dateFormat(
+            new Date(item.processTime * 1000),
+            "yyyy-MM-dd hh:mm"
+          );
+          return item;
+        });
+      } else {
+        this.$message.error(msg);
+      }
+    },
+
+    //加载组织数据
+    async getProjectInfo() {
+      const { issueInfo } = this;
+      if (!issueInfo || !issueInfo.projectId) return;
+      const url = "/gov/project/trace/projectdetail";
+
+      const { data, code, msg } = await requestPost(url, {
+        projectId: issueInfo.projectId,
+      });
+
+      if (code === 0) {
+        this.projectInfo = data;
+      } else {
+        this.$message.error(msg);
+      }
+    },
+
+    async getProjectCate() {
+      const { issueInfo } = this;
+      if (!issueInfo || !issueInfo.projectId) return;
+      const url = "/gov/project/projectcategory/categorytaglist";
+
+      const { data, code, msg } = await requestPost(url, {
+        projectId: issueInfo.projectId,
+      });
+
+      if (code === 0) {
+        this.projectCate = data.categoryList;
+        this.projectTag = data.tagList;
+      } else {
+        this.$message.error(msg);
+      }
+    },
+
+    //加载组织数据
+    async getYanPan() {
+      const url = "/gov/project/project/topic-research-analysis";
+
+      if (!this.issueInfo.projectId) return;
+
+      const { data, code, msg } = await requestPost(url, {
+        epmetUserIdList: this.epmetUserIdList,
+        icResiUserId: this.icResiUserId,
+        projectId: this.issueInfo.projectId,
+      });
+
+      if (code === 0) {
+        data.categoryList = data.projectData.map((item) => {
+          return {
+            categoryCode: item.firstCategoryCode,
+            categoryName: item.firstCategoryName,
+            showItem: true,
+            projectList: item.projectList.map((subItem) => {
+              return {
+                title: subItem.projectTitle,
+                status: subItem.projectStatus,
+                statusName:
+                  subItem.projectStatus == "pending" ? "待处理" : "结案",
+                projectId: subItem.projectId,
+                topicId: subItem.topicId,
+              };
+            }),
+          };
+        });
+        this.yanPan = { ...this.yanPan, ...data };
+        this.yanPan.loading = true;
+      } else {
+        this.$message.error(msg);
+      }
+    },
+
+    toUserInfo(item) {
+      this.$router.push({
+        path: `/main-shuju/visual-basicinfo-people/${item.icResiUserId}`,
+      });
+    },
+
+    toProjectInfo(item) {
+      console.log(item);
+      this.topicId = item.topicId;
+    },
+  },
+};
+</script>
+
+<style
+  lang="scss"
+  src="@/assets/scss/modules/visual/incident-info.scss"
+  scoped
+></style>
diff --git a/src/views/modules/visual/basicinfo/people.vue b/src/views/modules/visual/basicinfo/people.vue
index a75bebad..f2585b70 100644
--- a/src/views/modules/visual/basicinfo/people.vue
+++ b/src/views/modules/visual/basicinfo/people.vue
@@ -133,7 +133,7 @@
 
             <div
               class="rel z-zuo-2"
-              @click="userId = houseInfo.userList[0].userId"
+              @click="toUserInfo(houseInfo.userList[0].userId)"
               v-if="houseInfo.userList[0]"
             >
               <img
@@ -159,7 +159,7 @@
 
             <div
               class="rel z-you-2"
-              @click="userId = houseInfo.userList[1].userId"
+              @click="toUserInfo(houseInfo.userList[1].userId)"
               v-if="houseInfo.userList[1]"
             >
               <img
@@ -185,7 +185,7 @@
 
             <div
               class="rel z-zuo-1"
-              @click="userId = houseInfo.userList[2].userId"
+              @click="toUserInfo(houseInfo.userList[2].userId)"
               v-if="houseInfo.userList[2]"
             >
               <img
@@ -211,7 +211,7 @@
 
             <div
               class="rel z-you-1"
-              @click="userId = houseInfo.userList[3].userId"
+              @click="toUserInfo(houseInfo.userList[3].userId)"
               v-if="houseInfo.userList[3]"
             >
               <img
@@ -237,7 +237,7 @@
 
             <div
               class="rel z-zuo-3"
-              @click="userId = houseInfo.userList[4].userId"
+              @click="toUserInfo(houseInfo.userList[4].userId)"
               v-if="houseInfo.userList[4]"
             >
               <img
@@ -263,7 +263,7 @@
 
             <div
               class="rel z-you-3"
-              @click="userId = houseInfo.userList[5].userId"
+              @click="toUserInfo(houseInfo.userList[5].userId)"
               v-if="houseInfo.userList[5]"
             >
               <img
@@ -290,7 +290,199 @@
         </cpt-card>
       </div>
     </div>
-    <div class="g-r"></div>
+    <div class="g-r">
+      <div class="m-tb">
+        <cpt-card>
+          <div class="title">
+            <img src="@/assets/img/shuju/title-tip.png" />
+            <span>居民需求</span>
+          </div>
+
+          <div class="tb">
+            <cpt-tb
+              :col-list="demand.colList"
+              :loading="demand.loading"
+              :header="demand.header"
+              :list="demand.list"
+              @operate="handleOperateDemandList"
+            ></cpt-tb>
+
+            <div class="m-pagination" v-if="demand.total > demand.pageSize">
+              <el-pagination
+                :current-page="demand.pageNo"
+                :page-size="demand.pageSize"
+                :total="demand.total"
+                background
+                layout="prev, pager, next"
+                @current-change="handlePageNoChangeDemand"
+              >
+              </el-pagination>
+            </div>
+          </div>
+        </cpt-card>
+      </div>
+
+      <div class="m-row">
+        <div class="m-list">
+          <cpt-card>
+            <div class="title">
+              <img src="@/assets/img/shuju/title-tip.png" />
+              <a
+                :class="{ 'z-on': showedIncidentOrTopic == 'incident' }"
+                @click="showedIncidentOrTopic = 'incident'"
+                >上报事件</a
+              >
+              <a
+                :class="{ 'z-on': showedIncidentOrTopic == 'topic' }"
+                @click="showedIncidentOrTopic = 'topic'"
+                >发布话题</a
+              >
+            </div>
+            <div class="list-wrap" v-show="showedIncidentOrTopic == 'incident'">
+              <div class="list">
+                <div
+                  class="item"
+                  :key="'incident' + index"
+                  v-for="(item, index) in incident.list"
+                  @click="handleClickIncident(index)"
+                >
+                  <div class="item-title">{{ item.eventContent }}</div>
+                  <div class="item-date">{{ item.reportTime }}</div>
+                </div>
+              </div>
+
+              <div
+                class="m-pagination"
+                v-if="incident.total > incident.pageSize"
+              >
+                <el-pagination
+                  :current-page="incident.pageNo"
+                  :page-size="incident.pageSize"
+                  :total="incident.total"
+                  background
+                  layout="prev, pager, next"
+                  @current-change="handlePageNoChangeIncident"
+                >
+                </el-pagination>
+              </div>
+
+              <div v-if="incident.list.length == 0" class="m-hint">
+                <img
+                  src="@/assets/img/modules/visual/noData.png"
+                  class="no-data-img"
+                />
+              </div>
+            </div>
+
+            <div class="list-wrap" v-show="showedIncidentOrTopic == 'topic'">
+              <div class="list">
+                <div
+                  class="item"
+                  :key="'topic' + index"
+                  v-for="(item, index) in topic.list"
+                  @click="handleClickTopic(index)"
+                >
+                  <div class="item-title">{{ item.topicContent }}</div>
+                  <div class="item-date">{{ item.releaseTime }}</div>
+                </div>
+              </div>
+
+              <div class="m-pagination" v-if="topic.total > topic.pageSize">
+                <el-pagination
+                  :current-page="topic.pageNo"
+                  :page-size="topic.pageSize"
+                  :total="topic.total"
+                  background
+                  layout="prev, pager, next"
+                  @current-change="handlePageNoChangeTopic"
+                >
+                </el-pagination>
+              </div>
+
+              <div v-if="topic.list.length == 0" class="m-hint">
+                <img
+                  src="@/assets/img/modules/visual/noData.png"
+                  class="no-data-img"
+                />
+              </div>
+            </div>
+          </cpt-card>
+        </div>
+
+        <div class="m-list">
+          <cpt-card>
+            <div class="title">
+              <img src="@/assets/img/shuju/title-tip.png" />
+              <span>积分记录</span>
+            </div>
+
+            <div class="list-wrap">
+              <div class="list">
+                <div
+                  class="item"
+                  :key="'point' + index"
+                  v-for="(item, index) in point.list"
+                  @click="handleClickPoint(index)"
+                >
+                  <div class="item-row">
+                    <div class="item-l">
+                      <div class="item-point">{{ item.point }}</div>
+                    </div>
+                    <div class="item-r">
+                      <div class="item-title">{{ item.title }}</div>
+                      <div class="item-date">{{ item.dateTime }}</div>
+                    </div>
+                  </div>
+                </div>
+              </div>
+
+              <div class="m-pagination" v-if="point.total > point.pageSize">
+                <el-pagination
+                  :current-page="point.pageNo"
+                  :page-size="point.pageSize"
+                  :total="point.total"
+                  background
+                  layout="prev, pager, next"
+                  @current-change="handlePageNoChangePoint"
+                >
+                </el-pagination>
+              </div>
+
+              <div v-if="point.list.length == 0" class="m-hint">
+                <img
+                  src="@/assets/img/modules/visual/noData.png"
+                  class="no-data-img"
+                />
+              </div>
+            </div>
+          </cpt-card>
+        </div>
+      </div>
+    </div>
+
+    <demand-info
+      v-if="demand.list.length > 0 && showedDemandInfo"
+      :userId="userId"
+      queryOrigin="personal-data"
+      :demandId="demand.srcList[demand.currentIndex].demandRecId"
+      @close="showedDemandInfo = false"
+    />
+
+    <incident-info
+      v-if="incident.list.length > 0 && incident.showedInfo"
+      :resiEventId="incident.list[incident.currentIndex].resiEventId"
+      :epmetUserIdList="info.epmetUserIdList"
+      :icResiUserId="userId"
+      @close="incident.showedInfo = false"
+    />
+
+    <topic-info
+      v-if="topic.list.length > 0 && topic.showedInfo"
+      :topicId="topic.list[topic.currentIndex].topicId"
+      :epmetUserIdList="info.epmetUserIdList"
+      :icResiUserId="userId"
+      @close="topic.showedInfo = false"
+    />
   </div>
 </template>
 
@@ -299,16 +491,22 @@ import { Loading } from "element-ui"; //引入Loading服务
 import { requestPost } from "@/js/dai/request";
 import cptCard from "@/views/modules/visual/cpts/card";
 import peopleMore from "@/views/modules/visual/basicinfo/cpts/people-more";
+import demandInfo from "@/views/modules/visual/measure/dialogInfo";
+import incidentInfo from "@/views/modules/visual/basicinfo/cpts/incident-info";
+import topicInfo from "@/views/modules/visual/basicinfo/cpts/topic-info";
+import cptTb from "@/views/modules/visual/cpts/tb";
 
 export default {
   name: "HomeMap",
   data() {
     return {
       showedMoreInfo: false,
+      showedDemandInfo: false,
 
       userId: "",
 
       info: {
+        epmetUserIdList: [],
         financialSituation: { monthlyIncome: "", retirementAmount: "" },
         gridName: "",
         houseInfo: [],
@@ -329,6 +527,75 @@ export default {
           // },
         ],
       },
+
+      demand: {
+        loading: true,
+        colList: [
+          {
+            align: "center",
+            width: "10%",
+          },
+          {
+            align: "center",
+            width: "15%",
+          },
+          {
+            align: "center",
+            width: "15%",
+          },
+          {
+            align: "center",
+            width: "40%",
+          },
+          {
+            align: "center",
+            width: "10%",
+          },
+          {
+            align: "center",
+            width: "10%",
+          },
+        ],
+        header: ["序号", "服务时间", "需求类型", "需求内容", "状态", "操作"],
+        list: [],
+        srcList: [],
+        currentIndex: 0,
+        pageSize: 5,
+        pageNo: 1,
+        total: 0,
+      },
+
+      showedIncidentOrTopic: "incident",
+
+      incident: {
+        loading: false,
+        list: [],
+        pageSize: 10,
+        pageNo: 1,
+        total: 0,
+        showedInfo: false,
+        currentIndex: 0,
+      },
+
+      topic: {
+        loading: false,
+        list: [],
+        pageSize: 10,
+        pageNo: 1,
+        total: 0,
+        showedInfo: false,
+        currentIndex: 0,
+      },
+
+      point: {
+        loading: false,
+        list: [],
+        pageSize: 10,
+        pageNo: 1,
+        total: 0,
+        showedInfo: false,
+        currentIndex: 0,
+      },
     };
   },
 
@@ -345,6 +612,10 @@ export default {
   components: {
     cptCard,
     peopleMore,
+    cptTb,
+    demandInfo,
+    incidentInfo,
+    topicInfo,
   },
 
   watch: {
@@ -365,9 +636,17 @@ export default {
   methods: {
     handleSearch() {},
 
-    getApiData() {
-      this.getInfo();
+    async getApiData() {
+      await this.getInfo();
       this.getHouseInfo();
+      this.getDemandData();
+      this.getIncidentData();
+      this.getTopicData();
+      this.getPointData();
+    },
+
+    toUserInfo(uid) {
+      this.$router.push({ path: `/main-shuju/visual-basicinfo-people/${uid}` });
     },
 
     //加载组织数据
@@ -401,8 +680,148 @@ export default {
         this.$message.error(msg);
       }
     },
+
+    handlePageNoChangeDemand(val) {
+      this.demand.pageNo = val;
+      this.getDemandData();
+    },
+
+    handleOperateDemandList(index, type) {
+      if (type == "查看") {
+        this.showedDemandInfo = true;
+        this.demand.currentIndex = index;
+      }
+    },
+
+    //加载组织数据
+    async getDemandData() {
+      const url = "/heart/userdemand/mydemand";
+      let params = {
+        epmetUserIdList: this.info.epmetUserIdList,
+        icResiUserId: this.userId,
+        pageNo: this.demand.pageNo,
+        pageSize: this.demand.pageSize,
+      };
+
+      const { data, code, msg } = await requestPost(url, params);
+      this.demand.loading = false;
+
+      if (code === 0) {
+        this.demand.total = data.total;
+        this.demand.list = data.list.map((item) => {
+          return [
+            { type: "index" },
+            item.wantServiceTime,
+            item.categoryName,
+            item.content,
+            item.statusName,
+            { type: "operate", list: ["查看"] },
+          ];
+        });
+        this.demand.srcList = data.list;
+      } else {
+        this.$message.error(msg);
+      }
+    },
+
+    handlePageNoChangeIncident(val) {
+      this.incident.pageNo = val;
+      this.getIncidentData();
+    },
+
+    handleClickIncident(index) {
+      this.incident.showedInfo = true;
+      this.incident.currentIndex = index;
+    },
+
+    //加载组织数据
+    async getIncidentData() {
+      const url = "/gov/project/resievent/pageuserreported";
+      let params = {
+        epmetUserIdList: this.info.epmetUserIdList,
+        userId: this.userId,
+        pageNo: this.incident.pageNo,
+        pageSize: this.incident.pageSize,
+      };
+
+      const { data, code, msg } = await requestPost(url, params);
+      this.incident.loading = false;
+
+      if (code === 0) {
+        this.incident.total = data.total;
+        this.incident.list = data.list;
+      } else {
+        this.$message.error(msg);
+      }
+    },
+
+    handlePageNoChangeTopic(val) {
+      this.topic.pageNo = val;
+      this.getTopicData();
+    },
+
+    handleClickTopic(index) {
+      this.topic.showedInfo = true;
+      this.topic.currentIndex = index;
+    },
+
+    //加载组织数据
+    async getTopicData() {
+      const url = "/data/aggregator/resigroup/pageusertopic";
+      let params = {
+        epmetUserIdList: this.info.epmetUserIdList,
+        userId: this.userId,
+        pageNo: this.topic.pageNo,
+        pageSize: this.topic.pageSize,
+      };
+
+      const { data, code, msg } = await requestPost(url, params);
+      this.topic.loading = false;
+
+      if (code === 0) {
+        this.topic.total = data.total;
+        this.topic.list = data.list;
+      } else {
+        this.$message.error(msg);
+      }
+    },
+
+    handlePageNoChangePoint(val) {
+      this.point.pageNo = val;
+      this.getPointData();
+    },
+
+    handleClickPoint(index) {
+      this.point.showedInfo = true;
+      this.point.currentIndex = index;
+    },
+
+    //加载组织数据
+    async getPointData() {
+      const url = "/point/resi/point/pageuserpoint";
+      let params = {
+        epmetUserIdList: this.info.epmetUserIdList,
+        userId: this.userId,
+        pageNo: this.point.pageNo,
+        pageSize: this.point.pageSize,
+      };
+
+      const { data, code, msg } = await requestPost(url, params);
+      this.point.loading = false;
+
+      if (code === 0) {
+        this.point.total = data.total;
+        this.point.list = data.list;
+      } else {
+        this.$message.error(msg);
+      }
+    },
   },
 };
 </script>
 
-<style lang="scss" src="@/assets/scss/people.scss" scoped></style>
+<style
+  lang="scss"
+  src="@/assets/scss/modules/visual/people.scss"
+  scoped
+></style>
diff --git a/src/views/modules/visual/communityGovern/components/screen-loading/index.vue b/src/views/modules/visual/communityGovern/components/screen-loading/index.vue
new file mode 100644
index 00000000..cc8bda6f
--- /dev/null
+++ b/src/views/modules/visual/communityGovern/components/screen-loading/index.vue
@@ -0,0 +1,68 @@
+<template>
+  <div class="screen-loading">
+    <svg width="50px"
+         height="50px">
+      <circle cx="25"
+              cy="25"
+              r="20"
+              fill="transparent"
+              stroke-width="3"
+              stroke-dasharray="31.415, 31.415"
+              stroke="#29cdff"
+              stroke-linecap="round">
+        <animateTransform attributeName="transform"
+                          type="rotate"
+                          values="0, 25 25;360, 25 25"
+                          dur="1.5s"
+                          repeatCount="indefinite" />
+        <animate attributeName="stroke"
+                 values="#02bcfe;#3be6cb;#02bcfe"
+                 dur="3s"
+                 repeatCount="indefinite" />
+      </circle>
+
+      <circle cx="25"
+              cy="25"
+              r="10"
+              fill="transparent"
+              stroke-width="3"
+              stroke-dasharray="15.7, 15.7"
+              stroke="#29cdff"
+              stroke-linecap="round">
+        <animateTransform attributeName="transform"
+                          type="rotate"
+                          values="360, 25 25;0, 25 25"
+                          dur="1.5s"
+                          repeatCount="indefinite" />
+        <animate attributeName="stroke"
+                 values="#3be6cb;#02bcfe;#3be6cb"
+                 dur="3s"
+                 repeatCount="indefinite" />
+      </circle>
+    </svg>
+    <div class="loading-tip">
+      <slot></slot>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'DvLoading'
+}
+</script>
+
+<style lang="scss" scoped>
+.screen-loading {
+  width: 100%;
+  height: 100%;
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+  align-items: center;
+  .loading-tip {
+    font-size: 14px;
+    color: #fff;
+  }
+}
+</style>
diff --git a/src/views/modules/visual/communityGovern/components/screen-table/index.vue b/src/views/modules/visual/communityGovern/components/screen-table/index.vue
new file mode 100644
index 00000000..41c80f97
--- /dev/null
+++ b/src/views/modules/visual/communityGovern/components/screen-table/index.vue
@@ -0,0 +1,310 @@
+<template>
+  <div class="warning-table">
+    <div class="table">
+      <div class="table-header">
+        <div
+          class="table-header-th"
+          v-for="(item, index) in headerList"
+          :key="item.title"
+          :style="headerStyle[index]"
+        >
+          {{ item.title }}
+        </div>
+      </div>
+      <div class="table-body">
+        <div
+          class="table-body-tr"
+          v-for="(value, index) in tableData"
+          :key="index"
+        >
+          <div
+            class="td"
+            v-for="(item, indexs) in value"
+            :key="indexs"
+            :style="tableContentStyle[indexs]"
+          >
+            {{ item }}
+            <span
+              v-if="indexs + 1 == value.length && item.length > 8"
+              class="more"
+              @click.stop="onClickMorePop(index)"
+              ref="morePop"
+            >
+              更多>
+              <span class="more-pop" v-if="visiblePopList[index]">
+                <!-- 李佳琪、刘阳、赵欣、丁一、嘉敏、李岩、何嘉慧
+                  李易峰、赵敏、何军、曲树惠 -->
+                {{ item }}
+              </span>
+            </span>
+          </div>
+        </div>
+        <screen-loading v-if="visibleLoading">加载中</screen-loading>
+        <div class="no-data" v-if="tableData.length == 0 && !visibleLoading">
+          <img
+            src="../../../../../../assets/img/modules/visual/noData.png"
+            alt=""
+            srcset=""
+            class="no-data-img"
+          />
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import ScreenLoading from "../screen-loading/index";
+import Vue from "vue";
+export default {
+  name: "warning-table",
+  components: {
+    ScreenLoading,
+  },
+  props: {
+    headerList: {
+      type: Array,
+      required: false,
+      default: () => {
+        return [
+          { title: "序号" },
+          { title: "所属网格" },
+          { title: "所属小区" },
+          { title: "楼号" },
+          { title: "姓名" },
+        ];
+      },
+    },
+    tableData: {
+      type: Array,
+      required: false,
+      default: () => {
+        return [
+          // [
+          //   1,
+          //   "商丘路社区第一网格",
+          //   "商丘路小区",
+          //   "2号楼",
+          //   "杨颖、王平、刘佳敏、丁辉、杨萍",
+          // ],
+          // [
+          //   2,
+          //   "商丘路社区第一网格",
+          //   "商丘路小区",
+          //   "2号楼",
+          //   "杨颖、王平、刘佳敏、丁辉、杨萍",
+          // ],
+        ];
+      },
+    },
+    // 单独给头部设置样式
+    headerStyle: {
+      type: Array,
+      default: () => {
+        return [
+          // {
+          //   width:'200px',
+          //   border:'1px solid red'
+          // },
+          // {
+          //   width:'200px'
+          // }
+        ];
+      },
+    },
+    // 单独给内容设置样式
+    tableContentStyle: {
+      type: Array,
+      default: () => {
+        return [
+          // {
+          //   width:'200px',
+          //   border:'1px solid red'
+          // },
+          // {
+          //   width:'200px'
+          // }
+        ];
+      },
+    },
+    visibleLoading: {
+      type: Boolean,
+      default: true,
+    },
+    // // 表格平均分的份数
+    // ava: {
+    //   type: Number,
+    //   default: 8
+    // },
+    // // 表头高度--默认占比10%
+    // headerHeightAva: {
+    //   type: String,
+    //   default: '10%'
+    // },
+    // // 表格主体平均分成的份数
+    // tableContentAva: {
+    //   type: Number,
+    //   default: 5
+    // },
+  },
+  data() {
+    return {
+      visiblePopList: [
+        false,
+        false,
+        false,
+        false,
+        false,
+        false,
+        false,
+        false,
+        false,
+        false,
+      ],
+    };
+  },
+  watch: {
+    tableData(arr) {
+      if (Array.isArray(arr)) {
+        this.visiblePopList = new Array(arr.length).fill(false);
+      }
+    },
+  },
+
+  mounted() {
+    window.addEventListener("click", (e) => {
+      this.visiblePopList = new Array(this.visiblePopList.length).fill(false);
+    });
+  },
+
+  created() {},
+
+  methods: {
+    onClickMorePop(index) {
+      this.visiblePopList.forEach((item, indexs) => {
+        if (index == indexs) {
+          Vue.set(this.visiblePopList, index, true);
+        } else {
+          Vue.set(this.visiblePopList, indexs, false);
+        }
+      });
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.warning-table {
+  box-sizing: border-box;
+  width: 100%;
+  height: 100%;
+  .table {
+    width: 100%;
+    height: 100%;
+    &-header {
+      width: 100%;
+      height: 50px;
+      display: flex;
+      justify-content: space-around;
+      align-items: center;
+      background: rgba(8, 37, 134, 0.85);
+      font-size: 16px;
+      font-weight: 400;
+      color: #ffffff;
+
+      &-th {
+        text-align: center;
+        width: calc(100% / 5);
+      }
+    }
+
+    &-body {
+      box-sizing: border-box;
+      width: 100%;
+      height: calc(100% - 50px);
+      font-size: 18px;
+      font-weight: 400;
+      color: #ffffff;
+
+      &-tr {
+        width: 100%;
+        height: 50px;
+        // height: calc(100% / 10);
+        display: flex;
+        justify-content: space-around;
+        align-items: center;
+
+        .td {
+          text-align: center;
+          width: calc(100% / 5);
+          .more {
+            font-size: 18px;
+            font-weight: 400;
+            color: #e4dc00;
+            position: relative;
+            cursor: pointer;
+
+            &-pop {
+              box-sizing: border-box;
+              display: block;
+              box-sizing: border-box;
+              width: 215px;
+              height: auto;
+              line-height: 20px;
+              border: 1px solid red;
+              position: absolute;
+              right: -100%;
+              top: 150%;
+              background: #06186d;
+              border: 1px solid #1a64cc;
+              border-radius: 5px;
+              font-size: 9px;
+              font-weight: 400;
+              color: #ffffff;
+              padding: 16px 8px 10px 9px;
+              z-index: 1;
+              cursor: default;
+              // &::after{
+              //   position: absolute;
+              //   left: 30%;
+              //   top: -30%;
+              //   display: flex;
+              //   content:'';
+              //   width: 0;
+              //   height: 0;
+              //   border-width: 13px;
+              //   border-style: solid;
+              //   border-color: transparent transparent rgba(26, 100, 204,0.5) transparent;
+              //   // border-color: transparent transparent red transparent;
+              //   transform: translate(-50%,0);
+              // }
+            }
+          }
+        }
+      }
+
+      &-tr:nth-child(2n) {
+        background: rgba(16, 75, 164, 0.24);
+      }
+
+      &-tr:hover {
+        background: url("../../../../../../assets/img/modules/visual/hover-bac.png")
+          no-repeat center;
+        background-size: 100% 100%;
+      }
+      // 暂无数据
+      .no-data {
+        width: 100%;
+        height: calc(100% - 50px);
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        &-img {
+          width: 249px;
+          height: 172px;
+        }
+      }
+    }
+  }
+}
+</style>
diff --git a/src/views/modules/visual/communityGovern/cpt/issue-info.vue b/src/views/modules/visual/communityGovern/cpt/issue-info.vue
new file mode 100644
index 00000000..6ebd7d49
--- /dev/null
+++ b/src/views/modules/visual/communityGovern/cpt/issue-info.vue
@@ -0,0 +1,234 @@
+<template>
+  <div class="m-pop">
+    <div class="wrap">
+      <cpt-card>
+        <div class="title">
+          <img src="@/assets/img/shuju/title-tip.png" />
+          <span>议题详情</span>
+        </div>
+
+        <div class="btn-close"
+             @click="handleClose">
+          <img src="@/assets/img/shuju/people/close.png" />
+        </div>
+        <div class="m-content">
+          <div class="m-info">
+
+            <div class="info-prop">
+              <span class="info-title-2">议题标题：</span>
+              <span>{{ info.issueTitle }}</span>
+            </div>
+            <div class="info-prop">
+              <span class="info-title-2">议题建议：</span>
+              <span>{{ info.issueSuggestion }}</span>
+            </div>
+
+            <div class="info-prop" v-if="info.topicInfo">
+              <span class="info-title-2">话题内容：</span>
+              <div>
+                <div>{{ info.topicInfo.topicContent }}</div>
+                <div v-if="info.topicInfo.topicImgs&&info.topicInfo.topicImgs.length>0"
+                     class="info-pics">
+                  <img :src="src"
+                       :key="src"
+                       v-for="src in info.topicInfo.topicImgs" />
+                </div>
+              </div>
+            </div>
+            <div class="info-prop">
+              <span class="info-title-2">转议题时间：</span>
+              <span>{{ info.shiftIssueTime}}</span>
+            </div>
+            <div class="info-prop">
+              <span class="info-title-2">所属网格：</span>
+              <span>{{ info.belongsGridName}}</span>
+            </div>
+            <div class="info-prop" v-if="info.topicInfo">
+              <span class="info-title-2">话题发表人：</span>
+              <span>{{ info.topicInfo.publishedUser}}</span>
+            </div>
+            <div class="info-prop">
+              <span class="info-title-2">议题发起人：</span>
+              <span>{{ info.issueInitiator}}</span>
+            </div>
+            <div class="info-prop" v-if="info.topicInfo">
+              <span class="info-title-2">话题来源：</span>
+              <span>{{ info.topicInfo.groupName}}</span>
+            </div>
+            <div class="info-prop" v-if="info.topicInfo">
+              <span class="info-title-2">话题发表时间：</span>
+              <span>{{ info.topicInfo.publishedTimeShow}}</span>
+            </div>
+          </div>
+          <div class="m-line">
+            <div class="stat">
+              <div class="stat-item">
+                <div>
+                  {{ issueTrend.realityVoteCount }}/{{
+                        issueTrend.shouldVoteCount
+                      }}
+                </div>
+                <div class="z-weak">已表决/应表决</div>
+              </div>
+              <div class="stat-item">
+                <div>{{ issueTrend.supportAmount }}</div>
+                <div class="z-weak">支持</div>
+              </div>
+              <div class="stat-item">
+                <div>{{ issueTrend.oppositionAmount }}</div>
+                <div class="z-weak">反对</div>
+              </div>
+            </div>
+
+            <line-chart ref="lineChart"
+                        :list="null" />
+          </div>
+        </div>
+      </cpt-card>
+    </div>
+  </div>
+</template>
+
+<script>
+import cptCard from "@/views/modules/visual/cpts/card";
+import screenLoading from "@/views/modules/visual/cpts/loading";
+import { requestPost } from "@/js/dai/request";
+import lineChart from "@/views/modules/visual/cpts/line-chart";
+import dateFormat from "dai-js/tools/dateFormat";
+
+export default {
+  name: "demandInfo",
+  props: {
+    issueId: {
+      type: String,
+      default: "",
+    },
+
+  },
+
+  components: {
+    cptCard,
+    lineChart,
+    screenLoading,
+  },
+
+  data () {
+    return {
+      info: {
+        attitude: "",
+        belongsGridName: "",
+        issueIdea: "",
+        issueInitiator: "",
+        issueStatus: "",
+        issueSuggestion: "",
+        issueTitle: "",
+        joinVote: false,
+        projectId: "",
+        projectStatus: true,
+        publishIdeaFlag: false,
+        shiftIssueTime: "",
+        topicInfo: {
+          groupId: "",
+          groupName: "",
+          groupType: "",
+          publishedTime: "",
+          publishedUser: "",
+          topicContent: "",
+          topicId: "",
+          topicImgs: null,
+        },
+      },
+      issueTrend: {},
+      issueChartData: [],
+
+    };
+  },
+
+  computed: {},
+
+  watch: {
+    issueId () {
+      this.getApiData();
+    },
+  },
+
+  mounted () {
+    this.getApiData();
+  },
+
+  methods: {
+
+    handleClose () {
+      this.$emit("close");
+    },
+
+    async getApiData () {
+
+      await this.getInfo();
+      await this.getIssueTrend()
+    },
+
+    //加载组织数据
+    async getInfo () {
+      const url = "/resi/hall/issue/detail";
+      // const url = "http://yapi.elinkservice.cn/mock/245/gov/issue/issue/resibuzz";
+      let params = {
+        issueId: this.issueId,
+      };
+
+      const { data, code, msg } = await requestPost(url, params);
+
+      if (code === 0) {
+        this.info = data
+
+        this.info.topicInfo.publishedTimeShow = dateFormat(new Date(this.info.topicInfo.publishedTime * 1000), "yyyy-MM-dd")
+
+      } else {
+        this.$message.error(msg);
+      }
+    },
+
+    //加载组织数据
+    async getIssueTrend () {
+      const url = "/resi/hall/issue/votingtrend";
+
+      const { data, code, msg } = await requestPost(url, {
+        issueId: this.issueId,
+      });
+
+      if (code === 0) {
+        this.issueTrend = data;
+        let chartData = [];
+        data.polyLine.forEach((item) => {
+          let date = dateFormat(new Date(item.voteDate * 1000), "yyyy-MM-dd");
+          console.log("date:" + date);
+          chartData.push(
+            {
+              date,
+              value: item.supportIncrement,
+              type: "支持",
+            },
+            {
+              date,
+              value: item.oppositionIncrement,
+              type: "反对",
+            }
+          );
+        });
+        this.issueChartData = chartData;
+        this.$refs.lineChart.setList(this.issueChartData)
+
+      } else {
+        this.$message.error(msg);
+      }
+    },
+
+  },
+};
+</script>
+
+<style
+  lang="scss"
+  src="@/assets/scss/modules/visual/issue-info.scss"
+  scoped
+></style>
diff --git a/src/views/modules/visual/communityGovern/cpt/project-info.vue b/src/views/modules/visual/communityGovern/cpt/project-info.vue
new file mode 100644
index 00000000..2810747b
--- /dev/null
+++ b/src/views/modules/visual/communityGovern/cpt/project-info.vue
@@ -0,0 +1,696 @@
+<template>
+  <div class="m-pop">
+    <div class="wrap">
+      <cpt-card>
+        <div class="title">
+          <img src="@/assets/img/shuju/title-tip.png" />
+          <span>项目详情</span>
+        </div>
+
+        <div class="btn-close"
+             @click="handleClose">
+          <img src="@/assets/img/shuju/people/close.png" />
+        </div>
+        <div class="m-top">
+          <div class="m-info">
+            <div class="info-prop">
+              <span>项目标题：</span>
+              <span>{{ projectInfo.projectTitle }}</span>
+            </div>
+            <div class="info-prop">
+              <span>项目背景：</span>
+              <span>{{ projectInfo.backGround }}</span>
+            </div>
+            <div class="info-prop">
+              <span>项目方案：</span>
+              <span>{{ projectInfo.projectTitle }}</span>
+            </div>
+            <div class="info-prop">
+              <span>内部备注：</span>
+              <span>{{ projectInfo.internalRemark || "--" }}</span>
+            </div>
+            <div class="info-prop">
+              <span>当前处理部门：</span>
+              <span>{{ projectInfo.departmentNameList.join("、") }}</span>
+            </div>
+            <div class="info-prop"
+                 v-if="projectCate.length > 0">
+              <span>分类：</span>
+              <fold-text :row="3">
+                <div :key="item.name"
+                     v-for="item in projectCate">
+                  {{ item.name }}
+                </div>
+              </fold-text>
+            </div>
+            <div class="info-prop"
+                 v-if="projectTag.length > 0">
+              <span>标签：</span>
+              <fold-text :row="3">
+                <div :key="item.name"
+                     v-for="item in projectTag">
+                  {{ item.name }}
+                </div>
+              </fold-text>
+            </div>
+          </div>
+
+          <div class="m-process"
+               v-if="projectProcess.length > 0">
+            <div class="process-title">处理进展</div>
+            <div class="list">
+              <div class="item"
+                   :class="index === 0 ? 'z-on' : ''"
+                   :key="item.processId"
+                   v-for="(item, index) in projectProcess">
+                <div class="item-row">
+                  <div class="name">{{ item.processName }}</div>
+                  <div class="date">
+                    {{ item.processTime }}
+                  </div>
+                </div>
+
+                <div class="detail">
+                  <div class="detail-field">处理部门：</div>
+                  <div class="detail-value">{{ item.departmentName }}</div>
+                </div>
+
+                <div class="detail"
+                     v-if="item.processName != '转项目' && item.publicReply">
+                  <div class="detail-field">说 明：</div>
+                  <div class="detail-value">
+                    <fold-text :row="3">{{ item.publicReply }}</fold-text>
+                  </div>
+                </div>
+
+                <div class="detail"
+                     v-if="item.processName != '转项目' && item.internalRemark">
+                  <div class="detail-field">内部备注：</div>
+                  <div class="detail-value">
+                    <fold-text :row="3">{{
+                          item.internalRemark
+                        }}</fold-text>
+                  </div>
+                </div>
+                <div class="detail">
+                  <div class="attachement-list">
+                    <a :href="att.url"
+                       target="_blank"
+                       :key="att.url"
+                       v-for="att in item.internalFile">
+                      <i class="el-icon-folder-opened"></i>
+                      {{ att.name }}
+                    </a>
+                  </div>
+                </div>
+              </div>
+            </div>
+          </div>
+        </div>
+        <div v-if="projectInfo.origin!=='agency'"
+             class="tabs">
+          <div class="tab-btn"
+               @click="subStartGroupIndex"
+               v-if="groupList.length > 9">
+            <img src="@/assets/img/shuju/people/arrow-double-left.png" />
+          </div>
+          <div v-show="index >= startGroupIndex && index < startGroupIndex + 9"
+               class="tab"
+               :class="groupIndex % groupList.length == index ? 'z-on' : ''"
+               :key="'tab' + index"
+               @click="groupIndex = index"
+               v-for="(item, index) in groupList">
+            {{ item.label }}
+          </div>
+          <div class="tab-btn"
+               @click="addStartGroupIndex"
+               v-if="groupList.length > 9">
+            <img src="@/assets/img/shuju/people/arrow-double-right.png" />
+          </div>
+        </div>
+
+        <div class="m-case"
+             v-if="projectInfo.origin!=='agency'">
+          <div class="m-yanpan"
+               v-if="groupIndex == 0">
+            <div v-if="projectId">
+              <analyse v-if="yanPan.loading"
+                       singleTitle="楼院小组"
+                       :userList="yanPan.homeUserList"
+                       :userName="yanPan.icUserName"
+                       :singleList="yanPan.singleList"
+                       :hasEvent="yanPan.hasEvent"
+                       :moreList="yanPan.moreList"
+                       @user="toUserInfo"
+                       @project="toProjectInfo" />
+              <screen-loading v-else>加载中</screen-loading>
+            </div>
+            <div v-else
+                 class="m-hint">
+              <img src="@/assets/img/modules/visual/noData.png"
+                   class="no-data-img" />
+            </div>
+          </div>
+
+          <div v-if="groupIndex == 1">
+            <div class="m-row"
+                 v-if="projectInfo.originId">
+              <div v-if="projectInfo.origin==='issue'"
+                   class="m-info">
+                <div class="info-prop">
+                  <span>议题标题：</span>
+                  <span>{{ issueInfo.issueTitle }}</span>
+                </div>
+                <div class="info-prop">
+                  <span>议题建议：</span>
+                  <span>{{ issueInfo.issueSuggestion }}</span>
+                </div>
+                <div class="info-prop">
+                  <span>所属网格：</span>
+                  <span>{{ issueInfo.belongsGridName || "--" }}</span>
+                </div>
+                <div class="info-prop">
+                  <span>议题发起人：</span>
+                  <span>{{ issueInfo.issueInitiator }}</span>
+                </div>
+                <div class="info-prop">
+                  <span>议题来源：</span>
+                  <span>{{ issueInfo.topicInfo.groupName }}</span>
+                </div>
+                <div class="info-prop">
+                  <span>转议题时间：</span>
+                  <span>{{ issueInfo.shiftIssueTime }}</span>
+                </div>
+              </div>
+              <div v-if="projectInfo.origin==='resi_event'"
+                   class="m-info">
+                <div class="info-title">事件内容</div>
+                <div class="info-content">{{ info.eventContent }}</div>
+                <div class="info-pics">
+                  <img :src="src"
+                       :key="src"
+                       v-for="src in info.eventImgs"
+                       @click="watchImg(src)" />
+                </div>
+                <div class="info-prop">
+                  <span class="info-title-2">提交时间：</span>
+                  <span>{{ info.eventTime }}</span>
+                </div>
+                <div class="info-prop">
+                  <span class="info-title-2">报事人：</span>
+                  <span>{{ info.eventPeopleName }}</span>
+                </div>
+                <div class="info-prop">
+                  <span class="info-title-2">所属网格：</span>
+                  <span>{{ info.gridName }}</span>
+                </div>
+                <div class="info-prop">
+                  <span class="info-title-2">提报给：</span>
+                  <div>
+                    <div>{{ info.eventPersonShow}}</div>
+                    <div>{{ info.eventOrgShow}}</div>
+                  </div>
+
+                  <!-- <span>{{ info.eventPerson.join("、") || "--" }}</span> -->
+                </div>
+              </div>
+
+              <div v-if="projectInfo.origin==='issue'"
+                   class="m-line">
+                <div class="stat">
+                  <div class="stat-item">
+                    <div>
+                      {{ issueTrend.realityVoteCount }}/{{
+                        issueTrend.shouldVoteCount
+                      }}
+                    </div>
+                    <div class="z-weak">已表决/应表决</div>
+                  </div>
+                  <div class="stat-item">
+                    <div>{{ issueTrend.supportAmount }}</div>
+                    <div class="z-weak">支持</div>
+                  </div>
+                  <div class="stat-item">
+                    <div>{{ issueTrend.oppositionAmount }}</div>
+                    <div class="z-weak">反对</div>
+                  </div>
+                </div>
+
+                <line-chart v-if="issueChartData.length > 0"
+                            :list="issueChartData" />
+              </div>
+            </div>
+            <div v-else
+                 class="m-hint">
+              <img src="@/assets/img/modules/visual/noData.png"
+                   class="no-data-img" />
+            </div>
+          </div>
+
+        </div>
+      </cpt-card>
+    </div>
+  </div>
+</template>
+
+<script>
+import cptCard from "@/views/modules/visual/cpts/card";
+import screenLoading from "@/views/modules/visual/cpts/loading";
+import { requestPost } from "@/js/dai/request";
+import cptTb from "@/views/modules/visual/cpts/tb";
+import lineChart from "@/views/modules/visual/cpts/line-chart";
+import analyse from "@/views/modules/visual/cpts/analyse";
+import foldText from "@/views/components/foldText";
+import dateFormat from "dai-js/tools/dateFormat";
+
+function iniData () {
+  return {
+    projectIdCopy: this.projectId,
+    groupList: [
+      { label: "研判分析" },
+      { label: "项目来源" },
+    ],
+    groupIndex: 0,
+    startGroupIndex: 0,
+
+    projectProcess: [],
+
+    projectInfo: {
+      backGround: "",
+      departmentList: [
+        //   { departmentName: "南宁社区-南宁第二网格", staffList: ["周相成"] },
+      ],
+      departmentNameList: [],
+      internalRemark: "",
+      isSend: false,
+      locateAddress: "",
+      locateDimension: "",
+      locateLongitude: "",
+      origin: "",
+      originId: "",
+      platformIds: [],
+      processable: false,
+      projectId: "",
+      projectStatus: "pending",
+      projectTitle: "",
+      publicReply: "",
+      returnable: false,
+    },
+
+    issueInfo: {
+      attitude: "",
+      belongsGridName: "",
+      issueIdea: "",
+      issueInitiator: "",
+      issueStatus: "",
+      issueSuggestion: "",
+      issueTitle: "",
+      joinVote: true,
+      projectId: "",
+      projectStatus: false,
+      publishIdeaFlag: false,
+    },
+
+    issueTrend: {},
+    issueChartData: [],
+
+    eventInfo: {
+      eventTime: "",
+      eventContent: "",
+      eventAddress: "",
+      gridName: "",
+      isClosed: true,
+      isResolve: true,
+      isRollback: true,
+      eventImgs: [],
+      eventPerson: [],
+      eventOrg: [],
+      eventPeopleName: "",
+      projectInfo: {
+        projectId: "",
+        operationName: "",
+        operationTime: "",
+        projectDeclare: "",
+      },
+    },
+
+    projectCate: [],
+    projectTag: [],
+
+    yanPan: {
+      loading: false,
+
+      icResiUserId: "",
+      houseId: "",
+      icUserName: "",
+
+      homeUserList: [
+        // {
+        //   homeId: '',
+        //   icUserId: '',
+        //   icUserName: '',
+        // }
+      ],
+      singleList: [],//楼院小组
+      projectData: [
+        // {
+        //   firstCategoryCode: '',
+        //   firstCategoryName: '',
+        //   projectList: [],
+        // }
+      ],
+      hasEvent: false,
+      moreList: [],//
+
+    },
+  };
+}
+
+export default {
+  name: "demandInfo",
+  props: {
+    projectId: {
+      type: String,
+      default: "",
+    },
+    userId: {
+      type: String,
+      default: "",
+    },
+    categoryCodes: {
+      type: Array,
+      default: [],
+    },
+
+  },
+
+  components: {
+    cptCard,
+    cptTb,
+    analyse,
+    screenLoading,
+    lineChart,
+    foldText,
+  },
+
+  data: iniData,
+
+  computed: {},
+
+  watch: {
+    projectId () {
+      let data = iniData();
+      Object.keys(data).forEach((k) => {
+        this[k] = data[k];
+      });
+      this.getApiData();
+    },
+    // projectIdCopy () {
+
+
+    // },
+  },
+
+  mounted () {
+    console.log(this.projectIdCopy)
+    this.getApiData();
+  },
+
+  methods: {
+    watchImg (src) {
+      window.open(src);
+    },
+
+    addStartGroupIndex () {
+      const { startGroupIndex, groupList } = this;
+      if (startGroupIndex < groupList.length - 9) {
+        this.startGroupIndex = startGroupIndex + 1;
+      } else {
+        this.startGroupIndex = groupList.length - 9;
+      }
+    },
+    subStartGroupIndex () {
+      const { startGroupIndex, groupList } = this;
+      if (startGroupIndex > 0) {
+        this.startGroupIndex = startGroupIndex - 1;
+      } else {
+        this.startGroupIndex = 0;
+      }
+    },
+    handleClose () {
+      this.$emit("close");
+    },
+
+    async getApiData () {
+
+      await this.getProjectInfo()
+      this.getProjectCate();
+      this.getProjectProcess();
+      if (this.projectInfo.origin === 'issue') {
+        this.getIssueInfo();
+        this.getIssueTrend();
+      } else if (this.projectInfo.origin === 'resi_event') {
+        this.getEventInfo()
+      }
+      if (this.projectInfo.origin !== 'agency') {
+        await this.getYanPan();
+
+      }
+    },
+
+    //加载组织数据
+    async getProjectInfo () {
+
+      const url = "/gov/project/trace/projectdetail";
+
+      const { data, code, msg } = await requestPost(url, {
+        projectId: this.projectIdCopy,
+      });
+
+      if (code === 0) {
+        this.projectInfo = data;
+
+
+      } else {
+        this.$message.error(msg);
+      }
+    },
+
+    //加载组织数据
+    async getIssueInfo () {
+
+      const url = "/resi/hall/issue/detail";
+
+      const { data, code, msg } = await requestPost(url, {
+        issueId: this.projectInfo.originId,
+      });
+
+      if (code === 0) {
+        this.issueInfo = data;
+      } else {
+        this.$message.error(msg);
+      }
+    },
+
+    //加载组织数据
+    async getIssueTrend () {
+
+      const url = "/resi/hall/issue/votingtrend";
+
+      const { data, code, msg } = await requestPost(url, {
+        issueId: this.projectInfo.originId,
+      });
+
+      if (code === 0) {
+        this.issueTrend = data;
+        let chartData = [];
+        data.polyLine.forEach((item) => {
+          let date = dateFormat(new Date(item.voteDate * 1000), "yyyy-MM-dd");
+          console.log("date:" + date);
+          chartData.push(
+            {
+              date,
+              value: item.supportIncrement,
+              type: "支持",
+            },
+            {
+              date,
+              value: item.oppositionIncrement,
+              type: "反对",
+            }
+          );
+        });
+        this.issueChartData = chartData;
+      } else {
+        this.$message.error(msg);
+      }
+    },
+
+    //加载组织数据
+    async getEventInfo () {
+      const url = "/gov/project/resievent/eventdetail-icdata";
+
+      const { data, code, msg } = await requestPost(url, {
+        resiEventId: this.projectInfo.originId,
+      });
+
+      if (code === 0) {
+
+        if (data.eventOrg && data.eventOrg.length > 0) {
+          data.eventOrgShow = data.eventOrg.join('、')
+        }
+        if (data.eventPerson && data.eventPerson.length > 0) {
+          data.eventPersonShow = data.eventPerson.join('、')
+        }
+        this.info = { ...data };
+
+      } else {
+        this.$message.error(msg);
+      }
+    },
+
+    //加载组织数据
+    async getProjectProcess () {
+
+      const url = "/gov/project/trace/processlist-v2";
+
+      const { data, code, msg } = await requestPost(url, {
+        projectId: this.projectIdCopy,
+      });
+
+      if (code === 0) {
+        this.projectProcess = data.map((item) => {
+          item.processTime = dateFormat(
+            new Date(item.processTime * 1000),
+            "yyyy-MM-dd hh:mm"
+          );
+          return item;
+        });
+      } else {
+        this.$message.error(msg);
+      }
+    },
+
+    async getProjectCate () {
+
+      const url = "/gov/project/projectcategory/categorytaglist";
+
+      const { data, code, msg } = await requestPost(url, {
+        projectId: this.projectIdCopy,
+      });
+
+      if (code === 0) {
+        this.projectCate = data.categoryList;
+        this.projectTag = data.tagList;
+      } else {
+        this.$message.error(msg);
+      }
+    },
+
+    //加载组织数据
+    async getYanPan () {
+      const url = "/data/aggregator/project/projectanalysis";
+
+      const { data, code, msg } = await requestPost(url, {
+        categoryCodeList: this.categoryCodes,
+        userId: this.userId,
+        projectId: this.projectIdCopy
+      });
+
+      if (code === 0) {
+        data.icResiUserId = data.icUserId
+        data.homeUserList.forEach(item => {
+          item.icResiUserId = item.icUserId
+        });
+
+        let array1 = []
+        let array2 = []
+
+        //楼院小组、居民上报都存在是，研判分析显示两个分支
+        if (data.groupProjectList && data.groupProjectList.length > 0 && data.eventProjectList && data.eventProjectList.length > 0) {
+          this.yanPan.hasEvent = true
+          array1 = [...data.groupProjectList]
+          array2 = [...data.eventProjectList]
+        } else {
+          this.yanPan.hasEvent = false
+          if (data.groupProjectList && data.groupProjectList.length > 0) {
+            array1 = [...data.groupProjectList]
+          } else if (data.eventProjectList && data.eventProjectList.length > 0) {
+            array1 = [...data.eventProjectList]
+          } else {
+            array1 = []
+          }
+
+        }
+
+        if (array1.length > 0) {
+          data.singleList = array1.map((item) => {
+            return {
+              categoryCode: item.categoryCode,
+              categoryName: item.categoryName,
+              showItem: true,
+              projectList: item.projectList.map((subItem) => {
+                return {
+                  title: subItem.title,
+                  status: subItem.status,
+                  statusName:
+                    subItem.status == "pending" ? "待处理" : "结案",
+                  projectId: subItem.projectId,
+                };
+              }),
+            };
+          });
+        }
+        if (array2.length > 0) {
+          data.moreList = array2.map((item) => {
+            return {
+              categoryCode: item.categoryCode,
+              categoryName: item.categoryName,
+              showItem: true,
+              projectList: item.projectList.map((subItem) => {
+                return {
+                  title: subItem.title,
+                  status: subItem.status,
+                  statusName:
+                    subItem.status == "pending" ? "待处理" : "结案",
+                  projectId: subItem.projectId,
+                };
+              }),
+            };
+          });
+        }
+
+
+
+        this.yanPan = { ...this.yanPan, ...data };
+        console.log(this.yanPan)
+        this.yanPan.loading = true;
+      } else {
+        this.$message.error(msg);
+      }
+    },
+
+    toUserInfo (item) {
+      this.$router.push({
+        path: `/main-shuju/visual-basicinfo-people/${item.icResiUserId}`,
+      });
+    },
+
+    toProjectInfo (item) {
+      console.log(item);
+      this.projectIdCopy = item.projectId;
+      // let data = iniData();
+      // Object.keys(data).forEach((k) => {
+      //   this[k] = data[k];
+      // });
+      this.getApiData();
+    },
+  },
+};
+</script>
+
+<style
+  lang="scss"
+  src="@/assets/scss/modules/visual/incident-info.scss"
+  scoped
+></style>
diff --git a/src/views/modules/visual/communityGovern/distributionAnalyze.vue b/src/views/modules/visual/communityGovern/distributionAnalyze.vue
new file mode 100644
index 00000000..1ffc5d06
--- /dev/null
+++ b/src/views/modules/visual/communityGovern/distributionAnalyze.vue
@@ -0,0 +1,605 @@
+<template>
+  <cpt-card>
+    <div class="title">
+      <div class="card-title">
+        <img src="@/assets/img/shuju/title-tip.png" />
+        <span>项目分布分析</span>
+      </div>
+      <div class="second-title">
+        <div class="second-title-label">不同事件类别在不同时间段的变化和分布</div>
+        <div class="second-select cascader">
+
+          <el-cascader class="customer_cascader"
+                       ref="myCascader"
+                       v-model="agencyIdArray"
+                       :key="iscascaderShow"
+                       :options="casOptions"
+                       :props="optionProps"
+                       :show-all-levels="false"
+                       @change="handleChangeAgency"></el-cascader>
+        </div>
+        <div class="second-select">
+          <el-date-picker v-model="timeRange"
+                          type="daterange"
+                          range-separator="至"
+                          start-placeholder="开始日期"
+                          end-placeholder="结束日期"
+                          prefix-icon="el-icon-caret-bottom"
+                          value-format="yyyy-MM-dd"
+                          @change="handleSelectChange">
+          </el-date-picker>
+
+        </div>
+      </div>
+
+    </div>
+
+    <div class="g-cpt-resi">
+      <div class="g-l">
+        <screen-echarts-frame class="echart-line"
+                              @myChartMethod="lineInitOk"
+                              ref="lineChart"></screen-echarts-frame>
+        <!-- <div class="table-status"
+             v-if="loading">
+          <screen-loading>加载中</screen-loading>
+        </div>
+        <div class="table-status"
+             v-if="lineList.length == 0 && !loading">
+          <div class="no-data">
+            <img src="../../../../assets/img/modules/visual/noData.png"
+                 class="no-data-img" />
+          </div>
+        </div> -->
+
+      </div>
+      <div class="g-r">
+        <div class="r-map">
+          <screen-map class="map"
+                      ref="map"
+                      :showPolygonLayer="true"></screen-map>
+
+          <div class="r-legend">
+            <div class="legend_item"
+                 v-for="(item,index) in legendArray"
+                 :key="index">
+              <div :class="['color','color'+index]"></div>
+              <span>{{item.name}}</span>
+            </div>
+
+          </div>
+
+        </div>
+
+      </div>
+    </div>
+  </cpt-card>
+</template>
+
+<script>
+import { Loading } from "element-ui"; //引入Loading服务
+import { requestPost } from "@/js/dai/request";
+import cptCard from "@/views/modules/visual/cpts/card";
+import cptTb from "@/views/modules/visual/cpts/tb";
+import screenEchartsFrame from "@/views/modules/visual/components/screen-echarts-frame";
+import screenMap from "@/views/modules/visual/components/screen-map";
+import { lineOption } from './distributionLineOption.js'
+import * as echarts from 'echarts'
+import nextTick from 'dai-js/tools/nextTick'
+import ScreenLoading from "@/views/modules/visual/components/screen-loading";
+
+export default {
+  name: "HomeMap",
+  data () {
+    return {
+      showNoData: false,
+      timer: null,
+
+      casOptions: [],
+      agencyIdArray: [],
+      customerList: [],
+      iscascaderShow: 0,
+
+      optionProps: {
+        multiple: false,
+        value: 'agencyId',
+        label: 'agencyName',
+        children: 'subAgencyList',
+        checkStrictly: true
+      },
+
+      lineChart: '',
+      lineOption: {},
+      lineInitState: false,
+      lineColorArray: [],
+      xaxis: [],
+      series: [],
+      legend: [],
+      lineData: [820, 932, 901, 934, 1290, 1330, 1320],
+      lineList: [
+        //   {
+        //     time: '4:00',
+        //     categoryList: [
+        //       {
+        //         categoryCode: '001',
+        //         count: 100,
+        //         color: '#1B51FF',
+        //         name: '分类1'
+        //       },
+        //       {
+        //         categoryCode: '002',
+        //         count: 200,
+        //         color: '#00E5ED',
+        //         name: '分类2'
+        //       }
+        //     ]
+        //   },
+        //   {
+        //     time: '5:00',
+        //     categoryList: [
+        //       {
+        //         categoryCode: '001',
+        //         count: 20,
+        //         color: '#1B51FF',
+        //         name: '分类1'
+        //       },
+        //       {
+        //         categoryCode: '002',
+        //         count: 400,
+        //         color: '#00E5ED',
+        //         name: '分类2'
+        //       }
+        //     ]
+        //   },
+        //   {
+        //     time: '6:00',
+        //     categoryList: [
+        //       {
+        //         categoryCode: '001',
+        //         count: 50,
+        //         color: '#1B51FF',
+        //         name: '分类1'
+        //       },
+        //       {
+        //         categoryCode: '002',
+        //         count: 10,
+        //         color: '#00E5ED',
+        //         name: '分类2'
+        //       }
+        //     ]
+        //   }
+      ],
+
+      timeRange: [],
+      orgId: '',
+
+      isfirstInit: true,
+      mapList: [
+        {
+          orgId: '3115fc83f1db431008a73c553eef1eb5',
+          count: 169
+        },
+        {
+          orgId: '7e57419e6afcdc910d08124c0a1b4eb9',
+          count: 149
+        },
+        {
+          orgId: 'e56ac695b01d9eed8723bde718071df5',
+          count: 219
+        }
+      ],
+      agencyInfo: {},
+      subAgencyArray: [],
+      colorArray: ['#DD2719', '#EDBE00', '#00E5ED'],
+      colorFillArray: ['rgba(221, 39, 25, 0.24)', 'rgba(237, 190, 0, 0.25)', 'rgba(0, 229, 237, 0.16)'],
+      legendArray: [],
+      under: null,
+      above: null
+
+    };
+  },
+  // mixins: [animate]
+  beforeDestroy () {
+    this.timer && clearInterval(this.timer)
+  },
+
+  async mounted () {
+    this.userId = this.uid;
+    this.initData()
+    await this.getAgencylist()//获取组织级别
+    await nextTick(500)
+    await this.loadOrgData()
+    await this.getApiData();
+
+  },
+
+  methods: {
+    initData () {
+      let yesterday = new Date((new Date).getTime() - 24 * 60 * 60 * 1000)
+
+      let year = yesterday.getFullYear()
+      let month = yesterday.getMonth() + 1 //月
+      let day = yesterday.getDate() //日
+
+      var days = new Date(year, month, 0);
+      days = days.getDate(); //获取当前月的天数
+      var year2 = year;
+      var month2 = parseInt(month) - 1;
+      if (month2 == 0) {
+        year2 = parseInt(year2) - 1;
+        month2 = 12;
+      }
+      var day2 = day;
+      var days2 = new Date(year2, month2, 0);
+      days2 = days2.getDate();
+      if (day2 > days2) {
+        day2 = days2;
+      }
+      if (month2 < 10) {
+        month2 = '0' + month2;
+      }
+      var t2 = year2 + '-' + month2 + '-' + day2;
+      var t1 = year + '-' + month + '-' + day;
+      // let t3 = formate(t2, style);
+
+      this.timeRange = [t2, t1]
+
+    },
+
+    handleSelectChange () {
+      this.getApiData();
+    },
+
+    async getApiData () {
+
+      await this.getLine()
+      await this.loadMapData();
+    },
+
+    // 获取当前登录人员信息及组织信息
+    getAgencylist () {
+      const url = '/gov/org/customeragency/staffinagencylist'
+      let params = {}
+      window.app.ajax.post(
+        url,
+        params,
+        (data, rspMsg) => {
+          this.agencyInfo = data.agencyList
+          this.orgId = this.agencyInfo.agencyId
+          if (!this.agencyInfo.latitude) {
+            this.agencyInfo.latitude = 36.072227
+          }
+          if (!this.agencyInfo.longitude) {
+            this.agencyInfo.longitude = 120.389455
+          }
+          if (!this.agencyInfo.level) {
+            this.agencyInfo.level = 'street'
+          }
+
+          //组织级联数据
+          ++this.iscascaderShow
+          this.casOptions = []
+          this.agencyIdArray.length = []
+
+          if (data.subAgencyList) {
+            data.agencyList.subAgencyList = data.subAgencyList
+            this.casOptions.push(data.agencyList)
+            this.agencyIdArray.push(this.orgId)
+          }
+
+        },
+        (rspMsg, data) => {
+          this.$message.error(rspMsg)
+        }
+      )
+
+    },
+
+    handleChangeDate (value) {
+      this.dateId = value
+      this.getApiData()
+    },
+
+    //加载组织数据
+    async loadOrgData () {
+      const url = "/gov/org/agency/maporg"
+      // const url = "http://yapi.elinkservice.cn/mock/245/gov/org/agency/maporg"
+      let params = {
+        orgId: this.orgId,
+        level: 'agency'
+      }
+
+      const { data, code, msg } = await requestPost(url, params)
+
+      if (code === 0) {
+
+        // this.agencyInfo = data
+        // if (!data.latitude) {
+        //   this.agencyInfo.latitude = 36.072227
+        // }
+        // if (!data.longitude) {
+        //   this.agencyInfo.longitude = 120.389455
+        // }
+        // if (!data.level) {
+        //   this.agencyInfo.level = 'street'
+        // }
+        this.subAgencyArray = []
+        if (data.children && data.children.length > 0) {
+          this.subAgencyArray = data.children
+        } else {
+          this.subAgencyArray = []
+        }
+
+      } else {
+        this.$message.error(msg)
+      }
+
+    },
+
+    async loadMapData () {
+      const _that = this
+      // this.$refs.lineChart.showLoading()
+      const url = "/gov/project/project/projectdistributionanalysisright";
+      // const url = "http://yapi.elinkservice.cn/mock/245/gov/project/project/projectdistributionanalysisright";
+      let params = {
+        orgId: this.orgId,
+        startDate: this.timeRange.length > 0 && this.timeRange[0] || '',
+        endDate: this.timeRange.length > 0 && this.timeRange[1] || ''
+      };
+
+      const { data, code, msg } = await requestPost(url, params);
+
+      if (code === 0) {
+
+        this.legendArray = []
+        if (data.under) {
+          this.under = data.under
+          this.legendArray.push(
+            {
+              color: this.colorArray[0],
+              name: data.under + '以下'
+            }
+          )
+        }
+
+        if (data.above) {
+          this.above = data.above
+          this.legendArray.push(
+            {
+              color: this.colorArray[1],
+              name: data.under + '-' + data.above
+            }
+          )
+          this.legendArray.push(
+            {
+              color: this.colorArray[2],
+              name: data.above + '以上'
+            }
+          )
+        }
+        if (data.list && data.list.length > 0) {
+          this.mapList = data.list
+
+
+        } else {
+          this.mapList = []
+        }
+
+        this.mapList.forEach(item => {
+
+          for (let i = 0; i < this.subAgencyArray.length; i++) {
+            let agencyItem = this.subAgencyArray[i]
+            if (item.orgId === agencyItem.id) {
+              item.longitude = agencyItem.longitude
+              item.latitude = agencyItem.latitude
+              item.coordinates = agencyItem.coordinates
+
+              if (this.under) {
+                if (item.count < this.under || item.count === this.under) {
+                  item.color = this.colorArray[0]
+                  item.fillColor = this.colorFillArray[0]
+                } else {
+                  if (this.above) {
+                    if (item.count > this.under && item.count < this.above) {
+                      item.color = this.colorArray[1]
+                      item.fillColor = this.colorFillArray[1]
+                    } else {
+                      item.color = this.colorArray[2]
+                      item.fillColor = this.colorFillArray[2]
+                    }
+                  }
+                }
+
+
+              }
+              break
+            }
+
+          }
+
+        });
+
+        console.log(this.mapList)
+        this.loadMap()
+        this.isfirstInit = false
+
+      } else {
+        this.$message.error(msg);
+      }
+    },
+
+    loadMap () {
+
+      if (this.isfirstInit) {
+        //mapInfo, polygonArray, polIconUrlArray, iconArrays, iconUrlArray
+        this.$refs.map.loadMap(this.agencyInfo, this.mapList, null, null, null, null,)
+      } else {
+        this.$refs.map.refreshMap(this.mapList, null)
+
+
+      }
+    },
+
+    lineInitOk (dom) {
+      this.lineInitState = true
+
+    },
+    getLine () {
+      if (this.lineInitState) {
+        this.getLineChart()
+      } else {
+        setTimeout(() => {
+          this.getLine()
+        }, 500)
+      }
+    },
+    // 获取折线图
+    async getLineChart () {
+      this.$refs.lineChart.clear()
+      const _that = this
+      this.$refs.lineChart.showLoading()
+      const url = "/gov/project/project/projectdistributionanalysisleft";
+      // const url = "http://yapi.elinkservice.cn/mock/245/gov/project/project/projectdistributionanalysisleft";
+      let params = {
+        orgId: this.orgId,
+        startDate: this.timeRange.length > 0 && this.timeRange[0] || '',
+        endDate: this.timeRange.length > 0 && this.timeRange[1] || ''
+      };
+
+      const { data, code, msg } = await requestPost(url, params);
+      this.$refs.lineChart.hideLoading()
+      if (code === 0) {
+        // 获取pieChart配置
+        this.lineOption = lineOption()
+
+        if (data && data.length > 0) {
+          this.lineList = data
+          this.loadCategoryData()
+
+
+
+          this.$refs.lineChart.setOption(this.lineOption, true)
+          this.$refs.lineChart.setOption({
+            xAxis: { data: this.xaxis },
+            legend: { data: this.legend },
+            series: this.series
+          }, true)
+        } else {
+          this.lineList = []
+        }
+
+
+
+      } else {
+        this.$message.error(msg);
+      }
+
+    },
+
+    //解析折线图数据
+    loadCategoryData () {
+
+      this.xaxis = []
+      this.series = []
+      this.legend = []
+      let num = this.lineList[0].categoryList.length
+
+      let dataArray = new Array(num)
+      //遍历每个分类
+      this.lineList[0].categoryList.forEach((categoryItem, index) => {
+        this.legend.push(categoryItem.categoryName)
+        dataArray[index] = []
+
+      });
+
+
+      //遍历每个时间
+      this.lineList.forEach(item => {
+        this.xaxis.push(item.time)
+
+        //遍历每个分类
+        item.categoryList.forEach((categoryItem, index) => {
+          dataArray[index].push(categoryItem.count)
+        });
+
+      });
+
+      //遍历第一组的分类
+      this.lineList[0].categoryList.forEach((categoryItem, index) => {
+
+        let object = {
+          name: categoryItem.categoryName,
+          type: 'line',
+          smooth: true,
+          barWidth: 15,
+          areaStyle: {},
+          itemStyle: {
+            color: new echarts.graphic.LinearGradient(
+              0, 1, 0, 0,
+              [
+                { offset: 0, color: 'rgba(121, 55, 255, 0)' },
+                { offset: 1, color: categoryItem.color }
+              ]
+            )
+          },
+          data: dataArray[index]
+        }
+
+        this.series.push(object)
+
+
+      });
+
+    },
+
+    handleChangeAgency (value) {
+      this.agencyName = this.$refs["myCascader"].getCheckedNodes()[0].label
+      this.orgId = this.agencyIdArray.length > 0 ? this.agencyIdArray[this.agencyIdArray.length - 1] : ''
+      this.getApiData()
+
+    },
+
+
+    toUserInfo (uid) {
+      this.$router.push({ path: `/main-shuju/visual-basicinfo-people/${uid}` });
+    },
+  },
+  props: {
+    uid: {
+      type: String,
+      default: "",
+      // default: "8ada68cb6f1e4b9a8333348a39ef3aee",
+    },
+  },
+
+  computed: {
+
+  },
+
+  components: {
+    cptCard,
+    cptTb,
+    screenEchartsFrame,
+    screenMap,
+    ScreenLoading
+  },
+
+  watch: {
+    uid (id) {
+      this.userId = id;
+    },
+    userId () {
+      this.getApiData();
+      window.scrollTo(0, 0);
+    },
+  },
+};
+</script>
+
+<style
+  lang="scss"
+  src="@/assets/scss/modules/visual/distributionAnalyze.scss"
+  scoped
+></style>
+
+<style lang=scss scoped>
+</style>
diff --git a/src/views/modules/visual/communityGovern/distributionLineOption.js b/src/views/modules/visual/communityGovern/distributionLineOption.js
new file mode 100644
index 00000000..05df510d
--- /dev/null
+++ b/src/views/modules/visual/communityGovern/distributionLineOption.js
@@ -0,0 +1,105 @@
+import * as echarts from 'echarts'
+export function lineOption () {
+
+  return {
+    tooltip: {
+      trigger: 'axis',
+      axisPointer: {
+        type: 'cross',
+        label: {
+          backgroundColor: '#6a7985'
+        }
+      }
+    },
+    grid: {
+      left: 70,
+      top: 40,
+      right: 50,
+      bottom: 150
+    },
+    legend: {
+      textStyle: {
+        color: '#D2E7FF',
+        fontSize: 16,
+       
+      },
+      itemWidth: 20,
+      itemHeight: 10,
+      //  top: 650,
+      bottom: 0,
+      data: []
+    },
+    xAxis: {
+      type: 'category',
+      // boundaryGap: false,
+      axisLabel: {
+        color: '#8ec7dc',
+        fontSize: 16
+      },
+      axisTick: {
+        show: false
+      },
+      axisLine: {
+        lineStyle: {
+          color: '#0c4b59'
+        }
+      }
+    },
+    yAxis: {
+      nameTextStyle: {
+        color: '#8ec7dc',
+        fontSize: 18
+      },
+      splitNumber: 4,
+      minInterval: 1,
+      show: true,
+      type: 'value',
+      axisLabel: {
+        color: '#8ec7dc',
+        fontSize: 18
+      },
+      axisTick: {
+        show: false
+      },
+      splitLine: {
+        lineStyle: {
+          color: ['#145968'],
+          type: 'dotted'
+        }
+      },
+      axisLine: {
+        show: true,
+        symbol: ['none', 'arrow'],
+        symbolOffset: [0, 15],
+        lineStyle: {
+          color: '#0c4b59'
+        }
+      }
+    },
+    series: [
+      
+      // {
+      //   name: '项目数',
+      //   type: 'line',
+      //   barWidth: 15,
+      //   areaStyle: {},
+      //   itemStyle: {
+      //     color: new echarts.graphic.LinearGradient(
+      //       0, 1, 0, 0,
+      //       [
+      //         { offset: 0, color: 'rgba(121, 55, 255, 0)' },
+      //         { offset: 1, color: '#6339FF' }
+      //       ]
+      //     )
+      //   },
+      //   data: [120, 132, 101, 134, 90, 230, 210]
+      // },
+      // {
+      //   data: [820, 932, 901, 934, 1290, 1330, 1320],
+      //   type: 'line',
+      //   areaStyle: {}
+      // }
+    ]
+
+  }
+}
diff --git a/src/views/modules/visual/communityGovern/processAnalyze.vue b/src/views/modules/visual/communityGovern/processAnalyze.vue
new file mode 100644
index 00000000..73236c98
--- /dev/null
+++ b/src/views/modules/visual/communityGovern/processAnalyze.vue
@@ -0,0 +1,738 @@
+<template>
+  <cpt-card>
+    <div class="title">
+      <img src="@/assets/img/shuju/title-tip.png" />
+      <span>项目处理分析</span>
+
+      <div class="second-title">
+        <div class="second-select cascader">
+          <el-cascader class="customer_cascader"
+                       ref="myCascader"
+                       v-model="agencyIdArray"
+                       :key="iscascaderShow"
+                       :options="casOptions"
+                       :props="optionProps"
+                       :show-all-levels="false"
+                       @change="handleChangeAgency"></el-cascader>
+        </div>
+        <div class="second-select">
+          <el-date-picker v-model="dateIdShow"
+                          type="date"
+                          :clearable="false"
+                          @change="handleChangeDate"
+                          prefix-icon="el-icon-caret-bottom"
+                          placeholder="选择日期"
+                          value-format="yyyy-MM-dd">
+          </el-date-picker>
+        </div>
+      </div>
+
+    </div>
+    <div class="g-cpt-resi">
+      <div class="g-l">
+        <div class="l_top">
+          <div class="g-count">
+            <div class="t_count">项目总数</div>
+            <div class="c_count">{{projectTotal}}</div>
+            <div class="t_yestoday">昨日
+              <span class="c_yestoday">{{dateIncr}}</span>
+            </div>
+            <div class="t_today">上月
+              <span class="c_today">{{monthIncr}}</span>
+            </div>
+          </div>
+          <div v-if="!pieNoData && !dataLoading"
+               class="g-pie">
+            <screen-echarts-frame class="echart-wr"
+                                  @myChartMethod="pieInitOk"
+                                  ref="pieChart"></screen-echarts-frame>
+
+            <div class="pie-legend">
+              <div :class="['legend_item',{'item_last':index===legendArray.length-1}]"
+                   v-for="(item,index) in legendArray"
+                   :key="index">
+                <div class="item_name">{{item.name}}</div>
+                <img :src="item.url" />
+                <div class="item_num">
+                  <span class="item_count">{{item.count}}</span>
+                  <span class="item_percent">{{item.percent}}</span>
+                </div>
+              </div>
+            </div>
+
+          </div>
+          <screen-nodata class="nodata"
+                         v-if="pieNoData&& !dataLoading"></screen-nodata>
+          <div class="table-status"
+               v-if="dataLoading">
+            <screen-loading>加载中</screen-loading>
+          </div>
+
+        </div>
+        <div class="l_bottom">
+          <div class="bottom_label">近12月新增项目数</div>
+          <screen-echarts-frame v-if="!lineNoData&& !dataLoading"
+                                class="echart-line"
+                                @myChartMethod="lineInitOk"
+                                ref="lineChart"></screen-echarts-frame>
+          <screen-nodata class="nodata"
+                         v-if="lineNoData&& !dataLoading"></screen-nodata>
+          <div class="table-status"
+               v-if="dataLoading">
+            <screen-loading>加载中</screen-loading>
+          </div>
+        </div>
+      </div>
+      <div class="g-r">
+        <div class="r-map">
+          <screen-map class="map"
+                      ref="map"
+                      @clickFeature="clickProject"
+                      :showIconLayer="true"></screen-map>
+          <div class="r-status">
+            <div :class="['status', 'status-pending',  {'sel-status':status==='pending'}]"
+                 @click="handleChangeStatus('pending')">未结案</div>
+            <div :class="['status', 'status-closed',  {'sel-status':status==='closed'}]"
+                 @click="handleChangeStatus('closed')">已结案</div>
+
+          </div>
+          <div class="r-legend">
+            <img src="@/assets/img/shuju/weiwanjie.png"
+                 mode="aspectFill" />
+            <span>未结案</span>
+            <img src="@/assets/img/shuju/yiwanjie.png"
+                 mode="aspectFill" />
+            <span>已结案</span>
+
+          </div>
+
+        </div>
+      </div>
+    </div>
+  </cpt-card>
+</template>
+
+<script>
+import { Loading } from "element-ui"; //引入Loading服务
+import { Circle as CircleStyle, Icon, Fill, Stroke, Style, Text } from 'ol/style.js';
+import { requestPost } from "@/js/dai/request";
+import cptCard from "@/views/modules/visual/cpts/card";
+import cptTb from "@/views/modules/visual/cpts/tb";
+import screenEchartsFrame from "@/views/modules/visual/components/screen-echarts-frame";
+import screenMap from "@/views/modules/visual/components/screen-map";
+import ScreenLoading from "@/views/modules/visual/components/screen-loading";
+import ScreenNodata from "@/views/modules/visual/components/screen-nodata";
+
+import { pieOption } from './processPieOption.js'
+import { lineOption } from './processLineOption.js'
+import nextTick from 'dai-js/tools/nextTick'
+
+
+export default {
+  name: "HomeMap",
+  data () {
+    return {
+      dataLoading: true,
+      pieNoData: false,
+      lineNoData: false,
+      isfirstInit: true,//记录地图是否第一次加载
+
+      projectTotal: 0,
+      dateIncr: 0,
+      monthIncr: 0,
+
+      lineChart: '',
+      lineOption: {},
+      lineInitState: false,
+      lineColorArray: [],
+      lineData: [],
+      lineXaxis: [],
+      lineSeriesData: [],
+
+      pieChartS: null,
+      pieChart: '',
+      pieOption: {},
+      pieInitState: false,
+      pieTotal: 0,
+      colorArray: [],
+      pieData: [
+        // { value: 1048, name: '未结案', color: '#FAC126', selected: true },
+        // { value: 735, name: '已结案', color: '#3DDA83' },
+      ],
+
+      legendArray: [
+        {
+          name: '未结案',
+          count: 0,
+          percent: '0%',
+          url: require('../../../../assets/img/shuju/measure/huang@2x.png')
+        },
+        {
+          name: '已结案',
+          count: 0,
+          percent: '0%',
+          url: require('../../../../assets/img/shuju/measure/lv@2x.png')
+        }
+      ],
+
+      dateId: '',
+      dateIdShow: '',
+      agencyId: '',
+      status: 'pending',//状态:待处理 pending，结案closed
+      agencyInfo: {},
+      projectList: [],
+      projectList1: [
+        {
+          agencyId: '',
+          projectId: '',
+          origin: '',
+          status: 'pending',
+          title: '南宁第二网格南宁第二网格',
+          latitude: 36.062227,
+          longitude: 120.389455,
+        },
+        {
+          agencyId: '',
+          projectId: '',
+          origin: '',
+          status: 'closed',
+          latitude: 36.082227,
+          longitude: 120.389455,
+          title: "南宁第二网格",
+        }
+      ],
+
+      iconUrlArray: [],
+      iconTextStyle: {},
+
+      casOptions: [],
+      agencyIdArray: [],
+      customerList: [],
+      iscascaderShow: 0,
+
+      optionProps: {
+        multiple: false,
+        value: 'agencyId',
+        label: 'agencyName',
+        children: 'subAgencyList',
+        checkStrictly: true
+      },
+
+    };
+  },
+  // mixins: [animate]
+  beforeDestroy () {
+
+  },
+  async created () {
+
+  },
+
+  async mounted () {
+    this.dataLoading = true
+    //初始化时间、各组件
+    this.initData()
+    await this.getAgencylist()//获取组织级别
+    //获取服务器数据
+    await this.getProjectTotal()
+    await this.getLineChart()
+    await this.loadProjectlist()
+    this.dataLoading = false
+
+    this.assignData()
+
+  },
+
+  methods: {
+    async getApiData () {
+      await this.getProjectTotal()
+      await this.getLineChart()
+      await this.loadProjectlist()
+
+      this.assignData()
+
+    },
+
+    assignData () {
+      this.getPie()
+      this.getLine()
+    },
+
+    handleChangeDate (value) {
+      this.dateIdShow = value
+      this.getApiData()
+    },
+
+    // 获取当前登录人员信息及组织信息
+    async getAgencylist () {
+      const url = "/gov/org/customeragency/agencygridtree";
+
+      let params = {};
+
+      const { data, code, msg } = await requestPost(url, params);
+      if (code === 0) {
+        this.agencyInfo = data
+        this.agencyId = this.agencyInfo.agencyId
+        if (!this.agencyInfo.latitude) {
+          this.agencyInfo.latitude = 36.072227
+        }
+        if (!this.agencyInfo.longitude) {
+          this.agencyInfo.longitude = 120.389455
+        }
+        if (!this.agencyInfo.level) {
+          this.agencyInfo.level = 'street'
+        }
+
+        //组织级联数据
+        ++this.iscascaderShow
+        this.casOptions = []
+        this.agencyIdArray.length = []
+
+        if (data) {
+          this.casOptions.push(data)
+          this.agencyIdArray.push(this.agencyId)
+        }
+
+      } else {
+        this.$message.error(msg);
+      }
+
+    },
+
+    //加载项目
+    async getProjectTotal () {
+      if (this.$refs.pieChart) {
+        this.$refs.pieChart.showLoading()
+        this.$refs.pieChart.clear()
+      }
+
+      const url = "/data/aggregator/project/projecttotal";
+      // const url = "http://yapi.elinkservice.cn/mock/245/data/aggregator/project/projecttotal";
+      let params = {
+        agencyId: this.agencyId,
+        dateId: this.dateId,
+      };
+
+      const { data, code, msg } = await requestPost(url, params);
+      if (this.$refs.pieChart) {
+        this.$refs.pieChart.hideLoading()
+      }
+      if (code === 0) {
+        this.projectTotal = data.projectTotal
+        this.dateIncr = data.dateIncr
+        this.monthIncr = data.monthIncr
+        this.legendArray = [
+          {
+            name: '未结案',
+            count: data.pendingTotal,
+            percent: data.pendingRatio,
+            url: require('../../../../assets/img/shuju/measure/huang@2x.png')
+          },
+          {
+            name: '已结案',
+            count: data.closedTotal,
+            percent: data.closedRatio,
+            url: require('../../../../assets/img/shuju/measure/lv@2x.png')
+          }
+        ]
+
+        this.pieData = [
+          {
+            name: "未结案",
+            value: data.pendingTotal,
+          },
+          {
+            name: "已结案",
+            value: data.closedTotal,
+          }
+        ]
+
+      } else {
+        this.$message.error(msg);
+      }
+    },
+
+    //加载项目
+    async loadProjectlist () {
+      const url = "/data/aggregator/project/projectstatuslist";
+      // const url = "http://yapi.elinkservice.cn/mock/245/data/aggregator/project/projectstatuslist";
+      let params = {
+        agencyId: this.agencyId,
+        dateId: this.dateId,
+        status: this.status
+      };
+
+      const { data, code, msg } = await requestPost(url, params);
+
+
+      if (code === 0) {
+
+        this.projectList = [...data]
+        // if (this.status === 'closed') {
+        //   this.projectList = this.projectList1
+        // } else {
+        //   this.projectList = this.projectList2
+
+        // }
+        this.projectList.forEach(item => {
+          item.values_ = {
+            name: item.title
+          }
+          if (item.title.length > 10) {
+            item.values_.name = item.title.substring(0, 9) + '...'
+          }
+          if (item.status === 'pending') {
+            item.urlIndex = 0
+          } else {
+            item.urlIndex = 1
+          }
+        });
+
+        this.iconUrlArray = [
+          'https://elink-esua-epdc.oss-cn-qingdao.aliyuncs.com/epmet/test/20211209/0994757e8962405ca1cdf9792bf325e4.png',//未处理
+          'https://elink-esua-epdc.oss-cn-qingdao.aliyuncs.com/epmet/test/20211209/2a80f800b04442448c41a6ed4592cd95.png'//已处理
+        ]
+
+        this.iconTextStyle = {
+          textAlign: undefined,
+          font: "15px Arial",
+          //fontFamily: "Courier New, monospace",
+          // fontWeight: "bold",
+          text: '',
+          backgroundFill: new Fill({
+            color: "#194160",
+          }),
+          backgroundStroke: new Stroke({ color: "#2865FA", width: 2 }),
+          padding: [5, 10, 4, 10],
+          fill: new Fill({ color: "#ffffff" }),
+          // stroke: new Stroke({ color: "#2865FA", width: 3 }),
+          offsetY: -30,
+          offsetX: 50,
+          overflow: true,
+        }
+
+        //第一次加载完置为false
+        this.loadMap()
+
+        this.isfirstInit = false
+
+      } else {
+        this.$message.error(msg);
+      }
+    },
+
+    loadMap () {
+      if (this.isfirstInit) {
+        //mapInfo, polygonArray, polIconUrlArray, iconArrays, iconUrlArray
+        // this.$refs.map.loadMap(this.agencyInfo, null, null, this.projectList, this.iconUrlArray, this.iconTextStyle, 3000)
+        this.$refs.map.loadMap(this.agencyInfo, null, null, this.projectList, this.iconUrlArray, this.iconTextStyle)
+      } else {
+        this.$refs.map.refreshMap(null, this.projectList)
+      }
+    },
+
+    //点击项目
+    clickProject (feature) {
+      console.log('项目信息', feature.values_.properties)
+    },
+
+    pieInitOk (dom) {
+      this.pieChartS = dom
+      this.pieInitState = true
+    },
+    lineInitOk () {
+
+      this.lineInitState = true
+
+    },
+    getLine () {
+      if (this.lineInitState) {
+        this.assignLineChart()
+      } else {
+        setTimeout(() => {
+          this.getLine()
+        }, 500)
+      }
+    },
+    // 获取折线图
+    async getLineChart () {
+      if (this.$refs.lineChart) {
+        this.$refs.lineChart.clear()
+        this.$refs.lineChart.showLoading()
+      }
+      const _that = this
+      // this.$refs.pieChart.showLoading()
+      const url = "/data/aggregator/project/projectmonthincr";
+      // const url = "http://yapi.elinkservice.cn/mock/245/data/aggregator/project/projectmonthincr";
+      let params = {
+        agencyId: this.agencyId,
+        dateId: this.dateId,
+      };
+
+      const { data, code, msg } = await requestPost(url, params);
+
+      if (code === 0) {
+        // 获取pieChart配置
+
+        this.lineXaxis = []
+        this.lineSeriesData = []
+        if (data && data.length > 0) {
+          this.lineNoData = false
+          data.forEach(item => {
+            this.lineXaxis.push(item.type)
+            this.lineSeriesData.push(item.value)
+          });
+          this.lineData = data
+
+        } else {
+          this.lineNoData = true
+        }
+
+        if (this.$refs.lineChart) {
+          this.$refs.lineChart.hideLoading()
+        }
+
+      } else {
+        this.$message.error(msg);
+      }
+
+
+    },
+
+    assignLineChart () {
+
+      this.lineOption = lineOption()
+      this.$refs.lineChart.setOption(this.lineOption, true)
+      this.$refs.lineChart.setOption({
+        xAxis: { data: this.lineXaxis },
+        series: [
+          { data: this.lineSeriesData },
+
+        ]
+      }, true)
+    },
+
+    getPie () {
+      if (this.pieInitState) {
+        this.assignPieChart()
+      } else {
+        setTimeout(() => {
+          this.getPie()
+        }, 500)
+      }
+    },
+    // 获取饼状图
+    async assignPieChart () {
+
+      this.pieTotal = 0
+      let maxIndex = 0
+      let maxValue = this.pieData[0].value
+      const _that = this
+
+      // 获取pieChart配置
+      this.pieOption = pieOption(this.pieChartS)
+
+      this.pieData.forEach((item, index) => {
+        this.pieTotal = this.pieTotal + item.value
+        if (item.value > maxValue) {
+          maxValue = item.value
+          maxIndex = index
+          item.selected = true
+        } else if (index !== 0) {
+          item.selected = false
+        }
+      });
+
+      this.pieOption.title.text = this.pieTotal
+
+      this.clickPie(maxIndex)
+
+      let fun = function (params) {
+        _that.clickPie(params.dataIndex)
+      }
+      this.$refs.pieChart.handleClick(fun)
+
+    },
+
+    clickPie (seriesIndex) {
+      this.pieData.forEach((element, index) => {
+        if (index === seriesIndex) {
+          element.label = {
+            show: true,
+
+          };
+          element.labelLine = {
+            show: true,
+            lineStyle: {
+              opacity: 1,
+            }
+
+          };
+
+        } else {
+          element.label = {
+            show: false,
+
+          };
+          element.labelLine = {
+            show: false,
+            lineStyle: {
+              opacity: 0,
+              color: 'rgba(255,255,255,0)'
+            }
+          };
+        }
+      });
+      this.pieOption.series[1].data = this.pieData
+      // this.$refs.pieChart.hideLoading()
+      this.$refs.pieChart.setOption(this.pieOption)
+    },
+
+    handleChangeStatus (status) {
+      this.status = status
+      this.loadProjectlist()
+    },
+
+    handleChangeAgency (value) {
+
+      this.agencyName = this.$refs["myCascader"].getCheckedNodes()[0].label
+      this.agencyId = this.agencyIdArray.length > 0 ? this.agencyIdArray[this.agencyIdArray.length - 1] : ''
+      this.getApiData()
+      console.log(this.agencyIdArray)
+    },
+
+    //初始化时间
+    initData () {
+      var time = (new Date).getTime() - 24 * 60 * 60 * 1000;
+      var nowdate = new Date(time); // 获取的是前一天日期
+      var y = nowdate.getFullYear();
+      var m = nowdate.getMonth() + 1 < 10 ? "0" + (nowdate.getMonth() + 1) : nowdate.getMonth() + 1;
+      var d = nowdate.getDate() < 10 ? "0" + nowdate.getDate() : nowdate.getDate();
+      this.dateIdShow = y + '-' + m + '-' + d;
+    },
+
+    toUserInfo (uid) {
+      this.$router.push({ path: `/main-shuju/visual-basicinfo-people/${uid}` });
+    },
+  },
+  props: {
+    uid: {
+      type: String,
+      default: "",
+      // default: "8ada68cb6f1e4b9a8333348a39ef3aee",
+    },
+  },
+
+  computed: {},
+
+  components: {
+    cptCard,
+    cptTb,
+    screenEchartsFrame,
+    screenMap,
+    ScreenLoading,
+    ScreenNodata
+  },
+
+  watch: {
+    dateIdShow () {
+
+      let dataArray = this.dateIdShow.split('-')
+      this.dateId = dataArray.join('')
+    },
+    uid (id) {
+      this.userId = id;
+    },
+    userId () {
+      this.getApiData();
+      window.scrollTo(0, 0);
+    },
+  },
+};
+</script>
+
+<style
+  lang="scss"
+  src="@/assets/scss/modules/visual/processAnalyze.scss"
+  scoped
+></style>
+
+<style lang=scss >
+.customer_select {
+  /* 未选中任何选项的时候 placeholder的样式 需要先选中父元素 增加权重 */
+  /deep/ input::-webkit-input-placeholder {
+    color: #fff;
+  }
+  /deep/ input::-moz-input-placeholder {
+    color: #fff;
+  }
+  /deep/ input::-ms-input-placeholder {
+    color: #fff;
+  }
+
+  /* 修改的是el-input的样式 */
+  /* 一种方法是设置最里层el-input__inner的背景色 外层的两级父元素设置为透明色 */
+  /* 另一种方法是从el-select到el-input__inenr的背景色都设置为需要的颜色 */
+  /deep/ .el-select,
+  /deep/ .el-input,
+  /deep/ .el-input__inner {
+    background-color: #08164d00;
+    color: #fff;
+    border: 0px;
+    border-radius: 0px;
+    text-align: left;
+    font-size: 22px;
+    font-family: PingFang SC;
+    font-weight: 800;
+    color: #ffffff;
+    display: flex;
+  }
+
+  /* el-input聚焦的时候 外层的border会有一个样式 */
+  /deep/ .el-select .el-input.is-focus .el-input__inner {
+    border: 0px;
+  }
+
+  /* 修改的是el-input上下的小图标的颜色 */
+  /deep/ .el-select .el-input .el-select__caret::before {
+    color: #fff;
+    content: "";
+    background: url("../../../../assets/img/xiala.png") center center no-repeat;
+    position: absolute;
+    width: 100%;
+    height: 100%;
+    top: 50%;
+    left: 50%;
+    transform: translate(-50%, -50%);
+  }
+
+  /* 修改总体选项的样式 最外层 */
+  /deep/ .el-select-dropdown {
+    background-color: #08164d;
+    margin: 0px;
+    border: 0px;
+    border-radius: 0px;
+  }
+
+  /* 修改选项整体的样式 */
+  /deep/ .el-select-dropdown__list {
+    padding: 6px 0 20px 0;
+  }
+  /* 修改单个的选项的样式 */
+  /deep/ .el-select-dropdown__item {
+    background-color: transparent;
+    color: #fff;
+  }
+
+  /* item选项的hover样式 */
+  /deep/ .el-select-dropdown__item.hover,
+  /deep/ .el-select-dropdown__item:hover {
+    color: #409eff;
+  }
+
+  /* 修改的是下拉框选项内容上方的尖角 */
+  /deep/ .el-popper .popper__arrow,
+  .el-popper .popper__arrow::after {
+    display: none;
+  }
+}
diff --git a/src/views/modules/visual/communityGovern/processLineOption.js b/src/views/modules/visual/communityGovern/processLineOption.js
new file mode 100644
index 00000000..04b4f950
--- /dev/null
+++ b/src/views/modules/visual/communityGovern/processLineOption.js
@@ -0,0 +1,86 @@
+import * as echarts from 'echarts'
+export function lineOption () {
+
+  return {
+    tooltip: {
+      trigger: 'axis',
+      axisPointer: {
+        type: 'cross',
+        label: {
+          backgroundColor: '#6a7985'
+        }
+      }
+    },
+    xAxis: {
+      type: 'category',
+      // boundaryGap: false,
+      axisLabel: {
+        color: '#8ec7dc',
+        fontSize: 16
+      },
+      axisTick: {
+        show: false
+      },
+      axisLine: {
+        lineStyle: {
+          color: '#0c4b59'
+        }
+      }
+    },
+    yAxis: {
+      nameTextStyle: {
+        color: '#8ec7dc',
+        fontSize: 18
+      },
+      splitNumber: 4,
+      minInterval: 1,
+      show: true,
+      type: 'value',
+      axisLabel: {
+        color: '#8ec7dc',
+        fontSize: 18
+      },
+      axisTick: {
+        show: false
+      },
+      splitLine: {
+        lineStyle: {
+          color: ['#145968'],
+          type: 'dotted'
+        }
+      },
+      axisLine: {
+        show: true,
+        symbol: ['none', 'arrow'],
+        symbolOffset: [0, 15],
+        lineStyle: {
+          color: '#0c4b59'
+        }
+      }
+    },
+    series: [
+      {
+        name: '项目数',
+        type: 'line',
+        smooth: true,
+        barWidth: 15,
+        areaStyle: {},
+        itemStyle: {
+          color: new echarts.graphic.LinearGradient(
+            0, 1, 0, 0,
+            [
+              { offset: 0, color: 'rgba(121, 55, 255, 0)' },
+              { offset: 1, color: '#6339FF' }
+            ]
+          )
+        }
+      },
+      // {
+      //   data: [820, 932, 901, 934, 1290, 1330, 1320],
+      //   type: 'line',
+      //   areaStyle: {}
+      // }
+    ]
+
+  }
+}
diff --git a/src/views/modules/visual/communityGovern/processPieOption.js b/src/views/modules/visual/communityGovern/processPieOption.js
new file mode 100644
index 00000000..b86fc0e9
--- /dev/null
+++ b/src/views/modules/visual/communityGovern/processPieOption.js
@@ -0,0 +1,183 @@
+
+export function pieOption (_charts) {
+const center= ['50%', '200px']
+  return {
+    title: {
+      text: '0',
+      top: 170,
+      left: 'center',
+      textStyle: {
+        width: '100%',
+        fontSize: 32,
+        color: '#FFFFFF',
+        fontWeight: 400
+      },
+      itemGap: 5,
+      subtext: '总数',
+      subtextStyle: {
+        fontSize: 20,
+        color: '#fff',
+        fontWeight: 400
+      }
+    },
+    tooltip: {
+      show: false
+    },
+    // legend: {
+      // top: 350,
+      // bottom: 0,
+      // itemWidth: 20,
+      // itemHeight: 10,
+      // textStyle: {
+      //   color: '#D2E7FF',
+      //   fontSize: 16,
+      //   lineHeight: 20,
+      // },
+    
+    // },
+    series: [
+      // 外侧圆环
+      {
+        type: 'pie',
+        // 起始刻度的角度，默认为 90 度，即圆心的正上方。0 度为圆心的正右方。
+        startAngle: 0,
+        hoverAnimation: false,
+        // tooltip: {
+        // },
+        center: center,
+        radius: ['58%', '58.3%'],
+        label: {
+          normal: {
+            show: false
+          }
+        },
+        labelLine: {
+          normal: {
+            show: false
+          }
+        },
+        data: [{
+          value: 360,
+          itemStyle: {
+            normal: {
+              color: 'rgba(40, 101, 250, 0)',
+              width:0,
+              borderColor: 'rgba(40, 101, 250, 0.5)',
+              borderWidth: 1,
+              borderType: 'dotted'
+            }
+          }
+        }
+        ]
+      },
+
+      // 突出的
+      {
+        hoverAnimation: false,
+        // name: 'Access From',
+        type: 'pie',
+        center: center,
+        radius: ['35%', '48%'],
+        avoidLabelOverlap: false,
+        // top: top + '%',
+        // height: '80%',
+        // selectedMode: 'single',
+        left: 'center',
+        width: 400,
+        label: {
+          // show: false,
+          position: 'outside',
+          alignTo: 'edge',
+          // formatter: '{a|{c}}\n\n{name|{b}}',
+          formatter: '{a|{c}}\n{r|}\n{name|{b}}',
+          minMargin: 5,
+          edgeDistance: 1,
+          lineHeight: 15,
+          color: '#fff',
+          fontSize: 12,
+          // distanceToLabelLine: -60,
+          rich: {
+            name: {
+              padding: [0, 6, 0, 6]
+            },
+            a: {
+              fontSize: 30,
+              color: '#fff',
+              padding: [0, 6, 6, 6]
+            },
+            r: {
+              backgroundColor: 'auto',
+              borderRadius: 6,
+              width: 6,
+              height: 6,
+              // padding: [3, 3, 0, -12]
+            }
+          }
+        },
+        labelLine: {
+          show: false,
+          smooth: 0.2,
+          length: 30,
+          length2: 0,
+          maxSurfaceAngle: 80
+        },
+        labelLayout: function (params) {
+          
+          const isLeft = params.labelRect.x < _charts.getWidth() / 2;
+          const points = params.labelLinePoints;
+          // Update the end point.
+          if (points) {
+            points[2][0] = isLeft
+            ? params.labelRect.x
+            : params.labelRect.x + params.labelRect.width;
+          }
+          
+          return {
+            labelLinePoints: points
+          };
+        },
+        itemStyle: {
+           color:function(params) {
+          //自定义颜色
+          var colorList = [ '#FAC126', '#3DDA83'];
+            return colorList[params.dataIndex]
+          }
+        },
+        data: [],
+
+      },
+         // 中间圆环
+         {
+          type: 'pie',
+          // 起始刻度的角度，默认为 90 度，即圆心的正上方。0 度为圆心的正右方。
+          startAngle: 0,
+          hoverAnimation: false,
+          center: center,
+          // tooltip: {
+          // },
+          radius: ['0%', '25%'],
+          label: {
+          
+              show: false
+           
+          },
+          labelLine: {
+           
+              show: false
+          
+          },
+          data: [{
+            value: 360,
+            itemStyle: {
+              normal: {
+                color: 'rgba(8, 37, 134, 1)',
+            
+              }
+            }
+          }
+          ]
+        },
+    ]
+
+  }
+}
diff --git a/src/views/modules/visual/communityGovern/resiPieOption.js b/src/views/modules/visual/communityGovern/resiPieOption.js
new file mode 100644
index 00000000..7d195966
--- /dev/null
+++ b/src/views/modules/visual/communityGovern/resiPieOption.js
@@ -0,0 +1,179 @@
+
+export function pieOption (_charts) {
+const center= ['50%', '250px']
+  return {
+    title: {
+      text: '0',
+      top: 220,
+      left: 'center',
+      textStyle: {
+        width: '100%',
+        fontSize: 32,
+        color: '#FFFFFF',
+        fontWeight: 400
+      },
+      itemGap: 5,
+      subtext: '总数',
+      subtextStyle: {
+        fontSize: 20,
+        color: '#fff',
+        fontWeight: 400
+      }
+    },
+    tooltip: {
+      show: false
+    },
+    legend: {
+      top: 500,
+      bottom: 0,
+      itemWidth: 20,
+      itemHeight: 10,
+      textStyle: {
+        color: '#D2E7FF',
+        fontSize: 16,
+        lineHeight: 20,
+      },
+    
+    },
+    series: [
+      // 外侧圆环
+      {
+        type: 'pie',
+        // 起始刻度的角度，默认为 90 度，即圆心的正上方。0 度为圆心的正右方。
+        startAngle: 0,
+        hoverAnimation: false,
+        // tooltip: {
+        // },
+        center: center,
+        radius: ['55%', '55.3%'],
+        label: {
+          show: false
+        },
+        labelLine: {
+          show: false
+        },
+        data: [{
+          value: 360,
+          itemStyle: {
+            color: 'rgba(40, 101, 250, 0)',
+            width:0,
+            borderColor: 'rgba(40, 101, 250, 0.5)',
+            borderWidth: 1,
+            borderType: 'dotted'
+          }
+        }
+        ]
+      },
+
+      // 突出的
+      {
+        hoverAnimation: false,
+        // name: 'Access From',
+        type: 'pie',
+        center: center,
+        radius: ['40%', '60%'],
+        avoidLabelOverlap: false,
+        // top: top + '%',
+        // height: '80%',
+        selectedMode: 'single',
+        left: 'center',
+        width: 400,
+        label: {
+          // show: false,
+          position: 'outside',
+          alignTo: 'edge',
+          // formatter: '{a|{c}}\n\n{name|{b}}',
+          formatter: '{a|{c}}\n{r|}\n{name|{b}}',
+          minMargin: 5,
+          edgeDistance: -20,
+          lineHeight: 15,
+          color: '#fff',
+          fontSize: 12,
+          // distanceToLabelLine: -60,
+          rich: {
+            name: {
+              padding: [0, 6, 0, 6]
+            },
+            a: {
+              fontSize: 30,
+              color: '#fff',
+              padding: [0, 6, 6, 6]
+            },
+            r: {
+              backgroundColor: 'auto',
+              borderRadius: 6,
+              width: 6,
+              height: 6,
+              // padding: [3, 3, 0, -12]
+            }
+          }
+        },
+        labelLine: {
+          show: false,
+          smooth: 0.2,
+          length: 30,
+          length2: 0,
+          maxSurfaceAngle: 80
+        },
+        labelLayout: function (params) {
+          
+          const isLeft = params.labelRect.x < _charts.getWidth() / 2;
+          const points = params.labelLinePoints;
+          // Update the end point.
+          if (points) {
+            points[2][0] = isLeft
+            ? params.labelRect.x
+            : params.labelRect.x + params.labelRect.width;
+          }
+          
+          return {
+            labelLinePoints: points
+          };
+        },
+        itemStyle: {
+          // color:function(params) {
+          // //自定义颜色
+          // var colorList = [          
+          //       '#00FFFF', '#00FF00', '#FFFF00', '#FF8C00', '#FF0000', '#FE8463',
+          //   ];
+          //   return colorList[params.dataIndex]
+          // }
+        },
+        data: [],
+
+      },
+         // 中间圆环
+         {
+          type: 'pie',
+          // 起始刻度的角度，默认为 90 度，即圆心的正上方。0 度为圆心的正右方。
+          startAngle: 0,
+          hoverAnimation: false,
+          center: center,
+          // tooltip: {
+          // },
+          radius: ['0%', '25%'],
+          label: {
+          
+              show: false
+           
+          },
+          labelLine: {
+           
+              show: false
+          
+          },
+          data: [{
+            value: 360,
+            itemStyle: {
+              normal: {
+                color: 'rgba(8, 37, 134, 1)',
+            
+              }
+            }
+          }
+          ]
+        },
+    ]
+
+  }
+}
diff --git a/src/views/modules/visual/communityGovern/resibuzz.vue b/src/views/modules/visual/communityGovern/resibuzz.vue
new file mode 100644
index 00000000..92d1c819
--- /dev/null
+++ b/src/views/modules/visual/communityGovern/resibuzz.vue
@@ -0,0 +1,520 @@
+<template>
+  <cpt-card>
+    <div class="title">
+      <img src="@/assets/img/shuju/title-tip.png" />
+      <span>居民热议</span>
+
+      <div class="second-select cascader">
+
+        <el-cascader class="customer_cascader"
+                     ref="myCascader"
+                     v-model="agencyIdArray"
+                     :key="iscascaderShow"
+                     :options="casOptions"
+                     :props="optionProps"
+                     :show-all-levels="false"
+                     @change="handleChangeAgency"></el-cascader>
+      </div>
+      <div class="second-select status-select">
+        <el-select v-model="status"
+                   :popper-append-to-body="false"
+                   placeholder="请选择">
+          <el-option v-for="(item,index) in stateArray"
+                     :key="item.value"
+                     :label="item.label"
+                     :value="item.value"
+                     @click.native="handleChangeState(index)">
+          </el-option>
+        </el-select>
+      </div>
+    </div>
+
+    <div class="g-cpt-resi">
+      <div class="g-l">
+        <screen-echarts-frame v-if=" !dataLoading"
+                              class="echart-wr"
+                              @myChartMethod="pieInitOk"
+                              ref="pieChart"></screen-echarts-frame>
+
+        <div class="table-status"
+             v-if="dataLoading">
+          <screen-loading>加载中</screen-loading>
+        </div>
+      </div>
+      <div class="g-r">
+        <div class="m-tb">
+
+          <div class="tb">
+            <cpt-tb :col-list="demand.colList"
+                    :loading="demand.loading"
+                    :header="demand.header"
+                    :list="demand.list"
+                    @operate="toIssueInfo"></cpt-tb>
+
+          </div>
+          <div class="m-pagination">
+            <el-pagination :current-page="demand.pageNo"
+                           :page-size="demand.pageSize"
+                           :total="demand.total"
+                           background
+                           layout="prev, pager, next"
+                           @current-change="handlePageNoChange_demand">
+            </el-pagination>
+          </div>
+        </div>
+
+      </div>
+    </div>
+
+    <issue-info v-if="showIssue"
+                :issueId="issueId"
+                @close="showIssue = false" />
+
+  </cpt-card>
+</template>
+
+<script>
+import { Loading } from "element-ui"; //引入Loading服务
+import { requestPost } from "@/js/dai/request";
+import cptCard from "@/views/modules/visual/cpts/card";
+import cptTb from "@/views/modules/visual/cpts/tb";
+import screenEchartsFrame from "@/views/modules/visual/components/screen-echarts-frame";
+import ScreenLoading from "@/views/modules/visual/components/screen-loading";
+import ScreenNodata from "@/views/modules/visual/components/screen-nodata";
+import { pieOption } from './resiPieOption.js'
+import nextTick from 'dai-js/tools/nextTick'
+import issueInfo from "./cpt/issue-info";
+
+
+export default {
+  name: "HomeMap",
+  data () {
+    return {
+      dataLoading: true,
+
+      pieChartS: null,
+      pieChart: '',
+      pieOption: {},
+      pieInitState: false,
+      pieTotal: 0,
+      colorArray: [],
+      pieData: [
+        // { count: 1048, categoryName: '城市管理', color: '#1B51FF', selected: true },
+        // { count: 735, categoryName: '为民服务', color: '#00E5ED' },
+        // { count: 580, categoryName: '安全监管', color: '#7800FF' },
+        // { count: 484, categoryName: '民政', color: '#16D783' },
+        // { count: 300, categoryName: '环境保护', color: '#FF7800' },
+        // { count: 1048, categoryName: '建设管理', color: '#FFBA00' },
+        // { count: 735, categoryName: '街道吹哨部门报到', color: '#FFD685' },
+        // { count: 1580, categoryName: '社会治安综合', color: '#2A00FF' },
+        // { count: 484, categoryName: '公安交通管理', color: '#C600FF' },
+        // { count: 300, categoryName: '卫生计生监管执法', color: '#FF2A00' },
+        // { count: 484, categoryName: '民生', color: '#3DDA83' },
+        // { count: 300, categoryName: '街道安全', color: '#FAC126' }
+      ],
+      //voting 已转项目：shift_project 已关闭：closed，全部：all
+      stateArray: [
+        {
+          label: '全部',
+          value: 'all'
+        },
+        {
+          label: '表决中',
+          value: 'voting'
+        },
+        {
+          label: '已转项目',
+          value: 'shift_project'
+        },
+        {
+          label: '已关闭',
+          value: 'closed'
+        },
+      ],
+
+      status: 'all',
+      orgId: '',
+      orgTypeSel: '',
+      tableList: [],
+      demand: {
+        loading: true,
+        colList: [
+          {
+            align: "center",
+            width: "5%",
+          },
+          {
+            align: "center",
+            width: "10%",
+          },
+          {
+            align: "center",
+            width: "20%",
+          },
+          {
+            align: "center",
+            width: "10%",
+          },
+          {
+            align: "center",
+            width: "5%",
+          },
+          {
+            align: "center",
+            width: "10%",
+          },
+          {
+            align: "center",
+            width: "10%",
+          },
+          {
+            align: "center",
+            width: "15%",
+          },
+          {
+            align: "center",
+            width: "5%",
+          },
+          {
+            align: "center",
+            width: "5%",
+          },
+          {
+            align: "center",
+            width: "10%",
+          },
+        ],
+        header: ["序号", "议题标题", "处理意见", "分类", "状态", "创建时间", "发起人", "已表态/应表态", "支持", "反对", "操作"],
+        list: [],
+        pageSize: 10,
+        pageNo: 1,
+        total: 0,
+      },
+      showIssue: false,
+      issueId: '',
+
+      casOptions: [],
+      agencyIdArray: [],
+      customerList: [],
+      iscascaderShow: 0,
+
+      optionProps: {
+        multiple: false,
+        value: 'orgLevel',
+        label: 'agencyName',
+        children: 'subAgencyList',
+        checkStrictly: true
+      },
+
+    };
+  },
+  // mixins: [animate]
+  beforeDestroy () {
+
+  },
+
+  async mounted () {
+    this.dataLoading = true
+    await this.getAgencylist()//获取组织级别
+    await this.getApiData()
+
+    this.dataLoading = false
+
+    this.getPie()
+  },
+
+  methods: {
+
+    async getApiData () {
+      await this.getPieChart()
+      await this.getTable();
+    },
+
+    // 获取当前登录人员信息及组织信息
+    async getAgencylist () {
+      const url = "/gov/org/customeragency/agencygridtree";
+      let params = {};
+
+      const { data, code, msg } = await requestPost(url, params);
+      if (code === 0) {
+        this.agencyInfo = data
+        this.orgId = this.agencyInfo.agencyId
+        this.orgType = this.agencyInfo.level === 'grid' ? 'grid' : 'agency'
+
+        if (!this.agencyInfo.latitude) {
+          this.agencyInfo.latitude = 36.072227
+        }
+        if (!this.agencyInfo.longitude) {
+          this.agencyInfo.longitude = 120.389455
+        }
+        if (!this.agencyInfo.level) {
+          this.agencyInfo.level = 'street'
+        }
+
+        //组织级联数据
+        ++this.iscascaderShow
+        this.casOptions = []
+        this.agencyIdArray.length = []
+
+        if (data) {
+          this.casOptions.push(data)
+          this.agencyIdArray.push(this.agencyInfo.orgLevel)
+        }
+
+      } else {
+        this.$message.error(msg);
+      }
+
+
+    },
+    // 获取饼状图
+    async getPieChart () {
+      if (this.$refs.pieChart) {
+        this.$refs.pieChart.clear()
+        this.$refs.pieChart.showLoading()
+      }
+
+      const url = "/gov/issue/issue/resibuzz-leftpiechart";
+      // const url = "http://yapi.elinkservice.cn/mock/245/gov/issue/issue/resibuzz-leftpiechart";
+      let params = {
+        orgId: this.orgId,
+        orgType: this.orgType,
+        status: this.status,
+
+      };
+
+      const { data, code, msg } = await requestPost(url, params);
+
+      if (code === 0) {
+        if (data && data.length > 0) {
+
+          this.pieData = data
+
+        } else {
+          this.pieData = []
+
+        }
+
+        if (this.$refs.pieChart) {
+          this.$refs.pieChart.hideLoading()
+        }
+
+      } else {
+        this.$message.error(msg);
+      }
+
+    },
+
+    pieInitOk (dom) {
+      console.log('pie准备好了', dom)
+      this.pieChartS = dom
+      this.pieInitState = true
+
+    },
+    getPie () {
+      if (this.pieInitState) {
+        this.assignPieChart()
+      } else {
+        setTimeout(() => {
+          this.getPie()
+        }, 500)
+      }
+    },
+
+    clickPie (seriesIndex) {
+      this.pieData.forEach((element, index) => {
+        if (index === seriesIndex) {
+          element.label = {
+            show: true,
+
+          };
+          element.labelLine = {
+            show: true,
+            lineStyle: {
+              opacity: 1,
+            }
+
+          };
+          console.log('zhilma')
+
+        } else {
+          element.label = {
+            show: false,
+
+          };
+          element.labelLine = {
+            show: false,
+            lineStyle: {
+              opacity: 0,
+              color: 'rgba(255,255,255,0)'
+            }
+
+          };
+
+        }
+      });
+      this.pieOption.series[1].data = this.pieData
+
+      this.$refs.pieChart.setOption(this.pieOption)
+
+    },
+
+    assignPieChart () {
+
+      this.pieTotal = 0
+
+      if (this.pieData.length > 0) {
+        this.$refs.pieChart.setNoData(false)
+        const _that = this
+        let maxIndex = 0
+        let maxValue = this.pieData[0].count
+
+        this.pieData[0].selected = true
+
+        this.pieData.forEach((item, index) => {
+          item.name = item.categoryName
+          item.value = item.count
+          this.colorArray.push(item.color)
+          this.pieTotal = this.pieTotal + item.value
+
+          if (item.value > maxValue) {
+            maxValue = item.value
+            maxIndex = index
+            item.selected = true
+          } else if (index !== 0) {
+            item.selected = false
+          }
+
+        });
+        // 获取pieChart配置
+        this.pieOption = pieOption(this.pieChartS)
+        this.pieOption.title.text = this.pieTotal
+        this.pieOption.series[1].itemStyle = {
+          color: function (params) {
+            return _that.colorArray[params.dataIndex]
+          }
+        }
+        this.clickPie(maxIndex)
+
+        let fun = function (params) {
+          _that.clickPie(params.dataIndex)
+        }
+        this.$refs.pieChart.handleClick(fun)
+      } else {
+        this.$refs.pieChart.setNoData(true)
+      }
+
+    },
+
+    async handleChangeState (index) {
+      await this.getApiData()
+      this.assignPieChart()
+
+    },
+
+    async handleChangeAgency (value) {
+      let orgArray = []
+      let key = this.agencyIdArray.length > 0 ? this.agencyIdArray[this.agencyIdArray.length - 1] : ''
+      if (key) {
+        orgArray = key.split('-')
+        this.orgId = orgArray[0]
+        this.orgType = orgArray[1] === 'grid' ? 'grid' : 'agency'
+      } else {
+        this.orgId = ''
+        this.orgType = ''
+      }
+
+      await this.getApiData()
+      this.assignPieChart()
+
+    },
+
+    //加载组织数据
+    async getTable () {
+      const url = "/gov/issue/issue/resibuzz";
+      // const url = "http://yapi.elinkservice.cn/mock/245/gov/issue/issue/resibuzz";
+      let params = {
+        status: this.status,
+        orgId: this.orgId,
+        orgType: this.orgType,
+        pageNo: this.demand.pageNo,
+        pageSize: this.demand.pageSize,
+      };
+
+      const { data, code, msg } = await requestPost(url, params);
+      this.demand.loading = false;
+
+      if (code === 0) {
+        this.demand.total = data.total;
+        this.tableList = data.list
+        this.demand.list = data.list.map((item) => {
+          return [
+            { type: "index" },
+            item.issueTitle ? item.issueTitle : '',
+            item.suggestion ? item.suggestion : '',
+            item.categoryName.join(','),
+            item.status ? item.status : '',
+            item.createdTime ? item.createdTime : '',
+            item.issueOriginator ? item.issueOriginator : '',
+            item.voteAccount ? item.voteAccount : '',
+            item.supportCount ? item.supportCount : 0,
+            item.oppositionCount ? item.oppositionCount : 0,
+            { type: "operate", list: ["查看"] },
+          ];
+        });
+      } else {
+        this.$message.error(msg);
+      }
+    },
+
+    handlePageNoChange_demand (val) {
+      this.demand.pageNo = val;
+      this.getTable();
+    },
+
+    async toIssueInfo (index) {
+      const { tableList } = this;
+      this.issueId = tableList[index].issueId
+      this.showIssue = true
+
+    },
+  },
+  props: {
+    uid: {
+      type: String,
+      default: "",
+      // default: "8ada68cb6f1e4b9a8333348a39ef3aee",
+    },
+  },
+
+  computed: {},
+
+  components: {
+    cptCard,
+    cptTb,
+    screenEchartsFrame,
+    ScreenLoading,
+    ScreenNodata,
+    issueInfo
+  },
+
+  watch: {
+    uid (id) {
+      this.userId = id;
+    },
+    userId () {
+      this.getApiData();
+      window.scrollTo(0, 0);
+    },
+  },
+};
+</script>
+
+<style
+  lang="scss"
+  src="@/assets/scss/modules/visual/resibuzz.scss"
+  scoped
+></style>
+
+<style lang=scss scoped>
+</style>
diff --git a/src/views/modules/visual/communityGovern/typeAnalyze.vue b/src/views/modules/visual/communityGovern/typeAnalyze.vue
new file mode 100644
index 00000000..0c17367a
--- /dev/null
+++ b/src/views/modules/visual/communityGovern/typeAnalyze.vue
@@ -0,0 +1,495 @@
+<template>
+  <cpt-card>
+    <div class="title">
+      <img src="@/assets/img/shuju/title-tip.png" />
+      <span>项目分类分析</span>
+
+      <div class="second-select cascader">
+
+        <el-cascader class="customer_cascader"
+                     ref="myCascader"
+                     v-model="agencyIdArray"
+                     :key="iscascaderShow"
+                     :options="casOptions"
+                     :props="optionProps"
+                     :show-all-levels="false"
+                     @change="handleChangeAgency"></el-cascader>
+      </div>
+      <div class="second-select ">
+
+        <el-date-picker v-model="dateIdShow"
+                        type="date"
+                        :clearable="false"
+                        @change="handleChangeDate"
+                        prefix-icon="el-icon-caret-bottom"
+                        placeholder="选择日期"
+                        value-format="yyyy-MM-dd">
+        </el-date-picker>
+
+      </div>
+    </div>
+
+    <div class="g-cpt-resi">
+      <div class="g-l">
+        <screen-echarts-frame v-if="!dataLoading"
+                              class="echart-wr"
+                              @myChartMethod="pieInitOk"
+                              ref="pieChart"></screen-echarts-frame>
+
+        <div class="table-status"
+             v-if="dataLoading">
+          <screen-loading>加载中</screen-loading>
+        </div>
+      </div>
+      <div class="g-r">
+        <div class="m-tb">
+
+          <div class="tb">
+            <cpt-tb :col-list="demand.colList"
+                    :loading="demand.loading"
+                    :header="demand.header"
+                    :list="demand.list"
+                    @operate="toProjectInfo"></cpt-tb>
+
+          </div>
+
+          <div class="m-pagination">
+            <el-pagination :current-page="demand.pageNo"
+                           :page-size="demand.pageSize"
+                           :total="demand.total"
+                           background
+                           layout="prev, pager, next"
+                           @current-change="handlePageNoChange_demand">
+            </el-pagination>
+          </div>
+
+        </div>
+
+      </div>
+    </div>
+    <project-info v-if="showProject"
+                  :projectId="projectId"
+                  :userId="userId"
+                  :categoryCodes="categoryCodes"
+                  @close="showProject = false" />
+  </cpt-card>
+</template>
+
+<script>
+import { Loading } from "element-ui"; //引入Loading服务
+import { requestPost } from "@/js/dai/request";
+import cptCard from "@/views/modules/visual/cpts/card";
+import cptTb from "@/views/modules/visual/cpts/tb";
+import screenEchartsFrame from "@/views/modules/visual/components/screen-echarts-frame";
+import projectInfo from "./cpt/project-info";
+import ScreenLoading from "@/views/modules/visual/components/screen-loading";
+import { pieOption } from './typePieOption.js'
+import nextTick from 'dai-js/tools/nextTick'
+
+export default {
+  name: "HomeMap",
+  data () {
+    return {
+      dataLoading: true,
+      pieChartS: null,
+      pieChart: '',
+      pieOption: {},
+      pieInitState: false,
+      pieTotal: 0,
+      colorArray: [],
+      pieData: [
+        { total: 1048, categoryName: '城市管理', color: '#1B51FF', selected: true },
+        { total: 735, categoryName: '为民服务', color: '#00E5ED' },
+        { total: 580, categoryName: '安全监管', color: '#7800FF' },
+        { total: 484, categoryName: '民政', color: '#16D783' },
+        { total: 300, categoryName: '环境保护', color: '#FF7800' },
+        { total: 1049, categoryName: '建设管理', color: '#FFBA00' },
+        { total: 735, categoryName: '街道吹哨部门报到', color: '#FFD685' },
+        { total: 580, categoryName: '社会治安综合', color: '#2A00FF' },
+        { total: 484, categoryName: '公安交通管理', color: '#C600FF' },
+        { total: 300, categoryName: '卫生计生监管执法', color: '#FF2A00' },
+        { total: 484, categoryName: '民生', color: '#3DDA83' },
+        { total: 300, categoryName: '街道安全', color: '#FAC126' }
+      ],
+
+      dateIdShow: '',
+      agencyId: '',
+      dateId: '',
+      categoryCode: '',
+      demand: {
+        loading: true,
+        colList: [
+          {
+            align: "center",
+            width: "5%",
+          },
+
+          {
+            align: "center",
+            width: "10%",
+          },
+          {
+            align: "center",
+            width: "10%",
+          },
+          {
+            align: "center",
+            width: "10%",
+          },
+          {
+            align: "center",
+            width: "5%",
+          },
+          {
+            align: "center",
+            width: "30%",
+          },
+          {
+            align: "center",
+            width: "10%",
+          },
+          {
+            align: "center",
+            width: "10%",
+          },
+        ],
+        header: ["序号", "类别", "反映渠道", "所属网格", "状态", "项目标题", "转成项目时间", "操作"],
+        list: [],
+        pageSize: 10,
+        pageNo: 1,
+        total: 0,
+      },
+      tableList: [],
+      showProject: false,
+      userId: '',//话题事件创始人
+      categoryCodes: [],//一级分类Id	
+      projectId: '',
+
+
+      casOptions: [],
+      agencyIdArray: [],
+      customerList: [],
+      iscascaderShow: 0,
+
+      optionProps: {
+        multiple: false,
+        value: 'agencyId',
+        label: 'agencyName',
+        orgType: 'orgType',
+        children: 'subAgencyList',
+        checkStrictly: true
+      },
+
+    };
+  },
+  // mixins: [animate]
+  beforeDestroy () {
+
+  },
+
+  async mounted () {
+    this.dataLoading = true
+    this.initData()
+    await this.getAgencylist()//获取组织级别
+
+    await this.getPieChart()
+    this.dataLoading = false
+    this.getPie()
+  },
+
+  methods: {
+    initData () {
+      var time = (new Date).getTime() - 24 * 60 * 60 * 1000;
+      var nowdate = new Date(time); // 获取的是前一天日期
+      var y = nowdate.getFullYear();
+      var m = nowdate.getMonth() + 1 < 10 ? "0" + (nowdate.getMonth() + 1) : nowdate.getMonth() + 1;
+      var d = nowdate.getDate() < 10 ? "0" + nowdate.getDate() : nowdate.getDate();
+      this.dateIdShow = y + '-' + m + '-' + d;
+
+    },
+
+    // 获取当前登录人员信息及组织信息
+    async getAgencylist () {
+      const url = "/gov/org/customeragency/agencygridtree";
+
+      let params = {};
+
+      const { data, code, msg } = await requestPost(url, params);
+      if (code === 0) {
+        this.agencyInfo = data
+        this.agencyId = this.agencyInfo.agencyId
+        if (!this.agencyInfo.latitude) {
+          this.agencyInfo.latitude = 36.072227
+        }
+        if (!this.agencyInfo.longitude) {
+          this.agencyInfo.longitude = 120.389455
+        }
+        if (!this.agencyInfo.level) {
+          this.agencyInfo.level = 'street'
+        }
+
+        //组织级联数据
+        ++this.iscascaderShow
+        this.casOptions = []
+        this.agencyIdArray.length = []
+
+        if (data) {
+          this.casOptions.push(data)
+          this.agencyIdArray.push(this.agencyId)
+        }
+
+      } else {
+        this.$message.error(msg);
+      }
+
+    },
+
+    async handleChangeDate (value) {
+      this.dateIdShow = value
+      await this.getPieChart()
+      this.getPie()
+    },
+
+
+    pieInitOk (dom) {
+      console.log('pie准备好了', dom)
+      this.pieChartS = dom
+      this.pieInitState = true
+
+    },
+
+    // 获取饼状图
+    async getPieChart () {
+      if (this.$refs.pieChart) {
+        this.$refs.pieChart.showLoading()
+      }
+
+
+      const url = "/data/aggregator/project/projectcategorylist";
+      // const url = "http://yapi.elinkservice.cn/mock/245/data/aggregator/project/projectcategorylist";
+      let params = {
+        agencyId: this.agencyId,
+        dateId: this.dateId,
+      };
+
+      const { data, code, msg } = await requestPost(url, params);
+      // 获取pieChart配置
+
+      if (code === 0) {
+
+        if (data && data.length > 0) {
+          this.pieData = data
+
+        } else {
+          this.pieData = []
+        }
+        if (this.$refs.pieChart) {
+          this.$refs.pieChart.hideLoading()
+        }
+      } else {
+        this.$message.error(msg);
+      }
+
+    },
+    getPie () {
+      if (this.pieInitState) {
+        this.assignPieChart()
+      } else {
+        setTimeout(() => {
+          this.getPie()
+        }, 500)
+      }
+    },
+    assignPieChart () {
+
+      if (this.pieData.length > 0) {
+        this.$refs.pieChart.setNoData(false)
+        this.$refs.pieChart.clear()
+
+        this.pieTotal = 0
+        const _that = this
+        // 获取pieChart配置
+        this.pieOption = pieOption(this.pieChartS)
+        let maxValue = this.pieData[0].total
+        let maxIndex = 0
+        this.pieData[0].selected = true
+        this.pieData.forEach((item, index) => {
+          item.name = item.categoryName
+          item.value = item.total
+          this.colorArray.push(item.color)
+          this.pieTotal = this.pieTotal + item.value
+
+          if (item.value > maxValue) {
+            maxValue = item.value
+            maxIndex = index
+            item.selected = true
+            this.categoryCode = item.categoryCode
+          } else if (index !== 0) {
+            item.selected = false
+          }
+
+        });
+
+        this.pieOption.title.text = this.pieTotal
+        this.pieOption.series[1].itemStyle = {
+          color: function (params) {
+            return _that.colorArray[params.dataIndex]
+          }
+        }
+
+        let fun = function (params) {
+          _that.clickPie(params.dataIndex)
+
+        }
+        this.$refs.pieChart.handleClick(fun)
+        this.clickPie(maxIndex)
+      } else {
+        this.$refs.pieChart.setNoData(true)
+      }
+    },
+
+    async clickPie (seriesIndex) {
+      this.pieData.forEach((element, index) => {
+        if (index === seriesIndex) {
+          element.label = {
+            show: true,
+
+          };
+          element.labelLine = {
+            show: true,
+            lineStyle: {
+              opacity: 1,
+            }
+
+          };
+          console.log('zhilma')
+
+        } else {
+          element.label = {
+            show: false,
+
+          };
+          element.labelLine = {
+            show: false,
+            lineStyle: {
+              opacity: 0,
+              color: 'rgba(255,255,255,0)'
+            }
+
+          };
+
+        }
+      });
+      this.pieOption.series[1].data = this.pieData
+      // this.$refs.pieChart.hideLoading()
+      this.$refs.pieChart.setOption(this.pieOption)
+
+      this.categoryCode = this.pieData[seriesIndex].categoryCode
+      this.getTable()
+    },
+
+    async handleChangeAgency (value) {
+
+      this.agencyName = this.$refs["myCascader"].getCheckedNodes()[0].label
+      this.agencyId = this.agencyIdArray.length > 0 ? this.agencyIdArray[this.agencyIdArray.length - 1] : ''
+      await this.getPieChart()
+      this.getPie()
+      console.log(this.agencyIdArray)
+    },
+
+    //加载组织数据
+    async getTable () {
+      const url = "/data/aggregator/project/categoryprojectlist";
+      // const url = "http://yapi.elinkservice.cn/mock/245/data/aggregator/project/categoryprojectlist";
+      let params = {
+        dateId: this.dateId,
+        agencyId: this.agencyId,
+        categoryCode: this.categoryCode,
+        pageNo: this.demand.pageNo,
+        pageSize: this.demand.pageSize,
+        isPage: true
+      };
+
+      const { data, code, msg } = await requestPost(url, params);
+      this.demand.loading = false;
+
+      if (code === 0) {
+        this.demand.total = data.total;
+        this.tableList = data.list
+        if (data.list && data.list.length > 0) {
+          this.demand.list = data.list.map((item) => {
+            //楼院小组:issue； 项目立项:agency 事件上报:resi_event【也可控制点击查看时里边三个按钮的显示】	
+            item.originShow = item.origin === 'issue' ? '楼院小组' : item.origin === 'agency' ? '项目立项' : '事件上报'
+            //状态:待处理 pending，已结案closed	
+            item.statusShow = item.status === 'pending' ? '待处理' : '已结案'
+            return [
+              { type: "index" },
+              // item.projectCode ? item.projectCode : '',
+              item.categoryNames.join(','),
+              item.originShow ? item.originShow : '',
+              item.gridName ? item.gridName : '',
+              item.statusShow ? item.statusShow : '',
+              item.title ? item.title : '',
+              item.time ? item.time : '',
+              { type: "operate", list: ["查看"] },
+            ];
+          });
+        } else {
+          this.demand.list = []
+        }
+
+      } else {
+        this.$message.error(msg);
+      }
+    },
+
+    handlePageNoChange_demand (val) {
+      this.demand.pageNo = val;
+      this.getTable();
+    },
+    async toProjectInfo (index) {
+      const { tableList } = this;
+      this.projectId = tableList[index].projectId
+      this.userId = tableList[index].userId
+      this.categoryCodes = tableList[index].categoryCodes
+
+      this.showProject = true
+
+    },
+  },
+  props: {
+    uid: {
+      type: String,
+      default: "",
+      // default: "8ada68cb6f1e4b9a8333348a39ef3aee",
+    },
+  },
+
+  computed: {},
+
+  components: {
+    cptCard,
+    cptTb,
+    screenEchartsFrame,
+    projectInfo,
+    ScreenLoading,
+  },
+
+  watch: {
+    dateIdShow () {
+      let dataArray = this.dateIdShow.split('-')
+      this.dateId = dataArray.join('')
+    },
+
+  },
+};
+</script>
+
+<style
+  lang="scss"
+  src="@/assets/scss/modules/visual/typeAnalyze.scss"
+  scoped
+></style>
+
+<style lang=scss scoped>
+</style>
diff --git a/src/views/modules/visual/communityGovern/typePieOption.js b/src/views/modules/visual/communityGovern/typePieOption.js
new file mode 100644
index 00000000..64b6ad98
--- /dev/null
+++ b/src/views/modules/visual/communityGovern/typePieOption.js
@@ -0,0 +1,179 @@
+
+export function pieOption (_charts) {
+const center= ['50%', '250px']
+  return {
+    title: {
+      text: '0',
+      top: 220,
+      left: 'center',
+      textStyle: {
+        width: '100%',
+        fontSize: 32,
+        color: '#FFFFFF',
+        fontWeight: 400
+      },
+      itemGap: 5,
+      subtext: '总数',
+      subtextStyle: {
+        fontSize: 20,
+        color: '#fff',
+        fontWeight: 400
+      }
+    },
+    tooltip: {
+      show: false
+    },
+    legend: {
+      top: 500,
+      bottom: 0,
+      itemWidth: 20,
+      itemHeight: 10,
+      textStyle: {
+        color: '#D2E7FF',
+        fontSize: 16,
+        lineHeight: 20,
+      },
+    
+    },
+    series: [
+      // 外侧圆环
+      {
+        type: 'pie',
+        // 起始刻度的角度，默认为 90 度，即圆心的正上方。0 度为圆心的正右方。
+        startAngle: 0,
+        hoverAnimation: false,
+        // tooltip: {
+        // },
+        center: center,
+        radius: ['55%', '55.3%'],
+        label: {
+          show: false
+        },
+        labelLine: {
+          show: false
+        },
+        data: [{
+          value: 360,
+          itemStyle: {
+            color: 'rgba(40, 101, 250, 0)',
+            width:0,
+            borderColor: 'rgba(40, 101, 250, 0.5)',
+            borderWidth: 1,
+            borderType: 'dotted'
+          }
+        }
+        ]
+      },
+
+      // 突出的
+      {
+        hoverAnimation: false,
+        // name: 'Access From',
+        type: 'pie',
+        center: center,
+        radius: ['40%', '60%'],
+        avoidLabelOverlap: false,
+        // top: top + '%',
+        // height: '80%',
+        selectedMode: 'single',
+        left: 'center',
+        width: 400,
+        label: {
+          // show: false,
+          position: 'outside',
+          alignTo: 'edge',
+          // formatter: '{a|{c}}\n\n{name|{b}}',
+          formatter: '{a|{c}}\n{r|}\n{name|{b}}',
+          minMargin: 5,
+          edgeDistance: 1,
+          lineHeight: 15,
+          color: '#fff',
+          fontSize: 12,
+          // distanceToLabelLine: -60,
+          rich: {
+            name: {
+              padding: [0, 6, 0, 6]
+            },
+            a: {
+              fontSize: 30,
+              color: '#fff',
+              padding: [0, 6, 6, 6]
+            },
+            r: {
+              backgroundColor: 'auto',
+              borderRadius: 6,
+              width: 6,
+              height: 6,
+              // padding: [3, 3, 0, -12]
+            }
+          }
+        },
+        labelLine: {
+          show: false,
+          smooth: 0.2,
+          length: 30,
+          length2: 0,
+          maxSurfaceAngle: 80
+        },
+        labelLayout: function (params) {
+          
+          const isLeft = params.labelRect.x < _charts.getWidth() / 2;
+          const points = params.labelLinePoints;
+          // Update the end point.
+          if (points) {
+            points[2][0] = isLeft
+            ? params.labelRect.x
+            : params.labelRect.x + params.labelRect.width;
+          }
+          
+          return {
+            labelLinePoints: points
+          };
+        },
+        itemStyle: {
+          // color:function(params) {
+          // //自定义颜色
+          // var colorList = [          
+          //       '#00FFFF', '#00FF00', '#FFFF00', '#FF8C00', '#FF0000', '#FE8463',
+          //   ];
+          //   return colorList[params.dataIndex]
+          // }
+        },
+        data: [],
+
+      },
+         // 中间圆环
+         {
+          type: 'pie',
+          // 起始刻度的角度，默认为 90 度，即圆心的正上方。0 度为圆心的正右方。
+          startAngle: 0,
+          hoverAnimation: false,
+          center: center,
+          // tooltip: {
+          // },
+          radius: ['0%', '25%'],
+          label: {
+          
+              show: false
+           
+          },
+          labelLine: {
+           
+              show: false
+          
+          },
+          data: [{
+            value: 360,
+            itemStyle: {
+              normal: {
+                color: 'rgba(8, 37, 134, 1)',
+            
+              }
+            }
+          }
+          ]
+        },
+    ]
+
+  }
+}
diff --git a/src/views/modules/visual/communityParty/community.vue b/src/views/modules/visual/communityParty/community.vue
new file mode 100644
index 00000000..0c2833d5
--- /dev/null
+++ b/src/views/modules/visual/communityParty/community.vue
@@ -0,0 +1,847 @@
+<template>
+  <div class="warning-box">
+    <cpt-card class="card-wr">
+      <div class="card-title">
+        <img class="title-icon"
+             src="../../../../assets/img/shuju/title-tip.png" />
+        <div class="title-label">
+          区域化党建
+          <el-cascader 
+            v-model="selectAgency"
+            :options="propTree" 
+            :props="{ checkStrictly: true }" 
+            :show-all-levels="false"
+            clearable 
+            @change="handleCascader">
+          </el-cascader>
+        </div>
+      </div>
+      <div class="second-title">
+        <div class="second-title-label">党建单位分类统计</div>
+        <div class="second-select">
+          <el-select v-model="serviceMatter"
+                     placeholder="请选择"
+                     @change="handleSelectChange"
+                     @clear="handleSelectChange">
+            <el-option v-for="item in unitList"
+                       :key="item.value"
+                       :label="item.label"
+                       :value="item.value">
+            </el-option>
+          </el-select>
+        </div>
+        <div class="second-select">
+          <el-date-picker v-model="timeRange"
+                          type="daterange"
+                          range-separator="至"
+                          start-placeholder="开始日期"
+                          end-placeholder="结束日期"
+                          prefix-icon="el-icon-caret-bottom"
+                          value-format="yyyy-MM-dd HH:mm:ss"
+                          :clearable="false"
+                          :default-time="['00:00:00', '23:59:59']"
+                          >
+          </el-date-picker>
+        </div>
+      </div>
+      <div class="box-wr box-wr-400">
+        <div class="box-left">
+          <div v-for="(item, index) in cateInfo" :key="index" class="box-left-item">
+            <div class="box-label">{{ item.label }}</div>
+            <div class="box-num">{{ item.value }}</div>
+          </div>
+          <!-- <div class="box-left-item">
+            <div class="box-label">组织活动</div>
+            <div class="box-num">1233</div>
+          </div> -->
+        </div>
+        <div class="box-right">
+          <div class="warning-box-bottom">
+            <screen-table :headerList="headerList"
+                          :tableData="tableData"
+                          :visibleLoading="visibleLoading"
+                          :operate="true"
+                          @look="handleLook"></screen-table>
+            <div class="pagination">
+              <el-pagination :current-page="pageNo"
+                             :page-size="pageSize"
+                             background
+                             layout="prev, pager, next"
+                             @size-change="pageSizeChangeHandleNew"
+                             @current-change="pageCurrentChangeHandleNew"
+                             :total="total">
+              </el-pagination>
+            </div>
+          </div>
+        </div>
+      </div>
+      <div class="second-title">
+        <div class="second-title-label">党建单位分布</div>
+      </div>
+
+      <div class="box-wr">
+        <div class="box-left box-left-w400">
+          <div v-for="(item, index) in partyItem"
+               :key="index"
+               class="box-left-item">
+            <div class="box-label">{{ item.label }}</div>
+            <div class="box-num"
+                 :style="'color:' + item.color">{{ item.value }}</div>
+          </div>
+
+        </div>
+        <div class="box-right">
+          <div class="box-map">
+            <screen-map class="map"
+                        ref="map"
+                        @clickFeature="clickProject"
+                        :showIconLayer="true"></screen-map>
+          </div>
+          <div class="map-tips">
+            <div v-for="(item, index) in partyItem"
+                 :key="index"
+                 class="map-tips-item">
+              <div class="map-tips-icon">
+                <img :src="item.icon" />
+              </div>
+              <div class="map-tips-label">{{ item.label }}</div>
+            </div>
+          </div>
+        </div>
+      </div>
+
+    </cpt-card>
+    <dialog-info v-show="showedMoreInfo" :info="detailInfo"
+                 @close="showedMoreInfo = false" />
+  </div>
+</template>
+
+<script>
+import { requestPost } from "@/js/dai/request";
+import screenTable from "../components/screen-table/index";
+import cptCard from "@/views/modules/visual/cpts/card";
+import nextTick from "dai-js/tools/nextTick";
+import dialogInfo from './dialogInfo.vue'
+import screenMap from "@/views/modules/visual/components/screen-map";
+
+export default {
+  name: "warning-box",
+  components: {
+    cptCard,
+    screenTable,
+    dialogInfo,
+    screenMap
+  },
+  data () {
+    return {
+
+      showedMoreInfo: false,
+      tableLoading: false,
+      warningList: [],
+      headerList: [
+        { title: "序号", coulmn: 'index' },
+        { title: "区域化党建单位名称", coulmn: 'unitName' },
+        { title: "活动标题", coulmn: 'title' },
+        { title: "活动地址", coulmn: 'address' },
+        { title: "服务事项", coulmn: 'serviceMatterName' },
+        { title: "服务人数", coulmn: 'peopleCount' },
+        { title: "活动时间", coulmn: 'activityTime' }
+      ],
+      tableData: [
+        // [1,'商丘路社区第一网格','商丘路小区','2号楼','杨颖、王平、刘佳敏、丁辉、杨萍'],
+      ],
+      detailId: '',
+      agencyId: '',
+      value2: '',
+      timeRange: '',
+      visibleLoading: true,
+      serviceMatter: 'all',
+      pageNo: 1,
+      pageSize: 10,
+      total: 0,
+      activeIndex: 0,
+      activeLevel: "1",
+      selectAgency: '',
+      unitList: [],
+      propTree: [],
+      partyItem: [
+        {
+          name: '楼宇党建',
+          value: 1,
+          color: 'rgba(250, 32, 10, 1)',
+          icon: require('../../../../assets/img/shuju/measure/ly@2x.png')
+        }, {
+          name: '机关直属部门',
+          value: 2,
+          color: 'rgba(65, 181, 104, 1)',
+          icon: require('../../../../assets/img/shuju/measure/jgzs@2x.png')
+        }, {
+          name: '两新党建',
+          value: 3,
+          color: 'rgba(251, 177, 4, 1)',
+          icon: require('../../../../assets/img/shuju/measure/lxdj@2x.png')
+        }, {
+          name: '辖区单位',
+          value: 4,
+          color: 'rgba(80, 194, 237, 1)',
+          icon: require('../../../../assets/img/shuju/measure/xq@2x.png')
+        }, {
+          name: '其他',
+          value: 5,
+          color: 'rgba(192, 21, 195, 1)',
+          icon: require('../../../../assets/img/shuju/measure/qita.png')
+        }
+      ],
+      cateInfo: [],
+      //地图相关数据
+      isfirstInit: true,//记录是否是首次加载地图
+      agencyInfo: {},//登陆者的组织信息：主要为了获取地图中心点和level
+      unitMapList: [],
+      unitMapList1: [
+        {
+          type: '党建楼宇',
+          name: '建联单位1',
+          latitude: 36.062227,
+          longitude: 120.389455,
+        },
+        {
+          type: '党建楼宇',
+          name: '建联单位2',
+          latitude: 36.082227,
+          longitude: 120.389455,
+        },
+        {
+          type: '机关直属部门',
+          name: '建联单位3',
+          latitude: 36.062227,
+          longitude: 120.379455,
+        },
+        {
+          type: '两新党建',
+          name: '建联单位4',
+          latitude: 36.082227,
+          longitude: 120.379455,
+        },
+        {
+          type: '辖区单位',
+          name: '建联单位5',
+          latitude: 36.092227,
+          longitude: 120.379455,
+        },
+        {
+          type: '其他',
+          name: '建联单位6',
+          latitude: 36.102227,
+          longitude: 120.379455,
+        }
+      ],
+      detailInfo: {}
+    };
+  },
+  async mounted () {
+    const { user } = this.$store.state
+    this.agencyId = user.agencyId
+    console.log('agencyId-------', this.agencyId)
+    this.initTime()
+    await nextTick(100);
+    await this.getAgencyList()
+    this.loadUnit()
+    this.getList(this.agencyId)
+    this.getCateCount(this.agencyId)
+    this.getCateType(this.agencyId)
+    
+    await this.getWorkUserInfo()
+    await this.getMapUnitList(this.agencyId)
+  },
+  watch: {
+    timeRange(val) {
+      console.log('val-www', val)
+      this.getList(this.agencyId);
+    }
+  },
+  methods: {
+
+    //具体人员列表
+    async getList (agencyId) {
+      this.visibleLoading = true
+
+      const url = "/heart/icpartyactivity/activitylist"
+      // const url = "http://yapi.elinkservice.cn/mock/245/heart/icpartyactivity/list"
+      let params = {
+        agencyId,
+        pageSize: this.pageSize,
+        pageNo: this.pageNo,
+        serviceMatter: this.serviceMatter == 'all' ? '' : this.serviceMatter,
+        startTime: this.timeRange && this.timeRange[0] || '',
+        endTime: this.timeRange && this.timeRange[1] || ''
+      }
+
+      const { data, code, msg } = await requestPost(url, params)
+
+      if (code === 0) {
+        this.total = data.total
+        this.tableData = data.list.map((item, index) => {
+          return {
+            ...item,
+            index: index + 1
+          }
+        })
+      } else {
+        this.$message.error(msg)
+      }
+      this.visibleLoading = false
+    },
+    async getAgencyList() {
+      // const url = "/gov/org/customeragency/staffinagencylist";
+      // const url = '/gov/org/customeragency/agencygridtree'
+      const url = '/gov/org/customeragency/staffinagencylist'
+      // let params = {
+      //   agencyId: this.$store.state.user.agencyId,
+      // };
+      const { data, code, msg } = await requestPost(url);
+      if (code === 0) {
+        console.log('data-org----o', data)
+        let { agencyList, subAgencyList } = data
+        this.selectAgency = [`${agencyList.agencyId}-${agencyList.level}`]
+        let arr = []
+        agencyList.subAgencyList = subAgencyList
+        arr.push(agencyList)
+        this.propTree = arr && this.getTreeData(arr)
+
+      } else {
+        this.$message.error(msg)
+      }
+    },
+    getTreeData(data){
+      if (!Array.isArray(data)) return []
+      let arr = data.map(item => {
+        let _item = {}
+        if (item.subAgencyList) {
+          if (item.subAgencyList.length === 0) {
+            _item = { 
+              label: item.agencyName,
+              value: item.agencyId + '-' + item.level,
+              level: item.level,
+              children: undefined 
+            }
+          } else _item = { 
+            label: item.agencyName,
+            value: item.agencyId + '-' + item.level,
+            level: item.level,
+            children: this.getTreeData(item.subAgencyList)}
+        } else {
+          _item = { 
+            label: item.agencyName,
+            value: item.agencyId + '-' + item.level,
+            level: item.level,
+          }
+        }
+        return _item
+      })
+      return arr
+    },
+    async getCateCount (agencyId) {
+
+      const url = "/heart/icpartyactivity/statistics"
+      // const url = "http://yapi.elinkservice.cn/mock/245/heart/icpartyactivity/list"
+      let params = {
+        agencyId
+      }
+
+      const { data, code, msg } = await requestPost(url, params)
+
+      if (code === 0) {
+        this.cateInfo = data
+      } else {
+        this.$message.error(msg)
+      }
+    },
+    async getCateType (agencyId) {
+
+      const url = "/heart/icpartyunit/typestatistics"
+      // const url = "http://yapi.elinkservice.cn/mock/245/heart/icpartyactivity/list"
+      let params = {
+        agencyId
+      }
+
+      const { data, code, msg } = await requestPost(url, params)
+
+      if (code === 0) {
+        // this.cateInfo = data
+        const colorItem = {
+          0: {
+            color: 'rgba(250, 32, 10, 1)',
+            icon: require('../../../../assets/img/shuju/measure/ly@2x.png')
+          },
+          1: {
+            color: 'rgba(251, 177, 4, 1)',
+            icon: require('../../../../assets/img/shuju/measure/lxdj@2x.png')
+          },
+          2: {
+            color: 'rgba(80, 194, 237, 1)',
+            icon: require('../../../../assets/img/shuju/measure/xq@2x.png')
+          },
+          3: {
+            color: 'rgba(65, 181, 104, 1)',
+            icon: require('../../../../assets/img/shuju/measure/jgzs@2x.png')
+          },
+          4: {
+            color: 'rgba(192, 21, 195, 1)',
+            icon: require('../../../../assets/img/shuju/measure/qita.png')
+          }
+        }
+        this.partyItem = data.map((item, index) => {
+          return {
+            ...item,
+            ...colorItem[index]
+          }
+        })
+      } else {
+        this.$message.error(msg)
+      }
+    },
+    async getDetail (id) {
+
+      const url = "/heart/icpartyactivity/detail"
+      let params = {
+        id: id
+      }
+
+      const { data, code, msg } = await requestPost(url, params)
+
+      if (code === 0) {
+        this.detailInfo = data
+      } else {
+        this.$message.error(msg)
+      }
+    },
+    handleCascader(val) {
+      console.log('val-vvv', val)
+      if (val.length > 0) {
+        const _arr = val[val.length - 1].split('-')
+        const orgType = _arr[1] !== 'grid' ? 'agency': 'grid'
+        this.getList(_arr[0])
+        this.getMapUnitList(_arr[0])
+        this.getCateCount(_arr[0])
+        this.getCateType(_arr[0])
+      }
+      
+    },
+    initTime() {
+      const end = new Date();
+      const start = new Date();
+      start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
+      console.log('time-rtt', this.timeFormat(start), this.timeFormat(end))
+      this.timeRange = [this.timeFormat(start), this.timeFormat(end)]
+    },
+    timeFormat(date) {
+      if (!date || typeof date === 'string') {
+        return false
+      }
+      var y = date.getFullYear() //年
+      var m = date.getMonth() + 1 //月
+      if (m < 10) m = '0' + m
+      var d = date.getDate() //日
+      if (d < 10) d = '0' + d
+
+      return y + '-' + m + '-' + d + ' 00:00:00'
+    },
+    async loadUnit () {
+      const url = "/heart/icresidemanddict/subcodelist"
+      // const url = "http://yapi.elinkservice.cn/mock/245/heart/icpartyunit/option"
+
+      let params = {
+        parentCategoryCode: '1010'
+      }
+
+      const { data, code, msg } = await requestPost(url, params)
+
+      if (code === 0) {
+        this.unitList = data
+        this.unitList.unshift({
+          label: '全部',
+          value: 'all'
+        })
+      } else {
+        this.$message.error(msg)
+      }
+
+    },
+
+    // 获取当前管理员信息
+    getWorkUserInfo () {
+      const url = '/epmetuser/customerstaff/staffbasicinfo'
+      let params = {}
+      window.app.ajax.post(
+        url,
+        params,
+        (data, rspMsg) => {
+          this.agencyInfo = data
+          if (!data.latitude) {
+            this.agencyInfo.latitude = 36.072227
+          }
+          if (!data.longitude) {
+            this.agencyInfo.longitude = 120.389455
+          }
+          if (!data.level) {
+            this.agencyInfo.level = 'street'
+          }
+
+        },
+        (rspMsg, data) => {
+          this.$message.error(rspMsg)
+        }
+      )
+
+    },
+
+    //  //获取分类
+    // async loadType () {
+    //   const url = "/sys/dict/data/dictlist"
+
+    //   let params = {
+    //     dictType: 'party_unit_type'
+    //   }
+
+    //   const { data, code, msg } = await requestPost(url, params)
+
+    //   if (code === 0) {
+    //     this.typeList = data
+
+    //   } else {
+    //     this.$message.error(msg)
+    //   }
+
+    // },
+
+    //获取联建单位分布图
+    async getMapUnitList (agencyId) {
+      const url = "/heart/icpartyunit/distribution"
+      // const url = "http://yapi.elinkservice.cn/mock/245/heart/icpartyunit/distribution"
+
+      let params = {
+        agencyId
+      }
+
+      const { data, code, msg } = await requestPost(url, params)
+
+      if (code === 0) {
+        console.log('unitMapList----data', data)
+        this.unitMapList = data.map((item, index) => {
+          return {
+            ...item,
+            urlIndex: index
+          }
+        })
+        // this.unitMapList = this.unitMapList1
+        console.log('unitMapList----', this.unitMapList)
+        this.unitMapList.forEach(item => {
+
+          if (item.type === '楼宇党建') {
+            item.urlIndex = 0
+          } else if (item.type === '两新组织') {
+            item.urlIndex = 1
+          } else if (item.type === '区域单位党建') {
+            item.urlIndex = 2
+          } else if (item.type === '机关直属部门') {
+            item.urlIndex = 3
+          } else if (item.type === '其他') {
+            item.urlIndex = 4
+          }
+        });
+
+
+        this.iconUrlArray = [
+          require('../../../../assets/img/shuju/measure/ly@2x.png'),//未处理
+          require('../../../../assets/img/shuju/measure/jgzs@2x.png'),//已处理
+          require('../../../../assets/img/shuju/measure/lxdj@2x.png'),//已处理
+          require('../../../../assets/img/shuju/measure/xq@2x.png'),//已处理
+          require('../../../../assets/img/shuju/measure/qita.png')//已处理
+        ]
+
+
+        //第一次加载完置为false
+        this.loadMap()
+
+        this.isfirstInit = false
+
+      } else {
+        this.$message.error(msg)
+      }
+
+    },
+
+
+    //加载地图数据
+    loadMap () {
+      if (this.isfirstInit) {
+        //mapInfo, polygonArray, polIconUrlArray, iconArrays, iconUrlArray
+        this.$refs.map.loadMap(this.agencyInfo, null, null, this.unitMapList, this.iconUrlArray, null)
+      } else {
+        this.$refs.map.refreshMap(null, this.unitMapList)
+
+      }
+    },
+
+    //点击项目
+    clickProject (feature) {
+      console.log('标注信息', feature.values_.properties)
+    },
+    async handleLook(val) {
+      
+      this.detailId = val.id
+      await this.getDetail(val.id)
+      this.showedMoreInfo = true
+    },
+
+    handleSelectChange (val) {
+      this.getList();
+    },
+    pageSizeChangeHandleNew (val) {
+      this.pageNo = 1;
+      this.pageSize = val;
+      this.getList();
+    },
+    pageCurrentChangeHandleNew (val) {
+      this.pageNo = val;
+      this.getList();
+    },
+  },
+};
+</script>
+
+<style
+  lang="scss"
+  src="@/assets/scss/modules/visual/warning.scss"
+  scoped
+></style>
+<style lang="scss" scoped>
+.warning-box {
+  display: flex;
+  .card-wr {
+    flex: 1;
+  }
+  .card-wr:last-child {
+    margin-left: 20px;
+  }
+  ::v-deep .table-body {
+    overflow: auto;
+    &::-webkit-scrollbar {
+      width: 8px;
+      // background: linear-gradient(270deg, #0063FE, #0095FF);
+    }
+
+    &::-webkit-scrollbar-corner,
+      /* 滚动条角落 */
+    &::-webkit-scrollbar-thumb,
+    &::-webkit-scrollbar-track {      /*滚动条的轨道*/
+      border-radius: 4px;
+    }
+
+    &::-webkit-scrollbar-corner,
+    &::-webkit-scrollbar-track {
+      /* 滚动条轨道 */
+      
+      background: rgba(12, 129, 254, .24);
+      // box-shadow: inset 0 0 1px rgba(180, 160, 120, 0.5);
+    }
+
+    &::-webkit-scrollbar-thumb {
+      /* 滚动条手柄 */
+      background: linear-gradient(270deg, #0063FE, #0095FF);
+    }
+  }
+}
+.card-title {
+  display: flex;
+  align-items: center;
+  cursor: pointer;
+  .title-icon {
+    display: block;
+    width: 46px;
+    height: 34px;
+    box-sizing: border-box;
+    margin-right: 6px;
+  }
+  .title-label {
+    font-size: 20px;
+    font-weight: 800;
+    ::v-deep .el-input {
+      width: 180px;
+      margin-left: 10px;
+      .el-input__inner {
+        font-size: 18px;
+        font-weight: 800;
+        color: #fff;
+        background: transparent;
+        border: 0;
+      }
+      .el-icon-arrow-down::before {
+          content: "\e790";
+      }
+    }
+  }
+  ::v-deep .el-dropdown {
+    font-size: 16px;
+    color: #fff;
+    font-weight: 800;
+  }
+}
+.second-title {
+  display: flex;
+  align-items: center;
+  margin-top: 20px;
+  .second-title-label {
+    position: relative;
+    padding-left: 40px;
+    font-size: 16px;
+    font-weight: 500;
+    color: #fff;
+  }
+  .second-title-label::after {
+    content: "";
+    position: absolute;
+    top: 50%;
+    left: 20px;
+    width: 12px;
+    height: 12px;
+    box-sizing: border-box;
+    margin-top: -6px;
+    background: #2865fa;
+    border-radius: 50%;
+  }
+  .second-select {
+    margin: 0 10px 0 40px;
+    ::v-deep .el-input {
+      width: 180px;
+      height: 36px;
+      .el-input__inner {
+        height: 100%;
+        padding: 0 10px;
+        color: #fff;
+        line-height: 36px;
+        background: #06186d;
+        border: 1px solid #1a64cc;
+      }
+
+      .el-icon-arrow-up:before {
+        content: "\e78f";
+      }
+      // .el-select__caret:before {
+      //   content: '\E790'
+      // }
+    }
+    ::v-deep .el-date-editor {
+      width: 360px;
+      position: relative;
+      background: #06186d;
+      border: 1px solid #1a64cc;
+      .el-range-input {
+        color: #fff;
+        background: #06186d;
+      }
+      .el-range-separator {
+        color: #fff;
+      }
+      .el-range__icon {
+        position: absolute;
+        right: 5px;
+        // float: right;
+      }
+      .el-input__prefix {
+        left: unset;
+        right: 5px;
+      }
+    }
+  }
+  .second-select:last-child {
+    margin-left: 0;
+  }
+}
+
+.box-wr {
+  display: flex;
+  box-sizing: border-box;
+  .box-left {
+    flex-shrink: 0;
+    display: flex;
+    .box-left-item {
+      .box-label {
+        font-size: 16px;
+        color: rgba(255, 255, 255, 0.72);
+      }
+      .box-num {
+        font-size: 32px;
+        font-weight: bold;
+        color: #fff;
+      }
+    }
+  }
+  .box-right {
+    flex: 1;
+    .box-map {
+      height: 400px;
+      // border: 1px solid #2865fa;
+
+      .map {
+        height: 100%;
+        width: 100%;
+      }
+    }
+  }
+  .box-left-w400 {
+    flex-wrap: wrap;
+    width: 400px;
+    box-sizing: border-box;
+    padding-top: 60px;
+    padding-left: 100px;
+    .box-left-item {
+      width: 50%;
+    }
+  }
+}
+.box-wr-400 {
+  height: 400px;
+  .box-left {
+    width: 300px;
+    flex-direction: column;
+    justify-content: center;
+    align-items: center;
+    .box-left-item:last-child {
+      margin-top: 100px;
+    }
+  }
+}
+
+.map-tips {
+  width: 100%;
+  display: flex;
+  justify-content: center;
+  flex-wrap: wrap;
+  padding-top: 10px;
+  padding-bottom: 20px;
+  .map-tips-item {
+    display: flex;
+    align-items: center;
+    margin-top: 20px;
+    margin-right: 40px;
+    .map-tips-icon {
+      width: 32px;
+      height: 32px;
+      box-sizing: border-box;
+      margin-right: 10px;
+      // background: #DD2719;
+      // border-radius: 2px;
+      img {
+        display: block;
+        width: 100%;
+        height: 100%;
+      }
+    }
+    .map-tips-label {
+      font-size: 16px;
+      color: #fff;
+    }
+  }
+}
+</style>
diff --git a/src/views/modules/visual/communityParty/dialogInfo.vue b/src/views/modules/visual/communityParty/dialogInfo.vue
new file mode 100644
index 00000000..4a521290
--- /dev/null
+++ b/src/views/modules/visual/communityParty/dialogInfo.vue
@@ -0,0 +1,422 @@
+<template>
+  <div class="m-pop">
+    <div class="wrap">
+      <cpt-card>
+        <div class="title">
+          <img src="@/assets/img/shuju/title-tip.png" />
+          <span>活动详情</span>
+        </div>
+
+        <div class="btn-close" @click="handleClose">
+          <img src="@/assets/img/shuju/people/close.png" />
+        </div>
+        <!-- <div class="list-title">需求内容</div> -->
+        <div class="list-wr">
+          <div class="list">
+            
+            <!-- <div class="item-desc">
+              <span>市北区同德花园小区物业管理服务，公司的同志每天对该小区 公共部位，喷洒消毒液进行消毒。为杀灭新型冠状病毒，近几 天以来，市北区</span>
+            </div> -->
+            <div class="item">
+              <span class="item-field">服务事项：</span>
+              <span>{{ info.serviceMatterName }}</span>
+            </div>
+            <div class="item">
+              <span class="item-field">单位名称：</span>
+              <span>{{ info.unitName }}</span>
+            </div>
+            <div class="item">
+              <span class="item-field">活动标题：</span>
+              <span>{{ info.title }}</span>
+            </div>
+            <div class="item">
+              <span class="item-field">活动内容：</span>
+              <span class="item-content" v-html="info.content"></span>
+            </div>
+            <div class="item">
+              <span class="item-field">服务人数：</span>
+              <span>{{ info.peopleCount }}</span>
+            </div>
+            <div class="item">
+              <span class="item-field">活动时间：</span>
+              <span>{{ info.activityTime }}</span>
+            </div>
+            <div class="item">
+              <span class="item-field">活动坐标：</span>
+              <span>经度：{{ info.latitude }} <br /> 
+                    纬度：{{ info.longitude }}</span>
+            </div>
+            <div class="item">
+              <span class="item-field">活动地址：</span>
+              <span>{{ info.address }}</span>
+            </div>
+          </div>
+          <div class="list">
+            <div class="item">
+              <span class="item-field">活动结果：</span>
+              <span class="item-content" v-html="info.result"></span>
+            </div>
+          </div>
+        </div>
+
+        <!-- <div class="tabs">
+          <div
+            class="tab-btn"
+          >
+            <img src="@/assets/img/shuju/people/arrow-double-left.png" />
+          </div>
+          <div
+            class="tab z-on"
+          >
+            研判分析
+          </div>
+          <div
+            class="tab-btn"
+          >
+            <img src="@/assets/img/shuju/people/arrow-double-right.png" />
+          </div>
+        </div>
+
+        <div style="padding: 30px 0;">
+          <analyse :single-list="demandList" :single-title="'需求上报'" :more-title="'事件上报'" :user-list="userLists" 
+            :user-name="userName" :has-event="false" :more-list="eventList" />
+        </div> -->
+        
+        
+      </cpt-card>
+    </div>
+  </div>
+</template>
+
+<script>
+import cptCard from "@/views/modules/visual/cpts/card";
+import analyse from '../cpts/analyse.vue'
+import { requestPost } from "@/js/dai/request";
+
+export default {
+  name: "dialogInfo",
+  props: {
+    userId: {
+      type: String,
+      default: "",
+    },
+    gridName: {
+      type: String,
+      default: "",
+    },
+    info: Object
+  },
+
+  components: {
+    cptCard,
+    analyse
+  },
+
+  data() {
+    return {
+      fieldList: [],
+      groupList: [],
+      groupIndex: 0,
+      startGroupIndex: 0,
+      // info: {},
+      allInfo: {},
+
+      xiaoquList: [],
+      louList: [],
+      danyuanList: [],
+      homeList: [],
+      demandList: [
+        {
+          categoryName: '辨明服务',
+          categoryCode: '1',
+          showItem: false,
+          projectList: [
+            {
+              title: '不知道写了什么哈哈哈',
+              status: 'closed',
+              projectId: '1'
+            },
+            {
+              title: '罗里吧嗦写了什么哈哈哈',
+              status: 'closed',
+              projectId: '2'
+            },
+            {
+              title: '胡说八道写了什么哈哈哈',
+              status: 'closed',
+              projectId: '1=3'
+            },
+            {
+              title: '费眼飞鱼不知道写了什么哈哈哈',
+              status: 'closed',
+              projectId: '1=4'
+            },
+            {
+              title: '狗屁不通不知道写了什么哈哈哈',
+              status: 'closed',
+              projectId: '5'
+            },
+            {
+              title: '啦啦啦不知道写了什么哈哈哈',
+              status: 'closed',
+              projectId: '6'
+            }
+          ]
+        },
+        {
+          categoryName: '辨明服务',
+          categoryCode: '1',
+          showItem: false,
+          projectList: [
+            {
+              title: '不知道写了什么哈哈哈',
+              status: 'closed',
+              projectId: '1'
+            },
+            {
+              title: '罗里吧嗦写了什么哈哈哈',
+              status: 'closed',
+              projectId: '2'
+            },
+            {
+              title: '胡说八道写了什么哈哈哈',
+              status: 'closed',
+              projectId: '1=3'
+            },
+            {
+              title: '费眼飞鱼不知道写了什么哈哈哈',
+              status: 'closed',
+              projectId: '1=4'
+            },
+            {
+              title: '狗屁不通不知道写了什么哈哈哈',
+              status: 'closed',
+              projectId: '5'
+            },
+            {
+              title: '啦啦啦不知道写了什么哈哈哈',
+              status: 'closed',
+              projectId: '6'
+            }
+          ]
+        },
+        {
+          categoryName: '辨明服务',
+          categoryCode: '1',
+          showItem: false,
+          projectList: [
+            {
+              title: '不知道写了什么哈哈哈',
+              status: 'closed',
+              projectId: '1'
+            },
+            {
+              title: '罗里吧嗦写了什么哈哈哈',
+              status: 'closed',
+              projectId: '2'
+            },
+            {
+              title: '胡说八道写了什么哈哈哈',
+              status: 'closed',
+              projectId: '1=3'
+            },
+            {
+              title: '费眼飞鱼不知道写了什么哈哈哈',
+              status: 'closed',
+              projectId: '1=4'
+            },
+            {
+              title: '狗屁不通不知道写了什么哈哈哈',
+              status: 'closed',
+              projectId: '5'
+            },
+            {
+              title: '啦啦啦不知道写了什么哈哈哈',
+              status: 'closed',
+              projectId: '6'
+            }
+          ]
+        }
+      ],
+      userLists: [
+        {
+          homeId: '1',
+          icUserId: '1',
+          icUserName: '沾上干'
+        },
+        {
+          homeId: '2',
+          icUserId: '2',
+          icUserName: '李四'
+        },
+        {
+          homeId: '3',
+          icUserId: '3',
+          icUserName: '王五哈哈'
+        }
+      ],
+      userName: '王亚男哈',
+      eventList: [
+        {
+          categoryName: '辨明服务',
+          categoryCode: '1',
+          projectList: [
+            {
+              title: '不知道写了什么哈哈哈',
+              status: 'closed',
+              projectId: '1'
+            },
+            {
+              title: '罗里吧嗦写了什么哈哈哈',
+              status: 'closed',
+              projectId: '2'
+            },
+            {
+              title: '胡说八道写了什么哈哈哈',
+              status: 'closed',
+              projectId: '1=3'
+            },
+            {
+              title: '费眼飞鱼不知道写了什么哈哈哈',
+              status: 'closed',
+              projectId: '1=4'
+            },
+            {
+              title: '狗屁不通不知道写了什么哈哈哈',
+              status: 'closed',
+              projectId: '5'
+            },
+            {
+              title: '啦啦啦不知道写了什么哈哈哈',
+              status: 'closed',
+              projectId: '6'
+            }
+          ]
+        },
+        {
+          categoryName: '水煮鱼辨明服务辨明服务',
+          categoryCode: '4',
+          projectList: [
+            {
+              title: '熟煮雨不知道写了什么哈哈哈',
+              status: 'pending',
+              projectId: '4'
+            }
+          ]
+        },
+        {
+          categoryName: '开心麻花',
+          categoryCode: '2',
+          projectList: [
+            {
+              title: '不知道开心麻花写了什么哈哈哈',
+              status: 'closed',
+              projectId: '1'
+            }
+          ]
+        },
+        {
+          categoryName: '酸菜鱼',
+          categoryCode: '3',
+          projectList: [
+            {
+              title: '不知道酸菜鱼写了什么哈哈哈',
+              status: 'pending',
+              projectId: '3'
+            }
+          ]
+        }
+      ],
+    };
+  },
+
+  
+  mounted() {
+  },
+
+  methods: {
+    handleClose() {
+      this.$emit("close");
+    },
+  }
+};
+</script>
+
+<style lang="scss" src="@/assets/scss/modules/visual/people.scss" scoped></style>
+<style lang="scss" scoped>
+.m-pop {
+  .wrap {
+    .list {
+      display: block;
+      width: 50%;
+      .item {
+        display: flex;
+        width: 100%;
+        box-sizing: border-box;
+        margin-top: 0;
+        margin-bottom: 15px;
+        font-size: 16px;
+        cursor: pointer;
+        .item-field {
+          // width: 100px;
+          flex-shrink: 0;
+        }
+        .item-content {
+          width: 100%;
+          max-height: 420px;
+          overflow-y: auto;
+          &::-webkit-scrollbar {
+            width: 8px;
+            // background: linear-gradient(270deg, #0063FE, #0095FF);
+          }
+
+          &::-webkit-scrollbar-corner,
+            /* 滚动条角落 */
+          &::-webkit-scrollbar-thumb,
+          &::-webkit-scrollbar-track {      /*滚动条的轨道*/
+            border-radius: 4px;
+          }
+
+          &::-webkit-scrollbar-corner,
+          &::-webkit-scrollbar-track {
+            /* 滚动条轨道 */
+            
+            background: rgba(12, 129, 254, .24);
+            // box-shadow: inset 0 0 1px rgba(180, 160, 120, 0.5);
+          }
+
+          &::-webkit-scrollbar-thumb {
+            /* 滚动条手柄 */
+            background: linear-gradient(270deg, #0063FE, #0095FF);
+          }
+        }
+        ::v-deep p {
+          margin: 0;
+          img {
+            width: 100%;
+            height: 100%;
+          }
+        }
+      }
+      .item-desc {
+        font-size: 16px;
+        margin-bottom: 10px;
+        line-height: 24px;
+      }
+    }
+  }
+  .list-title {
+      width: 100%;
+      box-sizing: border-box;
+      padding: 20px 0 10px 62px;
+      font-size: 20px;
+      cursor: pointer;
+    }
+}
+.list-wr {
+  display: flex;
+  padding: 0 32px;
+  
+}
+
+</style>
diff --git a/src/views/modules/visual/communityParty/options.js b/src/views/modules/visual/communityParty/options.js
new file mode 100644
index 00000000..ba0ddd33
--- /dev/null
+++ b/src/views/modules/visual/communityParty/options.js
@@ -0,0 +1,176 @@
+
+export function pieOption (_charts) {
+  const center= ['50%', '50%']
+    return {
+      title: {
+        text: '0',
+        top: 125,
+        left: 196,
+        textAlign: 'center',
+        textStyle: {
+          width: '100%',
+          fontSize: 32,
+          color: '#FFFFFF',
+          fontWeight: 400,
+          align: 'center'
+        },
+        itemGap: 5,
+        subtext: '总数',
+        subtextStyle: {
+          fontSize: 16,
+          color: '#fff',
+          fontWeight: 400,
+          align: 'center'
+        }
+      },
+      tooltip: {
+        show: false
+      },
+      legend: {
+        top: 500,
+        bottom: 0,
+        itemWidth: 20,
+        itemHeight: 10,
+        textStyle: {
+          color: '#D2E7FF',
+          fontSize: 16,
+          lineHeight: 20,
+        },
+      
+      },
+      series: [
+        // 外侧圆环
+        {
+          type: 'pie',
+          // 起始刻度的角度，默认为 90 度，即圆心的正上方。0 度为圆心的正右方。
+          startAngle: 90,
+          hoverAnimation: false,
+          // tooltip: {
+          // },
+          center: center,
+          left: 'left',
+          radius: ['60%', '70%'],
+          width: 400,
+          label: {
+            show: false
+          },
+          labelLine: {
+            show: false
+          },
+          data: [{
+            value: 480,
+            itemStyle: {
+              color: 'rgba(40, 101, 250, 0)',
+              width:0,
+              borderColor: 'rgba(40, 101, 250, 0.5)',
+              borderWidth: 1,
+              borderType: 'dotted'
+            }
+          }
+          ]
+        },
+  
+        // 突出的
+        {
+          hoverAnimation: false,
+          type: 'pie',
+          center: center,
+          radius: ['40%', '60%'],
+          avoidLabelOverlap: false,
+          selectedMode: 'single',
+          left: 'left',
+          width: 400,
+          startAngle: 90,
+          label: {
+            // show: false,
+            position: 'outside',
+            alignTo: 'edge',
+            // formatter: '{a|{c}}\n\n{name|{b}}',
+            formatter: '{a|{c}}\n{r|}\n{name|{b}}',
+            minMargin: 5,
+            edgeDistance: 1,
+            lineHeight: 15,
+            color: '#fff',
+            fontSize: 12,
+            // distanceToLabelLine: -60,
+            rich: {
+              name: {
+                padding: [0, 6, 0, 6]
+              },
+              a: {
+                fontSize: 30,
+                color: '#fff',
+                padding: [0, 6, 6, 6]
+              },
+              r: {
+                backgroundColor: 'auto',
+                borderRadius: 6,
+                width: 6,
+                height: 6,
+                // padding: [3, 3, 0, -12]
+              }
+            }
+          },
+          labelLine: {
+            show: false,
+            smooth: 0.2,
+            length: 30,
+            length2: 0,
+            maxSurfaceAngle: 80
+          },
+          labelLayout: function (params) {
+            
+            const isLeft = params.labelRect.x < _charts.getWidth() / 2;
+            const points = params.labelLinePoints;
+            // Update the end point.
+            if (points) {
+              points[2][0] = isLeft
+              ? params.labelRect.x
+              : params.labelRect.x + params.labelRect.width;
+            }
+            
+            return {
+              labelLinePoints: points
+            };
+          },
+          itemStyle: {
+            
+          },
+          data: [],
+  
+        },
+           // 中间圆环
+           {
+            type: 'pie',
+            // 起始刻度的角度，默认为 90 度，即圆心的正上方。0 度为圆心的正右方。
+            startAngle: 90,
+            hoverAnimation: false,
+            center: center,
+            left: 'left',
+            width: 400,
+            // tooltip: {
+            // },
+            radius: ['0%', '25%'],
+            label: {
+            
+                show: false
+             
+            },
+            labelLine: {
+                show: false
+            
+            },
+            data: [
+              {
+                value: 360,
+                itemStyle: {
+                  color: 'rgba(8, 37, 134, 1)',
+                }
+              }
+            ]
+          },
+      ]
+  
+    }
+  }
+  
\ No newline at end of file
diff --git a/src/views/modules/visual/communityParty/party.vue b/src/views/modules/visual/communityParty/party.vue
new file mode 100644
index 00000000..238e8160
--- /dev/null
+++ b/src/views/modules/visual/communityParty/party.vue
@@ -0,0 +1,1005 @@
+<template>
+  <div class="warning-box">
+    <cpt-card>
+      <div class="card-title">
+        <img class="title-icon" src="../../../../assets/img/shuju/title-tip.png" />
+        <div class="title-label">
+          <!-- <el-dropdown trigger="click">
+            <span class="el-dropdown-link">
+              全部网格<i class="el-icon-caret-bottom el-icon--right"></i>
+            </span>
+            <el-dropdown-menu slot="dropdown">
+              <el-dropdown-item>黄金糕</el-dropdown-item>
+              <el-dropdown-item>狮子头</el-dropdown-item>
+              <el-dropdown-item>螺蛳粉</el-dropdown-item>
+              <el-dropdown-item>双皮奶</el-dropdown-item>
+              <el-dropdown-item>蚵仔煎</el-dropdown-item>
+            </el-dropdown-menu>
+          </el-dropdown> -->
+          <el-cascader 
+            v-model="selectAgency"
+            :options="propTree" 
+            :props="{ checkStrictly: true }" 
+            :show-all-levels="false"
+            :getCheckedNodes="getCheckedNodes"
+            clearable @change="handleCascader">
+          </el-cascader>
+        </div> 
+      </div>
+      <div class="card-echart">
+        <div class="card-left">
+          <div class="card-left-title">党员年龄统计</div>
+          <div class="card-flex">
+            <div class="echart-wr">
+              <!-- <div class="echart-cicle"></div>  -->
+              <screen-echarts-frame class="echart-org"
+                              @myChartMethod="pieInitOk"
+                              ref="ageChart"></screen-echarts-frame>
+              <!-- <div id="echartOrg" class="echart-org"></div> -->
+            </div>
+            <div class="echarts-tips echarts-tips-wd50">
+              <div class="tips-lists">
+                <div v-for="(item, index) in ageItem" :key="index" class="tips-items">
+                  <div class="tips-items-title" :class="'tips-items-title' + item.code">
+                    {{ item.name }}
+                  </div>
+                  <div class="tips-items-num">
+                    <div class="tips-item-count">{{item.value}}</div>
+                    <div class="tips-item-has">{{ item.radio }}</div>
+                  </div>
+                </div>
+                
+              </div>
+            </div>
+            
+          </div>
+          <div class="warning-box-bottom">
+            <screen-table
+              :headerList="headerList"
+              :tableData="ageList"
+              :visibleLoading="visibleLoading"
+              :operate="false"
+              @row="handleClickRow"
+            ></screen-table>
+            <div class="pagination">
+              <el-pagination
+                :current-page="agePageNo"
+                :page-size="agePageSize"
+                background
+                layout="prev, pager, next"
+                @size-change="pageSizeChangeHandleAge"
+                @current-change="pageCurrentChangeHandleAge"
+                :total="ageTotal"
+              >
+              </el-pagination>
+            </div>
+          </div>
+        </div>
+        <div class="card-left">
+          <div class="card-left-title">党员学历统计</div>
+          <div class="card-flex">
+            <div class="echart-wr echart-wr100">
+              <!-- <div class="echart-cicle echart-cicle0"></div> -->
+              <!-- <div id="echartType" class="echart-org"></div> -->
+              <screen-echarts-frame class="echart-org"
+                              @myChartMethod="pieInitOks"
+                              ref="eduChart"></screen-echarts-frame>
+            </div>
+            <div v-if="false" class="echarts-tips">
+              <div class="tips-list">
+                <div v-for="item in eduItem" :key="item.value" class="tips-item">
+                  <div class="tips-item-icon" :style="'background:' + item.color"></div>
+                  <div class="tips-item-text">{{item.name}}</div>
+                </div>
+                
+              </div>
+            </div>
+          </div>
+          <div class="warning-box-bottom">
+            <screen-table
+              :headerList="headerEduList"
+              :tableData="eduList"
+              :visibleLoading="visibleLoading"
+              :operate="false"
+              @row="handleClickRow"
+            ></screen-table>
+            <div class="pagination">
+              <el-pagination
+                :current-page="pageNo"
+                :page-size="pageSize"
+                background
+                layout="prev, pager, next"
+                @size-change="pageSizeChangeHandleNew"
+                @current-change="pageCurrentChangeHandleNew"
+                :total="total"
+              >
+              </el-pagination>
+            </div>
+          </div>
+        </div>
+      </div>
+
+      
+    </cpt-card>
+  </div>
+</template>
+
+<script>
+import { requestPost } from "@/js/dai/request";
+import screenTable from "../components/screen-table/index";
+import cptCard from "@/views/modules/visual/cpts/card";
+import nextTick from "dai-js/tools/nextTick";
+import screenEchartsFrame from "../components/screen-echarts-frame";
+import { pieOption } from './options'
+
+import * as echarts from 'echarts';
+export default {
+  name: "warning-box",
+  components: {
+    cptCard,
+    screenTable,
+    screenEchartsFrame
+  },
+  data() {
+    return {
+      headerList: [
+        { title: "序号", coulmn: 'index' },
+        { title: "姓名", coulmn: 'name' },
+        { title: "年龄", coulmn: 'age' },
+        { title: "手机号码", coulmn: 'mobile' }
+      ],
+      headerEduList: [
+        { title: "序号", coulmn: 'index' },
+        { title: "姓名", coulmn: 'name' },
+        { title: "学历", coulmn: 'education' },
+        { title: "手机号码", coulmn: 'mobile' }
+      ],
+      tableData: [
+        // [1,'商丘路社区第一网格','商丘路小区','2号楼','杨颖、王平、刘佳敏、丁辉、杨萍'],
+      ],
+      noInit: false,
+      noEduInit: false,
+      selectAgency: null,
+      ageTotalCount: 0,
+      eduTotalCount: 0,
+      propTree: [],
+      value2: '',
+      visibleLoading: true,
+      pageNo: 1,
+      pageSize: 10,
+      agePageNo: 1,
+      agePageSize: 10,
+      total: 0,
+      ageTotal: 0,
+      eduItem: [
+        {
+          name: '小学',
+          value: 0,
+          color: 'rgba(27, 81, 255, 1)'
+        }, {
+          name: '初中',
+          value: 1,
+          color: 'rgba(0, 229, 237, 1)'
+        }, {
+          name: '高中',
+          value: 2,
+          color: 'rgba(120, 0, 255, 1)'
+        }, {
+          name: '中专',
+          value: 3,
+          color: 'rgba(255, 120, 0, 1)'
+        }, {
+          name: '大专',
+          value: 4,
+          color: 'rgba(255, 186, 0, 1)'
+        }, {
+          name: '本科',
+          value: 5,
+          color: 'rgba(22, 215, 131, 1)'
+        }, {
+          name: '硕士',
+          value: 6,
+          color: 'rgba(42, 0, 255, 1)'
+        }, {
+          name: '博士',
+          value: 7,
+          color: 'rgba(198, 0, 255, 1)'
+        }, {
+          name: '其他',
+          value: 8,
+          color: 'rgba(255, 42, 0, 1)'
+        }
+      ],
+      ageItem: [
+        {
+          name: '50岁以下',
+          value: 1,
+          color: 'rgba(27, 81, 255, 1)'
+        }, {
+          name: '50-59岁',
+          value: 2,
+          color: 'rgba(0, 229, 237, 1)'
+        }, {
+          name: '60-69岁',
+          value: 3,
+          color: 'rgba(120, 0, 255, 1)'
+        }, {
+          name: '70-79岁',
+          value: 4,
+          color: 'rgba(255, 120, 0, 1)'
+        }, {
+          name: '80岁以上',
+          value: 5,
+          color: 'rgba(255, 186, 0, 1)'
+        }
+      ],
+      ageList: [],
+      eduList: [],
+      pieAgeChartS: null,
+      pieEduChartSs: null,
+      pieAgeOptions: null,
+      pieEduOptions: null
+    };
+  },
+  async mounted() {
+    await nextTick(100);
+    await this.getAgencyList()
+    this.getAgeCount(this.$store.state.user.agencyId, 'agency')
+    this.getEduCount(this.$store.state.user.agencyId, 'agency')
+    // this.initAgeCharts()
+    // this.initEduCharts()
+    this.getAgeList(this.$store.state.user.agencyId, 'agency')
+    this.getEduList(this.$store.state.user.agencyId, 'agency')
+    // this.initChartType()
+  },
+  methods: {
+    pieInitOk (dom) {
+      console.log('pie准备好了', dom)
+      this.pieAgeChartS = dom
+      // this.pieInitState = true
+
+    },
+    pieInitOks (dom) {
+      console.log('pies准备好了', dom)
+      this.pieEduChartS = dom
+      // this.pieInitState = true
+
+    },
+    initAgeCharts() {
+      // const eId = document.getElementById('echartOrg')
+      // let _charts = echarts.init(eId)
+      let option = {
+      
+      }
+      this.pieAgeOptions = pieOption(this.pieAgeChartS)
+      this.clickAgePie(0)
+      let fun = params => {
+        this.clickAgePie(params.dataIndex)
+      }
+      this.$refs.ageChart.handleClick(fun)
+      // option && this.$refs.pieChart.setOption(option);
+
+    },
+    initEduCharts() {
+      // const eId = document.getElementById('echartOrg')
+      // let _charts = echarts.init(eId)
+      let option = {
+      
+      }
+      let legend = {
+        show: true,
+        orient: 'vertical',
+        top: '20%',
+        right: 0,
+        textStyle: {
+          width: 90,
+          color: '#fff',
+          rich: {
+            a: {
+              width: 90
+            }
+          }
+        },
+        formatter: name => {
+          for (let a = 0; a < this.eduItem.length; a++) {
+            // this.data  这个数据中有名称和次数
+            if (this.eduItem[a].name === name) {
+              //两个名称进行对比，取出对应的次数
+              let params1 = name + "\n"; //然后return你需要的legend格式即可
+              console.log(params1);
+              let tmp = params1.split("\n");
+              let res = "" + params1;
+              for (let i in tmp) {
+                res = res.replace(tmp[i], "");
+              }
+              return res + params1;
+            }
+          }
+        }
+      }
+      this.pieEduOptions = pieOption(this.pieEduChartS)
+      this.pieEduOptions.legend = { ...legend }
+      // this.pieEduOptions.series[1].width = 400
+      this.clickEduPie(0)
+      let fun = params => {
+        this.clickEduPie(params.dataIndex)
+      }
+      this.$refs.eduChart.handleClick(fun)
+      // this.noInit = true
+      // option && this.$refs.pieChart.setOption(option);
+
+    },
+    initChartType() {
+      const eId = document.getElementById('echartType')
+      let _charts = echarts.init(eId)
+      
+      let option = {
+        tooltip: {
+          trigger: 'item'
+        },
+        legend: {
+          show: true,
+          orient: 'vertical',
+          top: '20%',
+          right: 0,
+          textStyle: {
+            width: 90,
+            color: '#fff',
+            rich: {
+              a: {
+                width: 90
+              }
+            }
+          },
+          formatter: name => {
+            for (let a = 0; a < this.eduItem.length; a++) {
+              // this.data  这个数据中有名称和次数
+              if (this.eduItem[a].name === name) {
+                //两个名称进行对比，取出对应的次数
+                let params1 = name + "\n"; //然后return你需要的legend格式即可
+                console.log(params1);
+                let tmp = params1.split("\n");
+                let res = "" + params1;
+                for (let i in tmp) {
+                  res = res.replace(tmp[i], "");
+                }
+                return res + params1;
+              }
+            }
+          }
+        },
+        title: {
+          text: '12000',  //图形标题，配置在中间对应效果图的80%
+          subtext: '总数',
+          left: 196,
+          top: "center",
+          textAlign: 'center',
+          textStyle: {
+            color: "#fff",
+            fontSize: 28,
+            align: "center"
+          },
+          subtextStyle: {
+            fontSize: 16,
+            color: '#fff',
+            align: 'center'
+          }
+        },
+        series: [
+          {
+            // name: 'Access From',
+            type: 'pie',
+            // center: ['50%', '50%'],
+            radius: ['40%', '60%'],
+            avoidLabelOverlap: true,
+            // top: top + '%',
+            // height: '80%',
+            // left: 0,
+            width: 400,
+            label: {
+              position: 'outside',
+              alignTo: 'edge',
+              formatter: '{a|{c}}\n{r|}\n{name|{b}}',
+              minMargin: 5,
+              edgeDistance: 20,
+              lineHeight: 15,
+              color: '#fff',
+              fontSize: 15,
+              rich: {
+                name: {
+                  padding: [0, 6, 0, 6]
+                },
+                a: {
+                  fontSize: 15,
+                  color: '#fff',
+                  padding: [0, 6, 0, 6]
+                },
+                r: {
+                  backgroundColor: 'auto',
+                  borderRadius: 6,
+                  width: 6,
+                  height: 6,
+                  // padding: [3, 3, 0, -12]
+                }
+              }
+            },
+            emphasis: {
+              label: {
+                show: true,
+                fontSize: '14',
+                fontWeight: 'bold'
+              }
+            },
+            labelLine: {
+              show: true,
+              length: 20,
+              length2: 0,
+              maxSurfaceAngle: 80
+            },
+            labelLayout: function (params) {
+              const isLeft = params.labelRect.x < _charts.getWidth() / 2;
+              const points = params.labelLinePoints;
+              // Update the end point.
+              points[2][0] = isLeft
+                ? params.labelRect.x
+                : params.labelRect.x + params.labelRect.width;
+              return {
+                labelLinePoints: points
+              };
+            },
+            data: this.eduItem
+          }
+        ]
+      }
+      option && _charts.setOption(option);
+
+    },
+    clickAgePie (seriesIndex) {
+      let _code = ''
+      let isClick = false
+      console.log('seriesIndex---', seriesIndex)
+      this.ageItem.forEach((element, index) => {
+        if (index === seriesIndex) {
+          _code = element.code
+          
+          if (!this.noInit) isClick = false
+          else {
+            element.isClick = !element.isClick
+            isClick = element.isClick
+          }
+
+          element.label = {
+            show: true,
+
+          };
+          element.labelLine = {
+            show: true,
+            lineStyle: {
+              opacity: 1,
+            }
+
+          };
+          console.log('zlcm', element)
+        } else {
+          element.isClick = false
+          element.label = {
+            show: false,
+
+          };
+          element.labelLine = {
+            show: false,
+            lineStyle: {
+              opacity: 0,
+              color: 'rgba(255,255,255,0)'
+            }
+
+          };
+
+        }
+      });
+      this.pieAgeOptions.title.text = this.ageTotalCount
+      this.pieAgeOptions.series[1].data = this.ageItem
+      // this.$refs.pieChart.hideLoading()
+      this.$refs.ageChart.setOption(this.pieAgeOptions)
+      if (this.noInit) {
+        const _arr = this.selectAgency[this.selectAgency.length - 1].split('-')
+        const orgType = _arr[1] !== 'grid' ? 'agency': 'grid'
+         console.log('zlcm---isClick', isClick)
+        this.getAgeList(_arr[0], orgType, isClick && _code || '')
+      }
+      this.noInit = true
+
+    },
+    clickEduPie (seriesIndex) {
+      let _code = ''
+      let isClick = false
+      this.eduItem.forEach((element, index) => {
+        if (index === seriesIndex) {
+          _code = element.code
+
+          if (!this.noEduInit) isClick = false
+          else {
+            element.isClick = !element.isClick
+            isClick = element.isClick
+          }
+
+          element.label = {
+            show: true,
+
+          };
+          element.labelLine = {
+            show: true,
+            lineStyle: {
+              opacity: 1,
+            }
+
+          };
+          console.log('zlcm')
+        } else {
+          element.isClick = false
+          element.label = {
+            show: false,
+
+          };
+          element.labelLine = {
+            show: false,
+            lineStyle: {
+              opacity: 0,
+              color: 'rgba(255,255,255,0)'
+            }
+
+          };
+
+        }
+      });
+      this.pieEduOptions.title.text = this.eduTotalCount
+      this.pieEduOptions.series[1].data = this.eduItem
+      // this.$refs.pieChart.hideLoading()
+      this.$refs.eduChart.setOption(this.pieEduOptions)
+      if (this.noEduInit) {
+        const _arr = this.selectAgency[this.selectAgency.length - 1].split('-')
+        const orgType = _arr[1] !== 'grid' ? 'agency': 'grid'
+
+        this.getEduList(_arr[0], orgType, isClick && _code || '')
+      }
+      this.noEduInit = true
+      
+
+    },
+    async getAgeCount(orgId, orgType) {
+      const url = "/epmetuser/icresiuser/partymemberagestatistics";
+      let params = {
+        orgId,
+        orgType
+      };
+      const { data, code, msg } = await requestPost(url, params);
+      if (code === 0) {
+        const colorList = [
+          {
+            name: '50岁以下',
+            value: 1,
+            color: '#FAC126'
+          }, {
+            name: '50-59岁',
+            value: 2,
+            color: '#3DDA83'
+          }, {
+            name: '60-69岁',
+            value: 3,
+            color: '#A800FF'
+          }, {
+            name: '70-79岁',
+            value: 4,
+            color: '#2865FA'
+          }, {
+            name: '80岁以上',
+            value: 5,
+            color: '#00DAD2'
+          }
+        ]
+        this.ageItem = data.map((item, index) => {
+          return {
+            ...item,
+            name: item.label,
+            isClick: false,
+            itemStyle: {
+              color: colorList[index].color
+            }
+          }
+        })
+        data.forEach(item => {
+          this.ageTotalCount += Number(item.value)
+        })
+        this.initAgeCharts()
+      } else {
+      }
+    },
+    async getEduCount(orgId, orgType) {
+      const url = "/epmetuser/icresiuser/partymembereducationstatistics";
+      let params = {
+        orgId,
+        orgType
+      };
+      const { data, code, msg } = await requestPost(url, params);
+      if (code === 0) {
+        this.eduItem = data.map(item => {
+          return {
+            ...item,
+            name: item.label,
+            isClick: false
+          }
+        })
+        data.forEach(item => {
+          this.eduTotalCount += Number(item.value)
+        })
+        this.initEduCharts()
+      } else {
+      }
+    },
+    async getAgeList(orgId, orgType, _code) {
+      
+      this.visibleLoading = true
+      const url = "/epmetuser/icresiuser/partymemberagelist";
+      let params = {
+        orgId,
+        orgType,
+        code: _code || '',
+        pageNo: this.agePageNo,
+        pageSize: this.agePageSize
+      };
+      const { data, code, msg } = await requestPost(url, params);
+      if (code === 0) {
+        this.ageList = data.list.map((item, index) => {
+          return {
+            ...item,
+            index: index + 1
+          }
+        })
+        this.ageTotal = data.total
+      } else {
+        this.$message.error(msg)
+      }
+      // if (_code == 0 || _code) this.noInit = true
+      this.visibleLoading = false
+    },
+    async getEduList(orgId, orgType, _code) {
+      const url = "/epmetuser/icresiuser/partymembereducationlist";
+      let params = {
+        orgId,
+        orgType,
+        code: _code || '',
+        pageNo: this.pageNo,
+        pageSize: this.pageSize
+      };
+      const { data, code, msg } = await requestPost(url, params);
+      if (code === 0) {
+        this.eduList = data.list.map((item, index) => {
+          return {
+            ...item,
+            index: index + 1
+          }
+        })
+        this.total = data.total
+      } else {
+        this.$message.error(msg)
+      }
+    },
+    async getAgencyList(node, resolve) {
+      // const url = "/gov/org/customeragency/staffinagencylist";
+      const url = '/gov/org/customeragency/agencygridtree'
+      // let params = {
+      //   agencyId: this.$store.state.user.agencyId,
+      // };
+      const { data, code, msg } = await requestPost(url);
+      if (code === 0) {
+        console.log('data-org----o', data)
+        this.selectAgency = [`${data.agencyId}-${data.level}`]
+        let arr = []
+        arr.push(data)
+        this.propTree = arr && this.getTreeData(arr)
+
+      } else {
+      }
+    },
+    getTreeData(data){
+      if (!Array.isArray(data)) return []
+      let arr = data.map(item => {
+        let _item = {}
+        if (item.subAgencyList) {
+          if (item.subAgencyList.length === 0) {
+            _item = { 
+              label: item.agencyName,
+              value: item.agencyId + '-' + item.level,
+              level: item.level,
+              children: undefined 
+            }
+          } else _item = { 
+            label: item.agencyName,
+            value: item.agencyId + '-' + item.level,
+            level: item.level,
+            children: this.getTreeData(item.subAgencyList)}
+        } else {
+          _item = { 
+            label: item.agencyName,
+            value: item.agencyId + '-' + item.level,
+            level: item.level,
+          }
+        }
+        return _item
+      })
+      return arr
+    },
+    handleClickRow(val) {
+      console.log('click-row----', val)
+      this.$router.push({
+        path: `/main-shuju/visual-basicinfo-people/${val.userId}`,
+      });
+    },
+    handleCascader(val) {
+      console.log('val-vvv', val)
+      const _arr = val[val.length - 1].split('-')
+      const orgType = _arr[1] !== 'grid' ? 'agency': 'grid'
+      this.getAgeList(_arr[0], orgType)
+      this.getEduList(_arr[0], orgType)
+    },
+    getCheckedNodes(val) {
+      console.log('val-nnn', val)
+    },
+    lazyLoad(node, resolve) {
+      setTimeout(() => {
+        this.getAgeList(node, resolve)
+      }, 500)
+    },
+    pageSizeChangeHandleAge(val) {
+      this.agePageNo = 1
+      this.agePageSize = val
+      this.getAgeList()
+    },
+    pageCurrentChangeHandleAge (val) {
+      this.agePageSize = val
+      this.getAgeList()
+    },
+    pageSizeChangeHandleNew(val) {
+      this.pageNo = 1;
+      this.pageSize = val;
+      this.getEduList()
+    },
+    pageCurrentChangeHandleNew(val) {
+      this.pageNo = val;
+      this.getEduList()
+    },
+  },
+};
+</script>
+
+<style
+  lang="scss"
+  src="@/assets/scss/modules/visual/warning.scss"
+  scoped
+></style>
+<style lang="scss" scoped>
+.card-title {
+  display: flex;
+  align-items: center;
+  cursor: pointer;
+  .title-icon {
+    display: block;
+    width: 46px;
+    height: 34px;
+    box-sizing: border-box;
+    margin-right: 6px;
+  }
+  ::v-deep .el-dropdown {
+    font-size: 18px;
+    color: #fff;
+    font-weight: 800;
+  }
+  .title-time {
+    display: flex;
+    align-items: center;
+    box-sizing: border-box;
+    margin-left: 30px;
+    font-size: 14px;
+    color: #fff;
+    .title-time-label {
+      margin-right: 10px;
+    }
+    ::v-deep .el-date-editor--month {
+      width: 100px;
+      .el-input__inner {
+        width: 100px;
+        height: 24px;
+        box-sizing: border-box;
+        padding: 0;
+        font-size: 14px;
+        color: #fff;
+        line-height: 24px;
+        text-align: center;
+        background: #06186D;
+        border: 1px solid #1A64CC;
+        border-radius: 2px;
+      }
+      .el-input__prefix {
+        display: none;
+      }
+      .el-input__suffix {
+        right: 0;
+        .el-input__icon {
+          line-height: 24px;
+        }
+      }
+      
+    }
+  }
+  .title-label {
+    ::v-deep .el-input {
+      width: 180px;
+      .el-input__inner {
+        font-size: 20px;
+        font-weight: 800;
+        color: #fff;
+        background: transparent;
+        border: 0;
+      }
+      .el-icon-arrow-down::before {
+          content: "\e790";
+      }
+    }
+  }
+}
+.card-echart {
+  display: flex;
+  margin-top: 40px;
+  height: 100%;
+  .card-left {
+    position: relative;
+    flex: 1;
+    // display: flex;
+    height: 100%;
+    .card-flex {
+      width: 100%;
+      display: flex;
+    }
+  }
+}
+.card-left-title {
+  position: relative;
+  padding-left: 40px;
+  font-size: 16px;
+  font-weight: 500;
+  color: #fff;
+}
+.card-left-title::after {
+  content: '';
+  position: absolute;
+  top: 50%;
+  left: 20px;
+  width: 12px;
+  height: 12px;
+  box-sizing: border-box;
+  margin-top: -6px;
+  background: #2865FA;
+  border-radius: 50%;
+}
+.echart-wr {
+  position: relative;
+  flex-shrink: 0;
+  width: 50%;
+  height: 320px;
+  box-sizing: border-box;
+  .echart-org {
+    width: 100%;
+    height: 100%;
+  }
+  .echart-cicle {
+    position: absolute;
+    top: 50%;
+    left: 50%;
+    width: 240px;
+    height: 240px;
+    box-sizing: border-box;
+    margin-top: -120px;
+    margin-left: -120px;
+    border: 1px dashed rgba(0, 96, 240, 1);
+    border-radius: 50%;
+  }
+  .echart-cicle0 {
+    left: 80px;
+    margin-left: 0;
+  }
+}
+.echart-wr100 {
+  width: 70%;
+}
+.echarts-tips {
+  width: 40%;
+  // flex: 1;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+}
+.echarts-tips-wd50 {
+  width: 320px;
+}
+.tips-list, .tips-item, .tips-lists, .tips-items-num {
+  display: flex;
+  align-items: center;
+}
+.tips-list {
+  // width: 100%;
+  // height: 100%;
+  flex-wrap: wrap;
+  // justify-content: center;
+  .tips-item {
+    // flex: 1;
+    width: 50%;
+    margin-top: 20px;
+    // margin-right: 40px;
+    cursor: pointer;
+    .tips-item-icon {
+      width: 20px;
+      height: 10px;
+      box-sizing: border-box;
+      margin-right: 8px;
+      background: #1B51FF;
+      border-radius: 2px;
+    }
+    .tips-item-text {
+      font-size: 16px;
+      color: #D2E7FF;
+    }
+  }
+}
+.tips-lists {
+  width: 100%;
+  box-sizing: border-box;
+  padding: 30px 0 0 30px;
+  flex-wrap: wrap;
+  .tips-items {
+    margin-bottom: 30px;
+    margin-right: 40px;
+    // width: 50%;
+    cursor: pointer;
+    .tips-items-title {
+      position: relative;
+      width: 100px;
+      height: 26px;
+      box-sizing: border-box;
+      padding-left: 6px;
+      font-size: 16px;
+      color: #EFF0F1;
+      background: url('../../../../assets/img/shuju/measure/huang@2x.png') no-repeat left bottom;
+      &1 {
+        background: url('../../../../assets/img/shuju/measure/lv@2x.png') no-repeat left bottom;
+      }
+      &2 {
+        background: url('../../../../assets/img/shuju/measure/zi@2x.png') no-repeat left bottom;
+      }
+      &3 {
+        background: url('../../../../assets/img/shuju/measure/lan@2x.png') no-repeat left bottom;
+      }
+      &4 {
+        background: url('../../../../assets/img/shuju/measure/lanlv@2x.png') no-repeat left bottom;
+      }
+    }
+    .tips-items-num {
+      justify-content: space-between;
+      box-sizing: border-box;
+      margin-top: 10px;
+      // padding-right: 30px;
+      font-size: 20px;
+      .tips-item-has {
+        font-size: 14px;
+      }
+    }
+  }
+}
+
+.warning-box-bottom {
+  height: calc(100% - 500px);
+  box-sizing: border-box;
+  margin: 0;
+  padding: 0 30px;
+  // overflow-y: scroll;
+}
+</style>
diff --git a/src/views/modules/visual/components/screen-echarts-frame/index.vue b/src/views/modules/visual/components/screen-echarts-frame/index.vue
new file mode 100644
index 00000000..9d97c8fb
--- /dev/null
+++ b/src/views/modules/visual/components/screen-echarts-frame/index.vue
@@ -0,0 +1,193 @@
+<template>
+  <div>
+    <div v-show="!noData"
+         class="screenEchartsFrame"
+         ref="screenEchartsFrame"></div>
+    <screen-nodata v-show="noData"
+                   class="nodata"></screen-nodata>
+  </div>
+</template>
+
+<script>
+import * as echarts from 'echarts';
+import ScreenNodata from "@/views/modules/visual/components/screen-nodata";
+export default {
+  name: 'screen-echarts-frame',
+  data () {
+    return {
+      myChart: '',
+      noData: false,
+    }
+  },
+  props: {
+    chartMethod: {
+      type: Function
+    }
+  },
+  mounted () {
+    this.initChart()
+    window.onresize = () => {
+      this.myChart.resize()
+    }
+  },
+  beforeDestroy () {
+    // 销毁echarts实例对象
+    if (this.myChart) this.myChart.dispose()
+  },
+  watch: {},
+  components: {
+    ScreenNodata,
+
+  },
+  methods: {
+    initChart () {
+
+      this.$nextTick(() => {
+        const dom = this.$refs.screenEchartsFrame
+        this.myChart = echarts.init(dom)
+
+        // this.myChart.setOption(this.chartMethod());
+        this.$emit('myChartMethod', this.myChart)
+      })
+    },
+    //点击pie事件
+    handleClick (fun) {
+      this.myChart.on('click', fun);
+    },
+    //没有数据
+    setNoData (nodata) {
+
+      this.noData = nodata
+    },
+
+    //高亮
+    highLight (index) {
+      this.myChart.dispatchAction({
+        type: 'highlight',
+        seriesIndex: 1,
+        dataIndex: index
+      });
+    },
+
+    // 配置option
+    setOption (option) {
+      this.myChart.setOption(option)
+    },
+    // 获取option
+    getOption () {
+      if (this.myChart) {
+        return this.myChart.getOption()
+      } else {
+        return null
+      }
+    },
+    //
+    resize () {
+      if (this.myChart) {
+        this.myChart.resize()
+      }
+    },
+    clear () {
+      if (this.myChart) {
+        this.myChart.clear()
+      }
+    },
+    showLoading () {
+      if (this.myChart) {
+        this.$nextTick(() => {
+          this.myChart.showLoading({
+            text: '',
+            color: '#29cdff',
+            textColor: '#29cdff',
+            maskColor: 'rgba(255, 255, 255, 0)',
+            zlevel: 0
+
+          })
+        })
+      }
+    },
+    hideLoading () {
+
+      if (this.myChart) {
+        this.myChart.hideLoading()
+      }
+    },
+    // 启动动画时使用
+    tooltipAnimate (chart, length) {
+      // 清除上一次动画
+      this.timeTicket && clearInterval(this.timeTicket)
+      const count = 0
+      // 启动动画
+      this._action(chart, count, length)
+      chart && // 移除动画
+        chart.on('mouseover', params => {
+          this._cleanAction(chart, params)
+        })
+      // 重写启动动画
+      chart &&
+        chart.on('mouseout', () => {
+          this._action(chart, count, length)
+        })
+    },
+    // tooltip动画action
+    _action (chart, count, length) {
+      this.timeTicket && clearInterval(this.timeTicket)
+      this.timeTicket = setInterval(() => {
+        if (!chart) {
+          clearInterval(this.timeTicket)
+          return
+        }
+        chart &&
+          chart.dispatchAction({
+            type: 'downplay',
+            seriesIndex: 0
+          })
+        chart &&
+          chart.dispatchAction({
+            type: 'highlight',
+            seriesIndex: 0,
+            dataIndex: count % length
+          })
+        chart &&
+          chart.dispatchAction({
+            type: 'showTip',
+            seriesIndex: 0,
+            dataIndex: count % length
+          })
+        count++
+      }, 1000 * 3)
+    },
+    _cleanAction (chart, params) {
+      this.timeTicket && clearInterval(this.timeTicket)
+      if (!chart) {
+        clearInterval(this.timeTicket)
+        return
+      }
+      chart &&
+        chart.dispatchAction({
+          type: 'downplay',
+          seriesIndex: 0
+        })
+      chart &&
+        chart.dispatchAction({
+          type: 'highlight',
+          seriesIndex: 0,
+          dataIndex: params.dataIndex
+        })
+      chart &&
+        chart.dispatchAction({
+          type: 'showTip',
+          seriesIndex: 0,
+          dataIndex: params.dataIndex
+        })
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.screenEchartsFrame {
+  width: 100%;
+  height: 100%;
+}
+</style>
diff --git a/src/views/modules/visual/components/screen-loading/index.vue b/src/views/modules/visual/components/screen-loading/index.vue
new file mode 100644
index 00000000..cc8bda6f
--- /dev/null
+++ b/src/views/modules/visual/components/screen-loading/index.vue
@@ -0,0 +1,68 @@
+<template>
+  <div class="screen-loading">
+    <svg width="50px"
+         height="50px">
+      <circle cx="25"
+              cy="25"
+              r="20"
+              fill="transparent"
+              stroke-width="3"
+              stroke-dasharray="31.415, 31.415"
+              stroke="#29cdff"
+              stroke-linecap="round">
+        <animateTransform attributeName="transform"
+                          type="rotate"
+                          values="0, 25 25;360, 25 25"
+                          dur="1.5s"
+                          repeatCount="indefinite" />
+        <animate attributeName="stroke"
+                 values="#02bcfe;#3be6cb;#02bcfe"
+                 dur="3s"
+                 repeatCount="indefinite" />
+      </circle>
+
+      <circle cx="25"
+              cy="25"
+              r="10"
+              fill="transparent"
+              stroke-width="3"
+              stroke-dasharray="15.7, 15.7"
+              stroke="#29cdff"
+              stroke-linecap="round">
+        <animateTransform attributeName="transform"
+                          type="rotate"
+                          values="360, 25 25;0, 25 25"
+                          dur="1.5s"
+                          repeatCount="indefinite" />
+        <animate attributeName="stroke"
+                 values="#3be6cb;#02bcfe;#3be6cb"
+                 dur="3s"
+                 repeatCount="indefinite" />
+      </circle>
+    </svg>
+    <div class="loading-tip">
+      <slot></slot>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'DvLoading'
+}
+</script>
+
+<style lang="scss" scoped>
+.screen-loading {
+  width: 100%;
+  height: 100%;
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+  align-items: center;
+  .loading-tip {
+    font-size: 14px;
+    color: #fff;
+  }
+}
+</style>
diff --git a/src/views/modules/visual/components/screen-map/index.vue b/src/views/modules/visual/components/screen-map/index.vue
new file mode 100644
index 00000000..f33f095f
--- /dev/null
+++ b/src/views/modules/visual/components/screen-map/index.vue
@@ -0,0 +1,765 @@
+<template>
+  <div class="div_content_map">
+    <div class="div_map"
+         id="map"
+         ref="map">
+    </div>
+    <div id="popup"
+         style="display: none;"
+         class="ol-popup">
+      <a href="#"
+         id="popup-closer"
+         class="ol-popup-closer"></a>
+      <div id="popup-content"
+           class="popup-content"></div>
+    </div>
+  </div>
+</template>
+
+<script>
+import 'ol/ol.css'
+import { Map, View } from 'ol'
+import TileLayer from 'ol/layer/Tile.js';
+import XYZ from 'ol/source/XYZ.js';
+import VectorLayer from 'ol/layer/Vector.js';
+import VectorSource from 'ol/source/Vector.js';
+import GeoJSON from 'ol/format/GeoJSON.js';
+import Point from "ol/geom/Point.js";
+import Feature from "ol/Feature.js";
+import Overlay from 'ol/Overlay';
+import { defaults as defaultInteractions, Select, DoubleClickZoom } from 'ol/interaction.js';
+import { getCenter, boundingExtent } from 'ol/extent.js';
+import { Circle as CircleStyle, Icon, Fill, Stroke, Style, Text } from 'ol/style.js';
+import { altKeyOnly, click, pointerMove } from 'ol/events/condition';
+import { getDistance } from 'ol/sphere';
+
+import { mapGetters } from "vuex";
+import { Loading } from 'element-ui'; //引入Loading服务
+
+import { requestPost } from "@/js/dai/request";
+var centerPointGlobal = [120.38945519, 36.0722275]
+
+
+let loading;//加载动画
+
+let map;
+let mapView;
+let gaodeMapLayer;//背景地图图层
+let polygonLayer;//区域多边形标注图层
+let polygonSource;//标注多边形
+
+let polIconLayer; // 区域icon标注图层
+let polIconSource; // icon
+
+let iconLayer; // icon图层
+let iconSource; // icon
+
+let select;//选中标注
+
+
+let polygonColorArray = [
+  'rgba(210, 2, 2, 0.24)',
+  'rgba(43, 231, 253, 0.25)',
+  'rgba(183, 185, 0, 0.16)'
+];
+
+
+//多边形标注样式
+var polygonStyleFunction = (function () {
+  return function (feature) {
+    return new Style({
+      fill: new Fill({
+        // color: [255, 255, 255, 0.3]
+        color: feature.values_.fillColor
+      }),
+      stroke: new Stroke({
+        color: feature.values_.color,
+        width: 2
+      }),
+
+      // text: createTextStyle(feature)
+    });;
+  };
+})()
+
+const vueGis = {
+  name: 'HomeMap',
+  data () {
+    return {
+      centerPoint: [],//中心点位置
+      zoom: 14,//缩放范围：区14
+      minZoom: 1,//最小缩放
+      overlay: null,
+      showPopup: false,
+      mapInfo: {
+
+      },
+
+      polygonArray: [
+        {
+          agencyLevel: "grid",
+          coordinates: "120.37421528296863,36.085017737014525,120.37551227771064,36.08181339174796,120.38108173804676,36.08303409283569,120.3852397566111,36.08318668276358,120.38539234391965,36.090816077003794,120.37410084117755,36.09096866431234,120.37421528296863,36.085017737014525",
+          id: "2a278c0ceb863359d263fda7aabf6752",
+          latitude: 36.072227,
+          level: "grid",
+          longitude: 120.389455,
+          name: "第三网格",
+        },
+        {
+          agencyLevel: "grid",
+          coordinates: "120.38577111171519,36.095762169637716,120.38544318588274,36.08317796726519,120.39339541546589,36.08080049372144,120.40122467708379,36.08026761565102,120.40188052874869,36.08276805856732,120.39929810296697,36.086990119140545,120.39757648953199,36.08981849070392,120.39901116927089,36.0943274884915,120.3977404524482,36.096418022709926,120.38577111171519,36.095762169637716",
+          id: "94227891bc4ad5f40cb95081761592d9",
+          latitude: 36.072227,
+          level: "grid",
+          longitude: 120.389455,
+          name: "南宁第二网格",
+        },
+        {
+          agencyLevel: "grid",
+          coordinates: "120.3736430792519,36.09505039184175,120.373948253869,36.09119754789451,120.38543049205646,36.09115940106737,120.38577381481036,36.0960803587938,120.3736430792519,36.09505039184175",
+          id: "a772a325e022484ef53e4a7d679726f1",
+          latitude: 36.072227,
+          level: "grid",
+          longitude: 120.389455,
+          name: "南宁第一网格",
+        },
+      ],
+
+      iconArrays: [
+
+      ],
+      iconTextStyle: {},
+
+      //policon图标样式
+      polIconUrlArray: [
+        'https://elink-esua-epdc.oss-cn-qingdao.aliyuncs.com/epmet/test/20211116/a219130b6bc74b0b80b5ddb0fce0892a.png',
+        'https://elink-esua-epdc.oss-cn-qingdao.aliyuncs.com/epmet/test/20211116/a775d15e62374350b80e5cdf1912a4eb.png',
+        'https://elink-esua-epdc.oss-cn-qingdao.aliyuncs.com/epmet/test/20211116/884efcf6d6b44224a7fda599dd1b14cb.png'
+      ],
+      //icon图标样式
+      iconUrlArray: [],
+      iconTextColor: '#ffffff',
+      distanceMax: null,//显示的坐标距离中心点的范围
+
+    }
+  },
+  async mounted () {
+
+
+  },
+  methods: {
+    //加载地图:地图基本信息，多边形区域信息，多边形icon
+    loadMap (mapInfo, polygonArray, polIconUrlArray, iconArrays, iconUrlArray, iconTextStyle, distanceMax) {
+      this.mapInfo = mapInfo
+      this.polygonArray = polygonArray
+      this.polIconUrlArray = polIconUrlArray
+      this.iconArrays = iconArrays
+      this.iconUrlArray = iconUrlArray
+      this.iconTextStyle = iconTextStyle
+      this.distanceMax = distanceMax
+
+      //初始化地图
+      this.initMap()
+
+      if (this.showPolygonLayer) {
+        //初始化多边形标注图层
+        this.initPolygonLayer()
+        //加载当前园区的标注
+        this.loadPolygon()
+      }
+      if (this.showPolIconLayer) {
+
+        //初始化多边形标注图层
+        this.initPolygonLayer()
+        //加载当前园区的标注
+        this.loadPolIcon()
+      }
+
+      if (this.showIconLayer) {
+        //初始化icon图层
+        this.initIconLayer()
+        this.loadIcon()
+      }
+
+      if (this.isAddOpenlay) {
+        //初始化icon图层
+        this.addOverlay()
+      }
+
+
+      this.addMapClick()
+
+    },
+
+    //刷新地图
+    async refreshMap (polygonArray, iconArrays) {
+      this.polygonArray = polygonArray
+      this.iconArrays = iconArrays
+
+      if (this.showPolygonLayer) {
+
+        //加载当前园区的标注
+        this.loadPolygon()
+      }
+      if (this.showPolIconLayer) {
+
+        //加载当前园区的标注
+        this.loadPolIcon()
+      }
+
+      if (this.showIconLayer) {
+
+        this.loadIcon()
+      }
+
+
+    },
+
+    //加载多边形
+    loadPolygon () {
+
+      polygonSource.clear()//清空多边形标注
+
+      let featureData = []//多边形数据数据
+
+      if (this.polygonArray && this.polygonArray.length > 0) {//判断是否存在下级标注
+        let oneData = {}
+
+        this.polygonArray.forEach(polygonItem => {
+
+          if (polygonItem.coordinates && polygonItem.coordinates !== '') {//如果有坐标
+
+            oneData = {
+              type: 'Feature',
+
+              properties: { ...polygonItem },
+              geometry: {
+                type: 'Polygon',
+                coordinates: [],
+              },
+            }
+            let coorArray = polygonItem.coordinates.split(',')//坐标数组
+
+            let itemArray = []//单个点位的[lon,lat]，数组
+            let tempPolygonArray = []//整个多边形的[[lon,lat],[lon,lat],[lon,lat]]数组
+
+            coorArray.forEach((item, index) => {
+              itemArray.push(item)
+              if (index % 2 == 0) {//偶
+
+              } else {//奇
+                tempPolygonArray.push(itemArray)
+                itemArray = []
+              }
+
+            });
+            oneData.geometry.coordinates.push(tempPolygonArray)
+            featureData.push(oneData)
+          }
+        });
+      }
+
+      if (featureData && featureData.length > 0) {
+        var geojsonObject = {
+          'type': 'FeatureCollection',
+          'features': featureData
+        };
+        let feature = (new GeoJSON()).readFeatures(geojsonObject)
+
+        polygonSource.addFeatures(feature)
+
+        if (this.showPolIconLayer) {
+          this.loadPolIcon(feature)
+        }
+
+      }
+
+    },
+
+    //加载多边形的icon
+    loadPolIcon (feature) {
+      let polyIconFeatures = [];
+      feature.forEach(oneIcon => {
+
+        var extent = boundingExtent(oneIcon.getGeometry().getCoordinates()[0]); //获取一个坐标数组的边界，格式为[minx,miny,maxx,maxy]
+        // var center = getCenter(extent);   //获取边界区域的中心位置
+        //添加标注
+        let x = (parseFloat(extent[0]) + parseFloat(extent[2])) / 2
+        let y = (parseFloat(extent[1]) + parseFloat(extent[3])) / 2
+
+        let polyIcon = new Feature({
+          geometry: new Point([x, y]),
+          id: oneIcon.id_,
+          properties: {
+            type: "icon",
+            id: oneIcon.id_
+          }
+        });
+
+        let polyIconStyle = new Style({
+          image: new Icon({
+            // anchor: [0.5, 0.5],
+            // imgSize: [32, 32],
+            scale: 0.5,
+            src: polIconUrlArray[oneIcon.values_.index - 1]
+          })
+        });
+
+        polyIcon.setStyle(polyIconStyle);
+        polyIconFeatures.push(polyIcon);
+
+      });
+
+      polIconSource.addFeatures(polyIconFeatures);
+    },
+
+    //加载icon图标
+    loadIcon () {
+      iconSource.clear()//清空多边形标注
+
+      if (this.iconArrays && this.iconArrays.length > 0) {
+
+        let iconFeatures = [];
+        let iconArraysNew = []
+        this.iconArrays.forEach((oneIcon, index) => {
+          //添加标注
+          let iconItem = new Feature({
+            geometry: new Point([oneIcon.longitude, oneIcon.latitude]),
+            id: oneIcon.id,
+            properties: {
+              type: "icon",
+              info: { ...oneIcon }
+            }
+          });
+
+          let iconStyle = new Style({
+            image: new Icon({
+              // anchor: [0.5, 0.5],
+              // imgSize: [32, 32],
+              // scale: 0.5,
+              src: this.iconUrlArray[oneIcon.urlIndex]
+            }),
+            text: this.createTextStyle(oneIcon)
+          });
+
+          iconItem.setStyle(iconStyle);
+          if (this.distanceMax) {
+            if (this.computedDistance(oneIcon.longitude, oneIcon.latitude, this.distanceMax)) {
+              iconFeatures.push(iconItem);
+            }
+          } else {
+            iconFeatures.push(iconItem);
+          }
+
+
+
+
+        });
+
+        iconSource.addFeatures(iconFeatures);
+      }
+    },
+
+    //icon文字样式
+    createTextStyle (feature) {
+      if (this.iconTextStyle) {
+        let iconTextStyle = { ...this.iconTextStyle }
+        iconTextStyle.text = feature.values_.name
+        return new Text({ ...iconTextStyle })
+      } else {
+        return null
+      }
+
+
+    },
+
+    //计算和中心点距离
+    computedDistance (lon, lat, max) {
+      let c1 = [2]; c1[0] = lon; c1[1] = lat;
+      let distance = getDistance(this.centerPoint, c1);
+      console.log(distance)
+      return (distance < max || distance === max)
+
+
+      // debugger
+      //   return 
+      // var wgs84Sphere = new ol.Sphere(6378137); 
+      // wgs84Sphere.haversineDistance([120.21592590991689, 30.210793016606],[120.21670777384473, 30.211168525868086]);
+    },
+
+    //初始化地图
+    initMap () {
+      this.setMapLocation()
+      gaodeMapLayer = new TileLayer({
+        title: "地图",
+        source: new XYZ({
+          //指定url瓦片
+          url: 'http://wprd0{1-4}.is.autonavi.com/appmaptile?lang=zh_cn&size=1&style=7&x={x}&y={y}&z={z}',
+          wrapX: true//x方向平铺，也可以选择false
+        }),
+        zIndex: 20
+      });
+
+      mapView = new View({
+        //中心点坐标
+        center: this.centerPoint,
+        // projection: 'EPSG:3857',
+        projection: 'EPSG:4326',
+        zoom: this.zoom,
+        minZoom: this.minZoom
+      })
+
+      //初始化map和地图底图
+      //创建地图容器
+      map = new Map({
+        layers: [gaodeMapLayer],
+        //加载瓦片图层数据
+        view: mapView,
+        target: 'map'
+        //目标加载到map中
+      })
+
+
+
+      //去除双击放大效果
+      const dblClickInteraction = map
+        .getInteractions()
+        .getArray()
+        .find(interaction => {
+          return interaction instanceof DoubleClickZoom;
+        });
+      map.removeInteraction(dblClickInteraction);
+
+    },
+    //设置地图定位的中心点和缩放级别
+    setMapLocation () {
+
+
+      if (this.mapInfo.longitude && this.mapInfo.latitude) {
+        this.centerPoint = []
+        this.centerPoint.push(this.mapInfo.longitude)
+        this.centerPoint.push(this.mapInfo.latitude)
+      } else {
+
+        this.centerPoint = centerPointGlobal
+      }
+
+      this.setZoom(this.mapInfo.level)
+    },
+
+    //根据组织层级设置缩放级别
+    setZoom (level) {
+      if (level === 'district') {
+        this.zoom = 11
+      } else if (level === 'street') {
+        this.zoom = 12
+      } else if (level === 'community') {
+        this.zoom = 13
+      }
+
+    },
+
+    //初始化多边形标注图层
+    initPolygonLayer () {
+      polygonSource = new VectorSource({
+        //features: (new GeoJSON()).readFeatures(geojsonObject)
+      });
+
+      polygonLayer = new VectorLayer({
+        source: polygonSource,
+        style: polygonStyleFunction,
+        zIndex: 50
+      });
+
+      //选中多边形后的样式
+      var overlayStyle = (function () {
+
+        return function (feature) {
+          var styles = {};
+          styles['Polygon'] = [
+            new Style({
+              stroke: new Stroke({
+                color: '#ec9000',
+                width: 2
+              })
+            }),
+
+            new Style({
+              fill: new Fill({
+                color: 'rgba(0, 0, 255, 0.1)'
+              })
+            }),
+            new Style({
+              text: createTextStyle(feature)
+            })
+          ];
+          styles['MultiPolygon'] = styles['Polygon'];
+          return styles[feature.getGeometry().getType()];
+        };
+      })();
+
+      select = new Select({
+        style: overlayStyle
+      });
+
+
+      map.addLayer(polygonLayer)
+      map.addInteraction(select);
+
+
+    },
+
+    //初始化多边形icon图层
+    initPolIconLayer () {
+      polIconSource = new VectorSource({
+        //features: (new GeoJSON()).readFeatures(geojsonObject)
+      });
+
+      polIconLayer = new VectorLayer({
+        source: polIconSource,
+        zIndex: 70
+      });
+
+      map.addLayer(polIconLayer);
+
+    },
+
+    //初始化icon图层
+    initIconLayer () {
+
+      iconSource = new VectorSource({
+        //features: (new GeoJSON()).readFeatures(geojsonObject)
+      });
+
+      iconLayer = new VectorLayer({
+        source: iconSource,
+        zIndex: 90
+      });
+
+      map.addLayer(iconLayer);
+      // select = new Select({ condition: click, });
+
+      // map.addInteraction(select);
+
+      // select.on('select', e => {
+      //   this.$emit('clickFeature', e)
+      // });
+    },
+
+    //添加覆盖层
+    addOverlay () {
+      // 使用变量存储弹窗所需的 DOM 对象
+      var container = document.getElementById("popup");
+      var closer = document.getElementById("popup-closer");
+      var content = document.getElementById("popup-content");
+
+      // 创建一个弹窗 Overlay 对象
+      this.overlay = new Overlay({
+        element: container, //绑定 Overlay 对象和 DOM 对象的
+        autoPan: true, // 定义弹出窗口在边缘点击时候可能不完整 设置自动平移效果
+        autoPanAnimation: {
+          duration: 250 //自动平移效果的动画时间 9毫秒
+        },
+        zIndex: 100
+      });
+      // 将弹窗添加到 map 地图中
+      map.addOverlay(this.overlay);
+      let _that = this;
+
+      /**
+       * 为弹窗添加一个响应关闭的函数
+       */
+      closer.onclick = function () {
+        _that.overlay.setPosition(undefined);
+        closer.blur();
+        return false;
+      };
+    },
+
+    //注册地图点击事件
+    addMapClick () {
+      let _that = this
+
+
+      map.on("click", function (evt) {
+        const feature = map.forEachFeatureAtPixel(evt.pixel, function (feature) {
+          return feature;
+        });
+        if (feature) {
+          console.log(feature)
+          if (_that.clickType === 'back') {
+
+            _that.$emit('clickFeature', feature)
+
+
+          } else if (_that.clickType === 'popup') {
+            _that.$emit('clickFeature', feature)
+            // _that.overlay.getElement().parentNode.style.display = 'block'
+            // _that.overlay.getElement().parentNode.parentNode.style.display = 'block'
+
+            // content.innerHTML = `
+            //     <p>你点击了这里：</p>
+            //     <p>经纬度：<p><code> </code> <p>
+            //     <p>坐标：</p>X：&nbsp;&nbsp; Y: `;
+            // _that.overlay.setPosition(evt.coordinate); //把 overlay 显示到指定的 x,y坐标
+
+
+          } else {
+            console.log('此处没有标注')
+          }
+
+        }
+
+      });
+    },
+
+    handleShowPopup (showData, coordinate) {
+      console.log(this.overlay.getElement())
+      this.overlay.getElement().style.display = 'block'
+      this.overlay.getElement().parentNode.style.display = 'block'
+      this.overlay.getElement().parentNode.parentNode.style.display = 'block'
+      var content = document.getElementById("popup-content");
+
+      content.innerHTML = showData;
+      this.overlay.setPosition(coordinate); //把 overlay 显示到指定的 x,y坐标
+    },
+
+    //取随机数
+    getRndBetween (lowerLimit, upperLimit) {
+      return Math.floor(Math.random() * (upperLimit - lowerLimit + 1)) + lowerLimit;
+    },
+
+    //开启加载动画
+    startLoading () {
+      loading = Loading.service({
+        lock: true, //是否锁定
+        text: '正在加载……', //加载中需要显示的文字
+        background: 'rgba(0,0,0,.7)' //背景颜色
+      });
+
+    },
+
+    //结束加载动画
+    endLoading () {
+      //clearTimeout(timer);
+      if (loading) {
+        loading.close();
+      }
+    },
+  },
+  props: {
+    //是否显示多边形图层
+    showPolygonLayer: {
+      type: Boolean,
+      default: false
+    },
+    //是否显示多边形icon图层
+    showPolIconLayer: {
+      type: Boolean,
+      default: false
+    },
+
+    //是否显示标注
+    showIconLayer: {
+      type: Boolean,
+      default: false
+    },
+    //是否添加弹出框图层
+    isAddOpenlay: {
+      type: Boolean,
+      default: false
+    },
+
+    //点击地图事件类型,back:返回，popup:弹出层
+    clickType: {
+      type: String,
+      default: 'back'
+    }
+
+  },
+  computed: {
+
+    mapHeight () {
+      return this.clientHeight - 120;
+
+    },
+
+    ...mapGetters(["clientHeight"])
+
+  },
+  components: {},
+}
+export default vueGis;
+</script>
+
+<style
+  lang="scss"
+  src="@/assets/scss/modules/visual/basicInfoMain.scss"
+  scoped
+></style>
+
+<style lang="scss" >
+.div_content_map {
+  .ol-viewport {
+    border-radius: 5px;
+  }
+  .div_map {
+    box-sizing: border-box;
+    width: 100%;
+    // padding: 10px 5px 13px;
+    // margin-top: 8px;
+    height: 100%;
+    color: #fff;
+  }
+}
+.ol-overlaycontainer-stopevent {
+  display: none;
+}
+.ol-popup {
+  position: absolute;
+  background-color: #1257c9;
+  -webkit-filter: drop-shadow(0 1px 4px rgba(0, 0, 0, 0.2));
+  filter: drop-shadow(0 1px 4px rgba(0, 0, 0, 0.2));
+  padding: 15px;
+  border-radius: 10px;
+  border: 1px solid #1257c9;
+  bottom: 12px;
+  left: -50px;
+  text-align: left;
+}
+.ol-popup:after,
+.ol-popup:before {
+  top: 100%;
+  border: solid transparent;
+  content: " ";
+  height: 0;
+  width: 0;
+  position: absolute;
+  pointer-events: none;
+}
+.ol-popup:after {
+  border-top-color: 1257c9;
+  border-width: 10px;
+  left: 48px;
+  margin-left: -10px;
+}
+.ol-popup:before {
+  border-top-color: #1257c9;
+  border-width: 11px;
+  left: 48px;
+  margin-left: -11px;
+}
+.ol-popup-closer {
+  text-decoration: none;
+  position: absolute;
+  top: 2px;
+  right: 8px;
+}
+.popup-content {
+  width: 300px;
+}
+.ol-popup-closer:after {
+  content: "✖";
+  color: rgba(1, 17, 104, 1);
+}
+</style>   
\ No newline at end of file
diff --git a/src/views/modules/visual/components/screen-nodata/index.vue b/src/views/modules/visual/components/screen-nodata/index.vue
new file mode 100644
index 00000000..9c34b253
--- /dev/null
+++ b/src/views/modules/visual/components/screen-nodata/index.vue
@@ -0,0 +1,34 @@
+<template>
+  <div class="empty">
+    <div class="icon"></div>
+  </div>
+</template>
+
+<script>
+export default {
+  data () {
+    return {}
+  },
+  methods: {}
+}
+</script>
+
+<style scoped lang="scss" rel="stylesheet/scss">
+.empty {
+  width: 100%;
+  height: calc(100% - 37px);
+  margin: 15px 0;
+
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  .icon {
+    width: 100%;
+    height: 160px;
+    background: url("../../../../../assets/img/modules/visual/noData.png")
+      no-repeat;
+    background-size: contain;
+    background-position: 50% 50%;
+  }
+}
+</style>
diff --git a/src/views/modules/visual/components/screen-table/index.vue b/src/views/modules/visual/components/screen-table/index.vue
new file mode 100644
index 00000000..c26e00fa
--- /dev/null
+++ b/src/views/modules/visual/components/screen-table/index.vue
@@ -0,0 +1,336 @@
+<template>
+  <div class="warning-table">
+    <div class="table">
+      <div class="table-header">
+        <div
+          class="table-header-th"
+          v-for="(item, index) in headerList"
+          :key="item.title"
+          :style="headerStyle[index]"
+        >
+          {{ item.title }}
+        </div>
+         <div
+          v-if="operate"
+          class="table-header-th"
+        >
+          操作
+        </div>
+      </div>
+      <div class="table-body">
+        <div
+          class="table-body-tr"
+          v-for="(value, index) in tableData"
+          :key="index"
+          @click.stop="handleClickRow(value)"
+        >
+          <div
+            class="td"
+            v-for="(item, indexs) in headerList"
+            :key="indexs"
+            :style="tableContentStyle[indexs]"
+          >
+            {{ value[item.coulmn] }}
+            <!-- <span
+              v-if="indexs + 1 == value.length && item.length > 8"
+              class="more"
+              @click.stop="onClickMorePop(index)"
+              ref="morePop"
+            >
+              更多>
+              <span class="more-pop" v-if="visiblePopList[index]">
+                {{ value[item.coulmn] }}
+              </span>
+            </span> -->
+          </div>
+          <div v-if="operate" class="td td-btn" @click="look(value)">查看</div>
+        </div>
+        <screen-loading v-if="visibleLoading">加载中</screen-loading>
+        <div class="no-data" v-if="tableData.length == 0 && !visibleLoading">
+          <img
+            src="../../../../../assets/img/modules/visual/noData.png"
+            alt=""
+            srcset=""
+            class="no-data-img"
+          />
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import ScreenLoading from "../screen-loading/index";
+import Vue from "vue";
+export default {
+  name: "warning-table",
+  components: {
+    ScreenLoading,
+  },
+  props: {
+    headerList: {
+      type: Array,
+      required: false,
+      default: () => {
+        return [
+          { title: "序号" },
+          { title: "所属网格" },
+          { title: "所属小区" },
+          { title: "楼号" },
+          { title: "姓名" },
+        ];
+      },
+    },
+    tableData: {
+      type: Array,
+      required: false,
+      default: () => {
+        return [
+          // [
+          //   1,
+          //   "商丘路社区第一网格",
+          //   "商丘路小区",
+          //   "2号楼",
+          //   "杨颖、王平、刘佳敏、丁辉、杨萍",
+          // ],
+          // [
+          //   2,
+          //   "商丘路社区第一网格",
+          //   "商丘路小区",
+          //   "2号楼",
+          //   "杨颖、王平、刘佳敏、丁辉、杨萍",
+          // ],
+        ];
+      },
+    },
+    // 单独给头部设置样式
+    headerStyle: {
+      type: Array,
+      default: () => {
+        return [
+          // {
+          //   width:'200px',
+          //   border:'1px solid red'
+          // },
+          // {
+          //   width:'200px'
+          // }
+        ];
+      },
+    },
+    // 单独给内容设置样式
+    tableContentStyle: {
+      type: Array,
+      default: () => {
+        return [
+          // {
+          //   width:'200px',
+          //   border:'1px solid red'
+          // },
+          // {
+          //   width:'200px'
+          // }
+        ];
+      },
+    },
+    visibleLoading: {
+      type: Boolean,
+      default: true,
+    },
+    operate: {
+      type: Boolean,
+      default: true
+    }
+    // // 表格平均分的份数
+    // ava: {
+    //   type: Number,
+    //   default: 8
+    // },
+    // // 表头高度--默认占比10%
+    // headerHeightAva: {
+    //   type: String,
+    //   default: '10%'
+    // },
+    // // 表格主体平均分成的份数
+    // tableContentAva: {
+    //   type: Number,
+    //   default: 5
+    // },
+  },
+  data() {
+    return {
+      visiblePopList: [
+        false,
+        false,
+        false,
+        false,
+        false,
+        false,
+        false,
+        false,
+        false,
+        false,
+      ],
+    };
+  },
+  watch: {
+    tableData(arr) {
+      if (Array.isArray(arr)) {
+        this.visiblePopList = new Array(arr.length).fill(false);
+      }
+    },
+  },
+
+  mounted() {
+    window.addEventListener("click", (e) => {
+      this.visiblePopList = new Array(this.visiblePopList.length).fill(false);
+    });
+  },
+
+  created() {},
+
+  methods: {
+    onClickMorePop(index) {
+      this.visiblePopList.forEach((item, indexs) => {
+        if (index == indexs) {
+          Vue.set(this.visiblePopList, index, true);
+        } else {
+          Vue.set(this.visiblePopList, indexs, false);
+        }
+      });
+    },
+    look(val) {
+      console.log('look-----l', val)
+      this.$emit('look', val)
+    },
+    handleClickRow(val) {
+      this.$emit('row', val)
+    }
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.warning-table {
+  box-sizing: border-box;
+  width: 100%;
+  height: 100%;
+  .table {
+    width: 100%;
+    height: 100%;
+    &-header {
+      width: 100%;
+      height: 50px;
+      display: flex;
+      justify-content: space-around;
+      align-items: center;
+      background: rgba(8, 37, 134, 0.85);
+      font-size: 16px;
+      font-weight: 400;
+      color: #ffffff;
+
+      &-th {
+        text-align: center;
+        width: calc(100% / 5);
+      }
+    }
+
+    &-body {
+      box-sizing: border-box;
+      width: 100%;
+      height: calc(100% - 50px);
+      font-size: 18px;
+      font-weight: 400;
+      color: #ffffff;
+
+      &-tr {
+        width: 100%;
+        height: 50px;
+        // height: calc(100% / 10);
+        display: flex;
+        justify-content: space-around;
+        align-items: center;
+
+        .td {
+          text-align: center;
+          width: calc(100% / 5);
+          box-sizing: border-box;
+          padding: 0 15px;
+          cursor: pointer;
+          overflow: hidden;
+          white-space: nowrap;
+          text-overflow: ellipsis;
+          .more {
+            font-size: 18px;
+            font-weight: 400;
+            color: #e4dc00;
+            position: relative;
+            cursor: pointer;
+
+            &-pop {
+              box-sizing: border-box;
+              display: block;
+              box-sizing: border-box;
+              width: 215px;
+              height: auto;
+              line-height: 20px;
+              border: 1px solid red;
+              position: absolute;
+              right: -100%;
+              top: 150%;
+              background: #06186d;
+              border: 1px solid #1a64cc;
+              border-radius: 5px;
+              font-size: 9px;
+              font-weight: 400;
+              color: #ffffff;
+              padding: 16px 8px 10px 9px;
+              z-index: 1;
+              cursor: default;
+              // &::after{
+              //   position: absolute;
+              //   left: 30%;
+              //   top: -30%;
+              //   display: flex;
+              //   content:'';
+              //   width: 0;
+              //   height: 0;
+              //   border-width: 13px;
+              //   border-style: solid;
+              //   border-color: transparent transparent rgba(26, 100, 204,0.5) transparent;
+              //   // border-color: transparent transparent red transparent;
+              //   transform: translate(-50%,0);
+              // }
+            }
+          }
+        }
+      }
+      .td-btn {
+        color: #e4dc00;
+      }
+
+      &-tr:nth-child(2n) {
+        background: rgba(16, 75, 164, 0.24);
+      }
+
+      &-tr:hover {
+        background: url("../../../../../assets/img/modules/visual/hover-bac.png")
+          no-repeat center;
+        background-size: 100% 100%;
+      }
+      // 暂无数据
+      .no-data {
+        width: 100%;
+        height: calc(100% - 50px);
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        &-img {
+          width: 249px;
+          height: 172px;
+        }
+      }
+    }
+  }
+}
+</style>
diff --git a/src/views/modules/visual/cpts/analyse.vue b/src/views/modules/visual/cpts/analyse.vue
new file mode 100644
index 00000000..6292ddc5
--- /dev/null
+++ b/src/views/modules/visual/cpts/analyse.vue
@@ -0,0 +1,588 @@
+<template>
+  <div class="analyse-container">
+    <div class="analyse-wr list-wr">
+
+      <div class="analys-col">
+        <div class="analys-family">
+          <div class="family-title">(家属)</div>
+          <div v-for="(item, index) in userList"
+               :key="index"
+               class="family-item"
+               @click="handleUser(item)">{{item.icUserName}}</div>
+          <!-- <div class="family-item">王亚男哈</div>
+          <div class="family-item">王亚男</div>
+          <div class="family-item">王亚男哈</div>
+          <div class="family-item">王亚</div> -->
+        </div>
+      </div>
+
+      <div class="analys-col">
+        <img class="analys-arrow"
+             src="../../../../assets/img/shuju/measure/zuo@2x.png" />
+      </div>
+
+      <div class="analys-col">
+        <div class="analys-person">
+          <div class="personal-name">{{userName}}</div>
+          <div class="personal-tips">(案件居民)</div>
+        </div>
+      </div>
+
+      <template v-if="hasEvent">
+        <div class="analys-col analys-col-posi">
+          <img class="analys-up"
+               src="../../../../assets/img/shuju/measure/up-right.png" />
+          <img class="analys-up analys-down"
+               src="../../../../assets/img/shuju/measure/down-right.png" />
+        </div>
+        <div class="analys-col">
+          <div class="cate-list cate-list-more">
+            <div class="cate-row">
+
+              <div class="analys-col">
+                <div class="analys-cate"
+                     @click="handleTabs('group')">
+                  <div class="label">{{ singleTitle }}</div>
+                  <div class="tips">(反应渠道)</div>
+                  <div class="icon">
+                    <img src="../../../../assets/img/shuju/measure/gantanhao.png" />
+                  </div>
+                </div>
+              </div>
+
+              <div v-if="sourceTab === 'group'"
+                   class="analys-col">
+                <img class="analys-arrow"
+                     src="../../../../assets/img/shuju/measure/you@2x.png" />
+              </div>
+
+            </div>
+
+            <div class="cate-row">
+
+              <div class="analys-col">
+                <div class="analys-cate"
+                     @click="handleTabs('event')">
+                  <div class="label">{{ moreTitle }}</div>
+                  <div class="tips">(反应渠道)</div>
+                  <div class="icon">
+                    <img src="../../../../assets/img/shuju/measure/gantanhao.png" />
+                  </div>
+                </div>
+              </div>
+
+              <div v-if="sourceTab === 'event'"
+                   class="analys-col">
+                <img class="analys-arrow"
+                     src="../../../../assets/img/shuju/measure/you@2x.png" />
+              </div>
+
+            </div>
+          </div>
+        </div>
+
+        <div class="analys-col analys-col-wr analys-col-more list-wr"
+             id="scroll-wr">
+          <div class="cate-list cate-list-child">
+            <div v-for="(item, index) in tempList"
+                 :key="index"
+                 class="cate-row">
+
+              <div class="cate-col">
+                <div class="analys-cate">
+                  <div class="label">{{item.categoryName}}</div>
+                  <div class="tips">(同类案件)</div>
+                  <div class="icon"
+                       @click="handleShow(item)">
+                    <img src="../../../../assets/img/shuju/measure/gantanhao.png" />
+                  </div>
+                </div>
+              </div>
+
+              <div class="cate-col cate-col-arrow">
+                <img v-show="item.showItem"
+                     class="analys-arrow"
+                     src="../../../../assets/img/shuju/measure/you@2x.png" />
+              </div>
+
+              <div class="cate-col cate-col-w100">
+                <div class="cate-list-w0"
+                     :class="item.showItem && 'cate-list-w100'">
+                  <div class="list list-wr">
+                    <template v-if="item.projectList && item.projectList.length > 0">
+                      <div v-for="(n, i) in item.projectList"
+                         :key="i"
+                         class="item"
+                         @click="handleProject(n)">
+                        <div class="item-status"
+                            :class="'item-status-'+n.status">{{filterStatus(n.status)}}</div>
+                        <div class="item-content">{{n.title}}</div>
+                      </div>
+                    </template>
+                    <div v-else class="no-data">暂无数据</div>
+                    <!-- <div class="item">
+                      <div class="item-status">已结案</div>
+                      <div class="item-content">合肥路与安宁路交合肥路与安宁路交</div>
+                    </div> -->
+
+                  </div>
+                </div>
+              </div>
+
+            </div>
+
+          </div>
+        </div>
+      </template>
+      <template v-else>
+        <div class="analys-col">
+          <img class="analys-arrow"
+               src="../../../../assets/img/shuju/measure/you@2x.png" />
+        </div>
+
+        <div class="analys-col">
+          <div class="analys-cate">
+            <div class="label">{{ singleTitle }}</div>
+            <div class="tips">(反应渠道)</div>
+            <!-- <div class="icon">
+              <img src="../../../../assets/img/shuju/measure/gantanhao.png" />
+            </div> -->
+          </div>
+        </div>
+
+        <div class="analys-col">
+          <img v-if="tempList.length > 1"
+               class="analys-up"
+               src="../../../../assets/img/shuju/measure/up-right.png" />
+          <img v-if="tempList.length != 2"
+               class="analys-arrow"
+               src="../../../../assets/img/shuju/measure/you@2x.png" />
+          <img v-if="tempList.length > 1"
+               class="analys-up analys-down"
+               src="../../../../assets/img/shuju/measure/down-right.png" />
+        </div>
+
+        <div class="analys-col list-wr"
+             :class="tempList.length > 2 && 'analys-col-wr' || 'analys-single'"
+             :style="'padding-top:' + (tempList.length - 3) * 190 + 'px;'">
+          <div class="cate-list">
+            <div v-for="(item, index) in tempList"
+                 :key="index"
+                 class="cate-row">
+
+              <div class="cate-col">
+                <div class="analys-cate">
+                  <div class="label">{{item.categoryName}}</div>
+                  <div class="tips">(同类案件)</div>
+                  <div class="icon"
+                       @click="handleShow(item)">
+                    <img src="../../../../assets/img/shuju/measure/gantanhao.png" />
+                  </div>
+                </div>
+              </div>
+              <div class="cate-col cate-col-arrow">
+                <img v-show="item.showItem"
+                     class="analys-arrow"
+                     src="../../../../assets/img/shuju/measure/you@2x.png" />
+              </div>
+
+              <div class="cate-col cate-col-w100">
+                <div class="cate-list-w0"
+                     :class="item.showItem && 'cate-list-w100'">
+                  <div class="list list-wr">
+                    <template v-if="item.projectList && item.projectList.length > 0">
+                      <div v-for="(n, i) in item.projectList"
+                         :key="i"
+                         class="item"
+                         @click="handleProject(n)">
+                        <div class="item-status"
+                            :class="'item-status-'+n.status">
+                          {{ n.statusName || filterStatus(n.status)}}
+                        </div>
+                        <div class="item-content">{{n.title}}</div>
+                      </div>
+                    </template>
+                    <div v-else class="no-data">暂无数据</div>
+                    <!-- <div class="item">
+                      <div class="item-status">已结案</div>
+                      <div class="item-content">合肥路与安宁路交合肥路与安宁路交</div>
+                    </div> -->
+
+                  </div>
+                </div>
+
+              </div>
+
+            </div>
+
+          </div>
+        </div>
+      </template>
+
+    </div>
+  </div>
+</template>
+
+<script>
+// singleList: [
+//   {
+//     categoryName: '辨明服务',
+//     categoryCode: '1',
+//     showItem: true,
+//     projectList: [
+//       {
+//         title: '不知道写了什么哈哈哈',
+//         status: 'closed',
+//         statusName: '',
+//         projectId: '1'
+//       }
+//     ]
+//   }
+// ]
+export default {
+  name: 'Analyse',
+  props: {
+    hasEvent: {
+      type: Boolean, // 楼院小组和事件上报同时存在时  为 true
+      default: false
+    },
+    moreTitle: String, // hasEvent 为true 时 传入
+    moreList: Array, // hasEvent 为true 时 传入
+    singleTitle: { // 默认，必传 单个来源或多个来源
+      type: String,
+      default: '楼院小组'
+    },
+    userList: Array, // 默认，必传 单个来源或多个来源
+    userName: String, // 默认，必传 单个来源或多个来源
+    singleList: Array, // 默认，必传 单个来源或多个来源
+
+  },
+  data () {
+    return {
+      sourceTab: 'group',
+      tempList: []
+    }
+  },
+  created () {
+    this.tempList = [...this.singleList]
+
+  },
+  methods: {
+    filterStatus (status) {
+      const statusObj = {
+        pending: '待处理',
+        closed: '已结案'
+      }
+      return statusObj[status]
+    },
+    handleTabs (type) {
+      if (type === 'group') this.tempList = [...this.singleList]
+      else if (type === 'event') this.tempList = [...this.moreList]
+      this.sourceTab = type
+      const _dom = document.getElementById('scroll-wr')
+      _dom.scrollTop = 0
+    },
+    handleProject (item) {
+      this.$emit('project', item)
+    },
+    handleUser (item) {
+      this.$emit('user', item)
+    },
+    handleShow (item) {
+      item.showItem = !item.showItem
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.analyse-container {
+  color: #fff;
+  .analyse-wr {
+    display: flex;
+    align-items: center;
+    width: 100%;
+    max-height: 560px;
+    box-sizing: border-box;
+    overflow: auto;
+
+    .analys-col {
+      position: relative;
+      cursor: pointer;
+      .analys-family {
+        text-align: center;
+        .family-title {
+          margin-bottom: 8px;
+        }
+        .family-item {
+          width: 76px;
+          box-sizing: border-box;
+          margin-bottom: 28px;
+          padding: 8px 0;
+          font-size: 14px;
+          color: #fff;
+          text-align: center;
+          background: rgba(255, 255, 255, 0);
+          border: 1px solid #1257c9;
+          border-radius: 2px;
+          box-shadow: 0 0 5px 2px rgba(18, 87, 201, 1) inset;
+        }
+      }
+      .analys-up {
+        display: block;
+        width: 64px;
+        height: 99px;
+        box-sizing: border-box;
+        margin-bottom: 85px;
+      }
+      .analys-down {
+        margin-top: 85px;
+        margin-bottom: 0;
+      }
+      .analys-arrow {
+        display: block;
+        width: 32px;
+        height: 18px;
+        box-sizing: border-box;
+        margin: 0 6px;
+      }
+
+      .analys-person {
+        width: 154px;
+        height: 152px;
+        box-sizing: border-box;
+        padding-top: 60px;
+        color: #fff;
+        text-align: center;
+        background: url("../../../../assets/img/shuju/measure/zhuhu@2x.png")
+          no-repeat center;
+        background-size: cover;
+        .personal-name {
+          font-size: 18px;
+          font-weight: 500;
+        }
+        .personal-tips {
+          margin-top: 6px;
+          font-size: 14px;
+        }
+      }
+
+      .analys-cate {
+        display: flex;
+        flex-direction: column;
+        justify-content: center;
+        align-items: center;
+        position: relative;
+        width: 120px;
+        min-height: 64px;
+        box-sizing: border-box;
+        padding: 14px 20px;
+        text-align: center;
+        color: #fff;
+        cursor: pointer;
+        background: rgba(255, 255, 255, 0);
+        border: 1px solid #1257c9;
+        border-radius: 4px;
+        box-shadow: 1px 1px 10px 5px rgba(18, 87, 201, 1) inset;
+        .label {
+          font-size: 18px;
+          font-weight: 500;
+        }
+        .tips {
+          margin-top: 6px;
+          font-size: 14px;
+        }
+        .icon {
+          position: absolute;
+          right: 4px;
+          bottom: 4px;
+          width: 12px;
+          height: 12px;
+          img {
+            display: block;
+            width: 100%;
+            height: 100%;
+          }
+        }
+      }
+
+      .cate-list {
+        // padding-top: 200px;
+        // display: flex;
+        // flex-direction: column;
+        // justify-content: space-between;
+        .cate-row {
+          display: flex;
+          align-items: center;
+          margin-bottom: 20px;
+          // margin-top: 0;
+          .cate-col-arrow {
+            width: 32px;
+            height: 18px;
+            // box-sizing: border-box;
+            margin: 0 6px;
+            .analys-arrow {
+              display: block;
+              width: 32px;
+              height: 100%;
+              box-sizing: border-box;
+              margin: 0 auto;
+            }
+          }
+          .cate-col-w100 {
+            width: 230px;
+            .cate-list-w0 {
+              width: 0;
+              transition: width 0.2s;
+              overflow: hidden;
+              // border: 0;
+              // padding: 0;
+            }
+            .cate-list-w100 {
+              width: 230px;
+              // padding: 4px 14px 10px;
+              // // background: rgba(255, 255, 255, 0);
+              // border: 1px solid #1257C9;
+              // overflow: auto;
+              transition: width 0.2s;
+            }
+          }
+        }
+      }
+      .cate-list-more {
+        // padding-top: 300px;
+        .cate-row {
+          margin-bottom: 200px;
+          // margin-top: 0;
+        }
+        .cate-row:last-child {
+          margin-bottom: 0;
+        }
+      }
+      .cate-list-child {
+        padding-top: 60px;
+      }
+
+      .list {
+        width: 230px;
+        height: 165px;
+        box-sizing: border-box;
+        padding: 4px 14px 10px;
+        background: rgba(255, 255, 255, 0);
+        border: 1px solid #1257c9;
+        overflow: auto;
+        border-radius: 4px;
+        box-shadow: 1px 1px 10px 5px rgba(18, 87, 201, 1) inset;
+        .item {
+          display: flex;
+          align-items: center;
+          width: 100%;
+          box-sizing: border-box;
+          padding: 8px 0;
+          color: #fff;
+          border-bottom: 1px dashed rgba(131, 152, 217, 1);
+          .item-status {
+            min-width: 50px;
+            // height: 15px;
+            box-sizing: border-box;
+            margin-right: 8px;
+            padding: 4px 0 2px;
+            font-size: 10px;
+            text-align: center;
+            // line-height: 15px;
+            background: #0c5cfe;
+            border-radius: 2px;
+            &-pending,
+            &-canceled {
+              background: rgba(224, 84, 0, 1);
+            }
+            &-assigned,
+            &-have_order {
+              background: rgba(9, 163, 125, 1);
+            }
+          }
+          .item-content {
+            font-size: 14px;
+            text-overflow: ellipsis;
+            white-space: nowrap;
+            overflow: hidden;
+          }
+        }
+      }
+    }
+    .analys-col-wr {
+      height: 100%;
+      box-sizing: border-box;
+      padding-right: 30px;
+      overflow: auto;
+    }
+    .analys-col-more {
+      height: 560px;
+    }
+    .analys-single {
+      .list {
+        height: 235px;
+      }
+      .cate-list {
+        .cate-row {
+          margin-bottom: 0;
+        }
+      }
+    }
+    .analys-col-posi {
+      // .analys-up, .analys-down {
+      //   position: absolute;
+      // }
+      .analys-up {
+        // top: -200px;
+        // left: -30px;
+        // margin-bottom: 160px;
+      }
+      .analys-down {
+        // margin-top: 160px;
+        // margin-bottom: 0;
+        // top: unset;
+        // bottom: -200px;
+        // left: -30px;
+      }
+    }
+  }
+}
+.no-data {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  height: 100%;
+  color: #fff;
+  text-align: center;
+  line-height: 100%;
+}
+.pad10 {
+  padding-top: 10px;
+}
+.list-wr::-webkit-scrollbar {
+  width: 8px;
+  // background: linear-gradient(270deg, #0063FE, #0095FF);
+}
+
+.list-wr::-webkit-scrollbar-corner,
+  /* 滚动条角落 */
+.list-wr::-webkit-scrollbar-thumb,
+.list-wr::-webkit-scrollbar-track {
+  /*滚动条的轨道*/
+  border-radius: 4px;
+}
+
+.list-wr::-webkit-scrollbar-corner,
+.list-wr::-webkit-scrollbar-track {
+  /* 滚动条轨道 */
+
+  background: rgba(12, 129, 254, 0.24);
+  // box-shadow: inset 0 0 1px rgba(180, 160, 120, 0.5);
+}
+
+.list-wr::-webkit-scrollbar-thumb {
+  /* 滚动条手柄 */
+  background: linear-gradient(270deg, #0063fe, #0095ff);
+}
+</style>
diff --git a/src/views/modules/visual/cpts/line-chart.vue b/src/views/modules/visual/cpts/line-chart.vue
new file mode 100644
index 00000000..8cb617e7
--- /dev/null
+++ b/src/views/modules/visual/cpts/line-chart.vue
@@ -0,0 +1,232 @@
+<template>
+  <div class="m-chart">
+    <canvas id="myChart"
+            :width="width"
+            :height="height" />
+  </div>
+</template>
+
+<script>
+import nextTick from "dai-js/tools/nextTick";
+// ios下字体渲染有bug
+const fontFamily = "PingFang SC";
+const fontSize = 14;
+
+let chart;
+let srcData = [];
+
+let textShapeList = [];
+const addTextShape = () => {
+  if (textShapeList.length > 0) {
+    textShapeList.forEach((item) => {
+      item.remove(true);
+    });
+    textShapeList = [];
+  }
+  // 添加折线上文本
+  const canvas = chart.get("canvas");
+  const group = canvas.addGroup();
+  const shapes = {};
+
+  function addFn (list) {
+    const listLength = list.length;
+    list.forEach(function (obj, index) {
+      // 避免显示太多，乱七八糟
+      if (listLength > 7 && index > 0 && index < listLength - 1) {
+        if (index % Math.ceil(listLength / 5) != 0) {
+          return;
+        }
+      }
+
+      const offsetX = 6;
+      const offsetY = 1;
+      const point = chart.getPosition(obj);
+      const text = group.addShape("text", {
+        attrs: {
+          x: obj.type === "支持" ? point.x + 2 * offsetX : point.x - offsetX,
+          y: point.y + offsetY,
+          text: obj.value,
+          textAlign: "center",
+          textBaseline: "bottom",
+          fill: "#333",
+          fontWeight: 500,
+          fontFamily,
+          fontSize,
+        },
+      });
+
+      textShapeList.push(text); // 缓存该 shape, 便于后续查找
+    });
+  }
+  srcData.sort((a, b) => {
+    return new Date(a.date).getTime() - new Date(b.date).getTime();
+  });
+  let supData = srcData.filter((item) => item.type == "支持");
+  let oppData = srcData.filter((item) => item.type == "反对");
+  addFn(supData);
+  addFn(oppData);
+};
+
+const iniChart = function (config, srcData) {
+  chart = new window.F2.Chart({
+    id: "myChart",
+    ...config,
+  });
+
+  const supColor = "#FFDA0E";
+  const oppColor = "#00E5ED";
+
+  chart.source(srcData, {
+    date: {
+      range: [0, 1],
+      type: "timeCat",
+      mask: "MM-DD",
+    },
+    value: {
+      // type: "linear",
+    },
+  });
+  // 设置坐标轴
+  chart.axis("date", {
+    line: {
+      lineWidth: 1,
+      stroke: "#E7EEEE",
+    },
+    label: {
+      fontWeight: 500,
+      fontSize,
+      fill: "#B5B7BF",
+      textBaseline: "middle",
+    },
+    labelOffset: 25,
+    country: {
+      range: [0.1, 0.9], // 配置 range 范围，使左右两边不留边距
+    },
+    grid: null,
+  });
+  chart.axis("value", {
+    line: {
+      lineWidth: 1,
+      stroke: "#E7EEEE",
+    },
+    labelOffset: 20,
+    label: {
+      fontWeight: 500,
+      fontSize,
+      fill: "#B5B7BF",
+    },
+  });
+  // 类别标识区
+  chart.legend({
+    position: "bottom",
+    align: "center",
+    offsetY: -30,
+    custom: true,
+    nameStyle: {
+      fill: "#999",
+      fontWeight: 500,
+      fontSize,
+    },
+    itemWidth: 150,
+    wordSpace: 25,
+    items: [
+      {
+        name: "支持",
+        marker (x, y, r, ctx) {
+          ctx.lineWidth = 10;
+          ctx.strokeStyle = supColor;
+          ctx.moveTo(x - r - 15, y);
+          ctx.lineTo(x + r + 15, y);
+          ctx.stroke();
+          ctx.fill();
+        },
+      },
+      {
+        name: "反对",
+        marker (x, y, r, ctx) {
+          ctx.lineWidth = 10;
+          ctx.strokeStyle = oppColor;
+          ctx.moveTo(x - r - 15, y);
+          ctx.lineTo(x + r + 15, y);
+          ctx.stroke();
+          ctx.fill();
+        },
+      },
+    ],
+  });
+  // 添加折线
+  chart
+    .line()
+    .position("date*value")
+    .color("type", (type) => {
+      if (type === "支持") {
+        return supColor;
+      }
+      return oppColor;
+    })
+    .style("type", {
+      lineWidth: 1,
+    })
+    .animate();
+  chart.render();
+
+  addTextShape();
+
+  // 注意：需要把chart return 出来
+  return chart;
+};
+
+export default {
+  name: "chart",
+  props: {
+    list: {
+      type: Array,
+      default: () => {
+        return [];
+      },
+    },
+    config: {
+      type: Object,
+      default: () => {
+        return {};
+      },
+    },
+    width: {
+      type: Number,
+      default: 400,
+    },
+    height: {
+      type: Number,
+      default: 260,
+    },
+  },
+  data () {
+    return {
+      iniLoading: false,
+    };
+  },
+  watch: {
+    list (data) {
+      chart.changeData(data);
+      srcData = data;
+      addTextShape();
+    },
+  },
+  async created () {
+    await nextTick(200);
+    iniChart(this.config, this.list);
+    await nextTick(200);
+    this.iniLoading = true;
+  },
+
+  methods: {
+    setList (data) {
+      chart.changeData(data);
+      srcData = data;
+      addTextShape();
+    },
+  }
+};
+</script>
+
+<style lang="scss" scoped></style>
diff --git a/src/views/modules/visual/cpts/loading.vue b/src/views/modules/visual/cpts/loading.vue
new file mode 100644
index 00000000..cc8bda6f
--- /dev/null
+++ b/src/views/modules/visual/cpts/loading.vue
@@ -0,0 +1,68 @@
+<template>
+  <div class="screen-loading">
+    <svg width="50px"
+         height="50px">
+      <circle cx="25"
+              cy="25"
+              r="20"
+              fill="transparent"
+              stroke-width="3"
+              stroke-dasharray="31.415, 31.415"
+              stroke="#29cdff"
+              stroke-linecap="round">
+        <animateTransform attributeName="transform"
+                          type="rotate"
+                          values="0, 25 25;360, 25 25"
+                          dur="1.5s"
+                          repeatCount="indefinite" />
+        <animate attributeName="stroke"
+                 values="#02bcfe;#3be6cb;#02bcfe"
+                 dur="3s"
+                 repeatCount="indefinite" />
+      </circle>
+
+      <circle cx="25"
+              cy="25"
+              r="10"
+              fill="transparent"
+              stroke-width="3"
+              stroke-dasharray="15.7, 15.7"
+              stroke="#29cdff"
+              stroke-linecap="round">
+        <animateTransform attributeName="transform"
+                          type="rotate"
+                          values="360, 25 25;0, 25 25"
+                          dur="1.5s"
+                          repeatCount="indefinite" />
+        <animate attributeName="stroke"
+                 values="#3be6cb;#02bcfe;#3be6cb"
+                 dur="3s"
+                 repeatCount="indefinite" />
+      </circle>
+    </svg>
+    <div class="loading-tip">
+      <slot></slot>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'DvLoading'
+}
+</script>
+
+<style lang="scss" scoped>
+.screen-loading {
+  width: 100%;
+  height: 100%;
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+  align-items: center;
+  .loading-tip {
+    font-size: 14px;
+    color: #fff;
+  }
+}
+</style>
diff --git a/src/views/modules/visual/cpts/tb.vue b/src/views/modules/visual/cpts/tb.vue
new file mode 100644
index 00000000..f0e903b3
--- /dev/null
+++ b/src/views/modules/visual/cpts/tb.vue
@@ -0,0 +1,224 @@
+<template>
+  <div class="m-table">
+    <table class="table" border="0" cellspacing="0" cellpadding="0">
+      <col
+        :align="item.align"
+        :width="item.width"
+        :key="'col' + index"
+        v-for="(item, index) in colList"
+      />
+
+      <thead>
+        <tr class="table-header">
+          <th class="table-header-th" v-for="item in header" :key="item">
+            {{ item }}
+          </th>
+        </tr>
+      </thead>
+      <tbody class="table-body">
+        <tr class="table-body-tr" v-for="(value, index) in list" :key="index">
+          <td class="td" v-for="(item, indexs) in value" :key="indexs">
+            <span v-if="typeof item === 'string' || typeof item === 'number'">{{
+              item
+            }}</span>
+            <div v-if="typeof item === 'object' && item.type == 'index'">
+              <img
+                v-if="highlightTop3 && index == 0"
+                src="@/assets/img/shuju/top/1.png"
+                alt=""
+              />
+              <img
+                v-else-if="highlightTop3 && index == 1"
+                src="@/assets/img/shuju/top/2.png"
+                alt=""
+              />
+              <img
+                v-else-if="highlightTop3 && index == 2"
+                src="@/assets/img/shuju/top/3.png"
+                alt=""
+              />
+              <span v-else>{{ index + 1 }}</span>
+            </div>
+            <a
+              v-else-if="typeof item === 'object' && item.type == 'operate'"
+              v-for="btn in item.list"
+              :key="'operate' + index + btn"
+              @click="handleClickBtn(index, btn)"
+              >{{ btn }}</a
+            >
+          </td>
+        </tr>
+      </tbody>
+    </table>
+
+    <div class="table-status" v-if="loading">
+      <screen-loading>加载中</screen-loading>
+    </div>
+
+    <div class="table-status" v-if="list.length == 0 && !loading">
+      <div class="no-data">
+        <img src="@/assets/img/modules/visual/noData.png" class="no-data-img" />
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import ScreenLoading from "./loading";
+import Vue from "vue";
+
+export default {
+  name: "table",
+  components: {
+    ScreenLoading,
+  },
+  props: {
+    colList: {
+      type: Array,
+      default: () => {
+        return [
+          // {
+          //   align: "center",
+          //   width: "50%",
+          // },
+        ];
+      },
+    },
+    header: {
+      type: Array,
+      required: false,
+      default: () => {
+        return [
+          // "序号", "所属网格", "操作"
+        ];
+      },
+    },
+    list: {
+      type: Array,
+      required: false,
+      default: () => {
+        return [
+          //   [
+          //     1,
+          //     "商丘路社区第一网格",
+          //     {
+          //       type: "operate",
+          //       list: ["查看"],
+          //     },
+          //   ],
+          //   [
+          //     2,
+          //     "商丘路社区第一网格",
+          //     {
+          //       type: "operate",
+          //       list: ["查看"],
+          //     },
+          //   ],
+        ];
+      },
+    },
+    loading: {
+      type: Boolean,
+      default: true,
+    },
+    highlightTop3: {
+      type: Boolean,
+      default: false,
+    },
+  },
+  data() {
+    return {};
+  },
+  watch: {},
+
+  mounted() {},
+
+  created() {},
+
+  methods: {
+    handleClickBtn(index, type) {
+      this.$emit("operate", index, type);
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.m-table {
+  .table {
+    box-sizing: border-box;
+    width: 100%;
+    height: 100%;
+    border: none;
+
+    &-header {
+      width: 100%;
+      height: 50px;
+      background: rgba(8, 37, 134, 0.85);
+      font-size: 16px;
+      font-weight: 400;
+      color: #ffffff;
+
+      &-th {
+        text-align: center;
+        border: none;
+        // width: calc(100% / 5);
+      }
+    }
+
+    &-body {
+      box-sizing: border-box;
+      width: 100%;
+      font-size: 16px;
+      font-weight: 400;
+      color: #ffffff;
+
+      &-tr {
+        box-sizing: border-box;
+        width: 100%;
+        min-height: 50px;
+
+        .td {
+          text-align: center;
+          border: none;
+          padding: 10px 0;
+          a {
+            font-size: 16px;
+            font-weight: 400;
+            color: #e4dc00;
+            position: relative;
+            cursor: pointer;
+          }
+        }
+      }
+
+      &-tr:nth-child(2n) {
+        background: rgba(16, 75, 164, 0.24);
+      }
+
+      &-tr:hover {
+        background: url("../../../../assets/img/modules/visual/hover-bac.png")
+          no-repeat center;
+        background-size: 100% 100%;
+      }
+    }
+  }
+
+  .table-status {
+    position: relative;
+    height: 300px;
+
+    // 暂无数据
+    .no-data {
+      &-img {
+        position: absolute;
+        top: 0;
+        left: 0;
+        right: 0;
+        bottom: 0;
+        margin: auto;
+      }
+    }
+  }
+}
+</style>
diff --git a/src/views/modules/visual/heart/index.vue b/src/views/modules/visual/heart/index.vue
new file mode 100644
index 00000000..1267d16b
--- /dev/null
+++ b/src/views/modules/visual/heart/index.vue
@@ -0,0 +1,317 @@
+<template>
+  <div>
+    <div class="m-sizer">
+      <span>时间：</span>
+      <el-date-picker
+        v-model="monthId"
+        type="month"
+        :clearable="false"
+        prefix-icon="el-icon-caret-bottom"
+        placeholder="选择日期"
+        value-format="yyyyMM"
+      >
+      </el-date-picker>
+    </div>
+
+    <div class="g-cpt">
+      <div class="m-tb">
+        <cpt-card>
+          <div class="title">
+            <img src="@/assets/img/shuju/title-tip.png" />
+            <span>公益达人</span>
+          </div>
+
+          <div class="tb">
+            <cpt-tb
+              :highlight-top3="true"
+              :col-list="tb3.colList"
+              :loading="tb3.loading"
+              :header="tb3.header"
+              :list="tb3.list"
+            ></cpt-tb>
+          </div>
+        </cpt-card>
+      </div>
+
+      <div class="m-tb">
+        <cpt-card>
+          <div class="title">
+            <img src="@/assets/img/shuju/title-tip.png" />
+            <span>党员先锋</span>
+          </div>
+
+          <div class="tb">
+            <cpt-tb
+              :highlight-top3="true"
+              :col-list="tb2.colList"
+              :loading="tb2.loading"
+              :header="tb2.header"
+              :list="tb2.list"
+            ></cpt-tb>
+          </div>
+        </cpt-card>
+      </div>
+
+      <div class="m-tb">
+        <cpt-card>
+          <div class="title">
+            <img src="@/assets/img/shuju/title-tip.png" />
+            <span>动力网格</span>
+          </div>
+
+          <div class="tb">
+            <cpt-tb
+              :highlight-top3="true"
+              :col-list="tb1.colList"
+              :loading="tb1.loading"
+              :header="tb1.header"
+              :list="tb1.list"
+            ></cpt-tb>
+          </div>
+        </cpt-card>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import { Loading } from "element-ui"; //引入Loading服务
+import { requestPost } from "@/js/dai/request";
+import cptCard from "@/views/modules/visual/cpts/card";
+import cptTb from "@/views/modules/visual/cpts/tb";
+import nextTick from "dai-js/tools/nextTick";
+import dateFormat from "dai-js/tools/dateFormat";
+
+export default {
+  name: "heart",
+  data() {
+    return {
+      agencyId: this.$store.state.user.agencyId,
+      areaCode: "",
+
+      monthId: dateFormat(
+        new Date(
+          new Date().getFullYear(),
+          new Date().getMonth() - 1,
+          new Date().getDate()
+        ),
+        "yyyyMM"
+      ),
+
+      // 先进网格/支部
+      tb1: {
+        loading: true,
+        colList: [
+          {
+            align: "center",
+            width: "10%",
+          },
+          {
+            align: "center",
+            width: "60%",
+          },
+          {
+            align: "center",
+            width: "30",
+          },
+        ],
+        header: ["序号", "网格名称", "活力值"],
+        list: [],
+        srcList: [],
+        currentIndex: 0,
+      },
+
+      // 先进网格/支部
+      tb2: {
+        loading: true,
+        colList: [
+          {
+            align: "center",
+            width: "10%",
+          },
+          {
+            align: "center",
+            width: "30%",
+          },
+          {
+            align: "center",
+            width: "40%",
+          },
+          {
+            align: "center",
+            width: "20",
+          },
+        ],
+        header: ["序号", "党员姓名", "所属网格", "积分总数"],
+        list: [],
+        srcList: [],
+        currentIndex: 0,
+      },
+
+      // 先进网格/支部
+      tb3: {
+        loading: true,
+        colList: [
+          {
+            align: "center",
+            width: "10%",
+          },
+          {
+            align: "center",
+            width: "30%",
+          },
+          {
+            align: "center",
+            width: "40%",
+          },
+          {
+            align: "center",
+            width: "20",
+          },
+        ],
+        header: ["序号", "居民姓名", "所属网格", "积分总数"],
+        list: [],
+        srcList: [],
+        currentIndex: 0,
+      },
+    };
+  },
+
+  props: {},
+
+  computed: {},
+
+  components: {
+    cptCard,
+    cptTb,
+  },
+
+  watch: {
+    monthId() {
+      this.getApiData();
+    },
+  },
+
+  async mounted() {
+    this.userId = this.uid;
+    await nextTick(100);
+    this.getApiData();
+  },
+
+  methods: {
+    handleSearch() {},
+
+    async getApiData() {
+      //await this.getAgencyInfo();
+      this.getTb1();
+      this.getTb2();
+      this.getTb3();
+    },
+
+    toUserInfo(uid) {
+      this.$router.push({ path: `/main-shuju/visual-basicinfo-people/${uid}` });
+    },
+
+    // 获取当前组织信息
+    async getAgencyInfo() {
+      const { data, code, msg } = await requestPost(
+        "/data/report/screen/agency/agencydetail-multic",
+        {
+          agencyId: this.$store.state.user.agencyId,
+        }
+      );
+      if (msg === "success" && code === 0) {
+        this.agencyId = data.agencyId;
+        this.areaCode = data.areaCode;
+      }
+    },
+
+    //加载组织数据
+    async getTb1() {
+      const { agencyId, areaCode } = this;
+      const url = "/data/report/screen/index/advancedbranchrank";
+      let params = {
+        agencyId,
+        areaCode,
+        monthId: this.monthId,
+        orgType: "agency",
+        topNum: 50,
+      };
+
+      const { data, code, msg } = await requestPost(url, params);
+      this.tb1.loading = false;
+
+      if (code === 0) {
+        this.tb1.list = data.map((item) => {
+          return [{ type: "index" }, item.name, item.scroe];
+        });
+        this.tb1.srcList = data;
+      } else {
+        this.$message.error(msg);
+      }
+    },
+
+    //加载组织数据
+    async getTb2() {
+      const { agencyId, areaCode } = this;
+      const url = "/data/report/screen/user/partypointrank";
+      let params = {
+        orgId: agencyId,
+        areaCode,
+        monthId: this.monthId,
+        orgType: "agency",
+        topNum: 50,
+      };
+
+      const { data, code, msg } = await requestPost(url, params);
+      this.tb2.loading = false;
+
+      if (code === 0) {
+        this.tb2.list = data.map((item) => {
+          return [
+            { type: "index" },
+            item.userName,
+            item.gridName,
+            item.pointTotal,
+          ];
+        });
+        this.tb2.srcList = data;
+      } else {
+        this.$message.error(msg);
+      }
+    },
+
+    //加载组织数据
+    async getTb3() {
+      const { agencyId, areaCode } = this;
+      const url = "/data/report/screen/user/userpointrank/withoutpartymember";
+      let params = {
+        orgId: agencyId,
+        areaCode,
+        monthId: this.monthId,
+        orgType: "agency",
+        topNum: 50,
+      };
+
+      const { data, code, msg } = await requestPost(url, params);
+      this.tb3.loading = false;
+
+      if (code === 0) {
+        this.tb3.list = data.map((item) => {
+          return [
+            { type: "index" },
+            item.userName,
+            item.gridName,
+            item.pointTotal,
+          ];
+        });
+        this.tb3.srcList = data;
+      } else {
+        this.$message.error(msg);
+      }
+    },
+  },
+};
+</script>
+
+<style lang="scss" src="@/assets/scss/modules/visual/heart.scss" scoped></style>
diff --git a/src/views/modules/visual/measure/dialogInfo.vue b/src/views/modules/visual/measure/dialogInfo.vue
new file mode 100644
index 00000000..2a50f80d
--- /dev/null
+++ b/src/views/modules/visual/measure/dialogInfo.vue
@@ -0,0 +1,305 @@
+<template>
+  <div class="m-pop">
+    <div class="wrap">
+      <cpt-card>
+        <div class="title">
+          <img src="@/assets/img/shuju/title-tip.png" />
+          <span>需求详情</span>
+        </div>
+
+        <div class="btn-close" @click="handleClose">
+          <img src="@/assets/img/shuju/people/close.png" />
+        </div>
+        <div class="list-title">需求内容</div>
+        <div class="list-wr">
+          <div class="list">
+            <div class="item-desc">
+              <!-- <span class="item-field">所属网格：</span> -->
+              <span>{{ info.content }}</span>
+            </div>
+            <div class="item">
+              <span class="item-field">所属网格：</span>
+              <span>{{ info.gridName }}</span>
+            </div>
+            <div class="item">
+              <span class="item-field">需求类型：</span>
+              <span>{{ info.categoryName }}</span>
+            </div>
+            <div class="item">
+              <span class="item-field">需求状态：</span>
+              <span>{{ info.statusName }}</span>
+            </div>
+            <div class="item">
+              <span class="item-field">上报类型：</span>
+              <span>{{ info.reportTypeName }}</span>
+            </div>
+            <div class="item">
+              <span class="item-field">上 报 人：</span>
+              <span>{{ info.reportUserName }}</span>
+            </div>
+            <div class="item">
+              <span class="item-field">上报人联系方式：</span>
+              <span>{{ info.reportUserMobile }}</span>
+            </div>
+            <div class="item">
+              <span class="item-field">上报时间：</span>
+              <span>{{ info.reportTime }}</span>
+            </div>
+            <div class="item">
+              <span class="item-field">服务时间：</span>
+              <span>{{ info.wantServiceTime }}</span>
+            </div>
+          </div>
+          <div class="list">
+            <div class="item" v-if="info.serviceShowFlag">
+              <span class="item-field">服务方：</span>
+              <span>{{ info.serviceShowName }}</span>
+            </div>
+            <template v-if="info.status == 'finished'">
+              <div class="item">
+                <span class="item-field">实际服务时间：</span>
+                <span v-if="info.serviceStartTime"
+                  >{{ info.serviceStartTime }} 至 <br />
+                  {{ info.serviceEndTime }}</span
+                >
+              </div>
+              <div class="item">
+                <span class="item-field">完成情况：</span>
+                <span
+                  >{{ info.finishResult == "resolved" ? "已解决" : "未解决" }}
+                  <br />
+                  {{ info.finishDesc }}</span
+                >
+              </div>
+              <div class="item">
+                <span class="item-field">评价：</span>
+                <span>
+                  <el-rate :value="info.score" disabled></el-rate>
+                </span>
+              </div>
+            </template>
+            
+          </div>
+        </div>
+
+        <div class="tabs">
+          <div class="tab-btn">
+            <img src="@/assets/img/shuju/people/arrow-double-left.png" />
+          </div>
+          <div class="tab z-on">研判分析</div>
+          <div class="tab-btn">
+            <img src="@/assets/img/shuju/people/arrow-double-right.png" />
+          </div>
+        </div>
+
+        <div style="padding: 30px 0">
+          <analyse
+            v-if="!loading"
+            :single-list="demandList"
+            :single-title="'需求上报'"
+            :more-title="'事件上报'"
+            :user-list="userLists"
+            :user-name="info.demandUserName"
+            :has-event="false"
+            :more-list="eventList"
+            @project="handleToProject"
+            @user="handleToUser"
+          />
+        </div>
+      </cpt-card>
+    </div>
+  </div>
+</template>
+
+<script>
+import cptCard from "@/views/modules/visual/cpts/card";
+import analyse from "../cpts/analyse.vue";
+import { requestPost } from "@/js/dai/request";
+
+export default {
+  name: "dialogInfo",
+  props: {
+    userId: {
+      type: String,
+      default: "",
+    },
+    demandId: String,
+    queryOrigin: String,
+    // info: Object,
+  },
+
+  components: {
+    cptCard,
+    analyse,
+  },
+
+  data() {
+    return {
+      loading: false,
+      info: {},
+      demandList: [
+        // {
+        //   categoryName: '辨明服务',
+        //   categoryCode: '1',
+        //   showItem: false,
+        //   projectList: [
+        //     {
+        //       title: '不知道写了什么哈哈哈',
+        //       status: 'closed',
+        //       projectId: '1'
+        //     }
+        //    
+        //   ]
+        // },
+        
+      ],
+      userLists: [
+        // {
+        //   homeId: "1",
+        //   icUserId: "1",
+        //   icUserName: "沾上干",
+        // }
+      ],
+      userName: "王亚男哈",
+      eventList: [
+        // {
+        //   categoryName: "辨明服务",
+        //   categoryCode: "1",
+        //   projectList: [
+        //     {
+        //       title: "不知道写了什么哈哈哈",
+        //       status: "closed",
+        //       projectId: "1",
+        //     },
+            
+        //   ],
+        // },
+        
+      ]
+    };
+  },
+
+  async mounted() {
+    await this.getInfo(this.demandId);
+  },
+
+  methods: {
+    handleClose() {
+      this.$emit("close");
+    },
+    async getInfo(demandId) {
+      // const url = "/gov/org/customeragency/staffinagencylist";
+      const url = "/heart/userdemand/demandDetail";
+      let params = {
+        demandRecId: demandId,
+      };
+      const { data, code, msg } = await requestPost(url, params);
+      if (code === 0) {
+        // console.log('data-org----dict', data)
+        this.info = data;
+        this.getAnalyse(demandId);
+      } else {
+        this.$message.error(msg);
+      }
+    },
+    async getAnalyse(demandId) {
+      // const url = "/gov/org/customeragency/staffinagencylist";
+      this.loading = true;
+      const url = "/heart/userdemand/demand-research-analysis";
+      let params = {
+        firstCategoryCode: this.info.firstCategoryCode,
+        demandRecId: demandId,
+        icResiUserId: this.info.icResiUserId,
+        epmetUserIdList: [this.info.epmetUserId],
+        queryOrigin: this.queryOrigin,
+      };
+      const { data, code, msg } = await requestPost(url, params);
+      if (code === 0) {
+        console.log("data-org----a", data);
+        this.userLists = data.houseUserList.map((item) => {
+          return {
+            ...item,
+            icUserId: item.icResiUserId,
+          };
+        });
+        this.demandList = data.demandData.map((item) => {
+          return {
+            ...item,
+            showItem: true,
+            categoryName: item.firstCategoryName,
+            categoryCode: item.firstCategoryCode,
+            projectList: item.demandList.map((n) => {
+              return {
+                ...n,
+                title: n.content,
+                status: n.status,
+                statusName: n.statusName,
+                projectId: n.demandRecId,
+              };
+            }),
+          };
+        });
+        console.log("demandList-dd", this.demandList);
+      } else {
+        this.$message.error(msg);
+      }
+      this.loading = false;
+    },
+    handleToProject(val) {
+      console.log("val---v", val);
+      this.getInfo(val.projectId);
+    },
+    handleToUser(val) {
+      console.log("val-uuu", val);
+
+      this.$router.push({
+        path: `/main-shuju/visual-basicinfo-people/${val.icUserId}`,
+      });
+    },
+  },
+};
+</script>
+
+<style
+  lang="scss"
+  src="@/assets/scss/modules/visual/people.scss"
+  scoped
+></style>
+<style lang="scss" scoped>
+.m-pop {
+  color: #fff;
+  .wrap {
+    .list {
+      display: block;
+      width: 50%;
+      .item {
+        display: flex;
+        width: 100%;
+        box-sizing: border-box;
+        margin-top: 0;
+        margin-bottom: 15px;
+        font-size: 16px;
+        cursor: pointer;
+      }
+      .item-desc {
+        font-size: 16px;
+        color: #fff;
+        margin-bottom: 10px;
+        line-height: 24px;
+      }
+    }
+  }
+  .list-title {
+    width: 100%;
+    box-sizing: border-box;
+    padding: 20px 0 10px 62px;
+    font-size: 20px;
+    color: #fff;
+    cursor: pointer;
+  }
+}
+.list-wr {
+  display: flex;
+  padding: 0 32px;
+}
+</style>
diff --git a/src/views/modules/visual/measure/service.vue b/src/views/modules/visual/measure/service.vue
new file mode 100644
index 00000000..8fdafe8a
--- /dev/null
+++ b/src/views/modules/visual/measure/service.vue
@@ -0,0 +1,800 @@
+<template>
+  <div class="warning-box">
+    <cpt-card>
+      <div class="card-title">
+        <img class="title-icon" src="../../../../assets/img/shuju/title-tip.png" />
+        <div class="title-label">
+          <el-cascader 
+            v-model="selectAgency"
+            :options="propTree" 
+            :props="{ checkStrictly: true }" 
+            :show-all-levels="false"
+            clearable 
+            @change="handleCascader">
+          </el-cascader>
+        </div>
+        <div class="title-time">
+          <div class="title-time-label">选择时间</div>
+          <div class="second-select">
+            <!-- <el-date-picker
+              v-model="value2"
+              type="month"
+              placeholder="选择月">
+            </el-date-picker> -->
+            <el-date-picker v-model="timeRange"
+              type="daterange"
+              range-separator="至"
+              start-placeholder="开始日期"
+              end-placeholder="结束日期"
+              prefix-icon="el-icon-caret-bottom"
+              value-format="yyyy-MM-dd"
+              >
+            </el-date-picker>
+          </div>
+        </div>
+      </div>
+
+      <!-- <div class="card-echart">
+        <div class="card-left">
+          <div class="echart-wr">
+            <div class="echart-cicle"></div>
+            <div id="echartOrg" class="echart-org"></div>
+          </div>
+          <div class="echarts-tips">
+            <div class="tips-list">
+              <div class="tips-item">
+                <div class="tips-item-icon"></div>
+                <div class="tips-item-text">为民服务</div>
+              </div>
+              <div class="tips-item">
+                <div class="tips-item-icon"></div>
+                <div class="tips-item-text">社会治安综合</div>
+              </div>
+              <div class="tips-item">
+                <div class="tips-item-icon"></div>
+                <div class="tips-item-text">社会治安综合</div>
+              </div>
+              <div class="tips-item">
+                <div class="tips-item-icon"></div>
+                <div class="tips-item-text">卫生计生监管执法</div>
+              </div>
+              <div class="tips-item">
+                <div class="tips-item-icon"></div>
+                <div class="tips-item-text">卫生计生监管执法</div>
+              </div>
+              <div class="tips-item">
+                <div class="tips-item-icon"></div>
+                <div class="tips-item-text">建设管理</div>
+              </div>
+              
+              <div class="tips-item">
+                <div class="tips-item-icon"></div>
+                <div class="tips-item-text">为民服务</div>
+              </div>
+            </div>
+          </div>
+        </div>
+        <div class="card-left">
+          <div class="echart-wr">
+            <div class="echart-cicle"></div>
+            <div id="echartType" class="echart-org"></div>
+          </div>
+          <div class="echarts-tips echarts-tips-wd50">
+            <div class="tips-lists">
+              <div class="tips-items">
+                <div class="tips-items-title">
+                  <div>志愿者</div>
+                </div>
+                <div class="tips-items-num">
+                  <div class="tips-item-count">17513</div>
+                  <div class="tips-item-has">（服务次数：2430）</div>
+                </div>
+              </div>
+              <div class="tips-items">
+                <div class="tips-items-title">
+                  <div>志愿者</div>
+                </div>
+                <div class="tips-items-num">
+                  <div class="tips-item-count">17</div>
+                  <div class="tips-item-has">（服务次数：2430）</div>
+                </div>
+              </div>
+              <div class="tips-items">
+                <div class="tips-items-title">
+                  <div>志愿者</div>
+                </div>
+                <div class="tips-items-num">
+                  <div class="tips-item-count">175</div>
+                  <div class="tips-item-has">（服务次数：2430）</div>
+                </div>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div> -->
+
+      <div class="echarts-container">
+        <div id="echartsBox" class="echarts-boxs"></div>
+      </div>
+      <div class="ecahrts-button">
+        <el-button type="warning" size="small" @click="handleExport">导出</el-button>
+      </div>
+      <div class="warning-box-bottom">
+        <screen-table
+          :headerList="headerList"
+          :tableData="tableData"
+          :visibleLoading="visibleLoading"
+          @look="handleLook"
+        ></screen-table>
+        <div class="pagination">
+          <el-pagination
+            :current-page="pageNo"
+            :page-size="pageSize"
+            background
+            layout="prev, pager, next"
+            @size-change="pageSizeChangeHandleNew"
+            @current-change="pageCurrentChangeHandleNew"
+            :total="total"
+          >
+          </el-pagination>
+        </div>
+      </div>
+    </cpt-card>
+    <dialog-info 
+      v-if="showedMoreInfo" 
+      :demandId="detailInfo.demandRecId"
+      :query-origin="'demand-analysis'"
+      @close="showedMoreInfo = false"
+     />
+  </div>
+</template>
+
+<script>
+import { requestPost } from "@/js/dai/request";
+import screenTable from "../components/screen-table/index";
+import cptCard from "@/views/modules/visual/cpts/card";
+import nextTick from "dai-js/tools/nextTick";
+import dialogInfo from './dialogInfo'
+import axios from 'axios'
+
+import * as echarts from 'echarts';
+export default {
+  name: "warning-box",
+  components: {
+    cptCard,
+    screenTable,
+    dialogInfo
+  },
+  data() {
+    return {
+      showedMoreInfo: false,
+      warningList: [],
+      headerList: [
+        { title: "序号", coulmn: 'index' },
+        { title: "状态", coulmn: 'statusName' },
+        { title: "所属网格", coulmn: 'gridName' },
+        { title: "需求类型", coulmn: 'categoryName' },
+        { title: "需求内容", coulmn: 'content' },
+        { title: "上报类型", coulmn: 'reportTypeName' },
+        { title: "上报人", coulmn: 'reportUserName' },
+        { title: "上报时间", coulmn: 'reportTime' },
+        { title: "需求人", coulmn: 'demandUserName' },
+        { title: "服务方", coulmn: 'serviceShowName' },
+        { title: "服务时间", coulmn: 'wantServiceTime' },
+      ],
+      categoryList: [],
+      categoryCode: '',
+      timeRange: '',
+      tableData: [
+        // [1,'商丘路社区第一网格','商丘路小区','2号楼','杨颖、王平、刘佳敏、丁辉、杨萍'],
+      ],
+      reportDict: [],
+      selectAgency: '',
+      propTree: [],
+      value2: '',
+      visibleLoading: true,
+      pageNo: 1,
+      pageSize: 10,
+      total: 0,
+      detailInfo: {}
+    };
+  },
+  watch: {
+    timeRange(val) {
+      console.log('val-www', val)
+      if (!val) return false
+      this.handleCascader(this.selectAgency)
+    }
+  },
+  async mounted() {
+    this.initTime()
+    await nextTick(100);
+    await this.getAgencyList()
+    await this.getDict()
+    this.getServicePie(this.$store.state.user.agencyId, 'agency')
+    // this.initCharts()
+    // this.initChartType()
+    // this.getServiceList(this.$store.state.user.agencyId, 'agency');
+  },
+  methods: {
+    initCharts(xData, yData) {
+      const eId = document.getElementById('echartsBox')
+      let _charts = echarts.init(eId)
+
+      let option = {
+        tooltip: {
+          trigger: 'axis',
+          axisPointer: {
+            // Use axis to trigger tooltip
+            type: 'shadow' // 'shadow' as default; can also be 'line' or 'shadow'
+          },
+          backgroundColor: 'transprant',
+          borderColor: 'transprant',
+          textStyle: {
+            color: '#fff'
+          },
+          formatter: params => {
+              let res;
+              let arr = []
+              let total = 0
+              const xName = params[0].axisValue
+              this.categoryList.forEach(item => {
+                if (item.categoryName === xName) {
+                  arr = item.detail
+                  total = item.total
+                }
+              })
+              let title = `<div style='margin-bottom: 10px;'><span>${xName}分类需求</span>${total}个</div>`
+              let desc = ''
+              let unit = '个'
+              arr.forEach(item => {
+                if (item.legendCode == 'volunteer') unit = '名'
+                else unit = '个'
+                if (item.legendCode == 'unfinished') {
+                  desc += `<div><span>尚有 ${item.serviceDemandTotal} 个需求未完成</span></div>`
+                }else {
+                  desc += `<div><span>共 ${item.totalService} ${unit} ${item.legendName} 完成需求 ${item.serviceDemandTotal} 个</span></div>`
+                }
+                
+              })
+              res= title + desc
+              return res
+          }
+        },
+        legend: {
+          top: 'bottom',
+          bottom: 'bottom',
+          textStyle: {
+            color: '#fff'
+          }
+        },
+        grid: {
+          left: '3%',
+          right: '4%',
+          bottom: '10%',
+          containLabel: true
+        },
+        xAxis: {
+          type: 'category',
+          axisLabel: {
+            color: '#fff',
+            interval: 0,
+            formatter: function(params) {
+              // const index = params.indexOf('#')
+              // const newParams = params.slice(0, index)
+              let newParamsName = params.length > 6 ? params.substring(0, 6) + '...' : params
+              return newParamsName
+            }
+          },
+          splitLine: {
+            show: false
+          },
+          splitArea: {
+            show: false
+          },
+          axisTick: {
+            interval: 0
+          },
+          data: xData
+        },
+        yAxis: {
+          type: 'value',
+          splitLine: {
+            show: false
+          },
+          axisLabel: {
+            color: '#fff'
+          },
+          // axisLine: false
+        },
+        series: yData
+        
+      };
+
+      option && _charts.setOption(option);
+      _charts.on('click', params => {
+        this.clickBar(params)
+      })
+
+    },
+    async getServicePie(orgId, orgType) {
+      const url = "/heart/userdemand/category-analysis";
+      let params = {
+        orgId,
+        orgType,
+        startDateId: this.timeRange && this.timeRange[0] || '',
+        endDateId: this.timeRange && this.timeRange[1] || ''
+      };
+      const { data, code, msg } = await requestPost(url, params);
+      if (code === 0) {
+        console.log('pie-data', data)
+        const { categoryList, legend } = data
+        this.categoryList = categoryList
+        let xData = categoryList.map(item => item.categoryName)
+        let yData = []
+        yData = legend.map((item, index) => {
+          return {
+            name: item.legendName,
+            type: 'bar',
+            stack: 'total',
+            // barWidth: 20,
+            label: {
+              show: false
+            },
+            emphasis: {
+              focus: 'none'
+            },
+            data: categoryList.map(n => {
+              return n.detail[index].serviceDemandTotal
+            })
+          }
+        })
+        console.log('yData', yData)
+        
+        this.initCharts(xData, yData)
+        this.categoryCode = categoryList[0].categoryCode
+        this.getServiceList(orgId, orgType, categoryList[0].categoryCode)
+      } else {
+      }
+      this.visibleLoading = false;
+    },
+    async getServiceList(orgId, orgType, _code) {
+      const url = "/heart/userdemand/pagelist-analysis";
+      let params = {
+        orgId,
+        orgType,
+        pageNo: this.pageNo,
+        pageSize: this.pageSize,
+        categoryCode: _code || '',
+        startDateId: this.timeRange && this.timeRange[0] || '',
+        endDateId: this.timeRange && this.timeRange[1] || ''
+      };
+      const { data, code, msg } = await requestPost(url, params);
+      if (code === 0) {
+        const status = {
+          pending: '待处理',
+          canceled: '已取消',
+          assigned: '已派单',
+          have_order: '已接单',
+          finished: '已完成',
+        }
+        // const type = {
+        //   volunteer: '志愿者',
+        //   social_org: '社会组织',
+        //   community_org: '社区自组织',
+        //   party_unit: '区域党建单位',
+        // }
+        this.tableData = data.list.map((item, index) => {
+          return {
+            ...item,
+            statusName: status[item.status],
+            reportTypeName: this.reportDict.filter(n => n.value === item.reportType)[0].label,
+            index: index + 1
+          }
+        })
+        this.total = data.total
+        
+      } else {
+      }
+      this.visibleLoading = false;
+    },
+    async getAgencyList() {
+      // const url = "/gov/org/customeragency/staffinagencylist";
+      const url = '/gov/org/customeragency/agencygridtree'
+      // let params = {
+      //   agencyId: this.$store.state.user.agencyId,
+      // };
+      const { data, code, msg } = await requestPost(url);
+      if (code === 0) {
+        console.log('data-org----o', data)
+        this.selectAgency = [`${data.agencyId}-${data.level}`]
+        let arr = []
+        arr.push(data)
+        this.propTree = arr && this.getTreeData(arr)
+
+      } else {
+        this.$message.error(msg)
+      }
+    },
+    async getDict() {
+      // const url = "/gov/org/customeragency/staffinagencylist";
+      const url = '/sys/dict/data/dictlist'
+      let params = {
+        dictType: 'user_demand_report_type',
+      };
+      const { data, code, msg } = await requestPost(url, params);
+      if (code === 0) {
+        console.log('data-org----dict', data)
+        this.reportDict = data
+
+      } else {
+        this.$message.error(msg)
+      }
+    },
+    handleExport() {
+      const _arr = this.selectAgency[this.selectAgency.length - 1].split('-')
+      const orgType = _arr[1] !== 'grid' ? 'agency': 'grid'
+      let params = {
+        orgId: _arr[0],
+        orgType: orgType,
+        categoryCode: this.categoryCode,
+        startDateId: this.timeRange && this.timeRange[0] || '',
+        endDateId: this.timeRange && this.timeRange[1] || ''
+      }
+      // .post('epmetuser/icresiuser/exportExcel', params)
+      axios({
+        url: window.SITE_CONFIG['apiURL'] + '/heart/userdemand/analysis-export',
+        // url: 'epmetuser/icresiuser/exportExcel',
+        method: 'post',
+        data: params,
+        responseType: 'blob'
+      })
+        .then(res => {
+          console.log('resllll', res)
+          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对象
+        })
+        .catch((err) => {
+          console.log('获取导出情失败', err)
+          return this.$message.error('网络错误')
+        })
+    },
+    getTreeData(data){
+      if (!Array.isArray(data)) return []
+      let arr = data.map(item => {
+        let _item = {}
+        if (item.subAgencyList) {
+          if (item.subAgencyList.length === 0) {
+            _item = { 
+              label: item.agencyName,
+              value: item.agencyId + '-' + item.level,
+              level: item.level,
+              children: undefined 
+            }
+          } else _item = { 
+            label: item.agencyName,
+            value: item.agencyId + '-' + item.level,
+            level: item.level,
+            children: this.getTreeData(item.subAgencyList)}
+        } else {
+          _item = { 
+            label: item.agencyName,
+            value: item.agencyId + '-' + item.level,
+            level: item.level,
+          }
+        }
+        return _item
+      })
+      return arr
+    },
+    initTime() {
+      const end = new Date();
+      const start = new Date();
+      start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
+      console.log('time-rtt', this.timeFormat(start), this.timeFormat(end))
+      this.timeRange = [this.timeFormat(start), this.timeFormat(end)]
+    },
+    timeFormat(date) {
+      if (!date || typeof date === 'string') {
+        return false
+      }
+      var y = date.getFullYear() //年
+      var m = date.getMonth() + 1 //月
+      if (m < 10) m = '0' + m
+      var d = date.getDate() //日
+      if (d < 10) d = '0' + d
+
+      return y + '-' + m + '-' + d
+    },
+    clickBar(params) {
+      console.log('params---p', params)
+      let code = ''
+      this.categoryList.forEach(item => {
+        if (item.categoryName == params.name) code = item.categoryCode
+      })
+      if (code) {
+        this.categoryCode = code
+        const _arr = this.selectAgency[this.selectAgency.length - 1].split('-')
+        const orgType = _arr[1] !== 'grid' ? 'agency': 'grid'
+        this.pageNo = 1
+        this.getServiceList(_arr[0], orgType, code)
+      }
+    },
+    async handleLook(val) {
+      
+      // this.detailId = val.id
+      this.detailInfo = val
+      // await this.getDetail(val.id)
+      this.showedMoreInfo = true
+    },
+    handleCascader(val) {
+      console.log('val-vvv', val)
+      if (val.length > 0) {
+        const _arr = val[val.length - 1].split('-')
+        const orgType = _arr[1] !== 'grid' ? 'agency': 'grid'
+        this.getServicePie(_arr[0], orgType)
+      }
+      
+    },
+    pageSizeChangeHandleNew(val) {
+      this.pageNo = 1;
+      this.pageSize = val;
+      const _arr = this.selectAgency[this.selectAgency.length - 1].split('-')
+      const orgType = _arr[1] !== 'grid' ? 'agency': 'grid'
+      this.getServiceList(_arr[0], orgType, this.categoryCode)
+    },
+    pageCurrentChangeHandleNew(val) {
+      this.pageNo = val;
+      const _arr = this.selectAgency[this.selectAgency.length - 1].split('-')
+      const orgType = _arr[1] !== 'grid' ? 'agency': 'grid'
+      this.getServiceList(_arr[0], orgType, this.categoryCode)
+    },
+  },
+};
+</script>
+
+<style
+  lang="scss"
+  src="@/assets/scss/modules/visual/warning.scss"
+  scoped
+></style>
+<style lang="scss" scoped>
+.warning-box-bottom {
+  margin-top: 10px;
+}
+.card-title {
+  display: flex;
+  align-items: center;
+  cursor: pointer;
+  .title-icon {
+    display: block;
+    width: 46px;
+    height: 34px;
+    box-sizing: border-box;
+    margin-right: 6px;
+  }
+  ::v-deep .el-dropdown {
+    font-size: 16px;
+    color: #fff;
+    font-weight: 800;
+  }
+  .title-time {
+    display: flex;
+    align-items: center;
+    box-sizing: border-box;
+    margin-left: 30px;
+    font-size: 14px;
+    color: #fff;
+    .title-time-label {
+      margin-right: 10px;
+    }
+    ::v-deep .el-date-editor--month {
+      width: 100px;
+      .el-input__inner {
+        width: 100px;
+        height: 24px;
+        box-sizing: border-box;
+        padding: 0;
+        font-size: 14px;
+        color: #fff;
+        line-height: 24px;
+        text-align: center;
+        background: #06186D;
+        border: 1px solid #1A64CC;
+        border-radius: 2px;
+      }
+      .el-input__prefix {
+        display: none;
+      }
+      .el-input__suffix {
+        right: 0;
+        .el-input__icon {
+          line-height: 24px;
+        }
+      }
+      
+    }
+  }
+
+  .title-label {
+    ::v-deep .el-input {
+      width: 180px;
+      .el-input__inner {
+        font-size: 20px;
+        font-weight: 800;
+        color: #fff;
+        background: transparent;
+        border: 0;
+      }
+      .el-icon-arrow-down::before {
+          content: "\e790";
+      }
+    }
+  }
+}
+.second-select {
+    margin: 0 10px 0 0;
+    ::v-deep .el-input {
+      width: 180px;
+      height: 36px;
+      .el-input__inner {
+        height: 100%;
+        padding: 0 10px;
+        color: #fff;
+        line-height: 36px;
+        background: #06186d;
+        border: 1px solid #1a64cc;
+      }
+
+      .el-icon-arrow-up:before {
+        content: "\e78f";
+      }
+      // .el-select__caret:before {
+      //   content: '\E790'
+      // }
+    }
+    ::v-deep .el-date-editor {
+      width: 360px;
+      position: relative;
+      background: #06186d;
+      border: 1px solid #1a64cc;
+      .el-range-input {
+        color: #fff;
+        background: #06186d;
+      }
+      .el-range-separator {
+        color: #fff;
+      }
+      .el-range__icon {
+        position: absolute;
+        right: 5px;
+        // float: right;
+      }
+      .el-input__prefix {
+        left: unset;
+        right: 5px;
+      }
+    }
+  }
+.card-echart {
+  display: flex;
+  margin-top: 40px;
+  .card-left {
+    position: relative;
+    flex: 1;
+    display: flex;
+    
+  }
+}
+.echart-wr {
+  position: relative;
+  flex-shrink: 0;
+  width: 50%;
+  height: 320px;
+  box-sizing: border-box;
+  .echart-org {
+    width: 100%;
+    height: 100%;
+  }
+  .echart-cicle {
+    position: absolute;
+    top: 50%;
+    left: 50%;
+    width: 240px;
+    height: 240px;
+    box-sizing: border-box;
+    margin-top: -120px;
+    margin-left: -120px;
+    border: 1px dashed rgba(0, 96, 240, 1);
+    border-radius: 50%;
+  }
+}
+
+.echarts-tips {
+  width: 40%;
+  // flex: 1;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+}
+.echarts-tips-wd50 {
+  width: 50%;
+}
+.tips-list, .tips-item, .tips-lists, .tips-items-num {
+  display: flex;
+  align-items: center;
+}
+.tips-list {
+  // width: 100%;
+  // height: 100%;
+  flex-wrap: wrap;
+  // justify-content: center;
+  .tips-item {
+    // flex: 1;
+    width: 50%;
+    margin-top: 20px;
+    // margin-right: 40px;
+    cursor: pointer;
+    .tips-item-icon {
+      width: 20px;
+      height: 10px;
+      box-sizing: border-box;
+      margin-right: 8px;
+      background: #1B51FF;
+      border-radius: 2px;
+    }
+    .tips-item-text {
+      font-size: 16px;
+      color: #D2E7FF;
+    }
+  }
+}
+.tips-lists {
+  width: 100%;
+  flex-wrap: wrap;
+  .tips-items {
+    margin-bottom: 30px;
+    width: 50%;
+    .tips-items-title {
+      font-size: 16px;
+    }
+    .tips-items-num {
+      justify-content: space-between;
+      box-sizing: border-box;
+      margin-top: 20px;
+      padding-right: 30px;
+      font-size: 20px;
+      .tips-item-has {
+        font-size: 14px;
+      }
+    }
+  }
+}
+
+
+.echarts-boxs {
+  width: 100%;
+  height: 400px;
+}
+
+.ecahrts-button {
+  width: 100%;
+  text-align: right;
+  ::v-deep .el-button--warning {
+
+    background: linear-gradient(90deg, #0863EA, #3B9FFC);
+    border: 0;
+  }
+}
+
+</style>
diff --git a/src/views/modules/visual/measure/volunteer.vue b/src/views/modules/visual/measure/volunteer.vue
new file mode 100644
index 00000000..7d757740
--- /dev/null
+++ b/src/views/modules/visual/measure/volunteer.vue
@@ -0,0 +1,798 @@
+<template>
+  <div class="warning-box">
+    <cpt-card>
+      <div class="card-title">
+        <img class="title-icon"
+             src="../../../../assets/img/shuju/title-tip.png" />
+        <div class="title-label">
+          <el-cascader v-model="selectAgency"
+                       :options="propTree"
+                       :props="{ checkStrictly: true }"
+                       :show-all-levels="false"
+                       clearable
+                       @change="handleCascader">
+          </el-cascader>
+        </div>
+      </div>
+      <div class="box-wr">
+        <cpt-card class="card-wr">
+          <div class="card-title">
+            <img class="title-icon"
+                 src="../../../../assets/img/shuju/title-tip.png" />
+            <div class="title-label">
+              志愿者服务情况
+            </div>
+          </div>
+
+          <div class="card-echart">
+            <div class="card-left">
+              <div class="card-count">
+                <div class="card-count-item">
+                  <div class="card-count-content">
+                    <div class="card-count-num">{{ vInfo.partyTotal || 0 }}</div>
+                    <div class="card-count-label">党员数量</div>
+                  </div>
+                </div>
+                <div class="card-count-item">
+                  <div class="card-count-content">
+                    <div class="card-count-num">{{ vInfo.resiTotal || 0 }}</div>
+                    <div class="card-count-label">居民数量</div>
+                  </div>
+                </div>
+              </div>
+              <div class="echart-wr">
+                <!-- <div class="echart-cicle"></div> -->
+                <div id="echartService"
+                     class="echart-org"></div>
+              </div>
+
+            </div>
+
+          </div>
+
+          <div class="card-echart">
+            <div class="card-left">
+              <div class="card-count">
+                <div class="card-count-item">
+                  <div class="card-count-content">
+                    <div class="card-count-num">{{ vInfo.partyServiceTotal || 0 }}</div>
+                    <div class="card-count-label">党员数量</div>
+                  </div>
+                </div>
+                <div class="card-count-item">
+                  <div class="card-count-content">
+                    <div class="card-count-num">{{ vInfo.resiServiceTotal || 0 }}</div>
+                    <div class="card-count-label">居民数量</div>
+                  </div>
+                </div>
+              </div>
+              <div class="echart-wr">
+                <!-- <div class="echart-cicle"></div> -->
+                <div id="echartCount"
+                     class="echart-org"></div>
+              </div>
+
+            </div>
+
+          </div>
+
+        </cpt-card>
+        <cpt-card class="card-wr card-wr-map">
+          <div class="card-title">
+            <img class="title-icon"
+                 src="../../../../assets/img/shuju/title-tip.png" />
+            <div class="title-label">
+              多元化治理平面图
+            </div>
+          </div>
+
+          <div class="card-map">
+            <screen-map class="map"
+                        ref="map"
+                        @clickFeature="clickMapVolunteer"
+                        :showIconLayer="true"
+                        :clickType="'popup'"
+                        :isAddOpenlay="true"></screen-map>
+          </div>
+          <div class="map-tips">
+
+            <div class="map-tips-item"
+                 v-for="item in legendArray"
+                 :key="item.optionValue">
+
+              <img class="title-icon"
+                   :src="item.url" />
+              <div class="map-tips-label">{{item.optionLabel}}</div>
+            </div>
+
+          </div>
+
+        </cpt-card>
+      </div>
+    </cpt-card>
+  </div>
+</template>
+
+<script>
+import { requestPost } from "@/js/dai/request";
+import screenTable from "../components/screen-table/index";
+import cptCard from "@/views/modules/visual/cpts/card";
+import nextTick from "dai-js/tools/nextTick";
+import screenMap from "@/views/modules/visual/components/screen-map";
+
+import * as echarts from 'echarts';
+export default {
+  name: "warning-box",
+  components: {
+    cptCard,
+    screenTable,
+    screenMap
+  },
+  data () {
+    return {
+      warningList: [],
+      headerList: [
+        { title: "序号", coulmn: 'index' },
+        { title: "需求类型", coulmn: 'gridName' },
+        { title: "具体内容", coulmn: 'buildingName' },
+        { title: "上报情况", coulmn: 'neighborhoodName' },
+        { title: "上报人", coulmn: 'residentNames' },
+        { title: "上报时间", coulmn: 'residentNames' },
+        { title: "是否认领", coulmn: 'residentNames' },
+        { title: "认领方", coulmn: 'residentNames' },
+        { title: "认领时间", coulmn: 'residentNames' }
+      ],
+      tableData: [
+        // [1,'商丘路社区第一网格','商丘路小区','2号楼','杨颖、王平、刘佳敏、丁辉、杨萍'],
+      ],
+      value2: '',
+      selectAgency: '',
+      propTree: [],
+      visibleLoading: true,
+      pageNo: 1,
+      pageSize: 10,
+      total: 0,
+      activeIndex: 0,
+      activeLevel: "1",
+
+      //地图相关数据
+      isfirstInit: true,//记录是否是首次加载地图
+      agencyInfo: {},//登陆者的组织信息：主要为了获取地图中心点和level
+      distributionsList: [],
+
+      legendArray: [],
+
+      iconUrlArray: [
+        require('../../../../assets/img/shuju/volunteer1.png'),//文化队伍
+        require('../../../../assets/img/shuju/volunteer2.png'),//楼委会
+        require('../../../../assets/img/shuju/volunteer3.png'),//能人达人
+        require('../../../../assets/img/shuju/volunteer4.png'),//老友俱乐部
+        require('../../../../assets/img/shuju/volunteer5.png'),//代办员
+        require('../../../../assets/img/shuju/volunteer6.png'),//调解员
+        require('../../../../assets/img/shuju/volunteer7.png'),//采集员
+        require('../../../../assets/img/shuju/volunteer8.png'),//治安巡逻
+        require('../../../../assets/img/shuju/volunteer9.png'),//其他
+      ],
+      vPersonal: [],
+      vCount: [],
+      vpTotal: 0,
+      vcTotal: 0,
+      vInfo: {}
+    };
+  },
+  async mounted () {
+    await nextTick(100);
+    await this.getAgencyList()
+    this.getPie(this.$store.state.user.agencyId)
+    // this.initCharts()
+    // this.initCount()
+
+    await this.getWorkUserInfo()
+    await this.getMapUnitList(this.$store.state.user.agencyId)
+  },
+  methods: {
+    initCharts (total, data) {
+      const eId = document.getElementById('echartService')
+      let _charts = echarts.init(eId)
+      let option = {
+        tooltip: {
+          trigger: 'item'
+        },
+        legend: {
+          show: true,
+          top: 'bottom',
+          left: 'center',
+          textStyle: {
+            color: '#fff'
+          }
+        },
+        title: {
+          text: total,  //图形标题，配置在中间对应效果图的80%
+          subtext: '志愿者总数',
+          left: "center",
+          top: "center",
+          textStyle: {
+            color: "#fff",
+            fontSize: 28,
+            align: "center"
+          },
+          subtextStyle: {
+            fontSize: 16,
+            color: '#fff'
+          }
+        },
+        series: [
+          {
+            // name: 'Access From',
+            type: 'pie',
+            radius: ['50%', '60%'],
+            avoidLabelOverlap: false,
+            left: 'center',
+            width: 400,
+            label: {
+              show: false,
+            },
+            emphasis: {
+              label: {
+                show: false,
+                fontSize: '14',
+                fontWeight: 'bold'
+              }
+            },
+
+            data: data
+          }
+        ]
+      }
+      option && _charts.setOption(option);
+
+    },
+    initCount (total, data) {
+      const eId = document.getElementById('echartCount')
+      let _charts = echarts.init(eId)
+      let option = {
+        tooltip: {
+          trigger: 'item'
+        },
+        legend: {
+          show: true,
+          top: 'bottom',
+          left: 'center',
+          textStyle: {
+            color: '#fff'
+          }
+        },
+        title: {
+          text: total,  //图形标题，配置在中间对应效果图的80%
+          subtext: '志愿者服务总数',
+          left: "center",
+          top: "center",
+          textStyle: {
+            color: "#fff",
+            fontSize: 28,
+            align: "center"
+          },
+          subtextStyle: {
+            fontSize: 16,
+            color: '#fff'
+          }
+        },
+        series: [
+          {
+            // name: 'Access From',
+            type: 'pie',
+            // center: ['10%', '50%'],
+            radius: ['50%', '60%'],
+            avoidLabelOverlap: false,
+            // top: top + '%',
+            // height: '80%',
+            left: 'center',
+            width: 400,
+            label: {
+              show: false,
+            },
+            emphasis: {
+              label: {
+                show: false,
+                fontSize: '14',
+                fontWeight: 'bold'
+              }
+            },
+
+            data: data
+          }
+        ]
+      }
+      option && _charts.setOption(option);
+
+    },
+    async getPie (agencyId) {
+      const url = "/data/report/heart/demand/volunteer/service";
+      let params = {
+        agencyId,
+      };
+      const { data, code, msg } = await requestPost(url, params);
+      if (code === 0) {
+        console.log('data-ddd', data)
+        this.vInfo = data
+        const arr = [{
+          name: '党员数量',
+          value: data.partyTotal,
+          itemStyle: {
+            color: 'rgba(26, 178, 255, 1)'
+          }
+        }, {
+          name: '居民数量',
+          value: data.resiTotal,
+          itemStyle: {
+            color: 'rgba(250, 193, 38, 1)'
+          }
+        }]
+        const arr1 = [{
+          name: '党员数量',
+          value: data.partyServiceTotal,
+          itemStyle: {
+            color: 'rgba(26, 178, 255, 1)'
+          }
+        }, {
+          name: '居民数量',
+          value: data.resiServiceTotal,
+          itemStyle: {
+            color: 'rgba(250, 193, 38, 1)'
+          }
+        }]
+        this.vPersonal = [...arr]
+        this.vCount = [...arr1]
+        this.vpTotal = data.volunteerTotal
+        this.vcTotal = data.serviceTotal
+        this.initCharts(data.volunteerTotal, arr)
+        this.initCount(data.serviceTotal, arr1)
+      } else {
+        this.$message.error(msg)
+      }
+    },
+    async getAgencyList () {
+      // const url = "/gov/org/customeragency/staffinagencylist";
+      // const url = '/gov/org/customeragency/agencygridtree'
+      const url = '/gov/org/customeragency/staffinagencylist'
+      // let params = {
+      //   agencyId: this.$store.state.user.agencyId,
+      // };
+      const { data, code, msg } = await requestPost(url);
+      if (code === 0) {
+        console.log('data-org----o', data)
+        let { agencyList, subAgencyList } = data
+        this.selectAgency = [`${agencyList.agencyId}-${agencyList.level}`]
+        let arr = []
+        agencyList.subAgencyList = subAgencyList
+        arr.push(agencyList)
+        this.propTree = arr && this.getTreeData(arr)
+
+      } else {
+        this.$message.error(msg)
+      }
+    },
+    getTreeData (data) {
+      if (!Array.isArray(data)) return []
+      let arr = data.map(item => {
+        let _item = {}
+        if (item.subAgencyList) {
+          if (item.subAgencyList.length === 0) {
+            _item = {
+              label: item.agencyName,
+              value: item.agencyId + '-' + item.level,
+              level: item.level,
+              children: undefined
+            }
+          } else _item = {
+            label: item.agencyName,
+            value: item.agencyId + '-' + item.level,
+            level: item.level,
+            children: this.getTreeData(item.subAgencyList)
+          }
+        } else {
+          _item = {
+            label: item.agencyName,
+            value: item.agencyId + '-' + item.level,
+            level: item.level,
+          }
+        }
+        return _item
+      })
+      return arr
+    },
+    // 【人员预警】 楼宇预警数量列表
+    pageSizeChangeHandleNew (val) {
+      this.pageNo = 1;
+      this.pageSize = val;
+    },
+    pageCurrentChangeHandleNew (val) {
+      this.pageNo = val;
+    },
+
+    // 获取当前管理员信息
+    getWorkUserInfo () {
+      const url = '/epmetuser/customerstaff/staffbasicinfo'
+      let params = {}
+      window.app.ajax.post(
+        url,
+        params,
+        (data, rspMsg) => {
+          this.agencyInfo = data
+          if (!data.latitude) {
+            this.agencyInfo.latitude = 36.072227
+          }
+          if (!data.longitude) {
+            this.agencyInfo.longitude = 120.389455
+          }
+          if (!data.level) {
+            this.agencyInfo.level = 'street'
+          }
+
+        },
+        (rspMsg, data) => {
+          this.$message.error(rspMsg)
+        }
+      )
+
+    },
+
+
+
+    //获取联建单位分布图
+    async getMapUnitList (agencyId) {
+      const url = "/epmetuser/volunteer/distribution"
+      // const url = "http://yapi.elinkservice.cn/mock/245/heart/icpartyunit/distribution"
+
+      let params = {
+        customerId: this.$store.state.user.customerId,
+        agencyId
+      }
+
+      const { data, code, msg } = await requestPost(url, params)
+
+      if (code === 0) {
+        this.legendArray = data.legends
+
+        this.legendArray.forEach((legendTtem, index) => {
+          if (index < this.iconUrlArray.length) {
+            legendTtem.url = this.iconUrlArray[index]
+          } else {//超过原型数量的都默认为第一个图标
+            legendTtem.url = this.iconUrlArray[0]
+          }
+
+        });
+        this.legendArray.push({
+          optionValue: 'other',
+          optionLabel: '其他',
+          url: this.iconUrlArray[8]
+        })
+
+        this.distributionsList = data.distributions
+
+        this.distributionsList.forEach(item => {
+          let typeShow = ''
+          if (item.volunteerCategories.length > 0) {
+            typeShow = item.volunteerCategories[0]
+          } else {
+            typeShow = 'other'
+          }
+          item.urlIndex = 0
+          for (let i = 0; i < this.legendArray.length; i++) {
+            if (typeShow === this.legendArray[i].optionValue) {
+              item.urlIndex = i
+              break;
+            }
+          }
+
+        });
+        console.log(this.distributionsList)
+
+        //第一次加载完置为false
+        this.loadMap()
+        this.isfirstInit = false
+
+      } else {
+        this.$message.error(msg)
+      }
+
+    },
+
+    handleCascader (val) {
+      console.log('val-vvv', val)
+      if (val.length > 0) {
+        const _arr = val[val.length - 1].split('-')
+        const orgType = _arr[1] !== 'grid' ? 'agency' : 'grid'
+        // this.getServicePie(_arr[0], orgType)
+        this.getPie(_arr[0])
+        this.getMapUnitList(_arr[0])
+      }
+
+    },
+    //加载地图数据
+    loadMap () {
+      if (this.isfirstInit) {
+        //mapInfo, polygonArray, polIconUrlArray, iconArrays, iconUrlArray
+        this.$refs.map.loadMap(this.agencyInfo, null, null, this.distributionsList, this.iconUrlArray, null)
+      } else {
+        this.$refs.map.refreshMap(null, this.distributionsList)
+
+      }
+    },
+
+    //点击项目
+    async clickMapVolunteer (feature) {
+      console.log('标注信息', feature.values_.properties)
+      if (!feature.values_.properties.info.icResiUserId) {
+        return false
+      }
+      const info = feature.values_.properties.info
+      const url = "/epmetuser/icresiuser/resi-brief/" + info.icResiUserId
+      // const url = "http://yapi.elinkservice.cn/mock/245/heart/icpartyunit/distribution"
+
+      let params = {}
+
+      const { data, code, msg } = await requestPost(url, params)
+
+      if (code === 0) {
+        let coordinate = [info.longitude, info.latitude]
+        data.gridName = data.gridName ? data.gridName : '--'
+        data.villageName = data.villageName ? data.villageName : '--'
+        data.icUserName = data.icUserName ? data.icUserName : '--'
+        data.mobile = data.mobile ? data.mobile : '--'
+        data.idCard = data.idCard ? data.idCard : '--'
+        data.birthday = data.birthday ? data.birthday : '--'
+        data.contacts = data.contacts ? data.contacts : '--'
+        data.contactsMobile = data.contactsMobile ? data.contactsMobile : '--'
+
+        data.isBdhjShow = data.isBdhj ? data.isBdhj === '0' ? '否' : '是' : '--'
+        data.genderShow = data.gender ? data.gender === '0' ? '女' : '男' : '--'
+        let categoriesArray = []
+
+        for (let key in data.volunteerCategories) {
+          categoriesArray.push(data.volunteerCategories[key])
+
+        }
+
+
+        if (categoriesArray.length > 0) {
+          data.categories = categoriesArray.join(',')
+        } else {
+          data.categories = '--'
+        }
+
+        let showData = `
+                <div style='font-size:16px; color:#FFFFFF;'>居民信息</div>
+                <div style='font-size:12px; color:#FFFFFF;margin-top:10px'>所属网格：
+                  <span>`+ data.gridName + `</span>
+                </div>
+                <div style='font-size:12px; color:#FFFFFF;margin-top:5px'>所属小区：
+                  <span>`+ data.villageName + `</span>
+                </div>
+                <div style='font-size:12px; color:#FFFFFF;margin-top:5px'>本地户籍：
+                  <span>`+ data.isBdhjShow + `</span>
+                </div>
+                <div style='font-size:12px; color:#FFFFFF;margin-top:5px'>姓名：
+                  <span>`+ data.icUserName + `</span>
+                </div> 
+                <div style='font-size:12px; color:#FFFFFF;margin-top:5px'>手机：
+                  <span>`+ data.mobile + `</span>
+                </div> 
+                <div style='font-size:12px; color:#FFFFFF;margin-top:5px'>性别：
+                  <span>`+ data.genderShow + `</span>
+                </div> 
+                <div style='font-size:12px; color:#FFFFFF;margin-top:5px'>身份证号：
+                  <span>`+ data.idCard + `</span>
+                </div> 
+                <div style='font-size:12px; color:#FFFFFF;margin-top:5px'>出生日期：
+                  <span>`+ data.birthday + `</span>
+                </div> 
+                <div style='font-size:12px; color:#FFFFFF;margin-top:5px'>联系人：
+                  <span>`+ data.contacts + `</span>
+                </div> 
+                <div style='font-size:12px; color:#FFFFFF;margin-top:5px'>联系人手机：
+                  <span>`+ data.contactsMobile + `</span>
+                </div> 
+                <div style='font-size:12px; color:#FFFFFF;margin-top:5px'>志愿者类别：
+                  <span>`+ data.categories + `</span>
+                </div> 
+                `
+        // console.log(showData)
+        this.$refs.map.handleShowPopup(showData, coordinate)
+
+      } else {
+        this.$message.error(msg)
+      }
+    },
+  },
+};
+</script>
+
+<style
+  lang="scss"
+  src="@/assets/scss/modules/visual/warning.scss"
+  scoped
+></style>
+<style lang="scss" scoped>
+.warning-box {
+  // display: flex;
+  .box-wr {
+    display: flex;
+  }
+  .card-wr {
+    flex: 1;
+  }
+  .card-wr:last-child {
+    margin-left: 20px;
+  }
+  padding: 25px 21px 15px 24px;
+}
+.card-title {
+  display: flex;
+  align-items: center;
+  cursor: pointer;
+  margin-bottom: 10px;
+  .title-icon {
+    display: block;
+    width: 36px;
+    height: 29px;
+    box-sizing: border-box;
+    margin-right: 3px;
+  }
+  .title-label {
+    font-size: 16px;
+    font-weight: 800;
+
+    ::v-deep .el-input {
+      width: 180px;
+      .el-input__inner {
+        font-size: 20px;
+        font-weight: 800;
+        color: #fff;
+        background: transparent;
+        border: 0;
+      }
+      .el-icon-arrow-down::before {
+        content: "\e790";
+      }
+    }
+  }
+  ::v-deep .el-dropdown {
+    font-size: 16px;
+    color: #fff;
+    font-weight: 800;
+  }
+}
+.card-echart {
+  display: flex;
+  margin-top: 40px;
+
+  .card-left {
+    position: relative;
+    flex: 1;
+    display: flex;
+  }
+}
+.card-echart:last-child {
+  padding-bottom: 40px;
+}
+.echart-wr {
+  position: relative;
+  flex-shrink: 0;
+  width: 50%;
+  height: 320px;
+  box-sizing: border-box;
+  .echart-org {
+    width: 100%;
+    height: 100%;
+  }
+  .echart-cicle {
+    position: absolute;
+    top: 50%;
+    left: 50%;
+    width: 240px;
+    height: 240px;
+    box-sizing: border-box;
+    margin-top: -120px;
+    margin-left: -120px;
+    border: 1px dashed rgba(0, 96, 240, 1);
+    border-radius: 50%;
+  }
+}
+.card-count {
+  flex: 1;
+  .card-count-item {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    width: 418px;
+    height: 124px;
+    box-sizing: border-box;
+    margin-top: 20px;
+    // padding-left: 192px;
+    background: url("../../../../assets/img/shuju/measure/dangyuan.png") center
+      no-repeat;
+    background-size: cover;
+    .card-count-content {
+      position: relative;
+      box-sizing: border-box;
+      padding-left: 30px;
+      color: #fff;
+      cursor: pointer;
+      .card-count-num {
+        font-size: 32px;
+        font-weight: bold;
+      }
+      .card-count-label {
+        margin-top: 6px;
+        font-size: 16px;
+        color: rgba(255, 255, 255, 0.72);
+      }
+    }
+    .card-count-content::after {
+      position: absolute;
+      top: 50%;
+      left: 0;
+      content: "";
+      width: 1px;
+      height: 50px;
+      margin-top: -25px;
+      background: rgba(98, 162, 205, 1);
+    }
+  }
+  .card-count-item:last-child {
+    background: url("../../../../assets/img/shuju/measure/jumin.png") center
+      no-repeat;
+  }
+}
+
+.map-tips {
+  width: 100%;
+  display: flex;
+  // justify-content: center;
+  align-items: center;
+  flex-wrap: wrap;
+  box-sizing: border-box;
+  padding: 6px 0 0 100px;
+  // padding-top: 10px;
+  // padding-bottom: 10px;
+
+  .map-tips-item {
+    display: flex;
+
+    align-items: center;
+    margin-top: 10px;
+    margin-right: 40px;
+
+    .map-tips-icon {
+      width: 20px;
+      height: 10px;
+      box-sizing: border-box;
+      margin-right: 10px;
+      background: #dd2719;
+      border-radius: 2px;
+    }
+    .map-tips-label {
+      font-size: 16px;
+      color: #fff;
+    }
+  }
+}
+
+.card-wr-map {
+  // height: calc(100vh - 120px);
+  text-align: center;
+
+  .card-map {
+    margin-top: 10px;
+    width: 100%;
+    // height: calc(100vh - 285px);
+    height: calc(100vh - 315px);
+
+    .map {
+      width: 100%;
+      height: 100%;
+    }
+  }
+}
+</style>
diff --git a/src/views/modules/workSys/demandCate.vue b/src/views/modules/workSys/demandCate.vue
index e8b665c6..e51e1ee2 100644
--- a/src/views/modules/workSys/demandCate.vue
+++ b/src/views/modules/workSys/demandCate.vue
@@ -32,6 +32,7 @@
         class="resi-table"
       >
         <el-table-column label="序号" type="index" align="center" width="50">
+          <template slot-scope="scope">{{ scope.row.index }}</template>
         </el-table-column>
         <el-table-column
           v-for="item in tableHeader"
@@ -401,9 +402,10 @@ export default {
           if (res.code !== 0) {
             return this.$message.error(res.msg)
           } else {
-            this.tableData = res.data.list.map(item => {
+            this.tableData = res.data.list.map((item, index) => {
               return {
                 ...item,
+                index: index + 1,
                 hasBtn: true,
                 children: item.children.map(n => {
                   return {
@@ -428,10 +430,20 @@ export default {
 
 <style lang="scss" scoped>
 .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);
+  ::v-deep .el-table {
+    th  {
+      color: #fff;
+      background-color: rgba(33, 149, 254, 1);
+    }
+    
+    .cell {
+      
+      span:nth-of-type(3) {
+        display: inline-block;
+        width: 90%;
+        word-break: break-all;
+      }
+    }
   }
 }
 .resi-table {
diff --git a/src/views/modules/workSys/mapConfig.vue b/src/views/modules/workSys/mapConfig.vue
index 267b19fc..d60f7930 100644
--- a/src/views/modules/workSys/mapConfig.vue
+++ b/src/views/modules/workSys/mapConfig.vue
@@ -67,7 +67,7 @@ import { Loading } from 'element-ui'; //引入Loading服务
 import { requestPost } from "@/js/dai/request";
 import { altKeyOnly, click, pointerMove } from 'ol/events/condition';
 
-
+var centerPointGlobal = [120.38945519, 36.0722275]
 let loading;//加载动画
 
 let x = 1500
@@ -374,11 +374,14 @@ const vueGis = {
     },
     //设置地图定位的中心点和缩放级别
     setMapLocation () {
-      this.centerPoint = []
 
       if (this.orgData.longitude && this.orgData.latitude) {
+        this.centerPoint = []
         this.centerPoint.push(this.orgData.longitude)
         this.centerPoint.push(this.orgData.latitude)
+      } else {
+
+        this.centerPoint = centerPointGlobal
       }
 
       this.setZoom(this.orgData.agencyLevel)
@@ -387,11 +390,11 @@ const vueGis = {
     //根据组织层级设置缩放级别
     setZoom (agencyLevel) {
       if (agencyLevel === 'district') {
-        this.zoom = 13
+        this.zoom = 12
       } else if (agencyLevel === 'street') {
-        this.zoom = 14
+        this.zoom = 13
       } else if (agencyLevel === 'community') {
-        this.zoom = 15
+        this.zoom = 14
       }
 
     },
diff --git a/src/views/pages/indexWork.vue b/src/views/pages/index.vue
similarity index 100%
rename from src/views/pages/indexWork.vue
rename to src/views/pages/index.vue
diff --git a/src/views/pages/login.vue b/src/views/pages/login.vue
index d08988d7..013f89d4 100644
--- a/src/views/pages/login.vue
+++ b/src/views/pages/login.vue
@@ -182,6 +182,26 @@ export default {
         const params = {
           phone: this.dataForm.phone
         }
+        // this.$http
+        // .post(url, params).then(({ data })=> {
+        //   console.log('res--comll', data)
+        //   if (data.data.length === 0) {
+        //     //没有客户，提示无法登录
+        //     this.$message.error('账号不存在')
+        //     this.endLoading()
+        //   } else if (data.data.length === 1) {
+        //     this.selectCustomer(data.data[0])
+        //   } else {
+        //     this.endLoading()
+        //     this.diaVisible = true
+        //     this.$nextTick(() => {
+        //       this.tableData = data.data
+        //     })
+        //   }
+        // }).catch((err) => {
+        //   this.endLoading()
+        //   this.$message.error(err)
+        // })
         window.app.ajax.post(
           url,
           params,

From 9aa3b18d502773ca75a54ef0a4a5490e68f7d38c Mon Sep 17 00:00:00 2001
From: dai <851733175@qq.com>
Date: Fri, 7 Jan 2022 17:02:20 +0800
Subject: [PATCH 29/29] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=85=9A=E7=BE=A4bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/communityService/dqfwzx/index.vue | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/views/modules/communityService/dqfwzx/index.vue b/src/views/modules/communityService/dqfwzx/index.vue
index b26a50a3..0544cbf9 100644
--- a/src/views/modules/communityService/dqfwzx/index.vue
+++ b/src/views/modules/communityService/dqfwzx/index.vue
@@ -191,9 +191,7 @@ export default {
   },
   async mounted() {
     await this.loadAgency();
-    await this.getTableData();
-    this.initMap();
-    this.setMap();
+    // await this.getTableData();
   },
   methods: {
     // 地图初始化函数，本例取名为init，开发者可根据实际情况定义
@@ -324,6 +322,7 @@ export default {
     },
 
     async getTableData() {
+      const oldLen = this.tableData.length;
       const url = "/gov/org/icpartyservicecenter/partyservicecenterlist";
       const { data, code, msg } = await requestPost(url, {
         orgId: this.agencyId,
@@ -333,7 +332,12 @@ export default {
         console.log("列表请求成功！！！！！！！！！！！！！！");
 
         this.tableData = data;
-      } else {
+
+        if (data.length > 0 && oldLen == 0) {
+          await nextTick(100);
+          this.initMap();
+          this.setMap();
+        }
       }
     },