diff --git a/src/views/bigScreen/index.vue b/src/views/bigScreen/index.vue
index 123906c..451bc7f 100644
--- a/src/views/bigScreen/index.vue
+++ b/src/views/bigScreen/index.vue
@@ -66,21 +66,22 @@
   showEchart.value = !showEchart.value
 }
 
-const secretLevelUserName = ref('')
+const secretLevelUserName = ref('内部')
 const systemType = ref('')
 onMounted(() => {
   systemType.value = window.localStorage.getItem('systemType')
-  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 => item.value === level)
-        if (index !== -1 && systemType.value === 'gm') {
-          secretLevelUserName.value = response.data[index].name
-        }
-      }
-    }
-  })
+  // 根据用户的m级标m
+  // 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 => item.value === level)
+  //       if (index !== -1 && systemType.value === 'gm') {
+  //         secretLevelUserName.value = response.data[index].name
+  //       }
+  //     }
+  //   }
+  // })
 })
 </script>
 

diff --git a/src/views/bigScreen/index.vue b/src/views/bigScreen/index.vue
index 123906c..451bc7f 100644
--- a/src/views/bigScreen/index.vue
+++ b/src/views/bigScreen/index.vue
@@ -66,21 +66,22 @@
   showEchart.value = !showEchart.value
 }
 
-const secretLevelUserName = ref('')
+const secretLevelUserName = ref('内部')
 const systemType = ref('')
 onMounted(() => {
   systemType.value = window.localStorage.getItem('systemType')
-  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 => item.value === level)
-        if (index !== -1 && systemType.value === 'gm') {
-          secretLevelUserName.value = response.data[index].name
-        }
-      }
-    }
-  })
+  // 根据用户的m级标m
+  // 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 => item.value === level)
+  //       if (index !== -1 && systemType.value === 'gm') {
+  //         secretLevelUserName.value = response.data[index].name
+  //       }
+  //     }
+  //   }
+  // })
 })
 </script>
 
diff --git a/src/views/monitor/realTime/index-new-gm-plugin.vue b/src/views/monitor/realTime/index-new-gm-plugin.vue
index 760f95c..2c6c5ca 100644
--- a/src/views/monitor/realTime/index-new-gm-plugin.vue
+++ b/src/views/monitor/realTime/index-new-gm-plugin.vue
@@ -149,7 +149,7 @@
   }
 }
 
-function handleNodeClick(data: any, node: any, self: any) {
+function handleNodeClick(data: any, node: any, self: any, isDrag = false) {
   console.log('获取设备信息', data)
   if (data.device.deviceStatusName === '离线') {
     ElMessage.warning(`设备 ${data.device.monitorName} 离线`)
@@ -157,8 +157,8 @@
   }
 
   const now = new Date().getTime()
-  if (now - treeClickCount < 300) { // 双击事件的判断，300毫秒内重复点击
-    if (data.children.length !== 0) { // 点击父亲
+  if (now - treeClickCount < 300 || isDrag) { // 双击事件的判断，300毫秒内重复点击
+    if (data && data.children && data.children?.length !== 0) { // 点击父亲
       return
     }
     // 不播放重复的视频
@@ -207,7 +207,6 @@
       points.value = []
       drawPoints.value = []
     }
-
     // 获取视频流接口
     fetchStream(data.device.cameraIndexCode).then(async (res: any) => {
       leafLoading.value = false
@@ -244,7 +243,9 @@
       }
     })
   }
-  treeClickCount = now
+  if (!isDrag) {
+    treeClickCount = now
+  }
 }
 
 const testurl = {
@@ -376,7 +377,30 @@
 
   return data // 返回修改后的原始数据
 }
+// ----------------------------------------------拖拽--------------------------------------------------
+// 处理拖拽开始事件
+const handleDragStart = (event: DragEvent, data: any) => {
+  if (data.children.length === 0) { // 仅允许拖拽叶子节点
+    event.dataTransfer?.setData('text/plain', JSON.stringify(data.device)) // 存储设备数据
+  }
+}
+// 处理拖拽经过事件
+const handleDragOver = (event: DragEvent) => {
+  event.preventDefault() // 允许在此区域放置
+}
 
+// 处理拖拽结束事件
+const handleDrop = (event: DragEvent) => {
+  event.preventDefault()
+  const deviceData = JSON.parse(event.dataTransfer?.getData('text/plain') as string)
+  if (deviceData) {
+    handleNodeClick({ device: { ...deviceData } }, null, null, true)
+  }
+  else {
+    ElMessage.warning('请拖拽摄像头')
+  }
+}
+// ----------------------------------------------------------------------------------------------------
 onMounted(() => {
   videoTree().then((response) => {
     if (response.code === 200) {
@@ -415,7 +439,11 @@
           @node-click="handleNodeClick"
         >
           <template #default="{ node, data }">
-            <span style="display: flex;align-items: center;">
+            <span
+              style="display: flex;align-items: center;"
+              :draggable="data.children.length === 0"
+              @dragstart="handleDragStart($event, data)"
+            >
               <!-- && leafLoading -->
               <el-icon v-if="data && data.device && data.device.id === currentLeafId && leafLoading" class="loading-rotate" style="margin-right: 5px">
                 <svg-icon name="icon-loading" />
@@ -475,7 +503,13 @@
           :show-operate-btns="true"
           :split-screen="videoCount"
         /> -->
-        <div id="videoArea" class="video-area" :style="{ width: `${width}px`, height: `${height}px` }">
+        <div
+          id="videoArea"
+          class="video-area"
+          :style="{ width: `${width}px`, height: `${height}px` }"
+          @dragover="handleDragOver"
+          @drop="handleDrop"
+        >
           <div :class="videoCount === 1 ? 'oneScreen' : 'jessibuca-root'">
             <jessibuca
               v-for="(item, index) in videoCount"
@@ -578,7 +612,6 @@
                 </span>
               </div>
             </block>
-            <!-- <el-radio-group v-if="" v-model="videoCount" fill="#67c23a" size="small" style="float: right;margin-right: 20px;" @change="handleChangeScreen"> -->
             <el-radio-group v-if="proxy.hasPerm('/realTime/screenExchange')" v-model="videoCount" fill="#67c23a" size="small" style="float: right;margin-right: 20px;" @change="handleChangeScreen">
               <el-radio-button :label="1">
                 1屏

diff --git a/src/views/bigScreen/index.vue b/src/views/bigScreen/index.vue
index 123906c..451bc7f 100644
--- a/src/views/bigScreen/index.vue
+++ b/src/views/bigScreen/index.vue
@@ -66,21 +66,22 @@
   showEchart.value = !showEchart.value
 }
 
-const secretLevelUserName = ref('')
+const secretLevelUserName = ref('内部')
 const systemType = ref('')
 onMounted(() => {
   systemType.value = window.localStorage.getItem('systemType')
-  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 => item.value === level)
-        if (index !== -1 && systemType.value === 'gm') {
-          secretLevelUserName.value = response.data[index].name
-        }
-      }
-    }
-  })
+  // 根据用户的m级标m
+  // 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 => item.value === level)
+  //       if (index !== -1 && systemType.value === 'gm') {
+  //         secretLevelUserName.value = response.data[index].name
+  //       }
+  //     }
+  //   }
+  // })
 })
 </script>
 
diff --git a/src/views/monitor/realTime/index-new-gm-plugin.vue b/src/views/monitor/realTime/index-new-gm-plugin.vue
index 760f95c..2c6c5ca 100644
--- a/src/views/monitor/realTime/index-new-gm-plugin.vue
+++ b/src/views/monitor/realTime/index-new-gm-plugin.vue
@@ -149,7 +149,7 @@
   }
 }
 
-function handleNodeClick(data: any, node: any, self: any) {
+function handleNodeClick(data: any, node: any, self: any, isDrag = false) {
   console.log('获取设备信息', data)
   if (data.device.deviceStatusName === '离线') {
     ElMessage.warning(`设备 ${data.device.monitorName} 离线`)
@@ -157,8 +157,8 @@
   }
 
   const now = new Date().getTime()
-  if (now - treeClickCount < 300) { // 双击事件的判断，300毫秒内重复点击
-    if (data.children.length !== 0) { // 点击父亲
+  if (now - treeClickCount < 300 || isDrag) { // 双击事件的判断，300毫秒内重复点击
+    if (data && data.children && data.children?.length !== 0) { // 点击父亲
       return
     }
     // 不播放重复的视频
@@ -207,7 +207,6 @@
       points.value = []
       drawPoints.value = []
     }
-
     // 获取视频流接口
     fetchStream(data.device.cameraIndexCode).then(async (res: any) => {
       leafLoading.value = false
@@ -244,7 +243,9 @@
       }
     })
   }
-  treeClickCount = now
+  if (!isDrag) {
+    treeClickCount = now
+  }
 }
 
 const testurl = {
@@ -376,7 +377,30 @@
 
   return data // 返回修改后的原始数据
 }
+// ----------------------------------------------拖拽--------------------------------------------------
+// 处理拖拽开始事件
+const handleDragStart = (event: DragEvent, data: any) => {
+  if (data.children.length === 0) { // 仅允许拖拽叶子节点
+    event.dataTransfer?.setData('text/plain', JSON.stringify(data.device)) // 存储设备数据
+  }
+}
+// 处理拖拽经过事件
+const handleDragOver = (event: DragEvent) => {
+  event.preventDefault() // 允许在此区域放置
+}
 
+// 处理拖拽结束事件
+const handleDrop = (event: DragEvent) => {
+  event.preventDefault()
+  const deviceData = JSON.parse(event.dataTransfer?.getData('text/plain') as string)
+  if (deviceData) {
+    handleNodeClick({ device: { ...deviceData } }, null, null, true)
+  }
+  else {
+    ElMessage.warning('请拖拽摄像头')
+  }
+}
+// ----------------------------------------------------------------------------------------------------
 onMounted(() => {
   videoTree().then((response) => {
     if (response.code === 200) {
@@ -415,7 +439,11 @@
           @node-click="handleNodeClick"
         >
           <template #default="{ node, data }">
-            <span style="display: flex;align-items: center;">
+            <span
+              style="display: flex;align-items: center;"
+              :draggable="data.children.length === 0"
+              @dragstart="handleDragStart($event, data)"
+            >
               <!-- && leafLoading -->
               <el-icon v-if="data && data.device && data.device.id === currentLeafId && leafLoading" class="loading-rotate" style="margin-right: 5px">
                 <svg-icon name="icon-loading" />
@@ -475,7 +503,13 @@
           :show-operate-btns="true"
           :split-screen="videoCount"
         /> -->
-        <div id="videoArea" class="video-area" :style="{ width: `${width}px`, height: `${height}px` }">
+        <div
+          id="videoArea"
+          class="video-area"
+          :style="{ width: `${width}px`, height: `${height}px` }"
+          @dragover="handleDragOver"
+          @drop="handleDrop"
+        >
           <div :class="videoCount === 1 ? 'oneScreen' : 'jessibuca-root'">
             <jessibuca
               v-for="(item, index) in videoCount"
@@ -578,7 +612,6 @@
                 </span>
               </div>
             </block>
-            <!-- <el-radio-group v-if="" v-model="videoCount" fill="#67c23a" size="small" style="float: right;margin-right: 20px;" @change="handleChangeScreen"> -->
             <el-radio-group v-if="proxy.hasPerm('/realTime/screenExchange')" v-model="videoCount" fill="#67c23a" size="small" style="float: right;margin-right: 20px;" @change="handleChangeScreen">
               <el-radio-button :label="1">
                 1屏
diff --git a/src/views/system/approval/approvalDialog.vue b/src/views/system/approval/approvalDialog.vue
index 7b3622e..fbac46e 100644
--- a/src/views/system/approval/approvalDialog.vue
+++ b/src/views/system/approval/approvalDialog.vue
@@ -118,7 +118,7 @@
         </el-row>
         <el-row :gutter="24">
           <el-col :span="24">
-            <el-form-item label="审批结论:" prop="comments">
+            <el-form-item label="审批备注:" prop="comments">
               <el-input
                 v-model="formData.comments"
                 :rows="4"

diff --git a/src/views/bigScreen/index.vue b/src/views/bigScreen/index.vue
index 123906c..451bc7f 100644
--- a/src/views/bigScreen/index.vue
+++ b/src/views/bigScreen/index.vue
@@ -66,21 +66,22 @@
   showEchart.value = !showEchart.value
 }
 
-const secretLevelUserName = ref('')
+const secretLevelUserName = ref('内部')
 const systemType = ref('')
 onMounted(() => {
   systemType.value = window.localStorage.getItem('systemType')
-  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 => item.value === level)
-        if (index !== -1 && systemType.value === 'gm') {
-          secretLevelUserName.value = response.data[index].name
-        }
-      }
-    }
-  })
+  // 根据用户的m级标m
+  // 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 => item.value === level)
+  //       if (index !== -1 && systemType.value === 'gm') {
+  //         secretLevelUserName.value = response.data[index].name
+  //       }
+  //     }
+  //   }
+  // })
 })
 </script>
 
diff --git a/src/views/monitor/realTime/index-new-gm-plugin.vue b/src/views/monitor/realTime/index-new-gm-plugin.vue
index 760f95c..2c6c5ca 100644
--- a/src/views/monitor/realTime/index-new-gm-plugin.vue
+++ b/src/views/monitor/realTime/index-new-gm-plugin.vue
@@ -149,7 +149,7 @@
   }
 }
 
-function handleNodeClick(data: any, node: any, self: any) {
+function handleNodeClick(data: any, node: any, self: any, isDrag = false) {
   console.log('获取设备信息', data)
   if (data.device.deviceStatusName === '离线') {
     ElMessage.warning(`设备 ${data.device.monitorName} 离线`)
@@ -157,8 +157,8 @@
   }
 
   const now = new Date().getTime()
-  if (now - treeClickCount < 300) { // 双击事件的判断，300毫秒内重复点击
-    if (data.children.length !== 0) { // 点击父亲
+  if (now - treeClickCount < 300 || isDrag) { // 双击事件的判断，300毫秒内重复点击
+    if (data && data.children && data.children?.length !== 0) { // 点击父亲
       return
     }
     // 不播放重复的视频
@@ -207,7 +207,6 @@
       points.value = []
       drawPoints.value = []
     }
-
     // 获取视频流接口
     fetchStream(data.device.cameraIndexCode).then(async (res: any) => {
       leafLoading.value = false
@@ -244,7 +243,9 @@
       }
     })
   }
-  treeClickCount = now
+  if (!isDrag) {
+    treeClickCount = now
+  }
 }
 
 const testurl = {
@@ -376,7 +377,30 @@
 
   return data // 返回修改后的原始数据
 }
+// ----------------------------------------------拖拽--------------------------------------------------
+// 处理拖拽开始事件
+const handleDragStart = (event: DragEvent, data: any) => {
+  if (data.children.length === 0) { // 仅允许拖拽叶子节点
+    event.dataTransfer?.setData('text/plain', JSON.stringify(data.device)) // 存储设备数据
+  }
+}
+// 处理拖拽经过事件
+const handleDragOver = (event: DragEvent) => {
+  event.preventDefault() // 允许在此区域放置
+}
 
+// 处理拖拽结束事件
+const handleDrop = (event: DragEvent) => {
+  event.preventDefault()
+  const deviceData = JSON.parse(event.dataTransfer?.getData('text/plain') as string)
+  if (deviceData) {
+    handleNodeClick({ device: { ...deviceData } }, null, null, true)
+  }
+  else {
+    ElMessage.warning('请拖拽摄像头')
+  }
+}
+// ----------------------------------------------------------------------------------------------------
 onMounted(() => {
   videoTree().then((response) => {
     if (response.code === 200) {
@@ -415,7 +439,11 @@
           @node-click="handleNodeClick"
         >
           <template #default="{ node, data }">
-            <span style="display: flex;align-items: center;">
+            <span
+              style="display: flex;align-items: center;"
+              :draggable="data.children.length === 0"
+              @dragstart="handleDragStart($event, data)"
+            >
               <!-- && leafLoading -->
               <el-icon v-if="data && data.device && data.device.id === currentLeafId && leafLoading" class="loading-rotate" style="margin-right: 5px">
                 <svg-icon name="icon-loading" />
@@ -475,7 +503,13 @@
           :show-operate-btns="true"
           :split-screen="videoCount"
         /> -->
-        <div id="videoArea" class="video-area" :style="{ width: `${width}px`, height: `${height}px` }">
+        <div
+          id="videoArea"
+          class="video-area"
+          :style="{ width: `${width}px`, height: `${height}px` }"
+          @dragover="handleDragOver"
+          @drop="handleDrop"
+        >
           <div :class="videoCount === 1 ? 'oneScreen' : 'jessibuca-root'">
             <jessibuca
               v-for="(item, index) in videoCount"
@@ -578,7 +612,6 @@
                 </span>
               </div>
             </block>
-            <!-- <el-radio-group v-if="" v-model="videoCount" fill="#67c23a" size="small" style="float: right;margin-right: 20px;" @change="handleChangeScreen"> -->
             <el-radio-group v-if="proxy.hasPerm('/realTime/screenExchange')" v-model="videoCount" fill="#67c23a" size="small" style="float: right;margin-right: 20px;" @change="handleChangeScreen">
               <el-radio-button :label="1">
                 1屏
diff --git a/src/views/system/approval/approvalDialog.vue b/src/views/system/approval/approvalDialog.vue
index 7b3622e..fbac46e 100644
--- a/src/views/system/approval/approvalDialog.vue
+++ b/src/views/system/approval/approvalDialog.vue
@@ -118,7 +118,7 @@
         </el-row>
         <el-row :gutter="24">
           <el-col :span="24">
-            <el-form-item label="审批结论:" prop="comments">
+            <el-form-item label="审批备注:" prop="comments">
               <el-input
                 v-model="formData.comments"
                 :rows="4"
diff --git a/src/views/system/approval/index.vue b/src/views/system/approval/index.vue
index f1f9102..6d71c04 100644
--- a/src/views/system/approval/index.vue
+++ b/src/views/system/approval/index.vue
@@ -37,7 +37,7 @@
 const columns: Ref<TableColumn[]> = ref([
   { text: '申请标题', value: 'title', align: 'center' },
   { text: '操作类型', value: 'operationTypeName', align: 'center' },
-  { text: '操作备注', value: 'operationRemark', align: 'center' },
+  // { text: '操作备注', value: 'operationRemark', align: 'center' },
   { text: '创建人', value: 'createName', align: 'center' },
   { text: '创建时间', value: 'createTime', align: 'center', width: '120' },
   { text: '审批人', value: 'auditName', align: 'center' },