From dac24f7a2b29c6b7dd422a992728fee4666be15d Mon Sep 17 00:00:00 2001
From: 13176889840 <13176889840@163.com>
Date: Mon, 13 Jun 2022 09:59:27 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=98=BE=E7=A4=BA=EF=BC=88?=
 =?UTF-8?q?=E5=9C=B0=E5=9B=BE=EF=BC=8C=E5=9B=BE=E8=A1=A8=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/visual/communityParty/community.vue      | 12 ++++++++----
 src/views/modules/visual/communityParty/party.vue    |  2 ++
 .../modules/visual/components/screen-map/index.vue   |  6 +++---
 3 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/src/views/modules/visual/communityParty/community.vue b/src/views/modules/visual/communityParty/community.vue
index 9ff87022..c25cd60a 100644
--- a/src/views/modules/visual/communityParty/community.vue
+++ b/src/views/modules/visual/communityParty/community.vue
@@ -360,6 +360,8 @@ export default {
       // this.pieEduOptions.series[1].width = 400
       this.clickEduPie(0)
       let fun = params => {
+        console.log('params------c', params)
+        if (params.seriesIndex == 0 || params.seriesIndex == 2) return
         this.clickEduPie(params.dataIndex)
       }
       this.$refs.eduChart.handleClick(fun)
@@ -368,6 +370,7 @@ export default {
 
     },
     clickEduPie (seriesIndex) {
+      
       let _code = ''
       let isClick = false
       this.partyItem.forEach((element, index) => {
@@ -517,10 +520,11 @@ export default {
       if (code === 0) {
         this.showMap = false
         this.unitTotal = data.total
+        this.unitTableData = []
         this.unitTableData = data.list.map((item, index) => {
           return {
             ...item,
-            index: index + 1
+            urlIndex: index
           }
         })
         this.unitTableData.forEach(item => {
@@ -693,7 +697,7 @@ export default {
             icon: require('../../../../assets/img/shuju/measure/lxzz.png')
           },
           2: {
-            color: 'rgba(80, 194, 237, 1)',
+            color: '#50C2ED',
             icon: require('../../../../assets/img/shuju/measure/qydw.png')
           },
           3: {
@@ -701,7 +705,7 @@ export default {
             icon: require('../../../../assets/img/shuju/measure/jgzs.png')
           },
           4: {
-            color: '#50C2ED',
+            color: '#0189d5',
             icon: require('../../../../assets/img/shuju/measure/other.png')
           },
           5: {
@@ -713,7 +717,7 @@ export default {
             icon: require('../../../../assets/img/shuju/measure/jijin.png')
           },
           7: {
-            color: '#0189d5',
+            color: '#C015C3', // 
             
             icon: require('../../../../assets/img/shuju/measure/qita.png')
           }
diff --git a/src/views/modules/visual/communityParty/party.vue b/src/views/modules/visual/communityParty/party.vue
index b5b0e541..d7ab9eb2 100644
--- a/src/views/modules/visual/communityParty/party.vue
+++ b/src/views/modules/visual/communityParty/party.vue
@@ -311,6 +311,7 @@ export default {
       this.pieAgeOptions = pieOption(this.pieAgeChartS)
       this.clickAgePie(0)
       let fun = params => {
+        if (params.seriesIndex == 0 || params.seriesIndex == 2) return
         this.clickAgePie(params.dataIndex)
       }
       this.$refs.ageChart.handleClick(fun)
@@ -359,6 +360,7 @@ export default {
       // this.pieEduOptions.series[1].width = 400
       this.clickEduPie(0)
       let fun = params => {
+        if (params.seriesIndex == 0 || params.seriesIndex == 2) return
         this.clickEduPie(params.dataIndex)
       }
       this.$refs.eduChart.handleClick(fun)
diff --git a/src/views/modules/visual/components/screen-map/index.vue b/src/views/modules/visual/components/screen-map/index.vue
index 1ccb4d13..bfa9f23e 100644
--- a/src/views/modules/visual/components/screen-map/index.vue
+++ b/src/views/modules/visual/components/screen-map/index.vue
@@ -355,7 +355,7 @@ const vueGis = {
     loadPolIcon (feature) {
       polIconSource.clear()
       let polyIconFeatures = [];
-      console.log('feature-----', feature)
+      // console.log('feature-----', feature)
       feature.forEach(oneIcon => {
 
         var extent = boundingExtent(oneIcon.getGeometry().getCoordinates()[0]); //获取一个坐标数组的边界，格式为[minx,miny,maxx,maxy]
@@ -372,7 +372,7 @@ const vueGis = {
             id: oneIcon.id_
           }
         });
-        console.log('oneIcon----ddd', oneIcon)
+        // console.log('oneIcon----ddd', oneIcon)
         let polyIconStyle = new Style({
           image: new Icon({
             // anchor: [0.5, 0.5],
@@ -408,7 +408,7 @@ const vueGis = {
               info: { ...oneIcon }
             }
           });
-          console.log('oneIcon----', oneIcon)
+          // console.log('oneIcon----', this.iconUrlArray[oneIcon.urlIndex])
           let iconStyle = new Style({
             image: new Icon({
               // anchor: [0.5, 0.5],