From 0d4bf41493e00b65b96386b2ec49982abdeec446 Mon Sep 17 00:00:00 2001
From: "lily.zhang" <daylily.zhang@akuhome.com>
Date: Thu, 4 Nov 2021 17:55:32 +0800
Subject: [PATCH] cxw-010203

---
 src/views/WeiboDetails/weiboContentTOPVolume/index.vue |  6 +++---
 src/views/WeiboDetails/weiboContentTOPVolume/opt.js    |  6 +++---
 src/views/WeiboDetails/weiboUserActiveArea/opt2.js     | 10 ++++++++--
 3 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/src/views/WeiboDetails/weiboContentTOPVolume/index.vue b/src/views/WeiboDetails/weiboContentTOPVolume/index.vue
index d5f55e0..5d68bea 100644
--- a/src/views/WeiboDetails/weiboContentTOPVolume/index.vue
+++ b/src/views/WeiboDetails/weiboContentTOPVolume/index.vue
@@ -1,7 +1,7 @@
 <!--
  * @Author: your name
  * @Date: 2021-10-14 15:54:06
- * @LastEditTime: 2021-11-04 16:55:02
+ * @LastEditTime: 2021-11-04 17:03:24
  * @LastEditors: Please set LastEditors
  * @Description: In User Settings Edit
  * @FilePath: /data-show/src/views/WeiboDetails/weiboContentTOPVolume/index.vue
@@ -51,15 +51,15 @@ export default {
                 let data = res.data || [];
                 let arr = [];
                 data.sort(comparePig('value'));
+                let maxVal = data[0].value
                 data.forEach((ele,index) => {
                     let obj = {
                         value: ele.value,
-                        opt: createOpt(ele.key,this.colors[index],ele.value)
+                        opt: createOpt(ele.key,this.colors[index],ele.value, maxVal)
                     }
                     arr.push(obj)
                 })
                 this.list = arr;
-                // this.opt1 = createOpt(data[0].key,'#306cc0',data[0].value);
                 this.load = false;
             });
         }
diff --git a/src/views/WeiboDetails/weiboContentTOPVolume/opt.js b/src/views/WeiboDetails/weiboContentTOPVolume/opt.js
index 8074f57..6d88a66 100644
--- a/src/views/WeiboDetails/weiboContentTOPVolume/opt.js
+++ b/src/views/WeiboDetails/weiboContentTOPVolume/opt.js
@@ -1,14 +1,14 @@
 /*
  * @Author: your name
  * @Date: 2021-10-14 16:05:12
- * @LastEditTime: 2021-10-14 18:39:52
+ * @LastEditTime: 2021-11-04 17:05:41
  * @LastEditors: Please set LastEditors
  * @Description: In User Settings Edit
  * @FilePath: /data-show/src/views/WeiboDetails/weiboContentTOPVolume/opt.js
  * startAngle: 180,
  */
 import * as echarts from "echarts";
-export default function createOpt(name, color, num) {
+export default function createOpt(name, color, num, maxVal) {
     return {
         tooltip: {
             backgroundColor: "#08182F",
@@ -31,7 +31,7 @@ export default function createOpt(name, color, num) {
                 startAngle: 180,
                 endAngle: 0,
                 min: 0,
-                max: 800,
+                max: maxVal * 5,
                 splitNumber: 5,
                 detail: { show: false, formatter: '{value}%' },
                 axisLine: {
diff --git a/src/views/WeiboDetails/weiboUserActiveArea/opt2.js b/src/views/WeiboDetails/weiboUserActiveArea/opt2.js
index 178233f..0c3b6dd 100644
--- a/src/views/WeiboDetails/weiboUserActiveArea/opt2.js
+++ b/src/views/WeiboDetails/weiboUserActiveArea/opt2.js
@@ -1,13 +1,13 @@
 /*
  * @Author: your name
  * @Date: 2021-10-14 11:53:16
- * @LastEditTime: 2021-10-14 15:51:30
+ * @LastEditTime: 2021-11-04 17:17:02
  * @LastEditors: Please set LastEditors
  * @Description: In User Settings Edit
  * @FilePath: /data-show/src/views/WeiboDetails/weiboUserActiveArea/opt2.js
  */
 const ini_data = [];//初始化省份数组
-const provArr = ['河北', '河南', '云南', '辽宁', '黑龙江', '湖南', '安徽', '山东'];
+const provArr = ['河北', '河南', '云南', '北京', '黑龙江', '湖南', '安徽', '山东'];
 //正则省份，将省与市的字眼去掉，框架不识别
 for (var i = 0; i < provArr.length; i++) {
     var str = provArr[i];
@@ -15,6 +15,7 @@ for (var i = 0; i < provArr.length; i++) {
     var str2 = { name: str.replace(re, ''), value: 5 };//拼接对象数组
     ini_data.push(str2);
 }
+
 export default function createOptD2() {
     return {
         tooltip: {
@@ -96,6 +97,11 @@ export default function createOptD2() {
                 //     }
                 // },
                 data: [
+                    {
+                        name: "北京市",
+                        value: 1000,
+                        // selected: true,
+                    },
                     {
                         name: "河北省",
                         value: 1000,