From 322a97007e3a8261e2fee7b5894eddc9a4a4556e Mon Sep 17 00:00:00 2001
From: "lily.zhang" <daylily.zhang@akuhome.com>
Date: Tue, 2 Nov 2021 18:24:30 +0800
Subject: [PATCH] cxw-010203

---
 src/api/BrandInsight/index.js                 |  6 +--
 src/views/BrandInsight/brandTop/opt.js        |  9 +++-
 src/views/EventInsight/hotEventPO/index.vue   |  8 ++--
 .../EventInsight/industryTOPHE/index.vue      | 41 +++----------------
 src/views/Index/index.vue                     |  4 +-
 5 files changed, 24 insertions(+), 44 deletions(-)

diff --git a/src/api/BrandInsight/index.js b/src/api/BrandInsight/index.js
index a790303..0d66f8b 100644
--- a/src/api/BrandInsight/index.js
+++ b/src/api/BrandInsight/index.js
@@ -1,16 +1,16 @@
 /*
  * @Author: your name
  * @Date: 2021-10-25 15:38:59
- * @LastEditTime: 2021-10-28 13:15:14
+ * @LastEditTime: 2021-11-02 18:02:29
  * @LastEditors: Please set LastEditors
  * @Description: In User Settings Edit
  * @FilePath: /data-show/src/api/BrandInsight/index.js
  */
 import httpService from "@/request"
 
-// 获取顶部选择项 无自选
+// 品牌车型top
 export function getCartypeTop10(params) {
-    let obj =  Object.assign({action: 'getCartypeTop10', sType: 'BrandOverview', iBBsType: 1}, params)
+    let obj =  Object.assign({action: 'getCartypeTop10', sType: 'BrandOverview'}, params)
     return httpService({
         url: `/api/v6.ashx`,
         method: 'post',
diff --git a/src/views/BrandInsight/brandTop/opt.js b/src/views/BrandInsight/brandTop/opt.js
index 4c2eda6..245fdc6 100644
--- a/src/views/BrandInsight/brandTop/opt.js
+++ b/src/views/BrandInsight/brandTop/opt.js
@@ -1,12 +1,13 @@
 /*
  * @Author: your name
  * @Date: 2021-10-12 09:12:13
- * @LastEditTime: 2021-10-12 09:17:55
+ * @LastEditTime: 2021-11-02 18:03:08
  * @LastEditors: Please set LastEditors
  * @Description: In User Settings Edit
  * @FilePath: /data-show/src/views/BrandInsight/brandTop/opt.js
  */
 import * as echarts from "echarts";
+import { bigNumberTransform } from "@/utils/gol/dataTool"
 export default function createOpt(dx,ds) {
     return {
         grid: {
@@ -56,6 +57,12 @@ export default function createOpt(dx,ds) {
                     color: "#FFF",
                 },
             },
+            axisLabel: {
+                formatter: (value) => {
+                    let str = bigNumberTransform(value);
+                    return str;
+                }
+            },
             splitLine: {
                 lineStyle: {
                     type: "dashed", // y轴分割线类型
diff --git a/src/views/EventInsight/hotEventPO/index.vue b/src/views/EventInsight/hotEventPO/index.vue
index b229a5e..a3bb040 100644
--- a/src/views/EventInsight/hotEventPO/index.vue
+++ b/src/views/EventInsight/hotEventPO/index.vue
@@ -1,13 +1,13 @@
 <!--
  * @Author: your name
  * @Date: 2021-10-18 09:07:18
- * @LastEditTime: 2021-10-27 17:16:55
+ * @LastEditTime: 2021-11-02 18:22:09
  * @LastEditors: Please set LastEditors
  * @Description: In User Settings Edit
  * @FilePath: /data-show/src/views/EventInsight/hotEventPropagationOriented/index.vue
 -->
 <template>
-    <div class="hpo-outter">
+    <div class="hpo-outter" v-loading="load">
         <v-label-div title="热点事件传播导向">
             <v-btn @click="goPath">事件对比</v-btn>
         </v-label-div>
@@ -24,6 +24,7 @@ export default {
     name: "hotEventPO",
     data() {
         return {
+            load: false,
             form: {
                 token: ""
             },
@@ -40,13 +41,14 @@ export default {
         },
         // 获取后台数据
         getData() {
+            this.load = true;
             let obj = Object.assign({}, this.getCommTime, this.form);
             getPropagationDirection0528(obj).then(res => {
                 let data = res.data;
                 let d1 = data.data;
                 let d2 = data.links;
                 this.opt = createOpt(d1, d2);
-                console.log(res)
+                this.load = false;
             })
         }
     }
diff --git a/src/views/EventInsight/industryTOPHE/index.vue b/src/views/EventInsight/industryTOPHE/index.vue
index 5da589a..a34bdd1 100644
--- a/src/views/EventInsight/industryTOPHE/index.vue
+++ b/src/views/EventInsight/industryTOPHE/index.vue
@@ -1,14 +1,14 @@
 <!--
  * @Author: your name
  * @Date: 2021-10-18 09:34:53
- * @LastEditTime: 2021-11-02 17:44:03
+ * @LastEditTime: 2021-11-02 18:23:06
  * @LastEditors: Please set LastEditors
  * @Description: In User Settings Edit
  * @FilePath: /data-show/src/views/EventInsight/IndustryTOPHE/index.vue
 -->
 
 <template>
-    <div class="itp-outter">
+    <div class="itp-outter" v-loading="load">
         <v-label-div title="行业TOP热点事件">
         </v-label-div>
         <div class="itp-inner">
@@ -24,43 +24,12 @@ export default {
     name: "industryTOPHE",
     data() {
         return {
+            load: false,
              form: {
                 token: ""
             },
             config: {},
-            columns: [
-                {
-                    title: "事件标题",
-                    dataIndex: "a",
-                    key: "a",
-                    width: "55%",
-                    scopedSlots: { customRender: 'a' },
-                },
-                {
-                    title: "影响力",
-                    dataIndex: "b",
-                    key: "b",
-                },
-                {
-                    title: "类型",
-                    dataIndex: "c",
-                    key: "c",
-                },
-                {
-                    title: "关联品牌",
-                    dataIndex: "d",
-                    key: "d",
-                    width: 180
-                }
-            ],
-            tbData: [
-                {
-                    a: "为了研究长城吉利谁更强，我们砸了台吉利",
-                    b: '20.2',
-                    c: '2021-08-18 12:00:00',
-                    d: '奥迪'
-                }
-            ]
+            
         };
     },
     created() {
@@ -72,6 +41,7 @@ export default {
             this.$router.push({path: '/eventDEC'})
         },
         getData() {
+            this.load = true;
             let obj = Object.assign({}, this.getCommTime, this.form);
             getHotEventsList(obj).then(res => {
                 let data = res.data || [];
@@ -89,6 +59,7 @@ export default {
                         header: ["事件标题", "影响力","类型","关联品牌"],
                         data: arr,
                     };
+                this.load = false;
             })
         },
         handlerSs() {
diff --git a/src/views/Index/index.vue b/src/views/Index/index.vue
index 6b79add..c593570 100644
--- a/src/views/Index/index.vue
+++ b/src/views/Index/index.vue
@@ -1,7 +1,7 @@
 <!--
  * @Author: xw
  * @Date: 2021-10-08 09:17:42
- * @LastEditTime: 2021-11-02 16:49:41
+ * @LastEditTime: 2021-11-02 17:55:45
  * @LastEditors: Please set LastEditors
  * @Description: 行业洞察
  * @FilePath: /data-show/src/views/Index/index.vue
@@ -146,7 +146,7 @@ export default {
            }
          
          this.outStyle = {
-             transform: `scaleY(${z}) translate(0, ${marginTop}px)`,
+             transform: `scaleY(${z}) translate(0, ${marginTop*0.09}rem)`,
           }
         },
         handlerSs() {