From c00154a95984cd54bf4abe181697d9388ea206f1 Mon Sep 17 00:00:00 2001
From: zx <604444282@qq.com>
Date: Tue, 29 Mar 2022 17:23:13 +0800
Subject: [PATCH] zx

---
 src/components/v-btn/index.vue                |  2 +-
 .../iSwitchEvent/ec-top/index.vue             | 10 +++--
 src/styles/antd.less                          | 19 ++++++++--
 .../BrandComparison/BrandBeginComparte.vue    |  1 +
 .../brandCompateHeader/index.vue              |  3 ++
 .../brandCompateHeaderStoken/index.vue        |  1 +
 src/views/BrandInsight/index.vue              | 23 +++++++++++-
 .../comparisonOfEventpp/index.vue             |  1 +
 src/views/EventDEC/esprocess/index.vue        |  1 +
 .../mcChooseModel/index.vue                   |  1 +
 .../brandCompateHeader/index.vue              |  3 ++
 src/views/ModelInsight/index.vue              | 23 +++++++++++-
 src/views/ThemeAnalize/index.vue              | 37 ++++++++++++++-----
 src/views/ThemeAnalize/tbEvent.js             |  5 +++
 src/views/ThemeBoard/EventTransform/index.vue |  3 +-
 15 files changed, 112 insertions(+), 21 deletions(-)

diff --git a/src/components/v-btn/index.vue b/src/components/v-btn/index.vue
index 91a1511..e8ff584 100644
--- a/src/components/v-btn/index.vue
+++ b/src/components/v-btn/index.vue
@@ -34,7 +34,7 @@ export default {
     min-width: 200px;
     text-align: center;
     line-height: 48px;
-    font-weight: 500;
+    font-weight: 600;
     color: #63AECC;
     font-size: 20px;
     cursor: pointer;
diff --git a/src/lycomponents/iSwitchEvent/ec-top/index.vue b/src/lycomponents/iSwitchEvent/ec-top/index.vue
index 5efeb59..741415a 100644
--- a/src/lycomponents/iSwitchEvent/ec-top/index.vue
+++ b/src/lycomponents/iSwitchEvent/ec-top/index.vue
@@ -18,8 +18,10 @@
                         <div class="d2">
                             <div class="d2-d1">{{item.events_title}}</div>
                             <div class="d2-d2">
-                                <span class="s1">开始时间：</span><span class="s2">{{item.minSourcetime}}</span>
-                                <span class="s1" style="margin-left: 40px">信息总量</span><span class="s2" style="margin-left: 8px">{{item.events_count}}条</span>
+                                <span class="s1" v-if="item.minSourcetime">开始时间：</span>
+                                <span class="s2">{{item.minSourcetime}}</span>
+                                <span class="s1" v-if="item.events_count" style="margin-left: 40px">信息总量</span>
+                                <span class="s2" style="margin-left: 8px">{{item.events_count}}</span><span v-if="item.events_count"  class="s2">条</span>
                             </div>
                         </div>
                         <div class="ec-btn" v-if="item.isDel" @click="del(index)">
@@ -106,9 +108,9 @@ export default {
         .ec-d1-dd1 {
             width: 800px;
             height: 120px;
-            background: linear-gradient(180deg, #0088c9 0%, #001c43 100%);
+            background: linear-gradient(180deg, rgba(0, 136, 201, 0.6), rgba(0, 28, 67, 0.6));
             border-radius: 4px;
-            border: 2px solid #0091ff;
+            border: 2px solid rgba(0, 145, 255, 0.6);
             margin-left: 16px;
             display: flex;
             justify-content: flex-start;
diff --git a/src/styles/antd.less b/src/styles/antd.less
index 5865f9a..ec5ad2c 100644
--- a/src/styles/antd.less
+++ b/src/styles/antd.less
@@ -383,9 +383,15 @@ li.ant-calendar-time-picker-select-option-selected {
   background: transparent !important;
 }
 
-.ant-tabs-card > .ant-tabs-bar .ant-tabs-tab-active {
-  border-color: rgb(26, 38, 65) !important;
-  background: rgb(26, 38, 65) !important;
+.ant-tabs.ant-tabs-card .ant-tabs-card-bar {
+  .ant-tabs-tab {
+    color: rgba(99, 174, 204, 0.6) !important; 
+  }
+  .ant-tabs-tab-active {
+    border-color: rgb(26, 38, 65) !important;
+    background: rgb(26, 38, 65) !important;
+    color: #63AECC !important; 
+  }
 }
 
 .ant-descriptions-row {
@@ -436,4 +442,11 @@ li.ant-calendar-time-picker-select-option-selected {
 }
 .ant-anchor-link-active > .ant-anchor-link-title {
   color: #3373CC !important;
+}
+
+.ant-modal-body {
+  padding: 1.5rem 1.5rem 0rem 1.5rem !important;
+  font-size: 0.875rem !important;
+  line-height: 1.5 !important;
+  word-wrap: break-word !important; 
 }
\ No newline at end of file
diff --git a/src/views/BrandComparison/BrandBeginComparte.vue b/src/views/BrandComparison/BrandBeginComparte.vue
index dfd9f57..6093ec0 100644
--- a/src/views/BrandComparison/BrandBeginComparte.vue
+++ b/src/views/BrandComparison/BrandBeginComparte.vue
@@ -155,6 +155,7 @@ export default {
     cursor: pointer;
     color: #63aecc;
     font-size: 24px;
+    font-weight: bold;
     text-align: center;
     line-height: 64px;
     margin-top: 16px;
diff --git a/src/views/BrandComparison/brandCompateHeader/index.vue b/src/views/BrandComparison/brandCompateHeader/index.vue
index a6d0690..68d2090 100644
--- a/src/views/BrandComparison/brandCompateHeader/index.vue
+++ b/src/views/BrandComparison/brandCompateHeader/index.vue
@@ -193,6 +193,7 @@ export default {
             .s1 {
                 position: absolute;
                 font-size: 14px;
+                font-weight: bold;
                 color: #b2daf8;
                 top: 52px;
                 left: 43px;
@@ -203,6 +204,7 @@ export default {
                 left: 110px;
                 color: #fff;
                 font-size: 20px;
+                font-weight: bold;
             }
             .s3 {
                 display: block;
@@ -218,6 +220,7 @@ export default {
                 text-align: center;
                 line-height: 28px;
                 font-size: 12px;
+                font-weight: bold;
                 cursor: pointer;
             }
         }
diff --git a/src/views/BrandComparison/brandCompateHeaderStoken/index.vue b/src/views/BrandComparison/brandCompateHeaderStoken/index.vue
index 4a03cb1..537e9db 100644
--- a/src/views/BrandComparison/brandCompateHeaderStoken/index.vue
+++ b/src/views/BrandComparison/brandCompateHeaderStoken/index.vue
@@ -152,6 +152,7 @@ export default {
                 text-align: center;
                 line-height: 28px;
                 font-size: 12px;
+                font-weight: bold;
                 cursor: pointer;
             }
         }
diff --git a/src/views/BrandInsight/index.vue b/src/views/BrandInsight/index.vue
index af19b28..0d7148a 100644
--- a/src/views/BrandInsight/index.vue
+++ b/src/views/BrandInsight/index.vue
@@ -17,7 +17,9 @@
                 <div class="bdl-d1-dd2">
                     <img class="m1" src="../../assets/images/BrandInsight/img_ppdb.png" @click="goRouter('/brandComparisonIndex')"/>
                     <div class="bdl-d1-dd2-d1">
-                        <span class="bdl-d1-dd2-d1-s1">{{this.brand}}</span>
+                        <span class="bdl-d1-dd2-d1-s3" v-if="brand.length>=9">{{this.brand}}</span>
+                        <span class="bdl-d1-dd2-d1-s2" v-else-if="brand.length>=6">{{this.brand}}</span>
+                        <span class="bdl-d1-dd2-d1-s1" v-else>{{this.brand}}</span>
                     </div>
                     <img class="m2" src="../../assets/images/BrandInsight/img_qhpp.png" @click="openBrand"/>
                 </div>
@@ -277,6 +279,25 @@ export default {
         .bdl-d1-dd2-d1-s1 {
             display: block;
             font-size: 40px;
+            font-weight: bold;
+            color: #b2daf7;
+            width: 100%;
+            text-align: center;
+            margin-top: 150px;
+        }
+        .bdl-d1-dd2-d1-s2 {
+            display: block;
+            font-size: 28px;
+            font-weight: bold;
+            color: #b2daf7;
+            width: 100%;
+            text-align: center;
+            margin-top: 150px;
+        }
+        .bdl-d1-dd2-d1-s3 {
+            display: block;
+            font-size: 24px;
+            font-weight: bold;
             color: #b2daf7;
             width: 100%;
             text-align: center;
diff --git a/src/views/EventComparison/comparisonOfEventpp/index.vue b/src/views/EventComparison/comparisonOfEventpp/index.vue
index efb4091..89d489f 100644
--- a/src/views/EventComparison/comparisonOfEventpp/index.vue
+++ b/src/views/EventComparison/comparisonOfEventpp/index.vue
@@ -218,6 +218,7 @@ export default {
                         padding-top: 16px;
                         height: 88px;
                         font-size: 16px;
+                        font-weight: 600;
                         cursor: pointer;
                     }
                     .d2 {
diff --git a/src/views/EventDEC/esprocess/index.vue b/src/views/EventDEC/esprocess/index.vue
index e9fcc94..4c72ab8 100644
--- a/src/views/EventDEC/esprocess/index.vue
+++ b/src/views/EventDEC/esprocess/index.vue
@@ -203,6 +203,7 @@ export default {
                         padding-top: 16px;
                         height: 88px;
                         font-size: 16px;
+                        font-weight: 600;
                          cursor: pointer;
                     }
                     .d2 {
diff --git a/src/views/MarketingComparison/mcChooseModel/index.vue b/src/views/MarketingComparison/mcChooseModel/index.vue
index 59ee145..c222eff 100644
--- a/src/views/MarketingComparison/mcChooseModel/index.vue
+++ b/src/views/MarketingComparison/mcChooseModel/index.vue
@@ -298,6 +298,7 @@ export default {
         cursor: pointer;
         text-align: center;
         color: #63aecc;
+        font-weight: bold;
         line-height: 28px;
       }
       .mc-t {
diff --git a/src/views/ModelComparison/brandCompateHeader/index.vue b/src/views/ModelComparison/brandCompateHeader/index.vue
index a2f7628..a016735 100644
--- a/src/views/ModelComparison/brandCompateHeader/index.vue
+++ b/src/views/ModelComparison/brandCompateHeader/index.vue
@@ -232,6 +232,7 @@ export default {
                 background-size: 100% 100%;
                 cursor: pointer;
                 text-align: center;
+                font-weight: bold;
                 color: #63aecc;
                 line-height: 28px;
             }
@@ -249,12 +250,14 @@ export default {
                     line-height: 78px;
                     text-align: center;
                     font-size: 14px;
+                    font-weight: bold;
                     color: #0090ff;
                     margin-left: 17px;
                 }
                 .m-t-s1 {
                     display: block;
                     font-size: 20px;
+                    font-weight: bold;
                     color: #fff;
                     margin-left: 6px;
                 }
diff --git a/src/views/ModelInsight/index.vue b/src/views/ModelInsight/index.vue
index 01371a5..3dd973d 100644
--- a/src/views/ModelInsight/index.vue
+++ b/src/views/ModelInsight/index.vue
@@ -17,7 +17,9 @@
                 <div class="bdl-d1-dd2">
                     <img class="m1" src="../../assets/images/ModelInsight/img_cxdb.png" @click="goRouter('/modelComparison')" />
                     <div class="bdl-d1-dd2-d1">
-                        <span class="bdl-d1-dd2-d1-s1">{{model}}</span>
+                        <span v-if="model.length >= 10" class="bdl-d1-dd2-d1-s3">{{model}}</span>
+                        <span v-else-if="model.length >= 7" class="bdl-d1-dd2-d1-s2">{{model}}</span>
+                        <span v-else class="bdl-d1-dd2-d1-s1">{{model}}</span>
                     </div>
                     <img class="m2" src="../../assets/images/ModelInsight/img_qhcx.png" @click="openModel" />
                 </div>
@@ -281,9 +283,28 @@ export default {
                 background-repeat: no-repeat;
                 background-size: cover;
                 background-position: 0 40px;
+                .bdl-d1-dd2-d1-s3 {
+                    display: block;
+                    font-size: 20px;
+                    font-weight: bold;
+                    color: #b2daf7;
+                    width: 100%;
+                    text-align: center;
+                    margin-top: 150px;
+                }
+                .bdl-d1-dd2-d1-s2 {
+                    display: block;
+                    font-size: 28px;
+                    font-weight: bold;
+                    color: #b2daf7;
+                    width: 100%;
+                    text-align: center;
+                    margin-top: 150px;
+                }
                 .bdl-d1-dd2-d1-s1 {
                     display: block;
                     font-size: 40px;
+                    font-weight: bold;
                     color: #b2daf7;
                     width: 100%;
                     text-align: center;
diff --git a/src/views/ThemeAnalize/index.vue b/src/views/ThemeAnalize/index.vue
index bdbc5c8..c0101ec 100644
--- a/src/views/ThemeAnalize/index.vue
+++ b/src/views/ThemeAnalize/index.vue
@@ -64,7 +64,7 @@
               </div>
           </div>
       </div>
-      <a-modal :title="modalObj.title" width="1200px" :footer="null" :visible="modalObj.visible" :dialog-style="{ top: '20px' }">
+      <a-modal :title="modalObj.title" @cancel="onClose" width="1200px" :footer="null" :visible="modalObj.visible" :dialog-style="{ top: '20px' }">
           <div class="modal-outter">
                 <div class="modal-top">
                   <v-tab-mode :active="activeMode" :btns="['便捷模式', '高级模式']" @change="changeMode"></v-tab-mode>
@@ -126,9 +126,8 @@
                               </a-descriptions>
                           </div>
                       </div>
-                      <div align="center">
-                        <v-btn @click="handlerOk">确定</v-btn>
-                        <v-btn @click="handlerCancel">关闭</v-btn>
+                      <div class="beCpm-footer" @click="handlerOk">
+                            保存
                       </div>
                     </div>
                     <div v-if="isHigh==1">
@@ -156,9 +155,8 @@
                           <div class="modal-display">
                           </div>
                       </div>
-                      <div align="center">
-                        <v-btn @click="handlerOk">确定</v-btn>
-                        <v-btn @click="handlerCancel">关闭</v-btn>
+                      <div class="beCpm-footer" @click="handlerOk">
+                            保存
                       </div>
                     </div>
                 <div>
@@ -169,7 +167,7 @@
 </template>
 
 <script>
-import tbEvent from './tbEvent';
+import tbEvent from './tbEvent'
 import helpContent from './helpContent'
 export default {
     name: "themeAnalize",
@@ -266,11 +264,11 @@ export default {
 .card-items {
     width: 446px;
     height: 240px;
-    background: linear-gradient(180deg, #0088c9 0%, #001c43 100%);
+    background: linear-gradient(180deg, rgba(0, 136, 201, 0.6), rgba(0, 28, 67, 0.6));
     border-radius: 4px;
     margin-top: 16px;
     margin-right: 16px;
-    border: 2px solid #0091ff;
+    border: 2px solid rgba(0, 145, 255, 0.6);
     .card-item-top {
         width: 100%;
     }
@@ -316,4 +314,23 @@ export default {
         background: rgb(21, 49, 81);
     }
 }
+
+.beCpm-footer {
+    position: relative;
+    width: 354px;
+    height: 64px;
+    background-image: url("../../assets/images/login/img_dlan_nor.png");
+    background-repeat: no-repeat;
+    background-size: cover;
+    bottom: 0px;
+    left: 50%;
+    transform: translate(-50%);
+    cursor: pointer;
+    color: #63aecc;
+    font-size: 24px;
+    font-weight: bold;
+    text-align: center;
+    line-height: 64px;
+    margin-top: 16px;
+}
 </style>
\ No newline at end of file
diff --git a/src/views/ThemeAnalize/tbEvent.js b/src/views/ThemeAnalize/tbEvent.js
index e59b4c8..c84008f 100644
--- a/src/views/ThemeAnalize/tbEvent.js
+++ b/src/views/ThemeAnalize/tbEvent.js
@@ -33,6 +33,7 @@ export default {
     },
     //新增按钮
     handlerAdd() {
+        this.modalObj.title = '新建主题'
         this.reSet();
         this.combo = {
             number: 0,
@@ -46,6 +47,7 @@ export default {
     },
     //编辑修改
     handlerEdit(guids) {
+        this.modalObj.title = '编辑主题'
         let obj = {
             token: this.getToken,
             Guids: guids
@@ -80,6 +82,9 @@ export default {
     },
     //删除确认框
     cancel() {},
+    onClose() {
+        this.modalObj.visible = false;
+    },
     //新增确认框
     handlerOk() {
         let newForm = {
diff --git a/src/views/ThemeBoard/EventTransform/index.vue b/src/views/ThemeBoard/EventTransform/index.vue
index c53379c..ac8ff7b 100644
--- a/src/views/ThemeBoard/EventTransform/index.vue
+++ b/src/views/ThemeBoard/EventTransform/index.vue
@@ -159,7 +159,7 @@ export default {
                     background-image: url("../../../assets/images/EventInsight/img_xlq.png");
                     background-repeat: no-repeat;
                     background-size: cover;
-                    font-size: 14px;
+                    font-size: 11px;
                     color: #b0deff;
                     text-align: center;
                     line-height: 120px;
@@ -202,6 +202,7 @@ export default {
                         padding-top: 16px;
                         height: 88px;
                         font-size: 16px;
+                        font-weight: 600;
                          cursor: pointer;
                     }
                     .d2 {