fix : 简化代码模板

package.json

@@ -8,34 +8,23 @@
     "preview": "vite preview"
   },
   "dependencies": {
-    "@antv/g6": "^3.5.7",
-    "@tinymce/tinymce-vue": "^4.0.7",
     "axios": "^1.4.0",
-    "d3": "^7.8.5",
     "echarts": "^5.4.2",
     "element-plus": "^2.3.5",
     "highlight.js": "9.18.5",
-    "jquery": "^3.6.0",
     "js-cookie": "^3.0.5",
     "nprogress": "^0.2.0",
     "pinia": "^2.0.35",
     "sass": "^1.62.1",
     "scss": "^0.2.4",
-    "sql-formatter": "^2.3.4",
-    "tinymce": "^5.0.4",
     "unplugin-icons": "^0.16.1",
     "vite-plugin-inspect": "^0.7.26",
     "vue": "^3.2.47",
-    "vue-clipboard3": "^2.0.0",
-    "vue-codemirror": "^6.1.1",
     "vue-json-viewer": "^3.0.4",
     "vue-router": "^4.1.6",
     "vuedraggable": "^4.1.0"
   },
   "devDependencies": {
-    "@codemirror/lang-java": "^6.0.1",
-    "@codemirror/lang-javascript": "^6.1.9",
-    "@codemirror/lang-sql": "^6.5.4",
     "@vitejs/plugin-vue": "^4.2.1",
     "@vitejs/plugin-vue-jsx": "^3.0.1",
     "lodash": "^4.17.21",

src/api/log/login.js

@@ -0,0 +1,24 @@
+import request from "@/utils/request.js";
+
+//查询登录日志
+export const getLoginLogList = (params) => {
+  return request({
+    url: "/log/login-info/list",
+    method: "get",
+    params
+  });
+};
+//查询登录日志详情
+export const getLoginLogDetail = (infoId) => {
+  return request({
+    url: `/log/login-info/${infoId}`,
+    method: "get"
+  });
+};
+//删除登录日志
+export const deleteLoginLog = (infoIds) => {
+  return request({
+    url: `/log/login-info/${infoIds}`,
+    method: "delete"
+  });
+};

src/api/log/operation.js

@@ -0,0 +1,24 @@
+import request from "@/utils/request.js";
+
+//查询操作日志
+export const getOperateLog = (params) => {
+  return request({
+    url: "/log/log/list",
+    method: "get",
+    params
+  });
+};
+//查询操作日志详情
+export const getOperateLogDetail = (operId) => {
+  return request({
+    url: `/log/log/${operId}`,
+    method: "get"
+  });
+};
+//删除操作日志
+export const deleteOperateLog = (operIds) => {
+  return request({
+    url: `/log/log/${operIds}`,
+    method: "delete"
+  });
+};

src/api/notice/notice.js

@@ -1,30 +0,0 @@
-import request from '@/utils/request.js'
-export const getNoticeList = (params) => {
-    return request({
-        url: '/notice/notice',
-        method: 'get',
-        params
-    })
-}
-export const getNoticeDetail = (noticeId) => {
-    return request({
-        url: '/notice/notice/'+noticeId,
-        method: "get"
-    });
-};
-
-
-export const addNotice = (data) => {
-    return request({
-        url: '/notice/notice',
-        method: 'post',
-        data
-    })
-}
-
-export const deleteNotice = (noticeId) => {
-    return request({
-        url: `/notice/notice/${noticeId}`,
-        method: "delete"
-    });
-};

src/api/notice/notify.js

@@ -1,43 +0,0 @@
-import request from '@/utils/request.js'
-export const getNotifyList = (params) => {
-    return request({
-        url: '/notice/notify',
-        method: 'get',
-        params
-    })
-}
-export const getNotifyDetail = (noticeId) => {
-    return request({
-        url: '/notice/notify/'+noticeId,
-        method: "get"
-    });
-};
-//已读单个消息
-export const readSingleNotify = (noticeId) => {
-    return request({
-        url: '/notice/notify/read/'+noticeId,
-        method: 'put'
-    })
-}
-//已读全部消息
-export const readAllNotify = () => {
-    return request({
-        url: '/notice/notify/read/all',
-        method: 'put'
-    })
-}
-//删除单个消息
-export const deleteSingleNotify = (noticeId) => {
-    return request({
-        url: '/notice/notify/'+noticeId,
-        method: "delete"
-    });
-};
-//删除多个消息
-export const deleteMoreNotify = (noticeIds) => {
-    return request({
-        url: '/notice/notify/batch/'+noticeIds,
-        method: "delete"
-    });
-};
-

src/api/system/dict-data.js

@@ -0,0 +1,44 @@
+import request from '@/utils/request.js'
+
+// 请求字典类型表list
+export const getDictDataList = (params) => {
+    return request({
+        url: '/dict/data',
+        method: 'get',
+        params
+    })
+}
+
+// 获取字典数据表详情
+export const getDictDataDetails = (dictCode) => {
+    return request({
+        url: '/dict/data/' + dictCode,
+        method: 'get'
+    })
+}
+
+// 新增字典数据表
+export const addDictData = (data) => {
+    return request({
+        url: '/dict/data',
+        method: 'post',
+        data
+    })
+}
+
+// 修改字典类型表
+export const editDictData = (data) => {
+    return request({
+        url: '/dict/data',
+        method: 'put',
+        data
+    })
+}
+
+// 删除字典类型表
+export const delDictData = (dictCode) => {
+    return request({
+        url: `/dict/data/${dictCode}`,
+        method: 'delete'
+    })
+}

src/api/system/dict-type.js

@@ -0,0 +1,51 @@
+import request from '@/utils/request.js'
+
+export const getDictOption = () => {
+    return request({
+        url: '/dict/type/option',
+        method: 'get'
+    })
+}
+
+// 请求字典类型表list
+export const getDictTypeList = (params) => {
+    return request({
+        url: '/dict/type',
+        method: 'get',
+        params
+    })
+}
+
+// 获取字典类型表详情
+export const getDictTypeDetails = (dictTypeId) => {
+    return request({
+        url: '/dict/type/' + dictTypeId,
+        method: 'get'
+    })
+}
+
+// 新增字典类型表
+export const addDictType = (data) => {
+    return request({
+        url: '/dict/type',
+        method: 'post',
+        data
+    })
+}
+
+// 修改字典类型表
+export const editDictType = (data) => {
+    return request({
+        url: '/dict/type',
+        method: 'put',
+        data
+    })
+}
+
+// 删除字典类型表
+export const delDictType =(dictTypeId) => {
+    return request({
+        url: '/dict/type/' + dictTypeId,
+        method: 'delete'
+    })
+}

src/assets/svg/home.svg

@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1725867856835" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="4259" xmlns:xlink="http://www.w3.org/1999/xlink" width="128" height="128"><path d="M849.237 136.533c48.26 0 87.382 39.193 87.382 87.54v456.85c0 48.346-39.122 87.54-87.382 87.54l-307.2-0.002v61.553h247.126v60.183H234.837v-60.183h247.126V768.46l-307.2 0.001c-48.26 0-87.382-39.193-87.382-87.54V224.073c0-48.347 39.122-87.54 87.382-87.54h674.474z m0 60.184H174.763c-15.081 0-27.307 12.248-27.307 27.356v456.85c0 15.108 12.226 27.355 27.307 27.355h674.474c15.081 0 27.307-12.247 27.307-27.356V224.073c0-15.108-12.226-27.356-27.307-27.356zM716.8 349.525l42.48 42.557L645.875 505.69c-37.324 37.392-97.837 37.392-135.16 0l-52.727-52.821c-13.863-13.889-36.34-13.889-50.203 0l-103.163 103.35-42.479-42.556 103.163-103.35c37.324-37.392 97.837-37.392 135.161 0l52.726 52.821c13.863 13.888 36.34 13.888 50.203 0L716.8 349.525z" fill="#000000" p-id="4260"></path></svg>

src/layout/navbar/BellSocket.vue

@@ -1,273 +0,0 @@
-<template>
-  <div>
-    <el-popover
-        :width="300"
-        trigger="click"
-        placement="bottom"
-        popper-style="box-shadow: rgb(14 18 22 / 35%) 0px 10px 38px -10px, rgb(14 18 22 / 20%) 0px 10px 20px -15px; padding: 10px;"
-    >
-      <template #reference>
-        <el-badge :hidden="total===0" :value="total" class="item">
-          <el-icon size="22px" style="cursor: pointer">
-            <Bell/>
-          </el-icon>
-        </el-badge>
-      </template>
-      <template #default>
-        <div v-if="total===0" style="height: 100px;display: flex;align-items: center;justify-content: center">
-          暂无数据~
-        </div>
-        <ul v-else>
-          <li v-for="(notice,index) in noticeList" :key="index">
-            <span @click="handleToNotifyDetail(notice,index)">{{ notice.noticeTitle }}</span>
-            <span v-if="notice.state==='0'" @click="handleRead(notice)">已读</span>
-          </li>
-        </ul>
-
-        <div class="notify-btn">
-          <el-button type="primary" @click="handlePrevious" :disabled="pageInfo.pageNum===1" link>上一页</el-button>
-          <span @click="handleMoreRead">本页已读</span>
-          <el-button type="primary" @click="handleNext" :disabled="pageInfo.pageNum*pageInfo.pageSize>total" link>下一页
-          </el-button>
-        </div>
-      </template>
-    </el-popover>
-    <el-dialog width="1200px" title="通知公告详情" v-model="visible" @close="visible=false">
-      <el-form :model="viewForm" label-width="100px">
-        <el-row>
-          <el-col :span="24" class="title-block">
-            <el-text class="title">{{ viewForm.noticeTitle }}</el-text>
-          </el-col>
-          <el-col :span="24">
-            <el-text v-if="viewForm.contentType === 'text'">{{ viewForm.noticeContent }}</el-text>
-            <span v-else v-html="viewForm.noticeContent"></span>
-          </el-col>
-        </el-row>
-      </el-form>
-    </el-dialog>
-  </div>
-</template>
-
-<script setup>
-import {getNotifyList, getNotifyDetail, readAllNotify, readSingleNotify} from "@/api/notice/notify";
-import {getToken} from '@/utils/auth'
-import {ElMessage} from "element-plus";
-import {useRouter} from "vue-router";
-const router = useRouter()
-const pageInfo = reactive({
-  pageNum: 1,
-  pageSize: 8
-})
-let send = {
-  type: "ping"
-}
-const viewForm = ref();
-const visible = ref(false);
-const showNotify = ref(false);
-const total = ref();
-const noticeList = ref();
-//查看详情
-const handleViewDetails = (noticeId) => {
-  getNotifyDetail(noticeId).then(res => {
-    visible.value = true
-    viewForm.value = res.data
-  })
-}
-const setWsUrl=(url)=>{
-  return (window.location.protocol === 'http:' ? "ws://" : "wss://")+window.location.host + import.meta.env.VITE_BASE_URL + url;
-}
-const initWebSocket = () => {
-  try {
-    //怎么区分http  https  /url(全局url)  封装url  只填个url？
-    const wsUrl=setWsUrl('/notice-ws/notice')
-    const socket = new WebSocket(wsUrl)
-    // 2. ws.send()给服务器发送信息
-    //连接发生错误的回调方法
-    socket.onerror = function () {
-      console.log("ws连接发生错误");
-    };
-    //连接成功建立的回调方法
-    socket.onopen = function () {
-      let authInfo = {
-        token: getToken(),
-        type: "auth",
-        cluster: "notice"
-      }
-      socket.send(JSON.stringify(authInfo))
-      console.log("ws连接成功");
-    }
-    //接收到消息的回调方法
-    socket.onmessage = function (event) {
-      let data = JSON.parse(event.data)
-      console.log('测试铃铛',data)
-      if (data.type === 'notice') {
-        noticeList.value.push(data.notice)
-        total.value += 1
-      } else if(!data.type&&data.cluster==="notice"){
-        noticeList.value.push(data)
-        total.value += 1
-      }
-      // console.log("服务器返回的信息: ", JSON.parse(event.data));
-    }
-    //连接关闭的回调方法
-    socket.onclose = function () {
-      // initWebSocket()
-      console.log("ws连接关闭");
-    }
-    setInterval(() => {
-      socket.send(JSON.stringify(send))
-    }, 30000)
-  } catch (e) {
-    console.log(e)
-    console.log("ws连接失败");
-  }
-}
-initWebSocket()
-
-const searchNotifyList = () => {
-  let params = {
-    cluster: "notice",
-    state: 0,
-    ...pageInfo
-  }
-  getNotifyList(params).then(res => {
-    console.log("获取到个人公告", res)
-    if (res.data) {
-      noticeList.value = res.data.rows
-      total.value = res.data.total
-    }
-    // initWebSocket()
-  })
-}
-searchNotifyList()
-
-//点击名字跳转到详情页
-const handleToNotifyDetail = (notice, index) => {
-  noticeList.value.splice(index, 1)
-  total.value -= 1
-  viewForm.value = {
-    noticeTitle: '',
-    noticeContent: ''
-  }
-  // router.push({path: `/system/notice/inform/index/${notice.noticeId}`})
-  handleViewDetails(notice.noticeId)
-}
-
-//单个已读
-const handleRead = (notice) => {
-  readSingleNotify(notice.noticeId).then(res => {
-    if (res.code === 1000) {
-      ElMessage.success(res.msg)
-      searchNotifyList()
-    } else {
-      ElMessage.error(res.msg)
-    }
-  })
-}
-//本页已读
-const handleMoreRead = () => {
-  let notifyIds = []
-  noticeList.value.forEach(item => {
-    notifyIds.push(item.noticeId)
-  })
-  readAllNotify(notifyIds).then(res => {
-    if (res.code === 1000) {
-      ElMessage.success(res.msg)
-      searchNotifyList()
-    } else {
-      ElMessage.error(res.msg)
-    }
-  })
-}
-//上一页
-const handlePrevious = () => {
-  if (pageInfo.pageNum !== 1) {
-    pageInfo.pageNum -= 1
-    searchNotifyList()
-  }
-}
-
-//下一页
-const handleNext = () => {
-  if (pageInfo.pageNum * pageInfo.pageSize <= total.value) {
-    pageInfo.pageNum += 1
-    searchNotifyList()
-  }
-}
-// onMounted(() => {
-//
-// });
-// 组件被销毁之前，清空 sock 对象
-// onBeforeUnmount(() => {
-//   // 关闭连接
-//   // 销毁 websocket 实例对象
-//   // socket = null;
-// });
-// defineExpose({
-//   searchNotifyList
-// })
-</script>
-
-<style lang="scss" scoped>
-.title-block {
-  text-align: center;
-  padding-bottom: 30px;
-
-  .title {
-    font-size: 28px;
-    font-weight: bold;
-  }
-}
-
-ul::-webkit-scrollbar {
-  width: 6px;
-}
-
-// 滚动条轨道
-ul::-webkit-scrollbar-track {
-  background: rgb(239, 239, 239);
-  border-radius: 2px;
-}
-
-// 小滑块
-ul::-webkit-scrollbar-thumb {
-  background: rgba(80, 81, 82, 0.29);
-  border-radius: 10px;
-}
-
-ul {
-  height: 100px;
-  overflow-y: auto;
-  padding: 0 10px;
-  margin-bottom: 10px;
-
-  li {
-    height: 25px;
-    line-height: 25px;
-    overflow-y: auto;
-    display: flex;
-    justify-content: space-between;
-
-    span:first-child:hover {
-      color: #2a99ff;
-      cursor: pointer;
-    }
-
-    span:last-child {
-      color: #2a99ff;
-      cursor: pointer;
-    }
-  }
-}
-
-.notify-btn {
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-
-  span {
-    color: #2a99ff;
-    cursor: pointer;
-  }
-}
-</style>

src/layout/navbar/Breadcrumb.vue

@@ -30,7 +30,7 @@ const getBreadcrumb = () => {
   let matched = route.matched.filter(item => item.meta && item.meta.title)
   const first = matched[0]
   if(!isDashboard(first)) {
-    matched = [{path: '/home', meta: {title: '首页'}}].concat(matched)
+    matched = [{path: '/home', meta: {title: '工作台'}}].concat(matched)
   }
   breadcrumbList.value.length = 0;
   const reBreadcrumbList = matched.filter(item => item.meta && item.meta.title && item.meta.breadcrumb !== false)

src/layout/navbar/index.vue

@@ -3,10 +3,9 @@
     <Hamburger></Hamburger>
     <Breadcrumb></Breadcrumb>
     <div class="right-bar">
-        <bell-socket/>
       <div class="user-box">
        <div>
-         <img :src="userInfo.avatar" alt="" @click.stop="handleVisitedP">
+<!--         <img :src="userInfo.avatar" alt="" @click.stop="handleVisitedP">-->
          <span>{{userInfo.userName}}</span>
        </div>
         <div class="person" v-if="visitedP">
@@ -25,8 +24,7 @@ import {useRouter} from 'vue-router';
 import Breadcrumb from './Breadcrumb.vue';
 import Hamburger from './Hamburger.vue';
 import {useAuthStore} from '@/stores/userstore.js'
-import BellSocket from "./BellSocket.vue";
+import {getUserInfo} from "@/api/login";
-import {getUserInfo} from "../../api/login";
 import {usePermisstionStroe} from '@/stores/permisstion'
 
 const authStore = useAuthStore()

src/router/index.js

@@ -33,7 +33,7 @@ const router = createRouter({
           name: "home",
           component: () => import("@/views/home/index.vue"),
           meta: {
-            title: "首页",
+            title: "工作台",
             breadcrumb: true,
           },
         },
@@ -46,42 +46,7 @@ const router = createRouter({
             breadcrumb: true,
           },
         },
-        {
+  
-          path: "/rapid/gen/edit/:tableId(\\d+)",
-          name: "genEdit",
-          component: () => import("@/views/rapid/gen/editTable.vue"),
-          meta: {
-            title: "数据库生成配置",
-            breadcrumb: true,
-          },
-        },
-        {
-          path: "/workflow/process/edit/:deploymentId",
-          name: "processEdit",
-          component: () => import("@/views/workflow/process/ProcessEdit.vue"),
-          meta: {
-            title: "编辑流程",
-            breadcrumb: true,
-          },
-        },
-        {
-          path: "/workflow/process",
-          name: "process",
-          component: () => import("@/views/workflow/process/index.vue"),
-          meta: {
-            title: "流程管理",
-            breadcrumb: true,
-          },
-        },
-        {
-          path: "/workflow/process/edit",
-          name: "processAdd",
-          component: () => import("@/views/workflow/process/ProcessEdit.vue"),
-          meta: {
-            title: "新增流程",
-            breadcrumb: true,
-          },
-        },
         {
           path: "/role-auth/user/:roleId(\\d+)",
           name: "distribute",
@@ -109,69 +74,8 @@ const router = createRouter({
             breadcrumb: true,
           },
         },
-        {
-          path: "/system/notice/inform/index/:queryId",
-          name: "notify",
-          component: () => import("@/views/system/notice/inform/index.vue"),
-          meta: {
-            title: "通知公告",
-            breadcrumb: false,
-          },
-        },
-        {
-          path: "/custom/query/sql/design/:queryId",
-          name: "sql",
-          component: () => import("@/views/custom-query/sql/SqlDesign.vue"),
-          meta: {
-            title: "自定义sql查询配置",
-            breadcrumb: true,
-          },
-        },
-        {
-          path: "/custom/query/data/adapter/design/:queryId",
-          name: "dataAdapter",
-          component: () =>
-            import("@/views/custom-query/data-adapter/DataAdapterDesign.vue"),
-          meta: {
-            title: "自定义数据适配器",
-            breadcrumb: true,
-          },
-        },
-        {
-          path: "/custom/query/echarts/design/:queryId",
-          name: "echarts",
-          component: () =>
-            import("@/views/custom-query/echarts-editor/EchartsDesign.vue"),
-          meta: {
-            title: "自定义echarts查询配置",
-            breadcrumb: true,
-          },
-        },
-        {
-          path: "/rapid/data/:dsId(\\d+)",
-          name: "rapid",
-          component: () => import("@/views/rapid/gen/index.vue"),
-          meta: {
-            title: "数据源关联数据",
-            breadcrumb: true,
-          },
-        },
       ],
-    },
+    }
-    {
-      path: "/topo/design/:queryId",
-      name: "topEdit",
-      component: () => import("@/views/custom-query/topo/topologyDesign.vue"),
-      meta: {
-        title: "top",
-        breadcrumb: false,
-      },
-    },
-    {
-      path: "/forbidden",
-      name: "forbidden",
-      component: () => import("@/views/forbidden/index.vue"),
-    },
   ],
 });
 

src/stores/permisstion.js

@@ -10,7 +10,15 @@ export const usePermisstionStroe = defineStore('permisstion', () => {
   const asyncRouters = ref([])
   //定义是否加载路由变量
   const isLoadRoutes = ref(false)
-  const menuList = ref([])
+  const menuList = ref([{
+    name: 'home',
+    path: '/home',
+    icon: 'home',
+    title: '工作台',
+    meta: {
+      breadcrumb: true
+    }
+  }])
 
   const setIsLoadRoutes = (status) => {
     return isLoadRoutes.value = status
@@ -21,7 +29,8 @@ export const usePermisstionStroe = defineStore('permisstion', () => {
         const sRouter = JSON.parse(JSON.stringify(res.data))
         const mData = JSON.parse(JSON.stringify(res.data))
         asyncRouters.value = formatAsyncRouters(sRouter)
-        menuList.value = generateMenu(mData)
+        // menuList.value = generateMenu(mData)
+        menuList.value = [...menuList.value, ...generateMenu(mData)]
         addAsyncRouters(asyncRouters.value)
         isLoadRoutes.value = false
       } else {
@@ -110,4 +119,4 @@ export const usePermisstionStroe = defineStore('permisstion', () => {
     setIsLoadRoutes,
     removeMenu
   }
-})
+})

src/views/home/index.vue

@@ -1,5 +1,5 @@
 <template>
-首页
+  工作台
 </template>
 
 <script setup>

src/views/monitor/logininfor/index.vue

@@ -0,0 +1,205 @@
+<template>
+  <div>
+    <el-form :model="queryParams" inline class="query-form" ref="logForm">
+      <el-form-item label="登录地址" prop="ipAddr">
+        <el-input v-model="queryParams.ipAddr" placeholder="请输入登录地址" clearable></el-input>
+      </el-form-item>
+      <el-form-item label="用户名称" prop="userName">
+        <el-input v-model="queryParams.userName" placeholder="请输入用户名称" clearable></el-input>
+      </el-form-item>
+      <el-form-item label="状态" prop="state">
+        <el-select v-model="queryParams.state" placeholder="登录状态" clearable filterable>
+          <el-option
+              v-for="item in [{label:'成功',value: '0'},{label:'失败',value: '1'}]"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="登录时间" prop="dateValue">
+        <el-config-provider>
+          <el-date-picker
+              v-model="dateValue"
+              type="datetimerange"
+              :shortcuts="shortcuts"
+              start-placeholder="开始日期"
+              end-placeholder="结束日期"
+              value-format="YYYY-MM-DD HH:mm:ss"
+          />
+        </el-config-provider>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" @click="getList" :icon="Search">搜索</el-button>
+        <el-button @click="handleReset" :icon="Refresh">重置</el-button>
+      </el-form-item>
+    </el-form>
+    <div class="query-btn">
+      <el-button type="danger" :icon="Delete"
+                 @click="handleMoreDelete(infoId)" :disabled="disabled" plain>删除
+      </el-button>
+    </div>
+    <div class="table">
+      <el-table
+          :data="list"
+          row-key="infoId"
+          :lazy="true"
+          ref="singleTable"
+          v-loading="loading"
+          @select="handleSelect"
+          v-tabh
+      >
+        <el-table-column type="selection" width="55"/>
+        <el-table-column prop="infoId" label="访问编号" align="center"/>
+        <el-table-column prop="userName" label="用户名称"  align="center"/>
+        <el-table-column prop="ipddr" label="登录地址" align="center"/>
+        <el-table-column prop="loginLocation" label="登录地点" align="center"/>
+        <el-table-column prop="browser" label="浏览器" align="center"/>
+        <el-table-column prop="os" label="操作系统" align="center"/>
+        <el-table-column prop="state" label="登录状态" align="center">
+          <template #default="scope">
+            <tag dict-type="common_state"  :value="scope.row.state"/>
+          </template>
+        </el-table-column>
+        <el-table-column prop="msg" label="操作信息" align="center"/>
+        <el-table-column prop="loginTime" label="登录日期" sortable align="center"/>
+        <el-table-column label="操作" align="center">
+          <template #default="scope">
+            <popover-delete :name="scope.row.userName" :type="'日志'"
+                            @delete="handleDelete(scope.row.infoId)"/>
+          </template>
+        </el-table-column>
+      </el-table>
+    </div>
+    <paging :current-page="pageInfo.pageNum" :page-size="pageInfo.pageSize" :page-sizes="[10, 20, 30, 40,50]"
+            :total="total" @changeSize="handleSizeChange" @goPage="handleCurrentChange"/>
+  </div>
+</template>
+
+<script setup>
+import {Search, Refresh, Delete} from '@element-plus/icons-vue'
+import {ElMessage, ElMessageBox} from "element-plus";
+import {getLoginLogList, deleteLoginLog} from "@/api/log/login";
+import Paging from "@/components/pagination/index.vue";
+
+const dateValue = ref()
+const queryParams = reactive({
+  ipAddr: '',
+  userName: '',
+  state: '',
+  startTime: '',
+  endTime: ''
+})
+const list = ref([])
+const logForm = ref()
+const singleTable = ref(null)
+const loading = ref(true)
+const pageInfo = reactive({
+  pageSize: 10,
+  pageNum: 1
+})
+const total = ref()
+const infoId = ref([])
+const disabled = ref(true)
+const shortcuts = [
+  {
+    text: '上周',
+    value: () => {
+      const end = new Date()
+      const start = new Date()
+      start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
+      return [start, end]
+    },
+  },
+  {
+    text: '上月',
+    value: () => {
+      const end = new Date()
+      const start = new Date()
+      start.setTime(start.getTime() - 3600 * 1000 * 24 * 30)
+      return [start, end]
+    },
+  },
+  {
+    text: '三月前',
+    value: () => {
+      const end = new Date()
+      const start = new Date()
+      start.setTime(start.getTime() - 3600 * 1000 * 24 * 90)
+      return [start, end]
+    },
+  },
+]
+
+//获取所有登录日志
+const getList = async () => {
+  let params = {
+    ...queryParams,
+    ...pageInfo
+  }
+  const date = dateValue.value
+  if (date !== undefined && date !== null) {
+    params.startTime = date[0]
+    params.endTime = date[1]
+  }
+  loading.value = true
+  getLoginLogList(params).then(res => {
+    if (res.code === 1000) {
+      list.value = res.data.rows
+      total.value = res.data.total
+      loading.value = false
+    }else {
+      ElMessage.error(res.msg);
+    }
+  })
+}
+
+//重置功能
+const handleReset = () => {
+  dateValue.value = []
+  logForm.value.resetFields()
+  getList()
+}
+
+//删除功能
+const handleDelete = async (infoId) => {
+  deleteLoginLog(infoId).then(res => {
+    if (res.code === 1000) {
+      ElMessage.success(res.msg)
+      getList()
+    } else {
+      ElMessage.error(res.msg)
+    }
+  })
+}
+//多删
+const handleMoreDelete = (infoId) => {
+  ElMessageBox.confirm(`确认删除名称为${infoId}的日志吗?`, '系统提示', {
+    confirmButtonText: '确定',
+    cancelButtonText: '取消',
+    type: 'warning'
+  }).then(() => {
+    handleDelete(infoId)
+  })
+}
+//勾选table数据行的 Checkbox, 多/单选删除功能
+const handleSelect = async (selection) => {
+  if (selection.length !== 0) {
+    disabled.value = false
+    infoId.value = selection.map(item => item.infoId).join()
+  } else {
+    disabled.value = true
+  }
+}
+//切换每页显示条数
+const handleSizeChange = (val) => {
+  pageInfo.pageSize = val
+  getList()
+}
+//点击页码进行分页功能
+const handleCurrentChange = (val) => {
+  pageInfo.pageNum = val
+  getList()
+}
+getList()
+</script>

src/views/monitor/operlog/index.vue

@@ -0,0 +1,337 @@
+<template>
+  <div>
+    <el-form :model="queryParams" inline class="query-form" ref="logForm">
+      <el-form-item label="服务名" prop="applicationName">
+        <el-input v-model="queryParams.applicationName" placeholder="请输入服务名" clearable></el-input>
+      </el-form-item>
+      <el-form-item label="操作名称" prop="title">
+        <el-input v-model="queryParams.title" placeholder="请输入操作名称" clearable></el-input>
+      </el-form-item>
+      <el-form-item label="操作人员" prop="operName">
+        <el-input v-model="queryParams.operName" placeholder="请输入操作人员" clearable></el-input>
+      </el-form-item>
+      <el-form-item label="类型" prop="businessType">
+        <el-select v-model="queryParams.businessType" placeholder="操作类型" clearable filterable>
+          <el-option
+              v-for="item in cacheStore.getDict('oper_type')"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="状态" prop="state">
+        <el-select v-model="queryParams.state" placeholder="操作状态" clearable filterable>
+          <el-option
+              v-for="item in [{label:'成功',value: '0'},{label:'失败',value: '1'}]"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="操作时间" prop="dateValue">
+        <el-config-provider>
+          <el-date-picker
+              v-model="dateValue"
+              type="datetimerange"
+              :shortcuts="shortcuts"
+              start-placeholder="开始日期"
+              end-placeholder="结束日期"
+              value-format="YYYY-MM-DD HH:mm:ss"
+          />
+        </el-config-provider>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" @click="getList" :icon="Search">搜索</el-button>
+        <el-button @click="handleReset" :icon="Refresh">重置</el-button>
+      </el-form-item>
+    </el-form>
+    <div class="query-btn">
+      <el-button type="danger" :icon="Delete"
+                 @click="handleMoreDelete(operIds)" :disabled="disabled" plain>删除
+      </el-button>
+    </div>
+    <div class="table">
+      <el-table
+          :data="list"
+          row-key="operId"
+          :lazy="true"
+          ref="singleTable"
+          v-loading="loading"
+          @select="handleSelect"
+          v-tabh
+      >
+        <el-table-column type="selection" width="50"/>
+        <el-table-column prop="operId" label="日志编号" align="center"/>
+        <el-table-column prop="applicationName" label="服务名称" align="center"/>
+        <el-table-column prop="title" label="操作名称" align="center"/>
+        <el-table-column prop="businessType" label="操作类型" width="100" align="center">
+          <template #default="scope">
+            <tag dict-type="oper_type" :value="scope.row.businessType"/>
+          </template>
+        </el-table-column>
+        <el-table-column prop="operName" label="操作人员" align="center"/>
+        <el-table-column prop="operIp" label="操作地址" align="center"/>
+        <el-table-column prop="operLocation" label="操作地点" align="center"/>
+        <el-table-column prop="state" label="操作状态" align="center">
+          <template #default="scope">
+            <tag dict-type="common_state" :value="scope.row.state"/>
+          </template>
+        </el-table-column>
+        <el-table-column prop="operTime" label="操作日期" sortable align="center"/>
+        <el-table-column prop="consumeTime" label="消耗时间" sortable align="center">
+          <template #default="scope">
+            {{ scope.row.consumeTime }}ms
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" align="center">
+          <template #default="scope">
+            <el-button type="primary" size="mini" @click="handleViewDetails(scope.row.operId)"  link>详细</el-button>
+            <popover-delete :name="scope.row.operId"  :type="'日志'"
+                            @delete="handleDelete(scope.row.operId)"/>
+          </template>
+        </el-table-column>
+      </el-table>
+    </div>
+    <paging :current-page="pageInfo.pageNum" :page-size="pageInfo.pageSize" :page-sizes="[10, 20, 30, 40,50]"
+            :total="total" @changeSize="handleSizeChange" @goPage="handleCurrentChange"/>
+    <el-dialog v-model="isVisited" title="操作日志详细" width="1000px">
+      <el-form :model="form">
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="服务名称：" prop="title">
+              <el-text>{{ form.applicationName }}</el-text>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="系统模块：" prop="title">
+              <el-text>{{ form.title }}</el-text>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="请求地址：" prop="operUrl">
+              <el-text>{{ form.operUrl }}</el-text>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="登录信息：" prop="title">
+              <el-breadcrumb separator="/">
+                <el-breadcrumb-item>{{ form.operName }}</el-breadcrumb-item>
+                <el-breadcrumb-item>{{ form.operIp }}</el-breadcrumb-item>
+                <el-breadcrumb-item>{{ form.operLocation }}</el-breadcrumb-item>
+              </el-breadcrumb>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="请求方式：" prop="requestMethod">
+              <el-text>{{ form.requestMethod }}</el-text>
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="操作方法：" prop="method">
+              <el-text>{{ form.method }}</el-text>
+            </el-form-item>
+            <el-form-item label="请求参数：" prop="operParam">
+              <json-viewer :value="form.operParam"
+                           :expand-depth=5
+                           copyable
+                           boxed
+                           sort></json-viewer>
+            </el-form-item>
+            <el-form-item label="返回参数：" prop="jsonResult" v-if="form.state ==0">
+              <json-viewer :value="form.jsonResult"
+                           :expand-depth=5
+                           copyable
+                           boxed
+                           sort></json-viewer>
+            </el-form-item>
+            <el-form-item label="返回参数：" prop="errorMsg" v-else>
+              <el-text>{{ form.errorMsg }}</el-text>
+            </el-form-item>
+            <el-form-item v-if="form.errorStackTrace" label="异常栈：" prop="errorMsg">
+              <el-scrollbar height="450px">
+                <div class="nowrap" v-html="form.errorStackTrace"></div>
+              </el-scrollbar>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="操作状态：" prop="state">
+              <tag dict-type="common_state" :value="form.state"/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="消耗时间：" prop="consumeTime">
+              <el-text>{{ form.consumeTime }}ms</el-text>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="操作时间：" prop="operTime">
+              <el-text>{{ form.operTime }}</el-text>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </el-dialog>
+  </div>
+</template>
+
+<script setup>
+import JsonViewer from "vue-json-viewer"
+import {Search, Refresh, Delete, View} from "@element-plus/icons-vue";
+import {getOperateLog, deleteOperateLog, getOperateLogDetail} from "@/api/log/operation";
+import {ElMessage, ElMessageBox} from "element-plus";
+import {useCacheStore} from '@/stores/cache.js'
+import Paging from "@/components/pagination/index.vue";
+
+const cacheStore = useCacheStore()
+cacheStore.setCacheKey(['oper_type'])
+import Tag from '@/components/Tag.vue'
+
+const queryParams = reactive({
+  applicationName:"",
+  title: "",
+  operName: "",
+  businessType: "",
+  state: "",
+  startTime: "",
+  endTime: ""
+});
+const form = ref();
+const list = ref([]);
+const logForm = ref();
+const singleTable = ref(null);
+const loading = ref(true);
+const dateValue = ref();
+const total = ref();
+const operIds = ref([]);
+const disabled = ref(true);
+const isVisited = ref(false);
+const pageInfo = reactive({
+  pageSize: 10,
+  pageNum: 1
+});
+const shortcuts = [
+  {
+    text: "上周",
+    value: () => {
+      const end = new Date();
+      const start = new Date();
+      start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
+      return [start, end];
+    }
+  },
+  {
+    text: "上月",
+    value: () => {
+      const end = new Date();
+      const start = new Date();
+      start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
+      return [start, end];
+    }
+  },
+  {
+    text: "三月前",
+    value: () => {
+      const end = new Date();
+      const start = new Date();
+      start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
+      return [start, end];
+    }
+  }
+];
+
+const getList = async () => {
+  let params = {
+    ...queryParams,
+    ...pageInfo
+  };
+  const date = dateValue.value;
+  if (date !== undefined && date !== null) {
+    params.startTime = date[0];
+    params.endTime = date[1];
+  }
+  loading.value = true
+  getOperateLog(params).then(res => {
+    if (res.code === 1000) {
+      list.value = res.data.rows;
+      total.value = res.data.total;
+      loading.value = false;
+    }else {
+      ElMessage.error(res.msg);
+    }
+  });
+};
+
+//重置功能
+const handleReset = () => {
+  dateValue.value = [];
+  logForm.value.resetFields();
+  getList();
+};
+//单选删除功能
+const handleDelete = async (operId) => {
+  deleteOperateLog(operId).then(res => {
+    if (res.code === 1000) {
+      ElMessage.success(res.msg);
+      getList();
+    } else {
+      ElMessage.error(res.msg);
+    }
+  });
+};
+//多删
+const handleMoreDelete = (operIds) => {
+  ElMessageBox.confirm(`确认删除名称为${operIds}的日志吗?`, '系统提示', {
+    confirmButtonText: '确定',
+    cancelButtonText: '取消',
+    type: 'warning'
+  }).then(() => {
+    handleDelete(operIds)
+  })
+}
+//勾选table数据行的 Checkbox, 实现单/多选删除功能
+const handleSelect = async (selection) => {
+  if (selection.length !== 0) {
+    disabled.value = false;
+    operIds.value = selection.map(item => item.operId).join()
+  } else {
+    disabled.value = true;
+  }
+}
+//查看详情
+const handleViewDetails = async (operId) => {
+  getOperateLogDetail(operId).then(res => {
+    if (res.code === 1000) {
+      isVisited.value = true;
+      try {
+        if (res.data.operParam !== null) {
+          res.data.operParam = JSON.parse(res.data.operParam)
+        }
+      } catch (e) {
+      }
+      if (res.data.jsonResult !== null) {
+        res.data.jsonResult = JSON.parse(res.data.jsonResult)
+      }
+      form.value = res.data
+    }
+  });
+};
+
+//切换每页显示条数
+const handleSizeChange = (val) => {
+  pageInfo.pageSize = val;
+  getList();
+};
+//点击页码进行分页功能
+const handleCurrentChange = (val) => {
+  pageInfo.pageNum = val;
+  getList();
+};
+getList();
+</script>
+<style scoped>
+:deep(.el-breadcrumb__item){
+  line-height: normal;
+}
+</style>

src/views/phone-traffic-management/address-book-management/index.vue

@@ -0,0 +1,13 @@
+<template>
+
+</template>
+
+<script>
+export default {
+  name: "index"
+}
+</script>
+
+<style scoped>
+
+</style>

src/views/phone-traffic-management/phone-traffic-config/index.vue

@@ -0,0 +1,13 @@
+<template>
+
+</template>
+
+<script>
+export default {
+  name: "index"
+}
+</script>
+
+<style scoped>
+
+</style>

src/views/system/dept/index.vue

@@ -0,0 +1,330 @@
+<template>
+  <div>
+    <el-form :model="queryParams" inline class="query-form" ref="queryInstance">
+      <el-form-item label="部门名称" prop="deptName">
+        <el-input v-model="queryParams.deptName" placeholder="请输入部门名称" clearable></el-input>
+      </el-form-item>
+      <el-form-item label="状态" prop="state">
+        <el-select v-model="queryParams.state" placeholder="部门状态" clearable filterable>
+          <el-option
+              v-for="item in cacheStore.getDict('normal_disable')"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" @click="getList" :icon="Search">搜索</el-button>
+        <el-button type="primary" @click="handleReset(queryInstance)" :icon="Refresh">重置</el-button>
+      </el-form-item>
+    </el-form>
+    <div class="table-header-btn">
+      <el-button type="primary" @click="handleAdd" :icon="Plus">新增</el-button>
+      <el-button type="info" @click="handleExpand" :icon="Sort">{{ isExpand ? '全部收起' : '全部展开' }}</el-button>
+    </div>
+    <el-table
+        :data="list"
+        ref="tableTree"
+        :default-expand-all="isExpand"
+        :tree-props="{ children: 'children', hasChildren: 'hasChildren' }"
+        row-key="deptId"
+        :lazy="true"
+        v-loading="loading"
+        @expand-change="expandChange"
+        @cell-click="cellClick"
+        v-tabh
+    >
+      <el-table-column prop="deptName" label="部门名称"/>
+      <el-table-column prop="orderNum" label="排序" width="60px"/>
+      <el-table-column prop="state" label="状态">
+        <template #default="scope">
+          <tag dict-type="normal_disable" :value="scope.row.state"/>
+        </template>
+      </el-table-column>
+      <el-table-column prop="createTime" label="创建时间"/>
+      <el-table-column label="操作" prop="operation">
+        <template #default="scope">
+          <el-button type="primary" size="mini" @click="handleAddLine(scope.row.deptId)" link>新增</el-button>
+          <el-button type="primary" size="mini" @click="handleEdit(scope.row.deptId)" link>修改</el-button>
+          <popover-delete v-if="scope.row.parentId!==0" :name="scope.row.deptName" :type="'部门'"
+                          @delete="handleDelete(scope.row.deptId)"/>
+        </template>
+      </el-table-column>
+    </el-table>
+    <el-dialog v-model="isVisited" :title="title" width="700px">
+      <el-form :model="form" ref="formInstance" label-width="90px" :rules="rules">
+        <el-row>
+          <el-col :span="24">
+            <el-form-item label="上级部门" prop="parentId">
+              <div v-if="form.parentId==0&&title=='修改部门'">
+                <el-input v-model="form.deptName" placeholder="请输入部门名称" disabled style="width: 560px"></el-input>
+              </div>
+              <el-tree-select
+                  v-else
+                  ref="treeSelect"
+                  v-model="form.parentId"
+                  placeholder="请选择上级部门"
+                  :data="deptList"
+                  :props="deptProps"
+                  value-key="value"
+                  check-strictly
+                  :render-after-expand="false"
+                  style="width: 560px"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="部门名称" prop="deptName">
+              <el-input v-model="form.deptName" placeholder="请输入部门名称"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="显示排序" prop="orderNum">
+              <el-input-number v-model="form.orderNum" style="width: 230px"></el-input-number>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="负责人" prop="leader">
+              <el-input v-model="form.leader" placeholder="请输入负责人"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="联系电话" prop="phone">
+              <el-input v-model="form.phone" placeholder="请输入联系电话"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="邮箱" prop="email">
+              <el-input v-model="form.email" placeholder="请输入邮箱"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="状态" prop="state">
+              <el-radio-group v-model="form.state" size="mini">
+                <el-radio v-for="dept in cacheStore.getDict('normal_disable')" :key="dept.value"
+                          :label="dept.value">
+                  {{ dept.label }}
+                </el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <template #footer>
+      <span>
+        <el-button @click="handleDataCancel">取消</el-button>
+        <el-button type="primary" @click="handleSubmit(formInstance)">确定</el-button>
+      </span>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+
+<script setup>
+import {Search, Refresh, Plus, Sort} from "@element-plus/icons-vue";
+import {useCacheStore} from '@/stores/cache.js'
+import {getDeptList, getDeptOption,addDept, deleteDept, editDept, getDeptDetail, getDeptExcludeOption} from "@/api/dept/dept";
+import {ElMessage, ElMessageBox} from "element-plus";
+import Tag from '@/components/Tag.vue'
+
+const cacheStore = useCacheStore()
+const queryInstance = ref()
+const queryParams = reactive({
+  deptName: '',
+  state: ''
+})
+const loading = ref(true)
+const list = ref([])
+const tableTree = ref()
+const isExpand = ref(true)
+const isVisited = ref(false);
+const title = ref();
+const form = ref();
+const formInstance = ref();
+const rules = reactive({
+  parentId: [
+    {required: true, message: '请选择上级部门', trigger: 'blur'},
+  ],
+  deptName: [
+    {required: true, message: '请输入部门名称', trigger: 'blur'},
+  ],
+  orderNum: [
+    {required: true, message: '请选择显示顺序', trigger: 'blur'},
+  ]
+})
+const deptList = ref([]);
+const deptProps = reactive({
+  value: "value",
+  label: "label"
+});
+//获取部门option
+const getDepartmentList = async () => {
+  //获取部门信息
+  getDeptOption().then(res => {
+    if (res.code === 1000) {
+      deptList.value = res.data;
+    } else {
+      ElMessage.error(res.msg);
+    }
+  });
+};
+//获取修改时的option
+const getEditOption = (deptId) => {
+  getDeptExcludeOption(deptId).then(res => {
+    if (res.code === 1000) {
+      deptList.value = res.data;
+    } else {
+      ElMessage.error(res.msg);
+    }
+  });
+}
+const getList = async () => {
+  loading.value = true
+  getDeptList(queryParams).then(res => {
+    if (res.code === 1000) {
+      list.value = res.data
+      loading.value = false
+    } else {
+      ElMessage.error(res.msg);
+    }
+  })
+}
+const getDetail = (deptId) => {
+  getDeptDetail(deptId).then(res => {
+    if (res.code === 1000) {
+      console.log(res.data)
+      if (title.value == "行内新增部门") {
+        form.value.parentId = res.data.deptId
+      } else {
+        form.value = res.data;
+      }
+    } else {
+      ElMessage.error(res.msg);
+    }
+  });
+}
+const handleReset = (instance) => {
+  if (!instance) return
+  instance.resetFields()
+  getList()
+}
+const restForm = () => {
+  form.value = {
+    leaderId: 0,
+    parentId: '',
+    deptName: null,
+    orderNum: 0,
+    state: '1',
+    leader: null,
+    phone: null,
+    email: null
+  };
+};
+
+const cellClick = (row,column) => {
+  if ("operation" !== column.property){
+    tableTree.value.toggleRowExpansion(row)
+  }
+}
+
+//添加功能
+const handleAdd = () => {
+  restForm();
+  getDepartmentList()
+  title.value = "新增部门";
+  isVisited.value = true;
+  nextTick(()=>{
+    // 清空校验
+    formInstance.value.clearValidate()
+  })
+};
+const handleAddLine = (deptId) => {
+  restForm();
+  getDepartmentList()
+  title.value = "行内新增部门";
+  isVisited.value = true;
+  getDetail(deptId)
+  nextTick(()=>{
+    // 清空校验
+    formInstance.value.clearValidate()
+  })
+}
+//编辑部门
+const handleEdit = (deptId) => {
+  restForm();
+  getEditOption(deptId)
+  getDetail(deptId)
+  title.value = "修改部门";
+  isVisited.value = true;
+  nextTick(()=>{
+    // 清空校验
+    formInstance.value.clearValidate()
+  })
+}
+
+const handleExpand = () => {
+  isExpand.value = !isExpand.value
+  expandChange(list.value, isExpand)
+  getList()
+}
+//展开收缩封装函数
+const expandChange = (data, isExpansion) => {
+  for (let i = 0; i < data.length; i++) {
+    tableTree.value.toggleRowExpansion(data[i], isExpansion);
+    if (data[i].children !== null) {
+      expandChange(data[i].children, isExpansion);
+    }
+  }
+}
+
+//删除功能
+const handleDelete = (deptId) => {
+    deleteDept(deptId).then(res => {
+      if (res.code === 1000) {
+        ElMessage.success(res.msg);
+        getList();
+      } else {
+        ElMessage.error(res.msg);
+      }
+    });
+};
+
+const handleDataCancel = () => {
+  restForm();
+  isVisited.value = false;
+};
+
+const handleSubmit = async (formInstance) => {
+  if (!formInstance) return;
+  formInstance.validate(async (valid) => {
+    if (!valid) return;
+    if (title.value == "新增部门") {
+      addDept(form.value).then(res => {
+        if (res.code === 1000) {
+          ElMessage.success(res.msg);
+          getList();
+          isVisited.value = false;
+        } else {
+          ElMessage.error(res.msg);
+        }
+      });
+    } else {
+      editDept(form.value).then(res => {
+        if (res.code === 1000) {
+          ElMessage.success(res.msg);
+          getList();
+          isVisited.value = false;
+        } else {
+          ElMessage.error(res.msg);
+        }
+      });
+    }
+  })
+}
+getList()
+</script>
+
+<style lang="scss" scoped>
+
+</style>

src/views/system/post/DistributeUser.vue

@@ -0,0 +1,356 @@
+<template>
+  <el-form :model="queryParams" class="query-form" inline ref="userForm">
+    <el-form-item label="当前岗位" prop="userName">
+      <el-tag >{{postName}}</el-tag>
+    </el-form-item>
+    <el-form-item label="用户名称" prop="userName">
+      <el-input
+          v-model="queryParams.userName"
+          placeholder="请输入用户名称"
+          clearable
+      ></el-input>
+    </el-form-item>
+    <el-form-item label="手机号码" prop="phoneNumber">
+      <el-input
+          v-model="queryParams.phoneNumber"
+          placeholder="请输入手机号码"
+          clearable
+      ></el-input>
+    </el-form-item>
+    <el-form-item>
+      <el-button type="primary" @click="searchUser" :icon="Search">搜索</el-button>
+      <el-button @click="handleReset" :icon="Refresh">重置</el-button>
+    </el-form-item>
+  </el-form>
+  <div class="table-header-btn">
+    <el-button type="primary" @click="handleAdd" :icon="Plus">添加用户</el-button>
+    <el-button type="primary" @click="handleBack" :icon="RefreshLeft" plain>返回</el-button>
+    <el-button type="danger" @click="handleCancelAll" :icon="CircleClose" plain>全部取消</el-button>
+    <el-button type="danger" @click="handleMoreCancelAuthorization(cancelUserIds,userNames)" :icon="CircleClose" plain
+               :disabled="moreCancelDisabled">批量取消
+    </el-button>
+    <el-button type="danger" @click="handleDeletePost" :icon="Delete" plain v-if="showDeleteCurrent">删除当前岗位</el-button>
+  </div>
+  <div class="table">
+    <el-table
+        :data="list"
+        row-key="userId"
+        :lazy="true"
+        ref="table"
+        v-loading="loading"
+        @select="handleSelect"
+        v-tabh
+    >
+      <el-table-column type="selection" width="55"/>
+      <el-table-column prop="userName" label="用户名称" align="center"/>
+      <el-table-column prop="nickName" label="用户昵称" align="center"/>
+      <el-table-column prop="email" label="邮箱" align="center"/>
+      <el-table-column prop="phoneNumber" label="手机号码" align="center"/>
+      <el-table-column prop="state" label="状态" align="center">
+        <template #default="scope">
+          <tag dict-type="normal_disable" :value="scope.row.state"/>
+        </template>
+      </el-table-column>
+      <el-table-column prop="createTime" label="创建时间" align="center" width="180px"/>
+      <el-table-column label="操作" align="center">
+        <template #default="scope">
+          <popover-delete :name="scope.row.userName" :type="'用户'" :btn-text="'取消授权'"
+                          @delete="handleCancelAuthorization([scope.row.userId])"/>
+        </template>
+      </el-table-column>
+    </el-table>
+  </div>
+  <paging :current-page="pageInfo.pageNum" :page-size="pageInfo.pageSize" :page-sizes="[10, 20, 30, 40,50]"
+          :total="total" @changeSize="handleSizeChange" @goPage="handleCurrentChange"/>
+  <el-dialog v-model="isVisited" :title="title" width="830px">
+    <el-form :model="query" class="query-form" inline ref="formInstance">
+      <el-form-item label="用户名称" prop="userName">
+        <el-input
+            v-model="query.userName"
+            placeholder="请输入用户名称"
+            clearable
+        ></el-input>
+      </el-form-item>
+      <el-form-item label="手机号码" prop="phoneNumber">
+        <el-input
+            v-model="query.phoneNumber"
+            placeholder="请输入手机号码"
+            clearable
+        ></el-input>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" @click="getExcludeUser" :icon="Search">搜索</el-button>
+        <el-button @click="handleDialogReset" :icon="Refresh">重置</el-button>
+      </el-form-item>
+    </el-form>
+    <div class="table">
+      <el-table
+          :data="userList"
+          row-key="userId"
+          :lazy="true"
+          ref="dialogTable"
+          v-loading="dialogLoading"
+          @select="handleDialogSelect"
+      >
+        <el-table-column type="selection" width="55"/>
+        <el-table-column prop="userName" label="用户名称" align="center"/>
+        <el-table-column prop="nickName" label="用户昵称" align="center"/>
+        <el-table-column prop="email" label="邮箱" align="center"/>
+        <el-table-column prop="phoneNumber" label="手机号码" align="center"/>
+        <el-table-column prop="state" label="状态" align="center">
+          <template #default="scope">
+            <tag dict-type="normal_disable" :value="scope.row.state"/>
+          </template>
+        </el-table-column>
+        <el-table-column prop="createTime" label="创建时间" align="center" width="180px"/>
+        <el-table-column label="操作" align="center">
+          <template #default="scope">
+            <el-button type="primary" size="mini"
+                       @click="handleSubmit([scope.row.userId])" link>添加
+            </el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+    </div>
+    <paging :current-page="pageInfo.pageNum" :page-size="pageInfo.pageSize" :page-sizes="[10, 20, 30, 40,50]"
+            :total="dialogTotal" @changeSize="handleSizeChangeDialog" @goPage="handleCurrentChangeDialog"/>
+
+    <template #footer>
+      <span>
+        <el-button @click="handleCancel">取消</el-button>
+        <el-button type="primary" @click="handleSubmit(userIds)" :disabled="dialogDisabled">批量添加</el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
+
+<script setup>
+import {Plus, Search, Refresh, RefreshLeft, Delete, CircleClose} from "@element-plus/icons-vue";
+import {ElMessage, ElMessageBox} from "element-plus";
+import {
+  getUserInfoByPostId,
+  cancelPostAndUserAuthorization,
+  unbindAllUserByPost,
+  getUserExcludePostId,
+  postBindUser
+} from "@/api/user/user";
+import {useRouter} from "vue-router";
+import Tag from '@/components/Tag.vue'
+import Paging from "@/components/pagination/index.vue";
+import {useTagsView} from '@/stores/tagsview.js'
+import {deletePost,getPostDetail} from "@/api/post/post";
+
+const tagsViewStore = useTagsView()
+const router = useRouter();
+const postId = reactive(router.currentRoute.value.params.postId)
+const postName =ref('');
+const userForm = ref();
+const table = ref();
+const title = ref('添加用户');
+const dialogTable = ref();
+const list = ref([]);
+const userList = ref([]);
+const total = ref([]);
+const dialogTotal = ref([]);
+const userIds = ref([]);
+const userNames = ref([]);
+const cancelUserIds = ref([]);
+const moreCancelDisabled = ref(true);
+const dialogDisabled = ref(true);
+const loading = ref(true);
+const dialogLoading = ref(true);
+const showDeleteCurrent = ref(false);
+const queryParams = reactive({
+  userName: "",
+  phoneNumber: ""
+});
+const query = reactive({
+  userName: "",
+  phoneNumber: ""
+});
+const pageInfo = reactive({
+  pageNum: 1,
+  pageSize: 10
+});
+const formInstance = ref();
+const isVisited = ref(false);
+const form = ref();
+onMounted(()=>{
+  getName()
+})
+const getName=()=>{
+  getPostDetail(postId).then(res => {
+    if (res.code === 1000) {
+      postName.value = res.data.postName
+    }
+  })
+}
+//用户搜索重置
+const handleReset = () => {
+  userForm.value.resetFields();
+  searchUser();
+};
+const handleDialogReset = () => {
+  formInstance.value.resetFields();
+  getExcludeUser();
+};
+//根据角色id获取用户信息
+const searchUser = async () => {
+  let params = {
+    // postId: postId,
+    ...queryParams,
+    ...pageInfo
+  };
+  loading.value = true
+  getUserInfoByPostId(postId, params).then(res => {
+    if (res.code === 1000) {
+      showDeleteCurrent.value = res.data.rows.length === 0;
+      list.value = res.data.rows;
+      total.value = res.data.total;
+      loading.value = false;
+    } else {
+      ElMessage.error(res.msg);
+    }
+  });
+};
+//获取添加弹窗的用户
+const getExcludeUser = async () => {
+  let params = {
+    // postId: postId,
+    ...query,
+    ...pageInfo
+  };
+  dialogLoading.value = true;
+  getUserExcludePostId(postId, params).then(res => {
+    if (res.code === 1000) {
+      userList.value = res.data.rows;
+      dialogTotal.value = res.data.total;
+      dialogLoading.value = false;
+    } else {
+      ElMessage.error(res.msg);
+    }
+  });
+};
+
+//添加用户
+const handleAdd = () => {
+  getExcludeUser()
+  isVisited.value = true
+  dialogDisabled.value = true
+}
+const handleBack = () => {
+  tagsViewStore.delVisitedViews(router.currentRoute.value.path)
+  router.push('/system/post')
+}
+//全部取消授权
+const handleCancelAll = () => {
+  ElMessageBox.confirm(`确认全部取消授权吗?`, "系统提示", {
+    confirmButtonText: "确定",
+    cancelButtonText: "取消",
+    type: "warning"
+  }).then(() => {
+    unbindAllUserByPost(postId).then(res => {
+      if (res.code === 1000) {
+        ElMessage.success(res.msg);
+        searchUser()
+      } else {
+        ElMessage.error(res.msg);
+      }
+    });
+  })
+}
+const handleSelect = (selection) => {
+  if (selection.length !== 0) {
+    moreCancelDisabled.value = false;
+    cancelUserIds.value = selection.map(item => item.userId)
+    userNames.value = selection.map(item => item.userName).join()
+  } else {
+    moreCancelDisabled.value = true;
+  }
+}
+//取消授权
+const handleCancelAuthorization = (userIds) => {
+  cancelPostAndUserAuthorization(userIds, postId).then(res => {
+    if (res.code === 1000) {
+      ElMessage.success(res.msg);
+      moreCancelDisabled.value = true
+      searchUser()
+    } else {
+      ElMessage.error(res.msg);
+    }
+  });
+}
+//批量取消授权
+const handleMoreCancelAuthorization = (cancelUserIds, userName) => {
+  ElMessageBox.confirm(`确认取消授权名称为"${userName}"的用户吗?`, "系统提示", {
+    confirmButtonText: "确定",
+    cancelButtonText: "取消",
+    type: "warning"
+  }).then(() => {
+    handleCancelAuthorization(cancelUserIds)
+  })
+}
+//删除当前岗位
+const handleDeletePost = () => {
+  ElMessageBox.confirm(`确认删除名称为"${postName}"的岗位吗?`, "系统提示", {
+    confirmButtonText: "确定",
+    cancelButtonText: "取消",
+    type: "warning"
+  }).then(() => {
+    deletePost(postId).then(res => {
+      if (res.code === 1000) {
+        ElMessage.success(res.msg)
+        tagsViewStore.delVisitedViews(router.currentRoute.value.path)
+        router.push('/system/post')
+      } else {
+        ElMessage.error(res.msg)
+      }
+    })
+  })
+}
+//取消
+const handleCancel = () => {
+  isVisited.value = false;
+};
+
+const handleDialogSelect = (selection) => {
+  if (selection.length !== 0) {
+    dialogDisabled.value = false;
+    userIds.value = selection.map(item => item.userId)
+  } else {
+    dialogDisabled.value = true;
+  }
+}
+const handleSubmit = (userIds) => {
+  postBindUser(userIds, postId).then(res => {
+    if (res.code === 1000) {
+      ElMessage.success(res.msg);
+      searchUser()
+      isVisited.value = false
+    } else {
+      ElMessage.error(res.msg);
+    }
+  });
+}
+//切换每页显示条数
+const handleSizeChange = (val) => {
+  pageInfo.pageSize = val;
+  searchUser();
+};
+const handleSizeChangeDialog = (val) => {
+  pageInfo.pageSize = val;
+  getExcludeUser();
+};
+
+//点击页码进行分页功能
+const handleCurrentChange = (val) => {
+  pageInfo.pageNum = val;
+  searchUser();
+};
+const handleCurrentChangeDialog = (val) => {
+  pageInfo.pageNum = val;
+  getExcludeUser();
+};
+
+searchUser()
+</script>

src/views/system/post/index.vue

@@ -0,0 +1,261 @@
+<template>
+  <div>
+    <el-form :model="queryParams" class="query-form" inline ref="queryInstance">
+      <el-form-item label="岗位名称" prop="postName">
+        <el-input v-model="queryParams.postName" placeholder="请输入岗位名称" clearable></el-input>
+      </el-form-item>
+      <el-form-item label="岗位编码" prop="postCode">
+        <el-input v-model="queryParams.postCode" placeholder="请输入岗位编码" clearable></el-input>
+      </el-form-item>
+      <el-form-item label="状态" prop="state">
+        <el-select v-model="queryParams.state" placeholder="岗位状态" clearable filterable>
+          <el-option
+              v-for="item in cacheStore.getDict('normal_disable')"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" @click="getList" :icon="Search">搜索</el-button>
+        <el-button type="primary" @click="handleReset(queryInstance)" :icon="Refresh">重置</el-button>
+      </el-form-item>
+    </el-form>
+    <div class="table-header-btn">
+      <el-button type="primary" @click="handleAdd" :icon="Plus">新增</el-button>
+      <!--      <el-button type="info" @click="handleExpand" :icon="Sort">{{ isExpand ? '全部收起' : '全部展开' }}</el-button>-->
+    </div>
+    <div class="table">
+      <el-table
+          :data="list"
+          row-key="postId"
+          :lazy="true"
+          v-loading="loading"
+          v-tabh
+      >
+        <el-table-column label="序号" type="index" align="center" width="60"/>
+        <el-table-column prop="postName" label="岗位名称"/>
+        <el-table-column prop="postCode" label="岗位编码"/>
+        <el-table-column prop="postSort" label="排序" width="60px"/>
+        <el-table-column prop="state" label="状态">
+          <template #default="scope">
+            <tag dict-type="normal_disable" :value="scope.row.state"/>
+          </template>
+        </el-table-column>
+        <el-table-column prop="createTime" label="创建时间"/>
+        <el-table-column label="操作">
+          <template #default="scope">
+            <el-button type="primary" size="mini" @click="handleEdit(scope.row.postId)" link>修改</el-button>
+            <el-button type="primary" size="mini" @click="handleAssignedUser(scope.row)" link>分配用户
+            </el-button>
+            <popover-delete v-if="scope.row.parentId!==0" :name="scope.row.postName" :type="'岗位'"
+                            @delete="handleDelete(scope.row.postId)"/>
+          </template>
+        </el-table-column>
+      </el-table>
+    </div>
+    <paging :current-page="pageInfo.pageNum" :page-size="pageInfo.pageSize" :page-sizes="[10, 20, 30, 40,50]"
+            :total="total" @changeSize="handleSizeChange" @goPage="handleCurrentChange"/>
+    <el-dialog v-model="isVisited" :title="title" width="600px">
+      <el-form :model="form" ref="formInstance" label-width="100px" :rules="rules">
+        <el-row>
+          <el-col :span="24">
+            <el-form-item label="岗位名称" prop="postName">
+              <el-input v-model="form.postName" placeholder="请输入岗位名称"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="岗位编码" prop="postCode">
+              <el-input v-model="form.postCode" placeholder="请输入岗位编码"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="11">
+            <el-form-item label="显示顺序" prop="postSort">
+              <el-input-number v-model="form.postSort"></el-input-number>
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="状态" prop="state">
+              <el-radio-group v-model="form.state" size="mini">
+                <el-radio v-for="post in cacheStore.getDict('normal_disable')" :key="post.value"
+                          :label="post.value">
+                  {{ post.label }}
+                </el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <template #footer>
+      <span>
+        <el-button @click="handleCancel">取消</el-button>
+        <el-button type="primary" @click="handleSubmit(formInstance)">确定</el-button>
+      </span>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+
+<script setup>
+import {useCacheStore} from '@/stores/cache.js'
+import {Search, Refresh, Plus} from "@element-plus/icons-vue";
+import {getPostList, addPost, deletePost, editPost, getPostDetail} from "@/api/post/post";
+import Tag from '@/components/Tag.vue'
+import {ElMessage} from "element-plus";
+import Paging from "@/components/pagination/index.vue";
+import {useRouter} from "vue-router";
+
+const router = useRouter()
+const cacheStore = useCacheStore()
+const queryInstance = ref()
+const queryParams = reactive({
+  postName: '',
+  postCode: '',
+  state: ''
+})
+const pageInfo = reactive({
+  pageSize: 10,
+  pageNum: 1
+})
+const total = ref()
+const isVisited = ref(false);
+const loading = ref(true)
+const list = ref([])
+const title = ref();
+const form = ref();
+const formInstance = ref();
+const rules = reactive({
+  postName: [
+    {required: true, message: '请输入岗位名称', trigger: 'blur'},
+  ],
+  postCode: [
+    {required: true, message: '请输入岗位编码', trigger: 'blur'},
+  ],
+  // postSort: [
+  //   {required: true, message: '请选择显示顺序', trigger: 'blur'},
+  // ]
+})
+const getList = async () => {
+  loading.value = true
+  getPostList({
+    ...queryParams,
+    ...pageInfo
+  }).then(res => {
+    if (res.code === 1000) {
+      res.data.rows = res.data.rows.sort((a, b) => {
+        return a.postSort - b.postSort
+      })
+      total.value = res.data.total;
+      list.value = res.data.rows
+      loading.value = false
+    } else {
+      ElMessage.error(res.msg);
+    }
+  })
+}
+const handleReset = (instance) => {
+  if (!instance) return
+  instance.resetFields()
+  getList()
+}
+const restForm = () => {
+  form.value = {
+    postName: null,
+    postCode: null,
+    postSort: 0,
+    state: '1'
+  };
+};
+//添加功能
+const handleAdd = () => {
+  restForm();
+  getList()
+  title.value = "新增岗位";
+  isVisited.value = true;
+};
+//修改功能
+const handleEdit = (postId) => {
+  restForm();
+  //查看详情
+  getPostDetail(postId).then(res => {
+    if (res.code === 1000) {
+      console.log('岗位详情', res.data)
+      form.value = res.data
+      title.value = "修改岗位";
+      isVisited.value = true;
+    }
+  })
+};
+//分配用户
+const handleAssignedUser = (row) => {
+  //路由跳转，携带参数
+  router.push('/post-auth/user/' + row.postId)
+}
+//删除功能
+const handleDelete = (postId) => {
+  // ElMessageBox.confirm(`确认删除名称为${row.postName}的数据吗?`, "系统提示", {
+  //   confirmButtonText: "确定",
+  //   cancelButtonText: "取消",
+  //   type: "warning"
+  // }).then(() => {
+  deletePost(postId).then(res => {
+    if (res.code === 1000) {
+      ElMessage.success(res.msg);
+      getList();
+    } else {
+      ElMessage.error(res.msg);
+    }
+  });
+  // });
+};
+
+//切换每页显示条数
+const handleSizeChange = (val) => {
+  pageInfo.pageSize = val
+  getList()
+}
+//点击页码进行分页功能
+const handleCurrentChange = (val) => {
+  pageInfo.pageNum = val
+  getList()
+}
+//取消操作
+const handleCancel = () => {
+  restForm();
+  isVisited.value = false;
+};
+
+const handleSubmit = async (formInstance) => {
+  if (!formInstance) return;
+  formInstance.validate(async (valid) => {
+    if (!valid) return;
+    if (title.value == "新增岗位") {
+      addPost(form.value).then(res => {
+        if (res.code === 1000) {
+          ElMessage.success(res.msg);
+          getList();
+          isVisited.value = false;
+        } else {
+          ElMessage.error(res.msg);
+        }
+      });
+    } else {
+      editPost(form.value).then(res => {
+        if (res.code === 1000) {
+          ElMessage.success(res.msg);
+          getList();
+          isVisited.value = false;
+        } else {
+          ElMessage.error(res.msg);
+        }
+      });
+    }
+  })
+}
+getList()
+</script>
+
+<style lang="scss" scoped>
+
+</style>

src/views/system/role/DistributeUser.vue

@@ -0,0 +1,357 @@
+<template>
+  <el-form :model="queryParams" class="query-form" inline ref="userForm">
+    <el-form-item label="当前角色" prop="userName">
+      <el-tag>{{ roleName }}</el-tag>
+    </el-form-item>
+    <el-form-item label="用户名称" prop="userName">
+      <el-input
+          v-model="queryParams.userName"
+          placeholder="请输入用户名称"
+          clearable
+      ></el-input>
+    </el-form-item>
+    <el-form-item label="手机号码" prop="phoneNumber">
+      <el-input
+          v-model="queryParams.phoneNumber"
+          placeholder="请输入手机号码"
+          clearable
+      ></el-input>
+    </el-form-item>
+    <el-form-item>
+      <el-button type="primary" @click="searchUser" :icon="Search">搜索</el-button>
+      <el-button @click="handleReset" :icon="Refresh">重置</el-button>
+    </el-form-item>
+  </el-form>
+  <div class="table-header-btn">
+    <el-button type="primary" @click="handleAdd" :icon="Plus">添加用户</el-button>
+    <el-button type="primary" @click="handleBack" :icon="RefreshLeft" plain>返回</el-button>
+    <el-button type="danger" @click="handleCancelAll" :icon="CircleClose" plain>全部取消</el-button>
+    <el-button type="danger" @click="handleMoreCancelAuthorization(cancelUserIds,userNames)" :icon="CircleClose" plain
+               :disabled="moreCancelDisabled">批量取消
+    </el-button>
+    <el-button type="danger" @click="handleDeleteRole" :icon="Delete" plain v-if="showDeleteCurrent">删除当前角色</el-button>
+  </div>
+  <div class="table">
+    <el-table
+        :data="list"
+        row-key="userId"
+        :lazy="true"
+        ref="table"
+        v-loading="loading"
+        @select="handleSelect"
+        v-tabh
+    >
+      <el-table-column type="selection" width="55"/>
+      <el-table-column prop="userName" label="用户名称" align="center"/>
+      <el-table-column prop="nickName" label="用户昵称" align="center"/>
+      <el-table-column prop="email" label="邮箱" align="center"/>
+      <el-table-column prop="phoneNumber" label="手机号码" align="center"/>
+      <el-table-column prop="state" label="状态" align="center">
+        <template #default="scope">
+          <tag dict-type="normal_disable" :value="scope.row.state"/>
+        </template>
+      </el-table-column>
+      <el-table-column prop="createTime" label="创建时间" align="center" width="180px"/>
+      <el-table-column label="操作" align="center">
+        <template #default="scope">
+          <popover-delete :name="scope.row.userName" :type="'用户'" :btn-text="'取消授权'"
+                          @delete="handleCancelAuthorization([scope.row.userId])"/>
+        </template>
+      </el-table-column>
+    </el-table>
+  </div>
+  <paging :current-page="pageInfo.pageNum" :page-size="pageInfo.pageSize" :page-sizes="[10, 20, 30, 40,50]"
+          :total="total" @changeSize="handleSizeChange" @goPage="handleCurrentChange"/>
+  <el-dialog v-model="isVisited" :title="title" width="830px">
+    <el-form :model="query" class="query-form" inline ref="formInstance">
+      <el-form-item label="用户名称" prop="userName">
+        <el-input
+            v-model="query.userName"
+            placeholder="请输入用户名称"
+            clearable
+        ></el-input>
+      </el-form-item>
+      <el-form-item label="手机号码" prop="phoneNumber">
+        <el-input
+            v-model="query.phoneNumber"
+            placeholder="请输入手机号码"
+            clearable
+        ></el-input>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" @click="getExcludeUser" :icon="Search">搜索</el-button>
+        <el-button @click="handleDialogReset" :icon="Refresh">重置</el-button>
+      </el-form-item>
+    </el-form>
+    <div class="table">
+      <el-table
+          :data="userList"
+          row-key="userId"
+          :lazy="true"
+          ref="dialogTable"
+          v-loading="dialogLoading"
+          @select="handleDialogSelect"
+      >
+        <el-table-column type="selection" width="55"/>
+        <el-table-column prop="userName" label="用户名称" align="center"/>
+        <el-table-column prop="nickName" label="用户昵称" align="center"/>
+        <el-table-column prop="email" label="邮箱" align="center"/>
+        <el-table-column prop="phoneNumber" label="手机号码" align="center"/>
+        <el-table-column prop="state" label="状态" align="center">
+          <template #default="scope">
+            <tag dict-type="normal_disable" :value="scope.row.state"/>
+          </template>
+        </el-table-column>
+        <el-table-column prop="createTime" label="创建时间" align="center" width="180px"/>
+        <el-table-column label="操作" align="center">
+          <template #default="scope">
+            <el-button type="primary" size="mini"
+                       @click="handleSubmit(scope.row.userId)" link>添加
+            </el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+    </div>
+    <paging :current-page="pageInfo.pageNum" :page-size="pageInfo.pageSize" :page-sizes="[10, 20, 30, 40,50]"
+            :total="dialogTotal" @changeSize="handleSizeChangeDialog" @goPage="handleCurrentChangeDialog"/>
+
+    <template #footer>
+      <span>
+        <el-button @click="handleCancel">取消</el-button>
+        <el-button type="primary" @click="handleSubmit(userIds)" :disabled="dialogDisabled">批量添加</el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
+
+<script setup>
+import {Plus, Search, Refresh, RefreshLeft, CircleClose, Delete} from "@element-plus/icons-vue";
+import {ElMessage, ElMessageBox} from "element-plus";
+import {getUserByRoleId, cancelAuthorization, getUserExcludeRoleId, unbindAllUser, roleBindUser} from "@/api/user/user";
+import {useRouter} from "vue-router";
+import Tag from '@/components/Tag.vue'
+import Paging from "@/components/pagination/index.vue";
+import {useTagsView} from '@/stores/tagsview.js'
+import {deleteRole, getRoleDetail} from "@/api/role/role";
+
+const tagsViewStore = useTagsView()
+const router = useRouter();
+const roleId = reactive(router.currentRoute.value.params.roleId)
+const roleName = ref('')
+const userForm = ref();
+const table = ref();
+const title = ref('添加用户');
+const dialogTable = ref();
+const list = ref([]);
+const userList = ref([]);
+const total = ref([]);
+const dialogTotal = ref([]);
+const userIds = ref([]);
+const userNames = ref([]);
+const cancelUserIds = ref([]);
+const moreCancelDisabled = ref(true);
+const dialogDisabled = ref(true);
+const loading = ref(true);
+const dialogLoading = ref(true);
+const showDeleteCurrent = ref(false);
+const queryParams = reactive({
+  userName: "",
+  phoneNumber: ""
+});
+const query = reactive({
+  userName: "",
+  phoneNumber: ""
+});
+const pageInfo = reactive({
+  pageNum: 1,
+  pageSize: 10
+});
+const formInstance = ref();
+const isVisited = ref(false);
+const form = ref();
+onMounted(()=>{
+  getRoleName()
+})
+//用户搜索重置
+const handleReset = () => {
+  userForm.value.resetFields();
+  searchUser();
+};
+const handleDialogReset = () => {
+  formInstance.value.resetFields();
+  getExcludeUser();
+};
+
+//获取角色详情
+const getRoleName = () => {
+  getRoleDetail(roleId).then(res => {
+    if (res.code === 1000) {
+      roleName.value = res.data.roleName
+    }
+  })
+}
+
+//根据角色id获取用户信息
+const searchUser = async () => {
+  let params = {
+    ...queryParams,
+    ...pageInfo
+  };
+  loading.value = true
+  getUserByRoleId(roleId, params).then(res => {
+    if (res.code === 1000) {
+      showDeleteCurrent.value = res.data.rows.length === 0;
+      list.value = res.data.rows;
+      total.value = res.data.total;
+      loading.value = false;
+    } else {
+      ElMessage.error(res.msg);
+    }
+  });
+};
+//获取添加弹窗的用户
+const getExcludeUser = async () => {
+  let params = {
+    // roleId: roleId,
+    ...query,
+    ...pageInfo
+  };
+  dialogLoading.value = true;
+  getUserExcludeRoleId(roleId, params).then(res => {
+    if (res.code === 1000) {
+      userList.value = res.data.rows;
+      dialogTotal.value = res.data.total;
+      dialogLoading.value = false;
+    } else {
+      ElMessage.error(res.msg);
+    }
+  });
+};
+
+//添加用户
+const handleAdd = () => {
+  getExcludeUser()
+  isVisited.value = true
+  dialogDisabled.value = true
+}
+const handleBack = () => {
+  tagsViewStore.delVisitedViews(router.currentRoute.value.path)
+  router.push('/system/role')
+}
+//全部取消授权
+const handleCancelAll = () => {
+  ElMessageBox.confirm(`确认全部取消授权吗?`, "系统提示", {
+    confirmButtonText: "确定",
+    cancelButtonText: "取消",
+    type: "warning"
+  }).then(() => {
+    unbindAllUser(roleId).then(res => {
+      if (res.code === 1000) {
+        ElMessage.success(res.msg);
+        searchUser()
+      } else {
+        ElMessage.error(res.msg);
+      }
+    });
+  })
+}
+const handleSelect = (selection) => {
+  if (selection.length !== 0) {
+    moreCancelDisabled.value = false;
+    cancelUserIds.value = selection.map(item => item.userId)
+    userNames.value = selection.map(item => item.userName).join()
+  } else {
+    moreCancelDisabled.value = true;
+  }
+}
+//单个取消授权
+const handleCancelAuthorization = (userIds) => {
+  cancelAuthorization({
+    id: roleId,
+    ids: userIds,
+  }).then(res => {
+    if (res.code === 1000) {
+      ElMessage.success(res.msg);
+      moreCancelDisabled.value = true
+      searchUser()
+    } else {
+      ElMessage.error(res.msg);
+    }
+  });
+}
+//批量取消授权
+const handleMoreCancelAuthorization = (cancelUserIds, userName) => {
+  ElMessageBox.confirm(`确认取消授权名称为"${userName}"的用户吗?`, "系统提示", {
+    confirmButtonText: "确定",
+    cancelButtonText: "取消",
+    type: "warning"
+  }).then(() => {
+    handleCancelAuthorization(cancelUserIds)
+  })
+}
+const handleDeleteRole = () => {
+  ElMessageBox.confirm(`确认删除名称为"${roleName}"的角色吗?`, "系统提示", {
+    confirmButtonText: "确定",
+    cancelButtonText: "取消",
+    type: "warning"
+  }).then(() => {
+    deleteRole(roleId).then(res => {
+      if (res.code === 1000) {
+        ElMessage.success(res.msg)
+        tagsViewStore.delVisitedViews(router.currentRoute.value.path)
+        router.push('/system/role')
+      } else {
+        ElMessage.error(res.msg)
+      }
+    })
+  })
+}
+//取消
+const handleCancel = () => {
+  isVisited.value = false;
+};
+
+const handleDialogSelect = (selection) => {
+  if (selection.length !== 0) {
+    dialogDisabled.value = false;
+    userIds.value = selection.map(item => item.userId)
+  } else {
+    dialogDisabled.value = true;
+  }
+}
+const handleSubmit = (userIds) => {
+  roleBindUser({
+    id: roleId,
+    ids: userIds,
+  }).then(res => {
+    if (res.code === 1000) {
+      ElMessage.success(res.msg);
+      searchUser()
+      isVisited.value = false
+    } else {
+      ElMessage.error(res.msg);
+    }
+  });
+}
+//切换每页显示条数
+const handleSizeChange = (val) => {
+  pageInfo.pageSize = val;
+  searchUser();
+};
+const handleSizeChangeDialog = (val) => {
+  pageInfo.pageSize = val;
+  getExcludeUser();
+};
+
+//点击页码进行分页功能
+const handleCurrentChange = (val) => {
+  pageInfo.pageNum = val;
+  searchUser();
+};
+const handleCurrentChangeDialog = (val) => {
+  pageInfo.pageNum = val;
+  getExcludeUser();
+};
+
+searchUser()
+</script>

src/views/system/role/add.vue

@@ -0,0 +1,268 @@
+<template>
+  <div v-loading="loading">
+    <baseTitle title="角色信息录入"></baseTitle>
+    <fvForm :schema="schame" @getInstance="getInstance" :rules="rules"></fvForm>
+    <div class="assign-menu-title" >
+      <baseTitle title="分配菜单"></baseTitle>
+      <fvSelect
+        :options="localData.tempRoleOpt"
+        v-model="localData.tempRoleSelect"
+        style="width: 200px;"
+        placeholder="请选择模版角色"
+        @change="roleTempChange"
+      />
+    </div>
+    <fvCheckbox :options="localData.checkOptions" v-model="localData.checkList" @change="checkBoxChange" />
+    <el-input v-model="localData.filterText" placeholder="请输入关键词" style="width: 400px;" />
+    <div class="menu-assign">
+      <el-tree
+        ref="menuTree"
+        :data="localData.menuData"
+        :filter-node-method="filterMenu"
+        :props="localData.menuTreeProps"
+        :check-strictly="!localData.checkStrictly"
+        show-checkbox
+        node-key="value"
+        @check-change="checkChange"
+      />
+    </div>
+    <div class="oper-page-btn">
+      <el-button color="#DED0B2" @click="handleSubmit">提交</el-button>
+      <el-button  @click="handleBack">返回</el-button>
+    </div>
+  </div>
+</template>
+
+<script setup lang="jsx">
+import { useTagsView } from '@/stores/tagsview.js'
+import { useAuthStore } from '@/stores/userstore.js'
+import fvRadio from '@/fvcomponents/fvRadio/index.vue'
+import { ElLoading, ElNotification } from 'element-plus';
+import { getMenuOptRole } from '@/api/system/menuman.js'
+import { getRoleDetail, operate, getTemRoleOption } from "@/api/role/role";
+
+const tagsViewStore = useTagsView()
+const authStore = useAuthStore()
+const route = useRoute()
+
+const form = ref(null)
+const menuTree = ref(null)
+const loading = ref(false)
+
+const isExpand = ref('展开')
+const isAllChose = ref('全选')
+const localData = reactive({
+  filterText: '',
+  menuData: [],
+  menuTreeProps: {
+    value: "value",
+    label: 'label',
+    children: 'children'
+  },
+  checkStrictly: true,
+  checkList: ['3'],
+  checkOptions: [
+    {
+      label: isExpand.value,
+      value: '1'
+    },
+    {
+      label: isAllChose.value,
+      value: '2'
+    },
+    {
+      label: '父子联动',
+      value: '3'
+    },
+  ],
+  tempRoleOpt: [],
+  tempRoleSelect: ''
+})
+
+const schame = computed(()=>{
+  let arr = [
+    {
+      label: '角色名称',
+      prop: 'roleName',
+      component: 'el-input',
+      props: {
+        placeholder: '请输入'
+      }
+    },
+    {
+      label: '角色标识',
+      prop: 'roleKey',
+      component: 'el-input',
+      props: {
+        placeholder: '请输入'
+      }
+    },
+    {
+      label: '显示顺序',
+      prop: 'roleSort',
+      component: 'el-input',
+      props: {
+        placeholder: '请输入',
+        type: 'number'
+      }
+    },
+    {
+      label: '状态',
+      prop: 'state',
+      component: markRaw(fvRadio),
+      props: {
+        cacheKey: 'normal_disable'
+      }
+    },
+    {
+      label: '是否为模版',
+      prop: 'template',
+      component: markRaw(fvRadio),
+      props: {
+        options: [
+          { label: '是', value: true },
+          { label: '否', value: false },
+        ]
+      }
+    },
+  ]
+  return !authStore.roles.includes('superAdmin') ? arr.slice(0, arr.length - 1) : arr
+})
+
+const rules = reactive({
+  roleName: [{required: true, message: '请输入', trigger: 'change'}],
+  roleKey: [{required: true, message: '请输入', trigger: 'change'}],
+  roleSort: [{required: true, message: '请输入', trigger: 'change'}],
+})
+
+const getInstance = (e) => {
+  form.value = e
+}
+
+const init = async () => {
+  form.value.setValues({state: '1', template: false})
+  const res = await getTemRoleOption()
+  localData.tempRoleOpt = res.data
+  const { data } = await getMenuOptRole(0)
+  localData.menuData = data.menuOption
+  // localData.checked = data.checked
+}
+
+const getInfo = async () => {
+  if(!route.query.id) return
+  const { data } = await getRoleDetail(route.query.id)
+  data.menuIds.forEach(key=>{
+    menuTree.value.setChecked(key, true, false)
+  })
+  form.value.setValues(data)
+}
+
+const roleTempChange = async (val) => {
+  try {
+    loading.value = true
+    const { data } = await getRoleDetail(val.value)
+    data.menuIds.forEach(key=>{
+      menuTree.value.setChecked(key, true, false)
+    })
+    delete data.roleId
+    delete data.roleName
+    delete data.roleKey
+    form.value.setValues(data)
+    loading.value = false
+  } catch (error) {
+    loading.value = false
+  }
+
+}
+
+const filterMenu = (value, data) => {
+  if(!value) return true
+  return data.menuName.includes(value)
+}
+
+const checkChange = (data) => {
+  // 获取已选
+  const checkedKeys = menuTree.value.getCheckedKeys()
+  // 获取半选
+  const halfCheckedKeys = menuTree.value.getHalfCheckedKeys()
+  return [...checkedKeys, ...halfCheckedKeys]
+}
+
+const checkBoxChange = (val) => {
+  localData.checkStrictly = val.includes('3')
+  let nodes = menuTree.value.store.nodesMap
+  if (val.includes('1')) {
+    for (const node in nodes) {
+      nodes[node].expanded = true;
+    }
+    isExpand.value = '折叠'
+  } else {
+    for (const node in nodes) {
+      nodes[node].expanded = false;
+    }
+    isExpand.value = '展开'
+  }
+  if (val.includes('2')) {
+    menuTree.value.setCheckedNodes(localData.menuData)
+    isAllChose.value = '不全选'
+  } else {
+    menuTree.value.setCheckedNodes([])
+    isAllChose.value = '全选'
+  }
+}
+
+const handleSubmit = async () => {
+  const loading = ElLoading.service({fullscreen: true})
+  const { isValidate } = await form.value.validate()
+  if(!isValidate){
+    loading.close()
+    return Promise.reject()
+  }
+  const values = form.value.getValues()
+  values.menuIds = checkChange()
+  operate(values).then(res=>{
+    ElNotification({
+      title: route.query.isAdd ? '新增' : '编辑',
+      message: res.msg,
+      type: res.code === 1000 ? 'success' : 'error'
+    })
+    loading.close()
+    res.code === 1000 ? tagsViewStore.delViewAndGoView('/system/role') : null
+  }).finally(()=>{
+    loading.close()
+  })
+}
+
+const handleBack = () => {
+  history.back()
+}
+
+watch(localData, (val)=>{
+  menuTree.value.filter(val.filterText)
+})
+
+onMounted( async ()=>{
+  loading.value = true
+  await init()
+  if(route.query.id) {
+    await getInfo()
+  }
+  loading.value = false
+})
+</script>
+
+<style lang="scss" scoped>
+.assign-menu-title {
+  display: flex;
+  justify-content: flex-start;
+  align-items: center;
+  >div:first-child {
+    margin-right: 15px;
+  }
+}
+.menu-assign {
+  width: 400px;
+  max-height: 500px;
+  overflow: auto;
+}
+</style>

src/views/system/role/index.vue

@@ -0,0 +1,486 @@
+<template>
+  <div>
+    <!-- 角色管理 -->
+    <el-form :model="queryParams" class="query-form" inline ref="roleForm">
+      <el-form-item label="角色名称" prop="roleName">
+        <el-input
+            v-model="queryParams.roleName"
+            placeholder="请输入角色名称"
+            clearable
+        ></el-input>
+      </el-form-item>
+      <el-form-item label="权限字符" prop="roleKey">
+        <el-input
+            v-model="queryParams.roleKey"
+            placeholder="请输入权限字符"
+            clearable
+        ></el-input>
+      </el-form-item>
+      <el-form-item label="状态" prop="state">
+        <el-select
+            v-model="queryParams.state"
+            placeholder="请选择角色状态"
+            clearable
+            filterable
+        >
+          <el-option
+              v-for="item in cacheStore.getDict('normal_disable')"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="登录时间" prop="dateValue">
+        <el-config-provider>
+          <el-date-picker
+              v-model="dateValue"
+              type="datetimerange"
+              :shortcuts="shortcuts"
+              start-placeholder="开始日期"
+              end-placeholder="结束日期"
+              value-format="YYYY-MM-DD HH:mm:ss"
+          />
+        </el-config-provider>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" @click="getList" :icon="Search">搜索</el-button>
+        <el-button @click="handleReset" :icon="Refresh">重置</el-button>
+      </el-form-item>
+    </el-form>
+    <div class="table-header-btn">
+      <el-button type="primary" @click="handleAdd" :icon="Plus">新增</el-button>
+    </div>
+    <div class="table">
+      <el-table
+          :data="list"
+          ref="table"
+          row-key="roleId"
+          :lazy="true"
+          v-loading="loading"
+          v-tabh
+      >
+        <el-table-column label="序号" type="index" align="center" width="60"/>
+        <!--      <el-table-column prop="roleId" label="角色编号" align="center"/>-->
+        <el-table-column prop="roleName" label="角色名称" align="center"/>
+        <el-table-column prop="roleKey" label="角色权限" align="center"/>
+        <el-table-column prop="dataScope" label="数据范围" align="center">
+          <template #default="scope">
+            <el-text v-if="scope.row.dataScope == '1'">所有数据权限</el-text>
+            <el-text v-if="scope.row.dataScope == '2'">自定义数据权限</el-text>
+            <el-text v-if="scope.row.dataScope == '3'">本部门数据权限</el-text>
+            <el-text v-if="scope.row.dataScope == '4'">本部门及以下数据权限</el-text>
+          </template>
+        </el-table-column>
+        <el-table-column prop="roleSort" label="显示顺序" align="center" width="100px"/>
+        <el-table-column prop="state" label="状态" align="center">
+          <template #default="scope">
+            <tag dict-type="normal_disable" :value="scope.row.state"/>
+          </template>
+        </el-table-column>
+        <el-table-column prop="createTime" label="创建时间" align="center"/>
+        <el-table-column label="操作" align="center">
+          <template #default="scope">
+            <el-button type="primary" size="mini"  @click="handleEdit(scope.row.roleId)" link>修改
+            </el-button>
+            <el-button type="primary" size="mini"  @click="handleAssignedUser(scope.row)" link>分配用户
+            </el-button>
+            <popover-delete :name="scope.row.roleName" :type="'角色'"
+                            @delete="handleDel(scope.row.roleId)"/>
+          </template>
+        </el-table-column>
+      </el-table>
+    </div>
+    <paging :current-page="pageInfo.pageNum" :page-size="pageInfo.pageSize" :page-sizes="[10, 20, 30, 40,50]"
+            :total="total" @changeSize="handleSizeChange" @goPage="handleCurrentChange"/>
+
+    <el-dialog v-model="isVisited" :title="title" width="700px">
+      <el-form :model="form" ref="formInstance" label-width="100px" :rules="rules">
+        <el-row>
+          <el-col :span="24">
+            <el-form-item label="角色名称" prop="roleName">
+              <el-input v-model="form.roleName" placeholder="请输入角色名称"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="角色权限" prop="roleKey">
+              <el-input v-model="form.roleKey" placeholder="请输入角色权限"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="11">
+            <el-form-item label="显示顺序" prop="roleSort">
+              <el-input-number v-model="form.roleSort"></el-input-number>
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="数据范围" prop="dataScope">
+              <el-radio-group v-model="form.dataScope" size="mini">
+                <el-radio
+                    v-for="role in [{value:'1',label:'所有数据权限'},{value:'2',label:'自定义数据权限'},{value:'3',label:'本部门数据权限'},{value:'4',label:'本部门及以下数据权限'}]"
+                    :key="role.value" :label="role.value">
+                  {{ role.label }}
+                </el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="状态" prop="state">
+              <el-radio-group v-model="form.state" size="mini">
+                <el-radio v-for="role in cacheStore.getDict('normal_disable')" :key="role.value"
+                          :label="role.value">
+                  {{ role.label }}
+                </el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="菜单权限" prop="menuIds">
+              <div style="display: flex;flex-direction: column">
+                <el-checkbox-group v-model="checkList" @change="changeCheckbox">
+                  <el-checkbox label="1">{{ isExpand }}</el-checkbox>
+                  <el-checkbox label="2">{{ isAllChose }}</el-checkbox>
+                  <el-checkbox label="3">父子联动</el-checkbox>
+                </el-checkbox-group>
+                <div class="dialog-tree ">
+                  <el-tree
+                      :data="treeData"
+                      :props="treeProps"
+                      node-key="menuId"
+                      ref="tree"
+                      :check-strictly="checkStrictly"
+                      show-checkbox
+                      @check-change="handleCheckChange"
+                  />
+                </div>
+              </div>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <template #footer>
+      <span>
+        <el-button @click="handleCancel">取消</el-button>
+        <el-button type="primary" @click="handleSubmit(formInstance)">确定</el-button>
+      </span>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+
+<script setup>
+import {Plus} from "@element-plus/icons-vue";
+import {useRouter} from 'vue-router'
+import {ElMessage, ElMessageBox} from "element-plus";
+import {useCacheStore} from "@/stores/cache.js";
+import {getMenuList} from '@/api/system/menuman.js'
+import {getRoleList, getRoleDetail, deleteRole, addRole, editRole} from "@/api/role/role";
+import {Search, Refresh, EditPen, Delete, User} from '@element-plus/icons-vue'
+import Tag from '@/components/Tag.vue'
+import Paging from "@/components/pagination/index.vue";
+
+const router = useRouter()
+const pageInfo = reactive({
+  pageSize: 10,
+  pageNum: 1
+})
+const cacheStore = useCacheStore();
+const queryParams = reactive({
+  roleName: "",
+  roleKey: "",
+  state: "",
+  startTime: '',
+  endTime: ''
+});
+const treeData = ref([])
+const tree = ref()
+const isExpand = ref('展开')
+const isAllChose = ref('全选')
+const table = ref()
+const menuIds = ref([])
+const checkStrictly = ref(false)
+const rules = reactive({
+  roleName: [
+    {required: true, message: '请输入角色名称', trigger: 'blur'},
+  ],
+  roleKey: [
+    {required: true, message: '请输入角色权限', trigger: 'blur'},
+  ],
+  roleSort: [
+    {required: true, message: '请选择显示顺序', trigger: 'blur'},
+  ]
+})
+const checkList = ref(['3'])
+const treeProps = {
+  value: "menuId",
+  label: 'menuName',
+  children: 'children'
+}
+const dateValue = ref()
+const total = ref()
+const shortcuts = [
+  {
+    text: '上周',
+    value: () => {
+      const end = new Date()
+      const start = new Date()
+      start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
+      return [start, end]
+    },
+  },
+  {
+    text: '上月',
+    value: () => {
+      const end = new Date()
+      const start = new Date()
+      start.setTime(start.getTime() - 3600 * 1000 * 24 * 30)
+      return [start, end]
+    },
+  },
+  {
+    text: '三月前',
+    value: () => {
+      const end = new Date()
+      const start = new Date()
+      start.setTime(start.getTime() - 3600 * 1000 * 24 * 90)
+      return [start, end]
+    },
+  },
+]
+const loading = ref(true);
+const roleForm = ref();
+const list = ref([]);
+const isVisited = ref(false);
+const title = ref();
+const form = ref();
+const formInstance = ref();
+//重置from表单
+const restForm = () => {
+  form.value = {
+    roleId: '',
+    roleName: null,
+    roleSort: 0,
+    state: '1',
+    roleKey: null,
+    dataScope: '1',
+    menuIds: []
+  };
+};
+const getList = async () => {
+  let params = {
+    ...queryParams,
+    ...pageInfo
+  }
+  let date = dateValue.value
+  if (date !== undefined && date !== null) {
+    params.startTime = date[0]
+    params.endTime = date[1]
+  }
+  loading.value = true
+  getRoleList(params).then(res => {
+    if (res.code === 1000) {
+      res.data.rows = res.data.rows.sort((a, b) => {
+        return a.roleSort - b.roleSort
+      })
+      list.value = res.data.rows
+      total.value = res.data.total
+      loading.value = false
+    }else {
+      ElMessage.error(res.msg);
+    }
+  })
+};
+
+
+//重置功能
+const handleReset = () => {
+  dateValue.value = []
+  roleForm.value.resetFields()
+  getList()
+}
+
+//添加功能
+const handleAdd = () => {
+  if( tree.value!==undefined){
+    tree.value.setCheckedKeys([])
+  }
+  // getMenu()
+  getMenuList().then(res => {
+    treeData.value = res.data
+  })
+  restForm();
+  rules.roleKey[0].required = true
+  title.value = "新增角色";
+  isVisited.value = true;
+  nextTick(()=>{
+    // 清空校验
+    formInstance.value.clearValidate()
+  })
+};
+
+//修改功能
+const handleEdit = (roleId) => {
+  restForm();
+  //查看详情
+  getRoleDetail(roleId).then(res => {
+    if (res.code === 1000) {
+      console.log('角色详情', res.data)
+      rules.roleKey[0].required = false
+      menuIds.value = res.data.menuIds
+      form.value = res.data
+      title.value = "修改角色";
+      isVisited.value = true;
+      nextTick(()=>{
+        // 清空校验
+        formInstance.value.clearValidate()
+      })
+    }
+  })
+  getMenu()
+};
+//删除功能
+const handleDel = (roleId) => {
+  // ElMessageBox.confirm(`确认删除角色名称为${row.roleName}的数据吗?`, "系统提示", {
+  //   confirmButtonText: "确定",
+  //   cancelButtonText: "取消",
+  //   type: "warning",
+  // }).then(() => {
+    deleteRole(roleId).then(res => {
+      if (res.code === 1000) {
+        ElMessage.success(res.msg);
+        getList();
+      } else {
+        ElMessage.error(res.msg);
+      }
+    });
+  // });
+};
+//分配用户
+const handleAssignedUser = (row) => {
+  //路由跳转，携带参数
+  router.push('/role-auth/user/' + row.roleId)
+}
+//获取菜单名称
+const getMenu = async () => {
+  let params = {
+    ...queryParams
+  }
+  getMenuList(params).then(res => {
+    tree.value.setCheckedKeys(menuIds.value)
+    treeData.value = res.data
+  })
+}
+//多选框事件
+const changeCheckbox = (checked) => {
+  //父子联动
+  checkStrictly.value = checked.indexOf("3") === -1;
+  let nodes = tree.value.store.nodesMap;
+  console.log('checked',checked)
+  //展开/折叠
+  if (checked.indexOf("1") === 1) {
+    for (const node in nodes) {
+      nodes[node].expanded = true;
+    }
+    isExpand.value = '折叠'
+  } else {
+    for (const node in nodes) {
+      nodes[node].expanded = false;
+    }
+    isExpand.value = '展开'
+  }
+  //全选/全不选
+  if (checked.indexOf("2") === 1) {
+    tree.value.setCheckedNodes(treeData.value)
+    isAllChose.value = '不全选'
+  } else {
+    tree.value.setCheckedNodes([])
+    isAllChose.value = '全选'
+  }
+}
+
+//点击新增/修改弹窗上的tree节点的左边选择框
+const handleCheckChange = (data) => {
+  form.value.menuIds = tree.value.getCheckedKeys()
+}
+
+
+//取消操作
+const handleCancel = () => {
+  restForm();
+  isVisited.value = false;
+};
+
+const handleSubmit = async (formInstance) => {
+  if (!formInstance) return;
+  formInstance.validate(async (valid) => {
+    if (!valid) return;
+    if (title.value == "新增角色") {
+      console.log('新增角色', form.value)
+      addRole(form.value).then(res => {
+        console.log('res', res)
+        if (res.code === 1000) {
+          ElMessage.success(res.msg);
+          getList();
+          isVisited.value = false;
+        } else {
+          ElMessage.error(res.msg);
+        }
+      });
+    } else {
+      // form.value.menuIds = tree.value.getCheckedKeys()
+      console.log('form.value修改', form.value)
+      editRole(form.value).then(res => {
+        if (res.code === 1000) {
+          ElMessage.success(res.msg);
+          isVisited.value = false;
+          getList();
+        } else {
+          ElMessage.error(res.msg);
+        }
+      });
+    }
+  })
+}
+//切换每页显示条数
+const handleSizeChange = (val) => {
+  pageInfo.pageSize = val
+  getList()
+}
+//点击页码进行分页功能
+const handleCurrentChange = (val) => {
+  pageInfo.pageNum = val
+  getList()
+}
+getList();
+</script>
+
+<style lang="scss" scoped>
+.dialog-tree {
+  border: 1px solid #ad8383;
+  height: 300px;
+  overflow: auto;
+}
+.dialog-tree::-webkit-scrollbar {
+  width: 6px;
+}
+
+// 滚动条轨道
+.dialog-tree::-webkit-scrollbar-track {
+  background: rgb(239, 239, 239);
+  border-radius: 2px;
+}
+
+// 小滑块
+.dialog-tree::-webkit-scrollbar-thumb {
+  background: rgba(80, 81, 82, 0.29);
+  border-radius: 10px;
+}
+.el-input-number {
+  width: 100%;
+}
+
+.el-tree-select {
+  :deep(.el-select) {
+    width: 100%;
+  }
+}
+</style>

src/views/task-management/all-work-order/index.vue

@@ -0,0 +1,13 @@
+<template>
+
+</template>
+
+<script>
+export default {
+  name: "index"
+}
+</script>
+
+<style scoped>
+
+</style>

src/views/task-management/historical-work-order/index.vue

@@ -0,0 +1,13 @@
+<template>
+
+</template>
+
+<script>
+export default {
+  name: "index"
+}
+</script>
+
+<style scoped>
+
+</style>

src/views/task-management/pending-work-order/index.vue

@@ -0,0 +1,13 @@
+<template>
+
+</template>
+
+<script>
+export default {
+  name: "index"
+}
+</script>
+
+<style scoped>
+
+</style>

src/views/tool/dict/index.vue

@@ -0,0 +1,582 @@
+<template>
+  <div>
+    <div class="layout">
+      <div class="layout-left">
+        <div class="query-btn">
+          <el-button type="primary" v-perm="['dict:type:add']" @click="handleAddType" :icon="Plus" plain>新增</el-button>
+          <!--        <el-button type="warning" v-perm="['dict:type:export']" @click="handleExport" :icon="Download" plain>导出-->
+          <!--        </el-button>-->
+          <el-button type="primary" :icon="Edit" v-perm="['dict:type:edit']"
+                     @click.stop="handleEditType" plain>修改
+          </el-button>
+          <el-button type="danger" :icon="Delete" v-perm="['dict:type:del']"
+                     @click.stop="handleDeleteType" :disabled="disabledDelete" plain>删除
+          </el-button>
+        </div>
+        <el-form :model="queryType">
+          <el-form-item prop="dictType">
+            <el-input v-model="queryType.dictType" placeholder="请输入字典类型" :suffix-icon="Search"
+                      clearable @clear="getTreeList" @input="getTreeList"></el-input>
+          </el-form-item>
+        </el-form>
+        <div class="scrollbar-dict">
+          <el-tree :data="treeData" ref="tree" :props="defaultProps" highlight-current @current-change="currentChange"
+                   @node-click="handleNodeClick">
+            <template #default="{ node, data }">
+              <div class="dict-tree">
+                <div>{{ data.dictName }}</div>
+                <!--              <div  style="display: none" :id="'option_'+data.dictId">-->
+                <!--                <el-button type="primary" size="small" :icon="Edit" v-perm="['dict:type:edit']"-->
+                <!--                           @click.stop="handleEditType(data.dictId)"/>-->
+                <!--                <el-button type="primary" size="small" :icon="Delete" v-perm="['dict:type:del']"-->
+                <!--                           @click.stop="handleDeleteType(data)" :disabled="disabledDelete"/>-->
+                <!--              </div> -->
+                <!--              :id="'type_'+data.dictId"-->
+                <div class="left-type">{{ data.dictType }}</div>
+              </div>
+            </template>
+          </el-tree>
+        </div>
+      </div>
+      <div class="layout-right" style="margin-top: 15px;">
+        <div class="query-btn">
+          <el-button type="primary" v-perm="['dict:data:add']" @click="handleAddData" :icon="Plus" plain>新增</el-button>
+        </div>
+        <el-form :model="queryData">
+          <el-form-item prop="dictLabel">
+            <el-input v-model="queryData.dictLabel" placeholder="请输入字典标签" :suffix-icon="Search"
+                      clearable @clear="getList(queryData.dictLabel,typeData)"
+                      @input="getList(queryData.dictLabel,typeData)" :disabled="isSearchData"></el-input>
+          </el-form-item>
+        </el-form>
+
+        <div class="table">
+          <el-table
+              :data="list"
+              row-key="dictId"
+              ref="singleTable"
+              v-loading="loading"
+              :header-cell-style="{'background':'#f5f7fa'}"
+              v-tabh
+          >
+            <!--            <el-table-column prop="dictType" label="字典类型" align="center"/>-->
+            <el-table-column prop="dictLabel" label="字典标签" align="center"/>
+            <el-table-column prop="" label="示例" align="center">
+              <template #default="scope">
+                <el-tag v-if="scope.row.isType" :type="scope.row.listClass" :effect="scope.row.theme">
+                  {{ scope.row.dictLabel }}
+                </el-tag>
+                <el-tag v-else :color="scope.row.listClass" :effect="scope.row.theme">{{ scope.row.dictLabel }}</el-tag>
+              </template>
+            </el-table-column>
+            <el-table-column prop="dictValue" label="字典键值" align="center"/>
+            <el-table-column prop="dictSort" label="排序" align="center" width="60px"/>
+            <el-table-column prop="state" label="状态" align="center">
+              <template #default="scope">
+                <tag dict-type="normal_disable" v-if="loadTag" :value="scope.row.state"/>
+              </template>
+            </el-table-column>
+            <el-table-column prop="createTime" label="创建时间" align="center" width="180px"/>
+            <el-table-column label="操作" align="center">
+              <template #default="scope">
+                <el-button type="primary" size="mini" v-perm="['dict:data:edit']"
+                           @click="handleEditData(scope.row.dictCode)" link>编辑
+                </el-button>
+                <popover-delete :name="scope.row.dictLabel" :type="'字典数据'" :perm="['dict:data:del']"
+                                @delete="handleDeleteData(scope.row.dictCode)"/>
+              </template>
+            </el-table-column>
+          </el-table>
+        </div>
+        <paging :current-page="pageInfo.pageNum" :page-size="pageInfo.pageSize" :page-sizes="[10, 20, 30, 40,50]"
+                :total="total" @changeSize="handleSizeChange" @goPage="handleCurrentChange"/>
+      </div>
+    </div>
+    <!--新增/修改字典类型弹窗-->
+    <el-dialog v-model="isTypeVisited" :title="typeTitle" width="700px">
+      <el-form :model="form" ref="formInstance" :rules="formRules" label-width="100px">
+        <el-row>
+          <el-col :span="24">
+            <el-form-item label="字典名称" prop="dictName">
+              <el-input v-model="form.dictName" placeholder="请输入字典名称"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="字典类型" prop="dictType">
+              <el-input v-model="form.dictType" placeholder="请输入字典类型"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="状态" prop="state">
+              <el-radio-group v-model="form.state" size="mini">
+                <el-radio v-for="dict in cacheStore.getDict('normal_disable')" :key="dict.value" :label="dict.value">
+                  {{ dict.label }}
+                </el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <template #footer>
+      <span>
+        <el-button @click="handleCancel">取消</el-button>
+        <el-button type="primary" @click="handleDictTypeSubmit(formInstance)">确定</el-button>
+      </span>
+      </template>
+    </el-dialog>
+
+    <!--新增/修改字典数据弹窗-->
+    <el-dialog v-model="isDataVisited" :title="dataTitle" width="700px">
+      <el-form :model="dataForm" ref="instance" :rules="dataRules" label-width="100px">
+        <el-row>
+          <!--          <el-col :span="24">-->
+          <!--            <el-form-item label="字典类型" prop="dictType">-->
+          <!--              <el-input v-model="dataForm.dictType" placeholder="请输入字典类型" disabled></el-input>-->
+          <!--            </el-form-item>-->
+          <!--          </el-col>-->
+          <el-col :span="24">
+            <el-form-item label="字典标签" prop="dictLabel">
+              <el-input v-model="dataForm.dictLabel" placeholder="请输入字典标签"></el-input>
+            </el-form-item>
+            <el-form-item label="字典键值" prop="dictValue">
+              <el-input v-model="dataForm.dictValue" placeholder="请输入字典键值"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="排序" prop="dictSort">
+              <el-input-number v-model="dataForm.dictSort"></el-input-number>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="状态" prop="state">
+              <el-radio-group v-model="dataForm.state" size="mini">
+                <el-radio v-for="dict in cacheStore.getDict('normal_disable')" :key="dict.value" :label="dict.value">
+                  {{ dict.label }}
+                </el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+          <!--          <el-col :span="12">-->
+          <!--            <el-form-item label="是否默认" prop="isDefault">-->
+          <!--              <el-radio-group v-model="dataForm.isDefault" size="mini">-->
+          <!--                <el-radio v-for="dict in [{value:0,label:'是'},{value:1,label:'否'}]" :key="dict.value" :label="dict.value">-->
+          <!--                  {{ dict.label }}-->
+          <!--                </el-radio>-->
+          <!--              </el-radio-group>-->
+          <!--            </el-form-item>-->
+          <!--          </el-col>-->
+          <el-col :span="12">
+            <el-form-item label="标签类型" prop="isType">
+              <el-switch v-model="dataForm.isType" active-text="是" inactive-text="否"
+                         @change="switchIsType($event,dataForm)"/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="标签主题" prop="theme">
+              <el-select v-model="dataForm.theme" placeholder="请选择显示样式">
+                <el-option
+                    v-for="item in tagThemeList"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="标签样式" prop="listClass">
+              <el-select v-model="dataForm.listClass" placeholder="请选择显示样式" v-if="dataForm.isType">
+                <el-option
+                    v-for="item in tagTypeList"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.value"
+                />
+              </el-select>
+              <el-color-picker v-model="dataForm.listClass" v-else/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="示例">
+              <el-tag v-if="dataForm.isType" :type="dataForm.listClass" :effect="dataForm.theme">
+                {{ dataForm.dictLabel }}
+              </el-tag>
+              <el-tag v-else :color="dataForm.listClass" :effect="dataForm.theme">{{ dataForm.dictLabel }}</el-tag>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <template #footer>
+      <span>
+        <el-button @click="handleDataCancel">取消</el-button>
+        <el-button type="primary" @click="handleDictDataSubmit(instance)">确定</el-button>
+      </span>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+
+<script setup>
+import {getDictTypeList, getDictTypeDetails, addDictType, editDictType, delDictType} from "@/api/system/dict-type";
+import {getDictDataList, addDictData, delDictData, editDictData, getDictDataDetails} from "@/api/system/dict-data";
+import {Search, Refresh, Delete, Plus, Edit, Download} from "@element-plus/icons-vue";
+import {ElMessage, ElMessageBox} from "element-plus";
+import {useCacheStore} from "@/stores/cache.js";
+import Paging from "@/components/pagination/index.vue";
+import {downLoadExcel} from "@/utils/downloadZip";
+import Tag from "@/components/Tag.vue";
+
+const cacheStore = useCacheStore();
+cacheStore.setCacheKey(["normal_disable"]);
+//查询参数
+const queryType = reactive({
+  dictType: ""
+});
+//查询参数
+const queryData = reactive({
+  dictLabel: ""
+});
+//页面信息
+const pageInfo = reactive({
+  pageNum: 1,
+  pageSize: 10
+});
+const loadTag = ref(true);
+const tree = ref();
+const isSearchData = ref(true);
+const treeData = ref([]);
+const defaultProps = {
+  label: "dictName"
+};
+const disabled = ref(true);
+const disabledDelete = ref(false);
+const list = ref([]);
+const loading = ref(false);
+const total = ref();
+const typeTitle = ref("");
+const dataTitle = ref("");
+const isTypeVisited = ref(false);
+const isDataVisited = ref(false);
+const singleTable = ref();
+const form = ref();
+const typeData = ref();
+const dataForm = ref();
+const instance = ref();
+const formInstance = ref();
+const formRules = ref({});
+const dataRules = ref({});
+const tagTypeList = ref([
+  {
+    value: 'primary',
+    label: 'primary'
+  },
+  {
+    value: 'success',
+    label: 'success'
+  },
+  {
+    value: 'info',
+    label: 'info'
+  },
+  {
+    value: 'warning',
+    label: 'warning'
+  },
+  {
+    value: 'danger',
+    label: 'danger'
+  },
+]);
+const tagThemeList = ref([
+  {
+    value: 'dark',
+    label: 'dark'
+  },
+  {
+    value: 'light',
+    label: 'light'
+  },
+  {
+    value: 'plain',
+    label: 'plain'
+  }
+]);
+const router = useRouter();
+
+const switchIsType = (val, dataForm) => {
+  if (val) {
+    dataForm.isType=true
+    dataForm.listClass = 'primary'
+  } else {
+    dataForm.isType=false
+    dataForm.listClass = '#ecf5ff'
+  }
+}
+//获取字典类型
+const getTreeList = async () => {
+  let params = {
+    ...queryType,
+    pageNum: 1,
+    pageSize: 50
+  };
+  getDictTypeList(params).then(res => {
+    if (res.code === 1000) {
+      treeData.value = res.data.rows;
+    } else {
+      ElMessage.error(res.msg);
+    }
+  });
+};
+//获取字典数据
+const getList = async (dictLabel, dictType) => {
+  if (typeData.value !== undefined) {
+    isSearchData.value = false
+    let params = {
+      dictLabel: dictLabel,
+      dictType: dictType,
+      ...pageInfo
+    };
+    loading.value = true;
+    getDictDataList(params).then(res => {
+      if (res.code === 1000) {
+        loadTag.value = false
+        list.value = res.data.rows;
+        total.value = res.data.total;
+        loading.value = false;
+        nextTick(() => {
+          loadTag.value = true
+        })
+      } else {
+        ElMessage.error(res.msg);
+      }
+    });
+  } else {
+    isSearchData.value = true
+  }
+};
+//点击字典类型,右侧表格出现字典数据
+const handleNodeClick = (node) => {
+  typeData.value = node.dictType;
+  if (node.dictType) {
+    getList('', node.dictType);
+  }
+};
+
+const currentChange = (Node) => {
+  localStorage.setItem("dictStore", JSON.stringify(Node));
+};
+
+
+//重置from表单
+const restForm = () => {
+  form.value = {
+    dictName: null,
+    dictType: null,
+    state: "1"
+  };
+};
+//重置dataFrom表单
+const restDataForm = () => {
+  dataForm.value = {
+    dictType: typeData.value,
+    dictLabel: null,
+    dictValue: null,
+    dictSort: 0,
+    state: "1",
+    // isDefault:0,
+    isType: true,
+    theme: 'dark',
+    listClass: 'primary',
+  };
+};
+//添加字典类型
+const handleAddType = () => {
+  restForm();
+  typeTitle.value = "新增字典类型表";
+  isTypeVisited.value = true;
+};
+//修改字典类型
+const handleEditType = () => {
+  if (tree.value.currentNode == null) {
+    ElMessageBox.alert("请先在下方选择一个字典类型进行修改数据", "系统提示", {
+      confirmButtonText: "确定",
+      type: "warning"
+    });
+  } else {
+    restForm();
+    const dictId = JSON.parse(localStorage.getItem("dictStore")).dictId;
+    //查看详情
+    getDictTypeDetails(dictId).then(res => {
+      if (res.code === 1000) {
+        form.value = res.data;
+        typeTitle.value = "编辑字典类型表";
+        isTypeVisited.value = true;
+      } else {
+        ElMessage.error(res.msg);
+      }
+    });
+  }
+};
+//删除字典类型
+const handleDeleteType = () => {
+  if (tree.value.currentNode == null) {
+    ElMessageBox.alert("请先在下方选择一个字典类型进行删除数据", "系统提示", {
+      confirmButtonText: "确定",
+      type: "warning"
+    });
+  } else {
+    const dictId = JSON.parse(localStorage.getItem("dictStore")).dictId;
+    const dictName = JSON.parse(localStorage.getItem("dictStore")).dictName;
+    ElMessageBox.confirm(`确认删除字典名称为${dictName}的字典类型表吗?`, "系统提示", {
+      confirmButtonText: "确定",
+      cancelButtonText: "取消",
+      type: "warning"
+    }).then(() => {
+      delDictType(dictId).then(res => {
+        if (res.code === 1000) {
+          ElMessage.success(res.msg);
+          getTreeList();
+        } else {
+          ElMessage.error(res.msg);
+        }
+      });
+    });
+  }
+};
+
+//添加字典数据
+const handleAddData = () => {
+  if (tree.value.currentNode == null) {
+    ElMessageBox.alert("请先在左边选择一个字典类型进行新增数据", "系统提示", {
+      confirmButtonText: "确定",
+      type: "warning"
+    });
+  } else {
+    restDataForm();
+    dataTitle.value = "新增字典数据表";
+    isDataVisited.value = true;
+  }
+};
+//修改字典数据
+const handleEditData = async (dictCode) => {
+  restDataForm();
+  //查看详情
+  getDictDataDetails(dictCode).then(res => {
+    if (res.code === 1000) {
+      dataForm.value = res.data
+      dataTitle.value = "编辑字典数据表";
+      isDataVisited.value = true;
+    } else {
+      ElMessage.error(res.msg);
+    }
+  });
+};
+//删除字典数据
+const handleDeleteData = async (row) => {
+  delDictData(row).then(res => {
+    if (res.code === 1000) {
+      ElMessage.success(res.msg);
+      getList('', typeData.value);
+    } else {
+      ElMessage.error(res.msg);
+    }
+  });
+};
+
+//取消字典类型操作弹窗
+const handleCancel = () => {
+  restForm();
+  isTypeVisited.value = false;
+};
+//取消字典数据操作弹窗
+const handleDataCancel = () => {
+  restDataForm();
+  isDataVisited.value = false;
+};
+//提交
+const handleDictTypeSubmit = async (instance) => {
+  if (!instance) return;
+  instance.validate(async (valid) => {
+    if (!valid) return;
+    if (typeTitle.value === "新增字典类型表") {
+      addDictType(form.value).then(res => {
+        if (res.code === 1000) {
+          ElMessage.success(res.msg);
+          getTreeList();
+          isTypeVisited.value = false;
+        } else {
+          ElMessage.error(res.msg);
+        }
+      });
+    } else if (typeTitle.value === "编辑字典类型表") {
+      // cacheStore.removeDict(form.value.dictType)
+      editDictType(form.value).then(res => {
+        if (res.code === 1000) {
+          ElMessage.success(res.msg);
+          getTreeList();
+          isTypeVisited.value = false;
+        } else {
+          ElMessage.error(res.msg);
+        }
+      });
+    }
+  })
+}
+//提交
+const handleDictDataSubmit = async (instance) => {
+  if (!instance) return;
+  instance.validate(async (valid) => {
+    if (!valid) return;
+    if (dataTitle.value === "新增字典数据表") {
+      addDictData(dataForm.value).then(res => {
+        if (res.code === 1000) {
+          ElMessage.success(res.msg);
+          getList('', typeData.value);
+          isDataVisited.value = false;
+        } else {
+          ElMessage.error(res.msg);
+        }
+      });
+    } else if (dataTitle.value === "编辑字典数据表") {
+      if(dataForm.value.isType===null){
+        dataForm.value.isType=false;
+      }
+      editDictData(dataForm.value).then(res => {
+        if (res.code === 1000) {
+          ElMessage.success(res.msg);
+          getList('', typeData.value);
+          isDataVisited.value = false;
+          // router.go(0);
+        } else {
+          ElMessage.error(res.msg);
+        }
+      });
+    }
+  });
+
+};
+
+//导出excel
+const handleExport = () => {
+  downLoadExcel("/dict/type/export", {...queryType});
+};
+
+//切换每页显示条数
+const handleSizeChange = (val) => {
+  pageInfo.pageSize = val;
+  getList('', typeData.value);
+};
+
+//点击页码进行分页功能
+const handleCurrentChange = (val) => {
+  pageInfo.pageNum = val;
+  getList('', typeData.value);
+};
+getTreeList();
+</script>
+<style scoped lang="scss">
+:deep(.el-tag.el-tag--dark) {
+  border-color: transparent !important;
+}
+</style>
+

src/views/voice-management/sensitive-words/index.vue

@@ -0,0 +1,13 @@
+<template>
+
+</template>
+
+<script>
+export default {
+  name: "index"
+}
+</script>
+
+<style scoped>
+
+</style>

src/views/voice-management/verbal-trick/index.vue

@@ -0,0 +1,13 @@
+<template>
+
+</template>
+
+<script>
+export default {
+  name: "index"
+}
+</script>
+
+<style scoped>
+
+</style>

src/views/voice-management/voice-config/index.vue

@@ -0,0 +1,13 @@
+<template>
+
+</template>
+
+<script>
+export default {
+  name: "index"
+}
+</script>
+
+<style scoped>
+
+</style>

vite.config.js

@@ -76,17 +76,11 @@ export default defineConfig({
       //   rewrite: (path) => path.replace(/^\/api/, ""),
       // },
       "/api": {
-        // target: "http://fateverse-vue.frp.feashow.cn",
+        // target: "http://192.168.31.176:9010",
-        // changeOrigin: true,
+        target: "http://112.19.165.99:20002/",
-        target: "http://192.168.31.176:9010",
         changeOrigin: true,
-        rewrite: (path) => path.replace(/^\/api/, ""),
+        // rewrite: (path) => path.replace(/^\/api/, ""),
-      },
+      }
-      "/api/notice-ws": {
-        target: "ws://fateverse-vue.frp.feashow.cn/api/notice-ws",
-        ws: true,
-        changeOrigin: true,
-      },
     },
   },
 });