From 739143596b34f0471bdfd43bd76f148c48941298 Mon Sep 17 00:00:00 2001
From: fengachen <373943794@qq.com>
Date: Fri, 31 Dec 2021 17:22:59 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=BF=AE=E6=94=B9=E3=80=91=E6=B6=88?=
 =?UTF-8?q?=E6=81=AF=E6=A0=B7=E5=BC=8F=E9=9C=80=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/dashboard/Analysis.vue          | 14 ++++++++++----
 src/views/system/UserAnnouncementList.vue |  5 ++---
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/src/views/dashboard/Analysis.vue b/src/views/dashboard/Analysis.vue
index 1691976..d34e980 100644
--- a/src/views/dashboard/Analysis.vue
+++ b/src/views/dashboard/Analysis.vue
@@ -13,12 +13,12 @@
         @change="handleTableChange"
         class="j-table-force-nowrap">
 
-        <template slot="text" slot-scope="text">
+        <template slot="text" slot-scope="text,record">
           <a-tooltip>
             <template slot="title">
               <span v-html="text" class="ellipsis-span"></span>
             </template>
-            <span v-html="myEllipsis(text,35)" class="ellipsis-span"></span>
+            <span v-html="myEllipsis(text,35)" :class="{'color-meeting':record.titile === '3','color-system':record.titile === '12' }" class="ellipsis-span"></span>
           </a-tooltip>
         </template>
 
@@ -296,6 +296,12 @@ export default {
 <style scoped lang="less">
 @import '~@assets/less/common.less';
 
+.ellipsis-span /deep/ * {
+  display: inline;
+  margin: 0 !important;
+  padding: 0 !important;
+}
+
 .index-home {
   position: relative;
   width: 100%;
@@ -427,10 +433,10 @@ export default {
 }
 /*会议通知的颜色*/
 .color-meeting {
-  color: #FF7200;
+  color: #FF7200!important;
 }
 /*系统通知的消息*/
 .color-system {
-  color: #690AF7;
+  color: #690AF7!important;
 }
 </style>
diff --git a/src/views/system/UserAnnouncementList.vue b/src/views/system/UserAnnouncementList.vue
index 7b0e873..6db43fd 100644
--- a/src/views/system/UserAnnouncementList.vue
+++ b/src/views/system/UserAnnouncementList.vue
@@ -62,12 +62,12 @@
         :pagination="ipagination"
         :loading="loading"
         @change="handleTableChange">
-        <span slot="templateContent" slot-scope="text">
+        <span slot="templateContent" slot-scope="text,record">
           <a-tooltip>
             <template slot="title">
               <span v-html="text" class="ellipsis-span"></span>
             </template>
-            <span v-html="myEllipsis(text,40)" class="ellipsis-span"></span>
+            <span v-html="myEllipsis(text,40)" :class="{'color-meeting':record.titile === '3','color-system':record.titile === '12' }" class="ellipsis-span"></span>
           </a-tooltip>
         </span>
 
@@ -447,7 +447,6 @@ export default {
   background-color: #ffffff
 }
 
-z
 .ant-modal-cust-warp {
   height: 100%
 }