Merge branch 'master' of http://yun.pashanhoo.com:9090/bdc/bdcjg-web

@@ -41,41 +41,6 @@ export default {
           宁强县: [106.25958, 32.82881, 20],
           略阳县: [106.15399, 33.33009, 20],
         };
-        let seriesData = [
-          {
-            name: '汉台区',
-          },
-          {
-            name: '南郑区',
-          },
-          {
-            name: '城固县',
-          },
-          {
-            name: '洋县',
-          },
-          {
-            name: '西乡县',
-          },
-          {
-            name: '镇巴县',
-          },
-          {
-            name: '勉县',
-          },
-          {
-            name: '留坝县',
-          },
-          {
-            name: '佛坪县',
-          },
-          {
-            name: '宁强县',
-          },
-          {
-            name: '略阳县'
-          }
-        ];
         let convertData = function (data) {
           let scatterData = [];
           for (var i = 0; i < data.length; i++) {
@@ -90,7 +55,6 @@ export default {
           return scatterData;
         };
         this.options = {
-      backgroundColor: 'rgba(0,0,0,1)',
           showLegendSymbol: true,
           tooltip: {
             trigger: 'item',
@@ -126,7 +90,23 @@ export default {
               color: '#737373'
             }
           },
-
+         geo: {
+             aspectScale: 1, //长宽比
+              zoom: 1.1,
+              mapType: '汉中市', // 自定义扩展图表类型
+              top: '15%',
+              left: '10%',
+                    map: '汉中市',
+                    itemStyle: {
+                        normal: {//阴影
+                            areaColor: '#02D9FD ',
+                            shadowColor: '#01271F',
+                            borderWidth: 0,
+                            shadowOffsetX: 2,
+                            shadowOffsetY: 25
+                        }
+                    }
+                    },
           series: [
             {
               type: 'map',
@@ -137,22 +117,26 @@ export default {
               left: '10%',
               itemStyle: {
                 normal: {
-                  areaColor: 'rgba(19,54,162, .5)',
-                  borderColor: 'rgba(0,242,252,.3)',
-                  borderWidth: 1,
+                  areaColor: 'rgba(19,54,162,.5)',
+                  borderColor: 'rgba(0,242,252,.5)',
+                  borderWidth: 2,
                   shadowBlur: 7,
-                  shadowColor: '#00f2fc',
+                  borderColor:'rgba(19,54,162,.1)',
+                  shadowColor: '#44f2fc',
                 },
                 emphasis: {
                   areaColor: '#4f7fff',
-                  borderColor: 'rgba(0,242,252,.6)',
+                  borderColor: 'rgba(0,242,252,.5)',
                   borderWidth: 2,
                   shadowBlur: 10,
                   shadowColor: '#00f2fc',
                 },
               },
               label: {
-                formatter: params => `${params.name}`,
+
+                 formatter: params => {
+               return `${params.data.name}\n${params.data.value+"个"}`;
+            },
                 show: true,
                 position: 'insideRight',
                 textStyle: {
@@ -166,39 +150,7 @@ export default {
                 }
               },
               data: newData,
-            },
-            {
-        name: 'MAP',
-        type: 'map3D',
-        map: name,
-        label: {
-          show: true,
-          textStyle: {
-            color: '#fff',
-          },
-          formatter: (params) => {
-            if (newData.find((ele) => ele.name == params.name)) {
-              return params.name + '\n' + newData.find((ele) => ele.name == params.name).value;
-            } else {
-              return params.name;
             }
-          },
-          borderRadius: 4,
-        },
-        itemStyle: {
-          color: '#144a69',
-          // shadowColor: 'rgba(0,243,255,0.2)',
-          // shadowOffsetY: 5,
-          // shadowBlur: 10,
-          borderColor: '#06767c',
-          borderWidth: 1,
-          // opacity: 1,
-        },
-
-        aspectScale: 0.9, //长宽比
-        selectedMode: false, //是否允许选中多个区域
-        data: newData,
-      },
           ],
         };
         // 重新选择区域

@@ -7,11 +7,18 @@
     display: flex;
     position: relative;
     top: -2px;
-
     b {
-      @include flex-center;
-      flex: 1;
-      width: 100%;
+      font-weight: 200;
+      display: inline-block;
+      position: relative;
+      font-size: 24px;
+      top: -11px;
+      width: 38%;
+      height: 40px;
+      margin-left: 28px;
+      // @include flex-center;
+      display: flex;
+      justify-content: center;
     }
   }
 
@@ -28,7 +35,7 @@
   }
 
   .dialog_footer {
-    margin-top: 8px;
+    margin-bottom: 8px;
     @include flex-center;
   }
 
@@ -72,6 +79,9 @@
   background-size: 100% 100%;
   right: 40px;
   top: 33px;
+  &:hover{
+    box-shadow: inset 0px 0px 12px 0px #02D9FD;
+  }
 }
 
 .el-dialog__close {

@@ -89,7 +89,6 @@ export default {
   methods: {
     // 初始化数据
     queryClick () {
-      // this.$startLoading();
       getQlxxDictList({ ...this.ruleForm, ...this.pageData }).then(res => {
         // this.$endLoading();
         let { records, total } = res.result
@@ -103,7 +102,6 @@ export default {
         cancelButtonText: '取消',
         type: 'warning'
       }).then(() => {
-        this.$startLoading()
         refreshDictCache().then(res => {
           if (res.code == 200) {
             let refech = this.$store.dispatch('dict/generateDic')