From 64faafee9df4e106558d3985c533fbf1c3f6521f Mon Sep 17 00:00:00 2001
From: zx <604444282@qq.com>
Date: Fri, 3 Dec 2021 16:23:29 +0800
Subject: [PATCH] zx

---
 src/lycomponents/iHeaderBrand/index.vue       | 25 ++---------
 .../brandTonalDistribution/index.vue          |  4 +-
 .../weiboTuneComparison/index.vue             |  4 +-
 .../BrandInsight/popularEventsList/index.vue  |  2 +-
 .../BrandInsight/weiboPortraits/index.vue     |  4 +-
 src/views/IndustryDataExport/tableEvent.js    | 44 ++++++++-----------
 .../mcChooseModel/index.vue                   | 17 +++----
 .../brandTonalDistribution/index.vue          |  3 +-
 .../weiboTuneComparison/index.vue             |  4 +-
 .../mfdNegativeTopic/index.vue                |  4 +-
 .../mfdPositiveTopic/index.vue                |  4 +-
 src/views/ModelInsight/ml-tts/index.vue       |  2 +-
 .../mlPopularEventsList/index.vue             |  2 +-
 .../ModelInsight/mlWeiboPortraits/index.vue   |  6 +--
 .../MWDweiboCharacters/index.vue              |  4 +-
 .../WeiboDetails/weiboCharacters/index.vue    |  4 +-
 16 files changed, 55 insertions(+), 78 deletions(-)

diff --git a/src/lycomponents/iHeaderBrand/index.vue b/src/lycomponents/iHeaderBrand/index.vue
index e3f242f..f3daae5 100644
--- a/src/lycomponents/iHeaderBrand/index.vue
+++ b/src/lycomponents/iHeaderBrand/index.vue
@@ -84,7 +84,7 @@ export default {
                 sEndTime: "",
             },
             selDatas: [],
-            offsetDays: 86400000 * 30, //最多选择7天
+            //offsetDays: 86400000 * 30, //最多选择7天
             timeShow: true
         };
     },
@@ -141,7 +141,7 @@ export default {
             if (this.form.sTimeType != 4) {
                 this.form.sStartTime = "";
                 this.form.sEndTime = "";
-                this.setCommTime({sTimeType: this.form.sTimeType});
+                this.setCommTime({sTimeType: this.form.sTimeType}); //首页同步时间
                 this.selTime = null;
                 this.reload();
             }
@@ -193,26 +193,7 @@ export default {
         },
         //根据选择的开始时间/结束时间，动态渲染要禁用的日期
         disabledDate(current) {
-            if (this.selectPriceDate) {
-                let selectV = moment(
-                    this.selectPriceDate,
-                    "YYYY-MM-DD"
-                ).valueOf();
-                return (
-                    current >
-                        moment(
-                            new Date(selectV + this.offsetDays),
-                            "YYYY-MM-DD"
-                        ) ||
-                    current <
-                        moment(
-                            new Date(selectV - this.offsetDays),
-                            "YYYY-MM-DD"
-                        )
-                );
-            } else {
-                return false;
-            }
+            return current > moment();
         },
     },
 };
diff --git a/src/views/BrandComparison/brandTonalDistribution/index.vue b/src/views/BrandComparison/brandTonalDistribution/index.vue
index 5ef6491..848bdcd 100644
--- a/src/views/BrandComparison/brandTonalDistribution/index.vue
+++ b/src/views/BrandComparison/brandTonalDistribution/index.vue
@@ -121,9 +121,9 @@ export default {
   .bd-inner {
     width: 100%;
     height: calc(100% - 48px);
-    margin-left: 18px;
+    margin-left: -24px;
     display: flex;
-    justify-content: flex-start;
+    justify-content: center;
     align-items: center;
   }
 }
diff --git a/src/views/BrandComparison/weiboTuneComparison/index.vue b/src/views/BrandComparison/weiboTuneComparison/index.vue
index fe0050d..dfcf30c 100644
--- a/src/views/BrandComparison/weiboTuneComparison/index.vue
+++ b/src/views/BrandComparison/weiboTuneComparison/index.vue
@@ -125,10 +125,10 @@ export default {
   }
   .wtc-inner {
     width: 100%;
-    margin-left: 18px;
     height: calc(100% - 48px);
+    margin-left: -24px;
     display: flex;
-    justify-content: flex-start;
+    justify-content: center;
     align-items: center;
   }
 }
diff --git a/src/views/BrandInsight/popularEventsList/index.vue b/src/views/BrandInsight/popularEventsList/index.vue
index 8e766dc..d5123fa 100644
--- a/src/views/BrandInsight/popularEventsList/index.vue
+++ b/src/views/BrandInsight/popularEventsList/index.vue
@@ -66,7 +66,7 @@ export default {
                 });
                 this.darr = arr2;
                 this.config = {
-                    headerBGC: "#1b4062",
+                    headerBGC: "rgba(16,33,59)",
                     oddRowBGC: "#173b6d",
                     evenRowBGC: "rgba(69, 149, 244, 0)",
                     columnWidth: [440, 120, 120],
diff --git a/src/views/BrandInsight/weiboPortraits/index.vue b/src/views/BrandInsight/weiboPortraits/index.vue
index cacb6a0..d4faa0a 100644
--- a/src/views/BrandInsight/weiboPortraits/index.vue
+++ b/src/views/BrandInsight/weiboPortraits/index.vue
@@ -16,7 +16,7 @@
                 <v-echarts :opt="opt"></v-echarts>
             </div>
             <div class="wp-in-d2">
-                <vue-scroll v-if="labelData.length<=3">
+                <div v-if="labelData.length<=3">
                     <v-label-ctx v-for="(item,index) in labelData" 
                     :key="index" :label="item.key" 
                     :cont="item.value" 
@@ -24,7 +24,7 @@
                     :color="colors[index]" 
                     :eStyle="{ height: '7.6rem' }">
                     </v-label-ctx>
-                </vue-scroll>
+                </div>
                 <vue-scroll v-if="labelData.length>3">
                     <v-label-ctx v-for="(item,index) in labelData" 
                     :key="index" :label="item.key" 
diff --git a/src/views/IndustryDataExport/tableEvent.js b/src/views/IndustryDataExport/tableEvent.js
index 20183d5..2958e41 100644
--- a/src/views/IndustryDataExport/tableEvent.js
+++ b/src/views/IndustryDataExport/tableEvent.js
@@ -116,11 +116,7 @@ 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();
-            // }
+            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;
@@ -277,25 +273,23 @@ export default {
     },
     //根据选择的开始时间/结束时间，动态渲染要禁用的日期
     disabledDate(current) {
-        if (this.selectPriceDate) {
-            let selectV = moment(
-                this.selectPriceDate,
-                "YYYY-MM-DD"
-            ).valueOf();
-            return (
-                current >
-                moment(
-                    new Date(selectV + this.offsetDays),
-                    "YYYY-MM-DD"
-                ) ||
-                current <
-                moment(
-                    new Date(selectV - this.offsetDays),
-                    "YYYY-MM-DD"
-                )
-            );
-        } else {
-            return false;
-        }
+        return current > moment();
+        // if (this.selectPriceDate) {
+        //     let selectV = moment(
+        //         this.selectPriceDate,
+        //         "YYYY-MM-DD"
+        //     ).valueOf();
+        //     return (
+        //         current >
+        //         moment() ||
+        //         current <
+        //         moment(
+        //             new Date(selectV - this.offsetDays),
+        //             "YYYY-MM-DD"
+        //         )
+        //     );
+        // } else {
+        //     return false;
+        // }
     },
 }
diff --git a/src/views/MarketingComparison/mcChooseModel/index.vue b/src/views/MarketingComparison/mcChooseModel/index.vue
index b11a7d0..f1375b6 100644
--- a/src/views/MarketingComparison/mcChooseModel/index.vue
+++ b/src/views/MarketingComparison/mcChooseModel/index.vue
@@ -11,7 +11,7 @@
     <v-label-div title="切换车型">
       <v-btn @click="goback">返回营销分析</v-btn>
     </v-label-div>
-    <div class="mccm-inner" style="margin-left:1.7rem">
+    <div class="mccm-inner">
       <template v-for="(item, index) in list">
         <div :key="index" style="display: flex; justify-content: flex-start">
           <div class="mccm-item">
@@ -22,7 +22,7 @@
             <div>
               <a-form-model
                 :label-col="labelCol"
-                :wrapper-col="wrapperCol"
+                
                 style="width: 100%"
               >
                 <a-form-model-item label="开始时间">
@@ -32,9 +32,9 @@
                     type="date"
                     placeholder="开始时间"
                     valueFormat="YYYY-MM-DD HH:mm:ss"
-                    style="width: 100%"
+                    style="width: 82%; margin-left:18px"
                     @change="handlerTime(item)"
-                  ><a-icon slot="suffixIcon" type="{null}" /></a-date-picker>
+                  ></a-date-picker>
                 </a-form-model-item>
                 <a-form-model-item label="结束时间">
                   <a-date-picker
@@ -43,9 +43,9 @@
                     type="date"
                     placeholder="结束时间"
                     valueFormat="YYYY-MM-DD HH:mm:ss"
-                    style="width: 100%"
+                    style="width: 82%; margin-left:18px"
                     @change="handlerTime(item)"
-                  ><a-icon slot="suffixIcon" type="{null}" /></a-date-picker>
+                  ></a-date-picker>
                 </a-form-model-item>
               </a-form-model>
             </div>
@@ -253,16 +253,17 @@ export default {
 <style lang="less" scoped>
 .mccm-outter {
   width: 1888px;
-  height: 276px;
+  height: 376px;
   border: 2px solid #0f2a4d;
   .mccm-inner {
     width: 100%;
     height: calc(100% - 48px);
+    margin-left:1.7rem;
     display: flex;
     justify-content: flex-start;
     .mccm-item {
       width: 240px;
-      height: 200px;
+      height: 290px;
       background: linear-gradient(180deg, #003a62 0%, #001c43 100%);
       border: 2px solid #0e5193;
       margin-top: 13px;
diff --git a/src/views/ModelComparison/brandTonalDistribution/index.vue b/src/views/ModelComparison/brandTonalDistribution/index.vue
index 95dddb2..a51c115 100644
--- a/src/views/ModelComparison/brandTonalDistribution/index.vue
+++ b/src/views/ModelComparison/brandTonalDistribution/index.vue
@@ -126,8 +126,9 @@ export default {
   .bd-inner {
     width: 100%;
     height: calc(100% - 48px);
+    margin-left: -24px;
     display: flex;
-    justify-content: flex-start;
+    justify-content: center;
     align-items: center;
   }
 }
diff --git a/src/views/ModelComparison/weiboTuneComparison/index.vue b/src/views/ModelComparison/weiboTuneComparison/index.vue
index b9dddbe..098f197 100644
--- a/src/views/ModelComparison/weiboTuneComparison/index.vue
+++ b/src/views/ModelComparison/weiboTuneComparison/index.vue
@@ -131,9 +131,9 @@ export default {
   .wtc-inner {
     width: 100%;
     height: calc(100% - 48px);
-    margin-left: 18px;
+    margin-left: -24px;
     display: flex;
-    justify-content: flex-start;
+    justify-content: center;
     align-items: center;
   }
 }
diff --git a/src/views/ModelForumDetails/mfdNegativeTopic/index.vue b/src/views/ModelForumDetails/mfdNegativeTopic/index.vue
index 1b9e44a..e697dc1 100644
--- a/src/views/ModelForumDetails/mfdNegativeTopic/index.vue
+++ b/src/views/ModelForumDetails/mfdNegativeTopic/index.vue
@@ -69,7 +69,7 @@ export default {
                 UserTo10.forEach((ele) => {
                     let a = [
                         `<span>用户名：${ele.key}</span>`,
-                        `<span>发帖量：${ele.value}</span>`,
+                        `<span>影响力：${ele.value}</span>`,
                     ];
                     list.push(a);
                 });
@@ -78,7 +78,7 @@ export default {
                     oddRowBGC: "#173b6d",
                     evenRowBGC: "rgba(69, 149, 244, 0)",
                     rowNum: 9,
-                    header: ["TOP10发帖用户"],
+                    header: ["TOP用户"],
                     data: list,
                 };
                 this.load = false;
diff --git a/src/views/ModelForumDetails/mfdPositiveTopic/index.vue b/src/views/ModelForumDetails/mfdPositiveTopic/index.vue
index 32bc1ff..83318f6 100644
--- a/src/views/ModelForumDetails/mfdPositiveTopic/index.vue
+++ b/src/views/ModelForumDetails/mfdPositiveTopic/index.vue
@@ -68,7 +68,7 @@ export default {
                 UserTo10.forEach((ele) => {
                     let a = [
                         `<span>用户名：${ele.key}</span>`,
-                        `<span>发帖量：${ele.value}</span>`,
+                        `<span>影响力：${ele.value}</span>`,
                     ];
                     list.push(a);
                 });
@@ -77,7 +77,7 @@ export default {
                     oddRowBGC: "#173b6d",
                     evenRowBGC: "rgba(69, 149, 244, 0)",
                     rowNum: 9,
-                    header: ["TOP10发帖用户"],
+                    header: ["TOP用户"],
                     data: list,
                 };
                 this.load = false;
diff --git a/src/views/ModelInsight/ml-tts/index.vue b/src/views/ModelInsight/ml-tts/index.vue
index b9fb8c1..182b1ae 100644
--- a/src/views/ModelInsight/ml-tts/index.vue
+++ b/src/views/ModelInsight/ml-tts/index.vue
@@ -92,7 +92,7 @@ export default {
                     token: this.getToken,
                     action: "getList",
                     sType: "BrandData",
-                    brand: this.form.sBrand,
+                    //brand: this.form.sBrand,
                     seriesName: this.form.sSeriesName,
                     title: "车型-行业数据",
                 },
diff --git a/src/views/ModelInsight/mlPopularEventsList/index.vue b/src/views/ModelInsight/mlPopularEventsList/index.vue
index e4c6033..95b7e73 100644
--- a/src/views/ModelInsight/mlPopularEventsList/index.vue
+++ b/src/views/ModelInsight/mlPopularEventsList/index.vue
@@ -74,7 +74,7 @@ export default {
                 });
                 this.darr = arr2;
                 this.config = {
-                    headerBGC: "#1b4062",
+                    headerBGC: "rgba(16,33,59)",
                     oddRowBGC: "#173b6d",
                     evenRowBGC: "rgba(69, 149, 244, 0)",
                     columnWidth: [400],
diff --git a/src/views/ModelInsight/mlWeiboPortraits/index.vue b/src/views/ModelInsight/mlWeiboPortraits/index.vue
index 6f9a401..d99db42 100644
--- a/src/views/ModelInsight/mlWeiboPortraits/index.vue
+++ b/src/views/ModelInsight/mlWeiboPortraits/index.vue
@@ -16,20 +16,20 @@
                 <v-echarts :opt="opt"></v-echarts>
             </div>
             <div class="wp-in-d2">
-                <vue-scroll v-if="labelData.length<=3">
+                <div v-if="labelData.length<=3">
                     <v-label-ctx v-for="(item,index) in labelData" 
                     :key="index" :label="item.key" 
                     :cont="item.value" 
                     :percentage="(item.value/totalData*100).toFixed(2) +'%'" 
                     :color="colors[index]" :eStyle="{ height: '7.6rem' }">
                     </v-label-ctx>
-                </vue-scroll>
+                </div>
                 <vue-scroll v-if="labelData.length>3">
                     <v-label-ctx v-for="(item,index) in labelData" 
                     :key="index" :label="item.key" 
                     :cont="item.value" 
                     :percentage="(item.value/totalData*100).toFixed(2) +'%'" 
-                    :color="colors[index]" :eStyle="{ height: '3.8rem' }">
+                    :color="colors[index]" :eStyle="{ height: '4.56rem' }">
                     </v-label-ctx>
                 </vue-scroll>
             </div>
diff --git a/src/views/ModelWeiboDetails/MWDweiboCharacters/index.vue b/src/views/ModelWeiboDetails/MWDweiboCharacters/index.vue
index 87c646e..e50da6d 100644
--- a/src/views/ModelWeiboDetails/MWDweiboCharacters/index.vue
+++ b/src/views/ModelWeiboDetails/MWDweiboCharacters/index.vue
@@ -21,7 +21,7 @@
         <v-echarts :opt="opt"></v-echarts>
       </div>
       <div class="d2">
-        <vue-scroll v-if="labelArr.length<=3">
+        <div v-if="labelArr.length<=3">
           <v-label-ctx
             v-for="(item, index) in labelArr"
             :key="index"
@@ -31,7 +31,7 @@
             :color="colors[index]"
             :eStyle="{ height: '8.54rem' }"
           ></v-label-ctx>
-        </vue-scroll>
+        </div>
         <vue-scroll v-if="labelArr.length>3">
           <v-label-ctx
             v-for="(item, index) in labelArr"
diff --git a/src/views/WeiboDetails/weiboCharacters/index.vue b/src/views/WeiboDetails/weiboCharacters/index.vue
index 8fb02f3..5bbecf4 100644
--- a/src/views/WeiboDetails/weiboCharacters/index.vue
+++ b/src/views/WeiboDetails/weiboCharacters/index.vue
@@ -21,7 +21,7 @@
         <v-echarts :opt="opt"></v-echarts>
       </div>
       <div class="d2">
-        <vue-scroll v-if="labelArr.length<=3">
+        <div v-if="labelArr.length<=3">
           <v-label-ctx
             v-for="(item, index) in labelArr"
             :key="index"
@@ -31,7 +31,7 @@
             :color="colors[index]"
             :eStyle="{ height: '8.54rem' }"
           ></v-label-ctx>
-        </vue-scroll>
+        </div>
         <vue-scroll v-if="labelArr.length>3">
           <v-label-ctx
             v-for="(item, index) in labelArr"