Merge branch 'master' of http://git.mydig.net/Sagoo-Cloud/sagoo-admin-ui

src/api/message/index.ts

@@ -10,7 +10,7 @@ export default {
   // 获取消息列表
   getList: (data: object) => get('/system/message/list', data),
   // 阅读消息
-  red: (id: number) => put('/system/message/red', { id }),
+  read: (id: number) => put('/system/message/read', { id }),
   // 获取所有未读消息数量
   unReadCount: () => get('/system/message/unReadCount')
 }

src/views/system/monitor/notice/index.vue

@@ -5,7 +5,7 @@
 				<el-table-column type="index" label="序号" width="60" align="center" />
 				<el-table-column prop="MessageInfo.title" label="标题" show-overflow-tooltip></el-table-column>
 				<el-table-column prop="MessageInfo.content" label="内容" show-overflow-tooltip></el-table-column>
-				<el-table-column prop="MessageInfo.createdAt" label="发生事件" width="160"></el-table-column>
+				<el-table-column prop="MessageInfo.createdAt" label="发生时间" width="160"></el-table-column>
 				<el-table-column prop="" label="状态" min-width="100" align="center">
 					<template #default="scope">
 						<el-tag type="success" size="small" v-if="scope.row.isRead">已读</el-tag>
@@ -14,7 +14,7 @@
 				</el-table-column>
 				<el-table-column label="操作" width="150" align="center">
 					<template #default="scope">
-						<el-button size="small" text type="primary" v-if="!scope.row.isRead">设为已读</el-button>
+						<el-button size="small" text type="primary" @click="read(scope.row)" v-if="!scope.row.isRead">设为已读</el-button>
 						<el-button size="small" text type="info" @click="onDel(scope.row)">删除</el-button>
 					</template>
 				</el-table-column>
@@ -50,4 +50,11 @@ const onDel = (row: ApiRow) => {
 		getList();
 	});
 };
+
+const read = (row: ApiRow) => {
+	api.read(row.id as number).then(() => {
+		ElMessage.success('已读成功');
+		getList();
+	});
+};
 </script>