Merge branch 'dev' of https://git.oa00.com/SWS/carInsightSystem into dev

src/api/comm/index.js

@@ -1,7 +1,7 @@
 /*
  * @Author: your name
  * @Date: 2021-10-20 16:36:08
- * @LastEditTime: 2021-12-13 18:32:41
+ * @LastEditTime: 2021-12-14 18:15:36
  * @LastEditors: Please set LastEditors
  * @Description: In User Settings Edit
  * @FilePath: /data-show/src/api/comm/index.js

src/views/BrandComparison/BrandBeginComparte.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: your name
  * @Date: 2021-11-05 13:56:24
- * @LastEditTime: 2021-11-08 09:35:56
+ * @LastEditTime: 2021-12-14 18:10:08
  * @LastEditors: Please set LastEditors
  * @Description: In User Settings Edit
  * @FilePath: /data-show/src/views/BrandComparison/BrandBeginComparte.vue
@@ -39,7 +39,8 @@ export default {
     data() {
         return {
             form: {
-                token: ""
+                token: "",
+                sType: 'brand'
             },
             chooseArr: [null, null, null, null, null, null],
             brands: [

src/views/Index/realTimeEvent/index.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: xw
  * @Date: 2021-10-08 15:56:35
- * @LastEditTime: 2021-12-14 10:27:28
+ * @LastEditTime: 2021-12-14 19:14:51
  * @LastEditors: Please set LastEditors
  * @Description: 实时事件
  * @FilePath: /data-show/src/views/Index/realTimeEvent/index.vue
@@ -88,10 +88,16 @@ export default {
             let ele = this.darr[row.rowIndex];
             if (row.columnIndex === 0) {
                 let id = ele[3];
-                this.setHeaderType(3);
+                let brand = ele[2];
-                this.$router.push({
+                getBrandOrSeriesLevel({
-                    path: "/eventDEC",
+                    token: this.getToken,
-                    query: { events_id: id },
+                    sBrand: brand,
+                }).then(() => {
+                    this.setHeaderType(3);
+                    this.$router.push({
+                        path: "/eventDEC",
+                        query: { events_id: id },
+                    });
                 });
             }
             if (row.columnIndex === 2) {
@@ -107,7 +113,7 @@ export default {
                     this.$router.push({
                         path: "/brandInsight",
                     });
-                })
+                });
             }
         },
         // 获取车型

src/views/MarketingComparison/mcBeginCompare.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: your name
  * @Date: 2021-11-03 17:12:47
- * @LastEditTime: 2021-12-14 09:54:41
+ * @LastEditTime: 2021-12-14 18:14:20
  * @LastEditors: Please set LastEditors
  * @Description: In User Settings Editiv
  * @FilePath: /data-show/src/views/MarketingComparison/mcBeginCompare.vue
@@ -47,6 +47,7 @@ export default {
     return {
       form: {
         token: "",
+        sType: 'series'
       },
       //
       chooseArr: [null, null, null, null, null, null],

src/views/ModelComparison/BrandBeginComparte.vue

@@ -39,7 +39,8 @@ export default {
     data() {
         return {
             form: {
-                token: ""
+                token: "",
+                sType: 'series'
             },
             chooseArr: [null, null, null, null, null, null],
             models: [

src/views/ModelTailDetails/MTDrearWingInformationList/index.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: your name
  * @Date: 2021-10-13 18:14:01
- * @LastEditTime: 2021-12-09 10:03:13
+ * @LastEditTime: 2021-12-14 18:28:33
  * @LastEditors: Please set LastEditors
  * @Description: In User Settings Edit
  * @FilePath: /data-show/src/views/TailInsightDetails/rearWingInformationList/index.vue
@@ -70,7 +70,7 @@ export default {
             },
             columns: [
                 {
-                    title: "新闻标题",
+                    title: "尾翼信息",
                     key: "title",
                     dataIndex: "title",
                     scopedSlots: { customRender: "titles" },

src/views/TailInsightDetails/rearWingInformationList/index.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: your name
  * @Date: 2021-10-13 18:14:01
- * @LastEditTime: 2021-12-09 09:57:22
+ * @LastEditTime: 2021-12-14 18:27:58
  * @LastEditors: Please set LastEditors
  * @Description: In User Settings Edit
  * @FilePath: /data-show/src/views/TailInsightDetails/rearWingInformationList/index.vue
@@ -72,7 +72,7 @@ export default {
             models: [],
             columns: [
                 {
-                    title: "新闻标题",
+                    title: "尾翼信息",
                     key: "title",
                     dataIndex: "title",
                     scopedSlots: { customRender: "titles" },