From 624f2ea7655de5d18318df2345c9afb8f81f902c Mon Sep 17 00:00:00 2001 From: zhangjiming Date: Tue, 25 Feb 2025 14:43:02 +0800 Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E6=88=B7=E3=80=81=E7=9F=BF=E7=9F=B3?= =?UTF-8?q?=E3=80=81=E6=BA=B6=E6=B6=B2=E3=80=81=E5=AE=9E=E9=AA=8C=E8=AE=B0?= =?UTF-8?q?=E5=BD=95=E6=B7=BB=E5=8A=A0=E5=88=A0=E9=99=A4=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/expeRecord/index.vue | 47 +++++++++++------- src/views/liquidConfig/index.vue | 42 +++++++++------- src/views/oreManage/index.vue | 99 +++++++++++++++++++------------------ src/views/userManage/UserManage.vue | 48 ++++++++++-------- 4 files changed, 131 insertions(+), 105 deletions(-) diff --git a/src/views/expeRecord/index.vue b/src/views/expeRecord/index.vue index 5c36af3..c5a7caa 100644 --- a/src/views/expeRecord/index.vue +++ b/src/views/expeRecord/index.vue @@ -30,19 +30,21 @@

操作员

实验名称

-
-
- +
+
+
+ +
+

{{ record.startTime }}

+

{{ userStore.userIdMap[record.createUser].nickname }}

+

{{ record.name }}

+

详情

-

{{ record.startTime }}

-

{{ userStore.userIdMap[record.createUser].nickname }}

-

{{ record.name }}

-

详情

-
+ @@ -62,6 +64,7 @@ import { deleteExperienceRecords, getExperienceRecords, type ExperienceRecord } import { showToast } from "vant"; import { useUserStore } from "@/stores/user"; import ExpeDetail from "./components/ExpeDetail.vue"; +import { ElMessageBox } from "element-plus"; const userStore = useUserStore(); const showEditDialog = ref(false); @@ -102,13 +105,19 @@ function onSelectAll() { function onDeleteRecords() { if (selectedIds.value.length === 0) return; - deleteExperienceRecords(selectedIds.value.join(",")).then(res => { - if (res.success) { - selectedIds.value = []; - getRecords(); - } else { - showToast(res.msg); - } + ElMessageBox.confirm("确定删除记录？", { + confirmButtonText: "确定", + cancelButtonText: "取消", + center: true, + }).then(() => { + deleteExperienceRecords(selectedIds.value.join(",")).then(res => { + if (res.success) { + selectedIds.value = []; + getRecords(); + } else { + showToast(res.msg); + } + }); }); } function onDetailClick(item: ExperienceRecord) { diff --git a/src/views/liquidConfig/index.vue b/src/views/liquidConfig/index.vue index 9e370a3..176192b 100644 --- a/src/views/liquidConfig/index.vue +++ b/src/views/liquidConfig/index.vue @@ -27,17 +27,19 @@

ID

溶液名称

-
-
- +
+
+
+ +
+

{{ liquid.id }}

+

{{ liquid.name }}

-

{{ liquid.id }}

-

{{ liquid.name }}

-
+ @@ -125,13 +127,19 @@ function onDeleteLiquid() { }); return; } - deleteLiquid(selectedIds.value.join(",")).then(res => { - if (res.success) { - selectedIds.value = []; - getLiquid(); - } else { - showToast(res.msg); - } + ElMessageBox.confirm("确定删除溶液？", { + confirmButtonText: "确定", + cancelButtonText: "取消", + center: true, + }).then(() => { + deleteLiquid(selectedIds.value.join(",")).then(res => { + if (res.success) { + selectedIds.value = []; + getLiquid(); + } else { + showToast(res.msg); + } + }); }); } diff --git a/src/views/oreManage/index.vue b/src/views/oreManage/index.vue index 7e6a951..90bd0f0 100644 --- a/src/views/oreManage/index.vue +++ b/src/views/oreManage/index.vue @@ -53,29 +53,31 @@

矿石名称

工艺

-
-
- +
+
+
+ +
+

{{ ore.id }}

+

{{ ore.oresName }}

+
+
    +
  • + {{ craft.name }} +
    • +
+
-

{{ ore.id }}

-

{{ ore.oresName }}

-
-
    -
  • - {{ craft.name }} -
    • -
-
-
+ @@ -189,13 +191,19 @@ function onEditOre() { } function onDeleteOre() { if (selectedIds.value.length === 0) return; - deleteOre(selectedIds.value.join(",")).then(res => { - if (res.success) { - selectedIds.value = []; - getOres(); - } else { - showToast(res.msg); - } + ElMessageBox.confirm("确定删除矿石？", { + confirmButtonText: "确定", + cancelButtonText: "取消", + center: true, + }).then(() => { + deleteOre(selectedIds.value.join(",")).then(res => { + if (res.success) { + selectedIds.value = []; + getOres(); + } else { + showToast(res.msg); + } + }); }); } function onAddCraft() { @@ -211,27 +219,20 @@ function onEditCraft() { function onDeleteCraft() { if (selectedCraftIds.value.length === 0) return; - ElMessageBox.confirm( - "确定删除工艺？", - { - confirmButtonText: '确定', - cancelButtonText: '取消', - center: true, - } - ) - .then(() => { + ElMessageBox.confirm("确定删除工艺？", { + confirmButtonText: "确定", + cancelButtonText: "取消", + center: true, + }).then(() => { deleteCraft(selectedCraftIds.value.join(",")).then(res => { - if (res.success) { - selectedCraftIds.value = []; - getOres(); - } else { - showToast(res.msg); - } - }); - }) - - - + if (res.success) { + selectedCraftIds.value = []; + getOres(); + } else { + showToast(res.msg); + } + }); + }); } function confirmCraftEdit(craft: Craft) { let req; diff --git a/src/views/userManage/UserManage.vue b/src/views/userManage/UserManage.vue index 73d87e4..1071059 100644 --- a/src/views/userManage/UserManage.vue +++ b/src/views/userManage/UserManage.vue @@ -28,19 +28,20 @@

昵称

类型

- -
-
- +
+
+
+ +
+

{{ user.username }}

+

{{ user.nickname }}

+

{{ user.role === 1 ? "管理员" : "普通用户" }}

-

{{ user.username }}

-

{{ user.nickname }}

-

{{ user.role === 1 ? "管理员" : "普通用户" }}

-
+ @@ -61,8 +62,9 @@ import { onMounted, ref } from "vue"; import { createUser, deleteUser, getUserList, type User } from "@/services/user/userManager"; import AddUser from "./components/AddUser.vue"; import { useUserStore } from "@/stores/user"; +import { ElMessageBox } from "element-plus"; -const userStore = useUserStore() +const userStore = useUserStore(); const showEditDialog = ref(false); const userList = ref([]); @@ -113,13 +115,19 @@ function addUser(user: { username: string; nickname: string; password: string }) } function onDeleteUser() { if (selectedIds.value.length === 0) return; - deleteUser(selectedIds.value.join(",")).then(res => { - if (res.success) { - selectedIds.value = []; - getUsers(); - } else { - showToast(res.msg); - } + ElMessageBox.confirm("确定删除用户？", { + confirmButtonText: "确定", + cancelButtonText: "取消", + center: true, + }).then(() => { + deleteUser(selectedIds.value.join(",")).then(res => { + if (res.success) { + selectedIds.value = []; + getUsers(); + } else { + showToast(res.msg); + } + }); }); }