Merge branch 'dev' of http://47.92.113.182:3000/docking/docking-vue into dev

src/views/data_directory/basic/reqMap.js

@@ -50,12 +50,14 @@ export const reqMapArr = [
       { key: "checkDep", label: "排查部门" },
       { key: "checker", label: "排查人" },
       { key: "taskName", label: "任务名称" },
+      { key: "dataId", label: "数据ID" },
     ],
     reqMap: {
       checkRiskName: "",
       checkDep: "",
       checker: "",
       taskName: "",
+      dataId: "",
     },
   },
   {
@@ -226,6 +228,14 @@ export const reqMapArr = [
       licenseNumber: "",
     },
   },
+  {
+    dataType: ["22"],
+    options: [
+      { key: "dataId", label: "数据ID" }],
+    reqMap: {
+      dataId: "",
+    },
+  },
   {
     dataType: ["24"],
     options: [{ key: "zoneName", label: "区域名称" }],

src/views/system_management/role/index.vue

@@ -20,6 +20,7 @@
       @get-data="getData"
     >
       <el-table-column prop="roleName" label="名称" />
+      <el-table-column prop="typeDesc" label="角色类型" />
       <el-table-column prop="remark" label="备注" />
       <el-table-column label="操作" width="120">
         <template #default="{ row }">

src/views/user_management/user/index.vue

@@ -13,6 +13,7 @@
       <el-table-column prop="username" label="用户名" />
       <el-table-column prop="mobile" label="手机号" />
       <el-table-column prop="departmentName" label="部门"> </el-table-column>
+      <el-table-column prop="rolesName" label="角色"> </el-table-column>
       <el-table-column v-slot="{ row }" label="操作" width="150">
         <el-button
           type="primary"