From 4f463dcbb38ec03d43d70c0da7414cd3afc7d027 Mon Sep 17 00:00:00 2001
From: zhang zhuo <cfn@leapy.cn>
Date: Fri, 19 Dec 2025 11:31:36 +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          |   3 +
 src/api/model/tools.ts           |  13 ++-
 src/layout/components/attach.vue | 159 +++++++++++++++++--------------
 src/layout/components/msg.vue    |  40 ++++++--
 src/views/system/post/index.vue  |   2 +-
 5 files changed, 137 insertions(+), 80 deletions(-)

diff --git a/src/api/model/system.ts b/src/api/model/system.ts
index 83aff4c..659dc93 100644
--- a/src/api/model/system.ts
+++ b/src/api/model/system.ts
@@ -266,5 +266,8 @@ export default {
 		remove: async function (data = {}) {
 			return await http.delete("message/remove", data);
 		},
+		clear: async function (data = {}) {
+			return await http.delete("message/clear", data);
+		},
 	},
 }
diff --git a/src/api/model/tools.ts b/src/api/model/tools.ts
index 28710c2..c1ce509 100644
--- a/src/api/model/tools.ts
+++ b/src/api/model/tools.ts
@@ -39,5 +39,16 @@ export default {
 		export: async function (data = {}) {
 			return await http.get("file/export", data);
 		},
-	}
+	},
+	attachment: {
+		list: async function (data = {}) {
+			return await http.get("attachment/list", data);
+		},
+		del: async function (data = {}) {
+			return await http.delete("attachment/del", data);
+		},
+		clear: async function (data = {}) {
+			return await http.delete("attachment/clear", data);
+		},
+	},
 }
diff --git a/src/layout/components/attach.vue b/src/layout/components/attach.vue
index ef4d6bf..6fab7a8 100644
--- a/src/layout/components/attach.vue
+++ b/src/layout/components/attach.vue
@@ -1,41 +1,44 @@
 <template>
 	<el-container v-loading="loading">
-		<el-main>
-			<el-empty v-if="tasks.length==0" :image-size="120">
-				<template #description>
-					<h2>没有正在执行的任务</h2>
-				</template>
-			</el-empty>
-			<el-card v-for="task in tasks" :key="task.id" shadow="hover" class="user-bar-tasks-item">
-				<div class="user-bar-tasks-item-body">
-					<div class="taskIcon">
-						<el-icon :size="20">
-							<el-icon-paperclip/>
-						</el-icon>
-					</div>
-					<div class="taskMain">
-						<div class="title">
-							<h2>{{ task.taskName }}</h2>
-							<p><span v-time.tip="task.createDate"></span> 创建</p>
+		<el-scrollbar :view-style="{ 'overflow-x': 'hidden' }" @endReached="handleScroll">
+			<el-main>
+				<el-empty v-if="attachList.length===0" :image-size="120">
+					<template #description>
+						<h2>没有正在执行的任务</h2>
+					</template>
+				</el-empty>
+				<el-card v-for="(attach, index) in attachList" :key="attach.attachment_id" shadow="hover"
+						 class="user-bar-attach-item">
+					<div class="user-bar-attach-item-body">
+						<div class="attachIcon">
+							<el-icon :size="20">
+								<el-icon-paperclip/>
+							</el-icon>
 						</div>
-						<div class="bottom">
-							<div class="state">
-								<el-tag type="info" v-if="task.state=='0'">待处理</el-tag>
-								<el-tag type="info" v-if="task.state=='1'">处理中</el-tag>
-								<el-tag type="primary" v-if="task.state=='2'">完成</el-tag>
-								<el-tag type="danger" v-if="task.state=='3'">失败</el-tag>
+						<div class="attachMain">
+							<div class="title">
+								<h2>{{ attach.name }}</h2>
+								<p><span v-time.tip="attach.create_time"></span> 创建</p>
+								<p v-if="attach.status===2"><span>{{ attach.fail_reason }}</span></p>
 							</div>
-							<div class="handler">
-								<el-button v-if="task.state=='2'" type="danger" circle icon="el-icon-delete"
-										   @click="remove(task)"></el-button>
-								<el-button v-if="task.state=='2'" type="primary" circle icon="el-icon-download"
-										   @click="download(task)"></el-button>
+							<div class="bottom">
+								<div class="state">
+									<el-tag type="info" v-if="attach.status===0">待处理</el-tag>
+									<el-tag type="success" v-if="attach.status===1">完成</el-tag>
+									<el-tag type="warning" v-if="attach.status===2">失败</el-tag>
+								</div>
+								<div class="handler">
+									<el-button type="danger" circle icon="el-icon-delete"
+											   @click="remove(attach, index)"></el-button>
+									<el-button v-if="attach.status===1" type="primary" circle icon="el-icon-download"
+											   @click="download(attach)"></el-button>
+								</div>
 							</div>
 						</div>
 					</div>
-				</div>
-			</el-card>
-		</el-main>
+				</el-card>
+			</el-main>
+		</el-scrollbar>
 		<el-footer style="padding:10px;text-align: right;">
 			<el-button circle icon="el-icon-delete" @click="removeAll"></el-button>
 			<el-button circle icon="el-icon-refresh" @click="refresh"></el-button>
@@ -44,42 +47,38 @@
 </template>
 
 <script setup>
-import {ref, onMounted} from "vue";
-import api from "@/api";
+import {ref, onMounted, getCurrentInstance} from "vue"
+import api from "@/api"
 import {ElMessageBox} from 'element-plus'
+import tools from "@/utils/tools"
+
+const {proxy} = getCurrentInstance()
 
 let loading = ref(false)
-let tasks = ref([])
-
+let attachList = ref([])
+let page = ref(1)
+let limit = ref(5)
+let finish = ref(false)
 
 onMounted(() => {
-	getData()
+	loadData()
 })
 
-async function getData() {
-	// loading.value = true
-	// const res = await api.system.tasks.list();
-	// tasks.value= res.data
-	// loading.value = false
-
-	tasks.value.push({
-			"id": "100",
-			"taskName": "年度报表生成",
-			"result": "",
-			"state": "0",
-			"createDate": "2022-06-13 17:04:55"
-		})
-	tasks.value.push({
-			"id": "101",
-			"taskName": "系统日志导出",
-			"result": "http://www.baidu.com",
-			"state": "2",
-			"createDate": "2022-06-12 09:31:08"
-		})
+async function loadData() {
+	loading.value = true
+	const res = await api.tools.attachment.list({page: page.value, limit: limit.value});
+	loading.value = false
+	attachList.value = attachList.value.concat(res.data)
+	if (res.data.length < limit.value) {
+		finish.value = true
+	}
 }
 
 function refresh() {
-	getData()
+	page.value = 1
+	attachList.value = []
+	finish.value = false
+	loadData()
 }
 
 function removeAll() {
@@ -88,41 +87,59 @@ function removeAll() {
 		cancelButtonText: '取消',
 		inputPattern: /^清空所有$/,
 		inputErrorMessage: '输入错误',
-	}).then(() => {
-		tasks.value = []
-	}).catch(() => {})
+	}).then(async () => {
+		loading.value = true
+		const [res, err] = await tools.go(api.tools.attachment.clear());
+		loading.value = false
+		if (!err) {
+			proxy.$message.error(res.msg)
+			return
+		}
+		proxy.$message.success(res.msg)
+		attachList.value = []
+	}).catch(() => {
+	})
 }
 
 function download(row) {
 	let a = document.createElement("a")
 	a.style = "display: none"
-	a.target = "_blank"
-	a.href = row.attach
+	a.href = row.path
 	document.body.appendChild(a)
 	a.click()
 	document.body.removeChild(a)
 }
 
-function remove(row) {
+async function handleScroll(event) {
+	if (loading.value || finish.value || event !== "bottom") return
+	page.value++
+	await loadData()
+}
 
+async function remove(row, index) {
+	loading.value = true
+	const res = await api.tools.attachment.del({ids: [row.attachment_id]});
+	loading.value = false
+	proxy.$message.success(res.msg)
+	attachList.value.splice(index, 1)
 }
 </script>
 
 
 <style scoped>
-.user-bar-tasks-item {
+.user-bar-attach-item {
 	margin-bottom: 10px;
 }
 
-.user-bar-tasks-item:hover {
+.user-bar-attach-item:hover {
 	border-color: var(--el-color-primary);
 }
 
-.user-bar-tasks-item-body {
+.user-bar-attach-item-body {
 	display: flex;
 }
 
-.user-bar-tasks-item-body .taskIcon {
+.user-bar-attach-item-body .attachIcon {
 	width: 45px;
 	height: 45px;
 	background: var(--el-color-primary-light-9);
@@ -134,21 +151,21 @@ function remove(row) {
 	border-radius: 20px;
 }
 
-.user-bar-tasks-item-body .taskMain {
+.user-bar-attach-item-body .attachMain {
 	flex: 1;
 }
 
-.user-bar-tasks-item-body .title h2 {
+.user-bar-attach-item-body .title h2 {
 	font-size: 15px;
 }
 
-.user-bar-tasks-item-body .title p {
+.user-bar-attach-item-body .title p {
 	font-size: 12px;
 	color: #999;
 	margin-top: 5px;
 }
 
-.user-bar-tasks-item-body .bottom {
+.user-bar-attach-item-body .bottom {
 	display: flex;
 	justify-content: space-between;
 	align-items: center;
diff --git a/src/layout/components/msg.vue b/src/layout/components/msg.vue
index 2c3e8ce..0477d4c 100644
--- a/src/layout/components/msg.vue
+++ b/src/layout/components/msg.vue
@@ -11,8 +11,7 @@
 			</el-icon>
 		</div>
 		<div v-else>
-			<el-scrollbar ref="scrollbar" height="230px" :view-style="{ 'overflow-x': 'hidden' }"
-						  @endReached="handleScroll">
+			<el-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)">
@@ -29,7 +28,11 @@
 	</div>
 	<el-divider/>
 	<div class="msg-more">
-		<el-button link type="primary" icon="el-icon-select" @click="read" :loading="loading">全部已读</el-button>
+		<el-button v-if="!isRead" link type="primary" icon="el-icon-select" @click="readAll" :loading="loading">
+			全部已读
+		</el-button>
+		<el-button v-else link type="danger" icon="el-icon-delete" @click="clearAll" :loading="loading">全部删除
+		</el-button>
 	</div>
 </template>
 
@@ -37,9 +40,10 @@
 import {getCurrentInstance, onMounted, ref} from "vue";
 import api from "@/api"
 import {useRouter} from "vue-router"
+import {ElMessageBox} from "element-plus";
+import tools from "@/utils/tools.js";
 
 const {proxy} = getCurrentInstance()
-const scrollbar = ref(null)
 const router = useRouter()
 const emit = defineEmits(['closed'])
 
@@ -49,6 +53,7 @@ let page = ref(1)
 const limit = ref(10)
 const loading = ref(false)
 const finish = ref(false)
+const isRead = ref(false)
 
 onMounted(() => {
 	loadData()
@@ -56,10 +61,10 @@ onMounted(() => {
 
 async function loadData() {
 	loading.value = true
-	let res = await api.system.message.mine({type: msgTab.value, page: page.value})
+	let res = await api.system.message.mine({page: page.value, limit: limit.value, type: msgTab.value})
 	loading.value = false
 	msgList.value = msgList.value.concat(res.data)
-	if (res.data.length > limit.value) {
+	if (res.data.length < limit.value) {
 		finish.value = true
 	}
 }
@@ -71,7 +76,7 @@ async function switchTab() {
 	await loadData()
 }
 
-async function read() {
+async function readAll() {
 	let res = await api.system.message.read({type: msgTab.value})
 	proxy.$message.success(res.msg)
 	msgList.value.forEach((item) => {
@@ -79,6 +84,27 @@ async function read() {
 			item.read_flag = 1
 		}
 	})
+	isRead.value = true
+}
+
+async function clearAll() {
+	ElMessageBox.prompt('请输入“清空所有”以确认操作', '警告', {
+		confirmButtonText: '确认',
+		cancelButtonText: '取消',
+		inputPattern: /^清空所有$/,
+		inputErrorMessage: '输入错误',
+	}).then(async () => {
+		loading.value = true
+		const [res, err] = await tools.go(api.system.message.clear({type: msgTab.value}));
+		loading.value = false
+		if (!err) {
+			proxy.$message.error(res.msg)
+			return
+		}
+		proxy.$message.success(res.msg)
+		msgList.value = []
+	}).catch(() => {
+	})
 }
 
 async function handleScroll(event) {
diff --git a/src/views/system/post/index.vue b/src/views/system/post/index.vue
index d560415..d73ecff 100644
--- a/src/views/system/post/index.vue
+++ b/src/views/system/post/index.vue
@@ -4,7 +4,7 @@
 			<el-button v-auth="'post:add'" type="primary" icon="el-icon-plus" @click="add"></el-button>
 			<el-button v-auth="'post:del'" type="danger" plain icon="el-icon-delete" :disabled="selection.length===0"
 					   @click="batch_del"></el-button>
-			<pi-export v-auth="'post:export'" module="post_export" :params="search"></pi-export>
+			<pi-export v-auth="'post:export'" module="post_export" :params="search" name="岗位列表导出"></pi-export>
 			<pi-import v-auth="'post:import'" :api-obj="api.system.post.import"></pi-import>
 		</template>
 		<template #search>