From 7cc89ef3de548fcb17e1df88c58ab1292904ecb9 Mon Sep 17 00:00:00 2001
From: "lily.zhang" <daylily.zhang@akuhome.com>
Date: Mon, 1 Nov 2021 11:58:08 +0800
Subject: [PATCH] cxw-010203

---
 src/lycomponents/iHeaderBrand/index.vue       |  2 +-
 src/styles/antd.less                          | 14 +++++
 src/views/BrandInsight/brandData/index.vue    |  4 +-
 src/views/BrandInsight/brandTop/index.vue     |  4 +-
 .../forumCommunicationTrend/index.vue         |  4 +-
 .../forumHotTopicDirection/index.vue          |  4 +-
 src/views/BrandInsight/keyMedia/index.vue     |  4 +-
 .../BrandInsight/popularEvents/index.vue      |  4 +-
 .../BrandInsight/popularEventsList/index.vue  |  4 +-
 .../BrandInsight/popularwordCloud/index.vue   |  4 +-
 .../rearWingPropagationSituation/index.vue    |  4 +-
 .../BrandInsight/spreadTOPmodels/index.vue    |  4 +-
 src/views/BrandInsight/titsopo/index.vue      |  4 +-
 src/views/BrandInsight/weiboKol/index.vue     |  4 +-
 .../BrandInsight/weiboPortraits/index.vue     |  4 +-
 .../BrandInsight/weiboVolumeTrend/index.vue   |  4 +-
 src/views/Index/dynamicNumber/index.vue       | 45 +++++++------
 src/views/Index/index.vue                     |  9 ++-
 .../Index/keyCommunicationPositions/index.vue |  7 ++-
 src/views/ModelInsight/index.vue              |  4 +-
 .../ModelInsight/ml-brand-data/index.vue      | 63 ++++++++++++++-----
 21 files changed, 131 insertions(+), 69 deletions(-)

diff --git a/src/lycomponents/iHeaderBrand/index.vue b/src/lycomponents/iHeaderBrand/index.vue
index 09bd2df..1fe534a 100644
--- a/src/lycomponents/iHeaderBrand/index.vue
+++ b/src/lycomponents/iHeaderBrand/index.vue
@@ -30,7 +30,7 @@
                 </a-select-option>
             </a-select>
 
-            <a-range-picker v-model="selTime" :disabled-date="disabledDate" style="margin-left: 0.8rem" @calendarChange="calendarPriceRangeChange" :size="$vuiSize" valueFormat="YYYY-MM-DD" v-if="form.sTimeType == selVal" @change="handlerChangeTime">
+            <a-range-picker show-time v-model="selTime" :disabled-date="disabledDate" style="margin-left: 0.8rem" @calendarChange="calendarPriceRangeChange" :size="$vuiSize" valueFormat="YYYY-MM-DD HH:mm:ss" v-if="form.sTimeType == selVal" @change="handlerChangeTime">
                 <a-icon slot="suffixIcon" type="calendar" />
             </a-range-picker>
 
diff --git a/src/styles/antd.less b/src/styles/antd.less
index 162073c..675a6e4 100644
--- a/src/styles/antd.less
+++ b/src/styles/antd.less
@@ -239,3 +239,17 @@
 .ant-checkbox-disabled + span {
   color: #fff !important;
 }
+.ant-calendar-range.ant-calendar-time .ant-calendar-time-picker-combobox {
+  background-color: #010B19 !important;
+}
+li.ant-calendar-time-picker-select-option-selected {
+  background-color: #010B19 !important;
+}
+.ant-calendar-range .ant-calendar-header {
+  border-bottom: 1px solid #ccc !important;
+}
+.ant-calendar-time-picker-select li {
+  &:hover {
+    background: #3373CC !important;
+  }
+}
diff --git a/src/views/BrandInsight/brandData/index.vue b/src/views/BrandInsight/brandData/index.vue
index 6d0581e..2f77e06 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-29 19:16:45
+ * @LastEditTime: 2021-11-01 09:57:44
  * @LastEditors: Please set LastEditors
  * @Description: 品牌数据
  * @FilePath: /data-show/src/views/BrandInsight/brandData/index.vue
@@ -91,7 +91,7 @@ export default {
     methods: {
         getBrandOverviewCount0528() {
             return new Promise((resolve, reject) => {
-                let obj = Object.assign({}, this.getCommTime, this.form);
+                let obj = Object.assign({}, this.getCtime2, this.form);
                 getBrandOverviewCount0528(obj)
                     .then((res) => {
                         this.count = res.data.count;
diff --git a/src/views/BrandInsight/brandTop/index.vue b/src/views/BrandInsight/brandTop/index.vue
index 1ffea4e..dcc0792 100644
--- a/src/views/BrandInsight/brandTop/index.vue
+++ b/src/views/BrandInsight/brandTop/index.vue
@@ -1,7 +1,7 @@
 <!--
  * @Author: xw
  * @Date: 2021-10-12 09:03:51
- * @LastEditTime: 2021-10-27 10:49:45
+ * @LastEditTime: 2021-11-01 09:58:03
  * @LastEditors: Please set LastEditors
  * @Description: 品牌TOP车型
  * @FilePath: /data-show/src/views/BrandInsight/brandTop/index.vue
@@ -39,7 +39,7 @@ export default {
     methods: {
         getData() {
             this.load = true;
-            let obj = Object.assign({},this.getCommTime, this.form);
+            let obj = Object.assign({},this.getCtime2, this.form);
             getCartypeTop10(obj).then(res => {
                 let data = res.data || {};
                 let dx = [];
diff --git a/src/views/BrandInsight/forumCommunicationTrend/index.vue b/src/views/BrandInsight/forumCommunicationTrend/index.vue
index 4043717..8d6cebc 100644
--- a/src/views/BrandInsight/forumCommunicationTrend/index.vue
+++ b/src/views/BrandInsight/forumCommunicationTrend/index.vue
@@ -1,7 +1,7 @@
 <!--
  * @Author: your name
  * @Date: 2021-10-12 16:33:38
- * @LastEditTime: 2021-10-27 10:51:37
+ * @LastEditTime: 2021-11-01 09:58:14
  * @LastEditors: Please set LastEditors
  * @Description: In User Settings Edit
  * @FilePath: /data-show/src/views/BrandInsight/forumCommunicationTrend/index.vue
@@ -37,7 +37,7 @@ export default {
     },
     methods: {
         getData() {
-            let obj = Object.assign({}, this.getCommTime, this.form);
+            let obj = Object.assign({}, this.getCtime2, this.form);
             getBbsCountTime(obj).then(res => {
                 let data = res.data || [];
                 let dx = [];
diff --git a/src/views/BrandInsight/forumHotTopicDirection/index.vue b/src/views/BrandInsight/forumHotTopicDirection/index.vue
index e78a3e8..78190d7 100644
--- a/src/views/BrandInsight/forumHotTopicDirection/index.vue
+++ b/src/views/BrandInsight/forumHotTopicDirection/index.vue
@@ -1,7 +1,7 @@
 <!--
  * @Author: your name
  * @Date: 2021-10-12 16:48:36
- * @LastEditTime: 2021-10-27 10:51:52
+ * @LastEditTime: 2021-11-01 09:58:25
  * @LastEditors: Please set LastEditors
  * @Description: In User Settings Edit
  * @FilePath: /data-show/src/views/BrandInsight/forumHotTopicDirection/index.vue
@@ -55,7 +55,7 @@ export default {
             return newArray;
         },
         getData() {
-            let obj = Object.assign({}, this.getCommTime, this.form);
+            let obj = Object.assign({}, this.getCtime2, this.form);
             getHotTopic0528(obj).then((res) => {
                 let data = res.data || [];
                 let groupedArray = this.group(data, 5);
diff --git a/src/views/BrandInsight/keyMedia/index.vue b/src/views/BrandInsight/keyMedia/index.vue
index 2f3f43a..64df300 100644
--- a/src/views/BrandInsight/keyMedia/index.vue
+++ b/src/views/BrandInsight/keyMedia/index.vue
@@ -1,7 +1,7 @@
 <!--
  * @Author: your name
  * @Date: 2021-10-12 18:43:22
- * @LastEditTime: 2021-10-27 10:52:13
+ * @LastEditTime: 2021-11-01 09:58:35
  * @LastEditors: Please set LastEditors
  * @Description: In User Settings Edit
  * @FilePath: /data-show/src/views/BrandInsight/keyMedia/index.vue
@@ -41,7 +41,7 @@ export default {
     },
     methods: {
         getData() {
-            let obj = Object.assign({}, this.getCommTime, this.form);
+            let obj = Object.assign({}, this.getCtime2, this.form);
             getWebsite(obj).then((res) => {
                 let data = res.data || {};
                 let arr = [];
diff --git a/src/views/BrandInsight/popularEvents/index.vue b/src/views/BrandInsight/popularEvents/index.vue
index 875ff64..0706a37 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-29 20:15:04
+ * @LastEditTime: 2021-11-01 09:58:44
  * @LastEditors: Please set LastEditors
  * @Description: 热门事件
  * @FilePath: /data-show/src/views/BrandInsight/popularEvents/index.vue
@@ -39,7 +39,7 @@ export default {
     },
     methods: {
         getData() {
-            let obj = Object.assign({}, this.getCommTime, this.form);
+            let obj = Object.assign({}, this.getCtime2, this.form);
             this.load = true;
             getHotEventsType(obj).then((res) => {
                 let data = res.data;
diff --git a/src/views/BrandInsight/popularEventsList/index.vue b/src/views/BrandInsight/popularEventsList/index.vue
index be064dd..07279ed 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-29 18:58:59
+ * @LastEditTime: 2021-11-01 09:58:55
  * @LastEditors: Please set LastEditors
  * @Description: 热门事件列表
  * @FilePath: /data-show/src/views/BrandInsight/popularEventsList/index.vue
@@ -40,7 +40,7 @@ export default {
     },
     methods: {
         getData() {
-            let obj = Object.assign({}, this.getCommTime, this.form);
+            let obj = Object.assign({}, this.getCtime2, this.form);
             this.load = true;
             getHotEventsList0528(obj).then((res) => {
                 let data = res.data || [];
diff --git a/src/views/BrandInsight/popularwordCloud/index.vue b/src/views/BrandInsight/popularwordCloud/index.vue
index 174d773..16e7e4c 100644
--- a/src/views/BrandInsight/popularwordCloud/index.vue
+++ b/src/views/BrandInsight/popularwordCloud/index.vue
@@ -1,7 +1,7 @@
 <!--
  * @Author: your name
  * @Date: 2021-10-12 19:16:46
- * @LastEditTime: 2021-10-27 10:52:45
+ * @LastEditTime: 2021-11-01 09:59:02
  * @LastEditors: Please set LastEditors
  * @Description: In User Settings Edit
  * @FilePath: /data-show/src/views/BrandInsight/popularwordCloud/index.vue
@@ -38,7 +38,7 @@ export default {
     },
     methods: {
         getData() {
-            let obj = Object.assign({}, this.getCommTime, this.form);
+            let obj = Object.assign({}, this.getCtime2, this.form);
             this.load = true;
             getHotWord(obj).then((res) => {
                  let data = res.data;
diff --git a/src/views/BrandInsight/rearWingPropagationSituation/index.vue b/src/views/BrandInsight/rearWingPropagationSituation/index.vue
index d3c0b38..41e9c19 100644
--- a/src/views/BrandInsight/rearWingPropagationSituation/index.vue
+++ b/src/views/BrandInsight/rearWingPropagationSituation/index.vue
@@ -1,7 +1,7 @@
 <!--
  * @Author: your name
  * @Date: 2021-10-12 18:35:53
- * @LastEditTime: 2021-10-27 10:52:53
+ * @LastEditTime: 2021-11-01 09:59:10
  * @LastEditors: Please set LastEditors
  * @Description: In User Settings Edit
  * @FilePath: /data-show/src/views/BrandInsight/rearWingPropagationSituation/index.vue
@@ -38,7 +38,7 @@ export default {
     },
     methods: {
        getData() {
-            let obj = Object.assign({}, this.getCommTime, this.form);
+            let obj = Object.assign({}, this.getCtime2, this.form);
             this.load = true;
             getWeiYiVolumeTime(obj).then(res => {
                 let data = res.data || [];
diff --git a/src/views/BrandInsight/spreadTOPmodels/index.vue b/src/views/BrandInsight/spreadTOPmodels/index.vue
index 47fabe6..7fc1524 100644
--- a/src/views/BrandInsight/spreadTOPmodels/index.vue
+++ b/src/views/BrandInsight/spreadTOPmodels/index.vue
@@ -1,7 +1,7 @@
 <!--
  * @Author: your name
  * @Date: 2021-10-12 18:18:20
- * @LastEditTime: 2021-10-27 10:53:04
+ * @LastEditTime: 2021-11-01 09:59:18
  * @LastEditors: Please set LastEditors
  * @Description: In User Settings Edit
  * @FilePath: /data-show/src/views/BrandInsight/spreadTOPmodels/index.vue
@@ -38,7 +38,7 @@ export default {
     },
     methods: {
        getData() {
-          let obj = Object.assign({},this.getCommTime, this.form); 
+          let obj = Object.assign({},this.getCtime2, this.form); 
           this.load = true;
           agetCartypeTop10(obj).then(res => {
               let data = res.data || {};
diff --git a/src/views/BrandInsight/titsopo/index.vue b/src/views/BrandInsight/titsopo/index.vue
index e989050..4f7f661 100644
--- a/src/views/BrandInsight/titsopo/index.vue
+++ b/src/views/BrandInsight/titsopo/index.vue
@@ -1,7 +1,7 @@
 <!--
  * @Author: xw
  * @Date: 2021-10-12 09:32:35
- * @LastEditTime: 2021-10-28 13:12:46
+ * @LastEditTime: 2021-11-01 09:59:32
  * @LastEditors: Please set LastEditors
  * @Description: 舆情传播趋势
  * @FilePath: /data-show/src/views/BrandInsight/titsopo/index.vue
@@ -46,7 +46,7 @@ export default {
     methods: {
         // 获取数据
         getData() {
-            let obj = Object.assign({},this.getCommTime, this.form);
+            let obj = Object.assign({},this.getCtime2, this.form);
             this.load = true;
             getSourcetypeTime(obj).then(res => {
                 let data = res.data || [];
diff --git a/src/views/BrandInsight/weiboKol/index.vue b/src/views/BrandInsight/weiboKol/index.vue
index 484a7c4..752d941 100644
--- a/src/views/BrandInsight/weiboKol/index.vue
+++ b/src/views/BrandInsight/weiboKol/index.vue
@@ -1,7 +1,7 @@
 <!--
  * @Author: your name
  * @Date: 2021-10-12 14:19:53
- * @LastEditTime: 2021-10-27 10:53:25
+ * @LastEditTime: 2021-11-01 09:59:47
  * @LastEditors: Please set LastEditors
  * @Description: 微博KOL
  * @FilePath: /data-show/src/views/BrandInsight/weiboKol/index.vue
@@ -72,7 +72,7 @@ export default {
     },
     methods: {
         getData() {
-            let obj = Object.assign({}, this.getCommTime, this.form);
+            let obj = Object.assign({}, this.getCtime2, this.form);
             this.load = true;
             getBoauthenCount0528(obj).then((res) => {
                 let data = res.data || [];
diff --git a/src/views/BrandInsight/weiboPortraits/index.vue b/src/views/BrandInsight/weiboPortraits/index.vue
index dfb99c7..1939742 100644
--- a/src/views/BrandInsight/weiboPortraits/index.vue
+++ b/src/views/BrandInsight/weiboPortraits/index.vue
@@ -1,7 +1,7 @@
 <!--
  * @Author: your name
  * @Date: 2021-10-12 15:06:47
- * @LastEditTime: 2021-10-27 10:53:36
+ * @LastEditTime: 2021-11-01 10:00:02
  * @LastEditors: Please set LastEditors
  * @Description: In User Settings Edit
  * @FilePath: /data-show/src/views/BrandInsight/weiboPortraits/index.vue
@@ -108,7 +108,7 @@ export default {
         // 获取数据
         getData() {
             this.load = true;
-            let obj = Object.assign({}, this.getCommTime, this.form);
+            let obj = Object.assign({}, this.getCtime2, this.form);
             getSexMergeWeiBo(obj).then((res) => {
                 let data = res.data;
                 let attestation = data.attestation || {};
diff --git a/src/views/BrandInsight/weiboVolumeTrend/index.vue b/src/views/BrandInsight/weiboVolumeTrend/index.vue
index fc258bb..d0a63cd 100644
--- a/src/views/BrandInsight/weiboVolumeTrend/index.vue
+++ b/src/views/BrandInsight/weiboVolumeTrend/index.vue
@@ -1,7 +1,7 @@
 <!--
  * @Author: your name
  * @Date: 2021-10-12 15:24:48
- * @LastEditTime: 2021-10-27 10:53:45
+ * @LastEditTime: 2021-11-01 10:00:09
  * @LastEditors: Please set LastEditors
  * @Description: In User Settings Edit
  * @FilePath: /data-show/src/views/BrandInsight/weiboVolumeTrend/index.vue
@@ -39,7 +39,7 @@ export default {
     },
     methods: {
         getData() {
-          let obj = Object.assign({}, this.getCommTime, this.form);
+          let obj = Object.assign({}, this.getCtime2, this.form);
           this.load = true;
           getCountTime0528(obj).then(res => {
               let data = res.data || [];
diff --git a/src/views/Index/dynamicNumber/index.vue b/src/views/Index/dynamicNumber/index.vue
index d7f1f55..0ca2ff5 100644
--- a/src/views/Index/dynamicNumber/index.vue
+++ b/src/views/Index/dynamicNumber/index.vue
@@ -1,13 +1,14 @@
 <!--
  * @Author: xw
  * @Date: 2021-10-09 14:25:05
- * @LastEditTime: 2021-10-28 11:56:49
+ * @LastEditTime: 2021-11-01 11:37:58
  * @LastEditors: Please set LastEditors
  * @Description: 大数据统计gif
  * @FilePath: /data-show/src/views/Index/dynamicNumber/index.vue
 -->
 <template>
     <div class="dy-outter" v-loading="load">
+        <img src="../../../assets/images/Index/d3.gif" class="load-m1">
         <div class="d1" @click="handlerClick(6)">
             <span class="s1">APP</span>
             <span class="s2">
@@ -154,20 +155,24 @@ export default {
     position: relative;
     width: 100%;
     height: 100%;
-    background-image: url("../../../assets/images/Index/d3.gif");
-    background-repeat: no-repeat;
-    background-size: cover;
+    .load-m1 {
+        position: absolute;
+        width: 100%;
+        height: 100%;
+        left: 0px;
+        top: 0px;
+    }
     .d1 {
         position: absolute;
         display: flex;
         width: 280px;
-        height: 60px;
+        height: 9%;
         background-image: url("../../../assets/images/Index/img_jbtter.png");
         background-repeat: no-repeat;
         background-size: cover;
         justify-content: flex-start;
         align-items: center;
-        top: 240px;
+        top: 38%;
         left: 0px;
         cursor: pointer;
         .s1 {
@@ -188,13 +193,13 @@ export default {
         position: absolute;
         display: flex;
         width: 280px;
-        height: 60px;
+        height: 9%;
         background-image: url("../../../assets/images/Index/img_jbtter.png");
         background-repeat: no-repeat;
         background-size: cover;
         justify-content: flex-end;
         align-items: center;
-        top: 240px;
+        top: 10%;
         left: 0px;
         cursor: pointer;
         .s2 {
@@ -214,12 +219,12 @@ export default {
     .d3 {
         position: absolute;
         width: 320px;
-        height: 82px;
+        height: 13%;
         background-image: url("../../../assets/images/Index/img_jbtt.png");
         background-repeat: no-repeat;
         background-size: cover;
-        left: 308px;
-        top: 323px;
+        left: 30%;
+        top: 47%;
         display: flex;
         justify-content: flex-start;
         align-items: center;
@@ -241,23 +246,23 @@ export default {
     }
 }
 .dd1 {
-    top: 360px !important;
+    top: 58% !important;
     left: 0px !important;
 }
 .dd2 {
-    top: 60px !important;
-    left: 456px !important;
+    top: 15% !important;
+    left: 45% !important;
 }
 .dd3 {
-    top: 220px !important;
-    left: 622px !important;
+    top: 36% !important;
+    left: 70% !important;
 }
 .dd4 {
-    top: 360px !important;
-    left: 622px !important;
+    top: 60% !important;
+    left: 70% !important;
 }
 .dd5 {
-    top: 460px !important;
-    left: 250px !important;
+    top: 72% !important;
+    left: 29% !important;
 }
 </style>
diff --git a/src/views/Index/index.vue b/src/views/Index/index.vue
index 7c28350..8f5daac 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-10-29 21:47:51
+ * @LastEditTime: 2021-11-01 11:22:01
  * @LastEditors: Please set LastEditors
  * @Description: 行业洞察
  * @FilePath: /data-show/src/views/Index/index.vue
@@ -172,7 +172,7 @@ export default {
     padding: 0px 16px 16px 16px;
     display: flex;
     justify-content: flex-start;
-    height: calc(100vh - 84px);
+    height: calc(100vh - 80px);
     .d1 {
         display: flex;
         flex-direction: column;
@@ -188,13 +188,16 @@ export default {
         margin-left: 16px;
         display: flex;
         flex-direction: column; 
+        height: 100%;
         .d2-top {
             width: 100%;
-            height: 644px;
+            height:  59.4%;
+            overflow: hidden;
         }
         .d2-bottom {
             display: flex;
             justify-content: flex-start;
+            height: 316px;
         }
     }
 }
diff --git a/src/views/Index/keyCommunicationPositions/index.vue b/src/views/Index/keyCommunicationPositions/index.vue
index c777e3a..4b5ef81 100644
--- a/src/views/Index/keyCommunicationPositions/index.vue
+++ b/src/views/Index/keyCommunicationPositions/index.vue
@@ -1,7 +1,7 @@
 <!--
  * @Author: xw
  * @Date: 2021-10-08 16:37:30
- * @LastEditTime: 2021-11-01 09:16:04
+ * @LastEditTime: 2021-11-01 11:11:28
  * @LastEditors: Please set LastEditors
  * @Description: 传播重点阵地
  * @FilePath: /data-show/src/views/Index/key-communication-positions/index.vue
@@ -78,5 +78,10 @@ export default {
     justify-content: flex-start;
     padding: 0 16px;
     height: calc(100% - 48px);
+    overflow: hidden;
+    .d1 {
+        display: flex;
+        flex-direction: column;
+    }
 }
 </style>
diff --git a/src/views/ModelInsight/index.vue b/src/views/ModelInsight/index.vue
index d8f0c36..ac594a7 100644
--- a/src/views/ModelInsight/index.vue
+++ b/src/views/ModelInsight/index.vue
@@ -1,7 +1,7 @@
 <!--
  * @Author: your name
  * @Date: 2021-10-25 13:12:20
- * @LastEditTime: 2021-10-28 18:48:58
+ * @LastEditTime: 2021-11-01 09:54:33
  * @LastEditors: Please set LastEditors
  * @Description: In User Settings Edit
  * @FilePath: /data-show/src/views/ModelInsight/index.vue
@@ -10,7 +10,7 @@
     <div class="d-container">
         <div class="ml-outter">
             <div class="ml-d1">
-                <ml-brand-data></ml-brand-data>
+                <ml-brand-data :brand="brand" :model="model"></ml-brand-data>
                 <div class="bdl-d1-dd2">
                     <img class="m1" src="../../assets/images/ModelInsight/img_cxdb.png" @click="goRouter('/brandComparison')" />
                     <div class="bdl-d1-dd2-d1">
diff --git a/src/views/ModelInsight/ml-brand-data/index.vue b/src/views/ModelInsight/ml-brand-data/index.vue
index 599a0f7..f41c433 100644
--- a/src/views/ModelInsight/ml-brand-data/index.vue
+++ b/src/views/ModelInsight/ml-brand-data/index.vue
@@ -1,7 +1,7 @@
 <!--
  * @Author: your name
  * @Date: 2021-10-25 13:20:36
- * @LastEditTime: 2021-10-28 19:17:26
+ * @LastEditTime: 2021-11-01 10:25:44
  * @LastEditors: Please set LastEditors
  * @Description: In User Settings Edit
  * @FilePath: /data-show/src/views/ModelInsight/ml-brand-data/index.vue
@@ -17,7 +17,15 @@
                     <span class="s1">传播数据总量</span>
                 </div>
                 <div class="d2">
-                    74,073,195
+                    <a-popover title="传播数据总量">
+                        <template slot="content">
+                            <div class="pd-item" v-for="(item,index) in totalArr" :key="index">
+                                <span>{{item.key}}</span>
+                                <span>{{item.value}}</span>
+                            </div>
+                        </template>
+                        <span class="s2">{{count}}</span>
+                    </a-popover>
                 </div>
             </div>
             <div class="mbd-d1" style="margin-top: 16px">
@@ -26,7 +34,7 @@
                     <span class="s1">占品牌传播比例</span>
                 </div>
                 <div class="d2">
-                    30.50%
+                    {{countPercent}}%
                 </div>
             </div>
             <div class="mbd-d1" style="margin-top: 16px">
@@ -45,7 +53,7 @@
 </template>
 
 <script>
-// import {getBrandOverviewCount0528} from "@/api/ModelInsight"
+import { getBrandOverviewCount0528 } from "@/api/ModelInsight";
 export default {
     name: "ml-brand-data",
     props: ["brand", "model"],
@@ -54,19 +62,39 @@ export default {
             form: {
                 sBrand: "",
                 sSeriesName: "",
-                token: ""
-            }
-        }
+                token: "",
+            },
+            totalArr: [],
+            count: 0,
+            countPercent: 0,
+        };
     },
-    created() {
-        this.form.token = this.getToken;
-        this.form.sBrand = this.brand;
-        this.form.sSeriesName = this.model;
-
+    watch: {
+        model: {
+            handler(val) {
+                if (val) {
+                    this.form.token = this.getToken;
+                    this.form.sBrand = this.brand;
+                    this.form.sSeriesName = this.model;
+                    this.getData1();
+                }
+            },
+            immediate: true,
+        },
     },
+    created() {},
     methods: {
-
-    }
+        getData1() {
+            let obj = Object.assign({}, this.getCtime2, this.form);
+            getBrandOverviewCount0528(obj).then((res) => {
+                let data = res.data;
+                this.count = data.count;
+                this.countPercent = data.countPercent;
+                this.totalArr = data.data;
+                console.log(this.totalArr)
+            });
+        },
+    },
 };
 </script>
 
@@ -120,4 +148,11 @@ export default {
         }
     }
 }
+.pd-item {
+    display: flex;
+    justify-content: space-between;
+    color: #fff;
+    border-bottom: 1px solid #173b6d;
+    padding: 10px;
+}
 </style>