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

---
 src/views/BrandInsight/brandData/index.vue    | 44 +++++++++++--------
 src/views/BrandInsight/keyMedia/index.vue     |  5 ++-
 src/views/BrandInsight/keyMedia/opt.js        | 10 ++---
 .../BrandInsight/popularEventsList/index.vue  |  4 +-
 .../rearWingPropagationSituation/opt.js       |  9 +++-
 5 files changed, 43 insertions(+), 29 deletions(-)

diff --git a/src/views/BrandInsight/brandData/index.vue b/src/views/BrandInsight/brandData/index.vue
index 3094974..6d0581e 100644
--- a/src/views/BrandInsight/brandData/index.vue
+++ b/src/views/BrandInsight/brandData/index.vue
@@ -1,7 +1,7 @@
 <!--
  * @Author: xw
  * @Date: 2021-10-11 18:42:58
- * @LastEditTime: 2021-10-28 16:21:27
+ * @LastEditTime: 2021-10-29 19:16:45
  * @LastEditors: Please set LastEditors
  * @Description: 品牌数据
  * @FilePath: /data-show/src/views/BrandInsight/brandData/index.vue
@@ -18,10 +18,10 @@
                 </div>
                 <a-popover title="传播数据">
                     <template slot="content">
-                       <div class="pd-item" v-for="(item,index) in countArr" :key="index">
-                         <span>{{item.key}}</span>
-                         <span>{{item.value}}</span>
-                       </div>
+                        <div class="pd-item" v-for="(item,index) in countArr" :key="index">
+                            <span>{{item.key}}</span>
+                            <span>{{item.value}}</span>
+                        </div>
                     </template>
                     <span class="s2">{{count}}</span>
                 </a-popover>
@@ -31,17 +31,23 @@
                     <img class="m1" src="../../../assets/images/BrandInsight/ic_dx.png" />
                     <span class="s1">舆情整体调性</span>
                 </div>
-                <span class="s2">
-                    <a-tooltip placement="top" :title="'正面：'+ affObj.a">
+                <a-popover title="传播数据">
+                    <template slot="content">
+                        <template v-for="(item,index) in affObj">
+                            <div class="pd-item" :key="index" v-if="index != 'z'">
+                                <span v-if="index === 'a'">正面</span>
+                                <span v-if="index === 'b'">中性</span>
+                                <span v-if="index === 'c'">负面</span>
+                                <span>{{item}}</span>
+                            </div>
+                        </template>
+                    </template>
+                    <span class="s2">
                         <span class="s2-s1" :style="{width: affObj.a/affObj.z * width +'px'}"></span>
-                    </a-tooltip>
-                    <a-tooltip placement="top" :title="'中性：'+ affObj.b">
                         <span class="s2-s1" :style="{width: affObj.b/affObj.z * width + 'px', background: '#54BF93'}"></span>
-                    </a-tooltip>
-                    <a-tooltip placement="top" :title="'负面：'+ affObj.c">
                         <span class="s2-s1" :style="{width: affObj.c/affObj.z *  width + 'px',background: '#CC9D12'}"></span>
-                    </a-tooltip>
-                </span>
+                    </span>
+                </a-popover>
             </div>
         </div>
 
@@ -89,7 +95,7 @@ export default {
                 getBrandOverviewCount0528(obj)
                     .then((res) => {
                         this.count = res.data.count;
-                        this.countArr = res.data.data || []
+                        this.countArr = res.data.data || [];
                         resolve(true);
                     })
                     .catch(() => {
@@ -176,11 +182,11 @@ export default {
     }
 }
 .pd-item {
-  display: flex;
-  justify-content: space-between;
-  color: #fff; 
-  border-bottom: 1px solid #173b6d;
-  padding: 10px;
+    display: flex;
+    justify-content: space-between;
+    color: #fff;
+    border-bottom: 1px solid #173b6d;
+    padding: 10px;
 }
 </style>
 
diff --git a/src/views/BrandInsight/keyMedia/index.vue b/src/views/BrandInsight/keyMedia/index.vue
index 6eccb92..2f3f43a 100644
--- a/src/views/BrandInsight/keyMedia/index.vue
+++ b/src/views/BrandInsight/keyMedia/index.vue
@@ -9,11 +9,12 @@
 
 <template>
     <div class="km-outter">
-        <v-label-div title="重点媒体" :showLine="false" :eStyle="{'border-style': 'none'}"></v-label-div>
+        <v-label-div title="重点媒体" :showLine="false" :eStyle="{'border-style': 'none'}">
+            <v-pagination :data="pdata" :style="{}" @change="handlerData"></v-pagination>
+        </v-label-div>
         <div class="km-inner">
             <v-echarts :opt="opt"></v-echarts>
         </div>
-        <v-pagination :data="pdata" :style="{position: 'absolute', left: '2px', bottom: '3px'}" @change="handlerData"></v-pagination>
     </div>
 </template>
 
diff --git a/src/views/BrandInsight/keyMedia/opt.js b/src/views/BrandInsight/keyMedia/opt.js
index c3c6978..e05cc6d 100644
--- a/src/views/BrandInsight/keyMedia/opt.js
+++ b/src/views/BrandInsight/keyMedia/opt.js
@@ -3,7 +3,7 @@
 /*
  * @Author: your name
  * @Date: 2021-10-09 12:38:34
- * @LastEditTime: 2021-10-26 15:29:46
+ * @LastEditTime: 2021-10-29 19:04:32
  * @LastEditors: Please set LastEditors
  * @Description: In User Settings Edit
  * @FilePath: /data-show/src/views/Index/tailInsight/opt.js
@@ -12,10 +12,10 @@ import * as echarts from "echarts";
 export default function createOpt(dy = [], ds = []) {
     return {
         grid: {
-            left: '4%',
-            right: '4%',
-            bottom: '4%',
-            top: "1%",
+            left: 16,
+            right: '5%',
+            bottom: 10,
+            top: 0,
             containLabel: true
         },
         tooltip: {
diff --git a/src/views/BrandInsight/popularEventsList/index.vue b/src/views/BrandInsight/popularEventsList/index.vue
index 9de6d3c..be064dd 100644
--- a/src/views/BrandInsight/popularEventsList/index.vue
+++ b/src/views/BrandInsight/popularEventsList/index.vue
@@ -1,7 +1,7 @@
 <!--
  * @Author: xw
  * @Date: 2021-10-12 10:50:44
- * @LastEditTime: 2021-10-28 19:07:15
+ * @LastEditTime: 2021-10-29 18:58:59
  * @LastEditors: Please set LastEditors
  * @Description: 热门事件列表
  * @FilePath: /data-show/src/views/BrandInsight/popularEventsList/index.vue
@@ -59,7 +59,7 @@ export default {
                     oddRowBGC: "#173b6d",
                     evenRowBGC: "rgba(69, 149, 244, 0)",
                     columnWidth: [400],
-                    rowNum: 5,
+                    rowNum: 6,
                     header: ["事件列表", "影响力", "时间", "关联车型"],
                     data: arr,
                 };
diff --git a/src/views/BrandInsight/rearWingPropagationSituation/opt.js b/src/views/BrandInsight/rearWingPropagationSituation/opt.js
index b9bed01..774c0e7 100644
--- a/src/views/BrandInsight/rearWingPropagationSituation/opt.js
+++ b/src/views/BrandInsight/rearWingPropagationSituation/opt.js
@@ -1,12 +1,13 @@
 /*
  * @Author: your name
  * @Date: 2021-10-12 16:40:53
- * @LastEditTime: 2021-10-26 15:17:09
+ * @LastEditTime: 2021-10-29 19:00:40
  * @LastEditors: Please set LastEditors
  * @Description: In User Settings Edit
  * @FilePath: /data-show/src/views/BrandInsight/forumCommunicationTrend/opt.js
  */
 import * as echarts from "echarts";
+import { bigNumberTransform } from "@/utils/gol/dataTool"
 export default function createOpt(dx=[], ds = []) {
     return {
         grid: {
@@ -54,6 +55,12 @@ export default function createOpt(dx=[], ds = []) {
                     color: "#FFF",
                 },
             },
+            axisLabel: {
+                formatter: (value) => {
+                    let str = bigNumberTransform(value);
+                    return str;
+                }
+            },
             splitLine: {
                 lineStyle: {
                     type: "dashed", // y轴分割线类型