From 9c5ab91a0806946b425a1efe03c4630b8f6aa68e Mon Sep 17 00:00:00 2001
From: zx <604444282@qq.com>
Date: Mon, 6 Dec 2021 16:45:46 +0800
Subject: [PATCH] zx

---
 src/lycomponents/iHeader/index.vue                       | 1 +
 src/lycomponents/iHeaderBrand/index.vue                  | 9 ++++++++-
 src/lycomponents/iHeaderMa/index.vue                     | 9 ++++++++-
 src/lycomponents/iSwitchBrand/index.vue                  | 3 ++-
 .../iSwitchEvent/eventRecommendationList/index.vue       | 9 ++++++---
 src/lycomponents/iSwitchModel/index.vue                  | 5 +----
 src/styles/datav.less                                    | 5 +++++
 src/views/BrandComparison/forumTonalComparison/index.vue | 3 ++-
 src/views/BrandInsight/popularEventsList/index.vue       | 2 +-
 src/views/EventDEC/mediaInterpretationEc/index.vue       | 2 +-
 src/views/EventDetails/hotOther/index.vue                | 9 +++++----
 src/views/IndustryDataExport/index.vue                   | 2 +-
 src/views/IndustryDataExport/tableEvent.js               | 6 +++++-
 .../eventBrandTonalDistribution/index.vue                | 3 ++-
 src/views/ModelComparison/forumTonalComparison/index.vue | 3 ++-
 src/views/ModelEventDetails/MEDHotOther/index.vue        | 7 ++++---
 16 files changed, 54 insertions(+), 24 deletions(-)

diff --git a/src/lycomponents/iHeader/index.vue b/src/lycomponents/iHeader/index.vue
index 08a99ac..13c07bb 100644
--- a/src/lycomponents/iHeader/index.vue
+++ b/src/lycomponents/iHeader/index.vue
@@ -93,6 +93,7 @@ export default {
     },
     created() {
         this.getTime();
+        this.sTimeType = this.getCommTime.sTimeType || 34; //同步显示
     },
     mounted() {
         this.intDt = self.setInterval(() => {
diff --git a/src/lycomponents/iHeaderBrand/index.vue b/src/lycomponents/iHeaderBrand/index.vue
index f3daae5..fef611e 100644
--- a/src/lycomponents/iHeaderBrand/index.vue
+++ b/src/lycomponents/iHeaderBrand/index.vue
@@ -46,7 +46,7 @@
             <span class="s2">{{ week }}</span>
             <img class="m1" src="../../assets/images/Index/ic_ry.png" />
             <span class="s3">{{getUser.UserName}}</span>
-            <a-dropdown placement="bottomRight">
+            <a-dropdown placement="bottomRight" v-if="this.getToken">
                 <a class="ant-dropdown-link">
                     <a-icon type="down" />
                 </a>
@@ -59,6 +59,7 @@
                     </a-menu-item>
                 </a-menu>
             </a-dropdown>
+            <a @click="goLogin" class="s4" v-if="!this.getToken">登录</a>
         </div>
     </div>
 </template>
@@ -257,6 +258,12 @@ export default {
             color: #ffffff;
             margin-left: 8px;
         }
+        .s4 {
+            display: inline-block;
+            font-size: 16px;
+            color: #ffffff;
+            margin-right: 8px;
+        }
         .m1 {
             display: inline-block;
             margin-left: 60px;
diff --git a/src/lycomponents/iHeaderMa/index.vue b/src/lycomponents/iHeaderMa/index.vue
index 35e9780..f105af2 100644
--- a/src/lycomponents/iHeaderMa/index.vue
+++ b/src/lycomponents/iHeaderMa/index.vue
@@ -42,7 +42,7 @@
             <span class="s2">{{ week }}</span>
             <img class="m1" src="../../assets/images/Index/ic_ry.png"/>
             <span class="s3">{{getUser.UserName}}</span>
-            <a-dropdown placement="bottomRight">
+            <a-dropdown placement="bottomRight" v-if="this.getToken">
                 <a class="ant-dropdown-link">
                     <a-icon type="down" />
                 </a>
@@ -55,6 +55,7 @@
                     </a-menu-item>
                 </a-menu>
             </a-dropdown>
+            <a @click="goLogin" class="s4" v-if="!this.getToken">登录</a>
         </div>
     </div>
 </template>
@@ -228,6 +229,12 @@ export default {
             color: #ffffff;
             margin-left: 8px;
         }
+        .s4 {
+            display: inline-block;
+            font-size: 16px;
+            color: #ffffff;
+            margin-right: 8px;
+        }
         .m1 {
             display: inline-block;
             margin-left: 60px;
diff --git a/src/lycomponents/iSwitchBrand/index.vue b/src/lycomponents/iSwitchBrand/index.vue
index 8853473..47ad4aa 100644
--- a/src/lycomponents/iSwitchBrand/index.vue
+++ b/src/lycomponents/iSwitchBrand/index.vue
@@ -39,7 +39,7 @@
 </template>
 
 <script>
-import { getUserBrand, getUserSeriesName } from "@/api/comm";
+import { getUserBrand,getUserSeriesName} from "@/api/comm";
 export default {
     name: "iSwitchBrand",
     props: {
@@ -155,6 +155,7 @@ export default {
                 let data = res.data || [];
                 this.models = data;
                 this.chooseModel = this.models[0];
+                this.setModel(this.chooseModel);
             });
         },
         // 确定品牌
diff --git a/src/lycomponents/iSwitchEvent/eventRecommendationList/index.vue b/src/lycomponents/iSwitchEvent/eventRecommendationList/index.vue
index 3a34eee..62d64c7 100644
--- a/src/lycomponents/iSwitchEvent/eventRecommendationList/index.vue
+++ b/src/lycomponents/iSwitchEvent/eventRecommendationList/index.vue
@@ -78,18 +78,19 @@ export default {
             pagination: {
                 current: 1,
                 total: 0,
-                pageSize: 20,
+                pageSize: 6,
                 "show-total": (total) => `共 ${total} 条`,
             },
             columns: [
                 {
                     title: "事件类型",
+                    width: 120,
                     dataIndex: "events_type",
                     key: "events_type",
                 },
                 {
                     title: "事件标题",
-                    width: 230,
+                    width: 630,
                     dataIndex: "events_title",
                     ellipsis: true,
                     key: "events_title",
@@ -107,16 +108,18 @@ export default {
                 {
                     title: "开始时间",
                     dataIndex: "minSourcetime",
-                    width: 160,
+                    width: 240,
                     key: "minSourcetime",
                 },
                 {
                     title: "文章篇数(篇)",
+                    width: 120,
                     dataIndex: "events_count",
                     key: "events_count",
                 },
                 {
                     title: "传播周期(天)",
+                    width: 120,
                     dataIndex: "days",
                     key: "days",
                 },
diff --git a/src/lycomponents/iSwitchModel/index.vue b/src/lycomponents/iSwitchModel/index.vue
index f8b5dc0..739cdc0 100644
--- a/src/lycomponents/iSwitchModel/index.vue
+++ b/src/lycomponents/iSwitchModel/index.vue
@@ -84,10 +84,7 @@ export default {
             })
             this.chooseBrand = row;
         });
-        this.getUserSeriesName(this.brandname);
-        //保存上次选择的值
-        this.chooseBrand = this.brandname;
-        this.chooseModel = this.modelName;
+        //this.getUserSeriesName(this.brandname);
     },
     data() {
         return {
diff --git a/src/styles/datav.less b/src/styles/datav.less
index 8a023e0..40c6dc9 100644
--- a/src/styles/datav.less
+++ b/src/styles/datav.less
@@ -1,3 +1,8 @@
+.dv-scroll-board .header{
+    height: 3rem;
+    align-items: center;
+}
+
 .dv-scroll-board .header .header-item {
     color: #3373CC;
     font-weight: bold;
diff --git a/src/views/BrandComparison/forumTonalComparison/index.vue b/src/views/BrandComparison/forumTonalComparison/index.vue
index 347fa75..47cbffe 100644
--- a/src/views/BrandComparison/forumTonalComparison/index.vue
+++ b/src/views/BrandComparison/forumTonalComparison/index.vue
@@ -132,8 +132,9 @@ export default {
   .wtc-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/BrandInsight/popularEventsList/index.vue b/src/views/BrandInsight/popularEventsList/index.vue
index d5123fa..dc779be 100644
--- a/src/views/BrandInsight/popularEventsList/index.vue
+++ b/src/views/BrandInsight/popularEventsList/index.vue
@@ -69,7 +69,7 @@ export default {
                     headerBGC: "rgba(16,33,59)",
                     oddRowBGC: "#173b6d",
                     evenRowBGC: "rgba(69, 149, 244, 0)",
-                    columnWidth: [440, 120, 120],
+                    columnWidth: [550,80,100,80],
                     rowNum: 6,
                     header: ["事件列表", "影响力", "时间", "关联车型"],
                     data: arr,
diff --git a/src/views/EventDEC/mediaInterpretationEc/index.vue b/src/views/EventDEC/mediaInterpretationEc/index.vue
index 6370a98..d228dd4 100644
--- a/src/views/EventDEC/mediaInterpretationEc/index.vue
+++ b/src/views/EventDEC/mediaInterpretationEc/index.vue
@@ -13,7 +13,7 @@
         <div class="mec-inner">
             <div class="dd1">
                 <v-label-div title="媒体解读" :showLine="false" :eStyle="{'border-style': 'none'}"></v-label-div>
-                <dv-scroll-board :config="config" :style="{ width: '100%', height: '23rem' }" />
+                <dv-scroll-board :config="config" :style="{ width: '100%', height: '24.7rem' }" />
             </div>
             <div class="dd1">
                 <v-label-div title="词云" :showLine="false" :eStyle="{'border-style': 'none'}">
diff --git a/src/views/EventDetails/hotOther/index.vue b/src/views/EventDetails/hotOther/index.vue
index 0798c9c..a626e53 100644
--- a/src/views/EventDetails/hotOther/index.vue
+++ b/src/views/EventDetails/hotOther/index.vue
@@ -36,7 +36,7 @@ export default {
                 token: "",
                 ssBrand: "",
                 iPageIndex: 1,
-                iPageSize: 20,
+                iPageSize: 6,
             },
             total: 0,
             tbData: [],
@@ -45,7 +45,7 @@ export default {
                     title: "事件列表",
                     dataIndex: "events_title",
                     key: "events_title",
-                    width: 200,
+                    width: 260,
                     scopedSlots: { customRender: "events_title" },
                     ellipsis: true,
                 },
@@ -58,13 +58,14 @@ export default {
                     title: "时间",
                     dataIndex: "maxSourcetime",
                     key: "maxSourcetime",
-                    width: 160,
+                    width: 120,
                 },
                 {
                     title: "关联品牌",
                     dataIndex: "events_brand",
                     scopedSlots: { customRender: "events_brand" },
                     key: "events_brand",
+                    width: 90,
                 },
             ],
         };
@@ -133,7 +134,7 @@ export default {
     }
 }
 /deep/ .ant-table-body {
-    height: 432px;
+    height: 480px;
     overflow: auto;
 }
 </style>
diff --git a/src/views/IndustryDataExport/index.vue b/src/views/IndustryDataExport/index.vue
index 8dad399..d14f678 100644
--- a/src/views/IndustryDataExport/index.vue
+++ b/src/views/IndustryDataExport/index.vue
@@ -61,7 +61,7 @@
                         <a-input v-model="execlForm.sFileName" disabled placeholder="请输入文件名称"></a-input>
                     </a-form-item>
                     <a-form-item label="导出格式">
-                        <span style="color: #63aecc; font-size: 14px">xlsz</span>
+                        <span style="color: #63aecc; font-size: 14px">xlsx</span>
                     </a-form-item>
                     <a-form-item label="导出字段" :wrapper-col="{ span: 21 }">
                         <a-checkbox-group v-model="checkedIds" :options="plainOptions4" @change="fileTypeChange" />
diff --git a/src/views/IndustryDataExport/tableEvent.js b/src/views/IndustryDataExport/tableEvent.js
index 6b4ebf1..6bb4ba2 100644
--- a/src/views/IndustryDataExport/tableEvent.js
+++ b/src/views/IndustryDataExport/tableEvent.js
@@ -118,7 +118,11 @@ export default {
     // 导出弹框
     handlerExport() {
         this.getToExcelField(this.form.sType, this.form.token).then(() => {
-            this.execlForm.sFileName = this.form.sBrand + this.form.sSeriesName + '事件洞察' + this.getDatetimeSs();
+            if(!this.form.sBrand && !this.form.sSeriesName) {
+                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/eventBrandTonalDistribution/index.vue b/src/views/ModelComparison/eventBrandTonalDistribution/index.vue
index cd16ccd..fa8f186 100644
--- a/src/views/ModelComparison/eventBrandTonalDistribution/index.vue
+++ b/src/views/ModelComparison/eventBrandTonalDistribution/index.vue
@@ -125,8 +125,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/forumTonalComparison/index.vue b/src/views/ModelComparison/forumTonalComparison/index.vue
index 30270d9..db5503d 100644
--- a/src/views/ModelComparison/forumTonalComparison/index.vue
+++ b/src/views/ModelComparison/forumTonalComparison/index.vue
@@ -111,8 +111,9 @@ export default {
     .wtc-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/ModelEventDetails/MEDHotOther/index.vue b/src/views/ModelEventDetails/MEDHotOther/index.vue
index 84218cb..94fcbcd 100644
--- a/src/views/ModelEventDetails/MEDHotOther/index.vue
+++ b/src/views/ModelEventDetails/MEDHotOther/index.vue
@@ -37,7 +37,7 @@ export default {
                 token: "",
                 ssBrand: "",
                 iPageIndex: 1,
-                iPageSize: 20,
+                iPageSize: 6,
                 sSeriesName: "",
             },
             total: 0,
@@ -47,7 +47,7 @@ export default {
                     title: "事件列表",
                     dataIndex: "events_title",
                     key: "events_title",
-                    width: 200,
+                    width: 260,
                     scopedSlots: { customRender: "events_title" },
                     ellipsis: true,
                 },
@@ -60,13 +60,14 @@ export default {
                     title: "时间",
                     dataIndex: "maxSourcetime",
                     key: "maxSourcetime",
-                    width: 160,
+                    width: 120,
                 },
                 {
                     title: "关联品牌",
                     dataIndex: "events_brand",
                     scopedSlots: { customRender: "events_brand" },
                     key: "events_brand",
+                    width: 90,
                 },
             ],
         };