From c5cb633f82d450ec859ee8a0fb7186cdd0a5be4f Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Thu, 05 Aug 2021 15:17:32 +0800
Subject: [PATCH] Merge branch 'master' of http://s16s652780.51mypc.cn:49896/r/zhba_regulatory

---
 src/views/home/indexEchart.js |  107 +++++++++++++++++++++++++----------------------------
 1 files changed, 51 insertions(+), 56 deletions(-)

diff --git a/src/views/home/indexEchart.js b/src/views/home/indexEchart.js
index 3d08623..c7b151f 100644
--- a/src/views/home/indexEchart.js
+++ b/src/views/home/indexEchart.js
@@ -421,9 +421,12 @@
       res.series.push({
         name: "分局预警占比",
         type: "pie",
-        clockWise: true,
+        clockwise: true,
         z: 2,
-        hoverAnimation: false,
+        emphasis: {
+          scale: false
+        },
+        // hoverAnimation: false,
         radius: [83 - i * 12 + '%', 78 - i * 12 + '%'],
         center: ["30%", "50%"],
         labelLine: {
@@ -450,7 +453,10 @@
             label: {
               show: false
             },
-            hoverAnimation: false
+            emphasis: {
+              scale: false
+            }
+            // hoverAnimation: false
           }
         ]
       });
@@ -520,10 +526,11 @@
         axisLabel: {
           interval: 0,
           inside: false,
-          textStyle: {
-            color: "#fff",
-            fontSize: 8
-          },
+          color: "#fff",
+          fontSize: 8,
+          // textStyle: {
+
+          // },
           show: true
         },
         data: optionData.yAxis
@@ -619,12 +626,8 @@
       zoom: 1.14,
       top: '10%',
       label: {
-        normal: {
-          show: false,
-          textStyle: {
-            color: '#fff'
-          }
-        },
+        show: false,
+        color: '#fff',
         emphasis: {
           textStyle: {
             color: '#fff'
@@ -634,16 +637,17 @@
 
       roam: true,
       itemStyle: {
-        normal: {
-          areaColor: 'rgba(0,255,255,.02)',
-          borderColor: '#00ffff',
-          borderWidth: 1.5,
-          shadowColor: '#00ffff',
-          shadowOffsetX: 0,
-          shadowOffsetY: 4,
-          shadowBlur: 10,
-        },
-        emphasis: {
+        areaColor: 'rgba(0,255,255,.02)',
+        borderColor: '#00ffff',
+        borderWidth: 1.5,
+        shadowColor: '#00ffff',
+        shadowOffsetX: 0,
+        shadowOffsetY: 4,
+        shadowBlur: 10,
+
+      },
+      emphasis: {
+        itemStyle: {
           color: 'transparent', //悬浮背景
           textStyle: {
             color: '#fff'
@@ -660,31 +664,28 @@
         // aspectScale: 0.75, //长宽比
         zoom: 1.14,
         label: {
-          normal: {
-            show: false,
-            textStyle: {
-              color: '#fff'
-            }
-          },
-          emphasis: {
-            textStyle: {
-              color: '#fff'
-            }
+          show: false,
+          color: '#fff'
+        },
+        emphasis: {
+          label: {
+            color: '#fff'
           }
         },
         top: '10%',
         roam: true,
         itemStyle: {
-          normal: {
-            areaColor: 'rgba(0,255,255,.02)',
-            borderColor: '#00ffff',
-            borderWidth: 1.5,
-            shadowColor: '#00ffff',
-            shadowOffsetX: 0,
-            shadowOffsetY: 4,
-            shadowBlur: 10,
-          },
-          emphasis: {
+          areaColor: 'rgba(0,255,255,.02)',
+          borderColor: '#00ffff',
+          borderWidth: 1.5,
+          shadowColor: '#00ffff',
+          shadowOffsetX: 0,
+          shadowOffsetY: 4,
+          shadowBlur: 10,
+
+        },
+        emphasis: {
+          itemStyle: {
             areaColor: 'transparent', //悬浮背景
             textStyle: {
               color: '#fff'
@@ -700,21 +701,12 @@
         symbol: 'image://' + symbolUrl,
         symbolSize: [30, 30],
         label: {
-          normal: {
-            show: false,
-            textStyle: {
-              color: '#fff',
-              fontSize: 9,
-            },
-            // formatter(value) {
-            //   return value.data.value[0]
-            // }
-          }
+          show: false,
+          color: '#fff',
+          fontSize: 9,
         },
         itemStyle: {
-          normal: {
-            color: '#FF0000', //标志颜色
-          }
+          color: '#FF0000', //标志颜色
         },
         data: geoData,
         showEffectOn: 'render',
@@ -722,6 +714,9 @@
           brushType: 'stroke'
         },
         hoverAnimation: true,
+        emphasis: {
+          scale: true
+        },
         zlevel: 1
       }
     ]

--
Gitblit v1.9.3