From c6a7359b6f81865942e36eb9f92cc24bd64d8199 Mon Sep 17 00:00:00 2001
From: Theo <971366405@qq.com>
Date: Sat, 21 Sep 2024 21:35:01 +0800
Subject: [PATCH] =?UTF-8?q?refactor:=20:recycle:=20=E9=80=9A=E7=9F=A5?=
 =?UTF-8?q?=E5=85=AC=E5=85=B1=E9=83=A8=E5=88=86=E5=86=85=E5=AE=B9=E9=87=8D?=
 =?UTF-8?q?=E6=9E=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

通知公告部分内容重构
---
 src/api/notice.ts                    |  2 +-
 src/components/Notice/index.vue      |  2 +-
 src/components/NoticeModal/index.vue | 19 ++++++++++++++----
 src/views/notice/index.vue           | 30 +++++++++++++++++++++++++---
 src/views/system/notice/index.vue    | 11 +++++++++-
 5 files changed, 54 insertions(+), 10 deletions(-)

diff --git a/src/api/notice.ts b/src/api/notice.ts
index f9ffb366..efa94850 100644
--- a/src/api/notice.ts
+++ b/src/api/notice.ts
@@ -199,7 +199,7 @@ export interface NoticeDetailVO {
   /** 通知内容 */
   content?: string;
   /** 通知类型 */
-  noticeTypeLabel?: number;
+  noticeType?: number;
   /** 发布人 */
   releaseBy?: string;
   /** 优先级(0-低 1-中 2-高) */
diff --git a/src/components/Notice/index.vue b/src/components/Notice/index.vue
index a4ba322c..f7ecf8d0 100644
--- a/src/components/Notice/index.vue
+++ b/src/components/Notice/index.vue
@@ -137,7 +137,7 @@ function readNotice(id: number) {
  */
 function more() {
   //跳转到我的消息页面
-  router.push({ path: "notice/notice" });
+  router.push({ path: "/notice/notice" });
 }
 
 /**
diff --git a/src/components/NoticeModal/index.vue b/src/components/NoticeModal/index.vue
index 62575329..2a958e03 100644
--- a/src/components/NoticeModal/index.vue
+++ b/src/components/NoticeModal/index.vue
@@ -27,10 +27,17 @@
       </div>
     </template>
     <div style="width: auto; text-align: left">
-      {{ message.noticeTypeLabel }} 优先级 {{ message.priority }} 发布人：{{
-        message.releaseBy
-      }}
-      发布时间：{{ message.releaseTime }}
+      <span class="header-item">
+        <el-tag v-if="message.noticeType == 2" type="warning">系统通知</el-tag>
+        <el-tag v-if="message.noticeType == 1" type="success">通知消息</el-tag>
+      </span>
+      <span class="header-item">
+        <el-tag v-if="message.priority == 0" type="danger">低</el-tag>
+        <el-tag v-if="message.priority == 1" type="success">中</el-tag>
+        <el-tag v-if="message.priority == 2" type="warning">高</el-tag>
+      </span>
+      <span class="header-item">{{ message.releaseBy }}</span>
+      <span class="header-item">{{ message.releaseTime }}</span>
     </div>
     <el-divider />
     <div
@@ -96,4 +103,8 @@ defineExpose({ open });
 .icon {
   cursor: pointer;
 }
+
+.header-item {
+  margin-right: 16px;
+}
 </style>
diff --git a/src/views/notice/index.vue b/src/views/notice/index.vue
index f6c68d5e..4ea6cadc 100644
--- a/src/views/notice/index.vue
+++ b/src/views/notice/index.vue
@@ -44,7 +44,16 @@
           label="通知类型"
           prop="noticeType"
           min-width="150"
-        />
+        >
+          <template #default="scope">
+            <el-tag v-if="scope.row.noticeType == 2" type="warning">
+              系统通知
+            </el-tag>
+            <el-tag v-if="scope.row.noticeType == 1" type="success">
+              通知消息
+            </el-tag>
+          </template>
+        </el-table-column>
         <el-table-column
           align="center"
           key="releaseBy"
@@ -72,10 +81,25 @@
           prop="releaseTime"
           min-width="100"
         />
-        <el-table-column align="center" fixed="right" label="操作" width="220">
+        <el-table-column
+          align="center"
+          key="readStatus"
+          label="状态"
+          prop="readStatus"
+          min-width="100"
+        >
+          <template #default="scope">
+            <el-tag v-if="scope.row.readStatus == 1" type="success">
+              已读
+            </el-tag>
+            <el-tag v-if="scope.row.readStatus == 0" type="warning">
+              未读
+            </el-tag>
+          </template>
+        </el-table-column>
+        <el-table-column align="center" fixed="right" label="操作" width="80">
           <template #default="scope">
             <el-button
-              v-hasPerm="['system:notice:edit']"
               type="primary"
               size="small"
               link
diff --git a/src/views/system/notice/index.vue b/src/views/system/notice/index.vue
index 96565986..aa87c80e 100644
--- a/src/views/system/notice/index.vue
+++ b/src/views/system/notice/index.vue
@@ -83,7 +83,16 @@
           label="通知类型"
           prop="noticeTypeLabel"
           min-width="150"
-        />
+        >
+          <template #default="scope">
+            <el-tag v-if="scope.row.noticeType == 2" type="warning">
+              系统通知
+            </el-tag>
+            <el-tag v-if="scope.row.noticeType == 1" type="success">
+              通知消息
+            </el-tag>
+          </template>
+        </el-table-column>
         <el-table-column
           align="center"
           key="releaseBy"