From 9afcd10cf65e2425216ec73e0f2562bd197a944e Mon Sep 17 00:00:00 2001
From: "lily.zhang" <daylily.zhang@akuhome.com>
Date: Fri, 19 Nov 2021 16:05:38 +0800
Subject: [PATCH] cxw-010203

---
 src/views/EventComparison/ecx-top/index.vue            | 5 +++--
 src/views/EventDEC/index.vue                           | 5 +++--
 src/views/EventDEC/pnwcWord/index.vue                  | 9 +++++++--
 src/views/IndustryDataExport/getApiData.js             | 7 ++++++-
 src/views/ModelComparison/brandCompateHeader/index.vue | 5 +++--
 src/views/ModelInsight/ml-tts/index.vue                | 3 ++-
 6 files changed, 24 insertions(+), 10 deletions(-)

diff --git a/src/views/EventComparison/ecx-top/index.vue b/src/views/EventComparison/ecx-top/index.vue
index 538f729..7748dae 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 14:35:15
+ * @LastEditTime: 2021-11-19 15:44:04
  * @LastEditors: Please set LastEditors
  * @Description: In User Settings Edit
  * @FilePath: /data-show/src/views/EventComparison/ec-d1/index.vue
@@ -52,7 +52,7 @@ export default {
     },
     methods: {
         goback() {
-            this.$router.go(-1);
+            this.$router.push('/eventInsight');
         },
         // 切换事件
         handlerSwitch() {
@@ -69,6 +69,7 @@ export default {
                 token: this.getToken,
                 iContrastType: 3,
                 sRele: sRele,
+                sType: 'ToEventPptV6'
             });
             getToPptTask(obj).then(() => {
                 this.$notification.open({
diff --git a/src/views/EventDEC/index.vue b/src/views/EventDEC/index.vue
index 0c77b81..22b84f5 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 13:59:34
+ * @LastEditTime: 2021-11-19 15:39:01
  * @LastEditors: Please set LastEditors
  * @Description: In User Settings Edit
  * @FilePath: /data-show/src/views/EventDEC/index.vue
@@ -131,7 +131,8 @@ export default {
             let obj = Object.assign({}, this.getCtime2, {
                 token: this.getToken,
                 iContrastType: 3,
-                sRele: this.events_id
+                sRele: this.events_id,
+                sType: 'ToEventPptV6'
             });
             getToPptTask(obj).then(() => {
                 this.$notification.open({
diff --git a/src/views/EventDEC/pnwcWord/index.vue b/src/views/EventDEC/pnwcWord/index.vue
index c0d6c34..f24525e 100644
--- a/src/views/EventDEC/pnwcWord/index.vue
+++ b/src/views/EventDEC/pnwcWord/index.vue
@@ -1,7 +1,7 @@
 <!--
  * @Author: your name
  * @Date: 2021-10-20 11:56:12
- * @LastEditTime: 2021-11-17 13:49:45
+ * @LastEditTime: 2021-11-19 15:28:36
  * @LastEditors: Please set LastEditors
  * @Description: In User Settings Edit
  * @FilePath: /data-show/src/views/EventDEC/pnwcWord/index.vue
@@ -22,7 +22,12 @@ import createWordCloud from "@/utils/gol/bubbleWord";
 import {getNegative1, getPositive1} from "@/api/EventdEC"
 export default {
     name: "pnwcWord",
-    props: ["brand", "model"],
+    props: {
+        id: {
+            type: String,
+            default: "",
+        },
+    },
     data() {
         return {
             load: false,
diff --git a/src/views/IndustryDataExport/getApiData.js b/src/views/IndustryDataExport/getApiData.js
index 2bc8b72..2d95ec9 100644
--- a/src/views/IndustryDataExport/getApiData.js
+++ b/src/views/IndustryDataExport/getApiData.js
@@ -1,7 +1,7 @@
 /*
  * @Author: your name
  * @Date: 2021-10-27 15:26:21
- * @LastEditTime: 2021-11-17 16:03:54
+ * @LastEditTime: 2021-11-19 16:04:37
  * @LastEditors: Please set LastEditors
  * @Description: In User Settings Edit
  * @FilePath: /data-show/src/views/IndustryDataExport/getApiData.js
@@ -168,13 +168,18 @@ export default {
             getToExcelField({sType: sType, token: token}).then(res => {
                 let data = res.data;
                 let arr = [];
+                let arr1 = [];
                 data.forEach((ele) => {
+                    if(ele.checked == 1) {
+                        arr1.push(ele.field)
+                    }
                     let obj = {
                         label: ele.name,
                         value: ele.field,
                     };
                     arr.push(obj);
                 });
+                this.checkedIds = arr1;
                 this.plainOptions4 = arr;
                 resolve(arr);
             }).catch(() => {
diff --git a/src/views/ModelComparison/brandCompateHeader/index.vue b/src/views/ModelComparison/brandCompateHeader/index.vue
index 34f24ea..58d782f 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-18 15:05:55
+ * @LastEditTime: 2021-11-19 15:41:42
  * @LastEditors: Please set LastEditors
  * @Description: In User Settings Edit
  * @FilePath: /data-show/src/views/MarketingComparison/mcChooseModel/index.vue
@@ -175,7 +175,8 @@ export default {
                 token: this.getToken,
                 iContrastType: 2,
                 sBrand: sBrand,
-                sSeriesName: sSeriesName
+                sSeriesName: sSeriesName,
+                sType: 'ToSeriesPptV6'
             });
             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 1479c86..e926927 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-16 14:25:41
+ * @LastEditTime: 2021-11-19 15:40:23
  * @LastEditors: Please set LastEditors
  * @Description: 舆情传播趋势
  * @FilePath: /data-show/src/views/BrandInsight/titsopo/index.vue
@@ -120,6 +120,7 @@ export default {
         exportData() {
              let obj = Object.assign({}, this.getCtime2, this.form);
              obj.iContrastType = 2;
+             obj.sType = 'ToSeriesPptV6';
              this.btnLoading = true;
              getToPptTask(obj).then(() => {
                  this.$notification.open({