From 8484686be6d84835b26435957264f5c913e02c75 Mon Sep 17 00:00:00 2001
From: zhaokai <zhaokai@zcloudchina.com>
Date: Wed, 3 Sep 2025 11:10:06 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E9=A1=B5=E9=9D=A2=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/data_directory/basic/reqMap.js   | 10 ++++++++++
 src/views/system_management/role/index.vue |  1 +
 src/views/user_management/user/index.vue   |  1 +
 3 files changed, 12 insertions(+)

diff --git a/src/views/data_directory/basic/reqMap.js b/src/views/data_directory/basic/reqMap.js
index 2f46649..c67502a 100644
--- a/src/views/data_directory/basic/reqMap.js
+++ b/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: "区域名称" }],
diff --git a/src/views/system_management/role/index.vue b/src/views/system_management/role/index.vue
index f15cc2f..f18382c 100644
--- a/src/views/system_management/role/index.vue
+++ b/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 }">
diff --git a/src/views/user_management/user/index.vue b/src/views/user_management/user/index.vue
index 6488bef..745b4a0 100644
--- a/src/views/user_management/user/index.vue
+++ b/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"