init : 初始化

src/views/system/config/index.vue

@@ -0,0 +1,302 @@
+<template>
+  <div>
+    <el-form :model="queryParams" inline class="query-form" ref="queryForm">
+      <el-form-item label="参数名称" prop="configName">
+        <el-input v-model="queryParams.configName" placeholder="请输参数名称"></el-input>
+      </el-form-item>
+      <el-form-item label="参数键名" prop="configKey">
+        <el-input v-model="queryParams.configKey" placeholder="请输参数键名"></el-input>
+      </el-form-item>
+      <el-form-item label="系统内置" prop="configType">
+        <el-select v-model="queryParams.configType" placeholder="请选择系统内置" clearable filterable>
+          <el-option
+              v-for="dict in cacheStore.getDict('yes_no')"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" @click="handleSearch()" :icon="Search">搜索</el-button>
+        <el-button @click="handleReset" :icon="Refresh">重置</el-button>
+      </el-form-item>
+    </el-form>
+    <div class="query-btn">
+      <el-button type="primary" v-perm="['admin:config:add']" @click="handleAdd" :icon="Plus" plain>新增</el-button>
+      <el-button type="danger" v-perm="['admin:config:del']" @click="handleDelete" :icon="Delete" plain
+                 :disabled="disabled">删除
+      </el-button>
+      <el-button type="warning" v-perm="['admin:config:export']" @click="handleExport" :icon="Download" plain>导出
+      </el-button>
+    </div>
+    <div class="table">
+      <el-table
+          :data="list"
+          row-key="configId"
+          :lazy="true"
+          ref="singleTable"
+          v-loading="loading"
+          @select="handleSelect">
+        <el-table-column type="selection" width="55"/>
+        <el-table-column label="序号" type="index" class-name="allowDrag"/>
+        <el-table-column prop="configName" label="参数名称" align="center"/>
+        <el-table-column prop="configKey" label="参数键名" align="center"/>
+        <el-table-column prop="configValue" label="参数键值" align="center"/>
+        <el-table-column prop="configType" label="系统内置" align="center">
+          <template #default="scope">
+            <tag dict-type="yes_no" :value="scope.row.configType"/>
+          </template>
+        </el-table-column>
+        <el-table-column prop="remark" label="备注" align="center"/>
+        <el-table-column label="操作">
+          <template #default="scope">
+            <el-button type="text" size="mini" v-perm="['admin:config:edit']"
+                       @click="handleEdit(scope.row.configId)" :icon="Edit">编辑
+            </el-button>
+            <el-button type="text" size="mini" v-perm="['admin:config:del']" @click="handleDelete(scope.row)"
+                       :icon="Delete">删除
+            </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="total" @changeSize="handleSizeChange" @goPage="handleCurrentChange"/>
+
+    <el-dialog v-model="isVisited" :title="title" width="900px">
+      <el-form :model="form" ref="formInstance" :rules="formRules" label-width="100px" class="dialog-form">
+        <el-row>
+          <el-col :span="11">
+            <el-form-item label="参数名称" prop="configName">
+              <el-input v-model="form.configName" placeholder="请输入参数名称"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="11" :offset="2">
+            <el-form-item label="参数键名" prop="configKey">
+              <el-input v-model="form.configKey" placeholder="请输入参数键名"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="11">
+            <el-form-item label="参数键值" prop="configValue">
+              <el-input v-model="form.configValue" placeholder="请输入参数值"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="11" :offset="2">
+            <el-form-item label="系统内置" prop="configType">
+              <el-select v-model="form.configType" placeholder="请选择系统内置" clearable filterable>
+                <el-option
+                    v-for="dict in cacheStore.getDict('yes_no')"
+                    :key="dict.value"
+                    :label="dict.label"
+                    :value="dict.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="11">
+            <el-form-item label="备注" prop="remark">
+              <el-input v-model="form.remark" placeholder="请输备注"></el-input>
+            </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 {getConfigList, getConfigDetails, addConfig, editConfig, delConfig} from "@/api/system/config";
+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";
+
+const cacheStore = useCacheStore()
+import Tag from '@/components/Tag.vue'
+import {downLoadExcel} from "@/utils/downloadZip";
+//查询参数
+const queryParams = reactive({
+  configName: '',
+  configKey: '',
+  configType: undefined,
+})
+//页面信息
+const pageInfo = reactive({
+  pageNum: 1,
+  pageSize: 10,
+})
+const disabled = ref(true)
+const list = ref([])
+const queryForm = ref([])
+const loading = ref(true)
+const total = ref()
+const title = ref('')
+const isVisited = ref(false)
+const form = ref()
+const formInstance = ref()
+const formRules = ref({
+  configName: [
+    {required: true, message: "参数名称不能为空", trigger: "blur"},
+  ],
+  configKey: [
+    {required: true, message: "参数键名不能为空", trigger: "blur"},
+  ],
+  configValue: [
+    {required: true, message: "参数键值不能为空", trigger: "blur"},
+  ],
+  configType: [
+    {required: true, message: "系统内置不能为空", trigger: "change"},
+  ],
+})
+//搜索功能
+const handleSearch = () => {
+  getList()
+}
+//重置搜索
+const handleReset = () => {
+  queryForm.value.resetFields()
+  getList()
+}
+//获取数据
+const getList = async () => {
+  let params = {
+    ...queryParams,
+    ...pageInfo
+  }
+  getConfigList(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)
+    }
+  })
+}
+//重置from表单
+const restFrom = () => {
+  form.value = {
+    configName: null,
+    configKey: null,
+    configValue: null,
+    configType: null,
+    remark: null
+  }
+}
+//取消
+const handleCancel = () => {
+  restFrom()
+  isVisited.value = false
+}
+//提交
+const handleSubmit = async (instance) => {
+  if (!instance) return
+  instance.validate(async (valid) => {
+    if (!valid) return
+    if (title.value === '新增参数配置表') {
+      addConfig(form.value).then(res => {
+        if (res.code === 1000) {
+          ElMessage.success(res.msg)
+          getList()
+          isVisited.value = false
+        } else {
+          ElMessage.error(res.msg)
+        }
+      })
+    } else {
+      editConfig(form.value).then(res => {
+        if (res.code === 1000) {
+          ElMessage.success(res.msg)
+          getList()
+          isVisited.value = false
+        } else {
+          ElMessage.error(res.msg)
+        }
+      })
+    }
+  })
+}
+//添加
+const handleAdd = async () => {
+  restFrom()
+  title.value = "新增参数配置表"
+  isVisited.value = true
+  nextTick(()=>{
+    // 清空校验
+    formInstance.value.clearValidate()
+  })
+}
+//修改
+const handleEdit = async (configId) => {
+  restFrom()
+  getConfigDetails(configId).then(res => {
+    if (res.code === 1000) {
+      form.value = res.data
+      title.value = "编辑参数配置表"
+      isVisited.value = true
+    } else {
+      ElMessage.error(res.msg)
+    }
+  })
+  nextTick(()=>{
+    // 清空校验
+    formInstance.value.clearValidate()
+  })
+}
+//导出excel
+const handleExport = () => {
+  downLoadExcel('/admin/admin/config/export', {...queryParams})
+}
+
+//勾选table数据行的 Checkbox
+const handleSelect = async (selection, row) => {
+  if (selection.length !== 0) {
+    disabled.value = false
+    configId.value = row.configId
+    if (selection.length > 1) {
+      const del_row = selection.shift();
+      singleTable.value.toggleRowSelection(del_row, false);
+    }
+  } else {
+    disabled.value = true
+  }
+}
+
+//切换每页显示条数
+const handleSizeChange = async (val) => {
+  pageInfo.value.pageSize = val
+  await getList()
+}
+
+//点击页码进行分页功能
+const handleCurrentChange = async (val) => {
+  pageInfo.value.pageNum = val
+  await getList()
+}
+//删除
+const handleDelete = async ({dsName, configId}) => {
+  ElMessageBox.confirm(`确认删除名称为${dsName}的参数配置表吗?`, '系统提示', {
+    confirmButtonText: '确定',
+    cancelButtonText: '取消',
+    type: 'warning'
+  }).then(() => {
+    delConfig(configId).then(res => {
+      if (res.code === 1000) {
+        ElMessage.success(res.msg)
+        getList()
+      } else {
+        ElMessage.error(res.msg)
+      }
+    })
+  })
+}
+getList()
+</script>

src/views/system/dept/index.vue

@@ -0,0 +1,322 @@
+<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"
+    >
+      <el-table-column prop="deptName" label="部门名称"/>
+      <el-table-column prop="orderNum" label="排序"/>
+      <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="text" size="mini" @click="handleAddLine(scope.row.deptId)">新增</el-button>
+          <el-button type="text" size="mini" @click="handleEdit(scope.row.deptId)">修改</el-button>
+          <el-button type="text" size="mini" v-if="scope.row.parentId!==0" @click="handleDelete(scope.row)">删除
+          </el-button>
+        </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 () => {
+  getDeptList(queryParams).then(res => {
+    list.value = res.data
+    loading.value = false
+  })
+}
+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 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 = (row) => {
+  ElMessageBox.confirm(`确认删除部门名称为${row.deptName}的数据吗?`, "系统提示", {
+    confirmButtonText: "确定",
+    cancelButtonText: "取消",
+    type: "warning"
+  }).then(() => {
+    deleteDept(row.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/menu/DistributeRole.vue

@@ -0,0 +1,316 @@
+<template>
+  <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>
+      <el-button type="primary" @click="searchRole" :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="danger" @click="handleCancelAll" :icon="CircleClose" plain>全部取消</el-button>
+    <el-button type="danger" @click="handleCancelAuthorization(cancelRoleIds,roleNames)" :icon="CircleClose" plain :disabled="moreCancelDisabled">批量取消</el-button>
+  </div>
+  <div class="table">
+    <el-table
+        :data="list"
+        row-key="roleId"
+        :lazy="true"
+        ref="table"
+        v-loading="loading"
+        @select="handleSelect"
+    >
+      <el-table-column type="selection" width="55"/>
+      <el-table-column label="序号" type="index" align="center" width="60"/>
+      <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"/>
+      <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="text" size="mini"
+                     @click="handleCancelAuthorization(scope.row.roleId,scope.row.roleName)" :icon="CircleClose">取消授权
+          </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="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="roleName">
+        <el-input
+            v-model="query.roleName"
+            placeholder="请输入角色名称"
+            clearable
+        ></el-input>
+      </el-form-item>
+      <el-form-item label="角色标识符" prop="roleKey">
+        <el-input
+            v-model="query.roleKey"
+            placeholder="请输入角色标识符"
+            clearable
+        ></el-input>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" @click="getExcludeRole" :icon="Search">搜索</el-button>
+        <el-button @click="handleDialogReset" :icon="Refresh">重置</el-button>
+      </el-form-item>
+    </el-form>
+    <div class="table">
+      <el-table
+          :data="roleList"
+          row-key="roleId"
+          :lazy="true"
+          v-loading="dialogLoading"
+          @select="handleDialogSelect"
+      >
+        <el-table-column type="selection" width="55"/>
+        <el-table-column label="序号" type="index" align="center" width="60"/>
+        <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"/>
+        <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="text" size="mini"
+                       @click="handleSubmit(scope.row.roleId)" >添加
+            </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(roleIds)" :disabled="dialogDisabled">批量添加</el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
+
+<script setup>
+import {Plus, Search, Refresh, CircleClose} from "@element-plus/icons-vue";
+import {ElMessage, ElMessageBox} from "element-plus";
+import {getRoleInfoByMenuId,getRoleExcludeMenuId,unbindAllRole,cancelAuthorization,bindRoleAndMenu} from "@/api/role/role"
+import {useRouter} from "vue-router";
+import Tag from '@/components/Tag.vue'
+import Paging from "@/components/pagination/index.vue";
+
+const router = useRouter();
+const menuId = reactive(router.currentRoute.value.params.menuId)
+const roleForm = ref();
+const table = ref();
+const title = ref('添加角色');
+const list = ref([]);
+const roleList = ref([]);
+const total = ref([]);
+const dialogTotal = ref([]);
+const moreCancelDisabled = ref(true);
+const dialogDisabled = ref(true);
+const loading = ref(true);
+const dialogLoading = ref(true);
+const roleNames = ref([]);
+const cancelRoleIds = ref([]);
+const roleIds = ref([]);
+const queryParams = reactive({
+  roleName: "",
+  roleKey: ""
+});
+const query = reactive({
+  roleName: "",
+  roleKey: ""
+});
+const pageInfo = reactive({
+  pageNum: 1,
+  pageSize: 10
+});
+const formInstance = ref();
+const isVisited = ref(false);
+const form = ref();
+//角色搜索重置
+const handleReset = () => {
+  roleForm.value.resetFields();
+  searchRole();
+};
+const handleDialogReset = () => {
+  formInstance.value.resetFields();
+  getExcludeRole();
+};
+//根据角色id获取角色信息
+const searchRole = async () => {
+  let params = {
+    menuId: menuId,
+    ...queryParams,
+    ...pageInfo
+  };
+  getRoleInfoByMenuId(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 getExcludeRole = async () => {
+  let params = {
+    menuId: menuId,
+    ...query,
+    ...pageInfo
+  };
+  getRoleExcludeMenuId(params).then(res => {
+    if (res.code === 1000) {
+      roleList.value = res.data.rows;
+      dialogTotal.value = res.data.total;
+      dialogLoading.value = false;
+    } else {
+      ElMessage.error(res.msg);
+    }
+  });
+};
+
+//添加角色
+const handleAdd = () => {
+  getExcludeRole()
+  isVisited.value = true
+  dialogDisabled.value = true
+}
+//全部取消授权
+const handleCancelAll = () => {
+  ElMessageBox.confirm(`确认全部取消授权吗?`, "系统提示", {
+    confirmButtonText: "确定",
+    cancelButtonText: "取消",
+    type: "warning"
+  }).then(() => {
+    unbindAllRole(menuId).then(res => {
+      if (res.code === 1000) {
+        ElMessage.success(res.msg);
+        searchRole()
+      } else {
+        ElMessage.error(res.msg);
+      }
+    });
+  })
+}
+//取消授权
+const handleCancelAuthorization = (roleId,roleName) => {
+  ElMessageBox.confirm(`确认取消授权角色名称为"${roleName}"的角色吗?`, "系统提示", {
+    confirmButtonText: "确定",
+    cancelButtonText: "取消",
+    type: "warning"
+  }).then(() => {
+    cancelAuthorization(menuId, roleId).then(res => {
+      if (res.code === 1000) {
+        ElMessage.success(res.msg);
+        moreCancelDisabled.value=true
+        searchRole()
+      } else {
+        ElMessage.error(res.msg);
+      }
+    });
+  })
+}
+
+//取消
+const handleCancel = () => {
+  isVisited.value = false;
+};
+
+const handleSelect =  (selection) => {
+  if (selection.length !== 0) {
+    moreCancelDisabled.value = false;
+    cancelRoleIds.value=selection.map(item=>item.roleId).join()
+    roleNames.value=selection.map(item=>item.roleName).join()
+  } else {
+    moreCancelDisabled.value = true;
+  }
+}
+const handleDialogSelect =  (selection) => {
+  if (selection.length !== 0) {
+    dialogDisabled.value = false;
+    roleIds.value=selection.map(item=>item.roleId).join()
+  } else {
+    dialogDisabled.value = true;
+  }
+}
+//添加角色
+const handleSubmit = (roleId) => {
+  bindRoleAndMenu(menuId,roleId).then(res => {
+    if (res.code === 1000) {
+      ElMessage.success(res.msg);
+      searchRole()
+      isVisited.value = false
+    } else {
+      ElMessage.error(res.msg);
+    }
+  });
+}
+//切换每页显示条数
+const handleSizeChange = (val) => {
+  pageInfo.pageSize = val;
+  searchRole();
+};
+const handleSizeChangeDialog = (val) => {
+  pageInfo.pageSize = val;
+  getExcludeRole();
+};
+
+//点击页码进行分页功能
+const handleCurrentChange = (val) => {
+  pageInfo.pageNum = val;
+  searchRole();
+};
+const handleCurrentChangeDialog = (val) => {
+  pageInfo.pageNum = val;
+  getExcludeRole();
+};
+
+searchRole()
+</script>

src/views/system/menu/index.vue

@@ -0,0 +1,387 @@
+<template>
+  <div>
+    <el-form :model="queryParams" label-width="70px" class="query-form" inline ref="queryInstance">
+      <el-form-item label="菜单名称" prop="menuName">
+        <el-input v-model="queryParams.menuName" 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">搜索</el-button>
+        <el-button type="primary" @click="handleReset(queryInstance)">重置</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="menuId" :lazy="true"
+              v-loading="loading" v-tabh>
+      <el-table-column prop="menuName" label="菜单名称"/>
+      <el-table-column prop="icon" label="图标">
+        <template #default="scope">
+          <!--          <el-icon>-->
+          <!--            <component :is="scope.row.icon" />-->
+          <!--          </el-icon>-->
+          <svg-icon :name="scope.row.icon"/>
+        </template>
+      </el-table-column>
+      <el-table-column prop="orderNum" label="排序"/>
+      <el-table-column prop="perms" label="权限标识"/>
+      <el-table-column prop="component" label="组件路径"/>
+      <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="text" size="mini" @click="handleAdd(scope.row)">新增</el-button>
+          <el-button type="text" size="mini" @click="handleEdit(scope.row.menuId)">修改</el-button>
+          <el-button type="text" size="mini" @click="handleAssignRoles(scope.row)">分配角色</el-button>
+          <el-button type="text" size="mini" @click="handleDel(scope.row.menuId, scope.row.menuName)">删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <el-dialog v-model="isVisited" :title="title" width="700px">
+      <el-form :model="form" :rules="formRules" ref="formInstance">
+        <el-form-item label="上级菜单">
+          <el-tree-select v-model="form.parentId" :data="menuOpt" style="width: 100%;"
+                          :filter-node-method="filterNodeMethod" clearable filterable :check-strictly="true"/>
+        </el-form-item>
+        <el-form-item label="菜单类型">
+          <el-radio-group v-model="form.menuType">
+            <el-radio
+                v-for="item in [{ label: '目录', value: 'D' }, { label: '菜单', value: 'M' }, { label: '按钮', value: 'B' }]"
+                :label="item.value" :key="item.value">
+              {{ item.label }}
+            </el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item label="菜单图标">
+          <template #label>
+            <div  style="display: flex;align-items: center">
+              <span style="margin-right: 5px">菜单图标</span>
+              <svg-icon v-if="form.icon" :name="form.icon" :class-name="'middle-icon'"/>
+            </div>
+          </template>
+          <icon-select :active-icon="form.icon" @getSelectIcon="getSelectIcon"/>
+        </el-form-item>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="菜单名称" prop="menuName" required>
+              <el-input v-model="form.menuName" placeholder=""></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="11" :offset="1">
+            <el-form-item label="显示顺序" prop="orderNum" required>
+              <el-input-number v-model="form.orderNum" controls-position="right"></el-input-number>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="是否外链">
+              <el-radio-group v-model="form.isCache">
+                <el-radio v-for="item in [{ label: '是', value: true }, { label: '否', value: false }]"
+                          :label="item.value"
+                          :key="item.value">
+                  {{ item.label }}
+                </el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+          <el-col :span="11" :offset="1" v-if="form.menuType !== 'B'">
+            <el-form-item label="路由地址" prop="path" required>
+              <el-input v-model="form.path"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row v-if="form.menuType === 'M'">
+          <el-col :span="12">
+            <el-form-item label="组件路径" prop="component" required>
+              <el-input v-model="form.component"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="11" :offset="1" v-if="form.menuType !== 'B'">
+            <el-form-item label="权限字符" prop="perms" required>
+              <el-input v-model="form.perms"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row v-if="form.menuType === 'M'">
+          <el-col :span="12">
+            <el-form-item label="路由参数">
+              <el-input v-model="form.pathParams"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="11" :offset="1" v-if="form.menuType !== 'B'">
+            <el-form-item label="是否缓存">
+              <el-radio-group v-model="form.isCache">
+                <el-radio v-for="item in [{ label: '缓存', value: true }, { label: '不缓存', value: false }]"
+                          :label="item.value" :key="item.value">
+                  {{ item.label }}
+                </el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12" v-if="form.menuType !== 'B'">
+            <el-form-item label="显示状态">
+              <el-radio-group v-model="form.visible">
+                <el-radio v-for="item in [{ label: '显示', value: '1' }, { label: '隐藏', value: '0' }]" :label="item.value"
+                          :key="item.value">
+                  {{ item.label }}
+                </el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+          <el-col :span="11" :offset="1" v-if="form.menuType !== 'B'">
+            <el-form-item label="菜单状态">
+              <el-radio-group v-model="form.state">
+                <el-radio v-for="item in [{ label: '正常', value: '0' }, { label: '停用', value: '1' }]" :label="item.value"
+                          :key="item.value">
+                  {{ item.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 {getMenuList, getMenuInfo, getMenuOpt, addMenu, editMenu, delMenu} from '@/api/system/menuman.js'
+import {Plus, Sort} from '@element-plus/icons-vue'
+import {ElMessage, ElMessageBox} from 'element-plus'
+import {useCacheStore} from '@/stores/cache.js'
+import Tag from '@/components/Tag.vue'
+import SvgIcon from '@/components/svgIcon/index.vue'
+import IconSelect from '@/components/iconSelect/index.vue'
+const cacheStore = useCacheStore()
+const queryParams = reactive({
+  menuName: undefined,
+  state: undefined
+})
+const queryInstance = ref()
+const loading = ref(true)
+const list = ref([])
+const tableTree = ref()
+const isExpand = ref(true)
+const isVisited = ref(false)
+const title = ref('')
+const form = ref({
+  parentId: '',
+  menuType: 'D',
+  icon: '',
+  menuName: '',
+  orderNum: '',
+  visible: '0',
+  state: '1',
+  isCache: false,
+  isFrame: false, //是否外链
+  perms: '',
+  pathParams: '',
+  path: '',
+  component: ''
+})
+const formRules = ref({
+  menuName: [{required: true, message: '请输入菜单名称', trigger: 'blur'}],
+  orderNum: [{required: true, message: '请输入显示顺序', trigger: 'blur'}],
+  component: [{required: true, message: '请输入组件路径', trigger: 'blur'}],
+  perms: [{required: true, message: '请输入权限字符', trigger: 'blur'}],
+  path: [{required: true, message: '请输入路由地址', trigger: 'blur'}],
+})
+const formInstance = ref()
+const menuOpt = ref([])
+const router =useRouter()
+const getSelectIcon=(val)=>{
+  form.value.icon=val
+}
+
+const getList = async () => {
+  getMenuList(queryParams).then(res => {
+    list.value = res.data
+    loading.value = false
+  })
+}
+
+const handleReset = (instance) => {
+  if (!instance) return
+  instance.resetFields()
+  getList()
+}
+const restFrom = () => {
+  form.value = {
+    parentId: '',
+    menuType: 'D',
+    icon: '',
+    menuName: '',
+    orderNum: '',
+    visible: '0',
+    state: '1',
+    isCache: false,
+    isFrame: false, //是否外链
+    perms: '',
+    pathParams: '',
+    path: '',
+    component: ''
+  }
+}
+const handleAdd = async (row) => {
+  title.value = '新增菜单'
+  restFrom()
+  if(row.menuId!==undefined){
+    await getMenuInfo(row.menuId).then(res => {
+      form.value.parentId = res.data.parentId
+    })
+  }
+  await getMenuOpt().then(res => {
+    menuOpt.value = [{
+      value: 0,
+      label: "一级目录",
+      children: res.data
+    }]
+  })
+  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 handleAssignRoles=(row)=>{
+  router.push('/menu-auth/role/' + row.menuId)
+}
+const handleEdit = async (menuId) => {
+  title.value = '修改菜单'
+  restFrom()
+  await getMenuInfo(menuId).then(res => {
+    form.value = {...res.data}
+  })
+  await getMenuOpt(menuId).then(res => {
+    menuOpt.value = [{
+      value: 0,
+      label: "一级目录",
+      children: res.data
+    }]
+  })
+  isVisited.value = true
+  nextTick(()=>{
+    // 清空校验
+    formInstance.value.clearValidate()
+  })
+}
+
+const handleDel = (menuId, menuName) => {
+  ElMessageBox.confirm(`确认删除名称为${menuName}的菜单吗?`, '系统提示', {
+    confirmButtonText: '确定',
+    cancelButtonText: '取消',
+    type: 'warning'
+  }).then(() => {
+    delMenu(menuId).then(res => {
+      if (res.code === 1000) {
+        ElMessage.success(res.msg)
+        getList()
+      } else {
+        ElMessage.error(res.msg)
+      }
+    })
+  })
+}
+
+const handleSubmit = async (instance) => {
+  if (!instance) return
+  instance.validate(async (valid, fields) => {
+    if (!valid) return
+    if (title.value === '新增菜单') {
+      await addMenu(form.value).then(res => {
+        if (res.code === 1000) {
+          ElMessage.success(res.msg)
+          getList()
+          isVisited.value = false
+        } else {
+          ElMessage.error(res.msg)
+        }
+      })
+    } else {
+      await editMenu(form.value).then(res => {
+        if (res.code === 1000) {
+          ElMessage.success(res.msg)
+          getList()
+          isVisited.value = false
+        } else {
+          ElMessage.error(res.msg)
+        }
+      })
+    }
+  })
+}
+
+const filterNodeMethod = (value, data) => data.label.includes(value)
+
+const handleCancel = () => {
+  form.value = {
+    parentId: '',
+    menuType: 'D',
+    icon: '',
+    menuName: '',
+    orderNum: '',
+    visible: '0',
+    state: '1',
+    isCache: false,
+    isFrame: false, //是否外链
+    perms: '',
+    pathParams: '',
+    path: '',
+    component: ''
+  }
+  isVisited.value = false
+}
+
+getList()
+</script>
+
+<style lang="scss" scoped>
+.el-input-number {
+  width: 100%;
+}
+
+.el-tree-select {
+  :deep(.el-select) {
+    width: 100%;
+  }
+}
+</style>

src/views/system/notice/inform/index.vue

@@ -0,0 +1,173 @@
+<template>
+  <div>
+    <el-form :model="queryParams" inline class="query-form" ref="queryInstance">
+      <el-form-item label="状态" prop="state">
+        <el-select v-model="queryParams.state" placeholder="请选择状态" clearable filterable>
+          <el-option label="未读" value="0"/>
+          <el-option label="已读" value="1"/>
+        </el-select>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" @click="getList" :icon="Search">搜索</el-button>
+        <el-button type="primary" @click="handleReset" :icon="Refresh">重置</el-button>
+      </el-form-item>
+    </el-form>
+    <div class="table">
+      <el-table
+          :data="list"
+          row-key="noticeId"
+          :lazy="true"
+          v-loading="loading"
+      >
+        <el-table-column label="序号" type="index" align="center" width="60"/>
+        <el-table-column prop="noticeTitle" label="公告标题" align="center"/>
+        <el-table-column prop="state" label="阅读状态" align="center">
+          <template #default="scope">
+            <el-tag :type="scope.row.state == 0? '':'warning'">{{
+                scope.row.state == 0 ? '未读' : '已读'
+              }}
+            </el-tag>
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" align="center">
+          <template #default="scope">
+            <el-button type="text" size="mini" :icon="View" @click="handleViewDetails(scope.row.noticeId)">详情
+            </el-button>
+            <el-button type="text" size="mini" :icon="Delete"
+                       @click="handleDelete(scope.row)" style="color: red">删除
+            </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="total" @changeSize="handleSizeChange" @goPage="handleCurrentChange"/>
+<!--    <bell-socket style="display: none" ref="bellSocket"/>-->
+    <!--详情弹窗-->
+    <el-dialog v-model="isViewVisited" title="通知公告详情" width="1200px" @close="handleCloseDialog">
+      <el-form :model="viewForm" label-width="100px">
+        <el-row>
+          <el-col :span="24" class="title-block">
+<!--            <el-form-item label="公告标题 :" prop="noticeTitle">-->
+              <el-text class="title">{{ viewForm.noticeTitle }}</el-text>
+<!--            </el-form-item>-->
+          </el-col>
+          <el-col :span="24">
+<!--            <el-form-item label="公告内容 :" prop="noticeContent">-->
+              <el-text v-if="viewForm.contentType == 'text'">{{ viewForm.noticeContent }}</el-text>
+              <span v-else v-html="viewForm.noticeContent"></span>
+<!--            </el-form-item>-->
+          </el-col>
+        </el-row>
+      </el-form>
+    </el-dialog>
+  </div>
+</template>
+
+<script setup>
+import {ElMessage, ElMessageBox} from "element-plus";
+import {getNotifyList, getNotifyDetail,deleteSingleNotify} from "@/api/notice/notify";
+import {View, Delete,Search, Refresh} from "@element-plus/icons-vue";
+import {useRouter} from "vue-router";
+import Paging from "@/components/pagination/index.vue";
+
+const queryParams = reactive({
+  state: null
+})
+const router = useRouter()
+// const bellSocket = ref()
+const loading = ref(true)
+const list = ref([])
+const total = ref([]);
+const isViewVisited = ref(false);
+const viewForm = ref();
+const notifyId = reactive(router.currentRoute.value.params.queryId)
+const pageInfo = reactive({
+  pageNum: 1,
+  pageSize: 10
+});
+onMounted(()=>{
+  if(notifyId!==undefined){
+    handleViewDetails(notifyId)
+  }
+})
+//重置搜索
+const handleReset = () => {
+  getList()
+}
+const getList = async () => {
+  let params = {
+    cluster: "notice",
+    ...queryParams,
+    ...pageInfo
+  };
+  getNotifyList(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 handleViewDetails = (noticeId) => {
+  getNotifyDetail(noticeId).then(res=>{
+    // bellSocket.value.searchNotifyList()
+    isViewVisited.value = true
+    viewForm.value = res.data
+  })
+}
+//关闭详情弹窗
+const handleCloseDialog=()=>{
+  if(notifyId!==undefined){
+    router.push({path:'/system/notice/inform/index'})
+  }
+  isViewVisited.value = false
+}
+//删除单个消息
+const handleDelete = (row) => {
+  ElMessageBox.confirm(`确认删除名称为${row.noticeTitle}的通知公告吗?`, "系统提示", {
+    confirmButtonText: "确定",
+    cancelButtonText: "取消",
+    type: "warning"
+  }).then(() => {
+    deleteSingleNotify(row.noticeId).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();
+};
+getList()
+</script>
+<style scoped lang="scss">
+.title-block{
+  text-align: center;
+  padding-bottom:30px;
+  .title{
+    font-size: 28px;
+    font-weight: bold;
+  }
+}
+</style>
+<style>
+.tox-tinymce-aux {
+  z-index: 5000 !important;
+}
+</style>

src/views/system/notice/publish/index.vue

@@ -0,0 +1,426 @@
+<template>
+  <div>
+    <el-form :model="queryParams" inline class="query-form" ref="queryInstance">
+      <el-form-item label="公告标题" prop="noticeTitle">
+        <el-input v-model="queryParams.noticeTitle" placeholder="请输入公告标题" clearable></el-input>
+      </el-form-item>
+      <el-form-item label="公告类型" prop="noticeType">
+        <el-select v-model="queryParams.noticeType" placeholder="请选择公告类型" clearable filterable>
+          <el-option label="通知" value="1"/>
+          <el-option label="公告" value="2"/>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="内容类型" prop="contentType">
+        <el-select v-model="queryParams.contentType" placeholder="请选择内容类型" clearable filterable>
+          <el-option label="富文本" value="html"/>
+          <el-option label="文本" value="text"/>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="发送类型" prop="sendType">
+        <el-select v-model="queryParams.sendType" placeholder="请输入发送类型" filterable clearable>
+          <el-option
+              v-for="item in sendTypeOption"
+              :key="item.value"
+              :label="item.name"
+              :value="item.value">
+          </el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" @click="getList" :icon="Search">搜索</el-button>
+        <el-button type="primary" @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"
+          row-key="noticeId"
+          :lazy="true"
+          v-loading="loading"
+      >
+        <el-table-column label="序号" type="index" align="center" width="60"/>
+        <el-table-column prop="noticeTitle" label="公告标题" align="center"/>
+        <el-table-column prop="noticeType" label="公告类型" align="center">
+          <template #default="scope">
+            <tag dict-type="notice_type"  :value="scope.row.noticeType"/>
+          </template>
+        </el-table-column>
+        <el-table-column prop="contentType" label="内容类型" align="center">
+          <template #default="scope">
+            <tag dict-type="content_type"  :value="scope.row.contentType"/>
+          </template>
+        </el-table-column>
+        <el-table-column prop="sendType" label="发送类型" align="center">
+          <template #default="scope">
+            {{ getSendTypeOptionItem(scope.row.sendType) }}
+          </template>
+        </el-table-column>
+        <el-table-column prop="createTime" label="创建时间" align="center"/>
+        <el-table-column label="操作" align="center">
+          <template #default="scope">
+            <el-button type="text" size="mini" :icon="View" @click="handleViewDetails(scope.row)">详情
+            </el-button>
+            <el-button type="text" size="mini" :icon="Delete" @click="handleDelete(scope.row)" style="color: red">删除
+            </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="total" @changeSize="handleSizeChange" @goPage="handleCurrentChange"/>
+    <!--新增弹窗-->
+    <el-dialog v-model="isVisited" title="新增公告" width="800px">
+      <el-form :model="form" ref="formInstance" label-width="80px" :rules="rules">
+        <el-row>
+          <el-col :span="11">
+            <el-form-item label="公告标题" prop="noticeTitle">
+              <el-input v-model="form.noticeTitle" placeholder="请输入公告标题"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="11" :offset="2">
+            <el-form-item label="公告类型" prop="noticeType">
+              <el-radio-group v-model="form.noticeType" size="mini">
+                <el-radio v-for="notice in cacheStore.getDict('notice_type')" :key="notice.value"
+                          :label="notice.value">
+                  {{ notice.label }}
+                </el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+          <el-col :span="11">
+            <el-form-item label="发送类型" prop="sendType">
+              <el-select v-model="form.sendType" placeholder="发送类型" filterable clearable
+                         @change="handleChangeSendType($event)" style="width: 268px">
+                <el-option
+                    v-for="item in sendTypeOption"
+                    :key="item.value"
+                    :label="item.name"
+                    :value="item.value">
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="11" :offset="2" v-if="form.sendType!=='all'">
+            <el-form-item label="发送对象" prop="senderIds">
+              <el-tree-select
+                  v-if="form.sendType==='dept'"
+                  ref="treeSelect"
+                  v-model="form.senderIds"
+                  placeholder="请选择发送对象"
+                  :data="deptList"
+                  :props="deptProps"
+                  value-key="value"
+                  check-strictly
+                  :render-after-expand="false"
+                  style="width: 268px"
+                  filterable clearable multiple
+              />
+              <el-select v-else v-model="form.senderIds" placeholder="请选择发送对象"
+                         filterable clearable multiple style="width: 268px">
+                <el-option
+                    v-for="item in senderIdsOption"
+                    :key="form.sendType==='role'?item.value:item.userId"
+                    :label="form.sendType==='role'?item.label:item.userName"
+                    :value="form.sendType==='role'?item.value:item.userId">
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="11" :offset="2">
+            <el-form-item label="内容类型" prop="contentType">
+              <el-radio-group v-model="form.contentType" size="mini">
+                <el-radio label="html">富文本</el-radio>
+                <el-radio label="text">文本</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+          <el-col :span="11">
+            <el-form-item v-if="form.contentType=='text'" label="公告内容" prop="noticeContent">
+              <el-input v-model="form.noticeContent" placeholder="请输入公告内容"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item v-if="form.contentType=='html'" label="公告内容" prop="noticeContent">
+              <Tinymce image-url="/notice/file" file-url="/notice/file" v-model:value="form.noticeContent"/>
+            </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>
+
+    <!--详情弹窗-->
+    <el-dialog v-model="isViewVisited" title="公告详情" width="1200px">
+      <el-form :model="viewForm" label-width="100px">
+        <el-row>
+          <el-col :span="8">
+            <el-form-item label="公告标题 :" prop="noticeTitle">
+              <el-text>{{ viewForm.noticeTitle }}</el-text>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="发送类型 :" prop="sendType">
+              <el-text>{{ getSendTypeOptionItem(viewForm.sendType) }}</el-text>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="发送对象 :" prop="senders">
+              <div v-for="sender in viewForm.senders">
+                <el-text>{{ sender }}</el-text>
+              </div>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="公告类型 :" prop="noticeType">
+              <tag dict-type="notice_type"  :value="viewForm.noticeType"/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="内容类型 :" prop="contentType">
+              <tag dict-type="content_type"  :value="viewForm.contentType"/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="公告内容 :" prop="noticeContent">
+              <el-text v-if="viewForm.contentType == 'text'">{{ viewForm.noticeContent }}</el-text>
+              <span v-else v-html="viewForm.noticeContent"></span>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </el-dialog>
+  </div>
+</template>
+
+<script setup>
+import {Search, Refresh, Plus, View, Delete} from "@element-plus/icons-vue";
+import {useCacheStore} from '@/stores/cache.js'
+import {ElMessage, ElMessageBox} from "element-plus";
+import {addNotice, deleteNotice, getNoticeList, getNoticeDetail} from "@/api/notice/notice";
+import {getRoleOption} from "@/api/role/role";
+import {getDeptOption} from "@/api/dept/dept";
+import Tinymce from "@/components/Tinymce.vue";
+import {getUserList} from "@/api/user/user";
+import Paging from "@/components/pagination/index.vue";
+
+const queryParams = reactive({
+  noticeTitle: '',
+  noticeType: '',
+  contentType: '',
+  sendType: '',
+  state: ''
+})
+const queryInstance = ref()
+const cacheStore = useCacheStore()
+const loading = ref(true)
+const sendTypeOption = ref([
+  {
+    name: '用户',
+    value: 'user'
+  },
+  {
+    name: '角色',
+    value: 'role'
+  },
+  {
+    name: '部门',
+    value: 'dept'
+  },
+  {
+    name: '全发',
+    value: 'all'
+  }
+])
+const senderIdsOption = ref([])
+const deptList = ref([]);
+const deptProps = reactive({
+  value: "value",
+  label: "label"
+});
+const list = ref([])
+const isVisited = ref(false);
+const isViewVisited = ref(false);
+const viewForm = ref();
+const form = ref();
+const content = ref();
+const formInstance = ref();
+const total = ref([]);
+const pageInfo = reactive({
+  pageNum: 1,
+  pageSize: 10
+});
+const rules = reactive({
+  noticeTitle: [{required: true, message: '请输入公告标题', trigger: 'blur'}],
+  // noticeContent: [{required: true, message: '请输入公告内容', trigger: 'blur'}],
+  contentType: [{required: true, message: '请输入内容类型', trigger: 'blur'}],
+  noticeType: [{required: true, message: '请选择公告类型', trigger: 'blur'}],
+  sendType: [{required: true, message: '请选择发送类型', trigger: 'blur'}],
+  senderIds: [{required: true, message: '请选择发送对象', trigger: 'blur'}],
+})
+
+const handleChangeSendType = (e) => {
+  if (e === 'user') {
+    getUser()
+  } else if (e === 'role') {
+    getRole()
+  } else if (e === 'dept') {
+    getDepartmentOption()
+  } else if (e === 'all') {
+
+  }
+}
+//获取用户list
+const getUser = async () => {
+  getUserList().then(res => {
+    if (res.code === 1000) {
+      senderIdsOption.value = res.data.rows;
+    }
+  });
+};
+//获取角色option
+const getRole = async () => {
+  getRoleOption().then(res => {
+    if (res.code === 1000) {
+      senderIdsOption.value = res.data;
+    }
+  });
+};
+//获取部门option
+const getDepartmentOption = async () => {
+  getDeptOption().then(res => {
+    if (res.code === 1000) {
+      deptList.value = res.data;
+    } else {
+      ElMessage.error(res.msg);
+    }
+  });
+};
+const getSendTypeOptionItem = (sendType) => {
+  for (let item of sendTypeOption.value) {
+    if (item.value === sendType) {
+      return item.name;
+    }
+  }
+  return "";
+};
+
+//重置搜索
+const handleReset = () => {
+  queryInstance.value.resetFields()
+  getList()
+}
+const getList = async () => {
+  let params = {
+    ...queryParams,
+    ...pageInfo
+  };
+  getNoticeList(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 handleViewDetails = async (row) => {
+  getNoticeDetail(row.noticeId).then(res => {
+    isViewVisited.value = true
+    viewForm.value = res.data
+  })
+}
+
+//删除
+const handleDelete = async (row) => {
+  ElMessageBox.confirm(`确认删除名称为${row.noticeTitle}的公告吗?`, '系统提示', {
+    confirmButtonText: '确定',
+    cancelButtonText: '取消',
+    type: 'warning'
+  }).then(() => {
+    deleteNotice(row.noticeId).then(res => {
+      if (res.code === 1000) {
+        ElMessage.success(res.msg)
+        getList()
+      } else {
+        ElMessage.error(res.msg)
+      }
+    })
+  })
+}
+const restForm = () => {
+  form.value = {
+    action: 'SEND',
+    noticeTitle: null,
+    noticeContent: null,
+    noticeType: "1",
+    sendType: null,
+    contentType: 'html',
+    state: "1",
+    senderIds: [],
+    cluster: 'notice'
+  };
+};
+//新增公告
+const handleAdd = () => {
+  restForm();
+  isVisited.value = true;
+  nextTick(() => {
+    // 清空校验
+    formInstance.value.clearValidate()
+  })
+};
+
+//取消
+const handleCancel = () => {
+  restForm();
+  isVisited.value = false;
+};
+//提交
+const handleSubmit = async (formInstance) => {
+  if (!formInstance) return;
+  formInstance.validate(async (valid) => {
+    if (!valid) return;
+    if(form.value.sendType==='all'){
+      form.value.senderIds=['0']
+    }
+    addNotice(form.value).then(res => {
+      if (res.code === 1000) {
+        ElMessage.success(res.msg);
+        getList();
+        isVisited.value = false;
+      } else {
+        ElMessage.error(res.msg);
+      }
+    });
+  })
+}
+
+//切换每页显示条数
+const handleSizeChange = (val) => {
+  pageInfo.pageSize = val;
+  getList();
+};
+
+//点击页码进行分页功能
+const handleCurrentChange = (val) => {
+  pageInfo.pageNum = val;
+  getList();
+};
+getList()
+</script>
+
+<style>
+.tox-tinymce-aux {
+  z-index: 5000 !important;
+}
+</style>

src/views/system/post/DistributeUser.vue

@@ -0,0 +1,301 @@
+<template>
+  <el-form :model="queryParams" class="query-form" inline ref="userForm">
+    <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="danger" @click="handleCancelAll" :icon="CircleClose" plain>全部取消</el-button>
+    <el-button type="danger" @click="handleCancelAuthorization(cancelUserIds,userNames)" :icon="CircleClose" plain :disabled="moreCancelDisabled">批量取消</el-button>
+  </div>
+  <div class="table">
+    <el-table
+        :data="list"
+        row-key="userId"
+        :lazy="true"
+        ref="table"
+        v-loading="loading"
+        @select="handleSelect"
+    >
+      <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="text" size="mini"
+                     @click="handleCancelAuthorization(scope.row.userId,scope.row.userName)" :icon="CircleClose">取消授权
+          </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="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="text" size="mini"
+                       @click="handleSubmit(scope.row.userId)" >添加
+            </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, 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";
+
+const router = useRouter();
+const postId = reactive(router.currentRoute.value.params.postId)
+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 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();
+
+//用户搜索重置
+const handleReset = () => {
+  userForm.value.resetFields();
+  searchUser();
+};
+const handleDialogReset = () => {
+  formInstance.value.resetFields();
+  getExcludeUser();
+};
+//根据角色id获取用户信息
+const searchUser = async () => {
+  let params = {
+    // postId: postId,
+    ...queryParams,
+    ...pageInfo
+  };
+  getUserInfoByPostId(postId,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 getExcludeUser = async () => {
+  let params = {
+    // postId: postId,
+    ...query,
+    ...pageInfo
+  };
+  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 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).join()
+    userNames.value=selection.map(item=>item.userName).join()
+  } else {
+    moreCancelDisabled.value = true;
+  }
+}
+//取消授权
+const handleCancelAuthorization = (userId,userName) => {
+  ElMessageBox.confirm(`确认取消授权用户名称为"${userName}"的角色吗?`, "系统提示", {
+    confirmButtonText: "确定",
+    cancelButtonText: "取消",
+    type: "warning"
+  }).then(() => {
+    cancelPostAndUserAuthorization(userId, postId).then(res => {
+      if (res.code === 1000) {
+        ElMessage.success(res.msg);
+        moreCancelDisabled.value=true
+        searchUser()
+      } 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).join()
+  } 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,254 @@
+<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"
+      >
+        <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="排序"/>
+        <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="text" size="mini" @click="handleEdit(scope.row.postId)">修改</el-button>
+            <el-button type="text" size="mini"  @click="handleAssignedUser(scope.row)">分配用户
+            </el-button>
+            <el-button type="text" size="mini" v-if="scope.row.parentId!==0" @click="handleDelete(scope.row)">删除
+            </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="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, ElMessageBox} 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 () => {
+  getPostList({
+    ...queryParams,
+    ...pageInfo
+  }).then(res => {
+    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
+  })
+}
+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 = (row) => {
+  ElMessageBox.confirm(`确认删除名称为${row.postName}的数据吗?`, "系统提示", {
+    confirmButtonText: "确定",
+    cancelButtonText: "取消",
+    type: "warning"
+  }).then(() => {
+    deletePost(row.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,300 @@
+<template>
+  <el-form :model="queryParams" class="query-form" inline ref="userForm">
+    <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="danger" @click="handleCancelAll" :icon="CircleClose" plain>全部取消</el-button>
+    <el-button type="danger" @click="handleCancelAuthorization(cancelUserIds,userNames)" :icon="CircleClose" plain :disabled="moreCancelDisabled">批量取消</el-button>
+  </div>
+  <div class="table">
+    <el-table
+        :data="list"
+        row-key="userId"
+        :lazy="true"
+        ref="table"
+        v-loading="loading"
+        @select="handleSelect"
+    >
+      <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="text" size="mini"
+                     @click="handleCancelAuthorization(scope.row.userId,scope.row.userName)" :icon="CircleClose">取消授权
+          </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="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="text" size="mini"
+                       @click="handleSubmit(scope.row.userId)" >添加
+            </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, CircleClose} 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";
+
+const router = useRouter();
+const roleId = reactive(router.currentRoute.value.params.roleId)
+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 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();
+
+//用户搜索重置
+const handleReset = () => {
+  userForm.value.resetFields();
+  searchUser();
+};
+const handleDialogReset = () => {
+  formInstance.value.resetFields();
+  getExcludeUser();
+};
+//根据角色id获取用户信息
+const searchUser = async () => {
+  let params = {
+    ...queryParams,
+    ...pageInfo
+  };
+  getUserByRoleId(roleId,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 getExcludeUser = async () => {
+  let params = {
+    // roleId: roleId,
+    ...query,
+    ...pageInfo
+  };
+  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 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).join()
+    userNames.value=selection.map(item=>item.userName).join()
+  } else {
+    moreCancelDisabled.value = true;
+  }
+}
+//取消授权
+const handleCancelAuthorization = (userId,userName) => {
+  ElMessageBox.confirm(`确认取消授权用户名称为"${userName}"的角色吗?`, "系统提示", {
+    confirmButtonText: "确定",
+    cancelButtonText: "取消",
+    type: "warning"
+  }).then(() => {
+    cancelAuthorization(userId, roleId).then(res => {
+      if (res.code === 1000) {
+        ElMessage.success(res.msg);
+        moreCancelDisabled.value=true
+        searchUser()
+      } 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).join()
+  } else {
+    dialogDisabled.value = true;
+  }
+}
+const handleSubmit = (userIds) => {
+  roleBindUser(userIds, roleId).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/index.vue

@@ -0,0 +1,479 @@
+<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"
+      >
+        <el-table-column label="序号" type="index" align="center" width="55"/>
+        <!--      <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"/>
+        <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="text" size="mini"  @click="handleEdit(scope.row.roleId)">修改
+            </el-button>
+            <el-button type="text" size="mini"  @click="handleAssignedUser(scope.row)">分配用户
+            </el-button>
+            <el-button type="text" size="mini"  @click="handleDel(scope.row)">删除
+            </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="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]
+  }
+  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
+    }
+  })
+};
+
+
+//重置功能
+const handleReset = () => {
+  dateValue.value = []
+  roleForm.value.resetFields()
+  getList()
+}
+
+//添加功能
+const handleAdd = () => {
+  // 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 = (row) => {
+  ElMessageBox.confirm(`确认删除角色名称为${row.roleName}的数据吗?`, "系统提示", {
+    confirmButtonText: "确定",
+    cancelButtonText: "取消",
+    type: "warning",
+  }).then(() => {
+    deleteRole(row.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/system/user/index.vue

@@ -0,0 +1,537 @@
+<template>
+  <div class="layout">
+    <div class="layout-left" style="width: 20%;border:none">
+      <el-form :model="queryDept" @submit.prevent>
+        <el-form-item prop="dictType">
+          <el-input v-model="queryDept.deptName" placeholder="请输入部门名称" :prefix-icon="Search"
+                    clearable @clear="handleSearchDept" @input="handleSearchDept"></el-input>
+        </el-form-item>
+      </el-form>
+      <el-tree :data="deptList" :props="deptProps" empty-text="" node-key="value" default-expand-all
+               highlight-current :expand-on-click-node="false"
+               @node-click="handle">
+        <template #default="{ node, data }">
+          {{ node.label }}
+        </template>
+      </el-tree>
+    </div>
+    <div class="layout-right" style="width: 80%;border:none">
+      <el-form :model="queryParams" class="query-form" inline ref="userForm">
+        <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 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"
+            row-key="userId"
+            :lazy="true"
+            v-loading="loading"
+            :header-cell-style="{'background':'#f5f5f8'}"
+        >
+          <el-table-column label="序号" type="index" align="center" width="55"/>
+          <!--          <el-table-column prop="userId" label="用户编号" align="center"/>-->
+          <el-table-column prop="userName" label="用户名称" align="center"/>
+          <el-table-column prop="nickName" label="用户昵称" align="center"/>
+          <el-table-column prop="deptName" 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="text" size="mini"
+                         @click="handleEdit(scope.row.userId)" >编辑
+              </el-button>
+              <el-button type="text" size="mini" @click="handleDelete(scope.row)">删除
+              </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="total" @changeSize="handleSizeChange" @goPage="handleCurrentChange"/>
+      <el-dialog v-model="isVisited" :title="title" width="700px">
+        <el-form :model="form" ref="formInstance" label-width="80px" :rules="rules">
+          <el-row>
+            <el-col :span="12">
+              <el-form-item label="用户名称" prop="userName">
+                <el-input v-model="form.userName" placeholder="请输入用户名称"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="用户昵称" prop="nickName">
+                <el-input v-model="form.nickName" placeholder="请输入用户昵称"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="用户性别" prop="sex">
+                <el-select v-model="form.sex"
+                           placeholder="请选择用户性别"
+                           style="width: 250px" filterable>
+                  <el-option
+                      v-for="item in cacheStore.getDict('user_sex')"
+                      :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="password">
+                <el-input
+                    v-model="form.password"
+                    type="password"
+                    placeholder="请输入密码"
+                    show-password
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="归属部门" prop="deptId">
+                <el-tree-select
+                    ref="treeSelect"
+                    v-model="form.deptId"
+                    :data="deptList"
+                    :props="deptProps"
+                    value-key="value"
+                    check-strictly
+                    :render-after-expand="false"
+                    @node-click=""
+                    style="width: 250px"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="手机号码" prop="phoneNumber">
+                <el-input v-model="form.phoneNumber" 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="user in cacheStore.getDict('normal_disable')" :key="user.value"
+                            :label="user.value">
+                    {{ user.label }}
+                  </el-radio>
+                </el-radio-group>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="岗位" prop="postIds">
+                <el-select
+                    v-model="form.postIds"
+                    multiple
+                    placeholder="请选择岗位"
+                    style="width: 250px" filterable
+                >
+                  <div v-if="title=='新增用户'">
+                    <el-option
+                        v-for="item in postList"
+                        :key="item.postId"
+                        :label="item.postName"
+                        :value="item.postId"
+                    />
+                  </div>
+                  <div v-else>
+                    <el-option
+                        v-for="item in form.postList"
+                        :key="item.value"
+                        :label="item.label"
+                        :value="item.value"
+                    />
+                  </div>
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="角色" prop="roleIds">
+                <el-select v-model="form.roleIds"
+                           multiple
+                           placeholder="请选择角色"
+                           style="width: 250px" filterable>
+                  <div v-if="title=='新增用户'">
+                    <el-option
+                        v-for="item in roleList"
+                        :key="item.roleId"
+                        :label="item.roleName"
+                        :value="item.roleId"
+                    />
+                  </div>
+                  <div v-else>
+                    <el-option
+                        v-for="item in form.roleList"
+                        :key="item.value"
+                        :label="item.label"
+                        :value="item.value"
+                    />
+                  </div>
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="24">
+              <el-form-item label="备注" prop="remark">
+                <el-input
+                    type="textarea"
+                    :rows="3"
+                    maxlength="255"
+                    show-word-limit
+                    placeholder="请输入内容"
+                    v-model="form.remark">
+                </el-input>
+              </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>
+  </div>
+</template>
+
+<script setup>
+import {Search, Refresh, Plus, Edit, Delete} from "@element-plus/icons-vue";
+import {defineProps} from "vue";
+import {getRoleList} from "@/api/role/role";
+import {getUserList, getUserDetail, addUser, editUser,deleteUser} from "@/api/user/user";
+import {getDeptList} from "@/api/dept/dept";
+import {getPostList} from "@/api/post/post";
+import {ElMessage, ElMessageBox} from "element-plus";
+import {useCacheStore} from "@/stores/cache.js";
+import Tag from '@/components/Tag.vue'
+import Paging from "@/components/pagination/index.vue";
+
+const cacheStore = useCacheStore();
+//查询参数
+const queryDept = reactive({
+  deptName: ""
+});
+const queryParams = reactive({
+  deptId: "",
+  userName: "",
+  phoneNumber: "",
+  state: "",
+  startTime: "",
+  endTime: ""
+});
+const userForm = ref();
+const list = ref([]);
+const total = ref([]);
+//页面信息
+const pageInfo = reactive({
+  pageNum: 1,
+  pageSize: 10
+});
+const loading = ref(true);
+const treeSelect = ref();
+const postList = ref([]);
+const roleList = ref([]);
+const deptList = ref([]);
+const deptProps = reactive({
+  value: "deptId",
+  label: "deptName"
+});
+const props = defineProps({
+  value: {
+    type: Array,
+    default: () => {
+      return [];
+    }
+  }
+});
+const form = ref({
+  // user: [],
+  // postIds: "",
+  // roleIds: "",
+  roleList: [],
+  postList: []
+});
+const formInstance = ref();
+const isVisited = ref(false);
+const title = ref("");
+const rules = reactive({
+  nickName: [
+    {required: true, message: "请输入用户昵称", trigger: "blur"}
+  ],
+  userName: [
+    {required: true, message: "请输入用户名称", trigger: "blur"}
+  ],
+  password: [
+    {required: true, message: "请输入用户密码", trigger: "blur"}
+  ]
+});
+const dateValue = 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 getDepartmentList = async () => {
+  let params = {
+    ...queryDept
+  };
+  //获取部门信息
+  getDeptList(params).then(res => {
+    if (res.code === 1000) {
+      deptList.value = res.data;
+    } else {
+      ElMessage.error(res.msg);
+    }
+  });
+};
+//获取用户数据
+const getList = async () => {
+  let params = {
+    ...queryParams,
+    ...pageInfo
+  };
+  const date = dateValue.value
+  if (date !== undefined && date !== null) {
+    params.startTime = date[0]
+    params.endTime = date[1]
+  }
+  getUserList(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 getRole = () => {
+  getRoleList().then(res => {
+    if (res.code === 1000) {
+      roleList.value = res.data.rows;
+    }
+  });
+};
+const getPost= async () => {
+  getPostList().then(res => {
+    if (res.code === 1000) {
+      postList.value = res.data.rows;
+    }
+  })
+}
+//搜索部门
+const handleSearchDept = () => {
+  getDepartmentList();
+};
+//点击部门节点筛选数据
+const handle = (node) => {
+  queryParams.deptId = node.deptId;
+  getList();
+};
+
+//用户搜索重置
+const handleReset = () => {
+  dateValue.value = [];
+  userForm.value.resetFields();
+  getList();
+};
+const restForm = () => {
+  form.value = {
+    roleList: [],
+    postList: [],
+    userName: null,
+    nickName: null,
+    deptId: null,
+    phoneNumber: null,
+    email: null,
+    password: null,
+    sex: null,
+    state: "1",
+    postIds: [],
+    roleIds: [],
+    remark: null,
+  };
+};
+//新增用户
+const handleAdd = () => {
+  rules.password[0].required = true
+  restForm();
+  getRole();
+  getPost()
+  title.value = "新增用户";
+  isVisited.value = true;
+  nextTick(()=>{
+    // 清空校验
+    formInstance.value.clearValidate()
+  })
+};
+
+//修改用户
+const handleEdit = (userId) => {
+  restForm();
+  getRole();
+  getPost()
+  //查看详情
+  getUserDetail(userId).then(res => {
+    if (res.code === 1000) {
+      rules.password[0].required = false
+      form.value = res.data.user;
+      form.value.roleIds = res.data.roleIds;
+      form.value.postIds = res.data.postIds;
+      form.value.roleList = res.data.roleList;
+      form.value.postList = res.data.postList;
+      title.value = "修改用户";
+      isVisited.value = true;
+      nextTick(()=>{
+        // 清空校验
+        formInstance.value.clearValidate()
+      })
+    }
+  });
+};
+//删除功能
+const handleDelete = (row) => {
+  ElMessageBox.confirm(`确认删除用户名称为${row.userName}的数据吗?`, "系统提示", {
+    confirmButtonText: "确定",
+    cancelButtonText: "取消",
+    type: "warning"
+  }).then(() => {
+    deleteUser(row.userId).then(res => {
+      if (res.code === 1000) {
+        ElMessage.success(res.msg);
+        getList();
+      } else {
+        ElMessage.error(res.msg);
+      }
+    });
+  });
+};
+
+//取消
+const handleCancel = () => {
+  restForm();
+  isVisited.value = false;
+};
+//提交
+const handleSubmit = async (formInstance) => {
+  if (!formInstance) return;
+  formInstance.validate(async (valid) => {
+    if (!valid) return;
+    if (title.value === "新增用户") {
+      addUser(form.value).then(res => {
+        if (res.code === 1000) {
+          ElMessage.success(res.msg);
+          getList();
+          isVisited.value = false;
+        } else {
+          ElMessage.error(res.msg);
+        }
+      });
+    } else {
+      editUser(form.value).then(res => {
+        if (res.code === 1000) {
+          ElMessage.success(res.msg);
+          getList();
+          isVisited.value = false;
+        } else {
+          ElMessage.error(res.msg);
+        }
+      });
+    }
+  })
+}
+
+//切换每页显示条数
+const handleSizeChange = (val) => {
+  pageInfo.pageSize = val;
+  getList();
+};
+
+//点击页码进行分页功能
+const handleCurrentChange = (val) => {
+  pageInfo.pageNum = val;
+  getList();
+};
+getDepartmentList();
+getList();
+</script>