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/layouts/components/Topbar/index.vue b/src/layouts/components/Topbar/index.vue
index bc3af96..47c3c6f 100644
--- a/src/layouts/components/Topbar/index.vue
+++ b/src/layouts/components/Topbar/index.vue
@@ -74,7 +74,8 @@
         <el-breadcrumb v-if="settingsStore.breadcrumb.enable && settingsStore.mode === 'pc' && settingsStore.app.routeBaseOn !== 'filesystem'">
           <transition-group name="breadcrumb">
             <el-breadcrumb-item v-for="(item, index) in breadcrumbList" :key="item.path" :to="index < breadcrumbList.length - 1 ? pathCompile(item.path) : ''">
-              {{ item.title }} <span v-if="systemType === 'gm' && (item.title === '设备管理' || item.title === '数据统计' || item.title === '实时监控')"> - 内部</span>
+              <!-- {{ item.title }} <span v-if="systemType === 'gm' && (item.title === '设备管理' || item.title === '数据统计' || item.title === '实时监控')"> - 内部</span> -->
+              {{ item.title }} <span v-if="systemType === 'gm' && index === breadcrumbList.length - 1"> - 内部</span>
             </el-breadcrumb-item>
           </transition-group>
         </el-breadcrumb>

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/layouts/components/Topbar/index.vue b/src/layouts/components/Topbar/index.vue
index bc3af96..47c3c6f 100644
--- a/src/layouts/components/Topbar/index.vue
+++ b/src/layouts/components/Topbar/index.vue
@@ -74,7 +74,8 @@
         <el-breadcrumb v-if="settingsStore.breadcrumb.enable && settingsStore.mode === 'pc' && settingsStore.app.routeBaseOn !== 'filesystem'">
           <transition-group name="breadcrumb">
             <el-breadcrumb-item v-for="(item, index) in breadcrumbList" :key="item.path" :to="index < breadcrumbList.length - 1 ? pathCompile(item.path) : ''">
-              {{ item.title }} <span v-if="systemType === 'gm' && (item.title === '设备管理' || item.title === '数据统计' || item.title === '实时监控')"> - 内部</span>
+              <!-- {{ item.title }} <span v-if="systemType === 'gm' && (item.title === '设备管理' || item.title === '数据统计' || item.title === '实时监控')"> - 内部</span> -->
+              {{ item.title }} <span v-if="systemType === 'gm' && index === breadcrumbList.length - 1"> - 内部</span>
             </el-breadcrumb-item>
           </transition-group>
         </el-breadcrumb>
diff --git a/src/views/alarm/dangerAssessment/assessment/list.vue b/src/views/alarm/dangerAssessment/assessment/list.vue
index e26789e..ba284f7 100644
--- a/src/views/alarm/dangerAssessment/assessment/list.vue
+++ b/src/views/alarm/dangerAssessment/assessment/list.vue
@@ -193,17 +193,17 @@
 const systemType = ref('') // 系统类型 sm/gm
 onMounted(() => {
   systemType.value = window.localStorage.getItem('systemType') as string
-  getDictByCode('secretUserLevel').then((response) => {
-    if (response.code === 200) {
-      if (Array.isArray(response.data) && response.data.length) {
-        const level = window.sessionStorage.getItem('secretUserLevel')
-        const index = response.data.findIndex((item: { value: string | null }) => item.value === level)
-        if (index !== -1 && systemType.value === 'gm') {
-          secretLevelUserName.value = response.data[index].name
-        }
-      }
-    }
-  })
+  // getDictByCode('secretUserLevel').then((response) => {
+  //   if (response.code === 200) {
+  //     if (Array.isArray(response.data) && response.data.length) {
+  //       const level = window.sessionStorage.getItem('secretUserLevel')
+  //       const index = response.data.findIndex((item: { value: string | null }) => item.value === level)
+  //       if (index !== -1 && systemType.value === 'gm') {
+  //         secretLevelUserName.value = response.data[index].name
+  //       }
+  //     }
+  //   }
+  // })
   fetchDangerCategory()
   getLastMonthAlarm() // 单位近一个月报警分析
   // getSafeCatogery() // 获取安全隐患类别
@@ -221,7 +221,8 @@
           <el-image :src="urlMap[item.name]" class="base-map-image" mode="fill" />
           <div class="item-text">
             <div style="color: #0f67e7;font-size: 16px;font-weight: 500;">
-              {{ item.name }}<span v-if="secretLevelUserName">-{{ secretLevelUserName }}</span>
+              {{ item.name }}
+              <!-- <span v-if="secretLevelUserName">-{{ secretLevelUserName }}</span> -->
             </div>
             <div class="num">
               {{ item.value }}<span class="unit">个</span>

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/layouts/components/Topbar/index.vue b/src/layouts/components/Topbar/index.vue
index bc3af96..47c3c6f 100644
--- a/src/layouts/components/Topbar/index.vue
+++ b/src/layouts/components/Topbar/index.vue
@@ -74,7 +74,8 @@
         <el-breadcrumb v-if="settingsStore.breadcrumb.enable && settingsStore.mode === 'pc' && settingsStore.app.routeBaseOn !== 'filesystem'">
           <transition-group name="breadcrumb">
             <el-breadcrumb-item v-for="(item, index) in breadcrumbList" :key="item.path" :to="index < breadcrumbList.length - 1 ? pathCompile(item.path) : ''">
-              {{ item.title }} <span v-if="systemType === 'gm' && (item.title === '设备管理' || item.title === '数据统计' || item.title === '实时监控')"> - 内部</span>
+              <!-- {{ item.title }} <span v-if="systemType === 'gm' && (item.title === '设备管理' || item.title === '数据统计' || item.title === '实时监控')"> - 内部</span> -->
+              {{ item.title }} <span v-if="systemType === 'gm' && index === breadcrumbList.length - 1"> - 内部</span>
             </el-breadcrumb-item>
           </transition-group>
         </el-breadcrumb>
diff --git a/src/views/alarm/dangerAssessment/assessment/list.vue b/src/views/alarm/dangerAssessment/assessment/list.vue
index e26789e..ba284f7 100644
--- a/src/views/alarm/dangerAssessment/assessment/list.vue
+++ b/src/views/alarm/dangerAssessment/assessment/list.vue
@@ -193,17 +193,17 @@
 const systemType = ref('') // 系统类型 sm/gm
 onMounted(() => {
   systemType.value = window.localStorage.getItem('systemType') as string
-  getDictByCode('secretUserLevel').then((response) => {
-    if (response.code === 200) {
-      if (Array.isArray(response.data) && response.data.length) {
-        const level = window.sessionStorage.getItem('secretUserLevel')
-        const index = response.data.findIndex((item: { value: string | null }) => item.value === level)
-        if (index !== -1 && systemType.value === 'gm') {
-          secretLevelUserName.value = response.data[index].name
-        }
-      }
-    }
-  })
+  // getDictByCode('secretUserLevel').then((response) => {
+  //   if (response.code === 200) {
+  //     if (Array.isArray(response.data) && response.data.length) {
+  //       const level = window.sessionStorage.getItem('secretUserLevel')
+  //       const index = response.data.findIndex((item: { value: string | null }) => item.value === level)
+  //       if (index !== -1 && systemType.value === 'gm') {
+  //         secretLevelUserName.value = response.data[index].name
+  //       }
+  //     }
+  //   }
+  // })
   fetchDangerCategory()
   getLastMonthAlarm() // 单位近一个月报警分析
   // getSafeCatogery() // 获取安全隐患类别
@@ -221,7 +221,8 @@
           <el-image :src="urlMap[item.name]" class="base-map-image" mode="fill" />
           <div class="item-text">
             <div style="color: #0f67e7;font-size: 16px;font-weight: 500;">
-              {{ item.name }}<span v-if="secretLevelUserName">-{{ secretLevelUserName }}</span>
+              {{ item.name }}
+              <!-- <span v-if="secretLevelUserName">-{{ secretLevelUserName }}</span> -->
             </div>
             <div class="num">
               {{ item.value }}<span class="unit">个</span>
diff --git a/src/views/bigScreen/index.vue b/src/views/bigScreen/index.vue
index 451bc7f..57be51b 100644
--- a/src/views/bigScreen/index.vue
+++ b/src/views/bigScreen/index.vue
@@ -66,7 +66,7 @@
   showEchart.value = !showEchart.value
 }
 
-const secretLevelUserName = ref('内部')
+const secretLevelUserName = ref('')
 const systemType = ref('')
 onMounted(() => {
   systemType.value = window.localStorage.getItem('systemType')

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/layouts/components/Topbar/index.vue b/src/layouts/components/Topbar/index.vue
index bc3af96..47c3c6f 100644
--- a/src/layouts/components/Topbar/index.vue
+++ b/src/layouts/components/Topbar/index.vue
@@ -74,7 +74,8 @@
         <el-breadcrumb v-if="settingsStore.breadcrumb.enable && settingsStore.mode === 'pc' && settingsStore.app.routeBaseOn !== 'filesystem'">
           <transition-group name="breadcrumb">
             <el-breadcrumb-item v-for="(item, index) in breadcrumbList" :key="item.path" :to="index < breadcrumbList.length - 1 ? pathCompile(item.path) : ''">
-              {{ item.title }} <span v-if="systemType === 'gm' && (item.title === '设备管理' || item.title === '数据统计' || item.title === '实时监控')"> - 内部</span>
+              <!-- {{ item.title }} <span v-if="systemType === 'gm' && (item.title === '设备管理' || item.title === '数据统计' || item.title === '实时监控')"> - 内部</span> -->
+              {{ item.title }} <span v-if="systemType === 'gm' && index === breadcrumbList.length - 1"> - 内部</span>
             </el-breadcrumb-item>
           </transition-group>
         </el-breadcrumb>
diff --git a/src/views/alarm/dangerAssessment/assessment/list.vue b/src/views/alarm/dangerAssessment/assessment/list.vue
index e26789e..ba284f7 100644
--- a/src/views/alarm/dangerAssessment/assessment/list.vue
+++ b/src/views/alarm/dangerAssessment/assessment/list.vue
@@ -193,17 +193,17 @@
 const systemType = ref('') // 系统类型 sm/gm
 onMounted(() => {
   systemType.value = window.localStorage.getItem('systemType') as string
-  getDictByCode('secretUserLevel').then((response) => {
-    if (response.code === 200) {
-      if (Array.isArray(response.data) && response.data.length) {
-        const level = window.sessionStorage.getItem('secretUserLevel')
-        const index = response.data.findIndex((item: { value: string | null }) => item.value === level)
-        if (index !== -1 && systemType.value === 'gm') {
-          secretLevelUserName.value = response.data[index].name
-        }
-      }
-    }
-  })
+  // getDictByCode('secretUserLevel').then((response) => {
+  //   if (response.code === 200) {
+  //     if (Array.isArray(response.data) && response.data.length) {
+  //       const level = window.sessionStorage.getItem('secretUserLevel')
+  //       const index = response.data.findIndex((item: { value: string | null }) => item.value === level)
+  //       if (index !== -1 && systemType.value === 'gm') {
+  //         secretLevelUserName.value = response.data[index].name
+  //       }
+  //     }
+  //   }
+  // })
   fetchDangerCategory()
   getLastMonthAlarm() // 单位近一个月报警分析
   // getSafeCatogery() // 获取安全隐患类别
@@ -221,7 +221,8 @@
           <el-image :src="urlMap[item.name]" class="base-map-image" mode="fill" />
           <div class="item-text">
             <div style="color: #0f67e7;font-size: 16px;font-weight: 500;">
-              {{ item.name }}<span v-if="secretLevelUserName">-{{ secretLevelUserName }}</span>
+              {{ item.name }}
+              <!-- <span v-if="secretLevelUserName">-{{ secretLevelUserName }}</span> -->
             </div>
             <div class="num">
               {{ item.value }}<span class="unit">个</span>
diff --git a/src/views/bigScreen/index.vue b/src/views/bigScreen/index.vue
index 451bc7f..57be51b 100644
--- a/src/views/bigScreen/index.vue
+++ b/src/views/bigScreen/index.vue
@@ -66,7 +66,7 @@
   showEchart.value = !showEchart.value
 }
 
-const secretLevelUserName = ref('内部')
+const secretLevelUserName = ref('')
 const systemType = ref('')
 onMounted(() => {
   systemType.value = window.localStorage.getItem('systemType')
diff --git a/src/views/monitor/deviceManage/importSelectSecretDialog.vue b/src/views/monitor/deviceManage/importSelectSecretDialog.vue
index 7c14119..c6d3ce7 100644
--- a/src/views/monitor/deviceManage/importSelectSecretDialog.vue
+++ b/src/views/monitor/deviceManage/importSelectSecretDialog.vue
@@ -4,6 +4,12 @@
 import { ElMessage, type FormInstance, type FormRules } from 'element-plus'
 import { getDictByCode } from '@/api/system/dict'
 import type { dictType } from '@/global'
+const props = defineProps({
+  typeTitle: {
+    type: String,
+    default: '文件',
+  },
+})
 const emits = defineEmits(['confirmSecret'])
 const dialogVisible = ref(false) // 弹窗显示隐藏
 
@@ -15,7 +21,7 @@
 const formDataRef = ref<FormInstance>() // 表单对象
 // 校验规则
 const rules = reactive<FormRules>({
-  secret: [{ required: true, message: '导入文件密级必选', trigger: ['blur', 'change'] }],
+  secret: [{ required: true, message: `导入${props.typeTitle}密级必选`, trigger: ['blur', 'change'] }],
 })
 // -----------------------------------------字典--------------------------------------------------------------
 const secretLevelList = ref<dictType[]>([]) // 密级
@@ -59,11 +65,11 @@
 
 <template>
   <el-dialog
-    v-model="dialogVisible" title="选择导入文件的密级" width="600" :before-close="close" append-to-body
+    v-model="dialogVisible" :title="`选择导入${props.typeTitle}的密级`" width="600" :before-close="close" append-to-body
     :open-delay="0" :close-on-click-modal="false"
   >
     <h4 style="color: red;">
-      **请选择导入文件的密级，并按照选择的密级导入相应密级的文件**
+      {{ `**请选择导入${props.typeTitle}的密级，并按照选择的密级导入相应密级的${props.typeTitle}**` }}
     </h4>
 
     <el-form
@@ -72,8 +78,8 @@
     >
       <el-row :gutter="10">
         <el-col :span="12">
-          <el-form-item label="导入文件密级：" prop="secret">
-            <el-radio-group style="display: flex;justify-content: space-around;" v-for="item in secretLevelList" :key="item.id" v-model="formData.secret">
+          <el-form-item :label="`导入${props.typeTitle}密级：`" prop="secret">
+            <el-radio-group v-for="item in secretLevelList" :key="item.id" v-model="formData.secret" style="display: flex;justify-content: space-around;">
               <el-radio :label="item.value" style="width: 300px;">
                 {{ item.name }}
               </el-radio>

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/layouts/components/Topbar/index.vue b/src/layouts/components/Topbar/index.vue
index bc3af96..47c3c6f 100644
--- a/src/layouts/components/Topbar/index.vue
+++ b/src/layouts/components/Topbar/index.vue
@@ -74,7 +74,8 @@
         <el-breadcrumb v-if="settingsStore.breadcrumb.enable && settingsStore.mode === 'pc' && settingsStore.app.routeBaseOn !== 'filesystem'">
           <transition-group name="breadcrumb">
             <el-breadcrumb-item v-for="(item, index) in breadcrumbList" :key="item.path" :to="index < breadcrumbList.length - 1 ? pathCompile(item.path) : ''">
-              {{ item.title }} <span v-if="systemType === 'gm' && (item.title === '设备管理' || item.title === '数据统计' || item.title === '实时监控')"> - 内部</span>
+              <!-- {{ item.title }} <span v-if="systemType === 'gm' && (item.title === '设备管理' || item.title === '数据统计' || item.title === '实时监控')"> - 内部</span> -->
+              {{ item.title }} <span v-if="systemType === 'gm' && index === breadcrumbList.length - 1"> - 内部</span>
             </el-breadcrumb-item>
           </transition-group>
         </el-breadcrumb>
diff --git a/src/views/alarm/dangerAssessment/assessment/list.vue b/src/views/alarm/dangerAssessment/assessment/list.vue
index e26789e..ba284f7 100644
--- a/src/views/alarm/dangerAssessment/assessment/list.vue
+++ b/src/views/alarm/dangerAssessment/assessment/list.vue
@@ -193,17 +193,17 @@
 const systemType = ref('') // 系统类型 sm/gm
 onMounted(() => {
   systemType.value = window.localStorage.getItem('systemType') as string
-  getDictByCode('secretUserLevel').then((response) => {
-    if (response.code === 200) {
-      if (Array.isArray(response.data) && response.data.length) {
-        const level = window.sessionStorage.getItem('secretUserLevel')
-        const index = response.data.findIndex((item: { value: string | null }) => item.value === level)
-        if (index !== -1 && systemType.value === 'gm') {
-          secretLevelUserName.value = response.data[index].name
-        }
-      }
-    }
-  })
+  // getDictByCode('secretUserLevel').then((response) => {
+  //   if (response.code === 200) {
+  //     if (Array.isArray(response.data) && response.data.length) {
+  //       const level = window.sessionStorage.getItem('secretUserLevel')
+  //       const index = response.data.findIndex((item: { value: string | null }) => item.value === level)
+  //       if (index !== -1 && systemType.value === 'gm') {
+  //         secretLevelUserName.value = response.data[index].name
+  //       }
+  //     }
+  //   }
+  // })
   fetchDangerCategory()
   getLastMonthAlarm() // 单位近一个月报警分析
   // getSafeCatogery() // 获取安全隐患类别
@@ -221,7 +221,8 @@
           <el-image :src="urlMap[item.name]" class="base-map-image" mode="fill" />
           <div class="item-text">
             <div style="color: #0f67e7;font-size: 16px;font-weight: 500;">
-              {{ item.name }}<span v-if="secretLevelUserName">-{{ secretLevelUserName }}</span>
+              {{ item.name }}
+              <!-- <span v-if="secretLevelUserName">-{{ secretLevelUserName }}</span> -->
             </div>
             <div class="num">
               {{ item.value }}<span class="unit">个</span>
diff --git a/src/views/bigScreen/index.vue b/src/views/bigScreen/index.vue
index 451bc7f..57be51b 100644
--- a/src/views/bigScreen/index.vue
+++ b/src/views/bigScreen/index.vue
@@ -66,7 +66,7 @@
   showEchart.value = !showEchart.value
 }
 
-const secretLevelUserName = ref('内部')
+const secretLevelUserName = ref('')
 const systemType = ref('')
 onMounted(() => {
   systemType.value = window.localStorage.getItem('systemType')
diff --git a/src/views/monitor/deviceManage/importSelectSecretDialog.vue b/src/views/monitor/deviceManage/importSelectSecretDialog.vue
index 7c14119..c6d3ce7 100644
--- a/src/views/monitor/deviceManage/importSelectSecretDialog.vue
+++ b/src/views/monitor/deviceManage/importSelectSecretDialog.vue
@@ -4,6 +4,12 @@
 import { ElMessage, type FormInstance, type FormRules } from 'element-plus'
 import { getDictByCode } from '@/api/system/dict'
 import type { dictType } from '@/global'
+const props = defineProps({
+  typeTitle: {
+    type: String,
+    default: '文件',
+  },
+})
 const emits = defineEmits(['confirmSecret'])
 const dialogVisible = ref(false) // 弹窗显示隐藏
 
@@ -15,7 +21,7 @@
 const formDataRef = ref<FormInstance>() // 表单对象
 // 校验规则
 const rules = reactive<FormRules>({
-  secret: [{ required: true, message: '导入文件密级必选', trigger: ['blur', 'change'] }],
+  secret: [{ required: true, message: `导入${props.typeTitle}密级必选`, trigger: ['blur', 'change'] }],
 })
 // -----------------------------------------字典--------------------------------------------------------------
 const secretLevelList = ref<dictType[]>([]) // 密级
@@ -59,11 +65,11 @@
 
 <template>
   <el-dialog
-    v-model="dialogVisible" title="选择导入文件的密级" width="600" :before-close="close" append-to-body
+    v-model="dialogVisible" :title="`选择导入${props.typeTitle}的密级`" width="600" :before-close="close" append-to-body
     :open-delay="0" :close-on-click-modal="false"
   >
     <h4 style="color: red;">
-      **请选择导入文件的密级，并按照选择的密级导入相应密级的文件**
+      {{ `**请选择导入${props.typeTitle}的密级，并按照选择的密级导入相应密级的${props.typeTitle}**` }}
     </h4>
 
     <el-form
@@ -72,8 +78,8 @@
     >
       <el-row :gutter="10">
         <el-col :span="12">
-          <el-form-item label="导入文件密级：" prop="secret">
-            <el-radio-group style="display: flex;justify-content: space-around;" v-for="item in secretLevelList" :key="item.id" v-model="formData.secret">
+          <el-form-item :label="`导入${props.typeTitle}密级：`" prop="secret">
+            <el-radio-group v-for="item in secretLevelList" :key="item.id" v-model="formData.secret" style="display: flex;justify-content: space-around;">
               <el-radio :label="item.value" style="width: 300px;">
                 {{ item.name }}
               </el-radio>
diff --git a/src/views/system/approval/approvalDialog.vue b/src/views/system/approval/approvalDialog.vue
index fbac46e..453a185 100644
--- a/src/views/system/approval/approvalDialog.vue
+++ b/src/views/system/approval/approvalDialog.vue
@@ -39,7 +39,7 @@
 const dataFormRef = ref<FormInstance>()
 // 校验规则
 const rules: FormRules = reactive({
-  comments: [{ required: true, message: '审批结论必填', trigger: ['blur', 'change'] }],
+  comments: [{ required: true, message: '审批备注必填', trigger: ['blur', 'change'] }],
 })
 /**
  * 初始化审批弹窗
@@ -120,10 +120,11 @@
           <el-col :span="24">
             <el-form-item label="审批备注:" prop="comments">
               <el-input
-                v-model="formData.comments"
+                v-model.trim="formData.comments"
                 :rows="4"
                 show-word-limit
                 type="textarea"
+                maxlength="100"
               />
             </el-form-item>
           </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/layouts/components/Topbar/index.vue b/src/layouts/components/Topbar/index.vue
index bc3af96..47c3c6f 100644
--- a/src/layouts/components/Topbar/index.vue
+++ b/src/layouts/components/Topbar/index.vue
@@ -74,7 +74,8 @@
         <el-breadcrumb v-if="settingsStore.breadcrumb.enable && settingsStore.mode === 'pc' && settingsStore.app.routeBaseOn !== 'filesystem'">
           <transition-group name="breadcrumb">
             <el-breadcrumb-item v-for="(item, index) in breadcrumbList" :key="item.path" :to="index < breadcrumbList.length - 1 ? pathCompile(item.path) : ''">
-              {{ item.title }} <span v-if="systemType === 'gm' && (item.title === '设备管理' || item.title === '数据统计' || item.title === '实时监控')"> - 内部</span>
+              <!-- {{ item.title }} <span v-if="systemType === 'gm' && (item.title === '设备管理' || item.title === '数据统计' || item.title === '实时监控')"> - 内部</span> -->
+              {{ item.title }} <span v-if="systemType === 'gm' && index === breadcrumbList.length - 1"> - 内部</span>
             </el-breadcrumb-item>
           </transition-group>
         </el-breadcrumb>
diff --git a/src/views/alarm/dangerAssessment/assessment/list.vue b/src/views/alarm/dangerAssessment/assessment/list.vue
index e26789e..ba284f7 100644
--- a/src/views/alarm/dangerAssessment/assessment/list.vue
+++ b/src/views/alarm/dangerAssessment/assessment/list.vue
@@ -193,17 +193,17 @@
 const systemType = ref('') // 系统类型 sm/gm
 onMounted(() => {
   systemType.value = window.localStorage.getItem('systemType') as string
-  getDictByCode('secretUserLevel').then((response) => {
-    if (response.code === 200) {
-      if (Array.isArray(response.data) && response.data.length) {
-        const level = window.sessionStorage.getItem('secretUserLevel')
-        const index = response.data.findIndex((item: { value: string | null }) => item.value === level)
-        if (index !== -1 && systemType.value === 'gm') {
-          secretLevelUserName.value = response.data[index].name
-        }
-      }
-    }
-  })
+  // getDictByCode('secretUserLevel').then((response) => {
+  //   if (response.code === 200) {
+  //     if (Array.isArray(response.data) && response.data.length) {
+  //       const level = window.sessionStorage.getItem('secretUserLevel')
+  //       const index = response.data.findIndex((item: { value: string | null }) => item.value === level)
+  //       if (index !== -1 && systemType.value === 'gm') {
+  //         secretLevelUserName.value = response.data[index].name
+  //       }
+  //     }
+  //   }
+  // })
   fetchDangerCategory()
   getLastMonthAlarm() // 单位近一个月报警分析
   // getSafeCatogery() // 获取安全隐患类别
@@ -221,7 +221,8 @@
           <el-image :src="urlMap[item.name]" class="base-map-image" mode="fill" />
           <div class="item-text">
             <div style="color: #0f67e7;font-size: 16px;font-weight: 500;">
-              {{ item.name }}<span v-if="secretLevelUserName">-{{ secretLevelUserName }}</span>
+              {{ item.name }}
+              <!-- <span v-if="secretLevelUserName">-{{ secretLevelUserName }}</span> -->
             </div>
             <div class="num">
               {{ item.value }}<span class="unit">个</span>
diff --git a/src/views/bigScreen/index.vue b/src/views/bigScreen/index.vue
index 451bc7f..57be51b 100644
--- a/src/views/bigScreen/index.vue
+++ b/src/views/bigScreen/index.vue
@@ -66,7 +66,7 @@
   showEchart.value = !showEchart.value
 }
 
-const secretLevelUserName = ref('内部')
+const secretLevelUserName = ref('')
 const systemType = ref('')
 onMounted(() => {
   systemType.value = window.localStorage.getItem('systemType')
diff --git a/src/views/monitor/deviceManage/importSelectSecretDialog.vue b/src/views/monitor/deviceManage/importSelectSecretDialog.vue
index 7c14119..c6d3ce7 100644
--- a/src/views/monitor/deviceManage/importSelectSecretDialog.vue
+++ b/src/views/monitor/deviceManage/importSelectSecretDialog.vue
@@ -4,6 +4,12 @@
 import { ElMessage, type FormInstance, type FormRules } from 'element-plus'
 import { getDictByCode } from '@/api/system/dict'
 import type { dictType } from '@/global'
+const props = defineProps({
+  typeTitle: {
+    type: String,
+    default: '文件',
+  },
+})
 const emits = defineEmits(['confirmSecret'])
 const dialogVisible = ref(false) // 弹窗显示隐藏
 
@@ -15,7 +21,7 @@
 const formDataRef = ref<FormInstance>() // 表单对象
 // 校验规则
 const rules = reactive<FormRules>({
-  secret: [{ required: true, message: '导入文件密级必选', trigger: ['blur', 'change'] }],
+  secret: [{ required: true, message: `导入${props.typeTitle}密级必选`, trigger: ['blur', 'change'] }],
 })
 // -----------------------------------------字典--------------------------------------------------------------
 const secretLevelList = ref<dictType[]>([]) // 密级
@@ -59,11 +65,11 @@
 
 <template>
   <el-dialog
-    v-model="dialogVisible" title="选择导入文件的密级" width="600" :before-close="close" append-to-body
+    v-model="dialogVisible" :title="`选择导入${props.typeTitle}的密级`" width="600" :before-close="close" append-to-body
     :open-delay="0" :close-on-click-modal="false"
   >
     <h4 style="color: red;">
-      **请选择导入文件的密级，并按照选择的密级导入相应密级的文件**
+      {{ `**请选择导入${props.typeTitle}的密级，并按照选择的密级导入相应密级的${props.typeTitle}**` }}
     </h4>
 
     <el-form
@@ -72,8 +78,8 @@
     >
       <el-row :gutter="10">
         <el-col :span="12">
-          <el-form-item label="导入文件密级：" prop="secret">
-            <el-radio-group style="display: flex;justify-content: space-around;" v-for="item in secretLevelList" :key="item.id" v-model="formData.secret">
+          <el-form-item :label="`导入${props.typeTitle}密级：`" prop="secret">
+            <el-radio-group v-for="item in secretLevelList" :key="item.id" v-model="formData.secret" style="display: flex;justify-content: space-around;">
               <el-radio :label="item.value" style="width: 300px;">
                 {{ item.name }}
               </el-radio>
diff --git a/src/views/system/approval/approvalDialog.vue b/src/views/system/approval/approvalDialog.vue
index fbac46e..453a185 100644
--- a/src/views/system/approval/approvalDialog.vue
+++ b/src/views/system/approval/approvalDialog.vue
@@ -39,7 +39,7 @@
 const dataFormRef = ref<FormInstance>()
 // 校验规则
 const rules: FormRules = reactive({
-  comments: [{ required: true, message: '审批结论必填', trigger: ['blur', 'change'] }],
+  comments: [{ required: true, message: '审批备注必填', trigger: ['blur', 'change'] }],
 })
 /**
  * 初始化审批弹窗
@@ -120,10 +120,11 @@
           <el-col :span="24">
             <el-form-item label="审批备注:" prop="comments">
               <el-input
-                v-model="formData.comments"
+                v-model.trim="formData.comments"
                 :rows="4"
                 show-word-limit
                 type="textarea"
+                maxlength="100"
               />
             </el-form-item>
           </el-col>
diff --git a/src/views/system/approval/index.vue b/src/views/system/approval/index.vue
index 6d71c04..b71db88 100644
--- a/src/views/system/approval/index.vue
+++ b/src/views/system/approval/index.vue
@@ -324,9 +324,9 @@
           <el-option v-for="item of operationTypeList" :key="item.value" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
-      <search-item>
+      <!-- <search-item>
         <el-input v-model="listQuery.operationRemark" placeholder="操作备注" clearable style="width: 200px;" @change="search" />
-      </search-item>
+      </search-item> -->
       <search-item>
         <el-select
           v-model="listQuery.status"

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/layouts/components/Topbar/index.vue b/src/layouts/components/Topbar/index.vue
index bc3af96..47c3c6f 100644
--- a/src/layouts/components/Topbar/index.vue
+++ b/src/layouts/components/Topbar/index.vue
@@ -74,7 +74,8 @@
         <el-breadcrumb v-if="settingsStore.breadcrumb.enable && settingsStore.mode === 'pc' && settingsStore.app.routeBaseOn !== 'filesystem'">
           <transition-group name="breadcrumb">
             <el-breadcrumb-item v-for="(item, index) in breadcrumbList" :key="item.path" :to="index < breadcrumbList.length - 1 ? pathCompile(item.path) : ''">
-              {{ item.title }} <span v-if="systemType === 'gm' && (item.title === '设备管理' || item.title === '数据统计' || item.title === '实时监控')"> - 内部</span>
+              <!-- {{ item.title }} <span v-if="systemType === 'gm' && (item.title === '设备管理' || item.title === '数据统计' || item.title === '实时监控')"> - 内部</span> -->
+              {{ item.title }} <span v-if="systemType === 'gm' && index === breadcrumbList.length - 1"> - 内部</span>
             </el-breadcrumb-item>
           </transition-group>
         </el-breadcrumb>
diff --git a/src/views/alarm/dangerAssessment/assessment/list.vue b/src/views/alarm/dangerAssessment/assessment/list.vue
index e26789e..ba284f7 100644
--- a/src/views/alarm/dangerAssessment/assessment/list.vue
+++ b/src/views/alarm/dangerAssessment/assessment/list.vue
@@ -193,17 +193,17 @@
 const systemType = ref('') // 系统类型 sm/gm
 onMounted(() => {
   systemType.value = window.localStorage.getItem('systemType') as string
-  getDictByCode('secretUserLevel').then((response) => {
-    if (response.code === 200) {
-      if (Array.isArray(response.data) && response.data.length) {
-        const level = window.sessionStorage.getItem('secretUserLevel')
-        const index = response.data.findIndex((item: { value: string | null }) => item.value === level)
-        if (index !== -1 && systemType.value === 'gm') {
-          secretLevelUserName.value = response.data[index].name
-        }
-      }
-    }
-  })
+  // getDictByCode('secretUserLevel').then((response) => {
+  //   if (response.code === 200) {
+  //     if (Array.isArray(response.data) && response.data.length) {
+  //       const level = window.sessionStorage.getItem('secretUserLevel')
+  //       const index = response.data.findIndex((item: { value: string | null }) => item.value === level)
+  //       if (index !== -1 && systemType.value === 'gm') {
+  //         secretLevelUserName.value = response.data[index].name
+  //       }
+  //     }
+  //   }
+  // })
   fetchDangerCategory()
   getLastMonthAlarm() // 单位近一个月报警分析
   // getSafeCatogery() // 获取安全隐患类别
@@ -221,7 +221,8 @@
           <el-image :src="urlMap[item.name]" class="base-map-image" mode="fill" />
           <div class="item-text">
             <div style="color: #0f67e7;font-size: 16px;font-weight: 500;">
-              {{ item.name }}<span v-if="secretLevelUserName">-{{ secretLevelUserName }}</span>
+              {{ item.name }}
+              <!-- <span v-if="secretLevelUserName">-{{ secretLevelUserName }}</span> -->
             </div>
             <div class="num">
               {{ item.value }}<span class="unit">个</span>
diff --git a/src/views/bigScreen/index.vue b/src/views/bigScreen/index.vue
index 451bc7f..57be51b 100644
--- a/src/views/bigScreen/index.vue
+++ b/src/views/bigScreen/index.vue
@@ -66,7 +66,7 @@
   showEchart.value = !showEchart.value
 }
 
-const secretLevelUserName = ref('内部')
+const secretLevelUserName = ref('')
 const systemType = ref('')
 onMounted(() => {
   systemType.value = window.localStorage.getItem('systemType')
diff --git a/src/views/monitor/deviceManage/importSelectSecretDialog.vue b/src/views/monitor/deviceManage/importSelectSecretDialog.vue
index 7c14119..c6d3ce7 100644
--- a/src/views/monitor/deviceManage/importSelectSecretDialog.vue
+++ b/src/views/monitor/deviceManage/importSelectSecretDialog.vue
@@ -4,6 +4,12 @@
 import { ElMessage, type FormInstance, type FormRules } from 'element-plus'
 import { getDictByCode } from '@/api/system/dict'
 import type { dictType } from '@/global'
+const props = defineProps({
+  typeTitle: {
+    type: String,
+    default: '文件',
+  },
+})
 const emits = defineEmits(['confirmSecret'])
 const dialogVisible = ref(false) // 弹窗显示隐藏
 
@@ -15,7 +21,7 @@
 const formDataRef = ref<FormInstance>() // 表单对象
 // 校验规则
 const rules = reactive<FormRules>({
-  secret: [{ required: true, message: '导入文件密级必选', trigger: ['blur', 'change'] }],
+  secret: [{ required: true, message: `导入${props.typeTitle}密级必选`, trigger: ['blur', 'change'] }],
 })
 // -----------------------------------------字典--------------------------------------------------------------
 const secretLevelList = ref<dictType[]>([]) // 密级
@@ -59,11 +65,11 @@
 
 <template>
   <el-dialog
-    v-model="dialogVisible" title="选择导入文件的密级" width="600" :before-close="close" append-to-body
+    v-model="dialogVisible" :title="`选择导入${props.typeTitle}的密级`" width="600" :before-close="close" append-to-body
     :open-delay="0" :close-on-click-modal="false"
   >
     <h4 style="color: red;">
-      **请选择导入文件的密级，并按照选择的密级导入相应密级的文件**
+      {{ `**请选择导入${props.typeTitle}的密级，并按照选择的密级导入相应密级的${props.typeTitle}**` }}
     </h4>
 
     <el-form
@@ -72,8 +78,8 @@
     >
       <el-row :gutter="10">
         <el-col :span="12">
-          <el-form-item label="导入文件密级：" prop="secret">
-            <el-radio-group style="display: flex;justify-content: space-around;" v-for="item in secretLevelList" :key="item.id" v-model="formData.secret">
+          <el-form-item :label="`导入${props.typeTitle}密级：`" prop="secret">
+            <el-radio-group v-for="item in secretLevelList" :key="item.id" v-model="formData.secret" style="display: flex;justify-content: space-around;">
               <el-radio :label="item.value" style="width: 300px;">
                 {{ item.name }}
               </el-radio>
diff --git a/src/views/system/approval/approvalDialog.vue b/src/views/system/approval/approvalDialog.vue
index fbac46e..453a185 100644
--- a/src/views/system/approval/approvalDialog.vue
+++ b/src/views/system/approval/approvalDialog.vue
@@ -39,7 +39,7 @@
 const dataFormRef = ref<FormInstance>()
 // 校验规则
 const rules: FormRules = reactive({
-  comments: [{ required: true, message: '审批结论必填', trigger: ['blur', 'change'] }],
+  comments: [{ required: true, message: '审批备注必填', trigger: ['blur', 'change'] }],
 })
 /**
  * 初始化审批弹窗
@@ -120,10 +120,11 @@
           <el-col :span="24">
             <el-form-item label="审批备注:" prop="comments">
               <el-input
-                v-model="formData.comments"
+                v-model.trim="formData.comments"
                 :rows="4"
                 show-word-limit
                 type="textarea"
+                maxlength="100"
               />
             </el-form-item>
           </el-col>
diff --git a/src/views/system/approval/index.vue b/src/views/system/approval/index.vue
index 6d71c04..b71db88 100644
--- a/src/views/system/approval/index.vue
+++ b/src/views/system/approval/index.vue
@@ -324,9 +324,9 @@
           <el-option v-for="item of operationTypeList" :key="item.value" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
-      <search-item>
+      <!-- <search-item>
         <el-input v-model="listQuery.operationRemark" placeholder="操作备注" clearable style="width: 200px;" @change="search" />
-      </search-item>
+      </search-item> -->
       <search-item>
         <el-select
           v-model="listQuery.status"
diff --git a/src/views/system/bsConfig/index.vue b/src/views/system/bsConfig/index.vue
index 1d8ef86..634b9ea 100644
--- a/src/views/system/bsConfig/index.vue
+++ b/src/views/system/bsConfig/index.vue
@@ -290,8 +290,8 @@
                 <template #default="scope">
                   <el-image
                     v-if="scope.row.picture"
-                    src="http://192.168.83.42:6909/safe-server//picture/alarm/2025-04/e98ad024b37e4c0daa083c44244d5041.jpeg?token=49eef86c-71ee-408c-a648-2e2ccf34b0a5"
-                    :preview-src-list="['http://192.168.83.42:6909/safe-server//picture/alarm/2025-04/e98ad024b37e4c0daa083c44244d5041.jpeg?token=49eef86c-71ee-408c-a648-2e2ccf34b0a5']"
+                    :src="scope.row.picture"
+                    :preview-src-list="[scope.row.picture]"
                     fit="cover"
                     :preview-teleported="true"
                   />
@@ -312,7 +312,7 @@
         </table-container>
       </div>
     </div>
-    <import-select-secret-dialog ref="importSelectSecretDialogRef" title="选择导入图片的密级" @confirm-secret="confirmSecret" />
+    <import-select-secret-dialog ref="importSelectSecretDialogRef" title="选择导入图片的密级" typeTitle="图片" @confirm-secret="confirmSecret" />
   </app-container>
 </template>
 

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/layouts/components/Topbar/index.vue b/src/layouts/components/Topbar/index.vue
index bc3af96..47c3c6f 100644
--- a/src/layouts/components/Topbar/index.vue
+++ b/src/layouts/components/Topbar/index.vue
@@ -74,7 +74,8 @@
         <el-breadcrumb v-if="settingsStore.breadcrumb.enable && settingsStore.mode === 'pc' && settingsStore.app.routeBaseOn !== 'filesystem'">
           <transition-group name="breadcrumb">
             <el-breadcrumb-item v-for="(item, index) in breadcrumbList" :key="item.path" :to="index < breadcrumbList.length - 1 ? pathCompile(item.path) : ''">
-              {{ item.title }} <span v-if="systemType === 'gm' && (item.title === '设备管理' || item.title === '数据统计' || item.title === '实时监控')"> - 内部</span>
+              <!-- {{ item.title }} <span v-if="systemType === 'gm' && (item.title === '设备管理' || item.title === '数据统计' || item.title === '实时监控')"> - 内部</span> -->
+              {{ item.title }} <span v-if="systemType === 'gm' && index === breadcrumbList.length - 1"> - 内部</span>
             </el-breadcrumb-item>
           </transition-group>
         </el-breadcrumb>
diff --git a/src/views/alarm/dangerAssessment/assessment/list.vue b/src/views/alarm/dangerAssessment/assessment/list.vue
index e26789e..ba284f7 100644
--- a/src/views/alarm/dangerAssessment/assessment/list.vue
+++ b/src/views/alarm/dangerAssessment/assessment/list.vue
@@ -193,17 +193,17 @@
 const systemType = ref('') // 系统类型 sm/gm
 onMounted(() => {
   systemType.value = window.localStorage.getItem('systemType') as string
-  getDictByCode('secretUserLevel').then((response) => {
-    if (response.code === 200) {
-      if (Array.isArray(response.data) && response.data.length) {
-        const level = window.sessionStorage.getItem('secretUserLevel')
-        const index = response.data.findIndex((item: { value: string | null }) => item.value === level)
-        if (index !== -1 && systemType.value === 'gm') {
-          secretLevelUserName.value = response.data[index].name
-        }
-      }
-    }
-  })
+  // getDictByCode('secretUserLevel').then((response) => {
+  //   if (response.code === 200) {
+  //     if (Array.isArray(response.data) && response.data.length) {
+  //       const level = window.sessionStorage.getItem('secretUserLevel')
+  //       const index = response.data.findIndex((item: { value: string | null }) => item.value === level)
+  //       if (index !== -1 && systemType.value === 'gm') {
+  //         secretLevelUserName.value = response.data[index].name
+  //       }
+  //     }
+  //   }
+  // })
   fetchDangerCategory()
   getLastMonthAlarm() // 单位近一个月报警分析
   // getSafeCatogery() // 获取安全隐患类别
@@ -221,7 +221,8 @@
           <el-image :src="urlMap[item.name]" class="base-map-image" mode="fill" />
           <div class="item-text">
             <div style="color: #0f67e7;font-size: 16px;font-weight: 500;">
-              {{ item.name }}<span v-if="secretLevelUserName">-{{ secretLevelUserName }}</span>
+              {{ item.name }}
+              <!-- <span v-if="secretLevelUserName">-{{ secretLevelUserName }}</span> -->
             </div>
             <div class="num">
               {{ item.value }}<span class="unit">个</span>
diff --git a/src/views/bigScreen/index.vue b/src/views/bigScreen/index.vue
index 451bc7f..57be51b 100644
--- a/src/views/bigScreen/index.vue
+++ b/src/views/bigScreen/index.vue
@@ -66,7 +66,7 @@
   showEchart.value = !showEchart.value
 }
 
-const secretLevelUserName = ref('内部')
+const secretLevelUserName = ref('')
 const systemType = ref('')
 onMounted(() => {
   systemType.value = window.localStorage.getItem('systemType')
diff --git a/src/views/monitor/deviceManage/importSelectSecretDialog.vue b/src/views/monitor/deviceManage/importSelectSecretDialog.vue
index 7c14119..c6d3ce7 100644
--- a/src/views/monitor/deviceManage/importSelectSecretDialog.vue
+++ b/src/views/monitor/deviceManage/importSelectSecretDialog.vue
@@ -4,6 +4,12 @@
 import { ElMessage, type FormInstance, type FormRules } from 'element-plus'
 import { getDictByCode } from '@/api/system/dict'
 import type { dictType } from '@/global'
+const props = defineProps({
+  typeTitle: {
+    type: String,
+    default: '文件',
+  },
+})
 const emits = defineEmits(['confirmSecret'])
 const dialogVisible = ref(false) // 弹窗显示隐藏
 
@@ -15,7 +21,7 @@
 const formDataRef = ref<FormInstance>() // 表单对象
 // 校验规则
 const rules = reactive<FormRules>({
-  secret: [{ required: true, message: '导入文件密级必选', trigger: ['blur', 'change'] }],
+  secret: [{ required: true, message: `导入${props.typeTitle}密级必选`, trigger: ['blur', 'change'] }],
 })
 // -----------------------------------------字典--------------------------------------------------------------
 const secretLevelList = ref<dictType[]>([]) // 密级
@@ -59,11 +65,11 @@
 
 <template>
   <el-dialog
-    v-model="dialogVisible" title="选择导入文件的密级" width="600" :before-close="close" append-to-body
+    v-model="dialogVisible" :title="`选择导入${props.typeTitle}的密级`" width="600" :before-close="close" append-to-body
     :open-delay="0" :close-on-click-modal="false"
   >
     <h4 style="color: red;">
-      **请选择导入文件的密级，并按照选择的密级导入相应密级的文件**
+      {{ `**请选择导入${props.typeTitle}的密级，并按照选择的密级导入相应密级的${props.typeTitle}**` }}
     </h4>
 
     <el-form
@@ -72,8 +78,8 @@
     >
       <el-row :gutter="10">
         <el-col :span="12">
-          <el-form-item label="导入文件密级：" prop="secret">
-            <el-radio-group style="display: flex;justify-content: space-around;" v-for="item in secretLevelList" :key="item.id" v-model="formData.secret">
+          <el-form-item :label="`导入${props.typeTitle}密级：`" prop="secret">
+            <el-radio-group v-for="item in secretLevelList" :key="item.id" v-model="formData.secret" style="display: flex;justify-content: space-around;">
               <el-radio :label="item.value" style="width: 300px;">
                 {{ item.name }}
               </el-radio>
diff --git a/src/views/system/approval/approvalDialog.vue b/src/views/system/approval/approvalDialog.vue
index fbac46e..453a185 100644
--- a/src/views/system/approval/approvalDialog.vue
+++ b/src/views/system/approval/approvalDialog.vue
@@ -39,7 +39,7 @@
 const dataFormRef = ref<FormInstance>()
 // 校验规则
 const rules: FormRules = reactive({
-  comments: [{ required: true, message: '审批结论必填', trigger: ['blur', 'change'] }],
+  comments: [{ required: true, message: '审批备注必填', trigger: ['blur', 'change'] }],
 })
 /**
  * 初始化审批弹窗
@@ -120,10 +120,11 @@
           <el-col :span="24">
             <el-form-item label="审批备注:" prop="comments">
               <el-input
-                v-model="formData.comments"
+                v-model.trim="formData.comments"
                 :rows="4"
                 show-word-limit
                 type="textarea"
+                maxlength="100"
               />
             </el-form-item>
           </el-col>
diff --git a/src/views/system/approval/index.vue b/src/views/system/approval/index.vue
index 6d71c04..b71db88 100644
--- a/src/views/system/approval/index.vue
+++ b/src/views/system/approval/index.vue
@@ -324,9 +324,9 @@
           <el-option v-for="item of operationTypeList" :key="item.value" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
-      <search-item>
+      <!-- <search-item>
         <el-input v-model="listQuery.operationRemark" placeholder="操作备注" clearable style="width: 200px;" @change="search" />
-      </search-item>
+      </search-item> -->
       <search-item>
         <el-select
           v-model="listQuery.status"
diff --git a/src/views/system/bsConfig/index.vue b/src/views/system/bsConfig/index.vue
index 1d8ef86..634b9ea 100644
--- a/src/views/system/bsConfig/index.vue
+++ b/src/views/system/bsConfig/index.vue
@@ -290,8 +290,8 @@
                 <template #default="scope">
                   <el-image
                     v-if="scope.row.picture"
-                    src="http://192.168.83.42:6909/safe-server//picture/alarm/2025-04/e98ad024b37e4c0daa083c44244d5041.jpeg?token=49eef86c-71ee-408c-a648-2e2ccf34b0a5"
-                    :preview-src-list="['http://192.168.83.42:6909/safe-server//picture/alarm/2025-04/e98ad024b37e4c0daa083c44244d5041.jpeg?token=49eef86c-71ee-408c-a648-2e2ccf34b0a5']"
+                    :src="scope.row.picture"
+                    :preview-src-list="[scope.row.picture]"
                     fit="cover"
                     :preview-teleported="true"
                   />
@@ -312,7 +312,7 @@
         </table-container>
       </div>
     </div>
-    <import-select-secret-dialog ref="importSelectSecretDialogRef" title="选择导入图片的密级" @confirm-secret="confirmSecret" />
+    <import-select-secret-dialog ref="importSelectSecretDialogRef" title="选择导入图片的密级" typeTitle="图片" @confirm-secret="confirmSecret" />
   </app-container>
 </template>
 
diff --git a/src/views/system/user/roleAssignment.vue b/src/views/system/user/roleAssignment.vue
index fa86cc5..06cc918 100644
--- a/src/views/system/user/roleAssignment.vue
+++ b/src/views/system/user/roleAssignment.vue
@@ -22,6 +22,7 @@
 const useApproval = ref('') // 是否走审批
 const userId = ref('')// 用户id
 const userName = ref('') // 用户名称
+const deptName = ref('') // 所在组织机构
 const ids = ref([]) // 选中项id
 const pageType = ref('')
 const defaultExpanded = ref<string[]>([]) // 默认展开的项
@@ -31,6 +32,7 @@
 
 }
 const treeRef = ref()
+const currentCheckedKeys = ref<string[]>([])
 // 获取角色列表
 const fetchRoleTree = () => {
   getRoleTreeListByUser(userId.value).then((response) => {
@@ -60,19 +62,22 @@
         }
       })
       defaultExpanded.value = expArr
-      defaultChecked.value = cheArr
+      // defaultChecked.value = cheArr
+      defaultChecked.value = pageType.value === 'detail' ? currentCheckedKeys.value : cheArr
       treeRef.value?.setCheckedNodes(defaultChecked.value)
       loading.value = false
     }
   })
 }
 // 弹窗初始化
-const initDialog = (row: userType, useApprovalParam = '', type = '') => {
+const initDialog = (row: any, useApprovalParam = '', type = '') => {
   loading.value = true
   userId.value = row.id
-  userName.value = row.name
+  userName.value = row.name || row.userName
+  deptName.value = row.deptName
   pageType.value = type
   useApproval.value = useApprovalParam
+  currentCheckedKeys.value = row.roleIds
   dialogFormVisible.value = true
   fetchRoleTree()
 }
@@ -91,7 +96,7 @@
   }
   else {
     const params = {
-      jsonContext: { userId: userId.value, roleIds: ids.value }, // 操作内容
+      jsonContext: { userId: userId.value, roleIds: ids.value, deptName: deptName.value, userName: userName.value }, // 操作内容
       operationRemark: '用户角色分配', // 操作备注
       title: '用户角色分配', // 申请标题
       status: '0',
@@ -110,6 +115,7 @@
   dialogFormVisible.value = false
   userId.value = ''
   userName.value = ''
+  deptName.value = ''
   defaultExpanded.value = []
   defaultChecked.value = []
   treeRef.value?.setCheckedNodes([])
@@ -119,6 +125,13 @@
 
 <template>
   <el-dialog v-model="dialogFormVisible" :title="titleText" width="30%" append-to-body>
+    <div v-if="pageType === 'detail' && userName" style="margin: 0 0 20px 0;font-size: 13px;color: #4181ff;">
+      <span>为</span>
+      <span v-if="deptName" style="font-weight: 600;">【{{ deptName }}】</span>
+      <span v-if="deptName">的</span>
+      <span v-if="userName" style="font-weight: 600;">【{{ userName }}】</span>
+      <span>分配角色</span>
+    </div>
     <el-scrollbar>
       <el-tree
         ref="treeRef" v-loading="loading" :props="defaultProps" :data="roleTreeList"

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/layouts/components/Topbar/index.vue b/src/layouts/components/Topbar/index.vue
index bc3af96..47c3c6f 100644
--- a/src/layouts/components/Topbar/index.vue
+++ b/src/layouts/components/Topbar/index.vue
@@ -74,7 +74,8 @@
         <el-breadcrumb v-if="settingsStore.breadcrumb.enable && settingsStore.mode === 'pc' && settingsStore.app.routeBaseOn !== 'filesystem'">
           <transition-group name="breadcrumb">
             <el-breadcrumb-item v-for="(item, index) in breadcrumbList" :key="item.path" :to="index < breadcrumbList.length - 1 ? pathCompile(item.path) : ''">
-              {{ item.title }} <span v-if="systemType === 'gm' && (item.title === '设备管理' || item.title === '数据统计' || item.title === '实时监控')"> - 内部</span>
+              <!-- {{ item.title }} <span v-if="systemType === 'gm' && (item.title === '设备管理' || item.title === '数据统计' || item.title === '实时监控')"> - 内部</span> -->
+              {{ item.title }} <span v-if="systemType === 'gm' && index === breadcrumbList.length - 1"> - 内部</span>
             </el-breadcrumb-item>
           </transition-group>
         </el-breadcrumb>
diff --git a/src/views/alarm/dangerAssessment/assessment/list.vue b/src/views/alarm/dangerAssessment/assessment/list.vue
index e26789e..ba284f7 100644
--- a/src/views/alarm/dangerAssessment/assessment/list.vue
+++ b/src/views/alarm/dangerAssessment/assessment/list.vue
@@ -193,17 +193,17 @@
 const systemType = ref('') // 系统类型 sm/gm
 onMounted(() => {
   systemType.value = window.localStorage.getItem('systemType') as string
-  getDictByCode('secretUserLevel').then((response) => {
-    if (response.code === 200) {
-      if (Array.isArray(response.data) && response.data.length) {
-        const level = window.sessionStorage.getItem('secretUserLevel')
-        const index = response.data.findIndex((item: { value: string | null }) => item.value === level)
-        if (index !== -1 && systemType.value === 'gm') {
-          secretLevelUserName.value = response.data[index].name
-        }
-      }
-    }
-  })
+  // getDictByCode('secretUserLevel').then((response) => {
+  //   if (response.code === 200) {
+  //     if (Array.isArray(response.data) && response.data.length) {
+  //       const level = window.sessionStorage.getItem('secretUserLevel')
+  //       const index = response.data.findIndex((item: { value: string | null }) => item.value === level)
+  //       if (index !== -1 && systemType.value === 'gm') {
+  //         secretLevelUserName.value = response.data[index].name
+  //       }
+  //     }
+  //   }
+  // })
   fetchDangerCategory()
   getLastMonthAlarm() // 单位近一个月报警分析
   // getSafeCatogery() // 获取安全隐患类别
@@ -221,7 +221,8 @@
           <el-image :src="urlMap[item.name]" class="base-map-image" mode="fill" />
           <div class="item-text">
             <div style="color: #0f67e7;font-size: 16px;font-weight: 500;">
-              {{ item.name }}<span v-if="secretLevelUserName">-{{ secretLevelUserName }}</span>
+              {{ item.name }}
+              <!-- <span v-if="secretLevelUserName">-{{ secretLevelUserName }}</span> -->
             </div>
             <div class="num">
               {{ item.value }}<span class="unit">个</span>
diff --git a/src/views/bigScreen/index.vue b/src/views/bigScreen/index.vue
index 451bc7f..57be51b 100644
--- a/src/views/bigScreen/index.vue
+++ b/src/views/bigScreen/index.vue
@@ -66,7 +66,7 @@
   showEchart.value = !showEchart.value
 }
 
-const secretLevelUserName = ref('内部')
+const secretLevelUserName = ref('')
 const systemType = ref('')
 onMounted(() => {
   systemType.value = window.localStorage.getItem('systemType')
diff --git a/src/views/monitor/deviceManage/importSelectSecretDialog.vue b/src/views/monitor/deviceManage/importSelectSecretDialog.vue
index 7c14119..c6d3ce7 100644
--- a/src/views/monitor/deviceManage/importSelectSecretDialog.vue
+++ b/src/views/monitor/deviceManage/importSelectSecretDialog.vue
@@ -4,6 +4,12 @@
 import { ElMessage, type FormInstance, type FormRules } from 'element-plus'
 import { getDictByCode } from '@/api/system/dict'
 import type { dictType } from '@/global'
+const props = defineProps({
+  typeTitle: {
+    type: String,
+    default: '文件',
+  },
+})
 const emits = defineEmits(['confirmSecret'])
 const dialogVisible = ref(false) // 弹窗显示隐藏
 
@@ -15,7 +21,7 @@
 const formDataRef = ref<FormInstance>() // 表单对象
 // 校验规则
 const rules = reactive<FormRules>({
-  secret: [{ required: true, message: '导入文件密级必选', trigger: ['blur', 'change'] }],
+  secret: [{ required: true, message: `导入${props.typeTitle}密级必选`, trigger: ['blur', 'change'] }],
 })
 // -----------------------------------------字典--------------------------------------------------------------
 const secretLevelList = ref<dictType[]>([]) // 密级
@@ -59,11 +65,11 @@
 
 <template>
   <el-dialog
-    v-model="dialogVisible" title="选择导入文件的密级" width="600" :before-close="close" append-to-body
+    v-model="dialogVisible" :title="`选择导入${props.typeTitle}的密级`" width="600" :before-close="close" append-to-body
     :open-delay="0" :close-on-click-modal="false"
   >
     <h4 style="color: red;">
-      **请选择导入文件的密级，并按照选择的密级导入相应密级的文件**
+      {{ `**请选择导入${props.typeTitle}的密级，并按照选择的密级导入相应密级的${props.typeTitle}**` }}
     </h4>
 
     <el-form
@@ -72,8 +78,8 @@
     >
       <el-row :gutter="10">
         <el-col :span="12">
-          <el-form-item label="导入文件密级：" prop="secret">
-            <el-radio-group style="display: flex;justify-content: space-around;" v-for="item in secretLevelList" :key="item.id" v-model="formData.secret">
+          <el-form-item :label="`导入${props.typeTitle}密级：`" prop="secret">
+            <el-radio-group v-for="item in secretLevelList" :key="item.id" v-model="formData.secret" style="display: flex;justify-content: space-around;">
               <el-radio :label="item.value" style="width: 300px;">
                 {{ item.name }}
               </el-radio>
diff --git a/src/views/system/approval/approvalDialog.vue b/src/views/system/approval/approvalDialog.vue
index fbac46e..453a185 100644
--- a/src/views/system/approval/approvalDialog.vue
+++ b/src/views/system/approval/approvalDialog.vue
@@ -39,7 +39,7 @@
 const dataFormRef = ref<FormInstance>()
 // 校验规则
 const rules: FormRules = reactive({
-  comments: [{ required: true, message: '审批结论必填', trigger: ['blur', 'change'] }],
+  comments: [{ required: true, message: '审批备注必填', trigger: ['blur', 'change'] }],
 })
 /**
  * 初始化审批弹窗
@@ -120,10 +120,11 @@
           <el-col :span="24">
             <el-form-item label="审批备注:" prop="comments">
               <el-input
-                v-model="formData.comments"
+                v-model.trim="formData.comments"
                 :rows="4"
                 show-word-limit
                 type="textarea"
+                maxlength="100"
               />
             </el-form-item>
           </el-col>
diff --git a/src/views/system/approval/index.vue b/src/views/system/approval/index.vue
index 6d71c04..b71db88 100644
--- a/src/views/system/approval/index.vue
+++ b/src/views/system/approval/index.vue
@@ -324,9 +324,9 @@
           <el-option v-for="item of operationTypeList" :key="item.value" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
-      <search-item>
+      <!-- <search-item>
         <el-input v-model="listQuery.operationRemark" placeholder="操作备注" clearable style="width: 200px;" @change="search" />
-      </search-item>
+      </search-item> -->
       <search-item>
         <el-select
           v-model="listQuery.status"
diff --git a/src/views/system/bsConfig/index.vue b/src/views/system/bsConfig/index.vue
index 1d8ef86..634b9ea 100644
--- a/src/views/system/bsConfig/index.vue
+++ b/src/views/system/bsConfig/index.vue
@@ -290,8 +290,8 @@
                 <template #default="scope">
                   <el-image
                     v-if="scope.row.picture"
-                    src="http://192.168.83.42:6909/safe-server//picture/alarm/2025-04/e98ad024b37e4c0daa083c44244d5041.jpeg?token=49eef86c-71ee-408c-a648-2e2ccf34b0a5"
-                    :preview-src-list="['http://192.168.83.42:6909/safe-server//picture/alarm/2025-04/e98ad024b37e4c0daa083c44244d5041.jpeg?token=49eef86c-71ee-408c-a648-2e2ccf34b0a5']"
+                    :src="scope.row.picture"
+                    :preview-src-list="[scope.row.picture]"
                     fit="cover"
                     :preview-teleported="true"
                   />
@@ -312,7 +312,7 @@
         </table-container>
       </div>
     </div>
-    <import-select-secret-dialog ref="importSelectSecretDialogRef" title="选择导入图片的密级" @confirm-secret="confirmSecret" />
+    <import-select-secret-dialog ref="importSelectSecretDialogRef" title="选择导入图片的密级" typeTitle="图片" @confirm-secret="confirmSecret" />
   </app-container>
 </template>
 
diff --git a/src/views/system/user/roleAssignment.vue b/src/views/system/user/roleAssignment.vue
index fa86cc5..06cc918 100644
--- a/src/views/system/user/roleAssignment.vue
+++ b/src/views/system/user/roleAssignment.vue
@@ -22,6 +22,7 @@
 const useApproval = ref('') // 是否走审批
 const userId = ref('')// 用户id
 const userName = ref('') // 用户名称
+const deptName = ref('') // 所在组织机构
 const ids = ref([]) // 选中项id
 const pageType = ref('')
 const defaultExpanded = ref<string[]>([]) // 默认展开的项
@@ -31,6 +32,7 @@
 
 }
 const treeRef = ref()
+const currentCheckedKeys = ref<string[]>([])
 // 获取角色列表
 const fetchRoleTree = () => {
   getRoleTreeListByUser(userId.value).then((response) => {
@@ -60,19 +62,22 @@
         }
       })
       defaultExpanded.value = expArr
-      defaultChecked.value = cheArr
+      // defaultChecked.value = cheArr
+      defaultChecked.value = pageType.value === 'detail' ? currentCheckedKeys.value : cheArr
       treeRef.value?.setCheckedNodes(defaultChecked.value)
       loading.value = false
     }
   })
 }
 // 弹窗初始化
-const initDialog = (row: userType, useApprovalParam = '', type = '') => {
+const initDialog = (row: any, useApprovalParam = '', type = '') => {
   loading.value = true
   userId.value = row.id
-  userName.value = row.name
+  userName.value = row.name || row.userName
+  deptName.value = row.deptName
   pageType.value = type
   useApproval.value = useApprovalParam
+  currentCheckedKeys.value = row.roleIds
   dialogFormVisible.value = true
   fetchRoleTree()
 }
@@ -91,7 +96,7 @@
   }
   else {
     const params = {
-      jsonContext: { userId: userId.value, roleIds: ids.value }, // 操作内容
+      jsonContext: { userId: userId.value, roleIds: ids.value, deptName: deptName.value, userName: userName.value }, // 操作内容
       operationRemark: '用户角色分配', // 操作备注
       title: '用户角色分配', // 申请标题
       status: '0',
@@ -110,6 +115,7 @@
   dialogFormVisible.value = false
   userId.value = ''
   userName.value = ''
+  deptName.value = ''
   defaultExpanded.value = []
   defaultChecked.value = []
   treeRef.value?.setCheckedNodes([])
@@ -119,6 +125,13 @@
 
 <template>
   <el-dialog v-model="dialogFormVisible" :title="titleText" width="30%" append-to-body>
+    <div v-if="pageType === 'detail' && userName" style="margin: 0 0 20px 0;font-size: 13px;color: #4181ff;">
+      <span>为</span>
+      <span v-if="deptName" style="font-weight: 600;">【{{ deptName }}】</span>
+      <span v-if="deptName">的</span>
+      <span v-if="userName" style="font-weight: 600;">【{{ userName }}】</span>
+      <span>分配角色</span>
+    </div>
     <el-scrollbar>
       <el-tree
         ref="treeRef" v-loading="loading" :props="defaultProps" :data="roleTreeList"
diff --git a/src/views/system/user/userAdd.vue b/src/views/system/user/userAdd.vue
index 288f071..c95a9a4 100644
--- a/src/views/system/user/userAdd.vue
+++ b/src/views/system/user/userAdd.vue
@@ -39,6 +39,7 @@
   parent: 'pid', value: 'id', label: 'name', children: 'children',
 })
 const roleTreeList = ref([])// 角色树列表数据
+const roleList: any = ref([])// 角色列表数据
 const deptTreeList = ref([])
 const sexList = ref<{ id: string; value: string; name: string }[]>()// 性别选项
 const perTypeList = ref<{ id: string; value: string; name: string }[]>()// 人员类别列表
@@ -91,6 +92,7 @@
     res.data.list = res.data.list.filter((item: any) => item.name !== '计量人员')
     if (res.data.list) { // 将列表转树结构
       roleTreeList.value = toTreeList(res.data.list, '0', true)
+      roleList.value = res.data.list
     }
   })
 }
@@ -116,6 +118,8 @@
   userForm.roleid = ''
   userForm.password = ''
   userForm.rePassword = ''
+
+  console.log('重置表单')
 }
 // 新增数据
 const createData = () => {
@@ -147,7 +151,7 @@
       }
       else {
         const params = {
-          jsonContext: userForm1, // 操作内容
+          jsonContext: { ...userForm1, roleName: roleName.value }, // 操作内容
           operationRemark: '新增用户', // 操作备注
           title: '新增用户', // 申请标题
           status: '0',
@@ -186,7 +190,7 @@
       }
       else {
         const params = {
-          jsonContext: userForm, // 操作内容
+          jsonContext: { ...userForm, roleName: roleName.value }, // 操作内容
           operationRemark: '修改用户', // 操作备注
           title: '修改用户', // 申请标题
           status: '0',
@@ -259,17 +263,6 @@
   btnLoading.value = false
   useApproval.value = useApprovalParam
   if (dialogStatus.value === 'create') { // 如果是新增，清除验证
-    userForm.account = row.account
-    userForm.id = row.id
-    userForm.name = row.name
-    userForm.email = row.email
-    userForm.phone = row.phone
-    userForm.deptId = row.deptId
-    userForm.sex = row.sex
-    userForm.birthday = row.birthday
-    userForm.secretLevel = row.secretLevel.toString()
-    userForm.roleid = row.roleid
-    roleName.value = row.roleName
     resetForm1()
     nextTick(() => {
       ruleFormRef.value?.clearValidate()
@@ -291,6 +284,13 @@
     delete userForm.rePassword
   }
 }
+
+const changeRole = (val: string) => {
+  const index = roleList.value.findIndex((item: { id: string }) => item.id === val)
+  if (index !== -1) {
+    roleName.value = roleList.value[index].name
+  }
+}
 defineExpose({ initDialog })
 </script>
 
@@ -365,6 +365,7 @@
               check-on-click-node
               filterable
               class="full-width-input"
+              @change="changeRole"
             />
           </el-form-item>
           <el-form-item v-else label="角色">