系统修改

src/assets/style/common.scss

@@ -1,5 +1,5 @@
 //ui 库
-//查询表格列表统一样式
+//条件检索列表统一样式
 .tjm_card_style_custom {
     
     .tjm_card_title {

src/components/ReplyCard/tree/item.vue

@@ -73,7 +73,7 @@ export default {
                         else this.$emit("success");
                     } else ElMessage.error(res.msg);
                 });
-            }).catch(() => ElMessage.success("已取消"));
+            }).catch(() => ElMessage.info("已取消"));
         }
     }
 }

src/views/caseShare/index.vue

@@ -1,6 +1,6 @@
 <template>
     <el-card class="tjm_card_style_custom">
-        <div class="tjm_card_title">查询表格</div>
+        <div class="tjm_card_title">条件检索</div>
         <div class="tjm_card_select">
             <el-form class="tjm_card_select_left" :model="params" inline label-width="80px" label-position="left">
                 <el-form-item label="案例编号">
@@ -213,7 +213,7 @@ export default {
                         this.reloadTable();
                     } else ElMessage.error(res.msg);
                 });
-            }).catch(() => ElMessage.success("已取消"));
+            }).catch(() => ElMessage.info("已取消"));
         },
 
         table_withdraw(row) {
@@ -228,7 +228,7 @@ export default {
                         this.reloadTable();
                     } else ElMessage.error(res.msg);
                 });
-            }).catch(() => ElMessage.success("已取消"));
+            }).catch(() => ElMessage.info("已取消"));
         },
 
         table_process(row) {

src/views/manage/policyShare/index.vue

@@ -1,6 +1,6 @@
 <template>
     <el-card class="tjm_card_style_custom">
-        <div class="tjm_card_title">查询表格</div>
+        <div class="tjm_card_title">条件检索</div>
         <div class="tjm_card_select">
             <el-form class="tjm_card_select_left" :model="params" inline label-width="80px" label-position="left">
                 <el-form-item label="政策编号">
@@ -192,7 +192,7 @@ export default {
                         this.reloadTable();
                     } else ElMessage.error(res.msg);
                 });
-            }).catch(() => ElMessage.success("已取消"));
+            }).catch(() => ElMessage.info("已取消"));
         },
 
         closed(e) {

src/views/manage/policyStrive/index.vue

@@ -1,6 +1,6 @@
 <template>
     <el-card class="tjm_card_style_custom">
-        <div class="tjm_card_title">查询表格</div>
+        <div class="tjm_card_title">条件检索</div>
         <div class="tjm_card_select">
             <el-form class="tjm_card_select_left" :model="params" inline label-width="80px" label-position="left">
                 <el-form-item label="政策编号">

src/views/myBusiness/component/done.vue

@@ -1,6 +1,6 @@
 <template>
     <el-card class="tjm_card_style_custom">
-        <div class="tjm_card_title">查询表格</div>
+        <div class="tjm_card_title">条件检索</div>
         <div class="tjm_card_select">
             <el-form class="tjm_card_select_left" :model="params" inline label-width="80px" label-position="left">
                 <el-form-item label="政策名称">

src/views/myBusiness/component/toDo.vue

@@ -1,6 +1,6 @@
 <template>
     <el-card class="tjm_card_style_custom">
-        <div class="tjm_card_title">查询表格</div>
+        <div class="tjm_card_title">条件检索</div>
         <div class="tjm_card_select">
             <el-form class="tjm_card_select_left" :model="params" inline label-width="80px" label-position="left">
                 <el-form-item label="政策名称">

src/views/policyShare/index.vue

@@ -1,6 +1,6 @@
 <template>
     <el-card class="tjm_card_style_custom">
-        <div class="tjm_card_title">查询表格</div>
+        <div class="tjm_card_title">条件检索</div>
         <div class="tjm_card_select">
             <el-form class="tjm_card_select_left" :model="params" inline label-width="80px" label-position="left">
                 <!-- <el-form-item label="所属部门">
@@ -284,7 +284,7 @@ export default {
                         this.reloadTable();
                     } else ElMessage.error(res.msg);
                 });
-            }).catch(() => ElMessage.success("已取消"));
+            }).catch(() => ElMessage.info("已取消"));
         },
 
         table_withdraw(row) {
@@ -299,7 +299,7 @@ export default {
                         this.reloadTable();
                     } else ElMessage.error(res.msg);
                 });
-            }).catch(() => ElMessage.success("已取消"));
+            }).catch(() => ElMessage.info("已取消"));
         },
 
         closed(e) {

src/views/policyShare/message/index.vue

@@ -6,7 +6,7 @@
 
     <template v-else>
         <el-card class="tjm_card_style_custom">
-            <div class="tjm_card_title">查询表格</div>
+            <div class="tjm_card_title">条件检索</div>
             <div class="tjm_card_select">
                 <el-form class="tjm_card_select_left" :model="params" inline label-width="80px" label-position="left">
                     <el-form-item label="政策编号">

src/views/policyStrive/index.vue

@@ -1,6 +1,6 @@
 <template>
     <el-card class="tjm_card_style_custom">
-        <div class="tjm_card_title">查询表格</div>
+        <div class="tjm_card_title">条件检索</div>
         <div class="tjm_card_select">
             <el-form class="tjm_card_select_left" :model="params" inline label-width="80px" label-position="left">
                 <el-form-item label="政策编号">
@@ -266,7 +266,7 @@ export default {
                         this.reloadTable();
                     } else ElMessage.error(res.msg);
                 });
-            }).catch(() => ElMessage.success("已取消"));
+            }).catch(() => ElMessage.info("已取消"));
         },
 
         table_withdraw(row) {
@@ -279,7 +279,7 @@ export default {
                     if (res.code === 200) {
                         ElMessage.success("操作成功");
                         this.reloadTable();
-                    } else ElMessage.error(res.msg);
+                    } else ElMessage.info(res.msg);
                 });
             }).catch(() => ElMessage.success("已取消"));
         },

src/views/publicDomain/index.vue

@@ -5,7 +5,7 @@
     </div>
 
     <el-card v-else class="tjm_card_style_custom">
-        <div class="tjm_card_title">查询表格</div>
+        <div class="tjm_card_title">条件检索</div>
         <div class="tjm_card_select">
             <el-form class="tjm_card_select_left" :model="params" inline label-width="80px" label-position="left">
                 <el-form-item label="政策编号">

src/views/system/dept.vue

@@ -1,7 +1,7 @@
 <template>
     <div>
         <el-card class="tjm_card_style_custom">
-    <!--      <div class="tjm_card_title">查询表格</div>-->
+    <!--      <div class="tjm_card_title">条件检索</div>-->
     <!--      <div class="tjm_card_select">-->
     <!--        <div class="tjm_card_select_left">-->
     <!--          <el-form-->
@@ -183,7 +183,7 @@ const params = ref({
 const isExpandAll = ref(true) //展  开
 const tableData = ref([])  //展示数据
 
-const dialogTitle = ref('新增')
+const dialogTitle = ref("新增")
 const addShow = ref(false)
 const deptTable = ref()
 
@@ -196,8 +196,8 @@ const form = ref({
     sort: 0,
 })
 const rules = ref({
-    name: [{ required: true, message: '部门名称不能为空', trigger: 'blur' }],
-    code: [{ required: true, message: '部门代码不能为空', trigger: 'blur' }],
+    name: [{ required: true, message: "部门名称不能为空", trigger: "blur" }],
+    code: [{ required: true, message: "部门代码不能为空", trigger: "blur" }],
 })
 
 const { proxy } = getCurrentInstance()
@@ -221,7 +221,7 @@ function currentChange(e) {
 function addItem(row) {
     console.log(row)
     form.value.parentId = row.id
-    dialogTitle.value = '新增'
+    dialogTitle.value = "新增"
     addShow.value = true
 }
 
@@ -235,7 +235,7 @@ function editItem(row) {
     form.value.sort = row.sort
     form.value.deptType = row.deptType
     form.value.state = row.state === 0
-    dialogTitle.value = '编辑'
+    dialogTitle.value = "编辑"
     addShow.value = true
 }
 function addCancel() {
@@ -251,17 +251,17 @@ function resetForm() {
         deptType: 1,
         sort: 0
     }
-    if (proxy.$refs['userRef']) {
-        proxy.$refs['userRef'].resetFields()
+    if (proxy.$refs["userRef"]) {
+        proxy.$refs["userRef"].resetFields()
     }
-    console.log('重置表单')
+    console.log("重置表单")
 }
 
 function submitForm() {
-    proxy.$refs['userRef'].validate(valid => {
+    proxy.$refs["userRef"].validate(valid => {
         if (valid) {
             if (form.value.id) {
-                console.log('修改表单')
+                console.log("修改表单")
                 const params = {
                     ...form.value
                 }
@@ -269,8 +269,8 @@ function submitForm() {
                 setDepart(params).then(res => {
                     if (res.code === 200) {
                         ElMessage({
-                            message: '修改成功',
-                            type: 'success'
+                            message: "修改成功",
+                            type: "success"
                         })
                         addShow.value = false
                         resetForm()
@@ -278,7 +278,7 @@ function submitForm() {
                     }
                 })
             } else {
-                console.log('新增表单')
+                console.log("新增表单")
                 const params = {
                     ...form.value
                 }
@@ -286,8 +286,8 @@ function submitForm() {
                 addDepart(params).then(res => {
                     if (res.code === 200) {
                         ElMessage({
-                            message: '新增成功',
-                            type: 'success'
+                            message: "新增成功",
+                            type: "success"
                         })
                         addShow.value = false
                         resetForm()
@@ -300,22 +300,22 @@ function submitForm() {
 }
 
 function deleteDepartClick(row) {
-    ElMessageBox.confirm('是否确认删除"' + row.name + '"?', '删除警告', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
+    ElMessageBox.confirm(`是否确认删除"${row.name}"?`, "删除警告", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
     }).then(() => {
         deleteDepart(row.id).then(res => {
             if (res.code === 200) {
                 ElMessage({
-                    message: '删除成功',
-                    type: 'success'
+                    message: "删除成功",
+                    type: "success"
                 })
                 getList()
             } else {
                 ElMessage({
                     message: res.msg,
-                    type: 'error'
+                    type: "error"
                 })
             }
         })

src/views/system/menu.vue

@@ -1,7 +1,7 @@
 <template>
     <div>
         <el-card class="tjm_card_style_custom">
-            <div class="tjm_card_title">查询表格</div>
+            <div class="tjm_card_title">条件检索</div>
             <div class="tjm_card_select">
                 <div class="tjm_card_select_left">
                 <el-form
@@ -72,14 +72,14 @@
                     <el-table-column prop="type" label="类型" width="120">
                         <template #default="scope">
                             <el-button :type="scope.row.type == 1 ? 'primary' : 'success'" text>
-                                {{ scope.row.type == 1 ? '菜单' : '按钮' }}
+                                {{ scope.row.type == 1 ? "菜单" : "按钮" }}
                             </el-button>
                         </template>
                     </el-table-column>
                     <el-table-column prop="type" label="设备" width="120">
                         <template #default="scope">
                             <el-button :type="scope.row.menuType != 2 ? 'primary' : 'success'" text>
-                                {{ scope.row.menuType == 1 ? 'Cloud端' : scope.row.menuType == 2 ? 'APP端' : 'Boot端' }}
+                                {{ scope.row.menuType == 1 ? "Cloud端" : scope.row.menuType == 2 ? "APP端" : "Boot端" }}
                             </el-button>
                         </template>
                     </el-table-column>
@@ -266,11 +266,11 @@
 </template>
 
 <script setup>
-import { getMenuTree, addMenu, modMenu, delMenu } from '@/api/system/menu.js'
-import { watch } from 'vue'
+import { getMenuTree, addMenu, modMenu, delMenu } from "@/api/system/menu.js"
+import { watch } from "vue"
 
 const { proxy } = getCurrentInstance()
-import { ClickOutside as vClickOutside } from 'element-plus'
+import { ClickOutside as vClickOutside } from "element-plus"
 
 const loading = ref(false) //加载
 const expandKeys = reactive(["1", "1762659463383281665"]) //展开
@@ -280,10 +280,10 @@ const formInline = ref({})
 
 //弹出框
 const open = ref(false)
-const title = ref('')
+const title = ref("")
 const data = reactive({
     form: {
-        parentId: '1',
+        parentId: "1",
         type: 1,
         state: 0,
         menuType: 3,
@@ -291,31 +291,31 @@ const data = reactive({
         sort: 0
     },
     rules: {
-        id: [{ required: true, message: '上级菜单不能为空', trigger: 'blur' }],
-        name: [{ required: true, message: '菜单名称不能为空', trigger: 'blur' }],
-        code: [{ required: true, message: '菜单代码不能为空', trigger: 'blur' }],
-        path: [{ required: true, message: '菜单路径不能为空', trigger: 'blur' }]
+        id: [{ required: true, message: "上级菜单不能为空", trigger: "blur" }],
+        name: [{ required: true, message: "菜单名称不能为空", trigger: "blur" }],
+        code: [{ required: true, message: "菜单代码不能为空", trigger: "blur" }],
+        path: [{ required: true, message: "菜单路径不能为空", trigger: "blur" }]
     }
 })
 
 function reset() {
     form.value = {
-        parentId: '1',
+        parentId: "1",
         type: 1,
         state: 0,
         menuType: 3,
         systemCode: 10001,
         sort: 0
     }
-    if (proxy.$refs['menuRef']) {
-        proxy.$refs['menuRef'].resetFields()
+    if (proxy.$refs["menuRef"]) {
+        proxy.$refs["menuRef"].resetFields()
     }
 }
 
 const { form, rules } = toRefs(data)
 
 function submitForm() {
-    proxy.$refs['menuRef'].validate(valid => {
+    proxy.$refs["menuRef"].validate(valid => {
         if (valid) {
             if (form.value.id != undefined) {
                 modMenu(form.value).then(res => {
@@ -323,7 +323,7 @@ function submitForm() {
                     if (res.code == 200) {
                         ElMessage({
                             message: res.msg,
-                            type: 'success'
+                            type: "success"
                         })
                         getMenuTreeList()
                         open.value = false
@@ -342,7 +342,7 @@ function submitForm() {
                         open.value = false
                         ElMessage({
                             message: res.msg,
-                            type: 'success'
+                            type: "success"
                         })
                     } else {
                         ElMessage({
@@ -353,7 +353,7 @@ function submitForm() {
                 })
             }
         } else {
-            console.log('检验不通过')
+            console.log("检验不通过")
         }
     })
 }
@@ -442,7 +442,7 @@ function hideSelectIcon(event) {
         event.target ||
         event.currentTarget
     var className = elem.className
-    if (className !== 'el-input__inner') {
+    if (className !== "el-input__inner") {
         showChooseIcon.value = false
     }
 }
@@ -453,10 +453,10 @@ function handleAdd(row) {
     if (row != null && row.id) {
         form.value.parentId = row.id
     } else {
-        form.value.parentId = '1'
+        form.value.parentId = "1"
     }
     open.value = true
-    title.value = '添加菜单'
+    title.value = "添加菜单"
 }
 
 //修改
@@ -490,15 +490,15 @@ async function handleUpdate(row) {
     }
     console.log(form.value)
     open.value = true
-    title.value = '修改菜单'
+    title.value = "修改菜单"
 }
 
 //删除
 function handleDelete(row) {
-    ElMessageBox.confirm('是否确认删除"' + row.name + '"?', '删除警告', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
+    ElMessageBox.confirm(`是否确认删除"${row.name}"?`, "删除警告", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
     }).then(() => {
         delMenu({ id: row.id }).then(res => {
             console.log(res)
@@ -506,7 +506,7 @@ function handleDelete(row) {
                 getMenuTreeList()
                 ElMessage({
                     message: res.msg,
-                    type: 'success'
+                    type: "success"
                 })
             } else {
                 ElMessage({

src/views/system/role.vue

@@ -1,7 +1,7 @@
 <template>
     <div>
         <el-card class="tjm_card_style_custom">
-        <!--      <div class="tjm_card_title">查询表格</div>-->
+        <!--      <div class="tjm_card_title">条件检索</div>-->
         <!--      <div class="tjm_card_select">-->
         <!--        <div class="tjm_card_select_left">-->
         <!--          <el-form-->
@@ -107,7 +107,7 @@
                             <el-tag
                                 :type="scope.row.state === 1 ? 'danger' : 'success'"
                                 disable-transitions>
-                                {{ scope.row.state === 1 ? '禁用' : '启用' }}
+                                {{ scope.row.state === 1 ? "禁用" : "启用" }}
                             </el-tag>
                         </template>
                     </el-table-column>
@@ -220,21 +220,21 @@ import {
     setRole,
     setRoleMenuTree,
     setRolePortTree
-} from '@/api/system/role'
+} from "@/api/system/role"
 
-const activeName = ref('first')
+const activeName = ref("first")
 const defaultProps = ref({
-    children: 'children',
-    label: 'name'
+    children: "children",
+    label: "name"
 })
 const treeData = ref([])
 const treeData2 = ref([])
 const loading = ref(false) //加载
 // const isExpandAll = ref(false) //展开
-const dialogTitle = ref('新增')
+const dialogTitle = ref("新增")
 const addShow = ref(false)
 const sendShow = ref(false)
-const selectedRow = ref('')
+const selectedRow = ref("")
 const tableData = ref([])
 
 const form = ref({
@@ -244,8 +244,8 @@ const form = ref({
     description: null
 })
 const rules = ref({
-    name: [{ required: true, message: '角色名称不能为空', trigger: 'blur' }],
-    code: [{ required: true, message: '角色代码不能为空', trigger: 'blur' }]
+    name: [{ required: true, message: "角色名称不能为空", trigger: "blur" }],
+    code: [{ required: true, message: "角色代码不能为空", trigger: "blur" }]
 })
 
 const checkedMenuKeys = ref([])
@@ -283,13 +283,13 @@ function currentChange(e) {
 }
 
 function addClick() {
-    dialogTitle.value = '新增'
+    dialogTitle.value = "新增"
     addShow.value = true
 }
 
 function showChange(row) {
     console.log(row)
-    dialogTitle.value = '修改'
+    dialogTitle.value = "修改"
     form.value.state = row.state === 0
     form.value.description = row.description
     form.value.code = row.code
@@ -310,17 +310,17 @@ function resetForm() {
         state: true,
         description: null
     }
-    if (proxy.$refs['userRef']) {
-        proxy.$refs['userRef'].resetFields()
+    if (proxy.$refs["userRef"]) {
+        proxy.$refs["userRef"].resetFields()
     }
-    console.log('重置表单')
+    console.log("重置表单")
 }
 
 function submitForm() {
-    proxy.$refs['userRef'].validate(valid => {
+    proxy.$refs["userRef"].validate(valid => {
         if (valid) {
             if (form.value.id) {
-                console.log('修改表单')
+                console.log("修改表单")
                 const params = {
                     ...form.value
                 }
@@ -328,8 +328,8 @@ function submitForm() {
                 setRole(params).then(res => {
                     if (res.code === 200) {
                         ElMessage({
-                            message: '修改成功',
-                            type: 'success'
+                            message: "修改成功",
+                            type: "success"
                         })
                         addShow.value = false
                         resetForm()
@@ -337,7 +337,7 @@ function submitForm() {
                     }
                 })
             } else {
-                console.log('新增表单')
+                console.log("新增表单")
                 const params = {
                     ...form.value
                 }
@@ -345,8 +345,8 @@ function submitForm() {
                 addRole(params).then(res => {
                     if (res.code === 200) {
                         ElMessage({
-                            message: '新增成功',
-                            type: 'success'
+                            message: "新增成功",
+                            type: "success"
                         })
                         addShow.value = false
                         resetForm()
@@ -370,7 +370,7 @@ function sendPermissions(row) {
             getRoleMenuTree(row.id).then(resp => {
                 checkedMenuKeys.value = []
                 if (!resp.data.length) {
-                    proxy.$refs['treeRef'] && proxy.$refs['treeRef'].setCheckedNodes(checkedMenuKeys.value, false)
+                    proxy.$refs["treeRef"] && proxy.$refs["treeRef"].setCheckedNodes(checkedMenuKeys.value, false)
                     sendShow.value = true
                 } else {
                     //
@@ -398,9 +398,9 @@ function sendPermissions(row) {
             getRolePortTree(row.id).then(resp => {
                 checkedMenuKeys2.value = []
                 if (!resp.data.length) {
-                    proxy.$refs['treeRef2'].setCheckedNodes(checkedMenuKeys2.value, false)
+                    proxy.$refs["treeRef2"].setCheckedNodes(checkedMenuKeys2.value, false)
                     sendShow.value = true
-                    console.log('都没选中接口')
+                    console.log("都没选中接口")
                 } else {
                     //
                     let keys = []
@@ -414,7 +414,7 @@ function sendPermissions(row) {
                     checkedMenuKeys2.value = [...new Set(lastKeys)].filter(item => {
                         return keys.includes(item)
                     })
-                    console.log(checkedMenuKeys2.value, '123')
+                    console.log(checkedMenuKeys2.value, "123")
                     sendShow.value = true
                 }
             })
@@ -440,24 +440,24 @@ function saveAllTree() {
 
 function saveTree() {
     // 获取所有选中的节点信息（包括未完全选中的父节点）
-    const halfCheckedKeys = proxy.$refs['treeRef'].getHalfCheckedKeys() // 获取半选中（即父节点未完全选中）节点的 keys
-    const checkedKeys = proxy.$refs['treeRef'].getCheckedKeys()
-    console.log(halfCheckedKeys, '半选菜单', checkedKeys, '选中的菜单')
+    const halfCheckedKeys = proxy.$refs["treeRef"].getHalfCheckedKeys() // 获取半选中（即父节点未完全选中）节点的 keys
+    const checkedKeys = proxy.$refs["treeRef"].getCheckedKeys()
+    console.log(halfCheckedKeys, "半选菜单", checkedKeys, "选中的菜单")
     // 合并已选中的节点和半选中的节点 keys，因为半选中的节点代表有子节点被选中，需要被包括在内
     const allKeys = [...new Set([...halfCheckedKeys, ...checkedKeys])]
 
     // 调用 API，传递所有必要的节点
-    setRoleMenuTree(selectedRow.value.id, { menuIds: allKeys.join(','), roleId: selectedRow.value.id }).then(res => {
+    setRoleMenuTree(selectedRow.value.id, { menuIds: allKeys.join(","), roleId: selectedRow.value.id }).then(res => {
         if (res.code === 200) {
             // ElMessage({
-            //   message: '分配成功',
-            //   type: 'success'
+            //   message: "分配成功",
+            //   type: "success"
             // })
             sendShow.value = false
         } else {
             ElMessage({
                 message: res.msg,
-                type: 'error'
+                type: "error"
             })
         }
     })
@@ -465,46 +465,46 @@ function saveTree() {
 
 function savePortTree() {
     // 获取所有选中的节点信息（包括未完全选中的父节点）
-    const halfCheckedKeys = proxy.$refs['treeRef2'].getHalfCheckedKeys() // 获取半选中（即父节点未完全选中）节点的 keys
-    const checkedKeys = proxy.$refs['treeRef2'].getCheckedKeys()
-    console.log(halfCheckedKeys, '半选菜单', checkedKeys, '选中的菜单')
+    const halfCheckedKeys = proxy.$refs["treeRef2"].getHalfCheckedKeys() // 获取半选中（即父节点未完全选中）节点的 keys
+    const checkedKeys = proxy.$refs["treeRef2"].getCheckedKeys()
+    console.log(halfCheckedKeys, "半选菜单", checkedKeys, "选中的菜单")
     // 合并已选中的节点和半选中的节点 keys，因为半选中的节点代表有子节点被选中，需要被包括在内
     const allKeys = [...new Set([...halfCheckedKeys, ...checkedKeys])]
 
     // 调用 API，传递所有必要的节点
-    setRolePortTree({ permissionType: 1, scopeIds: allKeys.join(','), roleId: selectedRow.value.id }).then(res => {
+    setRolePortTree({ permissionType: 1, scopeIds: allKeys.join(","), roleId: selectedRow.value.id }).then(res => {
         if (res.code === 200) {
             ElMessage({
-                message: '分配成功',
-                type: 'success'
+                message: "分配成功",
+                type: "success"
             })
             sendShow.value = false
         } else {
             ElMessage({
                 message: res.msg,
-                type: 'error'
+                type: "error"
             })
         }
     })
 }
 
 function deleteRoleClick(row) {
-    ElMessageBox.confirm('是否确认删除"' + row.name + '"?', '删除警告', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
+    ElMessageBox.confirm(`是否确认删除"${row.name}"?`, "删除警告", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
     }).then(() => {
         deleteRole(row.id).then(res => {
             if (res.code === 200) {
                 ElMessage({
-                    message: '删除成功',
-                    type: 'success'
+                    message: "删除成功",
+                    type: "success"
                 })
                 getList()
             } else {
                 ElMessage({
                     message: res.msg,
-                    type: 'error'
+                    type: "error"
                 })
             }
         })

src/views/system/template/index.vue

@@ -75,7 +75,7 @@ export default {
         },
 
         table_del(row) {
-            ElMessageBox.confirm("是否确认删除?", "删除警告", {
+            ElMessageBox.confirm(`是否确认删除"${row.templateName}"?`, "删除警告", {
                 type: "warning",
                 confirmButtonText: "确定",
                 cancelButtonText: "取消"
@@ -86,7 +86,7 @@ export default {
                         this.reloadTable();
                     } else ElMessage.error(res.msg);
                 });
-            }).catch(() => ElMessage.success("已取消"));
+            }).catch(() => ElMessage.info("已取消"));
         },
 
         closed(e) {

src/views/system/user.vue

@@ -1,6 +1,6 @@
 <script setup>
-import { getMainList } from '@/api/system/depart.js'
-import { getRoleList } from '@/api/system/role'
+import { getMainList } from "@/api/system/depart.js"
+import { getRoleList } from "@/api/system/role"
 import {
     getUserList,
     addUser,
@@ -9,11 +9,11 @@ import {
     byUserIduPRole,
     delUser,
     restPwdUser
-} from '@/api/system/user.js'
+} from "@/api/system/user.js"
 const { proxy } = getCurrentInstance()
 
 //部门树
-const deptName = ref('')
+const deptName = ref("")
 const deptOptions = ref([])
 const deptOptionsEdit = ref([])
 const filterNode = (value, data) => {
@@ -21,7 +21,7 @@ const filterNode = (value, data) => {
     return data.name.indexOf(value) !== -1
 }
 watch(deptName, val => {
-    proxy.$refs['deptTreeRef'].filter(val)
+    proxy.$refs["deptTreeRef"].filter(val)
 })
 
 //查询
@@ -105,9 +105,9 @@ const form = ref({
     email: null
 })
 const rules = ref({
-    depId: [{ required: true, message: '部门不能为空', trigger: 'blur' }],
-    roleIds: [{ required: true, message: '角色不能为空', trigger: 'blur' }],
-    userName: [{ required: true, message: '用户名不能为空', trigger: 'blur' }]
+    depId: [{ required: true, message: "部门不能为空", trigger: "blur" }],
+    roleIds: [{ required: true, message: "角色不能为空", trigger: "blur" }],
+    userName: [{ required: true, message: "用户名不能为空", trigger: "blur" }]
 })
 
 function reset() {
@@ -119,29 +119,29 @@ function reset() {
         phone: null,
         email: null
     }
-    if (proxy.$refs['userRef']) {
-        proxy.$refs['userRef'].resetFields()
+    if (proxy.$refs["userRef"]) {
+        proxy.$refs["userRef"].resetFields()
     }
 }
 
-const title = ref('')
+const title = ref("")
 const open = ref(false)
 
 function submitForm() {
-    proxy.$refs['userRef'].validate(valid => {
+    proxy.$refs["userRef"].validate(valid => {
         if (valid) {
             if (form.value.id != undefined) {
                 modUser(form.value).then(res => {
                     if (res.code == 200) {
                         byUserIduPRole(form.value.id, {
-                            roleIds: form.value.roleIds.join(',')
+                            roleIds: form.value.roleIds.join(",")
                         }).then(result => {
                             if (result.code == 200) {
                                 getUserListData()
                                 open.value = false
                                 ElMessage({
                                     message: res.msg,
-                                    type: 'success'
+                                    type: "success"
                                 })
                             } else {
                                 ElMessage({
@@ -161,14 +161,14 @@ function submitForm() {
                 addUser(form.value).then(res => {
                     if (res.code == 200) {
                         byUserIduPRole(res.data.id, {
-                            roleIds: form.value.roleIds.join(',')
+                            roleIds: form.value.roleIds.join(",")
                         }).then(result => {
                             if (result.code == 200) {
                                 getUserListData()
                                 open.value = false
                                 ElMessage({
                                     message: res.msg,
-                                    type: 'success'
+                                    type: "success"
                                 })
                             } else {
                                 ElMessage({
@@ -186,7 +186,7 @@ function submitForm() {
                 })
             }
         } else {
-            console.log('检验不通过')
+            console.log("检验不通过")
         }
     })
 }
@@ -196,7 +196,7 @@ function cancel() {
 }
 function addUserBtn() {
     open.value = true
-    title.value = '新增'
+    title.value = "新增"
 }
 function modUserBtn(row) {
     console.log(row)
@@ -213,14 +213,14 @@ function modUserBtn(row) {
     byUserIdfnRole(id).then(res => {
         form.value.roleIds = res.data.map(item => item.id)
         open.value = true
-        title.value = '修改'
+        title.value = "修改"
     })
 }
 function delUserBtn(row) {
-    ElMessageBox.confirm('是否确认删除"' + row.userName + '"?', '删除警告', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
+    ElMessageBox.confirm(`是否确认删除"${row.userName}"?`, "删除警告", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
     }).then(() => {
         delUser({ ids: row.id }).then(res => {
             console.log(res)
@@ -228,7 +228,7 @@ function delUserBtn(row) {
                 getUserListData()
                 ElMessage({
                     message: res.msg,
-                    type: 'success'
+                    type: "success"
                 })
             } else {
                 ElMessage({
@@ -246,27 +246,27 @@ function selectionChange(value) {
 function delUserMoreBtn() {
     if (selectionChangeData.value.length <= 0) {
         ElMessage({
-            message: '请先选择要删除的数据',
-            type: 'warning'
+            message: "请先选择要删除的数据",
+            type: "warning"
         })
         return
     }
-    ElMessageBox.confirm('是否确认删除?', '删除警告', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
+    ElMessageBox.confirm("是否确认删除?", "删除警告", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
     }).then(() => {
         let arr = []
         selectionChangeData.value.forEach(element => {
             arr.push(element.id)
         })
-        delUser({ ids: arr.join(',') }).then(res => {
+        delUser({ ids: arr.join(",") }).then(res => {
             console.log(res)
             if (res.code == 200) {
                 getUserListData()
                 ElMessage({
                     message: res.msg,
-                    type: 'success'
+                    type: "success"
                 })
             } else {
                 ElMessage({
@@ -279,17 +279,17 @@ function delUserMoreBtn() {
 }
 
 function resetUserPwdBtn(row) {
-    ElMessageBox.confirm('是否确认重置"' + row.userName + '"密码?', '删除警告', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
+    ElMessageBox.confirm(`是否确认重置"${row.userName}"密码?`, "删除警告", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
     }).then(() => {
         restPwdUser({ id: row.id }).then(res => {
             if (res.code == 200) {
                 getUserListData()
                 ElMessage({
                     message: res.msg,
-                    type: 'success'
+                    type: "success"
                 })
             } else {
                 ElMessage({
@@ -305,7 +305,7 @@ function resetUserPwdBtn(row) {
 <template>
     <div>
         <el-card class="tjm_card_style_custom">
-            <div class="tjm_card_title">查询表格</div>
+            <div class="tjm_card_title">条件检索</div>
             <div class="tjm_card_select">
                 <div class="tjm_card_select_left">
                     <el-form
@@ -412,7 +412,7 @@ function resetUserPwdBtn(row) {
                         <el-table-column prop="email" label="电子邮箱" width="240" />
                         <el-table-column prop="state" label="用户状态">
                             <template #default="scope">
-                                {{ ['启用', '禁用'][scope.row.state] }}
+                                {{ ["启用", "禁用"][scope.row.state] }}
                             </template>
                         </el-table-column>
                         <el-table-column prop="ope" label="操作">