From 44392554dcc4eea763993a263e2e4c3e3b01459b Mon Sep 17 00:00:00 2001
From: yyyyeeee <zhangjinli_808@163.com>
Date: Fri, 24 Feb 2023 16:47:48 +0800
Subject: [PATCH] zx

---
 src/lycomponents/iHeaderMyself/index.vue      | 18 ++-------------
 .../BrandComparison/BrandBeginComparte.vue    | 20 +++++++++++++++--
 .../brandCompateHeader/index.vue              | 22 +++++++++----------
 src/views/KeyMediaTheme/index.vue             |  4 ++--
 .../KeyMediaTheme/popularEventsList/index.vue |  4 ++--
 .../KeyMediaTheme/weiboCharacters/index.vue   |  4 ++--
 .../weiboCommunicationTrend/index.vue         |  4 ++--
 .../weiboCommunicationTrendLong/index.vue     |  4 ++--
 .../weiboContentTOPVolume/index.vue           |  4 ++--
 .../KeyMediaTheme/weiboContentType/index.vue  |  4 ++--
 .../weiboUserActiveArea/index.vue             |  4 ++--
 .../KeyMediaTheme/weiboWordCloud/index.vue    |  4 ++--
 .../ModelComparison/BrandBeginComparte.vue    | 20 +++++++++++++++--
 .../brandCompateHeader/index.vue              | 22 +++++++++----------
 src/views/MoreWarning/index.vue               |  6 ++---
 src/views/MyBrand/index.vue                   |  3 ---
 .../ThemeBoard/TransformAnalize/index.vue     | 13 ++++++++---
 src/views/ThemeData/tableEvent.js             |  2 ++
 18 files changed, 93 insertions(+), 69 deletions(-)

diff --git a/src/lycomponents/iHeaderMyself/index.vue b/src/lycomponents/iHeaderMyself/index.vue
index 600df93..c4664bc 100644
--- a/src/lycomponents/iHeaderMyself/index.vue
+++ b/src/lycomponents/iHeaderMyself/index.vue
@@ -81,27 +81,13 @@ export default {
                 sStartTime: "",
                 sEndTime: ""
             },
-            selDatas: [
-               
-            ],
+            selDatas: [],
         };
     },
-    //  watch: {
-    //     $route: {
-    //         handler(val) {
-    //             if (val.path === "/mcIndex") {
-    //                 this.timeShow = false;
-    //             } else {
-    //                 this.timeShow = true;
-    //             }
-    //         },
-    //         immediate: true,
-    //     },
-    // },
     created() {
         this.getSelect()
     },
-    mounted() {
+    mounted() {     
         this.intDt = self.setInterval(() => {
             let obj = this.getDatetime();
             this.clock = obj.clock;
diff --git a/src/views/BrandComparison/BrandBeginComparte.vue b/src/views/BrandComparison/BrandBeginComparte.vue
index 6093ec0..3abc4dc 100644
--- a/src/views/BrandComparison/BrandBeginComparte.vue
+++ b/src/views/BrandComparison/BrandBeginComparte.vue
@@ -9,7 +9,7 @@
 <template>
     <div class="d-container">
         <div class="bbc-inner">
-            <brandCompateHeader ref="brandRef" @del="handlerDel"></brandCompateHeader>
+            <brandCompateHeader ref="brandRef" @del="handlerDel" @change="handlerChange"></brandCompateHeader>
              <div class="mbc-inner">
                 <v-label-div title="品牌推荐">
                 </v-label-div>
@@ -74,12 +74,28 @@ export default {
                     obj.isDel = true;
                     return;
                 }
-            }    
+            }
         },
          // 删除
         handlerDel(n) {
             this.chooseArr[n] = null;
         },
+        handlerChange(val) {
+            let handlerObj = {brandname: val, seriesname: ""};
+            for(let i = 0; i < this.chooseArr.length; i++) {
+                let n = this.chooseArr.findIndex(ele =>{
+                    return ele && ele.brandname === handlerObj.brandname
+                })
+
+                if(!this.chooseArr[i] && n === -1) {
+                    this.chooseArr[i] = handlerObj;
+                    let obj = this.$refs.brandRef.brands[i]
+                    obj.name = handlerObj.brandname;
+                    obj.isDel = true;
+                    return;
+                }
+            }
+        },
         // 开始对比
         handlerSubmit() {
             let arr = this.$refs.brandRef.brands || [];
diff --git a/src/views/BrandComparison/brandCompateHeader/index.vue b/src/views/BrandComparison/brandCompateHeader/index.vue
index 68d2090..71a7192 100644
--- a/src/views/BrandComparison/brandCompateHeader/index.vue
+++ b/src/views/BrandComparison/brandCompateHeader/index.vue
@@ -105,16 +105,16 @@ export default {
         // 获取选择品牌的数据
         handlerBrand(arr) {
             let name = arr[0].brandname;
-            let n = this.brands.findIndex((ele) => ele.name === name);
-            if (n === -1) {
-                let row = this.brands[this.brandIndex];
-                row.name = name;
-                row.isDel = true;
-            }
-            let filterArr = this.brands.filter((ele) => {
-                return ele.name;
-            });
-            this.$emit("change", filterArr);
+            // let n = this.brands.findIndex((ele) => ele.name === name);
+            // if (n === -1) {
+            //     let row = this.brands[this.brandIndex];
+            //     row.name = name;
+            //     row.isDel = true;
+            // }
+            // let filterArr = this.brands.filter((ele) => {
+            //     return ele.name;
+            // });
+            this.$emit("change", name);
         },
         // 删除
         handlerDel(n) {
@@ -128,7 +128,7 @@ export default {
                 this.setBcStatus(false);
             }
             this.$emit("del", n);
-            this.$emit("change", filterArr);
+            // this.$emit("change", filterArr);
         },
         // 重选对比
         reCompare() {
diff --git a/src/views/KeyMediaTheme/index.vue b/src/views/KeyMediaTheme/index.vue
index 5e6dfe1..144954b 100644
--- a/src/views/KeyMediaTheme/index.vue
+++ b/src/views/KeyMediaTheme/index.vue
@@ -175,9 +175,9 @@ export default {
     };
   },
   created() {
+    this.form = this.$route.query
     this.form.token = this.getToken;
-    this.form.sGuid = this.$route.query.sGuid;
-    this.form.sSource = this.$route.query.source || "抖音";
+    this.form.ilimitType = 0
     if(this.form.sSource == '汽车之家' && this.getCarCircle == 1) {
       this.form.ilimitType = 1;
     } else if (this.form.sSource == '懂车帝' && this.getCarCircle == 1) {
diff --git a/src/views/KeyMediaTheme/popularEventsList/index.vue b/src/views/KeyMediaTheme/popularEventsList/index.vue
index 1f66fc6..cc345b0 100644
--- a/src/views/KeyMediaTheme/popularEventsList/index.vue
+++ b/src/views/KeyMediaTheme/popularEventsList/index.vue
@@ -38,9 +38,9 @@ export default {
         };
     },
     created() {
+        this.form = this.$route.query
         this.form.token = this.getToken;
-        this.form.sGuid = this.$route.query.sGuid;
-        this.form.sSource = this.$route.query.source || "抖音";
+        this.form.ilimitType = 0
         if(this.form.sSource == '汽车之家') {
         this.form.ilimitType = 1;
         } else if (this.form.sSource == '懂车帝' && this.getCarCircle == 1) {
diff --git a/src/views/KeyMediaTheme/weiboCharacters/index.vue b/src/views/KeyMediaTheme/weiboCharacters/index.vue
index 7461759..3094864 100644
--- a/src/views/KeyMediaTheme/weiboCharacters/index.vue
+++ b/src/views/KeyMediaTheme/weiboCharacters/index.vue
@@ -95,9 +95,9 @@ export default {
     };
   },
   created() {
+        this.form = this.$route.query
         this.form.token = this.getToken;
-        this.form.sGuid = this.$route.query.sGuid;
-        this.form.sSource = this.$route.query.source || "抖音";
+        this.form.ilimitType = 0
         if(this.form.sSource == '汽车之家') {
         this.form.ilimitType = 1;
         } else if (this.form.sSource == '懂车帝' && this.getCarCircle == 1) {
diff --git a/src/views/KeyMediaTheme/weiboCommunicationTrend/index.vue b/src/views/KeyMediaTheme/weiboCommunicationTrend/index.vue
index 9c83d77..37e0bc0 100644
--- a/src/views/KeyMediaTheme/weiboCommunicationTrend/index.vue
+++ b/src/views/KeyMediaTheme/weiboCommunicationTrend/index.vue
@@ -59,9 +59,9 @@ export default {
         }
     },
     created() {
+        this.form = this.$route.query
         this.form.token = this.getToken;
-        this.form.sGuid = this.$route.query.sGuid;
-        this.form.sSource = this.$route.query.source || "抖音";
+        this.form.ilimitType = 0
         if(this.form.sSource == '汽车之家') {
         this.form.ilimitType = 1;
         } else if (this.form.sSource == '懂车帝' && this.getCarCircle == 1) {
diff --git a/src/views/KeyMediaTheme/weiboCommunicationTrendLong/index.vue b/src/views/KeyMediaTheme/weiboCommunicationTrendLong/index.vue
index e4a2e8c..834b145 100644
--- a/src/views/KeyMediaTheme/weiboCommunicationTrendLong/index.vue
+++ b/src/views/KeyMediaTheme/weiboCommunicationTrendLong/index.vue
@@ -60,9 +60,9 @@ export default {
         }
     },
     created() {
+        this.form = this.$route.query
         this.form.token = this.getToken;
-        this.form.sGuid = this.$route.query.sGuid;
-        this.form.sSource = this.$route.query.source || "抖音";
+        this.form.ilimitType = 0
         if(this.form.sSource == '汽车之家') {
         this.form.ilimitType = 1;
         } else if (this.form.sSource == '懂车帝' && this.getCarCircle == 1) {
diff --git a/src/views/KeyMediaTheme/weiboContentTOPVolume/index.vue b/src/views/KeyMediaTheme/weiboContentTOPVolume/index.vue
index 6231b30..eca0d71 100644
--- a/src/views/KeyMediaTheme/weiboContentTOPVolume/index.vue
+++ b/src/views/KeyMediaTheme/weiboContentTOPVolume/index.vue
@@ -41,9 +41,9 @@ export default {
         };
     },
     created() {
+      this.form = this.$route.query
       this.form.token = this.getToken;
-      this.form.sGuid = this.$route.query.sGuid;
-      this.form.sSource = this.$route.query.source || "抖音";
+      this.form.ilimitType = 0
       if(this.form.sSource == '汽车之家') {
         this.form.ilimitType = 1;
       } else if (this.form.sSource == '懂车帝' && this.getCarCircle == 1) {
diff --git a/src/views/KeyMediaTheme/weiboContentType/index.vue b/src/views/KeyMediaTheme/weiboContentType/index.vue
index 1079aee..410b6f1 100644
--- a/src/views/KeyMediaTheme/weiboContentType/index.vue
+++ b/src/views/KeyMediaTheme/weiboContentType/index.vue
@@ -70,9 +70,9 @@ export default {
     };
   },
   created() {
+        this.form = this.$route.query
         this.form.token = this.getToken;
-        this.form.sGuid = this.$route.query.sGuid;
-        this.form.sSource = this.$route.query.source || "抖音";
+        this.form.ilimitType = 0
         if(this.form.sSource == '汽车之家') {
         this.form.ilimitType = 1;
         } else if (this.form.sSource == '懂车帝' && this.getCarCircle == 1) {
diff --git a/src/views/KeyMediaTheme/weiboUserActiveArea/index.vue b/src/views/KeyMediaTheme/weiboUserActiveArea/index.vue
index c4eef1f..0d2d653 100644
--- a/src/views/KeyMediaTheme/weiboUserActiveArea/index.vue
+++ b/src/views/KeyMediaTheme/weiboUserActiveArea/index.vue
@@ -40,9 +40,9 @@ export default {
     };
   },
   created() {
+        this.form = this.$route.query
         this.form.token = this.getToken;
-        this.form.sGuid = this.$route.query.sGuid;
-        this.form.sSource = this.$route.query.source || "抖音";
+        this.form.ilimitType = 0
         if(this.form.sSource == '汽车之家') {
         this.form.ilimitType = 1;
         } else if (this.form.sSource == '懂车帝' && this.getCarCircle == 1) {
diff --git a/src/views/KeyMediaTheme/weiboWordCloud/index.vue b/src/views/KeyMediaTheme/weiboWordCloud/index.vue
index d97a6a3..0381afc 100644
--- a/src/views/KeyMediaTheme/weiboWordCloud/index.vue
+++ b/src/views/KeyMediaTheme/weiboWordCloud/index.vue
@@ -36,9 +36,9 @@ export default {
     };
   },
   created() {
+        this.form = this.$route.query
         this.form.token = this.getToken;
-        this.form.sGuid = this.$route.query.sGuid;
-        this.form.sSource = this.$route.query.source || "抖音";
+        this.form.ilimitType = 0
         if(this.form.sSource == '汽车之家') {
         this.form.ilimitType = 1;
         } else if (this.form.sSource == '懂车帝' && this.getCarCircle == 1) {
diff --git a/src/views/ModelComparison/BrandBeginComparte.vue b/src/views/ModelComparison/BrandBeginComparte.vue
index 35abe9b..b0b2f19 100644
--- a/src/views/ModelComparison/BrandBeginComparte.vue
+++ b/src/views/ModelComparison/BrandBeginComparte.vue
@@ -9,7 +9,7 @@
 <template>
     <div class="d-container">
         <div class="mbc-outter">
-            <brandCompateHeader ref="modelRef" @del="handlerDel"></brandCompateHeader>
+            <brandCompateHeader ref="modelRef" @del="handlerDel" @change="handlerChange"></brandCompateHeader>
             <div class="mbc-inner">
                 <v-label-div title="车型推荐">
                 </v-label-div>
@@ -68,7 +68,23 @@ export default {
                     return;
                 }
             }
-            
+        },
+        handlerChange(val) {
+            let changeObj = {brandname: val[1].brandname, seriesname: val[1].name}
+            for(let i = 0; i < this.chooseArr.length; i++) {
+               let ele = this.chooseArr[i];
+               if(ele && ele.seriesname == changeObj.seriesname) {
+                   return;
+               }
+                if(!this.chooseArr[i]) {
+                    this.chooseArr[i] = changeObj;
+                    let obj = this.$refs.modelRef.list[i]
+                    obj.brand = changeObj.brandname;
+                    obj.model = changeObj.seriesname;
+                    obj.isDel = true;
+                    return;
+                }
+            }
         },
         // 获取推荐车型
         getData() {
diff --git a/src/views/ModelComparison/brandCompateHeader/index.vue b/src/views/ModelComparison/brandCompateHeader/index.vue
index e81cac1..37e0cda 100644
--- a/src/views/ModelComparison/brandCompateHeader/index.vue
+++ b/src/views/ModelComparison/brandCompateHeader/index.vue
@@ -152,20 +152,20 @@ export default {
                  this.setScStatus(false)
             }
             this.$emit("del", n);
-            this.$emit("change", filterArr);
+            // this.$emit("change", filterArr);
         },
         // 获取切换车型的数据
         handlerBrand(arr) {
-            let n = this.list.findIndex((ele) => ele.model === arr[1].name);
-            if (n != -1) return;
-            let row = this.list[this.chooseIndex];
-            row.brand = arr[1].brandname;
-            row.model = arr[1].name;
-            row.isDel = true;
-            let filterArr = this.list.filter((ele) => {
-                return ele.brand && ele.model;
-            });
-            this.$emit("change", filterArr);
+            // let n = this.list.findIndex((ele) => ele.model === arr[1].name);
+            // if (n != -1) return;
+            // let row = this.list[this.chooseIndex];
+            // row.brand = arr[1].brandname;
+            // row.model = arr[1].name;
+            // row.isDel = true;
+            // let filterArr = this.list.filter((ele) => {
+            //     return ele.brand && ele.model;
+            // });
+            this.$emit("change", arr);
         },
         // 重选对比
         reCompare() {
diff --git a/src/views/MoreWarning/index.vue b/src/views/MoreWarning/index.vue
index 028f02c..fb66523 100644
--- a/src/views/MoreWarning/index.vue
+++ b/src/views/MoreWarning/index.vue
@@ -222,14 +222,14 @@ export default {
             this.form.sCrisis = val.join(',');
             this.warningForm2.crisis = val.join(',');
             this.form.iPageIndex = 1;
-            this.pagination.current = 1;
+            this.pagination2.current = 1;
             this.getWarning();
             this.noClick = false;
         },
         statusChange(val, status) {
             this.noClick = true;
-            this.warningForm.iReadState = val.join(',');
-            this.warningForm.iPageIndex = 1;
+            this.warningForm2.iReadState = val.join(',');
+            this.warningForm2.iPageIndex = 1;
             this.pagination2.current = 1;
             this.getWarning();
             this.noClick = false;
diff --git a/src/views/MyBrand/index.vue b/src/views/MyBrand/index.vue
index cf20f1e..7fd456a 100644
--- a/src/views/MyBrand/index.vue
+++ b/src/views/MyBrand/index.vue
@@ -157,9 +157,7 @@ export default {
             this.settingForm.Crisis = val.join(',');
         },
         openChange(e) { //预警开启/关闭
-            let m = e?'预警已开启':'预警已关闭'
             this.Statu = e?'0':'1';
-            this.$message.success(m);
         },
         chooseSeries() {
             let obj = {
@@ -189,7 +187,6 @@ export default {
             };
             addOrUpdSwsQyQuartzList(form).then(res => {
                 if(res.msg == 'Success') {
-                    // this.setWarningSeries(this.settingForm.SeriesNames);
                     this.$message.success('修改成功');
                     this.visible = false;
                     this.reload();
diff --git a/src/views/ThemeBoard/TransformAnalize/index.vue b/src/views/ThemeBoard/TransformAnalize/index.vue
index 25f6c8a..87c6581 100644
--- a/src/views/ThemeBoard/TransformAnalize/index.vue
+++ b/src/views/ThemeBoard/TransformAnalize/index.vue
@@ -55,7 +55,7 @@ export default {
             ],
             list: [],
             form: {
-                token: ''
+                token: '',
             }
         }
     },
@@ -105,8 +105,15 @@ export default {
             this.$router.push({
                 path: '/keyMediaTheme',
                 query: {
-                    source: item.label,
-                    sGuid: this.$route.query.sGuid
+                    sSource: item.label,
+                    sGuid: this.$route.query.sGuid,
+                    sStartTime: this.$route.query.sStartTime,
+                    sEndTime: this.$route.query.sEndTime,
+                    sQuDao: this.$route.query.sQuDao,
+                    sQingGan: this.$route.query.sQingGan,
+                    sTitle: this.$route.query.sTitle,
+                    sTitleType: this.$route.query.sTitleType,
+                    sCrisis: this.$route.query.sCrisis,
                 }
             })
         }
diff --git a/src/views/ThemeData/tableEvent.js b/src/views/ThemeData/tableEvent.js
index 034b9d3..70c2142 100644
--- a/src/views/ThemeData/tableEvent.js
+++ b/src/views/ThemeData/tableEvent.js
@@ -83,11 +83,13 @@ export default {
                 token: this.getToken,
                 website: this.form.website,
                 sTitle: this.form.sTitle,
+                sTitleType: this.form.sTitleType,
                 sStartTime: this.form.sStartTime,
                 sEndTime: this.form.sEndTime,
                 sTimeType: this.form.sTimeType,
                 sQuDao: this.form.sQuDao,
                 sQingGan: this.form.sQingGan,
+                sCrisis: this.form.sCrisis,
                 name: this.$route.query.name,
             }
         })