From bbb9b242abbeec7bd57dd5ae8804e2ae97b1913e Mon Sep 17 00:00:00 2001
From: fengachen <373943794@qq.com>
Date: Wed, 29 Dec 2021 17:25:39 +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=E9=80=9A=E7=9F=A5=E5=8A=A0=E9=A2=9C=E8=89=B2=E5=8C=BA?=
 =?UTF-8?q?=E5=88=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/dashboard/Analysis.vue          | 16 +++++++++++++++-
 src/views/system/UserAnnouncementList.vue | 15 ++++++++++++++-
 2 files changed, 29 insertions(+), 2 deletions(-)

diff --git a/src/views/dashboard/Analysis.vue b/src/views/dashboard/Analysis.vue
index ef37626..1691976 100644
--- a/src/views/dashboard/Analysis.vue
+++ b/src/views/dashboard/Analysis.vue
@@ -22,6 +22,12 @@
           </a-tooltip>
         </template>
 
+        <template slot="color-text" slot-scope="text,record">
+          <!-- 会议通知-->
+          <span :class="{'color-meeting':record.titile === '3','color-system':record.titile === '12' }">{{ text }}</span>
+
+        </template>
+
         <span slot="action" class="action-span-cell" slot-scope="text, record">
           <a @click="showAnnouncement(record)" style="margin-right: 8px">查看</a>
           <a @click="haveRead(record)" v-if="record.readFlag === '0' ">已读</a>
@@ -103,7 +109,7 @@ export default {
           align: 'center',
           width: 180,
           dataIndex: 'titile_dictText',
-          scopedSlots: {customRender: 'text'}
+          scopedSlots: {customRender: 'color-text'}
         }, {
           title: '内容',
           align: 'center',
@@ -419,4 +425,12 @@ export default {
 
   //width: 150px;
 }
+/*会议通知的颜色*/
+.color-meeting {
+  color: #FF7200;
+}
+/*系统通知的消息*/
+.color-system {
+  color: #690AF7;
+}
 </style>
diff --git a/src/views/system/UserAnnouncementList.vue b/src/views/system/UserAnnouncementList.vue
index a16b6c6..7b0e873 100644
--- a/src/views/system/UserAnnouncementList.vue
+++ b/src/views/system/UserAnnouncementList.vue
@@ -75,6 +75,11 @@
           <j-ellipsis v-if="text" :value="text" :length="20"></j-ellipsis>
           <span v-else></span>
         </template>
+
+        <template slot="color-text" slot-scope="text,record">
+          <span :class="{'color-meeting':record.titile === '3','color-system':record.titile === '12' }">{{ text }}</span>
+        </template>
+
         <span slot="action" class="action-span-cell" slot-scope="text, record">
         <a @click="showAnnouncement(record)">查看</a>
         <a @click="haveRead(record)" v-if="record.readFlag === '0' ">已读</a>
@@ -129,7 +134,7 @@ export default {
           title: '提醒类型',
           align: 'center',
           dataIndex: 'titile_dictText',
-          scopedSlots: { customRender: 'text' },
+          scopedSlots: { customRender: 'color-text' },
           width: 200
         },
         {
@@ -455,5 +460,13 @@ z
 .ant-modal-cust-warp .ant-modal-content {
   height: 90% !important;
   overflow-y: hidden
+}
+ /*会议通知的颜色*/
+.color-meeting {
+  color: #FF7200;
+}
+/*系统通知的消息*/
+.color-system {
+  color: #690AF7;
 }
 </style>