From 0da3738089b3622c564cb93267987f9a77a076aa Mon Sep 17 00:00:00 2001
From: zhang zhuo <cfn@leapy.cn>
Date: Mon, 15 Dec 2025 14:00:46 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/model/system.ts                       |  29 +++
 src/assets/images/404.png                     | Bin 0 -> 21265 bytes
 src/components/piEditor/index.vue             |   6 +-
 .../components/{tasks.vue => attach.vue}      |   0
 src/layout/components/msg.vue                 | 134 ++++++++++++
 src/layout/components/userbar.vue             | 190 +++---------------
 src/views/dashboard/index.vue                 |  24 +--
 src/views/dashboard/message/detail.vue        |  75 +++++++
 src/views/dashboard/message/index.vue         |  28 ---
 src/views/system/account/index.vue            |  45 +++--
 src/views/system/account/save.vue             |  39 ++--
 src/views/system/message/index.vue            | 137 +++++++++++++
 src/views/system/message/save.vue             |  63 ++++++
 src/views/system/user/index.vue               |  20 ++
 14 files changed, 554 insertions(+), 236 deletions(-)
 create mode 100644 src/assets/images/404.png
 rename src/layout/components/{tasks.vue => attach.vue} (100%)
 create mode 100644 src/layout/components/msg.vue
 create mode 100644 src/views/dashboard/message/detail.vue
 delete mode 100644 src/views/dashboard/message/index.vue
 create mode 100644 src/views/system/message/index.vue
 create mode 100644 src/views/system/message/save.vue

diff --git a/src/api/model/system.ts b/src/api/model/system.ts
index 09c91a9..34d45ca 100644
--- a/src/api/model/system.ts
+++ b/src/api/model/system.ts
@@ -235,4 +235,33 @@ export default {
 			return await http.get("translations", data);
 		}
 	},
+	message: {
+		list: async function (data = {}) {
+			return await http.get("message/list", data);
+		},
+		add: async function (data = {}) {
+			return await http.post("message/add", data);
+		},
+		edit: async function (data = {}) {
+			return await http.put("message/edit", data);
+		},
+		del: async function (data = {}) {
+			return await http.delete("message/del", data);
+		},
+		recalled: async function (data = {}) {
+			return await http.put("message/recalled", data);
+		},
+		mine: async function (data = {}) {
+			return await http.get("message/mine", data);
+		},
+		read: async function (data = {}) {
+			return await http.post("message/read", data);
+		},
+		detail: async function (data = {}) {
+			return await http.get("message/detail", data);
+		},
+		remove: async function (data = {}) {
+			return await http.delete("message/remove", data);
+		},
+	},
 }
diff --git a/src/assets/images/404.png b/src/assets/images/404.png
new file mode 100644
index 0000000000000000000000000000000000000000..d406f04e201788c332994d104b5bc7e904fe75a6
GIT binary patch
literal 21265
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
al9CK1LX(6HtO^D0kfBs{RZ5f|2mcS>@u7qO

literal 0
HcmV?d00001

diff --git a/src/components/piEditor/index.vue b/src/components/piEditor/index.vue
index 3cc2018..dcbc5c5 100644
--- a/src/components/piEditor/index.vue
+++ b/src/components/piEditor/index.vue
@@ -66,10 +66,10 @@ let html = ref("")
 
 watch(() => props.modelValue, () => {
 	html.value = props.modelValue
-}, {deep: true})
-
-onMounted(() => {
+}, {immediate: true})
 
+watch(html, () => {
+	emit("update:modelValue", html.value)
 })
 
 onUnmounted(() => {
diff --git a/src/layout/components/tasks.vue b/src/layout/components/attach.vue
similarity index 100%
rename from src/layout/components/tasks.vue
rename to src/layout/components/attach.vue
diff --git a/src/layout/components/msg.vue b/src/layout/components/msg.vue
new file mode 100644
index 0000000..97dec54
--- /dev/null
+++ b/src/layout/components/msg.vue
@@ -0,0 +1,134 @@
+<template>
+	<el-tabs v-model="msgTab" class="msg-tabs" stretch @tabChange="switchTab">
+		<el-tab-pane label="业务" name="business"></el-tab-pane>
+		<el-tab-pane label="审批" name="approval"></el-tab-pane>
+		<el-tab-pane label="系统" name="system"></el-tab-pane>
+	</el-tabs>
+	<div class="msg-content">
+		<div v-if="msgList.length===0" class="msg-empty">
+			<el-icon class="icon">
+				<pi-icon-no-message/>
+			</el-icon>
+		</div>
+		<div v-else>
+			<el-scrollbar ref="scrollbar" height="230px" :view-style="{ 'overflow-x': 'hidden' }"
+						  @endReached="handleScroll">
+				<el-link v-for="item in msgList" :key="item" underline="never"
+						 :title="item.create_time + ' ' + item.title"
+						 style="display: block; width: 100%;" @click="detail(item)">
+					<template #default>
+						<el-text truncated style="width: 100%;" :class="{isRead: item.read_flag}">
+							<el-text type="primary" v-time.tip="item.create_time" style="margin-right: 5px;"
+									 :class="{isRead: item.read_flag}"></el-text>
+							{{ item.title }}
+						</el-text>
+					</template>
+				</el-link>
+			</el-scrollbar>
+		</div>
+	</div>
+	<el-divider/>
+	<div class="msg-more">
+		<el-button link type="primary" icon="el-icon-select" @click="read" :loading="loading">全部已读</el-button>
+	</div>
+</template>
+
+<script setup>
+import {getCurrentInstance, onMounted, ref} from "vue";
+import api from "@/api"
+import {useRouter} from "vue-router"
+
+const {proxy} = getCurrentInstance()
+const scrollbar = ref(null)
+const router = useRouter()
+
+let msgTab = ref("business")
+let msgList = ref([])
+let page = ref(1)
+const limit = ref(10)
+const loading = ref(false)
+const finish = ref(false)
+
+onMounted(() => {
+	loadData()
+})
+
+async function loadData() {
+	loading.value = true
+	let res = await api.system.message.mine({type: msgTab.value, page: page.value})
+	loading.value = false
+	msgList.value = msgList.value.concat(res.data)
+	if (res.data.length > limit.value) {
+		finish.value = true
+	}
+}
+
+async function switchTab() {
+	page.value = 1
+	msgList.value = []
+	finish.value = false
+	await loadData()
+}
+
+async function read() {
+	let res = await api.system.message.read({type: msgTab.value})
+	proxy.$message.success(res.msg)
+	msgList.value.forEach((item) => {
+		if (!item.read_flag) {
+			item.read_flag = 1
+		}
+	})
+}
+
+async function handleScroll(event) {
+	if (loading.value || finish.value || event !== "bottom") return
+	page.value++
+	await loadData()
+}
+
+function detail(item) {
+	if (msgTab.value === "system") {
+		router.push({
+			path: "/dashboard/message/detail",
+			query: {
+				id: item.mess_id
+			}
+		})
+	}
+}
+</script>
+
+<style scoped>
+.msg-content {
+	height: 230px;
+	overflow: hidden;
+}
+
+.msg-content .msg-empty {
+	display: flex;
+	height: 230px;
+	justify-content: center;
+	align-items: center;
+}
+
+.msg-content .msg-empty .icon {
+	font-size: 128px;
+}
+
+.msg-content .el-link {
+	line-height: 30px;
+}
+
+:deep(.el-link__inner) {
+	display: flex;
+}
+
+.msg-more {
+	text-align: center;
+	margin-top: -14px;
+}
+
+.isRead {
+	color: var(--el-color-info-light-3);
+}
+</style>
diff --git a/src/layout/components/userbar.vue b/src/layout/components/userbar.vue
index 35c93ed..e3bade1 100644
--- a/src/layout/components/userbar.vue
+++ b/src/layout/components/userbar.vue
@@ -14,18 +14,11 @@
 				</el-icon>
 			</el-badge>
 		</div>
-		<div class="tasks panel-item" @click="tasksVisible=true">
-			<el-badge :hidden="taskNum==0" :value="taskNum" class="badge" type="danger">
-				<el-icon>
-					<pi-icon-task/>
-				</el-icon>
-			</el-badge>
-		</div>
-		<div class="msg panel-item" @click="msgVisible=!msgVisible">
-			<el-popover v-model:visible="msgVisible" :width="280" trigger="click">
+		<div class="msg panel-item" @click="msgVisible=!msgVisible;newMsg=false;">
+			<el-popover v-model:visible="msgVisible" :width="300" trigger="click">
 				<template #reference>
 					<div class="msg-panel">
-						<el-badge :hidden="msgNum==0" :value="msgNum" class="badge" type="danger">
+						<el-badge :is-dot="newMsg" class="badge" type="danger">
 							<el-icon>
 								<el-icon-bell/>
 							</el-icon>
@@ -33,34 +26,17 @@
 					</div>
 				</template>
 				<template #default>
-					<el-tabs v-model="msgTab" class="msg-tabs" stretch>
-						<el-tab-pane label="通知" name="notice"></el-tab-pane>
-						<el-tab-pane label="消息" name="message"></el-tab-pane>
-						<el-tab-pane label="待办" name="todo"></el-tab-pane>
-					</el-tabs>
-					<div class="msg-content">
-						<div v-if="msgList.length===0" class="msg-empty">
-							<el-icon class="icon">
-								<pi-icon-no-message/>
-							</el-icon>
-						</div>
-						<div v-else>
-							<el-scrollbar height="220px" :view-style="{ 'overflow-x': 'hidden' }">
-								<el-link v-for="item in msgList" :key="item" href="/#/message" underline="never" :title="item.time + ' ' + item.title" style="display: block; width: 100%;">
-									<template #default>
-										<el-text truncated style="width: 100%;"><el-text type="primary" v-time.tip="item.time" style="margin-right: 5px;"></el-text>{{ item.title }}</el-text>
-									</template>
-								</el-link>
-							</el-scrollbar>
-						</div>
-					</div>
-					<el-divider/>
-					<div class="msg-more">
-						<el-button link type="primary" icon="el-icon-arrow-down">查看更多</el-button>
-					</div>
+					<msg v-if="msgVisible"/>
 				</template>
 			</el-popover>
 		</div>
+		<div class="attach panel-item" @click="attachVisible=true;newTask=false;">
+			<el-badge :is-dot="newTask" class="badge" type="danger">
+				<el-icon>
+					<pi-icon-task/>
+				</el-icon>
+			</el-badge>
+		</div>
 		<el-dropdown class="user panel-item" trigger="click" @command="handleUser">
 			<div class="user-avatar">
 				<el-avatar :size="30" :src="avatar">{{ nicknameF }}</el-avatar>
@@ -90,8 +66,8 @@
 	<el-dialog v-model="searchVisible" :width="700" title="菜单搜索" class="drawerBG" center destroy-on-close>
 		<search @success="searchVisible=false"></search>
 	</el-dialog>
-	<el-drawer v-model="tasksVisible" :size="450" title="附件中心" destroy-on-close>
-		<tasks></tasks>
+	<el-drawer v-model="attachVisible" :size="450" title="附件中心" destroy-on-close>
+		<attach/>
 	</el-drawer>
 </template>
 
@@ -100,9 +76,10 @@ defineOptions({
 	name: "userBar"
 })
 import {ref, onMounted, getCurrentInstance} from "vue"
-import search from './search.vue'
-import setting from './setting.vue'
-import tasks from './tasks.vue'
+import search from './search'
+import setting from './setting'
+import attach from './attach'
+import msg from './msg'
 import websocket from "@/utils/websocket"
 import {ElNotification} from 'element-plus'
 import tools from "@/utils/tools"
@@ -116,14 +93,11 @@ const {t} = useI18n()
 
 const msgVisible = ref(false);
 let searchVisible = ref(false)
-let msg = ref(false)
-let msgNum = ref(2)
-let msgList = ref([])
-const tasksVisible = ref(false)
-let taskNum = ref(0)
+let newMsg = ref(false)
+const attachVisible = ref(false)
+let newTask = ref(false)
 const settingDialog = ref(false)
 const userInfo = tools.data.get("USER_INFO");
-let msgTab = ref("notice")
 
 let nickname = userInfo.nickname || userInfo.username;
 let nicknameF = nickname.substring(0, 1);
@@ -132,7 +106,6 @@ let avatar = userInfo.avatar
 // mounted
 onMounted(() => {
 	initWebSocket()
-	loadData()
 })
 
 function initWebSocket() {
@@ -142,16 +115,16 @@ function initWebSocket() {
 }
 
 function messageHandle(message) {
-	if (message.data == "connection successful" || message.data == "pong") {
+	if (message.data === "connection successful" || message.data === "pong") {
 		return;
 	}
 	const data = JSON.parse(message.data)
 	if (!data) {
 		return;
 	}
-	if (data.code == 200) {
+	if (data.code === 200) {
 		ElNotification.success({
-			title: 'Success',
+			title: '新信息通知',
 			message: data['msg']
 		})
 	} else {
@@ -160,12 +133,11 @@ function messageHandle(message) {
 			message: data['msg']
 		})
 	}
-	if (data.type == "message") {
-		msgNum.value++
-	} else if (data.type == "task") {
-		taskNum.value++
+	if (data.type === "system" || data.type === "business" || data.type === "approval") {
+		newMsg.value = true
+	} else if (data.type === "attach") {
+		newTask.value = true
 	}
-	return;
 }
 
 function closeHandle() {
@@ -218,48 +190,6 @@ function handleUser(command) {
 function screen() {
 	tools.screen(document.documentElement)
 }
-
-async function loadData() {
-	// let res = await this.$API.home.message.newCount()
-	// this.msgNum = res.data.count
-	msgNum.value = 5
-	msgList.value.push({
-		title: '您有一笔新的订单请及时处理。您有一笔新的订单请及时处理',
-		time: '2025-06-17 17:59:21'
-	})
-	msgList.value.push({
-		title: '您有一笔新的订单请及时处理。您有一笔新的订单请及时处理',
-		time: '2025-06-16 10:29:30'
-	})
-	msgList.value.push({
-		title: '您有一笔新的订单请及时处理。',
-		time: '2025-06-15 12:29:30'
-	})
-	msgList.value.push({
-		title: '您有一笔新的订单请及时处理。',
-		time: '2025-05-15 12:29:30'
-	})
-	msgList.value.push({
-		title: '您有一笔新的订单请及时处理。',
-		time: '2025-01-16 12:29:30'
-	})
-	msgList.value.push({
-		title: '您有一笔新的订单请及时处理。',
-		time: '2024-06-15 12:29:30'
-	})
-	msgList.value.push({
-		title: '您有一笔新的订单请及时处理。',
-		time: '2024-06-15 12:29:30'
-	})
-	msgList.value.push({
-		title: '您有一笔新的订单请及时处理。',
-		time: '2015-06-15 12:29:30'
-	})
-	msgList.value.push({
-		title: '您有一笔新的订单请及时处理。',
-		time: '2025-06-15 12:29:30'
-	})
-}
 </script>
 
 <style lang="scss" scoped>
@@ -311,76 +241,10 @@ async function loadData() {
 	cursor: pointer;
 }
 
-.msg-list li {
-	border-top: 1px solid #eee;
-}
-
-.msg-list li a {
-	display: flex;
-	padding: 20px;
-}
-
-.msg-list li a:hover {
-	background: #ecf5ff;
-}
-
-.msg-list__main h2 {
-	font-size: 15px;
-	font-weight: normal;
-	color: #333;
-}
-
-.msg-list__main p {
-	font-size: 12px;
-	color: #999;
-	line-height: 1.8;
-	margin-top: 5px;
-}
-
-.dark .msg-list__main h2 {
-	color: #d0d0d0;
-}
-
-.dark .msg-list li {
-	border-top: 1px solid #363636;
-}
-
-.dark .msg-list li a:hover {
-	background: #383838;
-}
-
 .msg-panel {
 	display: grid;
 }
 
-.msg-content {
-	height: 220px;
-	overflow: hidden;
-}
-
-.msg-content .msg-empty {
-	display: flex;
-	height: 220px;
-	justify-content: center;
-	align-items: center;
-}
-
-.msg-content .msg-empty .icon {
-	font-size: 128px;
-}
-
-.msg-content .el-link {
-	line-height: 30px;
-}
-
-:deep(.el-link__inner) {
-	display: flex;
-}
-
-.msg-more {
-	text-align: center;
-}
-
 .el-divider--horizontal {
 	margin: 10px 0 !important;
 }
diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue
index 6921659..408ab2d 100644
--- a/src/views/dashboard/index.vue
+++ b/src/views/dashboard/index.vue
@@ -11,23 +11,15 @@
 	</div>
 </template>
 
-<script>
+<script setup>
+import {ref} from "vue";
+
+defineOptions({
+	name: "dashboard"
+})
+
+let pageLoading = ref(true)
 
-export default {
-	name: "dashboard",
-	components: {
-	},
-	data(){
-		return {
-			pageLoading: true
-		}
-	},
-	methods: {
-		onMounted(){
-			this.pageLoading = false
-		}
-	}
-}
 </script>
 
 <style scoped lang="scss">
diff --git a/src/views/dashboard/message/detail.vue b/src/views/dashboard/message/detail.vue
new file mode 100644
index 0000000..946a53d
--- /dev/null
+++ b/src/views/dashboard/message/detail.vue
@@ -0,0 +1,75 @@
+<template>
+	<el-main class="pi-page">
+		<el-page-header @back="onBack" :content="title" class="header">
+			<template #extra>
+				<div class="flex items-center">
+					<el-popconfirm title="确定删除吗？" @confirm="del">
+						<template #reference>
+							<el-button type="danger" circle icon="el-icon-delete" :disabled="!info.mess_id"/>
+						</template>
+					</el-popconfirm>
+
+				</div>
+			</template>
+		</el-page-header>
+		<section v-if="!info.mess_id" class="empty">
+			<img src="@/assets/images/404.png">
+		</section>
+		<section v-else v-html="info.content"/>
+	</el-main>
+</template>
+
+<script setup>
+import {getCurrentInstance, onMounted, ref} from "vue";
+import api from "@/api"
+import useTabs from "@/utils/useTabs"
+import {useRoute} from "vue-router"
+
+defineOptions({
+	name: "messageDetail"
+})
+
+const {proxy} = getCurrentInstance()
+const route = useRoute()
+let info = ref({})
+let title = ref("消息不存在")
+
+onMounted(() => {
+	loadData()
+})
+
+async function loadData() {
+	const res = await api.system.message.detail({id: route.query.id})
+	if (res.data) {
+		info.value = res.data
+		title.value = info.value.title
+	}
+}
+
+function onBack() {
+	useTabs.close()
+}
+
+async function del() {
+	const res = await api.system.message.remove({id: route.query.id})
+	proxy.$message.success(res.msg)
+	onBack()
+}
+</script>
+
+<style lang="scss" scoped>
+.pi-page {
+	background: var(--el-bg-color);
+	margin-top: 20px;
+}
+
+.header {
+	margin-bottom: 25px;
+}
+
+.empty {
+	text-align: center;
+	padding: 80px 0;
+
+}
+</style>
diff --git a/src/views/dashboard/message/index.vue b/src/views/dashboard/message/index.vue
deleted file mode 100644
index a735510..0000000
--- a/src/views/dashboard/message/index.vue
+++ /dev/null
@@ -1,28 +0,0 @@
-<template>
-	<div>
-		<el-input v-model="form" placeholder=""/>
-		<el-button plain @click="showClick">点我</el-button>
-		<pi-dialog v-model="show" ref="dialog"></pi-dialog>
-	</div>
-</template>
-
-<script setup>
-import {getCurrentInstance, ref} from "vue";
-defineOptions({
-	name: 'messageCenter'
-})
-const {proxy} = getCurrentInstance()
-
-let show = ref(false)
-
-let form = ref("")
-
-function showClick() {
-	show.value = true
-}
-
-</script>
-
-<style scoped>
-
-</style>
diff --git a/src/views/system/account/index.vue b/src/views/system/account/index.vue
index 2c5241e..3fa4a2f 100644
--- a/src/views/system/account/index.vue
+++ b/src/views/system/account/index.vue
@@ -6,11 +6,15 @@
 					<el-input placeholder="输入关键字进行过滤" v-model="groupFilterText" clearable></el-input>
 				</el-header>
 				<el-main class="nopadding">
-					<el-tree :default-expand-all="true" ref="groupRef" class="menu" node-key="dept_id" :data="group" :props="groupsProps" :current-node-key="''" :highlight-current="true" :expand-on-click-node="false" :filter-node-method="groupFilterNode" @node-click="groupClick"></el-tree>
+					<el-tree :default-expand-all="true" ref="groupRef" class="menu" node-key="dept_id" :data="group"
+							 :props="groupsProps" :current-node-key="''" :highlight-current="true"
+							 :expand-on-click-node="false" :filter-node-method="groupFilterNode"
+							 @node-click="groupClick"></el-tree>
 				</el-main>
 			</el-container>
 		</el-aside>
-		<pi-table ref="tableRef" :apiObj="api.system.account.list" @selection-change="selectionChange" stripe remoteSort remoteFilter>
+		<pi-table ref="tableRef" :apiObj="api.system.account.list" @selection-change="selectionChange" stripe remoteSort
+				  remoteFilter>
 			<template #do>
 				<el-button v-auth="'account:add'" type="primary" icon="el-icon-plus" @click="add"></el-button>
 			</template>
@@ -27,17 +31,22 @@
 			</el-table-column>
 			<el-table-column label="账号" prop="username"></el-table-column>
 			<el-table-column label="昵称" prop="nickname"></el-table-column>
+			<el-table-column label="邮箱" prop="email"></el-table-column>
+			<el-table-column label="电话" prop="phone"></el-table-column>
 			<el-table-column label="角色" prop="roles">
 				<template #default="scope">
-					{{scope.row.roles.map(item=>item.role_name).toString()}}
+					{{ scope.row.roles.map(item => item.role_name).toString() }}
 				</template>
 			</el-table-column>
 			<el-table-column label="创建时间" prop="create_time"></el-table-column>
 			<el-table-column label="操作" fixed="right" align="right" width="160">
 				<template #default="scope">
 					<el-button-group>
-						<el-button text type="primary" size="small" @click="table_show(scope.row, scope.$index)">查看</el-button>
-						<el-button v-auth="'account:edit'" text type="success" size="small" @click="table_edit(scope.row, scope.$index)">编辑</el-button>
+						<el-button text type="primary" size="small" @click="table_show(scope.row, scope.$index)">查看
+						</el-button>
+						<el-button v-auth="'account:edit'" text type="success" size="small"
+								   @click="table_edit(scope.row, scope.$index)">编辑
+						</el-button>
 						<el-popconfirm title="确定删除吗？" @confirm="table_del(scope.row, scope.$index)">
 							<template #reference>
 								<el-button v-auth="'account:del'" text type="danger" size="small">删除</el-button>
@@ -90,60 +99,68 @@ onMounted(() => {
 })
 
 //添加
-function add(){
+function add() {
 	dialogShow.value = true
 	nextTick(() => {
 		saveRef.value.open('add', null, group.value)
 	})
 }
+
 //编辑
-function table_edit(row){
+function table_edit(row) {
 	dialogShow.value = true
 	nextTick(() => {
 		saveRef.value.open('edit', row, group.value)
 	})
 }
+
 //查看
-function table_show(row){
+function table_show(row) {
 	dialogShow.value = true
 	nextTick(() => {
 		saveRef.value.open('show', row, group.value)
 	})
 }
+
 //删除
-async function table_del(row){
+async function table_del(row) {
 	const loading = proxy.$loading();
 	var res = await api.system.account.del({ids: [row.account_id]});
 	tableRef.value.refresh()
 	loading.close();
 	proxy.$message.success(res.msg)
 }
+
 //表格选择后回调事件
-function selectionChange(e){
+function selectionChange(e) {
 	selection.value = e;
 }
+
 //加载树数据
-async function getGroup(){
+async function getGroup() {
 	showGrouploading.value = true;
 	const res = await api.system.dept.option();
 	showGrouploading.value = false;
 	group.value = tools.makeTreeData(res.data, 0, "dept_id");
 	group.value.unshift({'dept_id': null, 'dept_name': '所有部门'})
 }
+
 //树过滤
-function groupFilterNode(value, data){
+function groupFilterNode(value, data) {
 	if (!value) return true;
 	return data.label.indexOf(value) !== -1;
 }
+
 //树点击事件
-function groupClick(data){
+function groupClick(data) {
 	var params = {
 		dept_id: data.dept_id
 	}
 	tableRef.value.reload(params)
 }
+
 //搜索
-function upsearch(){
+function upsearch() {
 	tableRef.value.upData(search.value)
 }
 </script>
diff --git a/src/views/system/account/save.vue b/src/views/system/account/save.vue
index 2becbcc..eb5123f 100644
--- a/src/views/system/account/save.vue
+++ b/src/views/system/account/save.vue
@@ -1,28 +1,38 @@
 <template>
 	<el-dialog :title="titleMap[mode]" v-model="visible" :width="500" destroy-on-close @closed="$emit('closed')">
-		<el-form :model="form" :rules="rules" :disabled="mode=='show'" ref="formRef" label-width="100px" label-position="right">
+		<el-form :model="form" :rules="rules" :disabled="mode==='show'" ref="formRef" label-width="100px"
+				 label-position="right">
 			<el-form-item label="账号" prop="username">
 				<el-input v-model="form.username" placeholder="用于登录系统" clearable></el-input>
 			</el-form-item>
+			<el-form-item label="邮箱" prop="email">
+				<el-input v-model="form.email" placeholder="请输入邮箱" clearable></el-input>
+			</el-form-item>
+			<el-form-item label="电话" prop="phone">
+				<el-input v-model="form.phone" placeholder="请输入联系电话" clearable></el-input>
+			</el-form-item>
 			<el-form-item label="登录密码" prop="password">
 				<el-input type="password" v-model="form.password" clearable show-password></el-input>
 			</el-form-item>
 			<el-form-item label="所属部门" prop="dept_id">
-				<el-cascader ref="deptRef" v-model="form.dept_id" :options="depts" :props="deptsProps" clearable style="width: 100%;"></el-cascader>
+				<el-cascader ref="deptRef" v-model="form.dept_id" :options="depts" :props="deptsProps" clearable
+							 style="width: 100%;"></el-cascader>
 			</el-form-item>
 			<el-form-item label="所属岗位" prop="posts">
 				<el-select v-model="form.posts" multiple filterable style="width: 100%">
-					<el-option v-for="item in groups2" :key="item.post_id" :label="item.post_name" :value="item.post_id"/>
+					<el-option v-for="item in groups2" :key="item.post_id" :label="item.post_name"
+							   :value="item.post_id"/>
 				</el-select>
 			</el-form-item>
 			<el-form-item label="所属角色" prop="roles">
 				<el-select v-model="form.roles" multiple filterable style="width: 100%">
-					<el-option v-for="item in groups" :key="item.role_id" :label="item.role_name" :value="item.role_id"/>
+					<el-option v-for="item in groups" :key="item.role_id" :label="item.role_name"
+							   :value="item.role_id"/>
 				</el-select>
 			</el-form-item>
 		</el-form>
 		<template #footer>
-			<el-button @click="visible=false" >取 消</el-button>
+			<el-button @click="visible=false">取 消</el-button>
 			<el-button v-if="mode!='show'" type="primary" :loading="isSaveing" @click="submit()">保 存</el-button>
 		</template>
 	</el-dialog>
@@ -49,8 +59,10 @@ let titleMap = ref({
 let visible = ref(false)
 let isSaveing = ref(false)
 const form = ref({
-	account_id:null,
+	account_id: null,
 	username: "",
+	email: '',
+	phone: '',
 	password: "",
 	dept_id: 0,
 	roles: [],
@@ -84,7 +96,7 @@ onMounted(() => {
 	getGroup2()
 })
 
-function open(m='add', data = {}, d = []){
+function open(m = 'add', data = {}, d = []) {
 	mode.value = m;
 	if (data) {
 		Object.assign(form.value, data)
@@ -96,21 +108,24 @@ function open(m='add', data = {}, d = []){
 }
 
 //加载树数据
-async function getGroup(){
+async function getGroup() {
 	const res = await api.system.role.option();
 	groups.value = res.data;
 }
 
-async function getGroup2(){
+async function getGroup2() {
 	const res = await api.system.post.option();
 	groups2.value = res.data;
 }
 
 //表单提交方法
-async function submit(){
+async function submit() {
 	// 校验登录
-	const validate = await formRef.value.validate().catch(() => {});
-	if(!validate){ return false }
+	const validate = await formRef.value.validate().catch(() => {
+	});
+	if (!validate) {
+		return false
+	}
 	// 部门获取最后一项
 	form.value.dept_id = deptRef.value.getCheckedNodes()[0].data.dept_id
 	if (form.value.password) form.value.password = tools.crypto.MD5(form.value.password)
diff --git a/src/views/system/message/index.vue b/src/views/system/message/index.vue
new file mode 100644
index 0000000..2f39e0f
--- /dev/null
+++ b/src/views/system/message/index.vue
@@ -0,0 +1,137 @@
+<template>
+	<pi-table ref="tableRef" :apiObj="api.system.message.list" @selection-change="selectionChange">
+		<template #do>
+			<el-button v-auth="'message:add'" type="primary" icon="el-icon-plus" @click="add"></el-button>
+			<el-button v-auth="'message:edit'" type="success" icon="el-icon-edit" @click="edit"
+					   :disabled="selection.length!==1"></el-button>
+			<el-button v-auth="'message:del'" type="danger" plain icon="el-icon-delete"
+					   :disabled="selection.length===0" @click="batch_del"></el-button>
+		</template>
+		<template #search>
+			<el-input v-model="search.title" placeholder="标题" clearable style="width: 200px;"></el-input>
+			<el-button type="primary" icon="el-icon-search" @click="upsearch"></el-button>
+		</template>
+		<el-table-column type="selection" width="50"></el-table-column>
+		<el-table-column label="ID" prop="message_id"></el-table-column>
+		<el-table-column label="标题" prop="title"></el-table-column>
+		<el-table-column label="是否撤回" prop="recalled_flag">
+			<template #default="scope">
+				<el-tag v-if="scope.row.recalled_flag === 1" type="danger">是</el-tag>
+				<el-tag v-else>否</el-tag>
+			</template>
+		</el-table-column>
+		<el-table-column label="创建人" prop="account.username"></el-table-column>
+		<el-table-column label="创建时间" prop="create_time"></el-table-column>
+		<el-table-column label="更新时间" prop="update_time"></el-table-column>
+		<el-table-column label="操作" fixed="right" align="center" width="120">
+			<template #default="scope">
+				<el-button-group>
+					<el-button text type="primary" size="small" @click="show(scope.row, scope.$index)">查看
+					</el-button>
+					<el-button v-auth="'message:edit'" text type="success" size="small"
+							   @click="edit(scope.row, scope.$index)">编辑
+					</el-button>
+					<el-popconfirm title="确定删除吗？" @confirm="del(scope.row, scope.$index)">
+						<template #reference>
+							<el-button v-auth="'message:del'" text type="danger" size="small">删除</el-button>
+						</template>
+					</el-popconfirm>
+					<el-popconfirm v-if="scope.row.recalled_flag !== 1" title="确定撤回吗？" @confirm="recalled(scope.row, scope.$index)">
+						<template #reference>
+							<el-button v-auth="'message:recalled'" text type="warning" size="small">撤回</el-button>
+						</template>
+					</el-popconfirm>
+				</el-button-group>
+			</template>
+		</el-table-column>
+	</pi-table>
+	<save-dialog v-if="dialogShow" ref="dialogRef" @success="tableRef.refresh()"
+				 @closed="dialogShow=false"></save-dialog>
+</template>
+
+<script setup>
+import saveDialog from './save'
+import api from "@/api/index";
+import {getCurrentInstance, nextTick, ref} from "vue";
+
+defineOptions({
+	name: "systemMessage"
+})
+
+const {proxy} = getCurrentInstance()
+const tableRef = ref(null)
+const dialogRef = ref(null)
+
+let dialogShow = ref(false)
+let selection = ref([])
+let search = ref({
+	title: null,
+})
+
+//添加
+function add() {
+	dialogShow.value = true
+	nextTick(() => {
+		dialogRef.value.open()
+	})
+}
+
+//编辑
+function edit(row) {
+	dialogShow.value = true
+	nextTick(() => {
+		if (row instanceof PointerEvent) {
+			row = selection.value[0]
+		}
+		dialogRef.value.open('edit', row)
+	})
+}
+
+//查看
+function show(row) {
+	dialogShow.value = true
+	nextTick(() => {
+		dialogRef.value.open('show', row)
+	})
+}
+
+//删除
+async function del(row) {
+	const loading = proxy.$loading();
+	const res = await api.system.message.del({ids: [row.message_id]});
+	tableRef.value.refresh()
+	loading.close();
+	proxy.$message.success(res.msg)
+}
+
+async function recalled(row) {
+	const loading = proxy.$loading();
+	const res = await api.system.message.recalled({id: row.message_id});
+	tableRef.value.refresh()
+	loading.close();
+	proxy.$message.success(res.msg)
+}
+
+//批量删除
+async function batch_del() {
+	proxy.$confirm(`确定删除选中的 ${selection.value.length} 项吗？如果删除项中含有子集将会被一并删除`, '提示', {
+		type: 'warning'
+	}).then(async () => {
+		const loading = proxy.$loading();
+		const res = await api.system.message.del({ids: selection.value.map(item => item.message_id)});
+		tableRef.value.refresh()
+		loading.close();
+		proxy.$message.success(res.msg)
+	})
+}
+
+//表格选择后回调事件
+function selectionChange(e) {
+	selection.value = e;
+}
+
+//搜索
+function upsearch() {
+	tableRef.value.upData(search.value)
+}
+</script>
diff --git a/src/views/system/message/save.vue b/src/views/system/message/save.vue
new file mode 100644
index 0000000..e1b6dc7
--- /dev/null
+++ b/src/views/system/message/save.vue
@@ -0,0 +1,63 @@
+<template>
+	<pi-dialog :title="titleMap[mode]" v-model="visible" :width="1000" destroy-on-close @closed="$emit('closed')" :close-on-click-modal="false" showFullscreen>
+		<el-form :model="form" :rules="rules" :disabled="mode==='show'" ref="formRef" label-width="100px">
+			<el-form-item label="标题" prop="title">
+				<el-input type="text" v-model="form.title" placeholder="请输入标题" clearable></el-input>
+			</el-form-item>
+			<el-form-item label="内容" prop="content">
+				<pi-editor v-model="form.content" placeholder="请输入内容"></pi-editor>
+			</el-form-item>
+		</el-form>
+		<template #footer>
+			<el-button @click="visible=false" >取 消</el-button>
+			<el-button v-if="mode!=='show'" type="primary" :loading="isSaveing" @click="submit()">保 存</el-button>
+		</template>
+	</pi-dialog>
+</template>
+
+<script setup>
+import {getCurrentInstance, ref} from 'vue'
+import api from "@/api/index"
+import piEditor from '@/components/piEditor'
+
+defineExpose({
+	open
+})
+const emit = defineEmits(['success', 'closed'])
+const formRef = ref(null)
+const {proxy} = getCurrentInstance()
+
+let mode = ref('add')
+let titleMap = ref({
+	add: '新增',
+	edit: '编辑',
+	show: '查看'
+})
+let visible = ref(false)
+let isSaveing = ref(false)
+let form = ref({
+	message_id: null,
+	title: null,
+	content: null
+})
+const rules = ref({
+})
+
+function open(m = 'add', data = null) {
+	mode.value = m
+	visible.value = true
+	Object.assign(form.value, data)
+}
+
+async function submit(){
+	// 校验登录
+	const validate = await formRef.value.validate().catch(() => {});
+	if(!validate){ return false }
+	isSaveing.value = true;
+	const res = form.value.message_id? await api.system.message.edit(form.value) : await api.system.message.add(form.value);
+	isSaveing.value = false;
+	emit('success')
+	visible.value = false;
+	proxy.$message.success(res.msg)
+}
+</script>
diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index a238aee..b739756 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -10,6 +10,20 @@
 						<p style="font-size: 14px; color: #888888;">{{ userInfo.bio }}</p>
 					</div>
 					<div class="down">
+						<div class="item">
+							<!--邮箱-->
+							<el-icon size="16">
+								<component :is="'pi-icon-birthday'"/>
+							</el-icon>
+							<el-text>{{ userInfo.email || "保密" }}</el-text>
+						</div>
+						<div class="item">
+							<!--电话-->
+							<el-icon size="16">
+								<component :is="'pi-icon-birthday'"/>
+							</el-icon>
+							<el-text>{{ userInfo.phone || "保密" }}</el-text>
+						</div>
 						<div class="item">
 							<!--岗位-->
 							<el-icon size="15">
@@ -68,6 +82,12 @@
 								<el-form-item label="昵称" prop="nickname">
 									<el-input v-model="form.nickname"></el-input>
 								</el-form-item>
+								<el-form-item label="邮箱" prop="email">
+									<el-input v-model="form.email"></el-input>
+								</el-form-item>
+								<el-form-item label="电话" prop="phone">
+									<el-input v-model="form.phone"></el-input>
+								</el-form-item>
 								<el-form-item label="性别" prop="sex">
 									<el-select v-model="form.sex">
 										<el-option label="保密" :value="0" disabled/>