From 38b39433786f2e1b2283650e1c17e2769b6cd90d Mon Sep 17 00:00:00 2001
From: zx <604444282@qq.com>
Date: Thu, 2 Dec 2021 11:20:38 +0800
Subject: [PATCH] zx

---
 src/lycomponents/iSwitchModel/index.vue                |  6 +++++-
 .../BrandComparison/brandTonalDistribution/index.vue   |  3 ++-
 .../BrandComparison/weiboTuneComparison/index.vue      |  1 +
 src/views/EventDEC/mediaInterpretationED/index.vue     |  1 +
 src/views/IndustryDataExport/index.vue                 |  2 +-
 src/views/IndustryDataExport/tableEvent.js             | 10 +++++-----
 .../ModelComparison/weiboTuneComparison/index.vue      |  1 +
 7 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/src/lycomponents/iSwitchModel/index.vue b/src/lycomponents/iSwitchModel/index.vue
index 8e84bd6..f8b5dc0 100644
--- a/src/lycomponents/iSwitchModel/index.vue
+++ b/src/lycomponents/iSwitchModel/index.vue
@@ -85,6 +85,9 @@ export default {
             this.chooseBrand = row;
         });
         this.getUserSeriesName(this.brandname);
+        //保存上次选择的值
+        this.chooseBrand = this.brandname;
+        this.chooseModel = this.modelName;
     },
     data() {
         return {
@@ -163,7 +166,8 @@ export default {
             this.showActive = row.brandid;
             this.chooseBrand =  row;
             this.brandname = this.chooseBrand.brandname;
-            this.getUserSeriesName(this.brandname)
+            this.getUserSeriesName(this.brandname);
+            this.chooseModel = null; //刷新
         },
         // 选择车型
         handlerModel(n, row) {
diff --git a/src/views/BrandComparison/brandTonalDistribution/index.vue b/src/views/BrandComparison/brandTonalDistribution/index.vue
index 12d76ba..5ef6491 100644
--- a/src/views/BrandComparison/brandTonalDistribution/index.vue
+++ b/src/views/BrandComparison/brandTonalDistribution/index.vue
@@ -22,7 +22,7 @@
         ><span class="s2">负面</span>
       </div>
     </div>
-    <div class="bd-inner" style="margin-left: 18px">
+    <div class="bd-inner">
       <roundata
         v-for="(item,index) in list"
         :key="index"
@@ -121,6 +121,7 @@ export default {
   .bd-inner {
     width: 100%;
     height: calc(100% - 48px);
+    margin-left: 18px;
     display: flex;
     justify-content: flex-start;
     align-items: center;
diff --git a/src/views/BrandComparison/weiboTuneComparison/index.vue b/src/views/BrandComparison/weiboTuneComparison/index.vue
index 54b7f08..fe0050d 100644
--- a/src/views/BrandComparison/weiboTuneComparison/index.vue
+++ b/src/views/BrandComparison/weiboTuneComparison/index.vue
@@ -125,6 +125,7 @@ export default {
   }
   .wtc-inner {
     width: 100%;
+    margin-left: 18px;
     height: calc(100% - 48px);
     display: flex;
     justify-content: flex-start;
diff --git a/src/views/EventDEC/mediaInterpretationED/index.vue b/src/views/EventDEC/mediaInterpretationED/index.vue
index 0d32398..a77db38 100644
--- a/src/views/EventDEC/mediaInterpretationED/index.vue
+++ b/src/views/EventDEC/mediaInterpretationED/index.vue
@@ -169,6 +169,7 @@ export default {
             .d1-inner {
                 width: 100%;
                 height: calc(100% - 48px);
+                margin-left: 16px;
                 display: flex;
                 justify-content: flex-start;
                 flex-wrap: wrap;
diff --git a/src/views/IndustryDataExport/index.vue b/src/views/IndustryDataExport/index.vue
index f46b99e..8dad399 100644
--- a/src/views/IndustryDataExport/index.vue
+++ b/src/views/IndustryDataExport/index.vue
@@ -17,7 +17,7 @@
                     <div class="ide-d1-dd1">
                         <span class="s1">时间：</span>
                         <v-tab-group :value="gValue" :style="{ background: 'transparent' }" :btns="btnTimes" @change="handlerTime"></v-tab-group>
-                        <a-range-picker v-model="selTime" style="margin-left: 0.8rem" :disabled-date="disabledDate" @calendarChange="calendarPriceRangeChange" :size="$vuiSize" valueFormat="YYYY-MM-DD" v-if="form.sTimeType == selVal" @change="handlerChangeTime">
+                        <a-range-picker show-time v-model="selTime" style="margin-left: 0.8rem" :disabled-date="disabledDate" @calendarChange="calendarPriceRangeChange" :size="$vuiSize" valueFormat="YYYY-MM-DD HH:mm:ss" v-if="form.sTimeType == selVal" @change="handlerChangeTime">
                             <a-icon slot="suffixIcon" type="calendar" />
                         </a-range-picker>
                     </div>
diff --git a/src/views/IndustryDataExport/tableEvent.js b/src/views/IndustryDataExport/tableEvent.js
index a7962c4..20183d5 100644
--- a/src/views/IndustryDataExport/tableEvent.js
+++ b/src/views/IndustryDataExport/tableEvent.js
@@ -116,11 +116,11 @@ export default {
     // 导出弹框
     handlerExport() {
         this.getToExcelField(this.form.sType, this.form.token).then(() => {
-            if(this.secIds.length===0 || this.secIds.length===1){
-                this.execlForm.sFileName = '事件洞察-' + this.getDatetimeSs();
-            } else {
-                this.execlForm.sFileName = this.form.sBrand + '-' + this.form.sSeriesName + '事件洞察-' + this.getDatetimeSs();
-            }
+            // if(this.secIds.length===0 || this.secIds.length===1){
+            //     this.execlForm.sFileName = '事件洞察' + this.getDatetimeSs();
+            // } else {
+                this.execlForm.sFileName = this.form.sBrand + this.form.sSeriesName + '事件洞察' + this.getDatetimeSs();
+            // }
             this.execlForm.sCheckedIds = this.tableAll ? '' : this.secIds.toString();
             this.execlForm.iNum = this.tableAll ? this.totalNum : this.secIds.length;
             this.modalObj.visible = true;
diff --git a/src/views/ModelComparison/weiboTuneComparison/index.vue b/src/views/ModelComparison/weiboTuneComparison/index.vue
index 54d16ca..b9dddbe 100644
--- a/src/views/ModelComparison/weiboTuneComparison/index.vue
+++ b/src/views/ModelComparison/weiboTuneComparison/index.vue
@@ -131,6 +131,7 @@ export default {
   .wtc-inner {
     width: 100%;
     height: calc(100% - 48px);
+    margin-left: 18px;
     display: flex;
     justify-content: flex-start;
     align-items: center;