From ef2799e5807e9287bec66dcf926942f8fcdd0a91 Mon Sep 17 00:00:00 2001
From: xiaowen <372193233@qq.com>
Date: Fri, 26 Nov 2021 17:44:13 +0800
Subject: [PATCH 1/4] cxw-010203

---
 src/views/BrandInsight/titsopo/index.vue               | 4 ++--
 src/views/EventComparison/ecx-top/index.vue            | 4 ++--
 src/views/EventDEC/index.vue                           | 3 +--
 src/views/ModelComparison/brandCompateHeader/index.vue | 4 ++--
 src/views/ModelInsight/ml-tts/index.vue                | 3 +--
 5 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/src/views/BrandInsight/titsopo/index.vue b/src/views/BrandInsight/titsopo/index.vue
index 393ee97..b023def 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-11-19 18:31:48
+ * @LastEditTime: 2021-11-26 17:29:09
  * @LastEditors: Please set LastEditors
  * @Description: 舆情传播趋势
  * @FilePath: /data-show/src/views/BrandInsight/titsopo/index.vue
@@ -141,7 +141,7 @@ export default {
         // 导出报告
         exportData() {
              let obj = Object.assign({}, this.getCtime2, this.form);
-             obj.iContrastType = 1;
+             obj.sType = 'ToBrandPptV6'
              this.btnLoading = true;
              getToPptTask(obj).then(() => {
                  this.$notification.open({
diff --git a/src/views/EventComparison/ecx-top/index.vue b/src/views/EventComparison/ecx-top/index.vue
index 7748dae..ede6ea3 100644
--- a/src/views/EventComparison/ecx-top/index.vue
+++ b/src/views/EventComparison/ecx-top/index.vue
@@ -1,7 +1,7 @@
 <!--
  * @Author: your name
  * @Date: 2021-10-18 10:42:29
- * @LastEditTime: 2021-11-19 15:44:04
+ * @LastEditTime: 2021-11-26 17:40:31
  * @LastEditors: Please set LastEditors
  * @Description: In User Settings Edit
  * @FilePath: /data-show/src/views/EventComparison/ec-d1/index.vue
@@ -69,7 +69,7 @@ export default {
                 token: this.getToken,
                 iContrastType: 3,
                 sRele: sRele,
-                sType: 'ToEventPptV6'
+                sType: 'ToEventPptV6C'
             });
             getToPptTask(obj).then(() => {
                 this.$notification.open({
diff --git a/src/views/EventDEC/index.vue b/src/views/EventDEC/index.vue
index 22b84f5..d1dbddb 100644
--- a/src/views/EventDEC/index.vue
+++ b/src/views/EventDEC/index.vue
@@ -1,7 +1,7 @@
 <!--
  * @Author: your name
  * @Date: 2021-10-19 15:57:11
- * @LastEditTime: 2021-11-19 15:39:01
+ * @LastEditTime: 2021-11-26 17:41:34
  * @LastEditors: Please set LastEditors
  * @Description: In User Settings Edit
  * @FilePath: /data-show/src/views/EventDEC/index.vue
@@ -130,7 +130,6 @@ export default {
            this.btnLoading = true;
             let obj = Object.assign({}, this.getCtime2, {
                 token: this.getToken,
-                iContrastType: 3,
                 sRele: this.events_id,
                 sType: 'ToEventPptV6'
             });
diff --git a/src/views/ModelComparison/brandCompateHeader/index.vue b/src/views/ModelComparison/brandCompateHeader/index.vue
index 58d782f..d8e4f0e 100644
--- a/src/views/ModelComparison/brandCompateHeader/index.vue
+++ b/src/views/ModelComparison/brandCompateHeader/index.vue
@@ -1,7 +1,7 @@
 <!--
  * @Author: your name
  * @Date: 2021-11-03 11:54:08
- * @LastEditTime: 2021-11-19 15:41:42
+ * @LastEditTime: 2021-11-26 17:36:33
  * @LastEditors: Please set LastEditors
  * @Description: In User Settings Edit
  * @FilePath: /data-show/src/views/MarketingComparison/mcChooseModel/index.vue
@@ -176,7 +176,7 @@ export default {
                 iContrastType: 2,
                 sBrand: sBrand,
                 sSeriesName: sSeriesName,
-                sType: 'ToSeriesPptV6'
+                sType: 'ToSeriesPptV6C'
             });
             getToPptTask(obj).then(() => {
                 this.$notification.open({
diff --git a/src/views/ModelInsight/ml-tts/index.vue b/src/views/ModelInsight/ml-tts/index.vue
index 3626128..cbf216a 100644
--- a/src/views/ModelInsight/ml-tts/index.vue
+++ b/src/views/ModelInsight/ml-tts/index.vue
@@ -1,7 +1,7 @@
 <!--
  * @Author: xw
  * @Date: 2021-10-12 09:32:35
- * @LastEditTime: 2021-11-19 18:32:18
+ * @LastEditTime: 2021-11-26 17:34:30
  * @LastEditors: Please set LastEditors
  * @Description: 舆情传播趋势
  * @FilePath: /data-show/src/views/BrandInsight/titsopo/index.vue
@@ -119,7 +119,6 @@ export default {
         // 导出报告
         exportData() {
              let obj = Object.assign({}, this.getCtime2, this.form);
-             obj.iContrastType = 2;
              obj.sType = 'ToSeriesPptV6';
              this.btnLoading = true;
              getToPptTask(obj).then(() => {

From cf9bc6cac36b4da6bfb029f664796992a71de03e Mon Sep 17 00:00:00 2001
From: xiaowen <372193233@qq.com>
Date: Mon, 29 Nov 2021 10:46:23 +0800
Subject: [PATCH 2/4] cxw-010203

---
 src/views/Index/realTimeEvent/index.vue        |  4 +++-
 src/views/Index/salesRank/index.vue            |  4 +++-
 src/views/Index/spreadTheSound/index.vue       |  4 +++-
 src/views/Index/tailInsight/index.vue          |  4 +++-
 src/views/ModelInsight/ml-brand-data/index.vue | 15 ++++++++-------
 5 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/src/views/Index/realTimeEvent/index.vue b/src/views/Index/realTimeEvent/index.vue
index 3b6126b..f816494 100644
--- a/src/views/Index/realTimeEvent/index.vue
+++ b/src/views/Index/realTimeEvent/index.vue
@@ -1,7 +1,7 @@
 <!--
  * @Author: xw
  * @Date: 2021-10-08 15:56:35
- * @LastEditTime: 2021-11-22 10:53:54
+ * @LastEditTime: 2021-11-29 10:37:39
  * @LastEditors: Please set LastEditors
  * @Description: 实时事件
  * @FilePath: /data-show/src/views/Index/realTimeEvent/index.vue
@@ -86,6 +86,7 @@ export default {
             let ele = this.darr[row.rowIndex];
             if (row.columnIndex === 0) {
                 let id = ele[3];
+                this.setHeaderType(3);
                 this.$router.push({
                     path: "/eventDEC",
                     query: { events_id: id },
@@ -95,6 +96,7 @@ export default {
                 let brand = ele[2];
                 let obj = {brandname: brand};
                 this.setBrand(obj);
+                this.setHeaderType(3);
                 this.$router.push({
                     path: "/brandInsight"
                 });
diff --git a/src/views/Index/salesRank/index.vue b/src/views/Index/salesRank/index.vue
index 99989a0..a346a50 100644
--- a/src/views/Index/salesRank/index.vue
+++ b/src/views/Index/salesRank/index.vue
@@ -1,7 +1,7 @@
 <!--
  * @Author: xw
  * @Date: 2021-10-08 18:58:00
- * @LastEditTime: 2021-11-22 10:54:16
+ * @LastEditTime: 2021-11-29 10:40:00
  * @LastEditors: Please set LastEditors
  * @Description: 热销排行
  * @FilePath: /data-show/src/views/Index/salesRank/index.vue
@@ -117,10 +117,12 @@ export default {
             if(this.type === 1) {
                 let model = ele.axisValueLabel
                 this.setModel({name: model});
+                this.setHeaderType(3);
                 this.$router.push("/modelInsight");
             } else {
                 let brand = ele.axisValueLabel;
                 this.setBrand({brandname: brand});
+                this.setHeaderType(3);
                 this.$router.push("/brandInsight");
             }
         }
diff --git a/src/views/Index/spreadTheSound/index.vue b/src/views/Index/spreadTheSound/index.vue
index 2c1bf0c..5783e45 100644
--- a/src/views/Index/spreadTheSound/index.vue
+++ b/src/views/Index/spreadTheSound/index.vue
@@ -1,7 +1,7 @@
 <!--
  * @Author: xw
  * @Date: 2021-10-09 10:53:21
- * @LastEditTime: 2021-11-22 10:54:28
+ * @LastEditTime: 2021-11-29 10:41:14
  * @LastEditors: Please set LastEditors
  * @Description: 传播声量TOP10
  * @FilePath: /data-show/src/views/Index/spreadTheSound/index.vue
@@ -89,10 +89,12 @@ export default {
             if(this.type === 1) {
                 let model = ele.axisValueLabel
                 this.setModel({name: model});
+                this.setHeaderType(3);
                 this.$router.push("/modelInsight");
             } else {
                 let brand = ele.axisValueLabel;
                 this.setBrand({brandname: brand});
+                this.setHeaderType(3);
                 this.$router.push("/brandInsight");
             }
         }
diff --git a/src/views/Index/tailInsight/index.vue b/src/views/Index/tailInsight/index.vue
index 2681b82..e7baa0e 100644
--- a/src/views/Index/tailInsight/index.vue
+++ b/src/views/Index/tailInsight/index.vue
@@ -1,7 +1,7 @@
 <!--
  * @Author: xw
  * @Date: 2021-10-09 11:56:50
- * @LastEditTime: 2021-11-22 10:54:34
+ * @LastEditTime: 2021-11-29 10:41:57
  * @LastEditors: Please set LastEditors
  * @Description: 尾翼洞察
  * @FilePath: /data-show/src/views/Index/tailInsight/index.vue
@@ -90,10 +90,12 @@ export default {
             if(this.type === 1) {
                 let model = ele.axisValueLabel
                 this.setModel({name: model});
+                this.setHeaderType(3);
                 this.$router.push("/modelInsight");
             } else {
                 let brand = ele.axisValueLabel;
                 this.setBrand({brandname: brand});
+                this.setHeaderType(3);
                 this.$router.push("/brandInsight");
             }
         }
diff --git a/src/views/ModelInsight/ml-brand-data/index.vue b/src/views/ModelInsight/ml-brand-data/index.vue
index bb88dcd..6eb7407 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-11-16 15:53:19
+ * @LastEditTime: 2021-11-29 10:22:21
  * @LastEditors: Please set LastEditors
  * @Description: In User Settings Edit
  * @FilePath: /data-show/src/views/ModelInsight/ml-brand-data/index.vue
@@ -55,9 +55,9 @@
                             </template>
                         </template>
                         <span class="s2">
-                            <span class="s2-s1" :style="{width: affObj.a/affObj.z * width +'px'}"></span>
-                            <span class="s2-s1" :style="{width: affObj.b/affObj.z * width + 'px', background: '#54BF93'}"></span>
-                            <span class="s2-s1" :style="{width: affObj.c/affObj.z *  width + 'px',background: '#CC9D12'}"></span>
+                            <span class="s2-s1" :style="{width: affObj.a/affObj.z * 100 + '%'}"></span>
+                            <span class="s2-s1" :style="{width: affObj.b/affObj.z * 100 + '%', background: '#54BF93'}"></span>
+                            <span class="s2-s1" :style="{width: affObj.c/affObj.z * 100 + '%',background: '#CC9D12'}"></span>
                         </span>
                     </a-popover>
                 </div>
@@ -73,7 +73,6 @@ export default {
     props: ["brand", "model"],
     data() {
         return {
-            width: 274,
             load: false,
             form: {
                 sBrand: "",
@@ -137,7 +136,8 @@ export default {
                         this.affObj.a * 1 +
                         this.affObj.b * 1 +
                         this.affObj.c * 1;
-                    resolve(data)    
+                    resolve(data)   
+                    console.log(this.affObj) 
                 }).catch(() => {
                     reject(false);
                 });
@@ -189,8 +189,9 @@ export default {
             .s2 {
                 margin-right: 0px;
                 display: flex;
-                justify-content: flex-start;
+                justify-content: flex-end;
                 cursor: pointer;
+                width: 274px;
                 .s2-s1 {
                     display: block;
                     width: 102px;

From cd987c9bafa7ad683d278b9200df821d85deabb2 Mon Sep 17 00:00:00 2001
From: xiaowen <372193233@qq.com>
Date: Mon, 29 Nov 2021 10:50:47 +0800
Subject: [PATCH 3/4] cxw-010203

---
 src/views/BrandInsight/brandData/index.vue | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/views/BrandInsight/brandData/index.vue b/src/views/BrandInsight/brandData/index.vue
index 1355d1e..e33590d 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-11-04 14:13:42
+ * @LastEditTime: 2021-11-29 10:48:33
  * @LastEditors: Please set LastEditors
  * @Description: 品牌数据
  * @FilePath: /data-show/src/views/BrandInsight/brandData/index.vue
@@ -43,9 +43,9 @@
                         </template>
                     </template>
                     <span class="s2">
-                        <span class="s2-s1" :style="{width: affObj.a/affObj.z * width +'px'}"></span>
-                        <span class="s2-s1" :style="{width: affObj.b/affObj.z * width + 'px', background: '#54BF93'}"></span>
-                        <span class="s2-s1" :style="{width: affObj.c/affObj.z *  width + 'px',background: '#CC9D12'}"></span>
+                        <span class="s2-s1" :style="{width: affObj.a/affObj.z * 100 +'%'}"></span>
+                        <span class="s2-s1" :style="{width: affObj.b/affObj.z * 100 + '%', background: '#54BF93'}"></span>
+                        <span class="s2-s1" :style="{width: affObj.c/affObj.z * 100 + '%',background: '#CC9D12'}"></span>
                     </span>
                 </a-popover>
             </div>
@@ -61,7 +61,6 @@ export default {
     props: ["brand"],
     data() {
         return {
-            width: 274,
             count: 0,
             countArr: [],
             load: false,

From 648e87adc2a678f0611970d2aadb881d7d4b3967 Mon Sep 17 00:00:00 2001
From: xiaowen <372193233@qq.com>
Date: Mon, 29 Nov 2021 11:03:10 +0800
Subject: [PATCH 4/4] cxw-010203

---
 src/views/BrandInsight/popularEvents/opt.js   | 4 ++--
 src/views/ModelInsight/mlPopularEvents/opt.js | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/views/BrandInsight/popularEvents/opt.js b/src/views/BrandInsight/popularEvents/opt.js
index 2a1da99..4ea1436 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-11-16 15:44:07
+ * @LastEditTime: 2021-11-29 10:59:38
  * @LastEditors: Please set LastEditors
  * @Description: In User Settings Edit
  * @FilePath: /data-show/src/views/BrandInsight/popularEvents/opt.js
@@ -25,7 +25,7 @@ function createData(obj = {}) {
             data: obj[key],
             type: 'scatter',
             symbolSize: function (data) {
-                return data[2]/1.2
+                return data[2] / 0.023e2;
             }
         }
         arr.push(o)
diff --git a/src/views/ModelInsight/mlPopularEvents/opt.js b/src/views/ModelInsight/mlPopularEvents/opt.js
index 0f71c00..d6dcdc8 100644
--- a/src/views/ModelInsight/mlPopularEvents/opt.js
+++ b/src/views/ModelInsight/mlPopularEvents/opt.js
@@ -1,7 +1,7 @@
 /*
  * @Author: your name
  * @Date: 2021-10-12 11:16:44
- * @LastEditTime: 2021-11-16 15:49:47
+ * @LastEditTime: 2021-11-29 11:01:29
  * @LastEditors: Please set LastEditors
  * @Description: In User Settings Edit
  * @FilePath: /data-show/src/views/BrandInsight/popularEvents/opt.js
@@ -18,7 +18,7 @@ function createData(obj = {}) {
             data: obj[key],
             type: 'scatter',
             symbolSize: function (data) {
-                return data[2] / 1.2
+                return data[2] / 0.023e2
             }
         }
         arr.push(o)