refactor: ♻️ 通知公共部分内容重构

通知公告部分内容重构

src/api/notice.ts

@@ -199,7 +199,7 @@ export interface NoticeDetailVO {
   /** 通知内容 */
   content?: string;
   /** 通知类型 */
-  noticeTypeLabel?: number;
+  noticeType?: number;
   /** 发布人 */
   releaseBy?: string;
   /** 优先级(0-低 1-中 2-高) */

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" });
 }
 
 /**

src/components/NoticeModal/index.vue

@@ -27,10 +27,17 @@
       </div>
     </template>
     <div style="width: auto; text-align: left">
-      {{ message.noticeTypeLabel }} 优先级 {{ message.priority }} 发布人：{{
+      <span class="header-item">
-        message.releaseBy
+        <el-tag v-if="message.noticeType == 2" type="warning">系统通知</el-tag>
-      }}
+        <el-tag v-if="message.noticeType == 1" type="success">通知消息</el-tag>
-      发布时间：{{ message.releaseTime }}
+      </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>

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

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"