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

* 'dev' of git.oa00.com:SWS/carInsightSystem:
  zx-营销对比
  zx

# Conflicts:
#	src/views/MarketingComparison/mcChooseModel/index.vue

src/store/mutations.js

@@ -1,7 +1,7 @@
 /*
  * @Author: your name
  * @Date: 2021-10-12 13:37:35
- * @LastEditTime: 2021-12-16 11:09:40
+ * @LastEditTime: 2021-12-16 13:41:40
  * @LastEditors: Please set LastEditors
  * @Description: In User Settings Edit
  * @FilePath: /data-show/src/store/mutations.js
@@ -87,7 +87,8 @@ const mutations = {
     },
     setMcStatus: (state, log) => {
         state.mcStatus = log;
-        sessionStorage.setItem('mcStatus', log);
+        let str = JSON.stringify(log);
+        sessionStorage.setItem('mcStatus', str);
     },
     setChangeSTime: (state, log) => {
         state.changeSTime = log;   

src/store/state.js

@@ -1,7 +1,7 @@
 /*
  * @Author: your name
  * @Date: 2021-10-12 13:37:50
- * @LastEditTime: 2021-12-16 11:08:19
+ * @LastEditTime: 2021-12-16 13:41:18
  * @LastEditors: Please set LastEditors
  * @Description: In User Settings Edit
  * @FilePath: /data-show/src/store/state.js
@@ -25,7 +25,7 @@ const state = {
     sComparison: JSON.parse(sessionStorage.getItem('sComparison')) || [],
     changeSTime: 1,
     mComparison: JSON.parse(sessionStorage.getItem('mComparison')) || [],
-    mcStatus: sessionStorage.getItem('mcStatus') || false,
+    mcStatus: JSON.parse(sessionStorage.getItem('mcStatus')) || false,
     eComparison: JSON.parse(sessionStorage.getItem('eComparison')) || [],
     levelBtn: JSON.parse(sessionStorage.getItem('levelBtn')) || [],
     menu: giveMenu() || JSON.parse(sessionStorage.getItem('menu')) || [],

src/views/Index/spreadTheSound/opt.js

@@ -83,7 +83,7 @@ export default function createOpt(dx = [], ds = []) {
     legend: {
       textStyle: { //图例文字的样式
         color: '#fff',
-        fontSize:10
+        fontSize: 8
       },
       y: 10,
       x: 10,

src/views/MarketingComparison/index.vue

@@ -8,8 +8,8 @@
 -->
 <template>
     <div class="d-container">
-       <marketingComparison v-if="hasData == true"></marketingComparison>
-       <mcBeginCompare v-else></mcBeginCompare>
+       <mcBeginCompare v-if="!hasData"></mcBeginCompare>
+       <marketing-comparison v-else></marketing-comparison>
     </div>
 </template>
 

src/views/MarketingComparison/mcBeginCompare.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: your name
  * @Date: 2021-11-03 17:12:47
- * @LastEditTime: 2021-12-14 18:14:20
+ * @LastEditTime: 2021-11-05 18:29:12
  * @LastEditors: Please set LastEditors
  * @Description: In User Settings Editiv
  * @FilePath: /data-show/src/views/MarketingComparison/mcBeginCompare.vue
@@ -14,7 +14,7 @@
         <v-label-div title="车型推荐">
           <v-btn @click="handlerSubmit">开始对比</v-btn>
         </v-label-div>
-        <div class="mbc-dd">
+        <div class="mbc-dd"  v-loading="load">
           <ul class="mb-ul">
             <li
               class="mbc-d-item"
@@ -45,6 +45,7 @@ export default {
   inject: ["reload"],
   data() {
     return {
+      load: false,
       form: {
         token: "",
         sType: 'series'
@@ -80,9 +81,11 @@ export default {
     // 获取推荐车型
     getData() {
       let obj = Object.assign({}, this.form);
+      this.load = true;
       getRecommendSeries(obj).then((res) => {
         let data = res.data || [];
         this.models = data;
+        this.load = false;  
       });
     },
     // 删除
@@ -122,7 +125,7 @@ export default {
 }
 .mbc-inner {
   width: 100%;
-  height: 488px;
+  height: 400px;
   border: 2px solid #0f2a4d;
   margin-top: 16px;
   .mbc-dd {
@@ -137,7 +140,7 @@ export default {
       li {
         float: left;
         width: 295px;
-        height: 89px;
+        height: 80px;
         background-color: #0f2b47;
         margin-left: 16px;
         margin-top: 16px;

src/views/MarketingComparison/mcChooseModel/index.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: your name
  * @Date: 2021-11-03 11:54:08
- * @LastEditTime: 2021-12-16 13:32:20
+ * @LastEditTime: 2021-12-16 13:39:09
  * @LastEditors: Please set LastEditors
  * @Description: In User Settings Edit
  * @FilePath: /data-show/src/views/MarketingComparison/mcChooseModel/index.vue
@@ -36,7 +36,7 @@
                     placeholder="开始时间"
                     valueFormat="YYYY-MM-DD HH:mm:ss"
                     style="width: 82%; margin-left:18px"
-                    @change="handlerTime(item)"
+                    @ok="handlerTime(item)"
                   ></a-date-picker>
                 </a-form-model-item>
                 <a-form-model-item label="结束时间">
@@ -47,7 +47,7 @@
                     placeholder="结束时间"
                     valueFormat="YYYY-MM-DD HH:mm:ss"
                     style="width: 82%; margin-left:18px"
-                    @change="handlerTime(item)"
+                    @ok="handlerTime(item)"
                   ></a-date-picker>
                 </a-form-model-item>
               </a-form-model>
@@ -165,9 +165,6 @@ export default {
   },
   created() {
     this.brand = this.getBrand.brandname || "奥迪";
-    if(this.getSComparison == []) {
-      this.setMcStatus();
-    }
     if (this.getChangeSTime) {
       const arr = [];
       this.list.forEach((e) => {
@@ -185,6 +182,12 @@ export default {
     goback() {
       this.$router.go(-1);
     },
+    //删除已选择页面
+    refresh() {
+      for(let i=0;i<this.list.length;i++){
+        this.handlerDel(i);
+      };
+    },
     // 获取车型
     modelData() {
       let model = this.getModel.name || "";