diff --git a/public/config/config.json b/public/config/config.json
index a1d00a8..eaba0a5 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -53,7 +53,7 @@
   "appStreamUrlDesc": "代理流播放地址",
   "appStreamUrl": "casic",
   "useApprovalDesc": "是否使用审批",
-  "useApproval": "false",
+  "useApproval": "true",
   "useGatewayDesc": "sm是否走网关",
   "useGateway": "false"
 }

diff --git a/public/config/config.json b/public/config/config.json
index a1d00a8..eaba0a5 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -53,7 +53,7 @@
   "appStreamUrlDesc": "代理流播放地址",
   "appStreamUrl": "casic",
   "useApprovalDesc": "是否使用审批",
-  "useApproval": "false",
+  "useApproval": "true",
   "useGatewayDesc": "sm是否走网关",
   "useGateway": "false"
 }
diff --git a/src/views/alarm/dangerAssessment/assessment/list.vue b/src/views/alarm/dangerAssessment/assessment/list.vue
index 88b5ce5..e26789e 100644
--- a/src/views/alarm/dangerAssessment/assessment/list.vue
+++ b/src/views/alarm/dangerAssessment/assessment/list.vue
@@ -287,9 +287,10 @@
                 top: 50,
                 left: 20,
                 right: 20,
-                bottom: 0,
+                bottom: 5,
                 containLabel: true, // 是否包含坐标轴的刻度标签
               }"
+              :rotate="0"
             />
           </bench-col>
         </el-col>

diff --git a/public/config/config.json b/public/config/config.json
index a1d00a8..eaba0a5 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -53,7 +53,7 @@
   "appStreamUrlDesc": "代理流播放地址",
   "appStreamUrl": "casic",
   "useApprovalDesc": "是否使用审批",
-  "useApproval": "false",
+  "useApproval": "true",
   "useGatewayDesc": "sm是否走网关",
   "useGateway": "false"
 }
diff --git a/src/views/alarm/dangerAssessment/assessment/list.vue b/src/views/alarm/dangerAssessment/assessment/list.vue
index 88b5ce5..e26789e 100644
--- a/src/views/alarm/dangerAssessment/assessment/list.vue
+++ b/src/views/alarm/dangerAssessment/assessment/list.vue
@@ -287,9 +287,10 @@
                 top: 50,
                 left: 20,
                 right: 20,
-                bottom: 0,
+                bottom: 5,
                 containLabel: true, // 是否包含坐标轴的刻度标签
               }"
+              :rotate="0"
             />
           </bench-col>
         </el-col>
diff --git a/src/views/system/role/dataPerm.vue b/src/views/system/role/dataPerm.vue
index 61f65ec..f348746 100644
--- a/src/views/system/role/dataPerm.vue
+++ b/src/views/system/role/dataPerm.vue
@@ -50,6 +50,7 @@
 // ---------------表单提交--------------------------------
 // 表单对象
 const dataFormRef = ref<FormInstance>()
+const currentCheckedKeys = ref<string[]>([])
 
 // 提交表单
 function submitForm() {
@@ -103,7 +104,8 @@
       treeList.value = toTreeList(tempData)
       const temp = getShowItem(tempData) // 获取展开项和选中项
       defaultExpanded.value = temp.expandList
-      defaultChecked.value = temp.openedList
+      defaultChecked.value = pageType.value === 'detail' ? currentCheckedKeys.value : temp.openedList
+      // defaultChecked.value = temp.openedList
       loading.value = false
     }
   })
@@ -147,13 +149,14 @@
 })
 
 // ----------初始化、关闭对话框相关-----------------
-function initDialog(row: RoleInfo, useApprovalParam = '', type = '') {
+function initDialog(row: any, useApprovalParam = '', type = '') {
   roleName.value = row.name
   roleId.value = row.id
   useApproval.value = useApprovalParam
   pageType.value = type
   dialogVisible.value = true
   btnLoading.value = false
+  currentCheckedKeys.value = row.ids
   fetchDeptTree(row.id)
 }
 // 关闭弹窗

diff --git a/public/config/config.json b/public/config/config.json
index a1d00a8..eaba0a5 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -53,7 +53,7 @@
   "appStreamUrlDesc": "代理流播放地址",
   "appStreamUrl": "casic",
   "useApprovalDesc": "是否使用审批",
-  "useApproval": "false",
+  "useApproval": "true",
   "useGatewayDesc": "sm是否走网关",
   "useGateway": "false"
 }
diff --git a/src/views/alarm/dangerAssessment/assessment/list.vue b/src/views/alarm/dangerAssessment/assessment/list.vue
index 88b5ce5..e26789e 100644
--- a/src/views/alarm/dangerAssessment/assessment/list.vue
+++ b/src/views/alarm/dangerAssessment/assessment/list.vue
@@ -287,9 +287,10 @@
                 top: 50,
                 left: 20,
                 right: 20,
-                bottom: 0,
+                bottom: 5,
                 containLabel: true, // 是否包含坐标轴的刻度标签
               }"
+              :rotate="0"
             />
           </bench-col>
         </el-col>
diff --git a/src/views/system/role/dataPerm.vue b/src/views/system/role/dataPerm.vue
index 61f65ec..f348746 100644
--- a/src/views/system/role/dataPerm.vue
+++ b/src/views/system/role/dataPerm.vue
@@ -50,6 +50,7 @@
 // ---------------表单提交--------------------------------
 // 表单对象
 const dataFormRef = ref<FormInstance>()
+const currentCheckedKeys = ref<string[]>([])
 
 // 提交表单
 function submitForm() {
@@ -103,7 +104,8 @@
       treeList.value = toTreeList(tempData)
       const temp = getShowItem(tempData) // 获取展开项和选中项
       defaultExpanded.value = temp.expandList
-      defaultChecked.value = temp.openedList
+      defaultChecked.value = pageType.value === 'detail' ? currentCheckedKeys.value : temp.openedList
+      // defaultChecked.value = temp.openedList
       loading.value = false
     }
   })
@@ -147,13 +149,14 @@
 })
 
 // ----------初始化、关闭对话框相关-----------------
-function initDialog(row: RoleInfo, useApprovalParam = '', type = '') {
+function initDialog(row: any, useApprovalParam = '', type = '') {
   roleName.value = row.name
   roleId.value = row.id
   useApproval.value = useApprovalParam
   pageType.value = type
   dialogVisible.value = true
   btnLoading.value = false
+  currentCheckedKeys.value = row.ids
   fetchDeptTree(row.id)
 }
 // 关闭弹窗
diff --git a/src/views/system/role/functionPerm.vue b/src/views/system/role/functionPerm.vue
index 164be26..fe11ac8 100644
--- a/src/views/system/role/functionPerm.vue
+++ b/src/views/system/role/functionPerm.vue
@@ -51,6 +51,18 @@
 // 表单对象
 const dataFormRef = ref<FormInstance>()
 
+// 存储当前选中的节点ID和完整数据
+const currentCheckedKeys = ref<string[]>([])
+function handleCheckChange(data: any, checked: { checkedKeys: string[]; halfCheckedKeys: string[] }) {
+  // 更新选中的节点ID
+  currentCheckedKeys.value = checked.checkedKeys
+
+  // 更新选中的节点完整数据
+  currentCheckedNodes.value = tree.value.getCheckedNodes(false, true)
+
+  console.log('选中状态更新:', currentCheckedKeys.value)
+}
+
 // 提交表单
 function submitForm() {
   const ids: string[] = tree.value.getCheckedKeys()
@@ -73,6 +85,7 @@
       operationType: 'role_funcAuthor',
       id: '',
     }
+
     approvalAdd(params).then(() => {
       ElMessage.success('审批提交成功，请耐心等待审批！')
       btnLoading.value = false
@@ -103,7 +116,7 @@
       treeList.value = toTreeList(tempData)
       const temp = getShowItem(tempData) // 获取展开项和选中项
       defaultExpanded.value = temp.expandList
-      defaultChecked.value = temp.openedList
+      defaultChecked.value = pageType.value === 'detail' ? currentCheckedKeys.value : temp.openedList
       tree.value.setCheckedKeys(temp.openedList)
       loading.value = false
     }
@@ -147,13 +160,15 @@
 })
 
 // ----------初始化、关闭对话框相关-----------------
-function initDialog(row: RoleInfo, useApprovalParam = '', type = '') {
+
+function initDialog(row: any, useApprovalParam = '', type = '') {
   roleName.value = row.name
   roleId.value = row.id
   pageType.value = type
   useApproval.value = useApprovalParam
   dialogVisible.value = true
   btnLoading.value = false
+  currentCheckedKeys.value = row.ids
   fetchResourceTree(row.id, row.bizType)
 }
 // 关闭弹窗
@@ -198,11 +213,12 @@
         :filter-node-method="filterNode"
         show-checkbox
         node-key="id"
+        @check="handleCheckChange"
       />
     </el-scrollbar>
     <template #footer>
       <div class="dialog-footer">
-        <el-button :loading="btnLoading" type="primary" @click="submitForm">
+        <el-button v-if="pageType !== 'detail'" :loading="btnLoading" type="primary" @click="submitForm">
           保存
         </el-button>
         <el-button @click="dialogClose">

diff --git a/public/config/config.json b/public/config/config.json
index a1d00a8..eaba0a5 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -53,7 +53,7 @@
   "appStreamUrlDesc": "代理流播放地址",
   "appStreamUrl": "casic",
   "useApprovalDesc": "是否使用审批",
-  "useApproval": "false",
+  "useApproval": "true",
   "useGatewayDesc": "sm是否走网关",
   "useGateway": "false"
 }
diff --git a/src/views/alarm/dangerAssessment/assessment/list.vue b/src/views/alarm/dangerAssessment/assessment/list.vue
index 88b5ce5..e26789e 100644
--- a/src/views/alarm/dangerAssessment/assessment/list.vue
+++ b/src/views/alarm/dangerAssessment/assessment/list.vue
@@ -287,9 +287,10 @@
                 top: 50,
                 left: 20,
                 right: 20,
-                bottom: 0,
+                bottom: 5,
                 containLabel: true, // 是否包含坐标轴的刻度标签
               }"
+              :rotate="0"
             />
           </bench-col>
         </el-col>
diff --git a/src/views/system/role/dataPerm.vue b/src/views/system/role/dataPerm.vue
index 61f65ec..f348746 100644
--- a/src/views/system/role/dataPerm.vue
+++ b/src/views/system/role/dataPerm.vue
@@ -50,6 +50,7 @@
 // ---------------表单提交--------------------------------
 // 表单对象
 const dataFormRef = ref<FormInstance>()
+const currentCheckedKeys = ref<string[]>([])
 
 // 提交表单
 function submitForm() {
@@ -103,7 +104,8 @@
       treeList.value = toTreeList(tempData)
       const temp = getShowItem(tempData) // 获取展开项和选中项
       defaultExpanded.value = temp.expandList
-      defaultChecked.value = temp.openedList
+      defaultChecked.value = pageType.value === 'detail' ? currentCheckedKeys.value : temp.openedList
+      // defaultChecked.value = temp.openedList
       loading.value = false
     }
   })
@@ -147,13 +149,14 @@
 })
 
 // ----------初始化、关闭对话框相关-----------------
-function initDialog(row: RoleInfo, useApprovalParam = '', type = '') {
+function initDialog(row: any, useApprovalParam = '', type = '') {
   roleName.value = row.name
   roleId.value = row.id
   useApproval.value = useApprovalParam
   pageType.value = type
   dialogVisible.value = true
   btnLoading.value = false
+  currentCheckedKeys.value = row.ids
   fetchDeptTree(row.id)
 }
 // 关闭弹窗
diff --git a/src/views/system/role/functionPerm.vue b/src/views/system/role/functionPerm.vue
index 164be26..fe11ac8 100644
--- a/src/views/system/role/functionPerm.vue
+++ b/src/views/system/role/functionPerm.vue
@@ -51,6 +51,18 @@
 // 表单对象
 const dataFormRef = ref<FormInstance>()
 
+// 存储当前选中的节点ID和完整数据
+const currentCheckedKeys = ref<string[]>([])
+function handleCheckChange(data: any, checked: { checkedKeys: string[]; halfCheckedKeys: string[] }) {
+  // 更新选中的节点ID
+  currentCheckedKeys.value = checked.checkedKeys
+
+  // 更新选中的节点完整数据
+  currentCheckedNodes.value = tree.value.getCheckedNodes(false, true)
+
+  console.log('选中状态更新:', currentCheckedKeys.value)
+}
+
 // 提交表单
 function submitForm() {
   const ids: string[] = tree.value.getCheckedKeys()
@@ -73,6 +85,7 @@
       operationType: 'role_funcAuthor',
       id: '',
     }
+
     approvalAdd(params).then(() => {
       ElMessage.success('审批提交成功，请耐心等待审批！')
       btnLoading.value = false
@@ -103,7 +116,7 @@
       treeList.value = toTreeList(tempData)
       const temp = getShowItem(tempData) // 获取展开项和选中项
       defaultExpanded.value = temp.expandList
-      defaultChecked.value = temp.openedList
+      defaultChecked.value = pageType.value === 'detail' ? currentCheckedKeys.value : temp.openedList
       tree.value.setCheckedKeys(temp.openedList)
       loading.value = false
     }
@@ -147,13 +160,15 @@
 })
 
 // ----------初始化、关闭对话框相关-----------------
-function initDialog(row: RoleInfo, useApprovalParam = '', type = '') {
+
+function initDialog(row: any, useApprovalParam = '', type = '') {
   roleName.value = row.name
   roleId.value = row.id
   pageType.value = type
   useApproval.value = useApprovalParam
   dialogVisible.value = true
   btnLoading.value = false
+  currentCheckedKeys.value = row.ids
   fetchResourceTree(row.id, row.bizType)
 }
 // 关闭弹窗
@@ -198,11 +213,12 @@
         :filter-node-method="filterNode"
         show-checkbox
         node-key="id"
+        @check="handleCheckChange"
       />
     </el-scrollbar>
     <template #footer>
       <div class="dialog-footer">
-        <el-button :loading="btnLoading" type="primary" @click="submitForm">
+        <el-button v-if="pageType !== 'detail'" :loading="btnLoading" type="primary" @click="submitForm">
           保存
         </el-button>
         <el-button @click="dialogClose">
diff --git a/src/views/system/user/listUser.vue b/src/views/system/user/listUser.vue
index 32a4b75..e76d9b4 100644
--- a/src/views/system/user/listUser.vue
+++ b/src/views/system/user/listUser.vue
@@ -125,7 +125,7 @@
       }
       else {
         const sendparams = {
-          jsonContext: { ...user, params }, // 操作内容
+          jsonContext: { ...user, ...params }, // 操作内容
           operationRemark: '用户重置密码', // 操作备注
           title: '用户重置密码', // 申请标题
           status: '0',