From 024b348fecfe537382660d8185fba6e84cc0878c Mon Sep 17 00:00:00 2001
From: jiangyy <jiang478938504@126.com>
Date: Mon, 20 Dec 2021 09:52:20 +0800
Subject: [PATCH 1/9] =?UTF-8?q?=E5=9C=B0=E5=9B=BE=E4=B8=AD=E5=BF=83?=
 =?UTF-8?q?=E7=82=B9=E9=BB=98=E8=AE=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/visual/basicinfo/basicInfoMain.vue     | 8 ++++++--
 src/views/modules/visual/components/screen-map/index.vue | 8 ++++++--
 src/views/modules/workSys/mapConfig.vue                  | 7 +++++--
 3 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/src/views/modules/visual/basicinfo/basicInfoMain.vue b/src/views/modules/visual/basicinfo/basicInfoMain.vue
index 8c0f4a59..568c453b 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)
diff --git a/src/views/modules/visual/components/screen-map/index.vue b/src/views/modules/visual/components/screen-map/index.vue
index eba9be98..0166c8c3 100644
--- a/src/views/modules/visual/components/screen-map/index.vue
+++ b/src/views/modules/visual/components/screen-map/index.vue
@@ -37,7 +37,7 @@ import { mapGetters } from "vuex";
 import { Loading } from 'element-ui'; //引入Loading服务
 
 import { requestPost } from "@/js/dai/request";
-
+var centerPointGlobal = [120.38945519, 36.0722275]
 
 
 let loading;//加载动画
@@ -433,11 +433,15 @@ const vueGis = {
     },
     //设置地图定位的中心点和缩放级别
     setMapLocation () {
-      this.centerPoint = []
+
 
       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)
diff --git a/src/views/modules/workSys/mapConfig.vue b/src/views/modules/workSys/mapConfig.vue
index 267b19fc..5853ab39 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)

From 1a578494ddfdfdc1b265ce45be05bb1c417a2b07 Mon Sep 17 00:00:00 2001
From: jiangyy <jiang478938504@126.com>
Date: Tue, 21 Dec 2021 16:54:56 +0800
Subject: [PATCH 2/9] =?UTF-8?q?=E5=B0=8F=E5=8C=BA=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E9=AB=98=E5=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/base/community/buildTable.vue     | 2 +-
 src/views/modules/base/community/communityTable.vue | 2 +-
 src/views/modules/base/community/roomTable.vue      | 8 ++++++--
 3 files changed, 8 insertions(+), 4 deletions(-)

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: {

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 3/9] =?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 c49824d155a28dfce8308ea84071d403b6080b60 Mon Sep 17 00:00:00 2001
From: jiangyy <jiang478938504@126.com>
Date: Wed, 29 Dec 2021 15:56:25 +0800
Subject: [PATCH 4/9] =?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 83cb317e2870f46a7e2f7bc28e3876ab9b5d9679 Mon Sep 17 00:00:00 2001
From: jiangyy <jiang478938504@126.com>
Date: Thu, 30 Dec 2021 15:20:14 +0800
Subject: [PATCH 5/9] =?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 6/9] =?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 7/9] =?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 8/9] =?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 9/9] =?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]