From 98d677521ed6cf0a1a38164b99b2093db34ce3ab Mon Sep 17 00:00:00 2001
From: "lily.zhang" <daylily.zhang@akuhome.com>
Date: Fri, 29 Oct 2021 20:19:45 +0800
Subject: [PATCH] cxw-010203

---
 .../BrandInsight/popularEvents/index.vue      | 13 +++----
 src/views/BrandInsight/popularEvents/opt.js   | 36 ++++++++++++-------
 src/views/BrandInsight/weiboKol/opt.js        |  6 ++--
 src/views/BrandInsight/weiboPortraits/opt.js  |  6 ++--
 4 files changed, 36 insertions(+), 25 deletions(-)

diff --git a/src/views/BrandInsight/popularEvents/index.vue b/src/views/BrandInsight/popularEvents/index.vue
index fda5c1a..875ff64 100644
--- a/src/views/BrandInsight/popularEvents/index.vue
+++ b/src/views/BrandInsight/popularEvents/index.vue
@@ -1,7 +1,7 @@
 <!--
  * @Author: xw
  * @Date: 2021-10-12 11:06:58
- * @LastEditTime: 2021-10-28 15:18:16
+ * @LastEditTime: 2021-10-29 20:15:04
  * @LastEditors: Please set LastEditors
  * @Description: 热门事件
  * @FilePath: /data-show/src/views/BrandInsight/popularEvents/index.vue
@@ -16,7 +16,7 @@
 </template>
 
 <script>
-import moment from "moment";
+// import moment from "moment";
 import { getHotEventsType } from "@/api/BrandInsight";
 import createOpt from "./opt";
 export default {
@@ -50,12 +50,12 @@ export default {
                     obj[ele] = [];
                 });
                 arr.forEach((ele) => {
-                    let m1 = moment(ele.minSourcetime);
-                    let m2 = moment(ele.maxSourcetime);
-                    let duration = m2.diff(m1, "minute");
+                    // let m1 = moment(ele.minSourcetime);
+                    // let m2 = moment(ele.maxSourcetime);
+                    // let duration = m2.diff(m1, "hours");
                     // let str= moment.utc(time).format('HH:mm')
                     let a = [
-                        duration,
+                        ele.maxSourcetime,
                         ele.events_count * 1,
                         ele.events_influence,
                         ele.events_brand,
@@ -66,6 +66,7 @@ export default {
                     ];
                     obj[ele.events_type].push(a);
                 });
+                console.log(obj)
                 this.opt = createOpt(obj);
                 this.load = false;
             });
diff --git a/src/views/BrandInsight/popularEvents/opt.js b/src/views/BrandInsight/popularEvents/opt.js
index 2ce40f0..4a281b8 100644
--- a/src/views/BrandInsight/popularEvents/opt.js
+++ b/src/views/BrandInsight/popularEvents/opt.js
@@ -1,7 +1,7 @@
 /*
  * @Author: your name
  * @Date: 2021-10-12 11:16:44
- * @LastEditTime: 2021-10-28 15:19:16
+ * @LastEditTime: 2021-10-29 20:16:33
  * @LastEditors: Please set LastEditors
  * @Description: In User Settings Edit
  * @FilePath: /data-show/src/views/BrandInsight/popularEvents/opt.js
@@ -15,7 +15,8 @@
 //     [['12:00',4,300000000,'E4','7-10年经验'],['08:00',0.77,300000000,'E3','7-10年经验'],['04:00',0.83,300000000,'E2','7-10年经验']],
 //     [['16:00',1.04,350000000,'F5','10年以上经验'],['08:00',1.54,350000000,'F3','10年以上经验'],['04:00',2.5,350000000,'F2','10年以上经验']],
 // ];
-import moment from "moment";
+// import moment from "moment";
+import { bigNumberTransform } from "@/utils/gol/dataTool"
 function createData(obj = {}) {
     let arr = [];
     for (let key in obj) {
@@ -47,10 +48,10 @@ export default function createOpt(ds = {}) {
             }
         },
         grid: {
-            left: '3%',
-            right: '2%',
-            bottom: '4%',
-            top: '15%',
+            left: 16,
+            right: '5%',
+            bottom: 10,
+            top: 42,
             containLabel: true
         },
         tooltip: {
@@ -64,7 +65,7 @@ export default function createOpt(ds = {}) {
             extraCssText: "box-shadow: 0px 0px 10px 0px #3373CC;",
             formatter: (p) => {
                 let data = p.data;
-                return `<span>${data[5]}-${data[3]}</span><br><span>${data[4]}</span><br><span>影响力：${data[2]}</span>`;
+                return `<span>${data[5]}-${data[3]}</span><br><span>${data[4]}</span><br><span>${data[0]}</span><br><span>影响力：${data[2]}</span>`;
             }
         },
         xAxis: {
@@ -79,17 +80,20 @@ export default function createOpt(ds = {}) {
                     color: "#fff",
                 },
             },
+            splitLine: {
+                show: false
+            },
             // data: ['00:00', '04:00', '08:00', '12:00', '16:00', '20:00', '24:00'],
             axisLabel : {
-                formatter: (value) => {
-                    console.log(value)
+                // formatter: (value) => {
+                    
 
-                    var str= moment.utc(value).format('HH:mm');
+                //     var str= moment.utc(value).format('HH:mm');
                     
 
-                    // let str = value.substring(10,16)
-                    return str;
-                }
+                //     // let str = value.substring(10,16)
+                //     return str;
+                // }
             },
         },
         yAxis: {
@@ -100,6 +104,12 @@ export default function createOpt(ds = {}) {
                     color: "#fff",
                 },
             },
+            axisLabel: {
+                formatter: (value) => {
+                    let str = bigNumberTransform(value);
+                    return str;
+                }
+            },
             splitLine: {
                 lineStyle: {
                     type: "dashed", // y轴分割线类型
diff --git a/src/views/BrandInsight/weiboKol/opt.js b/src/views/BrandInsight/weiboKol/opt.js
index 0ef7d01..384d26c 100644
--- a/src/views/BrandInsight/weiboKol/opt.js
+++ b/src/views/BrandInsight/weiboKol/opt.js
@@ -1,7 +1,7 @@
 /*
  * @Author: your name
  * @Date: 2021-10-12 14:33:51
- * @LastEditTime: 2021-10-25 20:04:41
+ * @LastEditTime: 2021-10-29 19:20:12
  * @LastEditors: Please set LastEditors
  * @Description: In User Settings Edit
  * @FilePath: /data-show/src/views/BrandInsight/weiboKol/opt.js
@@ -40,12 +40,12 @@ export default function createOpt(ds = [], colors= []) {
               label: {
                 show: false,
                 position: 'center',
-                lineHeight: 48
+                lineHeight: 30
               },
               emphasis: {
                 label: {
                   show: true,
-                  fontSize: '30',
+                  fontSize: '20',
                   color: "#ffff",
                   fontWeight: 'bold',
                   formatter: function (p) {
diff --git a/src/views/BrandInsight/weiboPortraits/opt.js b/src/views/BrandInsight/weiboPortraits/opt.js
index 1aab373..cac0c39 100644
--- a/src/views/BrandInsight/weiboPortraits/opt.js
+++ b/src/views/BrandInsight/weiboPortraits/opt.js
@@ -1,7 +1,7 @@
 /*
  * @Author: your name
  * @Date: 2021-10-12 15:14:58
- * @LastEditTime: 2021-10-26 12:47:13
+ * @LastEditTime: 2021-10-29 19:20:45
  * @LastEditors: Please set LastEditors
  * @Description: In User Settings Edit
  * @FilePath: /data-show/src/views/BrandInsight/weiboPortraits/opt.js
@@ -41,12 +41,12 @@ export default function createOpt(ds=[], colors=[]) {
                 show: false,
                 position: 'center',
                 color: "#ffff",
-                lineHeight: 48
+                lineHeight: 30
             },
               emphasis: {
                 label: {
                   show: true,
-                  fontSize: '30',
+                  fontSize: '20',
                   color: "#ffff",
                   formatter: function (p) {
                     return `${p.data.name}\n${p.percent}%\n${p.data.value}`