diff --git a/src/App.vue b/src/App.vue
index cde81b3..8a00f5d 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -125,7 +125,7 @@
         '--g-sub-sidebar-actual-width': subSidebarActualWidth,
       }"
     />
-    <system-info v-if="browserType !== 'mobile'" />
+    <!-- <system-info v-if="browserType !== 'mobile'" /> -->
     <audio id="eventAudio" src="" autoplay />
   </el-config-provider>
 </template>

diff --git a/src/App.vue b/src/App.vue
index cde81b3..8a00f5d 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -125,7 +125,7 @@
         '--g-sub-sidebar-actual-width': subSidebarActualWidth,
       }"
     />
-    <system-info v-if="browserType !== 'mobile'" />
+    <!-- <system-info v-if="browserType !== 'mobile'" /> -->
     <audio id="eventAudio" src="" autoplay />
   </el-config-provider>
 </template>
diff --git a/src/layouts/components/Tools/alarmDialog.vue b/src/layouts/components/Tools/alarmDialog.vue
index 1828375..df89ab8 100644
--- a/src/layouts/components/Tools/alarmDialog.vue
+++ b/src/layouts/components/Tools/alarmDialog.vue
@@ -116,7 +116,7 @@
     </div>
     <template #footer>
       <div class="dialog-footer">
-        <div class="btn" @click="detail">
+        <div v-if="proxy.hasPerm('/alarm/current')" class="btn" @click="detail">
           查看
         </div>
         <div v-if="info.isSound === '1'" class="btn" @click="closeSound">

diff --git a/src/App.vue b/src/App.vue
index cde81b3..8a00f5d 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -125,7 +125,7 @@
         '--g-sub-sidebar-actual-width': subSidebarActualWidth,
       }"
     />
-    <system-info v-if="browserType !== 'mobile'" />
+    <!-- <system-info v-if="browserType !== 'mobile'" /> -->
     <audio id="eventAudio" src="" autoplay />
   </el-config-provider>
 </template>
diff --git a/src/layouts/components/Tools/alarmDialog.vue b/src/layouts/components/Tools/alarmDialog.vue
index 1828375..df89ab8 100644
--- a/src/layouts/components/Tools/alarmDialog.vue
+++ b/src/layouts/components/Tools/alarmDialog.vue
@@ -116,7 +116,7 @@
     </div>
     <template #footer>
       <div class="dialog-footer">
-        <div class="btn" @click="detail">
+        <div v-if="proxy.hasPerm('/alarm/current')" class="btn" @click="detail">
           查看
         </div>
         <div v-if="info.isSound === '1'" class="btn" @click="closeSound">
diff --git a/src/layouts/components/Tools/alarmList.vue b/src/layouts/components/Tools/alarmList.vue
index c3a9d2a..5356b74 100644
--- a/src/layouts/components/Tools/alarmList.vue
+++ b/src/layouts/components/Tools/alarmList.vue
@@ -54,6 +54,7 @@
 }
 // 查看当前行
 const detailRow = (row: any) => {
+  if (!proxy.hasPerm('/alarm/current')) { return }
   $router.push({
     name: 'AlarmCurrent',
     query: {
@@ -77,21 +78,6 @@
   localStorage.setItem('eventAudio', 'pause')
 }
 const dialogRef = ref()
-// const dialog = () => {
-//   const row = {
-//     alarmNoteMethod: '1', // 消息提醒 1:弹窗，2:消息提醒
-//     isSound: '1', // 报警音效，1:开，0:关
-//     isSend: '1', // 报警推送，1:开，0:关
-//     isText: '1', // 报警短息，1:开，0:关
-//     alarmType: '浓度超限',
-//     tagNumber: 'NX5702',
-//     alarmTime: '2024-09-09',
-//     value: '20',
-//     typeName: '燃气智能终端',
-//     alarmLevel: '一级',
-//   }
-//   dialogRef.value.initDialog(row)
-// }
 const fetchData = (isLoading = false) => {
   loading.value = true
   if (isLoading) {
@@ -115,7 +101,10 @@
       dialogRef.value.initDialog(newVal)
     }
     if (newVal.isSound === '1') {
-      play()
+      // play()
+      if (!localStorage.getItem('eventAudio')) {
+        proxy.playAudio()
+      }
     }
     fetchData(false)
   }
@@ -146,6 +135,7 @@
 //     window.localStorage.removeItem('token')
 //   }
 // }
+// const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -180,7 +170,7 @@
                   {{ message.processStatus
                     === '未读' ? '未读' : '已读' }}
                 </el-tag>
-                <el-tag type="info" size="small" style="margin-left: 5px;">
+                <el-tag type="info" size="small" style="margin-left: 5px;" @click="detailRow(message)">
                   查看
                 </el-tag>
               </div>
@@ -214,7 +204,7 @@
       <!-- <div class="close" @click="dialog">
         弹窗
       </div> -->
-      <div class="more" @click="moreList">
+      <div v-if="proxy.hasPerm('/alarm/current')" class="more" @click="moreList">
         查看更多
       </div>
     </div>

diff --git a/src/App.vue b/src/App.vue
index cde81b3..8a00f5d 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -125,7 +125,7 @@
         '--g-sub-sidebar-actual-width': subSidebarActualWidth,
       }"
     />
-    <system-info v-if="browserType !== 'mobile'" />
+    <!-- <system-info v-if="browserType !== 'mobile'" /> -->
     <audio id="eventAudio" src="" autoplay />
   </el-config-provider>
 </template>
diff --git a/src/layouts/components/Tools/alarmDialog.vue b/src/layouts/components/Tools/alarmDialog.vue
index 1828375..df89ab8 100644
--- a/src/layouts/components/Tools/alarmDialog.vue
+++ b/src/layouts/components/Tools/alarmDialog.vue
@@ -116,7 +116,7 @@
     </div>
     <template #footer>
       <div class="dialog-footer">
-        <div class="btn" @click="detail">
+        <div v-if="proxy.hasPerm('/alarm/current')" class="btn" @click="detail">
           查看
         </div>
         <div v-if="info.isSound === '1'" class="btn" @click="closeSound">
diff --git a/src/layouts/components/Tools/alarmList.vue b/src/layouts/components/Tools/alarmList.vue
index c3a9d2a..5356b74 100644
--- a/src/layouts/components/Tools/alarmList.vue
+++ b/src/layouts/components/Tools/alarmList.vue
@@ -54,6 +54,7 @@
 }
 // 查看当前行
 const detailRow = (row: any) => {
+  if (!proxy.hasPerm('/alarm/current')) { return }
   $router.push({
     name: 'AlarmCurrent',
     query: {
@@ -77,21 +78,6 @@
   localStorage.setItem('eventAudio', 'pause')
 }
 const dialogRef = ref()
-// const dialog = () => {
-//   const row = {
-//     alarmNoteMethod: '1', // 消息提醒 1:弹窗，2:消息提醒
-//     isSound: '1', // 报警音效，1:开，0:关
-//     isSend: '1', // 报警推送，1:开，0:关
-//     isText: '1', // 报警短息，1:开，0:关
-//     alarmType: '浓度超限',
-//     tagNumber: 'NX5702',
-//     alarmTime: '2024-09-09',
-//     value: '20',
-//     typeName: '燃气智能终端',
-//     alarmLevel: '一级',
-//   }
-//   dialogRef.value.initDialog(row)
-// }
 const fetchData = (isLoading = false) => {
   loading.value = true
   if (isLoading) {
@@ -115,7 +101,10 @@
       dialogRef.value.initDialog(newVal)
     }
     if (newVal.isSound === '1') {
-      play()
+      // play()
+      if (!localStorage.getItem('eventAudio')) {
+        proxy.playAudio()
+      }
     }
     fetchData(false)
   }
@@ -146,6 +135,7 @@
 //     window.localStorage.removeItem('token')
 //   }
 // }
+// const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -180,7 +170,7 @@
                   {{ message.processStatus
                     === '未读' ? '未读' : '已读' }}
                 </el-tag>
-                <el-tag type="info" size="small" style="margin-left: 5px;">
+                <el-tag type="info" size="small" style="margin-left: 5px;" @click="detailRow(message)">
                   查看
                 </el-tag>
               </div>
@@ -214,7 +204,7 @@
       <!-- <div class="close" @click="dialog">
         弹窗
       </div> -->
-      <div class="more" @click="moreList">
+      <div v-if="proxy.hasPerm('/alarm/current')" class="more" @click="moreList">
         查看更多
       </div>
     </div>
diff --git a/src/layouts/components/Tools/index.vue b/src/layouts/components/Tools/index.vue
index 9f2d41f..61f9707 100644
--- a/src/layouts/components/Tools/index.vue
+++ b/src/layouts/components/Tools/index.vue
@@ -79,6 +79,7 @@
   // 断开 websocket
   // websocket.destroyWebSocket()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -89,18 +90,18 @@
           <svg-icon name="ep:search" />
         </el-icon>
       </span>
-      <span class="item" @click="board">
+      <span v-if="proxy.hasPerm('/fullscreen')" class="item" @click="board">
         <el-icon>
           <svg-icon name="ep:data-line" />
         </el-icon>
       </span>
-      <span v-if="settingsStore.mode === 'pc' && settingsStore.toolbar.enableFullscreen" class="item" @click="toggle">
+      <span class="item" @click="toggle">
         <el-icon>
           <svg-icon :name="isFullscreen ? 'fullscreen-exit' : 'fullscreen'" />
         </el-icon>
       </span>
       <!-- 报警信息列表 -->
-      <span class="item">
+      <span v-if="proxy.hasPerm('/alarmnotice')" class="item">
         <el-popover width="390">
           <template #reference>
             <div>

diff --git a/src/App.vue b/src/App.vue
index cde81b3..8a00f5d 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -125,7 +125,7 @@
         '--g-sub-sidebar-actual-width': subSidebarActualWidth,
       }"
     />
-    <system-info v-if="browserType !== 'mobile'" />
+    <!-- <system-info v-if="browserType !== 'mobile'" /> -->
     <audio id="eventAudio" src="" autoplay />
   </el-config-provider>
 </template>
diff --git a/src/layouts/components/Tools/alarmDialog.vue b/src/layouts/components/Tools/alarmDialog.vue
index 1828375..df89ab8 100644
--- a/src/layouts/components/Tools/alarmDialog.vue
+++ b/src/layouts/components/Tools/alarmDialog.vue
@@ -116,7 +116,7 @@
     </div>
     <template #footer>
       <div class="dialog-footer">
-        <div class="btn" @click="detail">
+        <div v-if="proxy.hasPerm('/alarm/current')" class="btn" @click="detail">
           查看
         </div>
         <div v-if="info.isSound === '1'" class="btn" @click="closeSound">
diff --git a/src/layouts/components/Tools/alarmList.vue b/src/layouts/components/Tools/alarmList.vue
index c3a9d2a..5356b74 100644
--- a/src/layouts/components/Tools/alarmList.vue
+++ b/src/layouts/components/Tools/alarmList.vue
@@ -54,6 +54,7 @@
 }
 // 查看当前行
 const detailRow = (row: any) => {
+  if (!proxy.hasPerm('/alarm/current')) { return }
   $router.push({
     name: 'AlarmCurrent',
     query: {
@@ -77,21 +78,6 @@
   localStorage.setItem('eventAudio', 'pause')
 }
 const dialogRef = ref()
-// const dialog = () => {
-//   const row = {
-//     alarmNoteMethod: '1', // 消息提醒 1:弹窗，2:消息提醒
-//     isSound: '1', // 报警音效，1:开，0:关
-//     isSend: '1', // 报警推送，1:开，0:关
-//     isText: '1', // 报警短息，1:开，0:关
-//     alarmType: '浓度超限',
-//     tagNumber: 'NX5702',
-//     alarmTime: '2024-09-09',
-//     value: '20',
-//     typeName: '燃气智能终端',
-//     alarmLevel: '一级',
-//   }
-//   dialogRef.value.initDialog(row)
-// }
 const fetchData = (isLoading = false) => {
   loading.value = true
   if (isLoading) {
@@ -115,7 +101,10 @@
       dialogRef.value.initDialog(newVal)
     }
     if (newVal.isSound === '1') {
-      play()
+      // play()
+      if (!localStorage.getItem('eventAudio')) {
+        proxy.playAudio()
+      }
     }
     fetchData(false)
   }
@@ -146,6 +135,7 @@
 //     window.localStorage.removeItem('token')
 //   }
 // }
+// const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -180,7 +170,7 @@
                   {{ message.processStatus
                     === '未读' ? '未读' : '已读' }}
                 </el-tag>
-                <el-tag type="info" size="small" style="margin-left: 5px;">
+                <el-tag type="info" size="small" style="margin-left: 5px;" @click="detailRow(message)">
                   查看
                 </el-tag>
               </div>
@@ -214,7 +204,7 @@
       <!-- <div class="close" @click="dialog">
         弹窗
       </div> -->
-      <div class="more" @click="moreList">
+      <div v-if="proxy.hasPerm('/alarm/current')" class="more" @click="moreList">
         查看更多
       </div>
     </div>
diff --git a/src/layouts/components/Tools/index.vue b/src/layouts/components/Tools/index.vue
index 9f2d41f..61f9707 100644
--- a/src/layouts/components/Tools/index.vue
+++ b/src/layouts/components/Tools/index.vue
@@ -79,6 +79,7 @@
   // 断开 websocket
   // websocket.destroyWebSocket()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -89,18 +90,18 @@
           <svg-icon name="ep:search" />
         </el-icon>
       </span>
-      <span class="item" @click="board">
+      <span v-if="proxy.hasPerm('/fullscreen')" class="item" @click="board">
         <el-icon>
           <svg-icon name="ep:data-line" />
         </el-icon>
       </span>
-      <span v-if="settingsStore.mode === 'pc' && settingsStore.toolbar.enableFullscreen" class="item" @click="toggle">
+      <span class="item" @click="toggle">
         <el-icon>
           <svg-icon :name="isFullscreen ? 'fullscreen-exit' : 'fullscreen'" />
         </el-icon>
       </span>
       <!-- 报警信息列表 -->
-      <span class="item">
+      <span v-if="proxy.hasPerm('/alarmnotice')" class="item">
         <el-popover width="390">
           <template #reference>
             <div>
diff --git a/src/layouts/components/Topbar/index.vue b/src/layouts/components/Topbar/index.vue
index 2863cef..4e3120e 100644
--- a/src/layouts/components/Topbar/index.vue
+++ b/src/layouts/components/Topbar/index.vue
@@ -67,7 +67,7 @@
           </transition-group>
         </el-breadcrumb>
       </div>
-      <tools />
+      <!-- <tools /> -->
     </div>
   </div>
 </template>

diff --git a/src/App.vue b/src/App.vue
index cde81b3..8a00f5d 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -125,7 +125,7 @@
         '--g-sub-sidebar-actual-width': subSidebarActualWidth,
       }"
     />
-    <system-info v-if="browserType !== 'mobile'" />
+    <!-- <system-info v-if="browserType !== 'mobile'" /> -->
     <audio id="eventAudio" src="" autoplay />
   </el-config-provider>
 </template>
diff --git a/src/layouts/components/Tools/alarmDialog.vue b/src/layouts/components/Tools/alarmDialog.vue
index 1828375..df89ab8 100644
--- a/src/layouts/components/Tools/alarmDialog.vue
+++ b/src/layouts/components/Tools/alarmDialog.vue
@@ -116,7 +116,7 @@
     </div>
     <template #footer>
       <div class="dialog-footer">
-        <div class="btn" @click="detail">
+        <div v-if="proxy.hasPerm('/alarm/current')" class="btn" @click="detail">
           查看
         </div>
         <div v-if="info.isSound === '1'" class="btn" @click="closeSound">
diff --git a/src/layouts/components/Tools/alarmList.vue b/src/layouts/components/Tools/alarmList.vue
index c3a9d2a..5356b74 100644
--- a/src/layouts/components/Tools/alarmList.vue
+++ b/src/layouts/components/Tools/alarmList.vue
@@ -54,6 +54,7 @@
 }
 // 查看当前行
 const detailRow = (row: any) => {
+  if (!proxy.hasPerm('/alarm/current')) { return }
   $router.push({
     name: 'AlarmCurrent',
     query: {
@@ -77,21 +78,6 @@
   localStorage.setItem('eventAudio', 'pause')
 }
 const dialogRef = ref()
-// const dialog = () => {
-//   const row = {
-//     alarmNoteMethod: '1', // 消息提醒 1:弹窗，2:消息提醒
-//     isSound: '1', // 报警音效，1:开，0:关
-//     isSend: '1', // 报警推送，1:开，0:关
-//     isText: '1', // 报警短息，1:开，0:关
-//     alarmType: '浓度超限',
-//     tagNumber: 'NX5702',
-//     alarmTime: '2024-09-09',
-//     value: '20',
-//     typeName: '燃气智能终端',
-//     alarmLevel: '一级',
-//   }
-//   dialogRef.value.initDialog(row)
-// }
 const fetchData = (isLoading = false) => {
   loading.value = true
   if (isLoading) {
@@ -115,7 +101,10 @@
       dialogRef.value.initDialog(newVal)
     }
     if (newVal.isSound === '1') {
-      play()
+      // play()
+      if (!localStorage.getItem('eventAudio')) {
+        proxy.playAudio()
+      }
     }
     fetchData(false)
   }
@@ -146,6 +135,7 @@
 //     window.localStorage.removeItem('token')
 //   }
 // }
+// const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -180,7 +170,7 @@
                   {{ message.processStatus
                     === '未读' ? '未读' : '已读' }}
                 </el-tag>
-                <el-tag type="info" size="small" style="margin-left: 5px;">
+                <el-tag type="info" size="small" style="margin-left: 5px;" @click="detailRow(message)">
                   查看
                 </el-tag>
               </div>
@@ -214,7 +204,7 @@
       <!-- <div class="close" @click="dialog">
         弹窗
       </div> -->
-      <div class="more" @click="moreList">
+      <div v-if="proxy.hasPerm('/alarm/current')" class="more" @click="moreList">
         查看更多
       </div>
     </div>
diff --git a/src/layouts/components/Tools/index.vue b/src/layouts/components/Tools/index.vue
index 9f2d41f..61f9707 100644
--- a/src/layouts/components/Tools/index.vue
+++ b/src/layouts/components/Tools/index.vue
@@ -79,6 +79,7 @@
   // 断开 websocket
   // websocket.destroyWebSocket()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -89,18 +90,18 @@
           <svg-icon name="ep:search" />
         </el-icon>
       </span>
-      <span class="item" @click="board">
+      <span v-if="proxy.hasPerm('/fullscreen')" class="item" @click="board">
         <el-icon>
           <svg-icon name="ep:data-line" />
         </el-icon>
       </span>
-      <span v-if="settingsStore.mode === 'pc' && settingsStore.toolbar.enableFullscreen" class="item" @click="toggle">
+      <span class="item" @click="toggle">
         <el-icon>
           <svg-icon :name="isFullscreen ? 'fullscreen-exit' : 'fullscreen'" />
         </el-icon>
       </span>
       <!-- 报警信息列表 -->
-      <span class="item">
+      <span v-if="proxy.hasPerm('/alarmnotice')" class="item">
         <el-popover width="390">
           <template #reference>
             <div>
diff --git a/src/layouts/components/Topbar/index.vue b/src/layouts/components/Topbar/index.vue
index 2863cef..4e3120e 100644
--- a/src/layouts/components/Topbar/index.vue
+++ b/src/layouts/components/Topbar/index.vue
@@ -67,7 +67,7 @@
           </transition-group>
         </el-breadcrumb>
       </div>
-      <tools />
+      <!-- <tools /> -->
     </div>
   </div>
 </template>
diff --git a/src/router/modules/pc.ts b/src/router/modules/pc.ts
index aacd6fa..97ced45 100644
--- a/src/router/modules/pc.ts
+++ b/src/router/modules/pc.ts
@@ -40,7 +40,7 @@
       icon: 'ep:key',
       sidebar: false,
       breadcrumb: false,
-      // auth: '/fullscreen',
+      auth: '/fullscreen',
     },
   },
   {
@@ -155,7 +155,7 @@
           sidebar: false,
           breadcrumb: false,
           activeMenu: '/well',
-          auth: '/well/detail',
+          auth: '/well',
         },
       },
     ],

diff --git a/src/App.vue b/src/App.vue
index cde81b3..8a00f5d 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -125,7 +125,7 @@
         '--g-sub-sidebar-actual-width': subSidebarActualWidth,
       }"
     />
-    <system-info v-if="browserType !== 'mobile'" />
+    <!-- <system-info v-if="browserType !== 'mobile'" /> -->
     <audio id="eventAudio" src="" autoplay />
   </el-config-provider>
 </template>
diff --git a/src/layouts/components/Tools/alarmDialog.vue b/src/layouts/components/Tools/alarmDialog.vue
index 1828375..df89ab8 100644
--- a/src/layouts/components/Tools/alarmDialog.vue
+++ b/src/layouts/components/Tools/alarmDialog.vue
@@ -116,7 +116,7 @@
     </div>
     <template #footer>
       <div class="dialog-footer">
-        <div class="btn" @click="detail">
+        <div v-if="proxy.hasPerm('/alarm/current')" class="btn" @click="detail">
           查看
         </div>
         <div v-if="info.isSound === '1'" class="btn" @click="closeSound">
diff --git a/src/layouts/components/Tools/alarmList.vue b/src/layouts/components/Tools/alarmList.vue
index c3a9d2a..5356b74 100644
--- a/src/layouts/components/Tools/alarmList.vue
+++ b/src/layouts/components/Tools/alarmList.vue
@@ -54,6 +54,7 @@
 }
 // 查看当前行
 const detailRow = (row: any) => {
+  if (!proxy.hasPerm('/alarm/current')) { return }
   $router.push({
     name: 'AlarmCurrent',
     query: {
@@ -77,21 +78,6 @@
   localStorage.setItem('eventAudio', 'pause')
 }
 const dialogRef = ref()
-// const dialog = () => {
-//   const row = {
-//     alarmNoteMethod: '1', // 消息提醒 1:弹窗，2:消息提醒
-//     isSound: '1', // 报警音效，1:开，0:关
-//     isSend: '1', // 报警推送，1:开，0:关
-//     isText: '1', // 报警短息，1:开，0:关
-//     alarmType: '浓度超限',
-//     tagNumber: 'NX5702',
-//     alarmTime: '2024-09-09',
-//     value: '20',
-//     typeName: '燃气智能终端',
-//     alarmLevel: '一级',
-//   }
-//   dialogRef.value.initDialog(row)
-// }
 const fetchData = (isLoading = false) => {
   loading.value = true
   if (isLoading) {
@@ -115,7 +101,10 @@
       dialogRef.value.initDialog(newVal)
     }
     if (newVal.isSound === '1') {
-      play()
+      // play()
+      if (!localStorage.getItem('eventAudio')) {
+        proxy.playAudio()
+      }
     }
     fetchData(false)
   }
@@ -146,6 +135,7 @@
 //     window.localStorage.removeItem('token')
 //   }
 // }
+// const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -180,7 +170,7 @@
                   {{ message.processStatus
                     === '未读' ? '未读' : '已读' }}
                 </el-tag>
-                <el-tag type="info" size="small" style="margin-left: 5px;">
+                <el-tag type="info" size="small" style="margin-left: 5px;" @click="detailRow(message)">
                   查看
                 </el-tag>
               </div>
@@ -214,7 +204,7 @@
       <!-- <div class="close" @click="dialog">
         弹窗
       </div> -->
-      <div class="more" @click="moreList">
+      <div v-if="proxy.hasPerm('/alarm/current')" class="more" @click="moreList">
         查看更多
       </div>
     </div>
diff --git a/src/layouts/components/Tools/index.vue b/src/layouts/components/Tools/index.vue
index 9f2d41f..61f9707 100644
--- a/src/layouts/components/Tools/index.vue
+++ b/src/layouts/components/Tools/index.vue
@@ -79,6 +79,7 @@
   // 断开 websocket
   // websocket.destroyWebSocket()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -89,18 +90,18 @@
           <svg-icon name="ep:search" />
         </el-icon>
       </span>
-      <span class="item" @click="board">
+      <span v-if="proxy.hasPerm('/fullscreen')" class="item" @click="board">
         <el-icon>
           <svg-icon name="ep:data-line" />
         </el-icon>
       </span>
-      <span v-if="settingsStore.mode === 'pc' && settingsStore.toolbar.enableFullscreen" class="item" @click="toggle">
+      <span class="item" @click="toggle">
         <el-icon>
           <svg-icon :name="isFullscreen ? 'fullscreen-exit' : 'fullscreen'" />
         </el-icon>
       </span>
       <!-- 报警信息列表 -->
-      <span class="item">
+      <span v-if="proxy.hasPerm('/alarmnotice')" class="item">
         <el-popover width="390">
           <template #reference>
             <div>
diff --git a/src/layouts/components/Topbar/index.vue b/src/layouts/components/Topbar/index.vue
index 2863cef..4e3120e 100644
--- a/src/layouts/components/Topbar/index.vue
+++ b/src/layouts/components/Topbar/index.vue
@@ -67,7 +67,7 @@
           </transition-group>
         </el-breadcrumb>
       </div>
-      <tools />
+      <!-- <tools /> -->
     </div>
   </div>
 </template>
diff --git a/src/router/modules/pc.ts b/src/router/modules/pc.ts
index aacd6fa..97ced45 100644
--- a/src/router/modules/pc.ts
+++ b/src/router/modules/pc.ts
@@ -40,7 +40,7 @@
       icon: 'ep:key',
       sidebar: false,
       breadcrumb: false,
-      // auth: '/fullscreen',
+      auth: '/fullscreen',
     },
   },
   {
@@ -155,7 +155,7 @@
           sidebar: false,
           breadcrumb: false,
           activeMenu: '/well',
-          auth: '/well/detail',
+          auth: '/well',
         },
       },
     ],
diff --git a/src/views/home/alarm/count/components/locationAnalysis.vue b/src/views/home/alarm/count/components/locationAnalysis.vue
index fc75b9e..bff1853 100644
--- a/src/views/home/alarm/count/components/locationAnalysis.vue
+++ b/src/views/home/alarm/count/components/locationAnalysis.vue
@@ -46,6 +46,7 @@
   })
 }
 fetchData()
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -75,6 +76,9 @@
         <el-button type="primary" style="margin: 0 5px;" @click="fetchData">
           搜索
         </el-button>
+        <el-button v-if="proxy.hasPerm('/alarm/count/exportLocation')" type="primary" style="margin: 0 5px;">
+          导出
+        </el-button>
       </div>
     </template>
     <template #content>

diff --git a/src/App.vue b/src/App.vue
index cde81b3..8a00f5d 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -125,7 +125,7 @@
         '--g-sub-sidebar-actual-width': subSidebarActualWidth,
       }"
     />
-    <system-info v-if="browserType !== 'mobile'" />
+    <!-- <system-info v-if="browserType !== 'mobile'" /> -->
     <audio id="eventAudio" src="" autoplay />
   </el-config-provider>
 </template>
diff --git a/src/layouts/components/Tools/alarmDialog.vue b/src/layouts/components/Tools/alarmDialog.vue
index 1828375..df89ab8 100644
--- a/src/layouts/components/Tools/alarmDialog.vue
+++ b/src/layouts/components/Tools/alarmDialog.vue
@@ -116,7 +116,7 @@
     </div>
     <template #footer>
       <div class="dialog-footer">
-        <div class="btn" @click="detail">
+        <div v-if="proxy.hasPerm('/alarm/current')" class="btn" @click="detail">
           查看
         </div>
         <div v-if="info.isSound === '1'" class="btn" @click="closeSound">
diff --git a/src/layouts/components/Tools/alarmList.vue b/src/layouts/components/Tools/alarmList.vue
index c3a9d2a..5356b74 100644
--- a/src/layouts/components/Tools/alarmList.vue
+++ b/src/layouts/components/Tools/alarmList.vue
@@ -54,6 +54,7 @@
 }
 // 查看当前行
 const detailRow = (row: any) => {
+  if (!proxy.hasPerm('/alarm/current')) { return }
   $router.push({
     name: 'AlarmCurrent',
     query: {
@@ -77,21 +78,6 @@
   localStorage.setItem('eventAudio', 'pause')
 }
 const dialogRef = ref()
-// const dialog = () => {
-//   const row = {
-//     alarmNoteMethod: '1', // 消息提醒 1:弹窗，2:消息提醒
-//     isSound: '1', // 报警音效，1:开，0:关
-//     isSend: '1', // 报警推送，1:开，0:关
-//     isText: '1', // 报警短息，1:开，0:关
-//     alarmType: '浓度超限',
-//     tagNumber: 'NX5702',
-//     alarmTime: '2024-09-09',
-//     value: '20',
-//     typeName: '燃气智能终端',
-//     alarmLevel: '一级',
-//   }
-//   dialogRef.value.initDialog(row)
-// }
 const fetchData = (isLoading = false) => {
   loading.value = true
   if (isLoading) {
@@ -115,7 +101,10 @@
       dialogRef.value.initDialog(newVal)
     }
     if (newVal.isSound === '1') {
-      play()
+      // play()
+      if (!localStorage.getItem('eventAudio')) {
+        proxy.playAudio()
+      }
     }
     fetchData(false)
   }
@@ -146,6 +135,7 @@
 //     window.localStorage.removeItem('token')
 //   }
 // }
+// const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -180,7 +170,7 @@
                   {{ message.processStatus
                     === '未读' ? '未读' : '已读' }}
                 </el-tag>
-                <el-tag type="info" size="small" style="margin-left: 5px;">
+                <el-tag type="info" size="small" style="margin-left: 5px;" @click="detailRow(message)">
                   查看
                 </el-tag>
               </div>
@@ -214,7 +204,7 @@
       <!-- <div class="close" @click="dialog">
         弹窗
       </div> -->
-      <div class="more" @click="moreList">
+      <div v-if="proxy.hasPerm('/alarm/current')" class="more" @click="moreList">
         查看更多
       </div>
     </div>
diff --git a/src/layouts/components/Tools/index.vue b/src/layouts/components/Tools/index.vue
index 9f2d41f..61f9707 100644
--- a/src/layouts/components/Tools/index.vue
+++ b/src/layouts/components/Tools/index.vue
@@ -79,6 +79,7 @@
   // 断开 websocket
   // websocket.destroyWebSocket()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -89,18 +90,18 @@
           <svg-icon name="ep:search" />
         </el-icon>
       </span>
-      <span class="item" @click="board">
+      <span v-if="proxy.hasPerm('/fullscreen')" class="item" @click="board">
         <el-icon>
           <svg-icon name="ep:data-line" />
         </el-icon>
       </span>
-      <span v-if="settingsStore.mode === 'pc' && settingsStore.toolbar.enableFullscreen" class="item" @click="toggle">
+      <span class="item" @click="toggle">
         <el-icon>
           <svg-icon :name="isFullscreen ? 'fullscreen-exit' : 'fullscreen'" />
         </el-icon>
       </span>
       <!-- 报警信息列表 -->
-      <span class="item">
+      <span v-if="proxy.hasPerm('/alarmnotice')" class="item">
         <el-popover width="390">
           <template #reference>
             <div>
diff --git a/src/layouts/components/Topbar/index.vue b/src/layouts/components/Topbar/index.vue
index 2863cef..4e3120e 100644
--- a/src/layouts/components/Topbar/index.vue
+++ b/src/layouts/components/Topbar/index.vue
@@ -67,7 +67,7 @@
           </transition-group>
         </el-breadcrumb>
       </div>
-      <tools />
+      <!-- <tools /> -->
     </div>
   </div>
 </template>
diff --git a/src/router/modules/pc.ts b/src/router/modules/pc.ts
index aacd6fa..97ced45 100644
--- a/src/router/modules/pc.ts
+++ b/src/router/modules/pc.ts
@@ -40,7 +40,7 @@
       icon: 'ep:key',
       sidebar: false,
       breadcrumb: false,
-      // auth: '/fullscreen',
+      auth: '/fullscreen',
     },
   },
   {
@@ -155,7 +155,7 @@
           sidebar: false,
           breadcrumb: false,
           activeMenu: '/well',
-          auth: '/well/detail',
+          auth: '/well',
         },
       },
     ],
diff --git a/src/views/home/alarm/count/components/locationAnalysis.vue b/src/views/home/alarm/count/components/locationAnalysis.vue
index fc75b9e..bff1853 100644
--- a/src/views/home/alarm/count/components/locationAnalysis.vue
+++ b/src/views/home/alarm/count/components/locationAnalysis.vue
@@ -46,6 +46,7 @@
   })
 }
 fetchData()
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -75,6 +76,9 @@
         <el-button type="primary" style="margin: 0 5px;" @click="fetchData">
           搜索
         </el-button>
+        <el-button v-if="proxy.hasPerm('/alarm/count/exportLocation')" type="primary" style="margin: 0 5px;">
+          导出
+        </el-button>
       </div>
     </template>
     <template #content>
diff --git a/src/views/home/alarm/current/components/detail.vue b/src/views/home/alarm/current/components/detail.vue
index dd3b31a..4204c92 100644
--- a/src/views/home/alarm/current/components/detail.vue
+++ b/src/views/home/alarm/current/components/detail.vue
@@ -111,7 +111,7 @@
   const res2 = await getAlarmTypeListPage({ offset: 1, limit: 9999 });
   ($route.query.type === 'history' ? getAlarmDetail : getAlarmDetail)($route.query.id as string).then((res) => {
     detailInfo.value = toHumpObject(res.data)
-    detailInfo.value.realAlarmName = detailInfo.value.realAlarm === '1' ? '报警' : '误报'
+    detailInfo.value.realAlarmName = detailInfo.value.realAlarm === '0' ? '是' : '否'
     detailInfo.value.alarmTypeName = res2.data.rows.filter((item: any) => item.id === detailInfo.value.alarmTypeId)[0]?.alarmType || ''
     detailInfo.value.alarmLevelName = res1.data.rows.filter((item: any) => item.id === detailInfo.value.alarmLevel)[0]?.alarmLevel || ''
     detailInfo.value.duration = detailInfo.value.ts && detailInfo.value.cancelTime ? getDateDiff(detailInfo.value.ts, detailInfo.value.cancelTime) : ''
@@ -139,6 +139,7 @@
 }
 // 点击经纬度展示地图
 const mapRef = ref()
+const { proxy } = getCurrentInstance() as any
 const showMap = (data: any) => {
   console.log(data, 'data')
   if (data.text === '位置') {
@@ -148,6 +149,13 @@
         2: 'StationMonitorDetail',
         3: 'PipelineMonitorDetail',
       } as { [key: string]: string }
+      // 判断是否有菜单权限
+      const watchObjectAuth = {
+        1: '/well',
+        2: '/station/monitor',
+        3: '/pipeline',
+      } as { [key: string]: string }
+      if (!proxy.hasPerm(watchObjectAuth[detailInfo.value.watchObject])) { return }
       $router.push({
         name: watchObject[detailInfo.value.watchObject],
         query: {

diff --git a/src/App.vue b/src/App.vue
index cde81b3..8a00f5d 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -125,7 +125,7 @@
         '--g-sub-sidebar-actual-width': subSidebarActualWidth,
       }"
     />
-    <system-info v-if="browserType !== 'mobile'" />
+    <!-- <system-info v-if="browserType !== 'mobile'" /> -->
     <audio id="eventAudio" src="" autoplay />
   </el-config-provider>
 </template>
diff --git a/src/layouts/components/Tools/alarmDialog.vue b/src/layouts/components/Tools/alarmDialog.vue
index 1828375..df89ab8 100644
--- a/src/layouts/components/Tools/alarmDialog.vue
+++ b/src/layouts/components/Tools/alarmDialog.vue
@@ -116,7 +116,7 @@
     </div>
     <template #footer>
       <div class="dialog-footer">
-        <div class="btn" @click="detail">
+        <div v-if="proxy.hasPerm('/alarm/current')" class="btn" @click="detail">
           查看
         </div>
         <div v-if="info.isSound === '1'" class="btn" @click="closeSound">
diff --git a/src/layouts/components/Tools/alarmList.vue b/src/layouts/components/Tools/alarmList.vue
index c3a9d2a..5356b74 100644
--- a/src/layouts/components/Tools/alarmList.vue
+++ b/src/layouts/components/Tools/alarmList.vue
@@ -54,6 +54,7 @@
 }
 // 查看当前行
 const detailRow = (row: any) => {
+  if (!proxy.hasPerm('/alarm/current')) { return }
   $router.push({
     name: 'AlarmCurrent',
     query: {
@@ -77,21 +78,6 @@
   localStorage.setItem('eventAudio', 'pause')
 }
 const dialogRef = ref()
-// const dialog = () => {
-//   const row = {
-//     alarmNoteMethod: '1', // 消息提醒 1:弹窗，2:消息提醒
-//     isSound: '1', // 报警音效，1:开，0:关
-//     isSend: '1', // 报警推送，1:开，0:关
-//     isText: '1', // 报警短息，1:开，0:关
-//     alarmType: '浓度超限',
-//     tagNumber: 'NX5702',
-//     alarmTime: '2024-09-09',
-//     value: '20',
-//     typeName: '燃气智能终端',
-//     alarmLevel: '一级',
-//   }
-//   dialogRef.value.initDialog(row)
-// }
 const fetchData = (isLoading = false) => {
   loading.value = true
   if (isLoading) {
@@ -115,7 +101,10 @@
       dialogRef.value.initDialog(newVal)
     }
     if (newVal.isSound === '1') {
-      play()
+      // play()
+      if (!localStorage.getItem('eventAudio')) {
+        proxy.playAudio()
+      }
     }
     fetchData(false)
   }
@@ -146,6 +135,7 @@
 //     window.localStorage.removeItem('token')
 //   }
 // }
+// const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -180,7 +170,7 @@
                   {{ message.processStatus
                     === '未读' ? '未读' : '已读' }}
                 </el-tag>
-                <el-tag type="info" size="small" style="margin-left: 5px;">
+                <el-tag type="info" size="small" style="margin-left: 5px;" @click="detailRow(message)">
                   查看
                 </el-tag>
               </div>
@@ -214,7 +204,7 @@
       <!-- <div class="close" @click="dialog">
         弹窗
       </div> -->
-      <div class="more" @click="moreList">
+      <div v-if="proxy.hasPerm('/alarm/current')" class="more" @click="moreList">
         查看更多
       </div>
     </div>
diff --git a/src/layouts/components/Tools/index.vue b/src/layouts/components/Tools/index.vue
index 9f2d41f..61f9707 100644
--- a/src/layouts/components/Tools/index.vue
+++ b/src/layouts/components/Tools/index.vue
@@ -79,6 +79,7 @@
   // 断开 websocket
   // websocket.destroyWebSocket()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -89,18 +90,18 @@
           <svg-icon name="ep:search" />
         </el-icon>
       </span>
-      <span class="item" @click="board">
+      <span v-if="proxy.hasPerm('/fullscreen')" class="item" @click="board">
         <el-icon>
           <svg-icon name="ep:data-line" />
         </el-icon>
       </span>
-      <span v-if="settingsStore.mode === 'pc' && settingsStore.toolbar.enableFullscreen" class="item" @click="toggle">
+      <span class="item" @click="toggle">
         <el-icon>
           <svg-icon :name="isFullscreen ? 'fullscreen-exit' : 'fullscreen'" />
         </el-icon>
       </span>
       <!-- 报警信息列表 -->
-      <span class="item">
+      <span v-if="proxy.hasPerm('/alarmnotice')" class="item">
         <el-popover width="390">
           <template #reference>
             <div>
diff --git a/src/layouts/components/Topbar/index.vue b/src/layouts/components/Topbar/index.vue
index 2863cef..4e3120e 100644
--- a/src/layouts/components/Topbar/index.vue
+++ b/src/layouts/components/Topbar/index.vue
@@ -67,7 +67,7 @@
           </transition-group>
         </el-breadcrumb>
       </div>
-      <tools />
+      <!-- <tools /> -->
     </div>
   </div>
 </template>
diff --git a/src/router/modules/pc.ts b/src/router/modules/pc.ts
index aacd6fa..97ced45 100644
--- a/src/router/modules/pc.ts
+++ b/src/router/modules/pc.ts
@@ -40,7 +40,7 @@
       icon: 'ep:key',
       sidebar: false,
       breadcrumb: false,
-      // auth: '/fullscreen',
+      auth: '/fullscreen',
     },
   },
   {
@@ -155,7 +155,7 @@
           sidebar: false,
           breadcrumb: false,
           activeMenu: '/well',
-          auth: '/well/detail',
+          auth: '/well',
         },
       },
     ],
diff --git a/src/views/home/alarm/count/components/locationAnalysis.vue b/src/views/home/alarm/count/components/locationAnalysis.vue
index fc75b9e..bff1853 100644
--- a/src/views/home/alarm/count/components/locationAnalysis.vue
+++ b/src/views/home/alarm/count/components/locationAnalysis.vue
@@ -46,6 +46,7 @@
   })
 }
 fetchData()
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -75,6 +76,9 @@
         <el-button type="primary" style="margin: 0 5px;" @click="fetchData">
           搜索
         </el-button>
+        <el-button v-if="proxy.hasPerm('/alarm/count/exportLocation')" type="primary" style="margin: 0 5px;">
+          导出
+        </el-button>
       </div>
     </template>
     <template #content>
diff --git a/src/views/home/alarm/current/components/detail.vue b/src/views/home/alarm/current/components/detail.vue
index dd3b31a..4204c92 100644
--- a/src/views/home/alarm/current/components/detail.vue
+++ b/src/views/home/alarm/current/components/detail.vue
@@ -111,7 +111,7 @@
   const res2 = await getAlarmTypeListPage({ offset: 1, limit: 9999 });
   ($route.query.type === 'history' ? getAlarmDetail : getAlarmDetail)($route.query.id as string).then((res) => {
     detailInfo.value = toHumpObject(res.data)
-    detailInfo.value.realAlarmName = detailInfo.value.realAlarm === '1' ? '报警' : '误报'
+    detailInfo.value.realAlarmName = detailInfo.value.realAlarm === '0' ? '是' : '否'
     detailInfo.value.alarmTypeName = res2.data.rows.filter((item: any) => item.id === detailInfo.value.alarmTypeId)[0]?.alarmType || ''
     detailInfo.value.alarmLevelName = res1.data.rows.filter((item: any) => item.id === detailInfo.value.alarmLevel)[0]?.alarmLevel || ''
     detailInfo.value.duration = detailInfo.value.ts && detailInfo.value.cancelTime ? getDateDiff(detailInfo.value.ts, detailInfo.value.cancelTime) : ''
@@ -139,6 +139,7 @@
 }
 // 点击经纬度展示地图
 const mapRef = ref()
+const { proxy } = getCurrentInstance() as any
 const showMap = (data: any) => {
   console.log(data, 'data')
   if (data.text === '位置') {
@@ -148,6 +149,13 @@
         2: 'StationMonitorDetail',
         3: 'PipelineMonitorDetail',
       } as { [key: string]: string }
+      // 判断是否有菜单权限
+      const watchObjectAuth = {
+        1: '/well',
+        2: '/station/monitor',
+        3: '/pipeline',
+      } as { [key: string]: string }
+      if (!proxy.hasPerm(watchObjectAuth[detailInfo.value.watchObject])) { return }
       $router.push({
         name: watchObject[detailInfo.value.watchObject],
         query: {
diff --git a/src/views/home/alarm/current/components/detailInfoDialog.vue b/src/views/home/alarm/current/components/detailInfoDialog.vue
index c089449..7fbf06b 100644
--- a/src/views/home/alarm/current/components/detailInfoDialog.vue
+++ b/src/views/home/alarm/current/components/detailInfoDialog.vue
@@ -114,6 +114,7 @@
   })
 }
 defineExpose({ initDialog, close })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -131,7 +132,7 @@
     <!-- 头部 -->
     <div class="header">
       <span>{{ info.alarmContent }}</span>
-      <span class="more" @click="moreData">>>更多</span>
+      <span v-if="proxy.hasPerm(type === 'data' ? '/alarm/current/more' : '/alarm/device/more')" class="more" @click="moreData">>>更多</span>
     </div>
     <div class="content">
       <div v-show="type === 'device'" class="item">
@@ -162,7 +163,7 @@
         报警设备:
         <span style="padding-left: 6px;">{{ info.devcode }} </span>
         <el-button
-          v-if="info.devTypeName === '燃气智能监测终端' || info.devTypeName === '液位检测仪' || info.devTypeName === '井盖监测仪'"
+          v-if="(info.devTypeName === '燃气智能监测终端' || info.devTypeName === '液位检测仪' || info.devTypeName === '井盖监测仪') && proxy.hasPerm('/alarm/current/data')"
           size="small" style="margin-left: 6px;" @click="viewData"
         >
           查看数据
@@ -228,7 +229,7 @@
         <span style="padding-left: 6px;">
           {{ info.confirmContent }}
         </span>
-        <el-button v-if="type === 'data'" size="small" style="padding-left: 6px;" @click="viewProcess">
+        <el-button v-if="type === 'data' && proxy.hasPerm('/alarm/current/process')" size="small" style="padding-left: 6px;" @click="viewProcess">
           流程图
         </el-button>
       </div>
@@ -246,17 +247,17 @@
       </div>
     </div>
     <div class="footer">
-      <el-button v-if="Number(info.processStatus) < 4 && type === 'data'" size="small" @click="remind">
+      <el-button v-if="(Number(info.processStatus) < 4 && type === 'data') && proxy.hasPerm('/alarm/current/remind')" size="small" @click="remind">
         提醒责任人
       </el-button>
       <el-button
-        v-if="type === 'device' && (info.processStatusName === '待处置' || info.processStatusName === '挂起')"
+        v-if="(type === 'device' && (info.processStatusName === '待处置' || info.processStatusName === '挂起')) && proxy.hasPerm('/alarm/device/handler')"
         size="small" @click="handler"
       >
         报警处置
       </el-button>
       <el-button
-        v-if="Number(info.processStatus) <= 3 || (type === 'device' && info.processStatusName === '待处置') || info.processStatusName === '挂起'"
+        v-if="(Number(info.processStatus) <= 3 || (type === 'device' && info.processStatusName === '待处置') || info.processStatusName === '挂起') && proxy.hasPerm(type === 'device' ? '/alarm/device/pending' : '/alarm/current/pending')"
         type="primary" size="small" @click="pending"
       >
         挂起

diff --git a/src/App.vue b/src/App.vue
index cde81b3..8a00f5d 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -125,7 +125,7 @@
         '--g-sub-sidebar-actual-width': subSidebarActualWidth,
       }"
     />
-    <system-info v-if="browserType !== 'mobile'" />
+    <!-- <system-info v-if="browserType !== 'mobile'" /> -->
     <audio id="eventAudio" src="" autoplay />
   </el-config-provider>
 </template>
diff --git a/src/layouts/components/Tools/alarmDialog.vue b/src/layouts/components/Tools/alarmDialog.vue
index 1828375..df89ab8 100644
--- a/src/layouts/components/Tools/alarmDialog.vue
+++ b/src/layouts/components/Tools/alarmDialog.vue
@@ -116,7 +116,7 @@
     </div>
     <template #footer>
       <div class="dialog-footer">
-        <div class="btn" @click="detail">
+        <div v-if="proxy.hasPerm('/alarm/current')" class="btn" @click="detail">
           查看
         </div>
         <div v-if="info.isSound === '1'" class="btn" @click="closeSound">
diff --git a/src/layouts/components/Tools/alarmList.vue b/src/layouts/components/Tools/alarmList.vue
index c3a9d2a..5356b74 100644
--- a/src/layouts/components/Tools/alarmList.vue
+++ b/src/layouts/components/Tools/alarmList.vue
@@ -54,6 +54,7 @@
 }
 // 查看当前行
 const detailRow = (row: any) => {
+  if (!proxy.hasPerm('/alarm/current')) { return }
   $router.push({
     name: 'AlarmCurrent',
     query: {
@@ -77,21 +78,6 @@
   localStorage.setItem('eventAudio', 'pause')
 }
 const dialogRef = ref()
-// const dialog = () => {
-//   const row = {
-//     alarmNoteMethod: '1', // 消息提醒 1:弹窗，2:消息提醒
-//     isSound: '1', // 报警音效，1:开，0:关
-//     isSend: '1', // 报警推送，1:开，0:关
-//     isText: '1', // 报警短息，1:开，0:关
-//     alarmType: '浓度超限',
-//     tagNumber: 'NX5702',
-//     alarmTime: '2024-09-09',
-//     value: '20',
-//     typeName: '燃气智能终端',
-//     alarmLevel: '一级',
-//   }
-//   dialogRef.value.initDialog(row)
-// }
 const fetchData = (isLoading = false) => {
   loading.value = true
   if (isLoading) {
@@ -115,7 +101,10 @@
       dialogRef.value.initDialog(newVal)
     }
     if (newVal.isSound === '1') {
-      play()
+      // play()
+      if (!localStorage.getItem('eventAudio')) {
+        proxy.playAudio()
+      }
     }
     fetchData(false)
   }
@@ -146,6 +135,7 @@
 //     window.localStorage.removeItem('token')
 //   }
 // }
+// const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -180,7 +170,7 @@
                   {{ message.processStatus
                     === '未读' ? '未读' : '已读' }}
                 </el-tag>
-                <el-tag type="info" size="small" style="margin-left: 5px;">
+                <el-tag type="info" size="small" style="margin-left: 5px;" @click="detailRow(message)">
                   查看
                 </el-tag>
               </div>
@@ -214,7 +204,7 @@
       <!-- <div class="close" @click="dialog">
         弹窗
       </div> -->
-      <div class="more" @click="moreList">
+      <div v-if="proxy.hasPerm('/alarm/current')" class="more" @click="moreList">
         查看更多
       </div>
     </div>
diff --git a/src/layouts/components/Tools/index.vue b/src/layouts/components/Tools/index.vue
index 9f2d41f..61f9707 100644
--- a/src/layouts/components/Tools/index.vue
+++ b/src/layouts/components/Tools/index.vue
@@ -79,6 +79,7 @@
   // 断开 websocket
   // websocket.destroyWebSocket()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -89,18 +90,18 @@
           <svg-icon name="ep:search" />
         </el-icon>
       </span>
-      <span class="item" @click="board">
+      <span v-if="proxy.hasPerm('/fullscreen')" class="item" @click="board">
         <el-icon>
           <svg-icon name="ep:data-line" />
         </el-icon>
       </span>
-      <span v-if="settingsStore.mode === 'pc' && settingsStore.toolbar.enableFullscreen" class="item" @click="toggle">
+      <span class="item" @click="toggle">
         <el-icon>
           <svg-icon :name="isFullscreen ? 'fullscreen-exit' : 'fullscreen'" />
         </el-icon>
       </span>
       <!-- 报警信息列表 -->
-      <span class="item">
+      <span v-if="proxy.hasPerm('/alarmnotice')" class="item">
         <el-popover width="390">
           <template #reference>
             <div>
diff --git a/src/layouts/components/Topbar/index.vue b/src/layouts/components/Topbar/index.vue
index 2863cef..4e3120e 100644
--- a/src/layouts/components/Topbar/index.vue
+++ b/src/layouts/components/Topbar/index.vue
@@ -67,7 +67,7 @@
           </transition-group>
         </el-breadcrumb>
       </div>
-      <tools />
+      <!-- <tools /> -->
     </div>
   </div>
 </template>
diff --git a/src/router/modules/pc.ts b/src/router/modules/pc.ts
index aacd6fa..97ced45 100644
--- a/src/router/modules/pc.ts
+++ b/src/router/modules/pc.ts
@@ -40,7 +40,7 @@
       icon: 'ep:key',
       sidebar: false,
       breadcrumb: false,
-      // auth: '/fullscreen',
+      auth: '/fullscreen',
     },
   },
   {
@@ -155,7 +155,7 @@
           sidebar: false,
           breadcrumb: false,
           activeMenu: '/well',
-          auth: '/well/detail',
+          auth: '/well',
         },
       },
     ],
diff --git a/src/views/home/alarm/count/components/locationAnalysis.vue b/src/views/home/alarm/count/components/locationAnalysis.vue
index fc75b9e..bff1853 100644
--- a/src/views/home/alarm/count/components/locationAnalysis.vue
+++ b/src/views/home/alarm/count/components/locationAnalysis.vue
@@ -46,6 +46,7 @@
   })
 }
 fetchData()
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -75,6 +76,9 @@
         <el-button type="primary" style="margin: 0 5px;" @click="fetchData">
           搜索
         </el-button>
+        <el-button v-if="proxy.hasPerm('/alarm/count/exportLocation')" type="primary" style="margin: 0 5px;">
+          导出
+        </el-button>
       </div>
     </template>
     <template #content>
diff --git a/src/views/home/alarm/current/components/detail.vue b/src/views/home/alarm/current/components/detail.vue
index dd3b31a..4204c92 100644
--- a/src/views/home/alarm/current/components/detail.vue
+++ b/src/views/home/alarm/current/components/detail.vue
@@ -111,7 +111,7 @@
   const res2 = await getAlarmTypeListPage({ offset: 1, limit: 9999 });
   ($route.query.type === 'history' ? getAlarmDetail : getAlarmDetail)($route.query.id as string).then((res) => {
     detailInfo.value = toHumpObject(res.data)
-    detailInfo.value.realAlarmName = detailInfo.value.realAlarm === '1' ? '报警' : '误报'
+    detailInfo.value.realAlarmName = detailInfo.value.realAlarm === '0' ? '是' : '否'
     detailInfo.value.alarmTypeName = res2.data.rows.filter((item: any) => item.id === detailInfo.value.alarmTypeId)[0]?.alarmType || ''
     detailInfo.value.alarmLevelName = res1.data.rows.filter((item: any) => item.id === detailInfo.value.alarmLevel)[0]?.alarmLevel || ''
     detailInfo.value.duration = detailInfo.value.ts && detailInfo.value.cancelTime ? getDateDiff(detailInfo.value.ts, detailInfo.value.cancelTime) : ''
@@ -139,6 +139,7 @@
 }
 // 点击经纬度展示地图
 const mapRef = ref()
+const { proxy } = getCurrentInstance() as any
 const showMap = (data: any) => {
   console.log(data, 'data')
   if (data.text === '位置') {
@@ -148,6 +149,13 @@
         2: 'StationMonitorDetail',
         3: 'PipelineMonitorDetail',
       } as { [key: string]: string }
+      // 判断是否有菜单权限
+      const watchObjectAuth = {
+        1: '/well',
+        2: '/station/monitor',
+        3: '/pipeline',
+      } as { [key: string]: string }
+      if (!proxy.hasPerm(watchObjectAuth[detailInfo.value.watchObject])) { return }
       $router.push({
         name: watchObject[detailInfo.value.watchObject],
         query: {
diff --git a/src/views/home/alarm/current/components/detailInfoDialog.vue b/src/views/home/alarm/current/components/detailInfoDialog.vue
index c089449..7fbf06b 100644
--- a/src/views/home/alarm/current/components/detailInfoDialog.vue
+++ b/src/views/home/alarm/current/components/detailInfoDialog.vue
@@ -114,6 +114,7 @@
   })
 }
 defineExpose({ initDialog, close })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -131,7 +132,7 @@
     <!-- 头部 -->
     <div class="header">
       <span>{{ info.alarmContent }}</span>
-      <span class="more" @click="moreData">>>更多</span>
+      <span v-if="proxy.hasPerm(type === 'data' ? '/alarm/current/more' : '/alarm/device/more')" class="more" @click="moreData">>>更多</span>
     </div>
     <div class="content">
       <div v-show="type === 'device'" class="item">
@@ -162,7 +163,7 @@
         报警设备:
         <span style="padding-left: 6px;">{{ info.devcode }} </span>
         <el-button
-          v-if="info.devTypeName === '燃气智能监测终端' || info.devTypeName === '液位检测仪' || info.devTypeName === '井盖监测仪'"
+          v-if="(info.devTypeName === '燃气智能监测终端' || info.devTypeName === '液位检测仪' || info.devTypeName === '井盖监测仪') && proxy.hasPerm('/alarm/current/data')"
           size="small" style="margin-left: 6px;" @click="viewData"
         >
           查看数据
@@ -228,7 +229,7 @@
         <span style="padding-left: 6px;">
           {{ info.confirmContent }}
         </span>
-        <el-button v-if="type === 'data'" size="small" style="padding-left: 6px;" @click="viewProcess">
+        <el-button v-if="type === 'data' && proxy.hasPerm('/alarm/current/process')" size="small" style="padding-left: 6px;" @click="viewProcess">
           流程图
         </el-button>
       </div>
@@ -246,17 +247,17 @@
       </div>
     </div>
     <div class="footer">
-      <el-button v-if="Number(info.processStatus) < 4 && type === 'data'" size="small" @click="remind">
+      <el-button v-if="(Number(info.processStatus) < 4 && type === 'data') && proxy.hasPerm('/alarm/current/remind')" size="small" @click="remind">
         提醒责任人
       </el-button>
       <el-button
-        v-if="type === 'device' && (info.processStatusName === '待处置' || info.processStatusName === '挂起')"
+        v-if="(type === 'device' && (info.processStatusName === '待处置' || info.processStatusName === '挂起')) && proxy.hasPerm('/alarm/device/handler')"
         size="small" @click="handler"
       >
         报警处置
       </el-button>
       <el-button
-        v-if="Number(info.processStatus) <= 3 || (type === 'device' && info.processStatusName === '待处置') || info.processStatusName === '挂起'"
+        v-if="(Number(info.processStatus) <= 3 || (type === 'device' && info.processStatusName === '待处置') || info.processStatusName === '挂起') && proxy.hasPerm(type === 'device' ? '/alarm/device/pending' : '/alarm/current/pending')"
         type="primary" size="small" @click="pending"
       >
         挂起
diff --git a/src/views/home/alarm/current/index.vue b/src/views/home/alarm/current/index.vue
index d019bbf..e2714bb 100644
--- a/src/views/home/alarm/current/index.vue
+++ b/src/views/home/alarm/current/index.vue
@@ -4,6 +4,7 @@
   Date: 2023-06-28
  -->
 <script lang="ts" setup name="CurrentAlarm">
+import dayjs from 'dayjs'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import { ArrowLeftBold, ArrowRightBold } from '@element-plus/icons-vue'
 import MapCom from './components/map.vue'
@@ -100,6 +101,7 @@
       path: '/alarm/current',
     })
   }
+  datetimerange.value = []
   listQuery.value = {
     limit: 20,
     offset: 1,
@@ -131,8 +133,8 @@
   if ($route.query.row) {
     loadingTable.value = true
     const row = JSON.parse($route.query.row as string)
-    getCurrentAlarmListPage({ offset: 1, limit: 99999 }).then((res) => {
-      const data = res.data.rows.filter((item: any) => item.id === row.id)
+    getCurrentAlarmListPage({ offset: 1, limit: 50 }).then((res) => {
+      const data = res.data.rows.filter((item: any) => item.id === row.alarmId)
       if (data.length) {
         list1.value = data.map((item: any) => ({
           ...item,
@@ -153,7 +155,10 @@
     })
     return
   }
-  fetchData()
+  datetimerange.value = [dayjs().subtract(7, 'day').format('YYYY-MM-DD HH:mm:ss'), dayjs().format('YYYY-MM-DD HH:mm:ss')]
+  setTimeout(() => {
+    fetchData()
+  })
 })
 // 表格标识  地图或普通
 const tableFlag = ref('normal')
@@ -181,6 +186,10 @@
 const mapRef = ref()
 const mapData = ref({})
 async function detail(row: any) {
+  if (row.processStatusName === '未读') {
+    list1.value[list1.value.findIndex((item: any) => item.id === row.id)].processStatusName = '已读'
+    row.processStatusName = '已读'
+  }
   const res = await detailAlarm(row.id)
   const data = toHumpObject(res.data)
   mapData.value = row
@@ -362,7 +371,7 @@
               <el-button v-if="proxy.hasPerm('/alarm/current/delete')" type="primary" @click="batchDeleteRow">
                 批量删除
               </el-button>
-              <el-button type="primary" @click="exportList">
+              <el-button v-if="proxy.hasPerm('/alarm/current/export')" type="primary" @click="exportList">
                 导出
               </el-button>
             </div>
@@ -383,7 +392,7 @@
               </el-table-column>
             </template>
             <template #columns>
-              <el-table-column label="操作" align="center" width="80">
+              <el-table-column v-if="proxy.hasPerm('/alarm/current/detail')" label="操作" align="center" width="80">
                 <template #default="scope">
                   <el-button type="primary" link size="small" @click="detail(scope.row)">
                     查看

diff --git a/src/App.vue b/src/App.vue
index cde81b3..8a00f5d 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -125,7 +125,7 @@
         '--g-sub-sidebar-actual-width': subSidebarActualWidth,
       }"
     />
-    <system-info v-if="browserType !== 'mobile'" />
+    <!-- <system-info v-if="browserType !== 'mobile'" /> -->
     <audio id="eventAudio" src="" autoplay />
   </el-config-provider>
 </template>
diff --git a/src/layouts/components/Tools/alarmDialog.vue b/src/layouts/components/Tools/alarmDialog.vue
index 1828375..df89ab8 100644
--- a/src/layouts/components/Tools/alarmDialog.vue
+++ b/src/layouts/components/Tools/alarmDialog.vue
@@ -116,7 +116,7 @@
     </div>
     <template #footer>
       <div class="dialog-footer">
-        <div class="btn" @click="detail">
+        <div v-if="proxy.hasPerm('/alarm/current')" class="btn" @click="detail">
           查看
         </div>
         <div v-if="info.isSound === '1'" class="btn" @click="closeSound">
diff --git a/src/layouts/components/Tools/alarmList.vue b/src/layouts/components/Tools/alarmList.vue
index c3a9d2a..5356b74 100644
--- a/src/layouts/components/Tools/alarmList.vue
+++ b/src/layouts/components/Tools/alarmList.vue
@@ -54,6 +54,7 @@
 }
 // 查看当前行
 const detailRow = (row: any) => {
+  if (!proxy.hasPerm('/alarm/current')) { return }
   $router.push({
     name: 'AlarmCurrent',
     query: {
@@ -77,21 +78,6 @@
   localStorage.setItem('eventAudio', 'pause')
 }
 const dialogRef = ref()
-// const dialog = () => {
-//   const row = {
-//     alarmNoteMethod: '1', // 消息提醒 1:弹窗，2:消息提醒
-//     isSound: '1', // 报警音效，1:开，0:关
-//     isSend: '1', // 报警推送，1:开，0:关
-//     isText: '1', // 报警短息，1:开，0:关
-//     alarmType: '浓度超限',
-//     tagNumber: 'NX5702',
-//     alarmTime: '2024-09-09',
-//     value: '20',
-//     typeName: '燃气智能终端',
-//     alarmLevel: '一级',
-//   }
-//   dialogRef.value.initDialog(row)
-// }
 const fetchData = (isLoading = false) => {
   loading.value = true
   if (isLoading) {
@@ -115,7 +101,10 @@
       dialogRef.value.initDialog(newVal)
     }
     if (newVal.isSound === '1') {
-      play()
+      // play()
+      if (!localStorage.getItem('eventAudio')) {
+        proxy.playAudio()
+      }
     }
     fetchData(false)
   }
@@ -146,6 +135,7 @@
 //     window.localStorage.removeItem('token')
 //   }
 // }
+// const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -180,7 +170,7 @@
                   {{ message.processStatus
                     === '未读' ? '未读' : '已读' }}
                 </el-tag>
-                <el-tag type="info" size="small" style="margin-left: 5px;">
+                <el-tag type="info" size="small" style="margin-left: 5px;" @click="detailRow(message)">
                   查看
                 </el-tag>
               </div>
@@ -214,7 +204,7 @@
       <!-- <div class="close" @click="dialog">
         弹窗
       </div> -->
-      <div class="more" @click="moreList">
+      <div v-if="proxy.hasPerm('/alarm/current')" class="more" @click="moreList">
         查看更多
       </div>
     </div>
diff --git a/src/layouts/components/Tools/index.vue b/src/layouts/components/Tools/index.vue
index 9f2d41f..61f9707 100644
--- a/src/layouts/components/Tools/index.vue
+++ b/src/layouts/components/Tools/index.vue
@@ -79,6 +79,7 @@
   // 断开 websocket
   // websocket.destroyWebSocket()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -89,18 +90,18 @@
           <svg-icon name="ep:search" />
         </el-icon>
       </span>
-      <span class="item" @click="board">
+      <span v-if="proxy.hasPerm('/fullscreen')" class="item" @click="board">
         <el-icon>
           <svg-icon name="ep:data-line" />
         </el-icon>
       </span>
-      <span v-if="settingsStore.mode === 'pc' && settingsStore.toolbar.enableFullscreen" class="item" @click="toggle">
+      <span class="item" @click="toggle">
         <el-icon>
           <svg-icon :name="isFullscreen ? 'fullscreen-exit' : 'fullscreen'" />
         </el-icon>
       </span>
       <!-- 报警信息列表 -->
-      <span class="item">
+      <span v-if="proxy.hasPerm('/alarmnotice')" class="item">
         <el-popover width="390">
           <template #reference>
             <div>
diff --git a/src/layouts/components/Topbar/index.vue b/src/layouts/components/Topbar/index.vue
index 2863cef..4e3120e 100644
--- a/src/layouts/components/Topbar/index.vue
+++ b/src/layouts/components/Topbar/index.vue
@@ -67,7 +67,7 @@
           </transition-group>
         </el-breadcrumb>
       </div>
-      <tools />
+      <!-- <tools /> -->
     </div>
   </div>
 </template>
diff --git a/src/router/modules/pc.ts b/src/router/modules/pc.ts
index aacd6fa..97ced45 100644
--- a/src/router/modules/pc.ts
+++ b/src/router/modules/pc.ts
@@ -40,7 +40,7 @@
       icon: 'ep:key',
       sidebar: false,
       breadcrumb: false,
-      // auth: '/fullscreen',
+      auth: '/fullscreen',
     },
   },
   {
@@ -155,7 +155,7 @@
           sidebar: false,
           breadcrumb: false,
           activeMenu: '/well',
-          auth: '/well/detail',
+          auth: '/well',
         },
       },
     ],
diff --git a/src/views/home/alarm/count/components/locationAnalysis.vue b/src/views/home/alarm/count/components/locationAnalysis.vue
index fc75b9e..bff1853 100644
--- a/src/views/home/alarm/count/components/locationAnalysis.vue
+++ b/src/views/home/alarm/count/components/locationAnalysis.vue
@@ -46,6 +46,7 @@
   })
 }
 fetchData()
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -75,6 +76,9 @@
         <el-button type="primary" style="margin: 0 5px;" @click="fetchData">
           搜索
         </el-button>
+        <el-button v-if="proxy.hasPerm('/alarm/count/exportLocation')" type="primary" style="margin: 0 5px;">
+          导出
+        </el-button>
       </div>
     </template>
     <template #content>
diff --git a/src/views/home/alarm/current/components/detail.vue b/src/views/home/alarm/current/components/detail.vue
index dd3b31a..4204c92 100644
--- a/src/views/home/alarm/current/components/detail.vue
+++ b/src/views/home/alarm/current/components/detail.vue
@@ -111,7 +111,7 @@
   const res2 = await getAlarmTypeListPage({ offset: 1, limit: 9999 });
   ($route.query.type === 'history' ? getAlarmDetail : getAlarmDetail)($route.query.id as string).then((res) => {
     detailInfo.value = toHumpObject(res.data)
-    detailInfo.value.realAlarmName = detailInfo.value.realAlarm === '1' ? '报警' : '误报'
+    detailInfo.value.realAlarmName = detailInfo.value.realAlarm === '0' ? '是' : '否'
     detailInfo.value.alarmTypeName = res2.data.rows.filter((item: any) => item.id === detailInfo.value.alarmTypeId)[0]?.alarmType || ''
     detailInfo.value.alarmLevelName = res1.data.rows.filter((item: any) => item.id === detailInfo.value.alarmLevel)[0]?.alarmLevel || ''
     detailInfo.value.duration = detailInfo.value.ts && detailInfo.value.cancelTime ? getDateDiff(detailInfo.value.ts, detailInfo.value.cancelTime) : ''
@@ -139,6 +139,7 @@
 }
 // 点击经纬度展示地图
 const mapRef = ref()
+const { proxy } = getCurrentInstance() as any
 const showMap = (data: any) => {
   console.log(data, 'data')
   if (data.text === '位置') {
@@ -148,6 +149,13 @@
         2: 'StationMonitorDetail',
         3: 'PipelineMonitorDetail',
       } as { [key: string]: string }
+      // 判断是否有菜单权限
+      const watchObjectAuth = {
+        1: '/well',
+        2: '/station/monitor',
+        3: '/pipeline',
+      } as { [key: string]: string }
+      if (!proxy.hasPerm(watchObjectAuth[detailInfo.value.watchObject])) { return }
       $router.push({
         name: watchObject[detailInfo.value.watchObject],
         query: {
diff --git a/src/views/home/alarm/current/components/detailInfoDialog.vue b/src/views/home/alarm/current/components/detailInfoDialog.vue
index c089449..7fbf06b 100644
--- a/src/views/home/alarm/current/components/detailInfoDialog.vue
+++ b/src/views/home/alarm/current/components/detailInfoDialog.vue
@@ -114,6 +114,7 @@
   })
 }
 defineExpose({ initDialog, close })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -131,7 +132,7 @@
     <!-- 头部 -->
     <div class="header">
       <span>{{ info.alarmContent }}</span>
-      <span class="more" @click="moreData">>>更多</span>
+      <span v-if="proxy.hasPerm(type === 'data' ? '/alarm/current/more' : '/alarm/device/more')" class="more" @click="moreData">>>更多</span>
     </div>
     <div class="content">
       <div v-show="type === 'device'" class="item">
@@ -162,7 +163,7 @@
         报警设备:
         <span style="padding-left: 6px;">{{ info.devcode }} </span>
         <el-button
-          v-if="info.devTypeName === '燃气智能监测终端' || info.devTypeName === '液位检测仪' || info.devTypeName === '井盖监测仪'"
+          v-if="(info.devTypeName === '燃气智能监测终端' || info.devTypeName === '液位检测仪' || info.devTypeName === '井盖监测仪') && proxy.hasPerm('/alarm/current/data')"
           size="small" style="margin-left: 6px;" @click="viewData"
         >
           查看数据
@@ -228,7 +229,7 @@
         <span style="padding-left: 6px;">
           {{ info.confirmContent }}
         </span>
-        <el-button v-if="type === 'data'" size="small" style="padding-left: 6px;" @click="viewProcess">
+        <el-button v-if="type === 'data' && proxy.hasPerm('/alarm/current/process')" size="small" style="padding-left: 6px;" @click="viewProcess">
           流程图
         </el-button>
       </div>
@@ -246,17 +247,17 @@
       </div>
     </div>
     <div class="footer">
-      <el-button v-if="Number(info.processStatus) < 4 && type === 'data'" size="small" @click="remind">
+      <el-button v-if="(Number(info.processStatus) < 4 && type === 'data') && proxy.hasPerm('/alarm/current/remind')" size="small" @click="remind">
         提醒责任人
       </el-button>
       <el-button
-        v-if="type === 'device' && (info.processStatusName === '待处置' || info.processStatusName === '挂起')"
+        v-if="(type === 'device' && (info.processStatusName === '待处置' || info.processStatusName === '挂起')) && proxy.hasPerm('/alarm/device/handler')"
         size="small" @click="handler"
       >
         报警处置
       </el-button>
       <el-button
-        v-if="Number(info.processStatus) <= 3 || (type === 'device' && info.processStatusName === '待处置') || info.processStatusName === '挂起'"
+        v-if="(Number(info.processStatus) <= 3 || (type === 'device' && info.processStatusName === '待处置') || info.processStatusName === '挂起') && proxy.hasPerm(type === 'device' ? '/alarm/device/pending' : '/alarm/current/pending')"
         type="primary" size="small" @click="pending"
       >
         挂起
diff --git a/src/views/home/alarm/current/index.vue b/src/views/home/alarm/current/index.vue
index d019bbf..e2714bb 100644
--- a/src/views/home/alarm/current/index.vue
+++ b/src/views/home/alarm/current/index.vue
@@ -4,6 +4,7 @@
   Date: 2023-06-28
  -->
 <script lang="ts" setup name="CurrentAlarm">
+import dayjs from 'dayjs'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import { ArrowLeftBold, ArrowRightBold } from '@element-plus/icons-vue'
 import MapCom from './components/map.vue'
@@ -100,6 +101,7 @@
       path: '/alarm/current',
     })
   }
+  datetimerange.value = []
   listQuery.value = {
     limit: 20,
     offset: 1,
@@ -131,8 +133,8 @@
   if ($route.query.row) {
     loadingTable.value = true
     const row = JSON.parse($route.query.row as string)
-    getCurrentAlarmListPage({ offset: 1, limit: 99999 }).then((res) => {
-      const data = res.data.rows.filter((item: any) => item.id === row.id)
+    getCurrentAlarmListPage({ offset: 1, limit: 50 }).then((res) => {
+      const data = res.data.rows.filter((item: any) => item.id === row.alarmId)
       if (data.length) {
         list1.value = data.map((item: any) => ({
           ...item,
@@ -153,7 +155,10 @@
     })
     return
   }
-  fetchData()
+  datetimerange.value = [dayjs().subtract(7, 'day').format('YYYY-MM-DD HH:mm:ss'), dayjs().format('YYYY-MM-DD HH:mm:ss')]
+  setTimeout(() => {
+    fetchData()
+  })
 })
 // 表格标识  地图或普通
 const tableFlag = ref('normal')
@@ -181,6 +186,10 @@
 const mapRef = ref()
 const mapData = ref({})
 async function detail(row: any) {
+  if (row.processStatusName === '未读') {
+    list1.value[list1.value.findIndex((item: any) => item.id === row.id)].processStatusName = '已读'
+    row.processStatusName = '已读'
+  }
   const res = await detailAlarm(row.id)
   const data = toHumpObject(res.data)
   mapData.value = row
@@ -362,7 +371,7 @@
               <el-button v-if="proxy.hasPerm('/alarm/current/delete')" type="primary" @click="batchDeleteRow">
                 批量删除
               </el-button>
-              <el-button type="primary" @click="exportList">
+              <el-button v-if="proxy.hasPerm('/alarm/current/export')" type="primary" @click="exportList">
                 导出
               </el-button>
             </div>
@@ -383,7 +392,7 @@
               </el-table-column>
             </template>
             <template #columns>
-              <el-table-column label="操作" align="center" width="80">
+              <el-table-column v-if="proxy.hasPerm('/alarm/current/detail')" label="操作" align="center" width="80">
                 <template #default="scope">
                   <el-button type="primary" link size="small" @click="detail(scope.row)">
                     查看
diff --git a/src/views/home/alarm/history/index.vue b/src/views/home/alarm/history/index.vue
index eeb49fc..3c810c3 100644
--- a/src/views/home/alarm/history/index.vue
+++ b/src/views/home/alarm/history/index.vue
@@ -97,6 +97,7 @@
 }
 // 重置查询条件f
 const reset = () => {
+  datetimerange.value = []
   listQuery.value = {
     limit: 20,
     offset: 1,
@@ -189,6 +190,7 @@
   })
 }
 fetchDict()
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -249,7 +251,7 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="exportList">
+          <el-button v-if="proxy.hasPerm('/alarm/history/export')" type="primary" @click="exportList">
             导出
           </el-button>
         </div>
@@ -272,7 +274,7 @@
           </el-table-column>
         </template>
         <template #columns>
-          <el-table-column label="操作" align="center" width="80">
+          <el-table-column v-if="proxy.hasPerm('/alarm/history/detail')" label="操作" align="center" width="80">
             <template #default="scope">
               <el-button type="primary" link size="small" @click="moreData(scope.row)">
                 查看

diff --git a/src/App.vue b/src/App.vue
index cde81b3..8a00f5d 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -125,7 +125,7 @@
         '--g-sub-sidebar-actual-width': subSidebarActualWidth,
       }"
     />
-    <system-info v-if="browserType !== 'mobile'" />
+    <!-- <system-info v-if="browserType !== 'mobile'" /> -->
     <audio id="eventAudio" src="" autoplay />
   </el-config-provider>
 </template>
diff --git a/src/layouts/components/Tools/alarmDialog.vue b/src/layouts/components/Tools/alarmDialog.vue
index 1828375..df89ab8 100644
--- a/src/layouts/components/Tools/alarmDialog.vue
+++ b/src/layouts/components/Tools/alarmDialog.vue
@@ -116,7 +116,7 @@
     </div>
     <template #footer>
       <div class="dialog-footer">
-        <div class="btn" @click="detail">
+        <div v-if="proxy.hasPerm('/alarm/current')" class="btn" @click="detail">
           查看
         </div>
         <div v-if="info.isSound === '1'" class="btn" @click="closeSound">
diff --git a/src/layouts/components/Tools/alarmList.vue b/src/layouts/components/Tools/alarmList.vue
index c3a9d2a..5356b74 100644
--- a/src/layouts/components/Tools/alarmList.vue
+++ b/src/layouts/components/Tools/alarmList.vue
@@ -54,6 +54,7 @@
 }
 // 查看当前行
 const detailRow = (row: any) => {
+  if (!proxy.hasPerm('/alarm/current')) { return }
   $router.push({
     name: 'AlarmCurrent',
     query: {
@@ -77,21 +78,6 @@
   localStorage.setItem('eventAudio', 'pause')
 }
 const dialogRef = ref()
-// const dialog = () => {
-//   const row = {
-//     alarmNoteMethod: '1', // 消息提醒 1:弹窗，2:消息提醒
-//     isSound: '1', // 报警音效，1:开，0:关
-//     isSend: '1', // 报警推送，1:开，0:关
-//     isText: '1', // 报警短息，1:开，0:关
-//     alarmType: '浓度超限',
-//     tagNumber: 'NX5702',
-//     alarmTime: '2024-09-09',
-//     value: '20',
-//     typeName: '燃气智能终端',
-//     alarmLevel: '一级',
-//   }
-//   dialogRef.value.initDialog(row)
-// }
 const fetchData = (isLoading = false) => {
   loading.value = true
   if (isLoading) {
@@ -115,7 +101,10 @@
       dialogRef.value.initDialog(newVal)
     }
     if (newVal.isSound === '1') {
-      play()
+      // play()
+      if (!localStorage.getItem('eventAudio')) {
+        proxy.playAudio()
+      }
     }
     fetchData(false)
   }
@@ -146,6 +135,7 @@
 //     window.localStorage.removeItem('token')
 //   }
 // }
+// const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -180,7 +170,7 @@
                   {{ message.processStatus
                     === '未读' ? '未读' : '已读' }}
                 </el-tag>
-                <el-tag type="info" size="small" style="margin-left: 5px;">
+                <el-tag type="info" size="small" style="margin-left: 5px;" @click="detailRow(message)">
                   查看
                 </el-tag>
               </div>
@@ -214,7 +204,7 @@
       <!-- <div class="close" @click="dialog">
         弹窗
       </div> -->
-      <div class="more" @click="moreList">
+      <div v-if="proxy.hasPerm('/alarm/current')" class="more" @click="moreList">
         查看更多
       </div>
     </div>
diff --git a/src/layouts/components/Tools/index.vue b/src/layouts/components/Tools/index.vue
index 9f2d41f..61f9707 100644
--- a/src/layouts/components/Tools/index.vue
+++ b/src/layouts/components/Tools/index.vue
@@ -79,6 +79,7 @@
   // 断开 websocket
   // websocket.destroyWebSocket()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -89,18 +90,18 @@
           <svg-icon name="ep:search" />
         </el-icon>
       </span>
-      <span class="item" @click="board">
+      <span v-if="proxy.hasPerm('/fullscreen')" class="item" @click="board">
         <el-icon>
           <svg-icon name="ep:data-line" />
         </el-icon>
       </span>
-      <span v-if="settingsStore.mode === 'pc' && settingsStore.toolbar.enableFullscreen" class="item" @click="toggle">
+      <span class="item" @click="toggle">
         <el-icon>
           <svg-icon :name="isFullscreen ? 'fullscreen-exit' : 'fullscreen'" />
         </el-icon>
       </span>
       <!-- 报警信息列表 -->
-      <span class="item">
+      <span v-if="proxy.hasPerm('/alarmnotice')" class="item">
         <el-popover width="390">
           <template #reference>
             <div>
diff --git a/src/layouts/components/Topbar/index.vue b/src/layouts/components/Topbar/index.vue
index 2863cef..4e3120e 100644
--- a/src/layouts/components/Topbar/index.vue
+++ b/src/layouts/components/Topbar/index.vue
@@ -67,7 +67,7 @@
           </transition-group>
         </el-breadcrumb>
       </div>
-      <tools />
+      <!-- <tools /> -->
     </div>
   </div>
 </template>
diff --git a/src/router/modules/pc.ts b/src/router/modules/pc.ts
index aacd6fa..97ced45 100644
--- a/src/router/modules/pc.ts
+++ b/src/router/modules/pc.ts
@@ -40,7 +40,7 @@
       icon: 'ep:key',
       sidebar: false,
       breadcrumb: false,
-      // auth: '/fullscreen',
+      auth: '/fullscreen',
     },
   },
   {
@@ -155,7 +155,7 @@
           sidebar: false,
           breadcrumb: false,
           activeMenu: '/well',
-          auth: '/well/detail',
+          auth: '/well',
         },
       },
     ],
diff --git a/src/views/home/alarm/count/components/locationAnalysis.vue b/src/views/home/alarm/count/components/locationAnalysis.vue
index fc75b9e..bff1853 100644
--- a/src/views/home/alarm/count/components/locationAnalysis.vue
+++ b/src/views/home/alarm/count/components/locationAnalysis.vue
@@ -46,6 +46,7 @@
   })
 }
 fetchData()
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -75,6 +76,9 @@
         <el-button type="primary" style="margin: 0 5px;" @click="fetchData">
           搜索
         </el-button>
+        <el-button v-if="proxy.hasPerm('/alarm/count/exportLocation')" type="primary" style="margin: 0 5px;">
+          导出
+        </el-button>
       </div>
     </template>
     <template #content>
diff --git a/src/views/home/alarm/current/components/detail.vue b/src/views/home/alarm/current/components/detail.vue
index dd3b31a..4204c92 100644
--- a/src/views/home/alarm/current/components/detail.vue
+++ b/src/views/home/alarm/current/components/detail.vue
@@ -111,7 +111,7 @@
   const res2 = await getAlarmTypeListPage({ offset: 1, limit: 9999 });
   ($route.query.type === 'history' ? getAlarmDetail : getAlarmDetail)($route.query.id as string).then((res) => {
     detailInfo.value = toHumpObject(res.data)
-    detailInfo.value.realAlarmName = detailInfo.value.realAlarm === '1' ? '报警' : '误报'
+    detailInfo.value.realAlarmName = detailInfo.value.realAlarm === '0' ? '是' : '否'
     detailInfo.value.alarmTypeName = res2.data.rows.filter((item: any) => item.id === detailInfo.value.alarmTypeId)[0]?.alarmType || ''
     detailInfo.value.alarmLevelName = res1.data.rows.filter((item: any) => item.id === detailInfo.value.alarmLevel)[0]?.alarmLevel || ''
     detailInfo.value.duration = detailInfo.value.ts && detailInfo.value.cancelTime ? getDateDiff(detailInfo.value.ts, detailInfo.value.cancelTime) : ''
@@ -139,6 +139,7 @@
 }
 // 点击经纬度展示地图
 const mapRef = ref()
+const { proxy } = getCurrentInstance() as any
 const showMap = (data: any) => {
   console.log(data, 'data')
   if (data.text === '位置') {
@@ -148,6 +149,13 @@
         2: 'StationMonitorDetail',
         3: 'PipelineMonitorDetail',
       } as { [key: string]: string }
+      // 判断是否有菜单权限
+      const watchObjectAuth = {
+        1: '/well',
+        2: '/station/monitor',
+        3: '/pipeline',
+      } as { [key: string]: string }
+      if (!proxy.hasPerm(watchObjectAuth[detailInfo.value.watchObject])) { return }
       $router.push({
         name: watchObject[detailInfo.value.watchObject],
         query: {
diff --git a/src/views/home/alarm/current/components/detailInfoDialog.vue b/src/views/home/alarm/current/components/detailInfoDialog.vue
index c089449..7fbf06b 100644
--- a/src/views/home/alarm/current/components/detailInfoDialog.vue
+++ b/src/views/home/alarm/current/components/detailInfoDialog.vue
@@ -114,6 +114,7 @@
   })
 }
 defineExpose({ initDialog, close })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -131,7 +132,7 @@
     <!-- 头部 -->
     <div class="header">
       <span>{{ info.alarmContent }}</span>
-      <span class="more" @click="moreData">>>更多</span>
+      <span v-if="proxy.hasPerm(type === 'data' ? '/alarm/current/more' : '/alarm/device/more')" class="more" @click="moreData">>>更多</span>
     </div>
     <div class="content">
       <div v-show="type === 'device'" class="item">
@@ -162,7 +163,7 @@
         报警设备:
         <span style="padding-left: 6px;">{{ info.devcode }} </span>
         <el-button
-          v-if="info.devTypeName === '燃气智能监测终端' || info.devTypeName === '液位检测仪' || info.devTypeName === '井盖监测仪'"
+          v-if="(info.devTypeName === '燃气智能监测终端' || info.devTypeName === '液位检测仪' || info.devTypeName === '井盖监测仪') && proxy.hasPerm('/alarm/current/data')"
           size="small" style="margin-left: 6px;" @click="viewData"
         >
           查看数据
@@ -228,7 +229,7 @@
         <span style="padding-left: 6px;">
           {{ info.confirmContent }}
         </span>
-        <el-button v-if="type === 'data'" size="small" style="padding-left: 6px;" @click="viewProcess">
+        <el-button v-if="type === 'data' && proxy.hasPerm('/alarm/current/process')" size="small" style="padding-left: 6px;" @click="viewProcess">
           流程图
         </el-button>
       </div>
@@ -246,17 +247,17 @@
       </div>
     </div>
     <div class="footer">
-      <el-button v-if="Number(info.processStatus) < 4 && type === 'data'" size="small" @click="remind">
+      <el-button v-if="(Number(info.processStatus) < 4 && type === 'data') && proxy.hasPerm('/alarm/current/remind')" size="small" @click="remind">
         提醒责任人
       </el-button>
       <el-button
-        v-if="type === 'device' && (info.processStatusName === '待处置' || info.processStatusName === '挂起')"
+        v-if="(type === 'device' && (info.processStatusName === '待处置' || info.processStatusName === '挂起')) && proxy.hasPerm('/alarm/device/handler')"
         size="small" @click="handler"
       >
         报警处置
       </el-button>
       <el-button
-        v-if="Number(info.processStatus) <= 3 || (type === 'device' && info.processStatusName === '待处置') || info.processStatusName === '挂起'"
+        v-if="(Number(info.processStatus) <= 3 || (type === 'device' && info.processStatusName === '待处置') || info.processStatusName === '挂起') && proxy.hasPerm(type === 'device' ? '/alarm/device/pending' : '/alarm/current/pending')"
         type="primary" size="small" @click="pending"
       >
         挂起
diff --git a/src/views/home/alarm/current/index.vue b/src/views/home/alarm/current/index.vue
index d019bbf..e2714bb 100644
--- a/src/views/home/alarm/current/index.vue
+++ b/src/views/home/alarm/current/index.vue
@@ -4,6 +4,7 @@
   Date: 2023-06-28
  -->
 <script lang="ts" setup name="CurrentAlarm">
+import dayjs from 'dayjs'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import { ArrowLeftBold, ArrowRightBold } from '@element-plus/icons-vue'
 import MapCom from './components/map.vue'
@@ -100,6 +101,7 @@
       path: '/alarm/current',
     })
   }
+  datetimerange.value = []
   listQuery.value = {
     limit: 20,
     offset: 1,
@@ -131,8 +133,8 @@
   if ($route.query.row) {
     loadingTable.value = true
     const row = JSON.parse($route.query.row as string)
-    getCurrentAlarmListPage({ offset: 1, limit: 99999 }).then((res) => {
-      const data = res.data.rows.filter((item: any) => item.id === row.id)
+    getCurrentAlarmListPage({ offset: 1, limit: 50 }).then((res) => {
+      const data = res.data.rows.filter((item: any) => item.id === row.alarmId)
       if (data.length) {
         list1.value = data.map((item: any) => ({
           ...item,
@@ -153,7 +155,10 @@
     })
     return
   }
-  fetchData()
+  datetimerange.value = [dayjs().subtract(7, 'day').format('YYYY-MM-DD HH:mm:ss'), dayjs().format('YYYY-MM-DD HH:mm:ss')]
+  setTimeout(() => {
+    fetchData()
+  })
 })
 // 表格标识  地图或普通
 const tableFlag = ref('normal')
@@ -181,6 +186,10 @@
 const mapRef = ref()
 const mapData = ref({})
 async function detail(row: any) {
+  if (row.processStatusName === '未读') {
+    list1.value[list1.value.findIndex((item: any) => item.id === row.id)].processStatusName = '已读'
+    row.processStatusName = '已读'
+  }
   const res = await detailAlarm(row.id)
   const data = toHumpObject(res.data)
   mapData.value = row
@@ -362,7 +371,7 @@
               <el-button v-if="proxy.hasPerm('/alarm/current/delete')" type="primary" @click="batchDeleteRow">
                 批量删除
               </el-button>
-              <el-button type="primary" @click="exportList">
+              <el-button v-if="proxy.hasPerm('/alarm/current/export')" type="primary" @click="exportList">
                 导出
               </el-button>
             </div>
@@ -383,7 +392,7 @@
               </el-table-column>
             </template>
             <template #columns>
-              <el-table-column label="操作" align="center" width="80">
+              <el-table-column v-if="proxy.hasPerm('/alarm/current/detail')" label="操作" align="center" width="80">
                 <template #default="scope">
                   <el-button type="primary" link size="small" @click="detail(scope.row)">
                     查看
diff --git a/src/views/home/alarm/history/index.vue b/src/views/home/alarm/history/index.vue
index eeb49fc..3c810c3 100644
--- a/src/views/home/alarm/history/index.vue
+++ b/src/views/home/alarm/history/index.vue
@@ -97,6 +97,7 @@
 }
 // 重置查询条件f
 const reset = () => {
+  datetimerange.value = []
   listQuery.value = {
     limit: 20,
     offset: 1,
@@ -189,6 +190,7 @@
   })
 }
 fetchDict()
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -249,7 +251,7 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="exportList">
+          <el-button v-if="proxy.hasPerm('/alarm/history/export')" type="primary" @click="exportList">
             导出
           </el-button>
         </div>
@@ -272,7 +274,7 @@
           </el-table-column>
         </template>
         <template #columns>
-          <el-table-column label="操作" align="center" width="80">
+          <el-table-column v-if="proxy.hasPerm('/alarm/history/detail')" label="操作" align="center" width="80">
             <template #default="scope">
               <el-button type="primary" link size="small" @click="moreData(scope.row)">
                 查看
diff --git a/src/views/home/dashboard/index.vue b/src/views/home/dashboard/index.vue
index d2f7e3c..42dfbed 100644
--- a/src/views/home/dashboard/index.vue
+++ b/src/views/home/dashboard/index.vue
@@ -42,7 +42,7 @@
     value: '0',
     name: '在线',
     unit: '个',
-    id: '1',
+    id: '1,2',
   },
   {
     img: img.lixian,
@@ -56,7 +56,7 @@
     value: '0',
     name: '停用',
     unit: '个',
-    id: '2',
+    id: '3',
   },
 ])
 // 工作台数据
@@ -133,7 +133,11 @@
   deviceOperationLoading.value = true
   getDeviceStatus().then((res) => {
     res.data.forEach((element: any) => {
-      const index = deviceOperationData.value.findIndex((item: any) => item.id === element.name)
+      if (element.name === '1' || element.name === '2') {
+        deviceOperationData.value[0].value = Number(deviceOperationData.value[0].value || '0') + Number(element.value)
+        return
+      }
+      const index = deviceOperationData.value.findIndex((item: any) => item.id.includes(element.name))
       if (index !== -1) {
         deviceOperationData.value[index].value = element.value
       }

diff --git a/src/App.vue b/src/App.vue
index cde81b3..8a00f5d 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -125,7 +125,7 @@
         '--g-sub-sidebar-actual-width': subSidebarActualWidth,
       }"
     />
-    <system-info v-if="browserType !== 'mobile'" />
+    <!-- <system-info v-if="browserType !== 'mobile'" /> -->
     <audio id="eventAudio" src="" autoplay />
   </el-config-provider>
 </template>
diff --git a/src/layouts/components/Tools/alarmDialog.vue b/src/layouts/components/Tools/alarmDialog.vue
index 1828375..df89ab8 100644
--- a/src/layouts/components/Tools/alarmDialog.vue
+++ b/src/layouts/components/Tools/alarmDialog.vue
@@ -116,7 +116,7 @@
     </div>
     <template #footer>
       <div class="dialog-footer">
-        <div class="btn" @click="detail">
+        <div v-if="proxy.hasPerm('/alarm/current')" class="btn" @click="detail">
           查看
         </div>
         <div v-if="info.isSound === '1'" class="btn" @click="closeSound">
diff --git a/src/layouts/components/Tools/alarmList.vue b/src/layouts/components/Tools/alarmList.vue
index c3a9d2a..5356b74 100644
--- a/src/layouts/components/Tools/alarmList.vue
+++ b/src/layouts/components/Tools/alarmList.vue
@@ -54,6 +54,7 @@
 }
 // 查看当前行
 const detailRow = (row: any) => {
+  if (!proxy.hasPerm('/alarm/current')) { return }
   $router.push({
     name: 'AlarmCurrent',
     query: {
@@ -77,21 +78,6 @@
   localStorage.setItem('eventAudio', 'pause')
 }
 const dialogRef = ref()
-// const dialog = () => {
-//   const row = {
-//     alarmNoteMethod: '1', // 消息提醒 1:弹窗，2:消息提醒
-//     isSound: '1', // 报警音效，1:开，0:关
-//     isSend: '1', // 报警推送，1:开，0:关
-//     isText: '1', // 报警短息，1:开，0:关
-//     alarmType: '浓度超限',
-//     tagNumber: 'NX5702',
-//     alarmTime: '2024-09-09',
-//     value: '20',
-//     typeName: '燃气智能终端',
-//     alarmLevel: '一级',
-//   }
-//   dialogRef.value.initDialog(row)
-// }
 const fetchData = (isLoading = false) => {
   loading.value = true
   if (isLoading) {
@@ -115,7 +101,10 @@
       dialogRef.value.initDialog(newVal)
     }
     if (newVal.isSound === '1') {
-      play()
+      // play()
+      if (!localStorage.getItem('eventAudio')) {
+        proxy.playAudio()
+      }
     }
     fetchData(false)
   }
@@ -146,6 +135,7 @@
 //     window.localStorage.removeItem('token')
 //   }
 // }
+// const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -180,7 +170,7 @@
                   {{ message.processStatus
                     === '未读' ? '未读' : '已读' }}
                 </el-tag>
-                <el-tag type="info" size="small" style="margin-left: 5px;">
+                <el-tag type="info" size="small" style="margin-left: 5px;" @click="detailRow(message)">
                   查看
                 </el-tag>
               </div>
@@ -214,7 +204,7 @@
       <!-- <div class="close" @click="dialog">
         弹窗
       </div> -->
-      <div class="more" @click="moreList">
+      <div v-if="proxy.hasPerm('/alarm/current')" class="more" @click="moreList">
         查看更多
       </div>
     </div>
diff --git a/src/layouts/components/Tools/index.vue b/src/layouts/components/Tools/index.vue
index 9f2d41f..61f9707 100644
--- a/src/layouts/components/Tools/index.vue
+++ b/src/layouts/components/Tools/index.vue
@@ -79,6 +79,7 @@
   // 断开 websocket
   // websocket.destroyWebSocket()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -89,18 +90,18 @@
           <svg-icon name="ep:search" />
         </el-icon>
       </span>
-      <span class="item" @click="board">
+      <span v-if="proxy.hasPerm('/fullscreen')" class="item" @click="board">
         <el-icon>
           <svg-icon name="ep:data-line" />
         </el-icon>
       </span>
-      <span v-if="settingsStore.mode === 'pc' && settingsStore.toolbar.enableFullscreen" class="item" @click="toggle">
+      <span class="item" @click="toggle">
         <el-icon>
           <svg-icon :name="isFullscreen ? 'fullscreen-exit' : 'fullscreen'" />
         </el-icon>
       </span>
       <!-- 报警信息列表 -->
-      <span class="item">
+      <span v-if="proxy.hasPerm('/alarmnotice')" class="item">
         <el-popover width="390">
           <template #reference>
             <div>
diff --git a/src/layouts/components/Topbar/index.vue b/src/layouts/components/Topbar/index.vue
index 2863cef..4e3120e 100644
--- a/src/layouts/components/Topbar/index.vue
+++ b/src/layouts/components/Topbar/index.vue
@@ -67,7 +67,7 @@
           </transition-group>
         </el-breadcrumb>
       </div>
-      <tools />
+      <!-- <tools /> -->
     </div>
   </div>
 </template>
diff --git a/src/router/modules/pc.ts b/src/router/modules/pc.ts
index aacd6fa..97ced45 100644
--- a/src/router/modules/pc.ts
+++ b/src/router/modules/pc.ts
@@ -40,7 +40,7 @@
       icon: 'ep:key',
       sidebar: false,
       breadcrumb: false,
-      // auth: '/fullscreen',
+      auth: '/fullscreen',
     },
   },
   {
@@ -155,7 +155,7 @@
           sidebar: false,
           breadcrumb: false,
           activeMenu: '/well',
-          auth: '/well/detail',
+          auth: '/well',
         },
       },
     ],
diff --git a/src/views/home/alarm/count/components/locationAnalysis.vue b/src/views/home/alarm/count/components/locationAnalysis.vue
index fc75b9e..bff1853 100644
--- a/src/views/home/alarm/count/components/locationAnalysis.vue
+++ b/src/views/home/alarm/count/components/locationAnalysis.vue
@@ -46,6 +46,7 @@
   })
 }
 fetchData()
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -75,6 +76,9 @@
         <el-button type="primary" style="margin: 0 5px;" @click="fetchData">
           搜索
         </el-button>
+        <el-button v-if="proxy.hasPerm('/alarm/count/exportLocation')" type="primary" style="margin: 0 5px;">
+          导出
+        </el-button>
       </div>
     </template>
     <template #content>
diff --git a/src/views/home/alarm/current/components/detail.vue b/src/views/home/alarm/current/components/detail.vue
index dd3b31a..4204c92 100644
--- a/src/views/home/alarm/current/components/detail.vue
+++ b/src/views/home/alarm/current/components/detail.vue
@@ -111,7 +111,7 @@
   const res2 = await getAlarmTypeListPage({ offset: 1, limit: 9999 });
   ($route.query.type === 'history' ? getAlarmDetail : getAlarmDetail)($route.query.id as string).then((res) => {
     detailInfo.value = toHumpObject(res.data)
-    detailInfo.value.realAlarmName = detailInfo.value.realAlarm === '1' ? '报警' : '误报'
+    detailInfo.value.realAlarmName = detailInfo.value.realAlarm === '0' ? '是' : '否'
     detailInfo.value.alarmTypeName = res2.data.rows.filter((item: any) => item.id === detailInfo.value.alarmTypeId)[0]?.alarmType || ''
     detailInfo.value.alarmLevelName = res1.data.rows.filter((item: any) => item.id === detailInfo.value.alarmLevel)[0]?.alarmLevel || ''
     detailInfo.value.duration = detailInfo.value.ts && detailInfo.value.cancelTime ? getDateDiff(detailInfo.value.ts, detailInfo.value.cancelTime) : ''
@@ -139,6 +139,7 @@
 }
 // 点击经纬度展示地图
 const mapRef = ref()
+const { proxy } = getCurrentInstance() as any
 const showMap = (data: any) => {
   console.log(data, 'data')
   if (data.text === '位置') {
@@ -148,6 +149,13 @@
         2: 'StationMonitorDetail',
         3: 'PipelineMonitorDetail',
       } as { [key: string]: string }
+      // 判断是否有菜单权限
+      const watchObjectAuth = {
+        1: '/well',
+        2: '/station/monitor',
+        3: '/pipeline',
+      } as { [key: string]: string }
+      if (!proxy.hasPerm(watchObjectAuth[detailInfo.value.watchObject])) { return }
       $router.push({
         name: watchObject[detailInfo.value.watchObject],
         query: {
diff --git a/src/views/home/alarm/current/components/detailInfoDialog.vue b/src/views/home/alarm/current/components/detailInfoDialog.vue
index c089449..7fbf06b 100644
--- a/src/views/home/alarm/current/components/detailInfoDialog.vue
+++ b/src/views/home/alarm/current/components/detailInfoDialog.vue
@@ -114,6 +114,7 @@
   })
 }
 defineExpose({ initDialog, close })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -131,7 +132,7 @@
     <!-- 头部 -->
     <div class="header">
       <span>{{ info.alarmContent }}</span>
-      <span class="more" @click="moreData">>>更多</span>
+      <span v-if="proxy.hasPerm(type === 'data' ? '/alarm/current/more' : '/alarm/device/more')" class="more" @click="moreData">>>更多</span>
     </div>
     <div class="content">
       <div v-show="type === 'device'" class="item">
@@ -162,7 +163,7 @@
         报警设备:
         <span style="padding-left: 6px;">{{ info.devcode }} </span>
         <el-button
-          v-if="info.devTypeName === '燃气智能监测终端' || info.devTypeName === '液位检测仪' || info.devTypeName === '井盖监测仪'"
+          v-if="(info.devTypeName === '燃气智能监测终端' || info.devTypeName === '液位检测仪' || info.devTypeName === '井盖监测仪') && proxy.hasPerm('/alarm/current/data')"
           size="small" style="margin-left: 6px;" @click="viewData"
         >
           查看数据
@@ -228,7 +229,7 @@
         <span style="padding-left: 6px;">
           {{ info.confirmContent }}
         </span>
-        <el-button v-if="type === 'data'" size="small" style="padding-left: 6px;" @click="viewProcess">
+        <el-button v-if="type === 'data' && proxy.hasPerm('/alarm/current/process')" size="small" style="padding-left: 6px;" @click="viewProcess">
           流程图
         </el-button>
       </div>
@@ -246,17 +247,17 @@
       </div>
     </div>
     <div class="footer">
-      <el-button v-if="Number(info.processStatus) < 4 && type === 'data'" size="small" @click="remind">
+      <el-button v-if="(Number(info.processStatus) < 4 && type === 'data') && proxy.hasPerm('/alarm/current/remind')" size="small" @click="remind">
         提醒责任人
       </el-button>
       <el-button
-        v-if="type === 'device' && (info.processStatusName === '待处置' || info.processStatusName === '挂起')"
+        v-if="(type === 'device' && (info.processStatusName === '待处置' || info.processStatusName === '挂起')) && proxy.hasPerm('/alarm/device/handler')"
         size="small" @click="handler"
       >
         报警处置
       </el-button>
       <el-button
-        v-if="Number(info.processStatus) <= 3 || (type === 'device' && info.processStatusName === '待处置') || info.processStatusName === '挂起'"
+        v-if="(Number(info.processStatus) <= 3 || (type === 'device' && info.processStatusName === '待处置') || info.processStatusName === '挂起') && proxy.hasPerm(type === 'device' ? '/alarm/device/pending' : '/alarm/current/pending')"
         type="primary" size="small" @click="pending"
       >
         挂起
diff --git a/src/views/home/alarm/current/index.vue b/src/views/home/alarm/current/index.vue
index d019bbf..e2714bb 100644
--- a/src/views/home/alarm/current/index.vue
+++ b/src/views/home/alarm/current/index.vue
@@ -4,6 +4,7 @@
   Date: 2023-06-28
  -->
 <script lang="ts" setup name="CurrentAlarm">
+import dayjs from 'dayjs'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import { ArrowLeftBold, ArrowRightBold } from '@element-plus/icons-vue'
 import MapCom from './components/map.vue'
@@ -100,6 +101,7 @@
       path: '/alarm/current',
     })
   }
+  datetimerange.value = []
   listQuery.value = {
     limit: 20,
     offset: 1,
@@ -131,8 +133,8 @@
   if ($route.query.row) {
     loadingTable.value = true
     const row = JSON.parse($route.query.row as string)
-    getCurrentAlarmListPage({ offset: 1, limit: 99999 }).then((res) => {
-      const data = res.data.rows.filter((item: any) => item.id === row.id)
+    getCurrentAlarmListPage({ offset: 1, limit: 50 }).then((res) => {
+      const data = res.data.rows.filter((item: any) => item.id === row.alarmId)
       if (data.length) {
         list1.value = data.map((item: any) => ({
           ...item,
@@ -153,7 +155,10 @@
     })
     return
   }
-  fetchData()
+  datetimerange.value = [dayjs().subtract(7, 'day').format('YYYY-MM-DD HH:mm:ss'), dayjs().format('YYYY-MM-DD HH:mm:ss')]
+  setTimeout(() => {
+    fetchData()
+  })
 })
 // 表格标识  地图或普通
 const tableFlag = ref('normal')
@@ -181,6 +186,10 @@
 const mapRef = ref()
 const mapData = ref({})
 async function detail(row: any) {
+  if (row.processStatusName === '未读') {
+    list1.value[list1.value.findIndex((item: any) => item.id === row.id)].processStatusName = '已读'
+    row.processStatusName = '已读'
+  }
   const res = await detailAlarm(row.id)
   const data = toHumpObject(res.data)
   mapData.value = row
@@ -362,7 +371,7 @@
               <el-button v-if="proxy.hasPerm('/alarm/current/delete')" type="primary" @click="batchDeleteRow">
                 批量删除
               </el-button>
-              <el-button type="primary" @click="exportList">
+              <el-button v-if="proxy.hasPerm('/alarm/current/export')" type="primary" @click="exportList">
                 导出
               </el-button>
             </div>
@@ -383,7 +392,7 @@
               </el-table-column>
             </template>
             <template #columns>
-              <el-table-column label="操作" align="center" width="80">
+              <el-table-column v-if="proxy.hasPerm('/alarm/current/detail')" label="操作" align="center" width="80">
                 <template #default="scope">
                   <el-button type="primary" link size="small" @click="detail(scope.row)">
                     查看
diff --git a/src/views/home/alarm/history/index.vue b/src/views/home/alarm/history/index.vue
index eeb49fc..3c810c3 100644
--- a/src/views/home/alarm/history/index.vue
+++ b/src/views/home/alarm/history/index.vue
@@ -97,6 +97,7 @@
 }
 // 重置查询条件f
 const reset = () => {
+  datetimerange.value = []
   listQuery.value = {
     limit: 20,
     offset: 1,
@@ -189,6 +190,7 @@
   })
 }
 fetchDict()
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -249,7 +251,7 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="exportList">
+          <el-button v-if="proxy.hasPerm('/alarm/history/export')" type="primary" @click="exportList">
             导出
           </el-button>
         </div>
@@ -272,7 +274,7 @@
           </el-table-column>
         </template>
         <template #columns>
-          <el-table-column label="操作" align="center" width="80">
+          <el-table-column v-if="proxy.hasPerm('/alarm/history/detail')" label="操作" align="center" width="80">
             <template #default="scope">
               <el-button type="primary" link size="small" @click="moreData(scope.row)">
                 查看
diff --git a/src/views/home/dashboard/index.vue b/src/views/home/dashboard/index.vue
index d2f7e3c..42dfbed 100644
--- a/src/views/home/dashboard/index.vue
+++ b/src/views/home/dashboard/index.vue
@@ -42,7 +42,7 @@
     value: '0',
     name: '在线',
     unit: '个',
-    id: '1',
+    id: '1,2',
   },
   {
     img: img.lixian,
@@ -56,7 +56,7 @@
     value: '0',
     name: '停用',
     unit: '个',
-    id: '2',
+    id: '3',
   },
 ])
 // 工作台数据
@@ -133,7 +133,11 @@
   deviceOperationLoading.value = true
   getDeviceStatus().then((res) => {
     res.data.forEach((element: any) => {
-      const index = deviceOperationData.value.findIndex((item: any) => item.id === element.name)
+      if (element.name === '1' || element.name === '2') {
+        deviceOperationData.value[0].value = Number(deviceOperationData.value[0].value || '0') + Number(element.value)
+        return
+      }
+      const index = deviceOperationData.value.findIndex((item: any) => item.id.includes(element.name))
       if (index !== -1) {
         deviceOperationData.value[index].value = element.value
       }
diff --git a/src/views/home/device/count/components/bottom.vue b/src/views/home/device/count/components/bottom.vue
index 28a4d78..e4e56fa 100644
--- a/src/views/home/device/count/components/bottom.vue
+++ b/src/views/home/device/count/components/bottom.vue
@@ -110,6 +110,7 @@
   })
 }
 fetchDict()
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -148,7 +149,7 @@
             <template #btns-right>
               <!-- 操作 -->
               <div>
-                <el-button type="primary">
+                <el-button v-if="proxy.hasPerm('/device/count/offline/export')" type="primary">
                   导出
                 </el-button>
               </div>

diff --git a/src/App.vue b/src/App.vue
index cde81b3..8a00f5d 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -125,7 +125,7 @@
         '--g-sub-sidebar-actual-width': subSidebarActualWidth,
       }"
     />
-    <system-info v-if="browserType !== 'mobile'" />
+    <!-- <system-info v-if="browserType !== 'mobile'" /> -->
     <audio id="eventAudio" src="" autoplay />
   </el-config-provider>
 </template>
diff --git a/src/layouts/components/Tools/alarmDialog.vue b/src/layouts/components/Tools/alarmDialog.vue
index 1828375..df89ab8 100644
--- a/src/layouts/components/Tools/alarmDialog.vue
+++ b/src/layouts/components/Tools/alarmDialog.vue
@@ -116,7 +116,7 @@
     </div>
     <template #footer>
       <div class="dialog-footer">
-        <div class="btn" @click="detail">
+        <div v-if="proxy.hasPerm('/alarm/current')" class="btn" @click="detail">
           查看
         </div>
         <div v-if="info.isSound === '1'" class="btn" @click="closeSound">
diff --git a/src/layouts/components/Tools/alarmList.vue b/src/layouts/components/Tools/alarmList.vue
index c3a9d2a..5356b74 100644
--- a/src/layouts/components/Tools/alarmList.vue
+++ b/src/layouts/components/Tools/alarmList.vue
@@ -54,6 +54,7 @@
 }
 // 查看当前行
 const detailRow = (row: any) => {
+  if (!proxy.hasPerm('/alarm/current')) { return }
   $router.push({
     name: 'AlarmCurrent',
     query: {
@@ -77,21 +78,6 @@
   localStorage.setItem('eventAudio', 'pause')
 }
 const dialogRef = ref()
-// const dialog = () => {
-//   const row = {
-//     alarmNoteMethod: '1', // 消息提醒 1:弹窗，2:消息提醒
-//     isSound: '1', // 报警音效，1:开，0:关
-//     isSend: '1', // 报警推送，1:开，0:关
-//     isText: '1', // 报警短息，1:开，0:关
-//     alarmType: '浓度超限',
-//     tagNumber: 'NX5702',
-//     alarmTime: '2024-09-09',
-//     value: '20',
-//     typeName: '燃气智能终端',
-//     alarmLevel: '一级',
-//   }
-//   dialogRef.value.initDialog(row)
-// }
 const fetchData = (isLoading = false) => {
   loading.value = true
   if (isLoading) {
@@ -115,7 +101,10 @@
       dialogRef.value.initDialog(newVal)
     }
     if (newVal.isSound === '1') {
-      play()
+      // play()
+      if (!localStorage.getItem('eventAudio')) {
+        proxy.playAudio()
+      }
     }
     fetchData(false)
   }
@@ -146,6 +135,7 @@
 //     window.localStorage.removeItem('token')
 //   }
 // }
+// const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -180,7 +170,7 @@
                   {{ message.processStatus
                     === '未读' ? '未读' : '已读' }}
                 </el-tag>
-                <el-tag type="info" size="small" style="margin-left: 5px;">
+                <el-tag type="info" size="small" style="margin-left: 5px;" @click="detailRow(message)">
                   查看
                 </el-tag>
               </div>
@@ -214,7 +204,7 @@
       <!-- <div class="close" @click="dialog">
         弹窗
       </div> -->
-      <div class="more" @click="moreList">
+      <div v-if="proxy.hasPerm('/alarm/current')" class="more" @click="moreList">
         查看更多
       </div>
     </div>
diff --git a/src/layouts/components/Tools/index.vue b/src/layouts/components/Tools/index.vue
index 9f2d41f..61f9707 100644
--- a/src/layouts/components/Tools/index.vue
+++ b/src/layouts/components/Tools/index.vue
@@ -79,6 +79,7 @@
   // 断开 websocket
   // websocket.destroyWebSocket()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -89,18 +90,18 @@
           <svg-icon name="ep:search" />
         </el-icon>
       </span>
-      <span class="item" @click="board">
+      <span v-if="proxy.hasPerm('/fullscreen')" class="item" @click="board">
         <el-icon>
           <svg-icon name="ep:data-line" />
         </el-icon>
       </span>
-      <span v-if="settingsStore.mode === 'pc' && settingsStore.toolbar.enableFullscreen" class="item" @click="toggle">
+      <span class="item" @click="toggle">
         <el-icon>
           <svg-icon :name="isFullscreen ? 'fullscreen-exit' : 'fullscreen'" />
         </el-icon>
       </span>
       <!-- 报警信息列表 -->
-      <span class="item">
+      <span v-if="proxy.hasPerm('/alarmnotice')" class="item">
         <el-popover width="390">
           <template #reference>
             <div>
diff --git a/src/layouts/components/Topbar/index.vue b/src/layouts/components/Topbar/index.vue
index 2863cef..4e3120e 100644
--- a/src/layouts/components/Topbar/index.vue
+++ b/src/layouts/components/Topbar/index.vue
@@ -67,7 +67,7 @@
           </transition-group>
         </el-breadcrumb>
       </div>
-      <tools />
+      <!-- <tools /> -->
     </div>
   </div>
 </template>
diff --git a/src/router/modules/pc.ts b/src/router/modules/pc.ts
index aacd6fa..97ced45 100644
--- a/src/router/modules/pc.ts
+++ b/src/router/modules/pc.ts
@@ -40,7 +40,7 @@
       icon: 'ep:key',
       sidebar: false,
       breadcrumb: false,
-      // auth: '/fullscreen',
+      auth: '/fullscreen',
     },
   },
   {
@@ -155,7 +155,7 @@
           sidebar: false,
           breadcrumb: false,
           activeMenu: '/well',
-          auth: '/well/detail',
+          auth: '/well',
         },
       },
     ],
diff --git a/src/views/home/alarm/count/components/locationAnalysis.vue b/src/views/home/alarm/count/components/locationAnalysis.vue
index fc75b9e..bff1853 100644
--- a/src/views/home/alarm/count/components/locationAnalysis.vue
+++ b/src/views/home/alarm/count/components/locationAnalysis.vue
@@ -46,6 +46,7 @@
   })
 }
 fetchData()
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -75,6 +76,9 @@
         <el-button type="primary" style="margin: 0 5px;" @click="fetchData">
           搜索
         </el-button>
+        <el-button v-if="proxy.hasPerm('/alarm/count/exportLocation')" type="primary" style="margin: 0 5px;">
+          导出
+        </el-button>
       </div>
     </template>
     <template #content>
diff --git a/src/views/home/alarm/current/components/detail.vue b/src/views/home/alarm/current/components/detail.vue
index dd3b31a..4204c92 100644
--- a/src/views/home/alarm/current/components/detail.vue
+++ b/src/views/home/alarm/current/components/detail.vue
@@ -111,7 +111,7 @@
   const res2 = await getAlarmTypeListPage({ offset: 1, limit: 9999 });
   ($route.query.type === 'history' ? getAlarmDetail : getAlarmDetail)($route.query.id as string).then((res) => {
     detailInfo.value = toHumpObject(res.data)
-    detailInfo.value.realAlarmName = detailInfo.value.realAlarm === '1' ? '报警' : '误报'
+    detailInfo.value.realAlarmName = detailInfo.value.realAlarm === '0' ? '是' : '否'
     detailInfo.value.alarmTypeName = res2.data.rows.filter((item: any) => item.id === detailInfo.value.alarmTypeId)[0]?.alarmType || ''
     detailInfo.value.alarmLevelName = res1.data.rows.filter((item: any) => item.id === detailInfo.value.alarmLevel)[0]?.alarmLevel || ''
     detailInfo.value.duration = detailInfo.value.ts && detailInfo.value.cancelTime ? getDateDiff(detailInfo.value.ts, detailInfo.value.cancelTime) : ''
@@ -139,6 +139,7 @@
 }
 // 点击经纬度展示地图
 const mapRef = ref()
+const { proxy } = getCurrentInstance() as any
 const showMap = (data: any) => {
   console.log(data, 'data')
   if (data.text === '位置') {
@@ -148,6 +149,13 @@
         2: 'StationMonitorDetail',
         3: 'PipelineMonitorDetail',
       } as { [key: string]: string }
+      // 判断是否有菜单权限
+      const watchObjectAuth = {
+        1: '/well',
+        2: '/station/monitor',
+        3: '/pipeline',
+      } as { [key: string]: string }
+      if (!proxy.hasPerm(watchObjectAuth[detailInfo.value.watchObject])) { return }
       $router.push({
         name: watchObject[detailInfo.value.watchObject],
         query: {
diff --git a/src/views/home/alarm/current/components/detailInfoDialog.vue b/src/views/home/alarm/current/components/detailInfoDialog.vue
index c089449..7fbf06b 100644
--- a/src/views/home/alarm/current/components/detailInfoDialog.vue
+++ b/src/views/home/alarm/current/components/detailInfoDialog.vue
@@ -114,6 +114,7 @@
   })
 }
 defineExpose({ initDialog, close })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -131,7 +132,7 @@
     <!-- 头部 -->
     <div class="header">
       <span>{{ info.alarmContent }}</span>
-      <span class="more" @click="moreData">>>更多</span>
+      <span v-if="proxy.hasPerm(type === 'data' ? '/alarm/current/more' : '/alarm/device/more')" class="more" @click="moreData">>>更多</span>
     </div>
     <div class="content">
       <div v-show="type === 'device'" class="item">
@@ -162,7 +163,7 @@
         报警设备:
         <span style="padding-left: 6px;">{{ info.devcode }} </span>
         <el-button
-          v-if="info.devTypeName === '燃气智能监测终端' || info.devTypeName === '液位检测仪' || info.devTypeName === '井盖监测仪'"
+          v-if="(info.devTypeName === '燃气智能监测终端' || info.devTypeName === '液位检测仪' || info.devTypeName === '井盖监测仪') && proxy.hasPerm('/alarm/current/data')"
           size="small" style="margin-left: 6px;" @click="viewData"
         >
           查看数据
@@ -228,7 +229,7 @@
         <span style="padding-left: 6px;">
           {{ info.confirmContent }}
         </span>
-        <el-button v-if="type === 'data'" size="small" style="padding-left: 6px;" @click="viewProcess">
+        <el-button v-if="type === 'data' && proxy.hasPerm('/alarm/current/process')" size="small" style="padding-left: 6px;" @click="viewProcess">
           流程图
         </el-button>
       </div>
@@ -246,17 +247,17 @@
       </div>
     </div>
     <div class="footer">
-      <el-button v-if="Number(info.processStatus) < 4 && type === 'data'" size="small" @click="remind">
+      <el-button v-if="(Number(info.processStatus) < 4 && type === 'data') && proxy.hasPerm('/alarm/current/remind')" size="small" @click="remind">
         提醒责任人
       </el-button>
       <el-button
-        v-if="type === 'device' && (info.processStatusName === '待处置' || info.processStatusName === '挂起')"
+        v-if="(type === 'device' && (info.processStatusName === '待处置' || info.processStatusName === '挂起')) && proxy.hasPerm('/alarm/device/handler')"
         size="small" @click="handler"
       >
         报警处置
       </el-button>
       <el-button
-        v-if="Number(info.processStatus) <= 3 || (type === 'device' && info.processStatusName === '待处置') || info.processStatusName === '挂起'"
+        v-if="(Number(info.processStatus) <= 3 || (type === 'device' && info.processStatusName === '待处置') || info.processStatusName === '挂起') && proxy.hasPerm(type === 'device' ? '/alarm/device/pending' : '/alarm/current/pending')"
         type="primary" size="small" @click="pending"
       >
         挂起
diff --git a/src/views/home/alarm/current/index.vue b/src/views/home/alarm/current/index.vue
index d019bbf..e2714bb 100644
--- a/src/views/home/alarm/current/index.vue
+++ b/src/views/home/alarm/current/index.vue
@@ -4,6 +4,7 @@
   Date: 2023-06-28
  -->
 <script lang="ts" setup name="CurrentAlarm">
+import dayjs from 'dayjs'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import { ArrowLeftBold, ArrowRightBold } from '@element-plus/icons-vue'
 import MapCom from './components/map.vue'
@@ -100,6 +101,7 @@
       path: '/alarm/current',
     })
   }
+  datetimerange.value = []
   listQuery.value = {
     limit: 20,
     offset: 1,
@@ -131,8 +133,8 @@
   if ($route.query.row) {
     loadingTable.value = true
     const row = JSON.parse($route.query.row as string)
-    getCurrentAlarmListPage({ offset: 1, limit: 99999 }).then((res) => {
-      const data = res.data.rows.filter((item: any) => item.id === row.id)
+    getCurrentAlarmListPage({ offset: 1, limit: 50 }).then((res) => {
+      const data = res.data.rows.filter((item: any) => item.id === row.alarmId)
       if (data.length) {
         list1.value = data.map((item: any) => ({
           ...item,
@@ -153,7 +155,10 @@
     })
     return
   }
-  fetchData()
+  datetimerange.value = [dayjs().subtract(7, 'day').format('YYYY-MM-DD HH:mm:ss'), dayjs().format('YYYY-MM-DD HH:mm:ss')]
+  setTimeout(() => {
+    fetchData()
+  })
 })
 // 表格标识  地图或普通
 const tableFlag = ref('normal')
@@ -181,6 +186,10 @@
 const mapRef = ref()
 const mapData = ref({})
 async function detail(row: any) {
+  if (row.processStatusName === '未读') {
+    list1.value[list1.value.findIndex((item: any) => item.id === row.id)].processStatusName = '已读'
+    row.processStatusName = '已读'
+  }
   const res = await detailAlarm(row.id)
   const data = toHumpObject(res.data)
   mapData.value = row
@@ -362,7 +371,7 @@
               <el-button v-if="proxy.hasPerm('/alarm/current/delete')" type="primary" @click="batchDeleteRow">
                 批量删除
               </el-button>
-              <el-button type="primary" @click="exportList">
+              <el-button v-if="proxy.hasPerm('/alarm/current/export')" type="primary" @click="exportList">
                 导出
               </el-button>
             </div>
@@ -383,7 +392,7 @@
               </el-table-column>
             </template>
             <template #columns>
-              <el-table-column label="操作" align="center" width="80">
+              <el-table-column v-if="proxy.hasPerm('/alarm/current/detail')" label="操作" align="center" width="80">
                 <template #default="scope">
                   <el-button type="primary" link size="small" @click="detail(scope.row)">
                     查看
diff --git a/src/views/home/alarm/history/index.vue b/src/views/home/alarm/history/index.vue
index eeb49fc..3c810c3 100644
--- a/src/views/home/alarm/history/index.vue
+++ b/src/views/home/alarm/history/index.vue
@@ -97,6 +97,7 @@
 }
 // 重置查询条件f
 const reset = () => {
+  datetimerange.value = []
   listQuery.value = {
     limit: 20,
     offset: 1,
@@ -189,6 +190,7 @@
   })
 }
 fetchDict()
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -249,7 +251,7 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="exportList">
+          <el-button v-if="proxy.hasPerm('/alarm/history/export')" type="primary" @click="exportList">
             导出
           </el-button>
         </div>
@@ -272,7 +274,7 @@
           </el-table-column>
         </template>
         <template #columns>
-          <el-table-column label="操作" align="center" width="80">
+          <el-table-column v-if="proxy.hasPerm('/alarm/history/detail')" label="操作" align="center" width="80">
             <template #default="scope">
               <el-button type="primary" link size="small" @click="moreData(scope.row)">
                 查看
diff --git a/src/views/home/dashboard/index.vue b/src/views/home/dashboard/index.vue
index d2f7e3c..42dfbed 100644
--- a/src/views/home/dashboard/index.vue
+++ b/src/views/home/dashboard/index.vue
@@ -42,7 +42,7 @@
     value: '0',
     name: '在线',
     unit: '个',
-    id: '1',
+    id: '1,2',
   },
   {
     img: img.lixian,
@@ -56,7 +56,7 @@
     value: '0',
     name: '停用',
     unit: '个',
-    id: '2',
+    id: '3',
   },
 ])
 // 工作台数据
@@ -133,7 +133,11 @@
   deviceOperationLoading.value = true
   getDeviceStatus().then((res) => {
     res.data.forEach((element: any) => {
-      const index = deviceOperationData.value.findIndex((item: any) => item.id === element.name)
+      if (element.name === '1' || element.name === '2') {
+        deviceOperationData.value[0].value = Number(deviceOperationData.value[0].value || '0') + Number(element.value)
+        return
+      }
+      const index = deviceOperationData.value.findIndex((item: any) => item.id.includes(element.name))
       if (index !== -1) {
         deviceOperationData.value[index].value = element.value
       }
diff --git a/src/views/home/device/count/components/bottom.vue b/src/views/home/device/count/components/bottom.vue
index 28a4d78..e4e56fa 100644
--- a/src/views/home/device/count/components/bottom.vue
+++ b/src/views/home/device/count/components/bottom.vue
@@ -110,6 +110,7 @@
   })
 }
 fetchDict()
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -148,7 +149,7 @@
             <template #btns-right>
               <!-- 操作 -->
               <div>
-                <el-button type="primary">
+                <el-button v-if="proxy.hasPerm('/device/count/offline/export')" type="primary">
                   导出
                 </el-button>
               </div>
diff --git a/src/views/home/device/device/index.vue b/src/views/home/device/device/index.vue
index c3970b9..9cdd606 100644
--- a/src/views/home/device/device/index.vue
+++ b/src/views/home/device/device/index.vue
@@ -88,6 +88,7 @@
 }
 // 重置查询条件f
 const reset = () => {
+  datetimerange.value = []
   listQuery.value = {
     limit: 20,
     offset: 1,
@@ -296,6 +297,7 @@
   fetchDict()
   fetchData()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -372,17 +374,17 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="editRow('add', {})">
+          <el-button v-if="proxy.hasPerm('/device/manage/add')" type="primary" @click="editRow('add', {})">
             新建
           </el-button>
-          <el-button type="primary" @click="downloadTemplate">
+          <el-button v-if="proxy.hasPerm('/device/manage/down')" type="primary" @click="downloadTemplate">
             模板下载
           </el-button>
-          <el-button type="primary" @click="importList">
+          <el-button v-if="proxy.hasPerm('/device/manage/import')" type="primary" @click="importList">
             批量导入
           </el-button>
-          <el-button type="primary" @click="exportList">
-            导出列表
+          <el-button v-if="proxy.hasPerm('/device/manage/export')" type="primary" @click="exportList">
+            导出
           </el-button>
           <input ref="fileRef" style="display: none;" type="file" accept=".xls,.xlsx" @change="onFileChange">
         </div>
@@ -409,16 +411,16 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="150">
             <template #default="scope">
-              <el-button type="primary" link size="small" @click="editRow('detail', scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/manage/detail')" type="primary" link size="small" @click="editRow('detail', scope.row)">
                 查看
               </el-button>
-              <el-button type="primary" link size="small" @click="editRow('edit', scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/manage/update')" type="primary" link size="small" @click="editRow('edit', scope.row)">
                 编辑
               </el-button>
-              <el-button type="danger" link size="small" @click="changeDefense(scope.row)">
+              <!-- <el-button v-if="proxy.hasPerm('/device/manage/add')" type="danger" link size="small" @click="changeDefense(scope.row)">
                 撤防
-              </el-button>
-              <el-button type="danger" link size="small" @click="removeRow(scope.row)">
+              </el-button> -->
+              <el-button v-if="proxy.hasPerm('/device/manage/delete')" type="danger" link size="small" @click="removeRow(scope.row)">
                 删除
               </el-button>
             </template>

diff --git a/src/App.vue b/src/App.vue
index cde81b3..8a00f5d 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -125,7 +125,7 @@
         '--g-sub-sidebar-actual-width': subSidebarActualWidth,
       }"
     />
-    <system-info v-if="browserType !== 'mobile'" />
+    <!-- <system-info v-if="browserType !== 'mobile'" /> -->
     <audio id="eventAudio" src="" autoplay />
   </el-config-provider>
 </template>
diff --git a/src/layouts/components/Tools/alarmDialog.vue b/src/layouts/components/Tools/alarmDialog.vue
index 1828375..df89ab8 100644
--- a/src/layouts/components/Tools/alarmDialog.vue
+++ b/src/layouts/components/Tools/alarmDialog.vue
@@ -116,7 +116,7 @@
     </div>
     <template #footer>
       <div class="dialog-footer">
-        <div class="btn" @click="detail">
+        <div v-if="proxy.hasPerm('/alarm/current')" class="btn" @click="detail">
           查看
         </div>
         <div v-if="info.isSound === '1'" class="btn" @click="closeSound">
diff --git a/src/layouts/components/Tools/alarmList.vue b/src/layouts/components/Tools/alarmList.vue
index c3a9d2a..5356b74 100644
--- a/src/layouts/components/Tools/alarmList.vue
+++ b/src/layouts/components/Tools/alarmList.vue
@@ -54,6 +54,7 @@
 }
 // 查看当前行
 const detailRow = (row: any) => {
+  if (!proxy.hasPerm('/alarm/current')) { return }
   $router.push({
     name: 'AlarmCurrent',
     query: {
@@ -77,21 +78,6 @@
   localStorage.setItem('eventAudio', 'pause')
 }
 const dialogRef = ref()
-// const dialog = () => {
-//   const row = {
-//     alarmNoteMethod: '1', // 消息提醒 1:弹窗，2:消息提醒
-//     isSound: '1', // 报警音效，1:开，0:关
-//     isSend: '1', // 报警推送，1:开，0:关
-//     isText: '1', // 报警短息，1:开，0:关
-//     alarmType: '浓度超限',
-//     tagNumber: 'NX5702',
-//     alarmTime: '2024-09-09',
-//     value: '20',
-//     typeName: '燃气智能终端',
-//     alarmLevel: '一级',
-//   }
-//   dialogRef.value.initDialog(row)
-// }
 const fetchData = (isLoading = false) => {
   loading.value = true
   if (isLoading) {
@@ -115,7 +101,10 @@
       dialogRef.value.initDialog(newVal)
     }
     if (newVal.isSound === '1') {
-      play()
+      // play()
+      if (!localStorage.getItem('eventAudio')) {
+        proxy.playAudio()
+      }
     }
     fetchData(false)
   }
@@ -146,6 +135,7 @@
 //     window.localStorage.removeItem('token')
 //   }
 // }
+// const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -180,7 +170,7 @@
                   {{ message.processStatus
                     === '未读' ? '未读' : '已读' }}
                 </el-tag>
-                <el-tag type="info" size="small" style="margin-left: 5px;">
+                <el-tag type="info" size="small" style="margin-left: 5px;" @click="detailRow(message)">
                   查看
                 </el-tag>
               </div>
@@ -214,7 +204,7 @@
       <!-- <div class="close" @click="dialog">
         弹窗
       </div> -->
-      <div class="more" @click="moreList">
+      <div v-if="proxy.hasPerm('/alarm/current')" class="more" @click="moreList">
         查看更多
       </div>
     </div>
diff --git a/src/layouts/components/Tools/index.vue b/src/layouts/components/Tools/index.vue
index 9f2d41f..61f9707 100644
--- a/src/layouts/components/Tools/index.vue
+++ b/src/layouts/components/Tools/index.vue
@@ -79,6 +79,7 @@
   // 断开 websocket
   // websocket.destroyWebSocket()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -89,18 +90,18 @@
           <svg-icon name="ep:search" />
         </el-icon>
       </span>
-      <span class="item" @click="board">
+      <span v-if="proxy.hasPerm('/fullscreen')" class="item" @click="board">
         <el-icon>
           <svg-icon name="ep:data-line" />
         </el-icon>
       </span>
-      <span v-if="settingsStore.mode === 'pc' && settingsStore.toolbar.enableFullscreen" class="item" @click="toggle">
+      <span class="item" @click="toggle">
         <el-icon>
           <svg-icon :name="isFullscreen ? 'fullscreen-exit' : 'fullscreen'" />
         </el-icon>
       </span>
       <!-- 报警信息列表 -->
-      <span class="item">
+      <span v-if="proxy.hasPerm('/alarmnotice')" class="item">
         <el-popover width="390">
           <template #reference>
             <div>
diff --git a/src/layouts/components/Topbar/index.vue b/src/layouts/components/Topbar/index.vue
index 2863cef..4e3120e 100644
--- a/src/layouts/components/Topbar/index.vue
+++ b/src/layouts/components/Topbar/index.vue
@@ -67,7 +67,7 @@
           </transition-group>
         </el-breadcrumb>
       </div>
-      <tools />
+      <!-- <tools /> -->
     </div>
   </div>
 </template>
diff --git a/src/router/modules/pc.ts b/src/router/modules/pc.ts
index aacd6fa..97ced45 100644
--- a/src/router/modules/pc.ts
+++ b/src/router/modules/pc.ts
@@ -40,7 +40,7 @@
       icon: 'ep:key',
       sidebar: false,
       breadcrumb: false,
-      // auth: '/fullscreen',
+      auth: '/fullscreen',
     },
   },
   {
@@ -155,7 +155,7 @@
           sidebar: false,
           breadcrumb: false,
           activeMenu: '/well',
-          auth: '/well/detail',
+          auth: '/well',
         },
       },
     ],
diff --git a/src/views/home/alarm/count/components/locationAnalysis.vue b/src/views/home/alarm/count/components/locationAnalysis.vue
index fc75b9e..bff1853 100644
--- a/src/views/home/alarm/count/components/locationAnalysis.vue
+++ b/src/views/home/alarm/count/components/locationAnalysis.vue
@@ -46,6 +46,7 @@
   })
 }
 fetchData()
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -75,6 +76,9 @@
         <el-button type="primary" style="margin: 0 5px;" @click="fetchData">
           搜索
         </el-button>
+        <el-button v-if="proxy.hasPerm('/alarm/count/exportLocation')" type="primary" style="margin: 0 5px;">
+          导出
+        </el-button>
       </div>
     </template>
     <template #content>
diff --git a/src/views/home/alarm/current/components/detail.vue b/src/views/home/alarm/current/components/detail.vue
index dd3b31a..4204c92 100644
--- a/src/views/home/alarm/current/components/detail.vue
+++ b/src/views/home/alarm/current/components/detail.vue
@@ -111,7 +111,7 @@
   const res2 = await getAlarmTypeListPage({ offset: 1, limit: 9999 });
   ($route.query.type === 'history' ? getAlarmDetail : getAlarmDetail)($route.query.id as string).then((res) => {
     detailInfo.value = toHumpObject(res.data)
-    detailInfo.value.realAlarmName = detailInfo.value.realAlarm === '1' ? '报警' : '误报'
+    detailInfo.value.realAlarmName = detailInfo.value.realAlarm === '0' ? '是' : '否'
     detailInfo.value.alarmTypeName = res2.data.rows.filter((item: any) => item.id === detailInfo.value.alarmTypeId)[0]?.alarmType || ''
     detailInfo.value.alarmLevelName = res1.data.rows.filter((item: any) => item.id === detailInfo.value.alarmLevel)[0]?.alarmLevel || ''
     detailInfo.value.duration = detailInfo.value.ts && detailInfo.value.cancelTime ? getDateDiff(detailInfo.value.ts, detailInfo.value.cancelTime) : ''
@@ -139,6 +139,7 @@
 }
 // 点击经纬度展示地图
 const mapRef = ref()
+const { proxy } = getCurrentInstance() as any
 const showMap = (data: any) => {
   console.log(data, 'data')
   if (data.text === '位置') {
@@ -148,6 +149,13 @@
         2: 'StationMonitorDetail',
         3: 'PipelineMonitorDetail',
       } as { [key: string]: string }
+      // 判断是否有菜单权限
+      const watchObjectAuth = {
+        1: '/well',
+        2: '/station/monitor',
+        3: '/pipeline',
+      } as { [key: string]: string }
+      if (!proxy.hasPerm(watchObjectAuth[detailInfo.value.watchObject])) { return }
       $router.push({
         name: watchObject[detailInfo.value.watchObject],
         query: {
diff --git a/src/views/home/alarm/current/components/detailInfoDialog.vue b/src/views/home/alarm/current/components/detailInfoDialog.vue
index c089449..7fbf06b 100644
--- a/src/views/home/alarm/current/components/detailInfoDialog.vue
+++ b/src/views/home/alarm/current/components/detailInfoDialog.vue
@@ -114,6 +114,7 @@
   })
 }
 defineExpose({ initDialog, close })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -131,7 +132,7 @@
     <!-- 头部 -->
     <div class="header">
       <span>{{ info.alarmContent }}</span>
-      <span class="more" @click="moreData">>>更多</span>
+      <span v-if="proxy.hasPerm(type === 'data' ? '/alarm/current/more' : '/alarm/device/more')" class="more" @click="moreData">>>更多</span>
     </div>
     <div class="content">
       <div v-show="type === 'device'" class="item">
@@ -162,7 +163,7 @@
         报警设备:
         <span style="padding-left: 6px;">{{ info.devcode }} </span>
         <el-button
-          v-if="info.devTypeName === '燃气智能监测终端' || info.devTypeName === '液位检测仪' || info.devTypeName === '井盖监测仪'"
+          v-if="(info.devTypeName === '燃气智能监测终端' || info.devTypeName === '液位检测仪' || info.devTypeName === '井盖监测仪') && proxy.hasPerm('/alarm/current/data')"
           size="small" style="margin-left: 6px;" @click="viewData"
         >
           查看数据
@@ -228,7 +229,7 @@
         <span style="padding-left: 6px;">
           {{ info.confirmContent }}
         </span>
-        <el-button v-if="type === 'data'" size="small" style="padding-left: 6px;" @click="viewProcess">
+        <el-button v-if="type === 'data' && proxy.hasPerm('/alarm/current/process')" size="small" style="padding-left: 6px;" @click="viewProcess">
           流程图
         </el-button>
       </div>
@@ -246,17 +247,17 @@
       </div>
     </div>
     <div class="footer">
-      <el-button v-if="Number(info.processStatus) < 4 && type === 'data'" size="small" @click="remind">
+      <el-button v-if="(Number(info.processStatus) < 4 && type === 'data') && proxy.hasPerm('/alarm/current/remind')" size="small" @click="remind">
         提醒责任人
       </el-button>
       <el-button
-        v-if="type === 'device' && (info.processStatusName === '待处置' || info.processStatusName === '挂起')"
+        v-if="(type === 'device' && (info.processStatusName === '待处置' || info.processStatusName === '挂起')) && proxy.hasPerm('/alarm/device/handler')"
         size="small" @click="handler"
       >
         报警处置
       </el-button>
       <el-button
-        v-if="Number(info.processStatus) <= 3 || (type === 'device' && info.processStatusName === '待处置') || info.processStatusName === '挂起'"
+        v-if="(Number(info.processStatus) <= 3 || (type === 'device' && info.processStatusName === '待处置') || info.processStatusName === '挂起') && proxy.hasPerm(type === 'device' ? '/alarm/device/pending' : '/alarm/current/pending')"
         type="primary" size="small" @click="pending"
       >
         挂起
diff --git a/src/views/home/alarm/current/index.vue b/src/views/home/alarm/current/index.vue
index d019bbf..e2714bb 100644
--- a/src/views/home/alarm/current/index.vue
+++ b/src/views/home/alarm/current/index.vue
@@ -4,6 +4,7 @@
   Date: 2023-06-28
  -->
 <script lang="ts" setup name="CurrentAlarm">
+import dayjs from 'dayjs'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import { ArrowLeftBold, ArrowRightBold } from '@element-plus/icons-vue'
 import MapCom from './components/map.vue'
@@ -100,6 +101,7 @@
       path: '/alarm/current',
     })
   }
+  datetimerange.value = []
   listQuery.value = {
     limit: 20,
     offset: 1,
@@ -131,8 +133,8 @@
   if ($route.query.row) {
     loadingTable.value = true
     const row = JSON.parse($route.query.row as string)
-    getCurrentAlarmListPage({ offset: 1, limit: 99999 }).then((res) => {
-      const data = res.data.rows.filter((item: any) => item.id === row.id)
+    getCurrentAlarmListPage({ offset: 1, limit: 50 }).then((res) => {
+      const data = res.data.rows.filter((item: any) => item.id === row.alarmId)
       if (data.length) {
         list1.value = data.map((item: any) => ({
           ...item,
@@ -153,7 +155,10 @@
     })
     return
   }
-  fetchData()
+  datetimerange.value = [dayjs().subtract(7, 'day').format('YYYY-MM-DD HH:mm:ss'), dayjs().format('YYYY-MM-DD HH:mm:ss')]
+  setTimeout(() => {
+    fetchData()
+  })
 })
 // 表格标识  地图或普通
 const tableFlag = ref('normal')
@@ -181,6 +186,10 @@
 const mapRef = ref()
 const mapData = ref({})
 async function detail(row: any) {
+  if (row.processStatusName === '未读') {
+    list1.value[list1.value.findIndex((item: any) => item.id === row.id)].processStatusName = '已读'
+    row.processStatusName = '已读'
+  }
   const res = await detailAlarm(row.id)
   const data = toHumpObject(res.data)
   mapData.value = row
@@ -362,7 +371,7 @@
               <el-button v-if="proxy.hasPerm('/alarm/current/delete')" type="primary" @click="batchDeleteRow">
                 批量删除
               </el-button>
-              <el-button type="primary" @click="exportList">
+              <el-button v-if="proxy.hasPerm('/alarm/current/export')" type="primary" @click="exportList">
                 导出
               </el-button>
             </div>
@@ -383,7 +392,7 @@
               </el-table-column>
             </template>
             <template #columns>
-              <el-table-column label="操作" align="center" width="80">
+              <el-table-column v-if="proxy.hasPerm('/alarm/current/detail')" label="操作" align="center" width="80">
                 <template #default="scope">
                   <el-button type="primary" link size="small" @click="detail(scope.row)">
                     查看
diff --git a/src/views/home/alarm/history/index.vue b/src/views/home/alarm/history/index.vue
index eeb49fc..3c810c3 100644
--- a/src/views/home/alarm/history/index.vue
+++ b/src/views/home/alarm/history/index.vue
@@ -97,6 +97,7 @@
 }
 // 重置查询条件f
 const reset = () => {
+  datetimerange.value = []
   listQuery.value = {
     limit: 20,
     offset: 1,
@@ -189,6 +190,7 @@
   })
 }
 fetchDict()
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -249,7 +251,7 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="exportList">
+          <el-button v-if="proxy.hasPerm('/alarm/history/export')" type="primary" @click="exportList">
             导出
           </el-button>
         </div>
@@ -272,7 +274,7 @@
           </el-table-column>
         </template>
         <template #columns>
-          <el-table-column label="操作" align="center" width="80">
+          <el-table-column v-if="proxy.hasPerm('/alarm/history/detail')" label="操作" align="center" width="80">
             <template #default="scope">
               <el-button type="primary" link size="small" @click="moreData(scope.row)">
                 查看
diff --git a/src/views/home/dashboard/index.vue b/src/views/home/dashboard/index.vue
index d2f7e3c..42dfbed 100644
--- a/src/views/home/dashboard/index.vue
+++ b/src/views/home/dashboard/index.vue
@@ -42,7 +42,7 @@
     value: '0',
     name: '在线',
     unit: '个',
-    id: '1',
+    id: '1,2',
   },
   {
     img: img.lixian,
@@ -56,7 +56,7 @@
     value: '0',
     name: '停用',
     unit: '个',
-    id: '2',
+    id: '3',
   },
 ])
 // 工作台数据
@@ -133,7 +133,11 @@
   deviceOperationLoading.value = true
   getDeviceStatus().then((res) => {
     res.data.forEach((element: any) => {
-      const index = deviceOperationData.value.findIndex((item: any) => item.id === element.name)
+      if (element.name === '1' || element.name === '2') {
+        deviceOperationData.value[0].value = Number(deviceOperationData.value[0].value || '0') + Number(element.value)
+        return
+      }
+      const index = deviceOperationData.value.findIndex((item: any) => item.id.includes(element.name))
       if (index !== -1) {
         deviceOperationData.value[index].value = element.value
       }
diff --git a/src/views/home/device/count/components/bottom.vue b/src/views/home/device/count/components/bottom.vue
index 28a4d78..e4e56fa 100644
--- a/src/views/home/device/count/components/bottom.vue
+++ b/src/views/home/device/count/components/bottom.vue
@@ -110,6 +110,7 @@
   })
 }
 fetchDict()
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -148,7 +149,7 @@
             <template #btns-right>
               <!-- 操作 -->
               <div>
-                <el-button type="primary">
+                <el-button v-if="proxy.hasPerm('/device/count/offline/export')" type="primary">
                   导出
                 </el-button>
               </div>
diff --git a/src/views/home/device/device/index.vue b/src/views/home/device/device/index.vue
index c3970b9..9cdd606 100644
--- a/src/views/home/device/device/index.vue
+++ b/src/views/home/device/device/index.vue
@@ -88,6 +88,7 @@
 }
 // 重置查询条件f
 const reset = () => {
+  datetimerange.value = []
   listQuery.value = {
     limit: 20,
     offset: 1,
@@ -296,6 +297,7 @@
   fetchDict()
   fetchData()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -372,17 +374,17 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="editRow('add', {})">
+          <el-button v-if="proxy.hasPerm('/device/manage/add')" type="primary" @click="editRow('add', {})">
             新建
           </el-button>
-          <el-button type="primary" @click="downloadTemplate">
+          <el-button v-if="proxy.hasPerm('/device/manage/down')" type="primary" @click="downloadTemplate">
             模板下载
           </el-button>
-          <el-button type="primary" @click="importList">
+          <el-button v-if="proxy.hasPerm('/device/manage/import')" type="primary" @click="importList">
             批量导入
           </el-button>
-          <el-button type="primary" @click="exportList">
-            导出列表
+          <el-button v-if="proxy.hasPerm('/device/manage/export')" type="primary" @click="exportList">
+            导出
           </el-button>
           <input ref="fileRef" style="display: none;" type="file" accept=".xls,.xlsx" @change="onFileChange">
         </div>
@@ -409,16 +411,16 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="150">
             <template #default="scope">
-              <el-button type="primary" link size="small" @click="editRow('detail', scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/manage/detail')" type="primary" link size="small" @click="editRow('detail', scope.row)">
                 查看
               </el-button>
-              <el-button type="primary" link size="small" @click="editRow('edit', scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/manage/update')" type="primary" link size="small" @click="editRow('edit', scope.row)">
                 编辑
               </el-button>
-              <el-button type="danger" link size="small" @click="changeDefense(scope.row)">
+              <!-- <el-button v-if="proxy.hasPerm('/device/manage/add')" type="danger" link size="small" @click="changeDefense(scope.row)">
                 撤防
-              </el-button>
-              <el-button type="danger" link size="small" @click="removeRow(scope.row)">
+              </el-button> -->
+              <el-button v-if="proxy.hasPerm('/device/manage/delete')" type="danger" link size="small" @click="removeRow(scope.row)">
                 删除
               </el-button>
             </template>
diff --git a/src/views/home/device/instruction/index.vue b/src/views/home/device/instruction/index.vue
index 1e598ed..1da6706 100644
--- a/src/views/home/device/instruction/index.vue
+++ b/src/views/home/device/instruction/index.vue
@@ -78,6 +78,7 @@
 }
 // 重置查询条件f
 const reset = () => {
+  datetimerange.value = []
   listQuery.value = {
     limit: 20,
     offset: 1,
@@ -158,6 +159,7 @@
     editRef.value.initDialog('addOther', {})
   }
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -213,10 +215,10 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary">
+          <el-button v-if="proxy.hasPerm('/device/instruction/batch')" type="primary">
             批量下发
           </el-button>
-          <el-button type="primary" @click="editRow('add', {})">
+          <el-button v-if="proxy.hasPerm('/device/instruction/add')" type="primary" @click="editRow('add', {})">
             新建
           </el-button>
         </div>
@@ -236,13 +238,13 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="120">
             <template #default="scope">
-              <el-button type="primary" link size="small" @click="editRow('detail', scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/instruction/detail')" type="primary" link size="small" @click="editRow('detail', scope.row)">
                 查看
               </el-button>
-              <el-button v-if="scope.row.status === '2'" type="primary" link size="small" @click="editRow('edit', scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/instruction/again') && scope.row.status === '2'" type="primary" link size="small" @click="editRow('edit', scope.row)">
                 重新下发
               </el-button>
-              <el-button type="danger" link size="small" @click="removeRow(scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/instruction/delete')" type="danger" link size="small" @click="removeRow(scope.row)">
                 删除
               </el-button>
             </template>

diff --git a/src/App.vue b/src/App.vue
index cde81b3..8a00f5d 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -125,7 +125,7 @@
         '--g-sub-sidebar-actual-width': subSidebarActualWidth,
       }"
     />
-    <system-info v-if="browserType !== 'mobile'" />
+    <!-- <system-info v-if="browserType !== 'mobile'" /> -->
     <audio id="eventAudio" src="" autoplay />
   </el-config-provider>
 </template>
diff --git a/src/layouts/components/Tools/alarmDialog.vue b/src/layouts/components/Tools/alarmDialog.vue
index 1828375..df89ab8 100644
--- a/src/layouts/components/Tools/alarmDialog.vue
+++ b/src/layouts/components/Tools/alarmDialog.vue
@@ -116,7 +116,7 @@
     </div>
     <template #footer>
       <div class="dialog-footer">
-        <div class="btn" @click="detail">
+        <div v-if="proxy.hasPerm('/alarm/current')" class="btn" @click="detail">
           查看
         </div>
         <div v-if="info.isSound === '1'" class="btn" @click="closeSound">
diff --git a/src/layouts/components/Tools/alarmList.vue b/src/layouts/components/Tools/alarmList.vue
index c3a9d2a..5356b74 100644
--- a/src/layouts/components/Tools/alarmList.vue
+++ b/src/layouts/components/Tools/alarmList.vue
@@ -54,6 +54,7 @@
 }
 // 查看当前行
 const detailRow = (row: any) => {
+  if (!proxy.hasPerm('/alarm/current')) { return }
   $router.push({
     name: 'AlarmCurrent',
     query: {
@@ -77,21 +78,6 @@
   localStorage.setItem('eventAudio', 'pause')
 }
 const dialogRef = ref()
-// const dialog = () => {
-//   const row = {
-//     alarmNoteMethod: '1', // 消息提醒 1:弹窗，2:消息提醒
-//     isSound: '1', // 报警音效，1:开，0:关
-//     isSend: '1', // 报警推送，1:开，0:关
-//     isText: '1', // 报警短息，1:开，0:关
-//     alarmType: '浓度超限',
-//     tagNumber: 'NX5702',
-//     alarmTime: '2024-09-09',
-//     value: '20',
-//     typeName: '燃气智能终端',
-//     alarmLevel: '一级',
-//   }
-//   dialogRef.value.initDialog(row)
-// }
 const fetchData = (isLoading = false) => {
   loading.value = true
   if (isLoading) {
@@ -115,7 +101,10 @@
       dialogRef.value.initDialog(newVal)
     }
     if (newVal.isSound === '1') {
-      play()
+      // play()
+      if (!localStorage.getItem('eventAudio')) {
+        proxy.playAudio()
+      }
     }
     fetchData(false)
   }
@@ -146,6 +135,7 @@
 //     window.localStorage.removeItem('token')
 //   }
 // }
+// const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -180,7 +170,7 @@
                   {{ message.processStatus
                     === '未读' ? '未读' : '已读' }}
                 </el-tag>
-                <el-tag type="info" size="small" style="margin-left: 5px;">
+                <el-tag type="info" size="small" style="margin-left: 5px;" @click="detailRow(message)">
                   查看
                 </el-tag>
               </div>
@@ -214,7 +204,7 @@
       <!-- <div class="close" @click="dialog">
         弹窗
       </div> -->
-      <div class="more" @click="moreList">
+      <div v-if="proxy.hasPerm('/alarm/current')" class="more" @click="moreList">
         查看更多
       </div>
     </div>
diff --git a/src/layouts/components/Tools/index.vue b/src/layouts/components/Tools/index.vue
index 9f2d41f..61f9707 100644
--- a/src/layouts/components/Tools/index.vue
+++ b/src/layouts/components/Tools/index.vue
@@ -79,6 +79,7 @@
   // 断开 websocket
   // websocket.destroyWebSocket()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -89,18 +90,18 @@
           <svg-icon name="ep:search" />
         </el-icon>
       </span>
-      <span class="item" @click="board">
+      <span v-if="proxy.hasPerm('/fullscreen')" class="item" @click="board">
         <el-icon>
           <svg-icon name="ep:data-line" />
         </el-icon>
       </span>
-      <span v-if="settingsStore.mode === 'pc' && settingsStore.toolbar.enableFullscreen" class="item" @click="toggle">
+      <span class="item" @click="toggle">
         <el-icon>
           <svg-icon :name="isFullscreen ? 'fullscreen-exit' : 'fullscreen'" />
         </el-icon>
       </span>
       <!-- 报警信息列表 -->
-      <span class="item">
+      <span v-if="proxy.hasPerm('/alarmnotice')" class="item">
         <el-popover width="390">
           <template #reference>
             <div>
diff --git a/src/layouts/components/Topbar/index.vue b/src/layouts/components/Topbar/index.vue
index 2863cef..4e3120e 100644
--- a/src/layouts/components/Topbar/index.vue
+++ b/src/layouts/components/Topbar/index.vue
@@ -67,7 +67,7 @@
           </transition-group>
         </el-breadcrumb>
       </div>
-      <tools />
+      <!-- <tools /> -->
     </div>
   </div>
 </template>
diff --git a/src/router/modules/pc.ts b/src/router/modules/pc.ts
index aacd6fa..97ced45 100644
--- a/src/router/modules/pc.ts
+++ b/src/router/modules/pc.ts
@@ -40,7 +40,7 @@
       icon: 'ep:key',
       sidebar: false,
       breadcrumb: false,
-      // auth: '/fullscreen',
+      auth: '/fullscreen',
     },
   },
   {
@@ -155,7 +155,7 @@
           sidebar: false,
           breadcrumb: false,
           activeMenu: '/well',
-          auth: '/well/detail',
+          auth: '/well',
         },
       },
     ],
diff --git a/src/views/home/alarm/count/components/locationAnalysis.vue b/src/views/home/alarm/count/components/locationAnalysis.vue
index fc75b9e..bff1853 100644
--- a/src/views/home/alarm/count/components/locationAnalysis.vue
+++ b/src/views/home/alarm/count/components/locationAnalysis.vue
@@ -46,6 +46,7 @@
   })
 }
 fetchData()
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -75,6 +76,9 @@
         <el-button type="primary" style="margin: 0 5px;" @click="fetchData">
           搜索
         </el-button>
+        <el-button v-if="proxy.hasPerm('/alarm/count/exportLocation')" type="primary" style="margin: 0 5px;">
+          导出
+        </el-button>
       </div>
     </template>
     <template #content>
diff --git a/src/views/home/alarm/current/components/detail.vue b/src/views/home/alarm/current/components/detail.vue
index dd3b31a..4204c92 100644
--- a/src/views/home/alarm/current/components/detail.vue
+++ b/src/views/home/alarm/current/components/detail.vue
@@ -111,7 +111,7 @@
   const res2 = await getAlarmTypeListPage({ offset: 1, limit: 9999 });
   ($route.query.type === 'history' ? getAlarmDetail : getAlarmDetail)($route.query.id as string).then((res) => {
     detailInfo.value = toHumpObject(res.data)
-    detailInfo.value.realAlarmName = detailInfo.value.realAlarm === '1' ? '报警' : '误报'
+    detailInfo.value.realAlarmName = detailInfo.value.realAlarm === '0' ? '是' : '否'
     detailInfo.value.alarmTypeName = res2.data.rows.filter((item: any) => item.id === detailInfo.value.alarmTypeId)[0]?.alarmType || ''
     detailInfo.value.alarmLevelName = res1.data.rows.filter((item: any) => item.id === detailInfo.value.alarmLevel)[0]?.alarmLevel || ''
     detailInfo.value.duration = detailInfo.value.ts && detailInfo.value.cancelTime ? getDateDiff(detailInfo.value.ts, detailInfo.value.cancelTime) : ''
@@ -139,6 +139,7 @@
 }
 // 点击经纬度展示地图
 const mapRef = ref()
+const { proxy } = getCurrentInstance() as any
 const showMap = (data: any) => {
   console.log(data, 'data')
   if (data.text === '位置') {
@@ -148,6 +149,13 @@
         2: 'StationMonitorDetail',
         3: 'PipelineMonitorDetail',
       } as { [key: string]: string }
+      // 判断是否有菜单权限
+      const watchObjectAuth = {
+        1: '/well',
+        2: '/station/monitor',
+        3: '/pipeline',
+      } as { [key: string]: string }
+      if (!proxy.hasPerm(watchObjectAuth[detailInfo.value.watchObject])) { return }
       $router.push({
         name: watchObject[detailInfo.value.watchObject],
         query: {
diff --git a/src/views/home/alarm/current/components/detailInfoDialog.vue b/src/views/home/alarm/current/components/detailInfoDialog.vue
index c089449..7fbf06b 100644
--- a/src/views/home/alarm/current/components/detailInfoDialog.vue
+++ b/src/views/home/alarm/current/components/detailInfoDialog.vue
@@ -114,6 +114,7 @@
   })
 }
 defineExpose({ initDialog, close })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -131,7 +132,7 @@
     <!-- 头部 -->
     <div class="header">
       <span>{{ info.alarmContent }}</span>
-      <span class="more" @click="moreData">>>更多</span>
+      <span v-if="proxy.hasPerm(type === 'data' ? '/alarm/current/more' : '/alarm/device/more')" class="more" @click="moreData">>>更多</span>
     </div>
     <div class="content">
       <div v-show="type === 'device'" class="item">
@@ -162,7 +163,7 @@
         报警设备:
         <span style="padding-left: 6px;">{{ info.devcode }} </span>
         <el-button
-          v-if="info.devTypeName === '燃气智能监测终端' || info.devTypeName === '液位检测仪' || info.devTypeName === '井盖监测仪'"
+          v-if="(info.devTypeName === '燃气智能监测终端' || info.devTypeName === '液位检测仪' || info.devTypeName === '井盖监测仪') && proxy.hasPerm('/alarm/current/data')"
           size="small" style="margin-left: 6px;" @click="viewData"
         >
           查看数据
@@ -228,7 +229,7 @@
         <span style="padding-left: 6px;">
           {{ info.confirmContent }}
         </span>
-        <el-button v-if="type === 'data'" size="small" style="padding-left: 6px;" @click="viewProcess">
+        <el-button v-if="type === 'data' && proxy.hasPerm('/alarm/current/process')" size="small" style="padding-left: 6px;" @click="viewProcess">
           流程图
         </el-button>
       </div>
@@ -246,17 +247,17 @@
       </div>
     </div>
     <div class="footer">
-      <el-button v-if="Number(info.processStatus) < 4 && type === 'data'" size="small" @click="remind">
+      <el-button v-if="(Number(info.processStatus) < 4 && type === 'data') && proxy.hasPerm('/alarm/current/remind')" size="small" @click="remind">
         提醒责任人
       </el-button>
       <el-button
-        v-if="type === 'device' && (info.processStatusName === '待处置' || info.processStatusName === '挂起')"
+        v-if="(type === 'device' && (info.processStatusName === '待处置' || info.processStatusName === '挂起')) && proxy.hasPerm('/alarm/device/handler')"
         size="small" @click="handler"
       >
         报警处置
       </el-button>
       <el-button
-        v-if="Number(info.processStatus) <= 3 || (type === 'device' && info.processStatusName === '待处置') || info.processStatusName === '挂起'"
+        v-if="(Number(info.processStatus) <= 3 || (type === 'device' && info.processStatusName === '待处置') || info.processStatusName === '挂起') && proxy.hasPerm(type === 'device' ? '/alarm/device/pending' : '/alarm/current/pending')"
         type="primary" size="small" @click="pending"
       >
         挂起
diff --git a/src/views/home/alarm/current/index.vue b/src/views/home/alarm/current/index.vue
index d019bbf..e2714bb 100644
--- a/src/views/home/alarm/current/index.vue
+++ b/src/views/home/alarm/current/index.vue
@@ -4,6 +4,7 @@
   Date: 2023-06-28
  -->
 <script lang="ts" setup name="CurrentAlarm">
+import dayjs from 'dayjs'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import { ArrowLeftBold, ArrowRightBold } from '@element-plus/icons-vue'
 import MapCom from './components/map.vue'
@@ -100,6 +101,7 @@
       path: '/alarm/current',
     })
   }
+  datetimerange.value = []
   listQuery.value = {
     limit: 20,
     offset: 1,
@@ -131,8 +133,8 @@
   if ($route.query.row) {
     loadingTable.value = true
     const row = JSON.parse($route.query.row as string)
-    getCurrentAlarmListPage({ offset: 1, limit: 99999 }).then((res) => {
-      const data = res.data.rows.filter((item: any) => item.id === row.id)
+    getCurrentAlarmListPage({ offset: 1, limit: 50 }).then((res) => {
+      const data = res.data.rows.filter((item: any) => item.id === row.alarmId)
       if (data.length) {
         list1.value = data.map((item: any) => ({
           ...item,
@@ -153,7 +155,10 @@
     })
     return
   }
-  fetchData()
+  datetimerange.value = [dayjs().subtract(7, 'day').format('YYYY-MM-DD HH:mm:ss'), dayjs().format('YYYY-MM-DD HH:mm:ss')]
+  setTimeout(() => {
+    fetchData()
+  })
 })
 // 表格标识  地图或普通
 const tableFlag = ref('normal')
@@ -181,6 +186,10 @@
 const mapRef = ref()
 const mapData = ref({})
 async function detail(row: any) {
+  if (row.processStatusName === '未读') {
+    list1.value[list1.value.findIndex((item: any) => item.id === row.id)].processStatusName = '已读'
+    row.processStatusName = '已读'
+  }
   const res = await detailAlarm(row.id)
   const data = toHumpObject(res.data)
   mapData.value = row
@@ -362,7 +371,7 @@
               <el-button v-if="proxy.hasPerm('/alarm/current/delete')" type="primary" @click="batchDeleteRow">
                 批量删除
               </el-button>
-              <el-button type="primary" @click="exportList">
+              <el-button v-if="proxy.hasPerm('/alarm/current/export')" type="primary" @click="exportList">
                 导出
               </el-button>
             </div>
@@ -383,7 +392,7 @@
               </el-table-column>
             </template>
             <template #columns>
-              <el-table-column label="操作" align="center" width="80">
+              <el-table-column v-if="proxy.hasPerm('/alarm/current/detail')" label="操作" align="center" width="80">
                 <template #default="scope">
                   <el-button type="primary" link size="small" @click="detail(scope.row)">
                     查看
diff --git a/src/views/home/alarm/history/index.vue b/src/views/home/alarm/history/index.vue
index eeb49fc..3c810c3 100644
--- a/src/views/home/alarm/history/index.vue
+++ b/src/views/home/alarm/history/index.vue
@@ -97,6 +97,7 @@
 }
 // 重置查询条件f
 const reset = () => {
+  datetimerange.value = []
   listQuery.value = {
     limit: 20,
     offset: 1,
@@ -189,6 +190,7 @@
   })
 }
 fetchDict()
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -249,7 +251,7 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="exportList">
+          <el-button v-if="proxy.hasPerm('/alarm/history/export')" type="primary" @click="exportList">
             导出
           </el-button>
         </div>
@@ -272,7 +274,7 @@
           </el-table-column>
         </template>
         <template #columns>
-          <el-table-column label="操作" align="center" width="80">
+          <el-table-column v-if="proxy.hasPerm('/alarm/history/detail')" label="操作" align="center" width="80">
             <template #default="scope">
               <el-button type="primary" link size="small" @click="moreData(scope.row)">
                 查看
diff --git a/src/views/home/dashboard/index.vue b/src/views/home/dashboard/index.vue
index d2f7e3c..42dfbed 100644
--- a/src/views/home/dashboard/index.vue
+++ b/src/views/home/dashboard/index.vue
@@ -42,7 +42,7 @@
     value: '0',
     name: '在线',
     unit: '个',
-    id: '1',
+    id: '1,2',
   },
   {
     img: img.lixian,
@@ -56,7 +56,7 @@
     value: '0',
     name: '停用',
     unit: '个',
-    id: '2',
+    id: '3',
   },
 ])
 // 工作台数据
@@ -133,7 +133,11 @@
   deviceOperationLoading.value = true
   getDeviceStatus().then((res) => {
     res.data.forEach((element: any) => {
-      const index = deviceOperationData.value.findIndex((item: any) => item.id === element.name)
+      if (element.name === '1' || element.name === '2') {
+        deviceOperationData.value[0].value = Number(deviceOperationData.value[0].value || '0') + Number(element.value)
+        return
+      }
+      const index = deviceOperationData.value.findIndex((item: any) => item.id.includes(element.name))
       if (index !== -1) {
         deviceOperationData.value[index].value = element.value
       }
diff --git a/src/views/home/device/count/components/bottom.vue b/src/views/home/device/count/components/bottom.vue
index 28a4d78..e4e56fa 100644
--- a/src/views/home/device/count/components/bottom.vue
+++ b/src/views/home/device/count/components/bottom.vue
@@ -110,6 +110,7 @@
   })
 }
 fetchDict()
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -148,7 +149,7 @@
             <template #btns-right>
               <!-- 操作 -->
               <div>
-                <el-button type="primary">
+                <el-button v-if="proxy.hasPerm('/device/count/offline/export')" type="primary">
                   导出
                 </el-button>
               </div>
diff --git a/src/views/home/device/device/index.vue b/src/views/home/device/device/index.vue
index c3970b9..9cdd606 100644
--- a/src/views/home/device/device/index.vue
+++ b/src/views/home/device/device/index.vue
@@ -88,6 +88,7 @@
 }
 // 重置查询条件f
 const reset = () => {
+  datetimerange.value = []
   listQuery.value = {
     limit: 20,
     offset: 1,
@@ -296,6 +297,7 @@
   fetchDict()
   fetchData()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -372,17 +374,17 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="editRow('add', {})">
+          <el-button v-if="proxy.hasPerm('/device/manage/add')" type="primary" @click="editRow('add', {})">
             新建
           </el-button>
-          <el-button type="primary" @click="downloadTemplate">
+          <el-button v-if="proxy.hasPerm('/device/manage/down')" type="primary" @click="downloadTemplate">
             模板下载
           </el-button>
-          <el-button type="primary" @click="importList">
+          <el-button v-if="proxy.hasPerm('/device/manage/import')" type="primary" @click="importList">
             批量导入
           </el-button>
-          <el-button type="primary" @click="exportList">
-            导出列表
+          <el-button v-if="proxy.hasPerm('/device/manage/export')" type="primary" @click="exportList">
+            导出
           </el-button>
           <input ref="fileRef" style="display: none;" type="file" accept=".xls,.xlsx" @change="onFileChange">
         </div>
@@ -409,16 +411,16 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="150">
             <template #default="scope">
-              <el-button type="primary" link size="small" @click="editRow('detail', scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/manage/detail')" type="primary" link size="small" @click="editRow('detail', scope.row)">
                 查看
               </el-button>
-              <el-button type="primary" link size="small" @click="editRow('edit', scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/manage/update')" type="primary" link size="small" @click="editRow('edit', scope.row)">
                 编辑
               </el-button>
-              <el-button type="danger" link size="small" @click="changeDefense(scope.row)">
+              <!-- <el-button v-if="proxy.hasPerm('/device/manage/add')" type="danger" link size="small" @click="changeDefense(scope.row)">
                 撤防
-              </el-button>
-              <el-button type="danger" link size="small" @click="removeRow(scope.row)">
+              </el-button> -->
+              <el-button v-if="proxy.hasPerm('/device/manage/delete')" type="danger" link size="small" @click="removeRow(scope.row)">
                 删除
               </el-button>
             </template>
diff --git a/src/views/home/device/instruction/index.vue b/src/views/home/device/instruction/index.vue
index 1e598ed..1da6706 100644
--- a/src/views/home/device/instruction/index.vue
+++ b/src/views/home/device/instruction/index.vue
@@ -78,6 +78,7 @@
 }
 // 重置查询条件f
 const reset = () => {
+  datetimerange.value = []
   listQuery.value = {
     limit: 20,
     offset: 1,
@@ -158,6 +159,7 @@
     editRef.value.initDialog('addOther', {})
   }
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -213,10 +215,10 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary">
+          <el-button v-if="proxy.hasPerm('/device/instruction/batch')" type="primary">
             批量下发
           </el-button>
-          <el-button type="primary" @click="editRow('add', {})">
+          <el-button v-if="proxy.hasPerm('/device/instruction/add')" type="primary" @click="editRow('add', {})">
             新建
           </el-button>
         </div>
@@ -236,13 +238,13 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="120">
             <template #default="scope">
-              <el-button type="primary" link size="small" @click="editRow('detail', scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/instruction/detail')" type="primary" link size="small" @click="editRow('detail', scope.row)">
                 查看
               </el-button>
-              <el-button v-if="scope.row.status === '2'" type="primary" link size="small" @click="editRow('edit', scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/instruction/again') && scope.row.status === '2'" type="primary" link size="small" @click="editRow('edit', scope.row)">
                 重新下发
               </el-button>
-              <el-button type="danger" link size="small" @click="removeRow(scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/instruction/delete')" type="danger" link size="small" @click="removeRow(scope.row)">
                 删除
               </el-button>
             </template>
diff --git a/src/views/home/device/product/index.vue b/src/views/home/device/product/index.vue
index 799fc90..fdd5463 100644
--- a/src/views/home/device/product/index.vue
+++ b/src/views/home/device/product/index.vue
@@ -128,6 +128,7 @@
   await fetchDict()
   fetchData()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -164,7 +165,7 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="editRow('add', {})">
+          <el-button v-if="proxy.hasPerm('/device/product/add')" type="primary" @click="editRow('add', {})">
             新建
           </el-button>
         </div>
@@ -184,10 +185,10 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="120">
             <template #default="scope">
-              <el-button type="primary" link size="small" @click="editRow('edit', scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/product/update')" type="primary" link size="small" @click="editRow('edit', scope.row)">
                 编辑
               </el-button>
-              <el-button type="danger" link size="small" @click="removeRow(scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/product/delete')" type="danger" link size="small" @click="removeRow(scope.row)">
                 删除
               </el-button>
             </template>

diff --git a/src/App.vue b/src/App.vue
index cde81b3..8a00f5d 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -125,7 +125,7 @@
         '--g-sub-sidebar-actual-width': subSidebarActualWidth,
       }"
     />
-    <system-info v-if="browserType !== 'mobile'" />
+    <!-- <system-info v-if="browserType !== 'mobile'" /> -->
     <audio id="eventAudio" src="" autoplay />
   </el-config-provider>
 </template>
diff --git a/src/layouts/components/Tools/alarmDialog.vue b/src/layouts/components/Tools/alarmDialog.vue
index 1828375..df89ab8 100644
--- a/src/layouts/components/Tools/alarmDialog.vue
+++ b/src/layouts/components/Tools/alarmDialog.vue
@@ -116,7 +116,7 @@
     </div>
     <template #footer>
       <div class="dialog-footer">
-        <div class="btn" @click="detail">
+        <div v-if="proxy.hasPerm('/alarm/current')" class="btn" @click="detail">
           查看
         </div>
         <div v-if="info.isSound === '1'" class="btn" @click="closeSound">
diff --git a/src/layouts/components/Tools/alarmList.vue b/src/layouts/components/Tools/alarmList.vue
index c3a9d2a..5356b74 100644
--- a/src/layouts/components/Tools/alarmList.vue
+++ b/src/layouts/components/Tools/alarmList.vue
@@ -54,6 +54,7 @@
 }
 // 查看当前行
 const detailRow = (row: any) => {
+  if (!proxy.hasPerm('/alarm/current')) { return }
   $router.push({
     name: 'AlarmCurrent',
     query: {
@@ -77,21 +78,6 @@
   localStorage.setItem('eventAudio', 'pause')
 }
 const dialogRef = ref()
-// const dialog = () => {
-//   const row = {
-//     alarmNoteMethod: '1', // 消息提醒 1:弹窗，2:消息提醒
-//     isSound: '1', // 报警音效，1:开，0:关
-//     isSend: '1', // 报警推送，1:开，0:关
-//     isText: '1', // 报警短息，1:开，0:关
-//     alarmType: '浓度超限',
-//     tagNumber: 'NX5702',
-//     alarmTime: '2024-09-09',
-//     value: '20',
-//     typeName: '燃气智能终端',
-//     alarmLevel: '一级',
-//   }
-//   dialogRef.value.initDialog(row)
-// }
 const fetchData = (isLoading = false) => {
   loading.value = true
   if (isLoading) {
@@ -115,7 +101,10 @@
       dialogRef.value.initDialog(newVal)
     }
     if (newVal.isSound === '1') {
-      play()
+      // play()
+      if (!localStorage.getItem('eventAudio')) {
+        proxy.playAudio()
+      }
     }
     fetchData(false)
   }
@@ -146,6 +135,7 @@
 //     window.localStorage.removeItem('token')
 //   }
 // }
+// const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -180,7 +170,7 @@
                   {{ message.processStatus
                     === '未读' ? '未读' : '已读' }}
                 </el-tag>
-                <el-tag type="info" size="small" style="margin-left: 5px;">
+                <el-tag type="info" size="small" style="margin-left: 5px;" @click="detailRow(message)">
                   查看
                 </el-tag>
               </div>
@@ -214,7 +204,7 @@
       <!-- <div class="close" @click="dialog">
         弹窗
       </div> -->
-      <div class="more" @click="moreList">
+      <div v-if="proxy.hasPerm('/alarm/current')" class="more" @click="moreList">
         查看更多
       </div>
     </div>
diff --git a/src/layouts/components/Tools/index.vue b/src/layouts/components/Tools/index.vue
index 9f2d41f..61f9707 100644
--- a/src/layouts/components/Tools/index.vue
+++ b/src/layouts/components/Tools/index.vue
@@ -79,6 +79,7 @@
   // 断开 websocket
   // websocket.destroyWebSocket()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -89,18 +90,18 @@
           <svg-icon name="ep:search" />
         </el-icon>
       </span>
-      <span class="item" @click="board">
+      <span v-if="proxy.hasPerm('/fullscreen')" class="item" @click="board">
         <el-icon>
           <svg-icon name="ep:data-line" />
         </el-icon>
       </span>
-      <span v-if="settingsStore.mode === 'pc' && settingsStore.toolbar.enableFullscreen" class="item" @click="toggle">
+      <span class="item" @click="toggle">
         <el-icon>
           <svg-icon :name="isFullscreen ? 'fullscreen-exit' : 'fullscreen'" />
         </el-icon>
       </span>
       <!-- 报警信息列表 -->
-      <span class="item">
+      <span v-if="proxy.hasPerm('/alarmnotice')" class="item">
         <el-popover width="390">
           <template #reference>
             <div>
diff --git a/src/layouts/components/Topbar/index.vue b/src/layouts/components/Topbar/index.vue
index 2863cef..4e3120e 100644
--- a/src/layouts/components/Topbar/index.vue
+++ b/src/layouts/components/Topbar/index.vue
@@ -67,7 +67,7 @@
           </transition-group>
         </el-breadcrumb>
       </div>
-      <tools />
+      <!-- <tools /> -->
     </div>
   </div>
 </template>
diff --git a/src/router/modules/pc.ts b/src/router/modules/pc.ts
index aacd6fa..97ced45 100644
--- a/src/router/modules/pc.ts
+++ b/src/router/modules/pc.ts
@@ -40,7 +40,7 @@
       icon: 'ep:key',
       sidebar: false,
       breadcrumb: false,
-      // auth: '/fullscreen',
+      auth: '/fullscreen',
     },
   },
   {
@@ -155,7 +155,7 @@
           sidebar: false,
           breadcrumb: false,
           activeMenu: '/well',
-          auth: '/well/detail',
+          auth: '/well',
         },
       },
     ],
diff --git a/src/views/home/alarm/count/components/locationAnalysis.vue b/src/views/home/alarm/count/components/locationAnalysis.vue
index fc75b9e..bff1853 100644
--- a/src/views/home/alarm/count/components/locationAnalysis.vue
+++ b/src/views/home/alarm/count/components/locationAnalysis.vue
@@ -46,6 +46,7 @@
   })
 }
 fetchData()
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -75,6 +76,9 @@
         <el-button type="primary" style="margin: 0 5px;" @click="fetchData">
           搜索
         </el-button>
+        <el-button v-if="proxy.hasPerm('/alarm/count/exportLocation')" type="primary" style="margin: 0 5px;">
+          导出
+        </el-button>
       </div>
     </template>
     <template #content>
diff --git a/src/views/home/alarm/current/components/detail.vue b/src/views/home/alarm/current/components/detail.vue
index dd3b31a..4204c92 100644
--- a/src/views/home/alarm/current/components/detail.vue
+++ b/src/views/home/alarm/current/components/detail.vue
@@ -111,7 +111,7 @@
   const res2 = await getAlarmTypeListPage({ offset: 1, limit: 9999 });
   ($route.query.type === 'history' ? getAlarmDetail : getAlarmDetail)($route.query.id as string).then((res) => {
     detailInfo.value = toHumpObject(res.data)
-    detailInfo.value.realAlarmName = detailInfo.value.realAlarm === '1' ? '报警' : '误报'
+    detailInfo.value.realAlarmName = detailInfo.value.realAlarm === '0' ? '是' : '否'
     detailInfo.value.alarmTypeName = res2.data.rows.filter((item: any) => item.id === detailInfo.value.alarmTypeId)[0]?.alarmType || ''
     detailInfo.value.alarmLevelName = res1.data.rows.filter((item: any) => item.id === detailInfo.value.alarmLevel)[0]?.alarmLevel || ''
     detailInfo.value.duration = detailInfo.value.ts && detailInfo.value.cancelTime ? getDateDiff(detailInfo.value.ts, detailInfo.value.cancelTime) : ''
@@ -139,6 +139,7 @@
 }
 // 点击经纬度展示地图
 const mapRef = ref()
+const { proxy } = getCurrentInstance() as any
 const showMap = (data: any) => {
   console.log(data, 'data')
   if (data.text === '位置') {
@@ -148,6 +149,13 @@
         2: 'StationMonitorDetail',
         3: 'PipelineMonitorDetail',
       } as { [key: string]: string }
+      // 判断是否有菜单权限
+      const watchObjectAuth = {
+        1: '/well',
+        2: '/station/monitor',
+        3: '/pipeline',
+      } as { [key: string]: string }
+      if (!proxy.hasPerm(watchObjectAuth[detailInfo.value.watchObject])) { return }
       $router.push({
         name: watchObject[detailInfo.value.watchObject],
         query: {
diff --git a/src/views/home/alarm/current/components/detailInfoDialog.vue b/src/views/home/alarm/current/components/detailInfoDialog.vue
index c089449..7fbf06b 100644
--- a/src/views/home/alarm/current/components/detailInfoDialog.vue
+++ b/src/views/home/alarm/current/components/detailInfoDialog.vue
@@ -114,6 +114,7 @@
   })
 }
 defineExpose({ initDialog, close })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -131,7 +132,7 @@
     <!-- 头部 -->
     <div class="header">
       <span>{{ info.alarmContent }}</span>
-      <span class="more" @click="moreData">>>更多</span>
+      <span v-if="proxy.hasPerm(type === 'data' ? '/alarm/current/more' : '/alarm/device/more')" class="more" @click="moreData">>>更多</span>
     </div>
     <div class="content">
       <div v-show="type === 'device'" class="item">
@@ -162,7 +163,7 @@
         报警设备:
         <span style="padding-left: 6px;">{{ info.devcode }} </span>
         <el-button
-          v-if="info.devTypeName === '燃气智能监测终端' || info.devTypeName === '液位检测仪' || info.devTypeName === '井盖监测仪'"
+          v-if="(info.devTypeName === '燃气智能监测终端' || info.devTypeName === '液位检测仪' || info.devTypeName === '井盖监测仪') && proxy.hasPerm('/alarm/current/data')"
           size="small" style="margin-left: 6px;" @click="viewData"
         >
           查看数据
@@ -228,7 +229,7 @@
         <span style="padding-left: 6px;">
           {{ info.confirmContent }}
         </span>
-        <el-button v-if="type === 'data'" size="small" style="padding-left: 6px;" @click="viewProcess">
+        <el-button v-if="type === 'data' && proxy.hasPerm('/alarm/current/process')" size="small" style="padding-left: 6px;" @click="viewProcess">
           流程图
         </el-button>
       </div>
@@ -246,17 +247,17 @@
       </div>
     </div>
     <div class="footer">
-      <el-button v-if="Number(info.processStatus) < 4 && type === 'data'" size="small" @click="remind">
+      <el-button v-if="(Number(info.processStatus) < 4 && type === 'data') && proxy.hasPerm('/alarm/current/remind')" size="small" @click="remind">
         提醒责任人
       </el-button>
       <el-button
-        v-if="type === 'device' && (info.processStatusName === '待处置' || info.processStatusName === '挂起')"
+        v-if="(type === 'device' && (info.processStatusName === '待处置' || info.processStatusName === '挂起')) && proxy.hasPerm('/alarm/device/handler')"
         size="small" @click="handler"
       >
         报警处置
       </el-button>
       <el-button
-        v-if="Number(info.processStatus) <= 3 || (type === 'device' && info.processStatusName === '待处置') || info.processStatusName === '挂起'"
+        v-if="(Number(info.processStatus) <= 3 || (type === 'device' && info.processStatusName === '待处置') || info.processStatusName === '挂起') && proxy.hasPerm(type === 'device' ? '/alarm/device/pending' : '/alarm/current/pending')"
         type="primary" size="small" @click="pending"
       >
         挂起
diff --git a/src/views/home/alarm/current/index.vue b/src/views/home/alarm/current/index.vue
index d019bbf..e2714bb 100644
--- a/src/views/home/alarm/current/index.vue
+++ b/src/views/home/alarm/current/index.vue
@@ -4,6 +4,7 @@
   Date: 2023-06-28
  -->
 <script lang="ts" setup name="CurrentAlarm">
+import dayjs from 'dayjs'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import { ArrowLeftBold, ArrowRightBold } from '@element-plus/icons-vue'
 import MapCom from './components/map.vue'
@@ -100,6 +101,7 @@
       path: '/alarm/current',
     })
   }
+  datetimerange.value = []
   listQuery.value = {
     limit: 20,
     offset: 1,
@@ -131,8 +133,8 @@
   if ($route.query.row) {
     loadingTable.value = true
     const row = JSON.parse($route.query.row as string)
-    getCurrentAlarmListPage({ offset: 1, limit: 99999 }).then((res) => {
-      const data = res.data.rows.filter((item: any) => item.id === row.id)
+    getCurrentAlarmListPage({ offset: 1, limit: 50 }).then((res) => {
+      const data = res.data.rows.filter((item: any) => item.id === row.alarmId)
       if (data.length) {
         list1.value = data.map((item: any) => ({
           ...item,
@@ -153,7 +155,10 @@
     })
     return
   }
-  fetchData()
+  datetimerange.value = [dayjs().subtract(7, 'day').format('YYYY-MM-DD HH:mm:ss'), dayjs().format('YYYY-MM-DD HH:mm:ss')]
+  setTimeout(() => {
+    fetchData()
+  })
 })
 // 表格标识  地图或普通
 const tableFlag = ref('normal')
@@ -181,6 +186,10 @@
 const mapRef = ref()
 const mapData = ref({})
 async function detail(row: any) {
+  if (row.processStatusName === '未读') {
+    list1.value[list1.value.findIndex((item: any) => item.id === row.id)].processStatusName = '已读'
+    row.processStatusName = '已读'
+  }
   const res = await detailAlarm(row.id)
   const data = toHumpObject(res.data)
   mapData.value = row
@@ -362,7 +371,7 @@
               <el-button v-if="proxy.hasPerm('/alarm/current/delete')" type="primary" @click="batchDeleteRow">
                 批量删除
               </el-button>
-              <el-button type="primary" @click="exportList">
+              <el-button v-if="proxy.hasPerm('/alarm/current/export')" type="primary" @click="exportList">
                 导出
               </el-button>
             </div>
@@ -383,7 +392,7 @@
               </el-table-column>
             </template>
             <template #columns>
-              <el-table-column label="操作" align="center" width="80">
+              <el-table-column v-if="proxy.hasPerm('/alarm/current/detail')" label="操作" align="center" width="80">
                 <template #default="scope">
                   <el-button type="primary" link size="small" @click="detail(scope.row)">
                     查看
diff --git a/src/views/home/alarm/history/index.vue b/src/views/home/alarm/history/index.vue
index eeb49fc..3c810c3 100644
--- a/src/views/home/alarm/history/index.vue
+++ b/src/views/home/alarm/history/index.vue
@@ -97,6 +97,7 @@
 }
 // 重置查询条件f
 const reset = () => {
+  datetimerange.value = []
   listQuery.value = {
     limit: 20,
     offset: 1,
@@ -189,6 +190,7 @@
   })
 }
 fetchDict()
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -249,7 +251,7 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="exportList">
+          <el-button v-if="proxy.hasPerm('/alarm/history/export')" type="primary" @click="exportList">
             导出
           </el-button>
         </div>
@@ -272,7 +274,7 @@
           </el-table-column>
         </template>
         <template #columns>
-          <el-table-column label="操作" align="center" width="80">
+          <el-table-column v-if="proxy.hasPerm('/alarm/history/detail')" label="操作" align="center" width="80">
             <template #default="scope">
               <el-button type="primary" link size="small" @click="moreData(scope.row)">
                 查看
diff --git a/src/views/home/dashboard/index.vue b/src/views/home/dashboard/index.vue
index d2f7e3c..42dfbed 100644
--- a/src/views/home/dashboard/index.vue
+++ b/src/views/home/dashboard/index.vue
@@ -42,7 +42,7 @@
     value: '0',
     name: '在线',
     unit: '个',
-    id: '1',
+    id: '1,2',
   },
   {
     img: img.lixian,
@@ -56,7 +56,7 @@
     value: '0',
     name: '停用',
     unit: '个',
-    id: '2',
+    id: '3',
   },
 ])
 // 工作台数据
@@ -133,7 +133,11 @@
   deviceOperationLoading.value = true
   getDeviceStatus().then((res) => {
     res.data.forEach((element: any) => {
-      const index = deviceOperationData.value.findIndex((item: any) => item.id === element.name)
+      if (element.name === '1' || element.name === '2') {
+        deviceOperationData.value[0].value = Number(deviceOperationData.value[0].value || '0') + Number(element.value)
+        return
+      }
+      const index = deviceOperationData.value.findIndex((item: any) => item.id.includes(element.name))
       if (index !== -1) {
         deviceOperationData.value[index].value = element.value
       }
diff --git a/src/views/home/device/count/components/bottom.vue b/src/views/home/device/count/components/bottom.vue
index 28a4d78..e4e56fa 100644
--- a/src/views/home/device/count/components/bottom.vue
+++ b/src/views/home/device/count/components/bottom.vue
@@ -110,6 +110,7 @@
   })
 }
 fetchDict()
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -148,7 +149,7 @@
             <template #btns-right>
               <!-- 操作 -->
               <div>
-                <el-button type="primary">
+                <el-button v-if="proxy.hasPerm('/device/count/offline/export')" type="primary">
                   导出
                 </el-button>
               </div>
diff --git a/src/views/home/device/device/index.vue b/src/views/home/device/device/index.vue
index c3970b9..9cdd606 100644
--- a/src/views/home/device/device/index.vue
+++ b/src/views/home/device/device/index.vue
@@ -88,6 +88,7 @@
 }
 // 重置查询条件f
 const reset = () => {
+  datetimerange.value = []
   listQuery.value = {
     limit: 20,
     offset: 1,
@@ -296,6 +297,7 @@
   fetchDict()
   fetchData()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -372,17 +374,17 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="editRow('add', {})">
+          <el-button v-if="proxy.hasPerm('/device/manage/add')" type="primary" @click="editRow('add', {})">
             新建
           </el-button>
-          <el-button type="primary" @click="downloadTemplate">
+          <el-button v-if="proxy.hasPerm('/device/manage/down')" type="primary" @click="downloadTemplate">
             模板下载
           </el-button>
-          <el-button type="primary" @click="importList">
+          <el-button v-if="proxy.hasPerm('/device/manage/import')" type="primary" @click="importList">
             批量导入
           </el-button>
-          <el-button type="primary" @click="exportList">
-            导出列表
+          <el-button v-if="proxy.hasPerm('/device/manage/export')" type="primary" @click="exportList">
+            导出
           </el-button>
           <input ref="fileRef" style="display: none;" type="file" accept=".xls,.xlsx" @change="onFileChange">
         </div>
@@ -409,16 +411,16 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="150">
             <template #default="scope">
-              <el-button type="primary" link size="small" @click="editRow('detail', scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/manage/detail')" type="primary" link size="small" @click="editRow('detail', scope.row)">
                 查看
               </el-button>
-              <el-button type="primary" link size="small" @click="editRow('edit', scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/manage/update')" type="primary" link size="small" @click="editRow('edit', scope.row)">
                 编辑
               </el-button>
-              <el-button type="danger" link size="small" @click="changeDefense(scope.row)">
+              <!-- <el-button v-if="proxy.hasPerm('/device/manage/add')" type="danger" link size="small" @click="changeDefense(scope.row)">
                 撤防
-              </el-button>
-              <el-button type="danger" link size="small" @click="removeRow(scope.row)">
+              </el-button> -->
+              <el-button v-if="proxy.hasPerm('/device/manage/delete')" type="danger" link size="small" @click="removeRow(scope.row)">
                 删除
               </el-button>
             </template>
diff --git a/src/views/home/device/instruction/index.vue b/src/views/home/device/instruction/index.vue
index 1e598ed..1da6706 100644
--- a/src/views/home/device/instruction/index.vue
+++ b/src/views/home/device/instruction/index.vue
@@ -78,6 +78,7 @@
 }
 // 重置查询条件f
 const reset = () => {
+  datetimerange.value = []
   listQuery.value = {
     limit: 20,
     offset: 1,
@@ -158,6 +159,7 @@
     editRef.value.initDialog('addOther', {})
   }
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -213,10 +215,10 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary">
+          <el-button v-if="proxy.hasPerm('/device/instruction/batch')" type="primary">
             批量下发
           </el-button>
-          <el-button type="primary" @click="editRow('add', {})">
+          <el-button v-if="proxy.hasPerm('/device/instruction/add')" type="primary" @click="editRow('add', {})">
             新建
           </el-button>
         </div>
@@ -236,13 +238,13 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="120">
             <template #default="scope">
-              <el-button type="primary" link size="small" @click="editRow('detail', scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/instruction/detail')" type="primary" link size="small" @click="editRow('detail', scope.row)">
                 查看
               </el-button>
-              <el-button v-if="scope.row.status === '2'" type="primary" link size="small" @click="editRow('edit', scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/instruction/again') && scope.row.status === '2'" type="primary" link size="small" @click="editRow('edit', scope.row)">
                 重新下发
               </el-button>
-              <el-button type="danger" link size="small" @click="removeRow(scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/instruction/delete')" type="danger" link size="small" @click="removeRow(scope.row)">
                 删除
               </el-button>
             </template>
diff --git a/src/views/home/device/product/index.vue b/src/views/home/device/product/index.vue
index 799fc90..fdd5463 100644
--- a/src/views/home/device/product/index.vue
+++ b/src/views/home/device/product/index.vue
@@ -128,6 +128,7 @@
   await fetchDict()
   fetchData()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -164,7 +165,7 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="editRow('add', {})">
+          <el-button v-if="proxy.hasPerm('/device/product/add')" type="primary" @click="editRow('add', {})">
             新建
           </el-button>
         </div>
@@ -184,10 +185,10 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="120">
             <template #default="scope">
-              <el-button type="primary" link size="small" @click="editRow('edit', scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/product/update')" type="primary" link size="small" @click="editRow('edit', scope.row)">
                 编辑
               </el-button>
-              <el-button type="danger" link size="small" @click="removeRow(scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/product/delete')" type="danger" link size="small" @click="removeRow(scope.row)">
                 删除
               </el-button>
             </template>
diff --git a/src/views/home/device/type/index.vue b/src/views/home/device/type/index.vue
index 59f1343..2344e57 100644
--- a/src/views/home/device/type/index.vue
+++ b/src/views/home/device/type/index.vue
@@ -105,6 +105,7 @@
   await fetchDict()
   fetchData()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -131,7 +132,7 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="editRow('add', {})">
+          <el-button v-if="proxy.hasPerm('/device/type/add')" type="primary" @click="editRow('add', {})">
             新建
           </el-button>
         </div>
@@ -151,10 +152,10 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="120">
             <template #default="scope">
-              <el-button type="primary" link size="small" @click="editRow('edit', scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/type/update')" type="primary" link size="small" @click="editRow('edit', scope.row)">
                 编辑
               </el-button>
-              <el-button type="danger" link size="small" @click="removeRow(scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/type/delete')" type="danger" link size="small" @click="removeRow(scope.row)">
                 删除
               </el-button>
             </template>

diff --git a/src/App.vue b/src/App.vue
index cde81b3..8a00f5d 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -125,7 +125,7 @@
         '--g-sub-sidebar-actual-width': subSidebarActualWidth,
       }"
     />
-    <system-info v-if="browserType !== 'mobile'" />
+    <!-- <system-info v-if="browserType !== 'mobile'" /> -->
     <audio id="eventAudio" src="" autoplay />
   </el-config-provider>
 </template>
diff --git a/src/layouts/components/Tools/alarmDialog.vue b/src/layouts/components/Tools/alarmDialog.vue
index 1828375..df89ab8 100644
--- a/src/layouts/components/Tools/alarmDialog.vue
+++ b/src/layouts/components/Tools/alarmDialog.vue
@@ -116,7 +116,7 @@
     </div>
     <template #footer>
       <div class="dialog-footer">
-        <div class="btn" @click="detail">
+        <div v-if="proxy.hasPerm('/alarm/current')" class="btn" @click="detail">
           查看
         </div>
         <div v-if="info.isSound === '1'" class="btn" @click="closeSound">
diff --git a/src/layouts/components/Tools/alarmList.vue b/src/layouts/components/Tools/alarmList.vue
index c3a9d2a..5356b74 100644
--- a/src/layouts/components/Tools/alarmList.vue
+++ b/src/layouts/components/Tools/alarmList.vue
@@ -54,6 +54,7 @@
 }
 // 查看当前行
 const detailRow = (row: any) => {
+  if (!proxy.hasPerm('/alarm/current')) { return }
   $router.push({
     name: 'AlarmCurrent',
     query: {
@@ -77,21 +78,6 @@
   localStorage.setItem('eventAudio', 'pause')
 }
 const dialogRef = ref()
-// const dialog = () => {
-//   const row = {
-//     alarmNoteMethod: '1', // 消息提醒 1:弹窗，2:消息提醒
-//     isSound: '1', // 报警音效，1:开，0:关
-//     isSend: '1', // 报警推送，1:开，0:关
-//     isText: '1', // 报警短息，1:开，0:关
-//     alarmType: '浓度超限',
-//     tagNumber: 'NX5702',
-//     alarmTime: '2024-09-09',
-//     value: '20',
-//     typeName: '燃气智能终端',
-//     alarmLevel: '一级',
-//   }
-//   dialogRef.value.initDialog(row)
-// }
 const fetchData = (isLoading = false) => {
   loading.value = true
   if (isLoading) {
@@ -115,7 +101,10 @@
       dialogRef.value.initDialog(newVal)
     }
     if (newVal.isSound === '1') {
-      play()
+      // play()
+      if (!localStorage.getItem('eventAudio')) {
+        proxy.playAudio()
+      }
     }
     fetchData(false)
   }
@@ -146,6 +135,7 @@
 //     window.localStorage.removeItem('token')
 //   }
 // }
+// const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -180,7 +170,7 @@
                   {{ message.processStatus
                     === '未读' ? '未读' : '已读' }}
                 </el-tag>
-                <el-tag type="info" size="small" style="margin-left: 5px;">
+                <el-tag type="info" size="small" style="margin-left: 5px;" @click="detailRow(message)">
                   查看
                 </el-tag>
               </div>
@@ -214,7 +204,7 @@
       <!-- <div class="close" @click="dialog">
         弹窗
       </div> -->
-      <div class="more" @click="moreList">
+      <div v-if="proxy.hasPerm('/alarm/current')" class="more" @click="moreList">
         查看更多
       </div>
     </div>
diff --git a/src/layouts/components/Tools/index.vue b/src/layouts/components/Tools/index.vue
index 9f2d41f..61f9707 100644
--- a/src/layouts/components/Tools/index.vue
+++ b/src/layouts/components/Tools/index.vue
@@ -79,6 +79,7 @@
   // 断开 websocket
   // websocket.destroyWebSocket()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -89,18 +90,18 @@
           <svg-icon name="ep:search" />
         </el-icon>
       </span>
-      <span class="item" @click="board">
+      <span v-if="proxy.hasPerm('/fullscreen')" class="item" @click="board">
         <el-icon>
           <svg-icon name="ep:data-line" />
         </el-icon>
       </span>
-      <span v-if="settingsStore.mode === 'pc' && settingsStore.toolbar.enableFullscreen" class="item" @click="toggle">
+      <span class="item" @click="toggle">
         <el-icon>
           <svg-icon :name="isFullscreen ? 'fullscreen-exit' : 'fullscreen'" />
         </el-icon>
       </span>
       <!-- 报警信息列表 -->
-      <span class="item">
+      <span v-if="proxy.hasPerm('/alarmnotice')" class="item">
         <el-popover width="390">
           <template #reference>
             <div>
diff --git a/src/layouts/components/Topbar/index.vue b/src/layouts/components/Topbar/index.vue
index 2863cef..4e3120e 100644
--- a/src/layouts/components/Topbar/index.vue
+++ b/src/layouts/components/Topbar/index.vue
@@ -67,7 +67,7 @@
           </transition-group>
         </el-breadcrumb>
       </div>
-      <tools />
+      <!-- <tools /> -->
     </div>
   </div>
 </template>
diff --git a/src/router/modules/pc.ts b/src/router/modules/pc.ts
index aacd6fa..97ced45 100644
--- a/src/router/modules/pc.ts
+++ b/src/router/modules/pc.ts
@@ -40,7 +40,7 @@
       icon: 'ep:key',
       sidebar: false,
       breadcrumb: false,
-      // auth: '/fullscreen',
+      auth: '/fullscreen',
     },
   },
   {
@@ -155,7 +155,7 @@
           sidebar: false,
           breadcrumb: false,
           activeMenu: '/well',
-          auth: '/well/detail',
+          auth: '/well',
         },
       },
     ],
diff --git a/src/views/home/alarm/count/components/locationAnalysis.vue b/src/views/home/alarm/count/components/locationAnalysis.vue
index fc75b9e..bff1853 100644
--- a/src/views/home/alarm/count/components/locationAnalysis.vue
+++ b/src/views/home/alarm/count/components/locationAnalysis.vue
@@ -46,6 +46,7 @@
   })
 }
 fetchData()
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -75,6 +76,9 @@
         <el-button type="primary" style="margin: 0 5px;" @click="fetchData">
           搜索
         </el-button>
+        <el-button v-if="proxy.hasPerm('/alarm/count/exportLocation')" type="primary" style="margin: 0 5px;">
+          导出
+        </el-button>
       </div>
     </template>
     <template #content>
diff --git a/src/views/home/alarm/current/components/detail.vue b/src/views/home/alarm/current/components/detail.vue
index dd3b31a..4204c92 100644
--- a/src/views/home/alarm/current/components/detail.vue
+++ b/src/views/home/alarm/current/components/detail.vue
@@ -111,7 +111,7 @@
   const res2 = await getAlarmTypeListPage({ offset: 1, limit: 9999 });
   ($route.query.type === 'history' ? getAlarmDetail : getAlarmDetail)($route.query.id as string).then((res) => {
     detailInfo.value = toHumpObject(res.data)
-    detailInfo.value.realAlarmName = detailInfo.value.realAlarm === '1' ? '报警' : '误报'
+    detailInfo.value.realAlarmName = detailInfo.value.realAlarm === '0' ? '是' : '否'
     detailInfo.value.alarmTypeName = res2.data.rows.filter((item: any) => item.id === detailInfo.value.alarmTypeId)[0]?.alarmType || ''
     detailInfo.value.alarmLevelName = res1.data.rows.filter((item: any) => item.id === detailInfo.value.alarmLevel)[0]?.alarmLevel || ''
     detailInfo.value.duration = detailInfo.value.ts && detailInfo.value.cancelTime ? getDateDiff(detailInfo.value.ts, detailInfo.value.cancelTime) : ''
@@ -139,6 +139,7 @@
 }
 // 点击经纬度展示地图
 const mapRef = ref()
+const { proxy } = getCurrentInstance() as any
 const showMap = (data: any) => {
   console.log(data, 'data')
   if (data.text === '位置') {
@@ -148,6 +149,13 @@
         2: 'StationMonitorDetail',
         3: 'PipelineMonitorDetail',
       } as { [key: string]: string }
+      // 判断是否有菜单权限
+      const watchObjectAuth = {
+        1: '/well',
+        2: '/station/monitor',
+        3: '/pipeline',
+      } as { [key: string]: string }
+      if (!proxy.hasPerm(watchObjectAuth[detailInfo.value.watchObject])) { return }
       $router.push({
         name: watchObject[detailInfo.value.watchObject],
         query: {
diff --git a/src/views/home/alarm/current/components/detailInfoDialog.vue b/src/views/home/alarm/current/components/detailInfoDialog.vue
index c089449..7fbf06b 100644
--- a/src/views/home/alarm/current/components/detailInfoDialog.vue
+++ b/src/views/home/alarm/current/components/detailInfoDialog.vue
@@ -114,6 +114,7 @@
   })
 }
 defineExpose({ initDialog, close })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -131,7 +132,7 @@
     <!-- 头部 -->
     <div class="header">
       <span>{{ info.alarmContent }}</span>
-      <span class="more" @click="moreData">>>更多</span>
+      <span v-if="proxy.hasPerm(type === 'data' ? '/alarm/current/more' : '/alarm/device/more')" class="more" @click="moreData">>>更多</span>
     </div>
     <div class="content">
       <div v-show="type === 'device'" class="item">
@@ -162,7 +163,7 @@
         报警设备:
         <span style="padding-left: 6px;">{{ info.devcode }} </span>
         <el-button
-          v-if="info.devTypeName === '燃气智能监测终端' || info.devTypeName === '液位检测仪' || info.devTypeName === '井盖监测仪'"
+          v-if="(info.devTypeName === '燃气智能监测终端' || info.devTypeName === '液位检测仪' || info.devTypeName === '井盖监测仪') && proxy.hasPerm('/alarm/current/data')"
           size="small" style="margin-left: 6px;" @click="viewData"
         >
           查看数据
@@ -228,7 +229,7 @@
         <span style="padding-left: 6px;">
           {{ info.confirmContent }}
         </span>
-        <el-button v-if="type === 'data'" size="small" style="padding-left: 6px;" @click="viewProcess">
+        <el-button v-if="type === 'data' && proxy.hasPerm('/alarm/current/process')" size="small" style="padding-left: 6px;" @click="viewProcess">
           流程图
         </el-button>
       </div>
@@ -246,17 +247,17 @@
       </div>
     </div>
     <div class="footer">
-      <el-button v-if="Number(info.processStatus) < 4 && type === 'data'" size="small" @click="remind">
+      <el-button v-if="(Number(info.processStatus) < 4 && type === 'data') && proxy.hasPerm('/alarm/current/remind')" size="small" @click="remind">
         提醒责任人
       </el-button>
       <el-button
-        v-if="type === 'device' && (info.processStatusName === '待处置' || info.processStatusName === '挂起')"
+        v-if="(type === 'device' && (info.processStatusName === '待处置' || info.processStatusName === '挂起')) && proxy.hasPerm('/alarm/device/handler')"
         size="small" @click="handler"
       >
         报警处置
       </el-button>
       <el-button
-        v-if="Number(info.processStatus) <= 3 || (type === 'device' && info.processStatusName === '待处置') || info.processStatusName === '挂起'"
+        v-if="(Number(info.processStatus) <= 3 || (type === 'device' && info.processStatusName === '待处置') || info.processStatusName === '挂起') && proxy.hasPerm(type === 'device' ? '/alarm/device/pending' : '/alarm/current/pending')"
         type="primary" size="small" @click="pending"
       >
         挂起
diff --git a/src/views/home/alarm/current/index.vue b/src/views/home/alarm/current/index.vue
index d019bbf..e2714bb 100644
--- a/src/views/home/alarm/current/index.vue
+++ b/src/views/home/alarm/current/index.vue
@@ -4,6 +4,7 @@
   Date: 2023-06-28
  -->
 <script lang="ts" setup name="CurrentAlarm">
+import dayjs from 'dayjs'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import { ArrowLeftBold, ArrowRightBold } from '@element-plus/icons-vue'
 import MapCom from './components/map.vue'
@@ -100,6 +101,7 @@
       path: '/alarm/current',
     })
   }
+  datetimerange.value = []
   listQuery.value = {
     limit: 20,
     offset: 1,
@@ -131,8 +133,8 @@
   if ($route.query.row) {
     loadingTable.value = true
     const row = JSON.parse($route.query.row as string)
-    getCurrentAlarmListPage({ offset: 1, limit: 99999 }).then((res) => {
-      const data = res.data.rows.filter((item: any) => item.id === row.id)
+    getCurrentAlarmListPage({ offset: 1, limit: 50 }).then((res) => {
+      const data = res.data.rows.filter((item: any) => item.id === row.alarmId)
       if (data.length) {
         list1.value = data.map((item: any) => ({
           ...item,
@@ -153,7 +155,10 @@
     })
     return
   }
-  fetchData()
+  datetimerange.value = [dayjs().subtract(7, 'day').format('YYYY-MM-DD HH:mm:ss'), dayjs().format('YYYY-MM-DD HH:mm:ss')]
+  setTimeout(() => {
+    fetchData()
+  })
 })
 // 表格标识  地图或普通
 const tableFlag = ref('normal')
@@ -181,6 +186,10 @@
 const mapRef = ref()
 const mapData = ref({})
 async function detail(row: any) {
+  if (row.processStatusName === '未读') {
+    list1.value[list1.value.findIndex((item: any) => item.id === row.id)].processStatusName = '已读'
+    row.processStatusName = '已读'
+  }
   const res = await detailAlarm(row.id)
   const data = toHumpObject(res.data)
   mapData.value = row
@@ -362,7 +371,7 @@
               <el-button v-if="proxy.hasPerm('/alarm/current/delete')" type="primary" @click="batchDeleteRow">
                 批量删除
               </el-button>
-              <el-button type="primary" @click="exportList">
+              <el-button v-if="proxy.hasPerm('/alarm/current/export')" type="primary" @click="exportList">
                 导出
               </el-button>
             </div>
@@ -383,7 +392,7 @@
               </el-table-column>
             </template>
             <template #columns>
-              <el-table-column label="操作" align="center" width="80">
+              <el-table-column v-if="proxy.hasPerm('/alarm/current/detail')" label="操作" align="center" width="80">
                 <template #default="scope">
                   <el-button type="primary" link size="small" @click="detail(scope.row)">
                     查看
diff --git a/src/views/home/alarm/history/index.vue b/src/views/home/alarm/history/index.vue
index eeb49fc..3c810c3 100644
--- a/src/views/home/alarm/history/index.vue
+++ b/src/views/home/alarm/history/index.vue
@@ -97,6 +97,7 @@
 }
 // 重置查询条件f
 const reset = () => {
+  datetimerange.value = []
   listQuery.value = {
     limit: 20,
     offset: 1,
@@ -189,6 +190,7 @@
   })
 }
 fetchDict()
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -249,7 +251,7 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="exportList">
+          <el-button v-if="proxy.hasPerm('/alarm/history/export')" type="primary" @click="exportList">
             导出
           </el-button>
         </div>
@@ -272,7 +274,7 @@
           </el-table-column>
         </template>
         <template #columns>
-          <el-table-column label="操作" align="center" width="80">
+          <el-table-column v-if="proxy.hasPerm('/alarm/history/detail')" label="操作" align="center" width="80">
             <template #default="scope">
               <el-button type="primary" link size="small" @click="moreData(scope.row)">
                 查看
diff --git a/src/views/home/dashboard/index.vue b/src/views/home/dashboard/index.vue
index d2f7e3c..42dfbed 100644
--- a/src/views/home/dashboard/index.vue
+++ b/src/views/home/dashboard/index.vue
@@ -42,7 +42,7 @@
     value: '0',
     name: '在线',
     unit: '个',
-    id: '1',
+    id: '1,2',
   },
   {
     img: img.lixian,
@@ -56,7 +56,7 @@
     value: '0',
     name: '停用',
     unit: '个',
-    id: '2',
+    id: '3',
   },
 ])
 // 工作台数据
@@ -133,7 +133,11 @@
   deviceOperationLoading.value = true
   getDeviceStatus().then((res) => {
     res.data.forEach((element: any) => {
-      const index = deviceOperationData.value.findIndex((item: any) => item.id === element.name)
+      if (element.name === '1' || element.name === '2') {
+        deviceOperationData.value[0].value = Number(deviceOperationData.value[0].value || '0') + Number(element.value)
+        return
+      }
+      const index = deviceOperationData.value.findIndex((item: any) => item.id.includes(element.name))
       if (index !== -1) {
         deviceOperationData.value[index].value = element.value
       }
diff --git a/src/views/home/device/count/components/bottom.vue b/src/views/home/device/count/components/bottom.vue
index 28a4d78..e4e56fa 100644
--- a/src/views/home/device/count/components/bottom.vue
+++ b/src/views/home/device/count/components/bottom.vue
@@ -110,6 +110,7 @@
   })
 }
 fetchDict()
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -148,7 +149,7 @@
             <template #btns-right>
               <!-- 操作 -->
               <div>
-                <el-button type="primary">
+                <el-button v-if="proxy.hasPerm('/device/count/offline/export')" type="primary">
                   导出
                 </el-button>
               </div>
diff --git a/src/views/home/device/device/index.vue b/src/views/home/device/device/index.vue
index c3970b9..9cdd606 100644
--- a/src/views/home/device/device/index.vue
+++ b/src/views/home/device/device/index.vue
@@ -88,6 +88,7 @@
 }
 // 重置查询条件f
 const reset = () => {
+  datetimerange.value = []
   listQuery.value = {
     limit: 20,
     offset: 1,
@@ -296,6 +297,7 @@
   fetchDict()
   fetchData()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -372,17 +374,17 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="editRow('add', {})">
+          <el-button v-if="proxy.hasPerm('/device/manage/add')" type="primary" @click="editRow('add', {})">
             新建
           </el-button>
-          <el-button type="primary" @click="downloadTemplate">
+          <el-button v-if="proxy.hasPerm('/device/manage/down')" type="primary" @click="downloadTemplate">
             模板下载
           </el-button>
-          <el-button type="primary" @click="importList">
+          <el-button v-if="proxy.hasPerm('/device/manage/import')" type="primary" @click="importList">
             批量导入
           </el-button>
-          <el-button type="primary" @click="exportList">
-            导出列表
+          <el-button v-if="proxy.hasPerm('/device/manage/export')" type="primary" @click="exportList">
+            导出
           </el-button>
           <input ref="fileRef" style="display: none;" type="file" accept=".xls,.xlsx" @change="onFileChange">
         </div>
@@ -409,16 +411,16 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="150">
             <template #default="scope">
-              <el-button type="primary" link size="small" @click="editRow('detail', scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/manage/detail')" type="primary" link size="small" @click="editRow('detail', scope.row)">
                 查看
               </el-button>
-              <el-button type="primary" link size="small" @click="editRow('edit', scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/manage/update')" type="primary" link size="small" @click="editRow('edit', scope.row)">
                 编辑
               </el-button>
-              <el-button type="danger" link size="small" @click="changeDefense(scope.row)">
+              <!-- <el-button v-if="proxy.hasPerm('/device/manage/add')" type="danger" link size="small" @click="changeDefense(scope.row)">
                 撤防
-              </el-button>
-              <el-button type="danger" link size="small" @click="removeRow(scope.row)">
+              </el-button> -->
+              <el-button v-if="proxy.hasPerm('/device/manage/delete')" type="danger" link size="small" @click="removeRow(scope.row)">
                 删除
               </el-button>
             </template>
diff --git a/src/views/home/device/instruction/index.vue b/src/views/home/device/instruction/index.vue
index 1e598ed..1da6706 100644
--- a/src/views/home/device/instruction/index.vue
+++ b/src/views/home/device/instruction/index.vue
@@ -78,6 +78,7 @@
 }
 // 重置查询条件f
 const reset = () => {
+  datetimerange.value = []
   listQuery.value = {
     limit: 20,
     offset: 1,
@@ -158,6 +159,7 @@
     editRef.value.initDialog('addOther', {})
   }
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -213,10 +215,10 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary">
+          <el-button v-if="proxy.hasPerm('/device/instruction/batch')" type="primary">
             批量下发
           </el-button>
-          <el-button type="primary" @click="editRow('add', {})">
+          <el-button v-if="proxy.hasPerm('/device/instruction/add')" type="primary" @click="editRow('add', {})">
             新建
           </el-button>
         </div>
@@ -236,13 +238,13 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="120">
             <template #default="scope">
-              <el-button type="primary" link size="small" @click="editRow('detail', scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/instruction/detail')" type="primary" link size="small" @click="editRow('detail', scope.row)">
                 查看
               </el-button>
-              <el-button v-if="scope.row.status === '2'" type="primary" link size="small" @click="editRow('edit', scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/instruction/again') && scope.row.status === '2'" type="primary" link size="small" @click="editRow('edit', scope.row)">
                 重新下发
               </el-button>
-              <el-button type="danger" link size="small" @click="removeRow(scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/instruction/delete')" type="danger" link size="small" @click="removeRow(scope.row)">
                 删除
               </el-button>
             </template>
diff --git a/src/views/home/device/product/index.vue b/src/views/home/device/product/index.vue
index 799fc90..fdd5463 100644
--- a/src/views/home/device/product/index.vue
+++ b/src/views/home/device/product/index.vue
@@ -128,6 +128,7 @@
   await fetchDict()
   fetchData()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -164,7 +165,7 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="editRow('add', {})">
+          <el-button v-if="proxy.hasPerm('/device/product/add')" type="primary" @click="editRow('add', {})">
             新建
           </el-button>
         </div>
@@ -184,10 +185,10 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="120">
             <template #default="scope">
-              <el-button type="primary" link size="small" @click="editRow('edit', scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/product/update')" type="primary" link size="small" @click="editRow('edit', scope.row)">
                 编辑
               </el-button>
-              <el-button type="danger" link size="small" @click="removeRow(scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/product/delete')" type="danger" link size="small" @click="removeRow(scope.row)">
                 删除
               </el-button>
             </template>
diff --git a/src/views/home/device/type/index.vue b/src/views/home/device/type/index.vue
index 59f1343..2344e57 100644
--- a/src/views/home/device/type/index.vue
+++ b/src/views/home/device/type/index.vue
@@ -105,6 +105,7 @@
   await fetchDict()
   fetchData()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -131,7 +132,7 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="editRow('add', {})">
+          <el-button v-if="proxy.hasPerm('/device/type/add')" type="primary" @click="editRow('add', {})">
             新建
           </el-button>
         </div>
@@ -151,10 +152,10 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="120">
             <template #default="scope">
-              <el-button type="primary" link size="small" @click="editRow('edit', scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/type/update')" type="primary" link size="small" @click="editRow('edit', scope.row)">
                 编辑
               </el-button>
-              <el-button type="danger" link size="small" @click="removeRow(scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/type/delete')" type="danger" link size="small" @click="removeRow(scope.row)">
                 删除
               </el-button>
             </template>
diff --git a/src/views/home/ledger/ledger/components/gridList.vue b/src/views/home/ledger/ledger/components/gridList.vue
index d03cd9f..189edef 100644
--- a/src/views/home/ledger/ledger/components/gridList.vue
+++ b/src/views/home/ledger/ledger/components/gridList.vue
@@ -91,6 +91,7 @@
     // })
   })
 }
+const { proxy } = getCurrentInstance() as any
 // 同步日志
 const allSync = () => {
   $router.push({
@@ -139,10 +140,10 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="allSync">
+          <el-button v-if="proxy.hasPerm('/ledger/sync')" type="primary" @click="allSync">
             同步日志
           </el-button>
-          <el-button type="primary" @click="sync('all', {})">
+          <el-button v-if="proxy.hasPerm('/ledger/sync/all')" type="primary" @click="sync('all', {})">
             全量同步
           </el-button>
         </div>
@@ -160,9 +161,9 @@
           </el-table-column>
         </template>
         <template #columns>
-          <el-table-column label="操作" align="center" width="80">
+          <el-table-column v-if="proxy.hasPerm('/ledger/sync/single')" label="操作" align="center" width="80">
             <template #default="scope">
-              <el-button type="primary" link size="small" @click="sync('single', scope.row)">
+              <el-button v-if="proxy.hasPerm('/ledger/sync/single')" type="primary" link size="small" @click="sync('single', scope.row)">
                 同步
               </el-button>
             </template>

diff --git a/src/App.vue b/src/App.vue
index cde81b3..8a00f5d 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -125,7 +125,7 @@
         '--g-sub-sidebar-actual-width': subSidebarActualWidth,
       }"
     />
-    <system-info v-if="browserType !== 'mobile'" />
+    <!-- <system-info v-if="browserType !== 'mobile'" /> -->
     <audio id="eventAudio" src="" autoplay />
   </el-config-provider>
 </template>
diff --git a/src/layouts/components/Tools/alarmDialog.vue b/src/layouts/components/Tools/alarmDialog.vue
index 1828375..df89ab8 100644
--- a/src/layouts/components/Tools/alarmDialog.vue
+++ b/src/layouts/components/Tools/alarmDialog.vue
@@ -116,7 +116,7 @@
     </div>
     <template #footer>
       <div class="dialog-footer">
-        <div class="btn" @click="detail">
+        <div v-if="proxy.hasPerm('/alarm/current')" class="btn" @click="detail">
           查看
         </div>
         <div v-if="info.isSound === '1'" class="btn" @click="closeSound">
diff --git a/src/layouts/components/Tools/alarmList.vue b/src/layouts/components/Tools/alarmList.vue
index c3a9d2a..5356b74 100644
--- a/src/layouts/components/Tools/alarmList.vue
+++ b/src/layouts/components/Tools/alarmList.vue
@@ -54,6 +54,7 @@
 }
 // 查看当前行
 const detailRow = (row: any) => {
+  if (!proxy.hasPerm('/alarm/current')) { return }
   $router.push({
     name: 'AlarmCurrent',
     query: {
@@ -77,21 +78,6 @@
   localStorage.setItem('eventAudio', 'pause')
 }
 const dialogRef = ref()
-// const dialog = () => {
-//   const row = {
-//     alarmNoteMethod: '1', // 消息提醒 1:弹窗，2:消息提醒
-//     isSound: '1', // 报警音效，1:开，0:关
-//     isSend: '1', // 报警推送，1:开，0:关
-//     isText: '1', // 报警短息，1:开，0:关
-//     alarmType: '浓度超限',
-//     tagNumber: 'NX5702',
-//     alarmTime: '2024-09-09',
-//     value: '20',
-//     typeName: '燃气智能终端',
-//     alarmLevel: '一级',
-//   }
-//   dialogRef.value.initDialog(row)
-// }
 const fetchData = (isLoading = false) => {
   loading.value = true
   if (isLoading) {
@@ -115,7 +101,10 @@
       dialogRef.value.initDialog(newVal)
     }
     if (newVal.isSound === '1') {
-      play()
+      // play()
+      if (!localStorage.getItem('eventAudio')) {
+        proxy.playAudio()
+      }
     }
     fetchData(false)
   }
@@ -146,6 +135,7 @@
 //     window.localStorage.removeItem('token')
 //   }
 // }
+// const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -180,7 +170,7 @@
                   {{ message.processStatus
                     === '未读' ? '未读' : '已读' }}
                 </el-tag>
-                <el-tag type="info" size="small" style="margin-left: 5px;">
+                <el-tag type="info" size="small" style="margin-left: 5px;" @click="detailRow(message)">
                   查看
                 </el-tag>
               </div>
@@ -214,7 +204,7 @@
       <!-- <div class="close" @click="dialog">
         弹窗
       </div> -->
-      <div class="more" @click="moreList">
+      <div v-if="proxy.hasPerm('/alarm/current')" class="more" @click="moreList">
         查看更多
       </div>
     </div>
diff --git a/src/layouts/components/Tools/index.vue b/src/layouts/components/Tools/index.vue
index 9f2d41f..61f9707 100644
--- a/src/layouts/components/Tools/index.vue
+++ b/src/layouts/components/Tools/index.vue
@@ -79,6 +79,7 @@
   // 断开 websocket
   // websocket.destroyWebSocket()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -89,18 +90,18 @@
           <svg-icon name="ep:search" />
         </el-icon>
       </span>
-      <span class="item" @click="board">
+      <span v-if="proxy.hasPerm('/fullscreen')" class="item" @click="board">
         <el-icon>
           <svg-icon name="ep:data-line" />
         </el-icon>
       </span>
-      <span v-if="settingsStore.mode === 'pc' && settingsStore.toolbar.enableFullscreen" class="item" @click="toggle">
+      <span class="item" @click="toggle">
         <el-icon>
           <svg-icon :name="isFullscreen ? 'fullscreen-exit' : 'fullscreen'" />
         </el-icon>
       </span>
       <!-- 报警信息列表 -->
-      <span class="item">
+      <span v-if="proxy.hasPerm('/alarmnotice')" class="item">
         <el-popover width="390">
           <template #reference>
             <div>
diff --git a/src/layouts/components/Topbar/index.vue b/src/layouts/components/Topbar/index.vue
index 2863cef..4e3120e 100644
--- a/src/layouts/components/Topbar/index.vue
+++ b/src/layouts/components/Topbar/index.vue
@@ -67,7 +67,7 @@
           </transition-group>
         </el-breadcrumb>
       </div>
-      <tools />
+      <!-- <tools /> -->
     </div>
   </div>
 </template>
diff --git a/src/router/modules/pc.ts b/src/router/modules/pc.ts
index aacd6fa..97ced45 100644
--- a/src/router/modules/pc.ts
+++ b/src/router/modules/pc.ts
@@ -40,7 +40,7 @@
       icon: 'ep:key',
       sidebar: false,
       breadcrumb: false,
-      // auth: '/fullscreen',
+      auth: '/fullscreen',
     },
   },
   {
@@ -155,7 +155,7 @@
           sidebar: false,
           breadcrumb: false,
           activeMenu: '/well',
-          auth: '/well/detail',
+          auth: '/well',
         },
       },
     ],
diff --git a/src/views/home/alarm/count/components/locationAnalysis.vue b/src/views/home/alarm/count/components/locationAnalysis.vue
index fc75b9e..bff1853 100644
--- a/src/views/home/alarm/count/components/locationAnalysis.vue
+++ b/src/views/home/alarm/count/components/locationAnalysis.vue
@@ -46,6 +46,7 @@
   })
 }
 fetchData()
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -75,6 +76,9 @@
         <el-button type="primary" style="margin: 0 5px;" @click="fetchData">
           搜索
         </el-button>
+        <el-button v-if="proxy.hasPerm('/alarm/count/exportLocation')" type="primary" style="margin: 0 5px;">
+          导出
+        </el-button>
       </div>
     </template>
     <template #content>
diff --git a/src/views/home/alarm/current/components/detail.vue b/src/views/home/alarm/current/components/detail.vue
index dd3b31a..4204c92 100644
--- a/src/views/home/alarm/current/components/detail.vue
+++ b/src/views/home/alarm/current/components/detail.vue
@@ -111,7 +111,7 @@
   const res2 = await getAlarmTypeListPage({ offset: 1, limit: 9999 });
   ($route.query.type === 'history' ? getAlarmDetail : getAlarmDetail)($route.query.id as string).then((res) => {
     detailInfo.value = toHumpObject(res.data)
-    detailInfo.value.realAlarmName = detailInfo.value.realAlarm === '1' ? '报警' : '误报'
+    detailInfo.value.realAlarmName = detailInfo.value.realAlarm === '0' ? '是' : '否'
     detailInfo.value.alarmTypeName = res2.data.rows.filter((item: any) => item.id === detailInfo.value.alarmTypeId)[0]?.alarmType || ''
     detailInfo.value.alarmLevelName = res1.data.rows.filter((item: any) => item.id === detailInfo.value.alarmLevel)[0]?.alarmLevel || ''
     detailInfo.value.duration = detailInfo.value.ts && detailInfo.value.cancelTime ? getDateDiff(detailInfo.value.ts, detailInfo.value.cancelTime) : ''
@@ -139,6 +139,7 @@
 }
 // 点击经纬度展示地图
 const mapRef = ref()
+const { proxy } = getCurrentInstance() as any
 const showMap = (data: any) => {
   console.log(data, 'data')
   if (data.text === '位置') {
@@ -148,6 +149,13 @@
         2: 'StationMonitorDetail',
         3: 'PipelineMonitorDetail',
       } as { [key: string]: string }
+      // 判断是否有菜单权限
+      const watchObjectAuth = {
+        1: '/well',
+        2: '/station/monitor',
+        3: '/pipeline',
+      } as { [key: string]: string }
+      if (!proxy.hasPerm(watchObjectAuth[detailInfo.value.watchObject])) { return }
       $router.push({
         name: watchObject[detailInfo.value.watchObject],
         query: {
diff --git a/src/views/home/alarm/current/components/detailInfoDialog.vue b/src/views/home/alarm/current/components/detailInfoDialog.vue
index c089449..7fbf06b 100644
--- a/src/views/home/alarm/current/components/detailInfoDialog.vue
+++ b/src/views/home/alarm/current/components/detailInfoDialog.vue
@@ -114,6 +114,7 @@
   })
 }
 defineExpose({ initDialog, close })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -131,7 +132,7 @@
     <!-- 头部 -->
     <div class="header">
       <span>{{ info.alarmContent }}</span>
-      <span class="more" @click="moreData">>>更多</span>
+      <span v-if="proxy.hasPerm(type === 'data' ? '/alarm/current/more' : '/alarm/device/more')" class="more" @click="moreData">>>更多</span>
     </div>
     <div class="content">
       <div v-show="type === 'device'" class="item">
@@ -162,7 +163,7 @@
         报警设备:
         <span style="padding-left: 6px;">{{ info.devcode }} </span>
         <el-button
-          v-if="info.devTypeName === '燃气智能监测终端' || info.devTypeName === '液位检测仪' || info.devTypeName === '井盖监测仪'"
+          v-if="(info.devTypeName === '燃气智能监测终端' || info.devTypeName === '液位检测仪' || info.devTypeName === '井盖监测仪') && proxy.hasPerm('/alarm/current/data')"
           size="small" style="margin-left: 6px;" @click="viewData"
         >
           查看数据
@@ -228,7 +229,7 @@
         <span style="padding-left: 6px;">
           {{ info.confirmContent }}
         </span>
-        <el-button v-if="type === 'data'" size="small" style="padding-left: 6px;" @click="viewProcess">
+        <el-button v-if="type === 'data' && proxy.hasPerm('/alarm/current/process')" size="small" style="padding-left: 6px;" @click="viewProcess">
           流程图
         </el-button>
       </div>
@@ -246,17 +247,17 @@
       </div>
     </div>
     <div class="footer">
-      <el-button v-if="Number(info.processStatus) < 4 && type === 'data'" size="small" @click="remind">
+      <el-button v-if="(Number(info.processStatus) < 4 && type === 'data') && proxy.hasPerm('/alarm/current/remind')" size="small" @click="remind">
         提醒责任人
       </el-button>
       <el-button
-        v-if="type === 'device' && (info.processStatusName === '待处置' || info.processStatusName === '挂起')"
+        v-if="(type === 'device' && (info.processStatusName === '待处置' || info.processStatusName === '挂起')) && proxy.hasPerm('/alarm/device/handler')"
         size="small" @click="handler"
       >
         报警处置
       </el-button>
       <el-button
-        v-if="Number(info.processStatus) <= 3 || (type === 'device' && info.processStatusName === '待处置') || info.processStatusName === '挂起'"
+        v-if="(Number(info.processStatus) <= 3 || (type === 'device' && info.processStatusName === '待处置') || info.processStatusName === '挂起') && proxy.hasPerm(type === 'device' ? '/alarm/device/pending' : '/alarm/current/pending')"
         type="primary" size="small" @click="pending"
       >
         挂起
diff --git a/src/views/home/alarm/current/index.vue b/src/views/home/alarm/current/index.vue
index d019bbf..e2714bb 100644
--- a/src/views/home/alarm/current/index.vue
+++ b/src/views/home/alarm/current/index.vue
@@ -4,6 +4,7 @@
   Date: 2023-06-28
  -->
 <script lang="ts" setup name="CurrentAlarm">
+import dayjs from 'dayjs'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import { ArrowLeftBold, ArrowRightBold } from '@element-plus/icons-vue'
 import MapCom from './components/map.vue'
@@ -100,6 +101,7 @@
       path: '/alarm/current',
     })
   }
+  datetimerange.value = []
   listQuery.value = {
     limit: 20,
     offset: 1,
@@ -131,8 +133,8 @@
   if ($route.query.row) {
     loadingTable.value = true
     const row = JSON.parse($route.query.row as string)
-    getCurrentAlarmListPage({ offset: 1, limit: 99999 }).then((res) => {
-      const data = res.data.rows.filter((item: any) => item.id === row.id)
+    getCurrentAlarmListPage({ offset: 1, limit: 50 }).then((res) => {
+      const data = res.data.rows.filter((item: any) => item.id === row.alarmId)
       if (data.length) {
         list1.value = data.map((item: any) => ({
           ...item,
@@ -153,7 +155,10 @@
     })
     return
   }
-  fetchData()
+  datetimerange.value = [dayjs().subtract(7, 'day').format('YYYY-MM-DD HH:mm:ss'), dayjs().format('YYYY-MM-DD HH:mm:ss')]
+  setTimeout(() => {
+    fetchData()
+  })
 })
 // 表格标识  地图或普通
 const tableFlag = ref('normal')
@@ -181,6 +186,10 @@
 const mapRef = ref()
 const mapData = ref({})
 async function detail(row: any) {
+  if (row.processStatusName === '未读') {
+    list1.value[list1.value.findIndex((item: any) => item.id === row.id)].processStatusName = '已读'
+    row.processStatusName = '已读'
+  }
   const res = await detailAlarm(row.id)
   const data = toHumpObject(res.data)
   mapData.value = row
@@ -362,7 +371,7 @@
               <el-button v-if="proxy.hasPerm('/alarm/current/delete')" type="primary" @click="batchDeleteRow">
                 批量删除
               </el-button>
-              <el-button type="primary" @click="exportList">
+              <el-button v-if="proxy.hasPerm('/alarm/current/export')" type="primary" @click="exportList">
                 导出
               </el-button>
             </div>
@@ -383,7 +392,7 @@
               </el-table-column>
             </template>
             <template #columns>
-              <el-table-column label="操作" align="center" width="80">
+              <el-table-column v-if="proxy.hasPerm('/alarm/current/detail')" label="操作" align="center" width="80">
                 <template #default="scope">
                   <el-button type="primary" link size="small" @click="detail(scope.row)">
                     查看
diff --git a/src/views/home/alarm/history/index.vue b/src/views/home/alarm/history/index.vue
index eeb49fc..3c810c3 100644
--- a/src/views/home/alarm/history/index.vue
+++ b/src/views/home/alarm/history/index.vue
@@ -97,6 +97,7 @@
 }
 // 重置查询条件f
 const reset = () => {
+  datetimerange.value = []
   listQuery.value = {
     limit: 20,
     offset: 1,
@@ -189,6 +190,7 @@
   })
 }
 fetchDict()
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -249,7 +251,7 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="exportList">
+          <el-button v-if="proxy.hasPerm('/alarm/history/export')" type="primary" @click="exportList">
             导出
           </el-button>
         </div>
@@ -272,7 +274,7 @@
           </el-table-column>
         </template>
         <template #columns>
-          <el-table-column label="操作" align="center" width="80">
+          <el-table-column v-if="proxy.hasPerm('/alarm/history/detail')" label="操作" align="center" width="80">
             <template #default="scope">
               <el-button type="primary" link size="small" @click="moreData(scope.row)">
                 查看
diff --git a/src/views/home/dashboard/index.vue b/src/views/home/dashboard/index.vue
index d2f7e3c..42dfbed 100644
--- a/src/views/home/dashboard/index.vue
+++ b/src/views/home/dashboard/index.vue
@@ -42,7 +42,7 @@
     value: '0',
     name: '在线',
     unit: '个',
-    id: '1',
+    id: '1,2',
   },
   {
     img: img.lixian,
@@ -56,7 +56,7 @@
     value: '0',
     name: '停用',
     unit: '个',
-    id: '2',
+    id: '3',
   },
 ])
 // 工作台数据
@@ -133,7 +133,11 @@
   deviceOperationLoading.value = true
   getDeviceStatus().then((res) => {
     res.data.forEach((element: any) => {
-      const index = deviceOperationData.value.findIndex((item: any) => item.id === element.name)
+      if (element.name === '1' || element.name === '2') {
+        deviceOperationData.value[0].value = Number(deviceOperationData.value[0].value || '0') + Number(element.value)
+        return
+      }
+      const index = deviceOperationData.value.findIndex((item: any) => item.id.includes(element.name))
       if (index !== -1) {
         deviceOperationData.value[index].value = element.value
       }
diff --git a/src/views/home/device/count/components/bottom.vue b/src/views/home/device/count/components/bottom.vue
index 28a4d78..e4e56fa 100644
--- a/src/views/home/device/count/components/bottom.vue
+++ b/src/views/home/device/count/components/bottom.vue
@@ -110,6 +110,7 @@
   })
 }
 fetchDict()
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -148,7 +149,7 @@
             <template #btns-right>
               <!-- 操作 -->
               <div>
-                <el-button type="primary">
+                <el-button v-if="proxy.hasPerm('/device/count/offline/export')" type="primary">
                   导出
                 </el-button>
               </div>
diff --git a/src/views/home/device/device/index.vue b/src/views/home/device/device/index.vue
index c3970b9..9cdd606 100644
--- a/src/views/home/device/device/index.vue
+++ b/src/views/home/device/device/index.vue
@@ -88,6 +88,7 @@
 }
 // 重置查询条件f
 const reset = () => {
+  datetimerange.value = []
   listQuery.value = {
     limit: 20,
     offset: 1,
@@ -296,6 +297,7 @@
   fetchDict()
   fetchData()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -372,17 +374,17 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="editRow('add', {})">
+          <el-button v-if="proxy.hasPerm('/device/manage/add')" type="primary" @click="editRow('add', {})">
             新建
           </el-button>
-          <el-button type="primary" @click="downloadTemplate">
+          <el-button v-if="proxy.hasPerm('/device/manage/down')" type="primary" @click="downloadTemplate">
             模板下载
           </el-button>
-          <el-button type="primary" @click="importList">
+          <el-button v-if="proxy.hasPerm('/device/manage/import')" type="primary" @click="importList">
             批量导入
           </el-button>
-          <el-button type="primary" @click="exportList">
-            导出列表
+          <el-button v-if="proxy.hasPerm('/device/manage/export')" type="primary" @click="exportList">
+            导出
           </el-button>
           <input ref="fileRef" style="display: none;" type="file" accept=".xls,.xlsx" @change="onFileChange">
         </div>
@@ -409,16 +411,16 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="150">
             <template #default="scope">
-              <el-button type="primary" link size="small" @click="editRow('detail', scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/manage/detail')" type="primary" link size="small" @click="editRow('detail', scope.row)">
                 查看
               </el-button>
-              <el-button type="primary" link size="small" @click="editRow('edit', scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/manage/update')" type="primary" link size="small" @click="editRow('edit', scope.row)">
                 编辑
               </el-button>
-              <el-button type="danger" link size="small" @click="changeDefense(scope.row)">
+              <!-- <el-button v-if="proxy.hasPerm('/device/manage/add')" type="danger" link size="small" @click="changeDefense(scope.row)">
                 撤防
-              </el-button>
-              <el-button type="danger" link size="small" @click="removeRow(scope.row)">
+              </el-button> -->
+              <el-button v-if="proxy.hasPerm('/device/manage/delete')" type="danger" link size="small" @click="removeRow(scope.row)">
                 删除
               </el-button>
             </template>
diff --git a/src/views/home/device/instruction/index.vue b/src/views/home/device/instruction/index.vue
index 1e598ed..1da6706 100644
--- a/src/views/home/device/instruction/index.vue
+++ b/src/views/home/device/instruction/index.vue
@@ -78,6 +78,7 @@
 }
 // 重置查询条件f
 const reset = () => {
+  datetimerange.value = []
   listQuery.value = {
     limit: 20,
     offset: 1,
@@ -158,6 +159,7 @@
     editRef.value.initDialog('addOther', {})
   }
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -213,10 +215,10 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary">
+          <el-button v-if="proxy.hasPerm('/device/instruction/batch')" type="primary">
             批量下发
           </el-button>
-          <el-button type="primary" @click="editRow('add', {})">
+          <el-button v-if="proxy.hasPerm('/device/instruction/add')" type="primary" @click="editRow('add', {})">
             新建
           </el-button>
         </div>
@@ -236,13 +238,13 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="120">
             <template #default="scope">
-              <el-button type="primary" link size="small" @click="editRow('detail', scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/instruction/detail')" type="primary" link size="small" @click="editRow('detail', scope.row)">
                 查看
               </el-button>
-              <el-button v-if="scope.row.status === '2'" type="primary" link size="small" @click="editRow('edit', scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/instruction/again') && scope.row.status === '2'" type="primary" link size="small" @click="editRow('edit', scope.row)">
                 重新下发
               </el-button>
-              <el-button type="danger" link size="small" @click="removeRow(scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/instruction/delete')" type="danger" link size="small" @click="removeRow(scope.row)">
                 删除
               </el-button>
             </template>
diff --git a/src/views/home/device/product/index.vue b/src/views/home/device/product/index.vue
index 799fc90..fdd5463 100644
--- a/src/views/home/device/product/index.vue
+++ b/src/views/home/device/product/index.vue
@@ -128,6 +128,7 @@
   await fetchDict()
   fetchData()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -164,7 +165,7 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="editRow('add', {})">
+          <el-button v-if="proxy.hasPerm('/device/product/add')" type="primary" @click="editRow('add', {})">
             新建
           </el-button>
         </div>
@@ -184,10 +185,10 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="120">
             <template #default="scope">
-              <el-button type="primary" link size="small" @click="editRow('edit', scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/product/update')" type="primary" link size="small" @click="editRow('edit', scope.row)">
                 编辑
               </el-button>
-              <el-button type="danger" link size="small" @click="removeRow(scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/product/delete')" type="danger" link size="small" @click="removeRow(scope.row)">
                 删除
               </el-button>
             </template>
diff --git a/src/views/home/device/type/index.vue b/src/views/home/device/type/index.vue
index 59f1343..2344e57 100644
--- a/src/views/home/device/type/index.vue
+++ b/src/views/home/device/type/index.vue
@@ -105,6 +105,7 @@
   await fetchDict()
   fetchData()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -131,7 +132,7 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="editRow('add', {})">
+          <el-button v-if="proxy.hasPerm('/device/type/add')" type="primary" @click="editRow('add', {})">
             新建
           </el-button>
         </div>
@@ -151,10 +152,10 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="120">
             <template #default="scope">
-              <el-button type="primary" link size="small" @click="editRow('edit', scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/type/update')" type="primary" link size="small" @click="editRow('edit', scope.row)">
                 编辑
               </el-button>
-              <el-button type="danger" link size="small" @click="removeRow(scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/type/delete')" type="danger" link size="small" @click="removeRow(scope.row)">
                 删除
               </el-button>
             </template>
diff --git a/src/views/home/ledger/ledger/components/gridList.vue b/src/views/home/ledger/ledger/components/gridList.vue
index d03cd9f..189edef 100644
--- a/src/views/home/ledger/ledger/components/gridList.vue
+++ b/src/views/home/ledger/ledger/components/gridList.vue
@@ -91,6 +91,7 @@
     // })
   })
 }
+const { proxy } = getCurrentInstance() as any
 // 同步日志
 const allSync = () => {
   $router.push({
@@ -139,10 +140,10 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="allSync">
+          <el-button v-if="proxy.hasPerm('/ledger/sync')" type="primary" @click="allSync">
             同步日志
           </el-button>
-          <el-button type="primary" @click="sync('all', {})">
+          <el-button v-if="proxy.hasPerm('/ledger/sync/all')" type="primary" @click="sync('all', {})">
             全量同步
           </el-button>
         </div>
@@ -160,9 +161,9 @@
           </el-table-column>
         </template>
         <template #columns>
-          <el-table-column label="操作" align="center" width="80">
+          <el-table-column v-if="proxy.hasPerm('/ledger/sync/single')" label="操作" align="center" width="80">
             <template #default="scope">
-              <el-button type="primary" link size="small" @click="sync('single', scope.row)">
+              <el-button v-if="proxy.hasPerm('/ledger/sync/single')" type="primary" link size="small" @click="sync('single', scope.row)">
                 同步
               </el-button>
             </template>
diff --git a/src/views/home/ledger/ledger/components/wellList.vue b/src/views/home/ledger/ledger/components/wellList.vue
index 9eb1f43..06f855a 100644
--- a/src/views/home/ledger/ledger/components/wellList.vue
+++ b/src/views/home/ledger/ledger/components/wellList.vue
@@ -123,6 +123,7 @@
   // await fetchDict()
   fetchData()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -159,11 +160,11 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="allSync">
+          <el-button v-if="proxy.hasPerm('/ledger/sync')" type="primary" @click="allSync">
             同步日志
           </el-button>
-          <el-button type="primary" @click="sync('all', {})">
-            全部同步
+          <el-button v-if="proxy.hasPerm('/ledger/sync/all')" type="primary" @click="sync('all', {})">
+            全量同步
           </el-button>
         </div>
       </template>
@@ -180,9 +181,9 @@
           </el-table-column>
         </template>
         <template #columns>
-          <el-table-column label="操作" align="center" width="80">
+          <el-table-column v-if="proxy.hasPerm('/ledger/sync/single')" label="操作" align="center" width="80">
             <template #default="scope">
-              <el-button type="primary" link size="small" @click="sync('single', scope.row)">
+              <el-button v-if="proxy.hasPerm('/ledger/sync/single')" type="primary" link size="small" @click="sync('single', scope.row)">
                 同步
               </el-button>
             </template>

diff --git a/src/App.vue b/src/App.vue
index cde81b3..8a00f5d 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -125,7 +125,7 @@
         '--g-sub-sidebar-actual-width': subSidebarActualWidth,
       }"
     />
-    <system-info v-if="browserType !== 'mobile'" />
+    <!-- <system-info v-if="browserType !== 'mobile'" /> -->
     <audio id="eventAudio" src="" autoplay />
   </el-config-provider>
 </template>
diff --git a/src/layouts/components/Tools/alarmDialog.vue b/src/layouts/components/Tools/alarmDialog.vue
index 1828375..df89ab8 100644
--- a/src/layouts/components/Tools/alarmDialog.vue
+++ b/src/layouts/components/Tools/alarmDialog.vue
@@ -116,7 +116,7 @@
     </div>
     <template #footer>
       <div class="dialog-footer">
-        <div class="btn" @click="detail">
+        <div v-if="proxy.hasPerm('/alarm/current')" class="btn" @click="detail">
           查看
         </div>
         <div v-if="info.isSound === '1'" class="btn" @click="closeSound">
diff --git a/src/layouts/components/Tools/alarmList.vue b/src/layouts/components/Tools/alarmList.vue
index c3a9d2a..5356b74 100644
--- a/src/layouts/components/Tools/alarmList.vue
+++ b/src/layouts/components/Tools/alarmList.vue
@@ -54,6 +54,7 @@
 }
 // 查看当前行
 const detailRow = (row: any) => {
+  if (!proxy.hasPerm('/alarm/current')) { return }
   $router.push({
     name: 'AlarmCurrent',
     query: {
@@ -77,21 +78,6 @@
   localStorage.setItem('eventAudio', 'pause')
 }
 const dialogRef = ref()
-// const dialog = () => {
-//   const row = {
-//     alarmNoteMethod: '1', // 消息提醒 1:弹窗，2:消息提醒
-//     isSound: '1', // 报警音效，1:开，0:关
-//     isSend: '1', // 报警推送，1:开，0:关
-//     isText: '1', // 报警短息，1:开，0:关
-//     alarmType: '浓度超限',
-//     tagNumber: 'NX5702',
-//     alarmTime: '2024-09-09',
-//     value: '20',
-//     typeName: '燃气智能终端',
-//     alarmLevel: '一级',
-//   }
-//   dialogRef.value.initDialog(row)
-// }
 const fetchData = (isLoading = false) => {
   loading.value = true
   if (isLoading) {
@@ -115,7 +101,10 @@
       dialogRef.value.initDialog(newVal)
     }
     if (newVal.isSound === '1') {
-      play()
+      // play()
+      if (!localStorage.getItem('eventAudio')) {
+        proxy.playAudio()
+      }
     }
     fetchData(false)
   }
@@ -146,6 +135,7 @@
 //     window.localStorage.removeItem('token')
 //   }
 // }
+// const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -180,7 +170,7 @@
                   {{ message.processStatus
                     === '未读' ? '未读' : '已读' }}
                 </el-tag>
-                <el-tag type="info" size="small" style="margin-left: 5px;">
+                <el-tag type="info" size="small" style="margin-left: 5px;" @click="detailRow(message)">
                   查看
                 </el-tag>
               </div>
@@ -214,7 +204,7 @@
       <!-- <div class="close" @click="dialog">
         弹窗
       </div> -->
-      <div class="more" @click="moreList">
+      <div v-if="proxy.hasPerm('/alarm/current')" class="more" @click="moreList">
         查看更多
       </div>
     </div>
diff --git a/src/layouts/components/Tools/index.vue b/src/layouts/components/Tools/index.vue
index 9f2d41f..61f9707 100644
--- a/src/layouts/components/Tools/index.vue
+++ b/src/layouts/components/Tools/index.vue
@@ -79,6 +79,7 @@
   // 断开 websocket
   // websocket.destroyWebSocket()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -89,18 +90,18 @@
           <svg-icon name="ep:search" />
         </el-icon>
       </span>
-      <span class="item" @click="board">
+      <span v-if="proxy.hasPerm('/fullscreen')" class="item" @click="board">
         <el-icon>
           <svg-icon name="ep:data-line" />
         </el-icon>
       </span>
-      <span v-if="settingsStore.mode === 'pc' && settingsStore.toolbar.enableFullscreen" class="item" @click="toggle">
+      <span class="item" @click="toggle">
         <el-icon>
           <svg-icon :name="isFullscreen ? 'fullscreen-exit' : 'fullscreen'" />
         </el-icon>
       </span>
       <!-- 报警信息列表 -->
-      <span class="item">
+      <span v-if="proxy.hasPerm('/alarmnotice')" class="item">
         <el-popover width="390">
           <template #reference>
             <div>
diff --git a/src/layouts/components/Topbar/index.vue b/src/layouts/components/Topbar/index.vue
index 2863cef..4e3120e 100644
--- a/src/layouts/components/Topbar/index.vue
+++ b/src/layouts/components/Topbar/index.vue
@@ -67,7 +67,7 @@
           </transition-group>
         </el-breadcrumb>
       </div>
-      <tools />
+      <!-- <tools /> -->
     </div>
   </div>
 </template>
diff --git a/src/router/modules/pc.ts b/src/router/modules/pc.ts
index aacd6fa..97ced45 100644
--- a/src/router/modules/pc.ts
+++ b/src/router/modules/pc.ts
@@ -40,7 +40,7 @@
       icon: 'ep:key',
       sidebar: false,
       breadcrumb: false,
-      // auth: '/fullscreen',
+      auth: '/fullscreen',
     },
   },
   {
@@ -155,7 +155,7 @@
           sidebar: false,
           breadcrumb: false,
           activeMenu: '/well',
-          auth: '/well/detail',
+          auth: '/well',
         },
       },
     ],
diff --git a/src/views/home/alarm/count/components/locationAnalysis.vue b/src/views/home/alarm/count/components/locationAnalysis.vue
index fc75b9e..bff1853 100644
--- a/src/views/home/alarm/count/components/locationAnalysis.vue
+++ b/src/views/home/alarm/count/components/locationAnalysis.vue
@@ -46,6 +46,7 @@
   })
 }
 fetchData()
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -75,6 +76,9 @@
         <el-button type="primary" style="margin: 0 5px;" @click="fetchData">
           搜索
         </el-button>
+        <el-button v-if="proxy.hasPerm('/alarm/count/exportLocation')" type="primary" style="margin: 0 5px;">
+          导出
+        </el-button>
       </div>
     </template>
     <template #content>
diff --git a/src/views/home/alarm/current/components/detail.vue b/src/views/home/alarm/current/components/detail.vue
index dd3b31a..4204c92 100644
--- a/src/views/home/alarm/current/components/detail.vue
+++ b/src/views/home/alarm/current/components/detail.vue
@@ -111,7 +111,7 @@
   const res2 = await getAlarmTypeListPage({ offset: 1, limit: 9999 });
   ($route.query.type === 'history' ? getAlarmDetail : getAlarmDetail)($route.query.id as string).then((res) => {
     detailInfo.value = toHumpObject(res.data)
-    detailInfo.value.realAlarmName = detailInfo.value.realAlarm === '1' ? '报警' : '误报'
+    detailInfo.value.realAlarmName = detailInfo.value.realAlarm === '0' ? '是' : '否'
     detailInfo.value.alarmTypeName = res2.data.rows.filter((item: any) => item.id === detailInfo.value.alarmTypeId)[0]?.alarmType || ''
     detailInfo.value.alarmLevelName = res1.data.rows.filter((item: any) => item.id === detailInfo.value.alarmLevel)[0]?.alarmLevel || ''
     detailInfo.value.duration = detailInfo.value.ts && detailInfo.value.cancelTime ? getDateDiff(detailInfo.value.ts, detailInfo.value.cancelTime) : ''
@@ -139,6 +139,7 @@
 }
 // 点击经纬度展示地图
 const mapRef = ref()
+const { proxy } = getCurrentInstance() as any
 const showMap = (data: any) => {
   console.log(data, 'data')
   if (data.text === '位置') {
@@ -148,6 +149,13 @@
         2: 'StationMonitorDetail',
         3: 'PipelineMonitorDetail',
       } as { [key: string]: string }
+      // 判断是否有菜单权限
+      const watchObjectAuth = {
+        1: '/well',
+        2: '/station/monitor',
+        3: '/pipeline',
+      } as { [key: string]: string }
+      if (!proxy.hasPerm(watchObjectAuth[detailInfo.value.watchObject])) { return }
       $router.push({
         name: watchObject[detailInfo.value.watchObject],
         query: {
diff --git a/src/views/home/alarm/current/components/detailInfoDialog.vue b/src/views/home/alarm/current/components/detailInfoDialog.vue
index c089449..7fbf06b 100644
--- a/src/views/home/alarm/current/components/detailInfoDialog.vue
+++ b/src/views/home/alarm/current/components/detailInfoDialog.vue
@@ -114,6 +114,7 @@
   })
 }
 defineExpose({ initDialog, close })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -131,7 +132,7 @@
     <!-- 头部 -->
     <div class="header">
       <span>{{ info.alarmContent }}</span>
-      <span class="more" @click="moreData">>>更多</span>
+      <span v-if="proxy.hasPerm(type === 'data' ? '/alarm/current/more' : '/alarm/device/more')" class="more" @click="moreData">>>更多</span>
     </div>
     <div class="content">
       <div v-show="type === 'device'" class="item">
@@ -162,7 +163,7 @@
         报警设备:
         <span style="padding-left: 6px;">{{ info.devcode }} </span>
         <el-button
-          v-if="info.devTypeName === '燃气智能监测终端' || info.devTypeName === '液位检测仪' || info.devTypeName === '井盖监测仪'"
+          v-if="(info.devTypeName === '燃气智能监测终端' || info.devTypeName === '液位检测仪' || info.devTypeName === '井盖监测仪') && proxy.hasPerm('/alarm/current/data')"
           size="small" style="margin-left: 6px;" @click="viewData"
         >
           查看数据
@@ -228,7 +229,7 @@
         <span style="padding-left: 6px;">
           {{ info.confirmContent }}
         </span>
-        <el-button v-if="type === 'data'" size="small" style="padding-left: 6px;" @click="viewProcess">
+        <el-button v-if="type === 'data' && proxy.hasPerm('/alarm/current/process')" size="small" style="padding-left: 6px;" @click="viewProcess">
           流程图
         </el-button>
       </div>
@@ -246,17 +247,17 @@
       </div>
     </div>
     <div class="footer">
-      <el-button v-if="Number(info.processStatus) < 4 && type === 'data'" size="small" @click="remind">
+      <el-button v-if="(Number(info.processStatus) < 4 && type === 'data') && proxy.hasPerm('/alarm/current/remind')" size="small" @click="remind">
         提醒责任人
       </el-button>
       <el-button
-        v-if="type === 'device' && (info.processStatusName === '待处置' || info.processStatusName === '挂起')"
+        v-if="(type === 'device' && (info.processStatusName === '待处置' || info.processStatusName === '挂起')) && proxy.hasPerm('/alarm/device/handler')"
         size="small" @click="handler"
       >
         报警处置
       </el-button>
       <el-button
-        v-if="Number(info.processStatus) <= 3 || (type === 'device' && info.processStatusName === '待处置') || info.processStatusName === '挂起'"
+        v-if="(Number(info.processStatus) <= 3 || (type === 'device' && info.processStatusName === '待处置') || info.processStatusName === '挂起') && proxy.hasPerm(type === 'device' ? '/alarm/device/pending' : '/alarm/current/pending')"
         type="primary" size="small" @click="pending"
       >
         挂起
diff --git a/src/views/home/alarm/current/index.vue b/src/views/home/alarm/current/index.vue
index d019bbf..e2714bb 100644
--- a/src/views/home/alarm/current/index.vue
+++ b/src/views/home/alarm/current/index.vue
@@ -4,6 +4,7 @@
   Date: 2023-06-28
  -->
 <script lang="ts" setup name="CurrentAlarm">
+import dayjs from 'dayjs'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import { ArrowLeftBold, ArrowRightBold } from '@element-plus/icons-vue'
 import MapCom from './components/map.vue'
@@ -100,6 +101,7 @@
       path: '/alarm/current',
     })
   }
+  datetimerange.value = []
   listQuery.value = {
     limit: 20,
     offset: 1,
@@ -131,8 +133,8 @@
   if ($route.query.row) {
     loadingTable.value = true
     const row = JSON.parse($route.query.row as string)
-    getCurrentAlarmListPage({ offset: 1, limit: 99999 }).then((res) => {
-      const data = res.data.rows.filter((item: any) => item.id === row.id)
+    getCurrentAlarmListPage({ offset: 1, limit: 50 }).then((res) => {
+      const data = res.data.rows.filter((item: any) => item.id === row.alarmId)
       if (data.length) {
         list1.value = data.map((item: any) => ({
           ...item,
@@ -153,7 +155,10 @@
     })
     return
   }
-  fetchData()
+  datetimerange.value = [dayjs().subtract(7, 'day').format('YYYY-MM-DD HH:mm:ss'), dayjs().format('YYYY-MM-DD HH:mm:ss')]
+  setTimeout(() => {
+    fetchData()
+  })
 })
 // 表格标识  地图或普通
 const tableFlag = ref('normal')
@@ -181,6 +186,10 @@
 const mapRef = ref()
 const mapData = ref({})
 async function detail(row: any) {
+  if (row.processStatusName === '未读') {
+    list1.value[list1.value.findIndex((item: any) => item.id === row.id)].processStatusName = '已读'
+    row.processStatusName = '已读'
+  }
   const res = await detailAlarm(row.id)
   const data = toHumpObject(res.data)
   mapData.value = row
@@ -362,7 +371,7 @@
               <el-button v-if="proxy.hasPerm('/alarm/current/delete')" type="primary" @click="batchDeleteRow">
                 批量删除
               </el-button>
-              <el-button type="primary" @click="exportList">
+              <el-button v-if="proxy.hasPerm('/alarm/current/export')" type="primary" @click="exportList">
                 导出
               </el-button>
             </div>
@@ -383,7 +392,7 @@
               </el-table-column>
             </template>
             <template #columns>
-              <el-table-column label="操作" align="center" width="80">
+              <el-table-column v-if="proxy.hasPerm('/alarm/current/detail')" label="操作" align="center" width="80">
                 <template #default="scope">
                   <el-button type="primary" link size="small" @click="detail(scope.row)">
                     查看
diff --git a/src/views/home/alarm/history/index.vue b/src/views/home/alarm/history/index.vue
index eeb49fc..3c810c3 100644
--- a/src/views/home/alarm/history/index.vue
+++ b/src/views/home/alarm/history/index.vue
@@ -97,6 +97,7 @@
 }
 // 重置查询条件f
 const reset = () => {
+  datetimerange.value = []
   listQuery.value = {
     limit: 20,
     offset: 1,
@@ -189,6 +190,7 @@
   })
 }
 fetchDict()
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -249,7 +251,7 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="exportList">
+          <el-button v-if="proxy.hasPerm('/alarm/history/export')" type="primary" @click="exportList">
             导出
           </el-button>
         </div>
@@ -272,7 +274,7 @@
           </el-table-column>
         </template>
         <template #columns>
-          <el-table-column label="操作" align="center" width="80">
+          <el-table-column v-if="proxy.hasPerm('/alarm/history/detail')" label="操作" align="center" width="80">
             <template #default="scope">
               <el-button type="primary" link size="small" @click="moreData(scope.row)">
                 查看
diff --git a/src/views/home/dashboard/index.vue b/src/views/home/dashboard/index.vue
index d2f7e3c..42dfbed 100644
--- a/src/views/home/dashboard/index.vue
+++ b/src/views/home/dashboard/index.vue
@@ -42,7 +42,7 @@
     value: '0',
     name: '在线',
     unit: '个',
-    id: '1',
+    id: '1,2',
   },
   {
     img: img.lixian,
@@ -56,7 +56,7 @@
     value: '0',
     name: '停用',
     unit: '个',
-    id: '2',
+    id: '3',
   },
 ])
 // 工作台数据
@@ -133,7 +133,11 @@
   deviceOperationLoading.value = true
   getDeviceStatus().then((res) => {
     res.data.forEach((element: any) => {
-      const index = deviceOperationData.value.findIndex((item: any) => item.id === element.name)
+      if (element.name === '1' || element.name === '2') {
+        deviceOperationData.value[0].value = Number(deviceOperationData.value[0].value || '0') + Number(element.value)
+        return
+      }
+      const index = deviceOperationData.value.findIndex((item: any) => item.id.includes(element.name))
       if (index !== -1) {
         deviceOperationData.value[index].value = element.value
       }
diff --git a/src/views/home/device/count/components/bottom.vue b/src/views/home/device/count/components/bottom.vue
index 28a4d78..e4e56fa 100644
--- a/src/views/home/device/count/components/bottom.vue
+++ b/src/views/home/device/count/components/bottom.vue
@@ -110,6 +110,7 @@
   })
 }
 fetchDict()
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -148,7 +149,7 @@
             <template #btns-right>
               <!-- 操作 -->
               <div>
-                <el-button type="primary">
+                <el-button v-if="proxy.hasPerm('/device/count/offline/export')" type="primary">
                   导出
                 </el-button>
               </div>
diff --git a/src/views/home/device/device/index.vue b/src/views/home/device/device/index.vue
index c3970b9..9cdd606 100644
--- a/src/views/home/device/device/index.vue
+++ b/src/views/home/device/device/index.vue
@@ -88,6 +88,7 @@
 }
 // 重置查询条件f
 const reset = () => {
+  datetimerange.value = []
   listQuery.value = {
     limit: 20,
     offset: 1,
@@ -296,6 +297,7 @@
   fetchDict()
   fetchData()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -372,17 +374,17 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="editRow('add', {})">
+          <el-button v-if="proxy.hasPerm('/device/manage/add')" type="primary" @click="editRow('add', {})">
             新建
           </el-button>
-          <el-button type="primary" @click="downloadTemplate">
+          <el-button v-if="proxy.hasPerm('/device/manage/down')" type="primary" @click="downloadTemplate">
             模板下载
           </el-button>
-          <el-button type="primary" @click="importList">
+          <el-button v-if="proxy.hasPerm('/device/manage/import')" type="primary" @click="importList">
             批量导入
           </el-button>
-          <el-button type="primary" @click="exportList">
-            导出列表
+          <el-button v-if="proxy.hasPerm('/device/manage/export')" type="primary" @click="exportList">
+            导出
           </el-button>
           <input ref="fileRef" style="display: none;" type="file" accept=".xls,.xlsx" @change="onFileChange">
         </div>
@@ -409,16 +411,16 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="150">
             <template #default="scope">
-              <el-button type="primary" link size="small" @click="editRow('detail', scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/manage/detail')" type="primary" link size="small" @click="editRow('detail', scope.row)">
                 查看
               </el-button>
-              <el-button type="primary" link size="small" @click="editRow('edit', scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/manage/update')" type="primary" link size="small" @click="editRow('edit', scope.row)">
                 编辑
               </el-button>
-              <el-button type="danger" link size="small" @click="changeDefense(scope.row)">
+              <!-- <el-button v-if="proxy.hasPerm('/device/manage/add')" type="danger" link size="small" @click="changeDefense(scope.row)">
                 撤防
-              </el-button>
-              <el-button type="danger" link size="small" @click="removeRow(scope.row)">
+              </el-button> -->
+              <el-button v-if="proxy.hasPerm('/device/manage/delete')" type="danger" link size="small" @click="removeRow(scope.row)">
                 删除
               </el-button>
             </template>
diff --git a/src/views/home/device/instruction/index.vue b/src/views/home/device/instruction/index.vue
index 1e598ed..1da6706 100644
--- a/src/views/home/device/instruction/index.vue
+++ b/src/views/home/device/instruction/index.vue
@@ -78,6 +78,7 @@
 }
 // 重置查询条件f
 const reset = () => {
+  datetimerange.value = []
   listQuery.value = {
     limit: 20,
     offset: 1,
@@ -158,6 +159,7 @@
     editRef.value.initDialog('addOther', {})
   }
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -213,10 +215,10 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary">
+          <el-button v-if="proxy.hasPerm('/device/instruction/batch')" type="primary">
             批量下发
           </el-button>
-          <el-button type="primary" @click="editRow('add', {})">
+          <el-button v-if="proxy.hasPerm('/device/instruction/add')" type="primary" @click="editRow('add', {})">
             新建
           </el-button>
         </div>
@@ -236,13 +238,13 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="120">
             <template #default="scope">
-              <el-button type="primary" link size="small" @click="editRow('detail', scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/instruction/detail')" type="primary" link size="small" @click="editRow('detail', scope.row)">
                 查看
               </el-button>
-              <el-button v-if="scope.row.status === '2'" type="primary" link size="small" @click="editRow('edit', scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/instruction/again') && scope.row.status === '2'" type="primary" link size="small" @click="editRow('edit', scope.row)">
                 重新下发
               </el-button>
-              <el-button type="danger" link size="small" @click="removeRow(scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/instruction/delete')" type="danger" link size="small" @click="removeRow(scope.row)">
                 删除
               </el-button>
             </template>
diff --git a/src/views/home/device/product/index.vue b/src/views/home/device/product/index.vue
index 799fc90..fdd5463 100644
--- a/src/views/home/device/product/index.vue
+++ b/src/views/home/device/product/index.vue
@@ -128,6 +128,7 @@
   await fetchDict()
   fetchData()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -164,7 +165,7 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="editRow('add', {})">
+          <el-button v-if="proxy.hasPerm('/device/product/add')" type="primary" @click="editRow('add', {})">
             新建
           </el-button>
         </div>
@@ -184,10 +185,10 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="120">
             <template #default="scope">
-              <el-button type="primary" link size="small" @click="editRow('edit', scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/product/update')" type="primary" link size="small" @click="editRow('edit', scope.row)">
                 编辑
               </el-button>
-              <el-button type="danger" link size="small" @click="removeRow(scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/product/delete')" type="danger" link size="small" @click="removeRow(scope.row)">
                 删除
               </el-button>
             </template>
diff --git a/src/views/home/device/type/index.vue b/src/views/home/device/type/index.vue
index 59f1343..2344e57 100644
--- a/src/views/home/device/type/index.vue
+++ b/src/views/home/device/type/index.vue
@@ -105,6 +105,7 @@
   await fetchDict()
   fetchData()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -131,7 +132,7 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="editRow('add', {})">
+          <el-button v-if="proxy.hasPerm('/device/type/add')" type="primary" @click="editRow('add', {})">
             新建
           </el-button>
         </div>
@@ -151,10 +152,10 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="120">
             <template #default="scope">
-              <el-button type="primary" link size="small" @click="editRow('edit', scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/type/update')" type="primary" link size="small" @click="editRow('edit', scope.row)">
                 编辑
               </el-button>
-              <el-button type="danger" link size="small" @click="removeRow(scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/type/delete')" type="danger" link size="small" @click="removeRow(scope.row)">
                 删除
               </el-button>
             </template>
diff --git a/src/views/home/ledger/ledger/components/gridList.vue b/src/views/home/ledger/ledger/components/gridList.vue
index d03cd9f..189edef 100644
--- a/src/views/home/ledger/ledger/components/gridList.vue
+++ b/src/views/home/ledger/ledger/components/gridList.vue
@@ -91,6 +91,7 @@
     // })
   })
 }
+const { proxy } = getCurrentInstance() as any
 // 同步日志
 const allSync = () => {
   $router.push({
@@ -139,10 +140,10 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="allSync">
+          <el-button v-if="proxy.hasPerm('/ledger/sync')" type="primary" @click="allSync">
             同步日志
           </el-button>
-          <el-button type="primary" @click="sync('all', {})">
+          <el-button v-if="proxy.hasPerm('/ledger/sync/all')" type="primary" @click="sync('all', {})">
             全量同步
           </el-button>
         </div>
@@ -160,9 +161,9 @@
           </el-table-column>
         </template>
         <template #columns>
-          <el-table-column label="操作" align="center" width="80">
+          <el-table-column v-if="proxy.hasPerm('/ledger/sync/single')" label="操作" align="center" width="80">
             <template #default="scope">
-              <el-button type="primary" link size="small" @click="sync('single', scope.row)">
+              <el-button v-if="proxy.hasPerm('/ledger/sync/single')" type="primary" link size="small" @click="sync('single', scope.row)">
                 同步
               </el-button>
             </template>
diff --git a/src/views/home/ledger/ledger/components/wellList.vue b/src/views/home/ledger/ledger/components/wellList.vue
index 9eb1f43..06f855a 100644
--- a/src/views/home/ledger/ledger/components/wellList.vue
+++ b/src/views/home/ledger/ledger/components/wellList.vue
@@ -123,6 +123,7 @@
   // await fetchDict()
   fetchData()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -159,11 +160,11 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="allSync">
+          <el-button v-if="proxy.hasPerm('/ledger/sync')" type="primary" @click="allSync">
             同步日志
           </el-button>
-          <el-button type="primary" @click="sync('all', {})">
-            全部同步
+          <el-button v-if="proxy.hasPerm('/ledger/sync/all')" type="primary" @click="sync('all', {})">
+            全量同步
           </el-button>
         </div>
       </template>
@@ -180,9 +181,9 @@
           </el-table-column>
         </template>
         <template #columns>
-          <el-table-column label="操作" align="center" width="80">
+          <el-table-column v-if="proxy.hasPerm('/ledger/sync/single')" label="操作" align="center" width="80">
             <template #default="scope">
-              <el-button type="primary" link size="small" @click="sync('single', scope.row)">
+              <el-button v-if="proxy.hasPerm('/ledger/sync/single')" type="primary" link size="small" @click="sync('single', scope.row)">
                 同步
               </el-button>
             </template>
diff --git a/src/views/home/ledger/ledger/index.vue b/src/views/home/ledger/ledger/index.vue
index a03aa12..8403fc5 100644
--- a/src/views/home/ledger/ledger/index.vue
+++ b/src/views/home/ledger/ledger/index.vue
@@ -7,7 +7,16 @@
 import type { TabsPaneContext } from 'element-plus'
 import wellList from './components/wellList.vue'
 import gridList from './components/gridList.vue'
-const activeName = ref('闸井')
+const { proxy } = getCurrentInstance() as any
+const activeName = ref(
+  proxy.hasPerm('/ledger/manage/well')
+    ? '闸井'
+    : proxy.hasPerm('/ledger/manage/station')
+      ? '场站'
+      : proxy.hasPerm('/ledger/manage/grid')
+        ? '网格'
+        : '',
+)
 const handleClick = (tab: TabsPaneContext, event: Event) => {
   // console.log(tab, event)
 }
@@ -17,13 +26,13 @@
   <!-- 布局 -->
   <app-container>
     <el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick">
-      <el-tab-pane label="闸井" name="闸井">
+      <el-tab-pane v-if="proxy.hasPerm('/ledger/manage/well')" label="闸井" name="闸井">
         <well-list v-if="activeName === '闸井'" type="1" />
       </el-tab-pane>
-      <el-tab-pane label="场站" name="场站">
+      <el-tab-pane v-if="proxy.hasPerm('/ledger/manage/station')" label="场站" name="场站">
         <well-list v-if="activeName === '场站'" type="2" />
       </el-tab-pane>
-      <el-tab-pane label="网格" name="网格">
+      <el-tab-pane v-if="proxy.hasPerm('/ledger/manage/grid')" label="网格" name="网格">
         <grid-list v-if="activeName === '网格'" />
       </el-tab-pane>
     </el-tabs>

diff --git a/src/App.vue b/src/App.vue
index cde81b3..8a00f5d 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -125,7 +125,7 @@
         '--g-sub-sidebar-actual-width': subSidebarActualWidth,
       }"
     />
-    <system-info v-if="browserType !== 'mobile'" />
+    <!-- <system-info v-if="browserType !== 'mobile'" /> -->
     <audio id="eventAudio" src="" autoplay />
   </el-config-provider>
 </template>
diff --git a/src/layouts/components/Tools/alarmDialog.vue b/src/layouts/components/Tools/alarmDialog.vue
index 1828375..df89ab8 100644
--- a/src/layouts/components/Tools/alarmDialog.vue
+++ b/src/layouts/components/Tools/alarmDialog.vue
@@ -116,7 +116,7 @@
     </div>
     <template #footer>
       <div class="dialog-footer">
-        <div class="btn" @click="detail">
+        <div v-if="proxy.hasPerm('/alarm/current')" class="btn" @click="detail">
           查看
         </div>
         <div v-if="info.isSound === '1'" class="btn" @click="closeSound">
diff --git a/src/layouts/components/Tools/alarmList.vue b/src/layouts/components/Tools/alarmList.vue
index c3a9d2a..5356b74 100644
--- a/src/layouts/components/Tools/alarmList.vue
+++ b/src/layouts/components/Tools/alarmList.vue
@@ -54,6 +54,7 @@
 }
 // 查看当前行
 const detailRow = (row: any) => {
+  if (!proxy.hasPerm('/alarm/current')) { return }
   $router.push({
     name: 'AlarmCurrent',
     query: {
@@ -77,21 +78,6 @@
   localStorage.setItem('eventAudio', 'pause')
 }
 const dialogRef = ref()
-// const dialog = () => {
-//   const row = {
-//     alarmNoteMethod: '1', // 消息提醒 1:弹窗，2:消息提醒
-//     isSound: '1', // 报警音效，1:开，0:关
-//     isSend: '1', // 报警推送，1:开，0:关
-//     isText: '1', // 报警短息，1:开，0:关
-//     alarmType: '浓度超限',
-//     tagNumber: 'NX5702',
-//     alarmTime: '2024-09-09',
-//     value: '20',
-//     typeName: '燃气智能终端',
-//     alarmLevel: '一级',
-//   }
-//   dialogRef.value.initDialog(row)
-// }
 const fetchData = (isLoading = false) => {
   loading.value = true
   if (isLoading) {
@@ -115,7 +101,10 @@
       dialogRef.value.initDialog(newVal)
     }
     if (newVal.isSound === '1') {
-      play()
+      // play()
+      if (!localStorage.getItem('eventAudio')) {
+        proxy.playAudio()
+      }
     }
     fetchData(false)
   }
@@ -146,6 +135,7 @@
 //     window.localStorage.removeItem('token')
 //   }
 // }
+// const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -180,7 +170,7 @@
                   {{ message.processStatus
                     === '未读' ? '未读' : '已读' }}
                 </el-tag>
-                <el-tag type="info" size="small" style="margin-left: 5px;">
+                <el-tag type="info" size="small" style="margin-left: 5px;" @click="detailRow(message)">
                   查看
                 </el-tag>
               </div>
@@ -214,7 +204,7 @@
       <!-- <div class="close" @click="dialog">
         弹窗
       </div> -->
-      <div class="more" @click="moreList">
+      <div v-if="proxy.hasPerm('/alarm/current')" class="more" @click="moreList">
         查看更多
       </div>
     </div>
diff --git a/src/layouts/components/Tools/index.vue b/src/layouts/components/Tools/index.vue
index 9f2d41f..61f9707 100644
--- a/src/layouts/components/Tools/index.vue
+++ b/src/layouts/components/Tools/index.vue
@@ -79,6 +79,7 @@
   // 断开 websocket
   // websocket.destroyWebSocket()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -89,18 +90,18 @@
           <svg-icon name="ep:search" />
         </el-icon>
       </span>
-      <span class="item" @click="board">
+      <span v-if="proxy.hasPerm('/fullscreen')" class="item" @click="board">
         <el-icon>
           <svg-icon name="ep:data-line" />
         </el-icon>
       </span>
-      <span v-if="settingsStore.mode === 'pc' && settingsStore.toolbar.enableFullscreen" class="item" @click="toggle">
+      <span class="item" @click="toggle">
         <el-icon>
           <svg-icon :name="isFullscreen ? 'fullscreen-exit' : 'fullscreen'" />
         </el-icon>
       </span>
       <!-- 报警信息列表 -->
-      <span class="item">
+      <span v-if="proxy.hasPerm('/alarmnotice')" class="item">
         <el-popover width="390">
           <template #reference>
             <div>
diff --git a/src/layouts/components/Topbar/index.vue b/src/layouts/components/Topbar/index.vue
index 2863cef..4e3120e 100644
--- a/src/layouts/components/Topbar/index.vue
+++ b/src/layouts/components/Topbar/index.vue
@@ -67,7 +67,7 @@
           </transition-group>
         </el-breadcrumb>
       </div>
-      <tools />
+      <!-- <tools /> -->
     </div>
   </div>
 </template>
diff --git a/src/router/modules/pc.ts b/src/router/modules/pc.ts
index aacd6fa..97ced45 100644
--- a/src/router/modules/pc.ts
+++ b/src/router/modules/pc.ts
@@ -40,7 +40,7 @@
       icon: 'ep:key',
       sidebar: false,
       breadcrumb: false,
-      // auth: '/fullscreen',
+      auth: '/fullscreen',
     },
   },
   {
@@ -155,7 +155,7 @@
           sidebar: false,
           breadcrumb: false,
           activeMenu: '/well',
-          auth: '/well/detail',
+          auth: '/well',
         },
       },
     ],
diff --git a/src/views/home/alarm/count/components/locationAnalysis.vue b/src/views/home/alarm/count/components/locationAnalysis.vue
index fc75b9e..bff1853 100644
--- a/src/views/home/alarm/count/components/locationAnalysis.vue
+++ b/src/views/home/alarm/count/components/locationAnalysis.vue
@@ -46,6 +46,7 @@
   })
 }
 fetchData()
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -75,6 +76,9 @@
         <el-button type="primary" style="margin: 0 5px;" @click="fetchData">
           搜索
         </el-button>
+        <el-button v-if="proxy.hasPerm('/alarm/count/exportLocation')" type="primary" style="margin: 0 5px;">
+          导出
+        </el-button>
       </div>
     </template>
     <template #content>
diff --git a/src/views/home/alarm/current/components/detail.vue b/src/views/home/alarm/current/components/detail.vue
index dd3b31a..4204c92 100644
--- a/src/views/home/alarm/current/components/detail.vue
+++ b/src/views/home/alarm/current/components/detail.vue
@@ -111,7 +111,7 @@
   const res2 = await getAlarmTypeListPage({ offset: 1, limit: 9999 });
   ($route.query.type === 'history' ? getAlarmDetail : getAlarmDetail)($route.query.id as string).then((res) => {
     detailInfo.value = toHumpObject(res.data)
-    detailInfo.value.realAlarmName = detailInfo.value.realAlarm === '1' ? '报警' : '误报'
+    detailInfo.value.realAlarmName = detailInfo.value.realAlarm === '0' ? '是' : '否'
     detailInfo.value.alarmTypeName = res2.data.rows.filter((item: any) => item.id === detailInfo.value.alarmTypeId)[0]?.alarmType || ''
     detailInfo.value.alarmLevelName = res1.data.rows.filter((item: any) => item.id === detailInfo.value.alarmLevel)[0]?.alarmLevel || ''
     detailInfo.value.duration = detailInfo.value.ts && detailInfo.value.cancelTime ? getDateDiff(detailInfo.value.ts, detailInfo.value.cancelTime) : ''
@@ -139,6 +139,7 @@
 }
 // 点击经纬度展示地图
 const mapRef = ref()
+const { proxy } = getCurrentInstance() as any
 const showMap = (data: any) => {
   console.log(data, 'data')
   if (data.text === '位置') {
@@ -148,6 +149,13 @@
         2: 'StationMonitorDetail',
         3: 'PipelineMonitorDetail',
       } as { [key: string]: string }
+      // 判断是否有菜单权限
+      const watchObjectAuth = {
+        1: '/well',
+        2: '/station/monitor',
+        3: '/pipeline',
+      } as { [key: string]: string }
+      if (!proxy.hasPerm(watchObjectAuth[detailInfo.value.watchObject])) { return }
       $router.push({
         name: watchObject[detailInfo.value.watchObject],
         query: {
diff --git a/src/views/home/alarm/current/components/detailInfoDialog.vue b/src/views/home/alarm/current/components/detailInfoDialog.vue
index c089449..7fbf06b 100644
--- a/src/views/home/alarm/current/components/detailInfoDialog.vue
+++ b/src/views/home/alarm/current/components/detailInfoDialog.vue
@@ -114,6 +114,7 @@
   })
 }
 defineExpose({ initDialog, close })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -131,7 +132,7 @@
     <!-- 头部 -->
     <div class="header">
       <span>{{ info.alarmContent }}</span>
-      <span class="more" @click="moreData">>>更多</span>
+      <span v-if="proxy.hasPerm(type === 'data' ? '/alarm/current/more' : '/alarm/device/more')" class="more" @click="moreData">>>更多</span>
     </div>
     <div class="content">
       <div v-show="type === 'device'" class="item">
@@ -162,7 +163,7 @@
         报警设备:
         <span style="padding-left: 6px;">{{ info.devcode }} </span>
         <el-button
-          v-if="info.devTypeName === '燃气智能监测终端' || info.devTypeName === '液位检测仪' || info.devTypeName === '井盖监测仪'"
+          v-if="(info.devTypeName === '燃气智能监测终端' || info.devTypeName === '液位检测仪' || info.devTypeName === '井盖监测仪') && proxy.hasPerm('/alarm/current/data')"
           size="small" style="margin-left: 6px;" @click="viewData"
         >
           查看数据
@@ -228,7 +229,7 @@
         <span style="padding-left: 6px;">
           {{ info.confirmContent }}
         </span>
-        <el-button v-if="type === 'data'" size="small" style="padding-left: 6px;" @click="viewProcess">
+        <el-button v-if="type === 'data' && proxy.hasPerm('/alarm/current/process')" size="small" style="padding-left: 6px;" @click="viewProcess">
           流程图
         </el-button>
       </div>
@@ -246,17 +247,17 @@
       </div>
     </div>
     <div class="footer">
-      <el-button v-if="Number(info.processStatus) < 4 && type === 'data'" size="small" @click="remind">
+      <el-button v-if="(Number(info.processStatus) < 4 && type === 'data') && proxy.hasPerm('/alarm/current/remind')" size="small" @click="remind">
         提醒责任人
       </el-button>
       <el-button
-        v-if="type === 'device' && (info.processStatusName === '待处置' || info.processStatusName === '挂起')"
+        v-if="(type === 'device' && (info.processStatusName === '待处置' || info.processStatusName === '挂起')) && proxy.hasPerm('/alarm/device/handler')"
         size="small" @click="handler"
       >
         报警处置
       </el-button>
       <el-button
-        v-if="Number(info.processStatus) <= 3 || (type === 'device' && info.processStatusName === '待处置') || info.processStatusName === '挂起'"
+        v-if="(Number(info.processStatus) <= 3 || (type === 'device' && info.processStatusName === '待处置') || info.processStatusName === '挂起') && proxy.hasPerm(type === 'device' ? '/alarm/device/pending' : '/alarm/current/pending')"
         type="primary" size="small" @click="pending"
       >
         挂起
diff --git a/src/views/home/alarm/current/index.vue b/src/views/home/alarm/current/index.vue
index d019bbf..e2714bb 100644
--- a/src/views/home/alarm/current/index.vue
+++ b/src/views/home/alarm/current/index.vue
@@ -4,6 +4,7 @@
   Date: 2023-06-28
  -->
 <script lang="ts" setup name="CurrentAlarm">
+import dayjs from 'dayjs'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import { ArrowLeftBold, ArrowRightBold } from '@element-plus/icons-vue'
 import MapCom from './components/map.vue'
@@ -100,6 +101,7 @@
       path: '/alarm/current',
     })
   }
+  datetimerange.value = []
   listQuery.value = {
     limit: 20,
     offset: 1,
@@ -131,8 +133,8 @@
   if ($route.query.row) {
     loadingTable.value = true
     const row = JSON.parse($route.query.row as string)
-    getCurrentAlarmListPage({ offset: 1, limit: 99999 }).then((res) => {
-      const data = res.data.rows.filter((item: any) => item.id === row.id)
+    getCurrentAlarmListPage({ offset: 1, limit: 50 }).then((res) => {
+      const data = res.data.rows.filter((item: any) => item.id === row.alarmId)
       if (data.length) {
         list1.value = data.map((item: any) => ({
           ...item,
@@ -153,7 +155,10 @@
     })
     return
   }
-  fetchData()
+  datetimerange.value = [dayjs().subtract(7, 'day').format('YYYY-MM-DD HH:mm:ss'), dayjs().format('YYYY-MM-DD HH:mm:ss')]
+  setTimeout(() => {
+    fetchData()
+  })
 })
 // 表格标识  地图或普通
 const tableFlag = ref('normal')
@@ -181,6 +186,10 @@
 const mapRef = ref()
 const mapData = ref({})
 async function detail(row: any) {
+  if (row.processStatusName === '未读') {
+    list1.value[list1.value.findIndex((item: any) => item.id === row.id)].processStatusName = '已读'
+    row.processStatusName = '已读'
+  }
   const res = await detailAlarm(row.id)
   const data = toHumpObject(res.data)
   mapData.value = row
@@ -362,7 +371,7 @@
               <el-button v-if="proxy.hasPerm('/alarm/current/delete')" type="primary" @click="batchDeleteRow">
                 批量删除
               </el-button>
-              <el-button type="primary" @click="exportList">
+              <el-button v-if="proxy.hasPerm('/alarm/current/export')" type="primary" @click="exportList">
                 导出
               </el-button>
             </div>
@@ -383,7 +392,7 @@
               </el-table-column>
             </template>
             <template #columns>
-              <el-table-column label="操作" align="center" width="80">
+              <el-table-column v-if="proxy.hasPerm('/alarm/current/detail')" label="操作" align="center" width="80">
                 <template #default="scope">
                   <el-button type="primary" link size="small" @click="detail(scope.row)">
                     查看
diff --git a/src/views/home/alarm/history/index.vue b/src/views/home/alarm/history/index.vue
index eeb49fc..3c810c3 100644
--- a/src/views/home/alarm/history/index.vue
+++ b/src/views/home/alarm/history/index.vue
@@ -97,6 +97,7 @@
 }
 // 重置查询条件f
 const reset = () => {
+  datetimerange.value = []
   listQuery.value = {
     limit: 20,
     offset: 1,
@@ -189,6 +190,7 @@
   })
 }
 fetchDict()
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -249,7 +251,7 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="exportList">
+          <el-button v-if="proxy.hasPerm('/alarm/history/export')" type="primary" @click="exportList">
             导出
           </el-button>
         </div>
@@ -272,7 +274,7 @@
           </el-table-column>
         </template>
         <template #columns>
-          <el-table-column label="操作" align="center" width="80">
+          <el-table-column v-if="proxy.hasPerm('/alarm/history/detail')" label="操作" align="center" width="80">
             <template #default="scope">
               <el-button type="primary" link size="small" @click="moreData(scope.row)">
                 查看
diff --git a/src/views/home/dashboard/index.vue b/src/views/home/dashboard/index.vue
index d2f7e3c..42dfbed 100644
--- a/src/views/home/dashboard/index.vue
+++ b/src/views/home/dashboard/index.vue
@@ -42,7 +42,7 @@
     value: '0',
     name: '在线',
     unit: '个',
-    id: '1',
+    id: '1,2',
   },
   {
     img: img.lixian,
@@ -56,7 +56,7 @@
     value: '0',
     name: '停用',
     unit: '个',
-    id: '2',
+    id: '3',
   },
 ])
 // 工作台数据
@@ -133,7 +133,11 @@
   deviceOperationLoading.value = true
   getDeviceStatus().then((res) => {
     res.data.forEach((element: any) => {
-      const index = deviceOperationData.value.findIndex((item: any) => item.id === element.name)
+      if (element.name === '1' || element.name === '2') {
+        deviceOperationData.value[0].value = Number(deviceOperationData.value[0].value || '0') + Number(element.value)
+        return
+      }
+      const index = deviceOperationData.value.findIndex((item: any) => item.id.includes(element.name))
       if (index !== -1) {
         deviceOperationData.value[index].value = element.value
       }
diff --git a/src/views/home/device/count/components/bottom.vue b/src/views/home/device/count/components/bottom.vue
index 28a4d78..e4e56fa 100644
--- a/src/views/home/device/count/components/bottom.vue
+++ b/src/views/home/device/count/components/bottom.vue
@@ -110,6 +110,7 @@
   })
 }
 fetchDict()
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -148,7 +149,7 @@
             <template #btns-right>
               <!-- 操作 -->
               <div>
-                <el-button type="primary">
+                <el-button v-if="proxy.hasPerm('/device/count/offline/export')" type="primary">
                   导出
                 </el-button>
               </div>
diff --git a/src/views/home/device/device/index.vue b/src/views/home/device/device/index.vue
index c3970b9..9cdd606 100644
--- a/src/views/home/device/device/index.vue
+++ b/src/views/home/device/device/index.vue
@@ -88,6 +88,7 @@
 }
 // 重置查询条件f
 const reset = () => {
+  datetimerange.value = []
   listQuery.value = {
     limit: 20,
     offset: 1,
@@ -296,6 +297,7 @@
   fetchDict()
   fetchData()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -372,17 +374,17 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="editRow('add', {})">
+          <el-button v-if="proxy.hasPerm('/device/manage/add')" type="primary" @click="editRow('add', {})">
             新建
           </el-button>
-          <el-button type="primary" @click="downloadTemplate">
+          <el-button v-if="proxy.hasPerm('/device/manage/down')" type="primary" @click="downloadTemplate">
             模板下载
           </el-button>
-          <el-button type="primary" @click="importList">
+          <el-button v-if="proxy.hasPerm('/device/manage/import')" type="primary" @click="importList">
             批量导入
           </el-button>
-          <el-button type="primary" @click="exportList">
-            导出列表
+          <el-button v-if="proxy.hasPerm('/device/manage/export')" type="primary" @click="exportList">
+            导出
           </el-button>
           <input ref="fileRef" style="display: none;" type="file" accept=".xls,.xlsx" @change="onFileChange">
         </div>
@@ -409,16 +411,16 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="150">
             <template #default="scope">
-              <el-button type="primary" link size="small" @click="editRow('detail', scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/manage/detail')" type="primary" link size="small" @click="editRow('detail', scope.row)">
                 查看
               </el-button>
-              <el-button type="primary" link size="small" @click="editRow('edit', scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/manage/update')" type="primary" link size="small" @click="editRow('edit', scope.row)">
                 编辑
               </el-button>
-              <el-button type="danger" link size="small" @click="changeDefense(scope.row)">
+              <!-- <el-button v-if="proxy.hasPerm('/device/manage/add')" type="danger" link size="small" @click="changeDefense(scope.row)">
                 撤防
-              </el-button>
-              <el-button type="danger" link size="small" @click="removeRow(scope.row)">
+              </el-button> -->
+              <el-button v-if="proxy.hasPerm('/device/manage/delete')" type="danger" link size="small" @click="removeRow(scope.row)">
                 删除
               </el-button>
             </template>
diff --git a/src/views/home/device/instruction/index.vue b/src/views/home/device/instruction/index.vue
index 1e598ed..1da6706 100644
--- a/src/views/home/device/instruction/index.vue
+++ b/src/views/home/device/instruction/index.vue
@@ -78,6 +78,7 @@
 }
 // 重置查询条件f
 const reset = () => {
+  datetimerange.value = []
   listQuery.value = {
     limit: 20,
     offset: 1,
@@ -158,6 +159,7 @@
     editRef.value.initDialog('addOther', {})
   }
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -213,10 +215,10 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary">
+          <el-button v-if="proxy.hasPerm('/device/instruction/batch')" type="primary">
             批量下发
           </el-button>
-          <el-button type="primary" @click="editRow('add', {})">
+          <el-button v-if="proxy.hasPerm('/device/instruction/add')" type="primary" @click="editRow('add', {})">
             新建
           </el-button>
         </div>
@@ -236,13 +238,13 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="120">
             <template #default="scope">
-              <el-button type="primary" link size="small" @click="editRow('detail', scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/instruction/detail')" type="primary" link size="small" @click="editRow('detail', scope.row)">
                 查看
               </el-button>
-              <el-button v-if="scope.row.status === '2'" type="primary" link size="small" @click="editRow('edit', scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/instruction/again') && scope.row.status === '2'" type="primary" link size="small" @click="editRow('edit', scope.row)">
                 重新下发
               </el-button>
-              <el-button type="danger" link size="small" @click="removeRow(scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/instruction/delete')" type="danger" link size="small" @click="removeRow(scope.row)">
                 删除
               </el-button>
             </template>
diff --git a/src/views/home/device/product/index.vue b/src/views/home/device/product/index.vue
index 799fc90..fdd5463 100644
--- a/src/views/home/device/product/index.vue
+++ b/src/views/home/device/product/index.vue
@@ -128,6 +128,7 @@
   await fetchDict()
   fetchData()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -164,7 +165,7 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="editRow('add', {})">
+          <el-button v-if="proxy.hasPerm('/device/product/add')" type="primary" @click="editRow('add', {})">
             新建
           </el-button>
         </div>
@@ -184,10 +185,10 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="120">
             <template #default="scope">
-              <el-button type="primary" link size="small" @click="editRow('edit', scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/product/update')" type="primary" link size="small" @click="editRow('edit', scope.row)">
                 编辑
               </el-button>
-              <el-button type="danger" link size="small" @click="removeRow(scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/product/delete')" type="danger" link size="small" @click="removeRow(scope.row)">
                 删除
               </el-button>
             </template>
diff --git a/src/views/home/device/type/index.vue b/src/views/home/device/type/index.vue
index 59f1343..2344e57 100644
--- a/src/views/home/device/type/index.vue
+++ b/src/views/home/device/type/index.vue
@@ -105,6 +105,7 @@
   await fetchDict()
   fetchData()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -131,7 +132,7 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="editRow('add', {})">
+          <el-button v-if="proxy.hasPerm('/device/type/add')" type="primary" @click="editRow('add', {})">
             新建
           </el-button>
         </div>
@@ -151,10 +152,10 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="120">
             <template #default="scope">
-              <el-button type="primary" link size="small" @click="editRow('edit', scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/type/update')" type="primary" link size="small" @click="editRow('edit', scope.row)">
                 编辑
               </el-button>
-              <el-button type="danger" link size="small" @click="removeRow(scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/type/delete')" type="danger" link size="small" @click="removeRow(scope.row)">
                 删除
               </el-button>
             </template>
diff --git a/src/views/home/ledger/ledger/components/gridList.vue b/src/views/home/ledger/ledger/components/gridList.vue
index d03cd9f..189edef 100644
--- a/src/views/home/ledger/ledger/components/gridList.vue
+++ b/src/views/home/ledger/ledger/components/gridList.vue
@@ -91,6 +91,7 @@
     // })
   })
 }
+const { proxy } = getCurrentInstance() as any
 // 同步日志
 const allSync = () => {
   $router.push({
@@ -139,10 +140,10 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="allSync">
+          <el-button v-if="proxy.hasPerm('/ledger/sync')" type="primary" @click="allSync">
             同步日志
           </el-button>
-          <el-button type="primary" @click="sync('all', {})">
+          <el-button v-if="proxy.hasPerm('/ledger/sync/all')" type="primary" @click="sync('all', {})">
             全量同步
           </el-button>
         </div>
@@ -160,9 +161,9 @@
           </el-table-column>
         </template>
         <template #columns>
-          <el-table-column label="操作" align="center" width="80">
+          <el-table-column v-if="proxy.hasPerm('/ledger/sync/single')" label="操作" align="center" width="80">
             <template #default="scope">
-              <el-button type="primary" link size="small" @click="sync('single', scope.row)">
+              <el-button v-if="proxy.hasPerm('/ledger/sync/single')" type="primary" link size="small" @click="sync('single', scope.row)">
                 同步
               </el-button>
             </template>
diff --git a/src/views/home/ledger/ledger/components/wellList.vue b/src/views/home/ledger/ledger/components/wellList.vue
index 9eb1f43..06f855a 100644
--- a/src/views/home/ledger/ledger/components/wellList.vue
+++ b/src/views/home/ledger/ledger/components/wellList.vue
@@ -123,6 +123,7 @@
   // await fetchDict()
   fetchData()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -159,11 +160,11 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="allSync">
+          <el-button v-if="proxy.hasPerm('/ledger/sync')" type="primary" @click="allSync">
             同步日志
           </el-button>
-          <el-button type="primary" @click="sync('all', {})">
-            全部同步
+          <el-button v-if="proxy.hasPerm('/ledger/sync/all')" type="primary" @click="sync('all', {})">
+            全量同步
           </el-button>
         </div>
       </template>
@@ -180,9 +181,9 @@
           </el-table-column>
         </template>
         <template #columns>
-          <el-table-column label="操作" align="center" width="80">
+          <el-table-column v-if="proxy.hasPerm('/ledger/sync/single')" label="操作" align="center" width="80">
             <template #default="scope">
-              <el-button type="primary" link size="small" @click="sync('single', scope.row)">
+              <el-button v-if="proxy.hasPerm('/ledger/sync/single')" type="primary" link size="small" @click="sync('single', scope.row)">
                 同步
               </el-button>
             </template>
diff --git a/src/views/home/ledger/ledger/index.vue b/src/views/home/ledger/ledger/index.vue
index a03aa12..8403fc5 100644
--- a/src/views/home/ledger/ledger/index.vue
+++ b/src/views/home/ledger/ledger/index.vue
@@ -7,7 +7,16 @@
 import type { TabsPaneContext } from 'element-plus'
 import wellList from './components/wellList.vue'
 import gridList from './components/gridList.vue'
-const activeName = ref('闸井')
+const { proxy } = getCurrentInstance() as any
+const activeName = ref(
+  proxy.hasPerm('/ledger/manage/well')
+    ? '闸井'
+    : proxy.hasPerm('/ledger/manage/station')
+      ? '场站'
+      : proxy.hasPerm('/ledger/manage/grid')
+        ? '网格'
+        : '',
+)
 const handleClick = (tab: TabsPaneContext, event: Event) => {
   // console.log(tab, event)
 }
@@ -17,13 +26,13 @@
   <!-- 布局 -->
   <app-container>
     <el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick">
-      <el-tab-pane label="闸井" name="闸井">
+      <el-tab-pane v-if="proxy.hasPerm('/ledger/manage/well')" label="闸井" name="闸井">
         <well-list v-if="activeName === '闸井'" type="1" />
       </el-tab-pane>
-      <el-tab-pane label="场站" name="场站">
+      <el-tab-pane v-if="proxy.hasPerm('/ledger/manage/station')" label="场站" name="场站">
         <well-list v-if="activeName === '场站'" type="2" />
       </el-tab-pane>
-      <el-tab-pane label="网格" name="网格">
+      <el-tab-pane v-if="proxy.hasPerm('/ledger/manage/grid')" label="网格" name="网格">
         <grid-list v-if="activeName === '网格'" />
       </el-tab-pane>
     </el-tabs>
diff --git a/src/views/home/ledger/pipeline/index.vue b/src/views/home/ledger/pipeline/index.vue
index e0d2512..01e95ac 100644
--- a/src/views/home/ledger/pipeline/index.vue
+++ b/src/views/home/ledger/pipeline/index.vue
@@ -160,6 +160,7 @@
 onMounted(async () => {
   fetchData()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -222,13 +223,13 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="editRow('add', {})">
+          <el-button v-if="proxy.hasPerm('/ledger/pipeline/add')" type="primary" @click="editRow('add', {})">
             新增
           </el-button>
-          <el-button type="primary" @click="importList">
+          <el-button v-if="proxy.hasPerm('/ledger/pipeline/import')" type="primary" @click="importList">
             批量导入
           </el-button>
-          <el-button type="primary" @click="exportList">
+          <el-button v-if="proxy.hasPerm('/ledger/pipeline/export')" type="primary" @click="exportList">
             批量导出
           </el-button>
         </div>
@@ -248,10 +249,10 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="100">
             <template #default="scope">
-              <el-button type="primary" link size="small" @click="editRow('edit', scope.row)">
+              <el-button v-if="proxy.hasPerm('/ledger/pipeline/update')" type="primary" link size="small" @click="editRow('edit', scope.row)">
                 编辑
               </el-button>
-              <el-button type="danger" link size="small" @click="removeRow(scope.row)">
+              <el-button v-if="proxy.hasPerm('/ledger/pipeline/delete')" type="danger" link size="small" @click="removeRow(scope.row)">
                 删除
               </el-button>
             </template>

diff --git a/src/App.vue b/src/App.vue
index cde81b3..8a00f5d 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -125,7 +125,7 @@
         '--g-sub-sidebar-actual-width': subSidebarActualWidth,
       }"
     />
-    <system-info v-if="browserType !== 'mobile'" />
+    <!-- <system-info v-if="browserType !== 'mobile'" /> -->
     <audio id="eventAudio" src="" autoplay />
   </el-config-provider>
 </template>
diff --git a/src/layouts/components/Tools/alarmDialog.vue b/src/layouts/components/Tools/alarmDialog.vue
index 1828375..df89ab8 100644
--- a/src/layouts/components/Tools/alarmDialog.vue
+++ b/src/layouts/components/Tools/alarmDialog.vue
@@ -116,7 +116,7 @@
     </div>
     <template #footer>
       <div class="dialog-footer">
-        <div class="btn" @click="detail">
+        <div v-if="proxy.hasPerm('/alarm/current')" class="btn" @click="detail">
           查看
         </div>
         <div v-if="info.isSound === '1'" class="btn" @click="closeSound">
diff --git a/src/layouts/components/Tools/alarmList.vue b/src/layouts/components/Tools/alarmList.vue
index c3a9d2a..5356b74 100644
--- a/src/layouts/components/Tools/alarmList.vue
+++ b/src/layouts/components/Tools/alarmList.vue
@@ -54,6 +54,7 @@
 }
 // 查看当前行
 const detailRow = (row: any) => {
+  if (!proxy.hasPerm('/alarm/current')) { return }
   $router.push({
     name: 'AlarmCurrent',
     query: {
@@ -77,21 +78,6 @@
   localStorage.setItem('eventAudio', 'pause')
 }
 const dialogRef = ref()
-// const dialog = () => {
-//   const row = {
-//     alarmNoteMethod: '1', // 消息提醒 1:弹窗，2:消息提醒
-//     isSound: '1', // 报警音效，1:开，0:关
-//     isSend: '1', // 报警推送，1:开，0:关
-//     isText: '1', // 报警短息，1:开，0:关
-//     alarmType: '浓度超限',
-//     tagNumber: 'NX5702',
-//     alarmTime: '2024-09-09',
-//     value: '20',
-//     typeName: '燃气智能终端',
-//     alarmLevel: '一级',
-//   }
-//   dialogRef.value.initDialog(row)
-// }
 const fetchData = (isLoading = false) => {
   loading.value = true
   if (isLoading) {
@@ -115,7 +101,10 @@
       dialogRef.value.initDialog(newVal)
     }
     if (newVal.isSound === '1') {
-      play()
+      // play()
+      if (!localStorage.getItem('eventAudio')) {
+        proxy.playAudio()
+      }
     }
     fetchData(false)
   }
@@ -146,6 +135,7 @@
 //     window.localStorage.removeItem('token')
 //   }
 // }
+// const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -180,7 +170,7 @@
                   {{ message.processStatus
                     === '未读' ? '未读' : '已读' }}
                 </el-tag>
-                <el-tag type="info" size="small" style="margin-left: 5px;">
+                <el-tag type="info" size="small" style="margin-left: 5px;" @click="detailRow(message)">
                   查看
                 </el-tag>
               </div>
@@ -214,7 +204,7 @@
       <!-- <div class="close" @click="dialog">
         弹窗
       </div> -->
-      <div class="more" @click="moreList">
+      <div v-if="proxy.hasPerm('/alarm/current')" class="more" @click="moreList">
         查看更多
       </div>
     </div>
diff --git a/src/layouts/components/Tools/index.vue b/src/layouts/components/Tools/index.vue
index 9f2d41f..61f9707 100644
--- a/src/layouts/components/Tools/index.vue
+++ b/src/layouts/components/Tools/index.vue
@@ -79,6 +79,7 @@
   // 断开 websocket
   // websocket.destroyWebSocket()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -89,18 +90,18 @@
           <svg-icon name="ep:search" />
         </el-icon>
       </span>
-      <span class="item" @click="board">
+      <span v-if="proxy.hasPerm('/fullscreen')" class="item" @click="board">
         <el-icon>
           <svg-icon name="ep:data-line" />
         </el-icon>
       </span>
-      <span v-if="settingsStore.mode === 'pc' && settingsStore.toolbar.enableFullscreen" class="item" @click="toggle">
+      <span class="item" @click="toggle">
         <el-icon>
           <svg-icon :name="isFullscreen ? 'fullscreen-exit' : 'fullscreen'" />
         </el-icon>
       </span>
       <!-- 报警信息列表 -->
-      <span class="item">
+      <span v-if="proxy.hasPerm('/alarmnotice')" class="item">
         <el-popover width="390">
           <template #reference>
             <div>
diff --git a/src/layouts/components/Topbar/index.vue b/src/layouts/components/Topbar/index.vue
index 2863cef..4e3120e 100644
--- a/src/layouts/components/Topbar/index.vue
+++ b/src/layouts/components/Topbar/index.vue
@@ -67,7 +67,7 @@
           </transition-group>
         </el-breadcrumb>
       </div>
-      <tools />
+      <!-- <tools /> -->
     </div>
   </div>
 </template>
diff --git a/src/router/modules/pc.ts b/src/router/modules/pc.ts
index aacd6fa..97ced45 100644
--- a/src/router/modules/pc.ts
+++ b/src/router/modules/pc.ts
@@ -40,7 +40,7 @@
       icon: 'ep:key',
       sidebar: false,
       breadcrumb: false,
-      // auth: '/fullscreen',
+      auth: '/fullscreen',
     },
   },
   {
@@ -155,7 +155,7 @@
           sidebar: false,
           breadcrumb: false,
           activeMenu: '/well',
-          auth: '/well/detail',
+          auth: '/well',
         },
       },
     ],
diff --git a/src/views/home/alarm/count/components/locationAnalysis.vue b/src/views/home/alarm/count/components/locationAnalysis.vue
index fc75b9e..bff1853 100644
--- a/src/views/home/alarm/count/components/locationAnalysis.vue
+++ b/src/views/home/alarm/count/components/locationAnalysis.vue
@@ -46,6 +46,7 @@
   })
 }
 fetchData()
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -75,6 +76,9 @@
         <el-button type="primary" style="margin: 0 5px;" @click="fetchData">
           搜索
         </el-button>
+        <el-button v-if="proxy.hasPerm('/alarm/count/exportLocation')" type="primary" style="margin: 0 5px;">
+          导出
+        </el-button>
       </div>
     </template>
     <template #content>
diff --git a/src/views/home/alarm/current/components/detail.vue b/src/views/home/alarm/current/components/detail.vue
index dd3b31a..4204c92 100644
--- a/src/views/home/alarm/current/components/detail.vue
+++ b/src/views/home/alarm/current/components/detail.vue
@@ -111,7 +111,7 @@
   const res2 = await getAlarmTypeListPage({ offset: 1, limit: 9999 });
   ($route.query.type === 'history' ? getAlarmDetail : getAlarmDetail)($route.query.id as string).then((res) => {
     detailInfo.value = toHumpObject(res.data)
-    detailInfo.value.realAlarmName = detailInfo.value.realAlarm === '1' ? '报警' : '误报'
+    detailInfo.value.realAlarmName = detailInfo.value.realAlarm === '0' ? '是' : '否'
     detailInfo.value.alarmTypeName = res2.data.rows.filter((item: any) => item.id === detailInfo.value.alarmTypeId)[0]?.alarmType || ''
     detailInfo.value.alarmLevelName = res1.data.rows.filter((item: any) => item.id === detailInfo.value.alarmLevel)[0]?.alarmLevel || ''
     detailInfo.value.duration = detailInfo.value.ts && detailInfo.value.cancelTime ? getDateDiff(detailInfo.value.ts, detailInfo.value.cancelTime) : ''
@@ -139,6 +139,7 @@
 }
 // 点击经纬度展示地图
 const mapRef = ref()
+const { proxy } = getCurrentInstance() as any
 const showMap = (data: any) => {
   console.log(data, 'data')
   if (data.text === '位置') {
@@ -148,6 +149,13 @@
         2: 'StationMonitorDetail',
         3: 'PipelineMonitorDetail',
       } as { [key: string]: string }
+      // 判断是否有菜单权限
+      const watchObjectAuth = {
+        1: '/well',
+        2: '/station/monitor',
+        3: '/pipeline',
+      } as { [key: string]: string }
+      if (!proxy.hasPerm(watchObjectAuth[detailInfo.value.watchObject])) { return }
       $router.push({
         name: watchObject[detailInfo.value.watchObject],
         query: {
diff --git a/src/views/home/alarm/current/components/detailInfoDialog.vue b/src/views/home/alarm/current/components/detailInfoDialog.vue
index c089449..7fbf06b 100644
--- a/src/views/home/alarm/current/components/detailInfoDialog.vue
+++ b/src/views/home/alarm/current/components/detailInfoDialog.vue
@@ -114,6 +114,7 @@
   })
 }
 defineExpose({ initDialog, close })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -131,7 +132,7 @@
     <!-- 头部 -->
     <div class="header">
       <span>{{ info.alarmContent }}</span>
-      <span class="more" @click="moreData">>>更多</span>
+      <span v-if="proxy.hasPerm(type === 'data' ? '/alarm/current/more' : '/alarm/device/more')" class="more" @click="moreData">>>更多</span>
     </div>
     <div class="content">
       <div v-show="type === 'device'" class="item">
@@ -162,7 +163,7 @@
         报警设备:
         <span style="padding-left: 6px;">{{ info.devcode }} </span>
         <el-button
-          v-if="info.devTypeName === '燃气智能监测终端' || info.devTypeName === '液位检测仪' || info.devTypeName === '井盖监测仪'"
+          v-if="(info.devTypeName === '燃气智能监测终端' || info.devTypeName === '液位检测仪' || info.devTypeName === '井盖监测仪') && proxy.hasPerm('/alarm/current/data')"
           size="small" style="margin-left: 6px;" @click="viewData"
         >
           查看数据
@@ -228,7 +229,7 @@
         <span style="padding-left: 6px;">
           {{ info.confirmContent }}
         </span>
-        <el-button v-if="type === 'data'" size="small" style="padding-left: 6px;" @click="viewProcess">
+        <el-button v-if="type === 'data' && proxy.hasPerm('/alarm/current/process')" size="small" style="padding-left: 6px;" @click="viewProcess">
           流程图
         </el-button>
       </div>
@@ -246,17 +247,17 @@
       </div>
     </div>
     <div class="footer">
-      <el-button v-if="Number(info.processStatus) < 4 && type === 'data'" size="small" @click="remind">
+      <el-button v-if="(Number(info.processStatus) < 4 && type === 'data') && proxy.hasPerm('/alarm/current/remind')" size="small" @click="remind">
         提醒责任人
       </el-button>
       <el-button
-        v-if="type === 'device' && (info.processStatusName === '待处置' || info.processStatusName === '挂起')"
+        v-if="(type === 'device' && (info.processStatusName === '待处置' || info.processStatusName === '挂起')) && proxy.hasPerm('/alarm/device/handler')"
         size="small" @click="handler"
       >
         报警处置
       </el-button>
       <el-button
-        v-if="Number(info.processStatus) <= 3 || (type === 'device' && info.processStatusName === '待处置') || info.processStatusName === '挂起'"
+        v-if="(Number(info.processStatus) <= 3 || (type === 'device' && info.processStatusName === '待处置') || info.processStatusName === '挂起') && proxy.hasPerm(type === 'device' ? '/alarm/device/pending' : '/alarm/current/pending')"
         type="primary" size="small" @click="pending"
       >
         挂起
diff --git a/src/views/home/alarm/current/index.vue b/src/views/home/alarm/current/index.vue
index d019bbf..e2714bb 100644
--- a/src/views/home/alarm/current/index.vue
+++ b/src/views/home/alarm/current/index.vue
@@ -4,6 +4,7 @@
   Date: 2023-06-28
  -->
 <script lang="ts" setup name="CurrentAlarm">
+import dayjs from 'dayjs'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import { ArrowLeftBold, ArrowRightBold } from '@element-plus/icons-vue'
 import MapCom from './components/map.vue'
@@ -100,6 +101,7 @@
       path: '/alarm/current',
     })
   }
+  datetimerange.value = []
   listQuery.value = {
     limit: 20,
     offset: 1,
@@ -131,8 +133,8 @@
   if ($route.query.row) {
     loadingTable.value = true
     const row = JSON.parse($route.query.row as string)
-    getCurrentAlarmListPage({ offset: 1, limit: 99999 }).then((res) => {
-      const data = res.data.rows.filter((item: any) => item.id === row.id)
+    getCurrentAlarmListPage({ offset: 1, limit: 50 }).then((res) => {
+      const data = res.data.rows.filter((item: any) => item.id === row.alarmId)
       if (data.length) {
         list1.value = data.map((item: any) => ({
           ...item,
@@ -153,7 +155,10 @@
     })
     return
   }
-  fetchData()
+  datetimerange.value = [dayjs().subtract(7, 'day').format('YYYY-MM-DD HH:mm:ss'), dayjs().format('YYYY-MM-DD HH:mm:ss')]
+  setTimeout(() => {
+    fetchData()
+  })
 })
 // 表格标识  地图或普通
 const tableFlag = ref('normal')
@@ -181,6 +186,10 @@
 const mapRef = ref()
 const mapData = ref({})
 async function detail(row: any) {
+  if (row.processStatusName === '未读') {
+    list1.value[list1.value.findIndex((item: any) => item.id === row.id)].processStatusName = '已读'
+    row.processStatusName = '已读'
+  }
   const res = await detailAlarm(row.id)
   const data = toHumpObject(res.data)
   mapData.value = row
@@ -362,7 +371,7 @@
               <el-button v-if="proxy.hasPerm('/alarm/current/delete')" type="primary" @click="batchDeleteRow">
                 批量删除
               </el-button>
-              <el-button type="primary" @click="exportList">
+              <el-button v-if="proxy.hasPerm('/alarm/current/export')" type="primary" @click="exportList">
                 导出
               </el-button>
             </div>
@@ -383,7 +392,7 @@
               </el-table-column>
             </template>
             <template #columns>
-              <el-table-column label="操作" align="center" width="80">
+              <el-table-column v-if="proxy.hasPerm('/alarm/current/detail')" label="操作" align="center" width="80">
                 <template #default="scope">
                   <el-button type="primary" link size="small" @click="detail(scope.row)">
                     查看
diff --git a/src/views/home/alarm/history/index.vue b/src/views/home/alarm/history/index.vue
index eeb49fc..3c810c3 100644
--- a/src/views/home/alarm/history/index.vue
+++ b/src/views/home/alarm/history/index.vue
@@ -97,6 +97,7 @@
 }
 // 重置查询条件f
 const reset = () => {
+  datetimerange.value = []
   listQuery.value = {
     limit: 20,
     offset: 1,
@@ -189,6 +190,7 @@
   })
 }
 fetchDict()
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -249,7 +251,7 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="exportList">
+          <el-button v-if="proxy.hasPerm('/alarm/history/export')" type="primary" @click="exportList">
             导出
           </el-button>
         </div>
@@ -272,7 +274,7 @@
           </el-table-column>
         </template>
         <template #columns>
-          <el-table-column label="操作" align="center" width="80">
+          <el-table-column v-if="proxy.hasPerm('/alarm/history/detail')" label="操作" align="center" width="80">
             <template #default="scope">
               <el-button type="primary" link size="small" @click="moreData(scope.row)">
                 查看
diff --git a/src/views/home/dashboard/index.vue b/src/views/home/dashboard/index.vue
index d2f7e3c..42dfbed 100644
--- a/src/views/home/dashboard/index.vue
+++ b/src/views/home/dashboard/index.vue
@@ -42,7 +42,7 @@
     value: '0',
     name: '在线',
     unit: '个',
-    id: '1',
+    id: '1,2',
   },
   {
     img: img.lixian,
@@ -56,7 +56,7 @@
     value: '0',
     name: '停用',
     unit: '个',
-    id: '2',
+    id: '3',
   },
 ])
 // 工作台数据
@@ -133,7 +133,11 @@
   deviceOperationLoading.value = true
   getDeviceStatus().then((res) => {
     res.data.forEach((element: any) => {
-      const index = deviceOperationData.value.findIndex((item: any) => item.id === element.name)
+      if (element.name === '1' || element.name === '2') {
+        deviceOperationData.value[0].value = Number(deviceOperationData.value[0].value || '0') + Number(element.value)
+        return
+      }
+      const index = deviceOperationData.value.findIndex((item: any) => item.id.includes(element.name))
       if (index !== -1) {
         deviceOperationData.value[index].value = element.value
       }
diff --git a/src/views/home/device/count/components/bottom.vue b/src/views/home/device/count/components/bottom.vue
index 28a4d78..e4e56fa 100644
--- a/src/views/home/device/count/components/bottom.vue
+++ b/src/views/home/device/count/components/bottom.vue
@@ -110,6 +110,7 @@
   })
 }
 fetchDict()
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -148,7 +149,7 @@
             <template #btns-right>
               <!-- 操作 -->
               <div>
-                <el-button type="primary">
+                <el-button v-if="proxy.hasPerm('/device/count/offline/export')" type="primary">
                   导出
                 </el-button>
               </div>
diff --git a/src/views/home/device/device/index.vue b/src/views/home/device/device/index.vue
index c3970b9..9cdd606 100644
--- a/src/views/home/device/device/index.vue
+++ b/src/views/home/device/device/index.vue
@@ -88,6 +88,7 @@
 }
 // 重置查询条件f
 const reset = () => {
+  datetimerange.value = []
   listQuery.value = {
     limit: 20,
     offset: 1,
@@ -296,6 +297,7 @@
   fetchDict()
   fetchData()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -372,17 +374,17 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="editRow('add', {})">
+          <el-button v-if="proxy.hasPerm('/device/manage/add')" type="primary" @click="editRow('add', {})">
             新建
           </el-button>
-          <el-button type="primary" @click="downloadTemplate">
+          <el-button v-if="proxy.hasPerm('/device/manage/down')" type="primary" @click="downloadTemplate">
             模板下载
           </el-button>
-          <el-button type="primary" @click="importList">
+          <el-button v-if="proxy.hasPerm('/device/manage/import')" type="primary" @click="importList">
             批量导入
           </el-button>
-          <el-button type="primary" @click="exportList">
-            导出列表
+          <el-button v-if="proxy.hasPerm('/device/manage/export')" type="primary" @click="exportList">
+            导出
           </el-button>
           <input ref="fileRef" style="display: none;" type="file" accept=".xls,.xlsx" @change="onFileChange">
         </div>
@@ -409,16 +411,16 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="150">
             <template #default="scope">
-              <el-button type="primary" link size="small" @click="editRow('detail', scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/manage/detail')" type="primary" link size="small" @click="editRow('detail', scope.row)">
                 查看
               </el-button>
-              <el-button type="primary" link size="small" @click="editRow('edit', scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/manage/update')" type="primary" link size="small" @click="editRow('edit', scope.row)">
                 编辑
               </el-button>
-              <el-button type="danger" link size="small" @click="changeDefense(scope.row)">
+              <!-- <el-button v-if="proxy.hasPerm('/device/manage/add')" type="danger" link size="small" @click="changeDefense(scope.row)">
                 撤防
-              </el-button>
-              <el-button type="danger" link size="small" @click="removeRow(scope.row)">
+              </el-button> -->
+              <el-button v-if="proxy.hasPerm('/device/manage/delete')" type="danger" link size="small" @click="removeRow(scope.row)">
                 删除
               </el-button>
             </template>
diff --git a/src/views/home/device/instruction/index.vue b/src/views/home/device/instruction/index.vue
index 1e598ed..1da6706 100644
--- a/src/views/home/device/instruction/index.vue
+++ b/src/views/home/device/instruction/index.vue
@@ -78,6 +78,7 @@
 }
 // 重置查询条件f
 const reset = () => {
+  datetimerange.value = []
   listQuery.value = {
     limit: 20,
     offset: 1,
@@ -158,6 +159,7 @@
     editRef.value.initDialog('addOther', {})
   }
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -213,10 +215,10 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary">
+          <el-button v-if="proxy.hasPerm('/device/instruction/batch')" type="primary">
             批量下发
           </el-button>
-          <el-button type="primary" @click="editRow('add', {})">
+          <el-button v-if="proxy.hasPerm('/device/instruction/add')" type="primary" @click="editRow('add', {})">
             新建
           </el-button>
         </div>
@@ -236,13 +238,13 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="120">
             <template #default="scope">
-              <el-button type="primary" link size="small" @click="editRow('detail', scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/instruction/detail')" type="primary" link size="small" @click="editRow('detail', scope.row)">
                 查看
               </el-button>
-              <el-button v-if="scope.row.status === '2'" type="primary" link size="small" @click="editRow('edit', scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/instruction/again') && scope.row.status === '2'" type="primary" link size="small" @click="editRow('edit', scope.row)">
                 重新下发
               </el-button>
-              <el-button type="danger" link size="small" @click="removeRow(scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/instruction/delete')" type="danger" link size="small" @click="removeRow(scope.row)">
                 删除
               </el-button>
             </template>
diff --git a/src/views/home/device/product/index.vue b/src/views/home/device/product/index.vue
index 799fc90..fdd5463 100644
--- a/src/views/home/device/product/index.vue
+++ b/src/views/home/device/product/index.vue
@@ -128,6 +128,7 @@
   await fetchDict()
   fetchData()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -164,7 +165,7 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="editRow('add', {})">
+          <el-button v-if="proxy.hasPerm('/device/product/add')" type="primary" @click="editRow('add', {})">
             新建
           </el-button>
         </div>
@@ -184,10 +185,10 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="120">
             <template #default="scope">
-              <el-button type="primary" link size="small" @click="editRow('edit', scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/product/update')" type="primary" link size="small" @click="editRow('edit', scope.row)">
                 编辑
               </el-button>
-              <el-button type="danger" link size="small" @click="removeRow(scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/product/delete')" type="danger" link size="small" @click="removeRow(scope.row)">
                 删除
               </el-button>
             </template>
diff --git a/src/views/home/device/type/index.vue b/src/views/home/device/type/index.vue
index 59f1343..2344e57 100644
--- a/src/views/home/device/type/index.vue
+++ b/src/views/home/device/type/index.vue
@@ -105,6 +105,7 @@
   await fetchDict()
   fetchData()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -131,7 +132,7 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="editRow('add', {})">
+          <el-button v-if="proxy.hasPerm('/device/type/add')" type="primary" @click="editRow('add', {})">
             新建
           </el-button>
         </div>
@@ -151,10 +152,10 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="120">
             <template #default="scope">
-              <el-button type="primary" link size="small" @click="editRow('edit', scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/type/update')" type="primary" link size="small" @click="editRow('edit', scope.row)">
                 编辑
               </el-button>
-              <el-button type="danger" link size="small" @click="removeRow(scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/type/delete')" type="danger" link size="small" @click="removeRow(scope.row)">
                 删除
               </el-button>
             </template>
diff --git a/src/views/home/ledger/ledger/components/gridList.vue b/src/views/home/ledger/ledger/components/gridList.vue
index d03cd9f..189edef 100644
--- a/src/views/home/ledger/ledger/components/gridList.vue
+++ b/src/views/home/ledger/ledger/components/gridList.vue
@@ -91,6 +91,7 @@
     // })
   })
 }
+const { proxy } = getCurrentInstance() as any
 // 同步日志
 const allSync = () => {
   $router.push({
@@ -139,10 +140,10 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="allSync">
+          <el-button v-if="proxy.hasPerm('/ledger/sync')" type="primary" @click="allSync">
             同步日志
           </el-button>
-          <el-button type="primary" @click="sync('all', {})">
+          <el-button v-if="proxy.hasPerm('/ledger/sync/all')" type="primary" @click="sync('all', {})">
             全量同步
           </el-button>
         </div>
@@ -160,9 +161,9 @@
           </el-table-column>
         </template>
         <template #columns>
-          <el-table-column label="操作" align="center" width="80">
+          <el-table-column v-if="proxy.hasPerm('/ledger/sync/single')" label="操作" align="center" width="80">
             <template #default="scope">
-              <el-button type="primary" link size="small" @click="sync('single', scope.row)">
+              <el-button v-if="proxy.hasPerm('/ledger/sync/single')" type="primary" link size="small" @click="sync('single', scope.row)">
                 同步
               </el-button>
             </template>
diff --git a/src/views/home/ledger/ledger/components/wellList.vue b/src/views/home/ledger/ledger/components/wellList.vue
index 9eb1f43..06f855a 100644
--- a/src/views/home/ledger/ledger/components/wellList.vue
+++ b/src/views/home/ledger/ledger/components/wellList.vue
@@ -123,6 +123,7 @@
   // await fetchDict()
   fetchData()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -159,11 +160,11 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="allSync">
+          <el-button v-if="proxy.hasPerm('/ledger/sync')" type="primary" @click="allSync">
             同步日志
           </el-button>
-          <el-button type="primary" @click="sync('all', {})">
-            全部同步
+          <el-button v-if="proxy.hasPerm('/ledger/sync/all')" type="primary" @click="sync('all', {})">
+            全量同步
           </el-button>
         </div>
       </template>
@@ -180,9 +181,9 @@
           </el-table-column>
         </template>
         <template #columns>
-          <el-table-column label="操作" align="center" width="80">
+          <el-table-column v-if="proxy.hasPerm('/ledger/sync/single')" label="操作" align="center" width="80">
             <template #default="scope">
-              <el-button type="primary" link size="small" @click="sync('single', scope.row)">
+              <el-button v-if="proxy.hasPerm('/ledger/sync/single')" type="primary" link size="small" @click="sync('single', scope.row)">
                 同步
               </el-button>
             </template>
diff --git a/src/views/home/ledger/ledger/index.vue b/src/views/home/ledger/ledger/index.vue
index a03aa12..8403fc5 100644
--- a/src/views/home/ledger/ledger/index.vue
+++ b/src/views/home/ledger/ledger/index.vue
@@ -7,7 +7,16 @@
 import type { TabsPaneContext } from 'element-plus'
 import wellList from './components/wellList.vue'
 import gridList from './components/gridList.vue'
-const activeName = ref('闸井')
+const { proxy } = getCurrentInstance() as any
+const activeName = ref(
+  proxy.hasPerm('/ledger/manage/well')
+    ? '闸井'
+    : proxy.hasPerm('/ledger/manage/station')
+      ? '场站'
+      : proxy.hasPerm('/ledger/manage/grid')
+        ? '网格'
+        : '',
+)
 const handleClick = (tab: TabsPaneContext, event: Event) => {
   // console.log(tab, event)
 }
@@ -17,13 +26,13 @@
   <!-- 布局 -->
   <app-container>
     <el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick">
-      <el-tab-pane label="闸井" name="闸井">
+      <el-tab-pane v-if="proxy.hasPerm('/ledger/manage/well')" label="闸井" name="闸井">
         <well-list v-if="activeName === '闸井'" type="1" />
       </el-tab-pane>
-      <el-tab-pane label="场站" name="场站">
+      <el-tab-pane v-if="proxy.hasPerm('/ledger/manage/station')" label="场站" name="场站">
         <well-list v-if="activeName === '场站'" type="2" />
       </el-tab-pane>
-      <el-tab-pane label="网格" name="网格">
+      <el-tab-pane v-if="proxy.hasPerm('/ledger/manage/grid')" label="网格" name="网格">
         <grid-list v-if="activeName === '网格'" />
       </el-tab-pane>
     </el-tabs>
diff --git a/src/views/home/ledger/pipeline/index.vue b/src/views/home/ledger/pipeline/index.vue
index e0d2512..01e95ac 100644
--- a/src/views/home/ledger/pipeline/index.vue
+++ b/src/views/home/ledger/pipeline/index.vue
@@ -160,6 +160,7 @@
 onMounted(async () => {
   fetchData()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -222,13 +223,13 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="editRow('add', {})">
+          <el-button v-if="proxy.hasPerm('/ledger/pipeline/add')" type="primary" @click="editRow('add', {})">
             新增
           </el-button>
-          <el-button type="primary" @click="importList">
+          <el-button v-if="proxy.hasPerm('/ledger/pipeline/import')" type="primary" @click="importList">
             批量导入
           </el-button>
-          <el-button type="primary" @click="exportList">
+          <el-button v-if="proxy.hasPerm('/ledger/pipeline/export')" type="primary" @click="exportList">
             批量导出
           </el-button>
         </div>
@@ -248,10 +249,10 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="100">
             <template #default="scope">
-              <el-button type="primary" link size="small" @click="editRow('edit', scope.row)">
+              <el-button v-if="proxy.hasPerm('/ledger/pipeline/update')" type="primary" link size="small" @click="editRow('edit', scope.row)">
                 编辑
               </el-button>
-              <el-button type="danger" link size="small" @click="removeRow(scope.row)">
+              <el-button v-if="proxy.hasPerm('/ledger/pipeline/delete')" type="danger" link size="small" @click="removeRow(scope.row)">
                 删除
               </el-button>
             </template>
diff --git a/src/views/home/ledger/sync/index.vue b/src/views/home/ledger/sync/index.vue
index 54a3218..a04bad9 100644
--- a/src/views/home/ledger/sync/index.vue
+++ b/src/views/home/ledger/sync/index.vue
@@ -62,6 +62,7 @@
 }
 // 重置查询条件f
 const reset = () => {
+  datetimerange.value = []
   listQuery.value = {
     limit: 20,
     offset: 1,
@@ -106,6 +107,8 @@
 onMounted(async () => {
   fetchData()
 })
+const { proxy } = getCurrentInstance() as any
+const $route = useRoute()
 </script>
 
 <template>
@@ -132,7 +135,7 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="goBak">
+          <el-button v-if="$route.type" type="primary" @click="goBak">
             返回
           </el-button>
         </div>
@@ -152,10 +155,10 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="80">
             <template #default="scope">
-              <el-button type="primary" link size="small">
+              <el-button v-if="proxy.hasPerm('/ledger/sync/detail')" type="primary" link size="small">
                 查看
               </el-button>
-              <el-button type="danger" link size="small" @click="removeRow(scope.row)">
+              <el-button v-if="proxy.hasPerm('/ledger/sync/delete')" type="danger" link size="small" @click="removeRow(scope.row)">
                 删除
               </el-button>
             </template>

diff --git a/src/App.vue b/src/App.vue
index cde81b3..8a00f5d 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -125,7 +125,7 @@
         '--g-sub-sidebar-actual-width': subSidebarActualWidth,
       }"
     />
-    <system-info v-if="browserType !== 'mobile'" />
+    <!-- <system-info v-if="browserType !== 'mobile'" /> -->
     <audio id="eventAudio" src="" autoplay />
   </el-config-provider>
 </template>
diff --git a/src/layouts/components/Tools/alarmDialog.vue b/src/layouts/components/Tools/alarmDialog.vue
index 1828375..df89ab8 100644
--- a/src/layouts/components/Tools/alarmDialog.vue
+++ b/src/layouts/components/Tools/alarmDialog.vue
@@ -116,7 +116,7 @@
     </div>
     <template #footer>
       <div class="dialog-footer">
-        <div class="btn" @click="detail">
+        <div v-if="proxy.hasPerm('/alarm/current')" class="btn" @click="detail">
           查看
         </div>
         <div v-if="info.isSound === '1'" class="btn" @click="closeSound">
diff --git a/src/layouts/components/Tools/alarmList.vue b/src/layouts/components/Tools/alarmList.vue
index c3a9d2a..5356b74 100644
--- a/src/layouts/components/Tools/alarmList.vue
+++ b/src/layouts/components/Tools/alarmList.vue
@@ -54,6 +54,7 @@
 }
 // 查看当前行
 const detailRow = (row: any) => {
+  if (!proxy.hasPerm('/alarm/current')) { return }
   $router.push({
     name: 'AlarmCurrent',
     query: {
@@ -77,21 +78,6 @@
   localStorage.setItem('eventAudio', 'pause')
 }
 const dialogRef = ref()
-// const dialog = () => {
-//   const row = {
-//     alarmNoteMethod: '1', // 消息提醒 1:弹窗，2:消息提醒
-//     isSound: '1', // 报警音效，1:开，0:关
-//     isSend: '1', // 报警推送，1:开，0:关
-//     isText: '1', // 报警短息，1:开，0:关
-//     alarmType: '浓度超限',
-//     tagNumber: 'NX5702',
-//     alarmTime: '2024-09-09',
-//     value: '20',
-//     typeName: '燃气智能终端',
-//     alarmLevel: '一级',
-//   }
-//   dialogRef.value.initDialog(row)
-// }
 const fetchData = (isLoading = false) => {
   loading.value = true
   if (isLoading) {
@@ -115,7 +101,10 @@
       dialogRef.value.initDialog(newVal)
     }
     if (newVal.isSound === '1') {
-      play()
+      // play()
+      if (!localStorage.getItem('eventAudio')) {
+        proxy.playAudio()
+      }
     }
     fetchData(false)
   }
@@ -146,6 +135,7 @@
 //     window.localStorage.removeItem('token')
 //   }
 // }
+// const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -180,7 +170,7 @@
                   {{ message.processStatus
                     === '未读' ? '未读' : '已读' }}
                 </el-tag>
-                <el-tag type="info" size="small" style="margin-left: 5px;">
+                <el-tag type="info" size="small" style="margin-left: 5px;" @click="detailRow(message)">
                   查看
                 </el-tag>
               </div>
@@ -214,7 +204,7 @@
       <!-- <div class="close" @click="dialog">
         弹窗
       </div> -->
-      <div class="more" @click="moreList">
+      <div v-if="proxy.hasPerm('/alarm/current')" class="more" @click="moreList">
         查看更多
       </div>
     </div>
diff --git a/src/layouts/components/Tools/index.vue b/src/layouts/components/Tools/index.vue
index 9f2d41f..61f9707 100644
--- a/src/layouts/components/Tools/index.vue
+++ b/src/layouts/components/Tools/index.vue
@@ -79,6 +79,7 @@
   // 断开 websocket
   // websocket.destroyWebSocket()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -89,18 +90,18 @@
           <svg-icon name="ep:search" />
         </el-icon>
       </span>
-      <span class="item" @click="board">
+      <span v-if="proxy.hasPerm('/fullscreen')" class="item" @click="board">
         <el-icon>
           <svg-icon name="ep:data-line" />
         </el-icon>
       </span>
-      <span v-if="settingsStore.mode === 'pc' && settingsStore.toolbar.enableFullscreen" class="item" @click="toggle">
+      <span class="item" @click="toggle">
         <el-icon>
           <svg-icon :name="isFullscreen ? 'fullscreen-exit' : 'fullscreen'" />
         </el-icon>
       </span>
       <!-- 报警信息列表 -->
-      <span class="item">
+      <span v-if="proxy.hasPerm('/alarmnotice')" class="item">
         <el-popover width="390">
           <template #reference>
             <div>
diff --git a/src/layouts/components/Topbar/index.vue b/src/layouts/components/Topbar/index.vue
index 2863cef..4e3120e 100644
--- a/src/layouts/components/Topbar/index.vue
+++ b/src/layouts/components/Topbar/index.vue
@@ -67,7 +67,7 @@
           </transition-group>
         </el-breadcrumb>
       </div>
-      <tools />
+      <!-- <tools /> -->
     </div>
   </div>
 </template>
diff --git a/src/router/modules/pc.ts b/src/router/modules/pc.ts
index aacd6fa..97ced45 100644
--- a/src/router/modules/pc.ts
+++ b/src/router/modules/pc.ts
@@ -40,7 +40,7 @@
       icon: 'ep:key',
       sidebar: false,
       breadcrumb: false,
-      // auth: '/fullscreen',
+      auth: '/fullscreen',
     },
   },
   {
@@ -155,7 +155,7 @@
           sidebar: false,
           breadcrumb: false,
           activeMenu: '/well',
-          auth: '/well/detail',
+          auth: '/well',
         },
       },
     ],
diff --git a/src/views/home/alarm/count/components/locationAnalysis.vue b/src/views/home/alarm/count/components/locationAnalysis.vue
index fc75b9e..bff1853 100644
--- a/src/views/home/alarm/count/components/locationAnalysis.vue
+++ b/src/views/home/alarm/count/components/locationAnalysis.vue
@@ -46,6 +46,7 @@
   })
 }
 fetchData()
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -75,6 +76,9 @@
         <el-button type="primary" style="margin: 0 5px;" @click="fetchData">
           搜索
         </el-button>
+        <el-button v-if="proxy.hasPerm('/alarm/count/exportLocation')" type="primary" style="margin: 0 5px;">
+          导出
+        </el-button>
       </div>
     </template>
     <template #content>
diff --git a/src/views/home/alarm/current/components/detail.vue b/src/views/home/alarm/current/components/detail.vue
index dd3b31a..4204c92 100644
--- a/src/views/home/alarm/current/components/detail.vue
+++ b/src/views/home/alarm/current/components/detail.vue
@@ -111,7 +111,7 @@
   const res2 = await getAlarmTypeListPage({ offset: 1, limit: 9999 });
   ($route.query.type === 'history' ? getAlarmDetail : getAlarmDetail)($route.query.id as string).then((res) => {
     detailInfo.value = toHumpObject(res.data)
-    detailInfo.value.realAlarmName = detailInfo.value.realAlarm === '1' ? '报警' : '误报'
+    detailInfo.value.realAlarmName = detailInfo.value.realAlarm === '0' ? '是' : '否'
     detailInfo.value.alarmTypeName = res2.data.rows.filter((item: any) => item.id === detailInfo.value.alarmTypeId)[0]?.alarmType || ''
     detailInfo.value.alarmLevelName = res1.data.rows.filter((item: any) => item.id === detailInfo.value.alarmLevel)[0]?.alarmLevel || ''
     detailInfo.value.duration = detailInfo.value.ts && detailInfo.value.cancelTime ? getDateDiff(detailInfo.value.ts, detailInfo.value.cancelTime) : ''
@@ -139,6 +139,7 @@
 }
 // 点击经纬度展示地图
 const mapRef = ref()
+const { proxy } = getCurrentInstance() as any
 const showMap = (data: any) => {
   console.log(data, 'data')
   if (data.text === '位置') {
@@ -148,6 +149,13 @@
         2: 'StationMonitorDetail',
         3: 'PipelineMonitorDetail',
       } as { [key: string]: string }
+      // 判断是否有菜单权限
+      const watchObjectAuth = {
+        1: '/well',
+        2: '/station/monitor',
+        3: '/pipeline',
+      } as { [key: string]: string }
+      if (!proxy.hasPerm(watchObjectAuth[detailInfo.value.watchObject])) { return }
       $router.push({
         name: watchObject[detailInfo.value.watchObject],
         query: {
diff --git a/src/views/home/alarm/current/components/detailInfoDialog.vue b/src/views/home/alarm/current/components/detailInfoDialog.vue
index c089449..7fbf06b 100644
--- a/src/views/home/alarm/current/components/detailInfoDialog.vue
+++ b/src/views/home/alarm/current/components/detailInfoDialog.vue
@@ -114,6 +114,7 @@
   })
 }
 defineExpose({ initDialog, close })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -131,7 +132,7 @@
     <!-- 头部 -->
     <div class="header">
       <span>{{ info.alarmContent }}</span>
-      <span class="more" @click="moreData">>>更多</span>
+      <span v-if="proxy.hasPerm(type === 'data' ? '/alarm/current/more' : '/alarm/device/more')" class="more" @click="moreData">>>更多</span>
     </div>
     <div class="content">
       <div v-show="type === 'device'" class="item">
@@ -162,7 +163,7 @@
         报警设备:
         <span style="padding-left: 6px;">{{ info.devcode }} </span>
         <el-button
-          v-if="info.devTypeName === '燃气智能监测终端' || info.devTypeName === '液位检测仪' || info.devTypeName === '井盖监测仪'"
+          v-if="(info.devTypeName === '燃气智能监测终端' || info.devTypeName === '液位检测仪' || info.devTypeName === '井盖监测仪') && proxy.hasPerm('/alarm/current/data')"
           size="small" style="margin-left: 6px;" @click="viewData"
         >
           查看数据
@@ -228,7 +229,7 @@
         <span style="padding-left: 6px;">
           {{ info.confirmContent }}
         </span>
-        <el-button v-if="type === 'data'" size="small" style="padding-left: 6px;" @click="viewProcess">
+        <el-button v-if="type === 'data' && proxy.hasPerm('/alarm/current/process')" size="small" style="padding-left: 6px;" @click="viewProcess">
           流程图
         </el-button>
       </div>
@@ -246,17 +247,17 @@
       </div>
     </div>
     <div class="footer">
-      <el-button v-if="Number(info.processStatus) < 4 && type === 'data'" size="small" @click="remind">
+      <el-button v-if="(Number(info.processStatus) < 4 && type === 'data') && proxy.hasPerm('/alarm/current/remind')" size="small" @click="remind">
         提醒责任人
       </el-button>
       <el-button
-        v-if="type === 'device' && (info.processStatusName === '待处置' || info.processStatusName === '挂起')"
+        v-if="(type === 'device' && (info.processStatusName === '待处置' || info.processStatusName === '挂起')) && proxy.hasPerm('/alarm/device/handler')"
         size="small" @click="handler"
       >
         报警处置
       </el-button>
       <el-button
-        v-if="Number(info.processStatus) <= 3 || (type === 'device' && info.processStatusName === '待处置') || info.processStatusName === '挂起'"
+        v-if="(Number(info.processStatus) <= 3 || (type === 'device' && info.processStatusName === '待处置') || info.processStatusName === '挂起') && proxy.hasPerm(type === 'device' ? '/alarm/device/pending' : '/alarm/current/pending')"
         type="primary" size="small" @click="pending"
       >
         挂起
diff --git a/src/views/home/alarm/current/index.vue b/src/views/home/alarm/current/index.vue
index d019bbf..e2714bb 100644
--- a/src/views/home/alarm/current/index.vue
+++ b/src/views/home/alarm/current/index.vue
@@ -4,6 +4,7 @@
   Date: 2023-06-28
  -->
 <script lang="ts" setup name="CurrentAlarm">
+import dayjs from 'dayjs'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import { ArrowLeftBold, ArrowRightBold } from '@element-plus/icons-vue'
 import MapCom from './components/map.vue'
@@ -100,6 +101,7 @@
       path: '/alarm/current',
     })
   }
+  datetimerange.value = []
   listQuery.value = {
     limit: 20,
     offset: 1,
@@ -131,8 +133,8 @@
   if ($route.query.row) {
     loadingTable.value = true
     const row = JSON.parse($route.query.row as string)
-    getCurrentAlarmListPage({ offset: 1, limit: 99999 }).then((res) => {
-      const data = res.data.rows.filter((item: any) => item.id === row.id)
+    getCurrentAlarmListPage({ offset: 1, limit: 50 }).then((res) => {
+      const data = res.data.rows.filter((item: any) => item.id === row.alarmId)
       if (data.length) {
         list1.value = data.map((item: any) => ({
           ...item,
@@ -153,7 +155,10 @@
     })
     return
   }
-  fetchData()
+  datetimerange.value = [dayjs().subtract(7, 'day').format('YYYY-MM-DD HH:mm:ss'), dayjs().format('YYYY-MM-DD HH:mm:ss')]
+  setTimeout(() => {
+    fetchData()
+  })
 })
 // 表格标识  地图或普通
 const tableFlag = ref('normal')
@@ -181,6 +186,10 @@
 const mapRef = ref()
 const mapData = ref({})
 async function detail(row: any) {
+  if (row.processStatusName === '未读') {
+    list1.value[list1.value.findIndex((item: any) => item.id === row.id)].processStatusName = '已读'
+    row.processStatusName = '已读'
+  }
   const res = await detailAlarm(row.id)
   const data = toHumpObject(res.data)
   mapData.value = row
@@ -362,7 +371,7 @@
               <el-button v-if="proxy.hasPerm('/alarm/current/delete')" type="primary" @click="batchDeleteRow">
                 批量删除
               </el-button>
-              <el-button type="primary" @click="exportList">
+              <el-button v-if="proxy.hasPerm('/alarm/current/export')" type="primary" @click="exportList">
                 导出
               </el-button>
             </div>
@@ -383,7 +392,7 @@
               </el-table-column>
             </template>
             <template #columns>
-              <el-table-column label="操作" align="center" width="80">
+              <el-table-column v-if="proxy.hasPerm('/alarm/current/detail')" label="操作" align="center" width="80">
                 <template #default="scope">
                   <el-button type="primary" link size="small" @click="detail(scope.row)">
                     查看
diff --git a/src/views/home/alarm/history/index.vue b/src/views/home/alarm/history/index.vue
index eeb49fc..3c810c3 100644
--- a/src/views/home/alarm/history/index.vue
+++ b/src/views/home/alarm/history/index.vue
@@ -97,6 +97,7 @@
 }
 // 重置查询条件f
 const reset = () => {
+  datetimerange.value = []
   listQuery.value = {
     limit: 20,
     offset: 1,
@@ -189,6 +190,7 @@
   })
 }
 fetchDict()
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -249,7 +251,7 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="exportList">
+          <el-button v-if="proxy.hasPerm('/alarm/history/export')" type="primary" @click="exportList">
             导出
           </el-button>
         </div>
@@ -272,7 +274,7 @@
           </el-table-column>
         </template>
         <template #columns>
-          <el-table-column label="操作" align="center" width="80">
+          <el-table-column v-if="proxy.hasPerm('/alarm/history/detail')" label="操作" align="center" width="80">
             <template #default="scope">
               <el-button type="primary" link size="small" @click="moreData(scope.row)">
                 查看
diff --git a/src/views/home/dashboard/index.vue b/src/views/home/dashboard/index.vue
index d2f7e3c..42dfbed 100644
--- a/src/views/home/dashboard/index.vue
+++ b/src/views/home/dashboard/index.vue
@@ -42,7 +42,7 @@
     value: '0',
     name: '在线',
     unit: '个',
-    id: '1',
+    id: '1,2',
   },
   {
     img: img.lixian,
@@ -56,7 +56,7 @@
     value: '0',
     name: '停用',
     unit: '个',
-    id: '2',
+    id: '3',
   },
 ])
 // 工作台数据
@@ -133,7 +133,11 @@
   deviceOperationLoading.value = true
   getDeviceStatus().then((res) => {
     res.data.forEach((element: any) => {
-      const index = deviceOperationData.value.findIndex((item: any) => item.id === element.name)
+      if (element.name === '1' || element.name === '2') {
+        deviceOperationData.value[0].value = Number(deviceOperationData.value[0].value || '0') + Number(element.value)
+        return
+      }
+      const index = deviceOperationData.value.findIndex((item: any) => item.id.includes(element.name))
       if (index !== -1) {
         deviceOperationData.value[index].value = element.value
       }
diff --git a/src/views/home/device/count/components/bottom.vue b/src/views/home/device/count/components/bottom.vue
index 28a4d78..e4e56fa 100644
--- a/src/views/home/device/count/components/bottom.vue
+++ b/src/views/home/device/count/components/bottom.vue
@@ -110,6 +110,7 @@
   })
 }
 fetchDict()
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -148,7 +149,7 @@
             <template #btns-right>
               <!-- 操作 -->
               <div>
-                <el-button type="primary">
+                <el-button v-if="proxy.hasPerm('/device/count/offline/export')" type="primary">
                   导出
                 </el-button>
               </div>
diff --git a/src/views/home/device/device/index.vue b/src/views/home/device/device/index.vue
index c3970b9..9cdd606 100644
--- a/src/views/home/device/device/index.vue
+++ b/src/views/home/device/device/index.vue
@@ -88,6 +88,7 @@
 }
 // 重置查询条件f
 const reset = () => {
+  datetimerange.value = []
   listQuery.value = {
     limit: 20,
     offset: 1,
@@ -296,6 +297,7 @@
   fetchDict()
   fetchData()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -372,17 +374,17 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="editRow('add', {})">
+          <el-button v-if="proxy.hasPerm('/device/manage/add')" type="primary" @click="editRow('add', {})">
             新建
           </el-button>
-          <el-button type="primary" @click="downloadTemplate">
+          <el-button v-if="proxy.hasPerm('/device/manage/down')" type="primary" @click="downloadTemplate">
             模板下载
           </el-button>
-          <el-button type="primary" @click="importList">
+          <el-button v-if="proxy.hasPerm('/device/manage/import')" type="primary" @click="importList">
             批量导入
           </el-button>
-          <el-button type="primary" @click="exportList">
-            导出列表
+          <el-button v-if="proxy.hasPerm('/device/manage/export')" type="primary" @click="exportList">
+            导出
           </el-button>
           <input ref="fileRef" style="display: none;" type="file" accept=".xls,.xlsx" @change="onFileChange">
         </div>
@@ -409,16 +411,16 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="150">
             <template #default="scope">
-              <el-button type="primary" link size="small" @click="editRow('detail', scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/manage/detail')" type="primary" link size="small" @click="editRow('detail', scope.row)">
                 查看
               </el-button>
-              <el-button type="primary" link size="small" @click="editRow('edit', scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/manage/update')" type="primary" link size="small" @click="editRow('edit', scope.row)">
                 编辑
               </el-button>
-              <el-button type="danger" link size="small" @click="changeDefense(scope.row)">
+              <!-- <el-button v-if="proxy.hasPerm('/device/manage/add')" type="danger" link size="small" @click="changeDefense(scope.row)">
                 撤防
-              </el-button>
-              <el-button type="danger" link size="small" @click="removeRow(scope.row)">
+              </el-button> -->
+              <el-button v-if="proxy.hasPerm('/device/manage/delete')" type="danger" link size="small" @click="removeRow(scope.row)">
                 删除
               </el-button>
             </template>
diff --git a/src/views/home/device/instruction/index.vue b/src/views/home/device/instruction/index.vue
index 1e598ed..1da6706 100644
--- a/src/views/home/device/instruction/index.vue
+++ b/src/views/home/device/instruction/index.vue
@@ -78,6 +78,7 @@
 }
 // 重置查询条件f
 const reset = () => {
+  datetimerange.value = []
   listQuery.value = {
     limit: 20,
     offset: 1,
@@ -158,6 +159,7 @@
     editRef.value.initDialog('addOther', {})
   }
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -213,10 +215,10 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary">
+          <el-button v-if="proxy.hasPerm('/device/instruction/batch')" type="primary">
             批量下发
           </el-button>
-          <el-button type="primary" @click="editRow('add', {})">
+          <el-button v-if="proxy.hasPerm('/device/instruction/add')" type="primary" @click="editRow('add', {})">
             新建
           </el-button>
         </div>
@@ -236,13 +238,13 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="120">
             <template #default="scope">
-              <el-button type="primary" link size="small" @click="editRow('detail', scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/instruction/detail')" type="primary" link size="small" @click="editRow('detail', scope.row)">
                 查看
               </el-button>
-              <el-button v-if="scope.row.status === '2'" type="primary" link size="small" @click="editRow('edit', scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/instruction/again') && scope.row.status === '2'" type="primary" link size="small" @click="editRow('edit', scope.row)">
                 重新下发
               </el-button>
-              <el-button type="danger" link size="small" @click="removeRow(scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/instruction/delete')" type="danger" link size="small" @click="removeRow(scope.row)">
                 删除
               </el-button>
             </template>
diff --git a/src/views/home/device/product/index.vue b/src/views/home/device/product/index.vue
index 799fc90..fdd5463 100644
--- a/src/views/home/device/product/index.vue
+++ b/src/views/home/device/product/index.vue
@@ -128,6 +128,7 @@
   await fetchDict()
   fetchData()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -164,7 +165,7 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="editRow('add', {})">
+          <el-button v-if="proxy.hasPerm('/device/product/add')" type="primary" @click="editRow('add', {})">
             新建
           </el-button>
         </div>
@@ -184,10 +185,10 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="120">
             <template #default="scope">
-              <el-button type="primary" link size="small" @click="editRow('edit', scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/product/update')" type="primary" link size="small" @click="editRow('edit', scope.row)">
                 编辑
               </el-button>
-              <el-button type="danger" link size="small" @click="removeRow(scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/product/delete')" type="danger" link size="small" @click="removeRow(scope.row)">
                 删除
               </el-button>
             </template>
diff --git a/src/views/home/device/type/index.vue b/src/views/home/device/type/index.vue
index 59f1343..2344e57 100644
--- a/src/views/home/device/type/index.vue
+++ b/src/views/home/device/type/index.vue
@@ -105,6 +105,7 @@
   await fetchDict()
   fetchData()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -131,7 +132,7 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="editRow('add', {})">
+          <el-button v-if="proxy.hasPerm('/device/type/add')" type="primary" @click="editRow('add', {})">
             新建
           </el-button>
         </div>
@@ -151,10 +152,10 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="120">
             <template #default="scope">
-              <el-button type="primary" link size="small" @click="editRow('edit', scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/type/update')" type="primary" link size="small" @click="editRow('edit', scope.row)">
                 编辑
               </el-button>
-              <el-button type="danger" link size="small" @click="removeRow(scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/type/delete')" type="danger" link size="small" @click="removeRow(scope.row)">
                 删除
               </el-button>
             </template>
diff --git a/src/views/home/ledger/ledger/components/gridList.vue b/src/views/home/ledger/ledger/components/gridList.vue
index d03cd9f..189edef 100644
--- a/src/views/home/ledger/ledger/components/gridList.vue
+++ b/src/views/home/ledger/ledger/components/gridList.vue
@@ -91,6 +91,7 @@
     // })
   })
 }
+const { proxy } = getCurrentInstance() as any
 // 同步日志
 const allSync = () => {
   $router.push({
@@ -139,10 +140,10 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="allSync">
+          <el-button v-if="proxy.hasPerm('/ledger/sync')" type="primary" @click="allSync">
             同步日志
           </el-button>
-          <el-button type="primary" @click="sync('all', {})">
+          <el-button v-if="proxy.hasPerm('/ledger/sync/all')" type="primary" @click="sync('all', {})">
             全量同步
           </el-button>
         </div>
@@ -160,9 +161,9 @@
           </el-table-column>
         </template>
         <template #columns>
-          <el-table-column label="操作" align="center" width="80">
+          <el-table-column v-if="proxy.hasPerm('/ledger/sync/single')" label="操作" align="center" width="80">
             <template #default="scope">
-              <el-button type="primary" link size="small" @click="sync('single', scope.row)">
+              <el-button v-if="proxy.hasPerm('/ledger/sync/single')" type="primary" link size="small" @click="sync('single', scope.row)">
                 同步
               </el-button>
             </template>
diff --git a/src/views/home/ledger/ledger/components/wellList.vue b/src/views/home/ledger/ledger/components/wellList.vue
index 9eb1f43..06f855a 100644
--- a/src/views/home/ledger/ledger/components/wellList.vue
+++ b/src/views/home/ledger/ledger/components/wellList.vue
@@ -123,6 +123,7 @@
   // await fetchDict()
   fetchData()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -159,11 +160,11 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="allSync">
+          <el-button v-if="proxy.hasPerm('/ledger/sync')" type="primary" @click="allSync">
             同步日志
           </el-button>
-          <el-button type="primary" @click="sync('all', {})">
-            全部同步
+          <el-button v-if="proxy.hasPerm('/ledger/sync/all')" type="primary" @click="sync('all', {})">
+            全量同步
           </el-button>
         </div>
       </template>
@@ -180,9 +181,9 @@
           </el-table-column>
         </template>
         <template #columns>
-          <el-table-column label="操作" align="center" width="80">
+          <el-table-column v-if="proxy.hasPerm('/ledger/sync/single')" label="操作" align="center" width="80">
             <template #default="scope">
-              <el-button type="primary" link size="small" @click="sync('single', scope.row)">
+              <el-button v-if="proxy.hasPerm('/ledger/sync/single')" type="primary" link size="small" @click="sync('single', scope.row)">
                 同步
               </el-button>
             </template>
diff --git a/src/views/home/ledger/ledger/index.vue b/src/views/home/ledger/ledger/index.vue
index a03aa12..8403fc5 100644
--- a/src/views/home/ledger/ledger/index.vue
+++ b/src/views/home/ledger/ledger/index.vue
@@ -7,7 +7,16 @@
 import type { TabsPaneContext } from 'element-plus'
 import wellList from './components/wellList.vue'
 import gridList from './components/gridList.vue'
-const activeName = ref('闸井')
+const { proxy } = getCurrentInstance() as any
+const activeName = ref(
+  proxy.hasPerm('/ledger/manage/well')
+    ? '闸井'
+    : proxy.hasPerm('/ledger/manage/station')
+      ? '场站'
+      : proxy.hasPerm('/ledger/manage/grid')
+        ? '网格'
+        : '',
+)
 const handleClick = (tab: TabsPaneContext, event: Event) => {
   // console.log(tab, event)
 }
@@ -17,13 +26,13 @@
   <!-- 布局 -->
   <app-container>
     <el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick">
-      <el-tab-pane label="闸井" name="闸井">
+      <el-tab-pane v-if="proxy.hasPerm('/ledger/manage/well')" label="闸井" name="闸井">
         <well-list v-if="activeName === '闸井'" type="1" />
       </el-tab-pane>
-      <el-tab-pane label="场站" name="场站">
+      <el-tab-pane v-if="proxy.hasPerm('/ledger/manage/station')" label="场站" name="场站">
         <well-list v-if="activeName === '场站'" type="2" />
       </el-tab-pane>
-      <el-tab-pane label="网格" name="网格">
+      <el-tab-pane v-if="proxy.hasPerm('/ledger/manage/grid')" label="网格" name="网格">
         <grid-list v-if="activeName === '网格'" />
       </el-tab-pane>
     </el-tabs>
diff --git a/src/views/home/ledger/pipeline/index.vue b/src/views/home/ledger/pipeline/index.vue
index e0d2512..01e95ac 100644
--- a/src/views/home/ledger/pipeline/index.vue
+++ b/src/views/home/ledger/pipeline/index.vue
@@ -160,6 +160,7 @@
 onMounted(async () => {
   fetchData()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -222,13 +223,13 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="editRow('add', {})">
+          <el-button v-if="proxy.hasPerm('/ledger/pipeline/add')" type="primary" @click="editRow('add', {})">
             新增
           </el-button>
-          <el-button type="primary" @click="importList">
+          <el-button v-if="proxy.hasPerm('/ledger/pipeline/import')" type="primary" @click="importList">
             批量导入
           </el-button>
-          <el-button type="primary" @click="exportList">
+          <el-button v-if="proxy.hasPerm('/ledger/pipeline/export')" type="primary" @click="exportList">
             批量导出
           </el-button>
         </div>
@@ -248,10 +249,10 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="100">
             <template #default="scope">
-              <el-button type="primary" link size="small" @click="editRow('edit', scope.row)">
+              <el-button v-if="proxy.hasPerm('/ledger/pipeline/update')" type="primary" link size="small" @click="editRow('edit', scope.row)">
                 编辑
               </el-button>
-              <el-button type="danger" link size="small" @click="removeRow(scope.row)">
+              <el-button v-if="proxy.hasPerm('/ledger/pipeline/delete')" type="danger" link size="small" @click="removeRow(scope.row)">
                 删除
               </el-button>
             </template>
diff --git a/src/views/home/ledger/sync/index.vue b/src/views/home/ledger/sync/index.vue
index 54a3218..a04bad9 100644
--- a/src/views/home/ledger/sync/index.vue
+++ b/src/views/home/ledger/sync/index.vue
@@ -62,6 +62,7 @@
 }
 // 重置查询条件f
 const reset = () => {
+  datetimerange.value = []
   listQuery.value = {
     limit: 20,
     offset: 1,
@@ -106,6 +107,8 @@
 onMounted(async () => {
   fetchData()
 })
+const { proxy } = getCurrentInstance() as any
+const $route = useRoute()
 </script>
 
 <template>
@@ -132,7 +135,7 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="goBak">
+          <el-button v-if="$route.type" type="primary" @click="goBak">
             返回
           </el-button>
         </div>
@@ -152,10 +155,10 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="80">
             <template #default="scope">
-              <el-button type="primary" link size="small">
+              <el-button v-if="proxy.hasPerm('/ledger/sync/detail')" type="primary" link size="small">
                 查看
               </el-button>
-              <el-button type="danger" link size="small" @click="removeRow(scope.row)">
+              <el-button v-if="proxy.hasPerm('/ledger/sync/delete')" type="danger" link size="small" @click="removeRow(scope.row)">
                 删除
               </el-button>
             </template>
diff --git a/src/views/home/monitor/service/index.vue b/src/views/home/monitor/service/index.vue
index 8df2239..570dc68 100644
--- a/src/views/home/monitor/service/index.vue
+++ b/src/views/home/monitor/service/index.vue
@@ -53,6 +53,7 @@
 onMounted(async () => {
   fetchData()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -66,7 +67,7 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary">
+          <el-button v-if="proxy.hasPerm('/monitor/service/add')" type="primary">
             新建
           </el-button>
         </div>

diff --git a/src/App.vue b/src/App.vue
index cde81b3..8a00f5d 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -125,7 +125,7 @@
         '--g-sub-sidebar-actual-width': subSidebarActualWidth,
       }"
     />
-    <system-info v-if="browserType !== 'mobile'" />
+    <!-- <system-info v-if="browserType !== 'mobile'" /> -->
     <audio id="eventAudio" src="" autoplay />
   </el-config-provider>
 </template>
diff --git a/src/layouts/components/Tools/alarmDialog.vue b/src/layouts/components/Tools/alarmDialog.vue
index 1828375..df89ab8 100644
--- a/src/layouts/components/Tools/alarmDialog.vue
+++ b/src/layouts/components/Tools/alarmDialog.vue
@@ -116,7 +116,7 @@
     </div>
     <template #footer>
       <div class="dialog-footer">
-        <div class="btn" @click="detail">
+        <div v-if="proxy.hasPerm('/alarm/current')" class="btn" @click="detail">
           查看
         </div>
         <div v-if="info.isSound === '1'" class="btn" @click="closeSound">
diff --git a/src/layouts/components/Tools/alarmList.vue b/src/layouts/components/Tools/alarmList.vue
index c3a9d2a..5356b74 100644
--- a/src/layouts/components/Tools/alarmList.vue
+++ b/src/layouts/components/Tools/alarmList.vue
@@ -54,6 +54,7 @@
 }
 // 查看当前行
 const detailRow = (row: any) => {
+  if (!proxy.hasPerm('/alarm/current')) { return }
   $router.push({
     name: 'AlarmCurrent',
     query: {
@@ -77,21 +78,6 @@
   localStorage.setItem('eventAudio', 'pause')
 }
 const dialogRef = ref()
-// const dialog = () => {
-//   const row = {
-//     alarmNoteMethod: '1', // 消息提醒 1:弹窗，2:消息提醒
-//     isSound: '1', // 报警音效，1:开，0:关
-//     isSend: '1', // 报警推送，1:开，0:关
-//     isText: '1', // 报警短息，1:开，0:关
-//     alarmType: '浓度超限',
-//     tagNumber: 'NX5702',
-//     alarmTime: '2024-09-09',
-//     value: '20',
-//     typeName: '燃气智能终端',
-//     alarmLevel: '一级',
-//   }
-//   dialogRef.value.initDialog(row)
-// }
 const fetchData = (isLoading = false) => {
   loading.value = true
   if (isLoading) {
@@ -115,7 +101,10 @@
       dialogRef.value.initDialog(newVal)
     }
     if (newVal.isSound === '1') {
-      play()
+      // play()
+      if (!localStorage.getItem('eventAudio')) {
+        proxy.playAudio()
+      }
     }
     fetchData(false)
   }
@@ -146,6 +135,7 @@
 //     window.localStorage.removeItem('token')
 //   }
 // }
+// const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -180,7 +170,7 @@
                   {{ message.processStatus
                     === '未读' ? '未读' : '已读' }}
                 </el-tag>
-                <el-tag type="info" size="small" style="margin-left: 5px;">
+                <el-tag type="info" size="small" style="margin-left: 5px;" @click="detailRow(message)">
                   查看
                 </el-tag>
               </div>
@@ -214,7 +204,7 @@
       <!-- <div class="close" @click="dialog">
         弹窗
       </div> -->
-      <div class="more" @click="moreList">
+      <div v-if="proxy.hasPerm('/alarm/current')" class="more" @click="moreList">
         查看更多
       </div>
     </div>
diff --git a/src/layouts/components/Tools/index.vue b/src/layouts/components/Tools/index.vue
index 9f2d41f..61f9707 100644
--- a/src/layouts/components/Tools/index.vue
+++ b/src/layouts/components/Tools/index.vue
@@ -79,6 +79,7 @@
   // 断开 websocket
   // websocket.destroyWebSocket()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -89,18 +90,18 @@
           <svg-icon name="ep:search" />
         </el-icon>
       </span>
-      <span class="item" @click="board">
+      <span v-if="proxy.hasPerm('/fullscreen')" class="item" @click="board">
         <el-icon>
           <svg-icon name="ep:data-line" />
         </el-icon>
       </span>
-      <span v-if="settingsStore.mode === 'pc' && settingsStore.toolbar.enableFullscreen" class="item" @click="toggle">
+      <span class="item" @click="toggle">
         <el-icon>
           <svg-icon :name="isFullscreen ? 'fullscreen-exit' : 'fullscreen'" />
         </el-icon>
       </span>
       <!-- 报警信息列表 -->
-      <span class="item">
+      <span v-if="proxy.hasPerm('/alarmnotice')" class="item">
         <el-popover width="390">
           <template #reference>
             <div>
diff --git a/src/layouts/components/Topbar/index.vue b/src/layouts/components/Topbar/index.vue
index 2863cef..4e3120e 100644
--- a/src/layouts/components/Topbar/index.vue
+++ b/src/layouts/components/Topbar/index.vue
@@ -67,7 +67,7 @@
           </transition-group>
         </el-breadcrumb>
       </div>
-      <tools />
+      <!-- <tools /> -->
     </div>
   </div>
 </template>
diff --git a/src/router/modules/pc.ts b/src/router/modules/pc.ts
index aacd6fa..97ced45 100644
--- a/src/router/modules/pc.ts
+++ b/src/router/modules/pc.ts
@@ -40,7 +40,7 @@
       icon: 'ep:key',
       sidebar: false,
       breadcrumb: false,
-      // auth: '/fullscreen',
+      auth: '/fullscreen',
     },
   },
   {
@@ -155,7 +155,7 @@
           sidebar: false,
           breadcrumb: false,
           activeMenu: '/well',
-          auth: '/well/detail',
+          auth: '/well',
         },
       },
     ],
diff --git a/src/views/home/alarm/count/components/locationAnalysis.vue b/src/views/home/alarm/count/components/locationAnalysis.vue
index fc75b9e..bff1853 100644
--- a/src/views/home/alarm/count/components/locationAnalysis.vue
+++ b/src/views/home/alarm/count/components/locationAnalysis.vue
@@ -46,6 +46,7 @@
   })
 }
 fetchData()
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -75,6 +76,9 @@
         <el-button type="primary" style="margin: 0 5px;" @click="fetchData">
           搜索
         </el-button>
+        <el-button v-if="proxy.hasPerm('/alarm/count/exportLocation')" type="primary" style="margin: 0 5px;">
+          导出
+        </el-button>
       </div>
     </template>
     <template #content>
diff --git a/src/views/home/alarm/current/components/detail.vue b/src/views/home/alarm/current/components/detail.vue
index dd3b31a..4204c92 100644
--- a/src/views/home/alarm/current/components/detail.vue
+++ b/src/views/home/alarm/current/components/detail.vue
@@ -111,7 +111,7 @@
   const res2 = await getAlarmTypeListPage({ offset: 1, limit: 9999 });
   ($route.query.type === 'history' ? getAlarmDetail : getAlarmDetail)($route.query.id as string).then((res) => {
     detailInfo.value = toHumpObject(res.data)
-    detailInfo.value.realAlarmName = detailInfo.value.realAlarm === '1' ? '报警' : '误报'
+    detailInfo.value.realAlarmName = detailInfo.value.realAlarm === '0' ? '是' : '否'
     detailInfo.value.alarmTypeName = res2.data.rows.filter((item: any) => item.id === detailInfo.value.alarmTypeId)[0]?.alarmType || ''
     detailInfo.value.alarmLevelName = res1.data.rows.filter((item: any) => item.id === detailInfo.value.alarmLevel)[0]?.alarmLevel || ''
     detailInfo.value.duration = detailInfo.value.ts && detailInfo.value.cancelTime ? getDateDiff(detailInfo.value.ts, detailInfo.value.cancelTime) : ''
@@ -139,6 +139,7 @@
 }
 // 点击经纬度展示地图
 const mapRef = ref()
+const { proxy } = getCurrentInstance() as any
 const showMap = (data: any) => {
   console.log(data, 'data')
   if (data.text === '位置') {
@@ -148,6 +149,13 @@
         2: 'StationMonitorDetail',
         3: 'PipelineMonitorDetail',
       } as { [key: string]: string }
+      // 判断是否有菜单权限
+      const watchObjectAuth = {
+        1: '/well',
+        2: '/station/monitor',
+        3: '/pipeline',
+      } as { [key: string]: string }
+      if (!proxy.hasPerm(watchObjectAuth[detailInfo.value.watchObject])) { return }
       $router.push({
         name: watchObject[detailInfo.value.watchObject],
         query: {
diff --git a/src/views/home/alarm/current/components/detailInfoDialog.vue b/src/views/home/alarm/current/components/detailInfoDialog.vue
index c089449..7fbf06b 100644
--- a/src/views/home/alarm/current/components/detailInfoDialog.vue
+++ b/src/views/home/alarm/current/components/detailInfoDialog.vue
@@ -114,6 +114,7 @@
   })
 }
 defineExpose({ initDialog, close })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -131,7 +132,7 @@
     <!-- 头部 -->
     <div class="header">
       <span>{{ info.alarmContent }}</span>
-      <span class="more" @click="moreData">>>更多</span>
+      <span v-if="proxy.hasPerm(type === 'data' ? '/alarm/current/more' : '/alarm/device/more')" class="more" @click="moreData">>>更多</span>
     </div>
     <div class="content">
       <div v-show="type === 'device'" class="item">
@@ -162,7 +163,7 @@
         报警设备:
         <span style="padding-left: 6px;">{{ info.devcode }} </span>
         <el-button
-          v-if="info.devTypeName === '燃气智能监测终端' || info.devTypeName === '液位检测仪' || info.devTypeName === '井盖监测仪'"
+          v-if="(info.devTypeName === '燃气智能监测终端' || info.devTypeName === '液位检测仪' || info.devTypeName === '井盖监测仪') && proxy.hasPerm('/alarm/current/data')"
           size="small" style="margin-left: 6px;" @click="viewData"
         >
           查看数据
@@ -228,7 +229,7 @@
         <span style="padding-left: 6px;">
           {{ info.confirmContent }}
         </span>
-        <el-button v-if="type === 'data'" size="small" style="padding-left: 6px;" @click="viewProcess">
+        <el-button v-if="type === 'data' && proxy.hasPerm('/alarm/current/process')" size="small" style="padding-left: 6px;" @click="viewProcess">
           流程图
         </el-button>
       </div>
@@ -246,17 +247,17 @@
       </div>
     </div>
     <div class="footer">
-      <el-button v-if="Number(info.processStatus) < 4 && type === 'data'" size="small" @click="remind">
+      <el-button v-if="(Number(info.processStatus) < 4 && type === 'data') && proxy.hasPerm('/alarm/current/remind')" size="small" @click="remind">
         提醒责任人
       </el-button>
       <el-button
-        v-if="type === 'device' && (info.processStatusName === '待处置' || info.processStatusName === '挂起')"
+        v-if="(type === 'device' && (info.processStatusName === '待处置' || info.processStatusName === '挂起')) && proxy.hasPerm('/alarm/device/handler')"
         size="small" @click="handler"
       >
         报警处置
       </el-button>
       <el-button
-        v-if="Number(info.processStatus) <= 3 || (type === 'device' && info.processStatusName === '待处置') || info.processStatusName === '挂起'"
+        v-if="(Number(info.processStatus) <= 3 || (type === 'device' && info.processStatusName === '待处置') || info.processStatusName === '挂起') && proxy.hasPerm(type === 'device' ? '/alarm/device/pending' : '/alarm/current/pending')"
         type="primary" size="small" @click="pending"
       >
         挂起
diff --git a/src/views/home/alarm/current/index.vue b/src/views/home/alarm/current/index.vue
index d019bbf..e2714bb 100644
--- a/src/views/home/alarm/current/index.vue
+++ b/src/views/home/alarm/current/index.vue
@@ -4,6 +4,7 @@
   Date: 2023-06-28
  -->
 <script lang="ts" setup name="CurrentAlarm">
+import dayjs from 'dayjs'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import { ArrowLeftBold, ArrowRightBold } from '@element-plus/icons-vue'
 import MapCom from './components/map.vue'
@@ -100,6 +101,7 @@
       path: '/alarm/current',
     })
   }
+  datetimerange.value = []
   listQuery.value = {
     limit: 20,
     offset: 1,
@@ -131,8 +133,8 @@
   if ($route.query.row) {
     loadingTable.value = true
     const row = JSON.parse($route.query.row as string)
-    getCurrentAlarmListPage({ offset: 1, limit: 99999 }).then((res) => {
-      const data = res.data.rows.filter((item: any) => item.id === row.id)
+    getCurrentAlarmListPage({ offset: 1, limit: 50 }).then((res) => {
+      const data = res.data.rows.filter((item: any) => item.id === row.alarmId)
       if (data.length) {
         list1.value = data.map((item: any) => ({
           ...item,
@@ -153,7 +155,10 @@
     })
     return
   }
-  fetchData()
+  datetimerange.value = [dayjs().subtract(7, 'day').format('YYYY-MM-DD HH:mm:ss'), dayjs().format('YYYY-MM-DD HH:mm:ss')]
+  setTimeout(() => {
+    fetchData()
+  })
 })
 // 表格标识  地图或普通
 const tableFlag = ref('normal')
@@ -181,6 +186,10 @@
 const mapRef = ref()
 const mapData = ref({})
 async function detail(row: any) {
+  if (row.processStatusName === '未读') {
+    list1.value[list1.value.findIndex((item: any) => item.id === row.id)].processStatusName = '已读'
+    row.processStatusName = '已读'
+  }
   const res = await detailAlarm(row.id)
   const data = toHumpObject(res.data)
   mapData.value = row
@@ -362,7 +371,7 @@
               <el-button v-if="proxy.hasPerm('/alarm/current/delete')" type="primary" @click="batchDeleteRow">
                 批量删除
               </el-button>
-              <el-button type="primary" @click="exportList">
+              <el-button v-if="proxy.hasPerm('/alarm/current/export')" type="primary" @click="exportList">
                 导出
               </el-button>
             </div>
@@ -383,7 +392,7 @@
               </el-table-column>
             </template>
             <template #columns>
-              <el-table-column label="操作" align="center" width="80">
+              <el-table-column v-if="proxy.hasPerm('/alarm/current/detail')" label="操作" align="center" width="80">
                 <template #default="scope">
                   <el-button type="primary" link size="small" @click="detail(scope.row)">
                     查看
diff --git a/src/views/home/alarm/history/index.vue b/src/views/home/alarm/history/index.vue
index eeb49fc..3c810c3 100644
--- a/src/views/home/alarm/history/index.vue
+++ b/src/views/home/alarm/history/index.vue
@@ -97,6 +97,7 @@
 }
 // 重置查询条件f
 const reset = () => {
+  datetimerange.value = []
   listQuery.value = {
     limit: 20,
     offset: 1,
@@ -189,6 +190,7 @@
   })
 }
 fetchDict()
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -249,7 +251,7 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="exportList">
+          <el-button v-if="proxy.hasPerm('/alarm/history/export')" type="primary" @click="exportList">
             导出
           </el-button>
         </div>
@@ -272,7 +274,7 @@
           </el-table-column>
         </template>
         <template #columns>
-          <el-table-column label="操作" align="center" width="80">
+          <el-table-column v-if="proxy.hasPerm('/alarm/history/detail')" label="操作" align="center" width="80">
             <template #default="scope">
               <el-button type="primary" link size="small" @click="moreData(scope.row)">
                 查看
diff --git a/src/views/home/dashboard/index.vue b/src/views/home/dashboard/index.vue
index d2f7e3c..42dfbed 100644
--- a/src/views/home/dashboard/index.vue
+++ b/src/views/home/dashboard/index.vue
@@ -42,7 +42,7 @@
     value: '0',
     name: '在线',
     unit: '个',
-    id: '1',
+    id: '1,2',
   },
   {
     img: img.lixian,
@@ -56,7 +56,7 @@
     value: '0',
     name: '停用',
     unit: '个',
-    id: '2',
+    id: '3',
   },
 ])
 // 工作台数据
@@ -133,7 +133,11 @@
   deviceOperationLoading.value = true
   getDeviceStatus().then((res) => {
     res.data.forEach((element: any) => {
-      const index = deviceOperationData.value.findIndex((item: any) => item.id === element.name)
+      if (element.name === '1' || element.name === '2') {
+        deviceOperationData.value[0].value = Number(deviceOperationData.value[0].value || '0') + Number(element.value)
+        return
+      }
+      const index = deviceOperationData.value.findIndex((item: any) => item.id.includes(element.name))
       if (index !== -1) {
         deviceOperationData.value[index].value = element.value
       }
diff --git a/src/views/home/device/count/components/bottom.vue b/src/views/home/device/count/components/bottom.vue
index 28a4d78..e4e56fa 100644
--- a/src/views/home/device/count/components/bottom.vue
+++ b/src/views/home/device/count/components/bottom.vue
@@ -110,6 +110,7 @@
   })
 }
 fetchDict()
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -148,7 +149,7 @@
             <template #btns-right>
               <!-- 操作 -->
               <div>
-                <el-button type="primary">
+                <el-button v-if="proxy.hasPerm('/device/count/offline/export')" type="primary">
                   导出
                 </el-button>
               </div>
diff --git a/src/views/home/device/device/index.vue b/src/views/home/device/device/index.vue
index c3970b9..9cdd606 100644
--- a/src/views/home/device/device/index.vue
+++ b/src/views/home/device/device/index.vue
@@ -88,6 +88,7 @@
 }
 // 重置查询条件f
 const reset = () => {
+  datetimerange.value = []
   listQuery.value = {
     limit: 20,
     offset: 1,
@@ -296,6 +297,7 @@
   fetchDict()
   fetchData()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -372,17 +374,17 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="editRow('add', {})">
+          <el-button v-if="proxy.hasPerm('/device/manage/add')" type="primary" @click="editRow('add', {})">
             新建
           </el-button>
-          <el-button type="primary" @click="downloadTemplate">
+          <el-button v-if="proxy.hasPerm('/device/manage/down')" type="primary" @click="downloadTemplate">
             模板下载
           </el-button>
-          <el-button type="primary" @click="importList">
+          <el-button v-if="proxy.hasPerm('/device/manage/import')" type="primary" @click="importList">
             批量导入
           </el-button>
-          <el-button type="primary" @click="exportList">
-            导出列表
+          <el-button v-if="proxy.hasPerm('/device/manage/export')" type="primary" @click="exportList">
+            导出
           </el-button>
           <input ref="fileRef" style="display: none;" type="file" accept=".xls,.xlsx" @change="onFileChange">
         </div>
@@ -409,16 +411,16 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="150">
             <template #default="scope">
-              <el-button type="primary" link size="small" @click="editRow('detail', scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/manage/detail')" type="primary" link size="small" @click="editRow('detail', scope.row)">
                 查看
               </el-button>
-              <el-button type="primary" link size="small" @click="editRow('edit', scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/manage/update')" type="primary" link size="small" @click="editRow('edit', scope.row)">
                 编辑
               </el-button>
-              <el-button type="danger" link size="small" @click="changeDefense(scope.row)">
+              <!-- <el-button v-if="proxy.hasPerm('/device/manage/add')" type="danger" link size="small" @click="changeDefense(scope.row)">
                 撤防
-              </el-button>
-              <el-button type="danger" link size="small" @click="removeRow(scope.row)">
+              </el-button> -->
+              <el-button v-if="proxy.hasPerm('/device/manage/delete')" type="danger" link size="small" @click="removeRow(scope.row)">
                 删除
               </el-button>
             </template>
diff --git a/src/views/home/device/instruction/index.vue b/src/views/home/device/instruction/index.vue
index 1e598ed..1da6706 100644
--- a/src/views/home/device/instruction/index.vue
+++ b/src/views/home/device/instruction/index.vue
@@ -78,6 +78,7 @@
 }
 // 重置查询条件f
 const reset = () => {
+  datetimerange.value = []
   listQuery.value = {
     limit: 20,
     offset: 1,
@@ -158,6 +159,7 @@
     editRef.value.initDialog('addOther', {})
   }
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -213,10 +215,10 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary">
+          <el-button v-if="proxy.hasPerm('/device/instruction/batch')" type="primary">
             批量下发
           </el-button>
-          <el-button type="primary" @click="editRow('add', {})">
+          <el-button v-if="proxy.hasPerm('/device/instruction/add')" type="primary" @click="editRow('add', {})">
             新建
           </el-button>
         </div>
@@ -236,13 +238,13 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="120">
             <template #default="scope">
-              <el-button type="primary" link size="small" @click="editRow('detail', scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/instruction/detail')" type="primary" link size="small" @click="editRow('detail', scope.row)">
                 查看
               </el-button>
-              <el-button v-if="scope.row.status === '2'" type="primary" link size="small" @click="editRow('edit', scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/instruction/again') && scope.row.status === '2'" type="primary" link size="small" @click="editRow('edit', scope.row)">
                 重新下发
               </el-button>
-              <el-button type="danger" link size="small" @click="removeRow(scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/instruction/delete')" type="danger" link size="small" @click="removeRow(scope.row)">
                 删除
               </el-button>
             </template>
diff --git a/src/views/home/device/product/index.vue b/src/views/home/device/product/index.vue
index 799fc90..fdd5463 100644
--- a/src/views/home/device/product/index.vue
+++ b/src/views/home/device/product/index.vue
@@ -128,6 +128,7 @@
   await fetchDict()
   fetchData()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -164,7 +165,7 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="editRow('add', {})">
+          <el-button v-if="proxy.hasPerm('/device/product/add')" type="primary" @click="editRow('add', {})">
             新建
           </el-button>
         </div>
@@ -184,10 +185,10 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="120">
             <template #default="scope">
-              <el-button type="primary" link size="small" @click="editRow('edit', scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/product/update')" type="primary" link size="small" @click="editRow('edit', scope.row)">
                 编辑
               </el-button>
-              <el-button type="danger" link size="small" @click="removeRow(scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/product/delete')" type="danger" link size="small" @click="removeRow(scope.row)">
                 删除
               </el-button>
             </template>
diff --git a/src/views/home/device/type/index.vue b/src/views/home/device/type/index.vue
index 59f1343..2344e57 100644
--- a/src/views/home/device/type/index.vue
+++ b/src/views/home/device/type/index.vue
@@ -105,6 +105,7 @@
   await fetchDict()
   fetchData()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -131,7 +132,7 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="editRow('add', {})">
+          <el-button v-if="proxy.hasPerm('/device/type/add')" type="primary" @click="editRow('add', {})">
             新建
           </el-button>
         </div>
@@ -151,10 +152,10 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="120">
             <template #default="scope">
-              <el-button type="primary" link size="small" @click="editRow('edit', scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/type/update')" type="primary" link size="small" @click="editRow('edit', scope.row)">
                 编辑
               </el-button>
-              <el-button type="danger" link size="small" @click="removeRow(scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/type/delete')" type="danger" link size="small" @click="removeRow(scope.row)">
                 删除
               </el-button>
             </template>
diff --git a/src/views/home/ledger/ledger/components/gridList.vue b/src/views/home/ledger/ledger/components/gridList.vue
index d03cd9f..189edef 100644
--- a/src/views/home/ledger/ledger/components/gridList.vue
+++ b/src/views/home/ledger/ledger/components/gridList.vue
@@ -91,6 +91,7 @@
     // })
   })
 }
+const { proxy } = getCurrentInstance() as any
 // 同步日志
 const allSync = () => {
   $router.push({
@@ -139,10 +140,10 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="allSync">
+          <el-button v-if="proxy.hasPerm('/ledger/sync')" type="primary" @click="allSync">
             同步日志
           </el-button>
-          <el-button type="primary" @click="sync('all', {})">
+          <el-button v-if="proxy.hasPerm('/ledger/sync/all')" type="primary" @click="sync('all', {})">
             全量同步
           </el-button>
         </div>
@@ -160,9 +161,9 @@
           </el-table-column>
         </template>
         <template #columns>
-          <el-table-column label="操作" align="center" width="80">
+          <el-table-column v-if="proxy.hasPerm('/ledger/sync/single')" label="操作" align="center" width="80">
             <template #default="scope">
-              <el-button type="primary" link size="small" @click="sync('single', scope.row)">
+              <el-button v-if="proxy.hasPerm('/ledger/sync/single')" type="primary" link size="small" @click="sync('single', scope.row)">
                 同步
               </el-button>
             </template>
diff --git a/src/views/home/ledger/ledger/components/wellList.vue b/src/views/home/ledger/ledger/components/wellList.vue
index 9eb1f43..06f855a 100644
--- a/src/views/home/ledger/ledger/components/wellList.vue
+++ b/src/views/home/ledger/ledger/components/wellList.vue
@@ -123,6 +123,7 @@
   // await fetchDict()
   fetchData()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -159,11 +160,11 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="allSync">
+          <el-button v-if="proxy.hasPerm('/ledger/sync')" type="primary" @click="allSync">
             同步日志
           </el-button>
-          <el-button type="primary" @click="sync('all', {})">
-            全部同步
+          <el-button v-if="proxy.hasPerm('/ledger/sync/all')" type="primary" @click="sync('all', {})">
+            全量同步
           </el-button>
         </div>
       </template>
@@ -180,9 +181,9 @@
           </el-table-column>
         </template>
         <template #columns>
-          <el-table-column label="操作" align="center" width="80">
+          <el-table-column v-if="proxy.hasPerm('/ledger/sync/single')" label="操作" align="center" width="80">
             <template #default="scope">
-              <el-button type="primary" link size="small" @click="sync('single', scope.row)">
+              <el-button v-if="proxy.hasPerm('/ledger/sync/single')" type="primary" link size="small" @click="sync('single', scope.row)">
                 同步
               </el-button>
             </template>
diff --git a/src/views/home/ledger/ledger/index.vue b/src/views/home/ledger/ledger/index.vue
index a03aa12..8403fc5 100644
--- a/src/views/home/ledger/ledger/index.vue
+++ b/src/views/home/ledger/ledger/index.vue
@@ -7,7 +7,16 @@
 import type { TabsPaneContext } from 'element-plus'
 import wellList from './components/wellList.vue'
 import gridList from './components/gridList.vue'
-const activeName = ref('闸井')
+const { proxy } = getCurrentInstance() as any
+const activeName = ref(
+  proxy.hasPerm('/ledger/manage/well')
+    ? '闸井'
+    : proxy.hasPerm('/ledger/manage/station')
+      ? '场站'
+      : proxy.hasPerm('/ledger/manage/grid')
+        ? '网格'
+        : '',
+)
 const handleClick = (tab: TabsPaneContext, event: Event) => {
   // console.log(tab, event)
 }
@@ -17,13 +26,13 @@
   <!-- 布局 -->
   <app-container>
     <el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick">
-      <el-tab-pane label="闸井" name="闸井">
+      <el-tab-pane v-if="proxy.hasPerm('/ledger/manage/well')" label="闸井" name="闸井">
         <well-list v-if="activeName === '闸井'" type="1" />
       </el-tab-pane>
-      <el-tab-pane label="场站" name="场站">
+      <el-tab-pane v-if="proxy.hasPerm('/ledger/manage/station')" label="场站" name="场站">
         <well-list v-if="activeName === '场站'" type="2" />
       </el-tab-pane>
-      <el-tab-pane label="网格" name="网格">
+      <el-tab-pane v-if="proxy.hasPerm('/ledger/manage/grid')" label="网格" name="网格">
         <grid-list v-if="activeName === '网格'" />
       </el-tab-pane>
     </el-tabs>
diff --git a/src/views/home/ledger/pipeline/index.vue b/src/views/home/ledger/pipeline/index.vue
index e0d2512..01e95ac 100644
--- a/src/views/home/ledger/pipeline/index.vue
+++ b/src/views/home/ledger/pipeline/index.vue
@@ -160,6 +160,7 @@
 onMounted(async () => {
   fetchData()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -222,13 +223,13 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="editRow('add', {})">
+          <el-button v-if="proxy.hasPerm('/ledger/pipeline/add')" type="primary" @click="editRow('add', {})">
             新增
           </el-button>
-          <el-button type="primary" @click="importList">
+          <el-button v-if="proxy.hasPerm('/ledger/pipeline/import')" type="primary" @click="importList">
             批量导入
           </el-button>
-          <el-button type="primary" @click="exportList">
+          <el-button v-if="proxy.hasPerm('/ledger/pipeline/export')" type="primary" @click="exportList">
             批量导出
           </el-button>
         </div>
@@ -248,10 +249,10 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="100">
             <template #default="scope">
-              <el-button type="primary" link size="small" @click="editRow('edit', scope.row)">
+              <el-button v-if="proxy.hasPerm('/ledger/pipeline/update')" type="primary" link size="small" @click="editRow('edit', scope.row)">
                 编辑
               </el-button>
-              <el-button type="danger" link size="small" @click="removeRow(scope.row)">
+              <el-button v-if="proxy.hasPerm('/ledger/pipeline/delete')" type="danger" link size="small" @click="removeRow(scope.row)">
                 删除
               </el-button>
             </template>
diff --git a/src/views/home/ledger/sync/index.vue b/src/views/home/ledger/sync/index.vue
index 54a3218..a04bad9 100644
--- a/src/views/home/ledger/sync/index.vue
+++ b/src/views/home/ledger/sync/index.vue
@@ -62,6 +62,7 @@
 }
 // 重置查询条件f
 const reset = () => {
+  datetimerange.value = []
   listQuery.value = {
     limit: 20,
     offset: 1,
@@ -106,6 +107,8 @@
 onMounted(async () => {
   fetchData()
 })
+const { proxy } = getCurrentInstance() as any
+const $route = useRoute()
 </script>
 
 <template>
@@ -132,7 +135,7 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="goBak">
+          <el-button v-if="$route.type" type="primary" @click="goBak">
             返回
           </el-button>
         </div>
@@ -152,10 +155,10 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="80">
             <template #default="scope">
-              <el-button type="primary" link size="small">
+              <el-button v-if="proxy.hasPerm('/ledger/sync/detail')" type="primary" link size="small">
                 查看
               </el-button>
-              <el-button type="danger" link size="small" @click="removeRow(scope.row)">
+              <el-button v-if="proxy.hasPerm('/ledger/sync/delete')" type="danger" link size="small" @click="removeRow(scope.row)">
                 删除
               </el-button>
             </template>
diff --git a/src/views/home/monitor/service/index.vue b/src/views/home/monitor/service/index.vue
index 8df2239..570dc68 100644
--- a/src/views/home/monitor/service/index.vue
+++ b/src/views/home/monitor/service/index.vue
@@ -53,6 +53,7 @@
 onMounted(async () => {
   fetchData()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -66,7 +67,7 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary">
+          <el-button v-if="proxy.hasPerm('/monitor/service/add')" type="primary">
             新建
           </el-button>
         </div>
diff --git a/src/views/home/monitor/time/index.vue b/src/views/home/monitor/time/index.vue
index caa6d46..0f7f5a0 100644
--- a/src/views/home/monitor/time/index.vue
+++ b/src/views/home/monitor/time/index.vue
@@ -53,6 +53,7 @@
 onMounted(async () => {
   fetchData()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -66,7 +67,7 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary">
+          <el-button v-if="proxy.hasPerm('/monitor/time/add')" type="primary">
             新建
           </el-button>
         </div>

diff --git a/src/App.vue b/src/App.vue
index cde81b3..8a00f5d 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -125,7 +125,7 @@
         '--g-sub-sidebar-actual-width': subSidebarActualWidth,
       }"
     />
-    <system-info v-if="browserType !== 'mobile'" />
+    <!-- <system-info v-if="browserType !== 'mobile'" /> -->
     <audio id="eventAudio" src="" autoplay />
   </el-config-provider>
 </template>
diff --git a/src/layouts/components/Tools/alarmDialog.vue b/src/layouts/components/Tools/alarmDialog.vue
index 1828375..df89ab8 100644
--- a/src/layouts/components/Tools/alarmDialog.vue
+++ b/src/layouts/components/Tools/alarmDialog.vue
@@ -116,7 +116,7 @@
     </div>
     <template #footer>
       <div class="dialog-footer">
-        <div class="btn" @click="detail">
+        <div v-if="proxy.hasPerm('/alarm/current')" class="btn" @click="detail">
           查看
         </div>
         <div v-if="info.isSound === '1'" class="btn" @click="closeSound">
diff --git a/src/layouts/components/Tools/alarmList.vue b/src/layouts/components/Tools/alarmList.vue
index c3a9d2a..5356b74 100644
--- a/src/layouts/components/Tools/alarmList.vue
+++ b/src/layouts/components/Tools/alarmList.vue
@@ -54,6 +54,7 @@
 }
 // 查看当前行
 const detailRow = (row: any) => {
+  if (!proxy.hasPerm('/alarm/current')) { return }
   $router.push({
     name: 'AlarmCurrent',
     query: {
@@ -77,21 +78,6 @@
   localStorage.setItem('eventAudio', 'pause')
 }
 const dialogRef = ref()
-// const dialog = () => {
-//   const row = {
-//     alarmNoteMethod: '1', // 消息提醒 1:弹窗，2:消息提醒
-//     isSound: '1', // 报警音效，1:开，0:关
-//     isSend: '1', // 报警推送，1:开，0:关
-//     isText: '1', // 报警短息，1:开，0:关
-//     alarmType: '浓度超限',
-//     tagNumber: 'NX5702',
-//     alarmTime: '2024-09-09',
-//     value: '20',
-//     typeName: '燃气智能终端',
-//     alarmLevel: '一级',
-//   }
-//   dialogRef.value.initDialog(row)
-// }
 const fetchData = (isLoading = false) => {
   loading.value = true
   if (isLoading) {
@@ -115,7 +101,10 @@
       dialogRef.value.initDialog(newVal)
     }
     if (newVal.isSound === '1') {
-      play()
+      // play()
+      if (!localStorage.getItem('eventAudio')) {
+        proxy.playAudio()
+      }
     }
     fetchData(false)
   }
@@ -146,6 +135,7 @@
 //     window.localStorage.removeItem('token')
 //   }
 // }
+// const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -180,7 +170,7 @@
                   {{ message.processStatus
                     === '未读' ? '未读' : '已读' }}
                 </el-tag>
-                <el-tag type="info" size="small" style="margin-left: 5px;">
+                <el-tag type="info" size="small" style="margin-left: 5px;" @click="detailRow(message)">
                   查看
                 </el-tag>
               </div>
@@ -214,7 +204,7 @@
       <!-- <div class="close" @click="dialog">
         弹窗
       </div> -->
-      <div class="more" @click="moreList">
+      <div v-if="proxy.hasPerm('/alarm/current')" class="more" @click="moreList">
         查看更多
       </div>
     </div>
diff --git a/src/layouts/components/Tools/index.vue b/src/layouts/components/Tools/index.vue
index 9f2d41f..61f9707 100644
--- a/src/layouts/components/Tools/index.vue
+++ b/src/layouts/components/Tools/index.vue
@@ -79,6 +79,7 @@
   // 断开 websocket
   // websocket.destroyWebSocket()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -89,18 +90,18 @@
           <svg-icon name="ep:search" />
         </el-icon>
       </span>
-      <span class="item" @click="board">
+      <span v-if="proxy.hasPerm('/fullscreen')" class="item" @click="board">
         <el-icon>
           <svg-icon name="ep:data-line" />
         </el-icon>
       </span>
-      <span v-if="settingsStore.mode === 'pc' && settingsStore.toolbar.enableFullscreen" class="item" @click="toggle">
+      <span class="item" @click="toggle">
         <el-icon>
           <svg-icon :name="isFullscreen ? 'fullscreen-exit' : 'fullscreen'" />
         </el-icon>
       </span>
       <!-- 报警信息列表 -->
-      <span class="item">
+      <span v-if="proxy.hasPerm('/alarmnotice')" class="item">
         <el-popover width="390">
           <template #reference>
             <div>
diff --git a/src/layouts/components/Topbar/index.vue b/src/layouts/components/Topbar/index.vue
index 2863cef..4e3120e 100644
--- a/src/layouts/components/Topbar/index.vue
+++ b/src/layouts/components/Topbar/index.vue
@@ -67,7 +67,7 @@
           </transition-group>
         </el-breadcrumb>
       </div>
-      <tools />
+      <!-- <tools /> -->
     </div>
   </div>
 </template>
diff --git a/src/router/modules/pc.ts b/src/router/modules/pc.ts
index aacd6fa..97ced45 100644
--- a/src/router/modules/pc.ts
+++ b/src/router/modules/pc.ts
@@ -40,7 +40,7 @@
       icon: 'ep:key',
       sidebar: false,
       breadcrumb: false,
-      // auth: '/fullscreen',
+      auth: '/fullscreen',
     },
   },
   {
@@ -155,7 +155,7 @@
           sidebar: false,
           breadcrumb: false,
           activeMenu: '/well',
-          auth: '/well/detail',
+          auth: '/well',
         },
       },
     ],
diff --git a/src/views/home/alarm/count/components/locationAnalysis.vue b/src/views/home/alarm/count/components/locationAnalysis.vue
index fc75b9e..bff1853 100644
--- a/src/views/home/alarm/count/components/locationAnalysis.vue
+++ b/src/views/home/alarm/count/components/locationAnalysis.vue
@@ -46,6 +46,7 @@
   })
 }
 fetchData()
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -75,6 +76,9 @@
         <el-button type="primary" style="margin: 0 5px;" @click="fetchData">
           搜索
         </el-button>
+        <el-button v-if="proxy.hasPerm('/alarm/count/exportLocation')" type="primary" style="margin: 0 5px;">
+          导出
+        </el-button>
       </div>
     </template>
     <template #content>
diff --git a/src/views/home/alarm/current/components/detail.vue b/src/views/home/alarm/current/components/detail.vue
index dd3b31a..4204c92 100644
--- a/src/views/home/alarm/current/components/detail.vue
+++ b/src/views/home/alarm/current/components/detail.vue
@@ -111,7 +111,7 @@
   const res2 = await getAlarmTypeListPage({ offset: 1, limit: 9999 });
   ($route.query.type === 'history' ? getAlarmDetail : getAlarmDetail)($route.query.id as string).then((res) => {
     detailInfo.value = toHumpObject(res.data)
-    detailInfo.value.realAlarmName = detailInfo.value.realAlarm === '1' ? '报警' : '误报'
+    detailInfo.value.realAlarmName = detailInfo.value.realAlarm === '0' ? '是' : '否'
     detailInfo.value.alarmTypeName = res2.data.rows.filter((item: any) => item.id === detailInfo.value.alarmTypeId)[0]?.alarmType || ''
     detailInfo.value.alarmLevelName = res1.data.rows.filter((item: any) => item.id === detailInfo.value.alarmLevel)[0]?.alarmLevel || ''
     detailInfo.value.duration = detailInfo.value.ts && detailInfo.value.cancelTime ? getDateDiff(detailInfo.value.ts, detailInfo.value.cancelTime) : ''
@@ -139,6 +139,7 @@
 }
 // 点击经纬度展示地图
 const mapRef = ref()
+const { proxy } = getCurrentInstance() as any
 const showMap = (data: any) => {
   console.log(data, 'data')
   if (data.text === '位置') {
@@ -148,6 +149,13 @@
         2: 'StationMonitorDetail',
         3: 'PipelineMonitorDetail',
       } as { [key: string]: string }
+      // 判断是否有菜单权限
+      const watchObjectAuth = {
+        1: '/well',
+        2: '/station/monitor',
+        3: '/pipeline',
+      } as { [key: string]: string }
+      if (!proxy.hasPerm(watchObjectAuth[detailInfo.value.watchObject])) { return }
       $router.push({
         name: watchObject[detailInfo.value.watchObject],
         query: {
diff --git a/src/views/home/alarm/current/components/detailInfoDialog.vue b/src/views/home/alarm/current/components/detailInfoDialog.vue
index c089449..7fbf06b 100644
--- a/src/views/home/alarm/current/components/detailInfoDialog.vue
+++ b/src/views/home/alarm/current/components/detailInfoDialog.vue
@@ -114,6 +114,7 @@
   })
 }
 defineExpose({ initDialog, close })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -131,7 +132,7 @@
     <!-- 头部 -->
     <div class="header">
       <span>{{ info.alarmContent }}</span>
-      <span class="more" @click="moreData">>>更多</span>
+      <span v-if="proxy.hasPerm(type === 'data' ? '/alarm/current/more' : '/alarm/device/more')" class="more" @click="moreData">>>更多</span>
     </div>
     <div class="content">
       <div v-show="type === 'device'" class="item">
@@ -162,7 +163,7 @@
         报警设备:
         <span style="padding-left: 6px;">{{ info.devcode }} </span>
         <el-button
-          v-if="info.devTypeName === '燃气智能监测终端' || info.devTypeName === '液位检测仪' || info.devTypeName === '井盖监测仪'"
+          v-if="(info.devTypeName === '燃气智能监测终端' || info.devTypeName === '液位检测仪' || info.devTypeName === '井盖监测仪') && proxy.hasPerm('/alarm/current/data')"
           size="small" style="margin-left: 6px;" @click="viewData"
         >
           查看数据
@@ -228,7 +229,7 @@
         <span style="padding-left: 6px;">
           {{ info.confirmContent }}
         </span>
-        <el-button v-if="type === 'data'" size="small" style="padding-left: 6px;" @click="viewProcess">
+        <el-button v-if="type === 'data' && proxy.hasPerm('/alarm/current/process')" size="small" style="padding-left: 6px;" @click="viewProcess">
           流程图
         </el-button>
       </div>
@@ -246,17 +247,17 @@
       </div>
     </div>
     <div class="footer">
-      <el-button v-if="Number(info.processStatus) < 4 && type === 'data'" size="small" @click="remind">
+      <el-button v-if="(Number(info.processStatus) < 4 && type === 'data') && proxy.hasPerm('/alarm/current/remind')" size="small" @click="remind">
         提醒责任人
       </el-button>
       <el-button
-        v-if="type === 'device' && (info.processStatusName === '待处置' || info.processStatusName === '挂起')"
+        v-if="(type === 'device' && (info.processStatusName === '待处置' || info.processStatusName === '挂起')) && proxy.hasPerm('/alarm/device/handler')"
         size="small" @click="handler"
       >
         报警处置
       </el-button>
       <el-button
-        v-if="Number(info.processStatus) <= 3 || (type === 'device' && info.processStatusName === '待处置') || info.processStatusName === '挂起'"
+        v-if="(Number(info.processStatus) <= 3 || (type === 'device' && info.processStatusName === '待处置') || info.processStatusName === '挂起') && proxy.hasPerm(type === 'device' ? '/alarm/device/pending' : '/alarm/current/pending')"
         type="primary" size="small" @click="pending"
       >
         挂起
diff --git a/src/views/home/alarm/current/index.vue b/src/views/home/alarm/current/index.vue
index d019bbf..e2714bb 100644
--- a/src/views/home/alarm/current/index.vue
+++ b/src/views/home/alarm/current/index.vue
@@ -4,6 +4,7 @@
   Date: 2023-06-28
  -->
 <script lang="ts" setup name="CurrentAlarm">
+import dayjs from 'dayjs'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import { ArrowLeftBold, ArrowRightBold } from '@element-plus/icons-vue'
 import MapCom from './components/map.vue'
@@ -100,6 +101,7 @@
       path: '/alarm/current',
     })
   }
+  datetimerange.value = []
   listQuery.value = {
     limit: 20,
     offset: 1,
@@ -131,8 +133,8 @@
   if ($route.query.row) {
     loadingTable.value = true
     const row = JSON.parse($route.query.row as string)
-    getCurrentAlarmListPage({ offset: 1, limit: 99999 }).then((res) => {
-      const data = res.data.rows.filter((item: any) => item.id === row.id)
+    getCurrentAlarmListPage({ offset: 1, limit: 50 }).then((res) => {
+      const data = res.data.rows.filter((item: any) => item.id === row.alarmId)
       if (data.length) {
         list1.value = data.map((item: any) => ({
           ...item,
@@ -153,7 +155,10 @@
     })
     return
   }
-  fetchData()
+  datetimerange.value = [dayjs().subtract(7, 'day').format('YYYY-MM-DD HH:mm:ss'), dayjs().format('YYYY-MM-DD HH:mm:ss')]
+  setTimeout(() => {
+    fetchData()
+  })
 })
 // 表格标识  地图或普通
 const tableFlag = ref('normal')
@@ -181,6 +186,10 @@
 const mapRef = ref()
 const mapData = ref({})
 async function detail(row: any) {
+  if (row.processStatusName === '未读') {
+    list1.value[list1.value.findIndex((item: any) => item.id === row.id)].processStatusName = '已读'
+    row.processStatusName = '已读'
+  }
   const res = await detailAlarm(row.id)
   const data = toHumpObject(res.data)
   mapData.value = row
@@ -362,7 +371,7 @@
               <el-button v-if="proxy.hasPerm('/alarm/current/delete')" type="primary" @click="batchDeleteRow">
                 批量删除
               </el-button>
-              <el-button type="primary" @click="exportList">
+              <el-button v-if="proxy.hasPerm('/alarm/current/export')" type="primary" @click="exportList">
                 导出
               </el-button>
             </div>
@@ -383,7 +392,7 @@
               </el-table-column>
             </template>
             <template #columns>
-              <el-table-column label="操作" align="center" width="80">
+              <el-table-column v-if="proxy.hasPerm('/alarm/current/detail')" label="操作" align="center" width="80">
                 <template #default="scope">
                   <el-button type="primary" link size="small" @click="detail(scope.row)">
                     查看
diff --git a/src/views/home/alarm/history/index.vue b/src/views/home/alarm/history/index.vue
index eeb49fc..3c810c3 100644
--- a/src/views/home/alarm/history/index.vue
+++ b/src/views/home/alarm/history/index.vue
@@ -97,6 +97,7 @@
 }
 // 重置查询条件f
 const reset = () => {
+  datetimerange.value = []
   listQuery.value = {
     limit: 20,
     offset: 1,
@@ -189,6 +190,7 @@
   })
 }
 fetchDict()
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -249,7 +251,7 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="exportList">
+          <el-button v-if="proxy.hasPerm('/alarm/history/export')" type="primary" @click="exportList">
             导出
           </el-button>
         </div>
@@ -272,7 +274,7 @@
           </el-table-column>
         </template>
         <template #columns>
-          <el-table-column label="操作" align="center" width="80">
+          <el-table-column v-if="proxy.hasPerm('/alarm/history/detail')" label="操作" align="center" width="80">
             <template #default="scope">
               <el-button type="primary" link size="small" @click="moreData(scope.row)">
                 查看
diff --git a/src/views/home/dashboard/index.vue b/src/views/home/dashboard/index.vue
index d2f7e3c..42dfbed 100644
--- a/src/views/home/dashboard/index.vue
+++ b/src/views/home/dashboard/index.vue
@@ -42,7 +42,7 @@
     value: '0',
     name: '在线',
     unit: '个',
-    id: '1',
+    id: '1,2',
   },
   {
     img: img.lixian,
@@ -56,7 +56,7 @@
     value: '0',
     name: '停用',
     unit: '个',
-    id: '2',
+    id: '3',
   },
 ])
 // 工作台数据
@@ -133,7 +133,11 @@
   deviceOperationLoading.value = true
   getDeviceStatus().then((res) => {
     res.data.forEach((element: any) => {
-      const index = deviceOperationData.value.findIndex((item: any) => item.id === element.name)
+      if (element.name === '1' || element.name === '2') {
+        deviceOperationData.value[0].value = Number(deviceOperationData.value[0].value || '0') + Number(element.value)
+        return
+      }
+      const index = deviceOperationData.value.findIndex((item: any) => item.id.includes(element.name))
       if (index !== -1) {
         deviceOperationData.value[index].value = element.value
       }
diff --git a/src/views/home/device/count/components/bottom.vue b/src/views/home/device/count/components/bottom.vue
index 28a4d78..e4e56fa 100644
--- a/src/views/home/device/count/components/bottom.vue
+++ b/src/views/home/device/count/components/bottom.vue
@@ -110,6 +110,7 @@
   })
 }
 fetchDict()
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -148,7 +149,7 @@
             <template #btns-right>
               <!-- 操作 -->
               <div>
-                <el-button type="primary">
+                <el-button v-if="proxy.hasPerm('/device/count/offline/export')" type="primary">
                   导出
                 </el-button>
               </div>
diff --git a/src/views/home/device/device/index.vue b/src/views/home/device/device/index.vue
index c3970b9..9cdd606 100644
--- a/src/views/home/device/device/index.vue
+++ b/src/views/home/device/device/index.vue
@@ -88,6 +88,7 @@
 }
 // 重置查询条件f
 const reset = () => {
+  datetimerange.value = []
   listQuery.value = {
     limit: 20,
     offset: 1,
@@ -296,6 +297,7 @@
   fetchDict()
   fetchData()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -372,17 +374,17 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="editRow('add', {})">
+          <el-button v-if="proxy.hasPerm('/device/manage/add')" type="primary" @click="editRow('add', {})">
             新建
           </el-button>
-          <el-button type="primary" @click="downloadTemplate">
+          <el-button v-if="proxy.hasPerm('/device/manage/down')" type="primary" @click="downloadTemplate">
             模板下载
           </el-button>
-          <el-button type="primary" @click="importList">
+          <el-button v-if="proxy.hasPerm('/device/manage/import')" type="primary" @click="importList">
             批量导入
           </el-button>
-          <el-button type="primary" @click="exportList">
-            导出列表
+          <el-button v-if="proxy.hasPerm('/device/manage/export')" type="primary" @click="exportList">
+            导出
           </el-button>
           <input ref="fileRef" style="display: none;" type="file" accept=".xls,.xlsx" @change="onFileChange">
         </div>
@@ -409,16 +411,16 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="150">
             <template #default="scope">
-              <el-button type="primary" link size="small" @click="editRow('detail', scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/manage/detail')" type="primary" link size="small" @click="editRow('detail', scope.row)">
                 查看
               </el-button>
-              <el-button type="primary" link size="small" @click="editRow('edit', scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/manage/update')" type="primary" link size="small" @click="editRow('edit', scope.row)">
                 编辑
               </el-button>
-              <el-button type="danger" link size="small" @click="changeDefense(scope.row)">
+              <!-- <el-button v-if="proxy.hasPerm('/device/manage/add')" type="danger" link size="small" @click="changeDefense(scope.row)">
                 撤防
-              </el-button>
-              <el-button type="danger" link size="small" @click="removeRow(scope.row)">
+              </el-button> -->
+              <el-button v-if="proxy.hasPerm('/device/manage/delete')" type="danger" link size="small" @click="removeRow(scope.row)">
                 删除
               </el-button>
             </template>
diff --git a/src/views/home/device/instruction/index.vue b/src/views/home/device/instruction/index.vue
index 1e598ed..1da6706 100644
--- a/src/views/home/device/instruction/index.vue
+++ b/src/views/home/device/instruction/index.vue
@@ -78,6 +78,7 @@
 }
 // 重置查询条件f
 const reset = () => {
+  datetimerange.value = []
   listQuery.value = {
     limit: 20,
     offset: 1,
@@ -158,6 +159,7 @@
     editRef.value.initDialog('addOther', {})
   }
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -213,10 +215,10 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary">
+          <el-button v-if="proxy.hasPerm('/device/instruction/batch')" type="primary">
             批量下发
           </el-button>
-          <el-button type="primary" @click="editRow('add', {})">
+          <el-button v-if="proxy.hasPerm('/device/instruction/add')" type="primary" @click="editRow('add', {})">
             新建
           </el-button>
         </div>
@@ -236,13 +238,13 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="120">
             <template #default="scope">
-              <el-button type="primary" link size="small" @click="editRow('detail', scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/instruction/detail')" type="primary" link size="small" @click="editRow('detail', scope.row)">
                 查看
               </el-button>
-              <el-button v-if="scope.row.status === '2'" type="primary" link size="small" @click="editRow('edit', scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/instruction/again') && scope.row.status === '2'" type="primary" link size="small" @click="editRow('edit', scope.row)">
                 重新下发
               </el-button>
-              <el-button type="danger" link size="small" @click="removeRow(scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/instruction/delete')" type="danger" link size="small" @click="removeRow(scope.row)">
                 删除
               </el-button>
             </template>
diff --git a/src/views/home/device/product/index.vue b/src/views/home/device/product/index.vue
index 799fc90..fdd5463 100644
--- a/src/views/home/device/product/index.vue
+++ b/src/views/home/device/product/index.vue
@@ -128,6 +128,7 @@
   await fetchDict()
   fetchData()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -164,7 +165,7 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="editRow('add', {})">
+          <el-button v-if="proxy.hasPerm('/device/product/add')" type="primary" @click="editRow('add', {})">
             新建
           </el-button>
         </div>
@@ -184,10 +185,10 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="120">
             <template #default="scope">
-              <el-button type="primary" link size="small" @click="editRow('edit', scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/product/update')" type="primary" link size="small" @click="editRow('edit', scope.row)">
                 编辑
               </el-button>
-              <el-button type="danger" link size="small" @click="removeRow(scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/product/delete')" type="danger" link size="small" @click="removeRow(scope.row)">
                 删除
               </el-button>
             </template>
diff --git a/src/views/home/device/type/index.vue b/src/views/home/device/type/index.vue
index 59f1343..2344e57 100644
--- a/src/views/home/device/type/index.vue
+++ b/src/views/home/device/type/index.vue
@@ -105,6 +105,7 @@
   await fetchDict()
   fetchData()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -131,7 +132,7 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="editRow('add', {})">
+          <el-button v-if="proxy.hasPerm('/device/type/add')" type="primary" @click="editRow('add', {})">
             新建
           </el-button>
         </div>
@@ -151,10 +152,10 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="120">
             <template #default="scope">
-              <el-button type="primary" link size="small" @click="editRow('edit', scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/type/update')" type="primary" link size="small" @click="editRow('edit', scope.row)">
                 编辑
               </el-button>
-              <el-button type="danger" link size="small" @click="removeRow(scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/type/delete')" type="danger" link size="small" @click="removeRow(scope.row)">
                 删除
               </el-button>
             </template>
diff --git a/src/views/home/ledger/ledger/components/gridList.vue b/src/views/home/ledger/ledger/components/gridList.vue
index d03cd9f..189edef 100644
--- a/src/views/home/ledger/ledger/components/gridList.vue
+++ b/src/views/home/ledger/ledger/components/gridList.vue
@@ -91,6 +91,7 @@
     // })
   })
 }
+const { proxy } = getCurrentInstance() as any
 // 同步日志
 const allSync = () => {
   $router.push({
@@ -139,10 +140,10 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="allSync">
+          <el-button v-if="proxy.hasPerm('/ledger/sync')" type="primary" @click="allSync">
             同步日志
           </el-button>
-          <el-button type="primary" @click="sync('all', {})">
+          <el-button v-if="proxy.hasPerm('/ledger/sync/all')" type="primary" @click="sync('all', {})">
             全量同步
           </el-button>
         </div>
@@ -160,9 +161,9 @@
           </el-table-column>
         </template>
         <template #columns>
-          <el-table-column label="操作" align="center" width="80">
+          <el-table-column v-if="proxy.hasPerm('/ledger/sync/single')" label="操作" align="center" width="80">
             <template #default="scope">
-              <el-button type="primary" link size="small" @click="sync('single', scope.row)">
+              <el-button v-if="proxy.hasPerm('/ledger/sync/single')" type="primary" link size="small" @click="sync('single', scope.row)">
                 同步
               </el-button>
             </template>
diff --git a/src/views/home/ledger/ledger/components/wellList.vue b/src/views/home/ledger/ledger/components/wellList.vue
index 9eb1f43..06f855a 100644
--- a/src/views/home/ledger/ledger/components/wellList.vue
+++ b/src/views/home/ledger/ledger/components/wellList.vue
@@ -123,6 +123,7 @@
   // await fetchDict()
   fetchData()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -159,11 +160,11 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="allSync">
+          <el-button v-if="proxy.hasPerm('/ledger/sync')" type="primary" @click="allSync">
             同步日志
           </el-button>
-          <el-button type="primary" @click="sync('all', {})">
-            全部同步
+          <el-button v-if="proxy.hasPerm('/ledger/sync/all')" type="primary" @click="sync('all', {})">
+            全量同步
           </el-button>
         </div>
       </template>
@@ -180,9 +181,9 @@
           </el-table-column>
         </template>
         <template #columns>
-          <el-table-column label="操作" align="center" width="80">
+          <el-table-column v-if="proxy.hasPerm('/ledger/sync/single')" label="操作" align="center" width="80">
             <template #default="scope">
-              <el-button type="primary" link size="small" @click="sync('single', scope.row)">
+              <el-button v-if="proxy.hasPerm('/ledger/sync/single')" type="primary" link size="small" @click="sync('single', scope.row)">
                 同步
               </el-button>
             </template>
diff --git a/src/views/home/ledger/ledger/index.vue b/src/views/home/ledger/ledger/index.vue
index a03aa12..8403fc5 100644
--- a/src/views/home/ledger/ledger/index.vue
+++ b/src/views/home/ledger/ledger/index.vue
@@ -7,7 +7,16 @@
 import type { TabsPaneContext } from 'element-plus'
 import wellList from './components/wellList.vue'
 import gridList from './components/gridList.vue'
-const activeName = ref('闸井')
+const { proxy } = getCurrentInstance() as any
+const activeName = ref(
+  proxy.hasPerm('/ledger/manage/well')
+    ? '闸井'
+    : proxy.hasPerm('/ledger/manage/station')
+      ? '场站'
+      : proxy.hasPerm('/ledger/manage/grid')
+        ? '网格'
+        : '',
+)
 const handleClick = (tab: TabsPaneContext, event: Event) => {
   // console.log(tab, event)
 }
@@ -17,13 +26,13 @@
   <!-- 布局 -->
   <app-container>
     <el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick">
-      <el-tab-pane label="闸井" name="闸井">
+      <el-tab-pane v-if="proxy.hasPerm('/ledger/manage/well')" label="闸井" name="闸井">
         <well-list v-if="activeName === '闸井'" type="1" />
       </el-tab-pane>
-      <el-tab-pane label="场站" name="场站">
+      <el-tab-pane v-if="proxy.hasPerm('/ledger/manage/station')" label="场站" name="场站">
         <well-list v-if="activeName === '场站'" type="2" />
       </el-tab-pane>
-      <el-tab-pane label="网格" name="网格">
+      <el-tab-pane v-if="proxy.hasPerm('/ledger/manage/grid')" label="网格" name="网格">
         <grid-list v-if="activeName === '网格'" />
       </el-tab-pane>
     </el-tabs>
diff --git a/src/views/home/ledger/pipeline/index.vue b/src/views/home/ledger/pipeline/index.vue
index e0d2512..01e95ac 100644
--- a/src/views/home/ledger/pipeline/index.vue
+++ b/src/views/home/ledger/pipeline/index.vue
@@ -160,6 +160,7 @@
 onMounted(async () => {
   fetchData()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -222,13 +223,13 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="editRow('add', {})">
+          <el-button v-if="proxy.hasPerm('/ledger/pipeline/add')" type="primary" @click="editRow('add', {})">
             新增
           </el-button>
-          <el-button type="primary" @click="importList">
+          <el-button v-if="proxy.hasPerm('/ledger/pipeline/import')" type="primary" @click="importList">
             批量导入
           </el-button>
-          <el-button type="primary" @click="exportList">
+          <el-button v-if="proxy.hasPerm('/ledger/pipeline/export')" type="primary" @click="exportList">
             批量导出
           </el-button>
         </div>
@@ -248,10 +249,10 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="100">
             <template #default="scope">
-              <el-button type="primary" link size="small" @click="editRow('edit', scope.row)">
+              <el-button v-if="proxy.hasPerm('/ledger/pipeline/update')" type="primary" link size="small" @click="editRow('edit', scope.row)">
                 编辑
               </el-button>
-              <el-button type="danger" link size="small" @click="removeRow(scope.row)">
+              <el-button v-if="proxy.hasPerm('/ledger/pipeline/delete')" type="danger" link size="small" @click="removeRow(scope.row)">
                 删除
               </el-button>
             </template>
diff --git a/src/views/home/ledger/sync/index.vue b/src/views/home/ledger/sync/index.vue
index 54a3218..a04bad9 100644
--- a/src/views/home/ledger/sync/index.vue
+++ b/src/views/home/ledger/sync/index.vue
@@ -62,6 +62,7 @@
 }
 // 重置查询条件f
 const reset = () => {
+  datetimerange.value = []
   listQuery.value = {
     limit: 20,
     offset: 1,
@@ -106,6 +107,8 @@
 onMounted(async () => {
   fetchData()
 })
+const { proxy } = getCurrentInstance() as any
+const $route = useRoute()
 </script>
 
 <template>
@@ -132,7 +135,7 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="goBak">
+          <el-button v-if="$route.type" type="primary" @click="goBak">
             返回
           </el-button>
         </div>
@@ -152,10 +155,10 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="80">
             <template #default="scope">
-              <el-button type="primary" link size="small">
+              <el-button v-if="proxy.hasPerm('/ledger/sync/detail')" type="primary" link size="small">
                 查看
               </el-button>
-              <el-button type="danger" link size="small" @click="removeRow(scope.row)">
+              <el-button v-if="proxy.hasPerm('/ledger/sync/delete')" type="danger" link size="small" @click="removeRow(scope.row)">
                 删除
               </el-button>
             </template>
diff --git a/src/views/home/monitor/service/index.vue b/src/views/home/monitor/service/index.vue
index 8df2239..570dc68 100644
--- a/src/views/home/monitor/service/index.vue
+++ b/src/views/home/monitor/service/index.vue
@@ -53,6 +53,7 @@
 onMounted(async () => {
   fetchData()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -66,7 +67,7 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary">
+          <el-button v-if="proxy.hasPerm('/monitor/service/add')" type="primary">
             新建
           </el-button>
         </div>
diff --git a/src/views/home/monitor/time/index.vue b/src/views/home/monitor/time/index.vue
index caa6d46..0f7f5a0 100644
--- a/src/views/home/monitor/time/index.vue
+++ b/src/views/home/monitor/time/index.vue
@@ -53,6 +53,7 @@
 onMounted(async () => {
   fetchData()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -66,7 +67,7 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary">
+          <el-button v-if="proxy.hasPerm('/monitor/time/add')" type="primary">
             新建
           </el-button>
         </div>
diff --git a/src/views/home/operation/alarm/components/detail.vue b/src/views/home/operation/alarm/components/detail.vue
index 8194cbd..4ae4a1f 100644
--- a/src/views/home/operation/alarm/components/detail.vue
+++ b/src/views/home/operation/alarm/components/detail.vue
@@ -151,6 +151,7 @@
 }
 // 点击经纬度展示地图
 const mapRef = ref()
+const { proxy } = getCurrentInstance() as any
 const showMap = (data: any) => {
   console.log(data, 'data')
   if (data.text === '位置') {
@@ -160,6 +161,13 @@
         2: 'StationMonitorDetail',
         3: 'PipelineMonitorDetail',
       } as { [key: string]: string }
+      // 判断是否有菜单权限
+      const watchObjectAuth = {
+        1: '/well',
+        2: '/station/monitor',
+        3: '/pipeline',
+      } as { [key: string]: string }
+      if (!proxy.hasPerm(watchObjectAuth[detailInfo.value.watchObject])) { return }
       $router.push({
         name: watchObject[detailInfo.value.watchObject],
         query: {

diff --git a/src/App.vue b/src/App.vue
index cde81b3..8a00f5d 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -125,7 +125,7 @@
         '--g-sub-sidebar-actual-width': subSidebarActualWidth,
       }"
     />
-    <system-info v-if="browserType !== 'mobile'" />
+    <!-- <system-info v-if="browserType !== 'mobile'" /> -->
     <audio id="eventAudio" src="" autoplay />
   </el-config-provider>
 </template>
diff --git a/src/layouts/components/Tools/alarmDialog.vue b/src/layouts/components/Tools/alarmDialog.vue
index 1828375..df89ab8 100644
--- a/src/layouts/components/Tools/alarmDialog.vue
+++ b/src/layouts/components/Tools/alarmDialog.vue
@@ -116,7 +116,7 @@
     </div>
     <template #footer>
       <div class="dialog-footer">
-        <div class="btn" @click="detail">
+        <div v-if="proxy.hasPerm('/alarm/current')" class="btn" @click="detail">
           查看
         </div>
         <div v-if="info.isSound === '1'" class="btn" @click="closeSound">
diff --git a/src/layouts/components/Tools/alarmList.vue b/src/layouts/components/Tools/alarmList.vue
index c3a9d2a..5356b74 100644
--- a/src/layouts/components/Tools/alarmList.vue
+++ b/src/layouts/components/Tools/alarmList.vue
@@ -54,6 +54,7 @@
 }
 // 查看当前行
 const detailRow = (row: any) => {
+  if (!proxy.hasPerm('/alarm/current')) { return }
   $router.push({
     name: 'AlarmCurrent',
     query: {
@@ -77,21 +78,6 @@
   localStorage.setItem('eventAudio', 'pause')
 }
 const dialogRef = ref()
-// const dialog = () => {
-//   const row = {
-//     alarmNoteMethod: '1', // 消息提醒 1:弹窗，2:消息提醒
-//     isSound: '1', // 报警音效，1:开，0:关
-//     isSend: '1', // 报警推送，1:开，0:关
-//     isText: '1', // 报警短息，1:开，0:关
-//     alarmType: '浓度超限',
-//     tagNumber: 'NX5702',
-//     alarmTime: '2024-09-09',
-//     value: '20',
-//     typeName: '燃气智能终端',
-//     alarmLevel: '一级',
-//   }
-//   dialogRef.value.initDialog(row)
-// }
 const fetchData = (isLoading = false) => {
   loading.value = true
   if (isLoading) {
@@ -115,7 +101,10 @@
       dialogRef.value.initDialog(newVal)
     }
     if (newVal.isSound === '1') {
-      play()
+      // play()
+      if (!localStorage.getItem('eventAudio')) {
+        proxy.playAudio()
+      }
     }
     fetchData(false)
   }
@@ -146,6 +135,7 @@
 //     window.localStorage.removeItem('token')
 //   }
 // }
+// const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -180,7 +170,7 @@
                   {{ message.processStatus
                     === '未读' ? '未读' : '已读' }}
                 </el-tag>
-                <el-tag type="info" size="small" style="margin-left: 5px;">
+                <el-tag type="info" size="small" style="margin-left: 5px;" @click="detailRow(message)">
                   查看
                 </el-tag>
               </div>
@@ -214,7 +204,7 @@
       <!-- <div class="close" @click="dialog">
         弹窗
       </div> -->
-      <div class="more" @click="moreList">
+      <div v-if="proxy.hasPerm('/alarm/current')" class="more" @click="moreList">
         查看更多
       </div>
     </div>
diff --git a/src/layouts/components/Tools/index.vue b/src/layouts/components/Tools/index.vue
index 9f2d41f..61f9707 100644
--- a/src/layouts/components/Tools/index.vue
+++ b/src/layouts/components/Tools/index.vue
@@ -79,6 +79,7 @@
   // 断开 websocket
   // websocket.destroyWebSocket()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -89,18 +90,18 @@
           <svg-icon name="ep:search" />
         </el-icon>
       </span>
-      <span class="item" @click="board">
+      <span v-if="proxy.hasPerm('/fullscreen')" class="item" @click="board">
         <el-icon>
           <svg-icon name="ep:data-line" />
         </el-icon>
       </span>
-      <span v-if="settingsStore.mode === 'pc' && settingsStore.toolbar.enableFullscreen" class="item" @click="toggle">
+      <span class="item" @click="toggle">
         <el-icon>
           <svg-icon :name="isFullscreen ? 'fullscreen-exit' : 'fullscreen'" />
         </el-icon>
       </span>
       <!-- 报警信息列表 -->
-      <span class="item">
+      <span v-if="proxy.hasPerm('/alarmnotice')" class="item">
         <el-popover width="390">
           <template #reference>
             <div>
diff --git a/src/layouts/components/Topbar/index.vue b/src/layouts/components/Topbar/index.vue
index 2863cef..4e3120e 100644
--- a/src/layouts/components/Topbar/index.vue
+++ b/src/layouts/components/Topbar/index.vue
@@ -67,7 +67,7 @@
           </transition-group>
         </el-breadcrumb>
       </div>
-      <tools />
+      <!-- <tools /> -->
     </div>
   </div>
 </template>
diff --git a/src/router/modules/pc.ts b/src/router/modules/pc.ts
index aacd6fa..97ced45 100644
--- a/src/router/modules/pc.ts
+++ b/src/router/modules/pc.ts
@@ -40,7 +40,7 @@
       icon: 'ep:key',
       sidebar: false,
       breadcrumb: false,
-      // auth: '/fullscreen',
+      auth: '/fullscreen',
     },
   },
   {
@@ -155,7 +155,7 @@
           sidebar: false,
           breadcrumb: false,
           activeMenu: '/well',
-          auth: '/well/detail',
+          auth: '/well',
         },
       },
     ],
diff --git a/src/views/home/alarm/count/components/locationAnalysis.vue b/src/views/home/alarm/count/components/locationAnalysis.vue
index fc75b9e..bff1853 100644
--- a/src/views/home/alarm/count/components/locationAnalysis.vue
+++ b/src/views/home/alarm/count/components/locationAnalysis.vue
@@ -46,6 +46,7 @@
   })
 }
 fetchData()
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -75,6 +76,9 @@
         <el-button type="primary" style="margin: 0 5px;" @click="fetchData">
           搜索
         </el-button>
+        <el-button v-if="proxy.hasPerm('/alarm/count/exportLocation')" type="primary" style="margin: 0 5px;">
+          导出
+        </el-button>
       </div>
     </template>
     <template #content>
diff --git a/src/views/home/alarm/current/components/detail.vue b/src/views/home/alarm/current/components/detail.vue
index dd3b31a..4204c92 100644
--- a/src/views/home/alarm/current/components/detail.vue
+++ b/src/views/home/alarm/current/components/detail.vue
@@ -111,7 +111,7 @@
   const res2 = await getAlarmTypeListPage({ offset: 1, limit: 9999 });
   ($route.query.type === 'history' ? getAlarmDetail : getAlarmDetail)($route.query.id as string).then((res) => {
     detailInfo.value = toHumpObject(res.data)
-    detailInfo.value.realAlarmName = detailInfo.value.realAlarm === '1' ? '报警' : '误报'
+    detailInfo.value.realAlarmName = detailInfo.value.realAlarm === '0' ? '是' : '否'
     detailInfo.value.alarmTypeName = res2.data.rows.filter((item: any) => item.id === detailInfo.value.alarmTypeId)[0]?.alarmType || ''
     detailInfo.value.alarmLevelName = res1.data.rows.filter((item: any) => item.id === detailInfo.value.alarmLevel)[0]?.alarmLevel || ''
     detailInfo.value.duration = detailInfo.value.ts && detailInfo.value.cancelTime ? getDateDiff(detailInfo.value.ts, detailInfo.value.cancelTime) : ''
@@ -139,6 +139,7 @@
 }
 // 点击经纬度展示地图
 const mapRef = ref()
+const { proxy } = getCurrentInstance() as any
 const showMap = (data: any) => {
   console.log(data, 'data')
   if (data.text === '位置') {
@@ -148,6 +149,13 @@
         2: 'StationMonitorDetail',
         3: 'PipelineMonitorDetail',
       } as { [key: string]: string }
+      // 判断是否有菜单权限
+      const watchObjectAuth = {
+        1: '/well',
+        2: '/station/monitor',
+        3: '/pipeline',
+      } as { [key: string]: string }
+      if (!proxy.hasPerm(watchObjectAuth[detailInfo.value.watchObject])) { return }
       $router.push({
         name: watchObject[detailInfo.value.watchObject],
         query: {
diff --git a/src/views/home/alarm/current/components/detailInfoDialog.vue b/src/views/home/alarm/current/components/detailInfoDialog.vue
index c089449..7fbf06b 100644
--- a/src/views/home/alarm/current/components/detailInfoDialog.vue
+++ b/src/views/home/alarm/current/components/detailInfoDialog.vue
@@ -114,6 +114,7 @@
   })
 }
 defineExpose({ initDialog, close })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -131,7 +132,7 @@
     <!-- 头部 -->
     <div class="header">
       <span>{{ info.alarmContent }}</span>
-      <span class="more" @click="moreData">>>更多</span>
+      <span v-if="proxy.hasPerm(type === 'data' ? '/alarm/current/more' : '/alarm/device/more')" class="more" @click="moreData">>>更多</span>
     </div>
     <div class="content">
       <div v-show="type === 'device'" class="item">
@@ -162,7 +163,7 @@
         报警设备:
         <span style="padding-left: 6px;">{{ info.devcode }} </span>
         <el-button
-          v-if="info.devTypeName === '燃气智能监测终端' || info.devTypeName === '液位检测仪' || info.devTypeName === '井盖监测仪'"
+          v-if="(info.devTypeName === '燃气智能监测终端' || info.devTypeName === '液位检测仪' || info.devTypeName === '井盖监测仪') && proxy.hasPerm('/alarm/current/data')"
           size="small" style="margin-left: 6px;" @click="viewData"
         >
           查看数据
@@ -228,7 +229,7 @@
         <span style="padding-left: 6px;">
           {{ info.confirmContent }}
         </span>
-        <el-button v-if="type === 'data'" size="small" style="padding-left: 6px;" @click="viewProcess">
+        <el-button v-if="type === 'data' && proxy.hasPerm('/alarm/current/process')" size="small" style="padding-left: 6px;" @click="viewProcess">
           流程图
         </el-button>
       </div>
@@ -246,17 +247,17 @@
       </div>
     </div>
     <div class="footer">
-      <el-button v-if="Number(info.processStatus) < 4 && type === 'data'" size="small" @click="remind">
+      <el-button v-if="(Number(info.processStatus) < 4 && type === 'data') && proxy.hasPerm('/alarm/current/remind')" size="small" @click="remind">
         提醒责任人
       </el-button>
       <el-button
-        v-if="type === 'device' && (info.processStatusName === '待处置' || info.processStatusName === '挂起')"
+        v-if="(type === 'device' && (info.processStatusName === '待处置' || info.processStatusName === '挂起')) && proxy.hasPerm('/alarm/device/handler')"
         size="small" @click="handler"
       >
         报警处置
       </el-button>
       <el-button
-        v-if="Number(info.processStatus) <= 3 || (type === 'device' && info.processStatusName === '待处置') || info.processStatusName === '挂起'"
+        v-if="(Number(info.processStatus) <= 3 || (type === 'device' && info.processStatusName === '待处置') || info.processStatusName === '挂起') && proxy.hasPerm(type === 'device' ? '/alarm/device/pending' : '/alarm/current/pending')"
         type="primary" size="small" @click="pending"
       >
         挂起
diff --git a/src/views/home/alarm/current/index.vue b/src/views/home/alarm/current/index.vue
index d019bbf..e2714bb 100644
--- a/src/views/home/alarm/current/index.vue
+++ b/src/views/home/alarm/current/index.vue
@@ -4,6 +4,7 @@
   Date: 2023-06-28
  -->
 <script lang="ts" setup name="CurrentAlarm">
+import dayjs from 'dayjs'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import { ArrowLeftBold, ArrowRightBold } from '@element-plus/icons-vue'
 import MapCom from './components/map.vue'
@@ -100,6 +101,7 @@
       path: '/alarm/current',
     })
   }
+  datetimerange.value = []
   listQuery.value = {
     limit: 20,
     offset: 1,
@@ -131,8 +133,8 @@
   if ($route.query.row) {
     loadingTable.value = true
     const row = JSON.parse($route.query.row as string)
-    getCurrentAlarmListPage({ offset: 1, limit: 99999 }).then((res) => {
-      const data = res.data.rows.filter((item: any) => item.id === row.id)
+    getCurrentAlarmListPage({ offset: 1, limit: 50 }).then((res) => {
+      const data = res.data.rows.filter((item: any) => item.id === row.alarmId)
       if (data.length) {
         list1.value = data.map((item: any) => ({
           ...item,
@@ -153,7 +155,10 @@
     })
     return
   }
-  fetchData()
+  datetimerange.value = [dayjs().subtract(7, 'day').format('YYYY-MM-DD HH:mm:ss'), dayjs().format('YYYY-MM-DD HH:mm:ss')]
+  setTimeout(() => {
+    fetchData()
+  })
 })
 // 表格标识  地图或普通
 const tableFlag = ref('normal')
@@ -181,6 +186,10 @@
 const mapRef = ref()
 const mapData = ref({})
 async function detail(row: any) {
+  if (row.processStatusName === '未读') {
+    list1.value[list1.value.findIndex((item: any) => item.id === row.id)].processStatusName = '已读'
+    row.processStatusName = '已读'
+  }
   const res = await detailAlarm(row.id)
   const data = toHumpObject(res.data)
   mapData.value = row
@@ -362,7 +371,7 @@
               <el-button v-if="proxy.hasPerm('/alarm/current/delete')" type="primary" @click="batchDeleteRow">
                 批量删除
               </el-button>
-              <el-button type="primary" @click="exportList">
+              <el-button v-if="proxy.hasPerm('/alarm/current/export')" type="primary" @click="exportList">
                 导出
               </el-button>
             </div>
@@ -383,7 +392,7 @@
               </el-table-column>
             </template>
             <template #columns>
-              <el-table-column label="操作" align="center" width="80">
+              <el-table-column v-if="proxy.hasPerm('/alarm/current/detail')" label="操作" align="center" width="80">
                 <template #default="scope">
                   <el-button type="primary" link size="small" @click="detail(scope.row)">
                     查看
diff --git a/src/views/home/alarm/history/index.vue b/src/views/home/alarm/history/index.vue
index eeb49fc..3c810c3 100644
--- a/src/views/home/alarm/history/index.vue
+++ b/src/views/home/alarm/history/index.vue
@@ -97,6 +97,7 @@
 }
 // 重置查询条件f
 const reset = () => {
+  datetimerange.value = []
   listQuery.value = {
     limit: 20,
     offset: 1,
@@ -189,6 +190,7 @@
   })
 }
 fetchDict()
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -249,7 +251,7 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="exportList">
+          <el-button v-if="proxy.hasPerm('/alarm/history/export')" type="primary" @click="exportList">
             导出
           </el-button>
         </div>
@@ -272,7 +274,7 @@
           </el-table-column>
         </template>
         <template #columns>
-          <el-table-column label="操作" align="center" width="80">
+          <el-table-column v-if="proxy.hasPerm('/alarm/history/detail')" label="操作" align="center" width="80">
             <template #default="scope">
               <el-button type="primary" link size="small" @click="moreData(scope.row)">
                 查看
diff --git a/src/views/home/dashboard/index.vue b/src/views/home/dashboard/index.vue
index d2f7e3c..42dfbed 100644
--- a/src/views/home/dashboard/index.vue
+++ b/src/views/home/dashboard/index.vue
@@ -42,7 +42,7 @@
     value: '0',
     name: '在线',
     unit: '个',
-    id: '1',
+    id: '1,2',
   },
   {
     img: img.lixian,
@@ -56,7 +56,7 @@
     value: '0',
     name: '停用',
     unit: '个',
-    id: '2',
+    id: '3',
   },
 ])
 // 工作台数据
@@ -133,7 +133,11 @@
   deviceOperationLoading.value = true
   getDeviceStatus().then((res) => {
     res.data.forEach((element: any) => {
-      const index = deviceOperationData.value.findIndex((item: any) => item.id === element.name)
+      if (element.name === '1' || element.name === '2') {
+        deviceOperationData.value[0].value = Number(deviceOperationData.value[0].value || '0') + Number(element.value)
+        return
+      }
+      const index = deviceOperationData.value.findIndex((item: any) => item.id.includes(element.name))
       if (index !== -1) {
         deviceOperationData.value[index].value = element.value
       }
diff --git a/src/views/home/device/count/components/bottom.vue b/src/views/home/device/count/components/bottom.vue
index 28a4d78..e4e56fa 100644
--- a/src/views/home/device/count/components/bottom.vue
+++ b/src/views/home/device/count/components/bottom.vue
@@ -110,6 +110,7 @@
   })
 }
 fetchDict()
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -148,7 +149,7 @@
             <template #btns-right>
               <!-- 操作 -->
               <div>
-                <el-button type="primary">
+                <el-button v-if="proxy.hasPerm('/device/count/offline/export')" type="primary">
                   导出
                 </el-button>
               </div>
diff --git a/src/views/home/device/device/index.vue b/src/views/home/device/device/index.vue
index c3970b9..9cdd606 100644
--- a/src/views/home/device/device/index.vue
+++ b/src/views/home/device/device/index.vue
@@ -88,6 +88,7 @@
 }
 // 重置查询条件f
 const reset = () => {
+  datetimerange.value = []
   listQuery.value = {
     limit: 20,
     offset: 1,
@@ -296,6 +297,7 @@
   fetchDict()
   fetchData()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -372,17 +374,17 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="editRow('add', {})">
+          <el-button v-if="proxy.hasPerm('/device/manage/add')" type="primary" @click="editRow('add', {})">
             新建
           </el-button>
-          <el-button type="primary" @click="downloadTemplate">
+          <el-button v-if="proxy.hasPerm('/device/manage/down')" type="primary" @click="downloadTemplate">
             模板下载
           </el-button>
-          <el-button type="primary" @click="importList">
+          <el-button v-if="proxy.hasPerm('/device/manage/import')" type="primary" @click="importList">
             批量导入
           </el-button>
-          <el-button type="primary" @click="exportList">
-            导出列表
+          <el-button v-if="proxy.hasPerm('/device/manage/export')" type="primary" @click="exportList">
+            导出
           </el-button>
           <input ref="fileRef" style="display: none;" type="file" accept=".xls,.xlsx" @change="onFileChange">
         </div>
@@ -409,16 +411,16 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="150">
             <template #default="scope">
-              <el-button type="primary" link size="small" @click="editRow('detail', scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/manage/detail')" type="primary" link size="small" @click="editRow('detail', scope.row)">
                 查看
               </el-button>
-              <el-button type="primary" link size="small" @click="editRow('edit', scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/manage/update')" type="primary" link size="small" @click="editRow('edit', scope.row)">
                 编辑
               </el-button>
-              <el-button type="danger" link size="small" @click="changeDefense(scope.row)">
+              <!-- <el-button v-if="proxy.hasPerm('/device/manage/add')" type="danger" link size="small" @click="changeDefense(scope.row)">
                 撤防
-              </el-button>
-              <el-button type="danger" link size="small" @click="removeRow(scope.row)">
+              </el-button> -->
+              <el-button v-if="proxy.hasPerm('/device/manage/delete')" type="danger" link size="small" @click="removeRow(scope.row)">
                 删除
               </el-button>
             </template>
diff --git a/src/views/home/device/instruction/index.vue b/src/views/home/device/instruction/index.vue
index 1e598ed..1da6706 100644
--- a/src/views/home/device/instruction/index.vue
+++ b/src/views/home/device/instruction/index.vue
@@ -78,6 +78,7 @@
 }
 // 重置查询条件f
 const reset = () => {
+  datetimerange.value = []
   listQuery.value = {
     limit: 20,
     offset: 1,
@@ -158,6 +159,7 @@
     editRef.value.initDialog('addOther', {})
   }
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -213,10 +215,10 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary">
+          <el-button v-if="proxy.hasPerm('/device/instruction/batch')" type="primary">
             批量下发
           </el-button>
-          <el-button type="primary" @click="editRow('add', {})">
+          <el-button v-if="proxy.hasPerm('/device/instruction/add')" type="primary" @click="editRow('add', {})">
             新建
           </el-button>
         </div>
@@ -236,13 +238,13 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="120">
             <template #default="scope">
-              <el-button type="primary" link size="small" @click="editRow('detail', scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/instruction/detail')" type="primary" link size="small" @click="editRow('detail', scope.row)">
                 查看
               </el-button>
-              <el-button v-if="scope.row.status === '2'" type="primary" link size="small" @click="editRow('edit', scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/instruction/again') && scope.row.status === '2'" type="primary" link size="small" @click="editRow('edit', scope.row)">
                 重新下发
               </el-button>
-              <el-button type="danger" link size="small" @click="removeRow(scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/instruction/delete')" type="danger" link size="small" @click="removeRow(scope.row)">
                 删除
               </el-button>
             </template>
diff --git a/src/views/home/device/product/index.vue b/src/views/home/device/product/index.vue
index 799fc90..fdd5463 100644
--- a/src/views/home/device/product/index.vue
+++ b/src/views/home/device/product/index.vue
@@ -128,6 +128,7 @@
   await fetchDict()
   fetchData()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -164,7 +165,7 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="editRow('add', {})">
+          <el-button v-if="proxy.hasPerm('/device/product/add')" type="primary" @click="editRow('add', {})">
             新建
           </el-button>
         </div>
@@ -184,10 +185,10 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="120">
             <template #default="scope">
-              <el-button type="primary" link size="small" @click="editRow('edit', scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/product/update')" type="primary" link size="small" @click="editRow('edit', scope.row)">
                 编辑
               </el-button>
-              <el-button type="danger" link size="small" @click="removeRow(scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/product/delete')" type="danger" link size="small" @click="removeRow(scope.row)">
                 删除
               </el-button>
             </template>
diff --git a/src/views/home/device/type/index.vue b/src/views/home/device/type/index.vue
index 59f1343..2344e57 100644
--- a/src/views/home/device/type/index.vue
+++ b/src/views/home/device/type/index.vue
@@ -105,6 +105,7 @@
   await fetchDict()
   fetchData()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -131,7 +132,7 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="editRow('add', {})">
+          <el-button v-if="proxy.hasPerm('/device/type/add')" type="primary" @click="editRow('add', {})">
             新建
           </el-button>
         </div>
@@ -151,10 +152,10 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="120">
             <template #default="scope">
-              <el-button type="primary" link size="small" @click="editRow('edit', scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/type/update')" type="primary" link size="small" @click="editRow('edit', scope.row)">
                 编辑
               </el-button>
-              <el-button type="danger" link size="small" @click="removeRow(scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/type/delete')" type="danger" link size="small" @click="removeRow(scope.row)">
                 删除
               </el-button>
             </template>
diff --git a/src/views/home/ledger/ledger/components/gridList.vue b/src/views/home/ledger/ledger/components/gridList.vue
index d03cd9f..189edef 100644
--- a/src/views/home/ledger/ledger/components/gridList.vue
+++ b/src/views/home/ledger/ledger/components/gridList.vue
@@ -91,6 +91,7 @@
     // })
   })
 }
+const { proxy } = getCurrentInstance() as any
 // 同步日志
 const allSync = () => {
   $router.push({
@@ -139,10 +140,10 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="allSync">
+          <el-button v-if="proxy.hasPerm('/ledger/sync')" type="primary" @click="allSync">
             同步日志
           </el-button>
-          <el-button type="primary" @click="sync('all', {})">
+          <el-button v-if="proxy.hasPerm('/ledger/sync/all')" type="primary" @click="sync('all', {})">
             全量同步
           </el-button>
         </div>
@@ -160,9 +161,9 @@
           </el-table-column>
         </template>
         <template #columns>
-          <el-table-column label="操作" align="center" width="80">
+          <el-table-column v-if="proxy.hasPerm('/ledger/sync/single')" label="操作" align="center" width="80">
             <template #default="scope">
-              <el-button type="primary" link size="small" @click="sync('single', scope.row)">
+              <el-button v-if="proxy.hasPerm('/ledger/sync/single')" type="primary" link size="small" @click="sync('single', scope.row)">
                 同步
               </el-button>
             </template>
diff --git a/src/views/home/ledger/ledger/components/wellList.vue b/src/views/home/ledger/ledger/components/wellList.vue
index 9eb1f43..06f855a 100644
--- a/src/views/home/ledger/ledger/components/wellList.vue
+++ b/src/views/home/ledger/ledger/components/wellList.vue
@@ -123,6 +123,7 @@
   // await fetchDict()
   fetchData()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -159,11 +160,11 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="allSync">
+          <el-button v-if="proxy.hasPerm('/ledger/sync')" type="primary" @click="allSync">
             同步日志
           </el-button>
-          <el-button type="primary" @click="sync('all', {})">
-            全部同步
+          <el-button v-if="proxy.hasPerm('/ledger/sync/all')" type="primary" @click="sync('all', {})">
+            全量同步
           </el-button>
         </div>
       </template>
@@ -180,9 +181,9 @@
           </el-table-column>
         </template>
         <template #columns>
-          <el-table-column label="操作" align="center" width="80">
+          <el-table-column v-if="proxy.hasPerm('/ledger/sync/single')" label="操作" align="center" width="80">
             <template #default="scope">
-              <el-button type="primary" link size="small" @click="sync('single', scope.row)">
+              <el-button v-if="proxy.hasPerm('/ledger/sync/single')" type="primary" link size="small" @click="sync('single', scope.row)">
                 同步
               </el-button>
             </template>
diff --git a/src/views/home/ledger/ledger/index.vue b/src/views/home/ledger/ledger/index.vue
index a03aa12..8403fc5 100644
--- a/src/views/home/ledger/ledger/index.vue
+++ b/src/views/home/ledger/ledger/index.vue
@@ -7,7 +7,16 @@
 import type { TabsPaneContext } from 'element-plus'
 import wellList from './components/wellList.vue'
 import gridList from './components/gridList.vue'
-const activeName = ref('闸井')
+const { proxy } = getCurrentInstance() as any
+const activeName = ref(
+  proxy.hasPerm('/ledger/manage/well')
+    ? '闸井'
+    : proxy.hasPerm('/ledger/manage/station')
+      ? '场站'
+      : proxy.hasPerm('/ledger/manage/grid')
+        ? '网格'
+        : '',
+)
 const handleClick = (tab: TabsPaneContext, event: Event) => {
   // console.log(tab, event)
 }
@@ -17,13 +26,13 @@
   <!-- 布局 -->
   <app-container>
     <el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick">
-      <el-tab-pane label="闸井" name="闸井">
+      <el-tab-pane v-if="proxy.hasPerm('/ledger/manage/well')" label="闸井" name="闸井">
         <well-list v-if="activeName === '闸井'" type="1" />
       </el-tab-pane>
-      <el-tab-pane label="场站" name="场站">
+      <el-tab-pane v-if="proxy.hasPerm('/ledger/manage/station')" label="场站" name="场站">
         <well-list v-if="activeName === '场站'" type="2" />
       </el-tab-pane>
-      <el-tab-pane label="网格" name="网格">
+      <el-tab-pane v-if="proxy.hasPerm('/ledger/manage/grid')" label="网格" name="网格">
         <grid-list v-if="activeName === '网格'" />
       </el-tab-pane>
     </el-tabs>
diff --git a/src/views/home/ledger/pipeline/index.vue b/src/views/home/ledger/pipeline/index.vue
index e0d2512..01e95ac 100644
--- a/src/views/home/ledger/pipeline/index.vue
+++ b/src/views/home/ledger/pipeline/index.vue
@@ -160,6 +160,7 @@
 onMounted(async () => {
   fetchData()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -222,13 +223,13 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="editRow('add', {})">
+          <el-button v-if="proxy.hasPerm('/ledger/pipeline/add')" type="primary" @click="editRow('add', {})">
             新增
           </el-button>
-          <el-button type="primary" @click="importList">
+          <el-button v-if="proxy.hasPerm('/ledger/pipeline/import')" type="primary" @click="importList">
             批量导入
           </el-button>
-          <el-button type="primary" @click="exportList">
+          <el-button v-if="proxy.hasPerm('/ledger/pipeline/export')" type="primary" @click="exportList">
             批量导出
           </el-button>
         </div>
@@ -248,10 +249,10 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="100">
             <template #default="scope">
-              <el-button type="primary" link size="small" @click="editRow('edit', scope.row)">
+              <el-button v-if="proxy.hasPerm('/ledger/pipeline/update')" type="primary" link size="small" @click="editRow('edit', scope.row)">
                 编辑
               </el-button>
-              <el-button type="danger" link size="small" @click="removeRow(scope.row)">
+              <el-button v-if="proxy.hasPerm('/ledger/pipeline/delete')" type="danger" link size="small" @click="removeRow(scope.row)">
                 删除
               </el-button>
             </template>
diff --git a/src/views/home/ledger/sync/index.vue b/src/views/home/ledger/sync/index.vue
index 54a3218..a04bad9 100644
--- a/src/views/home/ledger/sync/index.vue
+++ b/src/views/home/ledger/sync/index.vue
@@ -62,6 +62,7 @@
 }
 // 重置查询条件f
 const reset = () => {
+  datetimerange.value = []
   listQuery.value = {
     limit: 20,
     offset: 1,
@@ -106,6 +107,8 @@
 onMounted(async () => {
   fetchData()
 })
+const { proxy } = getCurrentInstance() as any
+const $route = useRoute()
 </script>
 
 <template>
@@ -132,7 +135,7 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="goBak">
+          <el-button v-if="$route.type" type="primary" @click="goBak">
             返回
           </el-button>
         </div>
@@ -152,10 +155,10 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="80">
             <template #default="scope">
-              <el-button type="primary" link size="small">
+              <el-button v-if="proxy.hasPerm('/ledger/sync/detail')" type="primary" link size="small">
                 查看
               </el-button>
-              <el-button type="danger" link size="small" @click="removeRow(scope.row)">
+              <el-button v-if="proxy.hasPerm('/ledger/sync/delete')" type="danger" link size="small" @click="removeRow(scope.row)">
                 删除
               </el-button>
             </template>
diff --git a/src/views/home/monitor/service/index.vue b/src/views/home/monitor/service/index.vue
index 8df2239..570dc68 100644
--- a/src/views/home/monitor/service/index.vue
+++ b/src/views/home/monitor/service/index.vue
@@ -53,6 +53,7 @@
 onMounted(async () => {
   fetchData()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -66,7 +67,7 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary">
+          <el-button v-if="proxy.hasPerm('/monitor/service/add')" type="primary">
             新建
           </el-button>
         </div>
diff --git a/src/views/home/monitor/time/index.vue b/src/views/home/monitor/time/index.vue
index caa6d46..0f7f5a0 100644
--- a/src/views/home/monitor/time/index.vue
+++ b/src/views/home/monitor/time/index.vue
@@ -53,6 +53,7 @@
 onMounted(async () => {
   fetchData()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -66,7 +67,7 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary">
+          <el-button v-if="proxy.hasPerm('/monitor/time/add')" type="primary">
             新建
           </el-button>
         </div>
diff --git a/src/views/home/operation/alarm/components/detail.vue b/src/views/home/operation/alarm/components/detail.vue
index 8194cbd..4ae4a1f 100644
--- a/src/views/home/operation/alarm/components/detail.vue
+++ b/src/views/home/operation/alarm/components/detail.vue
@@ -151,6 +151,7 @@
 }
 // 点击经纬度展示地图
 const mapRef = ref()
+const { proxy } = getCurrentInstance() as any
 const showMap = (data: any) => {
   console.log(data, 'data')
   if (data.text === '位置') {
@@ -160,6 +161,13 @@
         2: 'StationMonitorDetail',
         3: 'PipelineMonitorDetail',
       } as { [key: string]: string }
+      // 判断是否有菜单权限
+      const watchObjectAuth = {
+        1: '/well',
+        2: '/station/monitor',
+        3: '/pipeline',
+      } as { [key: string]: string }
+      if (!proxy.hasPerm(watchObjectAuth[detailInfo.value.watchObject])) { return }
       $router.push({
         name: watchObject[detailInfo.value.watchObject],
         query: {
diff --git a/src/views/home/operation/alarm/index.vue b/src/views/home/operation/alarm/index.vue
index ac0f31b..e53c991 100644
--- a/src/views/home/operation/alarm/index.vue
+++ b/src/views/home/operation/alarm/index.vue
@@ -82,6 +82,7 @@
 }
 // 重置查询条件f
 const reset = () => {
+  datetimerange.value = []
   listQuery.value = {
     limit: 20,
     offset: 1,
@@ -315,7 +316,7 @@
               <el-button v-if="proxy.hasPerm('/alarm/device/delete')" type="primary" @click="batchDeleteRow">
                 批量删除
               </el-button>
-              <el-button type="primary" @click="exportList">
+              <el-button v-if="proxy.hasPerm('/alarm/device/export')" type="primary" @click="exportList">
                 导出
               </el-button>
             </div>
@@ -336,7 +337,7 @@
               </el-table-column>
             </template>
             <template #columns>
-              <el-table-column label="操作" align="center" width="80">
+              <el-table-column v-if="proxy.hasPerm('/alarm/device/detail')" label="操作" align="center" width="80">
                 <template #default="scope">
                   <el-button type="primary" link size="small" @click="detail(scope.row)">
                     查看

diff --git a/src/App.vue b/src/App.vue
index cde81b3..8a00f5d 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -125,7 +125,7 @@
         '--g-sub-sidebar-actual-width': subSidebarActualWidth,
       }"
     />
-    <system-info v-if="browserType !== 'mobile'" />
+    <!-- <system-info v-if="browserType !== 'mobile'" /> -->
     <audio id="eventAudio" src="" autoplay />
   </el-config-provider>
 </template>
diff --git a/src/layouts/components/Tools/alarmDialog.vue b/src/layouts/components/Tools/alarmDialog.vue
index 1828375..df89ab8 100644
--- a/src/layouts/components/Tools/alarmDialog.vue
+++ b/src/layouts/components/Tools/alarmDialog.vue
@@ -116,7 +116,7 @@
     </div>
     <template #footer>
       <div class="dialog-footer">
-        <div class="btn" @click="detail">
+        <div v-if="proxy.hasPerm('/alarm/current')" class="btn" @click="detail">
           查看
         </div>
         <div v-if="info.isSound === '1'" class="btn" @click="closeSound">
diff --git a/src/layouts/components/Tools/alarmList.vue b/src/layouts/components/Tools/alarmList.vue
index c3a9d2a..5356b74 100644
--- a/src/layouts/components/Tools/alarmList.vue
+++ b/src/layouts/components/Tools/alarmList.vue
@@ -54,6 +54,7 @@
 }
 // 查看当前行
 const detailRow = (row: any) => {
+  if (!proxy.hasPerm('/alarm/current')) { return }
   $router.push({
     name: 'AlarmCurrent',
     query: {
@@ -77,21 +78,6 @@
   localStorage.setItem('eventAudio', 'pause')
 }
 const dialogRef = ref()
-// const dialog = () => {
-//   const row = {
-//     alarmNoteMethod: '1', // 消息提醒 1:弹窗，2:消息提醒
-//     isSound: '1', // 报警音效，1:开，0:关
-//     isSend: '1', // 报警推送，1:开，0:关
-//     isText: '1', // 报警短息，1:开，0:关
-//     alarmType: '浓度超限',
-//     tagNumber: 'NX5702',
-//     alarmTime: '2024-09-09',
-//     value: '20',
-//     typeName: '燃气智能终端',
-//     alarmLevel: '一级',
-//   }
-//   dialogRef.value.initDialog(row)
-// }
 const fetchData = (isLoading = false) => {
   loading.value = true
   if (isLoading) {
@@ -115,7 +101,10 @@
       dialogRef.value.initDialog(newVal)
     }
     if (newVal.isSound === '1') {
-      play()
+      // play()
+      if (!localStorage.getItem('eventAudio')) {
+        proxy.playAudio()
+      }
     }
     fetchData(false)
   }
@@ -146,6 +135,7 @@
 //     window.localStorage.removeItem('token')
 //   }
 // }
+// const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -180,7 +170,7 @@
                   {{ message.processStatus
                     === '未读' ? '未读' : '已读' }}
                 </el-tag>
-                <el-tag type="info" size="small" style="margin-left: 5px;">
+                <el-tag type="info" size="small" style="margin-left: 5px;" @click="detailRow(message)">
                   查看
                 </el-tag>
               </div>
@@ -214,7 +204,7 @@
       <!-- <div class="close" @click="dialog">
         弹窗
       </div> -->
-      <div class="more" @click="moreList">
+      <div v-if="proxy.hasPerm('/alarm/current')" class="more" @click="moreList">
         查看更多
       </div>
     </div>
diff --git a/src/layouts/components/Tools/index.vue b/src/layouts/components/Tools/index.vue
index 9f2d41f..61f9707 100644
--- a/src/layouts/components/Tools/index.vue
+++ b/src/layouts/components/Tools/index.vue
@@ -79,6 +79,7 @@
   // 断开 websocket
   // websocket.destroyWebSocket()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -89,18 +90,18 @@
           <svg-icon name="ep:search" />
         </el-icon>
       </span>
-      <span class="item" @click="board">
+      <span v-if="proxy.hasPerm('/fullscreen')" class="item" @click="board">
         <el-icon>
           <svg-icon name="ep:data-line" />
         </el-icon>
       </span>
-      <span v-if="settingsStore.mode === 'pc' && settingsStore.toolbar.enableFullscreen" class="item" @click="toggle">
+      <span class="item" @click="toggle">
         <el-icon>
           <svg-icon :name="isFullscreen ? 'fullscreen-exit' : 'fullscreen'" />
         </el-icon>
       </span>
       <!-- 报警信息列表 -->
-      <span class="item">
+      <span v-if="proxy.hasPerm('/alarmnotice')" class="item">
         <el-popover width="390">
           <template #reference>
             <div>
diff --git a/src/layouts/components/Topbar/index.vue b/src/layouts/components/Topbar/index.vue
index 2863cef..4e3120e 100644
--- a/src/layouts/components/Topbar/index.vue
+++ b/src/layouts/components/Topbar/index.vue
@@ -67,7 +67,7 @@
           </transition-group>
         </el-breadcrumb>
       </div>
-      <tools />
+      <!-- <tools /> -->
     </div>
   </div>
 </template>
diff --git a/src/router/modules/pc.ts b/src/router/modules/pc.ts
index aacd6fa..97ced45 100644
--- a/src/router/modules/pc.ts
+++ b/src/router/modules/pc.ts
@@ -40,7 +40,7 @@
       icon: 'ep:key',
       sidebar: false,
       breadcrumb: false,
-      // auth: '/fullscreen',
+      auth: '/fullscreen',
     },
   },
   {
@@ -155,7 +155,7 @@
           sidebar: false,
           breadcrumb: false,
           activeMenu: '/well',
-          auth: '/well/detail',
+          auth: '/well',
         },
       },
     ],
diff --git a/src/views/home/alarm/count/components/locationAnalysis.vue b/src/views/home/alarm/count/components/locationAnalysis.vue
index fc75b9e..bff1853 100644
--- a/src/views/home/alarm/count/components/locationAnalysis.vue
+++ b/src/views/home/alarm/count/components/locationAnalysis.vue
@@ -46,6 +46,7 @@
   })
 }
 fetchData()
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -75,6 +76,9 @@
         <el-button type="primary" style="margin: 0 5px;" @click="fetchData">
           搜索
         </el-button>
+        <el-button v-if="proxy.hasPerm('/alarm/count/exportLocation')" type="primary" style="margin: 0 5px;">
+          导出
+        </el-button>
       </div>
     </template>
     <template #content>
diff --git a/src/views/home/alarm/current/components/detail.vue b/src/views/home/alarm/current/components/detail.vue
index dd3b31a..4204c92 100644
--- a/src/views/home/alarm/current/components/detail.vue
+++ b/src/views/home/alarm/current/components/detail.vue
@@ -111,7 +111,7 @@
   const res2 = await getAlarmTypeListPage({ offset: 1, limit: 9999 });
   ($route.query.type === 'history' ? getAlarmDetail : getAlarmDetail)($route.query.id as string).then((res) => {
     detailInfo.value = toHumpObject(res.data)
-    detailInfo.value.realAlarmName = detailInfo.value.realAlarm === '1' ? '报警' : '误报'
+    detailInfo.value.realAlarmName = detailInfo.value.realAlarm === '0' ? '是' : '否'
     detailInfo.value.alarmTypeName = res2.data.rows.filter((item: any) => item.id === detailInfo.value.alarmTypeId)[0]?.alarmType || ''
     detailInfo.value.alarmLevelName = res1.data.rows.filter((item: any) => item.id === detailInfo.value.alarmLevel)[0]?.alarmLevel || ''
     detailInfo.value.duration = detailInfo.value.ts && detailInfo.value.cancelTime ? getDateDiff(detailInfo.value.ts, detailInfo.value.cancelTime) : ''
@@ -139,6 +139,7 @@
 }
 // 点击经纬度展示地图
 const mapRef = ref()
+const { proxy } = getCurrentInstance() as any
 const showMap = (data: any) => {
   console.log(data, 'data')
   if (data.text === '位置') {
@@ -148,6 +149,13 @@
         2: 'StationMonitorDetail',
         3: 'PipelineMonitorDetail',
       } as { [key: string]: string }
+      // 判断是否有菜单权限
+      const watchObjectAuth = {
+        1: '/well',
+        2: '/station/monitor',
+        3: '/pipeline',
+      } as { [key: string]: string }
+      if (!proxy.hasPerm(watchObjectAuth[detailInfo.value.watchObject])) { return }
       $router.push({
         name: watchObject[detailInfo.value.watchObject],
         query: {
diff --git a/src/views/home/alarm/current/components/detailInfoDialog.vue b/src/views/home/alarm/current/components/detailInfoDialog.vue
index c089449..7fbf06b 100644
--- a/src/views/home/alarm/current/components/detailInfoDialog.vue
+++ b/src/views/home/alarm/current/components/detailInfoDialog.vue
@@ -114,6 +114,7 @@
   })
 }
 defineExpose({ initDialog, close })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -131,7 +132,7 @@
     <!-- 头部 -->
     <div class="header">
       <span>{{ info.alarmContent }}</span>
-      <span class="more" @click="moreData">>>更多</span>
+      <span v-if="proxy.hasPerm(type === 'data' ? '/alarm/current/more' : '/alarm/device/more')" class="more" @click="moreData">>>更多</span>
     </div>
     <div class="content">
       <div v-show="type === 'device'" class="item">
@@ -162,7 +163,7 @@
         报警设备:
         <span style="padding-left: 6px;">{{ info.devcode }} </span>
         <el-button
-          v-if="info.devTypeName === '燃气智能监测终端' || info.devTypeName === '液位检测仪' || info.devTypeName === '井盖监测仪'"
+          v-if="(info.devTypeName === '燃气智能监测终端' || info.devTypeName === '液位检测仪' || info.devTypeName === '井盖监测仪') && proxy.hasPerm('/alarm/current/data')"
           size="small" style="margin-left: 6px;" @click="viewData"
         >
           查看数据
@@ -228,7 +229,7 @@
         <span style="padding-left: 6px;">
           {{ info.confirmContent }}
         </span>
-        <el-button v-if="type === 'data'" size="small" style="padding-left: 6px;" @click="viewProcess">
+        <el-button v-if="type === 'data' && proxy.hasPerm('/alarm/current/process')" size="small" style="padding-left: 6px;" @click="viewProcess">
           流程图
         </el-button>
       </div>
@@ -246,17 +247,17 @@
       </div>
     </div>
     <div class="footer">
-      <el-button v-if="Number(info.processStatus) < 4 && type === 'data'" size="small" @click="remind">
+      <el-button v-if="(Number(info.processStatus) < 4 && type === 'data') && proxy.hasPerm('/alarm/current/remind')" size="small" @click="remind">
         提醒责任人
       </el-button>
       <el-button
-        v-if="type === 'device' && (info.processStatusName === '待处置' || info.processStatusName === '挂起')"
+        v-if="(type === 'device' && (info.processStatusName === '待处置' || info.processStatusName === '挂起')) && proxy.hasPerm('/alarm/device/handler')"
         size="small" @click="handler"
       >
         报警处置
       </el-button>
       <el-button
-        v-if="Number(info.processStatus) <= 3 || (type === 'device' && info.processStatusName === '待处置') || info.processStatusName === '挂起'"
+        v-if="(Number(info.processStatus) <= 3 || (type === 'device' && info.processStatusName === '待处置') || info.processStatusName === '挂起') && proxy.hasPerm(type === 'device' ? '/alarm/device/pending' : '/alarm/current/pending')"
         type="primary" size="small" @click="pending"
       >
         挂起
diff --git a/src/views/home/alarm/current/index.vue b/src/views/home/alarm/current/index.vue
index d019bbf..e2714bb 100644
--- a/src/views/home/alarm/current/index.vue
+++ b/src/views/home/alarm/current/index.vue
@@ -4,6 +4,7 @@
   Date: 2023-06-28
  -->
 <script lang="ts" setup name="CurrentAlarm">
+import dayjs from 'dayjs'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import { ArrowLeftBold, ArrowRightBold } from '@element-plus/icons-vue'
 import MapCom from './components/map.vue'
@@ -100,6 +101,7 @@
       path: '/alarm/current',
     })
   }
+  datetimerange.value = []
   listQuery.value = {
     limit: 20,
     offset: 1,
@@ -131,8 +133,8 @@
   if ($route.query.row) {
     loadingTable.value = true
     const row = JSON.parse($route.query.row as string)
-    getCurrentAlarmListPage({ offset: 1, limit: 99999 }).then((res) => {
-      const data = res.data.rows.filter((item: any) => item.id === row.id)
+    getCurrentAlarmListPage({ offset: 1, limit: 50 }).then((res) => {
+      const data = res.data.rows.filter((item: any) => item.id === row.alarmId)
       if (data.length) {
         list1.value = data.map((item: any) => ({
           ...item,
@@ -153,7 +155,10 @@
     })
     return
   }
-  fetchData()
+  datetimerange.value = [dayjs().subtract(7, 'day').format('YYYY-MM-DD HH:mm:ss'), dayjs().format('YYYY-MM-DD HH:mm:ss')]
+  setTimeout(() => {
+    fetchData()
+  })
 })
 // 表格标识  地图或普通
 const tableFlag = ref('normal')
@@ -181,6 +186,10 @@
 const mapRef = ref()
 const mapData = ref({})
 async function detail(row: any) {
+  if (row.processStatusName === '未读') {
+    list1.value[list1.value.findIndex((item: any) => item.id === row.id)].processStatusName = '已读'
+    row.processStatusName = '已读'
+  }
   const res = await detailAlarm(row.id)
   const data = toHumpObject(res.data)
   mapData.value = row
@@ -362,7 +371,7 @@
               <el-button v-if="proxy.hasPerm('/alarm/current/delete')" type="primary" @click="batchDeleteRow">
                 批量删除
               </el-button>
-              <el-button type="primary" @click="exportList">
+              <el-button v-if="proxy.hasPerm('/alarm/current/export')" type="primary" @click="exportList">
                 导出
               </el-button>
             </div>
@@ -383,7 +392,7 @@
               </el-table-column>
             </template>
             <template #columns>
-              <el-table-column label="操作" align="center" width="80">
+              <el-table-column v-if="proxy.hasPerm('/alarm/current/detail')" label="操作" align="center" width="80">
                 <template #default="scope">
                   <el-button type="primary" link size="small" @click="detail(scope.row)">
                     查看
diff --git a/src/views/home/alarm/history/index.vue b/src/views/home/alarm/history/index.vue
index eeb49fc..3c810c3 100644
--- a/src/views/home/alarm/history/index.vue
+++ b/src/views/home/alarm/history/index.vue
@@ -97,6 +97,7 @@
 }
 // 重置查询条件f
 const reset = () => {
+  datetimerange.value = []
   listQuery.value = {
     limit: 20,
     offset: 1,
@@ -189,6 +190,7 @@
   })
 }
 fetchDict()
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -249,7 +251,7 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="exportList">
+          <el-button v-if="proxy.hasPerm('/alarm/history/export')" type="primary" @click="exportList">
             导出
           </el-button>
         </div>
@@ -272,7 +274,7 @@
           </el-table-column>
         </template>
         <template #columns>
-          <el-table-column label="操作" align="center" width="80">
+          <el-table-column v-if="proxy.hasPerm('/alarm/history/detail')" label="操作" align="center" width="80">
             <template #default="scope">
               <el-button type="primary" link size="small" @click="moreData(scope.row)">
                 查看
diff --git a/src/views/home/dashboard/index.vue b/src/views/home/dashboard/index.vue
index d2f7e3c..42dfbed 100644
--- a/src/views/home/dashboard/index.vue
+++ b/src/views/home/dashboard/index.vue
@@ -42,7 +42,7 @@
     value: '0',
     name: '在线',
     unit: '个',
-    id: '1',
+    id: '1,2',
   },
   {
     img: img.lixian,
@@ -56,7 +56,7 @@
     value: '0',
     name: '停用',
     unit: '个',
-    id: '2',
+    id: '3',
   },
 ])
 // 工作台数据
@@ -133,7 +133,11 @@
   deviceOperationLoading.value = true
   getDeviceStatus().then((res) => {
     res.data.forEach((element: any) => {
-      const index = deviceOperationData.value.findIndex((item: any) => item.id === element.name)
+      if (element.name === '1' || element.name === '2') {
+        deviceOperationData.value[0].value = Number(deviceOperationData.value[0].value || '0') + Number(element.value)
+        return
+      }
+      const index = deviceOperationData.value.findIndex((item: any) => item.id.includes(element.name))
       if (index !== -1) {
         deviceOperationData.value[index].value = element.value
       }
diff --git a/src/views/home/device/count/components/bottom.vue b/src/views/home/device/count/components/bottom.vue
index 28a4d78..e4e56fa 100644
--- a/src/views/home/device/count/components/bottom.vue
+++ b/src/views/home/device/count/components/bottom.vue
@@ -110,6 +110,7 @@
   })
 }
 fetchDict()
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -148,7 +149,7 @@
             <template #btns-right>
               <!-- 操作 -->
               <div>
-                <el-button type="primary">
+                <el-button v-if="proxy.hasPerm('/device/count/offline/export')" type="primary">
                   导出
                 </el-button>
               </div>
diff --git a/src/views/home/device/device/index.vue b/src/views/home/device/device/index.vue
index c3970b9..9cdd606 100644
--- a/src/views/home/device/device/index.vue
+++ b/src/views/home/device/device/index.vue
@@ -88,6 +88,7 @@
 }
 // 重置查询条件f
 const reset = () => {
+  datetimerange.value = []
   listQuery.value = {
     limit: 20,
     offset: 1,
@@ -296,6 +297,7 @@
   fetchDict()
   fetchData()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -372,17 +374,17 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="editRow('add', {})">
+          <el-button v-if="proxy.hasPerm('/device/manage/add')" type="primary" @click="editRow('add', {})">
             新建
           </el-button>
-          <el-button type="primary" @click="downloadTemplate">
+          <el-button v-if="proxy.hasPerm('/device/manage/down')" type="primary" @click="downloadTemplate">
             模板下载
           </el-button>
-          <el-button type="primary" @click="importList">
+          <el-button v-if="proxy.hasPerm('/device/manage/import')" type="primary" @click="importList">
             批量导入
           </el-button>
-          <el-button type="primary" @click="exportList">
-            导出列表
+          <el-button v-if="proxy.hasPerm('/device/manage/export')" type="primary" @click="exportList">
+            导出
           </el-button>
           <input ref="fileRef" style="display: none;" type="file" accept=".xls,.xlsx" @change="onFileChange">
         </div>
@@ -409,16 +411,16 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="150">
             <template #default="scope">
-              <el-button type="primary" link size="small" @click="editRow('detail', scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/manage/detail')" type="primary" link size="small" @click="editRow('detail', scope.row)">
                 查看
               </el-button>
-              <el-button type="primary" link size="small" @click="editRow('edit', scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/manage/update')" type="primary" link size="small" @click="editRow('edit', scope.row)">
                 编辑
               </el-button>
-              <el-button type="danger" link size="small" @click="changeDefense(scope.row)">
+              <!-- <el-button v-if="proxy.hasPerm('/device/manage/add')" type="danger" link size="small" @click="changeDefense(scope.row)">
                 撤防
-              </el-button>
-              <el-button type="danger" link size="small" @click="removeRow(scope.row)">
+              </el-button> -->
+              <el-button v-if="proxy.hasPerm('/device/manage/delete')" type="danger" link size="small" @click="removeRow(scope.row)">
                 删除
               </el-button>
             </template>
diff --git a/src/views/home/device/instruction/index.vue b/src/views/home/device/instruction/index.vue
index 1e598ed..1da6706 100644
--- a/src/views/home/device/instruction/index.vue
+++ b/src/views/home/device/instruction/index.vue
@@ -78,6 +78,7 @@
 }
 // 重置查询条件f
 const reset = () => {
+  datetimerange.value = []
   listQuery.value = {
     limit: 20,
     offset: 1,
@@ -158,6 +159,7 @@
     editRef.value.initDialog('addOther', {})
   }
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -213,10 +215,10 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary">
+          <el-button v-if="proxy.hasPerm('/device/instruction/batch')" type="primary">
             批量下发
           </el-button>
-          <el-button type="primary" @click="editRow('add', {})">
+          <el-button v-if="proxy.hasPerm('/device/instruction/add')" type="primary" @click="editRow('add', {})">
             新建
           </el-button>
         </div>
@@ -236,13 +238,13 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="120">
             <template #default="scope">
-              <el-button type="primary" link size="small" @click="editRow('detail', scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/instruction/detail')" type="primary" link size="small" @click="editRow('detail', scope.row)">
                 查看
               </el-button>
-              <el-button v-if="scope.row.status === '2'" type="primary" link size="small" @click="editRow('edit', scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/instruction/again') && scope.row.status === '2'" type="primary" link size="small" @click="editRow('edit', scope.row)">
                 重新下发
               </el-button>
-              <el-button type="danger" link size="small" @click="removeRow(scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/instruction/delete')" type="danger" link size="small" @click="removeRow(scope.row)">
                 删除
               </el-button>
             </template>
diff --git a/src/views/home/device/product/index.vue b/src/views/home/device/product/index.vue
index 799fc90..fdd5463 100644
--- a/src/views/home/device/product/index.vue
+++ b/src/views/home/device/product/index.vue
@@ -128,6 +128,7 @@
   await fetchDict()
   fetchData()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -164,7 +165,7 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="editRow('add', {})">
+          <el-button v-if="proxy.hasPerm('/device/product/add')" type="primary" @click="editRow('add', {})">
             新建
           </el-button>
         </div>
@@ -184,10 +185,10 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="120">
             <template #default="scope">
-              <el-button type="primary" link size="small" @click="editRow('edit', scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/product/update')" type="primary" link size="small" @click="editRow('edit', scope.row)">
                 编辑
               </el-button>
-              <el-button type="danger" link size="small" @click="removeRow(scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/product/delete')" type="danger" link size="small" @click="removeRow(scope.row)">
                 删除
               </el-button>
             </template>
diff --git a/src/views/home/device/type/index.vue b/src/views/home/device/type/index.vue
index 59f1343..2344e57 100644
--- a/src/views/home/device/type/index.vue
+++ b/src/views/home/device/type/index.vue
@@ -105,6 +105,7 @@
   await fetchDict()
   fetchData()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -131,7 +132,7 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="editRow('add', {})">
+          <el-button v-if="proxy.hasPerm('/device/type/add')" type="primary" @click="editRow('add', {})">
             新建
           </el-button>
         </div>
@@ -151,10 +152,10 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="120">
             <template #default="scope">
-              <el-button type="primary" link size="small" @click="editRow('edit', scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/type/update')" type="primary" link size="small" @click="editRow('edit', scope.row)">
                 编辑
               </el-button>
-              <el-button type="danger" link size="small" @click="removeRow(scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/type/delete')" type="danger" link size="small" @click="removeRow(scope.row)">
                 删除
               </el-button>
             </template>
diff --git a/src/views/home/ledger/ledger/components/gridList.vue b/src/views/home/ledger/ledger/components/gridList.vue
index d03cd9f..189edef 100644
--- a/src/views/home/ledger/ledger/components/gridList.vue
+++ b/src/views/home/ledger/ledger/components/gridList.vue
@@ -91,6 +91,7 @@
     // })
   })
 }
+const { proxy } = getCurrentInstance() as any
 // 同步日志
 const allSync = () => {
   $router.push({
@@ -139,10 +140,10 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="allSync">
+          <el-button v-if="proxy.hasPerm('/ledger/sync')" type="primary" @click="allSync">
             同步日志
           </el-button>
-          <el-button type="primary" @click="sync('all', {})">
+          <el-button v-if="proxy.hasPerm('/ledger/sync/all')" type="primary" @click="sync('all', {})">
             全量同步
           </el-button>
         </div>
@@ -160,9 +161,9 @@
           </el-table-column>
         </template>
         <template #columns>
-          <el-table-column label="操作" align="center" width="80">
+          <el-table-column v-if="proxy.hasPerm('/ledger/sync/single')" label="操作" align="center" width="80">
             <template #default="scope">
-              <el-button type="primary" link size="small" @click="sync('single', scope.row)">
+              <el-button v-if="proxy.hasPerm('/ledger/sync/single')" type="primary" link size="small" @click="sync('single', scope.row)">
                 同步
               </el-button>
             </template>
diff --git a/src/views/home/ledger/ledger/components/wellList.vue b/src/views/home/ledger/ledger/components/wellList.vue
index 9eb1f43..06f855a 100644
--- a/src/views/home/ledger/ledger/components/wellList.vue
+++ b/src/views/home/ledger/ledger/components/wellList.vue
@@ -123,6 +123,7 @@
   // await fetchDict()
   fetchData()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -159,11 +160,11 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="allSync">
+          <el-button v-if="proxy.hasPerm('/ledger/sync')" type="primary" @click="allSync">
             同步日志
           </el-button>
-          <el-button type="primary" @click="sync('all', {})">
-            全部同步
+          <el-button v-if="proxy.hasPerm('/ledger/sync/all')" type="primary" @click="sync('all', {})">
+            全量同步
           </el-button>
         </div>
       </template>
@@ -180,9 +181,9 @@
           </el-table-column>
         </template>
         <template #columns>
-          <el-table-column label="操作" align="center" width="80">
+          <el-table-column v-if="proxy.hasPerm('/ledger/sync/single')" label="操作" align="center" width="80">
             <template #default="scope">
-              <el-button type="primary" link size="small" @click="sync('single', scope.row)">
+              <el-button v-if="proxy.hasPerm('/ledger/sync/single')" type="primary" link size="small" @click="sync('single', scope.row)">
                 同步
               </el-button>
             </template>
diff --git a/src/views/home/ledger/ledger/index.vue b/src/views/home/ledger/ledger/index.vue
index a03aa12..8403fc5 100644
--- a/src/views/home/ledger/ledger/index.vue
+++ b/src/views/home/ledger/ledger/index.vue
@@ -7,7 +7,16 @@
 import type { TabsPaneContext } from 'element-plus'
 import wellList from './components/wellList.vue'
 import gridList from './components/gridList.vue'
-const activeName = ref('闸井')
+const { proxy } = getCurrentInstance() as any
+const activeName = ref(
+  proxy.hasPerm('/ledger/manage/well')
+    ? '闸井'
+    : proxy.hasPerm('/ledger/manage/station')
+      ? '场站'
+      : proxy.hasPerm('/ledger/manage/grid')
+        ? '网格'
+        : '',
+)
 const handleClick = (tab: TabsPaneContext, event: Event) => {
   // console.log(tab, event)
 }
@@ -17,13 +26,13 @@
   <!-- 布局 -->
   <app-container>
     <el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick">
-      <el-tab-pane label="闸井" name="闸井">
+      <el-tab-pane v-if="proxy.hasPerm('/ledger/manage/well')" label="闸井" name="闸井">
         <well-list v-if="activeName === '闸井'" type="1" />
       </el-tab-pane>
-      <el-tab-pane label="场站" name="场站">
+      <el-tab-pane v-if="proxy.hasPerm('/ledger/manage/station')" label="场站" name="场站">
         <well-list v-if="activeName === '场站'" type="2" />
       </el-tab-pane>
-      <el-tab-pane label="网格" name="网格">
+      <el-tab-pane v-if="proxy.hasPerm('/ledger/manage/grid')" label="网格" name="网格">
         <grid-list v-if="activeName === '网格'" />
       </el-tab-pane>
     </el-tabs>
diff --git a/src/views/home/ledger/pipeline/index.vue b/src/views/home/ledger/pipeline/index.vue
index e0d2512..01e95ac 100644
--- a/src/views/home/ledger/pipeline/index.vue
+++ b/src/views/home/ledger/pipeline/index.vue
@@ -160,6 +160,7 @@
 onMounted(async () => {
   fetchData()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -222,13 +223,13 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="editRow('add', {})">
+          <el-button v-if="proxy.hasPerm('/ledger/pipeline/add')" type="primary" @click="editRow('add', {})">
             新增
           </el-button>
-          <el-button type="primary" @click="importList">
+          <el-button v-if="proxy.hasPerm('/ledger/pipeline/import')" type="primary" @click="importList">
             批量导入
           </el-button>
-          <el-button type="primary" @click="exportList">
+          <el-button v-if="proxy.hasPerm('/ledger/pipeline/export')" type="primary" @click="exportList">
             批量导出
           </el-button>
         </div>
@@ -248,10 +249,10 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="100">
             <template #default="scope">
-              <el-button type="primary" link size="small" @click="editRow('edit', scope.row)">
+              <el-button v-if="proxy.hasPerm('/ledger/pipeline/update')" type="primary" link size="small" @click="editRow('edit', scope.row)">
                 编辑
               </el-button>
-              <el-button type="danger" link size="small" @click="removeRow(scope.row)">
+              <el-button v-if="proxy.hasPerm('/ledger/pipeline/delete')" type="danger" link size="small" @click="removeRow(scope.row)">
                 删除
               </el-button>
             </template>
diff --git a/src/views/home/ledger/sync/index.vue b/src/views/home/ledger/sync/index.vue
index 54a3218..a04bad9 100644
--- a/src/views/home/ledger/sync/index.vue
+++ b/src/views/home/ledger/sync/index.vue
@@ -62,6 +62,7 @@
 }
 // 重置查询条件f
 const reset = () => {
+  datetimerange.value = []
   listQuery.value = {
     limit: 20,
     offset: 1,
@@ -106,6 +107,8 @@
 onMounted(async () => {
   fetchData()
 })
+const { proxy } = getCurrentInstance() as any
+const $route = useRoute()
 </script>
 
 <template>
@@ -132,7 +135,7 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="goBak">
+          <el-button v-if="$route.type" type="primary" @click="goBak">
             返回
           </el-button>
         </div>
@@ -152,10 +155,10 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="80">
             <template #default="scope">
-              <el-button type="primary" link size="small">
+              <el-button v-if="proxy.hasPerm('/ledger/sync/detail')" type="primary" link size="small">
                 查看
               </el-button>
-              <el-button type="danger" link size="small" @click="removeRow(scope.row)">
+              <el-button v-if="proxy.hasPerm('/ledger/sync/delete')" type="danger" link size="small" @click="removeRow(scope.row)">
                 删除
               </el-button>
             </template>
diff --git a/src/views/home/monitor/service/index.vue b/src/views/home/monitor/service/index.vue
index 8df2239..570dc68 100644
--- a/src/views/home/monitor/service/index.vue
+++ b/src/views/home/monitor/service/index.vue
@@ -53,6 +53,7 @@
 onMounted(async () => {
   fetchData()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -66,7 +67,7 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary">
+          <el-button v-if="proxy.hasPerm('/monitor/service/add')" type="primary">
             新建
           </el-button>
         </div>
diff --git a/src/views/home/monitor/time/index.vue b/src/views/home/monitor/time/index.vue
index caa6d46..0f7f5a0 100644
--- a/src/views/home/monitor/time/index.vue
+++ b/src/views/home/monitor/time/index.vue
@@ -53,6 +53,7 @@
 onMounted(async () => {
   fetchData()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -66,7 +67,7 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary">
+          <el-button v-if="proxy.hasPerm('/monitor/time/add')" type="primary">
             新建
           </el-button>
         </div>
diff --git a/src/views/home/operation/alarm/components/detail.vue b/src/views/home/operation/alarm/components/detail.vue
index 8194cbd..4ae4a1f 100644
--- a/src/views/home/operation/alarm/components/detail.vue
+++ b/src/views/home/operation/alarm/components/detail.vue
@@ -151,6 +151,7 @@
 }
 // 点击经纬度展示地图
 const mapRef = ref()
+const { proxy } = getCurrentInstance() as any
 const showMap = (data: any) => {
   console.log(data, 'data')
   if (data.text === '位置') {
@@ -160,6 +161,13 @@
         2: 'StationMonitorDetail',
         3: 'PipelineMonitorDetail',
       } as { [key: string]: string }
+      // 判断是否有菜单权限
+      const watchObjectAuth = {
+        1: '/well',
+        2: '/station/monitor',
+        3: '/pipeline',
+      } as { [key: string]: string }
+      if (!proxy.hasPerm(watchObjectAuth[detailInfo.value.watchObject])) { return }
       $router.push({
         name: watchObject[detailInfo.value.watchObject],
         query: {
diff --git a/src/views/home/operation/alarm/index.vue b/src/views/home/operation/alarm/index.vue
index ac0f31b..e53c991 100644
--- a/src/views/home/operation/alarm/index.vue
+++ b/src/views/home/operation/alarm/index.vue
@@ -82,6 +82,7 @@
 }
 // 重置查询条件f
 const reset = () => {
+  datetimerange.value = []
   listQuery.value = {
     limit: 20,
     offset: 1,
@@ -315,7 +316,7 @@
               <el-button v-if="proxy.hasPerm('/alarm/device/delete')" type="primary" @click="batchDeleteRow">
                 批量删除
               </el-button>
-              <el-button type="primary" @click="exportList">
+              <el-button v-if="proxy.hasPerm('/alarm/device/export')" type="primary" @click="exportList">
                 导出
               </el-button>
             </div>
@@ -336,7 +337,7 @@
               </el-table-column>
             </template>
             <template #columns>
-              <el-table-column label="操作" align="center" width="80">
+              <el-table-column v-if="proxy.hasPerm('/alarm/device/detail')" label="操作" align="center" width="80">
                 <template #default="scope">
                   <el-button type="primary" link size="small" @click="detail(scope.row)">
                     查看
diff --git a/src/views/home/operation/history/index.vue b/src/views/home/operation/history/index.vue
index 5c04ff7..d96ac57 100644
--- a/src/views/home/operation/history/index.vue
+++ b/src/views/home/operation/history/index.vue
@@ -78,6 +78,7 @@
 }
 // 重置查询条件f
 const reset = () => {
+  datetimerange.value = []
   listQuery.value = {
     limit: 20,
     offset: 1,
@@ -161,6 +162,7 @@
     fetchData()
   })
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -218,7 +220,7 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="exportList">
+          <el-button v-if="proxy.hasPerm('/operation/history/export')" type="primary" @click="exportList">
             导出
           </el-button>
         </div>
@@ -241,7 +243,7 @@
           </el-table-column>
         </template>
         <template #columns>
-          <el-table-column label="操作" align="center" width="80">
+          <el-table-column v-if="proxy.hasPerm('/operation/history/detail')" label="操作" align="center" width="80">
             <template #default="scope">
               <el-button type="primary" link size="small" @click="detailRow(scope.row)">
                 查看

diff --git a/src/App.vue b/src/App.vue
index cde81b3..8a00f5d 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -125,7 +125,7 @@
         '--g-sub-sidebar-actual-width': subSidebarActualWidth,
       }"
     />
-    <system-info v-if="browserType !== 'mobile'" />
+    <!-- <system-info v-if="browserType !== 'mobile'" /> -->
     <audio id="eventAudio" src="" autoplay />
   </el-config-provider>
 </template>
diff --git a/src/layouts/components/Tools/alarmDialog.vue b/src/layouts/components/Tools/alarmDialog.vue
index 1828375..df89ab8 100644
--- a/src/layouts/components/Tools/alarmDialog.vue
+++ b/src/layouts/components/Tools/alarmDialog.vue
@@ -116,7 +116,7 @@
     </div>
     <template #footer>
       <div class="dialog-footer">
-        <div class="btn" @click="detail">
+        <div v-if="proxy.hasPerm('/alarm/current')" class="btn" @click="detail">
           查看
         </div>
         <div v-if="info.isSound === '1'" class="btn" @click="closeSound">
diff --git a/src/layouts/components/Tools/alarmList.vue b/src/layouts/components/Tools/alarmList.vue
index c3a9d2a..5356b74 100644
--- a/src/layouts/components/Tools/alarmList.vue
+++ b/src/layouts/components/Tools/alarmList.vue
@@ -54,6 +54,7 @@
 }
 // 查看当前行
 const detailRow = (row: any) => {
+  if (!proxy.hasPerm('/alarm/current')) { return }
   $router.push({
     name: 'AlarmCurrent',
     query: {
@@ -77,21 +78,6 @@
   localStorage.setItem('eventAudio', 'pause')
 }
 const dialogRef = ref()
-// const dialog = () => {
-//   const row = {
-//     alarmNoteMethod: '1', // 消息提醒 1:弹窗，2:消息提醒
-//     isSound: '1', // 报警音效，1:开，0:关
-//     isSend: '1', // 报警推送，1:开，0:关
-//     isText: '1', // 报警短息，1:开，0:关
-//     alarmType: '浓度超限',
-//     tagNumber: 'NX5702',
-//     alarmTime: '2024-09-09',
-//     value: '20',
-//     typeName: '燃气智能终端',
-//     alarmLevel: '一级',
-//   }
-//   dialogRef.value.initDialog(row)
-// }
 const fetchData = (isLoading = false) => {
   loading.value = true
   if (isLoading) {
@@ -115,7 +101,10 @@
       dialogRef.value.initDialog(newVal)
     }
     if (newVal.isSound === '1') {
-      play()
+      // play()
+      if (!localStorage.getItem('eventAudio')) {
+        proxy.playAudio()
+      }
     }
     fetchData(false)
   }
@@ -146,6 +135,7 @@
 //     window.localStorage.removeItem('token')
 //   }
 // }
+// const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -180,7 +170,7 @@
                   {{ message.processStatus
                     === '未读' ? '未读' : '已读' }}
                 </el-tag>
-                <el-tag type="info" size="small" style="margin-left: 5px;">
+                <el-tag type="info" size="small" style="margin-left: 5px;" @click="detailRow(message)">
                   查看
                 </el-tag>
               </div>
@@ -214,7 +204,7 @@
       <!-- <div class="close" @click="dialog">
         弹窗
       </div> -->
-      <div class="more" @click="moreList">
+      <div v-if="proxy.hasPerm('/alarm/current')" class="more" @click="moreList">
         查看更多
       </div>
     </div>
diff --git a/src/layouts/components/Tools/index.vue b/src/layouts/components/Tools/index.vue
index 9f2d41f..61f9707 100644
--- a/src/layouts/components/Tools/index.vue
+++ b/src/layouts/components/Tools/index.vue
@@ -79,6 +79,7 @@
   // 断开 websocket
   // websocket.destroyWebSocket()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -89,18 +90,18 @@
           <svg-icon name="ep:search" />
         </el-icon>
       </span>
-      <span class="item" @click="board">
+      <span v-if="proxy.hasPerm('/fullscreen')" class="item" @click="board">
         <el-icon>
           <svg-icon name="ep:data-line" />
         </el-icon>
       </span>
-      <span v-if="settingsStore.mode === 'pc' && settingsStore.toolbar.enableFullscreen" class="item" @click="toggle">
+      <span class="item" @click="toggle">
         <el-icon>
           <svg-icon :name="isFullscreen ? 'fullscreen-exit' : 'fullscreen'" />
         </el-icon>
       </span>
       <!-- 报警信息列表 -->
-      <span class="item">
+      <span v-if="proxy.hasPerm('/alarmnotice')" class="item">
         <el-popover width="390">
           <template #reference>
             <div>
diff --git a/src/layouts/components/Topbar/index.vue b/src/layouts/components/Topbar/index.vue
index 2863cef..4e3120e 100644
--- a/src/layouts/components/Topbar/index.vue
+++ b/src/layouts/components/Topbar/index.vue
@@ -67,7 +67,7 @@
           </transition-group>
         </el-breadcrumb>
       </div>
-      <tools />
+      <!-- <tools /> -->
     </div>
   </div>
 </template>
diff --git a/src/router/modules/pc.ts b/src/router/modules/pc.ts
index aacd6fa..97ced45 100644
--- a/src/router/modules/pc.ts
+++ b/src/router/modules/pc.ts
@@ -40,7 +40,7 @@
       icon: 'ep:key',
       sidebar: false,
       breadcrumb: false,
-      // auth: '/fullscreen',
+      auth: '/fullscreen',
     },
   },
   {
@@ -155,7 +155,7 @@
           sidebar: false,
           breadcrumb: false,
           activeMenu: '/well',
-          auth: '/well/detail',
+          auth: '/well',
         },
       },
     ],
diff --git a/src/views/home/alarm/count/components/locationAnalysis.vue b/src/views/home/alarm/count/components/locationAnalysis.vue
index fc75b9e..bff1853 100644
--- a/src/views/home/alarm/count/components/locationAnalysis.vue
+++ b/src/views/home/alarm/count/components/locationAnalysis.vue
@@ -46,6 +46,7 @@
   })
 }
 fetchData()
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -75,6 +76,9 @@
         <el-button type="primary" style="margin: 0 5px;" @click="fetchData">
           搜索
         </el-button>
+        <el-button v-if="proxy.hasPerm('/alarm/count/exportLocation')" type="primary" style="margin: 0 5px;">
+          导出
+        </el-button>
       </div>
     </template>
     <template #content>
diff --git a/src/views/home/alarm/current/components/detail.vue b/src/views/home/alarm/current/components/detail.vue
index dd3b31a..4204c92 100644
--- a/src/views/home/alarm/current/components/detail.vue
+++ b/src/views/home/alarm/current/components/detail.vue
@@ -111,7 +111,7 @@
   const res2 = await getAlarmTypeListPage({ offset: 1, limit: 9999 });
   ($route.query.type === 'history' ? getAlarmDetail : getAlarmDetail)($route.query.id as string).then((res) => {
     detailInfo.value = toHumpObject(res.data)
-    detailInfo.value.realAlarmName = detailInfo.value.realAlarm === '1' ? '报警' : '误报'
+    detailInfo.value.realAlarmName = detailInfo.value.realAlarm === '0' ? '是' : '否'
     detailInfo.value.alarmTypeName = res2.data.rows.filter((item: any) => item.id === detailInfo.value.alarmTypeId)[0]?.alarmType || ''
     detailInfo.value.alarmLevelName = res1.data.rows.filter((item: any) => item.id === detailInfo.value.alarmLevel)[0]?.alarmLevel || ''
     detailInfo.value.duration = detailInfo.value.ts && detailInfo.value.cancelTime ? getDateDiff(detailInfo.value.ts, detailInfo.value.cancelTime) : ''
@@ -139,6 +139,7 @@
 }
 // 点击经纬度展示地图
 const mapRef = ref()
+const { proxy } = getCurrentInstance() as any
 const showMap = (data: any) => {
   console.log(data, 'data')
   if (data.text === '位置') {
@@ -148,6 +149,13 @@
         2: 'StationMonitorDetail',
         3: 'PipelineMonitorDetail',
       } as { [key: string]: string }
+      // 判断是否有菜单权限
+      const watchObjectAuth = {
+        1: '/well',
+        2: '/station/monitor',
+        3: '/pipeline',
+      } as { [key: string]: string }
+      if (!proxy.hasPerm(watchObjectAuth[detailInfo.value.watchObject])) { return }
       $router.push({
         name: watchObject[detailInfo.value.watchObject],
         query: {
diff --git a/src/views/home/alarm/current/components/detailInfoDialog.vue b/src/views/home/alarm/current/components/detailInfoDialog.vue
index c089449..7fbf06b 100644
--- a/src/views/home/alarm/current/components/detailInfoDialog.vue
+++ b/src/views/home/alarm/current/components/detailInfoDialog.vue
@@ -114,6 +114,7 @@
   })
 }
 defineExpose({ initDialog, close })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -131,7 +132,7 @@
     <!-- 头部 -->
     <div class="header">
       <span>{{ info.alarmContent }}</span>
-      <span class="more" @click="moreData">>>更多</span>
+      <span v-if="proxy.hasPerm(type === 'data' ? '/alarm/current/more' : '/alarm/device/more')" class="more" @click="moreData">>>更多</span>
     </div>
     <div class="content">
       <div v-show="type === 'device'" class="item">
@@ -162,7 +163,7 @@
         报警设备:
         <span style="padding-left: 6px;">{{ info.devcode }} </span>
         <el-button
-          v-if="info.devTypeName === '燃气智能监测终端' || info.devTypeName === '液位检测仪' || info.devTypeName === '井盖监测仪'"
+          v-if="(info.devTypeName === '燃气智能监测终端' || info.devTypeName === '液位检测仪' || info.devTypeName === '井盖监测仪') && proxy.hasPerm('/alarm/current/data')"
           size="small" style="margin-left: 6px;" @click="viewData"
         >
           查看数据
@@ -228,7 +229,7 @@
         <span style="padding-left: 6px;">
           {{ info.confirmContent }}
         </span>
-        <el-button v-if="type === 'data'" size="small" style="padding-left: 6px;" @click="viewProcess">
+        <el-button v-if="type === 'data' && proxy.hasPerm('/alarm/current/process')" size="small" style="padding-left: 6px;" @click="viewProcess">
           流程图
         </el-button>
       </div>
@@ -246,17 +247,17 @@
       </div>
     </div>
     <div class="footer">
-      <el-button v-if="Number(info.processStatus) < 4 && type === 'data'" size="small" @click="remind">
+      <el-button v-if="(Number(info.processStatus) < 4 && type === 'data') && proxy.hasPerm('/alarm/current/remind')" size="small" @click="remind">
         提醒责任人
       </el-button>
       <el-button
-        v-if="type === 'device' && (info.processStatusName === '待处置' || info.processStatusName === '挂起')"
+        v-if="(type === 'device' && (info.processStatusName === '待处置' || info.processStatusName === '挂起')) && proxy.hasPerm('/alarm/device/handler')"
         size="small" @click="handler"
       >
         报警处置
       </el-button>
       <el-button
-        v-if="Number(info.processStatus) <= 3 || (type === 'device' && info.processStatusName === '待处置') || info.processStatusName === '挂起'"
+        v-if="(Number(info.processStatus) <= 3 || (type === 'device' && info.processStatusName === '待处置') || info.processStatusName === '挂起') && proxy.hasPerm(type === 'device' ? '/alarm/device/pending' : '/alarm/current/pending')"
         type="primary" size="small" @click="pending"
       >
         挂起
diff --git a/src/views/home/alarm/current/index.vue b/src/views/home/alarm/current/index.vue
index d019bbf..e2714bb 100644
--- a/src/views/home/alarm/current/index.vue
+++ b/src/views/home/alarm/current/index.vue
@@ -4,6 +4,7 @@
   Date: 2023-06-28
  -->
 <script lang="ts" setup name="CurrentAlarm">
+import dayjs from 'dayjs'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import { ArrowLeftBold, ArrowRightBold } from '@element-plus/icons-vue'
 import MapCom from './components/map.vue'
@@ -100,6 +101,7 @@
       path: '/alarm/current',
     })
   }
+  datetimerange.value = []
   listQuery.value = {
     limit: 20,
     offset: 1,
@@ -131,8 +133,8 @@
   if ($route.query.row) {
     loadingTable.value = true
     const row = JSON.parse($route.query.row as string)
-    getCurrentAlarmListPage({ offset: 1, limit: 99999 }).then((res) => {
-      const data = res.data.rows.filter((item: any) => item.id === row.id)
+    getCurrentAlarmListPage({ offset: 1, limit: 50 }).then((res) => {
+      const data = res.data.rows.filter((item: any) => item.id === row.alarmId)
       if (data.length) {
         list1.value = data.map((item: any) => ({
           ...item,
@@ -153,7 +155,10 @@
     })
     return
   }
-  fetchData()
+  datetimerange.value = [dayjs().subtract(7, 'day').format('YYYY-MM-DD HH:mm:ss'), dayjs().format('YYYY-MM-DD HH:mm:ss')]
+  setTimeout(() => {
+    fetchData()
+  })
 })
 // 表格标识  地图或普通
 const tableFlag = ref('normal')
@@ -181,6 +186,10 @@
 const mapRef = ref()
 const mapData = ref({})
 async function detail(row: any) {
+  if (row.processStatusName === '未读') {
+    list1.value[list1.value.findIndex((item: any) => item.id === row.id)].processStatusName = '已读'
+    row.processStatusName = '已读'
+  }
   const res = await detailAlarm(row.id)
   const data = toHumpObject(res.data)
   mapData.value = row
@@ -362,7 +371,7 @@
               <el-button v-if="proxy.hasPerm('/alarm/current/delete')" type="primary" @click="batchDeleteRow">
                 批量删除
               </el-button>
-              <el-button type="primary" @click="exportList">
+              <el-button v-if="proxy.hasPerm('/alarm/current/export')" type="primary" @click="exportList">
                 导出
               </el-button>
             </div>
@@ -383,7 +392,7 @@
               </el-table-column>
             </template>
             <template #columns>
-              <el-table-column label="操作" align="center" width="80">
+              <el-table-column v-if="proxy.hasPerm('/alarm/current/detail')" label="操作" align="center" width="80">
                 <template #default="scope">
                   <el-button type="primary" link size="small" @click="detail(scope.row)">
                     查看
diff --git a/src/views/home/alarm/history/index.vue b/src/views/home/alarm/history/index.vue
index eeb49fc..3c810c3 100644
--- a/src/views/home/alarm/history/index.vue
+++ b/src/views/home/alarm/history/index.vue
@@ -97,6 +97,7 @@
 }
 // 重置查询条件f
 const reset = () => {
+  datetimerange.value = []
   listQuery.value = {
     limit: 20,
     offset: 1,
@@ -189,6 +190,7 @@
   })
 }
 fetchDict()
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -249,7 +251,7 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="exportList">
+          <el-button v-if="proxy.hasPerm('/alarm/history/export')" type="primary" @click="exportList">
             导出
           </el-button>
         </div>
@@ -272,7 +274,7 @@
           </el-table-column>
         </template>
         <template #columns>
-          <el-table-column label="操作" align="center" width="80">
+          <el-table-column v-if="proxy.hasPerm('/alarm/history/detail')" label="操作" align="center" width="80">
             <template #default="scope">
               <el-button type="primary" link size="small" @click="moreData(scope.row)">
                 查看
diff --git a/src/views/home/dashboard/index.vue b/src/views/home/dashboard/index.vue
index d2f7e3c..42dfbed 100644
--- a/src/views/home/dashboard/index.vue
+++ b/src/views/home/dashboard/index.vue
@@ -42,7 +42,7 @@
     value: '0',
     name: '在线',
     unit: '个',
-    id: '1',
+    id: '1,2',
   },
   {
     img: img.lixian,
@@ -56,7 +56,7 @@
     value: '0',
     name: '停用',
     unit: '个',
-    id: '2',
+    id: '3',
   },
 ])
 // 工作台数据
@@ -133,7 +133,11 @@
   deviceOperationLoading.value = true
   getDeviceStatus().then((res) => {
     res.data.forEach((element: any) => {
-      const index = deviceOperationData.value.findIndex((item: any) => item.id === element.name)
+      if (element.name === '1' || element.name === '2') {
+        deviceOperationData.value[0].value = Number(deviceOperationData.value[0].value || '0') + Number(element.value)
+        return
+      }
+      const index = deviceOperationData.value.findIndex((item: any) => item.id.includes(element.name))
       if (index !== -1) {
         deviceOperationData.value[index].value = element.value
       }
diff --git a/src/views/home/device/count/components/bottom.vue b/src/views/home/device/count/components/bottom.vue
index 28a4d78..e4e56fa 100644
--- a/src/views/home/device/count/components/bottom.vue
+++ b/src/views/home/device/count/components/bottom.vue
@@ -110,6 +110,7 @@
   })
 }
 fetchDict()
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -148,7 +149,7 @@
             <template #btns-right>
               <!-- 操作 -->
               <div>
-                <el-button type="primary">
+                <el-button v-if="proxy.hasPerm('/device/count/offline/export')" type="primary">
                   导出
                 </el-button>
               </div>
diff --git a/src/views/home/device/device/index.vue b/src/views/home/device/device/index.vue
index c3970b9..9cdd606 100644
--- a/src/views/home/device/device/index.vue
+++ b/src/views/home/device/device/index.vue
@@ -88,6 +88,7 @@
 }
 // 重置查询条件f
 const reset = () => {
+  datetimerange.value = []
   listQuery.value = {
     limit: 20,
     offset: 1,
@@ -296,6 +297,7 @@
   fetchDict()
   fetchData()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -372,17 +374,17 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="editRow('add', {})">
+          <el-button v-if="proxy.hasPerm('/device/manage/add')" type="primary" @click="editRow('add', {})">
             新建
           </el-button>
-          <el-button type="primary" @click="downloadTemplate">
+          <el-button v-if="proxy.hasPerm('/device/manage/down')" type="primary" @click="downloadTemplate">
             模板下载
           </el-button>
-          <el-button type="primary" @click="importList">
+          <el-button v-if="proxy.hasPerm('/device/manage/import')" type="primary" @click="importList">
             批量导入
           </el-button>
-          <el-button type="primary" @click="exportList">
-            导出列表
+          <el-button v-if="proxy.hasPerm('/device/manage/export')" type="primary" @click="exportList">
+            导出
           </el-button>
           <input ref="fileRef" style="display: none;" type="file" accept=".xls,.xlsx" @change="onFileChange">
         </div>
@@ -409,16 +411,16 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="150">
             <template #default="scope">
-              <el-button type="primary" link size="small" @click="editRow('detail', scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/manage/detail')" type="primary" link size="small" @click="editRow('detail', scope.row)">
                 查看
               </el-button>
-              <el-button type="primary" link size="small" @click="editRow('edit', scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/manage/update')" type="primary" link size="small" @click="editRow('edit', scope.row)">
                 编辑
               </el-button>
-              <el-button type="danger" link size="small" @click="changeDefense(scope.row)">
+              <!-- <el-button v-if="proxy.hasPerm('/device/manage/add')" type="danger" link size="small" @click="changeDefense(scope.row)">
                 撤防
-              </el-button>
-              <el-button type="danger" link size="small" @click="removeRow(scope.row)">
+              </el-button> -->
+              <el-button v-if="proxy.hasPerm('/device/manage/delete')" type="danger" link size="small" @click="removeRow(scope.row)">
                 删除
               </el-button>
             </template>
diff --git a/src/views/home/device/instruction/index.vue b/src/views/home/device/instruction/index.vue
index 1e598ed..1da6706 100644
--- a/src/views/home/device/instruction/index.vue
+++ b/src/views/home/device/instruction/index.vue
@@ -78,6 +78,7 @@
 }
 // 重置查询条件f
 const reset = () => {
+  datetimerange.value = []
   listQuery.value = {
     limit: 20,
     offset: 1,
@@ -158,6 +159,7 @@
     editRef.value.initDialog('addOther', {})
   }
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -213,10 +215,10 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary">
+          <el-button v-if="proxy.hasPerm('/device/instruction/batch')" type="primary">
             批量下发
           </el-button>
-          <el-button type="primary" @click="editRow('add', {})">
+          <el-button v-if="proxy.hasPerm('/device/instruction/add')" type="primary" @click="editRow('add', {})">
             新建
           </el-button>
         </div>
@@ -236,13 +238,13 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="120">
             <template #default="scope">
-              <el-button type="primary" link size="small" @click="editRow('detail', scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/instruction/detail')" type="primary" link size="small" @click="editRow('detail', scope.row)">
                 查看
               </el-button>
-              <el-button v-if="scope.row.status === '2'" type="primary" link size="small" @click="editRow('edit', scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/instruction/again') && scope.row.status === '2'" type="primary" link size="small" @click="editRow('edit', scope.row)">
                 重新下发
               </el-button>
-              <el-button type="danger" link size="small" @click="removeRow(scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/instruction/delete')" type="danger" link size="small" @click="removeRow(scope.row)">
                 删除
               </el-button>
             </template>
diff --git a/src/views/home/device/product/index.vue b/src/views/home/device/product/index.vue
index 799fc90..fdd5463 100644
--- a/src/views/home/device/product/index.vue
+++ b/src/views/home/device/product/index.vue
@@ -128,6 +128,7 @@
   await fetchDict()
   fetchData()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -164,7 +165,7 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="editRow('add', {})">
+          <el-button v-if="proxy.hasPerm('/device/product/add')" type="primary" @click="editRow('add', {})">
             新建
           </el-button>
         </div>
@@ -184,10 +185,10 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="120">
             <template #default="scope">
-              <el-button type="primary" link size="small" @click="editRow('edit', scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/product/update')" type="primary" link size="small" @click="editRow('edit', scope.row)">
                 编辑
               </el-button>
-              <el-button type="danger" link size="small" @click="removeRow(scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/product/delete')" type="danger" link size="small" @click="removeRow(scope.row)">
                 删除
               </el-button>
             </template>
diff --git a/src/views/home/device/type/index.vue b/src/views/home/device/type/index.vue
index 59f1343..2344e57 100644
--- a/src/views/home/device/type/index.vue
+++ b/src/views/home/device/type/index.vue
@@ -105,6 +105,7 @@
   await fetchDict()
   fetchData()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -131,7 +132,7 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="editRow('add', {})">
+          <el-button v-if="proxy.hasPerm('/device/type/add')" type="primary" @click="editRow('add', {})">
             新建
           </el-button>
         </div>
@@ -151,10 +152,10 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="120">
             <template #default="scope">
-              <el-button type="primary" link size="small" @click="editRow('edit', scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/type/update')" type="primary" link size="small" @click="editRow('edit', scope.row)">
                 编辑
               </el-button>
-              <el-button type="danger" link size="small" @click="removeRow(scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/type/delete')" type="danger" link size="small" @click="removeRow(scope.row)">
                 删除
               </el-button>
             </template>
diff --git a/src/views/home/ledger/ledger/components/gridList.vue b/src/views/home/ledger/ledger/components/gridList.vue
index d03cd9f..189edef 100644
--- a/src/views/home/ledger/ledger/components/gridList.vue
+++ b/src/views/home/ledger/ledger/components/gridList.vue
@@ -91,6 +91,7 @@
     // })
   })
 }
+const { proxy } = getCurrentInstance() as any
 // 同步日志
 const allSync = () => {
   $router.push({
@@ -139,10 +140,10 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="allSync">
+          <el-button v-if="proxy.hasPerm('/ledger/sync')" type="primary" @click="allSync">
             同步日志
           </el-button>
-          <el-button type="primary" @click="sync('all', {})">
+          <el-button v-if="proxy.hasPerm('/ledger/sync/all')" type="primary" @click="sync('all', {})">
             全量同步
           </el-button>
         </div>
@@ -160,9 +161,9 @@
           </el-table-column>
         </template>
         <template #columns>
-          <el-table-column label="操作" align="center" width="80">
+          <el-table-column v-if="proxy.hasPerm('/ledger/sync/single')" label="操作" align="center" width="80">
             <template #default="scope">
-              <el-button type="primary" link size="small" @click="sync('single', scope.row)">
+              <el-button v-if="proxy.hasPerm('/ledger/sync/single')" type="primary" link size="small" @click="sync('single', scope.row)">
                 同步
               </el-button>
             </template>
diff --git a/src/views/home/ledger/ledger/components/wellList.vue b/src/views/home/ledger/ledger/components/wellList.vue
index 9eb1f43..06f855a 100644
--- a/src/views/home/ledger/ledger/components/wellList.vue
+++ b/src/views/home/ledger/ledger/components/wellList.vue
@@ -123,6 +123,7 @@
   // await fetchDict()
   fetchData()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -159,11 +160,11 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="allSync">
+          <el-button v-if="proxy.hasPerm('/ledger/sync')" type="primary" @click="allSync">
             同步日志
           </el-button>
-          <el-button type="primary" @click="sync('all', {})">
-            全部同步
+          <el-button v-if="proxy.hasPerm('/ledger/sync/all')" type="primary" @click="sync('all', {})">
+            全量同步
           </el-button>
         </div>
       </template>
@@ -180,9 +181,9 @@
           </el-table-column>
         </template>
         <template #columns>
-          <el-table-column label="操作" align="center" width="80">
+          <el-table-column v-if="proxy.hasPerm('/ledger/sync/single')" label="操作" align="center" width="80">
             <template #default="scope">
-              <el-button type="primary" link size="small" @click="sync('single', scope.row)">
+              <el-button v-if="proxy.hasPerm('/ledger/sync/single')" type="primary" link size="small" @click="sync('single', scope.row)">
                 同步
               </el-button>
             </template>
diff --git a/src/views/home/ledger/ledger/index.vue b/src/views/home/ledger/ledger/index.vue
index a03aa12..8403fc5 100644
--- a/src/views/home/ledger/ledger/index.vue
+++ b/src/views/home/ledger/ledger/index.vue
@@ -7,7 +7,16 @@
 import type { TabsPaneContext } from 'element-plus'
 import wellList from './components/wellList.vue'
 import gridList from './components/gridList.vue'
-const activeName = ref('闸井')
+const { proxy } = getCurrentInstance() as any
+const activeName = ref(
+  proxy.hasPerm('/ledger/manage/well')
+    ? '闸井'
+    : proxy.hasPerm('/ledger/manage/station')
+      ? '场站'
+      : proxy.hasPerm('/ledger/manage/grid')
+        ? '网格'
+        : '',
+)
 const handleClick = (tab: TabsPaneContext, event: Event) => {
   // console.log(tab, event)
 }
@@ -17,13 +26,13 @@
   <!-- 布局 -->
   <app-container>
     <el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick">
-      <el-tab-pane label="闸井" name="闸井">
+      <el-tab-pane v-if="proxy.hasPerm('/ledger/manage/well')" label="闸井" name="闸井">
         <well-list v-if="activeName === '闸井'" type="1" />
       </el-tab-pane>
-      <el-tab-pane label="场站" name="场站">
+      <el-tab-pane v-if="proxy.hasPerm('/ledger/manage/station')" label="场站" name="场站">
         <well-list v-if="activeName === '场站'" type="2" />
       </el-tab-pane>
-      <el-tab-pane label="网格" name="网格">
+      <el-tab-pane v-if="proxy.hasPerm('/ledger/manage/grid')" label="网格" name="网格">
         <grid-list v-if="activeName === '网格'" />
       </el-tab-pane>
     </el-tabs>
diff --git a/src/views/home/ledger/pipeline/index.vue b/src/views/home/ledger/pipeline/index.vue
index e0d2512..01e95ac 100644
--- a/src/views/home/ledger/pipeline/index.vue
+++ b/src/views/home/ledger/pipeline/index.vue
@@ -160,6 +160,7 @@
 onMounted(async () => {
   fetchData()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -222,13 +223,13 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="editRow('add', {})">
+          <el-button v-if="proxy.hasPerm('/ledger/pipeline/add')" type="primary" @click="editRow('add', {})">
             新增
           </el-button>
-          <el-button type="primary" @click="importList">
+          <el-button v-if="proxy.hasPerm('/ledger/pipeline/import')" type="primary" @click="importList">
             批量导入
           </el-button>
-          <el-button type="primary" @click="exportList">
+          <el-button v-if="proxy.hasPerm('/ledger/pipeline/export')" type="primary" @click="exportList">
             批量导出
           </el-button>
         </div>
@@ -248,10 +249,10 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="100">
             <template #default="scope">
-              <el-button type="primary" link size="small" @click="editRow('edit', scope.row)">
+              <el-button v-if="proxy.hasPerm('/ledger/pipeline/update')" type="primary" link size="small" @click="editRow('edit', scope.row)">
                 编辑
               </el-button>
-              <el-button type="danger" link size="small" @click="removeRow(scope.row)">
+              <el-button v-if="proxy.hasPerm('/ledger/pipeline/delete')" type="danger" link size="small" @click="removeRow(scope.row)">
                 删除
               </el-button>
             </template>
diff --git a/src/views/home/ledger/sync/index.vue b/src/views/home/ledger/sync/index.vue
index 54a3218..a04bad9 100644
--- a/src/views/home/ledger/sync/index.vue
+++ b/src/views/home/ledger/sync/index.vue
@@ -62,6 +62,7 @@
 }
 // 重置查询条件f
 const reset = () => {
+  datetimerange.value = []
   listQuery.value = {
     limit: 20,
     offset: 1,
@@ -106,6 +107,8 @@
 onMounted(async () => {
   fetchData()
 })
+const { proxy } = getCurrentInstance() as any
+const $route = useRoute()
 </script>
 
 <template>
@@ -132,7 +135,7 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="goBak">
+          <el-button v-if="$route.type" type="primary" @click="goBak">
             返回
           </el-button>
         </div>
@@ -152,10 +155,10 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="80">
             <template #default="scope">
-              <el-button type="primary" link size="small">
+              <el-button v-if="proxy.hasPerm('/ledger/sync/detail')" type="primary" link size="small">
                 查看
               </el-button>
-              <el-button type="danger" link size="small" @click="removeRow(scope.row)">
+              <el-button v-if="proxy.hasPerm('/ledger/sync/delete')" type="danger" link size="small" @click="removeRow(scope.row)">
                 删除
               </el-button>
             </template>
diff --git a/src/views/home/monitor/service/index.vue b/src/views/home/monitor/service/index.vue
index 8df2239..570dc68 100644
--- a/src/views/home/monitor/service/index.vue
+++ b/src/views/home/monitor/service/index.vue
@@ -53,6 +53,7 @@
 onMounted(async () => {
   fetchData()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -66,7 +67,7 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary">
+          <el-button v-if="proxy.hasPerm('/monitor/service/add')" type="primary">
             新建
           </el-button>
         </div>
diff --git a/src/views/home/monitor/time/index.vue b/src/views/home/monitor/time/index.vue
index caa6d46..0f7f5a0 100644
--- a/src/views/home/monitor/time/index.vue
+++ b/src/views/home/monitor/time/index.vue
@@ -53,6 +53,7 @@
 onMounted(async () => {
   fetchData()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -66,7 +67,7 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary">
+          <el-button v-if="proxy.hasPerm('/monitor/time/add')" type="primary">
             新建
           </el-button>
         </div>
diff --git a/src/views/home/operation/alarm/components/detail.vue b/src/views/home/operation/alarm/components/detail.vue
index 8194cbd..4ae4a1f 100644
--- a/src/views/home/operation/alarm/components/detail.vue
+++ b/src/views/home/operation/alarm/components/detail.vue
@@ -151,6 +151,7 @@
 }
 // 点击经纬度展示地图
 const mapRef = ref()
+const { proxy } = getCurrentInstance() as any
 const showMap = (data: any) => {
   console.log(data, 'data')
   if (data.text === '位置') {
@@ -160,6 +161,13 @@
         2: 'StationMonitorDetail',
         3: 'PipelineMonitorDetail',
       } as { [key: string]: string }
+      // 判断是否有菜单权限
+      const watchObjectAuth = {
+        1: '/well',
+        2: '/station/monitor',
+        3: '/pipeline',
+      } as { [key: string]: string }
+      if (!proxy.hasPerm(watchObjectAuth[detailInfo.value.watchObject])) { return }
       $router.push({
         name: watchObject[detailInfo.value.watchObject],
         query: {
diff --git a/src/views/home/operation/alarm/index.vue b/src/views/home/operation/alarm/index.vue
index ac0f31b..e53c991 100644
--- a/src/views/home/operation/alarm/index.vue
+++ b/src/views/home/operation/alarm/index.vue
@@ -82,6 +82,7 @@
 }
 // 重置查询条件f
 const reset = () => {
+  datetimerange.value = []
   listQuery.value = {
     limit: 20,
     offset: 1,
@@ -315,7 +316,7 @@
               <el-button v-if="proxy.hasPerm('/alarm/device/delete')" type="primary" @click="batchDeleteRow">
                 批量删除
               </el-button>
-              <el-button type="primary" @click="exportList">
+              <el-button v-if="proxy.hasPerm('/alarm/device/export')" type="primary" @click="exportList">
                 导出
               </el-button>
             </div>
@@ -336,7 +337,7 @@
               </el-table-column>
             </template>
             <template #columns>
-              <el-table-column label="操作" align="center" width="80">
+              <el-table-column v-if="proxy.hasPerm('/alarm/device/detail')" label="操作" align="center" width="80">
                 <template #default="scope">
                   <el-button type="primary" link size="small" @click="detail(scope.row)">
                     查看
diff --git a/src/views/home/operation/history/index.vue b/src/views/home/operation/history/index.vue
index 5c04ff7..d96ac57 100644
--- a/src/views/home/operation/history/index.vue
+++ b/src/views/home/operation/history/index.vue
@@ -78,6 +78,7 @@
 }
 // 重置查询条件f
 const reset = () => {
+  datetimerange.value = []
   listQuery.value = {
     limit: 20,
     offset: 1,
@@ -161,6 +162,7 @@
     fetchData()
   })
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -218,7 +220,7 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="exportList">
+          <el-button v-if="proxy.hasPerm('/operation/history/export')" type="primary" @click="exportList">
             导出
           </el-button>
         </div>
@@ -241,7 +243,7 @@
           </el-table-column>
         </template>
         <template #columns>
-          <el-table-column label="操作" align="center" width="80">
+          <el-table-column v-if="proxy.hasPerm('/operation/history/detail')" label="操作" align="center" width="80">
             <template #default="scope">
               <el-button type="primary" link size="small" @click="detailRow(scope.row)">
                 查看
diff --git a/src/views/home/operation/manufacturer/index.vue b/src/views/home/operation/manufacturer/index.vue
index 4a5816a..5f647c3 100644
--- a/src/views/home/operation/manufacturer/index.vue
+++ b/src/views/home/operation/manufacturer/index.vue
@@ -75,6 +75,7 @@
 }
 // 重置查询条件f
 const reset = () => {
+  datetimerange.value = []
   listQuery.value = {
     limit: 20,
     offset: 1,
@@ -125,6 +126,7 @@
   await fetchDict()
   fetchData()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -178,7 +180,7 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="exportList">
+          <el-button v-if="proxy.hasPerm('/operation/manufacturer/export')" type="primary" @click="exportList">
             导出
           </el-button>
         </div>

diff --git a/src/App.vue b/src/App.vue
index cde81b3..8a00f5d 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -125,7 +125,7 @@
         '--g-sub-sidebar-actual-width': subSidebarActualWidth,
       }"
     />
-    <system-info v-if="browserType !== 'mobile'" />
+    <!-- <system-info v-if="browserType !== 'mobile'" /> -->
     <audio id="eventAudio" src="" autoplay />
   </el-config-provider>
 </template>
diff --git a/src/layouts/components/Tools/alarmDialog.vue b/src/layouts/components/Tools/alarmDialog.vue
index 1828375..df89ab8 100644
--- a/src/layouts/components/Tools/alarmDialog.vue
+++ b/src/layouts/components/Tools/alarmDialog.vue
@@ -116,7 +116,7 @@
     </div>
     <template #footer>
       <div class="dialog-footer">
-        <div class="btn" @click="detail">
+        <div v-if="proxy.hasPerm('/alarm/current')" class="btn" @click="detail">
           查看
         </div>
         <div v-if="info.isSound === '1'" class="btn" @click="closeSound">
diff --git a/src/layouts/components/Tools/alarmList.vue b/src/layouts/components/Tools/alarmList.vue
index c3a9d2a..5356b74 100644
--- a/src/layouts/components/Tools/alarmList.vue
+++ b/src/layouts/components/Tools/alarmList.vue
@@ -54,6 +54,7 @@
 }
 // 查看当前行
 const detailRow = (row: any) => {
+  if (!proxy.hasPerm('/alarm/current')) { return }
   $router.push({
     name: 'AlarmCurrent',
     query: {
@@ -77,21 +78,6 @@
   localStorage.setItem('eventAudio', 'pause')
 }
 const dialogRef = ref()
-// const dialog = () => {
-//   const row = {
-//     alarmNoteMethod: '1', // 消息提醒 1:弹窗，2:消息提醒
-//     isSound: '1', // 报警音效，1:开，0:关
-//     isSend: '1', // 报警推送，1:开，0:关
-//     isText: '1', // 报警短息，1:开，0:关
-//     alarmType: '浓度超限',
-//     tagNumber: 'NX5702',
-//     alarmTime: '2024-09-09',
-//     value: '20',
-//     typeName: '燃气智能终端',
-//     alarmLevel: '一级',
-//   }
-//   dialogRef.value.initDialog(row)
-// }
 const fetchData = (isLoading = false) => {
   loading.value = true
   if (isLoading) {
@@ -115,7 +101,10 @@
       dialogRef.value.initDialog(newVal)
     }
     if (newVal.isSound === '1') {
-      play()
+      // play()
+      if (!localStorage.getItem('eventAudio')) {
+        proxy.playAudio()
+      }
     }
     fetchData(false)
   }
@@ -146,6 +135,7 @@
 //     window.localStorage.removeItem('token')
 //   }
 // }
+// const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -180,7 +170,7 @@
                   {{ message.processStatus
                     === '未读' ? '未读' : '已读' }}
                 </el-tag>
-                <el-tag type="info" size="small" style="margin-left: 5px;">
+                <el-tag type="info" size="small" style="margin-left: 5px;" @click="detailRow(message)">
                   查看
                 </el-tag>
               </div>
@@ -214,7 +204,7 @@
       <!-- <div class="close" @click="dialog">
         弹窗
       </div> -->
-      <div class="more" @click="moreList">
+      <div v-if="proxy.hasPerm('/alarm/current')" class="more" @click="moreList">
         查看更多
       </div>
     </div>
diff --git a/src/layouts/components/Tools/index.vue b/src/layouts/components/Tools/index.vue
index 9f2d41f..61f9707 100644
--- a/src/layouts/components/Tools/index.vue
+++ b/src/layouts/components/Tools/index.vue
@@ -79,6 +79,7 @@
   // 断开 websocket
   // websocket.destroyWebSocket()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -89,18 +90,18 @@
           <svg-icon name="ep:search" />
         </el-icon>
       </span>
-      <span class="item" @click="board">
+      <span v-if="proxy.hasPerm('/fullscreen')" class="item" @click="board">
         <el-icon>
           <svg-icon name="ep:data-line" />
         </el-icon>
       </span>
-      <span v-if="settingsStore.mode === 'pc' && settingsStore.toolbar.enableFullscreen" class="item" @click="toggle">
+      <span class="item" @click="toggle">
         <el-icon>
           <svg-icon :name="isFullscreen ? 'fullscreen-exit' : 'fullscreen'" />
         </el-icon>
       </span>
       <!-- 报警信息列表 -->
-      <span class="item">
+      <span v-if="proxy.hasPerm('/alarmnotice')" class="item">
         <el-popover width="390">
           <template #reference>
             <div>
diff --git a/src/layouts/components/Topbar/index.vue b/src/layouts/components/Topbar/index.vue
index 2863cef..4e3120e 100644
--- a/src/layouts/components/Topbar/index.vue
+++ b/src/layouts/components/Topbar/index.vue
@@ -67,7 +67,7 @@
           </transition-group>
         </el-breadcrumb>
       </div>
-      <tools />
+      <!-- <tools /> -->
     </div>
   </div>
 </template>
diff --git a/src/router/modules/pc.ts b/src/router/modules/pc.ts
index aacd6fa..97ced45 100644
--- a/src/router/modules/pc.ts
+++ b/src/router/modules/pc.ts
@@ -40,7 +40,7 @@
       icon: 'ep:key',
       sidebar: false,
       breadcrumb: false,
-      // auth: '/fullscreen',
+      auth: '/fullscreen',
     },
   },
   {
@@ -155,7 +155,7 @@
           sidebar: false,
           breadcrumb: false,
           activeMenu: '/well',
-          auth: '/well/detail',
+          auth: '/well',
         },
       },
     ],
diff --git a/src/views/home/alarm/count/components/locationAnalysis.vue b/src/views/home/alarm/count/components/locationAnalysis.vue
index fc75b9e..bff1853 100644
--- a/src/views/home/alarm/count/components/locationAnalysis.vue
+++ b/src/views/home/alarm/count/components/locationAnalysis.vue
@@ -46,6 +46,7 @@
   })
 }
 fetchData()
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -75,6 +76,9 @@
         <el-button type="primary" style="margin: 0 5px;" @click="fetchData">
           搜索
         </el-button>
+        <el-button v-if="proxy.hasPerm('/alarm/count/exportLocation')" type="primary" style="margin: 0 5px;">
+          导出
+        </el-button>
       </div>
     </template>
     <template #content>
diff --git a/src/views/home/alarm/current/components/detail.vue b/src/views/home/alarm/current/components/detail.vue
index dd3b31a..4204c92 100644
--- a/src/views/home/alarm/current/components/detail.vue
+++ b/src/views/home/alarm/current/components/detail.vue
@@ -111,7 +111,7 @@
   const res2 = await getAlarmTypeListPage({ offset: 1, limit: 9999 });
   ($route.query.type === 'history' ? getAlarmDetail : getAlarmDetail)($route.query.id as string).then((res) => {
     detailInfo.value = toHumpObject(res.data)
-    detailInfo.value.realAlarmName = detailInfo.value.realAlarm === '1' ? '报警' : '误报'
+    detailInfo.value.realAlarmName = detailInfo.value.realAlarm === '0' ? '是' : '否'
     detailInfo.value.alarmTypeName = res2.data.rows.filter((item: any) => item.id === detailInfo.value.alarmTypeId)[0]?.alarmType || ''
     detailInfo.value.alarmLevelName = res1.data.rows.filter((item: any) => item.id === detailInfo.value.alarmLevel)[0]?.alarmLevel || ''
     detailInfo.value.duration = detailInfo.value.ts && detailInfo.value.cancelTime ? getDateDiff(detailInfo.value.ts, detailInfo.value.cancelTime) : ''
@@ -139,6 +139,7 @@
 }
 // 点击经纬度展示地图
 const mapRef = ref()
+const { proxy } = getCurrentInstance() as any
 const showMap = (data: any) => {
   console.log(data, 'data')
   if (data.text === '位置') {
@@ -148,6 +149,13 @@
         2: 'StationMonitorDetail',
         3: 'PipelineMonitorDetail',
       } as { [key: string]: string }
+      // 判断是否有菜单权限
+      const watchObjectAuth = {
+        1: '/well',
+        2: '/station/monitor',
+        3: '/pipeline',
+      } as { [key: string]: string }
+      if (!proxy.hasPerm(watchObjectAuth[detailInfo.value.watchObject])) { return }
       $router.push({
         name: watchObject[detailInfo.value.watchObject],
         query: {
diff --git a/src/views/home/alarm/current/components/detailInfoDialog.vue b/src/views/home/alarm/current/components/detailInfoDialog.vue
index c089449..7fbf06b 100644
--- a/src/views/home/alarm/current/components/detailInfoDialog.vue
+++ b/src/views/home/alarm/current/components/detailInfoDialog.vue
@@ -114,6 +114,7 @@
   })
 }
 defineExpose({ initDialog, close })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -131,7 +132,7 @@
     <!-- 头部 -->
     <div class="header">
       <span>{{ info.alarmContent }}</span>
-      <span class="more" @click="moreData">>>更多</span>
+      <span v-if="proxy.hasPerm(type === 'data' ? '/alarm/current/more' : '/alarm/device/more')" class="more" @click="moreData">>>更多</span>
     </div>
     <div class="content">
       <div v-show="type === 'device'" class="item">
@@ -162,7 +163,7 @@
         报警设备:
         <span style="padding-left: 6px;">{{ info.devcode }} </span>
         <el-button
-          v-if="info.devTypeName === '燃气智能监测终端' || info.devTypeName === '液位检测仪' || info.devTypeName === '井盖监测仪'"
+          v-if="(info.devTypeName === '燃气智能监测终端' || info.devTypeName === '液位检测仪' || info.devTypeName === '井盖监测仪') && proxy.hasPerm('/alarm/current/data')"
           size="small" style="margin-left: 6px;" @click="viewData"
         >
           查看数据
@@ -228,7 +229,7 @@
         <span style="padding-left: 6px;">
           {{ info.confirmContent }}
         </span>
-        <el-button v-if="type === 'data'" size="small" style="padding-left: 6px;" @click="viewProcess">
+        <el-button v-if="type === 'data' && proxy.hasPerm('/alarm/current/process')" size="small" style="padding-left: 6px;" @click="viewProcess">
           流程图
         </el-button>
       </div>
@@ -246,17 +247,17 @@
       </div>
     </div>
     <div class="footer">
-      <el-button v-if="Number(info.processStatus) < 4 && type === 'data'" size="small" @click="remind">
+      <el-button v-if="(Number(info.processStatus) < 4 && type === 'data') && proxy.hasPerm('/alarm/current/remind')" size="small" @click="remind">
         提醒责任人
       </el-button>
       <el-button
-        v-if="type === 'device' && (info.processStatusName === '待处置' || info.processStatusName === '挂起')"
+        v-if="(type === 'device' && (info.processStatusName === '待处置' || info.processStatusName === '挂起')) && proxy.hasPerm('/alarm/device/handler')"
         size="small" @click="handler"
       >
         报警处置
       </el-button>
       <el-button
-        v-if="Number(info.processStatus) <= 3 || (type === 'device' && info.processStatusName === '待处置') || info.processStatusName === '挂起'"
+        v-if="(Number(info.processStatus) <= 3 || (type === 'device' && info.processStatusName === '待处置') || info.processStatusName === '挂起') && proxy.hasPerm(type === 'device' ? '/alarm/device/pending' : '/alarm/current/pending')"
         type="primary" size="small" @click="pending"
       >
         挂起
diff --git a/src/views/home/alarm/current/index.vue b/src/views/home/alarm/current/index.vue
index d019bbf..e2714bb 100644
--- a/src/views/home/alarm/current/index.vue
+++ b/src/views/home/alarm/current/index.vue
@@ -4,6 +4,7 @@
   Date: 2023-06-28
  -->
 <script lang="ts" setup name="CurrentAlarm">
+import dayjs from 'dayjs'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import { ArrowLeftBold, ArrowRightBold } from '@element-plus/icons-vue'
 import MapCom from './components/map.vue'
@@ -100,6 +101,7 @@
       path: '/alarm/current',
     })
   }
+  datetimerange.value = []
   listQuery.value = {
     limit: 20,
     offset: 1,
@@ -131,8 +133,8 @@
   if ($route.query.row) {
     loadingTable.value = true
     const row = JSON.parse($route.query.row as string)
-    getCurrentAlarmListPage({ offset: 1, limit: 99999 }).then((res) => {
-      const data = res.data.rows.filter((item: any) => item.id === row.id)
+    getCurrentAlarmListPage({ offset: 1, limit: 50 }).then((res) => {
+      const data = res.data.rows.filter((item: any) => item.id === row.alarmId)
       if (data.length) {
         list1.value = data.map((item: any) => ({
           ...item,
@@ -153,7 +155,10 @@
     })
     return
   }
-  fetchData()
+  datetimerange.value = [dayjs().subtract(7, 'day').format('YYYY-MM-DD HH:mm:ss'), dayjs().format('YYYY-MM-DD HH:mm:ss')]
+  setTimeout(() => {
+    fetchData()
+  })
 })
 // 表格标识  地图或普通
 const tableFlag = ref('normal')
@@ -181,6 +186,10 @@
 const mapRef = ref()
 const mapData = ref({})
 async function detail(row: any) {
+  if (row.processStatusName === '未读') {
+    list1.value[list1.value.findIndex((item: any) => item.id === row.id)].processStatusName = '已读'
+    row.processStatusName = '已读'
+  }
   const res = await detailAlarm(row.id)
   const data = toHumpObject(res.data)
   mapData.value = row
@@ -362,7 +371,7 @@
               <el-button v-if="proxy.hasPerm('/alarm/current/delete')" type="primary" @click="batchDeleteRow">
                 批量删除
               </el-button>
-              <el-button type="primary" @click="exportList">
+              <el-button v-if="proxy.hasPerm('/alarm/current/export')" type="primary" @click="exportList">
                 导出
               </el-button>
             </div>
@@ -383,7 +392,7 @@
               </el-table-column>
             </template>
             <template #columns>
-              <el-table-column label="操作" align="center" width="80">
+              <el-table-column v-if="proxy.hasPerm('/alarm/current/detail')" label="操作" align="center" width="80">
                 <template #default="scope">
                   <el-button type="primary" link size="small" @click="detail(scope.row)">
                     查看
diff --git a/src/views/home/alarm/history/index.vue b/src/views/home/alarm/history/index.vue
index eeb49fc..3c810c3 100644
--- a/src/views/home/alarm/history/index.vue
+++ b/src/views/home/alarm/history/index.vue
@@ -97,6 +97,7 @@
 }
 // 重置查询条件f
 const reset = () => {
+  datetimerange.value = []
   listQuery.value = {
     limit: 20,
     offset: 1,
@@ -189,6 +190,7 @@
   })
 }
 fetchDict()
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -249,7 +251,7 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="exportList">
+          <el-button v-if="proxy.hasPerm('/alarm/history/export')" type="primary" @click="exportList">
             导出
           </el-button>
         </div>
@@ -272,7 +274,7 @@
           </el-table-column>
         </template>
         <template #columns>
-          <el-table-column label="操作" align="center" width="80">
+          <el-table-column v-if="proxy.hasPerm('/alarm/history/detail')" label="操作" align="center" width="80">
             <template #default="scope">
               <el-button type="primary" link size="small" @click="moreData(scope.row)">
                 查看
diff --git a/src/views/home/dashboard/index.vue b/src/views/home/dashboard/index.vue
index d2f7e3c..42dfbed 100644
--- a/src/views/home/dashboard/index.vue
+++ b/src/views/home/dashboard/index.vue
@@ -42,7 +42,7 @@
     value: '0',
     name: '在线',
     unit: '个',
-    id: '1',
+    id: '1,2',
   },
   {
     img: img.lixian,
@@ -56,7 +56,7 @@
     value: '0',
     name: '停用',
     unit: '个',
-    id: '2',
+    id: '3',
   },
 ])
 // 工作台数据
@@ -133,7 +133,11 @@
   deviceOperationLoading.value = true
   getDeviceStatus().then((res) => {
     res.data.forEach((element: any) => {
-      const index = deviceOperationData.value.findIndex((item: any) => item.id === element.name)
+      if (element.name === '1' || element.name === '2') {
+        deviceOperationData.value[0].value = Number(deviceOperationData.value[0].value || '0') + Number(element.value)
+        return
+      }
+      const index = deviceOperationData.value.findIndex((item: any) => item.id.includes(element.name))
       if (index !== -1) {
         deviceOperationData.value[index].value = element.value
       }
diff --git a/src/views/home/device/count/components/bottom.vue b/src/views/home/device/count/components/bottom.vue
index 28a4d78..e4e56fa 100644
--- a/src/views/home/device/count/components/bottom.vue
+++ b/src/views/home/device/count/components/bottom.vue
@@ -110,6 +110,7 @@
   })
 }
 fetchDict()
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -148,7 +149,7 @@
             <template #btns-right>
               <!-- 操作 -->
               <div>
-                <el-button type="primary">
+                <el-button v-if="proxy.hasPerm('/device/count/offline/export')" type="primary">
                   导出
                 </el-button>
               </div>
diff --git a/src/views/home/device/device/index.vue b/src/views/home/device/device/index.vue
index c3970b9..9cdd606 100644
--- a/src/views/home/device/device/index.vue
+++ b/src/views/home/device/device/index.vue
@@ -88,6 +88,7 @@
 }
 // 重置查询条件f
 const reset = () => {
+  datetimerange.value = []
   listQuery.value = {
     limit: 20,
     offset: 1,
@@ -296,6 +297,7 @@
   fetchDict()
   fetchData()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -372,17 +374,17 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="editRow('add', {})">
+          <el-button v-if="proxy.hasPerm('/device/manage/add')" type="primary" @click="editRow('add', {})">
             新建
           </el-button>
-          <el-button type="primary" @click="downloadTemplate">
+          <el-button v-if="proxy.hasPerm('/device/manage/down')" type="primary" @click="downloadTemplate">
             模板下载
           </el-button>
-          <el-button type="primary" @click="importList">
+          <el-button v-if="proxy.hasPerm('/device/manage/import')" type="primary" @click="importList">
             批量导入
           </el-button>
-          <el-button type="primary" @click="exportList">
-            导出列表
+          <el-button v-if="proxy.hasPerm('/device/manage/export')" type="primary" @click="exportList">
+            导出
           </el-button>
           <input ref="fileRef" style="display: none;" type="file" accept=".xls,.xlsx" @change="onFileChange">
         </div>
@@ -409,16 +411,16 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="150">
             <template #default="scope">
-              <el-button type="primary" link size="small" @click="editRow('detail', scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/manage/detail')" type="primary" link size="small" @click="editRow('detail', scope.row)">
                 查看
               </el-button>
-              <el-button type="primary" link size="small" @click="editRow('edit', scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/manage/update')" type="primary" link size="small" @click="editRow('edit', scope.row)">
                 编辑
               </el-button>
-              <el-button type="danger" link size="small" @click="changeDefense(scope.row)">
+              <!-- <el-button v-if="proxy.hasPerm('/device/manage/add')" type="danger" link size="small" @click="changeDefense(scope.row)">
                 撤防
-              </el-button>
-              <el-button type="danger" link size="small" @click="removeRow(scope.row)">
+              </el-button> -->
+              <el-button v-if="proxy.hasPerm('/device/manage/delete')" type="danger" link size="small" @click="removeRow(scope.row)">
                 删除
               </el-button>
             </template>
diff --git a/src/views/home/device/instruction/index.vue b/src/views/home/device/instruction/index.vue
index 1e598ed..1da6706 100644
--- a/src/views/home/device/instruction/index.vue
+++ b/src/views/home/device/instruction/index.vue
@@ -78,6 +78,7 @@
 }
 // 重置查询条件f
 const reset = () => {
+  datetimerange.value = []
   listQuery.value = {
     limit: 20,
     offset: 1,
@@ -158,6 +159,7 @@
     editRef.value.initDialog('addOther', {})
   }
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -213,10 +215,10 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary">
+          <el-button v-if="proxy.hasPerm('/device/instruction/batch')" type="primary">
             批量下发
           </el-button>
-          <el-button type="primary" @click="editRow('add', {})">
+          <el-button v-if="proxy.hasPerm('/device/instruction/add')" type="primary" @click="editRow('add', {})">
             新建
           </el-button>
         </div>
@@ -236,13 +238,13 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="120">
             <template #default="scope">
-              <el-button type="primary" link size="small" @click="editRow('detail', scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/instruction/detail')" type="primary" link size="small" @click="editRow('detail', scope.row)">
                 查看
               </el-button>
-              <el-button v-if="scope.row.status === '2'" type="primary" link size="small" @click="editRow('edit', scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/instruction/again') && scope.row.status === '2'" type="primary" link size="small" @click="editRow('edit', scope.row)">
                 重新下发
               </el-button>
-              <el-button type="danger" link size="small" @click="removeRow(scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/instruction/delete')" type="danger" link size="small" @click="removeRow(scope.row)">
                 删除
               </el-button>
             </template>
diff --git a/src/views/home/device/product/index.vue b/src/views/home/device/product/index.vue
index 799fc90..fdd5463 100644
--- a/src/views/home/device/product/index.vue
+++ b/src/views/home/device/product/index.vue
@@ -128,6 +128,7 @@
   await fetchDict()
   fetchData()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -164,7 +165,7 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="editRow('add', {})">
+          <el-button v-if="proxy.hasPerm('/device/product/add')" type="primary" @click="editRow('add', {})">
             新建
           </el-button>
         </div>
@@ -184,10 +185,10 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="120">
             <template #default="scope">
-              <el-button type="primary" link size="small" @click="editRow('edit', scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/product/update')" type="primary" link size="small" @click="editRow('edit', scope.row)">
                 编辑
               </el-button>
-              <el-button type="danger" link size="small" @click="removeRow(scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/product/delete')" type="danger" link size="small" @click="removeRow(scope.row)">
                 删除
               </el-button>
             </template>
diff --git a/src/views/home/device/type/index.vue b/src/views/home/device/type/index.vue
index 59f1343..2344e57 100644
--- a/src/views/home/device/type/index.vue
+++ b/src/views/home/device/type/index.vue
@@ -105,6 +105,7 @@
   await fetchDict()
   fetchData()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -131,7 +132,7 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="editRow('add', {})">
+          <el-button v-if="proxy.hasPerm('/device/type/add')" type="primary" @click="editRow('add', {})">
             新建
           </el-button>
         </div>
@@ -151,10 +152,10 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="120">
             <template #default="scope">
-              <el-button type="primary" link size="small" @click="editRow('edit', scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/type/update')" type="primary" link size="small" @click="editRow('edit', scope.row)">
                 编辑
               </el-button>
-              <el-button type="danger" link size="small" @click="removeRow(scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/type/delete')" type="danger" link size="small" @click="removeRow(scope.row)">
                 删除
               </el-button>
             </template>
diff --git a/src/views/home/ledger/ledger/components/gridList.vue b/src/views/home/ledger/ledger/components/gridList.vue
index d03cd9f..189edef 100644
--- a/src/views/home/ledger/ledger/components/gridList.vue
+++ b/src/views/home/ledger/ledger/components/gridList.vue
@@ -91,6 +91,7 @@
     // })
   })
 }
+const { proxy } = getCurrentInstance() as any
 // 同步日志
 const allSync = () => {
   $router.push({
@@ -139,10 +140,10 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="allSync">
+          <el-button v-if="proxy.hasPerm('/ledger/sync')" type="primary" @click="allSync">
             同步日志
           </el-button>
-          <el-button type="primary" @click="sync('all', {})">
+          <el-button v-if="proxy.hasPerm('/ledger/sync/all')" type="primary" @click="sync('all', {})">
             全量同步
           </el-button>
         </div>
@@ -160,9 +161,9 @@
           </el-table-column>
         </template>
         <template #columns>
-          <el-table-column label="操作" align="center" width="80">
+          <el-table-column v-if="proxy.hasPerm('/ledger/sync/single')" label="操作" align="center" width="80">
             <template #default="scope">
-              <el-button type="primary" link size="small" @click="sync('single', scope.row)">
+              <el-button v-if="proxy.hasPerm('/ledger/sync/single')" type="primary" link size="small" @click="sync('single', scope.row)">
                 同步
               </el-button>
             </template>
diff --git a/src/views/home/ledger/ledger/components/wellList.vue b/src/views/home/ledger/ledger/components/wellList.vue
index 9eb1f43..06f855a 100644
--- a/src/views/home/ledger/ledger/components/wellList.vue
+++ b/src/views/home/ledger/ledger/components/wellList.vue
@@ -123,6 +123,7 @@
   // await fetchDict()
   fetchData()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -159,11 +160,11 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="allSync">
+          <el-button v-if="proxy.hasPerm('/ledger/sync')" type="primary" @click="allSync">
             同步日志
           </el-button>
-          <el-button type="primary" @click="sync('all', {})">
-            全部同步
+          <el-button v-if="proxy.hasPerm('/ledger/sync/all')" type="primary" @click="sync('all', {})">
+            全量同步
           </el-button>
         </div>
       </template>
@@ -180,9 +181,9 @@
           </el-table-column>
         </template>
         <template #columns>
-          <el-table-column label="操作" align="center" width="80">
+          <el-table-column v-if="proxy.hasPerm('/ledger/sync/single')" label="操作" align="center" width="80">
             <template #default="scope">
-              <el-button type="primary" link size="small" @click="sync('single', scope.row)">
+              <el-button v-if="proxy.hasPerm('/ledger/sync/single')" type="primary" link size="small" @click="sync('single', scope.row)">
                 同步
               </el-button>
             </template>
diff --git a/src/views/home/ledger/ledger/index.vue b/src/views/home/ledger/ledger/index.vue
index a03aa12..8403fc5 100644
--- a/src/views/home/ledger/ledger/index.vue
+++ b/src/views/home/ledger/ledger/index.vue
@@ -7,7 +7,16 @@
 import type { TabsPaneContext } from 'element-plus'
 import wellList from './components/wellList.vue'
 import gridList from './components/gridList.vue'
-const activeName = ref('闸井')
+const { proxy } = getCurrentInstance() as any
+const activeName = ref(
+  proxy.hasPerm('/ledger/manage/well')
+    ? '闸井'
+    : proxy.hasPerm('/ledger/manage/station')
+      ? '场站'
+      : proxy.hasPerm('/ledger/manage/grid')
+        ? '网格'
+        : '',
+)
 const handleClick = (tab: TabsPaneContext, event: Event) => {
   // console.log(tab, event)
 }
@@ -17,13 +26,13 @@
   <!-- 布局 -->
   <app-container>
     <el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick">
-      <el-tab-pane label="闸井" name="闸井">
+      <el-tab-pane v-if="proxy.hasPerm('/ledger/manage/well')" label="闸井" name="闸井">
         <well-list v-if="activeName === '闸井'" type="1" />
       </el-tab-pane>
-      <el-tab-pane label="场站" name="场站">
+      <el-tab-pane v-if="proxy.hasPerm('/ledger/manage/station')" label="场站" name="场站">
         <well-list v-if="activeName === '场站'" type="2" />
       </el-tab-pane>
-      <el-tab-pane label="网格" name="网格">
+      <el-tab-pane v-if="proxy.hasPerm('/ledger/manage/grid')" label="网格" name="网格">
         <grid-list v-if="activeName === '网格'" />
       </el-tab-pane>
     </el-tabs>
diff --git a/src/views/home/ledger/pipeline/index.vue b/src/views/home/ledger/pipeline/index.vue
index e0d2512..01e95ac 100644
--- a/src/views/home/ledger/pipeline/index.vue
+++ b/src/views/home/ledger/pipeline/index.vue
@@ -160,6 +160,7 @@
 onMounted(async () => {
   fetchData()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -222,13 +223,13 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="editRow('add', {})">
+          <el-button v-if="proxy.hasPerm('/ledger/pipeline/add')" type="primary" @click="editRow('add', {})">
             新增
           </el-button>
-          <el-button type="primary" @click="importList">
+          <el-button v-if="proxy.hasPerm('/ledger/pipeline/import')" type="primary" @click="importList">
             批量导入
           </el-button>
-          <el-button type="primary" @click="exportList">
+          <el-button v-if="proxy.hasPerm('/ledger/pipeline/export')" type="primary" @click="exportList">
             批量导出
           </el-button>
         </div>
@@ -248,10 +249,10 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="100">
             <template #default="scope">
-              <el-button type="primary" link size="small" @click="editRow('edit', scope.row)">
+              <el-button v-if="proxy.hasPerm('/ledger/pipeline/update')" type="primary" link size="small" @click="editRow('edit', scope.row)">
                 编辑
               </el-button>
-              <el-button type="danger" link size="small" @click="removeRow(scope.row)">
+              <el-button v-if="proxy.hasPerm('/ledger/pipeline/delete')" type="danger" link size="small" @click="removeRow(scope.row)">
                 删除
               </el-button>
             </template>
diff --git a/src/views/home/ledger/sync/index.vue b/src/views/home/ledger/sync/index.vue
index 54a3218..a04bad9 100644
--- a/src/views/home/ledger/sync/index.vue
+++ b/src/views/home/ledger/sync/index.vue
@@ -62,6 +62,7 @@
 }
 // 重置查询条件f
 const reset = () => {
+  datetimerange.value = []
   listQuery.value = {
     limit: 20,
     offset: 1,
@@ -106,6 +107,8 @@
 onMounted(async () => {
   fetchData()
 })
+const { proxy } = getCurrentInstance() as any
+const $route = useRoute()
 </script>
 
 <template>
@@ -132,7 +135,7 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="goBak">
+          <el-button v-if="$route.type" type="primary" @click="goBak">
             返回
           </el-button>
         </div>
@@ -152,10 +155,10 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="80">
             <template #default="scope">
-              <el-button type="primary" link size="small">
+              <el-button v-if="proxy.hasPerm('/ledger/sync/detail')" type="primary" link size="small">
                 查看
               </el-button>
-              <el-button type="danger" link size="small" @click="removeRow(scope.row)">
+              <el-button v-if="proxy.hasPerm('/ledger/sync/delete')" type="danger" link size="small" @click="removeRow(scope.row)">
                 删除
               </el-button>
             </template>
diff --git a/src/views/home/monitor/service/index.vue b/src/views/home/monitor/service/index.vue
index 8df2239..570dc68 100644
--- a/src/views/home/monitor/service/index.vue
+++ b/src/views/home/monitor/service/index.vue
@@ -53,6 +53,7 @@
 onMounted(async () => {
   fetchData()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -66,7 +67,7 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary">
+          <el-button v-if="proxy.hasPerm('/monitor/service/add')" type="primary">
             新建
           </el-button>
         </div>
diff --git a/src/views/home/monitor/time/index.vue b/src/views/home/monitor/time/index.vue
index caa6d46..0f7f5a0 100644
--- a/src/views/home/monitor/time/index.vue
+++ b/src/views/home/monitor/time/index.vue
@@ -53,6 +53,7 @@
 onMounted(async () => {
   fetchData()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -66,7 +67,7 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary">
+          <el-button v-if="proxy.hasPerm('/monitor/time/add')" type="primary">
             新建
           </el-button>
         </div>
diff --git a/src/views/home/operation/alarm/components/detail.vue b/src/views/home/operation/alarm/components/detail.vue
index 8194cbd..4ae4a1f 100644
--- a/src/views/home/operation/alarm/components/detail.vue
+++ b/src/views/home/operation/alarm/components/detail.vue
@@ -151,6 +151,7 @@
 }
 // 点击经纬度展示地图
 const mapRef = ref()
+const { proxy } = getCurrentInstance() as any
 const showMap = (data: any) => {
   console.log(data, 'data')
   if (data.text === '位置') {
@@ -160,6 +161,13 @@
         2: 'StationMonitorDetail',
         3: 'PipelineMonitorDetail',
       } as { [key: string]: string }
+      // 判断是否有菜单权限
+      const watchObjectAuth = {
+        1: '/well',
+        2: '/station/monitor',
+        3: '/pipeline',
+      } as { [key: string]: string }
+      if (!proxy.hasPerm(watchObjectAuth[detailInfo.value.watchObject])) { return }
       $router.push({
         name: watchObject[detailInfo.value.watchObject],
         query: {
diff --git a/src/views/home/operation/alarm/index.vue b/src/views/home/operation/alarm/index.vue
index ac0f31b..e53c991 100644
--- a/src/views/home/operation/alarm/index.vue
+++ b/src/views/home/operation/alarm/index.vue
@@ -82,6 +82,7 @@
 }
 // 重置查询条件f
 const reset = () => {
+  datetimerange.value = []
   listQuery.value = {
     limit: 20,
     offset: 1,
@@ -315,7 +316,7 @@
               <el-button v-if="proxy.hasPerm('/alarm/device/delete')" type="primary" @click="batchDeleteRow">
                 批量删除
               </el-button>
-              <el-button type="primary" @click="exportList">
+              <el-button v-if="proxy.hasPerm('/alarm/device/export')" type="primary" @click="exportList">
                 导出
               </el-button>
             </div>
@@ -336,7 +337,7 @@
               </el-table-column>
             </template>
             <template #columns>
-              <el-table-column label="操作" align="center" width="80">
+              <el-table-column v-if="proxy.hasPerm('/alarm/device/detail')" label="操作" align="center" width="80">
                 <template #default="scope">
                   <el-button type="primary" link size="small" @click="detail(scope.row)">
                     查看
diff --git a/src/views/home/operation/history/index.vue b/src/views/home/operation/history/index.vue
index 5c04ff7..d96ac57 100644
--- a/src/views/home/operation/history/index.vue
+++ b/src/views/home/operation/history/index.vue
@@ -78,6 +78,7 @@
 }
 // 重置查询条件f
 const reset = () => {
+  datetimerange.value = []
   listQuery.value = {
     limit: 20,
     offset: 1,
@@ -161,6 +162,7 @@
     fetchData()
   })
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -218,7 +220,7 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="exportList">
+          <el-button v-if="proxy.hasPerm('/operation/history/export')" type="primary" @click="exportList">
             导出
           </el-button>
         </div>
@@ -241,7 +243,7 @@
           </el-table-column>
         </template>
         <template #columns>
-          <el-table-column label="操作" align="center" width="80">
+          <el-table-column v-if="proxy.hasPerm('/operation/history/detail')" label="操作" align="center" width="80">
             <template #default="scope">
               <el-button type="primary" link size="small" @click="detailRow(scope.row)">
                 查看
diff --git a/src/views/home/operation/manufacturer/index.vue b/src/views/home/operation/manufacturer/index.vue
index 4a5816a..5f647c3 100644
--- a/src/views/home/operation/manufacturer/index.vue
+++ b/src/views/home/operation/manufacturer/index.vue
@@ -75,6 +75,7 @@
 }
 // 重置查询条件f
 const reset = () => {
+  datetimerange.value = []
   listQuery.value = {
     limit: 20,
     offset: 1,
@@ -125,6 +126,7 @@
   await fetchDict()
   fetchData()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -178,7 +180,7 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="exportList">
+          <el-button v-if="proxy.hasPerm('/operation/manufacturer/export')" type="primary" @click="exportList">
             导出
           </el-button>
         </div>
diff --git a/src/views/home/operation/trajectory/index.vue b/src/views/home/operation/trajectory/index.vue
index 9312fd7..606958e 100644
--- a/src/views/home/operation/trajectory/index.vue
+++ b/src/views/home/operation/trajectory/index.vue
@@ -65,6 +65,7 @@
 }
 // 重置查询条件f
 const reset = () => {
+  datetimerange.value = []
   listQuery.value = {
     limit: 20,
     offset: 1,
@@ -114,6 +115,7 @@
   await fetchDict()
   fetchData()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -175,7 +177,7 @@
           </span>
         </template>
         <template #columns>
-          <el-table-column label="操作" width="80" align="center">
+          <el-table-column v-if="proxy.hasPerm('/operation/trajectory/detail')" label="操作" width="80" align="center">
             <template #default="scope">
               <el-button type="primary" link size="small" @click="detail(scope.row)">
                 查看

diff --git a/src/App.vue b/src/App.vue
index cde81b3..8a00f5d 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -125,7 +125,7 @@
         '--g-sub-sidebar-actual-width': subSidebarActualWidth,
       }"
     />
-    <system-info v-if="browserType !== 'mobile'" />
+    <!-- <system-info v-if="browserType !== 'mobile'" /> -->
     <audio id="eventAudio" src="" autoplay />
   </el-config-provider>
 </template>
diff --git a/src/layouts/components/Tools/alarmDialog.vue b/src/layouts/components/Tools/alarmDialog.vue
index 1828375..df89ab8 100644
--- a/src/layouts/components/Tools/alarmDialog.vue
+++ b/src/layouts/components/Tools/alarmDialog.vue
@@ -116,7 +116,7 @@
     </div>
     <template #footer>
       <div class="dialog-footer">
-        <div class="btn" @click="detail">
+        <div v-if="proxy.hasPerm('/alarm/current')" class="btn" @click="detail">
           查看
         </div>
         <div v-if="info.isSound === '1'" class="btn" @click="closeSound">
diff --git a/src/layouts/components/Tools/alarmList.vue b/src/layouts/components/Tools/alarmList.vue
index c3a9d2a..5356b74 100644
--- a/src/layouts/components/Tools/alarmList.vue
+++ b/src/layouts/components/Tools/alarmList.vue
@@ -54,6 +54,7 @@
 }
 // 查看当前行
 const detailRow = (row: any) => {
+  if (!proxy.hasPerm('/alarm/current')) { return }
   $router.push({
     name: 'AlarmCurrent',
     query: {
@@ -77,21 +78,6 @@
   localStorage.setItem('eventAudio', 'pause')
 }
 const dialogRef = ref()
-// const dialog = () => {
-//   const row = {
-//     alarmNoteMethod: '1', // 消息提醒 1:弹窗，2:消息提醒
-//     isSound: '1', // 报警音效，1:开，0:关
-//     isSend: '1', // 报警推送，1:开，0:关
-//     isText: '1', // 报警短息，1:开，0:关
-//     alarmType: '浓度超限',
-//     tagNumber: 'NX5702',
-//     alarmTime: '2024-09-09',
-//     value: '20',
-//     typeName: '燃气智能终端',
-//     alarmLevel: '一级',
-//   }
-//   dialogRef.value.initDialog(row)
-// }
 const fetchData = (isLoading = false) => {
   loading.value = true
   if (isLoading) {
@@ -115,7 +101,10 @@
       dialogRef.value.initDialog(newVal)
     }
     if (newVal.isSound === '1') {
-      play()
+      // play()
+      if (!localStorage.getItem('eventAudio')) {
+        proxy.playAudio()
+      }
     }
     fetchData(false)
   }
@@ -146,6 +135,7 @@
 //     window.localStorage.removeItem('token')
 //   }
 // }
+// const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -180,7 +170,7 @@
                   {{ message.processStatus
                     === '未读' ? '未读' : '已读' }}
                 </el-tag>
-                <el-tag type="info" size="small" style="margin-left: 5px;">
+                <el-tag type="info" size="small" style="margin-left: 5px;" @click="detailRow(message)">
                   查看
                 </el-tag>
               </div>
@@ -214,7 +204,7 @@
       <!-- <div class="close" @click="dialog">
         弹窗
       </div> -->
-      <div class="more" @click="moreList">
+      <div v-if="proxy.hasPerm('/alarm/current')" class="more" @click="moreList">
         查看更多
       </div>
     </div>
diff --git a/src/layouts/components/Tools/index.vue b/src/layouts/components/Tools/index.vue
index 9f2d41f..61f9707 100644
--- a/src/layouts/components/Tools/index.vue
+++ b/src/layouts/components/Tools/index.vue
@@ -79,6 +79,7 @@
   // 断开 websocket
   // websocket.destroyWebSocket()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -89,18 +90,18 @@
           <svg-icon name="ep:search" />
         </el-icon>
       </span>
-      <span class="item" @click="board">
+      <span v-if="proxy.hasPerm('/fullscreen')" class="item" @click="board">
         <el-icon>
           <svg-icon name="ep:data-line" />
         </el-icon>
       </span>
-      <span v-if="settingsStore.mode === 'pc' && settingsStore.toolbar.enableFullscreen" class="item" @click="toggle">
+      <span class="item" @click="toggle">
         <el-icon>
           <svg-icon :name="isFullscreen ? 'fullscreen-exit' : 'fullscreen'" />
         </el-icon>
       </span>
       <!-- 报警信息列表 -->
-      <span class="item">
+      <span v-if="proxy.hasPerm('/alarmnotice')" class="item">
         <el-popover width="390">
           <template #reference>
             <div>
diff --git a/src/layouts/components/Topbar/index.vue b/src/layouts/components/Topbar/index.vue
index 2863cef..4e3120e 100644
--- a/src/layouts/components/Topbar/index.vue
+++ b/src/layouts/components/Topbar/index.vue
@@ -67,7 +67,7 @@
           </transition-group>
         </el-breadcrumb>
       </div>
-      <tools />
+      <!-- <tools /> -->
     </div>
   </div>
 </template>
diff --git a/src/router/modules/pc.ts b/src/router/modules/pc.ts
index aacd6fa..97ced45 100644
--- a/src/router/modules/pc.ts
+++ b/src/router/modules/pc.ts
@@ -40,7 +40,7 @@
       icon: 'ep:key',
       sidebar: false,
       breadcrumb: false,
-      // auth: '/fullscreen',
+      auth: '/fullscreen',
     },
   },
   {
@@ -155,7 +155,7 @@
           sidebar: false,
           breadcrumb: false,
           activeMenu: '/well',
-          auth: '/well/detail',
+          auth: '/well',
         },
       },
     ],
diff --git a/src/views/home/alarm/count/components/locationAnalysis.vue b/src/views/home/alarm/count/components/locationAnalysis.vue
index fc75b9e..bff1853 100644
--- a/src/views/home/alarm/count/components/locationAnalysis.vue
+++ b/src/views/home/alarm/count/components/locationAnalysis.vue
@@ -46,6 +46,7 @@
   })
 }
 fetchData()
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -75,6 +76,9 @@
         <el-button type="primary" style="margin: 0 5px;" @click="fetchData">
           搜索
         </el-button>
+        <el-button v-if="proxy.hasPerm('/alarm/count/exportLocation')" type="primary" style="margin: 0 5px;">
+          导出
+        </el-button>
       </div>
     </template>
     <template #content>
diff --git a/src/views/home/alarm/current/components/detail.vue b/src/views/home/alarm/current/components/detail.vue
index dd3b31a..4204c92 100644
--- a/src/views/home/alarm/current/components/detail.vue
+++ b/src/views/home/alarm/current/components/detail.vue
@@ -111,7 +111,7 @@
   const res2 = await getAlarmTypeListPage({ offset: 1, limit: 9999 });
   ($route.query.type === 'history' ? getAlarmDetail : getAlarmDetail)($route.query.id as string).then((res) => {
     detailInfo.value = toHumpObject(res.data)
-    detailInfo.value.realAlarmName = detailInfo.value.realAlarm === '1' ? '报警' : '误报'
+    detailInfo.value.realAlarmName = detailInfo.value.realAlarm === '0' ? '是' : '否'
     detailInfo.value.alarmTypeName = res2.data.rows.filter((item: any) => item.id === detailInfo.value.alarmTypeId)[0]?.alarmType || ''
     detailInfo.value.alarmLevelName = res1.data.rows.filter((item: any) => item.id === detailInfo.value.alarmLevel)[0]?.alarmLevel || ''
     detailInfo.value.duration = detailInfo.value.ts && detailInfo.value.cancelTime ? getDateDiff(detailInfo.value.ts, detailInfo.value.cancelTime) : ''
@@ -139,6 +139,7 @@
 }
 // 点击经纬度展示地图
 const mapRef = ref()
+const { proxy } = getCurrentInstance() as any
 const showMap = (data: any) => {
   console.log(data, 'data')
   if (data.text === '位置') {
@@ -148,6 +149,13 @@
         2: 'StationMonitorDetail',
         3: 'PipelineMonitorDetail',
       } as { [key: string]: string }
+      // 判断是否有菜单权限
+      const watchObjectAuth = {
+        1: '/well',
+        2: '/station/monitor',
+        3: '/pipeline',
+      } as { [key: string]: string }
+      if (!proxy.hasPerm(watchObjectAuth[detailInfo.value.watchObject])) { return }
       $router.push({
         name: watchObject[detailInfo.value.watchObject],
         query: {
diff --git a/src/views/home/alarm/current/components/detailInfoDialog.vue b/src/views/home/alarm/current/components/detailInfoDialog.vue
index c089449..7fbf06b 100644
--- a/src/views/home/alarm/current/components/detailInfoDialog.vue
+++ b/src/views/home/alarm/current/components/detailInfoDialog.vue
@@ -114,6 +114,7 @@
   })
 }
 defineExpose({ initDialog, close })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -131,7 +132,7 @@
     <!-- 头部 -->
     <div class="header">
       <span>{{ info.alarmContent }}</span>
-      <span class="more" @click="moreData">>>更多</span>
+      <span v-if="proxy.hasPerm(type === 'data' ? '/alarm/current/more' : '/alarm/device/more')" class="more" @click="moreData">>>更多</span>
     </div>
     <div class="content">
       <div v-show="type === 'device'" class="item">
@@ -162,7 +163,7 @@
         报警设备:
         <span style="padding-left: 6px;">{{ info.devcode }} </span>
         <el-button
-          v-if="info.devTypeName === '燃气智能监测终端' || info.devTypeName === '液位检测仪' || info.devTypeName === '井盖监测仪'"
+          v-if="(info.devTypeName === '燃气智能监测终端' || info.devTypeName === '液位检测仪' || info.devTypeName === '井盖监测仪') && proxy.hasPerm('/alarm/current/data')"
           size="small" style="margin-left: 6px;" @click="viewData"
         >
           查看数据
@@ -228,7 +229,7 @@
         <span style="padding-left: 6px;">
           {{ info.confirmContent }}
         </span>
-        <el-button v-if="type === 'data'" size="small" style="padding-left: 6px;" @click="viewProcess">
+        <el-button v-if="type === 'data' && proxy.hasPerm('/alarm/current/process')" size="small" style="padding-left: 6px;" @click="viewProcess">
           流程图
         </el-button>
       </div>
@@ -246,17 +247,17 @@
       </div>
     </div>
     <div class="footer">
-      <el-button v-if="Number(info.processStatus) < 4 && type === 'data'" size="small" @click="remind">
+      <el-button v-if="(Number(info.processStatus) < 4 && type === 'data') && proxy.hasPerm('/alarm/current/remind')" size="small" @click="remind">
         提醒责任人
       </el-button>
       <el-button
-        v-if="type === 'device' && (info.processStatusName === '待处置' || info.processStatusName === '挂起')"
+        v-if="(type === 'device' && (info.processStatusName === '待处置' || info.processStatusName === '挂起')) && proxy.hasPerm('/alarm/device/handler')"
         size="small" @click="handler"
       >
         报警处置
       </el-button>
       <el-button
-        v-if="Number(info.processStatus) <= 3 || (type === 'device' && info.processStatusName === '待处置') || info.processStatusName === '挂起'"
+        v-if="(Number(info.processStatus) <= 3 || (type === 'device' && info.processStatusName === '待处置') || info.processStatusName === '挂起') && proxy.hasPerm(type === 'device' ? '/alarm/device/pending' : '/alarm/current/pending')"
         type="primary" size="small" @click="pending"
       >
         挂起
diff --git a/src/views/home/alarm/current/index.vue b/src/views/home/alarm/current/index.vue
index d019bbf..e2714bb 100644
--- a/src/views/home/alarm/current/index.vue
+++ b/src/views/home/alarm/current/index.vue
@@ -4,6 +4,7 @@
   Date: 2023-06-28
  -->
 <script lang="ts" setup name="CurrentAlarm">
+import dayjs from 'dayjs'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import { ArrowLeftBold, ArrowRightBold } from '@element-plus/icons-vue'
 import MapCom from './components/map.vue'
@@ -100,6 +101,7 @@
       path: '/alarm/current',
     })
   }
+  datetimerange.value = []
   listQuery.value = {
     limit: 20,
     offset: 1,
@@ -131,8 +133,8 @@
   if ($route.query.row) {
     loadingTable.value = true
     const row = JSON.parse($route.query.row as string)
-    getCurrentAlarmListPage({ offset: 1, limit: 99999 }).then((res) => {
-      const data = res.data.rows.filter((item: any) => item.id === row.id)
+    getCurrentAlarmListPage({ offset: 1, limit: 50 }).then((res) => {
+      const data = res.data.rows.filter((item: any) => item.id === row.alarmId)
       if (data.length) {
         list1.value = data.map((item: any) => ({
           ...item,
@@ -153,7 +155,10 @@
     })
     return
   }
-  fetchData()
+  datetimerange.value = [dayjs().subtract(7, 'day').format('YYYY-MM-DD HH:mm:ss'), dayjs().format('YYYY-MM-DD HH:mm:ss')]
+  setTimeout(() => {
+    fetchData()
+  })
 })
 // 表格标识  地图或普通
 const tableFlag = ref('normal')
@@ -181,6 +186,10 @@
 const mapRef = ref()
 const mapData = ref({})
 async function detail(row: any) {
+  if (row.processStatusName === '未读') {
+    list1.value[list1.value.findIndex((item: any) => item.id === row.id)].processStatusName = '已读'
+    row.processStatusName = '已读'
+  }
   const res = await detailAlarm(row.id)
   const data = toHumpObject(res.data)
   mapData.value = row
@@ -362,7 +371,7 @@
               <el-button v-if="proxy.hasPerm('/alarm/current/delete')" type="primary" @click="batchDeleteRow">
                 批量删除
               </el-button>
-              <el-button type="primary" @click="exportList">
+              <el-button v-if="proxy.hasPerm('/alarm/current/export')" type="primary" @click="exportList">
                 导出
               </el-button>
             </div>
@@ -383,7 +392,7 @@
               </el-table-column>
             </template>
             <template #columns>
-              <el-table-column label="操作" align="center" width="80">
+              <el-table-column v-if="proxy.hasPerm('/alarm/current/detail')" label="操作" align="center" width="80">
                 <template #default="scope">
                   <el-button type="primary" link size="small" @click="detail(scope.row)">
                     查看
diff --git a/src/views/home/alarm/history/index.vue b/src/views/home/alarm/history/index.vue
index eeb49fc..3c810c3 100644
--- a/src/views/home/alarm/history/index.vue
+++ b/src/views/home/alarm/history/index.vue
@@ -97,6 +97,7 @@
 }
 // 重置查询条件f
 const reset = () => {
+  datetimerange.value = []
   listQuery.value = {
     limit: 20,
     offset: 1,
@@ -189,6 +190,7 @@
   })
 }
 fetchDict()
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -249,7 +251,7 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="exportList">
+          <el-button v-if="proxy.hasPerm('/alarm/history/export')" type="primary" @click="exportList">
             导出
           </el-button>
         </div>
@@ -272,7 +274,7 @@
           </el-table-column>
         </template>
         <template #columns>
-          <el-table-column label="操作" align="center" width="80">
+          <el-table-column v-if="proxy.hasPerm('/alarm/history/detail')" label="操作" align="center" width="80">
             <template #default="scope">
               <el-button type="primary" link size="small" @click="moreData(scope.row)">
                 查看
diff --git a/src/views/home/dashboard/index.vue b/src/views/home/dashboard/index.vue
index d2f7e3c..42dfbed 100644
--- a/src/views/home/dashboard/index.vue
+++ b/src/views/home/dashboard/index.vue
@@ -42,7 +42,7 @@
     value: '0',
     name: '在线',
     unit: '个',
-    id: '1',
+    id: '1,2',
   },
   {
     img: img.lixian,
@@ -56,7 +56,7 @@
     value: '0',
     name: '停用',
     unit: '个',
-    id: '2',
+    id: '3',
   },
 ])
 // 工作台数据
@@ -133,7 +133,11 @@
   deviceOperationLoading.value = true
   getDeviceStatus().then((res) => {
     res.data.forEach((element: any) => {
-      const index = deviceOperationData.value.findIndex((item: any) => item.id === element.name)
+      if (element.name === '1' || element.name === '2') {
+        deviceOperationData.value[0].value = Number(deviceOperationData.value[0].value || '0') + Number(element.value)
+        return
+      }
+      const index = deviceOperationData.value.findIndex((item: any) => item.id.includes(element.name))
       if (index !== -1) {
         deviceOperationData.value[index].value = element.value
       }
diff --git a/src/views/home/device/count/components/bottom.vue b/src/views/home/device/count/components/bottom.vue
index 28a4d78..e4e56fa 100644
--- a/src/views/home/device/count/components/bottom.vue
+++ b/src/views/home/device/count/components/bottom.vue
@@ -110,6 +110,7 @@
   })
 }
 fetchDict()
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -148,7 +149,7 @@
             <template #btns-right>
               <!-- 操作 -->
               <div>
-                <el-button type="primary">
+                <el-button v-if="proxy.hasPerm('/device/count/offline/export')" type="primary">
                   导出
                 </el-button>
               </div>
diff --git a/src/views/home/device/device/index.vue b/src/views/home/device/device/index.vue
index c3970b9..9cdd606 100644
--- a/src/views/home/device/device/index.vue
+++ b/src/views/home/device/device/index.vue
@@ -88,6 +88,7 @@
 }
 // 重置查询条件f
 const reset = () => {
+  datetimerange.value = []
   listQuery.value = {
     limit: 20,
     offset: 1,
@@ -296,6 +297,7 @@
   fetchDict()
   fetchData()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -372,17 +374,17 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="editRow('add', {})">
+          <el-button v-if="proxy.hasPerm('/device/manage/add')" type="primary" @click="editRow('add', {})">
             新建
           </el-button>
-          <el-button type="primary" @click="downloadTemplate">
+          <el-button v-if="proxy.hasPerm('/device/manage/down')" type="primary" @click="downloadTemplate">
             模板下载
           </el-button>
-          <el-button type="primary" @click="importList">
+          <el-button v-if="proxy.hasPerm('/device/manage/import')" type="primary" @click="importList">
             批量导入
           </el-button>
-          <el-button type="primary" @click="exportList">
-            导出列表
+          <el-button v-if="proxy.hasPerm('/device/manage/export')" type="primary" @click="exportList">
+            导出
           </el-button>
           <input ref="fileRef" style="display: none;" type="file" accept=".xls,.xlsx" @change="onFileChange">
         </div>
@@ -409,16 +411,16 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="150">
             <template #default="scope">
-              <el-button type="primary" link size="small" @click="editRow('detail', scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/manage/detail')" type="primary" link size="small" @click="editRow('detail', scope.row)">
                 查看
               </el-button>
-              <el-button type="primary" link size="small" @click="editRow('edit', scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/manage/update')" type="primary" link size="small" @click="editRow('edit', scope.row)">
                 编辑
               </el-button>
-              <el-button type="danger" link size="small" @click="changeDefense(scope.row)">
+              <!-- <el-button v-if="proxy.hasPerm('/device/manage/add')" type="danger" link size="small" @click="changeDefense(scope.row)">
                 撤防
-              </el-button>
-              <el-button type="danger" link size="small" @click="removeRow(scope.row)">
+              </el-button> -->
+              <el-button v-if="proxy.hasPerm('/device/manage/delete')" type="danger" link size="small" @click="removeRow(scope.row)">
                 删除
               </el-button>
             </template>
diff --git a/src/views/home/device/instruction/index.vue b/src/views/home/device/instruction/index.vue
index 1e598ed..1da6706 100644
--- a/src/views/home/device/instruction/index.vue
+++ b/src/views/home/device/instruction/index.vue
@@ -78,6 +78,7 @@
 }
 // 重置查询条件f
 const reset = () => {
+  datetimerange.value = []
   listQuery.value = {
     limit: 20,
     offset: 1,
@@ -158,6 +159,7 @@
     editRef.value.initDialog('addOther', {})
   }
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -213,10 +215,10 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary">
+          <el-button v-if="proxy.hasPerm('/device/instruction/batch')" type="primary">
             批量下发
           </el-button>
-          <el-button type="primary" @click="editRow('add', {})">
+          <el-button v-if="proxy.hasPerm('/device/instruction/add')" type="primary" @click="editRow('add', {})">
             新建
           </el-button>
         </div>
@@ -236,13 +238,13 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="120">
             <template #default="scope">
-              <el-button type="primary" link size="small" @click="editRow('detail', scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/instruction/detail')" type="primary" link size="small" @click="editRow('detail', scope.row)">
                 查看
               </el-button>
-              <el-button v-if="scope.row.status === '2'" type="primary" link size="small" @click="editRow('edit', scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/instruction/again') && scope.row.status === '2'" type="primary" link size="small" @click="editRow('edit', scope.row)">
                 重新下发
               </el-button>
-              <el-button type="danger" link size="small" @click="removeRow(scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/instruction/delete')" type="danger" link size="small" @click="removeRow(scope.row)">
                 删除
               </el-button>
             </template>
diff --git a/src/views/home/device/product/index.vue b/src/views/home/device/product/index.vue
index 799fc90..fdd5463 100644
--- a/src/views/home/device/product/index.vue
+++ b/src/views/home/device/product/index.vue
@@ -128,6 +128,7 @@
   await fetchDict()
   fetchData()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -164,7 +165,7 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="editRow('add', {})">
+          <el-button v-if="proxy.hasPerm('/device/product/add')" type="primary" @click="editRow('add', {})">
             新建
           </el-button>
         </div>
@@ -184,10 +185,10 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="120">
             <template #default="scope">
-              <el-button type="primary" link size="small" @click="editRow('edit', scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/product/update')" type="primary" link size="small" @click="editRow('edit', scope.row)">
                 编辑
               </el-button>
-              <el-button type="danger" link size="small" @click="removeRow(scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/product/delete')" type="danger" link size="small" @click="removeRow(scope.row)">
                 删除
               </el-button>
             </template>
diff --git a/src/views/home/device/type/index.vue b/src/views/home/device/type/index.vue
index 59f1343..2344e57 100644
--- a/src/views/home/device/type/index.vue
+++ b/src/views/home/device/type/index.vue
@@ -105,6 +105,7 @@
   await fetchDict()
   fetchData()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -131,7 +132,7 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="editRow('add', {})">
+          <el-button v-if="proxy.hasPerm('/device/type/add')" type="primary" @click="editRow('add', {})">
             新建
           </el-button>
         </div>
@@ -151,10 +152,10 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="120">
             <template #default="scope">
-              <el-button type="primary" link size="small" @click="editRow('edit', scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/type/update')" type="primary" link size="small" @click="editRow('edit', scope.row)">
                 编辑
               </el-button>
-              <el-button type="danger" link size="small" @click="removeRow(scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/type/delete')" type="danger" link size="small" @click="removeRow(scope.row)">
                 删除
               </el-button>
             </template>
diff --git a/src/views/home/ledger/ledger/components/gridList.vue b/src/views/home/ledger/ledger/components/gridList.vue
index d03cd9f..189edef 100644
--- a/src/views/home/ledger/ledger/components/gridList.vue
+++ b/src/views/home/ledger/ledger/components/gridList.vue
@@ -91,6 +91,7 @@
     // })
   })
 }
+const { proxy } = getCurrentInstance() as any
 // 同步日志
 const allSync = () => {
   $router.push({
@@ -139,10 +140,10 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="allSync">
+          <el-button v-if="proxy.hasPerm('/ledger/sync')" type="primary" @click="allSync">
             同步日志
           </el-button>
-          <el-button type="primary" @click="sync('all', {})">
+          <el-button v-if="proxy.hasPerm('/ledger/sync/all')" type="primary" @click="sync('all', {})">
             全量同步
           </el-button>
         </div>
@@ -160,9 +161,9 @@
           </el-table-column>
         </template>
         <template #columns>
-          <el-table-column label="操作" align="center" width="80">
+          <el-table-column v-if="proxy.hasPerm('/ledger/sync/single')" label="操作" align="center" width="80">
             <template #default="scope">
-              <el-button type="primary" link size="small" @click="sync('single', scope.row)">
+              <el-button v-if="proxy.hasPerm('/ledger/sync/single')" type="primary" link size="small" @click="sync('single', scope.row)">
                 同步
               </el-button>
             </template>
diff --git a/src/views/home/ledger/ledger/components/wellList.vue b/src/views/home/ledger/ledger/components/wellList.vue
index 9eb1f43..06f855a 100644
--- a/src/views/home/ledger/ledger/components/wellList.vue
+++ b/src/views/home/ledger/ledger/components/wellList.vue
@@ -123,6 +123,7 @@
   // await fetchDict()
   fetchData()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -159,11 +160,11 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="allSync">
+          <el-button v-if="proxy.hasPerm('/ledger/sync')" type="primary" @click="allSync">
             同步日志
           </el-button>
-          <el-button type="primary" @click="sync('all', {})">
-            全部同步
+          <el-button v-if="proxy.hasPerm('/ledger/sync/all')" type="primary" @click="sync('all', {})">
+            全量同步
           </el-button>
         </div>
       </template>
@@ -180,9 +181,9 @@
           </el-table-column>
         </template>
         <template #columns>
-          <el-table-column label="操作" align="center" width="80">
+          <el-table-column v-if="proxy.hasPerm('/ledger/sync/single')" label="操作" align="center" width="80">
             <template #default="scope">
-              <el-button type="primary" link size="small" @click="sync('single', scope.row)">
+              <el-button v-if="proxy.hasPerm('/ledger/sync/single')" type="primary" link size="small" @click="sync('single', scope.row)">
                 同步
               </el-button>
             </template>
diff --git a/src/views/home/ledger/ledger/index.vue b/src/views/home/ledger/ledger/index.vue
index a03aa12..8403fc5 100644
--- a/src/views/home/ledger/ledger/index.vue
+++ b/src/views/home/ledger/ledger/index.vue
@@ -7,7 +7,16 @@
 import type { TabsPaneContext } from 'element-plus'
 import wellList from './components/wellList.vue'
 import gridList from './components/gridList.vue'
-const activeName = ref('闸井')
+const { proxy } = getCurrentInstance() as any
+const activeName = ref(
+  proxy.hasPerm('/ledger/manage/well')
+    ? '闸井'
+    : proxy.hasPerm('/ledger/manage/station')
+      ? '场站'
+      : proxy.hasPerm('/ledger/manage/grid')
+        ? '网格'
+        : '',
+)
 const handleClick = (tab: TabsPaneContext, event: Event) => {
   // console.log(tab, event)
 }
@@ -17,13 +26,13 @@
   <!-- 布局 -->
   <app-container>
     <el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick">
-      <el-tab-pane label="闸井" name="闸井">
+      <el-tab-pane v-if="proxy.hasPerm('/ledger/manage/well')" label="闸井" name="闸井">
         <well-list v-if="activeName === '闸井'" type="1" />
       </el-tab-pane>
-      <el-tab-pane label="场站" name="场站">
+      <el-tab-pane v-if="proxy.hasPerm('/ledger/manage/station')" label="场站" name="场站">
         <well-list v-if="activeName === '场站'" type="2" />
       </el-tab-pane>
-      <el-tab-pane label="网格" name="网格">
+      <el-tab-pane v-if="proxy.hasPerm('/ledger/manage/grid')" label="网格" name="网格">
         <grid-list v-if="activeName === '网格'" />
       </el-tab-pane>
     </el-tabs>
diff --git a/src/views/home/ledger/pipeline/index.vue b/src/views/home/ledger/pipeline/index.vue
index e0d2512..01e95ac 100644
--- a/src/views/home/ledger/pipeline/index.vue
+++ b/src/views/home/ledger/pipeline/index.vue
@@ -160,6 +160,7 @@
 onMounted(async () => {
   fetchData()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -222,13 +223,13 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="editRow('add', {})">
+          <el-button v-if="proxy.hasPerm('/ledger/pipeline/add')" type="primary" @click="editRow('add', {})">
             新增
           </el-button>
-          <el-button type="primary" @click="importList">
+          <el-button v-if="proxy.hasPerm('/ledger/pipeline/import')" type="primary" @click="importList">
             批量导入
           </el-button>
-          <el-button type="primary" @click="exportList">
+          <el-button v-if="proxy.hasPerm('/ledger/pipeline/export')" type="primary" @click="exportList">
             批量导出
           </el-button>
         </div>
@@ -248,10 +249,10 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="100">
             <template #default="scope">
-              <el-button type="primary" link size="small" @click="editRow('edit', scope.row)">
+              <el-button v-if="proxy.hasPerm('/ledger/pipeline/update')" type="primary" link size="small" @click="editRow('edit', scope.row)">
                 编辑
               </el-button>
-              <el-button type="danger" link size="small" @click="removeRow(scope.row)">
+              <el-button v-if="proxy.hasPerm('/ledger/pipeline/delete')" type="danger" link size="small" @click="removeRow(scope.row)">
                 删除
               </el-button>
             </template>
diff --git a/src/views/home/ledger/sync/index.vue b/src/views/home/ledger/sync/index.vue
index 54a3218..a04bad9 100644
--- a/src/views/home/ledger/sync/index.vue
+++ b/src/views/home/ledger/sync/index.vue
@@ -62,6 +62,7 @@
 }
 // 重置查询条件f
 const reset = () => {
+  datetimerange.value = []
   listQuery.value = {
     limit: 20,
     offset: 1,
@@ -106,6 +107,8 @@
 onMounted(async () => {
   fetchData()
 })
+const { proxy } = getCurrentInstance() as any
+const $route = useRoute()
 </script>
 
 <template>
@@ -132,7 +135,7 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="goBak">
+          <el-button v-if="$route.type" type="primary" @click="goBak">
             返回
           </el-button>
         </div>
@@ -152,10 +155,10 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="80">
             <template #default="scope">
-              <el-button type="primary" link size="small">
+              <el-button v-if="proxy.hasPerm('/ledger/sync/detail')" type="primary" link size="small">
                 查看
               </el-button>
-              <el-button type="danger" link size="small" @click="removeRow(scope.row)">
+              <el-button v-if="proxy.hasPerm('/ledger/sync/delete')" type="danger" link size="small" @click="removeRow(scope.row)">
                 删除
               </el-button>
             </template>
diff --git a/src/views/home/monitor/service/index.vue b/src/views/home/monitor/service/index.vue
index 8df2239..570dc68 100644
--- a/src/views/home/monitor/service/index.vue
+++ b/src/views/home/monitor/service/index.vue
@@ -53,6 +53,7 @@
 onMounted(async () => {
   fetchData()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -66,7 +67,7 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary">
+          <el-button v-if="proxy.hasPerm('/monitor/service/add')" type="primary">
             新建
           </el-button>
         </div>
diff --git a/src/views/home/monitor/time/index.vue b/src/views/home/monitor/time/index.vue
index caa6d46..0f7f5a0 100644
--- a/src/views/home/monitor/time/index.vue
+++ b/src/views/home/monitor/time/index.vue
@@ -53,6 +53,7 @@
 onMounted(async () => {
   fetchData()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -66,7 +67,7 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary">
+          <el-button v-if="proxy.hasPerm('/monitor/time/add')" type="primary">
             新建
           </el-button>
         </div>
diff --git a/src/views/home/operation/alarm/components/detail.vue b/src/views/home/operation/alarm/components/detail.vue
index 8194cbd..4ae4a1f 100644
--- a/src/views/home/operation/alarm/components/detail.vue
+++ b/src/views/home/operation/alarm/components/detail.vue
@@ -151,6 +151,7 @@
 }
 // 点击经纬度展示地图
 const mapRef = ref()
+const { proxy } = getCurrentInstance() as any
 const showMap = (data: any) => {
   console.log(data, 'data')
   if (data.text === '位置') {
@@ -160,6 +161,13 @@
         2: 'StationMonitorDetail',
         3: 'PipelineMonitorDetail',
       } as { [key: string]: string }
+      // 判断是否有菜单权限
+      const watchObjectAuth = {
+        1: '/well',
+        2: '/station/monitor',
+        3: '/pipeline',
+      } as { [key: string]: string }
+      if (!proxy.hasPerm(watchObjectAuth[detailInfo.value.watchObject])) { return }
       $router.push({
         name: watchObject[detailInfo.value.watchObject],
         query: {
diff --git a/src/views/home/operation/alarm/index.vue b/src/views/home/operation/alarm/index.vue
index ac0f31b..e53c991 100644
--- a/src/views/home/operation/alarm/index.vue
+++ b/src/views/home/operation/alarm/index.vue
@@ -82,6 +82,7 @@
 }
 // 重置查询条件f
 const reset = () => {
+  datetimerange.value = []
   listQuery.value = {
     limit: 20,
     offset: 1,
@@ -315,7 +316,7 @@
               <el-button v-if="proxy.hasPerm('/alarm/device/delete')" type="primary" @click="batchDeleteRow">
                 批量删除
               </el-button>
-              <el-button type="primary" @click="exportList">
+              <el-button v-if="proxy.hasPerm('/alarm/device/export')" type="primary" @click="exportList">
                 导出
               </el-button>
             </div>
@@ -336,7 +337,7 @@
               </el-table-column>
             </template>
             <template #columns>
-              <el-table-column label="操作" align="center" width="80">
+              <el-table-column v-if="proxy.hasPerm('/alarm/device/detail')" label="操作" align="center" width="80">
                 <template #default="scope">
                   <el-button type="primary" link size="small" @click="detail(scope.row)">
                     查看
diff --git a/src/views/home/operation/history/index.vue b/src/views/home/operation/history/index.vue
index 5c04ff7..d96ac57 100644
--- a/src/views/home/operation/history/index.vue
+++ b/src/views/home/operation/history/index.vue
@@ -78,6 +78,7 @@
 }
 // 重置查询条件f
 const reset = () => {
+  datetimerange.value = []
   listQuery.value = {
     limit: 20,
     offset: 1,
@@ -161,6 +162,7 @@
     fetchData()
   })
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -218,7 +220,7 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="exportList">
+          <el-button v-if="proxy.hasPerm('/operation/history/export')" type="primary" @click="exportList">
             导出
           </el-button>
         </div>
@@ -241,7 +243,7 @@
           </el-table-column>
         </template>
         <template #columns>
-          <el-table-column label="操作" align="center" width="80">
+          <el-table-column v-if="proxy.hasPerm('/operation/history/detail')" label="操作" align="center" width="80">
             <template #default="scope">
               <el-button type="primary" link size="small" @click="detailRow(scope.row)">
                 查看
diff --git a/src/views/home/operation/manufacturer/index.vue b/src/views/home/operation/manufacturer/index.vue
index 4a5816a..5f647c3 100644
--- a/src/views/home/operation/manufacturer/index.vue
+++ b/src/views/home/operation/manufacturer/index.vue
@@ -75,6 +75,7 @@
 }
 // 重置查询条件f
 const reset = () => {
+  datetimerange.value = []
   listQuery.value = {
     limit: 20,
     offset: 1,
@@ -125,6 +126,7 @@
   await fetchDict()
   fetchData()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -178,7 +180,7 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="exportList">
+          <el-button v-if="proxy.hasPerm('/operation/manufacturer/export')" type="primary" @click="exportList">
             导出
           </el-button>
         </div>
diff --git a/src/views/home/operation/trajectory/index.vue b/src/views/home/operation/trajectory/index.vue
index 9312fd7..606958e 100644
--- a/src/views/home/operation/trajectory/index.vue
+++ b/src/views/home/operation/trajectory/index.vue
@@ -65,6 +65,7 @@
 }
 // 重置查询条件f
 const reset = () => {
+  datetimerange.value = []
   listQuery.value = {
     limit: 20,
     offset: 1,
@@ -114,6 +115,7 @@
   await fetchDict()
   fetchData()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -175,7 +177,7 @@
           </span>
         </template>
         <template #columns>
-          <el-table-column label="操作" width="80" align="center">
+          <el-table-column v-if="proxy.hasPerm('/operation/trajectory/detail')" label="操作" width="80" align="center">
             <template #default="scope">
               <el-button type="primary" link size="small" @click="detail(scope.row)">
                 查看
diff --git a/src/views/home/pipeline/components/detailData.vue b/src/views/home/pipeline/components/detailData.vue
index 80b6886..760b1c5 100644
--- a/src/views/home/pipeline/components/detailData.vue
+++ b/src/views/home/pipeline/components/detailData.vue
@@ -7,7 +7,13 @@
 import type { TabsPaneContext } from 'element-plus'
 import monitorData from './monitorDataList.vue'
 import maintenanceRecord from '@/views/home/well/components/maintenanceRecord.vue'
-const activeName = ref('监控数据')
+const { proxy } = getCurrentInstance() as any
+const activeName = ref(
+  proxy.hasPerm('/pipeline/monitor/data')
+    ? '监控数据'
+    : proxy.hasPerm('/pipeline/monitor/maintenance')
+      ? '监控设备维护记录'
+      : '')
 const handleClick = (tab: TabsPaneContext, event: Event) => {
   // console.log(tab, event)
 }
@@ -15,10 +21,10 @@
 
 <template>
   <el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick">
-    <el-tab-pane label="监控数据" name="监控数据">
+    <el-tab-pane v-if="proxy.hasPerm('/pipeline/monitor/data')" label="监控数据" name="监控数据">
       <monitor-data v-if="activeName === '监控数据'" />
     </el-tab-pane>
-    <el-tab-pane label="监控设备维护记录" name="监控设备维护记录">
+    <el-tab-pane v-if="proxy.hasPerm('/pipeline/monitor/maintenance')" label="监控设备维护记录" name="监控设备维护记录">
       <maintenance-record v-if="activeName === '监控设备维护记录'" />
     </el-tab-pane>
   </el-tabs>

diff --git a/src/App.vue b/src/App.vue
index cde81b3..8a00f5d 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -125,7 +125,7 @@
         '--g-sub-sidebar-actual-width': subSidebarActualWidth,
       }"
     />
-    <system-info v-if="browserType !== 'mobile'" />
+    <!-- <system-info v-if="browserType !== 'mobile'" /> -->
     <audio id="eventAudio" src="" autoplay />
   </el-config-provider>
 </template>
diff --git a/src/layouts/components/Tools/alarmDialog.vue b/src/layouts/components/Tools/alarmDialog.vue
index 1828375..df89ab8 100644
--- a/src/layouts/components/Tools/alarmDialog.vue
+++ b/src/layouts/components/Tools/alarmDialog.vue
@@ -116,7 +116,7 @@
     </div>
     <template #footer>
       <div class="dialog-footer">
-        <div class="btn" @click="detail">
+        <div v-if="proxy.hasPerm('/alarm/current')" class="btn" @click="detail">
           查看
         </div>
         <div v-if="info.isSound === '1'" class="btn" @click="closeSound">
diff --git a/src/layouts/components/Tools/alarmList.vue b/src/layouts/components/Tools/alarmList.vue
index c3a9d2a..5356b74 100644
--- a/src/layouts/components/Tools/alarmList.vue
+++ b/src/layouts/components/Tools/alarmList.vue
@@ -54,6 +54,7 @@
 }
 // 查看当前行
 const detailRow = (row: any) => {
+  if (!proxy.hasPerm('/alarm/current')) { return }
   $router.push({
     name: 'AlarmCurrent',
     query: {
@@ -77,21 +78,6 @@
   localStorage.setItem('eventAudio', 'pause')
 }
 const dialogRef = ref()
-// const dialog = () => {
-//   const row = {
-//     alarmNoteMethod: '1', // 消息提醒 1:弹窗，2:消息提醒
-//     isSound: '1', // 报警音效，1:开，0:关
-//     isSend: '1', // 报警推送，1:开，0:关
-//     isText: '1', // 报警短息，1:开，0:关
-//     alarmType: '浓度超限',
-//     tagNumber: 'NX5702',
-//     alarmTime: '2024-09-09',
-//     value: '20',
-//     typeName: '燃气智能终端',
-//     alarmLevel: '一级',
-//   }
-//   dialogRef.value.initDialog(row)
-// }
 const fetchData = (isLoading = false) => {
   loading.value = true
   if (isLoading) {
@@ -115,7 +101,10 @@
       dialogRef.value.initDialog(newVal)
     }
     if (newVal.isSound === '1') {
-      play()
+      // play()
+      if (!localStorage.getItem('eventAudio')) {
+        proxy.playAudio()
+      }
     }
     fetchData(false)
   }
@@ -146,6 +135,7 @@
 //     window.localStorage.removeItem('token')
 //   }
 // }
+// const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -180,7 +170,7 @@
                   {{ message.processStatus
                     === '未读' ? '未读' : '已读' }}
                 </el-tag>
-                <el-tag type="info" size="small" style="margin-left: 5px;">
+                <el-tag type="info" size="small" style="margin-left: 5px;" @click="detailRow(message)">
                   查看
                 </el-tag>
               </div>
@@ -214,7 +204,7 @@
       <!-- <div class="close" @click="dialog">
         弹窗
       </div> -->
-      <div class="more" @click="moreList">
+      <div v-if="proxy.hasPerm('/alarm/current')" class="more" @click="moreList">
         查看更多
       </div>
     </div>
diff --git a/src/layouts/components/Tools/index.vue b/src/layouts/components/Tools/index.vue
index 9f2d41f..61f9707 100644
--- a/src/layouts/components/Tools/index.vue
+++ b/src/layouts/components/Tools/index.vue
@@ -79,6 +79,7 @@
   // 断开 websocket
   // websocket.destroyWebSocket()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -89,18 +90,18 @@
           <svg-icon name="ep:search" />
         </el-icon>
       </span>
-      <span class="item" @click="board">
+      <span v-if="proxy.hasPerm('/fullscreen')" class="item" @click="board">
         <el-icon>
           <svg-icon name="ep:data-line" />
         </el-icon>
       </span>
-      <span v-if="settingsStore.mode === 'pc' && settingsStore.toolbar.enableFullscreen" class="item" @click="toggle">
+      <span class="item" @click="toggle">
         <el-icon>
           <svg-icon :name="isFullscreen ? 'fullscreen-exit' : 'fullscreen'" />
         </el-icon>
       </span>
       <!-- 报警信息列表 -->
-      <span class="item">
+      <span v-if="proxy.hasPerm('/alarmnotice')" class="item">
         <el-popover width="390">
           <template #reference>
             <div>
diff --git a/src/layouts/components/Topbar/index.vue b/src/layouts/components/Topbar/index.vue
index 2863cef..4e3120e 100644
--- a/src/layouts/components/Topbar/index.vue
+++ b/src/layouts/components/Topbar/index.vue
@@ -67,7 +67,7 @@
           </transition-group>
         </el-breadcrumb>
       </div>
-      <tools />
+      <!-- <tools /> -->
     </div>
   </div>
 </template>
diff --git a/src/router/modules/pc.ts b/src/router/modules/pc.ts
index aacd6fa..97ced45 100644
--- a/src/router/modules/pc.ts
+++ b/src/router/modules/pc.ts
@@ -40,7 +40,7 @@
       icon: 'ep:key',
       sidebar: false,
       breadcrumb: false,
-      // auth: '/fullscreen',
+      auth: '/fullscreen',
     },
   },
   {
@@ -155,7 +155,7 @@
           sidebar: false,
           breadcrumb: false,
           activeMenu: '/well',
-          auth: '/well/detail',
+          auth: '/well',
         },
       },
     ],
diff --git a/src/views/home/alarm/count/components/locationAnalysis.vue b/src/views/home/alarm/count/components/locationAnalysis.vue
index fc75b9e..bff1853 100644
--- a/src/views/home/alarm/count/components/locationAnalysis.vue
+++ b/src/views/home/alarm/count/components/locationAnalysis.vue
@@ -46,6 +46,7 @@
   })
 }
 fetchData()
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -75,6 +76,9 @@
         <el-button type="primary" style="margin: 0 5px;" @click="fetchData">
           搜索
         </el-button>
+        <el-button v-if="proxy.hasPerm('/alarm/count/exportLocation')" type="primary" style="margin: 0 5px;">
+          导出
+        </el-button>
       </div>
     </template>
     <template #content>
diff --git a/src/views/home/alarm/current/components/detail.vue b/src/views/home/alarm/current/components/detail.vue
index dd3b31a..4204c92 100644
--- a/src/views/home/alarm/current/components/detail.vue
+++ b/src/views/home/alarm/current/components/detail.vue
@@ -111,7 +111,7 @@
   const res2 = await getAlarmTypeListPage({ offset: 1, limit: 9999 });
   ($route.query.type === 'history' ? getAlarmDetail : getAlarmDetail)($route.query.id as string).then((res) => {
     detailInfo.value = toHumpObject(res.data)
-    detailInfo.value.realAlarmName = detailInfo.value.realAlarm === '1' ? '报警' : '误报'
+    detailInfo.value.realAlarmName = detailInfo.value.realAlarm === '0' ? '是' : '否'
     detailInfo.value.alarmTypeName = res2.data.rows.filter((item: any) => item.id === detailInfo.value.alarmTypeId)[0]?.alarmType || ''
     detailInfo.value.alarmLevelName = res1.data.rows.filter((item: any) => item.id === detailInfo.value.alarmLevel)[0]?.alarmLevel || ''
     detailInfo.value.duration = detailInfo.value.ts && detailInfo.value.cancelTime ? getDateDiff(detailInfo.value.ts, detailInfo.value.cancelTime) : ''
@@ -139,6 +139,7 @@
 }
 // 点击经纬度展示地图
 const mapRef = ref()
+const { proxy } = getCurrentInstance() as any
 const showMap = (data: any) => {
   console.log(data, 'data')
   if (data.text === '位置') {
@@ -148,6 +149,13 @@
         2: 'StationMonitorDetail',
         3: 'PipelineMonitorDetail',
       } as { [key: string]: string }
+      // 判断是否有菜单权限
+      const watchObjectAuth = {
+        1: '/well',
+        2: '/station/monitor',
+        3: '/pipeline',
+      } as { [key: string]: string }
+      if (!proxy.hasPerm(watchObjectAuth[detailInfo.value.watchObject])) { return }
       $router.push({
         name: watchObject[detailInfo.value.watchObject],
         query: {
diff --git a/src/views/home/alarm/current/components/detailInfoDialog.vue b/src/views/home/alarm/current/components/detailInfoDialog.vue
index c089449..7fbf06b 100644
--- a/src/views/home/alarm/current/components/detailInfoDialog.vue
+++ b/src/views/home/alarm/current/components/detailInfoDialog.vue
@@ -114,6 +114,7 @@
   })
 }
 defineExpose({ initDialog, close })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -131,7 +132,7 @@
     <!-- 头部 -->
     <div class="header">
       <span>{{ info.alarmContent }}</span>
-      <span class="more" @click="moreData">>>更多</span>
+      <span v-if="proxy.hasPerm(type === 'data' ? '/alarm/current/more' : '/alarm/device/more')" class="more" @click="moreData">>>更多</span>
     </div>
     <div class="content">
       <div v-show="type === 'device'" class="item">
@@ -162,7 +163,7 @@
         报警设备:
         <span style="padding-left: 6px;">{{ info.devcode }} </span>
         <el-button
-          v-if="info.devTypeName === '燃气智能监测终端' || info.devTypeName === '液位检测仪' || info.devTypeName === '井盖监测仪'"
+          v-if="(info.devTypeName === '燃气智能监测终端' || info.devTypeName === '液位检测仪' || info.devTypeName === '井盖监测仪') && proxy.hasPerm('/alarm/current/data')"
           size="small" style="margin-left: 6px;" @click="viewData"
         >
           查看数据
@@ -228,7 +229,7 @@
         <span style="padding-left: 6px;">
           {{ info.confirmContent }}
         </span>
-        <el-button v-if="type === 'data'" size="small" style="padding-left: 6px;" @click="viewProcess">
+        <el-button v-if="type === 'data' && proxy.hasPerm('/alarm/current/process')" size="small" style="padding-left: 6px;" @click="viewProcess">
           流程图
         </el-button>
       </div>
@@ -246,17 +247,17 @@
       </div>
     </div>
     <div class="footer">
-      <el-button v-if="Number(info.processStatus) < 4 && type === 'data'" size="small" @click="remind">
+      <el-button v-if="(Number(info.processStatus) < 4 && type === 'data') && proxy.hasPerm('/alarm/current/remind')" size="small" @click="remind">
         提醒责任人
       </el-button>
       <el-button
-        v-if="type === 'device' && (info.processStatusName === '待处置' || info.processStatusName === '挂起')"
+        v-if="(type === 'device' && (info.processStatusName === '待处置' || info.processStatusName === '挂起')) && proxy.hasPerm('/alarm/device/handler')"
         size="small" @click="handler"
       >
         报警处置
       </el-button>
       <el-button
-        v-if="Number(info.processStatus) <= 3 || (type === 'device' && info.processStatusName === '待处置') || info.processStatusName === '挂起'"
+        v-if="(Number(info.processStatus) <= 3 || (type === 'device' && info.processStatusName === '待处置') || info.processStatusName === '挂起') && proxy.hasPerm(type === 'device' ? '/alarm/device/pending' : '/alarm/current/pending')"
         type="primary" size="small" @click="pending"
       >
         挂起
diff --git a/src/views/home/alarm/current/index.vue b/src/views/home/alarm/current/index.vue
index d019bbf..e2714bb 100644
--- a/src/views/home/alarm/current/index.vue
+++ b/src/views/home/alarm/current/index.vue
@@ -4,6 +4,7 @@
   Date: 2023-06-28
  -->
 <script lang="ts" setup name="CurrentAlarm">
+import dayjs from 'dayjs'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import { ArrowLeftBold, ArrowRightBold } from '@element-plus/icons-vue'
 import MapCom from './components/map.vue'
@@ -100,6 +101,7 @@
       path: '/alarm/current',
     })
   }
+  datetimerange.value = []
   listQuery.value = {
     limit: 20,
     offset: 1,
@@ -131,8 +133,8 @@
   if ($route.query.row) {
     loadingTable.value = true
     const row = JSON.parse($route.query.row as string)
-    getCurrentAlarmListPage({ offset: 1, limit: 99999 }).then((res) => {
-      const data = res.data.rows.filter((item: any) => item.id === row.id)
+    getCurrentAlarmListPage({ offset: 1, limit: 50 }).then((res) => {
+      const data = res.data.rows.filter((item: any) => item.id === row.alarmId)
       if (data.length) {
         list1.value = data.map((item: any) => ({
           ...item,
@@ -153,7 +155,10 @@
     })
     return
   }
-  fetchData()
+  datetimerange.value = [dayjs().subtract(7, 'day').format('YYYY-MM-DD HH:mm:ss'), dayjs().format('YYYY-MM-DD HH:mm:ss')]
+  setTimeout(() => {
+    fetchData()
+  })
 })
 // 表格标识  地图或普通
 const tableFlag = ref('normal')
@@ -181,6 +186,10 @@
 const mapRef = ref()
 const mapData = ref({})
 async function detail(row: any) {
+  if (row.processStatusName === '未读') {
+    list1.value[list1.value.findIndex((item: any) => item.id === row.id)].processStatusName = '已读'
+    row.processStatusName = '已读'
+  }
   const res = await detailAlarm(row.id)
   const data = toHumpObject(res.data)
   mapData.value = row
@@ -362,7 +371,7 @@
               <el-button v-if="proxy.hasPerm('/alarm/current/delete')" type="primary" @click="batchDeleteRow">
                 批量删除
               </el-button>
-              <el-button type="primary" @click="exportList">
+              <el-button v-if="proxy.hasPerm('/alarm/current/export')" type="primary" @click="exportList">
                 导出
               </el-button>
             </div>
@@ -383,7 +392,7 @@
               </el-table-column>
             </template>
             <template #columns>
-              <el-table-column label="操作" align="center" width="80">
+              <el-table-column v-if="proxy.hasPerm('/alarm/current/detail')" label="操作" align="center" width="80">
                 <template #default="scope">
                   <el-button type="primary" link size="small" @click="detail(scope.row)">
                     查看
diff --git a/src/views/home/alarm/history/index.vue b/src/views/home/alarm/history/index.vue
index eeb49fc..3c810c3 100644
--- a/src/views/home/alarm/history/index.vue
+++ b/src/views/home/alarm/history/index.vue
@@ -97,6 +97,7 @@
 }
 // 重置查询条件f
 const reset = () => {
+  datetimerange.value = []
   listQuery.value = {
     limit: 20,
     offset: 1,
@@ -189,6 +190,7 @@
   })
 }
 fetchDict()
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -249,7 +251,7 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="exportList">
+          <el-button v-if="proxy.hasPerm('/alarm/history/export')" type="primary" @click="exportList">
             导出
           </el-button>
         </div>
@@ -272,7 +274,7 @@
           </el-table-column>
         </template>
         <template #columns>
-          <el-table-column label="操作" align="center" width="80">
+          <el-table-column v-if="proxy.hasPerm('/alarm/history/detail')" label="操作" align="center" width="80">
             <template #default="scope">
               <el-button type="primary" link size="small" @click="moreData(scope.row)">
                 查看
diff --git a/src/views/home/dashboard/index.vue b/src/views/home/dashboard/index.vue
index d2f7e3c..42dfbed 100644
--- a/src/views/home/dashboard/index.vue
+++ b/src/views/home/dashboard/index.vue
@@ -42,7 +42,7 @@
     value: '0',
     name: '在线',
     unit: '个',
-    id: '1',
+    id: '1,2',
   },
   {
     img: img.lixian,
@@ -56,7 +56,7 @@
     value: '0',
     name: '停用',
     unit: '个',
-    id: '2',
+    id: '3',
   },
 ])
 // 工作台数据
@@ -133,7 +133,11 @@
   deviceOperationLoading.value = true
   getDeviceStatus().then((res) => {
     res.data.forEach((element: any) => {
-      const index = deviceOperationData.value.findIndex((item: any) => item.id === element.name)
+      if (element.name === '1' || element.name === '2') {
+        deviceOperationData.value[0].value = Number(deviceOperationData.value[0].value || '0') + Number(element.value)
+        return
+      }
+      const index = deviceOperationData.value.findIndex((item: any) => item.id.includes(element.name))
       if (index !== -1) {
         deviceOperationData.value[index].value = element.value
       }
diff --git a/src/views/home/device/count/components/bottom.vue b/src/views/home/device/count/components/bottom.vue
index 28a4d78..e4e56fa 100644
--- a/src/views/home/device/count/components/bottom.vue
+++ b/src/views/home/device/count/components/bottom.vue
@@ -110,6 +110,7 @@
   })
 }
 fetchDict()
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -148,7 +149,7 @@
             <template #btns-right>
               <!-- 操作 -->
               <div>
-                <el-button type="primary">
+                <el-button v-if="proxy.hasPerm('/device/count/offline/export')" type="primary">
                   导出
                 </el-button>
               </div>
diff --git a/src/views/home/device/device/index.vue b/src/views/home/device/device/index.vue
index c3970b9..9cdd606 100644
--- a/src/views/home/device/device/index.vue
+++ b/src/views/home/device/device/index.vue
@@ -88,6 +88,7 @@
 }
 // 重置查询条件f
 const reset = () => {
+  datetimerange.value = []
   listQuery.value = {
     limit: 20,
     offset: 1,
@@ -296,6 +297,7 @@
   fetchDict()
   fetchData()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -372,17 +374,17 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="editRow('add', {})">
+          <el-button v-if="proxy.hasPerm('/device/manage/add')" type="primary" @click="editRow('add', {})">
             新建
           </el-button>
-          <el-button type="primary" @click="downloadTemplate">
+          <el-button v-if="proxy.hasPerm('/device/manage/down')" type="primary" @click="downloadTemplate">
             模板下载
           </el-button>
-          <el-button type="primary" @click="importList">
+          <el-button v-if="proxy.hasPerm('/device/manage/import')" type="primary" @click="importList">
             批量导入
           </el-button>
-          <el-button type="primary" @click="exportList">
-            导出列表
+          <el-button v-if="proxy.hasPerm('/device/manage/export')" type="primary" @click="exportList">
+            导出
           </el-button>
           <input ref="fileRef" style="display: none;" type="file" accept=".xls,.xlsx" @change="onFileChange">
         </div>
@@ -409,16 +411,16 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="150">
             <template #default="scope">
-              <el-button type="primary" link size="small" @click="editRow('detail', scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/manage/detail')" type="primary" link size="small" @click="editRow('detail', scope.row)">
                 查看
               </el-button>
-              <el-button type="primary" link size="small" @click="editRow('edit', scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/manage/update')" type="primary" link size="small" @click="editRow('edit', scope.row)">
                 编辑
               </el-button>
-              <el-button type="danger" link size="small" @click="changeDefense(scope.row)">
+              <!-- <el-button v-if="proxy.hasPerm('/device/manage/add')" type="danger" link size="small" @click="changeDefense(scope.row)">
                 撤防
-              </el-button>
-              <el-button type="danger" link size="small" @click="removeRow(scope.row)">
+              </el-button> -->
+              <el-button v-if="proxy.hasPerm('/device/manage/delete')" type="danger" link size="small" @click="removeRow(scope.row)">
                 删除
               </el-button>
             </template>
diff --git a/src/views/home/device/instruction/index.vue b/src/views/home/device/instruction/index.vue
index 1e598ed..1da6706 100644
--- a/src/views/home/device/instruction/index.vue
+++ b/src/views/home/device/instruction/index.vue
@@ -78,6 +78,7 @@
 }
 // 重置查询条件f
 const reset = () => {
+  datetimerange.value = []
   listQuery.value = {
     limit: 20,
     offset: 1,
@@ -158,6 +159,7 @@
     editRef.value.initDialog('addOther', {})
   }
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -213,10 +215,10 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary">
+          <el-button v-if="proxy.hasPerm('/device/instruction/batch')" type="primary">
             批量下发
           </el-button>
-          <el-button type="primary" @click="editRow('add', {})">
+          <el-button v-if="proxy.hasPerm('/device/instruction/add')" type="primary" @click="editRow('add', {})">
             新建
           </el-button>
         </div>
@@ -236,13 +238,13 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="120">
             <template #default="scope">
-              <el-button type="primary" link size="small" @click="editRow('detail', scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/instruction/detail')" type="primary" link size="small" @click="editRow('detail', scope.row)">
                 查看
               </el-button>
-              <el-button v-if="scope.row.status === '2'" type="primary" link size="small" @click="editRow('edit', scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/instruction/again') && scope.row.status === '2'" type="primary" link size="small" @click="editRow('edit', scope.row)">
                 重新下发
               </el-button>
-              <el-button type="danger" link size="small" @click="removeRow(scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/instruction/delete')" type="danger" link size="small" @click="removeRow(scope.row)">
                 删除
               </el-button>
             </template>
diff --git a/src/views/home/device/product/index.vue b/src/views/home/device/product/index.vue
index 799fc90..fdd5463 100644
--- a/src/views/home/device/product/index.vue
+++ b/src/views/home/device/product/index.vue
@@ -128,6 +128,7 @@
   await fetchDict()
   fetchData()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -164,7 +165,7 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="editRow('add', {})">
+          <el-button v-if="proxy.hasPerm('/device/product/add')" type="primary" @click="editRow('add', {})">
             新建
           </el-button>
         </div>
@@ -184,10 +185,10 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="120">
             <template #default="scope">
-              <el-button type="primary" link size="small" @click="editRow('edit', scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/product/update')" type="primary" link size="small" @click="editRow('edit', scope.row)">
                 编辑
               </el-button>
-              <el-button type="danger" link size="small" @click="removeRow(scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/product/delete')" type="danger" link size="small" @click="removeRow(scope.row)">
                 删除
               </el-button>
             </template>
diff --git a/src/views/home/device/type/index.vue b/src/views/home/device/type/index.vue
index 59f1343..2344e57 100644
--- a/src/views/home/device/type/index.vue
+++ b/src/views/home/device/type/index.vue
@@ -105,6 +105,7 @@
   await fetchDict()
   fetchData()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -131,7 +132,7 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="editRow('add', {})">
+          <el-button v-if="proxy.hasPerm('/device/type/add')" type="primary" @click="editRow('add', {})">
             新建
           </el-button>
         </div>
@@ -151,10 +152,10 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="120">
             <template #default="scope">
-              <el-button type="primary" link size="small" @click="editRow('edit', scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/type/update')" type="primary" link size="small" @click="editRow('edit', scope.row)">
                 编辑
               </el-button>
-              <el-button type="danger" link size="small" @click="removeRow(scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/type/delete')" type="danger" link size="small" @click="removeRow(scope.row)">
                 删除
               </el-button>
             </template>
diff --git a/src/views/home/ledger/ledger/components/gridList.vue b/src/views/home/ledger/ledger/components/gridList.vue
index d03cd9f..189edef 100644
--- a/src/views/home/ledger/ledger/components/gridList.vue
+++ b/src/views/home/ledger/ledger/components/gridList.vue
@@ -91,6 +91,7 @@
     // })
   })
 }
+const { proxy } = getCurrentInstance() as any
 // 同步日志
 const allSync = () => {
   $router.push({
@@ -139,10 +140,10 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="allSync">
+          <el-button v-if="proxy.hasPerm('/ledger/sync')" type="primary" @click="allSync">
             同步日志
           </el-button>
-          <el-button type="primary" @click="sync('all', {})">
+          <el-button v-if="proxy.hasPerm('/ledger/sync/all')" type="primary" @click="sync('all', {})">
             全量同步
           </el-button>
         </div>
@@ -160,9 +161,9 @@
           </el-table-column>
         </template>
         <template #columns>
-          <el-table-column label="操作" align="center" width="80">
+          <el-table-column v-if="proxy.hasPerm('/ledger/sync/single')" label="操作" align="center" width="80">
             <template #default="scope">
-              <el-button type="primary" link size="small" @click="sync('single', scope.row)">
+              <el-button v-if="proxy.hasPerm('/ledger/sync/single')" type="primary" link size="small" @click="sync('single', scope.row)">
                 同步
               </el-button>
             </template>
diff --git a/src/views/home/ledger/ledger/components/wellList.vue b/src/views/home/ledger/ledger/components/wellList.vue
index 9eb1f43..06f855a 100644
--- a/src/views/home/ledger/ledger/components/wellList.vue
+++ b/src/views/home/ledger/ledger/components/wellList.vue
@@ -123,6 +123,7 @@
   // await fetchDict()
   fetchData()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -159,11 +160,11 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="allSync">
+          <el-button v-if="proxy.hasPerm('/ledger/sync')" type="primary" @click="allSync">
             同步日志
           </el-button>
-          <el-button type="primary" @click="sync('all', {})">
-            全部同步
+          <el-button v-if="proxy.hasPerm('/ledger/sync/all')" type="primary" @click="sync('all', {})">
+            全量同步
           </el-button>
         </div>
       </template>
@@ -180,9 +181,9 @@
           </el-table-column>
         </template>
         <template #columns>
-          <el-table-column label="操作" align="center" width="80">
+          <el-table-column v-if="proxy.hasPerm('/ledger/sync/single')" label="操作" align="center" width="80">
             <template #default="scope">
-              <el-button type="primary" link size="small" @click="sync('single', scope.row)">
+              <el-button v-if="proxy.hasPerm('/ledger/sync/single')" type="primary" link size="small" @click="sync('single', scope.row)">
                 同步
               </el-button>
             </template>
diff --git a/src/views/home/ledger/ledger/index.vue b/src/views/home/ledger/ledger/index.vue
index a03aa12..8403fc5 100644
--- a/src/views/home/ledger/ledger/index.vue
+++ b/src/views/home/ledger/ledger/index.vue
@@ -7,7 +7,16 @@
 import type { TabsPaneContext } from 'element-plus'
 import wellList from './components/wellList.vue'
 import gridList from './components/gridList.vue'
-const activeName = ref('闸井')
+const { proxy } = getCurrentInstance() as any
+const activeName = ref(
+  proxy.hasPerm('/ledger/manage/well')
+    ? '闸井'
+    : proxy.hasPerm('/ledger/manage/station')
+      ? '场站'
+      : proxy.hasPerm('/ledger/manage/grid')
+        ? '网格'
+        : '',
+)
 const handleClick = (tab: TabsPaneContext, event: Event) => {
   // console.log(tab, event)
 }
@@ -17,13 +26,13 @@
   <!-- 布局 -->
   <app-container>
     <el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick">
-      <el-tab-pane label="闸井" name="闸井">
+      <el-tab-pane v-if="proxy.hasPerm('/ledger/manage/well')" label="闸井" name="闸井">
         <well-list v-if="activeName === '闸井'" type="1" />
       </el-tab-pane>
-      <el-tab-pane label="场站" name="场站">
+      <el-tab-pane v-if="proxy.hasPerm('/ledger/manage/station')" label="场站" name="场站">
         <well-list v-if="activeName === '场站'" type="2" />
       </el-tab-pane>
-      <el-tab-pane label="网格" name="网格">
+      <el-tab-pane v-if="proxy.hasPerm('/ledger/manage/grid')" label="网格" name="网格">
         <grid-list v-if="activeName === '网格'" />
       </el-tab-pane>
     </el-tabs>
diff --git a/src/views/home/ledger/pipeline/index.vue b/src/views/home/ledger/pipeline/index.vue
index e0d2512..01e95ac 100644
--- a/src/views/home/ledger/pipeline/index.vue
+++ b/src/views/home/ledger/pipeline/index.vue
@@ -160,6 +160,7 @@
 onMounted(async () => {
   fetchData()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -222,13 +223,13 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="editRow('add', {})">
+          <el-button v-if="proxy.hasPerm('/ledger/pipeline/add')" type="primary" @click="editRow('add', {})">
             新增
           </el-button>
-          <el-button type="primary" @click="importList">
+          <el-button v-if="proxy.hasPerm('/ledger/pipeline/import')" type="primary" @click="importList">
             批量导入
           </el-button>
-          <el-button type="primary" @click="exportList">
+          <el-button v-if="proxy.hasPerm('/ledger/pipeline/export')" type="primary" @click="exportList">
             批量导出
           </el-button>
         </div>
@@ -248,10 +249,10 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="100">
             <template #default="scope">
-              <el-button type="primary" link size="small" @click="editRow('edit', scope.row)">
+              <el-button v-if="proxy.hasPerm('/ledger/pipeline/update')" type="primary" link size="small" @click="editRow('edit', scope.row)">
                 编辑
               </el-button>
-              <el-button type="danger" link size="small" @click="removeRow(scope.row)">
+              <el-button v-if="proxy.hasPerm('/ledger/pipeline/delete')" type="danger" link size="small" @click="removeRow(scope.row)">
                 删除
               </el-button>
             </template>
diff --git a/src/views/home/ledger/sync/index.vue b/src/views/home/ledger/sync/index.vue
index 54a3218..a04bad9 100644
--- a/src/views/home/ledger/sync/index.vue
+++ b/src/views/home/ledger/sync/index.vue
@@ -62,6 +62,7 @@
 }
 // 重置查询条件f
 const reset = () => {
+  datetimerange.value = []
   listQuery.value = {
     limit: 20,
     offset: 1,
@@ -106,6 +107,8 @@
 onMounted(async () => {
   fetchData()
 })
+const { proxy } = getCurrentInstance() as any
+const $route = useRoute()
 </script>
 
 <template>
@@ -132,7 +135,7 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="goBak">
+          <el-button v-if="$route.type" type="primary" @click="goBak">
             返回
           </el-button>
         </div>
@@ -152,10 +155,10 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="80">
             <template #default="scope">
-              <el-button type="primary" link size="small">
+              <el-button v-if="proxy.hasPerm('/ledger/sync/detail')" type="primary" link size="small">
                 查看
               </el-button>
-              <el-button type="danger" link size="small" @click="removeRow(scope.row)">
+              <el-button v-if="proxy.hasPerm('/ledger/sync/delete')" type="danger" link size="small" @click="removeRow(scope.row)">
                 删除
               </el-button>
             </template>
diff --git a/src/views/home/monitor/service/index.vue b/src/views/home/monitor/service/index.vue
index 8df2239..570dc68 100644
--- a/src/views/home/monitor/service/index.vue
+++ b/src/views/home/monitor/service/index.vue
@@ -53,6 +53,7 @@
 onMounted(async () => {
   fetchData()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -66,7 +67,7 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary">
+          <el-button v-if="proxy.hasPerm('/monitor/service/add')" type="primary">
             新建
           </el-button>
         </div>
diff --git a/src/views/home/monitor/time/index.vue b/src/views/home/monitor/time/index.vue
index caa6d46..0f7f5a0 100644
--- a/src/views/home/monitor/time/index.vue
+++ b/src/views/home/monitor/time/index.vue
@@ -53,6 +53,7 @@
 onMounted(async () => {
   fetchData()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -66,7 +67,7 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary">
+          <el-button v-if="proxy.hasPerm('/monitor/time/add')" type="primary">
             新建
           </el-button>
         </div>
diff --git a/src/views/home/operation/alarm/components/detail.vue b/src/views/home/operation/alarm/components/detail.vue
index 8194cbd..4ae4a1f 100644
--- a/src/views/home/operation/alarm/components/detail.vue
+++ b/src/views/home/operation/alarm/components/detail.vue
@@ -151,6 +151,7 @@
 }
 // 点击经纬度展示地图
 const mapRef = ref()
+const { proxy } = getCurrentInstance() as any
 const showMap = (data: any) => {
   console.log(data, 'data')
   if (data.text === '位置') {
@@ -160,6 +161,13 @@
         2: 'StationMonitorDetail',
         3: 'PipelineMonitorDetail',
       } as { [key: string]: string }
+      // 判断是否有菜单权限
+      const watchObjectAuth = {
+        1: '/well',
+        2: '/station/monitor',
+        3: '/pipeline',
+      } as { [key: string]: string }
+      if (!proxy.hasPerm(watchObjectAuth[detailInfo.value.watchObject])) { return }
       $router.push({
         name: watchObject[detailInfo.value.watchObject],
         query: {
diff --git a/src/views/home/operation/alarm/index.vue b/src/views/home/operation/alarm/index.vue
index ac0f31b..e53c991 100644
--- a/src/views/home/operation/alarm/index.vue
+++ b/src/views/home/operation/alarm/index.vue
@@ -82,6 +82,7 @@
 }
 // 重置查询条件f
 const reset = () => {
+  datetimerange.value = []
   listQuery.value = {
     limit: 20,
     offset: 1,
@@ -315,7 +316,7 @@
               <el-button v-if="proxy.hasPerm('/alarm/device/delete')" type="primary" @click="batchDeleteRow">
                 批量删除
               </el-button>
-              <el-button type="primary" @click="exportList">
+              <el-button v-if="proxy.hasPerm('/alarm/device/export')" type="primary" @click="exportList">
                 导出
               </el-button>
             </div>
@@ -336,7 +337,7 @@
               </el-table-column>
             </template>
             <template #columns>
-              <el-table-column label="操作" align="center" width="80">
+              <el-table-column v-if="proxy.hasPerm('/alarm/device/detail')" label="操作" align="center" width="80">
                 <template #default="scope">
                   <el-button type="primary" link size="small" @click="detail(scope.row)">
                     查看
diff --git a/src/views/home/operation/history/index.vue b/src/views/home/operation/history/index.vue
index 5c04ff7..d96ac57 100644
--- a/src/views/home/operation/history/index.vue
+++ b/src/views/home/operation/history/index.vue
@@ -78,6 +78,7 @@
 }
 // 重置查询条件f
 const reset = () => {
+  datetimerange.value = []
   listQuery.value = {
     limit: 20,
     offset: 1,
@@ -161,6 +162,7 @@
     fetchData()
   })
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -218,7 +220,7 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="exportList">
+          <el-button v-if="proxy.hasPerm('/operation/history/export')" type="primary" @click="exportList">
             导出
           </el-button>
         </div>
@@ -241,7 +243,7 @@
           </el-table-column>
         </template>
         <template #columns>
-          <el-table-column label="操作" align="center" width="80">
+          <el-table-column v-if="proxy.hasPerm('/operation/history/detail')" label="操作" align="center" width="80">
             <template #default="scope">
               <el-button type="primary" link size="small" @click="detailRow(scope.row)">
                 查看
diff --git a/src/views/home/operation/manufacturer/index.vue b/src/views/home/operation/manufacturer/index.vue
index 4a5816a..5f647c3 100644
--- a/src/views/home/operation/manufacturer/index.vue
+++ b/src/views/home/operation/manufacturer/index.vue
@@ -75,6 +75,7 @@
 }
 // 重置查询条件f
 const reset = () => {
+  datetimerange.value = []
   listQuery.value = {
     limit: 20,
     offset: 1,
@@ -125,6 +126,7 @@
   await fetchDict()
   fetchData()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -178,7 +180,7 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="exportList">
+          <el-button v-if="proxy.hasPerm('/operation/manufacturer/export')" type="primary" @click="exportList">
             导出
           </el-button>
         </div>
diff --git a/src/views/home/operation/trajectory/index.vue b/src/views/home/operation/trajectory/index.vue
index 9312fd7..606958e 100644
--- a/src/views/home/operation/trajectory/index.vue
+++ b/src/views/home/operation/trajectory/index.vue
@@ -65,6 +65,7 @@
 }
 // 重置查询条件f
 const reset = () => {
+  datetimerange.value = []
   listQuery.value = {
     limit: 20,
     offset: 1,
@@ -114,6 +115,7 @@
   await fetchDict()
   fetchData()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -175,7 +177,7 @@
           </span>
         </template>
         <template #columns>
-          <el-table-column label="操作" width="80" align="center">
+          <el-table-column v-if="proxy.hasPerm('/operation/trajectory/detail')" label="操作" width="80" align="center">
             <template #default="scope">
               <el-button type="primary" link size="small" @click="detail(scope.row)">
                 查看
diff --git a/src/views/home/pipeline/components/detailData.vue b/src/views/home/pipeline/components/detailData.vue
index 80b6886..760b1c5 100644
--- a/src/views/home/pipeline/components/detailData.vue
+++ b/src/views/home/pipeline/components/detailData.vue
@@ -7,7 +7,13 @@
 import type { TabsPaneContext } from 'element-plus'
 import monitorData from './monitorDataList.vue'
 import maintenanceRecord from '@/views/home/well/components/maintenanceRecord.vue'
-const activeName = ref('监控数据')
+const { proxy } = getCurrentInstance() as any
+const activeName = ref(
+  proxy.hasPerm('/pipeline/monitor/data')
+    ? '监控数据'
+    : proxy.hasPerm('/pipeline/monitor/maintenance')
+      ? '监控设备维护记录'
+      : '')
 const handleClick = (tab: TabsPaneContext, event: Event) => {
   // console.log(tab, event)
 }
@@ -15,10 +21,10 @@
 
 <template>
   <el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick">
-    <el-tab-pane label="监控数据" name="监控数据">
+    <el-tab-pane v-if="proxy.hasPerm('/pipeline/monitor/data')" label="监控数据" name="监控数据">
       <monitor-data v-if="activeName === '监控数据'" />
     </el-tab-pane>
-    <el-tab-pane label="监控设备维护记录" name="监控设备维护记录">
+    <el-tab-pane v-if="proxy.hasPerm('/pipeline/monitor/maintenance')" label="监控设备维护记录" name="监控设备维护记录">
       <maintenance-record v-if="activeName === '监控设备维护记录'" />
     </el-tab-pane>
   </el-tabs>
diff --git a/src/views/home/pipeline/index.vue b/src/views/home/pipeline/index.vue
index 90baef0..4d66e51 100644
--- a/src/views/home/pipeline/index.vue
+++ b/src/views/home/pipeline/index.vue
@@ -254,6 +254,7 @@
     tableHeight.value = window.innerHeight - 60 - 50 - 10 - 98 - 10 - 52 - 52 - 10
   }
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -348,7 +349,7 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary">
+          <el-button v-if="proxy.hasPerm('/pipeline/export')" type="primary">
             导出
           </el-button>
         </div>
@@ -368,7 +369,7 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="80">
             <template #default="scope">
-              <el-button type="primary" link size="small" @click="editRow('detail', scope.row)">
+              <el-button v-if="proxy.hasPerm('/pipeline/detail')" type="primary" link size="small" @click="editRow('detail', scope.row)">
                 查看
               </el-button>
               <!-- <el-button type="primary" link size="small" @click="editRow('edit', scope.row)">

diff --git a/src/App.vue b/src/App.vue
index cde81b3..8a00f5d 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -125,7 +125,7 @@
         '--g-sub-sidebar-actual-width': subSidebarActualWidth,
       }"
     />
-    <system-info v-if="browserType !== 'mobile'" />
+    <!-- <system-info v-if="browserType !== 'mobile'" /> -->
     <audio id="eventAudio" src="" autoplay />
   </el-config-provider>
 </template>
diff --git a/src/layouts/components/Tools/alarmDialog.vue b/src/layouts/components/Tools/alarmDialog.vue
index 1828375..df89ab8 100644
--- a/src/layouts/components/Tools/alarmDialog.vue
+++ b/src/layouts/components/Tools/alarmDialog.vue
@@ -116,7 +116,7 @@
     </div>
     <template #footer>
       <div class="dialog-footer">
-        <div class="btn" @click="detail">
+        <div v-if="proxy.hasPerm('/alarm/current')" class="btn" @click="detail">
           查看
         </div>
         <div v-if="info.isSound === '1'" class="btn" @click="closeSound">
diff --git a/src/layouts/components/Tools/alarmList.vue b/src/layouts/components/Tools/alarmList.vue
index c3a9d2a..5356b74 100644
--- a/src/layouts/components/Tools/alarmList.vue
+++ b/src/layouts/components/Tools/alarmList.vue
@@ -54,6 +54,7 @@
 }
 // 查看当前行
 const detailRow = (row: any) => {
+  if (!proxy.hasPerm('/alarm/current')) { return }
   $router.push({
     name: 'AlarmCurrent',
     query: {
@@ -77,21 +78,6 @@
   localStorage.setItem('eventAudio', 'pause')
 }
 const dialogRef = ref()
-// const dialog = () => {
-//   const row = {
-//     alarmNoteMethod: '1', // 消息提醒 1:弹窗，2:消息提醒
-//     isSound: '1', // 报警音效，1:开，0:关
-//     isSend: '1', // 报警推送，1:开，0:关
-//     isText: '1', // 报警短息，1:开，0:关
-//     alarmType: '浓度超限',
-//     tagNumber: 'NX5702',
-//     alarmTime: '2024-09-09',
-//     value: '20',
-//     typeName: '燃气智能终端',
-//     alarmLevel: '一级',
-//   }
-//   dialogRef.value.initDialog(row)
-// }
 const fetchData = (isLoading = false) => {
   loading.value = true
   if (isLoading) {
@@ -115,7 +101,10 @@
       dialogRef.value.initDialog(newVal)
     }
     if (newVal.isSound === '1') {
-      play()
+      // play()
+      if (!localStorage.getItem('eventAudio')) {
+        proxy.playAudio()
+      }
     }
     fetchData(false)
   }
@@ -146,6 +135,7 @@
 //     window.localStorage.removeItem('token')
 //   }
 // }
+// const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -180,7 +170,7 @@
                   {{ message.processStatus
                     === '未读' ? '未读' : '已读' }}
                 </el-tag>
-                <el-tag type="info" size="small" style="margin-left: 5px;">
+                <el-tag type="info" size="small" style="margin-left: 5px;" @click="detailRow(message)">
                   查看
                 </el-tag>
               </div>
@@ -214,7 +204,7 @@
       <!-- <div class="close" @click="dialog">
         弹窗
       </div> -->
-      <div class="more" @click="moreList">
+      <div v-if="proxy.hasPerm('/alarm/current')" class="more" @click="moreList">
         查看更多
       </div>
     </div>
diff --git a/src/layouts/components/Tools/index.vue b/src/layouts/components/Tools/index.vue
index 9f2d41f..61f9707 100644
--- a/src/layouts/components/Tools/index.vue
+++ b/src/layouts/components/Tools/index.vue
@@ -79,6 +79,7 @@
   // 断开 websocket
   // websocket.destroyWebSocket()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -89,18 +90,18 @@
           <svg-icon name="ep:search" />
         </el-icon>
       </span>
-      <span class="item" @click="board">
+      <span v-if="proxy.hasPerm('/fullscreen')" class="item" @click="board">
         <el-icon>
           <svg-icon name="ep:data-line" />
         </el-icon>
       </span>
-      <span v-if="settingsStore.mode === 'pc' && settingsStore.toolbar.enableFullscreen" class="item" @click="toggle">
+      <span class="item" @click="toggle">
         <el-icon>
           <svg-icon :name="isFullscreen ? 'fullscreen-exit' : 'fullscreen'" />
         </el-icon>
       </span>
       <!-- 报警信息列表 -->
-      <span class="item">
+      <span v-if="proxy.hasPerm('/alarmnotice')" class="item">
         <el-popover width="390">
           <template #reference>
             <div>
diff --git a/src/layouts/components/Topbar/index.vue b/src/layouts/components/Topbar/index.vue
index 2863cef..4e3120e 100644
--- a/src/layouts/components/Topbar/index.vue
+++ b/src/layouts/components/Topbar/index.vue
@@ -67,7 +67,7 @@
           </transition-group>
         </el-breadcrumb>
       </div>
-      <tools />
+      <!-- <tools /> -->
     </div>
   </div>
 </template>
diff --git a/src/router/modules/pc.ts b/src/router/modules/pc.ts
index aacd6fa..97ced45 100644
--- a/src/router/modules/pc.ts
+++ b/src/router/modules/pc.ts
@@ -40,7 +40,7 @@
       icon: 'ep:key',
       sidebar: false,
       breadcrumb: false,
-      // auth: '/fullscreen',
+      auth: '/fullscreen',
     },
   },
   {
@@ -155,7 +155,7 @@
           sidebar: false,
           breadcrumb: false,
           activeMenu: '/well',
-          auth: '/well/detail',
+          auth: '/well',
         },
       },
     ],
diff --git a/src/views/home/alarm/count/components/locationAnalysis.vue b/src/views/home/alarm/count/components/locationAnalysis.vue
index fc75b9e..bff1853 100644
--- a/src/views/home/alarm/count/components/locationAnalysis.vue
+++ b/src/views/home/alarm/count/components/locationAnalysis.vue
@@ -46,6 +46,7 @@
   })
 }
 fetchData()
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -75,6 +76,9 @@
         <el-button type="primary" style="margin: 0 5px;" @click="fetchData">
           搜索
         </el-button>
+        <el-button v-if="proxy.hasPerm('/alarm/count/exportLocation')" type="primary" style="margin: 0 5px;">
+          导出
+        </el-button>
       </div>
     </template>
     <template #content>
diff --git a/src/views/home/alarm/current/components/detail.vue b/src/views/home/alarm/current/components/detail.vue
index dd3b31a..4204c92 100644
--- a/src/views/home/alarm/current/components/detail.vue
+++ b/src/views/home/alarm/current/components/detail.vue
@@ -111,7 +111,7 @@
   const res2 = await getAlarmTypeListPage({ offset: 1, limit: 9999 });
   ($route.query.type === 'history' ? getAlarmDetail : getAlarmDetail)($route.query.id as string).then((res) => {
     detailInfo.value = toHumpObject(res.data)
-    detailInfo.value.realAlarmName = detailInfo.value.realAlarm === '1' ? '报警' : '误报'
+    detailInfo.value.realAlarmName = detailInfo.value.realAlarm === '0' ? '是' : '否'
     detailInfo.value.alarmTypeName = res2.data.rows.filter((item: any) => item.id === detailInfo.value.alarmTypeId)[0]?.alarmType || ''
     detailInfo.value.alarmLevelName = res1.data.rows.filter((item: any) => item.id === detailInfo.value.alarmLevel)[0]?.alarmLevel || ''
     detailInfo.value.duration = detailInfo.value.ts && detailInfo.value.cancelTime ? getDateDiff(detailInfo.value.ts, detailInfo.value.cancelTime) : ''
@@ -139,6 +139,7 @@
 }
 // 点击经纬度展示地图
 const mapRef = ref()
+const { proxy } = getCurrentInstance() as any
 const showMap = (data: any) => {
   console.log(data, 'data')
   if (data.text === '位置') {
@@ -148,6 +149,13 @@
         2: 'StationMonitorDetail',
         3: 'PipelineMonitorDetail',
       } as { [key: string]: string }
+      // 判断是否有菜单权限
+      const watchObjectAuth = {
+        1: '/well',
+        2: '/station/monitor',
+        3: '/pipeline',
+      } as { [key: string]: string }
+      if (!proxy.hasPerm(watchObjectAuth[detailInfo.value.watchObject])) { return }
       $router.push({
         name: watchObject[detailInfo.value.watchObject],
         query: {
diff --git a/src/views/home/alarm/current/components/detailInfoDialog.vue b/src/views/home/alarm/current/components/detailInfoDialog.vue
index c089449..7fbf06b 100644
--- a/src/views/home/alarm/current/components/detailInfoDialog.vue
+++ b/src/views/home/alarm/current/components/detailInfoDialog.vue
@@ -114,6 +114,7 @@
   })
 }
 defineExpose({ initDialog, close })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -131,7 +132,7 @@
     <!-- 头部 -->
     <div class="header">
       <span>{{ info.alarmContent }}</span>
-      <span class="more" @click="moreData">>>更多</span>
+      <span v-if="proxy.hasPerm(type === 'data' ? '/alarm/current/more' : '/alarm/device/more')" class="more" @click="moreData">>>更多</span>
     </div>
     <div class="content">
       <div v-show="type === 'device'" class="item">
@@ -162,7 +163,7 @@
         报警设备:
         <span style="padding-left: 6px;">{{ info.devcode }} </span>
         <el-button
-          v-if="info.devTypeName === '燃气智能监测终端' || info.devTypeName === '液位检测仪' || info.devTypeName === '井盖监测仪'"
+          v-if="(info.devTypeName === '燃气智能监测终端' || info.devTypeName === '液位检测仪' || info.devTypeName === '井盖监测仪') && proxy.hasPerm('/alarm/current/data')"
           size="small" style="margin-left: 6px;" @click="viewData"
         >
           查看数据
@@ -228,7 +229,7 @@
         <span style="padding-left: 6px;">
           {{ info.confirmContent }}
         </span>
-        <el-button v-if="type === 'data'" size="small" style="padding-left: 6px;" @click="viewProcess">
+        <el-button v-if="type === 'data' && proxy.hasPerm('/alarm/current/process')" size="small" style="padding-left: 6px;" @click="viewProcess">
           流程图
         </el-button>
       </div>
@@ -246,17 +247,17 @@
       </div>
     </div>
     <div class="footer">
-      <el-button v-if="Number(info.processStatus) < 4 && type === 'data'" size="small" @click="remind">
+      <el-button v-if="(Number(info.processStatus) < 4 && type === 'data') && proxy.hasPerm('/alarm/current/remind')" size="small" @click="remind">
         提醒责任人
       </el-button>
       <el-button
-        v-if="type === 'device' && (info.processStatusName === '待处置' || info.processStatusName === '挂起')"
+        v-if="(type === 'device' && (info.processStatusName === '待处置' || info.processStatusName === '挂起')) && proxy.hasPerm('/alarm/device/handler')"
         size="small" @click="handler"
       >
         报警处置
       </el-button>
       <el-button
-        v-if="Number(info.processStatus) <= 3 || (type === 'device' && info.processStatusName === '待处置') || info.processStatusName === '挂起'"
+        v-if="(Number(info.processStatus) <= 3 || (type === 'device' && info.processStatusName === '待处置') || info.processStatusName === '挂起') && proxy.hasPerm(type === 'device' ? '/alarm/device/pending' : '/alarm/current/pending')"
         type="primary" size="small" @click="pending"
       >
         挂起
diff --git a/src/views/home/alarm/current/index.vue b/src/views/home/alarm/current/index.vue
index d019bbf..e2714bb 100644
--- a/src/views/home/alarm/current/index.vue
+++ b/src/views/home/alarm/current/index.vue
@@ -4,6 +4,7 @@
   Date: 2023-06-28
  -->
 <script lang="ts" setup name="CurrentAlarm">
+import dayjs from 'dayjs'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import { ArrowLeftBold, ArrowRightBold } from '@element-plus/icons-vue'
 import MapCom from './components/map.vue'
@@ -100,6 +101,7 @@
       path: '/alarm/current',
     })
   }
+  datetimerange.value = []
   listQuery.value = {
     limit: 20,
     offset: 1,
@@ -131,8 +133,8 @@
   if ($route.query.row) {
     loadingTable.value = true
     const row = JSON.parse($route.query.row as string)
-    getCurrentAlarmListPage({ offset: 1, limit: 99999 }).then((res) => {
-      const data = res.data.rows.filter((item: any) => item.id === row.id)
+    getCurrentAlarmListPage({ offset: 1, limit: 50 }).then((res) => {
+      const data = res.data.rows.filter((item: any) => item.id === row.alarmId)
       if (data.length) {
         list1.value = data.map((item: any) => ({
           ...item,
@@ -153,7 +155,10 @@
     })
     return
   }
-  fetchData()
+  datetimerange.value = [dayjs().subtract(7, 'day').format('YYYY-MM-DD HH:mm:ss'), dayjs().format('YYYY-MM-DD HH:mm:ss')]
+  setTimeout(() => {
+    fetchData()
+  })
 })
 // 表格标识  地图或普通
 const tableFlag = ref('normal')
@@ -181,6 +186,10 @@
 const mapRef = ref()
 const mapData = ref({})
 async function detail(row: any) {
+  if (row.processStatusName === '未读') {
+    list1.value[list1.value.findIndex((item: any) => item.id === row.id)].processStatusName = '已读'
+    row.processStatusName = '已读'
+  }
   const res = await detailAlarm(row.id)
   const data = toHumpObject(res.data)
   mapData.value = row
@@ -362,7 +371,7 @@
               <el-button v-if="proxy.hasPerm('/alarm/current/delete')" type="primary" @click="batchDeleteRow">
                 批量删除
               </el-button>
-              <el-button type="primary" @click="exportList">
+              <el-button v-if="proxy.hasPerm('/alarm/current/export')" type="primary" @click="exportList">
                 导出
               </el-button>
             </div>
@@ -383,7 +392,7 @@
               </el-table-column>
             </template>
             <template #columns>
-              <el-table-column label="操作" align="center" width="80">
+              <el-table-column v-if="proxy.hasPerm('/alarm/current/detail')" label="操作" align="center" width="80">
                 <template #default="scope">
                   <el-button type="primary" link size="small" @click="detail(scope.row)">
                     查看
diff --git a/src/views/home/alarm/history/index.vue b/src/views/home/alarm/history/index.vue
index eeb49fc..3c810c3 100644
--- a/src/views/home/alarm/history/index.vue
+++ b/src/views/home/alarm/history/index.vue
@@ -97,6 +97,7 @@
 }
 // 重置查询条件f
 const reset = () => {
+  datetimerange.value = []
   listQuery.value = {
     limit: 20,
     offset: 1,
@@ -189,6 +190,7 @@
   })
 }
 fetchDict()
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -249,7 +251,7 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="exportList">
+          <el-button v-if="proxy.hasPerm('/alarm/history/export')" type="primary" @click="exportList">
             导出
           </el-button>
         </div>
@@ -272,7 +274,7 @@
           </el-table-column>
         </template>
         <template #columns>
-          <el-table-column label="操作" align="center" width="80">
+          <el-table-column v-if="proxy.hasPerm('/alarm/history/detail')" label="操作" align="center" width="80">
             <template #default="scope">
               <el-button type="primary" link size="small" @click="moreData(scope.row)">
                 查看
diff --git a/src/views/home/dashboard/index.vue b/src/views/home/dashboard/index.vue
index d2f7e3c..42dfbed 100644
--- a/src/views/home/dashboard/index.vue
+++ b/src/views/home/dashboard/index.vue
@@ -42,7 +42,7 @@
     value: '0',
     name: '在线',
     unit: '个',
-    id: '1',
+    id: '1,2',
   },
   {
     img: img.lixian,
@@ -56,7 +56,7 @@
     value: '0',
     name: '停用',
     unit: '个',
-    id: '2',
+    id: '3',
   },
 ])
 // 工作台数据
@@ -133,7 +133,11 @@
   deviceOperationLoading.value = true
   getDeviceStatus().then((res) => {
     res.data.forEach((element: any) => {
-      const index = deviceOperationData.value.findIndex((item: any) => item.id === element.name)
+      if (element.name === '1' || element.name === '2') {
+        deviceOperationData.value[0].value = Number(deviceOperationData.value[0].value || '0') + Number(element.value)
+        return
+      }
+      const index = deviceOperationData.value.findIndex((item: any) => item.id.includes(element.name))
       if (index !== -1) {
         deviceOperationData.value[index].value = element.value
       }
diff --git a/src/views/home/device/count/components/bottom.vue b/src/views/home/device/count/components/bottom.vue
index 28a4d78..e4e56fa 100644
--- a/src/views/home/device/count/components/bottom.vue
+++ b/src/views/home/device/count/components/bottom.vue
@@ -110,6 +110,7 @@
   })
 }
 fetchDict()
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -148,7 +149,7 @@
             <template #btns-right>
               <!-- 操作 -->
               <div>
-                <el-button type="primary">
+                <el-button v-if="proxy.hasPerm('/device/count/offline/export')" type="primary">
                   导出
                 </el-button>
               </div>
diff --git a/src/views/home/device/device/index.vue b/src/views/home/device/device/index.vue
index c3970b9..9cdd606 100644
--- a/src/views/home/device/device/index.vue
+++ b/src/views/home/device/device/index.vue
@@ -88,6 +88,7 @@
 }
 // 重置查询条件f
 const reset = () => {
+  datetimerange.value = []
   listQuery.value = {
     limit: 20,
     offset: 1,
@@ -296,6 +297,7 @@
   fetchDict()
   fetchData()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -372,17 +374,17 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="editRow('add', {})">
+          <el-button v-if="proxy.hasPerm('/device/manage/add')" type="primary" @click="editRow('add', {})">
             新建
           </el-button>
-          <el-button type="primary" @click="downloadTemplate">
+          <el-button v-if="proxy.hasPerm('/device/manage/down')" type="primary" @click="downloadTemplate">
             模板下载
           </el-button>
-          <el-button type="primary" @click="importList">
+          <el-button v-if="proxy.hasPerm('/device/manage/import')" type="primary" @click="importList">
             批量导入
           </el-button>
-          <el-button type="primary" @click="exportList">
-            导出列表
+          <el-button v-if="proxy.hasPerm('/device/manage/export')" type="primary" @click="exportList">
+            导出
           </el-button>
           <input ref="fileRef" style="display: none;" type="file" accept=".xls,.xlsx" @change="onFileChange">
         </div>
@@ -409,16 +411,16 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="150">
             <template #default="scope">
-              <el-button type="primary" link size="small" @click="editRow('detail', scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/manage/detail')" type="primary" link size="small" @click="editRow('detail', scope.row)">
                 查看
               </el-button>
-              <el-button type="primary" link size="small" @click="editRow('edit', scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/manage/update')" type="primary" link size="small" @click="editRow('edit', scope.row)">
                 编辑
               </el-button>
-              <el-button type="danger" link size="small" @click="changeDefense(scope.row)">
+              <!-- <el-button v-if="proxy.hasPerm('/device/manage/add')" type="danger" link size="small" @click="changeDefense(scope.row)">
                 撤防
-              </el-button>
-              <el-button type="danger" link size="small" @click="removeRow(scope.row)">
+              </el-button> -->
+              <el-button v-if="proxy.hasPerm('/device/manage/delete')" type="danger" link size="small" @click="removeRow(scope.row)">
                 删除
               </el-button>
             </template>
diff --git a/src/views/home/device/instruction/index.vue b/src/views/home/device/instruction/index.vue
index 1e598ed..1da6706 100644
--- a/src/views/home/device/instruction/index.vue
+++ b/src/views/home/device/instruction/index.vue
@@ -78,6 +78,7 @@
 }
 // 重置查询条件f
 const reset = () => {
+  datetimerange.value = []
   listQuery.value = {
     limit: 20,
     offset: 1,
@@ -158,6 +159,7 @@
     editRef.value.initDialog('addOther', {})
   }
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -213,10 +215,10 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary">
+          <el-button v-if="proxy.hasPerm('/device/instruction/batch')" type="primary">
             批量下发
           </el-button>
-          <el-button type="primary" @click="editRow('add', {})">
+          <el-button v-if="proxy.hasPerm('/device/instruction/add')" type="primary" @click="editRow('add', {})">
             新建
           </el-button>
         </div>
@@ -236,13 +238,13 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="120">
             <template #default="scope">
-              <el-button type="primary" link size="small" @click="editRow('detail', scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/instruction/detail')" type="primary" link size="small" @click="editRow('detail', scope.row)">
                 查看
               </el-button>
-              <el-button v-if="scope.row.status === '2'" type="primary" link size="small" @click="editRow('edit', scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/instruction/again') && scope.row.status === '2'" type="primary" link size="small" @click="editRow('edit', scope.row)">
                 重新下发
               </el-button>
-              <el-button type="danger" link size="small" @click="removeRow(scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/instruction/delete')" type="danger" link size="small" @click="removeRow(scope.row)">
                 删除
               </el-button>
             </template>
diff --git a/src/views/home/device/product/index.vue b/src/views/home/device/product/index.vue
index 799fc90..fdd5463 100644
--- a/src/views/home/device/product/index.vue
+++ b/src/views/home/device/product/index.vue
@@ -128,6 +128,7 @@
   await fetchDict()
   fetchData()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -164,7 +165,7 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="editRow('add', {})">
+          <el-button v-if="proxy.hasPerm('/device/product/add')" type="primary" @click="editRow('add', {})">
             新建
           </el-button>
         </div>
@@ -184,10 +185,10 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="120">
             <template #default="scope">
-              <el-button type="primary" link size="small" @click="editRow('edit', scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/product/update')" type="primary" link size="small" @click="editRow('edit', scope.row)">
                 编辑
               </el-button>
-              <el-button type="danger" link size="small" @click="removeRow(scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/product/delete')" type="danger" link size="small" @click="removeRow(scope.row)">
                 删除
               </el-button>
             </template>
diff --git a/src/views/home/device/type/index.vue b/src/views/home/device/type/index.vue
index 59f1343..2344e57 100644
--- a/src/views/home/device/type/index.vue
+++ b/src/views/home/device/type/index.vue
@@ -105,6 +105,7 @@
   await fetchDict()
   fetchData()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -131,7 +132,7 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="editRow('add', {})">
+          <el-button v-if="proxy.hasPerm('/device/type/add')" type="primary" @click="editRow('add', {})">
             新建
           </el-button>
         </div>
@@ -151,10 +152,10 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="120">
             <template #default="scope">
-              <el-button type="primary" link size="small" @click="editRow('edit', scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/type/update')" type="primary" link size="small" @click="editRow('edit', scope.row)">
                 编辑
               </el-button>
-              <el-button type="danger" link size="small" @click="removeRow(scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/type/delete')" type="danger" link size="small" @click="removeRow(scope.row)">
                 删除
               </el-button>
             </template>
diff --git a/src/views/home/ledger/ledger/components/gridList.vue b/src/views/home/ledger/ledger/components/gridList.vue
index d03cd9f..189edef 100644
--- a/src/views/home/ledger/ledger/components/gridList.vue
+++ b/src/views/home/ledger/ledger/components/gridList.vue
@@ -91,6 +91,7 @@
     // })
   })
 }
+const { proxy } = getCurrentInstance() as any
 // 同步日志
 const allSync = () => {
   $router.push({
@@ -139,10 +140,10 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="allSync">
+          <el-button v-if="proxy.hasPerm('/ledger/sync')" type="primary" @click="allSync">
             同步日志
           </el-button>
-          <el-button type="primary" @click="sync('all', {})">
+          <el-button v-if="proxy.hasPerm('/ledger/sync/all')" type="primary" @click="sync('all', {})">
             全量同步
           </el-button>
         </div>
@@ -160,9 +161,9 @@
           </el-table-column>
         </template>
         <template #columns>
-          <el-table-column label="操作" align="center" width="80">
+          <el-table-column v-if="proxy.hasPerm('/ledger/sync/single')" label="操作" align="center" width="80">
             <template #default="scope">
-              <el-button type="primary" link size="small" @click="sync('single', scope.row)">
+              <el-button v-if="proxy.hasPerm('/ledger/sync/single')" type="primary" link size="small" @click="sync('single', scope.row)">
                 同步
               </el-button>
             </template>
diff --git a/src/views/home/ledger/ledger/components/wellList.vue b/src/views/home/ledger/ledger/components/wellList.vue
index 9eb1f43..06f855a 100644
--- a/src/views/home/ledger/ledger/components/wellList.vue
+++ b/src/views/home/ledger/ledger/components/wellList.vue
@@ -123,6 +123,7 @@
   // await fetchDict()
   fetchData()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -159,11 +160,11 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="allSync">
+          <el-button v-if="proxy.hasPerm('/ledger/sync')" type="primary" @click="allSync">
             同步日志
           </el-button>
-          <el-button type="primary" @click="sync('all', {})">
-            全部同步
+          <el-button v-if="proxy.hasPerm('/ledger/sync/all')" type="primary" @click="sync('all', {})">
+            全量同步
           </el-button>
         </div>
       </template>
@@ -180,9 +181,9 @@
           </el-table-column>
         </template>
         <template #columns>
-          <el-table-column label="操作" align="center" width="80">
+          <el-table-column v-if="proxy.hasPerm('/ledger/sync/single')" label="操作" align="center" width="80">
             <template #default="scope">
-              <el-button type="primary" link size="small" @click="sync('single', scope.row)">
+              <el-button v-if="proxy.hasPerm('/ledger/sync/single')" type="primary" link size="small" @click="sync('single', scope.row)">
                 同步
               </el-button>
             </template>
diff --git a/src/views/home/ledger/ledger/index.vue b/src/views/home/ledger/ledger/index.vue
index a03aa12..8403fc5 100644
--- a/src/views/home/ledger/ledger/index.vue
+++ b/src/views/home/ledger/ledger/index.vue
@@ -7,7 +7,16 @@
 import type { TabsPaneContext } from 'element-plus'
 import wellList from './components/wellList.vue'
 import gridList from './components/gridList.vue'
-const activeName = ref('闸井')
+const { proxy } = getCurrentInstance() as any
+const activeName = ref(
+  proxy.hasPerm('/ledger/manage/well')
+    ? '闸井'
+    : proxy.hasPerm('/ledger/manage/station')
+      ? '场站'
+      : proxy.hasPerm('/ledger/manage/grid')
+        ? '网格'
+        : '',
+)
 const handleClick = (tab: TabsPaneContext, event: Event) => {
   // console.log(tab, event)
 }
@@ -17,13 +26,13 @@
   <!-- 布局 -->
   <app-container>
     <el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick">
-      <el-tab-pane label="闸井" name="闸井">
+      <el-tab-pane v-if="proxy.hasPerm('/ledger/manage/well')" label="闸井" name="闸井">
         <well-list v-if="activeName === '闸井'" type="1" />
       </el-tab-pane>
-      <el-tab-pane label="场站" name="场站">
+      <el-tab-pane v-if="proxy.hasPerm('/ledger/manage/station')" label="场站" name="场站">
         <well-list v-if="activeName === '场站'" type="2" />
       </el-tab-pane>
-      <el-tab-pane label="网格" name="网格">
+      <el-tab-pane v-if="proxy.hasPerm('/ledger/manage/grid')" label="网格" name="网格">
         <grid-list v-if="activeName === '网格'" />
       </el-tab-pane>
     </el-tabs>
diff --git a/src/views/home/ledger/pipeline/index.vue b/src/views/home/ledger/pipeline/index.vue
index e0d2512..01e95ac 100644
--- a/src/views/home/ledger/pipeline/index.vue
+++ b/src/views/home/ledger/pipeline/index.vue
@@ -160,6 +160,7 @@
 onMounted(async () => {
   fetchData()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -222,13 +223,13 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="editRow('add', {})">
+          <el-button v-if="proxy.hasPerm('/ledger/pipeline/add')" type="primary" @click="editRow('add', {})">
             新增
           </el-button>
-          <el-button type="primary" @click="importList">
+          <el-button v-if="proxy.hasPerm('/ledger/pipeline/import')" type="primary" @click="importList">
             批量导入
           </el-button>
-          <el-button type="primary" @click="exportList">
+          <el-button v-if="proxy.hasPerm('/ledger/pipeline/export')" type="primary" @click="exportList">
             批量导出
           </el-button>
         </div>
@@ -248,10 +249,10 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="100">
             <template #default="scope">
-              <el-button type="primary" link size="small" @click="editRow('edit', scope.row)">
+              <el-button v-if="proxy.hasPerm('/ledger/pipeline/update')" type="primary" link size="small" @click="editRow('edit', scope.row)">
                 编辑
               </el-button>
-              <el-button type="danger" link size="small" @click="removeRow(scope.row)">
+              <el-button v-if="proxy.hasPerm('/ledger/pipeline/delete')" type="danger" link size="small" @click="removeRow(scope.row)">
                 删除
               </el-button>
             </template>
diff --git a/src/views/home/ledger/sync/index.vue b/src/views/home/ledger/sync/index.vue
index 54a3218..a04bad9 100644
--- a/src/views/home/ledger/sync/index.vue
+++ b/src/views/home/ledger/sync/index.vue
@@ -62,6 +62,7 @@
 }
 // 重置查询条件f
 const reset = () => {
+  datetimerange.value = []
   listQuery.value = {
     limit: 20,
     offset: 1,
@@ -106,6 +107,8 @@
 onMounted(async () => {
   fetchData()
 })
+const { proxy } = getCurrentInstance() as any
+const $route = useRoute()
 </script>
 
 <template>
@@ -132,7 +135,7 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="goBak">
+          <el-button v-if="$route.type" type="primary" @click="goBak">
             返回
           </el-button>
         </div>
@@ -152,10 +155,10 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="80">
             <template #default="scope">
-              <el-button type="primary" link size="small">
+              <el-button v-if="proxy.hasPerm('/ledger/sync/detail')" type="primary" link size="small">
                 查看
               </el-button>
-              <el-button type="danger" link size="small" @click="removeRow(scope.row)">
+              <el-button v-if="proxy.hasPerm('/ledger/sync/delete')" type="danger" link size="small" @click="removeRow(scope.row)">
                 删除
               </el-button>
             </template>
diff --git a/src/views/home/monitor/service/index.vue b/src/views/home/monitor/service/index.vue
index 8df2239..570dc68 100644
--- a/src/views/home/monitor/service/index.vue
+++ b/src/views/home/monitor/service/index.vue
@@ -53,6 +53,7 @@
 onMounted(async () => {
   fetchData()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -66,7 +67,7 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary">
+          <el-button v-if="proxy.hasPerm('/monitor/service/add')" type="primary">
             新建
           </el-button>
         </div>
diff --git a/src/views/home/monitor/time/index.vue b/src/views/home/monitor/time/index.vue
index caa6d46..0f7f5a0 100644
--- a/src/views/home/monitor/time/index.vue
+++ b/src/views/home/monitor/time/index.vue
@@ -53,6 +53,7 @@
 onMounted(async () => {
   fetchData()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -66,7 +67,7 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary">
+          <el-button v-if="proxy.hasPerm('/monitor/time/add')" type="primary">
             新建
           </el-button>
         </div>
diff --git a/src/views/home/operation/alarm/components/detail.vue b/src/views/home/operation/alarm/components/detail.vue
index 8194cbd..4ae4a1f 100644
--- a/src/views/home/operation/alarm/components/detail.vue
+++ b/src/views/home/operation/alarm/components/detail.vue
@@ -151,6 +151,7 @@
 }
 // 点击经纬度展示地图
 const mapRef = ref()
+const { proxy } = getCurrentInstance() as any
 const showMap = (data: any) => {
   console.log(data, 'data')
   if (data.text === '位置') {
@@ -160,6 +161,13 @@
         2: 'StationMonitorDetail',
         3: 'PipelineMonitorDetail',
       } as { [key: string]: string }
+      // 判断是否有菜单权限
+      const watchObjectAuth = {
+        1: '/well',
+        2: '/station/monitor',
+        3: '/pipeline',
+      } as { [key: string]: string }
+      if (!proxy.hasPerm(watchObjectAuth[detailInfo.value.watchObject])) { return }
       $router.push({
         name: watchObject[detailInfo.value.watchObject],
         query: {
diff --git a/src/views/home/operation/alarm/index.vue b/src/views/home/operation/alarm/index.vue
index ac0f31b..e53c991 100644
--- a/src/views/home/operation/alarm/index.vue
+++ b/src/views/home/operation/alarm/index.vue
@@ -82,6 +82,7 @@
 }
 // 重置查询条件f
 const reset = () => {
+  datetimerange.value = []
   listQuery.value = {
     limit: 20,
     offset: 1,
@@ -315,7 +316,7 @@
               <el-button v-if="proxy.hasPerm('/alarm/device/delete')" type="primary" @click="batchDeleteRow">
                 批量删除
               </el-button>
-              <el-button type="primary" @click="exportList">
+              <el-button v-if="proxy.hasPerm('/alarm/device/export')" type="primary" @click="exportList">
                 导出
               </el-button>
             </div>
@@ -336,7 +337,7 @@
               </el-table-column>
             </template>
             <template #columns>
-              <el-table-column label="操作" align="center" width="80">
+              <el-table-column v-if="proxy.hasPerm('/alarm/device/detail')" label="操作" align="center" width="80">
                 <template #default="scope">
                   <el-button type="primary" link size="small" @click="detail(scope.row)">
                     查看
diff --git a/src/views/home/operation/history/index.vue b/src/views/home/operation/history/index.vue
index 5c04ff7..d96ac57 100644
--- a/src/views/home/operation/history/index.vue
+++ b/src/views/home/operation/history/index.vue
@@ -78,6 +78,7 @@
 }
 // 重置查询条件f
 const reset = () => {
+  datetimerange.value = []
   listQuery.value = {
     limit: 20,
     offset: 1,
@@ -161,6 +162,7 @@
     fetchData()
   })
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -218,7 +220,7 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="exportList">
+          <el-button v-if="proxy.hasPerm('/operation/history/export')" type="primary" @click="exportList">
             导出
           </el-button>
         </div>
@@ -241,7 +243,7 @@
           </el-table-column>
         </template>
         <template #columns>
-          <el-table-column label="操作" align="center" width="80">
+          <el-table-column v-if="proxy.hasPerm('/operation/history/detail')" label="操作" align="center" width="80">
             <template #default="scope">
               <el-button type="primary" link size="small" @click="detailRow(scope.row)">
                 查看
diff --git a/src/views/home/operation/manufacturer/index.vue b/src/views/home/operation/manufacturer/index.vue
index 4a5816a..5f647c3 100644
--- a/src/views/home/operation/manufacturer/index.vue
+++ b/src/views/home/operation/manufacturer/index.vue
@@ -75,6 +75,7 @@
 }
 // 重置查询条件f
 const reset = () => {
+  datetimerange.value = []
   listQuery.value = {
     limit: 20,
     offset: 1,
@@ -125,6 +126,7 @@
   await fetchDict()
   fetchData()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -178,7 +180,7 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="exportList">
+          <el-button v-if="proxy.hasPerm('/operation/manufacturer/export')" type="primary" @click="exportList">
             导出
           </el-button>
         </div>
diff --git a/src/views/home/operation/trajectory/index.vue b/src/views/home/operation/trajectory/index.vue
index 9312fd7..606958e 100644
--- a/src/views/home/operation/trajectory/index.vue
+++ b/src/views/home/operation/trajectory/index.vue
@@ -65,6 +65,7 @@
 }
 // 重置查询条件f
 const reset = () => {
+  datetimerange.value = []
   listQuery.value = {
     limit: 20,
     offset: 1,
@@ -114,6 +115,7 @@
   await fetchDict()
   fetchData()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -175,7 +177,7 @@
           </span>
         </template>
         <template #columns>
-          <el-table-column label="操作" width="80" align="center">
+          <el-table-column v-if="proxy.hasPerm('/operation/trajectory/detail')" label="操作" width="80" align="center">
             <template #default="scope">
               <el-button type="primary" link size="small" @click="detail(scope.row)">
                 查看
diff --git a/src/views/home/pipeline/components/detailData.vue b/src/views/home/pipeline/components/detailData.vue
index 80b6886..760b1c5 100644
--- a/src/views/home/pipeline/components/detailData.vue
+++ b/src/views/home/pipeline/components/detailData.vue
@@ -7,7 +7,13 @@
 import type { TabsPaneContext } from 'element-plus'
 import monitorData from './monitorDataList.vue'
 import maintenanceRecord from '@/views/home/well/components/maintenanceRecord.vue'
-const activeName = ref('监控数据')
+const { proxy } = getCurrentInstance() as any
+const activeName = ref(
+  proxy.hasPerm('/pipeline/monitor/data')
+    ? '监控数据'
+    : proxy.hasPerm('/pipeline/monitor/maintenance')
+      ? '监控设备维护记录'
+      : '')
 const handleClick = (tab: TabsPaneContext, event: Event) => {
   // console.log(tab, event)
 }
@@ -15,10 +21,10 @@
 
 <template>
   <el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick">
-    <el-tab-pane label="监控数据" name="监控数据">
+    <el-tab-pane v-if="proxy.hasPerm('/pipeline/monitor/data')" label="监控数据" name="监控数据">
       <monitor-data v-if="activeName === '监控数据'" />
     </el-tab-pane>
-    <el-tab-pane label="监控设备维护记录" name="监控设备维护记录">
+    <el-tab-pane v-if="proxy.hasPerm('/pipeline/monitor/maintenance')" label="监控设备维护记录" name="监控设备维护记录">
       <maintenance-record v-if="activeName === '监控设备维护记录'" />
     </el-tab-pane>
   </el-tabs>
diff --git a/src/views/home/pipeline/index.vue b/src/views/home/pipeline/index.vue
index 90baef0..4d66e51 100644
--- a/src/views/home/pipeline/index.vue
+++ b/src/views/home/pipeline/index.vue
@@ -254,6 +254,7 @@
     tableHeight.value = window.innerHeight - 60 - 50 - 10 - 98 - 10 - 52 - 52 - 10
   }
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -348,7 +349,7 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary">
+          <el-button v-if="proxy.hasPerm('/pipeline/export')" type="primary">
             导出
           </el-button>
         </div>
@@ -368,7 +369,7 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="80">
             <template #default="scope">
-              <el-button type="primary" link size="small" @click="editRow('detail', scope.row)">
+              <el-button v-if="proxy.hasPerm('/pipeline/detail')" type="primary" link size="small" @click="editRow('detail', scope.row)">
                 查看
               </el-button>
               <!-- <el-button type="primary" link size="small" @click="editRow('edit', scope.row)">
diff --git a/src/views/home/rule/agreement/index.vue b/src/views/home/rule/agreement/index.vue
index fd41cd3..f1cfe15 100644
--- a/src/views/home/rule/agreement/index.vue
+++ b/src/views/home/rule/agreement/index.vue
@@ -95,6 +95,7 @@
 onMounted(async () => {
   fetchData()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -119,7 +120,7 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="editRow('add', {})">
+          <el-button v-if="proxy.hasPerm('/rule/agreement/add')" type="primary" @click="editRow('add', {})">
             新建
           </el-button>
         </div>
@@ -139,10 +140,10 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="120">
             <template #default="scope">
-              <el-button type="primary" link size="small" @click="editRow('edit', scope.row)">
+              <el-button v-if="proxy.hasPerm('/rule/agreement/update')" type="primary" link size="small" @click="editRow('edit', scope.row)">
                 编辑
               </el-button>
-              <el-button type="danger" link size="small" @click="removeRow(scope.row)">
+              <el-button v-if="proxy.hasPerm('/rule/agreement/delete')" type="danger" link size="small" @click="removeRow(scope.row)">
                 删除
               </el-button>
             </template>

diff --git a/src/App.vue b/src/App.vue
index cde81b3..8a00f5d 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -125,7 +125,7 @@
         '--g-sub-sidebar-actual-width': subSidebarActualWidth,
       }"
     />
-    <system-info v-if="browserType !== 'mobile'" />
+    <!-- <system-info v-if="browserType !== 'mobile'" /> -->
     <audio id="eventAudio" src="" autoplay />
   </el-config-provider>
 </template>
diff --git a/src/layouts/components/Tools/alarmDialog.vue b/src/layouts/components/Tools/alarmDialog.vue
index 1828375..df89ab8 100644
--- a/src/layouts/components/Tools/alarmDialog.vue
+++ b/src/layouts/components/Tools/alarmDialog.vue
@@ -116,7 +116,7 @@
     </div>
     <template #footer>
       <div class="dialog-footer">
-        <div class="btn" @click="detail">
+        <div v-if="proxy.hasPerm('/alarm/current')" class="btn" @click="detail">
           查看
         </div>
         <div v-if="info.isSound === '1'" class="btn" @click="closeSound">
diff --git a/src/layouts/components/Tools/alarmList.vue b/src/layouts/components/Tools/alarmList.vue
index c3a9d2a..5356b74 100644
--- a/src/layouts/components/Tools/alarmList.vue
+++ b/src/layouts/components/Tools/alarmList.vue
@@ -54,6 +54,7 @@
 }
 // 查看当前行
 const detailRow = (row: any) => {
+  if (!proxy.hasPerm('/alarm/current')) { return }
   $router.push({
     name: 'AlarmCurrent',
     query: {
@@ -77,21 +78,6 @@
   localStorage.setItem('eventAudio', 'pause')
 }
 const dialogRef = ref()
-// const dialog = () => {
-//   const row = {
-//     alarmNoteMethod: '1', // 消息提醒 1:弹窗，2:消息提醒
-//     isSound: '1', // 报警音效，1:开，0:关
-//     isSend: '1', // 报警推送，1:开，0:关
-//     isText: '1', // 报警短息，1:开，0:关
-//     alarmType: '浓度超限',
-//     tagNumber: 'NX5702',
-//     alarmTime: '2024-09-09',
-//     value: '20',
-//     typeName: '燃气智能终端',
-//     alarmLevel: '一级',
-//   }
-//   dialogRef.value.initDialog(row)
-// }
 const fetchData = (isLoading = false) => {
   loading.value = true
   if (isLoading) {
@@ -115,7 +101,10 @@
       dialogRef.value.initDialog(newVal)
     }
     if (newVal.isSound === '1') {
-      play()
+      // play()
+      if (!localStorage.getItem('eventAudio')) {
+        proxy.playAudio()
+      }
     }
     fetchData(false)
   }
@@ -146,6 +135,7 @@
 //     window.localStorage.removeItem('token')
 //   }
 // }
+// const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -180,7 +170,7 @@
                   {{ message.processStatus
                     === '未读' ? '未读' : '已读' }}
                 </el-tag>
-                <el-tag type="info" size="small" style="margin-left: 5px;">
+                <el-tag type="info" size="small" style="margin-left: 5px;" @click="detailRow(message)">
                   查看
                 </el-tag>
               </div>
@@ -214,7 +204,7 @@
       <!-- <div class="close" @click="dialog">
         弹窗
       </div> -->
-      <div class="more" @click="moreList">
+      <div v-if="proxy.hasPerm('/alarm/current')" class="more" @click="moreList">
         查看更多
       </div>
     </div>
diff --git a/src/layouts/components/Tools/index.vue b/src/layouts/components/Tools/index.vue
index 9f2d41f..61f9707 100644
--- a/src/layouts/components/Tools/index.vue
+++ b/src/layouts/components/Tools/index.vue
@@ -79,6 +79,7 @@
   // 断开 websocket
   // websocket.destroyWebSocket()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -89,18 +90,18 @@
           <svg-icon name="ep:search" />
         </el-icon>
       </span>
-      <span class="item" @click="board">
+      <span v-if="proxy.hasPerm('/fullscreen')" class="item" @click="board">
         <el-icon>
           <svg-icon name="ep:data-line" />
         </el-icon>
       </span>
-      <span v-if="settingsStore.mode === 'pc' && settingsStore.toolbar.enableFullscreen" class="item" @click="toggle">
+      <span class="item" @click="toggle">
         <el-icon>
           <svg-icon :name="isFullscreen ? 'fullscreen-exit' : 'fullscreen'" />
         </el-icon>
       </span>
       <!-- 报警信息列表 -->
-      <span class="item">
+      <span v-if="proxy.hasPerm('/alarmnotice')" class="item">
         <el-popover width="390">
           <template #reference>
             <div>
diff --git a/src/layouts/components/Topbar/index.vue b/src/layouts/components/Topbar/index.vue
index 2863cef..4e3120e 100644
--- a/src/layouts/components/Topbar/index.vue
+++ b/src/layouts/components/Topbar/index.vue
@@ -67,7 +67,7 @@
           </transition-group>
         </el-breadcrumb>
       </div>
-      <tools />
+      <!-- <tools /> -->
     </div>
   </div>
 </template>
diff --git a/src/router/modules/pc.ts b/src/router/modules/pc.ts
index aacd6fa..97ced45 100644
--- a/src/router/modules/pc.ts
+++ b/src/router/modules/pc.ts
@@ -40,7 +40,7 @@
       icon: 'ep:key',
       sidebar: false,
       breadcrumb: false,
-      // auth: '/fullscreen',
+      auth: '/fullscreen',
     },
   },
   {
@@ -155,7 +155,7 @@
           sidebar: false,
           breadcrumb: false,
           activeMenu: '/well',
-          auth: '/well/detail',
+          auth: '/well',
         },
       },
     ],
diff --git a/src/views/home/alarm/count/components/locationAnalysis.vue b/src/views/home/alarm/count/components/locationAnalysis.vue
index fc75b9e..bff1853 100644
--- a/src/views/home/alarm/count/components/locationAnalysis.vue
+++ b/src/views/home/alarm/count/components/locationAnalysis.vue
@@ -46,6 +46,7 @@
   })
 }
 fetchData()
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -75,6 +76,9 @@
         <el-button type="primary" style="margin: 0 5px;" @click="fetchData">
           搜索
         </el-button>
+        <el-button v-if="proxy.hasPerm('/alarm/count/exportLocation')" type="primary" style="margin: 0 5px;">
+          导出
+        </el-button>
       </div>
     </template>
     <template #content>
diff --git a/src/views/home/alarm/current/components/detail.vue b/src/views/home/alarm/current/components/detail.vue
index dd3b31a..4204c92 100644
--- a/src/views/home/alarm/current/components/detail.vue
+++ b/src/views/home/alarm/current/components/detail.vue
@@ -111,7 +111,7 @@
   const res2 = await getAlarmTypeListPage({ offset: 1, limit: 9999 });
   ($route.query.type === 'history' ? getAlarmDetail : getAlarmDetail)($route.query.id as string).then((res) => {
     detailInfo.value = toHumpObject(res.data)
-    detailInfo.value.realAlarmName = detailInfo.value.realAlarm === '1' ? '报警' : '误报'
+    detailInfo.value.realAlarmName = detailInfo.value.realAlarm === '0' ? '是' : '否'
     detailInfo.value.alarmTypeName = res2.data.rows.filter((item: any) => item.id === detailInfo.value.alarmTypeId)[0]?.alarmType || ''
     detailInfo.value.alarmLevelName = res1.data.rows.filter((item: any) => item.id === detailInfo.value.alarmLevel)[0]?.alarmLevel || ''
     detailInfo.value.duration = detailInfo.value.ts && detailInfo.value.cancelTime ? getDateDiff(detailInfo.value.ts, detailInfo.value.cancelTime) : ''
@@ -139,6 +139,7 @@
 }
 // 点击经纬度展示地图
 const mapRef = ref()
+const { proxy } = getCurrentInstance() as any
 const showMap = (data: any) => {
   console.log(data, 'data')
   if (data.text === '位置') {
@@ -148,6 +149,13 @@
         2: 'StationMonitorDetail',
         3: 'PipelineMonitorDetail',
       } as { [key: string]: string }
+      // 判断是否有菜单权限
+      const watchObjectAuth = {
+        1: '/well',
+        2: '/station/monitor',
+        3: '/pipeline',
+      } as { [key: string]: string }
+      if (!proxy.hasPerm(watchObjectAuth[detailInfo.value.watchObject])) { return }
       $router.push({
         name: watchObject[detailInfo.value.watchObject],
         query: {
diff --git a/src/views/home/alarm/current/components/detailInfoDialog.vue b/src/views/home/alarm/current/components/detailInfoDialog.vue
index c089449..7fbf06b 100644
--- a/src/views/home/alarm/current/components/detailInfoDialog.vue
+++ b/src/views/home/alarm/current/components/detailInfoDialog.vue
@@ -114,6 +114,7 @@
   })
 }
 defineExpose({ initDialog, close })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -131,7 +132,7 @@
     <!-- 头部 -->
     <div class="header">
       <span>{{ info.alarmContent }}</span>
-      <span class="more" @click="moreData">>>更多</span>
+      <span v-if="proxy.hasPerm(type === 'data' ? '/alarm/current/more' : '/alarm/device/more')" class="more" @click="moreData">>>更多</span>
     </div>
     <div class="content">
       <div v-show="type === 'device'" class="item">
@@ -162,7 +163,7 @@
         报警设备:
         <span style="padding-left: 6px;">{{ info.devcode }} </span>
         <el-button
-          v-if="info.devTypeName === '燃气智能监测终端' || info.devTypeName === '液位检测仪' || info.devTypeName === '井盖监测仪'"
+          v-if="(info.devTypeName === '燃气智能监测终端' || info.devTypeName === '液位检测仪' || info.devTypeName === '井盖监测仪') && proxy.hasPerm('/alarm/current/data')"
           size="small" style="margin-left: 6px;" @click="viewData"
         >
           查看数据
@@ -228,7 +229,7 @@
         <span style="padding-left: 6px;">
           {{ info.confirmContent }}
         </span>
-        <el-button v-if="type === 'data'" size="small" style="padding-left: 6px;" @click="viewProcess">
+        <el-button v-if="type === 'data' && proxy.hasPerm('/alarm/current/process')" size="small" style="padding-left: 6px;" @click="viewProcess">
           流程图
         </el-button>
       </div>
@@ -246,17 +247,17 @@
       </div>
     </div>
     <div class="footer">
-      <el-button v-if="Number(info.processStatus) < 4 && type === 'data'" size="small" @click="remind">
+      <el-button v-if="(Number(info.processStatus) < 4 && type === 'data') && proxy.hasPerm('/alarm/current/remind')" size="small" @click="remind">
         提醒责任人
       </el-button>
       <el-button
-        v-if="type === 'device' && (info.processStatusName === '待处置' || info.processStatusName === '挂起')"
+        v-if="(type === 'device' && (info.processStatusName === '待处置' || info.processStatusName === '挂起')) && proxy.hasPerm('/alarm/device/handler')"
         size="small" @click="handler"
       >
         报警处置
       </el-button>
       <el-button
-        v-if="Number(info.processStatus) <= 3 || (type === 'device' && info.processStatusName === '待处置') || info.processStatusName === '挂起'"
+        v-if="(Number(info.processStatus) <= 3 || (type === 'device' && info.processStatusName === '待处置') || info.processStatusName === '挂起') && proxy.hasPerm(type === 'device' ? '/alarm/device/pending' : '/alarm/current/pending')"
         type="primary" size="small" @click="pending"
       >
         挂起
diff --git a/src/views/home/alarm/current/index.vue b/src/views/home/alarm/current/index.vue
index d019bbf..e2714bb 100644
--- a/src/views/home/alarm/current/index.vue
+++ b/src/views/home/alarm/current/index.vue
@@ -4,6 +4,7 @@
   Date: 2023-06-28
  -->
 <script lang="ts" setup name="CurrentAlarm">
+import dayjs from 'dayjs'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import { ArrowLeftBold, ArrowRightBold } from '@element-plus/icons-vue'
 import MapCom from './components/map.vue'
@@ -100,6 +101,7 @@
       path: '/alarm/current',
     })
   }
+  datetimerange.value = []
   listQuery.value = {
     limit: 20,
     offset: 1,
@@ -131,8 +133,8 @@
   if ($route.query.row) {
     loadingTable.value = true
     const row = JSON.parse($route.query.row as string)
-    getCurrentAlarmListPage({ offset: 1, limit: 99999 }).then((res) => {
-      const data = res.data.rows.filter((item: any) => item.id === row.id)
+    getCurrentAlarmListPage({ offset: 1, limit: 50 }).then((res) => {
+      const data = res.data.rows.filter((item: any) => item.id === row.alarmId)
       if (data.length) {
         list1.value = data.map((item: any) => ({
           ...item,
@@ -153,7 +155,10 @@
     })
     return
   }
-  fetchData()
+  datetimerange.value = [dayjs().subtract(7, 'day').format('YYYY-MM-DD HH:mm:ss'), dayjs().format('YYYY-MM-DD HH:mm:ss')]
+  setTimeout(() => {
+    fetchData()
+  })
 })
 // 表格标识  地图或普通
 const tableFlag = ref('normal')
@@ -181,6 +186,10 @@
 const mapRef = ref()
 const mapData = ref({})
 async function detail(row: any) {
+  if (row.processStatusName === '未读') {
+    list1.value[list1.value.findIndex((item: any) => item.id === row.id)].processStatusName = '已读'
+    row.processStatusName = '已读'
+  }
   const res = await detailAlarm(row.id)
   const data = toHumpObject(res.data)
   mapData.value = row
@@ -362,7 +371,7 @@
               <el-button v-if="proxy.hasPerm('/alarm/current/delete')" type="primary" @click="batchDeleteRow">
                 批量删除
               </el-button>
-              <el-button type="primary" @click="exportList">
+              <el-button v-if="proxy.hasPerm('/alarm/current/export')" type="primary" @click="exportList">
                 导出
               </el-button>
             </div>
@@ -383,7 +392,7 @@
               </el-table-column>
             </template>
             <template #columns>
-              <el-table-column label="操作" align="center" width="80">
+              <el-table-column v-if="proxy.hasPerm('/alarm/current/detail')" label="操作" align="center" width="80">
                 <template #default="scope">
                   <el-button type="primary" link size="small" @click="detail(scope.row)">
                     查看
diff --git a/src/views/home/alarm/history/index.vue b/src/views/home/alarm/history/index.vue
index eeb49fc..3c810c3 100644
--- a/src/views/home/alarm/history/index.vue
+++ b/src/views/home/alarm/history/index.vue
@@ -97,6 +97,7 @@
 }
 // 重置查询条件f
 const reset = () => {
+  datetimerange.value = []
   listQuery.value = {
     limit: 20,
     offset: 1,
@@ -189,6 +190,7 @@
   })
 }
 fetchDict()
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -249,7 +251,7 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="exportList">
+          <el-button v-if="proxy.hasPerm('/alarm/history/export')" type="primary" @click="exportList">
             导出
           </el-button>
         </div>
@@ -272,7 +274,7 @@
           </el-table-column>
         </template>
         <template #columns>
-          <el-table-column label="操作" align="center" width="80">
+          <el-table-column v-if="proxy.hasPerm('/alarm/history/detail')" label="操作" align="center" width="80">
             <template #default="scope">
               <el-button type="primary" link size="small" @click="moreData(scope.row)">
                 查看
diff --git a/src/views/home/dashboard/index.vue b/src/views/home/dashboard/index.vue
index d2f7e3c..42dfbed 100644
--- a/src/views/home/dashboard/index.vue
+++ b/src/views/home/dashboard/index.vue
@@ -42,7 +42,7 @@
     value: '0',
     name: '在线',
     unit: '个',
-    id: '1',
+    id: '1,2',
   },
   {
     img: img.lixian,
@@ -56,7 +56,7 @@
     value: '0',
     name: '停用',
     unit: '个',
-    id: '2',
+    id: '3',
   },
 ])
 // 工作台数据
@@ -133,7 +133,11 @@
   deviceOperationLoading.value = true
   getDeviceStatus().then((res) => {
     res.data.forEach((element: any) => {
-      const index = deviceOperationData.value.findIndex((item: any) => item.id === element.name)
+      if (element.name === '1' || element.name === '2') {
+        deviceOperationData.value[0].value = Number(deviceOperationData.value[0].value || '0') + Number(element.value)
+        return
+      }
+      const index = deviceOperationData.value.findIndex((item: any) => item.id.includes(element.name))
       if (index !== -1) {
         deviceOperationData.value[index].value = element.value
       }
diff --git a/src/views/home/device/count/components/bottom.vue b/src/views/home/device/count/components/bottom.vue
index 28a4d78..e4e56fa 100644
--- a/src/views/home/device/count/components/bottom.vue
+++ b/src/views/home/device/count/components/bottom.vue
@@ -110,6 +110,7 @@
   })
 }
 fetchDict()
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -148,7 +149,7 @@
             <template #btns-right>
               <!-- 操作 -->
               <div>
-                <el-button type="primary">
+                <el-button v-if="proxy.hasPerm('/device/count/offline/export')" type="primary">
                   导出
                 </el-button>
               </div>
diff --git a/src/views/home/device/device/index.vue b/src/views/home/device/device/index.vue
index c3970b9..9cdd606 100644
--- a/src/views/home/device/device/index.vue
+++ b/src/views/home/device/device/index.vue
@@ -88,6 +88,7 @@
 }
 // 重置查询条件f
 const reset = () => {
+  datetimerange.value = []
   listQuery.value = {
     limit: 20,
     offset: 1,
@@ -296,6 +297,7 @@
   fetchDict()
   fetchData()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -372,17 +374,17 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="editRow('add', {})">
+          <el-button v-if="proxy.hasPerm('/device/manage/add')" type="primary" @click="editRow('add', {})">
             新建
           </el-button>
-          <el-button type="primary" @click="downloadTemplate">
+          <el-button v-if="proxy.hasPerm('/device/manage/down')" type="primary" @click="downloadTemplate">
             模板下载
           </el-button>
-          <el-button type="primary" @click="importList">
+          <el-button v-if="proxy.hasPerm('/device/manage/import')" type="primary" @click="importList">
             批量导入
           </el-button>
-          <el-button type="primary" @click="exportList">
-            导出列表
+          <el-button v-if="proxy.hasPerm('/device/manage/export')" type="primary" @click="exportList">
+            导出
           </el-button>
           <input ref="fileRef" style="display: none;" type="file" accept=".xls,.xlsx" @change="onFileChange">
         </div>
@@ -409,16 +411,16 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="150">
             <template #default="scope">
-              <el-button type="primary" link size="small" @click="editRow('detail', scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/manage/detail')" type="primary" link size="small" @click="editRow('detail', scope.row)">
                 查看
               </el-button>
-              <el-button type="primary" link size="small" @click="editRow('edit', scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/manage/update')" type="primary" link size="small" @click="editRow('edit', scope.row)">
                 编辑
               </el-button>
-              <el-button type="danger" link size="small" @click="changeDefense(scope.row)">
+              <!-- <el-button v-if="proxy.hasPerm('/device/manage/add')" type="danger" link size="small" @click="changeDefense(scope.row)">
                 撤防
-              </el-button>
-              <el-button type="danger" link size="small" @click="removeRow(scope.row)">
+              </el-button> -->
+              <el-button v-if="proxy.hasPerm('/device/manage/delete')" type="danger" link size="small" @click="removeRow(scope.row)">
                 删除
               </el-button>
             </template>
diff --git a/src/views/home/device/instruction/index.vue b/src/views/home/device/instruction/index.vue
index 1e598ed..1da6706 100644
--- a/src/views/home/device/instruction/index.vue
+++ b/src/views/home/device/instruction/index.vue
@@ -78,6 +78,7 @@
 }
 // 重置查询条件f
 const reset = () => {
+  datetimerange.value = []
   listQuery.value = {
     limit: 20,
     offset: 1,
@@ -158,6 +159,7 @@
     editRef.value.initDialog('addOther', {})
   }
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -213,10 +215,10 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary">
+          <el-button v-if="proxy.hasPerm('/device/instruction/batch')" type="primary">
             批量下发
           </el-button>
-          <el-button type="primary" @click="editRow('add', {})">
+          <el-button v-if="proxy.hasPerm('/device/instruction/add')" type="primary" @click="editRow('add', {})">
             新建
           </el-button>
         </div>
@@ -236,13 +238,13 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="120">
             <template #default="scope">
-              <el-button type="primary" link size="small" @click="editRow('detail', scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/instruction/detail')" type="primary" link size="small" @click="editRow('detail', scope.row)">
                 查看
               </el-button>
-              <el-button v-if="scope.row.status === '2'" type="primary" link size="small" @click="editRow('edit', scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/instruction/again') && scope.row.status === '2'" type="primary" link size="small" @click="editRow('edit', scope.row)">
                 重新下发
               </el-button>
-              <el-button type="danger" link size="small" @click="removeRow(scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/instruction/delete')" type="danger" link size="small" @click="removeRow(scope.row)">
                 删除
               </el-button>
             </template>
diff --git a/src/views/home/device/product/index.vue b/src/views/home/device/product/index.vue
index 799fc90..fdd5463 100644
--- a/src/views/home/device/product/index.vue
+++ b/src/views/home/device/product/index.vue
@@ -128,6 +128,7 @@
   await fetchDict()
   fetchData()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -164,7 +165,7 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="editRow('add', {})">
+          <el-button v-if="proxy.hasPerm('/device/product/add')" type="primary" @click="editRow('add', {})">
             新建
           </el-button>
         </div>
@@ -184,10 +185,10 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="120">
             <template #default="scope">
-              <el-button type="primary" link size="small" @click="editRow('edit', scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/product/update')" type="primary" link size="small" @click="editRow('edit', scope.row)">
                 编辑
               </el-button>
-              <el-button type="danger" link size="small" @click="removeRow(scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/product/delete')" type="danger" link size="small" @click="removeRow(scope.row)">
                 删除
               </el-button>
             </template>
diff --git a/src/views/home/device/type/index.vue b/src/views/home/device/type/index.vue
index 59f1343..2344e57 100644
--- a/src/views/home/device/type/index.vue
+++ b/src/views/home/device/type/index.vue
@@ -105,6 +105,7 @@
   await fetchDict()
   fetchData()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -131,7 +132,7 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="editRow('add', {})">
+          <el-button v-if="proxy.hasPerm('/device/type/add')" type="primary" @click="editRow('add', {})">
             新建
           </el-button>
         </div>
@@ -151,10 +152,10 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="120">
             <template #default="scope">
-              <el-button type="primary" link size="small" @click="editRow('edit', scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/type/update')" type="primary" link size="small" @click="editRow('edit', scope.row)">
                 编辑
               </el-button>
-              <el-button type="danger" link size="small" @click="removeRow(scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/type/delete')" type="danger" link size="small" @click="removeRow(scope.row)">
                 删除
               </el-button>
             </template>
diff --git a/src/views/home/ledger/ledger/components/gridList.vue b/src/views/home/ledger/ledger/components/gridList.vue
index d03cd9f..189edef 100644
--- a/src/views/home/ledger/ledger/components/gridList.vue
+++ b/src/views/home/ledger/ledger/components/gridList.vue
@@ -91,6 +91,7 @@
     // })
   })
 }
+const { proxy } = getCurrentInstance() as any
 // 同步日志
 const allSync = () => {
   $router.push({
@@ -139,10 +140,10 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="allSync">
+          <el-button v-if="proxy.hasPerm('/ledger/sync')" type="primary" @click="allSync">
             同步日志
           </el-button>
-          <el-button type="primary" @click="sync('all', {})">
+          <el-button v-if="proxy.hasPerm('/ledger/sync/all')" type="primary" @click="sync('all', {})">
             全量同步
           </el-button>
         </div>
@@ -160,9 +161,9 @@
           </el-table-column>
         </template>
         <template #columns>
-          <el-table-column label="操作" align="center" width="80">
+          <el-table-column v-if="proxy.hasPerm('/ledger/sync/single')" label="操作" align="center" width="80">
             <template #default="scope">
-              <el-button type="primary" link size="small" @click="sync('single', scope.row)">
+              <el-button v-if="proxy.hasPerm('/ledger/sync/single')" type="primary" link size="small" @click="sync('single', scope.row)">
                 同步
               </el-button>
             </template>
diff --git a/src/views/home/ledger/ledger/components/wellList.vue b/src/views/home/ledger/ledger/components/wellList.vue
index 9eb1f43..06f855a 100644
--- a/src/views/home/ledger/ledger/components/wellList.vue
+++ b/src/views/home/ledger/ledger/components/wellList.vue
@@ -123,6 +123,7 @@
   // await fetchDict()
   fetchData()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -159,11 +160,11 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="allSync">
+          <el-button v-if="proxy.hasPerm('/ledger/sync')" type="primary" @click="allSync">
             同步日志
           </el-button>
-          <el-button type="primary" @click="sync('all', {})">
-            全部同步
+          <el-button v-if="proxy.hasPerm('/ledger/sync/all')" type="primary" @click="sync('all', {})">
+            全量同步
           </el-button>
         </div>
       </template>
@@ -180,9 +181,9 @@
           </el-table-column>
         </template>
         <template #columns>
-          <el-table-column label="操作" align="center" width="80">
+          <el-table-column v-if="proxy.hasPerm('/ledger/sync/single')" label="操作" align="center" width="80">
             <template #default="scope">
-              <el-button type="primary" link size="small" @click="sync('single', scope.row)">
+              <el-button v-if="proxy.hasPerm('/ledger/sync/single')" type="primary" link size="small" @click="sync('single', scope.row)">
                 同步
               </el-button>
             </template>
diff --git a/src/views/home/ledger/ledger/index.vue b/src/views/home/ledger/ledger/index.vue
index a03aa12..8403fc5 100644
--- a/src/views/home/ledger/ledger/index.vue
+++ b/src/views/home/ledger/ledger/index.vue
@@ -7,7 +7,16 @@
 import type { TabsPaneContext } from 'element-plus'
 import wellList from './components/wellList.vue'
 import gridList from './components/gridList.vue'
-const activeName = ref('闸井')
+const { proxy } = getCurrentInstance() as any
+const activeName = ref(
+  proxy.hasPerm('/ledger/manage/well')
+    ? '闸井'
+    : proxy.hasPerm('/ledger/manage/station')
+      ? '场站'
+      : proxy.hasPerm('/ledger/manage/grid')
+        ? '网格'
+        : '',
+)
 const handleClick = (tab: TabsPaneContext, event: Event) => {
   // console.log(tab, event)
 }
@@ -17,13 +26,13 @@
   <!-- 布局 -->
   <app-container>
     <el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick">
-      <el-tab-pane label="闸井" name="闸井">
+      <el-tab-pane v-if="proxy.hasPerm('/ledger/manage/well')" label="闸井" name="闸井">
         <well-list v-if="activeName === '闸井'" type="1" />
       </el-tab-pane>
-      <el-tab-pane label="场站" name="场站">
+      <el-tab-pane v-if="proxy.hasPerm('/ledger/manage/station')" label="场站" name="场站">
         <well-list v-if="activeName === '场站'" type="2" />
       </el-tab-pane>
-      <el-tab-pane label="网格" name="网格">
+      <el-tab-pane v-if="proxy.hasPerm('/ledger/manage/grid')" label="网格" name="网格">
         <grid-list v-if="activeName === '网格'" />
       </el-tab-pane>
     </el-tabs>
diff --git a/src/views/home/ledger/pipeline/index.vue b/src/views/home/ledger/pipeline/index.vue
index e0d2512..01e95ac 100644
--- a/src/views/home/ledger/pipeline/index.vue
+++ b/src/views/home/ledger/pipeline/index.vue
@@ -160,6 +160,7 @@
 onMounted(async () => {
   fetchData()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -222,13 +223,13 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="editRow('add', {})">
+          <el-button v-if="proxy.hasPerm('/ledger/pipeline/add')" type="primary" @click="editRow('add', {})">
             新增
           </el-button>
-          <el-button type="primary" @click="importList">
+          <el-button v-if="proxy.hasPerm('/ledger/pipeline/import')" type="primary" @click="importList">
             批量导入
           </el-button>
-          <el-button type="primary" @click="exportList">
+          <el-button v-if="proxy.hasPerm('/ledger/pipeline/export')" type="primary" @click="exportList">
             批量导出
           </el-button>
         </div>
@@ -248,10 +249,10 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="100">
             <template #default="scope">
-              <el-button type="primary" link size="small" @click="editRow('edit', scope.row)">
+              <el-button v-if="proxy.hasPerm('/ledger/pipeline/update')" type="primary" link size="small" @click="editRow('edit', scope.row)">
                 编辑
               </el-button>
-              <el-button type="danger" link size="small" @click="removeRow(scope.row)">
+              <el-button v-if="proxy.hasPerm('/ledger/pipeline/delete')" type="danger" link size="small" @click="removeRow(scope.row)">
                 删除
               </el-button>
             </template>
diff --git a/src/views/home/ledger/sync/index.vue b/src/views/home/ledger/sync/index.vue
index 54a3218..a04bad9 100644
--- a/src/views/home/ledger/sync/index.vue
+++ b/src/views/home/ledger/sync/index.vue
@@ -62,6 +62,7 @@
 }
 // 重置查询条件f
 const reset = () => {
+  datetimerange.value = []
   listQuery.value = {
     limit: 20,
     offset: 1,
@@ -106,6 +107,8 @@
 onMounted(async () => {
   fetchData()
 })
+const { proxy } = getCurrentInstance() as any
+const $route = useRoute()
 </script>
 
 <template>
@@ -132,7 +135,7 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="goBak">
+          <el-button v-if="$route.type" type="primary" @click="goBak">
             返回
           </el-button>
         </div>
@@ -152,10 +155,10 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="80">
             <template #default="scope">
-              <el-button type="primary" link size="small">
+              <el-button v-if="proxy.hasPerm('/ledger/sync/detail')" type="primary" link size="small">
                 查看
               </el-button>
-              <el-button type="danger" link size="small" @click="removeRow(scope.row)">
+              <el-button v-if="proxy.hasPerm('/ledger/sync/delete')" type="danger" link size="small" @click="removeRow(scope.row)">
                 删除
               </el-button>
             </template>
diff --git a/src/views/home/monitor/service/index.vue b/src/views/home/monitor/service/index.vue
index 8df2239..570dc68 100644
--- a/src/views/home/monitor/service/index.vue
+++ b/src/views/home/monitor/service/index.vue
@@ -53,6 +53,7 @@
 onMounted(async () => {
   fetchData()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -66,7 +67,7 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary">
+          <el-button v-if="proxy.hasPerm('/monitor/service/add')" type="primary">
             新建
           </el-button>
         </div>
diff --git a/src/views/home/monitor/time/index.vue b/src/views/home/monitor/time/index.vue
index caa6d46..0f7f5a0 100644
--- a/src/views/home/monitor/time/index.vue
+++ b/src/views/home/monitor/time/index.vue
@@ -53,6 +53,7 @@
 onMounted(async () => {
   fetchData()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -66,7 +67,7 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary">
+          <el-button v-if="proxy.hasPerm('/monitor/time/add')" type="primary">
             新建
           </el-button>
         </div>
diff --git a/src/views/home/operation/alarm/components/detail.vue b/src/views/home/operation/alarm/components/detail.vue
index 8194cbd..4ae4a1f 100644
--- a/src/views/home/operation/alarm/components/detail.vue
+++ b/src/views/home/operation/alarm/components/detail.vue
@@ -151,6 +151,7 @@
 }
 // 点击经纬度展示地图
 const mapRef = ref()
+const { proxy } = getCurrentInstance() as any
 const showMap = (data: any) => {
   console.log(data, 'data')
   if (data.text === '位置') {
@@ -160,6 +161,13 @@
         2: 'StationMonitorDetail',
         3: 'PipelineMonitorDetail',
       } as { [key: string]: string }
+      // 判断是否有菜单权限
+      const watchObjectAuth = {
+        1: '/well',
+        2: '/station/monitor',
+        3: '/pipeline',
+      } as { [key: string]: string }
+      if (!proxy.hasPerm(watchObjectAuth[detailInfo.value.watchObject])) { return }
       $router.push({
         name: watchObject[detailInfo.value.watchObject],
         query: {
diff --git a/src/views/home/operation/alarm/index.vue b/src/views/home/operation/alarm/index.vue
index ac0f31b..e53c991 100644
--- a/src/views/home/operation/alarm/index.vue
+++ b/src/views/home/operation/alarm/index.vue
@@ -82,6 +82,7 @@
 }
 // 重置查询条件f
 const reset = () => {
+  datetimerange.value = []
   listQuery.value = {
     limit: 20,
     offset: 1,
@@ -315,7 +316,7 @@
               <el-button v-if="proxy.hasPerm('/alarm/device/delete')" type="primary" @click="batchDeleteRow">
                 批量删除
               </el-button>
-              <el-button type="primary" @click="exportList">
+              <el-button v-if="proxy.hasPerm('/alarm/device/export')" type="primary" @click="exportList">
                 导出
               </el-button>
             </div>
@@ -336,7 +337,7 @@
               </el-table-column>
             </template>
             <template #columns>
-              <el-table-column label="操作" align="center" width="80">
+              <el-table-column v-if="proxy.hasPerm('/alarm/device/detail')" label="操作" align="center" width="80">
                 <template #default="scope">
                   <el-button type="primary" link size="small" @click="detail(scope.row)">
                     查看
diff --git a/src/views/home/operation/history/index.vue b/src/views/home/operation/history/index.vue
index 5c04ff7..d96ac57 100644
--- a/src/views/home/operation/history/index.vue
+++ b/src/views/home/operation/history/index.vue
@@ -78,6 +78,7 @@
 }
 // 重置查询条件f
 const reset = () => {
+  datetimerange.value = []
   listQuery.value = {
     limit: 20,
     offset: 1,
@@ -161,6 +162,7 @@
     fetchData()
   })
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -218,7 +220,7 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="exportList">
+          <el-button v-if="proxy.hasPerm('/operation/history/export')" type="primary" @click="exportList">
             导出
           </el-button>
         </div>
@@ -241,7 +243,7 @@
           </el-table-column>
         </template>
         <template #columns>
-          <el-table-column label="操作" align="center" width="80">
+          <el-table-column v-if="proxy.hasPerm('/operation/history/detail')" label="操作" align="center" width="80">
             <template #default="scope">
               <el-button type="primary" link size="small" @click="detailRow(scope.row)">
                 查看
diff --git a/src/views/home/operation/manufacturer/index.vue b/src/views/home/operation/manufacturer/index.vue
index 4a5816a..5f647c3 100644
--- a/src/views/home/operation/manufacturer/index.vue
+++ b/src/views/home/operation/manufacturer/index.vue
@@ -75,6 +75,7 @@
 }
 // 重置查询条件f
 const reset = () => {
+  datetimerange.value = []
   listQuery.value = {
     limit: 20,
     offset: 1,
@@ -125,6 +126,7 @@
   await fetchDict()
   fetchData()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -178,7 +180,7 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="exportList">
+          <el-button v-if="proxy.hasPerm('/operation/manufacturer/export')" type="primary" @click="exportList">
             导出
           </el-button>
         </div>
diff --git a/src/views/home/operation/trajectory/index.vue b/src/views/home/operation/trajectory/index.vue
index 9312fd7..606958e 100644
--- a/src/views/home/operation/trajectory/index.vue
+++ b/src/views/home/operation/trajectory/index.vue
@@ -65,6 +65,7 @@
 }
 // 重置查询条件f
 const reset = () => {
+  datetimerange.value = []
   listQuery.value = {
     limit: 20,
     offset: 1,
@@ -114,6 +115,7 @@
   await fetchDict()
   fetchData()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -175,7 +177,7 @@
           </span>
         </template>
         <template #columns>
-          <el-table-column label="操作" width="80" align="center">
+          <el-table-column v-if="proxy.hasPerm('/operation/trajectory/detail')" label="操作" width="80" align="center">
             <template #default="scope">
               <el-button type="primary" link size="small" @click="detail(scope.row)">
                 查看
diff --git a/src/views/home/pipeline/components/detailData.vue b/src/views/home/pipeline/components/detailData.vue
index 80b6886..760b1c5 100644
--- a/src/views/home/pipeline/components/detailData.vue
+++ b/src/views/home/pipeline/components/detailData.vue
@@ -7,7 +7,13 @@
 import type { TabsPaneContext } from 'element-plus'
 import monitorData from './monitorDataList.vue'
 import maintenanceRecord from '@/views/home/well/components/maintenanceRecord.vue'
-const activeName = ref('监控数据')
+const { proxy } = getCurrentInstance() as any
+const activeName = ref(
+  proxy.hasPerm('/pipeline/monitor/data')
+    ? '监控数据'
+    : proxy.hasPerm('/pipeline/monitor/maintenance')
+      ? '监控设备维护记录'
+      : '')
 const handleClick = (tab: TabsPaneContext, event: Event) => {
   // console.log(tab, event)
 }
@@ -15,10 +21,10 @@
 
 <template>
   <el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick">
-    <el-tab-pane label="监控数据" name="监控数据">
+    <el-tab-pane v-if="proxy.hasPerm('/pipeline/monitor/data')" label="监控数据" name="监控数据">
       <monitor-data v-if="activeName === '监控数据'" />
     </el-tab-pane>
-    <el-tab-pane label="监控设备维护记录" name="监控设备维护记录">
+    <el-tab-pane v-if="proxy.hasPerm('/pipeline/monitor/maintenance')" label="监控设备维护记录" name="监控设备维护记录">
       <maintenance-record v-if="activeName === '监控设备维护记录'" />
     </el-tab-pane>
   </el-tabs>
diff --git a/src/views/home/pipeline/index.vue b/src/views/home/pipeline/index.vue
index 90baef0..4d66e51 100644
--- a/src/views/home/pipeline/index.vue
+++ b/src/views/home/pipeline/index.vue
@@ -254,6 +254,7 @@
     tableHeight.value = window.innerHeight - 60 - 50 - 10 - 98 - 10 - 52 - 52 - 10
   }
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -348,7 +349,7 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary">
+          <el-button v-if="proxy.hasPerm('/pipeline/export')" type="primary">
             导出
           </el-button>
         </div>
@@ -368,7 +369,7 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="80">
             <template #default="scope">
-              <el-button type="primary" link size="small" @click="editRow('detail', scope.row)">
+              <el-button v-if="proxy.hasPerm('/pipeline/detail')" type="primary" link size="small" @click="editRow('detail', scope.row)">
                 查看
               </el-button>
               <!-- <el-button type="primary" link size="small" @click="editRow('edit', scope.row)">
diff --git a/src/views/home/rule/agreement/index.vue b/src/views/home/rule/agreement/index.vue
index fd41cd3..f1cfe15 100644
--- a/src/views/home/rule/agreement/index.vue
+++ b/src/views/home/rule/agreement/index.vue
@@ -95,6 +95,7 @@
 onMounted(async () => {
   fetchData()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -119,7 +120,7 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="editRow('add', {})">
+          <el-button v-if="proxy.hasPerm('/rule/agreement/add')" type="primary" @click="editRow('add', {})">
             新建
           </el-button>
         </div>
@@ -139,10 +140,10 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="120">
             <template #default="scope">
-              <el-button type="primary" link size="small" @click="editRow('edit', scope.row)">
+              <el-button v-if="proxy.hasPerm('/rule/agreement/update')" type="primary" link size="small" @click="editRow('edit', scope.row)">
                 编辑
               </el-button>
-              <el-button type="danger" link size="small" @click="removeRow(scope.row)">
+              <el-button v-if="proxy.hasPerm('/rule/agreement/delete')" type="danger" link size="small" @click="removeRow(scope.row)">
                 删除
               </el-button>
             </template>
diff --git a/src/views/home/rule/alarm/components/alarmLevelList.vue b/src/views/home/rule/alarm/components/alarmLevelList.vue
index c8ffb7d..6c337c4 100644
--- a/src/views/home/rule/alarm/components/alarmLevelList.vue
+++ b/src/views/home/rule/alarm/components/alarmLevelList.vue
@@ -87,6 +87,7 @@
 const cancel = () => {
   dialogFormVisible.value = false
 }
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -97,7 +98,7 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="detailRow('create', {})">
+          <el-button v-if="proxy.hasPerm('/rule/alarm/level/add')" type="primary" @click="detailRow('create', {})">
             新增
           </el-button>
         </div>
@@ -117,10 +118,10 @@
         <template #columns>
           <el-table-column label="操作" width="120" align="center">
             <template #default="scope">
-              <el-button type="primary" link size="small" @click="detailRow('edit', scope.row)">
+              <el-button v-if="proxy.hasPerm('/rule/alarm/level/update')" type="primary" link size="small" @click="detailRow('edit', scope.row)">
                 编辑
               </el-button>
-              <el-button type="danger" link size="small" @click="removeRow(scope.row)">
+              <el-button v-if="proxy.hasPerm('/rule/alarm/level/delete')" type="danger" link size="small" @click="removeRow(scope.row)">
                 删除
               </el-button>
             </template>

diff --git a/src/App.vue b/src/App.vue
index cde81b3..8a00f5d 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -125,7 +125,7 @@
         '--g-sub-sidebar-actual-width': subSidebarActualWidth,
       }"
     />
-    <system-info v-if="browserType !== 'mobile'" />
+    <!-- <system-info v-if="browserType !== 'mobile'" /> -->
     <audio id="eventAudio" src="" autoplay />
   </el-config-provider>
 </template>
diff --git a/src/layouts/components/Tools/alarmDialog.vue b/src/layouts/components/Tools/alarmDialog.vue
index 1828375..df89ab8 100644
--- a/src/layouts/components/Tools/alarmDialog.vue
+++ b/src/layouts/components/Tools/alarmDialog.vue
@@ -116,7 +116,7 @@
     </div>
     <template #footer>
       <div class="dialog-footer">
-        <div class="btn" @click="detail">
+        <div v-if="proxy.hasPerm('/alarm/current')" class="btn" @click="detail">
           查看
         </div>
         <div v-if="info.isSound === '1'" class="btn" @click="closeSound">
diff --git a/src/layouts/components/Tools/alarmList.vue b/src/layouts/components/Tools/alarmList.vue
index c3a9d2a..5356b74 100644
--- a/src/layouts/components/Tools/alarmList.vue
+++ b/src/layouts/components/Tools/alarmList.vue
@@ -54,6 +54,7 @@
 }
 // 查看当前行
 const detailRow = (row: any) => {
+  if (!proxy.hasPerm('/alarm/current')) { return }
   $router.push({
     name: 'AlarmCurrent',
     query: {
@@ -77,21 +78,6 @@
   localStorage.setItem('eventAudio', 'pause')
 }
 const dialogRef = ref()
-// const dialog = () => {
-//   const row = {
-//     alarmNoteMethod: '1', // 消息提醒 1:弹窗，2:消息提醒
-//     isSound: '1', // 报警音效，1:开，0:关
-//     isSend: '1', // 报警推送，1:开，0:关
-//     isText: '1', // 报警短息，1:开，0:关
-//     alarmType: '浓度超限',
-//     tagNumber: 'NX5702',
-//     alarmTime: '2024-09-09',
-//     value: '20',
-//     typeName: '燃气智能终端',
-//     alarmLevel: '一级',
-//   }
-//   dialogRef.value.initDialog(row)
-// }
 const fetchData = (isLoading = false) => {
   loading.value = true
   if (isLoading) {
@@ -115,7 +101,10 @@
       dialogRef.value.initDialog(newVal)
     }
     if (newVal.isSound === '1') {
-      play()
+      // play()
+      if (!localStorage.getItem('eventAudio')) {
+        proxy.playAudio()
+      }
     }
     fetchData(false)
   }
@@ -146,6 +135,7 @@
 //     window.localStorage.removeItem('token')
 //   }
 // }
+// const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -180,7 +170,7 @@
                   {{ message.processStatus
                     === '未读' ? '未读' : '已读' }}
                 </el-tag>
-                <el-tag type="info" size="small" style="margin-left: 5px;">
+                <el-tag type="info" size="small" style="margin-left: 5px;" @click="detailRow(message)">
                   查看
                 </el-tag>
               </div>
@@ -214,7 +204,7 @@
       <!-- <div class="close" @click="dialog">
         弹窗
       </div> -->
-      <div class="more" @click="moreList">
+      <div v-if="proxy.hasPerm('/alarm/current')" class="more" @click="moreList">
         查看更多
       </div>
     </div>
diff --git a/src/layouts/components/Tools/index.vue b/src/layouts/components/Tools/index.vue
index 9f2d41f..61f9707 100644
--- a/src/layouts/components/Tools/index.vue
+++ b/src/layouts/components/Tools/index.vue
@@ -79,6 +79,7 @@
   // 断开 websocket
   // websocket.destroyWebSocket()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -89,18 +90,18 @@
           <svg-icon name="ep:search" />
         </el-icon>
       </span>
-      <span class="item" @click="board">
+      <span v-if="proxy.hasPerm('/fullscreen')" class="item" @click="board">
         <el-icon>
           <svg-icon name="ep:data-line" />
         </el-icon>
       </span>
-      <span v-if="settingsStore.mode === 'pc' && settingsStore.toolbar.enableFullscreen" class="item" @click="toggle">
+      <span class="item" @click="toggle">
         <el-icon>
           <svg-icon :name="isFullscreen ? 'fullscreen-exit' : 'fullscreen'" />
         </el-icon>
       </span>
       <!-- 报警信息列表 -->
-      <span class="item">
+      <span v-if="proxy.hasPerm('/alarmnotice')" class="item">
         <el-popover width="390">
           <template #reference>
             <div>
diff --git a/src/layouts/components/Topbar/index.vue b/src/layouts/components/Topbar/index.vue
index 2863cef..4e3120e 100644
--- a/src/layouts/components/Topbar/index.vue
+++ b/src/layouts/components/Topbar/index.vue
@@ -67,7 +67,7 @@
           </transition-group>
         </el-breadcrumb>
       </div>
-      <tools />
+      <!-- <tools /> -->
     </div>
   </div>
 </template>
diff --git a/src/router/modules/pc.ts b/src/router/modules/pc.ts
index aacd6fa..97ced45 100644
--- a/src/router/modules/pc.ts
+++ b/src/router/modules/pc.ts
@@ -40,7 +40,7 @@
       icon: 'ep:key',
       sidebar: false,
       breadcrumb: false,
-      // auth: '/fullscreen',
+      auth: '/fullscreen',
     },
   },
   {
@@ -155,7 +155,7 @@
           sidebar: false,
           breadcrumb: false,
           activeMenu: '/well',
-          auth: '/well/detail',
+          auth: '/well',
         },
       },
     ],
diff --git a/src/views/home/alarm/count/components/locationAnalysis.vue b/src/views/home/alarm/count/components/locationAnalysis.vue
index fc75b9e..bff1853 100644
--- a/src/views/home/alarm/count/components/locationAnalysis.vue
+++ b/src/views/home/alarm/count/components/locationAnalysis.vue
@@ -46,6 +46,7 @@
   })
 }
 fetchData()
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -75,6 +76,9 @@
         <el-button type="primary" style="margin: 0 5px;" @click="fetchData">
           搜索
         </el-button>
+        <el-button v-if="proxy.hasPerm('/alarm/count/exportLocation')" type="primary" style="margin: 0 5px;">
+          导出
+        </el-button>
       </div>
     </template>
     <template #content>
diff --git a/src/views/home/alarm/current/components/detail.vue b/src/views/home/alarm/current/components/detail.vue
index dd3b31a..4204c92 100644
--- a/src/views/home/alarm/current/components/detail.vue
+++ b/src/views/home/alarm/current/components/detail.vue
@@ -111,7 +111,7 @@
   const res2 = await getAlarmTypeListPage({ offset: 1, limit: 9999 });
   ($route.query.type === 'history' ? getAlarmDetail : getAlarmDetail)($route.query.id as string).then((res) => {
     detailInfo.value = toHumpObject(res.data)
-    detailInfo.value.realAlarmName = detailInfo.value.realAlarm === '1' ? '报警' : '误报'
+    detailInfo.value.realAlarmName = detailInfo.value.realAlarm === '0' ? '是' : '否'
     detailInfo.value.alarmTypeName = res2.data.rows.filter((item: any) => item.id === detailInfo.value.alarmTypeId)[0]?.alarmType || ''
     detailInfo.value.alarmLevelName = res1.data.rows.filter((item: any) => item.id === detailInfo.value.alarmLevel)[0]?.alarmLevel || ''
     detailInfo.value.duration = detailInfo.value.ts && detailInfo.value.cancelTime ? getDateDiff(detailInfo.value.ts, detailInfo.value.cancelTime) : ''
@@ -139,6 +139,7 @@
 }
 // 点击经纬度展示地图
 const mapRef = ref()
+const { proxy } = getCurrentInstance() as any
 const showMap = (data: any) => {
   console.log(data, 'data')
   if (data.text === '位置') {
@@ -148,6 +149,13 @@
         2: 'StationMonitorDetail',
         3: 'PipelineMonitorDetail',
       } as { [key: string]: string }
+      // 判断是否有菜单权限
+      const watchObjectAuth = {
+        1: '/well',
+        2: '/station/monitor',
+        3: '/pipeline',
+      } as { [key: string]: string }
+      if (!proxy.hasPerm(watchObjectAuth[detailInfo.value.watchObject])) { return }
       $router.push({
         name: watchObject[detailInfo.value.watchObject],
         query: {
diff --git a/src/views/home/alarm/current/components/detailInfoDialog.vue b/src/views/home/alarm/current/components/detailInfoDialog.vue
index c089449..7fbf06b 100644
--- a/src/views/home/alarm/current/components/detailInfoDialog.vue
+++ b/src/views/home/alarm/current/components/detailInfoDialog.vue
@@ -114,6 +114,7 @@
   })
 }
 defineExpose({ initDialog, close })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -131,7 +132,7 @@
     <!-- 头部 -->
     <div class="header">
       <span>{{ info.alarmContent }}</span>
-      <span class="more" @click="moreData">>>更多</span>
+      <span v-if="proxy.hasPerm(type === 'data' ? '/alarm/current/more' : '/alarm/device/more')" class="more" @click="moreData">>>更多</span>
     </div>
     <div class="content">
       <div v-show="type === 'device'" class="item">
@@ -162,7 +163,7 @@
         报警设备:
         <span style="padding-left: 6px;">{{ info.devcode }} </span>
         <el-button
-          v-if="info.devTypeName === '燃气智能监测终端' || info.devTypeName === '液位检测仪' || info.devTypeName === '井盖监测仪'"
+          v-if="(info.devTypeName === '燃气智能监测终端' || info.devTypeName === '液位检测仪' || info.devTypeName === '井盖监测仪') && proxy.hasPerm('/alarm/current/data')"
           size="small" style="margin-left: 6px;" @click="viewData"
         >
           查看数据
@@ -228,7 +229,7 @@
         <span style="padding-left: 6px;">
           {{ info.confirmContent }}
         </span>
-        <el-button v-if="type === 'data'" size="small" style="padding-left: 6px;" @click="viewProcess">
+        <el-button v-if="type === 'data' && proxy.hasPerm('/alarm/current/process')" size="small" style="padding-left: 6px;" @click="viewProcess">
           流程图
         </el-button>
       </div>
@@ -246,17 +247,17 @@
       </div>
     </div>
     <div class="footer">
-      <el-button v-if="Number(info.processStatus) < 4 && type === 'data'" size="small" @click="remind">
+      <el-button v-if="(Number(info.processStatus) < 4 && type === 'data') && proxy.hasPerm('/alarm/current/remind')" size="small" @click="remind">
         提醒责任人
       </el-button>
       <el-button
-        v-if="type === 'device' && (info.processStatusName === '待处置' || info.processStatusName === '挂起')"
+        v-if="(type === 'device' && (info.processStatusName === '待处置' || info.processStatusName === '挂起')) && proxy.hasPerm('/alarm/device/handler')"
         size="small" @click="handler"
       >
         报警处置
       </el-button>
       <el-button
-        v-if="Number(info.processStatus) <= 3 || (type === 'device' && info.processStatusName === '待处置') || info.processStatusName === '挂起'"
+        v-if="(Number(info.processStatus) <= 3 || (type === 'device' && info.processStatusName === '待处置') || info.processStatusName === '挂起') && proxy.hasPerm(type === 'device' ? '/alarm/device/pending' : '/alarm/current/pending')"
         type="primary" size="small" @click="pending"
       >
         挂起
diff --git a/src/views/home/alarm/current/index.vue b/src/views/home/alarm/current/index.vue
index d019bbf..e2714bb 100644
--- a/src/views/home/alarm/current/index.vue
+++ b/src/views/home/alarm/current/index.vue
@@ -4,6 +4,7 @@
   Date: 2023-06-28
  -->
 <script lang="ts" setup name="CurrentAlarm">
+import dayjs from 'dayjs'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import { ArrowLeftBold, ArrowRightBold } from '@element-plus/icons-vue'
 import MapCom from './components/map.vue'
@@ -100,6 +101,7 @@
       path: '/alarm/current',
     })
   }
+  datetimerange.value = []
   listQuery.value = {
     limit: 20,
     offset: 1,
@@ -131,8 +133,8 @@
   if ($route.query.row) {
     loadingTable.value = true
     const row = JSON.parse($route.query.row as string)
-    getCurrentAlarmListPage({ offset: 1, limit: 99999 }).then((res) => {
-      const data = res.data.rows.filter((item: any) => item.id === row.id)
+    getCurrentAlarmListPage({ offset: 1, limit: 50 }).then((res) => {
+      const data = res.data.rows.filter((item: any) => item.id === row.alarmId)
       if (data.length) {
         list1.value = data.map((item: any) => ({
           ...item,
@@ -153,7 +155,10 @@
     })
     return
   }
-  fetchData()
+  datetimerange.value = [dayjs().subtract(7, 'day').format('YYYY-MM-DD HH:mm:ss'), dayjs().format('YYYY-MM-DD HH:mm:ss')]
+  setTimeout(() => {
+    fetchData()
+  })
 })
 // 表格标识  地图或普通
 const tableFlag = ref('normal')
@@ -181,6 +186,10 @@
 const mapRef = ref()
 const mapData = ref({})
 async function detail(row: any) {
+  if (row.processStatusName === '未读') {
+    list1.value[list1.value.findIndex((item: any) => item.id === row.id)].processStatusName = '已读'
+    row.processStatusName = '已读'
+  }
   const res = await detailAlarm(row.id)
   const data = toHumpObject(res.data)
   mapData.value = row
@@ -362,7 +371,7 @@
               <el-button v-if="proxy.hasPerm('/alarm/current/delete')" type="primary" @click="batchDeleteRow">
                 批量删除
               </el-button>
-              <el-button type="primary" @click="exportList">
+              <el-button v-if="proxy.hasPerm('/alarm/current/export')" type="primary" @click="exportList">
                 导出
               </el-button>
             </div>
@@ -383,7 +392,7 @@
               </el-table-column>
             </template>
             <template #columns>
-              <el-table-column label="操作" align="center" width="80">
+              <el-table-column v-if="proxy.hasPerm('/alarm/current/detail')" label="操作" align="center" width="80">
                 <template #default="scope">
                   <el-button type="primary" link size="small" @click="detail(scope.row)">
                     查看
diff --git a/src/views/home/alarm/history/index.vue b/src/views/home/alarm/history/index.vue
index eeb49fc..3c810c3 100644
--- a/src/views/home/alarm/history/index.vue
+++ b/src/views/home/alarm/history/index.vue
@@ -97,6 +97,7 @@
 }
 // 重置查询条件f
 const reset = () => {
+  datetimerange.value = []
   listQuery.value = {
     limit: 20,
     offset: 1,
@@ -189,6 +190,7 @@
   })
 }
 fetchDict()
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -249,7 +251,7 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="exportList">
+          <el-button v-if="proxy.hasPerm('/alarm/history/export')" type="primary" @click="exportList">
             导出
           </el-button>
         </div>
@@ -272,7 +274,7 @@
           </el-table-column>
         </template>
         <template #columns>
-          <el-table-column label="操作" align="center" width="80">
+          <el-table-column v-if="proxy.hasPerm('/alarm/history/detail')" label="操作" align="center" width="80">
             <template #default="scope">
               <el-button type="primary" link size="small" @click="moreData(scope.row)">
                 查看
diff --git a/src/views/home/dashboard/index.vue b/src/views/home/dashboard/index.vue
index d2f7e3c..42dfbed 100644
--- a/src/views/home/dashboard/index.vue
+++ b/src/views/home/dashboard/index.vue
@@ -42,7 +42,7 @@
     value: '0',
     name: '在线',
     unit: '个',
-    id: '1',
+    id: '1,2',
   },
   {
     img: img.lixian,
@@ -56,7 +56,7 @@
     value: '0',
     name: '停用',
     unit: '个',
-    id: '2',
+    id: '3',
   },
 ])
 // 工作台数据
@@ -133,7 +133,11 @@
   deviceOperationLoading.value = true
   getDeviceStatus().then((res) => {
     res.data.forEach((element: any) => {
-      const index = deviceOperationData.value.findIndex((item: any) => item.id === element.name)
+      if (element.name === '1' || element.name === '2') {
+        deviceOperationData.value[0].value = Number(deviceOperationData.value[0].value || '0') + Number(element.value)
+        return
+      }
+      const index = deviceOperationData.value.findIndex((item: any) => item.id.includes(element.name))
       if (index !== -1) {
         deviceOperationData.value[index].value = element.value
       }
diff --git a/src/views/home/device/count/components/bottom.vue b/src/views/home/device/count/components/bottom.vue
index 28a4d78..e4e56fa 100644
--- a/src/views/home/device/count/components/bottom.vue
+++ b/src/views/home/device/count/components/bottom.vue
@@ -110,6 +110,7 @@
   })
 }
 fetchDict()
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -148,7 +149,7 @@
             <template #btns-right>
               <!-- 操作 -->
               <div>
-                <el-button type="primary">
+                <el-button v-if="proxy.hasPerm('/device/count/offline/export')" type="primary">
                   导出
                 </el-button>
               </div>
diff --git a/src/views/home/device/device/index.vue b/src/views/home/device/device/index.vue
index c3970b9..9cdd606 100644
--- a/src/views/home/device/device/index.vue
+++ b/src/views/home/device/device/index.vue
@@ -88,6 +88,7 @@
 }
 // 重置查询条件f
 const reset = () => {
+  datetimerange.value = []
   listQuery.value = {
     limit: 20,
     offset: 1,
@@ -296,6 +297,7 @@
   fetchDict()
   fetchData()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -372,17 +374,17 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="editRow('add', {})">
+          <el-button v-if="proxy.hasPerm('/device/manage/add')" type="primary" @click="editRow('add', {})">
             新建
           </el-button>
-          <el-button type="primary" @click="downloadTemplate">
+          <el-button v-if="proxy.hasPerm('/device/manage/down')" type="primary" @click="downloadTemplate">
             模板下载
           </el-button>
-          <el-button type="primary" @click="importList">
+          <el-button v-if="proxy.hasPerm('/device/manage/import')" type="primary" @click="importList">
             批量导入
           </el-button>
-          <el-button type="primary" @click="exportList">
-            导出列表
+          <el-button v-if="proxy.hasPerm('/device/manage/export')" type="primary" @click="exportList">
+            导出
           </el-button>
           <input ref="fileRef" style="display: none;" type="file" accept=".xls,.xlsx" @change="onFileChange">
         </div>
@@ -409,16 +411,16 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="150">
             <template #default="scope">
-              <el-button type="primary" link size="small" @click="editRow('detail', scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/manage/detail')" type="primary" link size="small" @click="editRow('detail', scope.row)">
                 查看
               </el-button>
-              <el-button type="primary" link size="small" @click="editRow('edit', scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/manage/update')" type="primary" link size="small" @click="editRow('edit', scope.row)">
                 编辑
               </el-button>
-              <el-button type="danger" link size="small" @click="changeDefense(scope.row)">
+              <!-- <el-button v-if="proxy.hasPerm('/device/manage/add')" type="danger" link size="small" @click="changeDefense(scope.row)">
                 撤防
-              </el-button>
-              <el-button type="danger" link size="small" @click="removeRow(scope.row)">
+              </el-button> -->
+              <el-button v-if="proxy.hasPerm('/device/manage/delete')" type="danger" link size="small" @click="removeRow(scope.row)">
                 删除
               </el-button>
             </template>
diff --git a/src/views/home/device/instruction/index.vue b/src/views/home/device/instruction/index.vue
index 1e598ed..1da6706 100644
--- a/src/views/home/device/instruction/index.vue
+++ b/src/views/home/device/instruction/index.vue
@@ -78,6 +78,7 @@
 }
 // 重置查询条件f
 const reset = () => {
+  datetimerange.value = []
   listQuery.value = {
     limit: 20,
     offset: 1,
@@ -158,6 +159,7 @@
     editRef.value.initDialog('addOther', {})
   }
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -213,10 +215,10 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary">
+          <el-button v-if="proxy.hasPerm('/device/instruction/batch')" type="primary">
             批量下发
           </el-button>
-          <el-button type="primary" @click="editRow('add', {})">
+          <el-button v-if="proxy.hasPerm('/device/instruction/add')" type="primary" @click="editRow('add', {})">
             新建
           </el-button>
         </div>
@@ -236,13 +238,13 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="120">
             <template #default="scope">
-              <el-button type="primary" link size="small" @click="editRow('detail', scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/instruction/detail')" type="primary" link size="small" @click="editRow('detail', scope.row)">
                 查看
               </el-button>
-              <el-button v-if="scope.row.status === '2'" type="primary" link size="small" @click="editRow('edit', scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/instruction/again') && scope.row.status === '2'" type="primary" link size="small" @click="editRow('edit', scope.row)">
                 重新下发
               </el-button>
-              <el-button type="danger" link size="small" @click="removeRow(scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/instruction/delete')" type="danger" link size="small" @click="removeRow(scope.row)">
                 删除
               </el-button>
             </template>
diff --git a/src/views/home/device/product/index.vue b/src/views/home/device/product/index.vue
index 799fc90..fdd5463 100644
--- a/src/views/home/device/product/index.vue
+++ b/src/views/home/device/product/index.vue
@@ -128,6 +128,7 @@
   await fetchDict()
   fetchData()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -164,7 +165,7 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="editRow('add', {})">
+          <el-button v-if="proxy.hasPerm('/device/product/add')" type="primary" @click="editRow('add', {})">
             新建
           </el-button>
         </div>
@@ -184,10 +185,10 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="120">
             <template #default="scope">
-              <el-button type="primary" link size="small" @click="editRow('edit', scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/product/update')" type="primary" link size="small" @click="editRow('edit', scope.row)">
                 编辑
               </el-button>
-              <el-button type="danger" link size="small" @click="removeRow(scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/product/delete')" type="danger" link size="small" @click="removeRow(scope.row)">
                 删除
               </el-button>
             </template>
diff --git a/src/views/home/device/type/index.vue b/src/views/home/device/type/index.vue
index 59f1343..2344e57 100644
--- a/src/views/home/device/type/index.vue
+++ b/src/views/home/device/type/index.vue
@@ -105,6 +105,7 @@
   await fetchDict()
   fetchData()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -131,7 +132,7 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="editRow('add', {})">
+          <el-button v-if="proxy.hasPerm('/device/type/add')" type="primary" @click="editRow('add', {})">
             新建
           </el-button>
         </div>
@@ -151,10 +152,10 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="120">
             <template #default="scope">
-              <el-button type="primary" link size="small" @click="editRow('edit', scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/type/update')" type="primary" link size="small" @click="editRow('edit', scope.row)">
                 编辑
               </el-button>
-              <el-button type="danger" link size="small" @click="removeRow(scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/type/delete')" type="danger" link size="small" @click="removeRow(scope.row)">
                 删除
               </el-button>
             </template>
diff --git a/src/views/home/ledger/ledger/components/gridList.vue b/src/views/home/ledger/ledger/components/gridList.vue
index d03cd9f..189edef 100644
--- a/src/views/home/ledger/ledger/components/gridList.vue
+++ b/src/views/home/ledger/ledger/components/gridList.vue
@@ -91,6 +91,7 @@
     // })
   })
 }
+const { proxy } = getCurrentInstance() as any
 // 同步日志
 const allSync = () => {
   $router.push({
@@ -139,10 +140,10 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="allSync">
+          <el-button v-if="proxy.hasPerm('/ledger/sync')" type="primary" @click="allSync">
             同步日志
           </el-button>
-          <el-button type="primary" @click="sync('all', {})">
+          <el-button v-if="proxy.hasPerm('/ledger/sync/all')" type="primary" @click="sync('all', {})">
             全量同步
           </el-button>
         </div>
@@ -160,9 +161,9 @@
           </el-table-column>
         </template>
         <template #columns>
-          <el-table-column label="操作" align="center" width="80">
+          <el-table-column v-if="proxy.hasPerm('/ledger/sync/single')" label="操作" align="center" width="80">
             <template #default="scope">
-              <el-button type="primary" link size="small" @click="sync('single', scope.row)">
+              <el-button v-if="proxy.hasPerm('/ledger/sync/single')" type="primary" link size="small" @click="sync('single', scope.row)">
                 同步
               </el-button>
             </template>
diff --git a/src/views/home/ledger/ledger/components/wellList.vue b/src/views/home/ledger/ledger/components/wellList.vue
index 9eb1f43..06f855a 100644
--- a/src/views/home/ledger/ledger/components/wellList.vue
+++ b/src/views/home/ledger/ledger/components/wellList.vue
@@ -123,6 +123,7 @@
   // await fetchDict()
   fetchData()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -159,11 +160,11 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="allSync">
+          <el-button v-if="proxy.hasPerm('/ledger/sync')" type="primary" @click="allSync">
             同步日志
           </el-button>
-          <el-button type="primary" @click="sync('all', {})">
-            全部同步
+          <el-button v-if="proxy.hasPerm('/ledger/sync/all')" type="primary" @click="sync('all', {})">
+            全量同步
           </el-button>
         </div>
       </template>
@@ -180,9 +181,9 @@
           </el-table-column>
         </template>
         <template #columns>
-          <el-table-column label="操作" align="center" width="80">
+          <el-table-column v-if="proxy.hasPerm('/ledger/sync/single')" label="操作" align="center" width="80">
             <template #default="scope">
-              <el-button type="primary" link size="small" @click="sync('single', scope.row)">
+              <el-button v-if="proxy.hasPerm('/ledger/sync/single')" type="primary" link size="small" @click="sync('single', scope.row)">
                 同步
               </el-button>
             </template>
diff --git a/src/views/home/ledger/ledger/index.vue b/src/views/home/ledger/ledger/index.vue
index a03aa12..8403fc5 100644
--- a/src/views/home/ledger/ledger/index.vue
+++ b/src/views/home/ledger/ledger/index.vue
@@ -7,7 +7,16 @@
 import type { TabsPaneContext } from 'element-plus'
 import wellList from './components/wellList.vue'
 import gridList from './components/gridList.vue'
-const activeName = ref('闸井')
+const { proxy } = getCurrentInstance() as any
+const activeName = ref(
+  proxy.hasPerm('/ledger/manage/well')
+    ? '闸井'
+    : proxy.hasPerm('/ledger/manage/station')
+      ? '场站'
+      : proxy.hasPerm('/ledger/manage/grid')
+        ? '网格'
+        : '',
+)
 const handleClick = (tab: TabsPaneContext, event: Event) => {
   // console.log(tab, event)
 }
@@ -17,13 +26,13 @@
   <!-- 布局 -->
   <app-container>
     <el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick">
-      <el-tab-pane label="闸井" name="闸井">
+      <el-tab-pane v-if="proxy.hasPerm('/ledger/manage/well')" label="闸井" name="闸井">
         <well-list v-if="activeName === '闸井'" type="1" />
       </el-tab-pane>
-      <el-tab-pane label="场站" name="场站">
+      <el-tab-pane v-if="proxy.hasPerm('/ledger/manage/station')" label="场站" name="场站">
         <well-list v-if="activeName === '场站'" type="2" />
       </el-tab-pane>
-      <el-tab-pane label="网格" name="网格">
+      <el-tab-pane v-if="proxy.hasPerm('/ledger/manage/grid')" label="网格" name="网格">
         <grid-list v-if="activeName === '网格'" />
       </el-tab-pane>
     </el-tabs>
diff --git a/src/views/home/ledger/pipeline/index.vue b/src/views/home/ledger/pipeline/index.vue
index e0d2512..01e95ac 100644
--- a/src/views/home/ledger/pipeline/index.vue
+++ b/src/views/home/ledger/pipeline/index.vue
@@ -160,6 +160,7 @@
 onMounted(async () => {
   fetchData()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -222,13 +223,13 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="editRow('add', {})">
+          <el-button v-if="proxy.hasPerm('/ledger/pipeline/add')" type="primary" @click="editRow('add', {})">
             新增
           </el-button>
-          <el-button type="primary" @click="importList">
+          <el-button v-if="proxy.hasPerm('/ledger/pipeline/import')" type="primary" @click="importList">
             批量导入
           </el-button>
-          <el-button type="primary" @click="exportList">
+          <el-button v-if="proxy.hasPerm('/ledger/pipeline/export')" type="primary" @click="exportList">
             批量导出
           </el-button>
         </div>
@@ -248,10 +249,10 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="100">
             <template #default="scope">
-              <el-button type="primary" link size="small" @click="editRow('edit', scope.row)">
+              <el-button v-if="proxy.hasPerm('/ledger/pipeline/update')" type="primary" link size="small" @click="editRow('edit', scope.row)">
                 编辑
               </el-button>
-              <el-button type="danger" link size="small" @click="removeRow(scope.row)">
+              <el-button v-if="proxy.hasPerm('/ledger/pipeline/delete')" type="danger" link size="small" @click="removeRow(scope.row)">
                 删除
               </el-button>
             </template>
diff --git a/src/views/home/ledger/sync/index.vue b/src/views/home/ledger/sync/index.vue
index 54a3218..a04bad9 100644
--- a/src/views/home/ledger/sync/index.vue
+++ b/src/views/home/ledger/sync/index.vue
@@ -62,6 +62,7 @@
 }
 // 重置查询条件f
 const reset = () => {
+  datetimerange.value = []
   listQuery.value = {
     limit: 20,
     offset: 1,
@@ -106,6 +107,8 @@
 onMounted(async () => {
   fetchData()
 })
+const { proxy } = getCurrentInstance() as any
+const $route = useRoute()
 </script>
 
 <template>
@@ -132,7 +135,7 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="goBak">
+          <el-button v-if="$route.type" type="primary" @click="goBak">
             返回
           </el-button>
         </div>
@@ -152,10 +155,10 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="80">
             <template #default="scope">
-              <el-button type="primary" link size="small">
+              <el-button v-if="proxy.hasPerm('/ledger/sync/detail')" type="primary" link size="small">
                 查看
               </el-button>
-              <el-button type="danger" link size="small" @click="removeRow(scope.row)">
+              <el-button v-if="proxy.hasPerm('/ledger/sync/delete')" type="danger" link size="small" @click="removeRow(scope.row)">
                 删除
               </el-button>
             </template>
diff --git a/src/views/home/monitor/service/index.vue b/src/views/home/monitor/service/index.vue
index 8df2239..570dc68 100644
--- a/src/views/home/monitor/service/index.vue
+++ b/src/views/home/monitor/service/index.vue
@@ -53,6 +53,7 @@
 onMounted(async () => {
   fetchData()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -66,7 +67,7 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary">
+          <el-button v-if="proxy.hasPerm('/monitor/service/add')" type="primary">
             新建
           </el-button>
         </div>
diff --git a/src/views/home/monitor/time/index.vue b/src/views/home/monitor/time/index.vue
index caa6d46..0f7f5a0 100644
--- a/src/views/home/monitor/time/index.vue
+++ b/src/views/home/monitor/time/index.vue
@@ -53,6 +53,7 @@
 onMounted(async () => {
   fetchData()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -66,7 +67,7 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary">
+          <el-button v-if="proxy.hasPerm('/monitor/time/add')" type="primary">
             新建
           </el-button>
         </div>
diff --git a/src/views/home/operation/alarm/components/detail.vue b/src/views/home/operation/alarm/components/detail.vue
index 8194cbd..4ae4a1f 100644
--- a/src/views/home/operation/alarm/components/detail.vue
+++ b/src/views/home/operation/alarm/components/detail.vue
@@ -151,6 +151,7 @@
 }
 // 点击经纬度展示地图
 const mapRef = ref()
+const { proxy } = getCurrentInstance() as any
 const showMap = (data: any) => {
   console.log(data, 'data')
   if (data.text === '位置') {
@@ -160,6 +161,13 @@
         2: 'StationMonitorDetail',
         3: 'PipelineMonitorDetail',
       } as { [key: string]: string }
+      // 判断是否有菜单权限
+      const watchObjectAuth = {
+        1: '/well',
+        2: '/station/monitor',
+        3: '/pipeline',
+      } as { [key: string]: string }
+      if (!proxy.hasPerm(watchObjectAuth[detailInfo.value.watchObject])) { return }
       $router.push({
         name: watchObject[detailInfo.value.watchObject],
         query: {
diff --git a/src/views/home/operation/alarm/index.vue b/src/views/home/operation/alarm/index.vue
index ac0f31b..e53c991 100644
--- a/src/views/home/operation/alarm/index.vue
+++ b/src/views/home/operation/alarm/index.vue
@@ -82,6 +82,7 @@
 }
 // 重置查询条件f
 const reset = () => {
+  datetimerange.value = []
   listQuery.value = {
     limit: 20,
     offset: 1,
@@ -315,7 +316,7 @@
               <el-button v-if="proxy.hasPerm('/alarm/device/delete')" type="primary" @click="batchDeleteRow">
                 批量删除
               </el-button>
-              <el-button type="primary" @click="exportList">
+              <el-button v-if="proxy.hasPerm('/alarm/device/export')" type="primary" @click="exportList">
                 导出
               </el-button>
             </div>
@@ -336,7 +337,7 @@
               </el-table-column>
             </template>
             <template #columns>
-              <el-table-column label="操作" align="center" width="80">
+              <el-table-column v-if="proxy.hasPerm('/alarm/device/detail')" label="操作" align="center" width="80">
                 <template #default="scope">
                   <el-button type="primary" link size="small" @click="detail(scope.row)">
                     查看
diff --git a/src/views/home/operation/history/index.vue b/src/views/home/operation/history/index.vue
index 5c04ff7..d96ac57 100644
--- a/src/views/home/operation/history/index.vue
+++ b/src/views/home/operation/history/index.vue
@@ -78,6 +78,7 @@
 }
 // 重置查询条件f
 const reset = () => {
+  datetimerange.value = []
   listQuery.value = {
     limit: 20,
     offset: 1,
@@ -161,6 +162,7 @@
     fetchData()
   })
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -218,7 +220,7 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="exportList">
+          <el-button v-if="proxy.hasPerm('/operation/history/export')" type="primary" @click="exportList">
             导出
           </el-button>
         </div>
@@ -241,7 +243,7 @@
           </el-table-column>
         </template>
         <template #columns>
-          <el-table-column label="操作" align="center" width="80">
+          <el-table-column v-if="proxy.hasPerm('/operation/history/detail')" label="操作" align="center" width="80">
             <template #default="scope">
               <el-button type="primary" link size="small" @click="detailRow(scope.row)">
                 查看
diff --git a/src/views/home/operation/manufacturer/index.vue b/src/views/home/operation/manufacturer/index.vue
index 4a5816a..5f647c3 100644
--- a/src/views/home/operation/manufacturer/index.vue
+++ b/src/views/home/operation/manufacturer/index.vue
@@ -75,6 +75,7 @@
 }
 // 重置查询条件f
 const reset = () => {
+  datetimerange.value = []
   listQuery.value = {
     limit: 20,
     offset: 1,
@@ -125,6 +126,7 @@
   await fetchDict()
   fetchData()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -178,7 +180,7 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="exportList">
+          <el-button v-if="proxy.hasPerm('/operation/manufacturer/export')" type="primary" @click="exportList">
             导出
           </el-button>
         </div>
diff --git a/src/views/home/operation/trajectory/index.vue b/src/views/home/operation/trajectory/index.vue
index 9312fd7..606958e 100644
--- a/src/views/home/operation/trajectory/index.vue
+++ b/src/views/home/operation/trajectory/index.vue
@@ -65,6 +65,7 @@
 }
 // 重置查询条件f
 const reset = () => {
+  datetimerange.value = []
   listQuery.value = {
     limit: 20,
     offset: 1,
@@ -114,6 +115,7 @@
   await fetchDict()
   fetchData()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -175,7 +177,7 @@
           </span>
         </template>
         <template #columns>
-          <el-table-column label="操作" width="80" align="center">
+          <el-table-column v-if="proxy.hasPerm('/operation/trajectory/detail')" label="操作" width="80" align="center">
             <template #default="scope">
               <el-button type="primary" link size="small" @click="detail(scope.row)">
                 查看
diff --git a/src/views/home/pipeline/components/detailData.vue b/src/views/home/pipeline/components/detailData.vue
index 80b6886..760b1c5 100644
--- a/src/views/home/pipeline/components/detailData.vue
+++ b/src/views/home/pipeline/components/detailData.vue
@@ -7,7 +7,13 @@
 import type { TabsPaneContext } from 'element-plus'
 import monitorData from './monitorDataList.vue'
 import maintenanceRecord from '@/views/home/well/components/maintenanceRecord.vue'
-const activeName = ref('监控数据')
+const { proxy } = getCurrentInstance() as any
+const activeName = ref(
+  proxy.hasPerm('/pipeline/monitor/data')
+    ? '监控数据'
+    : proxy.hasPerm('/pipeline/monitor/maintenance')
+      ? '监控设备维护记录'
+      : '')
 const handleClick = (tab: TabsPaneContext, event: Event) => {
   // console.log(tab, event)
 }
@@ -15,10 +21,10 @@
 
 <template>
   <el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick">
-    <el-tab-pane label="监控数据" name="监控数据">
+    <el-tab-pane v-if="proxy.hasPerm('/pipeline/monitor/data')" label="监控数据" name="监控数据">
       <monitor-data v-if="activeName === '监控数据'" />
     </el-tab-pane>
-    <el-tab-pane label="监控设备维护记录" name="监控设备维护记录">
+    <el-tab-pane v-if="proxy.hasPerm('/pipeline/monitor/maintenance')" label="监控设备维护记录" name="监控设备维护记录">
       <maintenance-record v-if="activeName === '监控设备维护记录'" />
     </el-tab-pane>
   </el-tabs>
diff --git a/src/views/home/pipeline/index.vue b/src/views/home/pipeline/index.vue
index 90baef0..4d66e51 100644
--- a/src/views/home/pipeline/index.vue
+++ b/src/views/home/pipeline/index.vue
@@ -254,6 +254,7 @@
     tableHeight.value = window.innerHeight - 60 - 50 - 10 - 98 - 10 - 52 - 52 - 10
   }
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -348,7 +349,7 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary">
+          <el-button v-if="proxy.hasPerm('/pipeline/export')" type="primary">
             导出
           </el-button>
         </div>
@@ -368,7 +369,7 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="80">
             <template #default="scope">
-              <el-button type="primary" link size="small" @click="editRow('detail', scope.row)">
+              <el-button v-if="proxy.hasPerm('/pipeline/detail')" type="primary" link size="small" @click="editRow('detail', scope.row)">
                 查看
               </el-button>
               <!-- <el-button type="primary" link size="small" @click="editRow('edit', scope.row)">
diff --git a/src/views/home/rule/agreement/index.vue b/src/views/home/rule/agreement/index.vue
index fd41cd3..f1cfe15 100644
--- a/src/views/home/rule/agreement/index.vue
+++ b/src/views/home/rule/agreement/index.vue
@@ -95,6 +95,7 @@
 onMounted(async () => {
   fetchData()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -119,7 +120,7 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="editRow('add', {})">
+          <el-button v-if="proxy.hasPerm('/rule/agreement/add')" type="primary" @click="editRow('add', {})">
             新建
           </el-button>
         </div>
@@ -139,10 +140,10 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="120">
             <template #default="scope">
-              <el-button type="primary" link size="small" @click="editRow('edit', scope.row)">
+              <el-button v-if="proxy.hasPerm('/rule/agreement/update')" type="primary" link size="small" @click="editRow('edit', scope.row)">
                 编辑
               </el-button>
-              <el-button type="danger" link size="small" @click="removeRow(scope.row)">
+              <el-button v-if="proxy.hasPerm('/rule/agreement/delete')" type="danger" link size="small" @click="removeRow(scope.row)">
                 删除
               </el-button>
             </template>
diff --git a/src/views/home/rule/alarm/components/alarmLevelList.vue b/src/views/home/rule/alarm/components/alarmLevelList.vue
index c8ffb7d..6c337c4 100644
--- a/src/views/home/rule/alarm/components/alarmLevelList.vue
+++ b/src/views/home/rule/alarm/components/alarmLevelList.vue
@@ -87,6 +87,7 @@
 const cancel = () => {
   dialogFormVisible.value = false
 }
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -97,7 +98,7 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="detailRow('create', {})">
+          <el-button v-if="proxy.hasPerm('/rule/alarm/level/add')" type="primary" @click="detailRow('create', {})">
             新增
           </el-button>
         </div>
@@ -117,10 +118,10 @@
         <template #columns>
           <el-table-column label="操作" width="120" align="center">
             <template #default="scope">
-              <el-button type="primary" link size="small" @click="detailRow('edit', scope.row)">
+              <el-button v-if="proxy.hasPerm('/rule/alarm/level/update')" type="primary" link size="small" @click="detailRow('edit', scope.row)">
                 编辑
               </el-button>
-              <el-button type="danger" link size="small" @click="removeRow(scope.row)">
+              <el-button v-if="proxy.hasPerm('/rule/alarm/level/delete')" type="danger" link size="small" @click="removeRow(scope.row)">
                 删除
               </el-button>
             </template>
diff --git a/src/views/home/rule/alarm/components/alarmTypeList.vue b/src/views/home/rule/alarm/components/alarmTypeList.vue
index 2cbf110..aa0cfed 100644
--- a/src/views/home/rule/alarm/components/alarmTypeList.vue
+++ b/src/views/home/rule/alarm/components/alarmTypeList.vue
@@ -80,6 +80,7 @@
 const cancel = () => {
   dialogFormVisible.value = false
 }
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -90,7 +91,7 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="detailRow('create', {})">
+          <el-button v-if="proxy.hasPerm('/rule/alarm/type/add')" type="primary" @click="detailRow('create', {})">
             新增
           </el-button>
         </div>
@@ -110,10 +111,10 @@
         <template #columns>
           <el-table-column label="操作" width="120" align="center">
             <template #default="scope">
-              <el-button type="primary" link size="small" @click="detailRow('edit', scope.row)">
+              <el-button v-if="proxy.hasPerm('/rule/alarm/type/update')" type="primary" link size="small" @click="detailRow('edit', scope.row)">
                 编辑
               </el-button>
-              <el-button type="danger" link size="small" @click="removeRow(scope.row)">
+              <el-button v-if="proxy.hasPerm('/rule/alarm/type/delete')" type="danger" link size="small" @click="removeRow(scope.row)">
                 删除
               </el-button>
             </template>

diff --git a/src/App.vue b/src/App.vue
index cde81b3..8a00f5d 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -125,7 +125,7 @@
         '--g-sub-sidebar-actual-width': subSidebarActualWidth,
       }"
     />
-    <system-info v-if="browserType !== 'mobile'" />
+    <!-- <system-info v-if="browserType !== 'mobile'" /> -->
     <audio id="eventAudio" src="" autoplay />
   </el-config-provider>
 </template>
diff --git a/src/layouts/components/Tools/alarmDialog.vue b/src/layouts/components/Tools/alarmDialog.vue
index 1828375..df89ab8 100644
--- a/src/layouts/components/Tools/alarmDialog.vue
+++ b/src/layouts/components/Tools/alarmDialog.vue
@@ -116,7 +116,7 @@
     </div>
     <template #footer>
       <div class="dialog-footer">
-        <div class="btn" @click="detail">
+        <div v-if="proxy.hasPerm('/alarm/current')" class="btn" @click="detail">
           查看
         </div>
         <div v-if="info.isSound === '1'" class="btn" @click="closeSound">
diff --git a/src/layouts/components/Tools/alarmList.vue b/src/layouts/components/Tools/alarmList.vue
index c3a9d2a..5356b74 100644
--- a/src/layouts/components/Tools/alarmList.vue
+++ b/src/layouts/components/Tools/alarmList.vue
@@ -54,6 +54,7 @@
 }
 // 查看当前行
 const detailRow = (row: any) => {
+  if (!proxy.hasPerm('/alarm/current')) { return }
   $router.push({
     name: 'AlarmCurrent',
     query: {
@@ -77,21 +78,6 @@
   localStorage.setItem('eventAudio', 'pause')
 }
 const dialogRef = ref()
-// const dialog = () => {
-//   const row = {
-//     alarmNoteMethod: '1', // 消息提醒 1:弹窗，2:消息提醒
-//     isSound: '1', // 报警音效，1:开，0:关
-//     isSend: '1', // 报警推送，1:开，0:关
-//     isText: '1', // 报警短息，1:开，0:关
-//     alarmType: '浓度超限',
-//     tagNumber: 'NX5702',
-//     alarmTime: '2024-09-09',
-//     value: '20',
-//     typeName: '燃气智能终端',
-//     alarmLevel: '一级',
-//   }
-//   dialogRef.value.initDialog(row)
-// }
 const fetchData = (isLoading = false) => {
   loading.value = true
   if (isLoading) {
@@ -115,7 +101,10 @@
       dialogRef.value.initDialog(newVal)
     }
     if (newVal.isSound === '1') {
-      play()
+      // play()
+      if (!localStorage.getItem('eventAudio')) {
+        proxy.playAudio()
+      }
     }
     fetchData(false)
   }
@@ -146,6 +135,7 @@
 //     window.localStorage.removeItem('token')
 //   }
 // }
+// const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -180,7 +170,7 @@
                   {{ message.processStatus
                     === '未读' ? '未读' : '已读' }}
                 </el-tag>
-                <el-tag type="info" size="small" style="margin-left: 5px;">
+                <el-tag type="info" size="small" style="margin-left: 5px;" @click="detailRow(message)">
                   查看
                 </el-tag>
               </div>
@@ -214,7 +204,7 @@
       <!-- <div class="close" @click="dialog">
         弹窗
       </div> -->
-      <div class="more" @click="moreList">
+      <div v-if="proxy.hasPerm('/alarm/current')" class="more" @click="moreList">
         查看更多
       </div>
     </div>
diff --git a/src/layouts/components/Tools/index.vue b/src/layouts/components/Tools/index.vue
index 9f2d41f..61f9707 100644
--- a/src/layouts/components/Tools/index.vue
+++ b/src/layouts/components/Tools/index.vue
@@ -79,6 +79,7 @@
   // 断开 websocket
   // websocket.destroyWebSocket()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -89,18 +90,18 @@
           <svg-icon name="ep:search" />
         </el-icon>
       </span>
-      <span class="item" @click="board">
+      <span v-if="proxy.hasPerm('/fullscreen')" class="item" @click="board">
         <el-icon>
           <svg-icon name="ep:data-line" />
         </el-icon>
       </span>
-      <span v-if="settingsStore.mode === 'pc' && settingsStore.toolbar.enableFullscreen" class="item" @click="toggle">
+      <span class="item" @click="toggle">
         <el-icon>
           <svg-icon :name="isFullscreen ? 'fullscreen-exit' : 'fullscreen'" />
         </el-icon>
       </span>
       <!-- 报警信息列表 -->
-      <span class="item">
+      <span v-if="proxy.hasPerm('/alarmnotice')" class="item">
         <el-popover width="390">
           <template #reference>
             <div>
diff --git a/src/layouts/components/Topbar/index.vue b/src/layouts/components/Topbar/index.vue
index 2863cef..4e3120e 100644
--- a/src/layouts/components/Topbar/index.vue
+++ b/src/layouts/components/Topbar/index.vue
@@ -67,7 +67,7 @@
           </transition-group>
         </el-breadcrumb>
       </div>
-      <tools />
+      <!-- <tools /> -->
     </div>
   </div>
 </template>
diff --git a/src/router/modules/pc.ts b/src/router/modules/pc.ts
index aacd6fa..97ced45 100644
--- a/src/router/modules/pc.ts
+++ b/src/router/modules/pc.ts
@@ -40,7 +40,7 @@
       icon: 'ep:key',
       sidebar: false,
       breadcrumb: false,
-      // auth: '/fullscreen',
+      auth: '/fullscreen',
     },
   },
   {
@@ -155,7 +155,7 @@
           sidebar: false,
           breadcrumb: false,
           activeMenu: '/well',
-          auth: '/well/detail',
+          auth: '/well',
         },
       },
     ],
diff --git a/src/views/home/alarm/count/components/locationAnalysis.vue b/src/views/home/alarm/count/components/locationAnalysis.vue
index fc75b9e..bff1853 100644
--- a/src/views/home/alarm/count/components/locationAnalysis.vue
+++ b/src/views/home/alarm/count/components/locationAnalysis.vue
@@ -46,6 +46,7 @@
   })
 }
 fetchData()
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -75,6 +76,9 @@
         <el-button type="primary" style="margin: 0 5px;" @click="fetchData">
           搜索
         </el-button>
+        <el-button v-if="proxy.hasPerm('/alarm/count/exportLocation')" type="primary" style="margin: 0 5px;">
+          导出
+        </el-button>
       </div>
     </template>
     <template #content>
diff --git a/src/views/home/alarm/current/components/detail.vue b/src/views/home/alarm/current/components/detail.vue
index dd3b31a..4204c92 100644
--- a/src/views/home/alarm/current/components/detail.vue
+++ b/src/views/home/alarm/current/components/detail.vue
@@ -111,7 +111,7 @@
   const res2 = await getAlarmTypeListPage({ offset: 1, limit: 9999 });
   ($route.query.type === 'history' ? getAlarmDetail : getAlarmDetail)($route.query.id as string).then((res) => {
     detailInfo.value = toHumpObject(res.data)
-    detailInfo.value.realAlarmName = detailInfo.value.realAlarm === '1' ? '报警' : '误报'
+    detailInfo.value.realAlarmName = detailInfo.value.realAlarm === '0' ? '是' : '否'
     detailInfo.value.alarmTypeName = res2.data.rows.filter((item: any) => item.id === detailInfo.value.alarmTypeId)[0]?.alarmType || ''
     detailInfo.value.alarmLevelName = res1.data.rows.filter((item: any) => item.id === detailInfo.value.alarmLevel)[0]?.alarmLevel || ''
     detailInfo.value.duration = detailInfo.value.ts && detailInfo.value.cancelTime ? getDateDiff(detailInfo.value.ts, detailInfo.value.cancelTime) : ''
@@ -139,6 +139,7 @@
 }
 // 点击经纬度展示地图
 const mapRef = ref()
+const { proxy } = getCurrentInstance() as any
 const showMap = (data: any) => {
   console.log(data, 'data')
   if (data.text === '位置') {
@@ -148,6 +149,13 @@
         2: 'StationMonitorDetail',
         3: 'PipelineMonitorDetail',
       } as { [key: string]: string }
+      // 判断是否有菜单权限
+      const watchObjectAuth = {
+        1: '/well',
+        2: '/station/monitor',
+        3: '/pipeline',
+      } as { [key: string]: string }
+      if (!proxy.hasPerm(watchObjectAuth[detailInfo.value.watchObject])) { return }
       $router.push({
         name: watchObject[detailInfo.value.watchObject],
         query: {
diff --git a/src/views/home/alarm/current/components/detailInfoDialog.vue b/src/views/home/alarm/current/components/detailInfoDialog.vue
index c089449..7fbf06b 100644
--- a/src/views/home/alarm/current/components/detailInfoDialog.vue
+++ b/src/views/home/alarm/current/components/detailInfoDialog.vue
@@ -114,6 +114,7 @@
   })
 }
 defineExpose({ initDialog, close })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -131,7 +132,7 @@
     <!-- 头部 -->
     <div class="header">
       <span>{{ info.alarmContent }}</span>
-      <span class="more" @click="moreData">>>更多</span>
+      <span v-if="proxy.hasPerm(type === 'data' ? '/alarm/current/more' : '/alarm/device/more')" class="more" @click="moreData">>>更多</span>
     </div>
     <div class="content">
       <div v-show="type === 'device'" class="item">
@@ -162,7 +163,7 @@
         报警设备:
         <span style="padding-left: 6px;">{{ info.devcode }} </span>
         <el-button
-          v-if="info.devTypeName === '燃气智能监测终端' || info.devTypeName === '液位检测仪' || info.devTypeName === '井盖监测仪'"
+          v-if="(info.devTypeName === '燃气智能监测终端' || info.devTypeName === '液位检测仪' || info.devTypeName === '井盖监测仪') && proxy.hasPerm('/alarm/current/data')"
           size="small" style="margin-left: 6px;" @click="viewData"
         >
           查看数据
@@ -228,7 +229,7 @@
         <span style="padding-left: 6px;">
           {{ info.confirmContent }}
         </span>
-        <el-button v-if="type === 'data'" size="small" style="padding-left: 6px;" @click="viewProcess">
+        <el-button v-if="type === 'data' && proxy.hasPerm('/alarm/current/process')" size="small" style="padding-left: 6px;" @click="viewProcess">
           流程图
         </el-button>
       </div>
@@ -246,17 +247,17 @@
       </div>
     </div>
     <div class="footer">
-      <el-button v-if="Number(info.processStatus) < 4 && type === 'data'" size="small" @click="remind">
+      <el-button v-if="(Number(info.processStatus) < 4 && type === 'data') && proxy.hasPerm('/alarm/current/remind')" size="small" @click="remind">
         提醒责任人
       </el-button>
       <el-button
-        v-if="type === 'device' && (info.processStatusName === '待处置' || info.processStatusName === '挂起')"
+        v-if="(type === 'device' && (info.processStatusName === '待处置' || info.processStatusName === '挂起')) && proxy.hasPerm('/alarm/device/handler')"
         size="small" @click="handler"
       >
         报警处置
       </el-button>
       <el-button
-        v-if="Number(info.processStatus) <= 3 || (type === 'device' && info.processStatusName === '待处置') || info.processStatusName === '挂起'"
+        v-if="(Number(info.processStatus) <= 3 || (type === 'device' && info.processStatusName === '待处置') || info.processStatusName === '挂起') && proxy.hasPerm(type === 'device' ? '/alarm/device/pending' : '/alarm/current/pending')"
         type="primary" size="small" @click="pending"
       >
         挂起
diff --git a/src/views/home/alarm/current/index.vue b/src/views/home/alarm/current/index.vue
index d019bbf..e2714bb 100644
--- a/src/views/home/alarm/current/index.vue
+++ b/src/views/home/alarm/current/index.vue
@@ -4,6 +4,7 @@
   Date: 2023-06-28
  -->
 <script lang="ts" setup name="CurrentAlarm">
+import dayjs from 'dayjs'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import { ArrowLeftBold, ArrowRightBold } from '@element-plus/icons-vue'
 import MapCom from './components/map.vue'
@@ -100,6 +101,7 @@
       path: '/alarm/current',
     })
   }
+  datetimerange.value = []
   listQuery.value = {
     limit: 20,
     offset: 1,
@@ -131,8 +133,8 @@
   if ($route.query.row) {
     loadingTable.value = true
     const row = JSON.parse($route.query.row as string)
-    getCurrentAlarmListPage({ offset: 1, limit: 99999 }).then((res) => {
-      const data = res.data.rows.filter((item: any) => item.id === row.id)
+    getCurrentAlarmListPage({ offset: 1, limit: 50 }).then((res) => {
+      const data = res.data.rows.filter((item: any) => item.id === row.alarmId)
       if (data.length) {
         list1.value = data.map((item: any) => ({
           ...item,
@@ -153,7 +155,10 @@
     })
     return
   }
-  fetchData()
+  datetimerange.value = [dayjs().subtract(7, 'day').format('YYYY-MM-DD HH:mm:ss'), dayjs().format('YYYY-MM-DD HH:mm:ss')]
+  setTimeout(() => {
+    fetchData()
+  })
 })
 // 表格标识  地图或普通
 const tableFlag = ref('normal')
@@ -181,6 +186,10 @@
 const mapRef = ref()
 const mapData = ref({})
 async function detail(row: any) {
+  if (row.processStatusName === '未读') {
+    list1.value[list1.value.findIndex((item: any) => item.id === row.id)].processStatusName = '已读'
+    row.processStatusName = '已读'
+  }
   const res = await detailAlarm(row.id)
   const data = toHumpObject(res.data)
   mapData.value = row
@@ -362,7 +371,7 @@
               <el-button v-if="proxy.hasPerm('/alarm/current/delete')" type="primary" @click="batchDeleteRow">
                 批量删除
               </el-button>
-              <el-button type="primary" @click="exportList">
+              <el-button v-if="proxy.hasPerm('/alarm/current/export')" type="primary" @click="exportList">
                 导出
               </el-button>
             </div>
@@ -383,7 +392,7 @@
               </el-table-column>
             </template>
             <template #columns>
-              <el-table-column label="操作" align="center" width="80">
+              <el-table-column v-if="proxy.hasPerm('/alarm/current/detail')" label="操作" align="center" width="80">
                 <template #default="scope">
                   <el-button type="primary" link size="small" @click="detail(scope.row)">
                     查看
diff --git a/src/views/home/alarm/history/index.vue b/src/views/home/alarm/history/index.vue
index eeb49fc..3c810c3 100644
--- a/src/views/home/alarm/history/index.vue
+++ b/src/views/home/alarm/history/index.vue
@@ -97,6 +97,7 @@
 }
 // 重置查询条件f
 const reset = () => {
+  datetimerange.value = []
   listQuery.value = {
     limit: 20,
     offset: 1,
@@ -189,6 +190,7 @@
   })
 }
 fetchDict()
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -249,7 +251,7 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="exportList">
+          <el-button v-if="proxy.hasPerm('/alarm/history/export')" type="primary" @click="exportList">
             导出
           </el-button>
         </div>
@@ -272,7 +274,7 @@
           </el-table-column>
         </template>
         <template #columns>
-          <el-table-column label="操作" align="center" width="80">
+          <el-table-column v-if="proxy.hasPerm('/alarm/history/detail')" label="操作" align="center" width="80">
             <template #default="scope">
               <el-button type="primary" link size="small" @click="moreData(scope.row)">
                 查看
diff --git a/src/views/home/dashboard/index.vue b/src/views/home/dashboard/index.vue
index d2f7e3c..42dfbed 100644
--- a/src/views/home/dashboard/index.vue
+++ b/src/views/home/dashboard/index.vue
@@ -42,7 +42,7 @@
     value: '0',
     name: '在线',
     unit: '个',
-    id: '1',
+    id: '1,2',
   },
   {
     img: img.lixian,
@@ -56,7 +56,7 @@
     value: '0',
     name: '停用',
     unit: '个',
-    id: '2',
+    id: '3',
   },
 ])
 // 工作台数据
@@ -133,7 +133,11 @@
   deviceOperationLoading.value = true
   getDeviceStatus().then((res) => {
     res.data.forEach((element: any) => {
-      const index = deviceOperationData.value.findIndex((item: any) => item.id === element.name)
+      if (element.name === '1' || element.name === '2') {
+        deviceOperationData.value[0].value = Number(deviceOperationData.value[0].value || '0') + Number(element.value)
+        return
+      }
+      const index = deviceOperationData.value.findIndex((item: any) => item.id.includes(element.name))
       if (index !== -1) {
         deviceOperationData.value[index].value = element.value
       }
diff --git a/src/views/home/device/count/components/bottom.vue b/src/views/home/device/count/components/bottom.vue
index 28a4d78..e4e56fa 100644
--- a/src/views/home/device/count/components/bottom.vue
+++ b/src/views/home/device/count/components/bottom.vue
@@ -110,6 +110,7 @@
   })
 }
 fetchDict()
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -148,7 +149,7 @@
             <template #btns-right>
               <!-- 操作 -->
               <div>
-                <el-button type="primary">
+                <el-button v-if="proxy.hasPerm('/device/count/offline/export')" type="primary">
                   导出
                 </el-button>
               </div>
diff --git a/src/views/home/device/device/index.vue b/src/views/home/device/device/index.vue
index c3970b9..9cdd606 100644
--- a/src/views/home/device/device/index.vue
+++ b/src/views/home/device/device/index.vue
@@ -88,6 +88,7 @@
 }
 // 重置查询条件f
 const reset = () => {
+  datetimerange.value = []
   listQuery.value = {
     limit: 20,
     offset: 1,
@@ -296,6 +297,7 @@
   fetchDict()
   fetchData()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -372,17 +374,17 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="editRow('add', {})">
+          <el-button v-if="proxy.hasPerm('/device/manage/add')" type="primary" @click="editRow('add', {})">
             新建
           </el-button>
-          <el-button type="primary" @click="downloadTemplate">
+          <el-button v-if="proxy.hasPerm('/device/manage/down')" type="primary" @click="downloadTemplate">
             模板下载
           </el-button>
-          <el-button type="primary" @click="importList">
+          <el-button v-if="proxy.hasPerm('/device/manage/import')" type="primary" @click="importList">
             批量导入
           </el-button>
-          <el-button type="primary" @click="exportList">
-            导出列表
+          <el-button v-if="proxy.hasPerm('/device/manage/export')" type="primary" @click="exportList">
+            导出
           </el-button>
           <input ref="fileRef" style="display: none;" type="file" accept=".xls,.xlsx" @change="onFileChange">
         </div>
@@ -409,16 +411,16 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="150">
             <template #default="scope">
-              <el-button type="primary" link size="small" @click="editRow('detail', scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/manage/detail')" type="primary" link size="small" @click="editRow('detail', scope.row)">
                 查看
               </el-button>
-              <el-button type="primary" link size="small" @click="editRow('edit', scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/manage/update')" type="primary" link size="small" @click="editRow('edit', scope.row)">
                 编辑
               </el-button>
-              <el-button type="danger" link size="small" @click="changeDefense(scope.row)">
+              <!-- <el-button v-if="proxy.hasPerm('/device/manage/add')" type="danger" link size="small" @click="changeDefense(scope.row)">
                 撤防
-              </el-button>
-              <el-button type="danger" link size="small" @click="removeRow(scope.row)">
+              </el-button> -->
+              <el-button v-if="proxy.hasPerm('/device/manage/delete')" type="danger" link size="small" @click="removeRow(scope.row)">
                 删除
               </el-button>
             </template>
diff --git a/src/views/home/device/instruction/index.vue b/src/views/home/device/instruction/index.vue
index 1e598ed..1da6706 100644
--- a/src/views/home/device/instruction/index.vue
+++ b/src/views/home/device/instruction/index.vue
@@ -78,6 +78,7 @@
 }
 // 重置查询条件f
 const reset = () => {
+  datetimerange.value = []
   listQuery.value = {
     limit: 20,
     offset: 1,
@@ -158,6 +159,7 @@
     editRef.value.initDialog('addOther', {})
   }
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -213,10 +215,10 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary">
+          <el-button v-if="proxy.hasPerm('/device/instruction/batch')" type="primary">
             批量下发
           </el-button>
-          <el-button type="primary" @click="editRow('add', {})">
+          <el-button v-if="proxy.hasPerm('/device/instruction/add')" type="primary" @click="editRow('add', {})">
             新建
           </el-button>
         </div>
@@ -236,13 +238,13 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="120">
             <template #default="scope">
-              <el-button type="primary" link size="small" @click="editRow('detail', scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/instruction/detail')" type="primary" link size="small" @click="editRow('detail', scope.row)">
                 查看
               </el-button>
-              <el-button v-if="scope.row.status === '2'" type="primary" link size="small" @click="editRow('edit', scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/instruction/again') && scope.row.status === '2'" type="primary" link size="small" @click="editRow('edit', scope.row)">
                 重新下发
               </el-button>
-              <el-button type="danger" link size="small" @click="removeRow(scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/instruction/delete')" type="danger" link size="small" @click="removeRow(scope.row)">
                 删除
               </el-button>
             </template>
diff --git a/src/views/home/device/product/index.vue b/src/views/home/device/product/index.vue
index 799fc90..fdd5463 100644
--- a/src/views/home/device/product/index.vue
+++ b/src/views/home/device/product/index.vue
@@ -128,6 +128,7 @@
   await fetchDict()
   fetchData()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -164,7 +165,7 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="editRow('add', {})">
+          <el-button v-if="proxy.hasPerm('/device/product/add')" type="primary" @click="editRow('add', {})">
             新建
           </el-button>
         </div>
@@ -184,10 +185,10 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="120">
             <template #default="scope">
-              <el-button type="primary" link size="small" @click="editRow('edit', scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/product/update')" type="primary" link size="small" @click="editRow('edit', scope.row)">
                 编辑
               </el-button>
-              <el-button type="danger" link size="small" @click="removeRow(scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/product/delete')" type="danger" link size="small" @click="removeRow(scope.row)">
                 删除
               </el-button>
             </template>
diff --git a/src/views/home/device/type/index.vue b/src/views/home/device/type/index.vue
index 59f1343..2344e57 100644
--- a/src/views/home/device/type/index.vue
+++ b/src/views/home/device/type/index.vue
@@ -105,6 +105,7 @@
   await fetchDict()
   fetchData()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -131,7 +132,7 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="editRow('add', {})">
+          <el-button v-if="proxy.hasPerm('/device/type/add')" type="primary" @click="editRow('add', {})">
             新建
           </el-button>
         </div>
@@ -151,10 +152,10 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="120">
             <template #default="scope">
-              <el-button type="primary" link size="small" @click="editRow('edit', scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/type/update')" type="primary" link size="small" @click="editRow('edit', scope.row)">
                 编辑
               </el-button>
-              <el-button type="danger" link size="small" @click="removeRow(scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/type/delete')" type="danger" link size="small" @click="removeRow(scope.row)">
                 删除
               </el-button>
             </template>
diff --git a/src/views/home/ledger/ledger/components/gridList.vue b/src/views/home/ledger/ledger/components/gridList.vue
index d03cd9f..189edef 100644
--- a/src/views/home/ledger/ledger/components/gridList.vue
+++ b/src/views/home/ledger/ledger/components/gridList.vue
@@ -91,6 +91,7 @@
     // })
   })
 }
+const { proxy } = getCurrentInstance() as any
 // 同步日志
 const allSync = () => {
   $router.push({
@@ -139,10 +140,10 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="allSync">
+          <el-button v-if="proxy.hasPerm('/ledger/sync')" type="primary" @click="allSync">
             同步日志
           </el-button>
-          <el-button type="primary" @click="sync('all', {})">
+          <el-button v-if="proxy.hasPerm('/ledger/sync/all')" type="primary" @click="sync('all', {})">
             全量同步
           </el-button>
         </div>
@@ -160,9 +161,9 @@
           </el-table-column>
         </template>
         <template #columns>
-          <el-table-column label="操作" align="center" width="80">
+          <el-table-column v-if="proxy.hasPerm('/ledger/sync/single')" label="操作" align="center" width="80">
             <template #default="scope">
-              <el-button type="primary" link size="small" @click="sync('single', scope.row)">
+              <el-button v-if="proxy.hasPerm('/ledger/sync/single')" type="primary" link size="small" @click="sync('single', scope.row)">
                 同步
               </el-button>
             </template>
diff --git a/src/views/home/ledger/ledger/components/wellList.vue b/src/views/home/ledger/ledger/components/wellList.vue
index 9eb1f43..06f855a 100644
--- a/src/views/home/ledger/ledger/components/wellList.vue
+++ b/src/views/home/ledger/ledger/components/wellList.vue
@@ -123,6 +123,7 @@
   // await fetchDict()
   fetchData()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -159,11 +160,11 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="allSync">
+          <el-button v-if="proxy.hasPerm('/ledger/sync')" type="primary" @click="allSync">
             同步日志
           </el-button>
-          <el-button type="primary" @click="sync('all', {})">
-            全部同步
+          <el-button v-if="proxy.hasPerm('/ledger/sync/all')" type="primary" @click="sync('all', {})">
+            全量同步
           </el-button>
         </div>
       </template>
@@ -180,9 +181,9 @@
           </el-table-column>
         </template>
         <template #columns>
-          <el-table-column label="操作" align="center" width="80">
+          <el-table-column v-if="proxy.hasPerm('/ledger/sync/single')" label="操作" align="center" width="80">
             <template #default="scope">
-              <el-button type="primary" link size="small" @click="sync('single', scope.row)">
+              <el-button v-if="proxy.hasPerm('/ledger/sync/single')" type="primary" link size="small" @click="sync('single', scope.row)">
                 同步
               </el-button>
             </template>
diff --git a/src/views/home/ledger/ledger/index.vue b/src/views/home/ledger/ledger/index.vue
index a03aa12..8403fc5 100644
--- a/src/views/home/ledger/ledger/index.vue
+++ b/src/views/home/ledger/ledger/index.vue
@@ -7,7 +7,16 @@
 import type { TabsPaneContext } from 'element-plus'
 import wellList from './components/wellList.vue'
 import gridList from './components/gridList.vue'
-const activeName = ref('闸井')
+const { proxy } = getCurrentInstance() as any
+const activeName = ref(
+  proxy.hasPerm('/ledger/manage/well')
+    ? '闸井'
+    : proxy.hasPerm('/ledger/manage/station')
+      ? '场站'
+      : proxy.hasPerm('/ledger/manage/grid')
+        ? '网格'
+        : '',
+)
 const handleClick = (tab: TabsPaneContext, event: Event) => {
   // console.log(tab, event)
 }
@@ -17,13 +26,13 @@
   <!-- 布局 -->
   <app-container>
     <el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick">
-      <el-tab-pane label="闸井" name="闸井">
+      <el-tab-pane v-if="proxy.hasPerm('/ledger/manage/well')" label="闸井" name="闸井">
         <well-list v-if="activeName === '闸井'" type="1" />
       </el-tab-pane>
-      <el-tab-pane label="场站" name="场站">
+      <el-tab-pane v-if="proxy.hasPerm('/ledger/manage/station')" label="场站" name="场站">
         <well-list v-if="activeName === '场站'" type="2" />
       </el-tab-pane>
-      <el-tab-pane label="网格" name="网格">
+      <el-tab-pane v-if="proxy.hasPerm('/ledger/manage/grid')" label="网格" name="网格">
         <grid-list v-if="activeName === '网格'" />
       </el-tab-pane>
     </el-tabs>
diff --git a/src/views/home/ledger/pipeline/index.vue b/src/views/home/ledger/pipeline/index.vue
index e0d2512..01e95ac 100644
--- a/src/views/home/ledger/pipeline/index.vue
+++ b/src/views/home/ledger/pipeline/index.vue
@@ -160,6 +160,7 @@
 onMounted(async () => {
   fetchData()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -222,13 +223,13 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="editRow('add', {})">
+          <el-button v-if="proxy.hasPerm('/ledger/pipeline/add')" type="primary" @click="editRow('add', {})">
             新增
           </el-button>
-          <el-button type="primary" @click="importList">
+          <el-button v-if="proxy.hasPerm('/ledger/pipeline/import')" type="primary" @click="importList">
             批量导入
           </el-button>
-          <el-button type="primary" @click="exportList">
+          <el-button v-if="proxy.hasPerm('/ledger/pipeline/export')" type="primary" @click="exportList">
             批量导出
           </el-button>
         </div>
@@ -248,10 +249,10 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="100">
             <template #default="scope">
-              <el-button type="primary" link size="small" @click="editRow('edit', scope.row)">
+              <el-button v-if="proxy.hasPerm('/ledger/pipeline/update')" type="primary" link size="small" @click="editRow('edit', scope.row)">
                 编辑
               </el-button>
-              <el-button type="danger" link size="small" @click="removeRow(scope.row)">
+              <el-button v-if="proxy.hasPerm('/ledger/pipeline/delete')" type="danger" link size="small" @click="removeRow(scope.row)">
                 删除
               </el-button>
             </template>
diff --git a/src/views/home/ledger/sync/index.vue b/src/views/home/ledger/sync/index.vue
index 54a3218..a04bad9 100644
--- a/src/views/home/ledger/sync/index.vue
+++ b/src/views/home/ledger/sync/index.vue
@@ -62,6 +62,7 @@
 }
 // 重置查询条件f
 const reset = () => {
+  datetimerange.value = []
   listQuery.value = {
     limit: 20,
     offset: 1,
@@ -106,6 +107,8 @@
 onMounted(async () => {
   fetchData()
 })
+const { proxy } = getCurrentInstance() as any
+const $route = useRoute()
 </script>
 
 <template>
@@ -132,7 +135,7 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="goBak">
+          <el-button v-if="$route.type" type="primary" @click="goBak">
             返回
           </el-button>
         </div>
@@ -152,10 +155,10 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="80">
             <template #default="scope">
-              <el-button type="primary" link size="small">
+              <el-button v-if="proxy.hasPerm('/ledger/sync/detail')" type="primary" link size="small">
                 查看
               </el-button>
-              <el-button type="danger" link size="small" @click="removeRow(scope.row)">
+              <el-button v-if="proxy.hasPerm('/ledger/sync/delete')" type="danger" link size="small" @click="removeRow(scope.row)">
                 删除
               </el-button>
             </template>
diff --git a/src/views/home/monitor/service/index.vue b/src/views/home/monitor/service/index.vue
index 8df2239..570dc68 100644
--- a/src/views/home/monitor/service/index.vue
+++ b/src/views/home/monitor/service/index.vue
@@ -53,6 +53,7 @@
 onMounted(async () => {
   fetchData()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -66,7 +67,7 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary">
+          <el-button v-if="proxy.hasPerm('/monitor/service/add')" type="primary">
             新建
           </el-button>
         </div>
diff --git a/src/views/home/monitor/time/index.vue b/src/views/home/monitor/time/index.vue
index caa6d46..0f7f5a0 100644
--- a/src/views/home/monitor/time/index.vue
+++ b/src/views/home/monitor/time/index.vue
@@ -53,6 +53,7 @@
 onMounted(async () => {
   fetchData()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -66,7 +67,7 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary">
+          <el-button v-if="proxy.hasPerm('/monitor/time/add')" type="primary">
             新建
           </el-button>
         </div>
diff --git a/src/views/home/operation/alarm/components/detail.vue b/src/views/home/operation/alarm/components/detail.vue
index 8194cbd..4ae4a1f 100644
--- a/src/views/home/operation/alarm/components/detail.vue
+++ b/src/views/home/operation/alarm/components/detail.vue
@@ -151,6 +151,7 @@
 }
 // 点击经纬度展示地图
 const mapRef = ref()
+const { proxy } = getCurrentInstance() as any
 const showMap = (data: any) => {
   console.log(data, 'data')
   if (data.text === '位置') {
@@ -160,6 +161,13 @@
         2: 'StationMonitorDetail',
         3: 'PipelineMonitorDetail',
       } as { [key: string]: string }
+      // 判断是否有菜单权限
+      const watchObjectAuth = {
+        1: '/well',
+        2: '/station/monitor',
+        3: '/pipeline',
+      } as { [key: string]: string }
+      if (!proxy.hasPerm(watchObjectAuth[detailInfo.value.watchObject])) { return }
       $router.push({
         name: watchObject[detailInfo.value.watchObject],
         query: {
diff --git a/src/views/home/operation/alarm/index.vue b/src/views/home/operation/alarm/index.vue
index ac0f31b..e53c991 100644
--- a/src/views/home/operation/alarm/index.vue
+++ b/src/views/home/operation/alarm/index.vue
@@ -82,6 +82,7 @@
 }
 // 重置查询条件f
 const reset = () => {
+  datetimerange.value = []
   listQuery.value = {
     limit: 20,
     offset: 1,
@@ -315,7 +316,7 @@
               <el-button v-if="proxy.hasPerm('/alarm/device/delete')" type="primary" @click="batchDeleteRow">
                 批量删除
               </el-button>
-              <el-button type="primary" @click="exportList">
+              <el-button v-if="proxy.hasPerm('/alarm/device/export')" type="primary" @click="exportList">
                 导出
               </el-button>
             </div>
@@ -336,7 +337,7 @@
               </el-table-column>
             </template>
             <template #columns>
-              <el-table-column label="操作" align="center" width="80">
+              <el-table-column v-if="proxy.hasPerm('/alarm/device/detail')" label="操作" align="center" width="80">
                 <template #default="scope">
                   <el-button type="primary" link size="small" @click="detail(scope.row)">
                     查看
diff --git a/src/views/home/operation/history/index.vue b/src/views/home/operation/history/index.vue
index 5c04ff7..d96ac57 100644
--- a/src/views/home/operation/history/index.vue
+++ b/src/views/home/operation/history/index.vue
@@ -78,6 +78,7 @@
 }
 // 重置查询条件f
 const reset = () => {
+  datetimerange.value = []
   listQuery.value = {
     limit: 20,
     offset: 1,
@@ -161,6 +162,7 @@
     fetchData()
   })
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -218,7 +220,7 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="exportList">
+          <el-button v-if="proxy.hasPerm('/operation/history/export')" type="primary" @click="exportList">
             导出
           </el-button>
         </div>
@@ -241,7 +243,7 @@
           </el-table-column>
         </template>
         <template #columns>
-          <el-table-column label="操作" align="center" width="80">
+          <el-table-column v-if="proxy.hasPerm('/operation/history/detail')" label="操作" align="center" width="80">
             <template #default="scope">
               <el-button type="primary" link size="small" @click="detailRow(scope.row)">
                 查看
diff --git a/src/views/home/operation/manufacturer/index.vue b/src/views/home/operation/manufacturer/index.vue
index 4a5816a..5f647c3 100644
--- a/src/views/home/operation/manufacturer/index.vue
+++ b/src/views/home/operation/manufacturer/index.vue
@@ -75,6 +75,7 @@
 }
 // 重置查询条件f
 const reset = () => {
+  datetimerange.value = []
   listQuery.value = {
     limit: 20,
     offset: 1,
@@ -125,6 +126,7 @@
   await fetchDict()
   fetchData()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -178,7 +180,7 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="exportList">
+          <el-button v-if="proxy.hasPerm('/operation/manufacturer/export')" type="primary" @click="exportList">
             导出
           </el-button>
         </div>
diff --git a/src/views/home/operation/trajectory/index.vue b/src/views/home/operation/trajectory/index.vue
index 9312fd7..606958e 100644
--- a/src/views/home/operation/trajectory/index.vue
+++ b/src/views/home/operation/trajectory/index.vue
@@ -65,6 +65,7 @@
 }
 // 重置查询条件f
 const reset = () => {
+  datetimerange.value = []
   listQuery.value = {
     limit: 20,
     offset: 1,
@@ -114,6 +115,7 @@
   await fetchDict()
   fetchData()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -175,7 +177,7 @@
           </span>
         </template>
         <template #columns>
-          <el-table-column label="操作" width="80" align="center">
+          <el-table-column v-if="proxy.hasPerm('/operation/trajectory/detail')" label="操作" width="80" align="center">
             <template #default="scope">
               <el-button type="primary" link size="small" @click="detail(scope.row)">
                 查看
diff --git a/src/views/home/pipeline/components/detailData.vue b/src/views/home/pipeline/components/detailData.vue
index 80b6886..760b1c5 100644
--- a/src/views/home/pipeline/components/detailData.vue
+++ b/src/views/home/pipeline/components/detailData.vue
@@ -7,7 +7,13 @@
 import type { TabsPaneContext } from 'element-plus'
 import monitorData from './monitorDataList.vue'
 import maintenanceRecord from '@/views/home/well/components/maintenanceRecord.vue'
-const activeName = ref('监控数据')
+const { proxy } = getCurrentInstance() as any
+const activeName = ref(
+  proxy.hasPerm('/pipeline/monitor/data')
+    ? '监控数据'
+    : proxy.hasPerm('/pipeline/monitor/maintenance')
+      ? '监控设备维护记录'
+      : '')
 const handleClick = (tab: TabsPaneContext, event: Event) => {
   // console.log(tab, event)
 }
@@ -15,10 +21,10 @@
 
 <template>
   <el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick">
-    <el-tab-pane label="监控数据" name="监控数据">
+    <el-tab-pane v-if="proxy.hasPerm('/pipeline/monitor/data')" label="监控数据" name="监控数据">
       <monitor-data v-if="activeName === '监控数据'" />
     </el-tab-pane>
-    <el-tab-pane label="监控设备维护记录" name="监控设备维护记录">
+    <el-tab-pane v-if="proxy.hasPerm('/pipeline/monitor/maintenance')" label="监控设备维护记录" name="监控设备维护记录">
       <maintenance-record v-if="activeName === '监控设备维护记录'" />
     </el-tab-pane>
   </el-tabs>
diff --git a/src/views/home/pipeline/index.vue b/src/views/home/pipeline/index.vue
index 90baef0..4d66e51 100644
--- a/src/views/home/pipeline/index.vue
+++ b/src/views/home/pipeline/index.vue
@@ -254,6 +254,7 @@
     tableHeight.value = window.innerHeight - 60 - 50 - 10 - 98 - 10 - 52 - 52 - 10
   }
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -348,7 +349,7 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary">
+          <el-button v-if="proxy.hasPerm('/pipeline/export')" type="primary">
             导出
           </el-button>
         </div>
@@ -368,7 +369,7 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="80">
             <template #default="scope">
-              <el-button type="primary" link size="small" @click="editRow('detail', scope.row)">
+              <el-button v-if="proxy.hasPerm('/pipeline/detail')" type="primary" link size="small" @click="editRow('detail', scope.row)">
                 查看
               </el-button>
               <!-- <el-button type="primary" link size="small" @click="editRow('edit', scope.row)">
diff --git a/src/views/home/rule/agreement/index.vue b/src/views/home/rule/agreement/index.vue
index fd41cd3..f1cfe15 100644
--- a/src/views/home/rule/agreement/index.vue
+++ b/src/views/home/rule/agreement/index.vue
@@ -95,6 +95,7 @@
 onMounted(async () => {
   fetchData()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -119,7 +120,7 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="editRow('add', {})">
+          <el-button v-if="proxy.hasPerm('/rule/agreement/add')" type="primary" @click="editRow('add', {})">
             新建
           </el-button>
         </div>
@@ -139,10 +140,10 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="120">
             <template #default="scope">
-              <el-button type="primary" link size="small" @click="editRow('edit', scope.row)">
+              <el-button v-if="proxy.hasPerm('/rule/agreement/update')" type="primary" link size="small" @click="editRow('edit', scope.row)">
                 编辑
               </el-button>
-              <el-button type="danger" link size="small" @click="removeRow(scope.row)">
+              <el-button v-if="proxy.hasPerm('/rule/agreement/delete')" type="danger" link size="small" @click="removeRow(scope.row)">
                 删除
               </el-button>
             </template>
diff --git a/src/views/home/rule/alarm/components/alarmLevelList.vue b/src/views/home/rule/alarm/components/alarmLevelList.vue
index c8ffb7d..6c337c4 100644
--- a/src/views/home/rule/alarm/components/alarmLevelList.vue
+++ b/src/views/home/rule/alarm/components/alarmLevelList.vue
@@ -87,6 +87,7 @@
 const cancel = () => {
   dialogFormVisible.value = false
 }
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -97,7 +98,7 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="detailRow('create', {})">
+          <el-button v-if="proxy.hasPerm('/rule/alarm/level/add')" type="primary" @click="detailRow('create', {})">
             新增
           </el-button>
         </div>
@@ -117,10 +118,10 @@
         <template #columns>
           <el-table-column label="操作" width="120" align="center">
             <template #default="scope">
-              <el-button type="primary" link size="small" @click="detailRow('edit', scope.row)">
+              <el-button v-if="proxy.hasPerm('/rule/alarm/level/update')" type="primary" link size="small" @click="detailRow('edit', scope.row)">
                 编辑
               </el-button>
-              <el-button type="danger" link size="small" @click="removeRow(scope.row)">
+              <el-button v-if="proxy.hasPerm('/rule/alarm/level/delete')" type="danger" link size="small" @click="removeRow(scope.row)">
                 删除
               </el-button>
             </template>
diff --git a/src/views/home/rule/alarm/components/alarmTypeList.vue b/src/views/home/rule/alarm/components/alarmTypeList.vue
index 2cbf110..aa0cfed 100644
--- a/src/views/home/rule/alarm/components/alarmTypeList.vue
+++ b/src/views/home/rule/alarm/components/alarmTypeList.vue
@@ -80,6 +80,7 @@
 const cancel = () => {
   dialogFormVisible.value = false
 }
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -90,7 +91,7 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="detailRow('create', {})">
+          <el-button v-if="proxy.hasPerm('/rule/alarm/type/add')" type="primary" @click="detailRow('create', {})">
             新增
           </el-button>
         </div>
@@ -110,10 +111,10 @@
         <template #columns>
           <el-table-column label="操作" width="120" align="center">
             <template #default="scope">
-              <el-button type="primary" link size="small" @click="detailRow('edit', scope.row)">
+              <el-button v-if="proxy.hasPerm('/rule/alarm/type/update')" type="primary" link size="small" @click="detailRow('edit', scope.row)">
                 编辑
               </el-button>
-              <el-button type="danger" link size="small" @click="removeRow(scope.row)">
+              <el-button v-if="proxy.hasPerm('/rule/alarm/type/delete')" type="danger" link size="small" @click="removeRow(scope.row)">
                 删除
               </el-button>
             </template>
diff --git a/src/views/home/rule/alarm/index.vue b/src/views/home/rule/alarm/index.vue
index 110030c..4e66a34 100644
--- a/src/views/home/rule/alarm/index.vue
+++ b/src/views/home/rule/alarm/index.vue
@@ -20,11 +20,14 @@
 // 初始展示列
 const columns = ref<any>([
   { text: '报警类型', value: 'alarmTypeName', align: 'center' },
-  { text: '报警名称', value: 'alarmName', align: 'center' },
-  { text: '报警等级', value: 'alarmLevelName', align: 'center' },
-  { text: '报警提示方式', value: 'alarmNoteMethodName', align: 'center' },
-  { text: '状态', value: 'stateName', align: 'center', width: '130' },
-  { text: '创建时间', value: 'ts', align: 'center' },
+  { text: '设备类型', value: 'typeName', align: 'center' },
+  { text: '产品', value: 'productName', align: 'center' },
+  { text: '厂商', value: 'manufacturerName', align: 'center' },
+  // { text: '报警名称', value: 'alarmName', align: 'center' },
+  { text: '报警等级', value: 'alarmLevelName', align: 'center', width: '100' },
+  { text: '报警提示方式', value: 'alarmNoteMethodName', align: 'center', width: '130', isCustom: true },
+  { text: '状态', value: 'stateName', align: 'center', width: '100', isCustom: true },
+  { text: '创建时间', value: 'ts', align: 'center', width: '200' },
 ])
 // 最终展示列
 const columnsConfig = ref([])
@@ -158,6 +161,7 @@
   await fetchDict()
   fetchData()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -191,13 +195,13 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="showAlarmType">
+          <el-button v-if="proxy.hasPerm('/rule/alarm/type')" type="primary" @click="showAlarmType">
             报警类型管理
           </el-button>
-          <el-button type="primary" @click="showAlarmLevel">
+          <el-button v-if="proxy.hasPerm('/rule/alarm/level')" type="primary" @click="showAlarmLevel">
             报警等级管理
           </el-button>
-          <el-button type="primary" @click="detailRow('create', {})">
+          <el-button v-if="proxy.hasPerm('/rule/alarm/add')" type="primary" @click="detailRow('create', {})">
             新增
           </el-button>
         </div>
@@ -214,16 +218,28 @@
             </template>
           </el-table-column>
         </template>
+        <template #isCustom="{ scope, column }">
+          <!-- 报警提示方式 -->
+          <span v-if="column.text === '报警提示方式'">
+            <el-tag v-if="scope.row.alarmNoteMethodName === '消息提醒'" type="primary">消息提醒</el-tag>
+            <el-tag v-if="scope.row.alarmNoteMethodName === '弹窗'" type="danger">弹窗提醒</el-tag>
+          </span>
+          <!-- 报警提示方式 -->
+          <span v-if="column.text === '状态'">
+            <el-tag v-if="scope.row.stateName === '启用'" type="success">启用</el-tag>
+            <el-tag v-if="scope.row.stateName === '未启用'" type="info">未启用</el-tag>
+          </span>
+        </template>
         <template #columns>
           <el-table-column label="操作" width="140" align="center">
             <template #default="scope">
-              <el-button type="primary" link size="small" @click="switchStatusRow(scope.row)">
+              <el-button v-if="proxy.hasPerm('/rule/alarm/handler')" type="primary" link size="small" @click="switchStatusRow(scope.row)">
                 {{ scope.row.state === '1' ? '停用' : '启用' }}
               </el-button>
-              <el-button type="primary" link size="small" @click="detailRow('edit', scope.row)">
+              <el-button v-if="proxy.hasPerm('/rule/alarm/update')" type="primary" link size="small" @click="detailRow('edit', scope.row)">
                 编辑
               </el-button>
-              <el-button type="danger" link size="small" @click="removeRow(scope.row)">
+              <el-button v-if="proxy.hasPerm('/rule/alarm/delete')" type="danger" link size="small" @click="removeRow(scope.row)">
                 删除
               </el-button>
             </template>

diff --git a/src/App.vue b/src/App.vue
index cde81b3..8a00f5d 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -125,7 +125,7 @@
         '--g-sub-sidebar-actual-width': subSidebarActualWidth,
       }"
     />
-    <system-info v-if="browserType !== 'mobile'" />
+    <!-- <system-info v-if="browserType !== 'mobile'" /> -->
     <audio id="eventAudio" src="" autoplay />
   </el-config-provider>
 </template>
diff --git a/src/layouts/components/Tools/alarmDialog.vue b/src/layouts/components/Tools/alarmDialog.vue
index 1828375..df89ab8 100644
--- a/src/layouts/components/Tools/alarmDialog.vue
+++ b/src/layouts/components/Tools/alarmDialog.vue
@@ -116,7 +116,7 @@
     </div>
     <template #footer>
       <div class="dialog-footer">
-        <div class="btn" @click="detail">
+        <div v-if="proxy.hasPerm('/alarm/current')" class="btn" @click="detail">
           查看
         </div>
         <div v-if="info.isSound === '1'" class="btn" @click="closeSound">
diff --git a/src/layouts/components/Tools/alarmList.vue b/src/layouts/components/Tools/alarmList.vue
index c3a9d2a..5356b74 100644
--- a/src/layouts/components/Tools/alarmList.vue
+++ b/src/layouts/components/Tools/alarmList.vue
@@ -54,6 +54,7 @@
 }
 // 查看当前行
 const detailRow = (row: any) => {
+  if (!proxy.hasPerm('/alarm/current')) { return }
   $router.push({
     name: 'AlarmCurrent',
     query: {
@@ -77,21 +78,6 @@
   localStorage.setItem('eventAudio', 'pause')
 }
 const dialogRef = ref()
-// const dialog = () => {
-//   const row = {
-//     alarmNoteMethod: '1', // 消息提醒 1:弹窗，2:消息提醒
-//     isSound: '1', // 报警音效，1:开，0:关
-//     isSend: '1', // 报警推送，1:开，0:关
-//     isText: '1', // 报警短息，1:开，0:关
-//     alarmType: '浓度超限',
-//     tagNumber: 'NX5702',
-//     alarmTime: '2024-09-09',
-//     value: '20',
-//     typeName: '燃气智能终端',
-//     alarmLevel: '一级',
-//   }
-//   dialogRef.value.initDialog(row)
-// }
 const fetchData = (isLoading = false) => {
   loading.value = true
   if (isLoading) {
@@ -115,7 +101,10 @@
       dialogRef.value.initDialog(newVal)
     }
     if (newVal.isSound === '1') {
-      play()
+      // play()
+      if (!localStorage.getItem('eventAudio')) {
+        proxy.playAudio()
+      }
     }
     fetchData(false)
   }
@@ -146,6 +135,7 @@
 //     window.localStorage.removeItem('token')
 //   }
 // }
+// const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -180,7 +170,7 @@
                   {{ message.processStatus
                     === '未读' ? '未读' : '已读' }}
                 </el-tag>
-                <el-tag type="info" size="small" style="margin-left: 5px;">
+                <el-tag type="info" size="small" style="margin-left: 5px;" @click="detailRow(message)">
                   查看
                 </el-tag>
               </div>
@@ -214,7 +204,7 @@
       <!-- <div class="close" @click="dialog">
         弹窗
       </div> -->
-      <div class="more" @click="moreList">
+      <div v-if="proxy.hasPerm('/alarm/current')" class="more" @click="moreList">
         查看更多
       </div>
     </div>
diff --git a/src/layouts/components/Tools/index.vue b/src/layouts/components/Tools/index.vue
index 9f2d41f..61f9707 100644
--- a/src/layouts/components/Tools/index.vue
+++ b/src/layouts/components/Tools/index.vue
@@ -79,6 +79,7 @@
   // 断开 websocket
   // websocket.destroyWebSocket()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -89,18 +90,18 @@
           <svg-icon name="ep:search" />
         </el-icon>
       </span>
-      <span class="item" @click="board">
+      <span v-if="proxy.hasPerm('/fullscreen')" class="item" @click="board">
         <el-icon>
           <svg-icon name="ep:data-line" />
         </el-icon>
       </span>
-      <span v-if="settingsStore.mode === 'pc' && settingsStore.toolbar.enableFullscreen" class="item" @click="toggle">
+      <span class="item" @click="toggle">
         <el-icon>
           <svg-icon :name="isFullscreen ? 'fullscreen-exit' : 'fullscreen'" />
         </el-icon>
       </span>
       <!-- 报警信息列表 -->
-      <span class="item">
+      <span v-if="proxy.hasPerm('/alarmnotice')" class="item">
         <el-popover width="390">
           <template #reference>
             <div>
diff --git a/src/layouts/components/Topbar/index.vue b/src/layouts/components/Topbar/index.vue
index 2863cef..4e3120e 100644
--- a/src/layouts/components/Topbar/index.vue
+++ b/src/layouts/components/Topbar/index.vue
@@ -67,7 +67,7 @@
           </transition-group>
         </el-breadcrumb>
       </div>
-      <tools />
+      <!-- <tools /> -->
     </div>
   </div>
 </template>
diff --git a/src/router/modules/pc.ts b/src/router/modules/pc.ts
index aacd6fa..97ced45 100644
--- a/src/router/modules/pc.ts
+++ b/src/router/modules/pc.ts
@@ -40,7 +40,7 @@
       icon: 'ep:key',
       sidebar: false,
       breadcrumb: false,
-      // auth: '/fullscreen',
+      auth: '/fullscreen',
     },
   },
   {
@@ -155,7 +155,7 @@
           sidebar: false,
           breadcrumb: false,
           activeMenu: '/well',
-          auth: '/well/detail',
+          auth: '/well',
         },
       },
     ],
diff --git a/src/views/home/alarm/count/components/locationAnalysis.vue b/src/views/home/alarm/count/components/locationAnalysis.vue
index fc75b9e..bff1853 100644
--- a/src/views/home/alarm/count/components/locationAnalysis.vue
+++ b/src/views/home/alarm/count/components/locationAnalysis.vue
@@ -46,6 +46,7 @@
   })
 }
 fetchData()
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -75,6 +76,9 @@
         <el-button type="primary" style="margin: 0 5px;" @click="fetchData">
           搜索
         </el-button>
+        <el-button v-if="proxy.hasPerm('/alarm/count/exportLocation')" type="primary" style="margin: 0 5px;">
+          导出
+        </el-button>
       </div>
     </template>
     <template #content>
diff --git a/src/views/home/alarm/current/components/detail.vue b/src/views/home/alarm/current/components/detail.vue
index dd3b31a..4204c92 100644
--- a/src/views/home/alarm/current/components/detail.vue
+++ b/src/views/home/alarm/current/components/detail.vue
@@ -111,7 +111,7 @@
   const res2 = await getAlarmTypeListPage({ offset: 1, limit: 9999 });
   ($route.query.type === 'history' ? getAlarmDetail : getAlarmDetail)($route.query.id as string).then((res) => {
     detailInfo.value = toHumpObject(res.data)
-    detailInfo.value.realAlarmName = detailInfo.value.realAlarm === '1' ? '报警' : '误报'
+    detailInfo.value.realAlarmName = detailInfo.value.realAlarm === '0' ? '是' : '否'
     detailInfo.value.alarmTypeName = res2.data.rows.filter((item: any) => item.id === detailInfo.value.alarmTypeId)[0]?.alarmType || ''
     detailInfo.value.alarmLevelName = res1.data.rows.filter((item: any) => item.id === detailInfo.value.alarmLevel)[0]?.alarmLevel || ''
     detailInfo.value.duration = detailInfo.value.ts && detailInfo.value.cancelTime ? getDateDiff(detailInfo.value.ts, detailInfo.value.cancelTime) : ''
@@ -139,6 +139,7 @@
 }
 // 点击经纬度展示地图
 const mapRef = ref()
+const { proxy } = getCurrentInstance() as any
 const showMap = (data: any) => {
   console.log(data, 'data')
   if (data.text === '位置') {
@@ -148,6 +149,13 @@
         2: 'StationMonitorDetail',
         3: 'PipelineMonitorDetail',
       } as { [key: string]: string }
+      // 判断是否有菜单权限
+      const watchObjectAuth = {
+        1: '/well',
+        2: '/station/monitor',
+        3: '/pipeline',
+      } as { [key: string]: string }
+      if (!proxy.hasPerm(watchObjectAuth[detailInfo.value.watchObject])) { return }
       $router.push({
         name: watchObject[detailInfo.value.watchObject],
         query: {
diff --git a/src/views/home/alarm/current/components/detailInfoDialog.vue b/src/views/home/alarm/current/components/detailInfoDialog.vue
index c089449..7fbf06b 100644
--- a/src/views/home/alarm/current/components/detailInfoDialog.vue
+++ b/src/views/home/alarm/current/components/detailInfoDialog.vue
@@ -114,6 +114,7 @@
   })
 }
 defineExpose({ initDialog, close })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -131,7 +132,7 @@
     <!-- 头部 -->
     <div class="header">
       <span>{{ info.alarmContent }}</span>
-      <span class="more" @click="moreData">>>更多</span>
+      <span v-if="proxy.hasPerm(type === 'data' ? '/alarm/current/more' : '/alarm/device/more')" class="more" @click="moreData">>>更多</span>
     </div>
     <div class="content">
       <div v-show="type === 'device'" class="item">
@@ -162,7 +163,7 @@
         报警设备:
         <span style="padding-left: 6px;">{{ info.devcode }} </span>
         <el-button
-          v-if="info.devTypeName === '燃气智能监测终端' || info.devTypeName === '液位检测仪' || info.devTypeName === '井盖监测仪'"
+          v-if="(info.devTypeName === '燃气智能监测终端' || info.devTypeName === '液位检测仪' || info.devTypeName === '井盖监测仪') && proxy.hasPerm('/alarm/current/data')"
           size="small" style="margin-left: 6px;" @click="viewData"
         >
           查看数据
@@ -228,7 +229,7 @@
         <span style="padding-left: 6px;">
           {{ info.confirmContent }}
         </span>
-        <el-button v-if="type === 'data'" size="small" style="padding-left: 6px;" @click="viewProcess">
+        <el-button v-if="type === 'data' && proxy.hasPerm('/alarm/current/process')" size="small" style="padding-left: 6px;" @click="viewProcess">
           流程图
         </el-button>
       </div>
@@ -246,17 +247,17 @@
       </div>
     </div>
     <div class="footer">
-      <el-button v-if="Number(info.processStatus) < 4 && type === 'data'" size="small" @click="remind">
+      <el-button v-if="(Number(info.processStatus) < 4 && type === 'data') && proxy.hasPerm('/alarm/current/remind')" size="small" @click="remind">
         提醒责任人
       </el-button>
       <el-button
-        v-if="type === 'device' && (info.processStatusName === '待处置' || info.processStatusName === '挂起')"
+        v-if="(type === 'device' && (info.processStatusName === '待处置' || info.processStatusName === '挂起')) && proxy.hasPerm('/alarm/device/handler')"
         size="small" @click="handler"
       >
         报警处置
       </el-button>
       <el-button
-        v-if="Number(info.processStatus) <= 3 || (type === 'device' && info.processStatusName === '待处置') || info.processStatusName === '挂起'"
+        v-if="(Number(info.processStatus) <= 3 || (type === 'device' && info.processStatusName === '待处置') || info.processStatusName === '挂起') && proxy.hasPerm(type === 'device' ? '/alarm/device/pending' : '/alarm/current/pending')"
         type="primary" size="small" @click="pending"
       >
         挂起
diff --git a/src/views/home/alarm/current/index.vue b/src/views/home/alarm/current/index.vue
index d019bbf..e2714bb 100644
--- a/src/views/home/alarm/current/index.vue
+++ b/src/views/home/alarm/current/index.vue
@@ -4,6 +4,7 @@
   Date: 2023-06-28
  -->
 <script lang="ts" setup name="CurrentAlarm">
+import dayjs from 'dayjs'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import { ArrowLeftBold, ArrowRightBold } from '@element-plus/icons-vue'
 import MapCom from './components/map.vue'
@@ -100,6 +101,7 @@
       path: '/alarm/current',
     })
   }
+  datetimerange.value = []
   listQuery.value = {
     limit: 20,
     offset: 1,
@@ -131,8 +133,8 @@
   if ($route.query.row) {
     loadingTable.value = true
     const row = JSON.parse($route.query.row as string)
-    getCurrentAlarmListPage({ offset: 1, limit: 99999 }).then((res) => {
-      const data = res.data.rows.filter((item: any) => item.id === row.id)
+    getCurrentAlarmListPage({ offset: 1, limit: 50 }).then((res) => {
+      const data = res.data.rows.filter((item: any) => item.id === row.alarmId)
       if (data.length) {
         list1.value = data.map((item: any) => ({
           ...item,
@@ -153,7 +155,10 @@
     })
     return
   }
-  fetchData()
+  datetimerange.value = [dayjs().subtract(7, 'day').format('YYYY-MM-DD HH:mm:ss'), dayjs().format('YYYY-MM-DD HH:mm:ss')]
+  setTimeout(() => {
+    fetchData()
+  })
 })
 // 表格标识  地图或普通
 const tableFlag = ref('normal')
@@ -181,6 +186,10 @@
 const mapRef = ref()
 const mapData = ref({})
 async function detail(row: any) {
+  if (row.processStatusName === '未读') {
+    list1.value[list1.value.findIndex((item: any) => item.id === row.id)].processStatusName = '已读'
+    row.processStatusName = '已读'
+  }
   const res = await detailAlarm(row.id)
   const data = toHumpObject(res.data)
   mapData.value = row
@@ -362,7 +371,7 @@
               <el-button v-if="proxy.hasPerm('/alarm/current/delete')" type="primary" @click="batchDeleteRow">
                 批量删除
               </el-button>
-              <el-button type="primary" @click="exportList">
+              <el-button v-if="proxy.hasPerm('/alarm/current/export')" type="primary" @click="exportList">
                 导出
               </el-button>
             </div>
@@ -383,7 +392,7 @@
               </el-table-column>
             </template>
             <template #columns>
-              <el-table-column label="操作" align="center" width="80">
+              <el-table-column v-if="proxy.hasPerm('/alarm/current/detail')" label="操作" align="center" width="80">
                 <template #default="scope">
                   <el-button type="primary" link size="small" @click="detail(scope.row)">
                     查看
diff --git a/src/views/home/alarm/history/index.vue b/src/views/home/alarm/history/index.vue
index eeb49fc..3c810c3 100644
--- a/src/views/home/alarm/history/index.vue
+++ b/src/views/home/alarm/history/index.vue
@@ -97,6 +97,7 @@
 }
 // 重置查询条件f
 const reset = () => {
+  datetimerange.value = []
   listQuery.value = {
     limit: 20,
     offset: 1,
@@ -189,6 +190,7 @@
   })
 }
 fetchDict()
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -249,7 +251,7 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="exportList">
+          <el-button v-if="proxy.hasPerm('/alarm/history/export')" type="primary" @click="exportList">
             导出
           </el-button>
         </div>
@@ -272,7 +274,7 @@
           </el-table-column>
         </template>
         <template #columns>
-          <el-table-column label="操作" align="center" width="80">
+          <el-table-column v-if="proxy.hasPerm('/alarm/history/detail')" label="操作" align="center" width="80">
             <template #default="scope">
               <el-button type="primary" link size="small" @click="moreData(scope.row)">
                 查看
diff --git a/src/views/home/dashboard/index.vue b/src/views/home/dashboard/index.vue
index d2f7e3c..42dfbed 100644
--- a/src/views/home/dashboard/index.vue
+++ b/src/views/home/dashboard/index.vue
@@ -42,7 +42,7 @@
     value: '0',
     name: '在线',
     unit: '个',
-    id: '1',
+    id: '1,2',
   },
   {
     img: img.lixian,
@@ -56,7 +56,7 @@
     value: '0',
     name: '停用',
     unit: '个',
-    id: '2',
+    id: '3',
   },
 ])
 // 工作台数据
@@ -133,7 +133,11 @@
   deviceOperationLoading.value = true
   getDeviceStatus().then((res) => {
     res.data.forEach((element: any) => {
-      const index = deviceOperationData.value.findIndex((item: any) => item.id === element.name)
+      if (element.name === '1' || element.name === '2') {
+        deviceOperationData.value[0].value = Number(deviceOperationData.value[0].value || '0') + Number(element.value)
+        return
+      }
+      const index = deviceOperationData.value.findIndex((item: any) => item.id.includes(element.name))
       if (index !== -1) {
         deviceOperationData.value[index].value = element.value
       }
diff --git a/src/views/home/device/count/components/bottom.vue b/src/views/home/device/count/components/bottom.vue
index 28a4d78..e4e56fa 100644
--- a/src/views/home/device/count/components/bottom.vue
+++ b/src/views/home/device/count/components/bottom.vue
@@ -110,6 +110,7 @@
   })
 }
 fetchDict()
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -148,7 +149,7 @@
             <template #btns-right>
               <!-- 操作 -->
               <div>
-                <el-button type="primary">
+                <el-button v-if="proxy.hasPerm('/device/count/offline/export')" type="primary">
                   导出
                 </el-button>
               </div>
diff --git a/src/views/home/device/device/index.vue b/src/views/home/device/device/index.vue
index c3970b9..9cdd606 100644
--- a/src/views/home/device/device/index.vue
+++ b/src/views/home/device/device/index.vue
@@ -88,6 +88,7 @@
 }
 // 重置查询条件f
 const reset = () => {
+  datetimerange.value = []
   listQuery.value = {
     limit: 20,
     offset: 1,
@@ -296,6 +297,7 @@
   fetchDict()
   fetchData()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -372,17 +374,17 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="editRow('add', {})">
+          <el-button v-if="proxy.hasPerm('/device/manage/add')" type="primary" @click="editRow('add', {})">
             新建
           </el-button>
-          <el-button type="primary" @click="downloadTemplate">
+          <el-button v-if="proxy.hasPerm('/device/manage/down')" type="primary" @click="downloadTemplate">
             模板下载
           </el-button>
-          <el-button type="primary" @click="importList">
+          <el-button v-if="proxy.hasPerm('/device/manage/import')" type="primary" @click="importList">
             批量导入
           </el-button>
-          <el-button type="primary" @click="exportList">
-            导出列表
+          <el-button v-if="proxy.hasPerm('/device/manage/export')" type="primary" @click="exportList">
+            导出
           </el-button>
           <input ref="fileRef" style="display: none;" type="file" accept=".xls,.xlsx" @change="onFileChange">
         </div>
@@ -409,16 +411,16 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="150">
             <template #default="scope">
-              <el-button type="primary" link size="small" @click="editRow('detail', scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/manage/detail')" type="primary" link size="small" @click="editRow('detail', scope.row)">
                 查看
               </el-button>
-              <el-button type="primary" link size="small" @click="editRow('edit', scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/manage/update')" type="primary" link size="small" @click="editRow('edit', scope.row)">
                 编辑
               </el-button>
-              <el-button type="danger" link size="small" @click="changeDefense(scope.row)">
+              <!-- <el-button v-if="proxy.hasPerm('/device/manage/add')" type="danger" link size="small" @click="changeDefense(scope.row)">
                 撤防
-              </el-button>
-              <el-button type="danger" link size="small" @click="removeRow(scope.row)">
+              </el-button> -->
+              <el-button v-if="proxy.hasPerm('/device/manage/delete')" type="danger" link size="small" @click="removeRow(scope.row)">
                 删除
               </el-button>
             </template>
diff --git a/src/views/home/device/instruction/index.vue b/src/views/home/device/instruction/index.vue
index 1e598ed..1da6706 100644
--- a/src/views/home/device/instruction/index.vue
+++ b/src/views/home/device/instruction/index.vue
@@ -78,6 +78,7 @@
 }
 // 重置查询条件f
 const reset = () => {
+  datetimerange.value = []
   listQuery.value = {
     limit: 20,
     offset: 1,
@@ -158,6 +159,7 @@
     editRef.value.initDialog('addOther', {})
   }
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -213,10 +215,10 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary">
+          <el-button v-if="proxy.hasPerm('/device/instruction/batch')" type="primary">
             批量下发
           </el-button>
-          <el-button type="primary" @click="editRow('add', {})">
+          <el-button v-if="proxy.hasPerm('/device/instruction/add')" type="primary" @click="editRow('add', {})">
             新建
           </el-button>
         </div>
@@ -236,13 +238,13 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="120">
             <template #default="scope">
-              <el-button type="primary" link size="small" @click="editRow('detail', scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/instruction/detail')" type="primary" link size="small" @click="editRow('detail', scope.row)">
                 查看
               </el-button>
-              <el-button v-if="scope.row.status === '2'" type="primary" link size="small" @click="editRow('edit', scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/instruction/again') && scope.row.status === '2'" type="primary" link size="small" @click="editRow('edit', scope.row)">
                 重新下发
               </el-button>
-              <el-button type="danger" link size="small" @click="removeRow(scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/instruction/delete')" type="danger" link size="small" @click="removeRow(scope.row)">
                 删除
               </el-button>
             </template>
diff --git a/src/views/home/device/product/index.vue b/src/views/home/device/product/index.vue
index 799fc90..fdd5463 100644
--- a/src/views/home/device/product/index.vue
+++ b/src/views/home/device/product/index.vue
@@ -128,6 +128,7 @@
   await fetchDict()
   fetchData()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -164,7 +165,7 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="editRow('add', {})">
+          <el-button v-if="proxy.hasPerm('/device/product/add')" type="primary" @click="editRow('add', {})">
             新建
           </el-button>
         </div>
@@ -184,10 +185,10 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="120">
             <template #default="scope">
-              <el-button type="primary" link size="small" @click="editRow('edit', scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/product/update')" type="primary" link size="small" @click="editRow('edit', scope.row)">
                 编辑
               </el-button>
-              <el-button type="danger" link size="small" @click="removeRow(scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/product/delete')" type="danger" link size="small" @click="removeRow(scope.row)">
                 删除
               </el-button>
             </template>
diff --git a/src/views/home/device/type/index.vue b/src/views/home/device/type/index.vue
index 59f1343..2344e57 100644
--- a/src/views/home/device/type/index.vue
+++ b/src/views/home/device/type/index.vue
@@ -105,6 +105,7 @@
   await fetchDict()
   fetchData()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -131,7 +132,7 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="editRow('add', {})">
+          <el-button v-if="proxy.hasPerm('/device/type/add')" type="primary" @click="editRow('add', {})">
             新建
           </el-button>
         </div>
@@ -151,10 +152,10 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="120">
             <template #default="scope">
-              <el-button type="primary" link size="small" @click="editRow('edit', scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/type/update')" type="primary" link size="small" @click="editRow('edit', scope.row)">
                 编辑
               </el-button>
-              <el-button type="danger" link size="small" @click="removeRow(scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/type/delete')" type="danger" link size="small" @click="removeRow(scope.row)">
                 删除
               </el-button>
             </template>
diff --git a/src/views/home/ledger/ledger/components/gridList.vue b/src/views/home/ledger/ledger/components/gridList.vue
index d03cd9f..189edef 100644
--- a/src/views/home/ledger/ledger/components/gridList.vue
+++ b/src/views/home/ledger/ledger/components/gridList.vue
@@ -91,6 +91,7 @@
     // })
   })
 }
+const { proxy } = getCurrentInstance() as any
 // 同步日志
 const allSync = () => {
   $router.push({
@@ -139,10 +140,10 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="allSync">
+          <el-button v-if="proxy.hasPerm('/ledger/sync')" type="primary" @click="allSync">
             同步日志
           </el-button>
-          <el-button type="primary" @click="sync('all', {})">
+          <el-button v-if="proxy.hasPerm('/ledger/sync/all')" type="primary" @click="sync('all', {})">
             全量同步
           </el-button>
         </div>
@@ -160,9 +161,9 @@
           </el-table-column>
         </template>
         <template #columns>
-          <el-table-column label="操作" align="center" width="80">
+          <el-table-column v-if="proxy.hasPerm('/ledger/sync/single')" label="操作" align="center" width="80">
             <template #default="scope">
-              <el-button type="primary" link size="small" @click="sync('single', scope.row)">
+              <el-button v-if="proxy.hasPerm('/ledger/sync/single')" type="primary" link size="small" @click="sync('single', scope.row)">
                 同步
               </el-button>
             </template>
diff --git a/src/views/home/ledger/ledger/components/wellList.vue b/src/views/home/ledger/ledger/components/wellList.vue
index 9eb1f43..06f855a 100644
--- a/src/views/home/ledger/ledger/components/wellList.vue
+++ b/src/views/home/ledger/ledger/components/wellList.vue
@@ -123,6 +123,7 @@
   // await fetchDict()
   fetchData()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -159,11 +160,11 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="allSync">
+          <el-button v-if="proxy.hasPerm('/ledger/sync')" type="primary" @click="allSync">
             同步日志
           </el-button>
-          <el-button type="primary" @click="sync('all', {})">
-            全部同步
+          <el-button v-if="proxy.hasPerm('/ledger/sync/all')" type="primary" @click="sync('all', {})">
+            全量同步
           </el-button>
         </div>
       </template>
@@ -180,9 +181,9 @@
           </el-table-column>
         </template>
         <template #columns>
-          <el-table-column label="操作" align="center" width="80">
+          <el-table-column v-if="proxy.hasPerm('/ledger/sync/single')" label="操作" align="center" width="80">
             <template #default="scope">
-              <el-button type="primary" link size="small" @click="sync('single', scope.row)">
+              <el-button v-if="proxy.hasPerm('/ledger/sync/single')" type="primary" link size="small" @click="sync('single', scope.row)">
                 同步
               </el-button>
             </template>
diff --git a/src/views/home/ledger/ledger/index.vue b/src/views/home/ledger/ledger/index.vue
index a03aa12..8403fc5 100644
--- a/src/views/home/ledger/ledger/index.vue
+++ b/src/views/home/ledger/ledger/index.vue
@@ -7,7 +7,16 @@
 import type { TabsPaneContext } from 'element-plus'
 import wellList from './components/wellList.vue'
 import gridList from './components/gridList.vue'
-const activeName = ref('闸井')
+const { proxy } = getCurrentInstance() as any
+const activeName = ref(
+  proxy.hasPerm('/ledger/manage/well')
+    ? '闸井'
+    : proxy.hasPerm('/ledger/manage/station')
+      ? '场站'
+      : proxy.hasPerm('/ledger/manage/grid')
+        ? '网格'
+        : '',
+)
 const handleClick = (tab: TabsPaneContext, event: Event) => {
   // console.log(tab, event)
 }
@@ -17,13 +26,13 @@
   <!-- 布局 -->
   <app-container>
     <el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick">
-      <el-tab-pane label="闸井" name="闸井">
+      <el-tab-pane v-if="proxy.hasPerm('/ledger/manage/well')" label="闸井" name="闸井">
         <well-list v-if="activeName === '闸井'" type="1" />
       </el-tab-pane>
-      <el-tab-pane label="场站" name="场站">
+      <el-tab-pane v-if="proxy.hasPerm('/ledger/manage/station')" label="场站" name="场站">
         <well-list v-if="activeName === '场站'" type="2" />
       </el-tab-pane>
-      <el-tab-pane label="网格" name="网格">
+      <el-tab-pane v-if="proxy.hasPerm('/ledger/manage/grid')" label="网格" name="网格">
         <grid-list v-if="activeName === '网格'" />
       </el-tab-pane>
     </el-tabs>
diff --git a/src/views/home/ledger/pipeline/index.vue b/src/views/home/ledger/pipeline/index.vue
index e0d2512..01e95ac 100644
--- a/src/views/home/ledger/pipeline/index.vue
+++ b/src/views/home/ledger/pipeline/index.vue
@@ -160,6 +160,7 @@
 onMounted(async () => {
   fetchData()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -222,13 +223,13 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="editRow('add', {})">
+          <el-button v-if="proxy.hasPerm('/ledger/pipeline/add')" type="primary" @click="editRow('add', {})">
             新增
           </el-button>
-          <el-button type="primary" @click="importList">
+          <el-button v-if="proxy.hasPerm('/ledger/pipeline/import')" type="primary" @click="importList">
             批量导入
           </el-button>
-          <el-button type="primary" @click="exportList">
+          <el-button v-if="proxy.hasPerm('/ledger/pipeline/export')" type="primary" @click="exportList">
             批量导出
           </el-button>
         </div>
@@ -248,10 +249,10 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="100">
             <template #default="scope">
-              <el-button type="primary" link size="small" @click="editRow('edit', scope.row)">
+              <el-button v-if="proxy.hasPerm('/ledger/pipeline/update')" type="primary" link size="small" @click="editRow('edit', scope.row)">
                 编辑
               </el-button>
-              <el-button type="danger" link size="small" @click="removeRow(scope.row)">
+              <el-button v-if="proxy.hasPerm('/ledger/pipeline/delete')" type="danger" link size="small" @click="removeRow(scope.row)">
                 删除
               </el-button>
             </template>
diff --git a/src/views/home/ledger/sync/index.vue b/src/views/home/ledger/sync/index.vue
index 54a3218..a04bad9 100644
--- a/src/views/home/ledger/sync/index.vue
+++ b/src/views/home/ledger/sync/index.vue
@@ -62,6 +62,7 @@
 }
 // 重置查询条件f
 const reset = () => {
+  datetimerange.value = []
   listQuery.value = {
     limit: 20,
     offset: 1,
@@ -106,6 +107,8 @@
 onMounted(async () => {
   fetchData()
 })
+const { proxy } = getCurrentInstance() as any
+const $route = useRoute()
 </script>
 
 <template>
@@ -132,7 +135,7 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="goBak">
+          <el-button v-if="$route.type" type="primary" @click="goBak">
             返回
           </el-button>
         </div>
@@ -152,10 +155,10 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="80">
             <template #default="scope">
-              <el-button type="primary" link size="small">
+              <el-button v-if="proxy.hasPerm('/ledger/sync/detail')" type="primary" link size="small">
                 查看
               </el-button>
-              <el-button type="danger" link size="small" @click="removeRow(scope.row)">
+              <el-button v-if="proxy.hasPerm('/ledger/sync/delete')" type="danger" link size="small" @click="removeRow(scope.row)">
                 删除
               </el-button>
             </template>
diff --git a/src/views/home/monitor/service/index.vue b/src/views/home/monitor/service/index.vue
index 8df2239..570dc68 100644
--- a/src/views/home/monitor/service/index.vue
+++ b/src/views/home/monitor/service/index.vue
@@ -53,6 +53,7 @@
 onMounted(async () => {
   fetchData()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -66,7 +67,7 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary">
+          <el-button v-if="proxy.hasPerm('/monitor/service/add')" type="primary">
             新建
           </el-button>
         </div>
diff --git a/src/views/home/monitor/time/index.vue b/src/views/home/monitor/time/index.vue
index caa6d46..0f7f5a0 100644
--- a/src/views/home/monitor/time/index.vue
+++ b/src/views/home/monitor/time/index.vue
@@ -53,6 +53,7 @@
 onMounted(async () => {
   fetchData()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -66,7 +67,7 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary">
+          <el-button v-if="proxy.hasPerm('/monitor/time/add')" type="primary">
             新建
           </el-button>
         </div>
diff --git a/src/views/home/operation/alarm/components/detail.vue b/src/views/home/operation/alarm/components/detail.vue
index 8194cbd..4ae4a1f 100644
--- a/src/views/home/operation/alarm/components/detail.vue
+++ b/src/views/home/operation/alarm/components/detail.vue
@@ -151,6 +151,7 @@
 }
 // 点击经纬度展示地图
 const mapRef = ref()
+const { proxy } = getCurrentInstance() as any
 const showMap = (data: any) => {
   console.log(data, 'data')
   if (data.text === '位置') {
@@ -160,6 +161,13 @@
         2: 'StationMonitorDetail',
         3: 'PipelineMonitorDetail',
       } as { [key: string]: string }
+      // 判断是否有菜单权限
+      const watchObjectAuth = {
+        1: '/well',
+        2: '/station/monitor',
+        3: '/pipeline',
+      } as { [key: string]: string }
+      if (!proxy.hasPerm(watchObjectAuth[detailInfo.value.watchObject])) { return }
       $router.push({
         name: watchObject[detailInfo.value.watchObject],
         query: {
diff --git a/src/views/home/operation/alarm/index.vue b/src/views/home/operation/alarm/index.vue
index ac0f31b..e53c991 100644
--- a/src/views/home/operation/alarm/index.vue
+++ b/src/views/home/operation/alarm/index.vue
@@ -82,6 +82,7 @@
 }
 // 重置查询条件f
 const reset = () => {
+  datetimerange.value = []
   listQuery.value = {
     limit: 20,
     offset: 1,
@@ -315,7 +316,7 @@
               <el-button v-if="proxy.hasPerm('/alarm/device/delete')" type="primary" @click="batchDeleteRow">
                 批量删除
               </el-button>
-              <el-button type="primary" @click="exportList">
+              <el-button v-if="proxy.hasPerm('/alarm/device/export')" type="primary" @click="exportList">
                 导出
               </el-button>
             </div>
@@ -336,7 +337,7 @@
               </el-table-column>
             </template>
             <template #columns>
-              <el-table-column label="操作" align="center" width="80">
+              <el-table-column v-if="proxy.hasPerm('/alarm/device/detail')" label="操作" align="center" width="80">
                 <template #default="scope">
                   <el-button type="primary" link size="small" @click="detail(scope.row)">
                     查看
diff --git a/src/views/home/operation/history/index.vue b/src/views/home/operation/history/index.vue
index 5c04ff7..d96ac57 100644
--- a/src/views/home/operation/history/index.vue
+++ b/src/views/home/operation/history/index.vue
@@ -78,6 +78,7 @@
 }
 // 重置查询条件f
 const reset = () => {
+  datetimerange.value = []
   listQuery.value = {
     limit: 20,
     offset: 1,
@@ -161,6 +162,7 @@
     fetchData()
   })
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -218,7 +220,7 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="exportList">
+          <el-button v-if="proxy.hasPerm('/operation/history/export')" type="primary" @click="exportList">
             导出
           </el-button>
         </div>
@@ -241,7 +243,7 @@
           </el-table-column>
         </template>
         <template #columns>
-          <el-table-column label="操作" align="center" width="80">
+          <el-table-column v-if="proxy.hasPerm('/operation/history/detail')" label="操作" align="center" width="80">
             <template #default="scope">
               <el-button type="primary" link size="small" @click="detailRow(scope.row)">
                 查看
diff --git a/src/views/home/operation/manufacturer/index.vue b/src/views/home/operation/manufacturer/index.vue
index 4a5816a..5f647c3 100644
--- a/src/views/home/operation/manufacturer/index.vue
+++ b/src/views/home/operation/manufacturer/index.vue
@@ -75,6 +75,7 @@
 }
 // 重置查询条件f
 const reset = () => {
+  datetimerange.value = []
   listQuery.value = {
     limit: 20,
     offset: 1,
@@ -125,6 +126,7 @@
   await fetchDict()
   fetchData()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -178,7 +180,7 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="exportList">
+          <el-button v-if="proxy.hasPerm('/operation/manufacturer/export')" type="primary" @click="exportList">
             导出
           </el-button>
         </div>
diff --git a/src/views/home/operation/trajectory/index.vue b/src/views/home/operation/trajectory/index.vue
index 9312fd7..606958e 100644
--- a/src/views/home/operation/trajectory/index.vue
+++ b/src/views/home/operation/trajectory/index.vue
@@ -65,6 +65,7 @@
 }
 // 重置查询条件f
 const reset = () => {
+  datetimerange.value = []
   listQuery.value = {
     limit: 20,
     offset: 1,
@@ -114,6 +115,7 @@
   await fetchDict()
   fetchData()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -175,7 +177,7 @@
           </span>
         </template>
         <template #columns>
-          <el-table-column label="操作" width="80" align="center">
+          <el-table-column v-if="proxy.hasPerm('/operation/trajectory/detail')" label="操作" width="80" align="center">
             <template #default="scope">
               <el-button type="primary" link size="small" @click="detail(scope.row)">
                 查看
diff --git a/src/views/home/pipeline/components/detailData.vue b/src/views/home/pipeline/components/detailData.vue
index 80b6886..760b1c5 100644
--- a/src/views/home/pipeline/components/detailData.vue
+++ b/src/views/home/pipeline/components/detailData.vue
@@ -7,7 +7,13 @@
 import type { TabsPaneContext } from 'element-plus'
 import monitorData from './monitorDataList.vue'
 import maintenanceRecord from '@/views/home/well/components/maintenanceRecord.vue'
-const activeName = ref('监控数据')
+const { proxy } = getCurrentInstance() as any
+const activeName = ref(
+  proxy.hasPerm('/pipeline/monitor/data')
+    ? '监控数据'
+    : proxy.hasPerm('/pipeline/monitor/maintenance')
+      ? '监控设备维护记录'
+      : '')
 const handleClick = (tab: TabsPaneContext, event: Event) => {
   // console.log(tab, event)
 }
@@ -15,10 +21,10 @@
 
 <template>
   <el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick">
-    <el-tab-pane label="监控数据" name="监控数据">
+    <el-tab-pane v-if="proxy.hasPerm('/pipeline/monitor/data')" label="监控数据" name="监控数据">
       <monitor-data v-if="activeName === '监控数据'" />
     </el-tab-pane>
-    <el-tab-pane label="监控设备维护记录" name="监控设备维护记录">
+    <el-tab-pane v-if="proxy.hasPerm('/pipeline/monitor/maintenance')" label="监控设备维护记录" name="监控设备维护记录">
       <maintenance-record v-if="activeName === '监控设备维护记录'" />
     </el-tab-pane>
   </el-tabs>
diff --git a/src/views/home/pipeline/index.vue b/src/views/home/pipeline/index.vue
index 90baef0..4d66e51 100644
--- a/src/views/home/pipeline/index.vue
+++ b/src/views/home/pipeline/index.vue
@@ -254,6 +254,7 @@
     tableHeight.value = window.innerHeight - 60 - 50 - 10 - 98 - 10 - 52 - 52 - 10
   }
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -348,7 +349,7 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary">
+          <el-button v-if="proxy.hasPerm('/pipeline/export')" type="primary">
             导出
           </el-button>
         </div>
@@ -368,7 +369,7 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="80">
             <template #default="scope">
-              <el-button type="primary" link size="small" @click="editRow('detail', scope.row)">
+              <el-button v-if="proxy.hasPerm('/pipeline/detail')" type="primary" link size="small" @click="editRow('detail', scope.row)">
                 查看
               </el-button>
               <!-- <el-button type="primary" link size="small" @click="editRow('edit', scope.row)">
diff --git a/src/views/home/rule/agreement/index.vue b/src/views/home/rule/agreement/index.vue
index fd41cd3..f1cfe15 100644
--- a/src/views/home/rule/agreement/index.vue
+++ b/src/views/home/rule/agreement/index.vue
@@ -95,6 +95,7 @@
 onMounted(async () => {
   fetchData()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -119,7 +120,7 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="editRow('add', {})">
+          <el-button v-if="proxy.hasPerm('/rule/agreement/add')" type="primary" @click="editRow('add', {})">
             新建
           </el-button>
         </div>
@@ -139,10 +140,10 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="120">
             <template #default="scope">
-              <el-button type="primary" link size="small" @click="editRow('edit', scope.row)">
+              <el-button v-if="proxy.hasPerm('/rule/agreement/update')" type="primary" link size="small" @click="editRow('edit', scope.row)">
                 编辑
               </el-button>
-              <el-button type="danger" link size="small" @click="removeRow(scope.row)">
+              <el-button v-if="proxy.hasPerm('/rule/agreement/delete')" type="danger" link size="small" @click="removeRow(scope.row)">
                 删除
               </el-button>
             </template>
diff --git a/src/views/home/rule/alarm/components/alarmLevelList.vue b/src/views/home/rule/alarm/components/alarmLevelList.vue
index c8ffb7d..6c337c4 100644
--- a/src/views/home/rule/alarm/components/alarmLevelList.vue
+++ b/src/views/home/rule/alarm/components/alarmLevelList.vue
@@ -87,6 +87,7 @@
 const cancel = () => {
   dialogFormVisible.value = false
 }
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -97,7 +98,7 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="detailRow('create', {})">
+          <el-button v-if="proxy.hasPerm('/rule/alarm/level/add')" type="primary" @click="detailRow('create', {})">
             新增
           </el-button>
         </div>
@@ -117,10 +118,10 @@
         <template #columns>
           <el-table-column label="操作" width="120" align="center">
             <template #default="scope">
-              <el-button type="primary" link size="small" @click="detailRow('edit', scope.row)">
+              <el-button v-if="proxy.hasPerm('/rule/alarm/level/update')" type="primary" link size="small" @click="detailRow('edit', scope.row)">
                 编辑
               </el-button>
-              <el-button type="danger" link size="small" @click="removeRow(scope.row)">
+              <el-button v-if="proxy.hasPerm('/rule/alarm/level/delete')" type="danger" link size="small" @click="removeRow(scope.row)">
                 删除
               </el-button>
             </template>
diff --git a/src/views/home/rule/alarm/components/alarmTypeList.vue b/src/views/home/rule/alarm/components/alarmTypeList.vue
index 2cbf110..aa0cfed 100644
--- a/src/views/home/rule/alarm/components/alarmTypeList.vue
+++ b/src/views/home/rule/alarm/components/alarmTypeList.vue
@@ -80,6 +80,7 @@
 const cancel = () => {
   dialogFormVisible.value = false
 }
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -90,7 +91,7 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="detailRow('create', {})">
+          <el-button v-if="proxy.hasPerm('/rule/alarm/type/add')" type="primary" @click="detailRow('create', {})">
             新增
           </el-button>
         </div>
@@ -110,10 +111,10 @@
         <template #columns>
           <el-table-column label="操作" width="120" align="center">
             <template #default="scope">
-              <el-button type="primary" link size="small" @click="detailRow('edit', scope.row)">
+              <el-button v-if="proxy.hasPerm('/rule/alarm/type/update')" type="primary" link size="small" @click="detailRow('edit', scope.row)">
                 编辑
               </el-button>
-              <el-button type="danger" link size="small" @click="removeRow(scope.row)">
+              <el-button v-if="proxy.hasPerm('/rule/alarm/type/delete')" type="danger" link size="small" @click="removeRow(scope.row)">
                 删除
               </el-button>
             </template>
diff --git a/src/views/home/rule/alarm/index.vue b/src/views/home/rule/alarm/index.vue
index 110030c..4e66a34 100644
--- a/src/views/home/rule/alarm/index.vue
+++ b/src/views/home/rule/alarm/index.vue
@@ -20,11 +20,14 @@
 // 初始展示列
 const columns = ref<any>([
   { text: '报警类型', value: 'alarmTypeName', align: 'center' },
-  { text: '报警名称', value: 'alarmName', align: 'center' },
-  { text: '报警等级', value: 'alarmLevelName', align: 'center' },
-  { text: '报警提示方式', value: 'alarmNoteMethodName', align: 'center' },
-  { text: '状态', value: 'stateName', align: 'center', width: '130' },
-  { text: '创建时间', value: 'ts', align: 'center' },
+  { text: '设备类型', value: 'typeName', align: 'center' },
+  { text: '产品', value: 'productName', align: 'center' },
+  { text: '厂商', value: 'manufacturerName', align: 'center' },
+  // { text: '报警名称', value: 'alarmName', align: 'center' },
+  { text: '报警等级', value: 'alarmLevelName', align: 'center', width: '100' },
+  { text: '报警提示方式', value: 'alarmNoteMethodName', align: 'center', width: '130', isCustom: true },
+  { text: '状态', value: 'stateName', align: 'center', width: '100', isCustom: true },
+  { text: '创建时间', value: 'ts', align: 'center', width: '200' },
 ])
 // 最终展示列
 const columnsConfig = ref([])
@@ -158,6 +161,7 @@
   await fetchDict()
   fetchData()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -191,13 +195,13 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="showAlarmType">
+          <el-button v-if="proxy.hasPerm('/rule/alarm/type')" type="primary" @click="showAlarmType">
             报警类型管理
           </el-button>
-          <el-button type="primary" @click="showAlarmLevel">
+          <el-button v-if="proxy.hasPerm('/rule/alarm/level')" type="primary" @click="showAlarmLevel">
             报警等级管理
           </el-button>
-          <el-button type="primary" @click="detailRow('create', {})">
+          <el-button v-if="proxy.hasPerm('/rule/alarm/add')" type="primary" @click="detailRow('create', {})">
             新增
           </el-button>
         </div>
@@ -214,16 +218,28 @@
             </template>
           </el-table-column>
         </template>
+        <template #isCustom="{ scope, column }">
+          <!-- 报警提示方式 -->
+          <span v-if="column.text === '报警提示方式'">
+            <el-tag v-if="scope.row.alarmNoteMethodName === '消息提醒'" type="primary">消息提醒</el-tag>
+            <el-tag v-if="scope.row.alarmNoteMethodName === '弹窗'" type="danger">弹窗提醒</el-tag>
+          </span>
+          <!-- 报警提示方式 -->
+          <span v-if="column.text === '状态'">
+            <el-tag v-if="scope.row.stateName === '启用'" type="success">启用</el-tag>
+            <el-tag v-if="scope.row.stateName === '未启用'" type="info">未启用</el-tag>
+          </span>
+        </template>
         <template #columns>
           <el-table-column label="操作" width="140" align="center">
             <template #default="scope">
-              <el-button type="primary" link size="small" @click="switchStatusRow(scope.row)">
+              <el-button v-if="proxy.hasPerm('/rule/alarm/handler')" type="primary" link size="small" @click="switchStatusRow(scope.row)">
                 {{ scope.row.state === '1' ? '停用' : '启用' }}
               </el-button>
-              <el-button type="primary" link size="small" @click="detailRow('edit', scope.row)">
+              <el-button v-if="proxy.hasPerm('/rule/alarm/update')" type="primary" link size="small" @click="detailRow('edit', scope.row)">
                 编辑
               </el-button>
-              <el-button type="danger" link size="small" @click="removeRow(scope.row)">
+              <el-button v-if="proxy.hasPerm('/rule/alarm/delete')" type="danger" link size="small" @click="removeRow(scope.row)">
                 删除
               </el-button>
             </template>
diff --git a/src/views/home/rule/special/components/editDialog.vue b/src/views/home/rule/special/components/editDialog.vue
index bb494ec..5df205b 100644
--- a/src/views/home/rule/special/components/editDialog.vue
+++ b/src/views/home/rule/special/components/editDialog.vue
@@ -8,7 +8,7 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { getDictByCode } from '@/api/system/dict'
 import { getDeviceTypeListPage } from '@/api/home/device/type'
-import { getAlarmLevelListPage, getAlarmRuleListPage } from '@/api/home/rule/alarm'
+import { getAlarmLevelListPage, getAlarmTypeListPage } from '@/api/home/rule/alarm'
 import { addSpecialAlarmRule, editSpecialAlarmRule } from '@/api/home/rule/special'
 import { getDeviceListPage } from '@/api/home/device/device'
 import { getProductListPage } from '@/api/home/device/product'
@@ -57,13 +57,15 @@
 }
 const list = ref<any[]>([])
 const columns = ref<any>([
-  { text: '报警规则', value: 'alarmRule', align: 'center', type: 'select', code: 'alarm-rule', required: true },
+  { text: '报警类型', value: 'alarmTypeId', align: 'center', type: 'select', code: 'alarm-rule', required: true },
   { text: '报警等级', value: 'alarmLevelId', align: 'center', type: 'select', code: 'alarm-level', required: true },
   { text: '报警阈值', value: 'alarmThreshold', align: 'center', type: 'input', required: true },
 ])
 // 初始化对话框
+const isFirst = ref(true)
 const initDialog = (dialogStatusValue: string, row: any) => {
   dialogStatus.value = dialogStatusValue
+  isFirst.value = true
   dialogFormVisible.value = true
   if (dialogStatus.value === 'create') { // 如果是新增，清除验证
     resetForm()
@@ -83,9 +85,13 @@
         alarmRule: row.alarmRule,
         alarmLevelId: row.alarmLevelId,
         alarmThreshold: row.alarmThreshold,
+        alarmTypeId: row.alarmTypeId,
       },
     ]
   }
+  setTimeout(() => {
+    isFirst.value = false
+  })
 }
 defineExpose({
   initDialog,
@@ -143,6 +149,7 @@
 const saveData = () => {
   const data = list.value.map((item: any) => ({
     alarmLevelId: item.alarmLevelId,
+    alarmTypeId: item.alarmTypeId,
     alarmRule: item.alarmRule,
     alarmRuleName: `${item.alarmRule}[${alarmLevelList.value.filter((citem: any) => citem.id === item.alarmLevelId)[0]?.name || ''}]:${item.alarmThreshold}%LEL`,
     alarmThreshold: item.alarmThreshold,
@@ -151,7 +158,7 @@
     position: dataForm.value.position,
     tagNumber: dataForm.value.tagNumber,
     devTypeName: deviceList.value.filter((citem: any) => citem.value === dataForm.value.devcode)[0]?.name || '',
-    alarmTypeId: alarmRuleList.value.filter((citem: any) => citem.name === item.alarmRule)[0]?.alarmTypeId || '',
+    // alarmTypeId: alarmRuleList.value.filter((citem: any) => citem.name === item.alarmRule)[0]?.alarmTypeId || '',
   }))
   if (dialogStatus.value === 'edit') {
     updateData(data)
@@ -207,7 +214,7 @@
   // 设备列表
   getDeviceListPage({ offset: 1, limit: 9999 }).then((res) => {
     deviceList.value = res.data.rows.map((item: any) => ({
-      name: item.devTypeName,
+      name: item.typeName,
       id: item.id,
       value: item.devcode,
       productId: item.productId,
@@ -223,14 +230,14 @@
       }))
     })
     // 报警规则
-    getAlarmRuleListPage({ limit: 9999, offset: 1 }).then((res) => {
-      alarmRuleList.value = res.data.rows.map((item: any) => ({
-        name: item.alarmName,
-        id: item.id,
-        value: item.id,
-        alarmTypeId: item.alarmTypeId,
-      }))
-    })
+    // getAlarmRuleListPage({ limit: 9999, offset: 1 }).then((res) => {
+    //   alarmRuleList.value = res.data.rows.map((item: any) => ({
+    //     name: item.alarmName,
+    //     id: item.id,
+    //     value: item.id,
+    //     alarmTypeId: item.alarmTypeId,
+    //   }))
+    // })
     // 报警等级
     getAlarmLevelListPage({ limit: 9999, offset: 1 }).then((res) => {
       alarmLevelList.value = res.data.rows.map((item: any) => ({
@@ -247,11 +254,26 @@
 watch(() => dataForm.value.devcode, (newVal) => {
   if (newVal) {
     const current = deviceList.value.filter((item: any) => item.value === dataForm.value.devcode)
+    console.log(current, 'current')
     if (current.length) {
       dataForm.value.productId = current[0].productId
       dataForm.value.tagNumber = current[0].tagNumber
       dataForm.value.position = current[0].position
+      // 根据设备类型寻找报警类型
+      getAlarmTypeListPage({ limit: 9999, offset: 1 }).then((res) => {
+        alarmRuleList.value = res.data.rows.filter((item: any) => item.deviceTypeName.includes(current[0].name)).map((item: any) => ({
+          name: item.alarmType,
+          id: item.id,
+          value: item.id,
+          // alarmTypeId: item.id,
+        }))
+      })
     }
+    if (isFirst.value) {
+      return
+    }
+    alarmRuleList.value = []
+    list.value = []
   }
 }, {
   deep: true,
@@ -330,12 +352,12 @@
                         <!-- 报警规则 -->
                         <template v-if="item.type === 'select' && item.code === 'alarm-rule'">
                           <el-select
-                            v-model.trim="scope.row[item.value]" placeholder="报警规则" style="width: 100%;"
+                            v-model.trim="scope.row[item.value]" placeholder="报警类型" style="width: 100%;"
                             clearable filterable :disabled="!scope.row.edit"
                           >
                             <el-option
                               v-for="item in alarmRuleList" :key="item.id" :label="item.name"
-                              :value="item.name"
+                              :value="item.id"
                             />
                           </el-select>
                         </template>

diff --git a/src/App.vue b/src/App.vue
index cde81b3..8a00f5d 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -125,7 +125,7 @@
         '--g-sub-sidebar-actual-width': subSidebarActualWidth,
       }"
     />
-    <system-info v-if="browserType !== 'mobile'" />
+    <!-- <system-info v-if="browserType !== 'mobile'" /> -->
     <audio id="eventAudio" src="" autoplay />
   </el-config-provider>
 </template>
diff --git a/src/layouts/components/Tools/alarmDialog.vue b/src/layouts/components/Tools/alarmDialog.vue
index 1828375..df89ab8 100644
--- a/src/layouts/components/Tools/alarmDialog.vue
+++ b/src/layouts/components/Tools/alarmDialog.vue
@@ -116,7 +116,7 @@
     </div>
     <template #footer>
       <div class="dialog-footer">
-        <div class="btn" @click="detail">
+        <div v-if="proxy.hasPerm('/alarm/current')" class="btn" @click="detail">
           查看
         </div>
         <div v-if="info.isSound === '1'" class="btn" @click="closeSound">
diff --git a/src/layouts/components/Tools/alarmList.vue b/src/layouts/components/Tools/alarmList.vue
index c3a9d2a..5356b74 100644
--- a/src/layouts/components/Tools/alarmList.vue
+++ b/src/layouts/components/Tools/alarmList.vue
@@ -54,6 +54,7 @@
 }
 // 查看当前行
 const detailRow = (row: any) => {
+  if (!proxy.hasPerm('/alarm/current')) { return }
   $router.push({
     name: 'AlarmCurrent',
     query: {
@@ -77,21 +78,6 @@
   localStorage.setItem('eventAudio', 'pause')
 }
 const dialogRef = ref()
-// const dialog = () => {
-//   const row = {
-//     alarmNoteMethod: '1', // 消息提醒 1:弹窗，2:消息提醒
-//     isSound: '1', // 报警音效，1:开，0:关
-//     isSend: '1', // 报警推送，1:开，0:关
-//     isText: '1', // 报警短息，1:开，0:关
-//     alarmType: '浓度超限',
-//     tagNumber: 'NX5702',
-//     alarmTime: '2024-09-09',
-//     value: '20',
-//     typeName: '燃气智能终端',
-//     alarmLevel: '一级',
-//   }
-//   dialogRef.value.initDialog(row)
-// }
 const fetchData = (isLoading = false) => {
   loading.value = true
   if (isLoading) {
@@ -115,7 +101,10 @@
       dialogRef.value.initDialog(newVal)
     }
     if (newVal.isSound === '1') {
-      play()
+      // play()
+      if (!localStorage.getItem('eventAudio')) {
+        proxy.playAudio()
+      }
     }
     fetchData(false)
   }
@@ -146,6 +135,7 @@
 //     window.localStorage.removeItem('token')
 //   }
 // }
+// const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -180,7 +170,7 @@
                   {{ message.processStatus
                     === '未读' ? '未读' : '已读' }}
                 </el-tag>
-                <el-tag type="info" size="small" style="margin-left: 5px;">
+                <el-tag type="info" size="small" style="margin-left: 5px;" @click="detailRow(message)">
                   查看
                 </el-tag>
               </div>
@@ -214,7 +204,7 @@
       <!-- <div class="close" @click="dialog">
         弹窗
       </div> -->
-      <div class="more" @click="moreList">
+      <div v-if="proxy.hasPerm('/alarm/current')" class="more" @click="moreList">
         查看更多
       </div>
     </div>
diff --git a/src/layouts/components/Tools/index.vue b/src/layouts/components/Tools/index.vue
index 9f2d41f..61f9707 100644
--- a/src/layouts/components/Tools/index.vue
+++ b/src/layouts/components/Tools/index.vue
@@ -79,6 +79,7 @@
   // 断开 websocket
   // websocket.destroyWebSocket()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -89,18 +90,18 @@
           <svg-icon name="ep:search" />
         </el-icon>
       </span>
-      <span class="item" @click="board">
+      <span v-if="proxy.hasPerm('/fullscreen')" class="item" @click="board">
         <el-icon>
           <svg-icon name="ep:data-line" />
         </el-icon>
       </span>
-      <span v-if="settingsStore.mode === 'pc' && settingsStore.toolbar.enableFullscreen" class="item" @click="toggle">
+      <span class="item" @click="toggle">
         <el-icon>
           <svg-icon :name="isFullscreen ? 'fullscreen-exit' : 'fullscreen'" />
         </el-icon>
       </span>
       <!-- 报警信息列表 -->
-      <span class="item">
+      <span v-if="proxy.hasPerm('/alarmnotice')" class="item">
         <el-popover width="390">
           <template #reference>
             <div>
diff --git a/src/layouts/components/Topbar/index.vue b/src/layouts/components/Topbar/index.vue
index 2863cef..4e3120e 100644
--- a/src/layouts/components/Topbar/index.vue
+++ b/src/layouts/components/Topbar/index.vue
@@ -67,7 +67,7 @@
           </transition-group>
         </el-breadcrumb>
       </div>
-      <tools />
+      <!-- <tools /> -->
     </div>
   </div>
 </template>
diff --git a/src/router/modules/pc.ts b/src/router/modules/pc.ts
index aacd6fa..97ced45 100644
--- a/src/router/modules/pc.ts
+++ b/src/router/modules/pc.ts
@@ -40,7 +40,7 @@
       icon: 'ep:key',
       sidebar: false,
       breadcrumb: false,
-      // auth: '/fullscreen',
+      auth: '/fullscreen',
     },
   },
   {
@@ -155,7 +155,7 @@
           sidebar: false,
           breadcrumb: false,
           activeMenu: '/well',
-          auth: '/well/detail',
+          auth: '/well',
         },
       },
     ],
diff --git a/src/views/home/alarm/count/components/locationAnalysis.vue b/src/views/home/alarm/count/components/locationAnalysis.vue
index fc75b9e..bff1853 100644
--- a/src/views/home/alarm/count/components/locationAnalysis.vue
+++ b/src/views/home/alarm/count/components/locationAnalysis.vue
@@ -46,6 +46,7 @@
   })
 }
 fetchData()
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -75,6 +76,9 @@
         <el-button type="primary" style="margin: 0 5px;" @click="fetchData">
           搜索
         </el-button>
+        <el-button v-if="proxy.hasPerm('/alarm/count/exportLocation')" type="primary" style="margin: 0 5px;">
+          导出
+        </el-button>
       </div>
     </template>
     <template #content>
diff --git a/src/views/home/alarm/current/components/detail.vue b/src/views/home/alarm/current/components/detail.vue
index dd3b31a..4204c92 100644
--- a/src/views/home/alarm/current/components/detail.vue
+++ b/src/views/home/alarm/current/components/detail.vue
@@ -111,7 +111,7 @@
   const res2 = await getAlarmTypeListPage({ offset: 1, limit: 9999 });
   ($route.query.type === 'history' ? getAlarmDetail : getAlarmDetail)($route.query.id as string).then((res) => {
     detailInfo.value = toHumpObject(res.data)
-    detailInfo.value.realAlarmName = detailInfo.value.realAlarm === '1' ? '报警' : '误报'
+    detailInfo.value.realAlarmName = detailInfo.value.realAlarm === '0' ? '是' : '否'
     detailInfo.value.alarmTypeName = res2.data.rows.filter((item: any) => item.id === detailInfo.value.alarmTypeId)[0]?.alarmType || ''
     detailInfo.value.alarmLevelName = res1.data.rows.filter((item: any) => item.id === detailInfo.value.alarmLevel)[0]?.alarmLevel || ''
     detailInfo.value.duration = detailInfo.value.ts && detailInfo.value.cancelTime ? getDateDiff(detailInfo.value.ts, detailInfo.value.cancelTime) : ''
@@ -139,6 +139,7 @@
 }
 // 点击经纬度展示地图
 const mapRef = ref()
+const { proxy } = getCurrentInstance() as any
 const showMap = (data: any) => {
   console.log(data, 'data')
   if (data.text === '位置') {
@@ -148,6 +149,13 @@
         2: 'StationMonitorDetail',
         3: 'PipelineMonitorDetail',
       } as { [key: string]: string }
+      // 判断是否有菜单权限
+      const watchObjectAuth = {
+        1: '/well',
+        2: '/station/monitor',
+        3: '/pipeline',
+      } as { [key: string]: string }
+      if (!proxy.hasPerm(watchObjectAuth[detailInfo.value.watchObject])) { return }
       $router.push({
         name: watchObject[detailInfo.value.watchObject],
         query: {
diff --git a/src/views/home/alarm/current/components/detailInfoDialog.vue b/src/views/home/alarm/current/components/detailInfoDialog.vue
index c089449..7fbf06b 100644
--- a/src/views/home/alarm/current/components/detailInfoDialog.vue
+++ b/src/views/home/alarm/current/components/detailInfoDialog.vue
@@ -114,6 +114,7 @@
   })
 }
 defineExpose({ initDialog, close })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -131,7 +132,7 @@
     <!-- 头部 -->
     <div class="header">
       <span>{{ info.alarmContent }}</span>
-      <span class="more" @click="moreData">>>更多</span>
+      <span v-if="proxy.hasPerm(type === 'data' ? '/alarm/current/more' : '/alarm/device/more')" class="more" @click="moreData">>>更多</span>
     </div>
     <div class="content">
       <div v-show="type === 'device'" class="item">
@@ -162,7 +163,7 @@
         报警设备:
         <span style="padding-left: 6px;">{{ info.devcode }} </span>
         <el-button
-          v-if="info.devTypeName === '燃气智能监测终端' || info.devTypeName === '液位检测仪' || info.devTypeName === '井盖监测仪'"
+          v-if="(info.devTypeName === '燃气智能监测终端' || info.devTypeName === '液位检测仪' || info.devTypeName === '井盖监测仪') && proxy.hasPerm('/alarm/current/data')"
           size="small" style="margin-left: 6px;" @click="viewData"
         >
           查看数据
@@ -228,7 +229,7 @@
         <span style="padding-left: 6px;">
           {{ info.confirmContent }}
         </span>
-        <el-button v-if="type === 'data'" size="small" style="padding-left: 6px;" @click="viewProcess">
+        <el-button v-if="type === 'data' && proxy.hasPerm('/alarm/current/process')" size="small" style="padding-left: 6px;" @click="viewProcess">
           流程图
         </el-button>
       </div>
@@ -246,17 +247,17 @@
       </div>
     </div>
     <div class="footer">
-      <el-button v-if="Number(info.processStatus) < 4 && type === 'data'" size="small" @click="remind">
+      <el-button v-if="(Number(info.processStatus) < 4 && type === 'data') && proxy.hasPerm('/alarm/current/remind')" size="small" @click="remind">
         提醒责任人
       </el-button>
       <el-button
-        v-if="type === 'device' && (info.processStatusName === '待处置' || info.processStatusName === '挂起')"
+        v-if="(type === 'device' && (info.processStatusName === '待处置' || info.processStatusName === '挂起')) && proxy.hasPerm('/alarm/device/handler')"
         size="small" @click="handler"
       >
         报警处置
       </el-button>
       <el-button
-        v-if="Number(info.processStatus) <= 3 || (type === 'device' && info.processStatusName === '待处置') || info.processStatusName === '挂起'"
+        v-if="(Number(info.processStatus) <= 3 || (type === 'device' && info.processStatusName === '待处置') || info.processStatusName === '挂起') && proxy.hasPerm(type === 'device' ? '/alarm/device/pending' : '/alarm/current/pending')"
         type="primary" size="small" @click="pending"
       >
         挂起
diff --git a/src/views/home/alarm/current/index.vue b/src/views/home/alarm/current/index.vue
index d019bbf..e2714bb 100644
--- a/src/views/home/alarm/current/index.vue
+++ b/src/views/home/alarm/current/index.vue
@@ -4,6 +4,7 @@
   Date: 2023-06-28
  -->
 <script lang="ts" setup name="CurrentAlarm">
+import dayjs from 'dayjs'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import { ArrowLeftBold, ArrowRightBold } from '@element-plus/icons-vue'
 import MapCom from './components/map.vue'
@@ -100,6 +101,7 @@
       path: '/alarm/current',
     })
   }
+  datetimerange.value = []
   listQuery.value = {
     limit: 20,
     offset: 1,
@@ -131,8 +133,8 @@
   if ($route.query.row) {
     loadingTable.value = true
     const row = JSON.parse($route.query.row as string)
-    getCurrentAlarmListPage({ offset: 1, limit: 99999 }).then((res) => {
-      const data = res.data.rows.filter((item: any) => item.id === row.id)
+    getCurrentAlarmListPage({ offset: 1, limit: 50 }).then((res) => {
+      const data = res.data.rows.filter((item: any) => item.id === row.alarmId)
       if (data.length) {
         list1.value = data.map((item: any) => ({
           ...item,
@@ -153,7 +155,10 @@
     })
     return
   }
-  fetchData()
+  datetimerange.value = [dayjs().subtract(7, 'day').format('YYYY-MM-DD HH:mm:ss'), dayjs().format('YYYY-MM-DD HH:mm:ss')]
+  setTimeout(() => {
+    fetchData()
+  })
 })
 // 表格标识  地图或普通
 const tableFlag = ref('normal')
@@ -181,6 +186,10 @@
 const mapRef = ref()
 const mapData = ref({})
 async function detail(row: any) {
+  if (row.processStatusName === '未读') {
+    list1.value[list1.value.findIndex((item: any) => item.id === row.id)].processStatusName = '已读'
+    row.processStatusName = '已读'
+  }
   const res = await detailAlarm(row.id)
   const data = toHumpObject(res.data)
   mapData.value = row
@@ -362,7 +371,7 @@
               <el-button v-if="proxy.hasPerm('/alarm/current/delete')" type="primary" @click="batchDeleteRow">
                 批量删除
               </el-button>
-              <el-button type="primary" @click="exportList">
+              <el-button v-if="proxy.hasPerm('/alarm/current/export')" type="primary" @click="exportList">
                 导出
               </el-button>
             </div>
@@ -383,7 +392,7 @@
               </el-table-column>
             </template>
             <template #columns>
-              <el-table-column label="操作" align="center" width="80">
+              <el-table-column v-if="proxy.hasPerm('/alarm/current/detail')" label="操作" align="center" width="80">
                 <template #default="scope">
                   <el-button type="primary" link size="small" @click="detail(scope.row)">
                     查看
diff --git a/src/views/home/alarm/history/index.vue b/src/views/home/alarm/history/index.vue
index eeb49fc..3c810c3 100644
--- a/src/views/home/alarm/history/index.vue
+++ b/src/views/home/alarm/history/index.vue
@@ -97,6 +97,7 @@
 }
 // 重置查询条件f
 const reset = () => {
+  datetimerange.value = []
   listQuery.value = {
     limit: 20,
     offset: 1,
@@ -189,6 +190,7 @@
   })
 }
 fetchDict()
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -249,7 +251,7 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="exportList">
+          <el-button v-if="proxy.hasPerm('/alarm/history/export')" type="primary" @click="exportList">
             导出
           </el-button>
         </div>
@@ -272,7 +274,7 @@
           </el-table-column>
         </template>
         <template #columns>
-          <el-table-column label="操作" align="center" width="80">
+          <el-table-column v-if="proxy.hasPerm('/alarm/history/detail')" label="操作" align="center" width="80">
             <template #default="scope">
               <el-button type="primary" link size="small" @click="moreData(scope.row)">
                 查看
diff --git a/src/views/home/dashboard/index.vue b/src/views/home/dashboard/index.vue
index d2f7e3c..42dfbed 100644
--- a/src/views/home/dashboard/index.vue
+++ b/src/views/home/dashboard/index.vue
@@ -42,7 +42,7 @@
     value: '0',
     name: '在线',
     unit: '个',
-    id: '1',
+    id: '1,2',
   },
   {
     img: img.lixian,
@@ -56,7 +56,7 @@
     value: '0',
     name: '停用',
     unit: '个',
-    id: '2',
+    id: '3',
   },
 ])
 // 工作台数据
@@ -133,7 +133,11 @@
   deviceOperationLoading.value = true
   getDeviceStatus().then((res) => {
     res.data.forEach((element: any) => {
-      const index = deviceOperationData.value.findIndex((item: any) => item.id === element.name)
+      if (element.name === '1' || element.name === '2') {
+        deviceOperationData.value[0].value = Number(deviceOperationData.value[0].value || '0') + Number(element.value)
+        return
+      }
+      const index = deviceOperationData.value.findIndex((item: any) => item.id.includes(element.name))
       if (index !== -1) {
         deviceOperationData.value[index].value = element.value
       }
diff --git a/src/views/home/device/count/components/bottom.vue b/src/views/home/device/count/components/bottom.vue
index 28a4d78..e4e56fa 100644
--- a/src/views/home/device/count/components/bottom.vue
+++ b/src/views/home/device/count/components/bottom.vue
@@ -110,6 +110,7 @@
   })
 }
 fetchDict()
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -148,7 +149,7 @@
             <template #btns-right>
               <!-- 操作 -->
               <div>
-                <el-button type="primary">
+                <el-button v-if="proxy.hasPerm('/device/count/offline/export')" type="primary">
                   导出
                 </el-button>
               </div>
diff --git a/src/views/home/device/device/index.vue b/src/views/home/device/device/index.vue
index c3970b9..9cdd606 100644
--- a/src/views/home/device/device/index.vue
+++ b/src/views/home/device/device/index.vue
@@ -88,6 +88,7 @@
 }
 // 重置查询条件f
 const reset = () => {
+  datetimerange.value = []
   listQuery.value = {
     limit: 20,
     offset: 1,
@@ -296,6 +297,7 @@
   fetchDict()
   fetchData()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -372,17 +374,17 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="editRow('add', {})">
+          <el-button v-if="proxy.hasPerm('/device/manage/add')" type="primary" @click="editRow('add', {})">
             新建
           </el-button>
-          <el-button type="primary" @click="downloadTemplate">
+          <el-button v-if="proxy.hasPerm('/device/manage/down')" type="primary" @click="downloadTemplate">
             模板下载
           </el-button>
-          <el-button type="primary" @click="importList">
+          <el-button v-if="proxy.hasPerm('/device/manage/import')" type="primary" @click="importList">
             批量导入
           </el-button>
-          <el-button type="primary" @click="exportList">
-            导出列表
+          <el-button v-if="proxy.hasPerm('/device/manage/export')" type="primary" @click="exportList">
+            导出
           </el-button>
           <input ref="fileRef" style="display: none;" type="file" accept=".xls,.xlsx" @change="onFileChange">
         </div>
@@ -409,16 +411,16 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="150">
             <template #default="scope">
-              <el-button type="primary" link size="small" @click="editRow('detail', scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/manage/detail')" type="primary" link size="small" @click="editRow('detail', scope.row)">
                 查看
               </el-button>
-              <el-button type="primary" link size="small" @click="editRow('edit', scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/manage/update')" type="primary" link size="small" @click="editRow('edit', scope.row)">
                 编辑
               </el-button>
-              <el-button type="danger" link size="small" @click="changeDefense(scope.row)">
+              <!-- <el-button v-if="proxy.hasPerm('/device/manage/add')" type="danger" link size="small" @click="changeDefense(scope.row)">
                 撤防
-              </el-button>
-              <el-button type="danger" link size="small" @click="removeRow(scope.row)">
+              </el-button> -->
+              <el-button v-if="proxy.hasPerm('/device/manage/delete')" type="danger" link size="small" @click="removeRow(scope.row)">
                 删除
               </el-button>
             </template>
diff --git a/src/views/home/device/instruction/index.vue b/src/views/home/device/instruction/index.vue
index 1e598ed..1da6706 100644
--- a/src/views/home/device/instruction/index.vue
+++ b/src/views/home/device/instruction/index.vue
@@ -78,6 +78,7 @@
 }
 // 重置查询条件f
 const reset = () => {
+  datetimerange.value = []
   listQuery.value = {
     limit: 20,
     offset: 1,
@@ -158,6 +159,7 @@
     editRef.value.initDialog('addOther', {})
   }
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -213,10 +215,10 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary">
+          <el-button v-if="proxy.hasPerm('/device/instruction/batch')" type="primary">
             批量下发
           </el-button>
-          <el-button type="primary" @click="editRow('add', {})">
+          <el-button v-if="proxy.hasPerm('/device/instruction/add')" type="primary" @click="editRow('add', {})">
             新建
           </el-button>
         </div>
@@ -236,13 +238,13 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="120">
             <template #default="scope">
-              <el-button type="primary" link size="small" @click="editRow('detail', scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/instruction/detail')" type="primary" link size="small" @click="editRow('detail', scope.row)">
                 查看
               </el-button>
-              <el-button v-if="scope.row.status === '2'" type="primary" link size="small" @click="editRow('edit', scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/instruction/again') && scope.row.status === '2'" type="primary" link size="small" @click="editRow('edit', scope.row)">
                 重新下发
               </el-button>
-              <el-button type="danger" link size="small" @click="removeRow(scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/instruction/delete')" type="danger" link size="small" @click="removeRow(scope.row)">
                 删除
               </el-button>
             </template>
diff --git a/src/views/home/device/product/index.vue b/src/views/home/device/product/index.vue
index 799fc90..fdd5463 100644
--- a/src/views/home/device/product/index.vue
+++ b/src/views/home/device/product/index.vue
@@ -128,6 +128,7 @@
   await fetchDict()
   fetchData()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -164,7 +165,7 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="editRow('add', {})">
+          <el-button v-if="proxy.hasPerm('/device/product/add')" type="primary" @click="editRow('add', {})">
             新建
           </el-button>
         </div>
@@ -184,10 +185,10 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="120">
             <template #default="scope">
-              <el-button type="primary" link size="small" @click="editRow('edit', scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/product/update')" type="primary" link size="small" @click="editRow('edit', scope.row)">
                 编辑
               </el-button>
-              <el-button type="danger" link size="small" @click="removeRow(scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/product/delete')" type="danger" link size="small" @click="removeRow(scope.row)">
                 删除
               </el-button>
             </template>
diff --git a/src/views/home/device/type/index.vue b/src/views/home/device/type/index.vue
index 59f1343..2344e57 100644
--- a/src/views/home/device/type/index.vue
+++ b/src/views/home/device/type/index.vue
@@ -105,6 +105,7 @@
   await fetchDict()
   fetchData()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -131,7 +132,7 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="editRow('add', {})">
+          <el-button v-if="proxy.hasPerm('/device/type/add')" type="primary" @click="editRow('add', {})">
             新建
           </el-button>
         </div>
@@ -151,10 +152,10 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="120">
             <template #default="scope">
-              <el-button type="primary" link size="small" @click="editRow('edit', scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/type/update')" type="primary" link size="small" @click="editRow('edit', scope.row)">
                 编辑
               </el-button>
-              <el-button type="danger" link size="small" @click="removeRow(scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/type/delete')" type="danger" link size="small" @click="removeRow(scope.row)">
                 删除
               </el-button>
             </template>
diff --git a/src/views/home/ledger/ledger/components/gridList.vue b/src/views/home/ledger/ledger/components/gridList.vue
index d03cd9f..189edef 100644
--- a/src/views/home/ledger/ledger/components/gridList.vue
+++ b/src/views/home/ledger/ledger/components/gridList.vue
@@ -91,6 +91,7 @@
     // })
   })
 }
+const { proxy } = getCurrentInstance() as any
 // 同步日志
 const allSync = () => {
   $router.push({
@@ -139,10 +140,10 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="allSync">
+          <el-button v-if="proxy.hasPerm('/ledger/sync')" type="primary" @click="allSync">
             同步日志
           </el-button>
-          <el-button type="primary" @click="sync('all', {})">
+          <el-button v-if="proxy.hasPerm('/ledger/sync/all')" type="primary" @click="sync('all', {})">
             全量同步
           </el-button>
         </div>
@@ -160,9 +161,9 @@
           </el-table-column>
         </template>
         <template #columns>
-          <el-table-column label="操作" align="center" width="80">
+          <el-table-column v-if="proxy.hasPerm('/ledger/sync/single')" label="操作" align="center" width="80">
             <template #default="scope">
-              <el-button type="primary" link size="small" @click="sync('single', scope.row)">
+              <el-button v-if="proxy.hasPerm('/ledger/sync/single')" type="primary" link size="small" @click="sync('single', scope.row)">
                 同步
               </el-button>
             </template>
diff --git a/src/views/home/ledger/ledger/components/wellList.vue b/src/views/home/ledger/ledger/components/wellList.vue
index 9eb1f43..06f855a 100644
--- a/src/views/home/ledger/ledger/components/wellList.vue
+++ b/src/views/home/ledger/ledger/components/wellList.vue
@@ -123,6 +123,7 @@
   // await fetchDict()
   fetchData()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -159,11 +160,11 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="allSync">
+          <el-button v-if="proxy.hasPerm('/ledger/sync')" type="primary" @click="allSync">
             同步日志
           </el-button>
-          <el-button type="primary" @click="sync('all', {})">
-            全部同步
+          <el-button v-if="proxy.hasPerm('/ledger/sync/all')" type="primary" @click="sync('all', {})">
+            全量同步
           </el-button>
         </div>
       </template>
@@ -180,9 +181,9 @@
           </el-table-column>
         </template>
         <template #columns>
-          <el-table-column label="操作" align="center" width="80">
+          <el-table-column v-if="proxy.hasPerm('/ledger/sync/single')" label="操作" align="center" width="80">
             <template #default="scope">
-              <el-button type="primary" link size="small" @click="sync('single', scope.row)">
+              <el-button v-if="proxy.hasPerm('/ledger/sync/single')" type="primary" link size="small" @click="sync('single', scope.row)">
                 同步
               </el-button>
             </template>
diff --git a/src/views/home/ledger/ledger/index.vue b/src/views/home/ledger/ledger/index.vue
index a03aa12..8403fc5 100644
--- a/src/views/home/ledger/ledger/index.vue
+++ b/src/views/home/ledger/ledger/index.vue
@@ -7,7 +7,16 @@
 import type { TabsPaneContext } from 'element-plus'
 import wellList from './components/wellList.vue'
 import gridList from './components/gridList.vue'
-const activeName = ref('闸井')
+const { proxy } = getCurrentInstance() as any
+const activeName = ref(
+  proxy.hasPerm('/ledger/manage/well')
+    ? '闸井'
+    : proxy.hasPerm('/ledger/manage/station')
+      ? '场站'
+      : proxy.hasPerm('/ledger/manage/grid')
+        ? '网格'
+        : '',
+)
 const handleClick = (tab: TabsPaneContext, event: Event) => {
   // console.log(tab, event)
 }
@@ -17,13 +26,13 @@
   <!-- 布局 -->
   <app-container>
     <el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick">
-      <el-tab-pane label="闸井" name="闸井">
+      <el-tab-pane v-if="proxy.hasPerm('/ledger/manage/well')" label="闸井" name="闸井">
         <well-list v-if="activeName === '闸井'" type="1" />
       </el-tab-pane>
-      <el-tab-pane label="场站" name="场站">
+      <el-tab-pane v-if="proxy.hasPerm('/ledger/manage/station')" label="场站" name="场站">
         <well-list v-if="activeName === '场站'" type="2" />
       </el-tab-pane>
-      <el-tab-pane label="网格" name="网格">
+      <el-tab-pane v-if="proxy.hasPerm('/ledger/manage/grid')" label="网格" name="网格">
         <grid-list v-if="activeName === '网格'" />
       </el-tab-pane>
     </el-tabs>
diff --git a/src/views/home/ledger/pipeline/index.vue b/src/views/home/ledger/pipeline/index.vue
index e0d2512..01e95ac 100644
--- a/src/views/home/ledger/pipeline/index.vue
+++ b/src/views/home/ledger/pipeline/index.vue
@@ -160,6 +160,7 @@
 onMounted(async () => {
   fetchData()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -222,13 +223,13 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="editRow('add', {})">
+          <el-button v-if="proxy.hasPerm('/ledger/pipeline/add')" type="primary" @click="editRow('add', {})">
             新增
           </el-button>
-          <el-button type="primary" @click="importList">
+          <el-button v-if="proxy.hasPerm('/ledger/pipeline/import')" type="primary" @click="importList">
             批量导入
           </el-button>
-          <el-button type="primary" @click="exportList">
+          <el-button v-if="proxy.hasPerm('/ledger/pipeline/export')" type="primary" @click="exportList">
             批量导出
           </el-button>
         </div>
@@ -248,10 +249,10 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="100">
             <template #default="scope">
-              <el-button type="primary" link size="small" @click="editRow('edit', scope.row)">
+              <el-button v-if="proxy.hasPerm('/ledger/pipeline/update')" type="primary" link size="small" @click="editRow('edit', scope.row)">
                 编辑
               </el-button>
-              <el-button type="danger" link size="small" @click="removeRow(scope.row)">
+              <el-button v-if="proxy.hasPerm('/ledger/pipeline/delete')" type="danger" link size="small" @click="removeRow(scope.row)">
                 删除
               </el-button>
             </template>
diff --git a/src/views/home/ledger/sync/index.vue b/src/views/home/ledger/sync/index.vue
index 54a3218..a04bad9 100644
--- a/src/views/home/ledger/sync/index.vue
+++ b/src/views/home/ledger/sync/index.vue
@@ -62,6 +62,7 @@
 }
 // 重置查询条件f
 const reset = () => {
+  datetimerange.value = []
   listQuery.value = {
     limit: 20,
     offset: 1,
@@ -106,6 +107,8 @@
 onMounted(async () => {
   fetchData()
 })
+const { proxy } = getCurrentInstance() as any
+const $route = useRoute()
 </script>
 
 <template>
@@ -132,7 +135,7 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="goBak">
+          <el-button v-if="$route.type" type="primary" @click="goBak">
             返回
           </el-button>
         </div>
@@ -152,10 +155,10 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="80">
             <template #default="scope">
-              <el-button type="primary" link size="small">
+              <el-button v-if="proxy.hasPerm('/ledger/sync/detail')" type="primary" link size="small">
                 查看
               </el-button>
-              <el-button type="danger" link size="small" @click="removeRow(scope.row)">
+              <el-button v-if="proxy.hasPerm('/ledger/sync/delete')" type="danger" link size="small" @click="removeRow(scope.row)">
                 删除
               </el-button>
             </template>
diff --git a/src/views/home/monitor/service/index.vue b/src/views/home/monitor/service/index.vue
index 8df2239..570dc68 100644
--- a/src/views/home/monitor/service/index.vue
+++ b/src/views/home/monitor/service/index.vue
@@ -53,6 +53,7 @@
 onMounted(async () => {
   fetchData()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -66,7 +67,7 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary">
+          <el-button v-if="proxy.hasPerm('/monitor/service/add')" type="primary">
             新建
           </el-button>
         </div>
diff --git a/src/views/home/monitor/time/index.vue b/src/views/home/monitor/time/index.vue
index caa6d46..0f7f5a0 100644
--- a/src/views/home/monitor/time/index.vue
+++ b/src/views/home/monitor/time/index.vue
@@ -53,6 +53,7 @@
 onMounted(async () => {
   fetchData()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -66,7 +67,7 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary">
+          <el-button v-if="proxy.hasPerm('/monitor/time/add')" type="primary">
             新建
           </el-button>
         </div>
diff --git a/src/views/home/operation/alarm/components/detail.vue b/src/views/home/operation/alarm/components/detail.vue
index 8194cbd..4ae4a1f 100644
--- a/src/views/home/operation/alarm/components/detail.vue
+++ b/src/views/home/operation/alarm/components/detail.vue
@@ -151,6 +151,7 @@
 }
 // 点击经纬度展示地图
 const mapRef = ref()
+const { proxy } = getCurrentInstance() as any
 const showMap = (data: any) => {
   console.log(data, 'data')
   if (data.text === '位置') {
@@ -160,6 +161,13 @@
         2: 'StationMonitorDetail',
         3: 'PipelineMonitorDetail',
       } as { [key: string]: string }
+      // 判断是否有菜单权限
+      const watchObjectAuth = {
+        1: '/well',
+        2: '/station/monitor',
+        3: '/pipeline',
+      } as { [key: string]: string }
+      if (!proxy.hasPerm(watchObjectAuth[detailInfo.value.watchObject])) { return }
       $router.push({
         name: watchObject[detailInfo.value.watchObject],
         query: {
diff --git a/src/views/home/operation/alarm/index.vue b/src/views/home/operation/alarm/index.vue
index ac0f31b..e53c991 100644
--- a/src/views/home/operation/alarm/index.vue
+++ b/src/views/home/operation/alarm/index.vue
@@ -82,6 +82,7 @@
 }
 // 重置查询条件f
 const reset = () => {
+  datetimerange.value = []
   listQuery.value = {
     limit: 20,
     offset: 1,
@@ -315,7 +316,7 @@
               <el-button v-if="proxy.hasPerm('/alarm/device/delete')" type="primary" @click="batchDeleteRow">
                 批量删除
               </el-button>
-              <el-button type="primary" @click="exportList">
+              <el-button v-if="proxy.hasPerm('/alarm/device/export')" type="primary" @click="exportList">
                 导出
               </el-button>
             </div>
@@ -336,7 +337,7 @@
               </el-table-column>
             </template>
             <template #columns>
-              <el-table-column label="操作" align="center" width="80">
+              <el-table-column v-if="proxy.hasPerm('/alarm/device/detail')" label="操作" align="center" width="80">
                 <template #default="scope">
                   <el-button type="primary" link size="small" @click="detail(scope.row)">
                     查看
diff --git a/src/views/home/operation/history/index.vue b/src/views/home/operation/history/index.vue
index 5c04ff7..d96ac57 100644
--- a/src/views/home/operation/history/index.vue
+++ b/src/views/home/operation/history/index.vue
@@ -78,6 +78,7 @@
 }
 // 重置查询条件f
 const reset = () => {
+  datetimerange.value = []
   listQuery.value = {
     limit: 20,
     offset: 1,
@@ -161,6 +162,7 @@
     fetchData()
   })
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -218,7 +220,7 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="exportList">
+          <el-button v-if="proxy.hasPerm('/operation/history/export')" type="primary" @click="exportList">
             导出
           </el-button>
         </div>
@@ -241,7 +243,7 @@
           </el-table-column>
         </template>
         <template #columns>
-          <el-table-column label="操作" align="center" width="80">
+          <el-table-column v-if="proxy.hasPerm('/operation/history/detail')" label="操作" align="center" width="80">
             <template #default="scope">
               <el-button type="primary" link size="small" @click="detailRow(scope.row)">
                 查看
diff --git a/src/views/home/operation/manufacturer/index.vue b/src/views/home/operation/manufacturer/index.vue
index 4a5816a..5f647c3 100644
--- a/src/views/home/operation/manufacturer/index.vue
+++ b/src/views/home/operation/manufacturer/index.vue
@@ -75,6 +75,7 @@
 }
 // 重置查询条件f
 const reset = () => {
+  datetimerange.value = []
   listQuery.value = {
     limit: 20,
     offset: 1,
@@ -125,6 +126,7 @@
   await fetchDict()
   fetchData()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -178,7 +180,7 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="exportList">
+          <el-button v-if="proxy.hasPerm('/operation/manufacturer/export')" type="primary" @click="exportList">
             导出
           </el-button>
         </div>
diff --git a/src/views/home/operation/trajectory/index.vue b/src/views/home/operation/trajectory/index.vue
index 9312fd7..606958e 100644
--- a/src/views/home/operation/trajectory/index.vue
+++ b/src/views/home/operation/trajectory/index.vue
@@ -65,6 +65,7 @@
 }
 // 重置查询条件f
 const reset = () => {
+  datetimerange.value = []
   listQuery.value = {
     limit: 20,
     offset: 1,
@@ -114,6 +115,7 @@
   await fetchDict()
   fetchData()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -175,7 +177,7 @@
           </span>
         </template>
         <template #columns>
-          <el-table-column label="操作" width="80" align="center">
+          <el-table-column v-if="proxy.hasPerm('/operation/trajectory/detail')" label="操作" width="80" align="center">
             <template #default="scope">
               <el-button type="primary" link size="small" @click="detail(scope.row)">
                 查看
diff --git a/src/views/home/pipeline/components/detailData.vue b/src/views/home/pipeline/components/detailData.vue
index 80b6886..760b1c5 100644
--- a/src/views/home/pipeline/components/detailData.vue
+++ b/src/views/home/pipeline/components/detailData.vue
@@ -7,7 +7,13 @@
 import type { TabsPaneContext } from 'element-plus'
 import monitorData from './monitorDataList.vue'
 import maintenanceRecord from '@/views/home/well/components/maintenanceRecord.vue'
-const activeName = ref('监控数据')
+const { proxy } = getCurrentInstance() as any
+const activeName = ref(
+  proxy.hasPerm('/pipeline/monitor/data')
+    ? '监控数据'
+    : proxy.hasPerm('/pipeline/monitor/maintenance')
+      ? '监控设备维护记录'
+      : '')
 const handleClick = (tab: TabsPaneContext, event: Event) => {
   // console.log(tab, event)
 }
@@ -15,10 +21,10 @@
 
 <template>
   <el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick">
-    <el-tab-pane label="监控数据" name="监控数据">
+    <el-tab-pane v-if="proxy.hasPerm('/pipeline/monitor/data')" label="监控数据" name="监控数据">
       <monitor-data v-if="activeName === '监控数据'" />
     </el-tab-pane>
-    <el-tab-pane label="监控设备维护记录" name="监控设备维护记录">
+    <el-tab-pane v-if="proxy.hasPerm('/pipeline/monitor/maintenance')" label="监控设备维护记录" name="监控设备维护记录">
       <maintenance-record v-if="activeName === '监控设备维护记录'" />
     </el-tab-pane>
   </el-tabs>
diff --git a/src/views/home/pipeline/index.vue b/src/views/home/pipeline/index.vue
index 90baef0..4d66e51 100644
--- a/src/views/home/pipeline/index.vue
+++ b/src/views/home/pipeline/index.vue
@@ -254,6 +254,7 @@
     tableHeight.value = window.innerHeight - 60 - 50 - 10 - 98 - 10 - 52 - 52 - 10
   }
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -348,7 +349,7 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary">
+          <el-button v-if="proxy.hasPerm('/pipeline/export')" type="primary">
             导出
           </el-button>
         </div>
@@ -368,7 +369,7 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="80">
             <template #default="scope">
-              <el-button type="primary" link size="small" @click="editRow('detail', scope.row)">
+              <el-button v-if="proxy.hasPerm('/pipeline/detail')" type="primary" link size="small" @click="editRow('detail', scope.row)">
                 查看
               </el-button>
               <!-- <el-button type="primary" link size="small" @click="editRow('edit', scope.row)">
diff --git a/src/views/home/rule/agreement/index.vue b/src/views/home/rule/agreement/index.vue
index fd41cd3..f1cfe15 100644
--- a/src/views/home/rule/agreement/index.vue
+++ b/src/views/home/rule/agreement/index.vue
@@ -95,6 +95,7 @@
 onMounted(async () => {
   fetchData()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -119,7 +120,7 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="editRow('add', {})">
+          <el-button v-if="proxy.hasPerm('/rule/agreement/add')" type="primary" @click="editRow('add', {})">
             新建
           </el-button>
         </div>
@@ -139,10 +140,10 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="120">
             <template #default="scope">
-              <el-button type="primary" link size="small" @click="editRow('edit', scope.row)">
+              <el-button v-if="proxy.hasPerm('/rule/agreement/update')" type="primary" link size="small" @click="editRow('edit', scope.row)">
                 编辑
               </el-button>
-              <el-button type="danger" link size="small" @click="removeRow(scope.row)">
+              <el-button v-if="proxy.hasPerm('/rule/agreement/delete')" type="danger" link size="small" @click="removeRow(scope.row)">
                 删除
               </el-button>
             </template>
diff --git a/src/views/home/rule/alarm/components/alarmLevelList.vue b/src/views/home/rule/alarm/components/alarmLevelList.vue
index c8ffb7d..6c337c4 100644
--- a/src/views/home/rule/alarm/components/alarmLevelList.vue
+++ b/src/views/home/rule/alarm/components/alarmLevelList.vue
@@ -87,6 +87,7 @@
 const cancel = () => {
   dialogFormVisible.value = false
 }
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -97,7 +98,7 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="detailRow('create', {})">
+          <el-button v-if="proxy.hasPerm('/rule/alarm/level/add')" type="primary" @click="detailRow('create', {})">
             新增
           </el-button>
         </div>
@@ -117,10 +118,10 @@
         <template #columns>
           <el-table-column label="操作" width="120" align="center">
             <template #default="scope">
-              <el-button type="primary" link size="small" @click="detailRow('edit', scope.row)">
+              <el-button v-if="proxy.hasPerm('/rule/alarm/level/update')" type="primary" link size="small" @click="detailRow('edit', scope.row)">
                 编辑
               </el-button>
-              <el-button type="danger" link size="small" @click="removeRow(scope.row)">
+              <el-button v-if="proxy.hasPerm('/rule/alarm/level/delete')" type="danger" link size="small" @click="removeRow(scope.row)">
                 删除
               </el-button>
             </template>
diff --git a/src/views/home/rule/alarm/components/alarmTypeList.vue b/src/views/home/rule/alarm/components/alarmTypeList.vue
index 2cbf110..aa0cfed 100644
--- a/src/views/home/rule/alarm/components/alarmTypeList.vue
+++ b/src/views/home/rule/alarm/components/alarmTypeList.vue
@@ -80,6 +80,7 @@
 const cancel = () => {
   dialogFormVisible.value = false
 }
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -90,7 +91,7 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="detailRow('create', {})">
+          <el-button v-if="proxy.hasPerm('/rule/alarm/type/add')" type="primary" @click="detailRow('create', {})">
             新增
           </el-button>
         </div>
@@ -110,10 +111,10 @@
         <template #columns>
           <el-table-column label="操作" width="120" align="center">
             <template #default="scope">
-              <el-button type="primary" link size="small" @click="detailRow('edit', scope.row)">
+              <el-button v-if="proxy.hasPerm('/rule/alarm/type/update')" type="primary" link size="small" @click="detailRow('edit', scope.row)">
                 编辑
               </el-button>
-              <el-button type="danger" link size="small" @click="removeRow(scope.row)">
+              <el-button v-if="proxy.hasPerm('/rule/alarm/type/delete')" type="danger" link size="small" @click="removeRow(scope.row)">
                 删除
               </el-button>
             </template>
diff --git a/src/views/home/rule/alarm/index.vue b/src/views/home/rule/alarm/index.vue
index 110030c..4e66a34 100644
--- a/src/views/home/rule/alarm/index.vue
+++ b/src/views/home/rule/alarm/index.vue
@@ -20,11 +20,14 @@
 // 初始展示列
 const columns = ref<any>([
   { text: '报警类型', value: 'alarmTypeName', align: 'center' },
-  { text: '报警名称', value: 'alarmName', align: 'center' },
-  { text: '报警等级', value: 'alarmLevelName', align: 'center' },
-  { text: '报警提示方式', value: 'alarmNoteMethodName', align: 'center' },
-  { text: '状态', value: 'stateName', align: 'center', width: '130' },
-  { text: '创建时间', value: 'ts', align: 'center' },
+  { text: '设备类型', value: 'typeName', align: 'center' },
+  { text: '产品', value: 'productName', align: 'center' },
+  { text: '厂商', value: 'manufacturerName', align: 'center' },
+  // { text: '报警名称', value: 'alarmName', align: 'center' },
+  { text: '报警等级', value: 'alarmLevelName', align: 'center', width: '100' },
+  { text: '报警提示方式', value: 'alarmNoteMethodName', align: 'center', width: '130', isCustom: true },
+  { text: '状态', value: 'stateName', align: 'center', width: '100', isCustom: true },
+  { text: '创建时间', value: 'ts', align: 'center', width: '200' },
 ])
 // 最终展示列
 const columnsConfig = ref([])
@@ -158,6 +161,7 @@
   await fetchDict()
   fetchData()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -191,13 +195,13 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="showAlarmType">
+          <el-button v-if="proxy.hasPerm('/rule/alarm/type')" type="primary" @click="showAlarmType">
             报警类型管理
           </el-button>
-          <el-button type="primary" @click="showAlarmLevel">
+          <el-button v-if="proxy.hasPerm('/rule/alarm/level')" type="primary" @click="showAlarmLevel">
             报警等级管理
           </el-button>
-          <el-button type="primary" @click="detailRow('create', {})">
+          <el-button v-if="proxy.hasPerm('/rule/alarm/add')" type="primary" @click="detailRow('create', {})">
             新增
           </el-button>
         </div>
@@ -214,16 +218,28 @@
             </template>
           </el-table-column>
         </template>
+        <template #isCustom="{ scope, column }">
+          <!-- 报警提示方式 -->
+          <span v-if="column.text === '报警提示方式'">
+            <el-tag v-if="scope.row.alarmNoteMethodName === '消息提醒'" type="primary">消息提醒</el-tag>
+            <el-tag v-if="scope.row.alarmNoteMethodName === '弹窗'" type="danger">弹窗提醒</el-tag>
+          </span>
+          <!-- 报警提示方式 -->
+          <span v-if="column.text === '状态'">
+            <el-tag v-if="scope.row.stateName === '启用'" type="success">启用</el-tag>
+            <el-tag v-if="scope.row.stateName === '未启用'" type="info">未启用</el-tag>
+          </span>
+        </template>
         <template #columns>
           <el-table-column label="操作" width="140" align="center">
             <template #default="scope">
-              <el-button type="primary" link size="small" @click="switchStatusRow(scope.row)">
+              <el-button v-if="proxy.hasPerm('/rule/alarm/handler')" type="primary" link size="small" @click="switchStatusRow(scope.row)">
                 {{ scope.row.state === '1' ? '停用' : '启用' }}
               </el-button>
-              <el-button type="primary" link size="small" @click="detailRow('edit', scope.row)">
+              <el-button v-if="proxy.hasPerm('/rule/alarm/update')" type="primary" link size="small" @click="detailRow('edit', scope.row)">
                 编辑
               </el-button>
-              <el-button type="danger" link size="small" @click="removeRow(scope.row)">
+              <el-button v-if="proxy.hasPerm('/rule/alarm/delete')" type="danger" link size="small" @click="removeRow(scope.row)">
                 删除
               </el-button>
             </template>
diff --git a/src/views/home/rule/special/components/editDialog.vue b/src/views/home/rule/special/components/editDialog.vue
index bb494ec..5df205b 100644
--- a/src/views/home/rule/special/components/editDialog.vue
+++ b/src/views/home/rule/special/components/editDialog.vue
@@ -8,7 +8,7 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { getDictByCode } from '@/api/system/dict'
 import { getDeviceTypeListPage } from '@/api/home/device/type'
-import { getAlarmLevelListPage, getAlarmRuleListPage } from '@/api/home/rule/alarm'
+import { getAlarmLevelListPage, getAlarmTypeListPage } from '@/api/home/rule/alarm'
 import { addSpecialAlarmRule, editSpecialAlarmRule } from '@/api/home/rule/special'
 import { getDeviceListPage } from '@/api/home/device/device'
 import { getProductListPage } from '@/api/home/device/product'
@@ -57,13 +57,15 @@
 }
 const list = ref<any[]>([])
 const columns = ref<any>([
-  { text: '报警规则', value: 'alarmRule', align: 'center', type: 'select', code: 'alarm-rule', required: true },
+  { text: '报警类型', value: 'alarmTypeId', align: 'center', type: 'select', code: 'alarm-rule', required: true },
   { text: '报警等级', value: 'alarmLevelId', align: 'center', type: 'select', code: 'alarm-level', required: true },
   { text: '报警阈值', value: 'alarmThreshold', align: 'center', type: 'input', required: true },
 ])
 // 初始化对话框
+const isFirst = ref(true)
 const initDialog = (dialogStatusValue: string, row: any) => {
   dialogStatus.value = dialogStatusValue
+  isFirst.value = true
   dialogFormVisible.value = true
   if (dialogStatus.value === 'create') { // 如果是新增，清除验证
     resetForm()
@@ -83,9 +85,13 @@
         alarmRule: row.alarmRule,
         alarmLevelId: row.alarmLevelId,
         alarmThreshold: row.alarmThreshold,
+        alarmTypeId: row.alarmTypeId,
       },
     ]
   }
+  setTimeout(() => {
+    isFirst.value = false
+  })
 }
 defineExpose({
   initDialog,
@@ -143,6 +149,7 @@
 const saveData = () => {
   const data = list.value.map((item: any) => ({
     alarmLevelId: item.alarmLevelId,
+    alarmTypeId: item.alarmTypeId,
     alarmRule: item.alarmRule,
     alarmRuleName: `${item.alarmRule}[${alarmLevelList.value.filter((citem: any) => citem.id === item.alarmLevelId)[0]?.name || ''}]:${item.alarmThreshold}%LEL`,
     alarmThreshold: item.alarmThreshold,
@@ -151,7 +158,7 @@
     position: dataForm.value.position,
     tagNumber: dataForm.value.tagNumber,
     devTypeName: deviceList.value.filter((citem: any) => citem.value === dataForm.value.devcode)[0]?.name || '',
-    alarmTypeId: alarmRuleList.value.filter((citem: any) => citem.name === item.alarmRule)[0]?.alarmTypeId || '',
+    // alarmTypeId: alarmRuleList.value.filter((citem: any) => citem.name === item.alarmRule)[0]?.alarmTypeId || '',
   }))
   if (dialogStatus.value === 'edit') {
     updateData(data)
@@ -207,7 +214,7 @@
   // 设备列表
   getDeviceListPage({ offset: 1, limit: 9999 }).then((res) => {
     deviceList.value = res.data.rows.map((item: any) => ({
-      name: item.devTypeName,
+      name: item.typeName,
       id: item.id,
       value: item.devcode,
       productId: item.productId,
@@ -223,14 +230,14 @@
       }))
     })
     // 报警规则
-    getAlarmRuleListPage({ limit: 9999, offset: 1 }).then((res) => {
-      alarmRuleList.value = res.data.rows.map((item: any) => ({
-        name: item.alarmName,
-        id: item.id,
-        value: item.id,
-        alarmTypeId: item.alarmTypeId,
-      }))
-    })
+    // getAlarmRuleListPage({ limit: 9999, offset: 1 }).then((res) => {
+    //   alarmRuleList.value = res.data.rows.map((item: any) => ({
+    //     name: item.alarmName,
+    //     id: item.id,
+    //     value: item.id,
+    //     alarmTypeId: item.alarmTypeId,
+    //   }))
+    // })
     // 报警等级
     getAlarmLevelListPage({ limit: 9999, offset: 1 }).then((res) => {
       alarmLevelList.value = res.data.rows.map((item: any) => ({
@@ -247,11 +254,26 @@
 watch(() => dataForm.value.devcode, (newVal) => {
   if (newVal) {
     const current = deviceList.value.filter((item: any) => item.value === dataForm.value.devcode)
+    console.log(current, 'current')
     if (current.length) {
       dataForm.value.productId = current[0].productId
       dataForm.value.tagNumber = current[0].tagNumber
       dataForm.value.position = current[0].position
+      // 根据设备类型寻找报警类型
+      getAlarmTypeListPage({ limit: 9999, offset: 1 }).then((res) => {
+        alarmRuleList.value = res.data.rows.filter((item: any) => item.deviceTypeName.includes(current[0].name)).map((item: any) => ({
+          name: item.alarmType,
+          id: item.id,
+          value: item.id,
+          // alarmTypeId: item.id,
+        }))
+      })
     }
+    if (isFirst.value) {
+      return
+    }
+    alarmRuleList.value = []
+    list.value = []
   }
 }, {
   deep: true,
@@ -330,12 +352,12 @@
                         <!-- 报警规则 -->
                         <template v-if="item.type === 'select' && item.code === 'alarm-rule'">
                           <el-select
-                            v-model.trim="scope.row[item.value]" placeholder="报警规则" style="width: 100%;"
+                            v-model.trim="scope.row[item.value]" placeholder="报警类型" style="width: 100%;"
                             clearable filterable :disabled="!scope.row.edit"
                           >
                             <el-option
                               v-for="item in alarmRuleList" :key="item.id" :label="item.name"
-                              :value="item.name"
+                              :value="item.id"
                             />
                           </el-select>
                         </template>
diff --git a/src/views/home/rule/special/index.vue b/src/views/home/rule/special/index.vue
index 5c7b67c..7209dfa 100644
--- a/src/views/home/rule/special/index.vue
+++ b/src/views/home/rule/special/index.vue
@@ -99,6 +99,7 @@
   await fetchDict()
   fetchData()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -127,7 +128,7 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="detail('create', {})">
+          <el-button v-if="proxy.hasPerm('/rule/special/add')" type="primary" @click="detail('create', {})">
             新增
           </el-button>
         </div>
@@ -147,13 +148,13 @@
         <template #columns>
           <el-table-column label="操作" width="140" align="center">
             <template #default="scope">
-              <el-button type="primary" link size="small" @click="detail('detail', scope.row)">
+              <el-button v-if="proxy.hasPerm('/rule/special/detail')" type="primary" link size="small" @click="detail('detail', scope.row)">
                 查看
               </el-button>
-              <el-button type="primary" link size="small" @click="detail('edit', scope.row)">
+              <el-button v-if="proxy.hasPerm('/rule/special/update')" type="primary" link size="small" @click="detail('edit', scope.row)">
                 编辑
               </el-button>
-              <el-button type="danger" link size="small" @click="removeRow(scope.row)">
+              <el-button v-if="proxy.hasPerm('/rule/special/delete')" type="danger" link size="small" @click="removeRow(scope.row)">
                 删除
               </el-button>
             </template>

diff --git a/src/App.vue b/src/App.vue
index cde81b3..8a00f5d 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -125,7 +125,7 @@
         '--g-sub-sidebar-actual-width': subSidebarActualWidth,
       }"
     />
-    <system-info v-if="browserType !== 'mobile'" />
+    <!-- <system-info v-if="browserType !== 'mobile'" /> -->
     <audio id="eventAudio" src="" autoplay />
   </el-config-provider>
 </template>
diff --git a/src/layouts/components/Tools/alarmDialog.vue b/src/layouts/components/Tools/alarmDialog.vue
index 1828375..df89ab8 100644
--- a/src/layouts/components/Tools/alarmDialog.vue
+++ b/src/layouts/components/Tools/alarmDialog.vue
@@ -116,7 +116,7 @@
     </div>
     <template #footer>
       <div class="dialog-footer">
-        <div class="btn" @click="detail">
+        <div v-if="proxy.hasPerm('/alarm/current')" class="btn" @click="detail">
           查看
         </div>
         <div v-if="info.isSound === '1'" class="btn" @click="closeSound">
diff --git a/src/layouts/components/Tools/alarmList.vue b/src/layouts/components/Tools/alarmList.vue
index c3a9d2a..5356b74 100644
--- a/src/layouts/components/Tools/alarmList.vue
+++ b/src/layouts/components/Tools/alarmList.vue
@@ -54,6 +54,7 @@
 }
 // 查看当前行
 const detailRow = (row: any) => {
+  if (!proxy.hasPerm('/alarm/current')) { return }
   $router.push({
     name: 'AlarmCurrent',
     query: {
@@ -77,21 +78,6 @@
   localStorage.setItem('eventAudio', 'pause')
 }
 const dialogRef = ref()
-// const dialog = () => {
-//   const row = {
-//     alarmNoteMethod: '1', // 消息提醒 1:弹窗，2:消息提醒
-//     isSound: '1', // 报警音效，1:开，0:关
-//     isSend: '1', // 报警推送，1:开，0:关
-//     isText: '1', // 报警短息，1:开，0:关
-//     alarmType: '浓度超限',
-//     tagNumber: 'NX5702',
-//     alarmTime: '2024-09-09',
-//     value: '20',
-//     typeName: '燃气智能终端',
-//     alarmLevel: '一级',
-//   }
-//   dialogRef.value.initDialog(row)
-// }
 const fetchData = (isLoading = false) => {
   loading.value = true
   if (isLoading) {
@@ -115,7 +101,10 @@
       dialogRef.value.initDialog(newVal)
     }
     if (newVal.isSound === '1') {
-      play()
+      // play()
+      if (!localStorage.getItem('eventAudio')) {
+        proxy.playAudio()
+      }
     }
     fetchData(false)
   }
@@ -146,6 +135,7 @@
 //     window.localStorage.removeItem('token')
 //   }
 // }
+// const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -180,7 +170,7 @@
                   {{ message.processStatus
                     === '未读' ? '未读' : '已读' }}
                 </el-tag>
-                <el-tag type="info" size="small" style="margin-left: 5px;">
+                <el-tag type="info" size="small" style="margin-left: 5px;" @click="detailRow(message)">
                   查看
                 </el-tag>
               </div>
@@ -214,7 +204,7 @@
       <!-- <div class="close" @click="dialog">
         弹窗
       </div> -->
-      <div class="more" @click="moreList">
+      <div v-if="proxy.hasPerm('/alarm/current')" class="more" @click="moreList">
         查看更多
       </div>
     </div>
diff --git a/src/layouts/components/Tools/index.vue b/src/layouts/components/Tools/index.vue
index 9f2d41f..61f9707 100644
--- a/src/layouts/components/Tools/index.vue
+++ b/src/layouts/components/Tools/index.vue
@@ -79,6 +79,7 @@
   // 断开 websocket
   // websocket.destroyWebSocket()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -89,18 +90,18 @@
           <svg-icon name="ep:search" />
         </el-icon>
       </span>
-      <span class="item" @click="board">
+      <span v-if="proxy.hasPerm('/fullscreen')" class="item" @click="board">
         <el-icon>
           <svg-icon name="ep:data-line" />
         </el-icon>
       </span>
-      <span v-if="settingsStore.mode === 'pc' && settingsStore.toolbar.enableFullscreen" class="item" @click="toggle">
+      <span class="item" @click="toggle">
         <el-icon>
           <svg-icon :name="isFullscreen ? 'fullscreen-exit' : 'fullscreen'" />
         </el-icon>
       </span>
       <!-- 报警信息列表 -->
-      <span class="item">
+      <span v-if="proxy.hasPerm('/alarmnotice')" class="item">
         <el-popover width="390">
           <template #reference>
             <div>
diff --git a/src/layouts/components/Topbar/index.vue b/src/layouts/components/Topbar/index.vue
index 2863cef..4e3120e 100644
--- a/src/layouts/components/Topbar/index.vue
+++ b/src/layouts/components/Topbar/index.vue
@@ -67,7 +67,7 @@
           </transition-group>
         </el-breadcrumb>
       </div>
-      <tools />
+      <!-- <tools /> -->
     </div>
   </div>
 </template>
diff --git a/src/router/modules/pc.ts b/src/router/modules/pc.ts
index aacd6fa..97ced45 100644
--- a/src/router/modules/pc.ts
+++ b/src/router/modules/pc.ts
@@ -40,7 +40,7 @@
       icon: 'ep:key',
       sidebar: false,
       breadcrumb: false,
-      // auth: '/fullscreen',
+      auth: '/fullscreen',
     },
   },
   {
@@ -155,7 +155,7 @@
           sidebar: false,
           breadcrumb: false,
           activeMenu: '/well',
-          auth: '/well/detail',
+          auth: '/well',
         },
       },
     ],
diff --git a/src/views/home/alarm/count/components/locationAnalysis.vue b/src/views/home/alarm/count/components/locationAnalysis.vue
index fc75b9e..bff1853 100644
--- a/src/views/home/alarm/count/components/locationAnalysis.vue
+++ b/src/views/home/alarm/count/components/locationAnalysis.vue
@@ -46,6 +46,7 @@
   })
 }
 fetchData()
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -75,6 +76,9 @@
         <el-button type="primary" style="margin: 0 5px;" @click="fetchData">
           搜索
         </el-button>
+        <el-button v-if="proxy.hasPerm('/alarm/count/exportLocation')" type="primary" style="margin: 0 5px;">
+          导出
+        </el-button>
       </div>
     </template>
     <template #content>
diff --git a/src/views/home/alarm/current/components/detail.vue b/src/views/home/alarm/current/components/detail.vue
index dd3b31a..4204c92 100644
--- a/src/views/home/alarm/current/components/detail.vue
+++ b/src/views/home/alarm/current/components/detail.vue
@@ -111,7 +111,7 @@
   const res2 = await getAlarmTypeListPage({ offset: 1, limit: 9999 });
   ($route.query.type === 'history' ? getAlarmDetail : getAlarmDetail)($route.query.id as string).then((res) => {
     detailInfo.value = toHumpObject(res.data)
-    detailInfo.value.realAlarmName = detailInfo.value.realAlarm === '1' ? '报警' : '误报'
+    detailInfo.value.realAlarmName = detailInfo.value.realAlarm === '0' ? '是' : '否'
     detailInfo.value.alarmTypeName = res2.data.rows.filter((item: any) => item.id === detailInfo.value.alarmTypeId)[0]?.alarmType || ''
     detailInfo.value.alarmLevelName = res1.data.rows.filter((item: any) => item.id === detailInfo.value.alarmLevel)[0]?.alarmLevel || ''
     detailInfo.value.duration = detailInfo.value.ts && detailInfo.value.cancelTime ? getDateDiff(detailInfo.value.ts, detailInfo.value.cancelTime) : ''
@@ -139,6 +139,7 @@
 }
 // 点击经纬度展示地图
 const mapRef = ref()
+const { proxy } = getCurrentInstance() as any
 const showMap = (data: any) => {
   console.log(data, 'data')
   if (data.text === '位置') {
@@ -148,6 +149,13 @@
         2: 'StationMonitorDetail',
         3: 'PipelineMonitorDetail',
       } as { [key: string]: string }
+      // 判断是否有菜单权限
+      const watchObjectAuth = {
+        1: '/well',
+        2: '/station/monitor',
+        3: '/pipeline',
+      } as { [key: string]: string }
+      if (!proxy.hasPerm(watchObjectAuth[detailInfo.value.watchObject])) { return }
       $router.push({
         name: watchObject[detailInfo.value.watchObject],
         query: {
diff --git a/src/views/home/alarm/current/components/detailInfoDialog.vue b/src/views/home/alarm/current/components/detailInfoDialog.vue
index c089449..7fbf06b 100644
--- a/src/views/home/alarm/current/components/detailInfoDialog.vue
+++ b/src/views/home/alarm/current/components/detailInfoDialog.vue
@@ -114,6 +114,7 @@
   })
 }
 defineExpose({ initDialog, close })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -131,7 +132,7 @@
     <!-- 头部 -->
     <div class="header">
       <span>{{ info.alarmContent }}</span>
-      <span class="more" @click="moreData">>>更多</span>
+      <span v-if="proxy.hasPerm(type === 'data' ? '/alarm/current/more' : '/alarm/device/more')" class="more" @click="moreData">>>更多</span>
     </div>
     <div class="content">
       <div v-show="type === 'device'" class="item">
@@ -162,7 +163,7 @@
         报警设备:
         <span style="padding-left: 6px;">{{ info.devcode }} </span>
         <el-button
-          v-if="info.devTypeName === '燃气智能监测终端' || info.devTypeName === '液位检测仪' || info.devTypeName === '井盖监测仪'"
+          v-if="(info.devTypeName === '燃气智能监测终端' || info.devTypeName === '液位检测仪' || info.devTypeName === '井盖监测仪') && proxy.hasPerm('/alarm/current/data')"
           size="small" style="margin-left: 6px;" @click="viewData"
         >
           查看数据
@@ -228,7 +229,7 @@
         <span style="padding-left: 6px;">
           {{ info.confirmContent }}
         </span>
-        <el-button v-if="type === 'data'" size="small" style="padding-left: 6px;" @click="viewProcess">
+        <el-button v-if="type === 'data' && proxy.hasPerm('/alarm/current/process')" size="small" style="padding-left: 6px;" @click="viewProcess">
           流程图
         </el-button>
       </div>
@@ -246,17 +247,17 @@
       </div>
     </div>
     <div class="footer">
-      <el-button v-if="Number(info.processStatus) < 4 && type === 'data'" size="small" @click="remind">
+      <el-button v-if="(Number(info.processStatus) < 4 && type === 'data') && proxy.hasPerm('/alarm/current/remind')" size="small" @click="remind">
         提醒责任人
       </el-button>
       <el-button
-        v-if="type === 'device' && (info.processStatusName === '待处置' || info.processStatusName === '挂起')"
+        v-if="(type === 'device' && (info.processStatusName === '待处置' || info.processStatusName === '挂起')) && proxy.hasPerm('/alarm/device/handler')"
         size="small" @click="handler"
       >
         报警处置
       </el-button>
       <el-button
-        v-if="Number(info.processStatus) <= 3 || (type === 'device' && info.processStatusName === '待处置') || info.processStatusName === '挂起'"
+        v-if="(Number(info.processStatus) <= 3 || (type === 'device' && info.processStatusName === '待处置') || info.processStatusName === '挂起') && proxy.hasPerm(type === 'device' ? '/alarm/device/pending' : '/alarm/current/pending')"
         type="primary" size="small" @click="pending"
       >
         挂起
diff --git a/src/views/home/alarm/current/index.vue b/src/views/home/alarm/current/index.vue
index d019bbf..e2714bb 100644
--- a/src/views/home/alarm/current/index.vue
+++ b/src/views/home/alarm/current/index.vue
@@ -4,6 +4,7 @@
   Date: 2023-06-28
  -->
 <script lang="ts" setup name="CurrentAlarm">
+import dayjs from 'dayjs'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import { ArrowLeftBold, ArrowRightBold } from '@element-plus/icons-vue'
 import MapCom from './components/map.vue'
@@ -100,6 +101,7 @@
       path: '/alarm/current',
     })
   }
+  datetimerange.value = []
   listQuery.value = {
     limit: 20,
     offset: 1,
@@ -131,8 +133,8 @@
   if ($route.query.row) {
     loadingTable.value = true
     const row = JSON.parse($route.query.row as string)
-    getCurrentAlarmListPage({ offset: 1, limit: 99999 }).then((res) => {
-      const data = res.data.rows.filter((item: any) => item.id === row.id)
+    getCurrentAlarmListPage({ offset: 1, limit: 50 }).then((res) => {
+      const data = res.data.rows.filter((item: any) => item.id === row.alarmId)
       if (data.length) {
         list1.value = data.map((item: any) => ({
           ...item,
@@ -153,7 +155,10 @@
     })
     return
   }
-  fetchData()
+  datetimerange.value = [dayjs().subtract(7, 'day').format('YYYY-MM-DD HH:mm:ss'), dayjs().format('YYYY-MM-DD HH:mm:ss')]
+  setTimeout(() => {
+    fetchData()
+  })
 })
 // 表格标识  地图或普通
 const tableFlag = ref('normal')
@@ -181,6 +186,10 @@
 const mapRef = ref()
 const mapData = ref({})
 async function detail(row: any) {
+  if (row.processStatusName === '未读') {
+    list1.value[list1.value.findIndex((item: any) => item.id === row.id)].processStatusName = '已读'
+    row.processStatusName = '已读'
+  }
   const res = await detailAlarm(row.id)
   const data = toHumpObject(res.data)
   mapData.value = row
@@ -362,7 +371,7 @@
               <el-button v-if="proxy.hasPerm('/alarm/current/delete')" type="primary" @click="batchDeleteRow">
                 批量删除
               </el-button>
-              <el-button type="primary" @click="exportList">
+              <el-button v-if="proxy.hasPerm('/alarm/current/export')" type="primary" @click="exportList">
                 导出
               </el-button>
             </div>
@@ -383,7 +392,7 @@
               </el-table-column>
             </template>
             <template #columns>
-              <el-table-column label="操作" align="center" width="80">
+              <el-table-column v-if="proxy.hasPerm('/alarm/current/detail')" label="操作" align="center" width="80">
                 <template #default="scope">
                   <el-button type="primary" link size="small" @click="detail(scope.row)">
                     查看
diff --git a/src/views/home/alarm/history/index.vue b/src/views/home/alarm/history/index.vue
index eeb49fc..3c810c3 100644
--- a/src/views/home/alarm/history/index.vue
+++ b/src/views/home/alarm/history/index.vue
@@ -97,6 +97,7 @@
 }
 // 重置查询条件f
 const reset = () => {
+  datetimerange.value = []
   listQuery.value = {
     limit: 20,
     offset: 1,
@@ -189,6 +190,7 @@
   })
 }
 fetchDict()
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -249,7 +251,7 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="exportList">
+          <el-button v-if="proxy.hasPerm('/alarm/history/export')" type="primary" @click="exportList">
             导出
           </el-button>
         </div>
@@ -272,7 +274,7 @@
           </el-table-column>
         </template>
         <template #columns>
-          <el-table-column label="操作" align="center" width="80">
+          <el-table-column v-if="proxy.hasPerm('/alarm/history/detail')" label="操作" align="center" width="80">
             <template #default="scope">
               <el-button type="primary" link size="small" @click="moreData(scope.row)">
                 查看
diff --git a/src/views/home/dashboard/index.vue b/src/views/home/dashboard/index.vue
index d2f7e3c..42dfbed 100644
--- a/src/views/home/dashboard/index.vue
+++ b/src/views/home/dashboard/index.vue
@@ -42,7 +42,7 @@
     value: '0',
     name: '在线',
     unit: '个',
-    id: '1',
+    id: '1,2',
   },
   {
     img: img.lixian,
@@ -56,7 +56,7 @@
     value: '0',
     name: '停用',
     unit: '个',
-    id: '2',
+    id: '3',
   },
 ])
 // 工作台数据
@@ -133,7 +133,11 @@
   deviceOperationLoading.value = true
   getDeviceStatus().then((res) => {
     res.data.forEach((element: any) => {
-      const index = deviceOperationData.value.findIndex((item: any) => item.id === element.name)
+      if (element.name === '1' || element.name === '2') {
+        deviceOperationData.value[0].value = Number(deviceOperationData.value[0].value || '0') + Number(element.value)
+        return
+      }
+      const index = deviceOperationData.value.findIndex((item: any) => item.id.includes(element.name))
       if (index !== -1) {
         deviceOperationData.value[index].value = element.value
       }
diff --git a/src/views/home/device/count/components/bottom.vue b/src/views/home/device/count/components/bottom.vue
index 28a4d78..e4e56fa 100644
--- a/src/views/home/device/count/components/bottom.vue
+++ b/src/views/home/device/count/components/bottom.vue
@@ -110,6 +110,7 @@
   })
 }
 fetchDict()
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -148,7 +149,7 @@
             <template #btns-right>
               <!-- 操作 -->
               <div>
-                <el-button type="primary">
+                <el-button v-if="proxy.hasPerm('/device/count/offline/export')" type="primary">
                   导出
                 </el-button>
               </div>
diff --git a/src/views/home/device/device/index.vue b/src/views/home/device/device/index.vue
index c3970b9..9cdd606 100644
--- a/src/views/home/device/device/index.vue
+++ b/src/views/home/device/device/index.vue
@@ -88,6 +88,7 @@
 }
 // 重置查询条件f
 const reset = () => {
+  datetimerange.value = []
   listQuery.value = {
     limit: 20,
     offset: 1,
@@ -296,6 +297,7 @@
   fetchDict()
   fetchData()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -372,17 +374,17 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="editRow('add', {})">
+          <el-button v-if="proxy.hasPerm('/device/manage/add')" type="primary" @click="editRow('add', {})">
             新建
           </el-button>
-          <el-button type="primary" @click="downloadTemplate">
+          <el-button v-if="proxy.hasPerm('/device/manage/down')" type="primary" @click="downloadTemplate">
             模板下载
           </el-button>
-          <el-button type="primary" @click="importList">
+          <el-button v-if="proxy.hasPerm('/device/manage/import')" type="primary" @click="importList">
             批量导入
           </el-button>
-          <el-button type="primary" @click="exportList">
-            导出列表
+          <el-button v-if="proxy.hasPerm('/device/manage/export')" type="primary" @click="exportList">
+            导出
           </el-button>
           <input ref="fileRef" style="display: none;" type="file" accept=".xls,.xlsx" @change="onFileChange">
         </div>
@@ -409,16 +411,16 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="150">
             <template #default="scope">
-              <el-button type="primary" link size="small" @click="editRow('detail', scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/manage/detail')" type="primary" link size="small" @click="editRow('detail', scope.row)">
                 查看
               </el-button>
-              <el-button type="primary" link size="small" @click="editRow('edit', scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/manage/update')" type="primary" link size="small" @click="editRow('edit', scope.row)">
                 编辑
               </el-button>
-              <el-button type="danger" link size="small" @click="changeDefense(scope.row)">
+              <!-- <el-button v-if="proxy.hasPerm('/device/manage/add')" type="danger" link size="small" @click="changeDefense(scope.row)">
                 撤防
-              </el-button>
-              <el-button type="danger" link size="small" @click="removeRow(scope.row)">
+              </el-button> -->
+              <el-button v-if="proxy.hasPerm('/device/manage/delete')" type="danger" link size="small" @click="removeRow(scope.row)">
                 删除
               </el-button>
             </template>
diff --git a/src/views/home/device/instruction/index.vue b/src/views/home/device/instruction/index.vue
index 1e598ed..1da6706 100644
--- a/src/views/home/device/instruction/index.vue
+++ b/src/views/home/device/instruction/index.vue
@@ -78,6 +78,7 @@
 }
 // 重置查询条件f
 const reset = () => {
+  datetimerange.value = []
   listQuery.value = {
     limit: 20,
     offset: 1,
@@ -158,6 +159,7 @@
     editRef.value.initDialog('addOther', {})
   }
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -213,10 +215,10 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary">
+          <el-button v-if="proxy.hasPerm('/device/instruction/batch')" type="primary">
             批量下发
           </el-button>
-          <el-button type="primary" @click="editRow('add', {})">
+          <el-button v-if="proxy.hasPerm('/device/instruction/add')" type="primary" @click="editRow('add', {})">
             新建
           </el-button>
         </div>
@@ -236,13 +238,13 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="120">
             <template #default="scope">
-              <el-button type="primary" link size="small" @click="editRow('detail', scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/instruction/detail')" type="primary" link size="small" @click="editRow('detail', scope.row)">
                 查看
               </el-button>
-              <el-button v-if="scope.row.status === '2'" type="primary" link size="small" @click="editRow('edit', scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/instruction/again') && scope.row.status === '2'" type="primary" link size="small" @click="editRow('edit', scope.row)">
                 重新下发
               </el-button>
-              <el-button type="danger" link size="small" @click="removeRow(scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/instruction/delete')" type="danger" link size="small" @click="removeRow(scope.row)">
                 删除
               </el-button>
             </template>
diff --git a/src/views/home/device/product/index.vue b/src/views/home/device/product/index.vue
index 799fc90..fdd5463 100644
--- a/src/views/home/device/product/index.vue
+++ b/src/views/home/device/product/index.vue
@@ -128,6 +128,7 @@
   await fetchDict()
   fetchData()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -164,7 +165,7 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="editRow('add', {})">
+          <el-button v-if="proxy.hasPerm('/device/product/add')" type="primary" @click="editRow('add', {})">
             新建
           </el-button>
         </div>
@@ -184,10 +185,10 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="120">
             <template #default="scope">
-              <el-button type="primary" link size="small" @click="editRow('edit', scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/product/update')" type="primary" link size="small" @click="editRow('edit', scope.row)">
                 编辑
               </el-button>
-              <el-button type="danger" link size="small" @click="removeRow(scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/product/delete')" type="danger" link size="small" @click="removeRow(scope.row)">
                 删除
               </el-button>
             </template>
diff --git a/src/views/home/device/type/index.vue b/src/views/home/device/type/index.vue
index 59f1343..2344e57 100644
--- a/src/views/home/device/type/index.vue
+++ b/src/views/home/device/type/index.vue
@@ -105,6 +105,7 @@
   await fetchDict()
   fetchData()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -131,7 +132,7 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="editRow('add', {})">
+          <el-button v-if="proxy.hasPerm('/device/type/add')" type="primary" @click="editRow('add', {})">
             新建
           </el-button>
         </div>
@@ -151,10 +152,10 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="120">
             <template #default="scope">
-              <el-button type="primary" link size="small" @click="editRow('edit', scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/type/update')" type="primary" link size="small" @click="editRow('edit', scope.row)">
                 编辑
               </el-button>
-              <el-button type="danger" link size="small" @click="removeRow(scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/type/delete')" type="danger" link size="small" @click="removeRow(scope.row)">
                 删除
               </el-button>
             </template>
diff --git a/src/views/home/ledger/ledger/components/gridList.vue b/src/views/home/ledger/ledger/components/gridList.vue
index d03cd9f..189edef 100644
--- a/src/views/home/ledger/ledger/components/gridList.vue
+++ b/src/views/home/ledger/ledger/components/gridList.vue
@@ -91,6 +91,7 @@
     // })
   })
 }
+const { proxy } = getCurrentInstance() as any
 // 同步日志
 const allSync = () => {
   $router.push({
@@ -139,10 +140,10 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="allSync">
+          <el-button v-if="proxy.hasPerm('/ledger/sync')" type="primary" @click="allSync">
             同步日志
           </el-button>
-          <el-button type="primary" @click="sync('all', {})">
+          <el-button v-if="proxy.hasPerm('/ledger/sync/all')" type="primary" @click="sync('all', {})">
             全量同步
           </el-button>
         </div>
@@ -160,9 +161,9 @@
           </el-table-column>
         </template>
         <template #columns>
-          <el-table-column label="操作" align="center" width="80">
+          <el-table-column v-if="proxy.hasPerm('/ledger/sync/single')" label="操作" align="center" width="80">
             <template #default="scope">
-              <el-button type="primary" link size="small" @click="sync('single', scope.row)">
+              <el-button v-if="proxy.hasPerm('/ledger/sync/single')" type="primary" link size="small" @click="sync('single', scope.row)">
                 同步
               </el-button>
             </template>
diff --git a/src/views/home/ledger/ledger/components/wellList.vue b/src/views/home/ledger/ledger/components/wellList.vue
index 9eb1f43..06f855a 100644
--- a/src/views/home/ledger/ledger/components/wellList.vue
+++ b/src/views/home/ledger/ledger/components/wellList.vue
@@ -123,6 +123,7 @@
   // await fetchDict()
   fetchData()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -159,11 +160,11 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="allSync">
+          <el-button v-if="proxy.hasPerm('/ledger/sync')" type="primary" @click="allSync">
             同步日志
           </el-button>
-          <el-button type="primary" @click="sync('all', {})">
-            全部同步
+          <el-button v-if="proxy.hasPerm('/ledger/sync/all')" type="primary" @click="sync('all', {})">
+            全量同步
           </el-button>
         </div>
       </template>
@@ -180,9 +181,9 @@
           </el-table-column>
         </template>
         <template #columns>
-          <el-table-column label="操作" align="center" width="80">
+          <el-table-column v-if="proxy.hasPerm('/ledger/sync/single')" label="操作" align="center" width="80">
             <template #default="scope">
-              <el-button type="primary" link size="small" @click="sync('single', scope.row)">
+              <el-button v-if="proxy.hasPerm('/ledger/sync/single')" type="primary" link size="small" @click="sync('single', scope.row)">
                 同步
               </el-button>
             </template>
diff --git a/src/views/home/ledger/ledger/index.vue b/src/views/home/ledger/ledger/index.vue
index a03aa12..8403fc5 100644
--- a/src/views/home/ledger/ledger/index.vue
+++ b/src/views/home/ledger/ledger/index.vue
@@ -7,7 +7,16 @@
 import type { TabsPaneContext } from 'element-plus'
 import wellList from './components/wellList.vue'
 import gridList from './components/gridList.vue'
-const activeName = ref('闸井')
+const { proxy } = getCurrentInstance() as any
+const activeName = ref(
+  proxy.hasPerm('/ledger/manage/well')
+    ? '闸井'
+    : proxy.hasPerm('/ledger/manage/station')
+      ? '场站'
+      : proxy.hasPerm('/ledger/manage/grid')
+        ? '网格'
+        : '',
+)
 const handleClick = (tab: TabsPaneContext, event: Event) => {
   // console.log(tab, event)
 }
@@ -17,13 +26,13 @@
   <!-- 布局 -->
   <app-container>
     <el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick">
-      <el-tab-pane label="闸井" name="闸井">
+      <el-tab-pane v-if="proxy.hasPerm('/ledger/manage/well')" label="闸井" name="闸井">
         <well-list v-if="activeName === '闸井'" type="1" />
       </el-tab-pane>
-      <el-tab-pane label="场站" name="场站">
+      <el-tab-pane v-if="proxy.hasPerm('/ledger/manage/station')" label="场站" name="场站">
         <well-list v-if="activeName === '场站'" type="2" />
       </el-tab-pane>
-      <el-tab-pane label="网格" name="网格">
+      <el-tab-pane v-if="proxy.hasPerm('/ledger/manage/grid')" label="网格" name="网格">
         <grid-list v-if="activeName === '网格'" />
       </el-tab-pane>
     </el-tabs>
diff --git a/src/views/home/ledger/pipeline/index.vue b/src/views/home/ledger/pipeline/index.vue
index e0d2512..01e95ac 100644
--- a/src/views/home/ledger/pipeline/index.vue
+++ b/src/views/home/ledger/pipeline/index.vue
@@ -160,6 +160,7 @@
 onMounted(async () => {
   fetchData()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -222,13 +223,13 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="editRow('add', {})">
+          <el-button v-if="proxy.hasPerm('/ledger/pipeline/add')" type="primary" @click="editRow('add', {})">
             新增
           </el-button>
-          <el-button type="primary" @click="importList">
+          <el-button v-if="proxy.hasPerm('/ledger/pipeline/import')" type="primary" @click="importList">
             批量导入
           </el-button>
-          <el-button type="primary" @click="exportList">
+          <el-button v-if="proxy.hasPerm('/ledger/pipeline/export')" type="primary" @click="exportList">
             批量导出
           </el-button>
         </div>
@@ -248,10 +249,10 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="100">
             <template #default="scope">
-              <el-button type="primary" link size="small" @click="editRow('edit', scope.row)">
+              <el-button v-if="proxy.hasPerm('/ledger/pipeline/update')" type="primary" link size="small" @click="editRow('edit', scope.row)">
                 编辑
               </el-button>
-              <el-button type="danger" link size="small" @click="removeRow(scope.row)">
+              <el-button v-if="proxy.hasPerm('/ledger/pipeline/delete')" type="danger" link size="small" @click="removeRow(scope.row)">
                 删除
               </el-button>
             </template>
diff --git a/src/views/home/ledger/sync/index.vue b/src/views/home/ledger/sync/index.vue
index 54a3218..a04bad9 100644
--- a/src/views/home/ledger/sync/index.vue
+++ b/src/views/home/ledger/sync/index.vue
@@ -62,6 +62,7 @@
 }
 // 重置查询条件f
 const reset = () => {
+  datetimerange.value = []
   listQuery.value = {
     limit: 20,
     offset: 1,
@@ -106,6 +107,8 @@
 onMounted(async () => {
   fetchData()
 })
+const { proxy } = getCurrentInstance() as any
+const $route = useRoute()
 </script>
 
 <template>
@@ -132,7 +135,7 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="goBak">
+          <el-button v-if="$route.type" type="primary" @click="goBak">
             返回
           </el-button>
         </div>
@@ -152,10 +155,10 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="80">
             <template #default="scope">
-              <el-button type="primary" link size="small">
+              <el-button v-if="proxy.hasPerm('/ledger/sync/detail')" type="primary" link size="small">
                 查看
               </el-button>
-              <el-button type="danger" link size="small" @click="removeRow(scope.row)">
+              <el-button v-if="proxy.hasPerm('/ledger/sync/delete')" type="danger" link size="small" @click="removeRow(scope.row)">
                 删除
               </el-button>
             </template>
diff --git a/src/views/home/monitor/service/index.vue b/src/views/home/monitor/service/index.vue
index 8df2239..570dc68 100644
--- a/src/views/home/monitor/service/index.vue
+++ b/src/views/home/monitor/service/index.vue
@@ -53,6 +53,7 @@
 onMounted(async () => {
   fetchData()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -66,7 +67,7 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary">
+          <el-button v-if="proxy.hasPerm('/monitor/service/add')" type="primary">
             新建
           </el-button>
         </div>
diff --git a/src/views/home/monitor/time/index.vue b/src/views/home/monitor/time/index.vue
index caa6d46..0f7f5a0 100644
--- a/src/views/home/monitor/time/index.vue
+++ b/src/views/home/monitor/time/index.vue
@@ -53,6 +53,7 @@
 onMounted(async () => {
   fetchData()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -66,7 +67,7 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary">
+          <el-button v-if="proxy.hasPerm('/monitor/time/add')" type="primary">
             新建
           </el-button>
         </div>
diff --git a/src/views/home/operation/alarm/components/detail.vue b/src/views/home/operation/alarm/components/detail.vue
index 8194cbd..4ae4a1f 100644
--- a/src/views/home/operation/alarm/components/detail.vue
+++ b/src/views/home/operation/alarm/components/detail.vue
@@ -151,6 +151,7 @@
 }
 // 点击经纬度展示地图
 const mapRef = ref()
+const { proxy } = getCurrentInstance() as any
 const showMap = (data: any) => {
   console.log(data, 'data')
   if (data.text === '位置') {
@@ -160,6 +161,13 @@
         2: 'StationMonitorDetail',
         3: 'PipelineMonitorDetail',
       } as { [key: string]: string }
+      // 判断是否有菜单权限
+      const watchObjectAuth = {
+        1: '/well',
+        2: '/station/monitor',
+        3: '/pipeline',
+      } as { [key: string]: string }
+      if (!proxy.hasPerm(watchObjectAuth[detailInfo.value.watchObject])) { return }
       $router.push({
         name: watchObject[detailInfo.value.watchObject],
         query: {
diff --git a/src/views/home/operation/alarm/index.vue b/src/views/home/operation/alarm/index.vue
index ac0f31b..e53c991 100644
--- a/src/views/home/operation/alarm/index.vue
+++ b/src/views/home/operation/alarm/index.vue
@@ -82,6 +82,7 @@
 }
 // 重置查询条件f
 const reset = () => {
+  datetimerange.value = []
   listQuery.value = {
     limit: 20,
     offset: 1,
@@ -315,7 +316,7 @@
               <el-button v-if="proxy.hasPerm('/alarm/device/delete')" type="primary" @click="batchDeleteRow">
                 批量删除
               </el-button>
-              <el-button type="primary" @click="exportList">
+              <el-button v-if="proxy.hasPerm('/alarm/device/export')" type="primary" @click="exportList">
                 导出
               </el-button>
             </div>
@@ -336,7 +337,7 @@
               </el-table-column>
             </template>
             <template #columns>
-              <el-table-column label="操作" align="center" width="80">
+              <el-table-column v-if="proxy.hasPerm('/alarm/device/detail')" label="操作" align="center" width="80">
                 <template #default="scope">
                   <el-button type="primary" link size="small" @click="detail(scope.row)">
                     查看
diff --git a/src/views/home/operation/history/index.vue b/src/views/home/operation/history/index.vue
index 5c04ff7..d96ac57 100644
--- a/src/views/home/operation/history/index.vue
+++ b/src/views/home/operation/history/index.vue
@@ -78,6 +78,7 @@
 }
 // 重置查询条件f
 const reset = () => {
+  datetimerange.value = []
   listQuery.value = {
     limit: 20,
     offset: 1,
@@ -161,6 +162,7 @@
     fetchData()
   })
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -218,7 +220,7 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="exportList">
+          <el-button v-if="proxy.hasPerm('/operation/history/export')" type="primary" @click="exportList">
             导出
           </el-button>
         </div>
@@ -241,7 +243,7 @@
           </el-table-column>
         </template>
         <template #columns>
-          <el-table-column label="操作" align="center" width="80">
+          <el-table-column v-if="proxy.hasPerm('/operation/history/detail')" label="操作" align="center" width="80">
             <template #default="scope">
               <el-button type="primary" link size="small" @click="detailRow(scope.row)">
                 查看
diff --git a/src/views/home/operation/manufacturer/index.vue b/src/views/home/operation/manufacturer/index.vue
index 4a5816a..5f647c3 100644
--- a/src/views/home/operation/manufacturer/index.vue
+++ b/src/views/home/operation/manufacturer/index.vue
@@ -75,6 +75,7 @@
 }
 // 重置查询条件f
 const reset = () => {
+  datetimerange.value = []
   listQuery.value = {
     limit: 20,
     offset: 1,
@@ -125,6 +126,7 @@
   await fetchDict()
   fetchData()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -178,7 +180,7 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="exportList">
+          <el-button v-if="proxy.hasPerm('/operation/manufacturer/export')" type="primary" @click="exportList">
             导出
           </el-button>
         </div>
diff --git a/src/views/home/operation/trajectory/index.vue b/src/views/home/operation/trajectory/index.vue
index 9312fd7..606958e 100644
--- a/src/views/home/operation/trajectory/index.vue
+++ b/src/views/home/operation/trajectory/index.vue
@@ -65,6 +65,7 @@
 }
 // 重置查询条件f
 const reset = () => {
+  datetimerange.value = []
   listQuery.value = {
     limit: 20,
     offset: 1,
@@ -114,6 +115,7 @@
   await fetchDict()
   fetchData()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -175,7 +177,7 @@
           </span>
         </template>
         <template #columns>
-          <el-table-column label="操作" width="80" align="center">
+          <el-table-column v-if="proxy.hasPerm('/operation/trajectory/detail')" label="操作" width="80" align="center">
             <template #default="scope">
               <el-button type="primary" link size="small" @click="detail(scope.row)">
                 查看
diff --git a/src/views/home/pipeline/components/detailData.vue b/src/views/home/pipeline/components/detailData.vue
index 80b6886..760b1c5 100644
--- a/src/views/home/pipeline/components/detailData.vue
+++ b/src/views/home/pipeline/components/detailData.vue
@@ -7,7 +7,13 @@
 import type { TabsPaneContext } from 'element-plus'
 import monitorData from './monitorDataList.vue'
 import maintenanceRecord from '@/views/home/well/components/maintenanceRecord.vue'
-const activeName = ref('监控数据')
+const { proxy } = getCurrentInstance() as any
+const activeName = ref(
+  proxy.hasPerm('/pipeline/monitor/data')
+    ? '监控数据'
+    : proxy.hasPerm('/pipeline/monitor/maintenance')
+      ? '监控设备维护记录'
+      : '')
 const handleClick = (tab: TabsPaneContext, event: Event) => {
   // console.log(tab, event)
 }
@@ -15,10 +21,10 @@
 
 <template>
   <el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick">
-    <el-tab-pane label="监控数据" name="监控数据">
+    <el-tab-pane v-if="proxy.hasPerm('/pipeline/monitor/data')" label="监控数据" name="监控数据">
       <monitor-data v-if="activeName === '监控数据'" />
     </el-tab-pane>
-    <el-tab-pane label="监控设备维护记录" name="监控设备维护记录">
+    <el-tab-pane v-if="proxy.hasPerm('/pipeline/monitor/maintenance')" label="监控设备维护记录" name="监控设备维护记录">
       <maintenance-record v-if="activeName === '监控设备维护记录'" />
     </el-tab-pane>
   </el-tabs>
diff --git a/src/views/home/pipeline/index.vue b/src/views/home/pipeline/index.vue
index 90baef0..4d66e51 100644
--- a/src/views/home/pipeline/index.vue
+++ b/src/views/home/pipeline/index.vue
@@ -254,6 +254,7 @@
     tableHeight.value = window.innerHeight - 60 - 50 - 10 - 98 - 10 - 52 - 52 - 10
   }
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -348,7 +349,7 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary">
+          <el-button v-if="proxy.hasPerm('/pipeline/export')" type="primary">
             导出
           </el-button>
         </div>
@@ -368,7 +369,7 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="80">
             <template #default="scope">
-              <el-button type="primary" link size="small" @click="editRow('detail', scope.row)">
+              <el-button v-if="proxy.hasPerm('/pipeline/detail')" type="primary" link size="small" @click="editRow('detail', scope.row)">
                 查看
               </el-button>
               <!-- <el-button type="primary" link size="small" @click="editRow('edit', scope.row)">
diff --git a/src/views/home/rule/agreement/index.vue b/src/views/home/rule/agreement/index.vue
index fd41cd3..f1cfe15 100644
--- a/src/views/home/rule/agreement/index.vue
+++ b/src/views/home/rule/agreement/index.vue
@@ -95,6 +95,7 @@
 onMounted(async () => {
   fetchData()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -119,7 +120,7 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="editRow('add', {})">
+          <el-button v-if="proxy.hasPerm('/rule/agreement/add')" type="primary" @click="editRow('add', {})">
             新建
           </el-button>
         </div>
@@ -139,10 +140,10 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="120">
             <template #default="scope">
-              <el-button type="primary" link size="small" @click="editRow('edit', scope.row)">
+              <el-button v-if="proxy.hasPerm('/rule/agreement/update')" type="primary" link size="small" @click="editRow('edit', scope.row)">
                 编辑
               </el-button>
-              <el-button type="danger" link size="small" @click="removeRow(scope.row)">
+              <el-button v-if="proxy.hasPerm('/rule/agreement/delete')" type="danger" link size="small" @click="removeRow(scope.row)">
                 删除
               </el-button>
             </template>
diff --git a/src/views/home/rule/alarm/components/alarmLevelList.vue b/src/views/home/rule/alarm/components/alarmLevelList.vue
index c8ffb7d..6c337c4 100644
--- a/src/views/home/rule/alarm/components/alarmLevelList.vue
+++ b/src/views/home/rule/alarm/components/alarmLevelList.vue
@@ -87,6 +87,7 @@
 const cancel = () => {
   dialogFormVisible.value = false
 }
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -97,7 +98,7 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="detailRow('create', {})">
+          <el-button v-if="proxy.hasPerm('/rule/alarm/level/add')" type="primary" @click="detailRow('create', {})">
             新增
           </el-button>
         </div>
@@ -117,10 +118,10 @@
         <template #columns>
           <el-table-column label="操作" width="120" align="center">
             <template #default="scope">
-              <el-button type="primary" link size="small" @click="detailRow('edit', scope.row)">
+              <el-button v-if="proxy.hasPerm('/rule/alarm/level/update')" type="primary" link size="small" @click="detailRow('edit', scope.row)">
                 编辑
               </el-button>
-              <el-button type="danger" link size="small" @click="removeRow(scope.row)">
+              <el-button v-if="proxy.hasPerm('/rule/alarm/level/delete')" type="danger" link size="small" @click="removeRow(scope.row)">
                 删除
               </el-button>
             </template>
diff --git a/src/views/home/rule/alarm/components/alarmTypeList.vue b/src/views/home/rule/alarm/components/alarmTypeList.vue
index 2cbf110..aa0cfed 100644
--- a/src/views/home/rule/alarm/components/alarmTypeList.vue
+++ b/src/views/home/rule/alarm/components/alarmTypeList.vue
@@ -80,6 +80,7 @@
 const cancel = () => {
   dialogFormVisible.value = false
 }
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -90,7 +91,7 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="detailRow('create', {})">
+          <el-button v-if="proxy.hasPerm('/rule/alarm/type/add')" type="primary" @click="detailRow('create', {})">
             新增
           </el-button>
         </div>
@@ -110,10 +111,10 @@
         <template #columns>
           <el-table-column label="操作" width="120" align="center">
             <template #default="scope">
-              <el-button type="primary" link size="small" @click="detailRow('edit', scope.row)">
+              <el-button v-if="proxy.hasPerm('/rule/alarm/type/update')" type="primary" link size="small" @click="detailRow('edit', scope.row)">
                 编辑
               </el-button>
-              <el-button type="danger" link size="small" @click="removeRow(scope.row)">
+              <el-button v-if="proxy.hasPerm('/rule/alarm/type/delete')" type="danger" link size="small" @click="removeRow(scope.row)">
                 删除
               </el-button>
             </template>
diff --git a/src/views/home/rule/alarm/index.vue b/src/views/home/rule/alarm/index.vue
index 110030c..4e66a34 100644
--- a/src/views/home/rule/alarm/index.vue
+++ b/src/views/home/rule/alarm/index.vue
@@ -20,11 +20,14 @@
 // 初始展示列
 const columns = ref<any>([
   { text: '报警类型', value: 'alarmTypeName', align: 'center' },
-  { text: '报警名称', value: 'alarmName', align: 'center' },
-  { text: '报警等级', value: 'alarmLevelName', align: 'center' },
-  { text: '报警提示方式', value: 'alarmNoteMethodName', align: 'center' },
-  { text: '状态', value: 'stateName', align: 'center', width: '130' },
-  { text: '创建时间', value: 'ts', align: 'center' },
+  { text: '设备类型', value: 'typeName', align: 'center' },
+  { text: '产品', value: 'productName', align: 'center' },
+  { text: '厂商', value: 'manufacturerName', align: 'center' },
+  // { text: '报警名称', value: 'alarmName', align: 'center' },
+  { text: '报警等级', value: 'alarmLevelName', align: 'center', width: '100' },
+  { text: '报警提示方式', value: 'alarmNoteMethodName', align: 'center', width: '130', isCustom: true },
+  { text: '状态', value: 'stateName', align: 'center', width: '100', isCustom: true },
+  { text: '创建时间', value: 'ts', align: 'center', width: '200' },
 ])
 // 最终展示列
 const columnsConfig = ref([])
@@ -158,6 +161,7 @@
   await fetchDict()
   fetchData()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -191,13 +195,13 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="showAlarmType">
+          <el-button v-if="proxy.hasPerm('/rule/alarm/type')" type="primary" @click="showAlarmType">
             报警类型管理
           </el-button>
-          <el-button type="primary" @click="showAlarmLevel">
+          <el-button v-if="proxy.hasPerm('/rule/alarm/level')" type="primary" @click="showAlarmLevel">
             报警等级管理
           </el-button>
-          <el-button type="primary" @click="detailRow('create', {})">
+          <el-button v-if="proxy.hasPerm('/rule/alarm/add')" type="primary" @click="detailRow('create', {})">
             新增
           </el-button>
         </div>
@@ -214,16 +218,28 @@
             </template>
           </el-table-column>
         </template>
+        <template #isCustom="{ scope, column }">
+          <!-- 报警提示方式 -->
+          <span v-if="column.text === '报警提示方式'">
+            <el-tag v-if="scope.row.alarmNoteMethodName === '消息提醒'" type="primary">消息提醒</el-tag>
+            <el-tag v-if="scope.row.alarmNoteMethodName === '弹窗'" type="danger">弹窗提醒</el-tag>
+          </span>
+          <!-- 报警提示方式 -->
+          <span v-if="column.text === '状态'">
+            <el-tag v-if="scope.row.stateName === '启用'" type="success">启用</el-tag>
+            <el-tag v-if="scope.row.stateName === '未启用'" type="info">未启用</el-tag>
+          </span>
+        </template>
         <template #columns>
           <el-table-column label="操作" width="140" align="center">
             <template #default="scope">
-              <el-button type="primary" link size="small" @click="switchStatusRow(scope.row)">
+              <el-button v-if="proxy.hasPerm('/rule/alarm/handler')" type="primary" link size="small" @click="switchStatusRow(scope.row)">
                 {{ scope.row.state === '1' ? '停用' : '启用' }}
               </el-button>
-              <el-button type="primary" link size="small" @click="detailRow('edit', scope.row)">
+              <el-button v-if="proxy.hasPerm('/rule/alarm/update')" type="primary" link size="small" @click="detailRow('edit', scope.row)">
                 编辑
               </el-button>
-              <el-button type="danger" link size="small" @click="removeRow(scope.row)">
+              <el-button v-if="proxy.hasPerm('/rule/alarm/delete')" type="danger" link size="small" @click="removeRow(scope.row)">
                 删除
               </el-button>
             </template>
diff --git a/src/views/home/rule/special/components/editDialog.vue b/src/views/home/rule/special/components/editDialog.vue
index bb494ec..5df205b 100644
--- a/src/views/home/rule/special/components/editDialog.vue
+++ b/src/views/home/rule/special/components/editDialog.vue
@@ -8,7 +8,7 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { getDictByCode } from '@/api/system/dict'
 import { getDeviceTypeListPage } from '@/api/home/device/type'
-import { getAlarmLevelListPage, getAlarmRuleListPage } from '@/api/home/rule/alarm'
+import { getAlarmLevelListPage, getAlarmTypeListPage } from '@/api/home/rule/alarm'
 import { addSpecialAlarmRule, editSpecialAlarmRule } from '@/api/home/rule/special'
 import { getDeviceListPage } from '@/api/home/device/device'
 import { getProductListPage } from '@/api/home/device/product'
@@ -57,13 +57,15 @@
 }
 const list = ref<any[]>([])
 const columns = ref<any>([
-  { text: '报警规则', value: 'alarmRule', align: 'center', type: 'select', code: 'alarm-rule', required: true },
+  { text: '报警类型', value: 'alarmTypeId', align: 'center', type: 'select', code: 'alarm-rule', required: true },
   { text: '报警等级', value: 'alarmLevelId', align: 'center', type: 'select', code: 'alarm-level', required: true },
   { text: '报警阈值', value: 'alarmThreshold', align: 'center', type: 'input', required: true },
 ])
 // 初始化对话框
+const isFirst = ref(true)
 const initDialog = (dialogStatusValue: string, row: any) => {
   dialogStatus.value = dialogStatusValue
+  isFirst.value = true
   dialogFormVisible.value = true
   if (dialogStatus.value === 'create') { // 如果是新增，清除验证
     resetForm()
@@ -83,9 +85,13 @@
         alarmRule: row.alarmRule,
         alarmLevelId: row.alarmLevelId,
         alarmThreshold: row.alarmThreshold,
+        alarmTypeId: row.alarmTypeId,
       },
     ]
   }
+  setTimeout(() => {
+    isFirst.value = false
+  })
 }
 defineExpose({
   initDialog,
@@ -143,6 +149,7 @@
 const saveData = () => {
   const data = list.value.map((item: any) => ({
     alarmLevelId: item.alarmLevelId,
+    alarmTypeId: item.alarmTypeId,
     alarmRule: item.alarmRule,
     alarmRuleName: `${item.alarmRule}[${alarmLevelList.value.filter((citem: any) => citem.id === item.alarmLevelId)[0]?.name || ''}]:${item.alarmThreshold}%LEL`,
     alarmThreshold: item.alarmThreshold,
@@ -151,7 +158,7 @@
     position: dataForm.value.position,
     tagNumber: dataForm.value.tagNumber,
     devTypeName: deviceList.value.filter((citem: any) => citem.value === dataForm.value.devcode)[0]?.name || '',
-    alarmTypeId: alarmRuleList.value.filter((citem: any) => citem.name === item.alarmRule)[0]?.alarmTypeId || '',
+    // alarmTypeId: alarmRuleList.value.filter((citem: any) => citem.name === item.alarmRule)[0]?.alarmTypeId || '',
   }))
   if (dialogStatus.value === 'edit') {
     updateData(data)
@@ -207,7 +214,7 @@
   // 设备列表
   getDeviceListPage({ offset: 1, limit: 9999 }).then((res) => {
     deviceList.value = res.data.rows.map((item: any) => ({
-      name: item.devTypeName,
+      name: item.typeName,
       id: item.id,
       value: item.devcode,
       productId: item.productId,
@@ -223,14 +230,14 @@
       }))
     })
     // 报警规则
-    getAlarmRuleListPage({ limit: 9999, offset: 1 }).then((res) => {
-      alarmRuleList.value = res.data.rows.map((item: any) => ({
-        name: item.alarmName,
-        id: item.id,
-        value: item.id,
-        alarmTypeId: item.alarmTypeId,
-      }))
-    })
+    // getAlarmRuleListPage({ limit: 9999, offset: 1 }).then((res) => {
+    //   alarmRuleList.value = res.data.rows.map((item: any) => ({
+    //     name: item.alarmName,
+    //     id: item.id,
+    //     value: item.id,
+    //     alarmTypeId: item.alarmTypeId,
+    //   }))
+    // })
     // 报警等级
     getAlarmLevelListPage({ limit: 9999, offset: 1 }).then((res) => {
       alarmLevelList.value = res.data.rows.map((item: any) => ({
@@ -247,11 +254,26 @@
 watch(() => dataForm.value.devcode, (newVal) => {
   if (newVal) {
     const current = deviceList.value.filter((item: any) => item.value === dataForm.value.devcode)
+    console.log(current, 'current')
     if (current.length) {
       dataForm.value.productId = current[0].productId
       dataForm.value.tagNumber = current[0].tagNumber
       dataForm.value.position = current[0].position
+      // 根据设备类型寻找报警类型
+      getAlarmTypeListPage({ limit: 9999, offset: 1 }).then((res) => {
+        alarmRuleList.value = res.data.rows.filter((item: any) => item.deviceTypeName.includes(current[0].name)).map((item: any) => ({
+          name: item.alarmType,
+          id: item.id,
+          value: item.id,
+          // alarmTypeId: item.id,
+        }))
+      })
     }
+    if (isFirst.value) {
+      return
+    }
+    alarmRuleList.value = []
+    list.value = []
   }
 }, {
   deep: true,
@@ -330,12 +352,12 @@
                         <!-- 报警规则 -->
                         <template v-if="item.type === 'select' && item.code === 'alarm-rule'">
                           <el-select
-                            v-model.trim="scope.row[item.value]" placeholder="报警规则" style="width: 100%;"
+                            v-model.trim="scope.row[item.value]" placeholder="报警类型" style="width: 100%;"
                             clearable filterable :disabled="!scope.row.edit"
                           >
                             <el-option
                               v-for="item in alarmRuleList" :key="item.id" :label="item.name"
-                              :value="item.name"
+                              :value="item.id"
                             />
                           </el-select>
                         </template>
diff --git a/src/views/home/rule/special/index.vue b/src/views/home/rule/special/index.vue
index 5c7b67c..7209dfa 100644
--- a/src/views/home/rule/special/index.vue
+++ b/src/views/home/rule/special/index.vue
@@ -99,6 +99,7 @@
   await fetchDict()
   fetchData()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -127,7 +128,7 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="detail('create', {})">
+          <el-button v-if="proxy.hasPerm('/rule/special/add')" type="primary" @click="detail('create', {})">
             新增
           </el-button>
         </div>
@@ -147,13 +148,13 @@
         <template #columns>
           <el-table-column label="操作" width="140" align="center">
             <template #default="scope">
-              <el-button type="primary" link size="small" @click="detail('detail', scope.row)">
+              <el-button v-if="proxy.hasPerm('/rule/special/detail')" type="primary" link size="small" @click="detail('detail', scope.row)">
                 查看
               </el-button>
-              <el-button type="primary" link size="small" @click="detail('edit', scope.row)">
+              <el-button v-if="proxy.hasPerm('/rule/special/update')" type="primary" link size="small" @click="detail('edit', scope.row)">
                 编辑
               </el-button>
-              <el-button type="danger" link size="small" @click="removeRow(scope.row)">
+              <el-button v-if="proxy.hasPerm('/rule/special/delete')" type="danger" link size="small" @click="removeRow(scope.row)">
                 删除
               </el-button>
             </template>
diff --git a/src/views/home/station/control/index.vue b/src/views/home/station/control/index.vue
index 4510922..6657c5d 100644
--- a/src/views/home/station/control/index.vue
+++ b/src/views/home/station/control/index.vue
@@ -71,6 +71,7 @@
     },
   ]
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -114,7 +115,7 @@
               </div>
             </div>
             <div class="right1">
-              <el-card shadow="always">
+              <el-card v-if="proxy.hasPerm('/station/control/video')" shadow="always">
                 <template #header>
                   <div class="clearfix">
                     <div>云台控制</div>

diff --git a/src/App.vue b/src/App.vue
index cde81b3..8a00f5d 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -125,7 +125,7 @@
         '--g-sub-sidebar-actual-width': subSidebarActualWidth,
       }"
     />
-    <system-info v-if="browserType !== 'mobile'" />
+    <!-- <system-info v-if="browserType !== 'mobile'" /> -->
     <audio id="eventAudio" src="" autoplay />
   </el-config-provider>
 </template>
diff --git a/src/layouts/components/Tools/alarmDialog.vue b/src/layouts/components/Tools/alarmDialog.vue
index 1828375..df89ab8 100644
--- a/src/layouts/components/Tools/alarmDialog.vue
+++ b/src/layouts/components/Tools/alarmDialog.vue
@@ -116,7 +116,7 @@
     </div>
     <template #footer>
       <div class="dialog-footer">
-        <div class="btn" @click="detail">
+        <div v-if="proxy.hasPerm('/alarm/current')" class="btn" @click="detail">
           查看
         </div>
         <div v-if="info.isSound === '1'" class="btn" @click="closeSound">
diff --git a/src/layouts/components/Tools/alarmList.vue b/src/layouts/components/Tools/alarmList.vue
index c3a9d2a..5356b74 100644
--- a/src/layouts/components/Tools/alarmList.vue
+++ b/src/layouts/components/Tools/alarmList.vue
@@ -54,6 +54,7 @@
 }
 // 查看当前行
 const detailRow = (row: any) => {
+  if (!proxy.hasPerm('/alarm/current')) { return }
   $router.push({
     name: 'AlarmCurrent',
     query: {
@@ -77,21 +78,6 @@
   localStorage.setItem('eventAudio', 'pause')
 }
 const dialogRef = ref()
-// const dialog = () => {
-//   const row = {
-//     alarmNoteMethod: '1', // 消息提醒 1:弹窗，2:消息提醒
-//     isSound: '1', // 报警音效，1:开，0:关
-//     isSend: '1', // 报警推送，1:开，0:关
-//     isText: '1', // 报警短息，1:开，0:关
-//     alarmType: '浓度超限',
-//     tagNumber: 'NX5702',
-//     alarmTime: '2024-09-09',
-//     value: '20',
-//     typeName: '燃气智能终端',
-//     alarmLevel: '一级',
-//   }
-//   dialogRef.value.initDialog(row)
-// }
 const fetchData = (isLoading = false) => {
   loading.value = true
   if (isLoading) {
@@ -115,7 +101,10 @@
       dialogRef.value.initDialog(newVal)
     }
     if (newVal.isSound === '1') {
-      play()
+      // play()
+      if (!localStorage.getItem('eventAudio')) {
+        proxy.playAudio()
+      }
     }
     fetchData(false)
   }
@@ -146,6 +135,7 @@
 //     window.localStorage.removeItem('token')
 //   }
 // }
+// const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -180,7 +170,7 @@
                   {{ message.processStatus
                     === '未读' ? '未读' : '已读' }}
                 </el-tag>
-                <el-tag type="info" size="small" style="margin-left: 5px;">
+                <el-tag type="info" size="small" style="margin-left: 5px;" @click="detailRow(message)">
                   查看
                 </el-tag>
               </div>
@@ -214,7 +204,7 @@
       <!-- <div class="close" @click="dialog">
         弹窗
       </div> -->
-      <div class="more" @click="moreList">
+      <div v-if="proxy.hasPerm('/alarm/current')" class="more" @click="moreList">
         查看更多
       </div>
     </div>
diff --git a/src/layouts/components/Tools/index.vue b/src/layouts/components/Tools/index.vue
index 9f2d41f..61f9707 100644
--- a/src/layouts/components/Tools/index.vue
+++ b/src/layouts/components/Tools/index.vue
@@ -79,6 +79,7 @@
   // 断开 websocket
   // websocket.destroyWebSocket()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -89,18 +90,18 @@
           <svg-icon name="ep:search" />
         </el-icon>
       </span>
-      <span class="item" @click="board">
+      <span v-if="proxy.hasPerm('/fullscreen')" class="item" @click="board">
         <el-icon>
           <svg-icon name="ep:data-line" />
         </el-icon>
       </span>
-      <span v-if="settingsStore.mode === 'pc' && settingsStore.toolbar.enableFullscreen" class="item" @click="toggle">
+      <span class="item" @click="toggle">
         <el-icon>
           <svg-icon :name="isFullscreen ? 'fullscreen-exit' : 'fullscreen'" />
         </el-icon>
       </span>
       <!-- 报警信息列表 -->
-      <span class="item">
+      <span v-if="proxy.hasPerm('/alarmnotice')" class="item">
         <el-popover width="390">
           <template #reference>
             <div>
diff --git a/src/layouts/components/Topbar/index.vue b/src/layouts/components/Topbar/index.vue
index 2863cef..4e3120e 100644
--- a/src/layouts/components/Topbar/index.vue
+++ b/src/layouts/components/Topbar/index.vue
@@ -67,7 +67,7 @@
           </transition-group>
         </el-breadcrumb>
       </div>
-      <tools />
+      <!-- <tools /> -->
     </div>
   </div>
 </template>
diff --git a/src/router/modules/pc.ts b/src/router/modules/pc.ts
index aacd6fa..97ced45 100644
--- a/src/router/modules/pc.ts
+++ b/src/router/modules/pc.ts
@@ -40,7 +40,7 @@
       icon: 'ep:key',
       sidebar: false,
       breadcrumb: false,
-      // auth: '/fullscreen',
+      auth: '/fullscreen',
     },
   },
   {
@@ -155,7 +155,7 @@
           sidebar: false,
           breadcrumb: false,
           activeMenu: '/well',
-          auth: '/well/detail',
+          auth: '/well',
         },
       },
     ],
diff --git a/src/views/home/alarm/count/components/locationAnalysis.vue b/src/views/home/alarm/count/components/locationAnalysis.vue
index fc75b9e..bff1853 100644
--- a/src/views/home/alarm/count/components/locationAnalysis.vue
+++ b/src/views/home/alarm/count/components/locationAnalysis.vue
@@ -46,6 +46,7 @@
   })
 }
 fetchData()
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -75,6 +76,9 @@
         <el-button type="primary" style="margin: 0 5px;" @click="fetchData">
           搜索
         </el-button>
+        <el-button v-if="proxy.hasPerm('/alarm/count/exportLocation')" type="primary" style="margin: 0 5px;">
+          导出
+        </el-button>
       </div>
     </template>
     <template #content>
diff --git a/src/views/home/alarm/current/components/detail.vue b/src/views/home/alarm/current/components/detail.vue
index dd3b31a..4204c92 100644
--- a/src/views/home/alarm/current/components/detail.vue
+++ b/src/views/home/alarm/current/components/detail.vue
@@ -111,7 +111,7 @@
   const res2 = await getAlarmTypeListPage({ offset: 1, limit: 9999 });
   ($route.query.type === 'history' ? getAlarmDetail : getAlarmDetail)($route.query.id as string).then((res) => {
     detailInfo.value = toHumpObject(res.data)
-    detailInfo.value.realAlarmName = detailInfo.value.realAlarm === '1' ? '报警' : '误报'
+    detailInfo.value.realAlarmName = detailInfo.value.realAlarm === '0' ? '是' : '否'
     detailInfo.value.alarmTypeName = res2.data.rows.filter((item: any) => item.id === detailInfo.value.alarmTypeId)[0]?.alarmType || ''
     detailInfo.value.alarmLevelName = res1.data.rows.filter((item: any) => item.id === detailInfo.value.alarmLevel)[0]?.alarmLevel || ''
     detailInfo.value.duration = detailInfo.value.ts && detailInfo.value.cancelTime ? getDateDiff(detailInfo.value.ts, detailInfo.value.cancelTime) : ''
@@ -139,6 +139,7 @@
 }
 // 点击经纬度展示地图
 const mapRef = ref()
+const { proxy } = getCurrentInstance() as any
 const showMap = (data: any) => {
   console.log(data, 'data')
   if (data.text === '位置') {
@@ -148,6 +149,13 @@
         2: 'StationMonitorDetail',
         3: 'PipelineMonitorDetail',
       } as { [key: string]: string }
+      // 判断是否有菜单权限
+      const watchObjectAuth = {
+        1: '/well',
+        2: '/station/monitor',
+        3: '/pipeline',
+      } as { [key: string]: string }
+      if (!proxy.hasPerm(watchObjectAuth[detailInfo.value.watchObject])) { return }
       $router.push({
         name: watchObject[detailInfo.value.watchObject],
         query: {
diff --git a/src/views/home/alarm/current/components/detailInfoDialog.vue b/src/views/home/alarm/current/components/detailInfoDialog.vue
index c089449..7fbf06b 100644
--- a/src/views/home/alarm/current/components/detailInfoDialog.vue
+++ b/src/views/home/alarm/current/components/detailInfoDialog.vue
@@ -114,6 +114,7 @@
   })
 }
 defineExpose({ initDialog, close })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -131,7 +132,7 @@
     <!-- 头部 -->
     <div class="header">
       <span>{{ info.alarmContent }}</span>
-      <span class="more" @click="moreData">>>更多</span>
+      <span v-if="proxy.hasPerm(type === 'data' ? '/alarm/current/more' : '/alarm/device/more')" class="more" @click="moreData">>>更多</span>
     </div>
     <div class="content">
       <div v-show="type === 'device'" class="item">
@@ -162,7 +163,7 @@
         报警设备:
         <span style="padding-left: 6px;">{{ info.devcode }} </span>
         <el-button
-          v-if="info.devTypeName === '燃气智能监测终端' || info.devTypeName === '液位检测仪' || info.devTypeName === '井盖监测仪'"
+          v-if="(info.devTypeName === '燃气智能监测终端' || info.devTypeName === '液位检测仪' || info.devTypeName === '井盖监测仪') && proxy.hasPerm('/alarm/current/data')"
           size="small" style="margin-left: 6px;" @click="viewData"
         >
           查看数据
@@ -228,7 +229,7 @@
         <span style="padding-left: 6px;">
           {{ info.confirmContent }}
         </span>
-        <el-button v-if="type === 'data'" size="small" style="padding-left: 6px;" @click="viewProcess">
+        <el-button v-if="type === 'data' && proxy.hasPerm('/alarm/current/process')" size="small" style="padding-left: 6px;" @click="viewProcess">
           流程图
         </el-button>
       </div>
@@ -246,17 +247,17 @@
       </div>
     </div>
     <div class="footer">
-      <el-button v-if="Number(info.processStatus) < 4 && type === 'data'" size="small" @click="remind">
+      <el-button v-if="(Number(info.processStatus) < 4 && type === 'data') && proxy.hasPerm('/alarm/current/remind')" size="small" @click="remind">
         提醒责任人
       </el-button>
       <el-button
-        v-if="type === 'device' && (info.processStatusName === '待处置' || info.processStatusName === '挂起')"
+        v-if="(type === 'device' && (info.processStatusName === '待处置' || info.processStatusName === '挂起')) && proxy.hasPerm('/alarm/device/handler')"
         size="small" @click="handler"
       >
         报警处置
       </el-button>
       <el-button
-        v-if="Number(info.processStatus) <= 3 || (type === 'device' && info.processStatusName === '待处置') || info.processStatusName === '挂起'"
+        v-if="(Number(info.processStatus) <= 3 || (type === 'device' && info.processStatusName === '待处置') || info.processStatusName === '挂起') && proxy.hasPerm(type === 'device' ? '/alarm/device/pending' : '/alarm/current/pending')"
         type="primary" size="small" @click="pending"
       >
         挂起
diff --git a/src/views/home/alarm/current/index.vue b/src/views/home/alarm/current/index.vue
index d019bbf..e2714bb 100644
--- a/src/views/home/alarm/current/index.vue
+++ b/src/views/home/alarm/current/index.vue
@@ -4,6 +4,7 @@
   Date: 2023-06-28
  -->
 <script lang="ts" setup name="CurrentAlarm">
+import dayjs from 'dayjs'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import { ArrowLeftBold, ArrowRightBold } from '@element-plus/icons-vue'
 import MapCom from './components/map.vue'
@@ -100,6 +101,7 @@
       path: '/alarm/current',
     })
   }
+  datetimerange.value = []
   listQuery.value = {
     limit: 20,
     offset: 1,
@@ -131,8 +133,8 @@
   if ($route.query.row) {
     loadingTable.value = true
     const row = JSON.parse($route.query.row as string)
-    getCurrentAlarmListPage({ offset: 1, limit: 99999 }).then((res) => {
-      const data = res.data.rows.filter((item: any) => item.id === row.id)
+    getCurrentAlarmListPage({ offset: 1, limit: 50 }).then((res) => {
+      const data = res.data.rows.filter((item: any) => item.id === row.alarmId)
       if (data.length) {
         list1.value = data.map((item: any) => ({
           ...item,
@@ -153,7 +155,10 @@
     })
     return
   }
-  fetchData()
+  datetimerange.value = [dayjs().subtract(7, 'day').format('YYYY-MM-DD HH:mm:ss'), dayjs().format('YYYY-MM-DD HH:mm:ss')]
+  setTimeout(() => {
+    fetchData()
+  })
 })
 // 表格标识  地图或普通
 const tableFlag = ref('normal')
@@ -181,6 +186,10 @@
 const mapRef = ref()
 const mapData = ref({})
 async function detail(row: any) {
+  if (row.processStatusName === '未读') {
+    list1.value[list1.value.findIndex((item: any) => item.id === row.id)].processStatusName = '已读'
+    row.processStatusName = '已读'
+  }
   const res = await detailAlarm(row.id)
   const data = toHumpObject(res.data)
   mapData.value = row
@@ -362,7 +371,7 @@
               <el-button v-if="proxy.hasPerm('/alarm/current/delete')" type="primary" @click="batchDeleteRow">
                 批量删除
               </el-button>
-              <el-button type="primary" @click="exportList">
+              <el-button v-if="proxy.hasPerm('/alarm/current/export')" type="primary" @click="exportList">
                 导出
               </el-button>
             </div>
@@ -383,7 +392,7 @@
               </el-table-column>
             </template>
             <template #columns>
-              <el-table-column label="操作" align="center" width="80">
+              <el-table-column v-if="proxy.hasPerm('/alarm/current/detail')" label="操作" align="center" width="80">
                 <template #default="scope">
                   <el-button type="primary" link size="small" @click="detail(scope.row)">
                     查看
diff --git a/src/views/home/alarm/history/index.vue b/src/views/home/alarm/history/index.vue
index eeb49fc..3c810c3 100644
--- a/src/views/home/alarm/history/index.vue
+++ b/src/views/home/alarm/history/index.vue
@@ -97,6 +97,7 @@
 }
 // 重置查询条件f
 const reset = () => {
+  datetimerange.value = []
   listQuery.value = {
     limit: 20,
     offset: 1,
@@ -189,6 +190,7 @@
   })
 }
 fetchDict()
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -249,7 +251,7 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="exportList">
+          <el-button v-if="proxy.hasPerm('/alarm/history/export')" type="primary" @click="exportList">
             导出
           </el-button>
         </div>
@@ -272,7 +274,7 @@
           </el-table-column>
         </template>
         <template #columns>
-          <el-table-column label="操作" align="center" width="80">
+          <el-table-column v-if="proxy.hasPerm('/alarm/history/detail')" label="操作" align="center" width="80">
             <template #default="scope">
               <el-button type="primary" link size="small" @click="moreData(scope.row)">
                 查看
diff --git a/src/views/home/dashboard/index.vue b/src/views/home/dashboard/index.vue
index d2f7e3c..42dfbed 100644
--- a/src/views/home/dashboard/index.vue
+++ b/src/views/home/dashboard/index.vue
@@ -42,7 +42,7 @@
     value: '0',
     name: '在线',
     unit: '个',
-    id: '1',
+    id: '1,2',
   },
   {
     img: img.lixian,
@@ -56,7 +56,7 @@
     value: '0',
     name: '停用',
     unit: '个',
-    id: '2',
+    id: '3',
   },
 ])
 // 工作台数据
@@ -133,7 +133,11 @@
   deviceOperationLoading.value = true
   getDeviceStatus().then((res) => {
     res.data.forEach((element: any) => {
-      const index = deviceOperationData.value.findIndex((item: any) => item.id === element.name)
+      if (element.name === '1' || element.name === '2') {
+        deviceOperationData.value[0].value = Number(deviceOperationData.value[0].value || '0') + Number(element.value)
+        return
+      }
+      const index = deviceOperationData.value.findIndex((item: any) => item.id.includes(element.name))
       if (index !== -1) {
         deviceOperationData.value[index].value = element.value
       }
diff --git a/src/views/home/device/count/components/bottom.vue b/src/views/home/device/count/components/bottom.vue
index 28a4d78..e4e56fa 100644
--- a/src/views/home/device/count/components/bottom.vue
+++ b/src/views/home/device/count/components/bottom.vue
@@ -110,6 +110,7 @@
   })
 }
 fetchDict()
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -148,7 +149,7 @@
             <template #btns-right>
               <!-- 操作 -->
               <div>
-                <el-button type="primary">
+                <el-button v-if="proxy.hasPerm('/device/count/offline/export')" type="primary">
                   导出
                 </el-button>
               </div>
diff --git a/src/views/home/device/device/index.vue b/src/views/home/device/device/index.vue
index c3970b9..9cdd606 100644
--- a/src/views/home/device/device/index.vue
+++ b/src/views/home/device/device/index.vue
@@ -88,6 +88,7 @@
 }
 // 重置查询条件f
 const reset = () => {
+  datetimerange.value = []
   listQuery.value = {
     limit: 20,
     offset: 1,
@@ -296,6 +297,7 @@
   fetchDict()
   fetchData()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -372,17 +374,17 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="editRow('add', {})">
+          <el-button v-if="proxy.hasPerm('/device/manage/add')" type="primary" @click="editRow('add', {})">
             新建
           </el-button>
-          <el-button type="primary" @click="downloadTemplate">
+          <el-button v-if="proxy.hasPerm('/device/manage/down')" type="primary" @click="downloadTemplate">
             模板下载
           </el-button>
-          <el-button type="primary" @click="importList">
+          <el-button v-if="proxy.hasPerm('/device/manage/import')" type="primary" @click="importList">
             批量导入
           </el-button>
-          <el-button type="primary" @click="exportList">
-            导出列表
+          <el-button v-if="proxy.hasPerm('/device/manage/export')" type="primary" @click="exportList">
+            导出
           </el-button>
           <input ref="fileRef" style="display: none;" type="file" accept=".xls,.xlsx" @change="onFileChange">
         </div>
@@ -409,16 +411,16 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="150">
             <template #default="scope">
-              <el-button type="primary" link size="small" @click="editRow('detail', scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/manage/detail')" type="primary" link size="small" @click="editRow('detail', scope.row)">
                 查看
               </el-button>
-              <el-button type="primary" link size="small" @click="editRow('edit', scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/manage/update')" type="primary" link size="small" @click="editRow('edit', scope.row)">
                 编辑
               </el-button>
-              <el-button type="danger" link size="small" @click="changeDefense(scope.row)">
+              <!-- <el-button v-if="proxy.hasPerm('/device/manage/add')" type="danger" link size="small" @click="changeDefense(scope.row)">
                 撤防
-              </el-button>
-              <el-button type="danger" link size="small" @click="removeRow(scope.row)">
+              </el-button> -->
+              <el-button v-if="proxy.hasPerm('/device/manage/delete')" type="danger" link size="small" @click="removeRow(scope.row)">
                 删除
               </el-button>
             </template>
diff --git a/src/views/home/device/instruction/index.vue b/src/views/home/device/instruction/index.vue
index 1e598ed..1da6706 100644
--- a/src/views/home/device/instruction/index.vue
+++ b/src/views/home/device/instruction/index.vue
@@ -78,6 +78,7 @@
 }
 // 重置查询条件f
 const reset = () => {
+  datetimerange.value = []
   listQuery.value = {
     limit: 20,
     offset: 1,
@@ -158,6 +159,7 @@
     editRef.value.initDialog('addOther', {})
   }
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -213,10 +215,10 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary">
+          <el-button v-if="proxy.hasPerm('/device/instruction/batch')" type="primary">
             批量下发
           </el-button>
-          <el-button type="primary" @click="editRow('add', {})">
+          <el-button v-if="proxy.hasPerm('/device/instruction/add')" type="primary" @click="editRow('add', {})">
             新建
           </el-button>
         </div>
@@ -236,13 +238,13 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="120">
             <template #default="scope">
-              <el-button type="primary" link size="small" @click="editRow('detail', scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/instruction/detail')" type="primary" link size="small" @click="editRow('detail', scope.row)">
                 查看
               </el-button>
-              <el-button v-if="scope.row.status === '2'" type="primary" link size="small" @click="editRow('edit', scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/instruction/again') && scope.row.status === '2'" type="primary" link size="small" @click="editRow('edit', scope.row)">
                 重新下发
               </el-button>
-              <el-button type="danger" link size="small" @click="removeRow(scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/instruction/delete')" type="danger" link size="small" @click="removeRow(scope.row)">
                 删除
               </el-button>
             </template>
diff --git a/src/views/home/device/product/index.vue b/src/views/home/device/product/index.vue
index 799fc90..fdd5463 100644
--- a/src/views/home/device/product/index.vue
+++ b/src/views/home/device/product/index.vue
@@ -128,6 +128,7 @@
   await fetchDict()
   fetchData()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -164,7 +165,7 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="editRow('add', {})">
+          <el-button v-if="proxy.hasPerm('/device/product/add')" type="primary" @click="editRow('add', {})">
             新建
           </el-button>
         </div>
@@ -184,10 +185,10 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="120">
             <template #default="scope">
-              <el-button type="primary" link size="small" @click="editRow('edit', scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/product/update')" type="primary" link size="small" @click="editRow('edit', scope.row)">
                 编辑
               </el-button>
-              <el-button type="danger" link size="small" @click="removeRow(scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/product/delete')" type="danger" link size="small" @click="removeRow(scope.row)">
                 删除
               </el-button>
             </template>
diff --git a/src/views/home/device/type/index.vue b/src/views/home/device/type/index.vue
index 59f1343..2344e57 100644
--- a/src/views/home/device/type/index.vue
+++ b/src/views/home/device/type/index.vue
@@ -105,6 +105,7 @@
   await fetchDict()
   fetchData()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -131,7 +132,7 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="editRow('add', {})">
+          <el-button v-if="proxy.hasPerm('/device/type/add')" type="primary" @click="editRow('add', {})">
             新建
           </el-button>
         </div>
@@ -151,10 +152,10 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="120">
             <template #default="scope">
-              <el-button type="primary" link size="small" @click="editRow('edit', scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/type/update')" type="primary" link size="small" @click="editRow('edit', scope.row)">
                 编辑
               </el-button>
-              <el-button type="danger" link size="small" @click="removeRow(scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/type/delete')" type="danger" link size="small" @click="removeRow(scope.row)">
                 删除
               </el-button>
             </template>
diff --git a/src/views/home/ledger/ledger/components/gridList.vue b/src/views/home/ledger/ledger/components/gridList.vue
index d03cd9f..189edef 100644
--- a/src/views/home/ledger/ledger/components/gridList.vue
+++ b/src/views/home/ledger/ledger/components/gridList.vue
@@ -91,6 +91,7 @@
     // })
   })
 }
+const { proxy } = getCurrentInstance() as any
 // 同步日志
 const allSync = () => {
   $router.push({
@@ -139,10 +140,10 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="allSync">
+          <el-button v-if="proxy.hasPerm('/ledger/sync')" type="primary" @click="allSync">
             同步日志
           </el-button>
-          <el-button type="primary" @click="sync('all', {})">
+          <el-button v-if="proxy.hasPerm('/ledger/sync/all')" type="primary" @click="sync('all', {})">
             全量同步
           </el-button>
         </div>
@@ -160,9 +161,9 @@
           </el-table-column>
         </template>
         <template #columns>
-          <el-table-column label="操作" align="center" width="80">
+          <el-table-column v-if="proxy.hasPerm('/ledger/sync/single')" label="操作" align="center" width="80">
             <template #default="scope">
-              <el-button type="primary" link size="small" @click="sync('single', scope.row)">
+              <el-button v-if="proxy.hasPerm('/ledger/sync/single')" type="primary" link size="small" @click="sync('single', scope.row)">
                 同步
               </el-button>
             </template>
diff --git a/src/views/home/ledger/ledger/components/wellList.vue b/src/views/home/ledger/ledger/components/wellList.vue
index 9eb1f43..06f855a 100644
--- a/src/views/home/ledger/ledger/components/wellList.vue
+++ b/src/views/home/ledger/ledger/components/wellList.vue
@@ -123,6 +123,7 @@
   // await fetchDict()
   fetchData()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -159,11 +160,11 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="allSync">
+          <el-button v-if="proxy.hasPerm('/ledger/sync')" type="primary" @click="allSync">
             同步日志
           </el-button>
-          <el-button type="primary" @click="sync('all', {})">
-            全部同步
+          <el-button v-if="proxy.hasPerm('/ledger/sync/all')" type="primary" @click="sync('all', {})">
+            全量同步
           </el-button>
         </div>
       </template>
@@ -180,9 +181,9 @@
           </el-table-column>
         </template>
         <template #columns>
-          <el-table-column label="操作" align="center" width="80">
+          <el-table-column v-if="proxy.hasPerm('/ledger/sync/single')" label="操作" align="center" width="80">
             <template #default="scope">
-              <el-button type="primary" link size="small" @click="sync('single', scope.row)">
+              <el-button v-if="proxy.hasPerm('/ledger/sync/single')" type="primary" link size="small" @click="sync('single', scope.row)">
                 同步
               </el-button>
             </template>
diff --git a/src/views/home/ledger/ledger/index.vue b/src/views/home/ledger/ledger/index.vue
index a03aa12..8403fc5 100644
--- a/src/views/home/ledger/ledger/index.vue
+++ b/src/views/home/ledger/ledger/index.vue
@@ -7,7 +7,16 @@
 import type { TabsPaneContext } from 'element-plus'
 import wellList from './components/wellList.vue'
 import gridList from './components/gridList.vue'
-const activeName = ref('闸井')
+const { proxy } = getCurrentInstance() as any
+const activeName = ref(
+  proxy.hasPerm('/ledger/manage/well')
+    ? '闸井'
+    : proxy.hasPerm('/ledger/manage/station')
+      ? '场站'
+      : proxy.hasPerm('/ledger/manage/grid')
+        ? '网格'
+        : '',
+)
 const handleClick = (tab: TabsPaneContext, event: Event) => {
   // console.log(tab, event)
 }
@@ -17,13 +26,13 @@
   <!-- 布局 -->
   <app-container>
     <el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick">
-      <el-tab-pane label="闸井" name="闸井">
+      <el-tab-pane v-if="proxy.hasPerm('/ledger/manage/well')" label="闸井" name="闸井">
         <well-list v-if="activeName === '闸井'" type="1" />
       </el-tab-pane>
-      <el-tab-pane label="场站" name="场站">
+      <el-tab-pane v-if="proxy.hasPerm('/ledger/manage/station')" label="场站" name="场站">
         <well-list v-if="activeName === '场站'" type="2" />
       </el-tab-pane>
-      <el-tab-pane label="网格" name="网格">
+      <el-tab-pane v-if="proxy.hasPerm('/ledger/manage/grid')" label="网格" name="网格">
         <grid-list v-if="activeName === '网格'" />
       </el-tab-pane>
     </el-tabs>
diff --git a/src/views/home/ledger/pipeline/index.vue b/src/views/home/ledger/pipeline/index.vue
index e0d2512..01e95ac 100644
--- a/src/views/home/ledger/pipeline/index.vue
+++ b/src/views/home/ledger/pipeline/index.vue
@@ -160,6 +160,7 @@
 onMounted(async () => {
   fetchData()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -222,13 +223,13 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="editRow('add', {})">
+          <el-button v-if="proxy.hasPerm('/ledger/pipeline/add')" type="primary" @click="editRow('add', {})">
             新增
           </el-button>
-          <el-button type="primary" @click="importList">
+          <el-button v-if="proxy.hasPerm('/ledger/pipeline/import')" type="primary" @click="importList">
             批量导入
           </el-button>
-          <el-button type="primary" @click="exportList">
+          <el-button v-if="proxy.hasPerm('/ledger/pipeline/export')" type="primary" @click="exportList">
             批量导出
           </el-button>
         </div>
@@ -248,10 +249,10 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="100">
             <template #default="scope">
-              <el-button type="primary" link size="small" @click="editRow('edit', scope.row)">
+              <el-button v-if="proxy.hasPerm('/ledger/pipeline/update')" type="primary" link size="small" @click="editRow('edit', scope.row)">
                 编辑
               </el-button>
-              <el-button type="danger" link size="small" @click="removeRow(scope.row)">
+              <el-button v-if="proxy.hasPerm('/ledger/pipeline/delete')" type="danger" link size="small" @click="removeRow(scope.row)">
                 删除
               </el-button>
             </template>
diff --git a/src/views/home/ledger/sync/index.vue b/src/views/home/ledger/sync/index.vue
index 54a3218..a04bad9 100644
--- a/src/views/home/ledger/sync/index.vue
+++ b/src/views/home/ledger/sync/index.vue
@@ -62,6 +62,7 @@
 }
 // 重置查询条件f
 const reset = () => {
+  datetimerange.value = []
   listQuery.value = {
     limit: 20,
     offset: 1,
@@ -106,6 +107,8 @@
 onMounted(async () => {
   fetchData()
 })
+const { proxy } = getCurrentInstance() as any
+const $route = useRoute()
 </script>
 
 <template>
@@ -132,7 +135,7 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="goBak">
+          <el-button v-if="$route.type" type="primary" @click="goBak">
             返回
           </el-button>
         </div>
@@ -152,10 +155,10 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="80">
             <template #default="scope">
-              <el-button type="primary" link size="small">
+              <el-button v-if="proxy.hasPerm('/ledger/sync/detail')" type="primary" link size="small">
                 查看
               </el-button>
-              <el-button type="danger" link size="small" @click="removeRow(scope.row)">
+              <el-button v-if="proxy.hasPerm('/ledger/sync/delete')" type="danger" link size="small" @click="removeRow(scope.row)">
                 删除
               </el-button>
             </template>
diff --git a/src/views/home/monitor/service/index.vue b/src/views/home/monitor/service/index.vue
index 8df2239..570dc68 100644
--- a/src/views/home/monitor/service/index.vue
+++ b/src/views/home/monitor/service/index.vue
@@ -53,6 +53,7 @@
 onMounted(async () => {
   fetchData()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -66,7 +67,7 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary">
+          <el-button v-if="proxy.hasPerm('/monitor/service/add')" type="primary">
             新建
           </el-button>
         </div>
diff --git a/src/views/home/monitor/time/index.vue b/src/views/home/monitor/time/index.vue
index caa6d46..0f7f5a0 100644
--- a/src/views/home/monitor/time/index.vue
+++ b/src/views/home/monitor/time/index.vue
@@ -53,6 +53,7 @@
 onMounted(async () => {
   fetchData()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -66,7 +67,7 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary">
+          <el-button v-if="proxy.hasPerm('/monitor/time/add')" type="primary">
             新建
           </el-button>
         </div>
diff --git a/src/views/home/operation/alarm/components/detail.vue b/src/views/home/operation/alarm/components/detail.vue
index 8194cbd..4ae4a1f 100644
--- a/src/views/home/operation/alarm/components/detail.vue
+++ b/src/views/home/operation/alarm/components/detail.vue
@@ -151,6 +151,7 @@
 }
 // 点击经纬度展示地图
 const mapRef = ref()
+const { proxy } = getCurrentInstance() as any
 const showMap = (data: any) => {
   console.log(data, 'data')
   if (data.text === '位置') {
@@ -160,6 +161,13 @@
         2: 'StationMonitorDetail',
         3: 'PipelineMonitorDetail',
       } as { [key: string]: string }
+      // 判断是否有菜单权限
+      const watchObjectAuth = {
+        1: '/well',
+        2: '/station/monitor',
+        3: '/pipeline',
+      } as { [key: string]: string }
+      if (!proxy.hasPerm(watchObjectAuth[detailInfo.value.watchObject])) { return }
       $router.push({
         name: watchObject[detailInfo.value.watchObject],
         query: {
diff --git a/src/views/home/operation/alarm/index.vue b/src/views/home/operation/alarm/index.vue
index ac0f31b..e53c991 100644
--- a/src/views/home/operation/alarm/index.vue
+++ b/src/views/home/operation/alarm/index.vue
@@ -82,6 +82,7 @@
 }
 // 重置查询条件f
 const reset = () => {
+  datetimerange.value = []
   listQuery.value = {
     limit: 20,
     offset: 1,
@@ -315,7 +316,7 @@
               <el-button v-if="proxy.hasPerm('/alarm/device/delete')" type="primary" @click="batchDeleteRow">
                 批量删除
               </el-button>
-              <el-button type="primary" @click="exportList">
+              <el-button v-if="proxy.hasPerm('/alarm/device/export')" type="primary" @click="exportList">
                 导出
               </el-button>
             </div>
@@ -336,7 +337,7 @@
               </el-table-column>
             </template>
             <template #columns>
-              <el-table-column label="操作" align="center" width="80">
+              <el-table-column v-if="proxy.hasPerm('/alarm/device/detail')" label="操作" align="center" width="80">
                 <template #default="scope">
                   <el-button type="primary" link size="small" @click="detail(scope.row)">
                     查看
diff --git a/src/views/home/operation/history/index.vue b/src/views/home/operation/history/index.vue
index 5c04ff7..d96ac57 100644
--- a/src/views/home/operation/history/index.vue
+++ b/src/views/home/operation/history/index.vue
@@ -78,6 +78,7 @@
 }
 // 重置查询条件f
 const reset = () => {
+  datetimerange.value = []
   listQuery.value = {
     limit: 20,
     offset: 1,
@@ -161,6 +162,7 @@
     fetchData()
   })
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -218,7 +220,7 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="exportList">
+          <el-button v-if="proxy.hasPerm('/operation/history/export')" type="primary" @click="exportList">
             导出
           </el-button>
         </div>
@@ -241,7 +243,7 @@
           </el-table-column>
         </template>
         <template #columns>
-          <el-table-column label="操作" align="center" width="80">
+          <el-table-column v-if="proxy.hasPerm('/operation/history/detail')" label="操作" align="center" width="80">
             <template #default="scope">
               <el-button type="primary" link size="small" @click="detailRow(scope.row)">
                 查看
diff --git a/src/views/home/operation/manufacturer/index.vue b/src/views/home/operation/manufacturer/index.vue
index 4a5816a..5f647c3 100644
--- a/src/views/home/operation/manufacturer/index.vue
+++ b/src/views/home/operation/manufacturer/index.vue
@@ -75,6 +75,7 @@
 }
 // 重置查询条件f
 const reset = () => {
+  datetimerange.value = []
   listQuery.value = {
     limit: 20,
     offset: 1,
@@ -125,6 +126,7 @@
   await fetchDict()
   fetchData()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -178,7 +180,7 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="exportList">
+          <el-button v-if="proxy.hasPerm('/operation/manufacturer/export')" type="primary" @click="exportList">
             导出
           </el-button>
         </div>
diff --git a/src/views/home/operation/trajectory/index.vue b/src/views/home/operation/trajectory/index.vue
index 9312fd7..606958e 100644
--- a/src/views/home/operation/trajectory/index.vue
+++ b/src/views/home/operation/trajectory/index.vue
@@ -65,6 +65,7 @@
 }
 // 重置查询条件f
 const reset = () => {
+  datetimerange.value = []
   listQuery.value = {
     limit: 20,
     offset: 1,
@@ -114,6 +115,7 @@
   await fetchDict()
   fetchData()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -175,7 +177,7 @@
           </span>
         </template>
         <template #columns>
-          <el-table-column label="操作" width="80" align="center">
+          <el-table-column v-if="proxy.hasPerm('/operation/trajectory/detail')" label="操作" width="80" align="center">
             <template #default="scope">
               <el-button type="primary" link size="small" @click="detail(scope.row)">
                 查看
diff --git a/src/views/home/pipeline/components/detailData.vue b/src/views/home/pipeline/components/detailData.vue
index 80b6886..760b1c5 100644
--- a/src/views/home/pipeline/components/detailData.vue
+++ b/src/views/home/pipeline/components/detailData.vue
@@ -7,7 +7,13 @@
 import type { TabsPaneContext } from 'element-plus'
 import monitorData from './monitorDataList.vue'
 import maintenanceRecord from '@/views/home/well/components/maintenanceRecord.vue'
-const activeName = ref('监控数据')
+const { proxy } = getCurrentInstance() as any
+const activeName = ref(
+  proxy.hasPerm('/pipeline/monitor/data')
+    ? '监控数据'
+    : proxy.hasPerm('/pipeline/monitor/maintenance')
+      ? '监控设备维护记录'
+      : '')
 const handleClick = (tab: TabsPaneContext, event: Event) => {
   // console.log(tab, event)
 }
@@ -15,10 +21,10 @@
 
 <template>
   <el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick">
-    <el-tab-pane label="监控数据" name="监控数据">
+    <el-tab-pane v-if="proxy.hasPerm('/pipeline/monitor/data')" label="监控数据" name="监控数据">
       <monitor-data v-if="activeName === '监控数据'" />
     </el-tab-pane>
-    <el-tab-pane label="监控设备维护记录" name="监控设备维护记录">
+    <el-tab-pane v-if="proxy.hasPerm('/pipeline/monitor/maintenance')" label="监控设备维护记录" name="监控设备维护记录">
       <maintenance-record v-if="activeName === '监控设备维护记录'" />
     </el-tab-pane>
   </el-tabs>
diff --git a/src/views/home/pipeline/index.vue b/src/views/home/pipeline/index.vue
index 90baef0..4d66e51 100644
--- a/src/views/home/pipeline/index.vue
+++ b/src/views/home/pipeline/index.vue
@@ -254,6 +254,7 @@
     tableHeight.value = window.innerHeight - 60 - 50 - 10 - 98 - 10 - 52 - 52 - 10
   }
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -348,7 +349,7 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary">
+          <el-button v-if="proxy.hasPerm('/pipeline/export')" type="primary">
             导出
           </el-button>
         </div>
@@ -368,7 +369,7 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="80">
             <template #default="scope">
-              <el-button type="primary" link size="small" @click="editRow('detail', scope.row)">
+              <el-button v-if="proxy.hasPerm('/pipeline/detail')" type="primary" link size="small" @click="editRow('detail', scope.row)">
                 查看
               </el-button>
               <!-- <el-button type="primary" link size="small" @click="editRow('edit', scope.row)">
diff --git a/src/views/home/rule/agreement/index.vue b/src/views/home/rule/agreement/index.vue
index fd41cd3..f1cfe15 100644
--- a/src/views/home/rule/agreement/index.vue
+++ b/src/views/home/rule/agreement/index.vue
@@ -95,6 +95,7 @@
 onMounted(async () => {
   fetchData()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -119,7 +120,7 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="editRow('add', {})">
+          <el-button v-if="proxy.hasPerm('/rule/agreement/add')" type="primary" @click="editRow('add', {})">
             新建
           </el-button>
         </div>
@@ -139,10 +140,10 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="120">
             <template #default="scope">
-              <el-button type="primary" link size="small" @click="editRow('edit', scope.row)">
+              <el-button v-if="proxy.hasPerm('/rule/agreement/update')" type="primary" link size="small" @click="editRow('edit', scope.row)">
                 编辑
               </el-button>
-              <el-button type="danger" link size="small" @click="removeRow(scope.row)">
+              <el-button v-if="proxy.hasPerm('/rule/agreement/delete')" type="danger" link size="small" @click="removeRow(scope.row)">
                 删除
               </el-button>
             </template>
diff --git a/src/views/home/rule/alarm/components/alarmLevelList.vue b/src/views/home/rule/alarm/components/alarmLevelList.vue
index c8ffb7d..6c337c4 100644
--- a/src/views/home/rule/alarm/components/alarmLevelList.vue
+++ b/src/views/home/rule/alarm/components/alarmLevelList.vue
@@ -87,6 +87,7 @@
 const cancel = () => {
   dialogFormVisible.value = false
 }
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -97,7 +98,7 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="detailRow('create', {})">
+          <el-button v-if="proxy.hasPerm('/rule/alarm/level/add')" type="primary" @click="detailRow('create', {})">
             新增
           </el-button>
         </div>
@@ -117,10 +118,10 @@
         <template #columns>
           <el-table-column label="操作" width="120" align="center">
             <template #default="scope">
-              <el-button type="primary" link size="small" @click="detailRow('edit', scope.row)">
+              <el-button v-if="proxy.hasPerm('/rule/alarm/level/update')" type="primary" link size="small" @click="detailRow('edit', scope.row)">
                 编辑
               </el-button>
-              <el-button type="danger" link size="small" @click="removeRow(scope.row)">
+              <el-button v-if="proxy.hasPerm('/rule/alarm/level/delete')" type="danger" link size="small" @click="removeRow(scope.row)">
                 删除
               </el-button>
             </template>
diff --git a/src/views/home/rule/alarm/components/alarmTypeList.vue b/src/views/home/rule/alarm/components/alarmTypeList.vue
index 2cbf110..aa0cfed 100644
--- a/src/views/home/rule/alarm/components/alarmTypeList.vue
+++ b/src/views/home/rule/alarm/components/alarmTypeList.vue
@@ -80,6 +80,7 @@
 const cancel = () => {
   dialogFormVisible.value = false
 }
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -90,7 +91,7 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="detailRow('create', {})">
+          <el-button v-if="proxy.hasPerm('/rule/alarm/type/add')" type="primary" @click="detailRow('create', {})">
             新增
           </el-button>
         </div>
@@ -110,10 +111,10 @@
         <template #columns>
           <el-table-column label="操作" width="120" align="center">
             <template #default="scope">
-              <el-button type="primary" link size="small" @click="detailRow('edit', scope.row)">
+              <el-button v-if="proxy.hasPerm('/rule/alarm/type/update')" type="primary" link size="small" @click="detailRow('edit', scope.row)">
                 编辑
               </el-button>
-              <el-button type="danger" link size="small" @click="removeRow(scope.row)">
+              <el-button v-if="proxy.hasPerm('/rule/alarm/type/delete')" type="danger" link size="small" @click="removeRow(scope.row)">
                 删除
               </el-button>
             </template>
diff --git a/src/views/home/rule/alarm/index.vue b/src/views/home/rule/alarm/index.vue
index 110030c..4e66a34 100644
--- a/src/views/home/rule/alarm/index.vue
+++ b/src/views/home/rule/alarm/index.vue
@@ -20,11 +20,14 @@
 // 初始展示列
 const columns = ref<any>([
   { text: '报警类型', value: 'alarmTypeName', align: 'center' },
-  { text: '报警名称', value: 'alarmName', align: 'center' },
-  { text: '报警等级', value: 'alarmLevelName', align: 'center' },
-  { text: '报警提示方式', value: 'alarmNoteMethodName', align: 'center' },
-  { text: '状态', value: 'stateName', align: 'center', width: '130' },
-  { text: '创建时间', value: 'ts', align: 'center' },
+  { text: '设备类型', value: 'typeName', align: 'center' },
+  { text: '产品', value: 'productName', align: 'center' },
+  { text: '厂商', value: 'manufacturerName', align: 'center' },
+  // { text: '报警名称', value: 'alarmName', align: 'center' },
+  { text: '报警等级', value: 'alarmLevelName', align: 'center', width: '100' },
+  { text: '报警提示方式', value: 'alarmNoteMethodName', align: 'center', width: '130', isCustom: true },
+  { text: '状态', value: 'stateName', align: 'center', width: '100', isCustom: true },
+  { text: '创建时间', value: 'ts', align: 'center', width: '200' },
 ])
 // 最终展示列
 const columnsConfig = ref([])
@@ -158,6 +161,7 @@
   await fetchDict()
   fetchData()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -191,13 +195,13 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="showAlarmType">
+          <el-button v-if="proxy.hasPerm('/rule/alarm/type')" type="primary" @click="showAlarmType">
             报警类型管理
           </el-button>
-          <el-button type="primary" @click="showAlarmLevel">
+          <el-button v-if="proxy.hasPerm('/rule/alarm/level')" type="primary" @click="showAlarmLevel">
             报警等级管理
           </el-button>
-          <el-button type="primary" @click="detailRow('create', {})">
+          <el-button v-if="proxy.hasPerm('/rule/alarm/add')" type="primary" @click="detailRow('create', {})">
             新增
           </el-button>
         </div>
@@ -214,16 +218,28 @@
             </template>
           </el-table-column>
         </template>
+        <template #isCustom="{ scope, column }">
+          <!-- 报警提示方式 -->
+          <span v-if="column.text === '报警提示方式'">
+            <el-tag v-if="scope.row.alarmNoteMethodName === '消息提醒'" type="primary">消息提醒</el-tag>
+            <el-tag v-if="scope.row.alarmNoteMethodName === '弹窗'" type="danger">弹窗提醒</el-tag>
+          </span>
+          <!-- 报警提示方式 -->
+          <span v-if="column.text === '状态'">
+            <el-tag v-if="scope.row.stateName === '启用'" type="success">启用</el-tag>
+            <el-tag v-if="scope.row.stateName === '未启用'" type="info">未启用</el-tag>
+          </span>
+        </template>
         <template #columns>
           <el-table-column label="操作" width="140" align="center">
             <template #default="scope">
-              <el-button type="primary" link size="small" @click="switchStatusRow(scope.row)">
+              <el-button v-if="proxy.hasPerm('/rule/alarm/handler')" type="primary" link size="small" @click="switchStatusRow(scope.row)">
                 {{ scope.row.state === '1' ? '停用' : '启用' }}
               </el-button>
-              <el-button type="primary" link size="small" @click="detailRow('edit', scope.row)">
+              <el-button v-if="proxy.hasPerm('/rule/alarm/update')" type="primary" link size="small" @click="detailRow('edit', scope.row)">
                 编辑
               </el-button>
-              <el-button type="danger" link size="small" @click="removeRow(scope.row)">
+              <el-button v-if="proxy.hasPerm('/rule/alarm/delete')" type="danger" link size="small" @click="removeRow(scope.row)">
                 删除
               </el-button>
             </template>
diff --git a/src/views/home/rule/special/components/editDialog.vue b/src/views/home/rule/special/components/editDialog.vue
index bb494ec..5df205b 100644
--- a/src/views/home/rule/special/components/editDialog.vue
+++ b/src/views/home/rule/special/components/editDialog.vue
@@ -8,7 +8,7 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { getDictByCode } from '@/api/system/dict'
 import { getDeviceTypeListPage } from '@/api/home/device/type'
-import { getAlarmLevelListPage, getAlarmRuleListPage } from '@/api/home/rule/alarm'
+import { getAlarmLevelListPage, getAlarmTypeListPage } from '@/api/home/rule/alarm'
 import { addSpecialAlarmRule, editSpecialAlarmRule } from '@/api/home/rule/special'
 import { getDeviceListPage } from '@/api/home/device/device'
 import { getProductListPage } from '@/api/home/device/product'
@@ -57,13 +57,15 @@
 }
 const list = ref<any[]>([])
 const columns = ref<any>([
-  { text: '报警规则', value: 'alarmRule', align: 'center', type: 'select', code: 'alarm-rule', required: true },
+  { text: '报警类型', value: 'alarmTypeId', align: 'center', type: 'select', code: 'alarm-rule', required: true },
   { text: '报警等级', value: 'alarmLevelId', align: 'center', type: 'select', code: 'alarm-level', required: true },
   { text: '报警阈值', value: 'alarmThreshold', align: 'center', type: 'input', required: true },
 ])
 // 初始化对话框
+const isFirst = ref(true)
 const initDialog = (dialogStatusValue: string, row: any) => {
   dialogStatus.value = dialogStatusValue
+  isFirst.value = true
   dialogFormVisible.value = true
   if (dialogStatus.value === 'create') { // 如果是新增，清除验证
     resetForm()
@@ -83,9 +85,13 @@
         alarmRule: row.alarmRule,
         alarmLevelId: row.alarmLevelId,
         alarmThreshold: row.alarmThreshold,
+        alarmTypeId: row.alarmTypeId,
       },
     ]
   }
+  setTimeout(() => {
+    isFirst.value = false
+  })
 }
 defineExpose({
   initDialog,
@@ -143,6 +149,7 @@
 const saveData = () => {
   const data = list.value.map((item: any) => ({
     alarmLevelId: item.alarmLevelId,
+    alarmTypeId: item.alarmTypeId,
     alarmRule: item.alarmRule,
     alarmRuleName: `${item.alarmRule}[${alarmLevelList.value.filter((citem: any) => citem.id === item.alarmLevelId)[0]?.name || ''}]:${item.alarmThreshold}%LEL`,
     alarmThreshold: item.alarmThreshold,
@@ -151,7 +158,7 @@
     position: dataForm.value.position,
     tagNumber: dataForm.value.tagNumber,
     devTypeName: deviceList.value.filter((citem: any) => citem.value === dataForm.value.devcode)[0]?.name || '',
-    alarmTypeId: alarmRuleList.value.filter((citem: any) => citem.name === item.alarmRule)[0]?.alarmTypeId || '',
+    // alarmTypeId: alarmRuleList.value.filter((citem: any) => citem.name === item.alarmRule)[0]?.alarmTypeId || '',
   }))
   if (dialogStatus.value === 'edit') {
     updateData(data)
@@ -207,7 +214,7 @@
   // 设备列表
   getDeviceListPage({ offset: 1, limit: 9999 }).then((res) => {
     deviceList.value = res.data.rows.map((item: any) => ({
-      name: item.devTypeName,
+      name: item.typeName,
       id: item.id,
       value: item.devcode,
       productId: item.productId,
@@ -223,14 +230,14 @@
       }))
     })
     // 报警规则
-    getAlarmRuleListPage({ limit: 9999, offset: 1 }).then((res) => {
-      alarmRuleList.value = res.data.rows.map((item: any) => ({
-        name: item.alarmName,
-        id: item.id,
-        value: item.id,
-        alarmTypeId: item.alarmTypeId,
-      }))
-    })
+    // getAlarmRuleListPage({ limit: 9999, offset: 1 }).then((res) => {
+    //   alarmRuleList.value = res.data.rows.map((item: any) => ({
+    //     name: item.alarmName,
+    //     id: item.id,
+    //     value: item.id,
+    //     alarmTypeId: item.alarmTypeId,
+    //   }))
+    // })
     // 报警等级
     getAlarmLevelListPage({ limit: 9999, offset: 1 }).then((res) => {
       alarmLevelList.value = res.data.rows.map((item: any) => ({
@@ -247,11 +254,26 @@
 watch(() => dataForm.value.devcode, (newVal) => {
   if (newVal) {
     const current = deviceList.value.filter((item: any) => item.value === dataForm.value.devcode)
+    console.log(current, 'current')
     if (current.length) {
       dataForm.value.productId = current[0].productId
       dataForm.value.tagNumber = current[0].tagNumber
       dataForm.value.position = current[0].position
+      // 根据设备类型寻找报警类型
+      getAlarmTypeListPage({ limit: 9999, offset: 1 }).then((res) => {
+        alarmRuleList.value = res.data.rows.filter((item: any) => item.deviceTypeName.includes(current[0].name)).map((item: any) => ({
+          name: item.alarmType,
+          id: item.id,
+          value: item.id,
+          // alarmTypeId: item.id,
+        }))
+      })
     }
+    if (isFirst.value) {
+      return
+    }
+    alarmRuleList.value = []
+    list.value = []
   }
 }, {
   deep: true,
@@ -330,12 +352,12 @@
                         <!-- 报警规则 -->
                         <template v-if="item.type === 'select' && item.code === 'alarm-rule'">
                           <el-select
-                            v-model.trim="scope.row[item.value]" placeholder="报警规则" style="width: 100%;"
+                            v-model.trim="scope.row[item.value]" placeholder="报警类型" style="width: 100%;"
                             clearable filterable :disabled="!scope.row.edit"
                           >
                             <el-option
                               v-for="item in alarmRuleList" :key="item.id" :label="item.name"
-                              :value="item.name"
+                              :value="item.id"
                             />
                           </el-select>
                         </template>
diff --git a/src/views/home/rule/special/index.vue b/src/views/home/rule/special/index.vue
index 5c7b67c..7209dfa 100644
--- a/src/views/home/rule/special/index.vue
+++ b/src/views/home/rule/special/index.vue
@@ -99,6 +99,7 @@
   await fetchDict()
   fetchData()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -127,7 +128,7 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="detail('create', {})">
+          <el-button v-if="proxy.hasPerm('/rule/special/add')" type="primary" @click="detail('create', {})">
             新增
           </el-button>
         </div>
@@ -147,13 +148,13 @@
         <template #columns>
           <el-table-column label="操作" width="140" align="center">
             <template #default="scope">
-              <el-button type="primary" link size="small" @click="detail('detail', scope.row)">
+              <el-button v-if="proxy.hasPerm('/rule/special/detail')" type="primary" link size="small" @click="detail('detail', scope.row)">
                 查看
               </el-button>
-              <el-button type="primary" link size="small" @click="detail('edit', scope.row)">
+              <el-button v-if="proxy.hasPerm('/rule/special/update')" type="primary" link size="small" @click="detail('edit', scope.row)">
                 编辑
               </el-button>
-              <el-button type="danger" link size="small" @click="removeRow(scope.row)">
+              <el-button v-if="proxy.hasPerm('/rule/special/delete')" type="danger" link size="small" @click="removeRow(scope.row)">
                 删除
               </el-button>
             </template>
diff --git a/src/views/home/station/control/index.vue b/src/views/home/station/control/index.vue
index 4510922..6657c5d 100644
--- a/src/views/home/station/control/index.vue
+++ b/src/views/home/station/control/index.vue
@@ -71,6 +71,7 @@
     },
   ]
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -114,7 +115,7 @@
               </div>
             </div>
             <div class="right1">
-              <el-card shadow="always">
+              <el-card v-if="proxy.hasPerm('/station/control/video')" shadow="always">
                 <template #header>
                   <div class="clearfix">
                     <div>云台控制</div>
diff --git a/src/views/home/station/operation/index.vue b/src/views/home/station/operation/index.vue
index 02a5e44..d3d3d09 100644
--- a/src/views/home/station/operation/index.vue
+++ b/src/views/home/station/operation/index.vue
@@ -71,6 +71,7 @@
 }
 // 重置查询条件f
 const reset = () => {
+  datetimerange.value = []
   listQuery.value = {
     limit: 20,
     offset: 1,
@@ -121,6 +122,7 @@
   await fetchDict()
   fetchData()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -160,10 +162,10 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary">
+          <el-button v-if="proxy.hasPerm('/station/operation/add')" type="primary">
             新增
           </el-button>
-          <el-button type="primary" @click="exportList">
+          <el-button v-if="proxy.hasPerm('/station/operation/export')" type="primary" @click="exportList">
             导出
           </el-button>
         </div>

diff --git a/src/App.vue b/src/App.vue
index cde81b3..8a00f5d 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -125,7 +125,7 @@
         '--g-sub-sidebar-actual-width': subSidebarActualWidth,
       }"
     />
-    <system-info v-if="browserType !== 'mobile'" />
+    <!-- <system-info v-if="browserType !== 'mobile'" /> -->
     <audio id="eventAudio" src="" autoplay />
   </el-config-provider>
 </template>
diff --git a/src/layouts/components/Tools/alarmDialog.vue b/src/layouts/components/Tools/alarmDialog.vue
index 1828375..df89ab8 100644
--- a/src/layouts/components/Tools/alarmDialog.vue
+++ b/src/layouts/components/Tools/alarmDialog.vue
@@ -116,7 +116,7 @@
     </div>
     <template #footer>
       <div class="dialog-footer">
-        <div class="btn" @click="detail">
+        <div v-if="proxy.hasPerm('/alarm/current')" class="btn" @click="detail">
           查看
         </div>
         <div v-if="info.isSound === '1'" class="btn" @click="closeSound">
diff --git a/src/layouts/components/Tools/alarmList.vue b/src/layouts/components/Tools/alarmList.vue
index c3a9d2a..5356b74 100644
--- a/src/layouts/components/Tools/alarmList.vue
+++ b/src/layouts/components/Tools/alarmList.vue
@@ -54,6 +54,7 @@
 }
 // 查看当前行
 const detailRow = (row: any) => {
+  if (!proxy.hasPerm('/alarm/current')) { return }
   $router.push({
     name: 'AlarmCurrent',
     query: {
@@ -77,21 +78,6 @@
   localStorage.setItem('eventAudio', 'pause')
 }
 const dialogRef = ref()
-// const dialog = () => {
-//   const row = {
-//     alarmNoteMethod: '1', // 消息提醒 1:弹窗，2:消息提醒
-//     isSound: '1', // 报警音效，1:开，0:关
-//     isSend: '1', // 报警推送，1:开，0:关
-//     isText: '1', // 报警短息，1:开，0:关
-//     alarmType: '浓度超限',
-//     tagNumber: 'NX5702',
-//     alarmTime: '2024-09-09',
-//     value: '20',
-//     typeName: '燃气智能终端',
-//     alarmLevel: '一级',
-//   }
-//   dialogRef.value.initDialog(row)
-// }
 const fetchData = (isLoading = false) => {
   loading.value = true
   if (isLoading) {
@@ -115,7 +101,10 @@
       dialogRef.value.initDialog(newVal)
     }
     if (newVal.isSound === '1') {
-      play()
+      // play()
+      if (!localStorage.getItem('eventAudio')) {
+        proxy.playAudio()
+      }
     }
     fetchData(false)
   }
@@ -146,6 +135,7 @@
 //     window.localStorage.removeItem('token')
 //   }
 // }
+// const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -180,7 +170,7 @@
                   {{ message.processStatus
                     === '未读' ? '未读' : '已读' }}
                 </el-tag>
-                <el-tag type="info" size="small" style="margin-left: 5px;">
+                <el-tag type="info" size="small" style="margin-left: 5px;" @click="detailRow(message)">
                   查看
                 </el-tag>
               </div>
@@ -214,7 +204,7 @@
       <!-- <div class="close" @click="dialog">
         弹窗
       </div> -->
-      <div class="more" @click="moreList">
+      <div v-if="proxy.hasPerm('/alarm/current')" class="more" @click="moreList">
         查看更多
       </div>
     </div>
diff --git a/src/layouts/components/Tools/index.vue b/src/layouts/components/Tools/index.vue
index 9f2d41f..61f9707 100644
--- a/src/layouts/components/Tools/index.vue
+++ b/src/layouts/components/Tools/index.vue
@@ -79,6 +79,7 @@
   // 断开 websocket
   // websocket.destroyWebSocket()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -89,18 +90,18 @@
           <svg-icon name="ep:search" />
         </el-icon>
       </span>
-      <span class="item" @click="board">
+      <span v-if="proxy.hasPerm('/fullscreen')" class="item" @click="board">
         <el-icon>
           <svg-icon name="ep:data-line" />
         </el-icon>
       </span>
-      <span v-if="settingsStore.mode === 'pc' && settingsStore.toolbar.enableFullscreen" class="item" @click="toggle">
+      <span class="item" @click="toggle">
         <el-icon>
           <svg-icon :name="isFullscreen ? 'fullscreen-exit' : 'fullscreen'" />
         </el-icon>
       </span>
       <!-- 报警信息列表 -->
-      <span class="item">
+      <span v-if="proxy.hasPerm('/alarmnotice')" class="item">
         <el-popover width="390">
           <template #reference>
             <div>
diff --git a/src/layouts/components/Topbar/index.vue b/src/layouts/components/Topbar/index.vue
index 2863cef..4e3120e 100644
--- a/src/layouts/components/Topbar/index.vue
+++ b/src/layouts/components/Topbar/index.vue
@@ -67,7 +67,7 @@
           </transition-group>
         </el-breadcrumb>
       </div>
-      <tools />
+      <!-- <tools /> -->
     </div>
   </div>
 </template>
diff --git a/src/router/modules/pc.ts b/src/router/modules/pc.ts
index aacd6fa..97ced45 100644
--- a/src/router/modules/pc.ts
+++ b/src/router/modules/pc.ts
@@ -40,7 +40,7 @@
       icon: 'ep:key',
       sidebar: false,
       breadcrumb: false,
-      // auth: '/fullscreen',
+      auth: '/fullscreen',
     },
   },
   {
@@ -155,7 +155,7 @@
           sidebar: false,
           breadcrumb: false,
           activeMenu: '/well',
-          auth: '/well/detail',
+          auth: '/well',
         },
       },
     ],
diff --git a/src/views/home/alarm/count/components/locationAnalysis.vue b/src/views/home/alarm/count/components/locationAnalysis.vue
index fc75b9e..bff1853 100644
--- a/src/views/home/alarm/count/components/locationAnalysis.vue
+++ b/src/views/home/alarm/count/components/locationAnalysis.vue
@@ -46,6 +46,7 @@
   })
 }
 fetchData()
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -75,6 +76,9 @@
         <el-button type="primary" style="margin: 0 5px;" @click="fetchData">
           搜索
         </el-button>
+        <el-button v-if="proxy.hasPerm('/alarm/count/exportLocation')" type="primary" style="margin: 0 5px;">
+          导出
+        </el-button>
       </div>
     </template>
     <template #content>
diff --git a/src/views/home/alarm/current/components/detail.vue b/src/views/home/alarm/current/components/detail.vue
index dd3b31a..4204c92 100644
--- a/src/views/home/alarm/current/components/detail.vue
+++ b/src/views/home/alarm/current/components/detail.vue
@@ -111,7 +111,7 @@
   const res2 = await getAlarmTypeListPage({ offset: 1, limit: 9999 });
   ($route.query.type === 'history' ? getAlarmDetail : getAlarmDetail)($route.query.id as string).then((res) => {
     detailInfo.value = toHumpObject(res.data)
-    detailInfo.value.realAlarmName = detailInfo.value.realAlarm === '1' ? '报警' : '误报'
+    detailInfo.value.realAlarmName = detailInfo.value.realAlarm === '0' ? '是' : '否'
     detailInfo.value.alarmTypeName = res2.data.rows.filter((item: any) => item.id === detailInfo.value.alarmTypeId)[0]?.alarmType || ''
     detailInfo.value.alarmLevelName = res1.data.rows.filter((item: any) => item.id === detailInfo.value.alarmLevel)[0]?.alarmLevel || ''
     detailInfo.value.duration = detailInfo.value.ts && detailInfo.value.cancelTime ? getDateDiff(detailInfo.value.ts, detailInfo.value.cancelTime) : ''
@@ -139,6 +139,7 @@
 }
 // 点击经纬度展示地图
 const mapRef = ref()
+const { proxy } = getCurrentInstance() as any
 const showMap = (data: any) => {
   console.log(data, 'data')
   if (data.text === '位置') {
@@ -148,6 +149,13 @@
         2: 'StationMonitorDetail',
         3: 'PipelineMonitorDetail',
       } as { [key: string]: string }
+      // 判断是否有菜单权限
+      const watchObjectAuth = {
+        1: '/well',
+        2: '/station/monitor',
+        3: '/pipeline',
+      } as { [key: string]: string }
+      if (!proxy.hasPerm(watchObjectAuth[detailInfo.value.watchObject])) { return }
       $router.push({
         name: watchObject[detailInfo.value.watchObject],
         query: {
diff --git a/src/views/home/alarm/current/components/detailInfoDialog.vue b/src/views/home/alarm/current/components/detailInfoDialog.vue
index c089449..7fbf06b 100644
--- a/src/views/home/alarm/current/components/detailInfoDialog.vue
+++ b/src/views/home/alarm/current/components/detailInfoDialog.vue
@@ -114,6 +114,7 @@
   })
 }
 defineExpose({ initDialog, close })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -131,7 +132,7 @@
     <!-- 头部 -->
     <div class="header">
       <span>{{ info.alarmContent }}</span>
-      <span class="more" @click="moreData">>>更多</span>
+      <span v-if="proxy.hasPerm(type === 'data' ? '/alarm/current/more' : '/alarm/device/more')" class="more" @click="moreData">>>更多</span>
     </div>
     <div class="content">
       <div v-show="type === 'device'" class="item">
@@ -162,7 +163,7 @@
         报警设备:
         <span style="padding-left: 6px;">{{ info.devcode }} </span>
         <el-button
-          v-if="info.devTypeName === '燃气智能监测终端' || info.devTypeName === '液位检测仪' || info.devTypeName === '井盖监测仪'"
+          v-if="(info.devTypeName === '燃气智能监测终端' || info.devTypeName === '液位检测仪' || info.devTypeName === '井盖监测仪') && proxy.hasPerm('/alarm/current/data')"
           size="small" style="margin-left: 6px;" @click="viewData"
         >
           查看数据
@@ -228,7 +229,7 @@
         <span style="padding-left: 6px;">
           {{ info.confirmContent }}
         </span>
-        <el-button v-if="type === 'data'" size="small" style="padding-left: 6px;" @click="viewProcess">
+        <el-button v-if="type === 'data' && proxy.hasPerm('/alarm/current/process')" size="small" style="padding-left: 6px;" @click="viewProcess">
           流程图
         </el-button>
       </div>
@@ -246,17 +247,17 @@
       </div>
     </div>
     <div class="footer">
-      <el-button v-if="Number(info.processStatus) < 4 && type === 'data'" size="small" @click="remind">
+      <el-button v-if="(Number(info.processStatus) < 4 && type === 'data') && proxy.hasPerm('/alarm/current/remind')" size="small" @click="remind">
         提醒责任人
       </el-button>
       <el-button
-        v-if="type === 'device' && (info.processStatusName === '待处置' || info.processStatusName === '挂起')"
+        v-if="(type === 'device' && (info.processStatusName === '待处置' || info.processStatusName === '挂起')) && proxy.hasPerm('/alarm/device/handler')"
         size="small" @click="handler"
       >
         报警处置
       </el-button>
       <el-button
-        v-if="Number(info.processStatus) <= 3 || (type === 'device' && info.processStatusName === '待处置') || info.processStatusName === '挂起'"
+        v-if="(Number(info.processStatus) <= 3 || (type === 'device' && info.processStatusName === '待处置') || info.processStatusName === '挂起') && proxy.hasPerm(type === 'device' ? '/alarm/device/pending' : '/alarm/current/pending')"
         type="primary" size="small" @click="pending"
       >
         挂起
diff --git a/src/views/home/alarm/current/index.vue b/src/views/home/alarm/current/index.vue
index d019bbf..e2714bb 100644
--- a/src/views/home/alarm/current/index.vue
+++ b/src/views/home/alarm/current/index.vue
@@ -4,6 +4,7 @@
   Date: 2023-06-28
  -->
 <script lang="ts" setup name="CurrentAlarm">
+import dayjs from 'dayjs'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import { ArrowLeftBold, ArrowRightBold } from '@element-plus/icons-vue'
 import MapCom from './components/map.vue'
@@ -100,6 +101,7 @@
       path: '/alarm/current',
     })
   }
+  datetimerange.value = []
   listQuery.value = {
     limit: 20,
     offset: 1,
@@ -131,8 +133,8 @@
   if ($route.query.row) {
     loadingTable.value = true
     const row = JSON.parse($route.query.row as string)
-    getCurrentAlarmListPage({ offset: 1, limit: 99999 }).then((res) => {
-      const data = res.data.rows.filter((item: any) => item.id === row.id)
+    getCurrentAlarmListPage({ offset: 1, limit: 50 }).then((res) => {
+      const data = res.data.rows.filter((item: any) => item.id === row.alarmId)
       if (data.length) {
         list1.value = data.map((item: any) => ({
           ...item,
@@ -153,7 +155,10 @@
     })
     return
   }
-  fetchData()
+  datetimerange.value = [dayjs().subtract(7, 'day').format('YYYY-MM-DD HH:mm:ss'), dayjs().format('YYYY-MM-DD HH:mm:ss')]
+  setTimeout(() => {
+    fetchData()
+  })
 })
 // 表格标识  地图或普通
 const tableFlag = ref('normal')
@@ -181,6 +186,10 @@
 const mapRef = ref()
 const mapData = ref({})
 async function detail(row: any) {
+  if (row.processStatusName === '未读') {
+    list1.value[list1.value.findIndex((item: any) => item.id === row.id)].processStatusName = '已读'
+    row.processStatusName = '已读'
+  }
   const res = await detailAlarm(row.id)
   const data = toHumpObject(res.data)
   mapData.value = row
@@ -362,7 +371,7 @@
               <el-button v-if="proxy.hasPerm('/alarm/current/delete')" type="primary" @click="batchDeleteRow">
                 批量删除
               </el-button>
-              <el-button type="primary" @click="exportList">
+              <el-button v-if="proxy.hasPerm('/alarm/current/export')" type="primary" @click="exportList">
                 导出
               </el-button>
             </div>
@@ -383,7 +392,7 @@
               </el-table-column>
             </template>
             <template #columns>
-              <el-table-column label="操作" align="center" width="80">
+              <el-table-column v-if="proxy.hasPerm('/alarm/current/detail')" label="操作" align="center" width="80">
                 <template #default="scope">
                   <el-button type="primary" link size="small" @click="detail(scope.row)">
                     查看
diff --git a/src/views/home/alarm/history/index.vue b/src/views/home/alarm/history/index.vue
index eeb49fc..3c810c3 100644
--- a/src/views/home/alarm/history/index.vue
+++ b/src/views/home/alarm/history/index.vue
@@ -97,6 +97,7 @@
 }
 // 重置查询条件f
 const reset = () => {
+  datetimerange.value = []
   listQuery.value = {
     limit: 20,
     offset: 1,
@@ -189,6 +190,7 @@
   })
 }
 fetchDict()
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -249,7 +251,7 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="exportList">
+          <el-button v-if="proxy.hasPerm('/alarm/history/export')" type="primary" @click="exportList">
             导出
           </el-button>
         </div>
@@ -272,7 +274,7 @@
           </el-table-column>
         </template>
         <template #columns>
-          <el-table-column label="操作" align="center" width="80">
+          <el-table-column v-if="proxy.hasPerm('/alarm/history/detail')" label="操作" align="center" width="80">
             <template #default="scope">
               <el-button type="primary" link size="small" @click="moreData(scope.row)">
                 查看
diff --git a/src/views/home/dashboard/index.vue b/src/views/home/dashboard/index.vue
index d2f7e3c..42dfbed 100644
--- a/src/views/home/dashboard/index.vue
+++ b/src/views/home/dashboard/index.vue
@@ -42,7 +42,7 @@
     value: '0',
     name: '在线',
     unit: '个',
-    id: '1',
+    id: '1,2',
   },
   {
     img: img.lixian,
@@ -56,7 +56,7 @@
     value: '0',
     name: '停用',
     unit: '个',
-    id: '2',
+    id: '3',
   },
 ])
 // 工作台数据
@@ -133,7 +133,11 @@
   deviceOperationLoading.value = true
   getDeviceStatus().then((res) => {
     res.data.forEach((element: any) => {
-      const index = deviceOperationData.value.findIndex((item: any) => item.id === element.name)
+      if (element.name === '1' || element.name === '2') {
+        deviceOperationData.value[0].value = Number(deviceOperationData.value[0].value || '0') + Number(element.value)
+        return
+      }
+      const index = deviceOperationData.value.findIndex((item: any) => item.id.includes(element.name))
       if (index !== -1) {
         deviceOperationData.value[index].value = element.value
       }
diff --git a/src/views/home/device/count/components/bottom.vue b/src/views/home/device/count/components/bottom.vue
index 28a4d78..e4e56fa 100644
--- a/src/views/home/device/count/components/bottom.vue
+++ b/src/views/home/device/count/components/bottom.vue
@@ -110,6 +110,7 @@
   })
 }
 fetchDict()
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -148,7 +149,7 @@
             <template #btns-right>
               <!-- 操作 -->
               <div>
-                <el-button type="primary">
+                <el-button v-if="proxy.hasPerm('/device/count/offline/export')" type="primary">
                   导出
                 </el-button>
               </div>
diff --git a/src/views/home/device/device/index.vue b/src/views/home/device/device/index.vue
index c3970b9..9cdd606 100644
--- a/src/views/home/device/device/index.vue
+++ b/src/views/home/device/device/index.vue
@@ -88,6 +88,7 @@
 }
 // 重置查询条件f
 const reset = () => {
+  datetimerange.value = []
   listQuery.value = {
     limit: 20,
     offset: 1,
@@ -296,6 +297,7 @@
   fetchDict()
   fetchData()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -372,17 +374,17 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="editRow('add', {})">
+          <el-button v-if="proxy.hasPerm('/device/manage/add')" type="primary" @click="editRow('add', {})">
             新建
           </el-button>
-          <el-button type="primary" @click="downloadTemplate">
+          <el-button v-if="proxy.hasPerm('/device/manage/down')" type="primary" @click="downloadTemplate">
             模板下载
           </el-button>
-          <el-button type="primary" @click="importList">
+          <el-button v-if="proxy.hasPerm('/device/manage/import')" type="primary" @click="importList">
             批量导入
           </el-button>
-          <el-button type="primary" @click="exportList">
-            导出列表
+          <el-button v-if="proxy.hasPerm('/device/manage/export')" type="primary" @click="exportList">
+            导出
           </el-button>
           <input ref="fileRef" style="display: none;" type="file" accept=".xls,.xlsx" @change="onFileChange">
         </div>
@@ -409,16 +411,16 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="150">
             <template #default="scope">
-              <el-button type="primary" link size="small" @click="editRow('detail', scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/manage/detail')" type="primary" link size="small" @click="editRow('detail', scope.row)">
                 查看
               </el-button>
-              <el-button type="primary" link size="small" @click="editRow('edit', scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/manage/update')" type="primary" link size="small" @click="editRow('edit', scope.row)">
                 编辑
               </el-button>
-              <el-button type="danger" link size="small" @click="changeDefense(scope.row)">
+              <!-- <el-button v-if="proxy.hasPerm('/device/manage/add')" type="danger" link size="small" @click="changeDefense(scope.row)">
                 撤防
-              </el-button>
-              <el-button type="danger" link size="small" @click="removeRow(scope.row)">
+              </el-button> -->
+              <el-button v-if="proxy.hasPerm('/device/manage/delete')" type="danger" link size="small" @click="removeRow(scope.row)">
                 删除
               </el-button>
             </template>
diff --git a/src/views/home/device/instruction/index.vue b/src/views/home/device/instruction/index.vue
index 1e598ed..1da6706 100644
--- a/src/views/home/device/instruction/index.vue
+++ b/src/views/home/device/instruction/index.vue
@@ -78,6 +78,7 @@
 }
 // 重置查询条件f
 const reset = () => {
+  datetimerange.value = []
   listQuery.value = {
     limit: 20,
     offset: 1,
@@ -158,6 +159,7 @@
     editRef.value.initDialog('addOther', {})
   }
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -213,10 +215,10 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary">
+          <el-button v-if="proxy.hasPerm('/device/instruction/batch')" type="primary">
             批量下发
           </el-button>
-          <el-button type="primary" @click="editRow('add', {})">
+          <el-button v-if="proxy.hasPerm('/device/instruction/add')" type="primary" @click="editRow('add', {})">
             新建
           </el-button>
         </div>
@@ -236,13 +238,13 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="120">
             <template #default="scope">
-              <el-button type="primary" link size="small" @click="editRow('detail', scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/instruction/detail')" type="primary" link size="small" @click="editRow('detail', scope.row)">
                 查看
               </el-button>
-              <el-button v-if="scope.row.status === '2'" type="primary" link size="small" @click="editRow('edit', scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/instruction/again') && scope.row.status === '2'" type="primary" link size="small" @click="editRow('edit', scope.row)">
                 重新下发
               </el-button>
-              <el-button type="danger" link size="small" @click="removeRow(scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/instruction/delete')" type="danger" link size="small" @click="removeRow(scope.row)">
                 删除
               </el-button>
             </template>
diff --git a/src/views/home/device/product/index.vue b/src/views/home/device/product/index.vue
index 799fc90..fdd5463 100644
--- a/src/views/home/device/product/index.vue
+++ b/src/views/home/device/product/index.vue
@@ -128,6 +128,7 @@
   await fetchDict()
   fetchData()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -164,7 +165,7 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="editRow('add', {})">
+          <el-button v-if="proxy.hasPerm('/device/product/add')" type="primary" @click="editRow('add', {})">
             新建
           </el-button>
         </div>
@@ -184,10 +185,10 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="120">
             <template #default="scope">
-              <el-button type="primary" link size="small" @click="editRow('edit', scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/product/update')" type="primary" link size="small" @click="editRow('edit', scope.row)">
                 编辑
               </el-button>
-              <el-button type="danger" link size="small" @click="removeRow(scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/product/delete')" type="danger" link size="small" @click="removeRow(scope.row)">
                 删除
               </el-button>
             </template>
diff --git a/src/views/home/device/type/index.vue b/src/views/home/device/type/index.vue
index 59f1343..2344e57 100644
--- a/src/views/home/device/type/index.vue
+++ b/src/views/home/device/type/index.vue
@@ -105,6 +105,7 @@
   await fetchDict()
   fetchData()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -131,7 +132,7 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="editRow('add', {})">
+          <el-button v-if="proxy.hasPerm('/device/type/add')" type="primary" @click="editRow('add', {})">
             新建
           </el-button>
         </div>
@@ -151,10 +152,10 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="120">
             <template #default="scope">
-              <el-button type="primary" link size="small" @click="editRow('edit', scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/type/update')" type="primary" link size="small" @click="editRow('edit', scope.row)">
                 编辑
               </el-button>
-              <el-button type="danger" link size="small" @click="removeRow(scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/type/delete')" type="danger" link size="small" @click="removeRow(scope.row)">
                 删除
               </el-button>
             </template>
diff --git a/src/views/home/ledger/ledger/components/gridList.vue b/src/views/home/ledger/ledger/components/gridList.vue
index d03cd9f..189edef 100644
--- a/src/views/home/ledger/ledger/components/gridList.vue
+++ b/src/views/home/ledger/ledger/components/gridList.vue
@@ -91,6 +91,7 @@
     // })
   })
 }
+const { proxy } = getCurrentInstance() as any
 // 同步日志
 const allSync = () => {
   $router.push({
@@ -139,10 +140,10 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="allSync">
+          <el-button v-if="proxy.hasPerm('/ledger/sync')" type="primary" @click="allSync">
             同步日志
           </el-button>
-          <el-button type="primary" @click="sync('all', {})">
+          <el-button v-if="proxy.hasPerm('/ledger/sync/all')" type="primary" @click="sync('all', {})">
             全量同步
           </el-button>
         </div>
@@ -160,9 +161,9 @@
           </el-table-column>
         </template>
         <template #columns>
-          <el-table-column label="操作" align="center" width="80">
+          <el-table-column v-if="proxy.hasPerm('/ledger/sync/single')" label="操作" align="center" width="80">
             <template #default="scope">
-              <el-button type="primary" link size="small" @click="sync('single', scope.row)">
+              <el-button v-if="proxy.hasPerm('/ledger/sync/single')" type="primary" link size="small" @click="sync('single', scope.row)">
                 同步
               </el-button>
             </template>
diff --git a/src/views/home/ledger/ledger/components/wellList.vue b/src/views/home/ledger/ledger/components/wellList.vue
index 9eb1f43..06f855a 100644
--- a/src/views/home/ledger/ledger/components/wellList.vue
+++ b/src/views/home/ledger/ledger/components/wellList.vue
@@ -123,6 +123,7 @@
   // await fetchDict()
   fetchData()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -159,11 +160,11 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="allSync">
+          <el-button v-if="proxy.hasPerm('/ledger/sync')" type="primary" @click="allSync">
             同步日志
           </el-button>
-          <el-button type="primary" @click="sync('all', {})">
-            全部同步
+          <el-button v-if="proxy.hasPerm('/ledger/sync/all')" type="primary" @click="sync('all', {})">
+            全量同步
           </el-button>
         </div>
       </template>
@@ -180,9 +181,9 @@
           </el-table-column>
         </template>
         <template #columns>
-          <el-table-column label="操作" align="center" width="80">
+          <el-table-column v-if="proxy.hasPerm('/ledger/sync/single')" label="操作" align="center" width="80">
             <template #default="scope">
-              <el-button type="primary" link size="small" @click="sync('single', scope.row)">
+              <el-button v-if="proxy.hasPerm('/ledger/sync/single')" type="primary" link size="small" @click="sync('single', scope.row)">
                 同步
               </el-button>
             </template>
diff --git a/src/views/home/ledger/ledger/index.vue b/src/views/home/ledger/ledger/index.vue
index a03aa12..8403fc5 100644
--- a/src/views/home/ledger/ledger/index.vue
+++ b/src/views/home/ledger/ledger/index.vue
@@ -7,7 +7,16 @@
 import type { TabsPaneContext } from 'element-plus'
 import wellList from './components/wellList.vue'
 import gridList from './components/gridList.vue'
-const activeName = ref('闸井')
+const { proxy } = getCurrentInstance() as any
+const activeName = ref(
+  proxy.hasPerm('/ledger/manage/well')
+    ? '闸井'
+    : proxy.hasPerm('/ledger/manage/station')
+      ? '场站'
+      : proxy.hasPerm('/ledger/manage/grid')
+        ? '网格'
+        : '',
+)
 const handleClick = (tab: TabsPaneContext, event: Event) => {
   // console.log(tab, event)
 }
@@ -17,13 +26,13 @@
   <!-- 布局 -->
   <app-container>
     <el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick">
-      <el-tab-pane label="闸井" name="闸井">
+      <el-tab-pane v-if="proxy.hasPerm('/ledger/manage/well')" label="闸井" name="闸井">
         <well-list v-if="activeName === '闸井'" type="1" />
       </el-tab-pane>
-      <el-tab-pane label="场站" name="场站">
+      <el-tab-pane v-if="proxy.hasPerm('/ledger/manage/station')" label="场站" name="场站">
         <well-list v-if="activeName === '场站'" type="2" />
       </el-tab-pane>
-      <el-tab-pane label="网格" name="网格">
+      <el-tab-pane v-if="proxy.hasPerm('/ledger/manage/grid')" label="网格" name="网格">
         <grid-list v-if="activeName === '网格'" />
       </el-tab-pane>
     </el-tabs>
diff --git a/src/views/home/ledger/pipeline/index.vue b/src/views/home/ledger/pipeline/index.vue
index e0d2512..01e95ac 100644
--- a/src/views/home/ledger/pipeline/index.vue
+++ b/src/views/home/ledger/pipeline/index.vue
@@ -160,6 +160,7 @@
 onMounted(async () => {
   fetchData()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -222,13 +223,13 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="editRow('add', {})">
+          <el-button v-if="proxy.hasPerm('/ledger/pipeline/add')" type="primary" @click="editRow('add', {})">
             新增
           </el-button>
-          <el-button type="primary" @click="importList">
+          <el-button v-if="proxy.hasPerm('/ledger/pipeline/import')" type="primary" @click="importList">
             批量导入
           </el-button>
-          <el-button type="primary" @click="exportList">
+          <el-button v-if="proxy.hasPerm('/ledger/pipeline/export')" type="primary" @click="exportList">
             批量导出
           </el-button>
         </div>
@@ -248,10 +249,10 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="100">
             <template #default="scope">
-              <el-button type="primary" link size="small" @click="editRow('edit', scope.row)">
+              <el-button v-if="proxy.hasPerm('/ledger/pipeline/update')" type="primary" link size="small" @click="editRow('edit', scope.row)">
                 编辑
               </el-button>
-              <el-button type="danger" link size="small" @click="removeRow(scope.row)">
+              <el-button v-if="proxy.hasPerm('/ledger/pipeline/delete')" type="danger" link size="small" @click="removeRow(scope.row)">
                 删除
               </el-button>
             </template>
diff --git a/src/views/home/ledger/sync/index.vue b/src/views/home/ledger/sync/index.vue
index 54a3218..a04bad9 100644
--- a/src/views/home/ledger/sync/index.vue
+++ b/src/views/home/ledger/sync/index.vue
@@ -62,6 +62,7 @@
 }
 // 重置查询条件f
 const reset = () => {
+  datetimerange.value = []
   listQuery.value = {
     limit: 20,
     offset: 1,
@@ -106,6 +107,8 @@
 onMounted(async () => {
   fetchData()
 })
+const { proxy } = getCurrentInstance() as any
+const $route = useRoute()
 </script>
 
 <template>
@@ -132,7 +135,7 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="goBak">
+          <el-button v-if="$route.type" type="primary" @click="goBak">
             返回
           </el-button>
         </div>
@@ -152,10 +155,10 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="80">
             <template #default="scope">
-              <el-button type="primary" link size="small">
+              <el-button v-if="proxy.hasPerm('/ledger/sync/detail')" type="primary" link size="small">
                 查看
               </el-button>
-              <el-button type="danger" link size="small" @click="removeRow(scope.row)">
+              <el-button v-if="proxy.hasPerm('/ledger/sync/delete')" type="danger" link size="small" @click="removeRow(scope.row)">
                 删除
               </el-button>
             </template>
diff --git a/src/views/home/monitor/service/index.vue b/src/views/home/monitor/service/index.vue
index 8df2239..570dc68 100644
--- a/src/views/home/monitor/service/index.vue
+++ b/src/views/home/monitor/service/index.vue
@@ -53,6 +53,7 @@
 onMounted(async () => {
   fetchData()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -66,7 +67,7 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary">
+          <el-button v-if="proxy.hasPerm('/monitor/service/add')" type="primary">
             新建
           </el-button>
         </div>
diff --git a/src/views/home/monitor/time/index.vue b/src/views/home/monitor/time/index.vue
index caa6d46..0f7f5a0 100644
--- a/src/views/home/monitor/time/index.vue
+++ b/src/views/home/monitor/time/index.vue
@@ -53,6 +53,7 @@
 onMounted(async () => {
   fetchData()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -66,7 +67,7 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary">
+          <el-button v-if="proxy.hasPerm('/monitor/time/add')" type="primary">
             新建
           </el-button>
         </div>
diff --git a/src/views/home/operation/alarm/components/detail.vue b/src/views/home/operation/alarm/components/detail.vue
index 8194cbd..4ae4a1f 100644
--- a/src/views/home/operation/alarm/components/detail.vue
+++ b/src/views/home/operation/alarm/components/detail.vue
@@ -151,6 +151,7 @@
 }
 // 点击经纬度展示地图
 const mapRef = ref()
+const { proxy } = getCurrentInstance() as any
 const showMap = (data: any) => {
   console.log(data, 'data')
   if (data.text === '位置') {
@@ -160,6 +161,13 @@
         2: 'StationMonitorDetail',
         3: 'PipelineMonitorDetail',
       } as { [key: string]: string }
+      // 判断是否有菜单权限
+      const watchObjectAuth = {
+        1: '/well',
+        2: '/station/monitor',
+        3: '/pipeline',
+      } as { [key: string]: string }
+      if (!proxy.hasPerm(watchObjectAuth[detailInfo.value.watchObject])) { return }
       $router.push({
         name: watchObject[detailInfo.value.watchObject],
         query: {
diff --git a/src/views/home/operation/alarm/index.vue b/src/views/home/operation/alarm/index.vue
index ac0f31b..e53c991 100644
--- a/src/views/home/operation/alarm/index.vue
+++ b/src/views/home/operation/alarm/index.vue
@@ -82,6 +82,7 @@
 }
 // 重置查询条件f
 const reset = () => {
+  datetimerange.value = []
   listQuery.value = {
     limit: 20,
     offset: 1,
@@ -315,7 +316,7 @@
               <el-button v-if="proxy.hasPerm('/alarm/device/delete')" type="primary" @click="batchDeleteRow">
                 批量删除
               </el-button>
-              <el-button type="primary" @click="exportList">
+              <el-button v-if="proxy.hasPerm('/alarm/device/export')" type="primary" @click="exportList">
                 导出
               </el-button>
             </div>
@@ -336,7 +337,7 @@
               </el-table-column>
             </template>
             <template #columns>
-              <el-table-column label="操作" align="center" width="80">
+              <el-table-column v-if="proxy.hasPerm('/alarm/device/detail')" label="操作" align="center" width="80">
                 <template #default="scope">
                   <el-button type="primary" link size="small" @click="detail(scope.row)">
                     查看
diff --git a/src/views/home/operation/history/index.vue b/src/views/home/operation/history/index.vue
index 5c04ff7..d96ac57 100644
--- a/src/views/home/operation/history/index.vue
+++ b/src/views/home/operation/history/index.vue
@@ -78,6 +78,7 @@
 }
 // 重置查询条件f
 const reset = () => {
+  datetimerange.value = []
   listQuery.value = {
     limit: 20,
     offset: 1,
@@ -161,6 +162,7 @@
     fetchData()
   })
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -218,7 +220,7 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="exportList">
+          <el-button v-if="proxy.hasPerm('/operation/history/export')" type="primary" @click="exportList">
             导出
           </el-button>
         </div>
@@ -241,7 +243,7 @@
           </el-table-column>
         </template>
         <template #columns>
-          <el-table-column label="操作" align="center" width="80">
+          <el-table-column v-if="proxy.hasPerm('/operation/history/detail')" label="操作" align="center" width="80">
             <template #default="scope">
               <el-button type="primary" link size="small" @click="detailRow(scope.row)">
                 查看
diff --git a/src/views/home/operation/manufacturer/index.vue b/src/views/home/operation/manufacturer/index.vue
index 4a5816a..5f647c3 100644
--- a/src/views/home/operation/manufacturer/index.vue
+++ b/src/views/home/operation/manufacturer/index.vue
@@ -75,6 +75,7 @@
 }
 // 重置查询条件f
 const reset = () => {
+  datetimerange.value = []
   listQuery.value = {
     limit: 20,
     offset: 1,
@@ -125,6 +126,7 @@
   await fetchDict()
   fetchData()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -178,7 +180,7 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="exportList">
+          <el-button v-if="proxy.hasPerm('/operation/manufacturer/export')" type="primary" @click="exportList">
             导出
           </el-button>
         </div>
diff --git a/src/views/home/operation/trajectory/index.vue b/src/views/home/operation/trajectory/index.vue
index 9312fd7..606958e 100644
--- a/src/views/home/operation/trajectory/index.vue
+++ b/src/views/home/operation/trajectory/index.vue
@@ -65,6 +65,7 @@
 }
 // 重置查询条件f
 const reset = () => {
+  datetimerange.value = []
   listQuery.value = {
     limit: 20,
     offset: 1,
@@ -114,6 +115,7 @@
   await fetchDict()
   fetchData()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -175,7 +177,7 @@
           </span>
         </template>
         <template #columns>
-          <el-table-column label="操作" width="80" align="center">
+          <el-table-column v-if="proxy.hasPerm('/operation/trajectory/detail')" label="操作" width="80" align="center">
             <template #default="scope">
               <el-button type="primary" link size="small" @click="detail(scope.row)">
                 查看
diff --git a/src/views/home/pipeline/components/detailData.vue b/src/views/home/pipeline/components/detailData.vue
index 80b6886..760b1c5 100644
--- a/src/views/home/pipeline/components/detailData.vue
+++ b/src/views/home/pipeline/components/detailData.vue
@@ -7,7 +7,13 @@
 import type { TabsPaneContext } from 'element-plus'
 import monitorData from './monitorDataList.vue'
 import maintenanceRecord from '@/views/home/well/components/maintenanceRecord.vue'
-const activeName = ref('监控数据')
+const { proxy } = getCurrentInstance() as any
+const activeName = ref(
+  proxy.hasPerm('/pipeline/monitor/data')
+    ? '监控数据'
+    : proxy.hasPerm('/pipeline/monitor/maintenance')
+      ? '监控设备维护记录'
+      : '')
 const handleClick = (tab: TabsPaneContext, event: Event) => {
   // console.log(tab, event)
 }
@@ -15,10 +21,10 @@
 
 <template>
   <el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick">
-    <el-tab-pane label="监控数据" name="监控数据">
+    <el-tab-pane v-if="proxy.hasPerm('/pipeline/monitor/data')" label="监控数据" name="监控数据">
       <monitor-data v-if="activeName === '监控数据'" />
     </el-tab-pane>
-    <el-tab-pane label="监控设备维护记录" name="监控设备维护记录">
+    <el-tab-pane v-if="proxy.hasPerm('/pipeline/monitor/maintenance')" label="监控设备维护记录" name="监控设备维护记录">
       <maintenance-record v-if="activeName === '监控设备维护记录'" />
     </el-tab-pane>
   </el-tabs>
diff --git a/src/views/home/pipeline/index.vue b/src/views/home/pipeline/index.vue
index 90baef0..4d66e51 100644
--- a/src/views/home/pipeline/index.vue
+++ b/src/views/home/pipeline/index.vue
@@ -254,6 +254,7 @@
     tableHeight.value = window.innerHeight - 60 - 50 - 10 - 98 - 10 - 52 - 52 - 10
   }
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -348,7 +349,7 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary">
+          <el-button v-if="proxy.hasPerm('/pipeline/export')" type="primary">
             导出
           </el-button>
         </div>
@@ -368,7 +369,7 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="80">
             <template #default="scope">
-              <el-button type="primary" link size="small" @click="editRow('detail', scope.row)">
+              <el-button v-if="proxy.hasPerm('/pipeline/detail')" type="primary" link size="small" @click="editRow('detail', scope.row)">
                 查看
               </el-button>
               <!-- <el-button type="primary" link size="small" @click="editRow('edit', scope.row)">
diff --git a/src/views/home/rule/agreement/index.vue b/src/views/home/rule/agreement/index.vue
index fd41cd3..f1cfe15 100644
--- a/src/views/home/rule/agreement/index.vue
+++ b/src/views/home/rule/agreement/index.vue
@@ -95,6 +95,7 @@
 onMounted(async () => {
   fetchData()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -119,7 +120,7 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="editRow('add', {})">
+          <el-button v-if="proxy.hasPerm('/rule/agreement/add')" type="primary" @click="editRow('add', {})">
             新建
           </el-button>
         </div>
@@ -139,10 +140,10 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="120">
             <template #default="scope">
-              <el-button type="primary" link size="small" @click="editRow('edit', scope.row)">
+              <el-button v-if="proxy.hasPerm('/rule/agreement/update')" type="primary" link size="small" @click="editRow('edit', scope.row)">
                 编辑
               </el-button>
-              <el-button type="danger" link size="small" @click="removeRow(scope.row)">
+              <el-button v-if="proxy.hasPerm('/rule/agreement/delete')" type="danger" link size="small" @click="removeRow(scope.row)">
                 删除
               </el-button>
             </template>
diff --git a/src/views/home/rule/alarm/components/alarmLevelList.vue b/src/views/home/rule/alarm/components/alarmLevelList.vue
index c8ffb7d..6c337c4 100644
--- a/src/views/home/rule/alarm/components/alarmLevelList.vue
+++ b/src/views/home/rule/alarm/components/alarmLevelList.vue
@@ -87,6 +87,7 @@
 const cancel = () => {
   dialogFormVisible.value = false
 }
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -97,7 +98,7 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="detailRow('create', {})">
+          <el-button v-if="proxy.hasPerm('/rule/alarm/level/add')" type="primary" @click="detailRow('create', {})">
             新增
           </el-button>
         </div>
@@ -117,10 +118,10 @@
         <template #columns>
           <el-table-column label="操作" width="120" align="center">
             <template #default="scope">
-              <el-button type="primary" link size="small" @click="detailRow('edit', scope.row)">
+              <el-button v-if="proxy.hasPerm('/rule/alarm/level/update')" type="primary" link size="small" @click="detailRow('edit', scope.row)">
                 编辑
               </el-button>
-              <el-button type="danger" link size="small" @click="removeRow(scope.row)">
+              <el-button v-if="proxy.hasPerm('/rule/alarm/level/delete')" type="danger" link size="small" @click="removeRow(scope.row)">
                 删除
               </el-button>
             </template>
diff --git a/src/views/home/rule/alarm/components/alarmTypeList.vue b/src/views/home/rule/alarm/components/alarmTypeList.vue
index 2cbf110..aa0cfed 100644
--- a/src/views/home/rule/alarm/components/alarmTypeList.vue
+++ b/src/views/home/rule/alarm/components/alarmTypeList.vue
@@ -80,6 +80,7 @@
 const cancel = () => {
   dialogFormVisible.value = false
 }
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -90,7 +91,7 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="detailRow('create', {})">
+          <el-button v-if="proxy.hasPerm('/rule/alarm/type/add')" type="primary" @click="detailRow('create', {})">
             新增
           </el-button>
         </div>
@@ -110,10 +111,10 @@
         <template #columns>
           <el-table-column label="操作" width="120" align="center">
             <template #default="scope">
-              <el-button type="primary" link size="small" @click="detailRow('edit', scope.row)">
+              <el-button v-if="proxy.hasPerm('/rule/alarm/type/update')" type="primary" link size="small" @click="detailRow('edit', scope.row)">
                 编辑
               </el-button>
-              <el-button type="danger" link size="small" @click="removeRow(scope.row)">
+              <el-button v-if="proxy.hasPerm('/rule/alarm/type/delete')" type="danger" link size="small" @click="removeRow(scope.row)">
                 删除
               </el-button>
             </template>
diff --git a/src/views/home/rule/alarm/index.vue b/src/views/home/rule/alarm/index.vue
index 110030c..4e66a34 100644
--- a/src/views/home/rule/alarm/index.vue
+++ b/src/views/home/rule/alarm/index.vue
@@ -20,11 +20,14 @@
 // 初始展示列
 const columns = ref<any>([
   { text: '报警类型', value: 'alarmTypeName', align: 'center' },
-  { text: '报警名称', value: 'alarmName', align: 'center' },
-  { text: '报警等级', value: 'alarmLevelName', align: 'center' },
-  { text: '报警提示方式', value: 'alarmNoteMethodName', align: 'center' },
-  { text: '状态', value: 'stateName', align: 'center', width: '130' },
-  { text: '创建时间', value: 'ts', align: 'center' },
+  { text: '设备类型', value: 'typeName', align: 'center' },
+  { text: '产品', value: 'productName', align: 'center' },
+  { text: '厂商', value: 'manufacturerName', align: 'center' },
+  // { text: '报警名称', value: 'alarmName', align: 'center' },
+  { text: '报警等级', value: 'alarmLevelName', align: 'center', width: '100' },
+  { text: '报警提示方式', value: 'alarmNoteMethodName', align: 'center', width: '130', isCustom: true },
+  { text: '状态', value: 'stateName', align: 'center', width: '100', isCustom: true },
+  { text: '创建时间', value: 'ts', align: 'center', width: '200' },
 ])
 // 最终展示列
 const columnsConfig = ref([])
@@ -158,6 +161,7 @@
   await fetchDict()
   fetchData()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -191,13 +195,13 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="showAlarmType">
+          <el-button v-if="proxy.hasPerm('/rule/alarm/type')" type="primary" @click="showAlarmType">
             报警类型管理
           </el-button>
-          <el-button type="primary" @click="showAlarmLevel">
+          <el-button v-if="proxy.hasPerm('/rule/alarm/level')" type="primary" @click="showAlarmLevel">
             报警等级管理
           </el-button>
-          <el-button type="primary" @click="detailRow('create', {})">
+          <el-button v-if="proxy.hasPerm('/rule/alarm/add')" type="primary" @click="detailRow('create', {})">
             新增
           </el-button>
         </div>
@@ -214,16 +218,28 @@
             </template>
           </el-table-column>
         </template>
+        <template #isCustom="{ scope, column }">
+          <!-- 报警提示方式 -->
+          <span v-if="column.text === '报警提示方式'">
+            <el-tag v-if="scope.row.alarmNoteMethodName === '消息提醒'" type="primary">消息提醒</el-tag>
+            <el-tag v-if="scope.row.alarmNoteMethodName === '弹窗'" type="danger">弹窗提醒</el-tag>
+          </span>
+          <!-- 报警提示方式 -->
+          <span v-if="column.text === '状态'">
+            <el-tag v-if="scope.row.stateName === '启用'" type="success">启用</el-tag>
+            <el-tag v-if="scope.row.stateName === '未启用'" type="info">未启用</el-tag>
+          </span>
+        </template>
         <template #columns>
           <el-table-column label="操作" width="140" align="center">
             <template #default="scope">
-              <el-button type="primary" link size="small" @click="switchStatusRow(scope.row)">
+              <el-button v-if="proxy.hasPerm('/rule/alarm/handler')" type="primary" link size="small" @click="switchStatusRow(scope.row)">
                 {{ scope.row.state === '1' ? '停用' : '启用' }}
               </el-button>
-              <el-button type="primary" link size="small" @click="detailRow('edit', scope.row)">
+              <el-button v-if="proxy.hasPerm('/rule/alarm/update')" type="primary" link size="small" @click="detailRow('edit', scope.row)">
                 编辑
               </el-button>
-              <el-button type="danger" link size="small" @click="removeRow(scope.row)">
+              <el-button v-if="proxy.hasPerm('/rule/alarm/delete')" type="danger" link size="small" @click="removeRow(scope.row)">
                 删除
               </el-button>
             </template>
diff --git a/src/views/home/rule/special/components/editDialog.vue b/src/views/home/rule/special/components/editDialog.vue
index bb494ec..5df205b 100644
--- a/src/views/home/rule/special/components/editDialog.vue
+++ b/src/views/home/rule/special/components/editDialog.vue
@@ -8,7 +8,7 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { getDictByCode } from '@/api/system/dict'
 import { getDeviceTypeListPage } from '@/api/home/device/type'
-import { getAlarmLevelListPage, getAlarmRuleListPage } from '@/api/home/rule/alarm'
+import { getAlarmLevelListPage, getAlarmTypeListPage } from '@/api/home/rule/alarm'
 import { addSpecialAlarmRule, editSpecialAlarmRule } from '@/api/home/rule/special'
 import { getDeviceListPage } from '@/api/home/device/device'
 import { getProductListPage } from '@/api/home/device/product'
@@ -57,13 +57,15 @@
 }
 const list = ref<any[]>([])
 const columns = ref<any>([
-  { text: '报警规则', value: 'alarmRule', align: 'center', type: 'select', code: 'alarm-rule', required: true },
+  { text: '报警类型', value: 'alarmTypeId', align: 'center', type: 'select', code: 'alarm-rule', required: true },
   { text: '报警等级', value: 'alarmLevelId', align: 'center', type: 'select', code: 'alarm-level', required: true },
   { text: '报警阈值', value: 'alarmThreshold', align: 'center', type: 'input', required: true },
 ])
 // 初始化对话框
+const isFirst = ref(true)
 const initDialog = (dialogStatusValue: string, row: any) => {
   dialogStatus.value = dialogStatusValue
+  isFirst.value = true
   dialogFormVisible.value = true
   if (dialogStatus.value === 'create') { // 如果是新增，清除验证
     resetForm()
@@ -83,9 +85,13 @@
         alarmRule: row.alarmRule,
         alarmLevelId: row.alarmLevelId,
         alarmThreshold: row.alarmThreshold,
+        alarmTypeId: row.alarmTypeId,
       },
     ]
   }
+  setTimeout(() => {
+    isFirst.value = false
+  })
 }
 defineExpose({
   initDialog,
@@ -143,6 +149,7 @@
 const saveData = () => {
   const data = list.value.map((item: any) => ({
     alarmLevelId: item.alarmLevelId,
+    alarmTypeId: item.alarmTypeId,
     alarmRule: item.alarmRule,
     alarmRuleName: `${item.alarmRule}[${alarmLevelList.value.filter((citem: any) => citem.id === item.alarmLevelId)[0]?.name || ''}]:${item.alarmThreshold}%LEL`,
     alarmThreshold: item.alarmThreshold,
@@ -151,7 +158,7 @@
     position: dataForm.value.position,
     tagNumber: dataForm.value.tagNumber,
     devTypeName: deviceList.value.filter((citem: any) => citem.value === dataForm.value.devcode)[0]?.name || '',
-    alarmTypeId: alarmRuleList.value.filter((citem: any) => citem.name === item.alarmRule)[0]?.alarmTypeId || '',
+    // alarmTypeId: alarmRuleList.value.filter((citem: any) => citem.name === item.alarmRule)[0]?.alarmTypeId || '',
   }))
   if (dialogStatus.value === 'edit') {
     updateData(data)
@@ -207,7 +214,7 @@
   // 设备列表
   getDeviceListPage({ offset: 1, limit: 9999 }).then((res) => {
     deviceList.value = res.data.rows.map((item: any) => ({
-      name: item.devTypeName,
+      name: item.typeName,
       id: item.id,
       value: item.devcode,
       productId: item.productId,
@@ -223,14 +230,14 @@
       }))
     })
     // 报警规则
-    getAlarmRuleListPage({ limit: 9999, offset: 1 }).then((res) => {
-      alarmRuleList.value = res.data.rows.map((item: any) => ({
-        name: item.alarmName,
-        id: item.id,
-        value: item.id,
-        alarmTypeId: item.alarmTypeId,
-      }))
-    })
+    // getAlarmRuleListPage({ limit: 9999, offset: 1 }).then((res) => {
+    //   alarmRuleList.value = res.data.rows.map((item: any) => ({
+    //     name: item.alarmName,
+    //     id: item.id,
+    //     value: item.id,
+    //     alarmTypeId: item.alarmTypeId,
+    //   }))
+    // })
     // 报警等级
     getAlarmLevelListPage({ limit: 9999, offset: 1 }).then((res) => {
       alarmLevelList.value = res.data.rows.map((item: any) => ({
@@ -247,11 +254,26 @@
 watch(() => dataForm.value.devcode, (newVal) => {
   if (newVal) {
     const current = deviceList.value.filter((item: any) => item.value === dataForm.value.devcode)
+    console.log(current, 'current')
     if (current.length) {
       dataForm.value.productId = current[0].productId
       dataForm.value.tagNumber = current[0].tagNumber
       dataForm.value.position = current[0].position
+      // 根据设备类型寻找报警类型
+      getAlarmTypeListPage({ limit: 9999, offset: 1 }).then((res) => {
+        alarmRuleList.value = res.data.rows.filter((item: any) => item.deviceTypeName.includes(current[0].name)).map((item: any) => ({
+          name: item.alarmType,
+          id: item.id,
+          value: item.id,
+          // alarmTypeId: item.id,
+        }))
+      })
     }
+    if (isFirst.value) {
+      return
+    }
+    alarmRuleList.value = []
+    list.value = []
   }
 }, {
   deep: true,
@@ -330,12 +352,12 @@
                         <!-- 报警规则 -->
                         <template v-if="item.type === 'select' && item.code === 'alarm-rule'">
                           <el-select
-                            v-model.trim="scope.row[item.value]" placeholder="报警规则" style="width: 100%;"
+                            v-model.trim="scope.row[item.value]" placeholder="报警类型" style="width: 100%;"
                             clearable filterable :disabled="!scope.row.edit"
                           >
                             <el-option
                               v-for="item in alarmRuleList" :key="item.id" :label="item.name"
-                              :value="item.name"
+                              :value="item.id"
                             />
                           </el-select>
                         </template>
diff --git a/src/views/home/rule/special/index.vue b/src/views/home/rule/special/index.vue
index 5c7b67c..7209dfa 100644
--- a/src/views/home/rule/special/index.vue
+++ b/src/views/home/rule/special/index.vue
@@ -99,6 +99,7 @@
   await fetchDict()
   fetchData()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -127,7 +128,7 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="detail('create', {})">
+          <el-button v-if="proxy.hasPerm('/rule/special/add')" type="primary" @click="detail('create', {})">
             新增
           </el-button>
         </div>
@@ -147,13 +148,13 @@
         <template #columns>
           <el-table-column label="操作" width="140" align="center">
             <template #default="scope">
-              <el-button type="primary" link size="small" @click="detail('detail', scope.row)">
+              <el-button v-if="proxy.hasPerm('/rule/special/detail')" type="primary" link size="small" @click="detail('detail', scope.row)">
                 查看
               </el-button>
-              <el-button type="primary" link size="small" @click="detail('edit', scope.row)">
+              <el-button v-if="proxy.hasPerm('/rule/special/update')" type="primary" link size="small" @click="detail('edit', scope.row)">
                 编辑
               </el-button>
-              <el-button type="danger" link size="small" @click="removeRow(scope.row)">
+              <el-button v-if="proxy.hasPerm('/rule/special/delete')" type="danger" link size="small" @click="removeRow(scope.row)">
                 删除
               </el-button>
             </template>
diff --git a/src/views/home/station/control/index.vue b/src/views/home/station/control/index.vue
index 4510922..6657c5d 100644
--- a/src/views/home/station/control/index.vue
+++ b/src/views/home/station/control/index.vue
@@ -71,6 +71,7 @@
     },
   ]
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -114,7 +115,7 @@
               </div>
             </div>
             <div class="right1">
-              <el-card shadow="always">
+              <el-card v-if="proxy.hasPerm('/station/control/video')" shadow="always">
                 <template #header>
                   <div class="clearfix">
                     <div>云台控制</div>
diff --git a/src/views/home/station/operation/index.vue b/src/views/home/station/operation/index.vue
index 02a5e44..d3d3d09 100644
--- a/src/views/home/station/operation/index.vue
+++ b/src/views/home/station/operation/index.vue
@@ -71,6 +71,7 @@
 }
 // 重置查询条件f
 const reset = () => {
+  datetimerange.value = []
   listQuery.value = {
     limit: 20,
     offset: 1,
@@ -121,6 +122,7 @@
   await fetchDict()
   fetchData()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -160,10 +162,10 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary">
+          <el-button v-if="proxy.hasPerm('/station/operation/add')" type="primary">
             新增
           </el-button>
-          <el-button type="primary" @click="exportList">
+          <el-button v-if="proxy.hasPerm('/station/operation/export')" type="primary" @click="exportList">
             导出
           </el-button>
         </div>
diff --git a/src/views/home/station/station/components/detailData.vue b/src/views/home/station/station/components/detailData.vue
index 237b22a..c936f30 100644
--- a/src/views/home/station/station/components/detailData.vue
+++ b/src/views/home/station/station/components/detailData.vue
@@ -8,7 +8,13 @@
 import monitorData from './monitorData.vue'
 import lifeCycleRecord from '@/views/home/well/components/lifeCycleRecord.vue'
 import maintenanceRecord from '@/views/home/well/components/maintenanceRecord.vue'
-const activeName = ref('监控数据')
+const { proxy } = getCurrentInstance() as any
+const activeName = ref(
+  proxy.hasPerm('/station/monitor/data')
+    ? '监控数据'
+    : proxy.hasPerm('/station/monitor/life')
+      ? '全生命周期记录'
+      : proxy.hasPerm('/station/monitor/maintenance') ? '监控设备维护记录' : '')
 const handleClick = (tab: TabsPaneContext, event: Event) => {
   console.log(tab, event)
 }
@@ -16,13 +22,13 @@
 
 <template>
   <el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick">
-    <el-tab-pane label="监控数据" name="监控数据">
+    <el-tab-pane v-if="proxy.hasPerm('/station/monitor/data')" label="监控数据" name="监控数据">
       <monitor-data v-if="activeName === '监控数据'" />
     </el-tab-pane>
-    <el-tab-pane label="全生命周期记录" name="全生命周期记录">
+    <el-tab-pane v-if="proxy.hasPerm('/station/monitor/life')" label="全生命周期记录" name="全生命周期记录">
       <life-cycle-record v-if="activeName === '全生命周期记录'" />
     </el-tab-pane>
-    <el-tab-pane label="监控设备维护记录" name="监控设备维护记录">
+    <el-tab-pane v-if="proxy.hasPerm('/station/monitor/maintenance')" label="监控设备维护记录" name="监控设备维护记录">
       <maintenance-record v-if="activeName === '监控设备维护记录'" />
     </el-tab-pane>
   </el-tabs>

diff --git a/src/App.vue b/src/App.vue
index cde81b3..8a00f5d 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -125,7 +125,7 @@
         '--g-sub-sidebar-actual-width': subSidebarActualWidth,
       }"
     />
-    <system-info v-if="browserType !== 'mobile'" />
+    <!-- <system-info v-if="browserType !== 'mobile'" /> -->
     <audio id="eventAudio" src="" autoplay />
   </el-config-provider>
 </template>
diff --git a/src/layouts/components/Tools/alarmDialog.vue b/src/layouts/components/Tools/alarmDialog.vue
index 1828375..df89ab8 100644
--- a/src/layouts/components/Tools/alarmDialog.vue
+++ b/src/layouts/components/Tools/alarmDialog.vue
@@ -116,7 +116,7 @@
     </div>
     <template #footer>
       <div class="dialog-footer">
-        <div class="btn" @click="detail">
+        <div v-if="proxy.hasPerm('/alarm/current')" class="btn" @click="detail">
           查看
         </div>
         <div v-if="info.isSound === '1'" class="btn" @click="closeSound">
diff --git a/src/layouts/components/Tools/alarmList.vue b/src/layouts/components/Tools/alarmList.vue
index c3a9d2a..5356b74 100644
--- a/src/layouts/components/Tools/alarmList.vue
+++ b/src/layouts/components/Tools/alarmList.vue
@@ -54,6 +54,7 @@
 }
 // 查看当前行
 const detailRow = (row: any) => {
+  if (!proxy.hasPerm('/alarm/current')) { return }
   $router.push({
     name: 'AlarmCurrent',
     query: {
@@ -77,21 +78,6 @@
   localStorage.setItem('eventAudio', 'pause')
 }
 const dialogRef = ref()
-// const dialog = () => {
-//   const row = {
-//     alarmNoteMethod: '1', // 消息提醒 1:弹窗，2:消息提醒
-//     isSound: '1', // 报警音效，1:开，0:关
-//     isSend: '1', // 报警推送，1:开，0:关
-//     isText: '1', // 报警短息，1:开，0:关
-//     alarmType: '浓度超限',
-//     tagNumber: 'NX5702',
-//     alarmTime: '2024-09-09',
-//     value: '20',
-//     typeName: '燃气智能终端',
-//     alarmLevel: '一级',
-//   }
-//   dialogRef.value.initDialog(row)
-// }
 const fetchData = (isLoading = false) => {
   loading.value = true
   if (isLoading) {
@@ -115,7 +101,10 @@
       dialogRef.value.initDialog(newVal)
     }
     if (newVal.isSound === '1') {
-      play()
+      // play()
+      if (!localStorage.getItem('eventAudio')) {
+        proxy.playAudio()
+      }
     }
     fetchData(false)
   }
@@ -146,6 +135,7 @@
 //     window.localStorage.removeItem('token')
 //   }
 // }
+// const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -180,7 +170,7 @@
                   {{ message.processStatus
                     === '未读' ? '未读' : '已读' }}
                 </el-tag>
-                <el-tag type="info" size="small" style="margin-left: 5px;">
+                <el-tag type="info" size="small" style="margin-left: 5px;" @click="detailRow(message)">
                   查看
                 </el-tag>
               </div>
@@ -214,7 +204,7 @@
       <!-- <div class="close" @click="dialog">
         弹窗
       </div> -->
-      <div class="more" @click="moreList">
+      <div v-if="proxy.hasPerm('/alarm/current')" class="more" @click="moreList">
         查看更多
       </div>
     </div>
diff --git a/src/layouts/components/Tools/index.vue b/src/layouts/components/Tools/index.vue
index 9f2d41f..61f9707 100644
--- a/src/layouts/components/Tools/index.vue
+++ b/src/layouts/components/Tools/index.vue
@@ -79,6 +79,7 @@
   // 断开 websocket
   // websocket.destroyWebSocket()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -89,18 +90,18 @@
           <svg-icon name="ep:search" />
         </el-icon>
       </span>
-      <span class="item" @click="board">
+      <span v-if="proxy.hasPerm('/fullscreen')" class="item" @click="board">
         <el-icon>
           <svg-icon name="ep:data-line" />
         </el-icon>
       </span>
-      <span v-if="settingsStore.mode === 'pc' && settingsStore.toolbar.enableFullscreen" class="item" @click="toggle">
+      <span class="item" @click="toggle">
         <el-icon>
           <svg-icon :name="isFullscreen ? 'fullscreen-exit' : 'fullscreen'" />
         </el-icon>
       </span>
       <!-- 报警信息列表 -->
-      <span class="item">
+      <span v-if="proxy.hasPerm('/alarmnotice')" class="item">
         <el-popover width="390">
           <template #reference>
             <div>
diff --git a/src/layouts/components/Topbar/index.vue b/src/layouts/components/Topbar/index.vue
index 2863cef..4e3120e 100644
--- a/src/layouts/components/Topbar/index.vue
+++ b/src/layouts/components/Topbar/index.vue
@@ -67,7 +67,7 @@
           </transition-group>
         </el-breadcrumb>
       </div>
-      <tools />
+      <!-- <tools /> -->
     </div>
   </div>
 </template>
diff --git a/src/router/modules/pc.ts b/src/router/modules/pc.ts
index aacd6fa..97ced45 100644
--- a/src/router/modules/pc.ts
+++ b/src/router/modules/pc.ts
@@ -40,7 +40,7 @@
       icon: 'ep:key',
       sidebar: false,
       breadcrumb: false,
-      // auth: '/fullscreen',
+      auth: '/fullscreen',
     },
   },
   {
@@ -155,7 +155,7 @@
           sidebar: false,
           breadcrumb: false,
           activeMenu: '/well',
-          auth: '/well/detail',
+          auth: '/well',
         },
       },
     ],
diff --git a/src/views/home/alarm/count/components/locationAnalysis.vue b/src/views/home/alarm/count/components/locationAnalysis.vue
index fc75b9e..bff1853 100644
--- a/src/views/home/alarm/count/components/locationAnalysis.vue
+++ b/src/views/home/alarm/count/components/locationAnalysis.vue
@@ -46,6 +46,7 @@
   })
 }
 fetchData()
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -75,6 +76,9 @@
         <el-button type="primary" style="margin: 0 5px;" @click="fetchData">
           搜索
         </el-button>
+        <el-button v-if="proxy.hasPerm('/alarm/count/exportLocation')" type="primary" style="margin: 0 5px;">
+          导出
+        </el-button>
       </div>
     </template>
     <template #content>
diff --git a/src/views/home/alarm/current/components/detail.vue b/src/views/home/alarm/current/components/detail.vue
index dd3b31a..4204c92 100644
--- a/src/views/home/alarm/current/components/detail.vue
+++ b/src/views/home/alarm/current/components/detail.vue
@@ -111,7 +111,7 @@
   const res2 = await getAlarmTypeListPage({ offset: 1, limit: 9999 });
   ($route.query.type === 'history' ? getAlarmDetail : getAlarmDetail)($route.query.id as string).then((res) => {
     detailInfo.value = toHumpObject(res.data)
-    detailInfo.value.realAlarmName = detailInfo.value.realAlarm === '1' ? '报警' : '误报'
+    detailInfo.value.realAlarmName = detailInfo.value.realAlarm === '0' ? '是' : '否'
     detailInfo.value.alarmTypeName = res2.data.rows.filter((item: any) => item.id === detailInfo.value.alarmTypeId)[0]?.alarmType || ''
     detailInfo.value.alarmLevelName = res1.data.rows.filter((item: any) => item.id === detailInfo.value.alarmLevel)[0]?.alarmLevel || ''
     detailInfo.value.duration = detailInfo.value.ts && detailInfo.value.cancelTime ? getDateDiff(detailInfo.value.ts, detailInfo.value.cancelTime) : ''
@@ -139,6 +139,7 @@
 }
 // 点击经纬度展示地图
 const mapRef = ref()
+const { proxy } = getCurrentInstance() as any
 const showMap = (data: any) => {
   console.log(data, 'data')
   if (data.text === '位置') {
@@ -148,6 +149,13 @@
         2: 'StationMonitorDetail',
         3: 'PipelineMonitorDetail',
       } as { [key: string]: string }
+      // 判断是否有菜单权限
+      const watchObjectAuth = {
+        1: '/well',
+        2: '/station/monitor',
+        3: '/pipeline',
+      } as { [key: string]: string }
+      if (!proxy.hasPerm(watchObjectAuth[detailInfo.value.watchObject])) { return }
       $router.push({
         name: watchObject[detailInfo.value.watchObject],
         query: {
diff --git a/src/views/home/alarm/current/components/detailInfoDialog.vue b/src/views/home/alarm/current/components/detailInfoDialog.vue
index c089449..7fbf06b 100644
--- a/src/views/home/alarm/current/components/detailInfoDialog.vue
+++ b/src/views/home/alarm/current/components/detailInfoDialog.vue
@@ -114,6 +114,7 @@
   })
 }
 defineExpose({ initDialog, close })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -131,7 +132,7 @@
     <!-- 头部 -->
     <div class="header">
       <span>{{ info.alarmContent }}</span>
-      <span class="more" @click="moreData">>>更多</span>
+      <span v-if="proxy.hasPerm(type === 'data' ? '/alarm/current/more' : '/alarm/device/more')" class="more" @click="moreData">>>更多</span>
     </div>
     <div class="content">
       <div v-show="type === 'device'" class="item">
@@ -162,7 +163,7 @@
         报警设备:
         <span style="padding-left: 6px;">{{ info.devcode }} </span>
         <el-button
-          v-if="info.devTypeName === '燃气智能监测终端' || info.devTypeName === '液位检测仪' || info.devTypeName === '井盖监测仪'"
+          v-if="(info.devTypeName === '燃气智能监测终端' || info.devTypeName === '液位检测仪' || info.devTypeName === '井盖监测仪') && proxy.hasPerm('/alarm/current/data')"
           size="small" style="margin-left: 6px;" @click="viewData"
         >
           查看数据
@@ -228,7 +229,7 @@
         <span style="padding-left: 6px;">
           {{ info.confirmContent }}
         </span>
-        <el-button v-if="type === 'data'" size="small" style="padding-left: 6px;" @click="viewProcess">
+        <el-button v-if="type === 'data' && proxy.hasPerm('/alarm/current/process')" size="small" style="padding-left: 6px;" @click="viewProcess">
           流程图
         </el-button>
       </div>
@@ -246,17 +247,17 @@
       </div>
     </div>
     <div class="footer">
-      <el-button v-if="Number(info.processStatus) < 4 && type === 'data'" size="small" @click="remind">
+      <el-button v-if="(Number(info.processStatus) < 4 && type === 'data') && proxy.hasPerm('/alarm/current/remind')" size="small" @click="remind">
         提醒责任人
       </el-button>
       <el-button
-        v-if="type === 'device' && (info.processStatusName === '待处置' || info.processStatusName === '挂起')"
+        v-if="(type === 'device' && (info.processStatusName === '待处置' || info.processStatusName === '挂起')) && proxy.hasPerm('/alarm/device/handler')"
         size="small" @click="handler"
       >
         报警处置
       </el-button>
       <el-button
-        v-if="Number(info.processStatus) <= 3 || (type === 'device' && info.processStatusName === '待处置') || info.processStatusName === '挂起'"
+        v-if="(Number(info.processStatus) <= 3 || (type === 'device' && info.processStatusName === '待处置') || info.processStatusName === '挂起') && proxy.hasPerm(type === 'device' ? '/alarm/device/pending' : '/alarm/current/pending')"
         type="primary" size="small" @click="pending"
       >
         挂起
diff --git a/src/views/home/alarm/current/index.vue b/src/views/home/alarm/current/index.vue
index d019bbf..e2714bb 100644
--- a/src/views/home/alarm/current/index.vue
+++ b/src/views/home/alarm/current/index.vue
@@ -4,6 +4,7 @@
   Date: 2023-06-28
  -->
 <script lang="ts" setup name="CurrentAlarm">
+import dayjs from 'dayjs'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import { ArrowLeftBold, ArrowRightBold } from '@element-plus/icons-vue'
 import MapCom from './components/map.vue'
@@ -100,6 +101,7 @@
       path: '/alarm/current',
     })
   }
+  datetimerange.value = []
   listQuery.value = {
     limit: 20,
     offset: 1,
@@ -131,8 +133,8 @@
   if ($route.query.row) {
     loadingTable.value = true
     const row = JSON.parse($route.query.row as string)
-    getCurrentAlarmListPage({ offset: 1, limit: 99999 }).then((res) => {
-      const data = res.data.rows.filter((item: any) => item.id === row.id)
+    getCurrentAlarmListPage({ offset: 1, limit: 50 }).then((res) => {
+      const data = res.data.rows.filter((item: any) => item.id === row.alarmId)
       if (data.length) {
         list1.value = data.map((item: any) => ({
           ...item,
@@ -153,7 +155,10 @@
     })
     return
   }
-  fetchData()
+  datetimerange.value = [dayjs().subtract(7, 'day').format('YYYY-MM-DD HH:mm:ss'), dayjs().format('YYYY-MM-DD HH:mm:ss')]
+  setTimeout(() => {
+    fetchData()
+  })
 })
 // 表格标识  地图或普通
 const tableFlag = ref('normal')
@@ -181,6 +186,10 @@
 const mapRef = ref()
 const mapData = ref({})
 async function detail(row: any) {
+  if (row.processStatusName === '未读') {
+    list1.value[list1.value.findIndex((item: any) => item.id === row.id)].processStatusName = '已读'
+    row.processStatusName = '已读'
+  }
   const res = await detailAlarm(row.id)
   const data = toHumpObject(res.data)
   mapData.value = row
@@ -362,7 +371,7 @@
               <el-button v-if="proxy.hasPerm('/alarm/current/delete')" type="primary" @click="batchDeleteRow">
                 批量删除
               </el-button>
-              <el-button type="primary" @click="exportList">
+              <el-button v-if="proxy.hasPerm('/alarm/current/export')" type="primary" @click="exportList">
                 导出
               </el-button>
             </div>
@@ -383,7 +392,7 @@
               </el-table-column>
             </template>
             <template #columns>
-              <el-table-column label="操作" align="center" width="80">
+              <el-table-column v-if="proxy.hasPerm('/alarm/current/detail')" label="操作" align="center" width="80">
                 <template #default="scope">
                   <el-button type="primary" link size="small" @click="detail(scope.row)">
                     查看
diff --git a/src/views/home/alarm/history/index.vue b/src/views/home/alarm/history/index.vue
index eeb49fc..3c810c3 100644
--- a/src/views/home/alarm/history/index.vue
+++ b/src/views/home/alarm/history/index.vue
@@ -97,6 +97,7 @@
 }
 // 重置查询条件f
 const reset = () => {
+  datetimerange.value = []
   listQuery.value = {
     limit: 20,
     offset: 1,
@@ -189,6 +190,7 @@
   })
 }
 fetchDict()
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -249,7 +251,7 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="exportList">
+          <el-button v-if="proxy.hasPerm('/alarm/history/export')" type="primary" @click="exportList">
             导出
           </el-button>
         </div>
@@ -272,7 +274,7 @@
           </el-table-column>
         </template>
         <template #columns>
-          <el-table-column label="操作" align="center" width="80">
+          <el-table-column v-if="proxy.hasPerm('/alarm/history/detail')" label="操作" align="center" width="80">
             <template #default="scope">
               <el-button type="primary" link size="small" @click="moreData(scope.row)">
                 查看
diff --git a/src/views/home/dashboard/index.vue b/src/views/home/dashboard/index.vue
index d2f7e3c..42dfbed 100644
--- a/src/views/home/dashboard/index.vue
+++ b/src/views/home/dashboard/index.vue
@@ -42,7 +42,7 @@
     value: '0',
     name: '在线',
     unit: '个',
-    id: '1',
+    id: '1,2',
   },
   {
     img: img.lixian,
@@ -56,7 +56,7 @@
     value: '0',
     name: '停用',
     unit: '个',
-    id: '2',
+    id: '3',
   },
 ])
 // 工作台数据
@@ -133,7 +133,11 @@
   deviceOperationLoading.value = true
   getDeviceStatus().then((res) => {
     res.data.forEach((element: any) => {
-      const index = deviceOperationData.value.findIndex((item: any) => item.id === element.name)
+      if (element.name === '1' || element.name === '2') {
+        deviceOperationData.value[0].value = Number(deviceOperationData.value[0].value || '0') + Number(element.value)
+        return
+      }
+      const index = deviceOperationData.value.findIndex((item: any) => item.id.includes(element.name))
       if (index !== -1) {
         deviceOperationData.value[index].value = element.value
       }
diff --git a/src/views/home/device/count/components/bottom.vue b/src/views/home/device/count/components/bottom.vue
index 28a4d78..e4e56fa 100644
--- a/src/views/home/device/count/components/bottom.vue
+++ b/src/views/home/device/count/components/bottom.vue
@@ -110,6 +110,7 @@
   })
 }
 fetchDict()
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -148,7 +149,7 @@
             <template #btns-right>
               <!-- 操作 -->
               <div>
-                <el-button type="primary">
+                <el-button v-if="proxy.hasPerm('/device/count/offline/export')" type="primary">
                   导出
                 </el-button>
               </div>
diff --git a/src/views/home/device/device/index.vue b/src/views/home/device/device/index.vue
index c3970b9..9cdd606 100644
--- a/src/views/home/device/device/index.vue
+++ b/src/views/home/device/device/index.vue
@@ -88,6 +88,7 @@
 }
 // 重置查询条件f
 const reset = () => {
+  datetimerange.value = []
   listQuery.value = {
     limit: 20,
     offset: 1,
@@ -296,6 +297,7 @@
   fetchDict()
   fetchData()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -372,17 +374,17 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="editRow('add', {})">
+          <el-button v-if="proxy.hasPerm('/device/manage/add')" type="primary" @click="editRow('add', {})">
             新建
           </el-button>
-          <el-button type="primary" @click="downloadTemplate">
+          <el-button v-if="proxy.hasPerm('/device/manage/down')" type="primary" @click="downloadTemplate">
             模板下载
           </el-button>
-          <el-button type="primary" @click="importList">
+          <el-button v-if="proxy.hasPerm('/device/manage/import')" type="primary" @click="importList">
             批量导入
           </el-button>
-          <el-button type="primary" @click="exportList">
-            导出列表
+          <el-button v-if="proxy.hasPerm('/device/manage/export')" type="primary" @click="exportList">
+            导出
           </el-button>
           <input ref="fileRef" style="display: none;" type="file" accept=".xls,.xlsx" @change="onFileChange">
         </div>
@@ -409,16 +411,16 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="150">
             <template #default="scope">
-              <el-button type="primary" link size="small" @click="editRow('detail', scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/manage/detail')" type="primary" link size="small" @click="editRow('detail', scope.row)">
                 查看
               </el-button>
-              <el-button type="primary" link size="small" @click="editRow('edit', scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/manage/update')" type="primary" link size="small" @click="editRow('edit', scope.row)">
                 编辑
               </el-button>
-              <el-button type="danger" link size="small" @click="changeDefense(scope.row)">
+              <!-- <el-button v-if="proxy.hasPerm('/device/manage/add')" type="danger" link size="small" @click="changeDefense(scope.row)">
                 撤防
-              </el-button>
-              <el-button type="danger" link size="small" @click="removeRow(scope.row)">
+              </el-button> -->
+              <el-button v-if="proxy.hasPerm('/device/manage/delete')" type="danger" link size="small" @click="removeRow(scope.row)">
                 删除
               </el-button>
             </template>
diff --git a/src/views/home/device/instruction/index.vue b/src/views/home/device/instruction/index.vue
index 1e598ed..1da6706 100644
--- a/src/views/home/device/instruction/index.vue
+++ b/src/views/home/device/instruction/index.vue
@@ -78,6 +78,7 @@
 }
 // 重置查询条件f
 const reset = () => {
+  datetimerange.value = []
   listQuery.value = {
     limit: 20,
     offset: 1,
@@ -158,6 +159,7 @@
     editRef.value.initDialog('addOther', {})
   }
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -213,10 +215,10 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary">
+          <el-button v-if="proxy.hasPerm('/device/instruction/batch')" type="primary">
             批量下发
           </el-button>
-          <el-button type="primary" @click="editRow('add', {})">
+          <el-button v-if="proxy.hasPerm('/device/instruction/add')" type="primary" @click="editRow('add', {})">
             新建
           </el-button>
         </div>
@@ -236,13 +238,13 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="120">
             <template #default="scope">
-              <el-button type="primary" link size="small" @click="editRow('detail', scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/instruction/detail')" type="primary" link size="small" @click="editRow('detail', scope.row)">
                 查看
               </el-button>
-              <el-button v-if="scope.row.status === '2'" type="primary" link size="small" @click="editRow('edit', scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/instruction/again') && scope.row.status === '2'" type="primary" link size="small" @click="editRow('edit', scope.row)">
                 重新下发
               </el-button>
-              <el-button type="danger" link size="small" @click="removeRow(scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/instruction/delete')" type="danger" link size="small" @click="removeRow(scope.row)">
                 删除
               </el-button>
             </template>
diff --git a/src/views/home/device/product/index.vue b/src/views/home/device/product/index.vue
index 799fc90..fdd5463 100644
--- a/src/views/home/device/product/index.vue
+++ b/src/views/home/device/product/index.vue
@@ -128,6 +128,7 @@
   await fetchDict()
   fetchData()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -164,7 +165,7 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="editRow('add', {})">
+          <el-button v-if="proxy.hasPerm('/device/product/add')" type="primary" @click="editRow('add', {})">
             新建
           </el-button>
         </div>
@@ -184,10 +185,10 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="120">
             <template #default="scope">
-              <el-button type="primary" link size="small" @click="editRow('edit', scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/product/update')" type="primary" link size="small" @click="editRow('edit', scope.row)">
                 编辑
               </el-button>
-              <el-button type="danger" link size="small" @click="removeRow(scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/product/delete')" type="danger" link size="small" @click="removeRow(scope.row)">
                 删除
               </el-button>
             </template>
diff --git a/src/views/home/device/type/index.vue b/src/views/home/device/type/index.vue
index 59f1343..2344e57 100644
--- a/src/views/home/device/type/index.vue
+++ b/src/views/home/device/type/index.vue
@@ -105,6 +105,7 @@
   await fetchDict()
   fetchData()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -131,7 +132,7 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="editRow('add', {})">
+          <el-button v-if="proxy.hasPerm('/device/type/add')" type="primary" @click="editRow('add', {})">
             新建
           </el-button>
         </div>
@@ -151,10 +152,10 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="120">
             <template #default="scope">
-              <el-button type="primary" link size="small" @click="editRow('edit', scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/type/update')" type="primary" link size="small" @click="editRow('edit', scope.row)">
                 编辑
               </el-button>
-              <el-button type="danger" link size="small" @click="removeRow(scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/type/delete')" type="danger" link size="small" @click="removeRow(scope.row)">
                 删除
               </el-button>
             </template>
diff --git a/src/views/home/ledger/ledger/components/gridList.vue b/src/views/home/ledger/ledger/components/gridList.vue
index d03cd9f..189edef 100644
--- a/src/views/home/ledger/ledger/components/gridList.vue
+++ b/src/views/home/ledger/ledger/components/gridList.vue
@@ -91,6 +91,7 @@
     // })
   })
 }
+const { proxy } = getCurrentInstance() as any
 // 同步日志
 const allSync = () => {
   $router.push({
@@ -139,10 +140,10 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="allSync">
+          <el-button v-if="proxy.hasPerm('/ledger/sync')" type="primary" @click="allSync">
             同步日志
           </el-button>
-          <el-button type="primary" @click="sync('all', {})">
+          <el-button v-if="proxy.hasPerm('/ledger/sync/all')" type="primary" @click="sync('all', {})">
             全量同步
           </el-button>
         </div>
@@ -160,9 +161,9 @@
           </el-table-column>
         </template>
         <template #columns>
-          <el-table-column label="操作" align="center" width="80">
+          <el-table-column v-if="proxy.hasPerm('/ledger/sync/single')" label="操作" align="center" width="80">
             <template #default="scope">
-              <el-button type="primary" link size="small" @click="sync('single', scope.row)">
+              <el-button v-if="proxy.hasPerm('/ledger/sync/single')" type="primary" link size="small" @click="sync('single', scope.row)">
                 同步
               </el-button>
             </template>
diff --git a/src/views/home/ledger/ledger/components/wellList.vue b/src/views/home/ledger/ledger/components/wellList.vue
index 9eb1f43..06f855a 100644
--- a/src/views/home/ledger/ledger/components/wellList.vue
+++ b/src/views/home/ledger/ledger/components/wellList.vue
@@ -123,6 +123,7 @@
   // await fetchDict()
   fetchData()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -159,11 +160,11 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="allSync">
+          <el-button v-if="proxy.hasPerm('/ledger/sync')" type="primary" @click="allSync">
             同步日志
           </el-button>
-          <el-button type="primary" @click="sync('all', {})">
-            全部同步
+          <el-button v-if="proxy.hasPerm('/ledger/sync/all')" type="primary" @click="sync('all', {})">
+            全量同步
           </el-button>
         </div>
       </template>
@@ -180,9 +181,9 @@
           </el-table-column>
         </template>
         <template #columns>
-          <el-table-column label="操作" align="center" width="80">
+          <el-table-column v-if="proxy.hasPerm('/ledger/sync/single')" label="操作" align="center" width="80">
             <template #default="scope">
-              <el-button type="primary" link size="small" @click="sync('single', scope.row)">
+              <el-button v-if="proxy.hasPerm('/ledger/sync/single')" type="primary" link size="small" @click="sync('single', scope.row)">
                 同步
               </el-button>
             </template>
diff --git a/src/views/home/ledger/ledger/index.vue b/src/views/home/ledger/ledger/index.vue
index a03aa12..8403fc5 100644
--- a/src/views/home/ledger/ledger/index.vue
+++ b/src/views/home/ledger/ledger/index.vue
@@ -7,7 +7,16 @@
 import type { TabsPaneContext } from 'element-plus'
 import wellList from './components/wellList.vue'
 import gridList from './components/gridList.vue'
-const activeName = ref('闸井')
+const { proxy } = getCurrentInstance() as any
+const activeName = ref(
+  proxy.hasPerm('/ledger/manage/well')
+    ? '闸井'
+    : proxy.hasPerm('/ledger/manage/station')
+      ? '场站'
+      : proxy.hasPerm('/ledger/manage/grid')
+        ? '网格'
+        : '',
+)
 const handleClick = (tab: TabsPaneContext, event: Event) => {
   // console.log(tab, event)
 }
@@ -17,13 +26,13 @@
   <!-- 布局 -->
   <app-container>
     <el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick">
-      <el-tab-pane label="闸井" name="闸井">
+      <el-tab-pane v-if="proxy.hasPerm('/ledger/manage/well')" label="闸井" name="闸井">
         <well-list v-if="activeName === '闸井'" type="1" />
       </el-tab-pane>
-      <el-tab-pane label="场站" name="场站">
+      <el-tab-pane v-if="proxy.hasPerm('/ledger/manage/station')" label="场站" name="场站">
         <well-list v-if="activeName === '场站'" type="2" />
       </el-tab-pane>
-      <el-tab-pane label="网格" name="网格">
+      <el-tab-pane v-if="proxy.hasPerm('/ledger/manage/grid')" label="网格" name="网格">
         <grid-list v-if="activeName === '网格'" />
       </el-tab-pane>
     </el-tabs>
diff --git a/src/views/home/ledger/pipeline/index.vue b/src/views/home/ledger/pipeline/index.vue
index e0d2512..01e95ac 100644
--- a/src/views/home/ledger/pipeline/index.vue
+++ b/src/views/home/ledger/pipeline/index.vue
@@ -160,6 +160,7 @@
 onMounted(async () => {
   fetchData()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -222,13 +223,13 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="editRow('add', {})">
+          <el-button v-if="proxy.hasPerm('/ledger/pipeline/add')" type="primary" @click="editRow('add', {})">
             新增
           </el-button>
-          <el-button type="primary" @click="importList">
+          <el-button v-if="proxy.hasPerm('/ledger/pipeline/import')" type="primary" @click="importList">
             批量导入
           </el-button>
-          <el-button type="primary" @click="exportList">
+          <el-button v-if="proxy.hasPerm('/ledger/pipeline/export')" type="primary" @click="exportList">
             批量导出
           </el-button>
         </div>
@@ -248,10 +249,10 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="100">
             <template #default="scope">
-              <el-button type="primary" link size="small" @click="editRow('edit', scope.row)">
+              <el-button v-if="proxy.hasPerm('/ledger/pipeline/update')" type="primary" link size="small" @click="editRow('edit', scope.row)">
                 编辑
               </el-button>
-              <el-button type="danger" link size="small" @click="removeRow(scope.row)">
+              <el-button v-if="proxy.hasPerm('/ledger/pipeline/delete')" type="danger" link size="small" @click="removeRow(scope.row)">
                 删除
               </el-button>
             </template>
diff --git a/src/views/home/ledger/sync/index.vue b/src/views/home/ledger/sync/index.vue
index 54a3218..a04bad9 100644
--- a/src/views/home/ledger/sync/index.vue
+++ b/src/views/home/ledger/sync/index.vue
@@ -62,6 +62,7 @@
 }
 // 重置查询条件f
 const reset = () => {
+  datetimerange.value = []
   listQuery.value = {
     limit: 20,
     offset: 1,
@@ -106,6 +107,8 @@
 onMounted(async () => {
   fetchData()
 })
+const { proxy } = getCurrentInstance() as any
+const $route = useRoute()
 </script>
 
 <template>
@@ -132,7 +135,7 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="goBak">
+          <el-button v-if="$route.type" type="primary" @click="goBak">
             返回
           </el-button>
         </div>
@@ -152,10 +155,10 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="80">
             <template #default="scope">
-              <el-button type="primary" link size="small">
+              <el-button v-if="proxy.hasPerm('/ledger/sync/detail')" type="primary" link size="small">
                 查看
               </el-button>
-              <el-button type="danger" link size="small" @click="removeRow(scope.row)">
+              <el-button v-if="proxy.hasPerm('/ledger/sync/delete')" type="danger" link size="small" @click="removeRow(scope.row)">
                 删除
               </el-button>
             </template>
diff --git a/src/views/home/monitor/service/index.vue b/src/views/home/monitor/service/index.vue
index 8df2239..570dc68 100644
--- a/src/views/home/monitor/service/index.vue
+++ b/src/views/home/monitor/service/index.vue
@@ -53,6 +53,7 @@
 onMounted(async () => {
   fetchData()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -66,7 +67,7 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary">
+          <el-button v-if="proxy.hasPerm('/monitor/service/add')" type="primary">
             新建
           </el-button>
         </div>
diff --git a/src/views/home/monitor/time/index.vue b/src/views/home/monitor/time/index.vue
index caa6d46..0f7f5a0 100644
--- a/src/views/home/monitor/time/index.vue
+++ b/src/views/home/monitor/time/index.vue
@@ -53,6 +53,7 @@
 onMounted(async () => {
   fetchData()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -66,7 +67,7 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary">
+          <el-button v-if="proxy.hasPerm('/monitor/time/add')" type="primary">
             新建
           </el-button>
         </div>
diff --git a/src/views/home/operation/alarm/components/detail.vue b/src/views/home/operation/alarm/components/detail.vue
index 8194cbd..4ae4a1f 100644
--- a/src/views/home/operation/alarm/components/detail.vue
+++ b/src/views/home/operation/alarm/components/detail.vue
@@ -151,6 +151,7 @@
 }
 // 点击经纬度展示地图
 const mapRef = ref()
+const { proxy } = getCurrentInstance() as any
 const showMap = (data: any) => {
   console.log(data, 'data')
   if (data.text === '位置') {
@@ -160,6 +161,13 @@
         2: 'StationMonitorDetail',
         3: 'PipelineMonitorDetail',
       } as { [key: string]: string }
+      // 判断是否有菜单权限
+      const watchObjectAuth = {
+        1: '/well',
+        2: '/station/monitor',
+        3: '/pipeline',
+      } as { [key: string]: string }
+      if (!proxy.hasPerm(watchObjectAuth[detailInfo.value.watchObject])) { return }
       $router.push({
         name: watchObject[detailInfo.value.watchObject],
         query: {
diff --git a/src/views/home/operation/alarm/index.vue b/src/views/home/operation/alarm/index.vue
index ac0f31b..e53c991 100644
--- a/src/views/home/operation/alarm/index.vue
+++ b/src/views/home/operation/alarm/index.vue
@@ -82,6 +82,7 @@
 }
 // 重置查询条件f
 const reset = () => {
+  datetimerange.value = []
   listQuery.value = {
     limit: 20,
     offset: 1,
@@ -315,7 +316,7 @@
               <el-button v-if="proxy.hasPerm('/alarm/device/delete')" type="primary" @click="batchDeleteRow">
                 批量删除
               </el-button>
-              <el-button type="primary" @click="exportList">
+              <el-button v-if="proxy.hasPerm('/alarm/device/export')" type="primary" @click="exportList">
                 导出
               </el-button>
             </div>
@@ -336,7 +337,7 @@
               </el-table-column>
             </template>
             <template #columns>
-              <el-table-column label="操作" align="center" width="80">
+              <el-table-column v-if="proxy.hasPerm('/alarm/device/detail')" label="操作" align="center" width="80">
                 <template #default="scope">
                   <el-button type="primary" link size="small" @click="detail(scope.row)">
                     查看
diff --git a/src/views/home/operation/history/index.vue b/src/views/home/operation/history/index.vue
index 5c04ff7..d96ac57 100644
--- a/src/views/home/operation/history/index.vue
+++ b/src/views/home/operation/history/index.vue
@@ -78,6 +78,7 @@
 }
 // 重置查询条件f
 const reset = () => {
+  datetimerange.value = []
   listQuery.value = {
     limit: 20,
     offset: 1,
@@ -161,6 +162,7 @@
     fetchData()
   })
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -218,7 +220,7 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="exportList">
+          <el-button v-if="proxy.hasPerm('/operation/history/export')" type="primary" @click="exportList">
             导出
           </el-button>
         </div>
@@ -241,7 +243,7 @@
           </el-table-column>
         </template>
         <template #columns>
-          <el-table-column label="操作" align="center" width="80">
+          <el-table-column v-if="proxy.hasPerm('/operation/history/detail')" label="操作" align="center" width="80">
             <template #default="scope">
               <el-button type="primary" link size="small" @click="detailRow(scope.row)">
                 查看
diff --git a/src/views/home/operation/manufacturer/index.vue b/src/views/home/operation/manufacturer/index.vue
index 4a5816a..5f647c3 100644
--- a/src/views/home/operation/manufacturer/index.vue
+++ b/src/views/home/operation/manufacturer/index.vue
@@ -75,6 +75,7 @@
 }
 // 重置查询条件f
 const reset = () => {
+  datetimerange.value = []
   listQuery.value = {
     limit: 20,
     offset: 1,
@@ -125,6 +126,7 @@
   await fetchDict()
   fetchData()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -178,7 +180,7 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="exportList">
+          <el-button v-if="proxy.hasPerm('/operation/manufacturer/export')" type="primary" @click="exportList">
             导出
           </el-button>
         </div>
diff --git a/src/views/home/operation/trajectory/index.vue b/src/views/home/operation/trajectory/index.vue
index 9312fd7..606958e 100644
--- a/src/views/home/operation/trajectory/index.vue
+++ b/src/views/home/operation/trajectory/index.vue
@@ -65,6 +65,7 @@
 }
 // 重置查询条件f
 const reset = () => {
+  datetimerange.value = []
   listQuery.value = {
     limit: 20,
     offset: 1,
@@ -114,6 +115,7 @@
   await fetchDict()
   fetchData()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -175,7 +177,7 @@
           </span>
         </template>
         <template #columns>
-          <el-table-column label="操作" width="80" align="center">
+          <el-table-column v-if="proxy.hasPerm('/operation/trajectory/detail')" label="操作" width="80" align="center">
             <template #default="scope">
               <el-button type="primary" link size="small" @click="detail(scope.row)">
                 查看
diff --git a/src/views/home/pipeline/components/detailData.vue b/src/views/home/pipeline/components/detailData.vue
index 80b6886..760b1c5 100644
--- a/src/views/home/pipeline/components/detailData.vue
+++ b/src/views/home/pipeline/components/detailData.vue
@@ -7,7 +7,13 @@
 import type { TabsPaneContext } from 'element-plus'
 import monitorData from './monitorDataList.vue'
 import maintenanceRecord from '@/views/home/well/components/maintenanceRecord.vue'
-const activeName = ref('监控数据')
+const { proxy } = getCurrentInstance() as any
+const activeName = ref(
+  proxy.hasPerm('/pipeline/monitor/data')
+    ? '监控数据'
+    : proxy.hasPerm('/pipeline/monitor/maintenance')
+      ? '监控设备维护记录'
+      : '')
 const handleClick = (tab: TabsPaneContext, event: Event) => {
   // console.log(tab, event)
 }
@@ -15,10 +21,10 @@
 
 <template>
   <el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick">
-    <el-tab-pane label="监控数据" name="监控数据">
+    <el-tab-pane v-if="proxy.hasPerm('/pipeline/monitor/data')" label="监控数据" name="监控数据">
       <monitor-data v-if="activeName === '监控数据'" />
     </el-tab-pane>
-    <el-tab-pane label="监控设备维护记录" name="监控设备维护记录">
+    <el-tab-pane v-if="proxy.hasPerm('/pipeline/monitor/maintenance')" label="监控设备维护记录" name="监控设备维护记录">
       <maintenance-record v-if="activeName === '监控设备维护记录'" />
     </el-tab-pane>
   </el-tabs>
diff --git a/src/views/home/pipeline/index.vue b/src/views/home/pipeline/index.vue
index 90baef0..4d66e51 100644
--- a/src/views/home/pipeline/index.vue
+++ b/src/views/home/pipeline/index.vue
@@ -254,6 +254,7 @@
     tableHeight.value = window.innerHeight - 60 - 50 - 10 - 98 - 10 - 52 - 52 - 10
   }
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -348,7 +349,7 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary">
+          <el-button v-if="proxy.hasPerm('/pipeline/export')" type="primary">
             导出
           </el-button>
         </div>
@@ -368,7 +369,7 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="80">
             <template #default="scope">
-              <el-button type="primary" link size="small" @click="editRow('detail', scope.row)">
+              <el-button v-if="proxy.hasPerm('/pipeline/detail')" type="primary" link size="small" @click="editRow('detail', scope.row)">
                 查看
               </el-button>
               <!-- <el-button type="primary" link size="small" @click="editRow('edit', scope.row)">
diff --git a/src/views/home/rule/agreement/index.vue b/src/views/home/rule/agreement/index.vue
index fd41cd3..f1cfe15 100644
--- a/src/views/home/rule/agreement/index.vue
+++ b/src/views/home/rule/agreement/index.vue
@@ -95,6 +95,7 @@
 onMounted(async () => {
   fetchData()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -119,7 +120,7 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="editRow('add', {})">
+          <el-button v-if="proxy.hasPerm('/rule/agreement/add')" type="primary" @click="editRow('add', {})">
             新建
           </el-button>
         </div>
@@ -139,10 +140,10 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="120">
             <template #default="scope">
-              <el-button type="primary" link size="small" @click="editRow('edit', scope.row)">
+              <el-button v-if="proxy.hasPerm('/rule/agreement/update')" type="primary" link size="small" @click="editRow('edit', scope.row)">
                 编辑
               </el-button>
-              <el-button type="danger" link size="small" @click="removeRow(scope.row)">
+              <el-button v-if="proxy.hasPerm('/rule/agreement/delete')" type="danger" link size="small" @click="removeRow(scope.row)">
                 删除
               </el-button>
             </template>
diff --git a/src/views/home/rule/alarm/components/alarmLevelList.vue b/src/views/home/rule/alarm/components/alarmLevelList.vue
index c8ffb7d..6c337c4 100644
--- a/src/views/home/rule/alarm/components/alarmLevelList.vue
+++ b/src/views/home/rule/alarm/components/alarmLevelList.vue
@@ -87,6 +87,7 @@
 const cancel = () => {
   dialogFormVisible.value = false
 }
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -97,7 +98,7 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="detailRow('create', {})">
+          <el-button v-if="proxy.hasPerm('/rule/alarm/level/add')" type="primary" @click="detailRow('create', {})">
             新增
           </el-button>
         </div>
@@ -117,10 +118,10 @@
         <template #columns>
           <el-table-column label="操作" width="120" align="center">
             <template #default="scope">
-              <el-button type="primary" link size="small" @click="detailRow('edit', scope.row)">
+              <el-button v-if="proxy.hasPerm('/rule/alarm/level/update')" type="primary" link size="small" @click="detailRow('edit', scope.row)">
                 编辑
               </el-button>
-              <el-button type="danger" link size="small" @click="removeRow(scope.row)">
+              <el-button v-if="proxy.hasPerm('/rule/alarm/level/delete')" type="danger" link size="small" @click="removeRow(scope.row)">
                 删除
               </el-button>
             </template>
diff --git a/src/views/home/rule/alarm/components/alarmTypeList.vue b/src/views/home/rule/alarm/components/alarmTypeList.vue
index 2cbf110..aa0cfed 100644
--- a/src/views/home/rule/alarm/components/alarmTypeList.vue
+++ b/src/views/home/rule/alarm/components/alarmTypeList.vue
@@ -80,6 +80,7 @@
 const cancel = () => {
   dialogFormVisible.value = false
 }
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -90,7 +91,7 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="detailRow('create', {})">
+          <el-button v-if="proxy.hasPerm('/rule/alarm/type/add')" type="primary" @click="detailRow('create', {})">
             新增
           </el-button>
         </div>
@@ -110,10 +111,10 @@
         <template #columns>
           <el-table-column label="操作" width="120" align="center">
             <template #default="scope">
-              <el-button type="primary" link size="small" @click="detailRow('edit', scope.row)">
+              <el-button v-if="proxy.hasPerm('/rule/alarm/type/update')" type="primary" link size="small" @click="detailRow('edit', scope.row)">
                 编辑
               </el-button>
-              <el-button type="danger" link size="small" @click="removeRow(scope.row)">
+              <el-button v-if="proxy.hasPerm('/rule/alarm/type/delete')" type="danger" link size="small" @click="removeRow(scope.row)">
                 删除
               </el-button>
             </template>
diff --git a/src/views/home/rule/alarm/index.vue b/src/views/home/rule/alarm/index.vue
index 110030c..4e66a34 100644
--- a/src/views/home/rule/alarm/index.vue
+++ b/src/views/home/rule/alarm/index.vue
@@ -20,11 +20,14 @@
 // 初始展示列
 const columns = ref<any>([
   { text: '报警类型', value: 'alarmTypeName', align: 'center' },
-  { text: '报警名称', value: 'alarmName', align: 'center' },
-  { text: '报警等级', value: 'alarmLevelName', align: 'center' },
-  { text: '报警提示方式', value: 'alarmNoteMethodName', align: 'center' },
-  { text: '状态', value: 'stateName', align: 'center', width: '130' },
-  { text: '创建时间', value: 'ts', align: 'center' },
+  { text: '设备类型', value: 'typeName', align: 'center' },
+  { text: '产品', value: 'productName', align: 'center' },
+  { text: '厂商', value: 'manufacturerName', align: 'center' },
+  // { text: '报警名称', value: 'alarmName', align: 'center' },
+  { text: '报警等级', value: 'alarmLevelName', align: 'center', width: '100' },
+  { text: '报警提示方式', value: 'alarmNoteMethodName', align: 'center', width: '130', isCustom: true },
+  { text: '状态', value: 'stateName', align: 'center', width: '100', isCustom: true },
+  { text: '创建时间', value: 'ts', align: 'center', width: '200' },
 ])
 // 最终展示列
 const columnsConfig = ref([])
@@ -158,6 +161,7 @@
   await fetchDict()
   fetchData()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -191,13 +195,13 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="showAlarmType">
+          <el-button v-if="proxy.hasPerm('/rule/alarm/type')" type="primary" @click="showAlarmType">
             报警类型管理
           </el-button>
-          <el-button type="primary" @click="showAlarmLevel">
+          <el-button v-if="proxy.hasPerm('/rule/alarm/level')" type="primary" @click="showAlarmLevel">
             报警等级管理
           </el-button>
-          <el-button type="primary" @click="detailRow('create', {})">
+          <el-button v-if="proxy.hasPerm('/rule/alarm/add')" type="primary" @click="detailRow('create', {})">
             新增
           </el-button>
         </div>
@@ -214,16 +218,28 @@
             </template>
           </el-table-column>
         </template>
+        <template #isCustom="{ scope, column }">
+          <!-- 报警提示方式 -->
+          <span v-if="column.text === '报警提示方式'">
+            <el-tag v-if="scope.row.alarmNoteMethodName === '消息提醒'" type="primary">消息提醒</el-tag>
+            <el-tag v-if="scope.row.alarmNoteMethodName === '弹窗'" type="danger">弹窗提醒</el-tag>
+          </span>
+          <!-- 报警提示方式 -->
+          <span v-if="column.text === '状态'">
+            <el-tag v-if="scope.row.stateName === '启用'" type="success">启用</el-tag>
+            <el-tag v-if="scope.row.stateName === '未启用'" type="info">未启用</el-tag>
+          </span>
+        </template>
         <template #columns>
           <el-table-column label="操作" width="140" align="center">
             <template #default="scope">
-              <el-button type="primary" link size="small" @click="switchStatusRow(scope.row)">
+              <el-button v-if="proxy.hasPerm('/rule/alarm/handler')" type="primary" link size="small" @click="switchStatusRow(scope.row)">
                 {{ scope.row.state === '1' ? '停用' : '启用' }}
               </el-button>
-              <el-button type="primary" link size="small" @click="detailRow('edit', scope.row)">
+              <el-button v-if="proxy.hasPerm('/rule/alarm/update')" type="primary" link size="small" @click="detailRow('edit', scope.row)">
                 编辑
               </el-button>
-              <el-button type="danger" link size="small" @click="removeRow(scope.row)">
+              <el-button v-if="proxy.hasPerm('/rule/alarm/delete')" type="danger" link size="small" @click="removeRow(scope.row)">
                 删除
               </el-button>
             </template>
diff --git a/src/views/home/rule/special/components/editDialog.vue b/src/views/home/rule/special/components/editDialog.vue
index bb494ec..5df205b 100644
--- a/src/views/home/rule/special/components/editDialog.vue
+++ b/src/views/home/rule/special/components/editDialog.vue
@@ -8,7 +8,7 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { getDictByCode } from '@/api/system/dict'
 import { getDeviceTypeListPage } from '@/api/home/device/type'
-import { getAlarmLevelListPage, getAlarmRuleListPage } from '@/api/home/rule/alarm'
+import { getAlarmLevelListPage, getAlarmTypeListPage } from '@/api/home/rule/alarm'
 import { addSpecialAlarmRule, editSpecialAlarmRule } from '@/api/home/rule/special'
 import { getDeviceListPage } from '@/api/home/device/device'
 import { getProductListPage } from '@/api/home/device/product'
@@ -57,13 +57,15 @@
 }
 const list = ref<any[]>([])
 const columns = ref<any>([
-  { text: '报警规则', value: 'alarmRule', align: 'center', type: 'select', code: 'alarm-rule', required: true },
+  { text: '报警类型', value: 'alarmTypeId', align: 'center', type: 'select', code: 'alarm-rule', required: true },
   { text: '报警等级', value: 'alarmLevelId', align: 'center', type: 'select', code: 'alarm-level', required: true },
   { text: '报警阈值', value: 'alarmThreshold', align: 'center', type: 'input', required: true },
 ])
 // 初始化对话框
+const isFirst = ref(true)
 const initDialog = (dialogStatusValue: string, row: any) => {
   dialogStatus.value = dialogStatusValue
+  isFirst.value = true
   dialogFormVisible.value = true
   if (dialogStatus.value === 'create') { // 如果是新增，清除验证
     resetForm()
@@ -83,9 +85,13 @@
         alarmRule: row.alarmRule,
         alarmLevelId: row.alarmLevelId,
         alarmThreshold: row.alarmThreshold,
+        alarmTypeId: row.alarmTypeId,
       },
     ]
   }
+  setTimeout(() => {
+    isFirst.value = false
+  })
 }
 defineExpose({
   initDialog,
@@ -143,6 +149,7 @@
 const saveData = () => {
   const data = list.value.map((item: any) => ({
     alarmLevelId: item.alarmLevelId,
+    alarmTypeId: item.alarmTypeId,
     alarmRule: item.alarmRule,
     alarmRuleName: `${item.alarmRule}[${alarmLevelList.value.filter((citem: any) => citem.id === item.alarmLevelId)[0]?.name || ''}]:${item.alarmThreshold}%LEL`,
     alarmThreshold: item.alarmThreshold,
@@ -151,7 +158,7 @@
     position: dataForm.value.position,
     tagNumber: dataForm.value.tagNumber,
     devTypeName: deviceList.value.filter((citem: any) => citem.value === dataForm.value.devcode)[0]?.name || '',
-    alarmTypeId: alarmRuleList.value.filter((citem: any) => citem.name === item.alarmRule)[0]?.alarmTypeId || '',
+    // alarmTypeId: alarmRuleList.value.filter((citem: any) => citem.name === item.alarmRule)[0]?.alarmTypeId || '',
   }))
   if (dialogStatus.value === 'edit') {
     updateData(data)
@@ -207,7 +214,7 @@
   // 设备列表
   getDeviceListPage({ offset: 1, limit: 9999 }).then((res) => {
     deviceList.value = res.data.rows.map((item: any) => ({
-      name: item.devTypeName,
+      name: item.typeName,
       id: item.id,
       value: item.devcode,
       productId: item.productId,
@@ -223,14 +230,14 @@
       }))
     })
     // 报警规则
-    getAlarmRuleListPage({ limit: 9999, offset: 1 }).then((res) => {
-      alarmRuleList.value = res.data.rows.map((item: any) => ({
-        name: item.alarmName,
-        id: item.id,
-        value: item.id,
-        alarmTypeId: item.alarmTypeId,
-      }))
-    })
+    // getAlarmRuleListPage({ limit: 9999, offset: 1 }).then((res) => {
+    //   alarmRuleList.value = res.data.rows.map((item: any) => ({
+    //     name: item.alarmName,
+    //     id: item.id,
+    //     value: item.id,
+    //     alarmTypeId: item.alarmTypeId,
+    //   }))
+    // })
     // 报警等级
     getAlarmLevelListPage({ limit: 9999, offset: 1 }).then((res) => {
       alarmLevelList.value = res.data.rows.map((item: any) => ({
@@ -247,11 +254,26 @@
 watch(() => dataForm.value.devcode, (newVal) => {
   if (newVal) {
     const current = deviceList.value.filter((item: any) => item.value === dataForm.value.devcode)
+    console.log(current, 'current')
     if (current.length) {
       dataForm.value.productId = current[0].productId
       dataForm.value.tagNumber = current[0].tagNumber
       dataForm.value.position = current[0].position
+      // 根据设备类型寻找报警类型
+      getAlarmTypeListPage({ limit: 9999, offset: 1 }).then((res) => {
+        alarmRuleList.value = res.data.rows.filter((item: any) => item.deviceTypeName.includes(current[0].name)).map((item: any) => ({
+          name: item.alarmType,
+          id: item.id,
+          value: item.id,
+          // alarmTypeId: item.id,
+        }))
+      })
     }
+    if (isFirst.value) {
+      return
+    }
+    alarmRuleList.value = []
+    list.value = []
   }
 }, {
   deep: true,
@@ -330,12 +352,12 @@
                         <!-- 报警规则 -->
                         <template v-if="item.type === 'select' && item.code === 'alarm-rule'">
                           <el-select
-                            v-model.trim="scope.row[item.value]" placeholder="报警规则" style="width: 100%;"
+                            v-model.trim="scope.row[item.value]" placeholder="报警类型" style="width: 100%;"
                             clearable filterable :disabled="!scope.row.edit"
                           >
                             <el-option
                               v-for="item in alarmRuleList" :key="item.id" :label="item.name"
-                              :value="item.name"
+                              :value="item.id"
                             />
                           </el-select>
                         </template>
diff --git a/src/views/home/rule/special/index.vue b/src/views/home/rule/special/index.vue
index 5c7b67c..7209dfa 100644
--- a/src/views/home/rule/special/index.vue
+++ b/src/views/home/rule/special/index.vue
@@ -99,6 +99,7 @@
   await fetchDict()
   fetchData()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -127,7 +128,7 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="detail('create', {})">
+          <el-button v-if="proxy.hasPerm('/rule/special/add')" type="primary" @click="detail('create', {})">
             新增
           </el-button>
         </div>
@@ -147,13 +148,13 @@
         <template #columns>
           <el-table-column label="操作" width="140" align="center">
             <template #default="scope">
-              <el-button type="primary" link size="small" @click="detail('detail', scope.row)">
+              <el-button v-if="proxy.hasPerm('/rule/special/detail')" type="primary" link size="small" @click="detail('detail', scope.row)">
                 查看
               </el-button>
-              <el-button type="primary" link size="small" @click="detail('edit', scope.row)">
+              <el-button v-if="proxy.hasPerm('/rule/special/update')" type="primary" link size="small" @click="detail('edit', scope.row)">
                 编辑
               </el-button>
-              <el-button type="danger" link size="small" @click="removeRow(scope.row)">
+              <el-button v-if="proxy.hasPerm('/rule/special/delete')" type="danger" link size="small" @click="removeRow(scope.row)">
                 删除
               </el-button>
             </template>
diff --git a/src/views/home/station/control/index.vue b/src/views/home/station/control/index.vue
index 4510922..6657c5d 100644
--- a/src/views/home/station/control/index.vue
+++ b/src/views/home/station/control/index.vue
@@ -71,6 +71,7 @@
     },
   ]
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -114,7 +115,7 @@
               </div>
             </div>
             <div class="right1">
-              <el-card shadow="always">
+              <el-card v-if="proxy.hasPerm('/station/control/video')" shadow="always">
                 <template #header>
                   <div class="clearfix">
                     <div>云台控制</div>
diff --git a/src/views/home/station/operation/index.vue b/src/views/home/station/operation/index.vue
index 02a5e44..d3d3d09 100644
--- a/src/views/home/station/operation/index.vue
+++ b/src/views/home/station/operation/index.vue
@@ -71,6 +71,7 @@
 }
 // 重置查询条件f
 const reset = () => {
+  datetimerange.value = []
   listQuery.value = {
     limit: 20,
     offset: 1,
@@ -121,6 +122,7 @@
   await fetchDict()
   fetchData()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -160,10 +162,10 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary">
+          <el-button v-if="proxy.hasPerm('/station/operation/add')" type="primary">
             新增
           </el-button>
-          <el-button type="primary" @click="exportList">
+          <el-button v-if="proxy.hasPerm('/station/operation/export')" type="primary" @click="exportList">
             导出
           </el-button>
         </div>
diff --git a/src/views/home/station/station/components/detailData.vue b/src/views/home/station/station/components/detailData.vue
index 237b22a..c936f30 100644
--- a/src/views/home/station/station/components/detailData.vue
+++ b/src/views/home/station/station/components/detailData.vue
@@ -8,7 +8,13 @@
 import monitorData from './monitorData.vue'
 import lifeCycleRecord from '@/views/home/well/components/lifeCycleRecord.vue'
 import maintenanceRecord from '@/views/home/well/components/maintenanceRecord.vue'
-const activeName = ref('监控数据')
+const { proxy } = getCurrentInstance() as any
+const activeName = ref(
+  proxy.hasPerm('/station/monitor/data')
+    ? '监控数据'
+    : proxy.hasPerm('/station/monitor/life')
+      ? '全生命周期记录'
+      : proxy.hasPerm('/station/monitor/maintenance') ? '监控设备维护记录' : '')
 const handleClick = (tab: TabsPaneContext, event: Event) => {
   console.log(tab, event)
 }
@@ -16,13 +22,13 @@
 
 <template>
   <el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick">
-    <el-tab-pane label="监控数据" name="监控数据">
+    <el-tab-pane v-if="proxy.hasPerm('/station/monitor/data')" label="监控数据" name="监控数据">
       <monitor-data v-if="activeName === '监控数据'" />
     </el-tab-pane>
-    <el-tab-pane label="全生命周期记录" name="全生命周期记录">
+    <el-tab-pane v-if="proxy.hasPerm('/station/monitor/life')" label="全生命周期记录" name="全生命周期记录">
       <life-cycle-record v-if="activeName === '全生命周期记录'" />
     </el-tab-pane>
-    <el-tab-pane label="监控设备维护记录" name="监控设备维护记录">
+    <el-tab-pane v-if="proxy.hasPerm('/station/monitor/maintenance')" label="监控设备维护记录" name="监控设备维护记录">
       <maintenance-record v-if="activeName === '监控设备维护记录'" />
     </el-tab-pane>
   </el-tabs>
diff --git a/src/views/home/station/station/index.vue b/src/views/home/station/station/index.vue
index 32eb20c..9cd1128 100644
--- a/src/views/home/station/station/index.vue
+++ b/src/views/home/station/station/index.vue
@@ -193,6 +193,7 @@
     tableHeight.value = window.innerHeight - 60 - 50 - 10 - 98 - 10 - 52 - 52 - 10
   }
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -254,7 +255,7 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary">
+          <el-button v-if="proxy.hasPerm('/station/monitor/export')" type="primary">
             导出
           </el-button>
         </div>
@@ -274,10 +275,10 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="120">
             <template #default="scope">
-              <el-button type="primary" link size="small" @click="editRow('detail', scope.row)">
+              <el-button v-if="proxy.hasPerm('/station/monitor/detail')" type="primary" link size="small" @click="editRow('detail', scope.row)">
                 查看
               </el-button>
-              <el-button type="primary" link size="small" @click="editRow('edit', scope.row)">
+              <el-button v-if="proxy.hasPerm('/station/monitor/update')" type="primary" link size="small" @click="editRow('edit', scope.row)">
                 编辑
               </el-button>
             </template>

diff --git a/src/App.vue b/src/App.vue
index cde81b3..8a00f5d 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -125,7 +125,7 @@
         '--g-sub-sidebar-actual-width': subSidebarActualWidth,
       }"
     />
-    <system-info v-if="browserType !== 'mobile'" />
+    <!-- <system-info v-if="browserType !== 'mobile'" /> -->
     <audio id="eventAudio" src="" autoplay />
   </el-config-provider>
 </template>
diff --git a/src/layouts/components/Tools/alarmDialog.vue b/src/layouts/components/Tools/alarmDialog.vue
index 1828375..df89ab8 100644
--- a/src/layouts/components/Tools/alarmDialog.vue
+++ b/src/layouts/components/Tools/alarmDialog.vue
@@ -116,7 +116,7 @@
     </div>
     <template #footer>
       <div class="dialog-footer">
-        <div class="btn" @click="detail">
+        <div v-if="proxy.hasPerm('/alarm/current')" class="btn" @click="detail">
           查看
         </div>
         <div v-if="info.isSound === '1'" class="btn" @click="closeSound">
diff --git a/src/layouts/components/Tools/alarmList.vue b/src/layouts/components/Tools/alarmList.vue
index c3a9d2a..5356b74 100644
--- a/src/layouts/components/Tools/alarmList.vue
+++ b/src/layouts/components/Tools/alarmList.vue
@@ -54,6 +54,7 @@
 }
 // 查看当前行
 const detailRow = (row: any) => {
+  if (!proxy.hasPerm('/alarm/current')) { return }
   $router.push({
     name: 'AlarmCurrent',
     query: {
@@ -77,21 +78,6 @@
   localStorage.setItem('eventAudio', 'pause')
 }
 const dialogRef = ref()
-// const dialog = () => {
-//   const row = {
-//     alarmNoteMethod: '1', // 消息提醒 1:弹窗，2:消息提醒
-//     isSound: '1', // 报警音效，1:开，0:关
-//     isSend: '1', // 报警推送，1:开，0:关
-//     isText: '1', // 报警短息，1:开，0:关
-//     alarmType: '浓度超限',
-//     tagNumber: 'NX5702',
-//     alarmTime: '2024-09-09',
-//     value: '20',
-//     typeName: '燃气智能终端',
-//     alarmLevel: '一级',
-//   }
-//   dialogRef.value.initDialog(row)
-// }
 const fetchData = (isLoading = false) => {
   loading.value = true
   if (isLoading) {
@@ -115,7 +101,10 @@
       dialogRef.value.initDialog(newVal)
     }
     if (newVal.isSound === '1') {
-      play()
+      // play()
+      if (!localStorage.getItem('eventAudio')) {
+        proxy.playAudio()
+      }
     }
     fetchData(false)
   }
@@ -146,6 +135,7 @@
 //     window.localStorage.removeItem('token')
 //   }
 // }
+// const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -180,7 +170,7 @@
                   {{ message.processStatus
                     === '未读' ? '未读' : '已读' }}
                 </el-tag>
-                <el-tag type="info" size="small" style="margin-left: 5px;">
+                <el-tag type="info" size="small" style="margin-left: 5px;" @click="detailRow(message)">
                   查看
                 </el-tag>
               </div>
@@ -214,7 +204,7 @@
       <!-- <div class="close" @click="dialog">
         弹窗
       </div> -->
-      <div class="more" @click="moreList">
+      <div v-if="proxy.hasPerm('/alarm/current')" class="more" @click="moreList">
         查看更多
       </div>
     </div>
diff --git a/src/layouts/components/Tools/index.vue b/src/layouts/components/Tools/index.vue
index 9f2d41f..61f9707 100644
--- a/src/layouts/components/Tools/index.vue
+++ b/src/layouts/components/Tools/index.vue
@@ -79,6 +79,7 @@
   // 断开 websocket
   // websocket.destroyWebSocket()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -89,18 +90,18 @@
           <svg-icon name="ep:search" />
         </el-icon>
       </span>
-      <span class="item" @click="board">
+      <span v-if="proxy.hasPerm('/fullscreen')" class="item" @click="board">
         <el-icon>
           <svg-icon name="ep:data-line" />
         </el-icon>
       </span>
-      <span v-if="settingsStore.mode === 'pc' && settingsStore.toolbar.enableFullscreen" class="item" @click="toggle">
+      <span class="item" @click="toggle">
         <el-icon>
           <svg-icon :name="isFullscreen ? 'fullscreen-exit' : 'fullscreen'" />
         </el-icon>
       </span>
       <!-- 报警信息列表 -->
-      <span class="item">
+      <span v-if="proxy.hasPerm('/alarmnotice')" class="item">
         <el-popover width="390">
           <template #reference>
             <div>
diff --git a/src/layouts/components/Topbar/index.vue b/src/layouts/components/Topbar/index.vue
index 2863cef..4e3120e 100644
--- a/src/layouts/components/Topbar/index.vue
+++ b/src/layouts/components/Topbar/index.vue
@@ -67,7 +67,7 @@
           </transition-group>
         </el-breadcrumb>
       </div>
-      <tools />
+      <!-- <tools /> -->
     </div>
   </div>
 </template>
diff --git a/src/router/modules/pc.ts b/src/router/modules/pc.ts
index aacd6fa..97ced45 100644
--- a/src/router/modules/pc.ts
+++ b/src/router/modules/pc.ts
@@ -40,7 +40,7 @@
       icon: 'ep:key',
       sidebar: false,
       breadcrumb: false,
-      // auth: '/fullscreen',
+      auth: '/fullscreen',
     },
   },
   {
@@ -155,7 +155,7 @@
           sidebar: false,
           breadcrumb: false,
           activeMenu: '/well',
-          auth: '/well/detail',
+          auth: '/well',
         },
       },
     ],
diff --git a/src/views/home/alarm/count/components/locationAnalysis.vue b/src/views/home/alarm/count/components/locationAnalysis.vue
index fc75b9e..bff1853 100644
--- a/src/views/home/alarm/count/components/locationAnalysis.vue
+++ b/src/views/home/alarm/count/components/locationAnalysis.vue
@@ -46,6 +46,7 @@
   })
 }
 fetchData()
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -75,6 +76,9 @@
         <el-button type="primary" style="margin: 0 5px;" @click="fetchData">
           搜索
         </el-button>
+        <el-button v-if="proxy.hasPerm('/alarm/count/exportLocation')" type="primary" style="margin: 0 5px;">
+          导出
+        </el-button>
       </div>
     </template>
     <template #content>
diff --git a/src/views/home/alarm/current/components/detail.vue b/src/views/home/alarm/current/components/detail.vue
index dd3b31a..4204c92 100644
--- a/src/views/home/alarm/current/components/detail.vue
+++ b/src/views/home/alarm/current/components/detail.vue
@@ -111,7 +111,7 @@
   const res2 = await getAlarmTypeListPage({ offset: 1, limit: 9999 });
   ($route.query.type === 'history' ? getAlarmDetail : getAlarmDetail)($route.query.id as string).then((res) => {
     detailInfo.value = toHumpObject(res.data)
-    detailInfo.value.realAlarmName = detailInfo.value.realAlarm === '1' ? '报警' : '误报'
+    detailInfo.value.realAlarmName = detailInfo.value.realAlarm === '0' ? '是' : '否'
     detailInfo.value.alarmTypeName = res2.data.rows.filter((item: any) => item.id === detailInfo.value.alarmTypeId)[0]?.alarmType || ''
     detailInfo.value.alarmLevelName = res1.data.rows.filter((item: any) => item.id === detailInfo.value.alarmLevel)[0]?.alarmLevel || ''
     detailInfo.value.duration = detailInfo.value.ts && detailInfo.value.cancelTime ? getDateDiff(detailInfo.value.ts, detailInfo.value.cancelTime) : ''
@@ -139,6 +139,7 @@
 }
 // 点击经纬度展示地图
 const mapRef = ref()
+const { proxy } = getCurrentInstance() as any
 const showMap = (data: any) => {
   console.log(data, 'data')
   if (data.text === '位置') {
@@ -148,6 +149,13 @@
         2: 'StationMonitorDetail',
         3: 'PipelineMonitorDetail',
       } as { [key: string]: string }
+      // 判断是否有菜单权限
+      const watchObjectAuth = {
+        1: '/well',
+        2: '/station/monitor',
+        3: '/pipeline',
+      } as { [key: string]: string }
+      if (!proxy.hasPerm(watchObjectAuth[detailInfo.value.watchObject])) { return }
       $router.push({
         name: watchObject[detailInfo.value.watchObject],
         query: {
diff --git a/src/views/home/alarm/current/components/detailInfoDialog.vue b/src/views/home/alarm/current/components/detailInfoDialog.vue
index c089449..7fbf06b 100644
--- a/src/views/home/alarm/current/components/detailInfoDialog.vue
+++ b/src/views/home/alarm/current/components/detailInfoDialog.vue
@@ -114,6 +114,7 @@
   })
 }
 defineExpose({ initDialog, close })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -131,7 +132,7 @@
     <!-- 头部 -->
     <div class="header">
       <span>{{ info.alarmContent }}</span>
-      <span class="more" @click="moreData">>>更多</span>
+      <span v-if="proxy.hasPerm(type === 'data' ? '/alarm/current/more' : '/alarm/device/more')" class="more" @click="moreData">>>更多</span>
     </div>
     <div class="content">
       <div v-show="type === 'device'" class="item">
@@ -162,7 +163,7 @@
         报警设备:
         <span style="padding-left: 6px;">{{ info.devcode }} </span>
         <el-button
-          v-if="info.devTypeName === '燃气智能监测终端' || info.devTypeName === '液位检测仪' || info.devTypeName === '井盖监测仪'"
+          v-if="(info.devTypeName === '燃气智能监测终端' || info.devTypeName === '液位检测仪' || info.devTypeName === '井盖监测仪') && proxy.hasPerm('/alarm/current/data')"
           size="small" style="margin-left: 6px;" @click="viewData"
         >
           查看数据
@@ -228,7 +229,7 @@
         <span style="padding-left: 6px;">
           {{ info.confirmContent }}
         </span>
-        <el-button v-if="type === 'data'" size="small" style="padding-left: 6px;" @click="viewProcess">
+        <el-button v-if="type === 'data' && proxy.hasPerm('/alarm/current/process')" size="small" style="padding-left: 6px;" @click="viewProcess">
           流程图
         </el-button>
       </div>
@@ -246,17 +247,17 @@
       </div>
     </div>
     <div class="footer">
-      <el-button v-if="Number(info.processStatus) < 4 && type === 'data'" size="small" @click="remind">
+      <el-button v-if="(Number(info.processStatus) < 4 && type === 'data') && proxy.hasPerm('/alarm/current/remind')" size="small" @click="remind">
         提醒责任人
       </el-button>
       <el-button
-        v-if="type === 'device' && (info.processStatusName === '待处置' || info.processStatusName === '挂起')"
+        v-if="(type === 'device' && (info.processStatusName === '待处置' || info.processStatusName === '挂起')) && proxy.hasPerm('/alarm/device/handler')"
         size="small" @click="handler"
       >
         报警处置
       </el-button>
       <el-button
-        v-if="Number(info.processStatus) <= 3 || (type === 'device' && info.processStatusName === '待处置') || info.processStatusName === '挂起'"
+        v-if="(Number(info.processStatus) <= 3 || (type === 'device' && info.processStatusName === '待处置') || info.processStatusName === '挂起') && proxy.hasPerm(type === 'device' ? '/alarm/device/pending' : '/alarm/current/pending')"
         type="primary" size="small" @click="pending"
       >
         挂起
diff --git a/src/views/home/alarm/current/index.vue b/src/views/home/alarm/current/index.vue
index d019bbf..e2714bb 100644
--- a/src/views/home/alarm/current/index.vue
+++ b/src/views/home/alarm/current/index.vue
@@ -4,6 +4,7 @@
   Date: 2023-06-28
  -->
 <script lang="ts" setup name="CurrentAlarm">
+import dayjs from 'dayjs'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import { ArrowLeftBold, ArrowRightBold } from '@element-plus/icons-vue'
 import MapCom from './components/map.vue'
@@ -100,6 +101,7 @@
       path: '/alarm/current',
     })
   }
+  datetimerange.value = []
   listQuery.value = {
     limit: 20,
     offset: 1,
@@ -131,8 +133,8 @@
   if ($route.query.row) {
     loadingTable.value = true
     const row = JSON.parse($route.query.row as string)
-    getCurrentAlarmListPage({ offset: 1, limit: 99999 }).then((res) => {
-      const data = res.data.rows.filter((item: any) => item.id === row.id)
+    getCurrentAlarmListPage({ offset: 1, limit: 50 }).then((res) => {
+      const data = res.data.rows.filter((item: any) => item.id === row.alarmId)
       if (data.length) {
         list1.value = data.map((item: any) => ({
           ...item,
@@ -153,7 +155,10 @@
     })
     return
   }
-  fetchData()
+  datetimerange.value = [dayjs().subtract(7, 'day').format('YYYY-MM-DD HH:mm:ss'), dayjs().format('YYYY-MM-DD HH:mm:ss')]
+  setTimeout(() => {
+    fetchData()
+  })
 })
 // 表格标识  地图或普通
 const tableFlag = ref('normal')
@@ -181,6 +186,10 @@
 const mapRef = ref()
 const mapData = ref({})
 async function detail(row: any) {
+  if (row.processStatusName === '未读') {
+    list1.value[list1.value.findIndex((item: any) => item.id === row.id)].processStatusName = '已读'
+    row.processStatusName = '已读'
+  }
   const res = await detailAlarm(row.id)
   const data = toHumpObject(res.data)
   mapData.value = row
@@ -362,7 +371,7 @@
               <el-button v-if="proxy.hasPerm('/alarm/current/delete')" type="primary" @click="batchDeleteRow">
                 批量删除
               </el-button>
-              <el-button type="primary" @click="exportList">
+              <el-button v-if="proxy.hasPerm('/alarm/current/export')" type="primary" @click="exportList">
                 导出
               </el-button>
             </div>
@@ -383,7 +392,7 @@
               </el-table-column>
             </template>
             <template #columns>
-              <el-table-column label="操作" align="center" width="80">
+              <el-table-column v-if="proxy.hasPerm('/alarm/current/detail')" label="操作" align="center" width="80">
                 <template #default="scope">
                   <el-button type="primary" link size="small" @click="detail(scope.row)">
                     查看
diff --git a/src/views/home/alarm/history/index.vue b/src/views/home/alarm/history/index.vue
index eeb49fc..3c810c3 100644
--- a/src/views/home/alarm/history/index.vue
+++ b/src/views/home/alarm/history/index.vue
@@ -97,6 +97,7 @@
 }
 // 重置查询条件f
 const reset = () => {
+  datetimerange.value = []
   listQuery.value = {
     limit: 20,
     offset: 1,
@@ -189,6 +190,7 @@
   })
 }
 fetchDict()
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -249,7 +251,7 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="exportList">
+          <el-button v-if="proxy.hasPerm('/alarm/history/export')" type="primary" @click="exportList">
             导出
           </el-button>
         </div>
@@ -272,7 +274,7 @@
           </el-table-column>
         </template>
         <template #columns>
-          <el-table-column label="操作" align="center" width="80">
+          <el-table-column v-if="proxy.hasPerm('/alarm/history/detail')" label="操作" align="center" width="80">
             <template #default="scope">
               <el-button type="primary" link size="small" @click="moreData(scope.row)">
                 查看
diff --git a/src/views/home/dashboard/index.vue b/src/views/home/dashboard/index.vue
index d2f7e3c..42dfbed 100644
--- a/src/views/home/dashboard/index.vue
+++ b/src/views/home/dashboard/index.vue
@@ -42,7 +42,7 @@
     value: '0',
     name: '在线',
     unit: '个',
-    id: '1',
+    id: '1,2',
   },
   {
     img: img.lixian,
@@ -56,7 +56,7 @@
     value: '0',
     name: '停用',
     unit: '个',
-    id: '2',
+    id: '3',
   },
 ])
 // 工作台数据
@@ -133,7 +133,11 @@
   deviceOperationLoading.value = true
   getDeviceStatus().then((res) => {
     res.data.forEach((element: any) => {
-      const index = deviceOperationData.value.findIndex((item: any) => item.id === element.name)
+      if (element.name === '1' || element.name === '2') {
+        deviceOperationData.value[0].value = Number(deviceOperationData.value[0].value || '0') + Number(element.value)
+        return
+      }
+      const index = deviceOperationData.value.findIndex((item: any) => item.id.includes(element.name))
       if (index !== -1) {
         deviceOperationData.value[index].value = element.value
       }
diff --git a/src/views/home/device/count/components/bottom.vue b/src/views/home/device/count/components/bottom.vue
index 28a4d78..e4e56fa 100644
--- a/src/views/home/device/count/components/bottom.vue
+++ b/src/views/home/device/count/components/bottom.vue
@@ -110,6 +110,7 @@
   })
 }
 fetchDict()
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -148,7 +149,7 @@
             <template #btns-right>
               <!-- 操作 -->
               <div>
-                <el-button type="primary">
+                <el-button v-if="proxy.hasPerm('/device/count/offline/export')" type="primary">
                   导出
                 </el-button>
               </div>
diff --git a/src/views/home/device/device/index.vue b/src/views/home/device/device/index.vue
index c3970b9..9cdd606 100644
--- a/src/views/home/device/device/index.vue
+++ b/src/views/home/device/device/index.vue
@@ -88,6 +88,7 @@
 }
 // 重置查询条件f
 const reset = () => {
+  datetimerange.value = []
   listQuery.value = {
     limit: 20,
     offset: 1,
@@ -296,6 +297,7 @@
   fetchDict()
   fetchData()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -372,17 +374,17 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="editRow('add', {})">
+          <el-button v-if="proxy.hasPerm('/device/manage/add')" type="primary" @click="editRow('add', {})">
             新建
           </el-button>
-          <el-button type="primary" @click="downloadTemplate">
+          <el-button v-if="proxy.hasPerm('/device/manage/down')" type="primary" @click="downloadTemplate">
             模板下载
           </el-button>
-          <el-button type="primary" @click="importList">
+          <el-button v-if="proxy.hasPerm('/device/manage/import')" type="primary" @click="importList">
             批量导入
           </el-button>
-          <el-button type="primary" @click="exportList">
-            导出列表
+          <el-button v-if="proxy.hasPerm('/device/manage/export')" type="primary" @click="exportList">
+            导出
           </el-button>
           <input ref="fileRef" style="display: none;" type="file" accept=".xls,.xlsx" @change="onFileChange">
         </div>
@@ -409,16 +411,16 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="150">
             <template #default="scope">
-              <el-button type="primary" link size="small" @click="editRow('detail', scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/manage/detail')" type="primary" link size="small" @click="editRow('detail', scope.row)">
                 查看
               </el-button>
-              <el-button type="primary" link size="small" @click="editRow('edit', scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/manage/update')" type="primary" link size="small" @click="editRow('edit', scope.row)">
                 编辑
               </el-button>
-              <el-button type="danger" link size="small" @click="changeDefense(scope.row)">
+              <!-- <el-button v-if="proxy.hasPerm('/device/manage/add')" type="danger" link size="small" @click="changeDefense(scope.row)">
                 撤防
-              </el-button>
-              <el-button type="danger" link size="small" @click="removeRow(scope.row)">
+              </el-button> -->
+              <el-button v-if="proxy.hasPerm('/device/manage/delete')" type="danger" link size="small" @click="removeRow(scope.row)">
                 删除
               </el-button>
             </template>
diff --git a/src/views/home/device/instruction/index.vue b/src/views/home/device/instruction/index.vue
index 1e598ed..1da6706 100644
--- a/src/views/home/device/instruction/index.vue
+++ b/src/views/home/device/instruction/index.vue
@@ -78,6 +78,7 @@
 }
 // 重置查询条件f
 const reset = () => {
+  datetimerange.value = []
   listQuery.value = {
     limit: 20,
     offset: 1,
@@ -158,6 +159,7 @@
     editRef.value.initDialog('addOther', {})
   }
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -213,10 +215,10 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary">
+          <el-button v-if="proxy.hasPerm('/device/instruction/batch')" type="primary">
             批量下发
           </el-button>
-          <el-button type="primary" @click="editRow('add', {})">
+          <el-button v-if="proxy.hasPerm('/device/instruction/add')" type="primary" @click="editRow('add', {})">
             新建
           </el-button>
         </div>
@@ -236,13 +238,13 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="120">
             <template #default="scope">
-              <el-button type="primary" link size="small" @click="editRow('detail', scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/instruction/detail')" type="primary" link size="small" @click="editRow('detail', scope.row)">
                 查看
               </el-button>
-              <el-button v-if="scope.row.status === '2'" type="primary" link size="small" @click="editRow('edit', scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/instruction/again') && scope.row.status === '2'" type="primary" link size="small" @click="editRow('edit', scope.row)">
                 重新下发
               </el-button>
-              <el-button type="danger" link size="small" @click="removeRow(scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/instruction/delete')" type="danger" link size="small" @click="removeRow(scope.row)">
                 删除
               </el-button>
             </template>
diff --git a/src/views/home/device/product/index.vue b/src/views/home/device/product/index.vue
index 799fc90..fdd5463 100644
--- a/src/views/home/device/product/index.vue
+++ b/src/views/home/device/product/index.vue
@@ -128,6 +128,7 @@
   await fetchDict()
   fetchData()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -164,7 +165,7 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="editRow('add', {})">
+          <el-button v-if="proxy.hasPerm('/device/product/add')" type="primary" @click="editRow('add', {})">
             新建
           </el-button>
         </div>
@@ -184,10 +185,10 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="120">
             <template #default="scope">
-              <el-button type="primary" link size="small" @click="editRow('edit', scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/product/update')" type="primary" link size="small" @click="editRow('edit', scope.row)">
                 编辑
               </el-button>
-              <el-button type="danger" link size="small" @click="removeRow(scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/product/delete')" type="danger" link size="small" @click="removeRow(scope.row)">
                 删除
               </el-button>
             </template>
diff --git a/src/views/home/device/type/index.vue b/src/views/home/device/type/index.vue
index 59f1343..2344e57 100644
--- a/src/views/home/device/type/index.vue
+++ b/src/views/home/device/type/index.vue
@@ -105,6 +105,7 @@
   await fetchDict()
   fetchData()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -131,7 +132,7 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="editRow('add', {})">
+          <el-button v-if="proxy.hasPerm('/device/type/add')" type="primary" @click="editRow('add', {})">
             新建
           </el-button>
         </div>
@@ -151,10 +152,10 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="120">
             <template #default="scope">
-              <el-button type="primary" link size="small" @click="editRow('edit', scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/type/update')" type="primary" link size="small" @click="editRow('edit', scope.row)">
                 编辑
               </el-button>
-              <el-button type="danger" link size="small" @click="removeRow(scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/type/delete')" type="danger" link size="small" @click="removeRow(scope.row)">
                 删除
               </el-button>
             </template>
diff --git a/src/views/home/ledger/ledger/components/gridList.vue b/src/views/home/ledger/ledger/components/gridList.vue
index d03cd9f..189edef 100644
--- a/src/views/home/ledger/ledger/components/gridList.vue
+++ b/src/views/home/ledger/ledger/components/gridList.vue
@@ -91,6 +91,7 @@
     // })
   })
 }
+const { proxy } = getCurrentInstance() as any
 // 同步日志
 const allSync = () => {
   $router.push({
@@ -139,10 +140,10 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="allSync">
+          <el-button v-if="proxy.hasPerm('/ledger/sync')" type="primary" @click="allSync">
             同步日志
           </el-button>
-          <el-button type="primary" @click="sync('all', {})">
+          <el-button v-if="proxy.hasPerm('/ledger/sync/all')" type="primary" @click="sync('all', {})">
             全量同步
           </el-button>
         </div>
@@ -160,9 +161,9 @@
           </el-table-column>
         </template>
         <template #columns>
-          <el-table-column label="操作" align="center" width="80">
+          <el-table-column v-if="proxy.hasPerm('/ledger/sync/single')" label="操作" align="center" width="80">
             <template #default="scope">
-              <el-button type="primary" link size="small" @click="sync('single', scope.row)">
+              <el-button v-if="proxy.hasPerm('/ledger/sync/single')" type="primary" link size="small" @click="sync('single', scope.row)">
                 同步
               </el-button>
             </template>
diff --git a/src/views/home/ledger/ledger/components/wellList.vue b/src/views/home/ledger/ledger/components/wellList.vue
index 9eb1f43..06f855a 100644
--- a/src/views/home/ledger/ledger/components/wellList.vue
+++ b/src/views/home/ledger/ledger/components/wellList.vue
@@ -123,6 +123,7 @@
   // await fetchDict()
   fetchData()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -159,11 +160,11 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="allSync">
+          <el-button v-if="proxy.hasPerm('/ledger/sync')" type="primary" @click="allSync">
             同步日志
           </el-button>
-          <el-button type="primary" @click="sync('all', {})">
-            全部同步
+          <el-button v-if="proxy.hasPerm('/ledger/sync/all')" type="primary" @click="sync('all', {})">
+            全量同步
           </el-button>
         </div>
       </template>
@@ -180,9 +181,9 @@
           </el-table-column>
         </template>
         <template #columns>
-          <el-table-column label="操作" align="center" width="80">
+          <el-table-column v-if="proxy.hasPerm('/ledger/sync/single')" label="操作" align="center" width="80">
             <template #default="scope">
-              <el-button type="primary" link size="small" @click="sync('single', scope.row)">
+              <el-button v-if="proxy.hasPerm('/ledger/sync/single')" type="primary" link size="small" @click="sync('single', scope.row)">
                 同步
               </el-button>
             </template>
diff --git a/src/views/home/ledger/ledger/index.vue b/src/views/home/ledger/ledger/index.vue
index a03aa12..8403fc5 100644
--- a/src/views/home/ledger/ledger/index.vue
+++ b/src/views/home/ledger/ledger/index.vue
@@ -7,7 +7,16 @@
 import type { TabsPaneContext } from 'element-plus'
 import wellList from './components/wellList.vue'
 import gridList from './components/gridList.vue'
-const activeName = ref('闸井')
+const { proxy } = getCurrentInstance() as any
+const activeName = ref(
+  proxy.hasPerm('/ledger/manage/well')
+    ? '闸井'
+    : proxy.hasPerm('/ledger/manage/station')
+      ? '场站'
+      : proxy.hasPerm('/ledger/manage/grid')
+        ? '网格'
+        : '',
+)
 const handleClick = (tab: TabsPaneContext, event: Event) => {
   // console.log(tab, event)
 }
@@ -17,13 +26,13 @@
   <!-- 布局 -->
   <app-container>
     <el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick">
-      <el-tab-pane label="闸井" name="闸井">
+      <el-tab-pane v-if="proxy.hasPerm('/ledger/manage/well')" label="闸井" name="闸井">
         <well-list v-if="activeName === '闸井'" type="1" />
       </el-tab-pane>
-      <el-tab-pane label="场站" name="场站">
+      <el-tab-pane v-if="proxy.hasPerm('/ledger/manage/station')" label="场站" name="场站">
         <well-list v-if="activeName === '场站'" type="2" />
       </el-tab-pane>
-      <el-tab-pane label="网格" name="网格">
+      <el-tab-pane v-if="proxy.hasPerm('/ledger/manage/grid')" label="网格" name="网格">
         <grid-list v-if="activeName === '网格'" />
       </el-tab-pane>
     </el-tabs>
diff --git a/src/views/home/ledger/pipeline/index.vue b/src/views/home/ledger/pipeline/index.vue
index e0d2512..01e95ac 100644
--- a/src/views/home/ledger/pipeline/index.vue
+++ b/src/views/home/ledger/pipeline/index.vue
@@ -160,6 +160,7 @@
 onMounted(async () => {
   fetchData()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -222,13 +223,13 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="editRow('add', {})">
+          <el-button v-if="proxy.hasPerm('/ledger/pipeline/add')" type="primary" @click="editRow('add', {})">
             新增
           </el-button>
-          <el-button type="primary" @click="importList">
+          <el-button v-if="proxy.hasPerm('/ledger/pipeline/import')" type="primary" @click="importList">
             批量导入
           </el-button>
-          <el-button type="primary" @click="exportList">
+          <el-button v-if="proxy.hasPerm('/ledger/pipeline/export')" type="primary" @click="exportList">
             批量导出
           </el-button>
         </div>
@@ -248,10 +249,10 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="100">
             <template #default="scope">
-              <el-button type="primary" link size="small" @click="editRow('edit', scope.row)">
+              <el-button v-if="proxy.hasPerm('/ledger/pipeline/update')" type="primary" link size="small" @click="editRow('edit', scope.row)">
                 编辑
               </el-button>
-              <el-button type="danger" link size="small" @click="removeRow(scope.row)">
+              <el-button v-if="proxy.hasPerm('/ledger/pipeline/delete')" type="danger" link size="small" @click="removeRow(scope.row)">
                 删除
               </el-button>
             </template>
diff --git a/src/views/home/ledger/sync/index.vue b/src/views/home/ledger/sync/index.vue
index 54a3218..a04bad9 100644
--- a/src/views/home/ledger/sync/index.vue
+++ b/src/views/home/ledger/sync/index.vue
@@ -62,6 +62,7 @@
 }
 // 重置查询条件f
 const reset = () => {
+  datetimerange.value = []
   listQuery.value = {
     limit: 20,
     offset: 1,
@@ -106,6 +107,8 @@
 onMounted(async () => {
   fetchData()
 })
+const { proxy } = getCurrentInstance() as any
+const $route = useRoute()
 </script>
 
 <template>
@@ -132,7 +135,7 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="goBak">
+          <el-button v-if="$route.type" type="primary" @click="goBak">
             返回
           </el-button>
         </div>
@@ -152,10 +155,10 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="80">
             <template #default="scope">
-              <el-button type="primary" link size="small">
+              <el-button v-if="proxy.hasPerm('/ledger/sync/detail')" type="primary" link size="small">
                 查看
               </el-button>
-              <el-button type="danger" link size="small" @click="removeRow(scope.row)">
+              <el-button v-if="proxy.hasPerm('/ledger/sync/delete')" type="danger" link size="small" @click="removeRow(scope.row)">
                 删除
               </el-button>
             </template>
diff --git a/src/views/home/monitor/service/index.vue b/src/views/home/monitor/service/index.vue
index 8df2239..570dc68 100644
--- a/src/views/home/monitor/service/index.vue
+++ b/src/views/home/monitor/service/index.vue
@@ -53,6 +53,7 @@
 onMounted(async () => {
   fetchData()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -66,7 +67,7 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary">
+          <el-button v-if="proxy.hasPerm('/monitor/service/add')" type="primary">
             新建
           </el-button>
         </div>
diff --git a/src/views/home/monitor/time/index.vue b/src/views/home/monitor/time/index.vue
index caa6d46..0f7f5a0 100644
--- a/src/views/home/monitor/time/index.vue
+++ b/src/views/home/monitor/time/index.vue
@@ -53,6 +53,7 @@
 onMounted(async () => {
   fetchData()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -66,7 +67,7 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary">
+          <el-button v-if="proxy.hasPerm('/monitor/time/add')" type="primary">
             新建
           </el-button>
         </div>
diff --git a/src/views/home/operation/alarm/components/detail.vue b/src/views/home/operation/alarm/components/detail.vue
index 8194cbd..4ae4a1f 100644
--- a/src/views/home/operation/alarm/components/detail.vue
+++ b/src/views/home/operation/alarm/components/detail.vue
@@ -151,6 +151,7 @@
 }
 // 点击经纬度展示地图
 const mapRef = ref()
+const { proxy } = getCurrentInstance() as any
 const showMap = (data: any) => {
   console.log(data, 'data')
   if (data.text === '位置') {
@@ -160,6 +161,13 @@
         2: 'StationMonitorDetail',
         3: 'PipelineMonitorDetail',
       } as { [key: string]: string }
+      // 判断是否有菜单权限
+      const watchObjectAuth = {
+        1: '/well',
+        2: '/station/monitor',
+        3: '/pipeline',
+      } as { [key: string]: string }
+      if (!proxy.hasPerm(watchObjectAuth[detailInfo.value.watchObject])) { return }
       $router.push({
         name: watchObject[detailInfo.value.watchObject],
         query: {
diff --git a/src/views/home/operation/alarm/index.vue b/src/views/home/operation/alarm/index.vue
index ac0f31b..e53c991 100644
--- a/src/views/home/operation/alarm/index.vue
+++ b/src/views/home/operation/alarm/index.vue
@@ -82,6 +82,7 @@
 }
 // 重置查询条件f
 const reset = () => {
+  datetimerange.value = []
   listQuery.value = {
     limit: 20,
     offset: 1,
@@ -315,7 +316,7 @@
               <el-button v-if="proxy.hasPerm('/alarm/device/delete')" type="primary" @click="batchDeleteRow">
                 批量删除
               </el-button>
-              <el-button type="primary" @click="exportList">
+              <el-button v-if="proxy.hasPerm('/alarm/device/export')" type="primary" @click="exportList">
                 导出
               </el-button>
             </div>
@@ -336,7 +337,7 @@
               </el-table-column>
             </template>
             <template #columns>
-              <el-table-column label="操作" align="center" width="80">
+              <el-table-column v-if="proxy.hasPerm('/alarm/device/detail')" label="操作" align="center" width="80">
                 <template #default="scope">
                   <el-button type="primary" link size="small" @click="detail(scope.row)">
                     查看
diff --git a/src/views/home/operation/history/index.vue b/src/views/home/operation/history/index.vue
index 5c04ff7..d96ac57 100644
--- a/src/views/home/operation/history/index.vue
+++ b/src/views/home/operation/history/index.vue
@@ -78,6 +78,7 @@
 }
 // 重置查询条件f
 const reset = () => {
+  datetimerange.value = []
   listQuery.value = {
     limit: 20,
     offset: 1,
@@ -161,6 +162,7 @@
     fetchData()
   })
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -218,7 +220,7 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="exportList">
+          <el-button v-if="proxy.hasPerm('/operation/history/export')" type="primary" @click="exportList">
             导出
           </el-button>
         </div>
@@ -241,7 +243,7 @@
           </el-table-column>
         </template>
         <template #columns>
-          <el-table-column label="操作" align="center" width="80">
+          <el-table-column v-if="proxy.hasPerm('/operation/history/detail')" label="操作" align="center" width="80">
             <template #default="scope">
               <el-button type="primary" link size="small" @click="detailRow(scope.row)">
                 查看
diff --git a/src/views/home/operation/manufacturer/index.vue b/src/views/home/operation/manufacturer/index.vue
index 4a5816a..5f647c3 100644
--- a/src/views/home/operation/manufacturer/index.vue
+++ b/src/views/home/operation/manufacturer/index.vue
@@ -75,6 +75,7 @@
 }
 // 重置查询条件f
 const reset = () => {
+  datetimerange.value = []
   listQuery.value = {
     limit: 20,
     offset: 1,
@@ -125,6 +126,7 @@
   await fetchDict()
   fetchData()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -178,7 +180,7 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="exportList">
+          <el-button v-if="proxy.hasPerm('/operation/manufacturer/export')" type="primary" @click="exportList">
             导出
           </el-button>
         </div>
diff --git a/src/views/home/operation/trajectory/index.vue b/src/views/home/operation/trajectory/index.vue
index 9312fd7..606958e 100644
--- a/src/views/home/operation/trajectory/index.vue
+++ b/src/views/home/operation/trajectory/index.vue
@@ -65,6 +65,7 @@
 }
 // 重置查询条件f
 const reset = () => {
+  datetimerange.value = []
   listQuery.value = {
     limit: 20,
     offset: 1,
@@ -114,6 +115,7 @@
   await fetchDict()
   fetchData()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -175,7 +177,7 @@
           </span>
         </template>
         <template #columns>
-          <el-table-column label="操作" width="80" align="center">
+          <el-table-column v-if="proxy.hasPerm('/operation/trajectory/detail')" label="操作" width="80" align="center">
             <template #default="scope">
               <el-button type="primary" link size="small" @click="detail(scope.row)">
                 查看
diff --git a/src/views/home/pipeline/components/detailData.vue b/src/views/home/pipeline/components/detailData.vue
index 80b6886..760b1c5 100644
--- a/src/views/home/pipeline/components/detailData.vue
+++ b/src/views/home/pipeline/components/detailData.vue
@@ -7,7 +7,13 @@
 import type { TabsPaneContext } from 'element-plus'
 import monitorData from './monitorDataList.vue'
 import maintenanceRecord from '@/views/home/well/components/maintenanceRecord.vue'
-const activeName = ref('监控数据')
+const { proxy } = getCurrentInstance() as any
+const activeName = ref(
+  proxy.hasPerm('/pipeline/monitor/data')
+    ? '监控数据'
+    : proxy.hasPerm('/pipeline/monitor/maintenance')
+      ? '监控设备维护记录'
+      : '')
 const handleClick = (tab: TabsPaneContext, event: Event) => {
   // console.log(tab, event)
 }
@@ -15,10 +21,10 @@
 
 <template>
   <el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick">
-    <el-tab-pane label="监控数据" name="监控数据">
+    <el-tab-pane v-if="proxy.hasPerm('/pipeline/monitor/data')" label="监控数据" name="监控数据">
       <monitor-data v-if="activeName === '监控数据'" />
     </el-tab-pane>
-    <el-tab-pane label="监控设备维护记录" name="监控设备维护记录">
+    <el-tab-pane v-if="proxy.hasPerm('/pipeline/monitor/maintenance')" label="监控设备维护记录" name="监控设备维护记录">
       <maintenance-record v-if="activeName === '监控设备维护记录'" />
     </el-tab-pane>
   </el-tabs>
diff --git a/src/views/home/pipeline/index.vue b/src/views/home/pipeline/index.vue
index 90baef0..4d66e51 100644
--- a/src/views/home/pipeline/index.vue
+++ b/src/views/home/pipeline/index.vue
@@ -254,6 +254,7 @@
     tableHeight.value = window.innerHeight - 60 - 50 - 10 - 98 - 10 - 52 - 52 - 10
   }
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -348,7 +349,7 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary">
+          <el-button v-if="proxy.hasPerm('/pipeline/export')" type="primary">
             导出
           </el-button>
         </div>
@@ -368,7 +369,7 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="80">
             <template #default="scope">
-              <el-button type="primary" link size="small" @click="editRow('detail', scope.row)">
+              <el-button v-if="proxy.hasPerm('/pipeline/detail')" type="primary" link size="small" @click="editRow('detail', scope.row)">
                 查看
               </el-button>
               <!-- <el-button type="primary" link size="small" @click="editRow('edit', scope.row)">
diff --git a/src/views/home/rule/agreement/index.vue b/src/views/home/rule/agreement/index.vue
index fd41cd3..f1cfe15 100644
--- a/src/views/home/rule/agreement/index.vue
+++ b/src/views/home/rule/agreement/index.vue
@@ -95,6 +95,7 @@
 onMounted(async () => {
   fetchData()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -119,7 +120,7 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="editRow('add', {})">
+          <el-button v-if="proxy.hasPerm('/rule/agreement/add')" type="primary" @click="editRow('add', {})">
             新建
           </el-button>
         </div>
@@ -139,10 +140,10 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="120">
             <template #default="scope">
-              <el-button type="primary" link size="small" @click="editRow('edit', scope.row)">
+              <el-button v-if="proxy.hasPerm('/rule/agreement/update')" type="primary" link size="small" @click="editRow('edit', scope.row)">
                 编辑
               </el-button>
-              <el-button type="danger" link size="small" @click="removeRow(scope.row)">
+              <el-button v-if="proxy.hasPerm('/rule/agreement/delete')" type="danger" link size="small" @click="removeRow(scope.row)">
                 删除
               </el-button>
             </template>
diff --git a/src/views/home/rule/alarm/components/alarmLevelList.vue b/src/views/home/rule/alarm/components/alarmLevelList.vue
index c8ffb7d..6c337c4 100644
--- a/src/views/home/rule/alarm/components/alarmLevelList.vue
+++ b/src/views/home/rule/alarm/components/alarmLevelList.vue
@@ -87,6 +87,7 @@
 const cancel = () => {
   dialogFormVisible.value = false
 }
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -97,7 +98,7 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="detailRow('create', {})">
+          <el-button v-if="proxy.hasPerm('/rule/alarm/level/add')" type="primary" @click="detailRow('create', {})">
             新增
           </el-button>
         </div>
@@ -117,10 +118,10 @@
         <template #columns>
           <el-table-column label="操作" width="120" align="center">
             <template #default="scope">
-              <el-button type="primary" link size="small" @click="detailRow('edit', scope.row)">
+              <el-button v-if="proxy.hasPerm('/rule/alarm/level/update')" type="primary" link size="small" @click="detailRow('edit', scope.row)">
                 编辑
               </el-button>
-              <el-button type="danger" link size="small" @click="removeRow(scope.row)">
+              <el-button v-if="proxy.hasPerm('/rule/alarm/level/delete')" type="danger" link size="small" @click="removeRow(scope.row)">
                 删除
               </el-button>
             </template>
diff --git a/src/views/home/rule/alarm/components/alarmTypeList.vue b/src/views/home/rule/alarm/components/alarmTypeList.vue
index 2cbf110..aa0cfed 100644
--- a/src/views/home/rule/alarm/components/alarmTypeList.vue
+++ b/src/views/home/rule/alarm/components/alarmTypeList.vue
@@ -80,6 +80,7 @@
 const cancel = () => {
   dialogFormVisible.value = false
 }
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -90,7 +91,7 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="detailRow('create', {})">
+          <el-button v-if="proxy.hasPerm('/rule/alarm/type/add')" type="primary" @click="detailRow('create', {})">
             新增
           </el-button>
         </div>
@@ -110,10 +111,10 @@
         <template #columns>
           <el-table-column label="操作" width="120" align="center">
             <template #default="scope">
-              <el-button type="primary" link size="small" @click="detailRow('edit', scope.row)">
+              <el-button v-if="proxy.hasPerm('/rule/alarm/type/update')" type="primary" link size="small" @click="detailRow('edit', scope.row)">
                 编辑
               </el-button>
-              <el-button type="danger" link size="small" @click="removeRow(scope.row)">
+              <el-button v-if="proxy.hasPerm('/rule/alarm/type/delete')" type="danger" link size="small" @click="removeRow(scope.row)">
                 删除
               </el-button>
             </template>
diff --git a/src/views/home/rule/alarm/index.vue b/src/views/home/rule/alarm/index.vue
index 110030c..4e66a34 100644
--- a/src/views/home/rule/alarm/index.vue
+++ b/src/views/home/rule/alarm/index.vue
@@ -20,11 +20,14 @@
 // 初始展示列
 const columns = ref<any>([
   { text: '报警类型', value: 'alarmTypeName', align: 'center' },
-  { text: '报警名称', value: 'alarmName', align: 'center' },
-  { text: '报警等级', value: 'alarmLevelName', align: 'center' },
-  { text: '报警提示方式', value: 'alarmNoteMethodName', align: 'center' },
-  { text: '状态', value: 'stateName', align: 'center', width: '130' },
-  { text: '创建时间', value: 'ts', align: 'center' },
+  { text: '设备类型', value: 'typeName', align: 'center' },
+  { text: '产品', value: 'productName', align: 'center' },
+  { text: '厂商', value: 'manufacturerName', align: 'center' },
+  // { text: '报警名称', value: 'alarmName', align: 'center' },
+  { text: '报警等级', value: 'alarmLevelName', align: 'center', width: '100' },
+  { text: '报警提示方式', value: 'alarmNoteMethodName', align: 'center', width: '130', isCustom: true },
+  { text: '状态', value: 'stateName', align: 'center', width: '100', isCustom: true },
+  { text: '创建时间', value: 'ts', align: 'center', width: '200' },
 ])
 // 最终展示列
 const columnsConfig = ref([])
@@ -158,6 +161,7 @@
   await fetchDict()
   fetchData()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -191,13 +195,13 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="showAlarmType">
+          <el-button v-if="proxy.hasPerm('/rule/alarm/type')" type="primary" @click="showAlarmType">
             报警类型管理
           </el-button>
-          <el-button type="primary" @click="showAlarmLevel">
+          <el-button v-if="proxy.hasPerm('/rule/alarm/level')" type="primary" @click="showAlarmLevel">
             报警等级管理
           </el-button>
-          <el-button type="primary" @click="detailRow('create', {})">
+          <el-button v-if="proxy.hasPerm('/rule/alarm/add')" type="primary" @click="detailRow('create', {})">
             新增
           </el-button>
         </div>
@@ -214,16 +218,28 @@
             </template>
           </el-table-column>
         </template>
+        <template #isCustom="{ scope, column }">
+          <!-- 报警提示方式 -->
+          <span v-if="column.text === '报警提示方式'">
+            <el-tag v-if="scope.row.alarmNoteMethodName === '消息提醒'" type="primary">消息提醒</el-tag>
+            <el-tag v-if="scope.row.alarmNoteMethodName === '弹窗'" type="danger">弹窗提醒</el-tag>
+          </span>
+          <!-- 报警提示方式 -->
+          <span v-if="column.text === '状态'">
+            <el-tag v-if="scope.row.stateName === '启用'" type="success">启用</el-tag>
+            <el-tag v-if="scope.row.stateName === '未启用'" type="info">未启用</el-tag>
+          </span>
+        </template>
         <template #columns>
           <el-table-column label="操作" width="140" align="center">
             <template #default="scope">
-              <el-button type="primary" link size="small" @click="switchStatusRow(scope.row)">
+              <el-button v-if="proxy.hasPerm('/rule/alarm/handler')" type="primary" link size="small" @click="switchStatusRow(scope.row)">
                 {{ scope.row.state === '1' ? '停用' : '启用' }}
               </el-button>
-              <el-button type="primary" link size="small" @click="detailRow('edit', scope.row)">
+              <el-button v-if="proxy.hasPerm('/rule/alarm/update')" type="primary" link size="small" @click="detailRow('edit', scope.row)">
                 编辑
               </el-button>
-              <el-button type="danger" link size="small" @click="removeRow(scope.row)">
+              <el-button v-if="proxy.hasPerm('/rule/alarm/delete')" type="danger" link size="small" @click="removeRow(scope.row)">
                 删除
               </el-button>
             </template>
diff --git a/src/views/home/rule/special/components/editDialog.vue b/src/views/home/rule/special/components/editDialog.vue
index bb494ec..5df205b 100644
--- a/src/views/home/rule/special/components/editDialog.vue
+++ b/src/views/home/rule/special/components/editDialog.vue
@@ -8,7 +8,7 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { getDictByCode } from '@/api/system/dict'
 import { getDeviceTypeListPage } from '@/api/home/device/type'
-import { getAlarmLevelListPage, getAlarmRuleListPage } from '@/api/home/rule/alarm'
+import { getAlarmLevelListPage, getAlarmTypeListPage } from '@/api/home/rule/alarm'
 import { addSpecialAlarmRule, editSpecialAlarmRule } from '@/api/home/rule/special'
 import { getDeviceListPage } from '@/api/home/device/device'
 import { getProductListPage } from '@/api/home/device/product'
@@ -57,13 +57,15 @@
 }
 const list = ref<any[]>([])
 const columns = ref<any>([
-  { text: '报警规则', value: 'alarmRule', align: 'center', type: 'select', code: 'alarm-rule', required: true },
+  { text: '报警类型', value: 'alarmTypeId', align: 'center', type: 'select', code: 'alarm-rule', required: true },
   { text: '报警等级', value: 'alarmLevelId', align: 'center', type: 'select', code: 'alarm-level', required: true },
   { text: '报警阈值', value: 'alarmThreshold', align: 'center', type: 'input', required: true },
 ])
 // 初始化对话框
+const isFirst = ref(true)
 const initDialog = (dialogStatusValue: string, row: any) => {
   dialogStatus.value = dialogStatusValue
+  isFirst.value = true
   dialogFormVisible.value = true
   if (dialogStatus.value === 'create') { // 如果是新增，清除验证
     resetForm()
@@ -83,9 +85,13 @@
         alarmRule: row.alarmRule,
         alarmLevelId: row.alarmLevelId,
         alarmThreshold: row.alarmThreshold,
+        alarmTypeId: row.alarmTypeId,
       },
     ]
   }
+  setTimeout(() => {
+    isFirst.value = false
+  })
 }
 defineExpose({
   initDialog,
@@ -143,6 +149,7 @@
 const saveData = () => {
   const data = list.value.map((item: any) => ({
     alarmLevelId: item.alarmLevelId,
+    alarmTypeId: item.alarmTypeId,
     alarmRule: item.alarmRule,
     alarmRuleName: `${item.alarmRule}[${alarmLevelList.value.filter((citem: any) => citem.id === item.alarmLevelId)[0]?.name || ''}]:${item.alarmThreshold}%LEL`,
     alarmThreshold: item.alarmThreshold,
@@ -151,7 +158,7 @@
     position: dataForm.value.position,
     tagNumber: dataForm.value.tagNumber,
     devTypeName: deviceList.value.filter((citem: any) => citem.value === dataForm.value.devcode)[0]?.name || '',
-    alarmTypeId: alarmRuleList.value.filter((citem: any) => citem.name === item.alarmRule)[0]?.alarmTypeId || '',
+    // alarmTypeId: alarmRuleList.value.filter((citem: any) => citem.name === item.alarmRule)[0]?.alarmTypeId || '',
   }))
   if (dialogStatus.value === 'edit') {
     updateData(data)
@@ -207,7 +214,7 @@
   // 设备列表
   getDeviceListPage({ offset: 1, limit: 9999 }).then((res) => {
     deviceList.value = res.data.rows.map((item: any) => ({
-      name: item.devTypeName,
+      name: item.typeName,
       id: item.id,
       value: item.devcode,
       productId: item.productId,
@@ -223,14 +230,14 @@
       }))
     })
     // 报警规则
-    getAlarmRuleListPage({ limit: 9999, offset: 1 }).then((res) => {
-      alarmRuleList.value = res.data.rows.map((item: any) => ({
-        name: item.alarmName,
-        id: item.id,
-        value: item.id,
-        alarmTypeId: item.alarmTypeId,
-      }))
-    })
+    // getAlarmRuleListPage({ limit: 9999, offset: 1 }).then((res) => {
+    //   alarmRuleList.value = res.data.rows.map((item: any) => ({
+    //     name: item.alarmName,
+    //     id: item.id,
+    //     value: item.id,
+    //     alarmTypeId: item.alarmTypeId,
+    //   }))
+    // })
     // 报警等级
     getAlarmLevelListPage({ limit: 9999, offset: 1 }).then((res) => {
       alarmLevelList.value = res.data.rows.map((item: any) => ({
@@ -247,11 +254,26 @@
 watch(() => dataForm.value.devcode, (newVal) => {
   if (newVal) {
     const current = deviceList.value.filter((item: any) => item.value === dataForm.value.devcode)
+    console.log(current, 'current')
     if (current.length) {
       dataForm.value.productId = current[0].productId
       dataForm.value.tagNumber = current[0].tagNumber
       dataForm.value.position = current[0].position
+      // 根据设备类型寻找报警类型
+      getAlarmTypeListPage({ limit: 9999, offset: 1 }).then((res) => {
+        alarmRuleList.value = res.data.rows.filter((item: any) => item.deviceTypeName.includes(current[0].name)).map((item: any) => ({
+          name: item.alarmType,
+          id: item.id,
+          value: item.id,
+          // alarmTypeId: item.id,
+        }))
+      })
     }
+    if (isFirst.value) {
+      return
+    }
+    alarmRuleList.value = []
+    list.value = []
   }
 }, {
   deep: true,
@@ -330,12 +352,12 @@
                         <!-- 报警规则 -->
                         <template v-if="item.type === 'select' && item.code === 'alarm-rule'">
                           <el-select
-                            v-model.trim="scope.row[item.value]" placeholder="报警规则" style="width: 100%;"
+                            v-model.trim="scope.row[item.value]" placeholder="报警类型" style="width: 100%;"
                             clearable filterable :disabled="!scope.row.edit"
                           >
                             <el-option
                               v-for="item in alarmRuleList" :key="item.id" :label="item.name"
-                              :value="item.name"
+                              :value="item.id"
                             />
                           </el-select>
                         </template>
diff --git a/src/views/home/rule/special/index.vue b/src/views/home/rule/special/index.vue
index 5c7b67c..7209dfa 100644
--- a/src/views/home/rule/special/index.vue
+++ b/src/views/home/rule/special/index.vue
@@ -99,6 +99,7 @@
   await fetchDict()
   fetchData()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -127,7 +128,7 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="detail('create', {})">
+          <el-button v-if="proxy.hasPerm('/rule/special/add')" type="primary" @click="detail('create', {})">
             新增
           </el-button>
         </div>
@@ -147,13 +148,13 @@
         <template #columns>
           <el-table-column label="操作" width="140" align="center">
             <template #default="scope">
-              <el-button type="primary" link size="small" @click="detail('detail', scope.row)">
+              <el-button v-if="proxy.hasPerm('/rule/special/detail')" type="primary" link size="small" @click="detail('detail', scope.row)">
                 查看
               </el-button>
-              <el-button type="primary" link size="small" @click="detail('edit', scope.row)">
+              <el-button v-if="proxy.hasPerm('/rule/special/update')" type="primary" link size="small" @click="detail('edit', scope.row)">
                 编辑
               </el-button>
-              <el-button type="danger" link size="small" @click="removeRow(scope.row)">
+              <el-button v-if="proxy.hasPerm('/rule/special/delete')" type="danger" link size="small" @click="removeRow(scope.row)">
                 删除
               </el-button>
             </template>
diff --git a/src/views/home/station/control/index.vue b/src/views/home/station/control/index.vue
index 4510922..6657c5d 100644
--- a/src/views/home/station/control/index.vue
+++ b/src/views/home/station/control/index.vue
@@ -71,6 +71,7 @@
     },
   ]
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -114,7 +115,7 @@
               </div>
             </div>
             <div class="right1">
-              <el-card shadow="always">
+              <el-card v-if="proxy.hasPerm('/station/control/video')" shadow="always">
                 <template #header>
                   <div class="clearfix">
                     <div>云台控制</div>
diff --git a/src/views/home/station/operation/index.vue b/src/views/home/station/operation/index.vue
index 02a5e44..d3d3d09 100644
--- a/src/views/home/station/operation/index.vue
+++ b/src/views/home/station/operation/index.vue
@@ -71,6 +71,7 @@
 }
 // 重置查询条件f
 const reset = () => {
+  datetimerange.value = []
   listQuery.value = {
     limit: 20,
     offset: 1,
@@ -121,6 +122,7 @@
   await fetchDict()
   fetchData()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -160,10 +162,10 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary">
+          <el-button v-if="proxy.hasPerm('/station/operation/add')" type="primary">
             新增
           </el-button>
-          <el-button type="primary" @click="exportList">
+          <el-button v-if="proxy.hasPerm('/station/operation/export')" type="primary" @click="exportList">
             导出
           </el-button>
         </div>
diff --git a/src/views/home/station/station/components/detailData.vue b/src/views/home/station/station/components/detailData.vue
index 237b22a..c936f30 100644
--- a/src/views/home/station/station/components/detailData.vue
+++ b/src/views/home/station/station/components/detailData.vue
@@ -8,7 +8,13 @@
 import monitorData from './monitorData.vue'
 import lifeCycleRecord from '@/views/home/well/components/lifeCycleRecord.vue'
 import maintenanceRecord from '@/views/home/well/components/maintenanceRecord.vue'
-const activeName = ref('监控数据')
+const { proxy } = getCurrentInstance() as any
+const activeName = ref(
+  proxy.hasPerm('/station/monitor/data')
+    ? '监控数据'
+    : proxy.hasPerm('/station/monitor/life')
+      ? '全生命周期记录'
+      : proxy.hasPerm('/station/monitor/maintenance') ? '监控设备维护记录' : '')
 const handleClick = (tab: TabsPaneContext, event: Event) => {
   console.log(tab, event)
 }
@@ -16,13 +22,13 @@
 
 <template>
   <el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick">
-    <el-tab-pane label="监控数据" name="监控数据">
+    <el-tab-pane v-if="proxy.hasPerm('/station/monitor/data')" label="监控数据" name="监控数据">
       <monitor-data v-if="activeName === '监控数据'" />
     </el-tab-pane>
-    <el-tab-pane label="全生命周期记录" name="全生命周期记录">
+    <el-tab-pane v-if="proxy.hasPerm('/station/monitor/life')" label="全生命周期记录" name="全生命周期记录">
       <life-cycle-record v-if="activeName === '全生命周期记录'" />
     </el-tab-pane>
-    <el-tab-pane label="监控设备维护记录" name="监控设备维护记录">
+    <el-tab-pane v-if="proxy.hasPerm('/station/monitor/maintenance')" label="监控设备维护记录" name="监控设备维护记录">
       <maintenance-record v-if="activeName === '监控设备维护记录'" />
     </el-tab-pane>
   </el-tabs>
diff --git a/src/views/home/station/station/index.vue b/src/views/home/station/station/index.vue
index 32eb20c..9cd1128 100644
--- a/src/views/home/station/station/index.vue
+++ b/src/views/home/station/station/index.vue
@@ -193,6 +193,7 @@
     tableHeight.value = window.innerHeight - 60 - 50 - 10 - 98 - 10 - 52 - 52 - 10
   }
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -254,7 +255,7 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary">
+          <el-button v-if="proxy.hasPerm('/station/monitor/export')" type="primary">
             导出
           </el-button>
         </div>
@@ -274,10 +275,10 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="120">
             <template #default="scope">
-              <el-button type="primary" link size="small" @click="editRow('detail', scope.row)">
+              <el-button v-if="proxy.hasPerm('/station/monitor/detail')" type="primary" link size="small" @click="editRow('detail', scope.row)">
                 查看
               </el-button>
-              <el-button type="primary" link size="small" @click="editRow('edit', scope.row)">
+              <el-button v-if="proxy.hasPerm('/station/monitor/update')" type="primary" link size="small" @click="editRow('edit', scope.row)">
                 编辑
               </el-button>
             </template>
diff --git a/src/views/home/well/components/detail.vue b/src/views/home/well/components/detail.vue
index eda3b06..55f4f08 100644
--- a/src/views/home/well/components/detail.vue
+++ b/src/views/home/well/components/detail.vue
@@ -147,6 +147,7 @@
 onMounted(() => {
   fetchWellDetail()
 })
+const detailRef = ref()
 </script>
 
 <template>
@@ -175,7 +176,7 @@
       </el-descriptions>
     </detail-block-com>
     <detail-block-com>
-      <detail-data />
+      <detail-data ref="detailRef" />
     </detail-block-com>
   </app-container>
 </template>

diff --git a/src/App.vue b/src/App.vue
index cde81b3..8a00f5d 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -125,7 +125,7 @@
         '--g-sub-sidebar-actual-width': subSidebarActualWidth,
       }"
     />
-    <system-info v-if="browserType !== 'mobile'" />
+    <!-- <system-info v-if="browserType !== 'mobile'" /> -->
     <audio id="eventAudio" src="" autoplay />
   </el-config-provider>
 </template>
diff --git a/src/layouts/components/Tools/alarmDialog.vue b/src/layouts/components/Tools/alarmDialog.vue
index 1828375..df89ab8 100644
--- a/src/layouts/components/Tools/alarmDialog.vue
+++ b/src/layouts/components/Tools/alarmDialog.vue
@@ -116,7 +116,7 @@
     </div>
     <template #footer>
       <div class="dialog-footer">
-        <div class="btn" @click="detail">
+        <div v-if="proxy.hasPerm('/alarm/current')" class="btn" @click="detail">
           查看
         </div>
         <div v-if="info.isSound === '1'" class="btn" @click="closeSound">
diff --git a/src/layouts/components/Tools/alarmList.vue b/src/layouts/components/Tools/alarmList.vue
index c3a9d2a..5356b74 100644
--- a/src/layouts/components/Tools/alarmList.vue
+++ b/src/layouts/components/Tools/alarmList.vue
@@ -54,6 +54,7 @@
 }
 // 查看当前行
 const detailRow = (row: any) => {
+  if (!proxy.hasPerm('/alarm/current')) { return }
   $router.push({
     name: 'AlarmCurrent',
     query: {
@@ -77,21 +78,6 @@
   localStorage.setItem('eventAudio', 'pause')
 }
 const dialogRef = ref()
-// const dialog = () => {
-//   const row = {
-//     alarmNoteMethod: '1', // 消息提醒 1:弹窗，2:消息提醒
-//     isSound: '1', // 报警音效，1:开，0:关
-//     isSend: '1', // 报警推送，1:开，0:关
-//     isText: '1', // 报警短息，1:开，0:关
-//     alarmType: '浓度超限',
-//     tagNumber: 'NX5702',
-//     alarmTime: '2024-09-09',
-//     value: '20',
-//     typeName: '燃气智能终端',
-//     alarmLevel: '一级',
-//   }
-//   dialogRef.value.initDialog(row)
-// }
 const fetchData = (isLoading = false) => {
   loading.value = true
   if (isLoading) {
@@ -115,7 +101,10 @@
       dialogRef.value.initDialog(newVal)
     }
     if (newVal.isSound === '1') {
-      play()
+      // play()
+      if (!localStorage.getItem('eventAudio')) {
+        proxy.playAudio()
+      }
     }
     fetchData(false)
   }
@@ -146,6 +135,7 @@
 //     window.localStorage.removeItem('token')
 //   }
 // }
+// const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -180,7 +170,7 @@
                   {{ message.processStatus
                     === '未读' ? '未读' : '已读' }}
                 </el-tag>
-                <el-tag type="info" size="small" style="margin-left: 5px;">
+                <el-tag type="info" size="small" style="margin-left: 5px;" @click="detailRow(message)">
                   查看
                 </el-tag>
               </div>
@@ -214,7 +204,7 @@
       <!-- <div class="close" @click="dialog">
         弹窗
       </div> -->
-      <div class="more" @click="moreList">
+      <div v-if="proxy.hasPerm('/alarm/current')" class="more" @click="moreList">
         查看更多
       </div>
     </div>
diff --git a/src/layouts/components/Tools/index.vue b/src/layouts/components/Tools/index.vue
index 9f2d41f..61f9707 100644
--- a/src/layouts/components/Tools/index.vue
+++ b/src/layouts/components/Tools/index.vue
@@ -79,6 +79,7 @@
   // 断开 websocket
   // websocket.destroyWebSocket()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -89,18 +90,18 @@
           <svg-icon name="ep:search" />
         </el-icon>
       </span>
-      <span class="item" @click="board">
+      <span v-if="proxy.hasPerm('/fullscreen')" class="item" @click="board">
         <el-icon>
           <svg-icon name="ep:data-line" />
         </el-icon>
       </span>
-      <span v-if="settingsStore.mode === 'pc' && settingsStore.toolbar.enableFullscreen" class="item" @click="toggle">
+      <span class="item" @click="toggle">
         <el-icon>
           <svg-icon :name="isFullscreen ? 'fullscreen-exit' : 'fullscreen'" />
         </el-icon>
       </span>
       <!-- 报警信息列表 -->
-      <span class="item">
+      <span v-if="proxy.hasPerm('/alarmnotice')" class="item">
         <el-popover width="390">
           <template #reference>
             <div>
diff --git a/src/layouts/components/Topbar/index.vue b/src/layouts/components/Topbar/index.vue
index 2863cef..4e3120e 100644
--- a/src/layouts/components/Topbar/index.vue
+++ b/src/layouts/components/Topbar/index.vue
@@ -67,7 +67,7 @@
           </transition-group>
         </el-breadcrumb>
       </div>
-      <tools />
+      <!-- <tools /> -->
     </div>
   </div>
 </template>
diff --git a/src/router/modules/pc.ts b/src/router/modules/pc.ts
index aacd6fa..97ced45 100644
--- a/src/router/modules/pc.ts
+++ b/src/router/modules/pc.ts
@@ -40,7 +40,7 @@
       icon: 'ep:key',
       sidebar: false,
       breadcrumb: false,
-      // auth: '/fullscreen',
+      auth: '/fullscreen',
     },
   },
   {
@@ -155,7 +155,7 @@
           sidebar: false,
           breadcrumb: false,
           activeMenu: '/well',
-          auth: '/well/detail',
+          auth: '/well',
         },
       },
     ],
diff --git a/src/views/home/alarm/count/components/locationAnalysis.vue b/src/views/home/alarm/count/components/locationAnalysis.vue
index fc75b9e..bff1853 100644
--- a/src/views/home/alarm/count/components/locationAnalysis.vue
+++ b/src/views/home/alarm/count/components/locationAnalysis.vue
@@ -46,6 +46,7 @@
   })
 }
 fetchData()
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -75,6 +76,9 @@
         <el-button type="primary" style="margin: 0 5px;" @click="fetchData">
           搜索
         </el-button>
+        <el-button v-if="proxy.hasPerm('/alarm/count/exportLocation')" type="primary" style="margin: 0 5px;">
+          导出
+        </el-button>
       </div>
     </template>
     <template #content>
diff --git a/src/views/home/alarm/current/components/detail.vue b/src/views/home/alarm/current/components/detail.vue
index dd3b31a..4204c92 100644
--- a/src/views/home/alarm/current/components/detail.vue
+++ b/src/views/home/alarm/current/components/detail.vue
@@ -111,7 +111,7 @@
   const res2 = await getAlarmTypeListPage({ offset: 1, limit: 9999 });
   ($route.query.type === 'history' ? getAlarmDetail : getAlarmDetail)($route.query.id as string).then((res) => {
     detailInfo.value = toHumpObject(res.data)
-    detailInfo.value.realAlarmName = detailInfo.value.realAlarm === '1' ? '报警' : '误报'
+    detailInfo.value.realAlarmName = detailInfo.value.realAlarm === '0' ? '是' : '否'
     detailInfo.value.alarmTypeName = res2.data.rows.filter((item: any) => item.id === detailInfo.value.alarmTypeId)[0]?.alarmType || ''
     detailInfo.value.alarmLevelName = res1.data.rows.filter((item: any) => item.id === detailInfo.value.alarmLevel)[0]?.alarmLevel || ''
     detailInfo.value.duration = detailInfo.value.ts && detailInfo.value.cancelTime ? getDateDiff(detailInfo.value.ts, detailInfo.value.cancelTime) : ''
@@ -139,6 +139,7 @@
 }
 // 点击经纬度展示地图
 const mapRef = ref()
+const { proxy } = getCurrentInstance() as any
 const showMap = (data: any) => {
   console.log(data, 'data')
   if (data.text === '位置') {
@@ -148,6 +149,13 @@
         2: 'StationMonitorDetail',
         3: 'PipelineMonitorDetail',
       } as { [key: string]: string }
+      // 判断是否有菜单权限
+      const watchObjectAuth = {
+        1: '/well',
+        2: '/station/monitor',
+        3: '/pipeline',
+      } as { [key: string]: string }
+      if (!proxy.hasPerm(watchObjectAuth[detailInfo.value.watchObject])) { return }
       $router.push({
         name: watchObject[detailInfo.value.watchObject],
         query: {
diff --git a/src/views/home/alarm/current/components/detailInfoDialog.vue b/src/views/home/alarm/current/components/detailInfoDialog.vue
index c089449..7fbf06b 100644
--- a/src/views/home/alarm/current/components/detailInfoDialog.vue
+++ b/src/views/home/alarm/current/components/detailInfoDialog.vue
@@ -114,6 +114,7 @@
   })
 }
 defineExpose({ initDialog, close })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -131,7 +132,7 @@
     <!-- 头部 -->
     <div class="header">
       <span>{{ info.alarmContent }}</span>
-      <span class="more" @click="moreData">>>更多</span>
+      <span v-if="proxy.hasPerm(type === 'data' ? '/alarm/current/more' : '/alarm/device/more')" class="more" @click="moreData">>>更多</span>
     </div>
     <div class="content">
       <div v-show="type === 'device'" class="item">
@@ -162,7 +163,7 @@
         报警设备:
         <span style="padding-left: 6px;">{{ info.devcode }} </span>
         <el-button
-          v-if="info.devTypeName === '燃气智能监测终端' || info.devTypeName === '液位检测仪' || info.devTypeName === '井盖监测仪'"
+          v-if="(info.devTypeName === '燃气智能监测终端' || info.devTypeName === '液位检测仪' || info.devTypeName === '井盖监测仪') && proxy.hasPerm('/alarm/current/data')"
           size="small" style="margin-left: 6px;" @click="viewData"
         >
           查看数据
@@ -228,7 +229,7 @@
         <span style="padding-left: 6px;">
           {{ info.confirmContent }}
         </span>
-        <el-button v-if="type === 'data'" size="small" style="padding-left: 6px;" @click="viewProcess">
+        <el-button v-if="type === 'data' && proxy.hasPerm('/alarm/current/process')" size="small" style="padding-left: 6px;" @click="viewProcess">
           流程图
         </el-button>
       </div>
@@ -246,17 +247,17 @@
       </div>
     </div>
     <div class="footer">
-      <el-button v-if="Number(info.processStatus) < 4 && type === 'data'" size="small" @click="remind">
+      <el-button v-if="(Number(info.processStatus) < 4 && type === 'data') && proxy.hasPerm('/alarm/current/remind')" size="small" @click="remind">
         提醒责任人
       </el-button>
       <el-button
-        v-if="type === 'device' && (info.processStatusName === '待处置' || info.processStatusName === '挂起')"
+        v-if="(type === 'device' && (info.processStatusName === '待处置' || info.processStatusName === '挂起')) && proxy.hasPerm('/alarm/device/handler')"
         size="small" @click="handler"
       >
         报警处置
       </el-button>
       <el-button
-        v-if="Number(info.processStatus) <= 3 || (type === 'device' && info.processStatusName === '待处置') || info.processStatusName === '挂起'"
+        v-if="(Number(info.processStatus) <= 3 || (type === 'device' && info.processStatusName === '待处置') || info.processStatusName === '挂起') && proxy.hasPerm(type === 'device' ? '/alarm/device/pending' : '/alarm/current/pending')"
         type="primary" size="small" @click="pending"
       >
         挂起
diff --git a/src/views/home/alarm/current/index.vue b/src/views/home/alarm/current/index.vue
index d019bbf..e2714bb 100644
--- a/src/views/home/alarm/current/index.vue
+++ b/src/views/home/alarm/current/index.vue
@@ -4,6 +4,7 @@
   Date: 2023-06-28
  -->
 <script lang="ts" setup name="CurrentAlarm">
+import dayjs from 'dayjs'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import { ArrowLeftBold, ArrowRightBold } from '@element-plus/icons-vue'
 import MapCom from './components/map.vue'
@@ -100,6 +101,7 @@
       path: '/alarm/current',
     })
   }
+  datetimerange.value = []
   listQuery.value = {
     limit: 20,
     offset: 1,
@@ -131,8 +133,8 @@
   if ($route.query.row) {
     loadingTable.value = true
     const row = JSON.parse($route.query.row as string)
-    getCurrentAlarmListPage({ offset: 1, limit: 99999 }).then((res) => {
-      const data = res.data.rows.filter((item: any) => item.id === row.id)
+    getCurrentAlarmListPage({ offset: 1, limit: 50 }).then((res) => {
+      const data = res.data.rows.filter((item: any) => item.id === row.alarmId)
       if (data.length) {
         list1.value = data.map((item: any) => ({
           ...item,
@@ -153,7 +155,10 @@
     })
     return
   }
-  fetchData()
+  datetimerange.value = [dayjs().subtract(7, 'day').format('YYYY-MM-DD HH:mm:ss'), dayjs().format('YYYY-MM-DD HH:mm:ss')]
+  setTimeout(() => {
+    fetchData()
+  })
 })
 // 表格标识  地图或普通
 const tableFlag = ref('normal')
@@ -181,6 +186,10 @@
 const mapRef = ref()
 const mapData = ref({})
 async function detail(row: any) {
+  if (row.processStatusName === '未读') {
+    list1.value[list1.value.findIndex((item: any) => item.id === row.id)].processStatusName = '已读'
+    row.processStatusName = '已读'
+  }
   const res = await detailAlarm(row.id)
   const data = toHumpObject(res.data)
   mapData.value = row
@@ -362,7 +371,7 @@
               <el-button v-if="proxy.hasPerm('/alarm/current/delete')" type="primary" @click="batchDeleteRow">
                 批量删除
               </el-button>
-              <el-button type="primary" @click="exportList">
+              <el-button v-if="proxy.hasPerm('/alarm/current/export')" type="primary" @click="exportList">
                 导出
               </el-button>
             </div>
@@ -383,7 +392,7 @@
               </el-table-column>
             </template>
             <template #columns>
-              <el-table-column label="操作" align="center" width="80">
+              <el-table-column v-if="proxy.hasPerm('/alarm/current/detail')" label="操作" align="center" width="80">
                 <template #default="scope">
                   <el-button type="primary" link size="small" @click="detail(scope.row)">
                     查看
diff --git a/src/views/home/alarm/history/index.vue b/src/views/home/alarm/history/index.vue
index eeb49fc..3c810c3 100644
--- a/src/views/home/alarm/history/index.vue
+++ b/src/views/home/alarm/history/index.vue
@@ -97,6 +97,7 @@
 }
 // 重置查询条件f
 const reset = () => {
+  datetimerange.value = []
   listQuery.value = {
     limit: 20,
     offset: 1,
@@ -189,6 +190,7 @@
   })
 }
 fetchDict()
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -249,7 +251,7 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="exportList">
+          <el-button v-if="proxy.hasPerm('/alarm/history/export')" type="primary" @click="exportList">
             导出
           </el-button>
         </div>
@@ -272,7 +274,7 @@
           </el-table-column>
         </template>
         <template #columns>
-          <el-table-column label="操作" align="center" width="80">
+          <el-table-column v-if="proxy.hasPerm('/alarm/history/detail')" label="操作" align="center" width="80">
             <template #default="scope">
               <el-button type="primary" link size="small" @click="moreData(scope.row)">
                 查看
diff --git a/src/views/home/dashboard/index.vue b/src/views/home/dashboard/index.vue
index d2f7e3c..42dfbed 100644
--- a/src/views/home/dashboard/index.vue
+++ b/src/views/home/dashboard/index.vue
@@ -42,7 +42,7 @@
     value: '0',
     name: '在线',
     unit: '个',
-    id: '1',
+    id: '1,2',
   },
   {
     img: img.lixian,
@@ -56,7 +56,7 @@
     value: '0',
     name: '停用',
     unit: '个',
-    id: '2',
+    id: '3',
   },
 ])
 // 工作台数据
@@ -133,7 +133,11 @@
   deviceOperationLoading.value = true
   getDeviceStatus().then((res) => {
     res.data.forEach((element: any) => {
-      const index = deviceOperationData.value.findIndex((item: any) => item.id === element.name)
+      if (element.name === '1' || element.name === '2') {
+        deviceOperationData.value[0].value = Number(deviceOperationData.value[0].value || '0') + Number(element.value)
+        return
+      }
+      const index = deviceOperationData.value.findIndex((item: any) => item.id.includes(element.name))
       if (index !== -1) {
         deviceOperationData.value[index].value = element.value
       }
diff --git a/src/views/home/device/count/components/bottom.vue b/src/views/home/device/count/components/bottom.vue
index 28a4d78..e4e56fa 100644
--- a/src/views/home/device/count/components/bottom.vue
+++ b/src/views/home/device/count/components/bottom.vue
@@ -110,6 +110,7 @@
   })
 }
 fetchDict()
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -148,7 +149,7 @@
             <template #btns-right>
               <!-- 操作 -->
               <div>
-                <el-button type="primary">
+                <el-button v-if="proxy.hasPerm('/device/count/offline/export')" type="primary">
                   导出
                 </el-button>
               </div>
diff --git a/src/views/home/device/device/index.vue b/src/views/home/device/device/index.vue
index c3970b9..9cdd606 100644
--- a/src/views/home/device/device/index.vue
+++ b/src/views/home/device/device/index.vue
@@ -88,6 +88,7 @@
 }
 // 重置查询条件f
 const reset = () => {
+  datetimerange.value = []
   listQuery.value = {
     limit: 20,
     offset: 1,
@@ -296,6 +297,7 @@
   fetchDict()
   fetchData()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -372,17 +374,17 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="editRow('add', {})">
+          <el-button v-if="proxy.hasPerm('/device/manage/add')" type="primary" @click="editRow('add', {})">
             新建
           </el-button>
-          <el-button type="primary" @click="downloadTemplate">
+          <el-button v-if="proxy.hasPerm('/device/manage/down')" type="primary" @click="downloadTemplate">
             模板下载
           </el-button>
-          <el-button type="primary" @click="importList">
+          <el-button v-if="proxy.hasPerm('/device/manage/import')" type="primary" @click="importList">
             批量导入
           </el-button>
-          <el-button type="primary" @click="exportList">
-            导出列表
+          <el-button v-if="proxy.hasPerm('/device/manage/export')" type="primary" @click="exportList">
+            导出
           </el-button>
           <input ref="fileRef" style="display: none;" type="file" accept=".xls,.xlsx" @change="onFileChange">
         </div>
@@ -409,16 +411,16 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="150">
             <template #default="scope">
-              <el-button type="primary" link size="small" @click="editRow('detail', scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/manage/detail')" type="primary" link size="small" @click="editRow('detail', scope.row)">
                 查看
               </el-button>
-              <el-button type="primary" link size="small" @click="editRow('edit', scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/manage/update')" type="primary" link size="small" @click="editRow('edit', scope.row)">
                 编辑
               </el-button>
-              <el-button type="danger" link size="small" @click="changeDefense(scope.row)">
+              <!-- <el-button v-if="proxy.hasPerm('/device/manage/add')" type="danger" link size="small" @click="changeDefense(scope.row)">
                 撤防
-              </el-button>
-              <el-button type="danger" link size="small" @click="removeRow(scope.row)">
+              </el-button> -->
+              <el-button v-if="proxy.hasPerm('/device/manage/delete')" type="danger" link size="small" @click="removeRow(scope.row)">
                 删除
               </el-button>
             </template>
diff --git a/src/views/home/device/instruction/index.vue b/src/views/home/device/instruction/index.vue
index 1e598ed..1da6706 100644
--- a/src/views/home/device/instruction/index.vue
+++ b/src/views/home/device/instruction/index.vue
@@ -78,6 +78,7 @@
 }
 // 重置查询条件f
 const reset = () => {
+  datetimerange.value = []
   listQuery.value = {
     limit: 20,
     offset: 1,
@@ -158,6 +159,7 @@
     editRef.value.initDialog('addOther', {})
   }
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -213,10 +215,10 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary">
+          <el-button v-if="proxy.hasPerm('/device/instruction/batch')" type="primary">
             批量下发
           </el-button>
-          <el-button type="primary" @click="editRow('add', {})">
+          <el-button v-if="proxy.hasPerm('/device/instruction/add')" type="primary" @click="editRow('add', {})">
             新建
           </el-button>
         </div>
@@ -236,13 +238,13 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="120">
             <template #default="scope">
-              <el-button type="primary" link size="small" @click="editRow('detail', scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/instruction/detail')" type="primary" link size="small" @click="editRow('detail', scope.row)">
                 查看
               </el-button>
-              <el-button v-if="scope.row.status === '2'" type="primary" link size="small" @click="editRow('edit', scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/instruction/again') && scope.row.status === '2'" type="primary" link size="small" @click="editRow('edit', scope.row)">
                 重新下发
               </el-button>
-              <el-button type="danger" link size="small" @click="removeRow(scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/instruction/delete')" type="danger" link size="small" @click="removeRow(scope.row)">
                 删除
               </el-button>
             </template>
diff --git a/src/views/home/device/product/index.vue b/src/views/home/device/product/index.vue
index 799fc90..fdd5463 100644
--- a/src/views/home/device/product/index.vue
+++ b/src/views/home/device/product/index.vue
@@ -128,6 +128,7 @@
   await fetchDict()
   fetchData()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -164,7 +165,7 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="editRow('add', {})">
+          <el-button v-if="proxy.hasPerm('/device/product/add')" type="primary" @click="editRow('add', {})">
             新建
           </el-button>
         </div>
@@ -184,10 +185,10 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="120">
             <template #default="scope">
-              <el-button type="primary" link size="small" @click="editRow('edit', scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/product/update')" type="primary" link size="small" @click="editRow('edit', scope.row)">
                 编辑
               </el-button>
-              <el-button type="danger" link size="small" @click="removeRow(scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/product/delete')" type="danger" link size="small" @click="removeRow(scope.row)">
                 删除
               </el-button>
             </template>
diff --git a/src/views/home/device/type/index.vue b/src/views/home/device/type/index.vue
index 59f1343..2344e57 100644
--- a/src/views/home/device/type/index.vue
+++ b/src/views/home/device/type/index.vue
@@ -105,6 +105,7 @@
   await fetchDict()
   fetchData()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -131,7 +132,7 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="editRow('add', {})">
+          <el-button v-if="proxy.hasPerm('/device/type/add')" type="primary" @click="editRow('add', {})">
             新建
           </el-button>
         </div>
@@ -151,10 +152,10 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="120">
             <template #default="scope">
-              <el-button type="primary" link size="small" @click="editRow('edit', scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/type/update')" type="primary" link size="small" @click="editRow('edit', scope.row)">
                 编辑
               </el-button>
-              <el-button type="danger" link size="small" @click="removeRow(scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/type/delete')" type="danger" link size="small" @click="removeRow(scope.row)">
                 删除
               </el-button>
             </template>
diff --git a/src/views/home/ledger/ledger/components/gridList.vue b/src/views/home/ledger/ledger/components/gridList.vue
index d03cd9f..189edef 100644
--- a/src/views/home/ledger/ledger/components/gridList.vue
+++ b/src/views/home/ledger/ledger/components/gridList.vue
@@ -91,6 +91,7 @@
     // })
   })
 }
+const { proxy } = getCurrentInstance() as any
 // 同步日志
 const allSync = () => {
   $router.push({
@@ -139,10 +140,10 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="allSync">
+          <el-button v-if="proxy.hasPerm('/ledger/sync')" type="primary" @click="allSync">
             同步日志
           </el-button>
-          <el-button type="primary" @click="sync('all', {})">
+          <el-button v-if="proxy.hasPerm('/ledger/sync/all')" type="primary" @click="sync('all', {})">
             全量同步
           </el-button>
         </div>
@@ -160,9 +161,9 @@
           </el-table-column>
         </template>
         <template #columns>
-          <el-table-column label="操作" align="center" width="80">
+          <el-table-column v-if="proxy.hasPerm('/ledger/sync/single')" label="操作" align="center" width="80">
             <template #default="scope">
-              <el-button type="primary" link size="small" @click="sync('single', scope.row)">
+              <el-button v-if="proxy.hasPerm('/ledger/sync/single')" type="primary" link size="small" @click="sync('single', scope.row)">
                 同步
               </el-button>
             </template>
diff --git a/src/views/home/ledger/ledger/components/wellList.vue b/src/views/home/ledger/ledger/components/wellList.vue
index 9eb1f43..06f855a 100644
--- a/src/views/home/ledger/ledger/components/wellList.vue
+++ b/src/views/home/ledger/ledger/components/wellList.vue
@@ -123,6 +123,7 @@
   // await fetchDict()
   fetchData()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -159,11 +160,11 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="allSync">
+          <el-button v-if="proxy.hasPerm('/ledger/sync')" type="primary" @click="allSync">
             同步日志
           </el-button>
-          <el-button type="primary" @click="sync('all', {})">
-            全部同步
+          <el-button v-if="proxy.hasPerm('/ledger/sync/all')" type="primary" @click="sync('all', {})">
+            全量同步
           </el-button>
         </div>
       </template>
@@ -180,9 +181,9 @@
           </el-table-column>
         </template>
         <template #columns>
-          <el-table-column label="操作" align="center" width="80">
+          <el-table-column v-if="proxy.hasPerm('/ledger/sync/single')" label="操作" align="center" width="80">
             <template #default="scope">
-              <el-button type="primary" link size="small" @click="sync('single', scope.row)">
+              <el-button v-if="proxy.hasPerm('/ledger/sync/single')" type="primary" link size="small" @click="sync('single', scope.row)">
                 同步
               </el-button>
             </template>
diff --git a/src/views/home/ledger/ledger/index.vue b/src/views/home/ledger/ledger/index.vue
index a03aa12..8403fc5 100644
--- a/src/views/home/ledger/ledger/index.vue
+++ b/src/views/home/ledger/ledger/index.vue
@@ -7,7 +7,16 @@
 import type { TabsPaneContext } from 'element-plus'
 import wellList from './components/wellList.vue'
 import gridList from './components/gridList.vue'
-const activeName = ref('闸井')
+const { proxy } = getCurrentInstance() as any
+const activeName = ref(
+  proxy.hasPerm('/ledger/manage/well')
+    ? '闸井'
+    : proxy.hasPerm('/ledger/manage/station')
+      ? '场站'
+      : proxy.hasPerm('/ledger/manage/grid')
+        ? '网格'
+        : '',
+)
 const handleClick = (tab: TabsPaneContext, event: Event) => {
   // console.log(tab, event)
 }
@@ -17,13 +26,13 @@
   <!-- 布局 -->
   <app-container>
     <el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick">
-      <el-tab-pane label="闸井" name="闸井">
+      <el-tab-pane v-if="proxy.hasPerm('/ledger/manage/well')" label="闸井" name="闸井">
         <well-list v-if="activeName === '闸井'" type="1" />
       </el-tab-pane>
-      <el-tab-pane label="场站" name="场站">
+      <el-tab-pane v-if="proxy.hasPerm('/ledger/manage/station')" label="场站" name="场站">
         <well-list v-if="activeName === '场站'" type="2" />
       </el-tab-pane>
-      <el-tab-pane label="网格" name="网格">
+      <el-tab-pane v-if="proxy.hasPerm('/ledger/manage/grid')" label="网格" name="网格">
         <grid-list v-if="activeName === '网格'" />
       </el-tab-pane>
     </el-tabs>
diff --git a/src/views/home/ledger/pipeline/index.vue b/src/views/home/ledger/pipeline/index.vue
index e0d2512..01e95ac 100644
--- a/src/views/home/ledger/pipeline/index.vue
+++ b/src/views/home/ledger/pipeline/index.vue
@@ -160,6 +160,7 @@
 onMounted(async () => {
   fetchData()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -222,13 +223,13 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="editRow('add', {})">
+          <el-button v-if="proxy.hasPerm('/ledger/pipeline/add')" type="primary" @click="editRow('add', {})">
             新增
           </el-button>
-          <el-button type="primary" @click="importList">
+          <el-button v-if="proxy.hasPerm('/ledger/pipeline/import')" type="primary" @click="importList">
             批量导入
           </el-button>
-          <el-button type="primary" @click="exportList">
+          <el-button v-if="proxy.hasPerm('/ledger/pipeline/export')" type="primary" @click="exportList">
             批量导出
           </el-button>
         </div>
@@ -248,10 +249,10 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="100">
             <template #default="scope">
-              <el-button type="primary" link size="small" @click="editRow('edit', scope.row)">
+              <el-button v-if="proxy.hasPerm('/ledger/pipeline/update')" type="primary" link size="small" @click="editRow('edit', scope.row)">
                 编辑
               </el-button>
-              <el-button type="danger" link size="small" @click="removeRow(scope.row)">
+              <el-button v-if="proxy.hasPerm('/ledger/pipeline/delete')" type="danger" link size="small" @click="removeRow(scope.row)">
                 删除
               </el-button>
             </template>
diff --git a/src/views/home/ledger/sync/index.vue b/src/views/home/ledger/sync/index.vue
index 54a3218..a04bad9 100644
--- a/src/views/home/ledger/sync/index.vue
+++ b/src/views/home/ledger/sync/index.vue
@@ -62,6 +62,7 @@
 }
 // 重置查询条件f
 const reset = () => {
+  datetimerange.value = []
   listQuery.value = {
     limit: 20,
     offset: 1,
@@ -106,6 +107,8 @@
 onMounted(async () => {
   fetchData()
 })
+const { proxy } = getCurrentInstance() as any
+const $route = useRoute()
 </script>
 
 <template>
@@ -132,7 +135,7 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="goBak">
+          <el-button v-if="$route.type" type="primary" @click="goBak">
             返回
           </el-button>
         </div>
@@ -152,10 +155,10 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="80">
             <template #default="scope">
-              <el-button type="primary" link size="small">
+              <el-button v-if="proxy.hasPerm('/ledger/sync/detail')" type="primary" link size="small">
                 查看
               </el-button>
-              <el-button type="danger" link size="small" @click="removeRow(scope.row)">
+              <el-button v-if="proxy.hasPerm('/ledger/sync/delete')" type="danger" link size="small" @click="removeRow(scope.row)">
                 删除
               </el-button>
             </template>
diff --git a/src/views/home/monitor/service/index.vue b/src/views/home/monitor/service/index.vue
index 8df2239..570dc68 100644
--- a/src/views/home/monitor/service/index.vue
+++ b/src/views/home/monitor/service/index.vue
@@ -53,6 +53,7 @@
 onMounted(async () => {
   fetchData()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -66,7 +67,7 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary">
+          <el-button v-if="proxy.hasPerm('/monitor/service/add')" type="primary">
             新建
           </el-button>
         </div>
diff --git a/src/views/home/monitor/time/index.vue b/src/views/home/monitor/time/index.vue
index caa6d46..0f7f5a0 100644
--- a/src/views/home/monitor/time/index.vue
+++ b/src/views/home/monitor/time/index.vue
@@ -53,6 +53,7 @@
 onMounted(async () => {
   fetchData()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -66,7 +67,7 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary">
+          <el-button v-if="proxy.hasPerm('/monitor/time/add')" type="primary">
             新建
           </el-button>
         </div>
diff --git a/src/views/home/operation/alarm/components/detail.vue b/src/views/home/operation/alarm/components/detail.vue
index 8194cbd..4ae4a1f 100644
--- a/src/views/home/operation/alarm/components/detail.vue
+++ b/src/views/home/operation/alarm/components/detail.vue
@@ -151,6 +151,7 @@
 }
 // 点击经纬度展示地图
 const mapRef = ref()
+const { proxy } = getCurrentInstance() as any
 const showMap = (data: any) => {
   console.log(data, 'data')
   if (data.text === '位置') {
@@ -160,6 +161,13 @@
         2: 'StationMonitorDetail',
         3: 'PipelineMonitorDetail',
       } as { [key: string]: string }
+      // 判断是否有菜单权限
+      const watchObjectAuth = {
+        1: '/well',
+        2: '/station/monitor',
+        3: '/pipeline',
+      } as { [key: string]: string }
+      if (!proxy.hasPerm(watchObjectAuth[detailInfo.value.watchObject])) { return }
       $router.push({
         name: watchObject[detailInfo.value.watchObject],
         query: {
diff --git a/src/views/home/operation/alarm/index.vue b/src/views/home/operation/alarm/index.vue
index ac0f31b..e53c991 100644
--- a/src/views/home/operation/alarm/index.vue
+++ b/src/views/home/operation/alarm/index.vue
@@ -82,6 +82,7 @@
 }
 // 重置查询条件f
 const reset = () => {
+  datetimerange.value = []
   listQuery.value = {
     limit: 20,
     offset: 1,
@@ -315,7 +316,7 @@
               <el-button v-if="proxy.hasPerm('/alarm/device/delete')" type="primary" @click="batchDeleteRow">
                 批量删除
               </el-button>
-              <el-button type="primary" @click="exportList">
+              <el-button v-if="proxy.hasPerm('/alarm/device/export')" type="primary" @click="exportList">
                 导出
               </el-button>
             </div>
@@ -336,7 +337,7 @@
               </el-table-column>
             </template>
             <template #columns>
-              <el-table-column label="操作" align="center" width="80">
+              <el-table-column v-if="proxy.hasPerm('/alarm/device/detail')" label="操作" align="center" width="80">
                 <template #default="scope">
                   <el-button type="primary" link size="small" @click="detail(scope.row)">
                     查看
diff --git a/src/views/home/operation/history/index.vue b/src/views/home/operation/history/index.vue
index 5c04ff7..d96ac57 100644
--- a/src/views/home/operation/history/index.vue
+++ b/src/views/home/operation/history/index.vue
@@ -78,6 +78,7 @@
 }
 // 重置查询条件f
 const reset = () => {
+  datetimerange.value = []
   listQuery.value = {
     limit: 20,
     offset: 1,
@@ -161,6 +162,7 @@
     fetchData()
   })
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -218,7 +220,7 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="exportList">
+          <el-button v-if="proxy.hasPerm('/operation/history/export')" type="primary" @click="exportList">
             导出
           </el-button>
         </div>
@@ -241,7 +243,7 @@
           </el-table-column>
         </template>
         <template #columns>
-          <el-table-column label="操作" align="center" width="80">
+          <el-table-column v-if="proxy.hasPerm('/operation/history/detail')" label="操作" align="center" width="80">
             <template #default="scope">
               <el-button type="primary" link size="small" @click="detailRow(scope.row)">
                 查看
diff --git a/src/views/home/operation/manufacturer/index.vue b/src/views/home/operation/manufacturer/index.vue
index 4a5816a..5f647c3 100644
--- a/src/views/home/operation/manufacturer/index.vue
+++ b/src/views/home/operation/manufacturer/index.vue
@@ -75,6 +75,7 @@
 }
 // 重置查询条件f
 const reset = () => {
+  datetimerange.value = []
   listQuery.value = {
     limit: 20,
     offset: 1,
@@ -125,6 +126,7 @@
   await fetchDict()
   fetchData()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -178,7 +180,7 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="exportList">
+          <el-button v-if="proxy.hasPerm('/operation/manufacturer/export')" type="primary" @click="exportList">
             导出
           </el-button>
         </div>
diff --git a/src/views/home/operation/trajectory/index.vue b/src/views/home/operation/trajectory/index.vue
index 9312fd7..606958e 100644
--- a/src/views/home/operation/trajectory/index.vue
+++ b/src/views/home/operation/trajectory/index.vue
@@ -65,6 +65,7 @@
 }
 // 重置查询条件f
 const reset = () => {
+  datetimerange.value = []
   listQuery.value = {
     limit: 20,
     offset: 1,
@@ -114,6 +115,7 @@
   await fetchDict()
   fetchData()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -175,7 +177,7 @@
           </span>
         </template>
         <template #columns>
-          <el-table-column label="操作" width="80" align="center">
+          <el-table-column v-if="proxy.hasPerm('/operation/trajectory/detail')" label="操作" width="80" align="center">
             <template #default="scope">
               <el-button type="primary" link size="small" @click="detail(scope.row)">
                 查看
diff --git a/src/views/home/pipeline/components/detailData.vue b/src/views/home/pipeline/components/detailData.vue
index 80b6886..760b1c5 100644
--- a/src/views/home/pipeline/components/detailData.vue
+++ b/src/views/home/pipeline/components/detailData.vue
@@ -7,7 +7,13 @@
 import type { TabsPaneContext } from 'element-plus'
 import monitorData from './monitorDataList.vue'
 import maintenanceRecord from '@/views/home/well/components/maintenanceRecord.vue'
-const activeName = ref('监控数据')
+const { proxy } = getCurrentInstance() as any
+const activeName = ref(
+  proxy.hasPerm('/pipeline/monitor/data')
+    ? '监控数据'
+    : proxy.hasPerm('/pipeline/monitor/maintenance')
+      ? '监控设备维护记录'
+      : '')
 const handleClick = (tab: TabsPaneContext, event: Event) => {
   // console.log(tab, event)
 }
@@ -15,10 +21,10 @@
 
 <template>
   <el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick">
-    <el-tab-pane label="监控数据" name="监控数据">
+    <el-tab-pane v-if="proxy.hasPerm('/pipeline/monitor/data')" label="监控数据" name="监控数据">
       <monitor-data v-if="activeName === '监控数据'" />
     </el-tab-pane>
-    <el-tab-pane label="监控设备维护记录" name="监控设备维护记录">
+    <el-tab-pane v-if="proxy.hasPerm('/pipeline/monitor/maintenance')" label="监控设备维护记录" name="监控设备维护记录">
       <maintenance-record v-if="activeName === '监控设备维护记录'" />
     </el-tab-pane>
   </el-tabs>
diff --git a/src/views/home/pipeline/index.vue b/src/views/home/pipeline/index.vue
index 90baef0..4d66e51 100644
--- a/src/views/home/pipeline/index.vue
+++ b/src/views/home/pipeline/index.vue
@@ -254,6 +254,7 @@
     tableHeight.value = window.innerHeight - 60 - 50 - 10 - 98 - 10 - 52 - 52 - 10
   }
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -348,7 +349,7 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary">
+          <el-button v-if="proxy.hasPerm('/pipeline/export')" type="primary">
             导出
           </el-button>
         </div>
@@ -368,7 +369,7 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="80">
             <template #default="scope">
-              <el-button type="primary" link size="small" @click="editRow('detail', scope.row)">
+              <el-button v-if="proxy.hasPerm('/pipeline/detail')" type="primary" link size="small" @click="editRow('detail', scope.row)">
                 查看
               </el-button>
               <!-- <el-button type="primary" link size="small" @click="editRow('edit', scope.row)">
diff --git a/src/views/home/rule/agreement/index.vue b/src/views/home/rule/agreement/index.vue
index fd41cd3..f1cfe15 100644
--- a/src/views/home/rule/agreement/index.vue
+++ b/src/views/home/rule/agreement/index.vue
@@ -95,6 +95,7 @@
 onMounted(async () => {
   fetchData()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -119,7 +120,7 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="editRow('add', {})">
+          <el-button v-if="proxy.hasPerm('/rule/agreement/add')" type="primary" @click="editRow('add', {})">
             新建
           </el-button>
         </div>
@@ -139,10 +140,10 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="120">
             <template #default="scope">
-              <el-button type="primary" link size="small" @click="editRow('edit', scope.row)">
+              <el-button v-if="proxy.hasPerm('/rule/agreement/update')" type="primary" link size="small" @click="editRow('edit', scope.row)">
                 编辑
               </el-button>
-              <el-button type="danger" link size="small" @click="removeRow(scope.row)">
+              <el-button v-if="proxy.hasPerm('/rule/agreement/delete')" type="danger" link size="small" @click="removeRow(scope.row)">
                 删除
               </el-button>
             </template>
diff --git a/src/views/home/rule/alarm/components/alarmLevelList.vue b/src/views/home/rule/alarm/components/alarmLevelList.vue
index c8ffb7d..6c337c4 100644
--- a/src/views/home/rule/alarm/components/alarmLevelList.vue
+++ b/src/views/home/rule/alarm/components/alarmLevelList.vue
@@ -87,6 +87,7 @@
 const cancel = () => {
   dialogFormVisible.value = false
 }
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -97,7 +98,7 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="detailRow('create', {})">
+          <el-button v-if="proxy.hasPerm('/rule/alarm/level/add')" type="primary" @click="detailRow('create', {})">
             新增
           </el-button>
         </div>
@@ -117,10 +118,10 @@
         <template #columns>
           <el-table-column label="操作" width="120" align="center">
             <template #default="scope">
-              <el-button type="primary" link size="small" @click="detailRow('edit', scope.row)">
+              <el-button v-if="proxy.hasPerm('/rule/alarm/level/update')" type="primary" link size="small" @click="detailRow('edit', scope.row)">
                 编辑
               </el-button>
-              <el-button type="danger" link size="small" @click="removeRow(scope.row)">
+              <el-button v-if="proxy.hasPerm('/rule/alarm/level/delete')" type="danger" link size="small" @click="removeRow(scope.row)">
                 删除
               </el-button>
             </template>
diff --git a/src/views/home/rule/alarm/components/alarmTypeList.vue b/src/views/home/rule/alarm/components/alarmTypeList.vue
index 2cbf110..aa0cfed 100644
--- a/src/views/home/rule/alarm/components/alarmTypeList.vue
+++ b/src/views/home/rule/alarm/components/alarmTypeList.vue
@@ -80,6 +80,7 @@
 const cancel = () => {
   dialogFormVisible.value = false
 }
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -90,7 +91,7 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="detailRow('create', {})">
+          <el-button v-if="proxy.hasPerm('/rule/alarm/type/add')" type="primary" @click="detailRow('create', {})">
             新增
           </el-button>
         </div>
@@ -110,10 +111,10 @@
         <template #columns>
           <el-table-column label="操作" width="120" align="center">
             <template #default="scope">
-              <el-button type="primary" link size="small" @click="detailRow('edit', scope.row)">
+              <el-button v-if="proxy.hasPerm('/rule/alarm/type/update')" type="primary" link size="small" @click="detailRow('edit', scope.row)">
                 编辑
               </el-button>
-              <el-button type="danger" link size="small" @click="removeRow(scope.row)">
+              <el-button v-if="proxy.hasPerm('/rule/alarm/type/delete')" type="danger" link size="small" @click="removeRow(scope.row)">
                 删除
               </el-button>
             </template>
diff --git a/src/views/home/rule/alarm/index.vue b/src/views/home/rule/alarm/index.vue
index 110030c..4e66a34 100644
--- a/src/views/home/rule/alarm/index.vue
+++ b/src/views/home/rule/alarm/index.vue
@@ -20,11 +20,14 @@
 // 初始展示列
 const columns = ref<any>([
   { text: '报警类型', value: 'alarmTypeName', align: 'center' },
-  { text: '报警名称', value: 'alarmName', align: 'center' },
-  { text: '报警等级', value: 'alarmLevelName', align: 'center' },
-  { text: '报警提示方式', value: 'alarmNoteMethodName', align: 'center' },
-  { text: '状态', value: 'stateName', align: 'center', width: '130' },
-  { text: '创建时间', value: 'ts', align: 'center' },
+  { text: '设备类型', value: 'typeName', align: 'center' },
+  { text: '产品', value: 'productName', align: 'center' },
+  { text: '厂商', value: 'manufacturerName', align: 'center' },
+  // { text: '报警名称', value: 'alarmName', align: 'center' },
+  { text: '报警等级', value: 'alarmLevelName', align: 'center', width: '100' },
+  { text: '报警提示方式', value: 'alarmNoteMethodName', align: 'center', width: '130', isCustom: true },
+  { text: '状态', value: 'stateName', align: 'center', width: '100', isCustom: true },
+  { text: '创建时间', value: 'ts', align: 'center', width: '200' },
 ])
 // 最终展示列
 const columnsConfig = ref([])
@@ -158,6 +161,7 @@
   await fetchDict()
   fetchData()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -191,13 +195,13 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="showAlarmType">
+          <el-button v-if="proxy.hasPerm('/rule/alarm/type')" type="primary" @click="showAlarmType">
             报警类型管理
           </el-button>
-          <el-button type="primary" @click="showAlarmLevel">
+          <el-button v-if="proxy.hasPerm('/rule/alarm/level')" type="primary" @click="showAlarmLevel">
             报警等级管理
           </el-button>
-          <el-button type="primary" @click="detailRow('create', {})">
+          <el-button v-if="proxy.hasPerm('/rule/alarm/add')" type="primary" @click="detailRow('create', {})">
             新增
           </el-button>
         </div>
@@ -214,16 +218,28 @@
             </template>
           </el-table-column>
         </template>
+        <template #isCustom="{ scope, column }">
+          <!-- 报警提示方式 -->
+          <span v-if="column.text === '报警提示方式'">
+            <el-tag v-if="scope.row.alarmNoteMethodName === '消息提醒'" type="primary">消息提醒</el-tag>
+            <el-tag v-if="scope.row.alarmNoteMethodName === '弹窗'" type="danger">弹窗提醒</el-tag>
+          </span>
+          <!-- 报警提示方式 -->
+          <span v-if="column.text === '状态'">
+            <el-tag v-if="scope.row.stateName === '启用'" type="success">启用</el-tag>
+            <el-tag v-if="scope.row.stateName === '未启用'" type="info">未启用</el-tag>
+          </span>
+        </template>
         <template #columns>
           <el-table-column label="操作" width="140" align="center">
             <template #default="scope">
-              <el-button type="primary" link size="small" @click="switchStatusRow(scope.row)">
+              <el-button v-if="proxy.hasPerm('/rule/alarm/handler')" type="primary" link size="small" @click="switchStatusRow(scope.row)">
                 {{ scope.row.state === '1' ? '停用' : '启用' }}
               </el-button>
-              <el-button type="primary" link size="small" @click="detailRow('edit', scope.row)">
+              <el-button v-if="proxy.hasPerm('/rule/alarm/update')" type="primary" link size="small" @click="detailRow('edit', scope.row)">
                 编辑
               </el-button>
-              <el-button type="danger" link size="small" @click="removeRow(scope.row)">
+              <el-button v-if="proxy.hasPerm('/rule/alarm/delete')" type="danger" link size="small" @click="removeRow(scope.row)">
                 删除
               </el-button>
             </template>
diff --git a/src/views/home/rule/special/components/editDialog.vue b/src/views/home/rule/special/components/editDialog.vue
index bb494ec..5df205b 100644
--- a/src/views/home/rule/special/components/editDialog.vue
+++ b/src/views/home/rule/special/components/editDialog.vue
@@ -8,7 +8,7 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { getDictByCode } from '@/api/system/dict'
 import { getDeviceTypeListPage } from '@/api/home/device/type'
-import { getAlarmLevelListPage, getAlarmRuleListPage } from '@/api/home/rule/alarm'
+import { getAlarmLevelListPage, getAlarmTypeListPage } from '@/api/home/rule/alarm'
 import { addSpecialAlarmRule, editSpecialAlarmRule } from '@/api/home/rule/special'
 import { getDeviceListPage } from '@/api/home/device/device'
 import { getProductListPage } from '@/api/home/device/product'
@@ -57,13 +57,15 @@
 }
 const list = ref<any[]>([])
 const columns = ref<any>([
-  { text: '报警规则', value: 'alarmRule', align: 'center', type: 'select', code: 'alarm-rule', required: true },
+  { text: '报警类型', value: 'alarmTypeId', align: 'center', type: 'select', code: 'alarm-rule', required: true },
   { text: '报警等级', value: 'alarmLevelId', align: 'center', type: 'select', code: 'alarm-level', required: true },
   { text: '报警阈值', value: 'alarmThreshold', align: 'center', type: 'input', required: true },
 ])
 // 初始化对话框
+const isFirst = ref(true)
 const initDialog = (dialogStatusValue: string, row: any) => {
   dialogStatus.value = dialogStatusValue
+  isFirst.value = true
   dialogFormVisible.value = true
   if (dialogStatus.value === 'create') { // 如果是新增，清除验证
     resetForm()
@@ -83,9 +85,13 @@
         alarmRule: row.alarmRule,
         alarmLevelId: row.alarmLevelId,
         alarmThreshold: row.alarmThreshold,
+        alarmTypeId: row.alarmTypeId,
       },
     ]
   }
+  setTimeout(() => {
+    isFirst.value = false
+  })
 }
 defineExpose({
   initDialog,
@@ -143,6 +149,7 @@
 const saveData = () => {
   const data = list.value.map((item: any) => ({
     alarmLevelId: item.alarmLevelId,
+    alarmTypeId: item.alarmTypeId,
     alarmRule: item.alarmRule,
     alarmRuleName: `${item.alarmRule}[${alarmLevelList.value.filter((citem: any) => citem.id === item.alarmLevelId)[0]?.name || ''}]:${item.alarmThreshold}%LEL`,
     alarmThreshold: item.alarmThreshold,
@@ -151,7 +158,7 @@
     position: dataForm.value.position,
     tagNumber: dataForm.value.tagNumber,
     devTypeName: deviceList.value.filter((citem: any) => citem.value === dataForm.value.devcode)[0]?.name || '',
-    alarmTypeId: alarmRuleList.value.filter((citem: any) => citem.name === item.alarmRule)[0]?.alarmTypeId || '',
+    // alarmTypeId: alarmRuleList.value.filter((citem: any) => citem.name === item.alarmRule)[0]?.alarmTypeId || '',
   }))
   if (dialogStatus.value === 'edit') {
     updateData(data)
@@ -207,7 +214,7 @@
   // 设备列表
   getDeviceListPage({ offset: 1, limit: 9999 }).then((res) => {
     deviceList.value = res.data.rows.map((item: any) => ({
-      name: item.devTypeName,
+      name: item.typeName,
       id: item.id,
       value: item.devcode,
       productId: item.productId,
@@ -223,14 +230,14 @@
       }))
     })
     // 报警规则
-    getAlarmRuleListPage({ limit: 9999, offset: 1 }).then((res) => {
-      alarmRuleList.value = res.data.rows.map((item: any) => ({
-        name: item.alarmName,
-        id: item.id,
-        value: item.id,
-        alarmTypeId: item.alarmTypeId,
-      }))
-    })
+    // getAlarmRuleListPage({ limit: 9999, offset: 1 }).then((res) => {
+    //   alarmRuleList.value = res.data.rows.map((item: any) => ({
+    //     name: item.alarmName,
+    //     id: item.id,
+    //     value: item.id,
+    //     alarmTypeId: item.alarmTypeId,
+    //   }))
+    // })
     // 报警等级
     getAlarmLevelListPage({ limit: 9999, offset: 1 }).then((res) => {
       alarmLevelList.value = res.data.rows.map((item: any) => ({
@@ -247,11 +254,26 @@
 watch(() => dataForm.value.devcode, (newVal) => {
   if (newVal) {
     const current = deviceList.value.filter((item: any) => item.value === dataForm.value.devcode)
+    console.log(current, 'current')
     if (current.length) {
       dataForm.value.productId = current[0].productId
       dataForm.value.tagNumber = current[0].tagNumber
       dataForm.value.position = current[0].position
+      // 根据设备类型寻找报警类型
+      getAlarmTypeListPage({ limit: 9999, offset: 1 }).then((res) => {
+        alarmRuleList.value = res.data.rows.filter((item: any) => item.deviceTypeName.includes(current[0].name)).map((item: any) => ({
+          name: item.alarmType,
+          id: item.id,
+          value: item.id,
+          // alarmTypeId: item.id,
+        }))
+      })
     }
+    if (isFirst.value) {
+      return
+    }
+    alarmRuleList.value = []
+    list.value = []
   }
 }, {
   deep: true,
@@ -330,12 +352,12 @@
                         <!-- 报警规则 -->
                         <template v-if="item.type === 'select' && item.code === 'alarm-rule'">
                           <el-select
-                            v-model.trim="scope.row[item.value]" placeholder="报警规则" style="width: 100%;"
+                            v-model.trim="scope.row[item.value]" placeholder="报警类型" style="width: 100%;"
                             clearable filterable :disabled="!scope.row.edit"
                           >
                             <el-option
                               v-for="item in alarmRuleList" :key="item.id" :label="item.name"
-                              :value="item.name"
+                              :value="item.id"
                             />
                           </el-select>
                         </template>
diff --git a/src/views/home/rule/special/index.vue b/src/views/home/rule/special/index.vue
index 5c7b67c..7209dfa 100644
--- a/src/views/home/rule/special/index.vue
+++ b/src/views/home/rule/special/index.vue
@@ -99,6 +99,7 @@
   await fetchDict()
   fetchData()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -127,7 +128,7 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="detail('create', {})">
+          <el-button v-if="proxy.hasPerm('/rule/special/add')" type="primary" @click="detail('create', {})">
             新增
           </el-button>
         </div>
@@ -147,13 +148,13 @@
         <template #columns>
           <el-table-column label="操作" width="140" align="center">
             <template #default="scope">
-              <el-button type="primary" link size="small" @click="detail('detail', scope.row)">
+              <el-button v-if="proxy.hasPerm('/rule/special/detail')" type="primary" link size="small" @click="detail('detail', scope.row)">
                 查看
               </el-button>
-              <el-button type="primary" link size="small" @click="detail('edit', scope.row)">
+              <el-button v-if="proxy.hasPerm('/rule/special/update')" type="primary" link size="small" @click="detail('edit', scope.row)">
                 编辑
               </el-button>
-              <el-button type="danger" link size="small" @click="removeRow(scope.row)">
+              <el-button v-if="proxy.hasPerm('/rule/special/delete')" type="danger" link size="small" @click="removeRow(scope.row)">
                 删除
               </el-button>
             </template>
diff --git a/src/views/home/station/control/index.vue b/src/views/home/station/control/index.vue
index 4510922..6657c5d 100644
--- a/src/views/home/station/control/index.vue
+++ b/src/views/home/station/control/index.vue
@@ -71,6 +71,7 @@
     },
   ]
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -114,7 +115,7 @@
               </div>
             </div>
             <div class="right1">
-              <el-card shadow="always">
+              <el-card v-if="proxy.hasPerm('/station/control/video')" shadow="always">
                 <template #header>
                   <div class="clearfix">
                     <div>云台控制</div>
diff --git a/src/views/home/station/operation/index.vue b/src/views/home/station/operation/index.vue
index 02a5e44..d3d3d09 100644
--- a/src/views/home/station/operation/index.vue
+++ b/src/views/home/station/operation/index.vue
@@ -71,6 +71,7 @@
 }
 // 重置查询条件f
 const reset = () => {
+  datetimerange.value = []
   listQuery.value = {
     limit: 20,
     offset: 1,
@@ -121,6 +122,7 @@
   await fetchDict()
   fetchData()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -160,10 +162,10 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary">
+          <el-button v-if="proxy.hasPerm('/station/operation/add')" type="primary">
             新增
           </el-button>
-          <el-button type="primary" @click="exportList">
+          <el-button v-if="proxy.hasPerm('/station/operation/export')" type="primary" @click="exportList">
             导出
           </el-button>
         </div>
diff --git a/src/views/home/station/station/components/detailData.vue b/src/views/home/station/station/components/detailData.vue
index 237b22a..c936f30 100644
--- a/src/views/home/station/station/components/detailData.vue
+++ b/src/views/home/station/station/components/detailData.vue
@@ -8,7 +8,13 @@
 import monitorData from './monitorData.vue'
 import lifeCycleRecord from '@/views/home/well/components/lifeCycleRecord.vue'
 import maintenanceRecord from '@/views/home/well/components/maintenanceRecord.vue'
-const activeName = ref('监控数据')
+const { proxy } = getCurrentInstance() as any
+const activeName = ref(
+  proxy.hasPerm('/station/monitor/data')
+    ? '监控数据'
+    : proxy.hasPerm('/station/monitor/life')
+      ? '全生命周期记录'
+      : proxy.hasPerm('/station/monitor/maintenance') ? '监控设备维护记录' : '')
 const handleClick = (tab: TabsPaneContext, event: Event) => {
   console.log(tab, event)
 }
@@ -16,13 +22,13 @@
 
 <template>
   <el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick">
-    <el-tab-pane label="监控数据" name="监控数据">
+    <el-tab-pane v-if="proxy.hasPerm('/station/monitor/data')" label="监控数据" name="监控数据">
       <monitor-data v-if="activeName === '监控数据'" />
     </el-tab-pane>
-    <el-tab-pane label="全生命周期记录" name="全生命周期记录">
+    <el-tab-pane v-if="proxy.hasPerm('/station/monitor/life')" label="全生命周期记录" name="全生命周期记录">
       <life-cycle-record v-if="activeName === '全生命周期记录'" />
     </el-tab-pane>
-    <el-tab-pane label="监控设备维护记录" name="监控设备维护记录">
+    <el-tab-pane v-if="proxy.hasPerm('/station/monitor/maintenance')" label="监控设备维护记录" name="监控设备维护记录">
       <maintenance-record v-if="activeName === '监控设备维护记录'" />
     </el-tab-pane>
   </el-tabs>
diff --git a/src/views/home/station/station/index.vue b/src/views/home/station/station/index.vue
index 32eb20c..9cd1128 100644
--- a/src/views/home/station/station/index.vue
+++ b/src/views/home/station/station/index.vue
@@ -193,6 +193,7 @@
     tableHeight.value = window.innerHeight - 60 - 50 - 10 - 98 - 10 - 52 - 52 - 10
   }
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -254,7 +255,7 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary">
+          <el-button v-if="proxy.hasPerm('/station/monitor/export')" type="primary">
             导出
           </el-button>
         </div>
@@ -274,10 +275,10 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="120">
             <template #default="scope">
-              <el-button type="primary" link size="small" @click="editRow('detail', scope.row)">
+              <el-button v-if="proxy.hasPerm('/station/monitor/detail')" type="primary" link size="small" @click="editRow('detail', scope.row)">
                 查看
               </el-button>
-              <el-button type="primary" link size="small" @click="editRow('edit', scope.row)">
+              <el-button v-if="proxy.hasPerm('/station/monitor/update')" type="primary" link size="small" @click="editRow('edit', scope.row)">
                 编辑
               </el-button>
             </template>
diff --git a/src/views/home/well/components/detail.vue b/src/views/home/well/components/detail.vue
index eda3b06..55f4f08 100644
--- a/src/views/home/well/components/detail.vue
+++ b/src/views/home/well/components/detail.vue
@@ -147,6 +147,7 @@
 onMounted(() => {
   fetchWellDetail()
 })
+const detailRef = ref()
 </script>
 
 <template>
@@ -175,7 +176,7 @@
       </el-descriptions>
     </detail-block-com>
     <detail-block-com>
-      <detail-data />
+      <detail-data ref="detailRef" />
     </detail-block-com>
   </app-container>
 </template>
diff --git a/src/views/home/well/components/detailData.vue b/src/views/home/well/components/detailData.vue
index 7fcfe7b..3a1aed1 100644
--- a/src/views/home/well/components/detailData.vue
+++ b/src/views/home/well/components/detailData.vue
@@ -8,21 +8,31 @@
 import monitorData from './monitorData.vue'
 import lifeCycleRecord from './lifeCycleRecord.vue'
 import maintenanceRecord from './maintenanceRecord.vue'
-const activeName = ref('监控数据')
+const { proxy } = getCurrentInstance() as any
+const activeName = ref(
+  proxy.hasPerm('/well/monitor/data')
+    ? '监控数据'
+    : proxy.hasPerm('/well/monitor/life')
+      ? '全生命周期记录'
+      : proxy.hasPerm('/well/monitor/maintenance') ? '监控设备维护记录' : '',
+)
 const handleClick = (tab: TabsPaneContext, event: Event) => {
   console.log(tab, event)
 }
+defineExpose({
+  activeName,
+})
 </script>
 
 <template>
   <el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick">
-    <el-tab-pane label="监控数据" name="监控数据">
+    <el-tab-pane v-if="proxy.hasPerm('/well/monitor/data')" label="监控数据" name="监控数据">
       <monitor-data v-if="activeName === '监控数据'" />
     </el-tab-pane>
-    <el-tab-pane label="全生命周期记录" name="全生命周期记录">
+    <el-tab-pane v-if="proxy.hasPerm('/well/monitor/life')" label="全生命周期记录" name="全生命周期记录">
       <life-cycle-record v-if="activeName === '全生命周期记录'" />
     </el-tab-pane>
-    <el-tab-pane label="监控设备维护记录" name="监控设备维护记录">
+    <el-tab-pane v-if="proxy.hasPerm('/well/monitor/maintenance')" label="监控设备维护记录" name="监控设备维护记录">
       <maintenance-record v-if="activeName === '监控设备维护记录'" />
     </el-tab-pane>
   </el-tabs>

diff --git a/src/App.vue b/src/App.vue
index cde81b3..8a00f5d 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -125,7 +125,7 @@
         '--g-sub-sidebar-actual-width': subSidebarActualWidth,
       }"
     />
-    <system-info v-if="browserType !== 'mobile'" />
+    <!-- <system-info v-if="browserType !== 'mobile'" /> -->
     <audio id="eventAudio" src="" autoplay />
   </el-config-provider>
 </template>
diff --git a/src/layouts/components/Tools/alarmDialog.vue b/src/layouts/components/Tools/alarmDialog.vue
index 1828375..df89ab8 100644
--- a/src/layouts/components/Tools/alarmDialog.vue
+++ b/src/layouts/components/Tools/alarmDialog.vue
@@ -116,7 +116,7 @@
     </div>
     <template #footer>
       <div class="dialog-footer">
-        <div class="btn" @click="detail">
+        <div v-if="proxy.hasPerm('/alarm/current')" class="btn" @click="detail">
           查看
         </div>
         <div v-if="info.isSound === '1'" class="btn" @click="closeSound">
diff --git a/src/layouts/components/Tools/alarmList.vue b/src/layouts/components/Tools/alarmList.vue
index c3a9d2a..5356b74 100644
--- a/src/layouts/components/Tools/alarmList.vue
+++ b/src/layouts/components/Tools/alarmList.vue
@@ -54,6 +54,7 @@
 }
 // 查看当前行
 const detailRow = (row: any) => {
+  if (!proxy.hasPerm('/alarm/current')) { return }
   $router.push({
     name: 'AlarmCurrent',
     query: {
@@ -77,21 +78,6 @@
   localStorage.setItem('eventAudio', 'pause')
 }
 const dialogRef = ref()
-// const dialog = () => {
-//   const row = {
-//     alarmNoteMethod: '1', // 消息提醒 1:弹窗，2:消息提醒
-//     isSound: '1', // 报警音效，1:开，0:关
-//     isSend: '1', // 报警推送，1:开，0:关
-//     isText: '1', // 报警短息，1:开，0:关
-//     alarmType: '浓度超限',
-//     tagNumber: 'NX5702',
-//     alarmTime: '2024-09-09',
-//     value: '20',
-//     typeName: '燃气智能终端',
-//     alarmLevel: '一级',
-//   }
-//   dialogRef.value.initDialog(row)
-// }
 const fetchData = (isLoading = false) => {
   loading.value = true
   if (isLoading) {
@@ -115,7 +101,10 @@
       dialogRef.value.initDialog(newVal)
     }
     if (newVal.isSound === '1') {
-      play()
+      // play()
+      if (!localStorage.getItem('eventAudio')) {
+        proxy.playAudio()
+      }
     }
     fetchData(false)
   }
@@ -146,6 +135,7 @@
 //     window.localStorage.removeItem('token')
 //   }
 // }
+// const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -180,7 +170,7 @@
                   {{ message.processStatus
                     === '未读' ? '未读' : '已读' }}
                 </el-tag>
-                <el-tag type="info" size="small" style="margin-left: 5px;">
+                <el-tag type="info" size="small" style="margin-left: 5px;" @click="detailRow(message)">
                   查看
                 </el-tag>
               </div>
@@ -214,7 +204,7 @@
       <!-- <div class="close" @click="dialog">
         弹窗
       </div> -->
-      <div class="more" @click="moreList">
+      <div v-if="proxy.hasPerm('/alarm/current')" class="more" @click="moreList">
         查看更多
       </div>
     </div>
diff --git a/src/layouts/components/Tools/index.vue b/src/layouts/components/Tools/index.vue
index 9f2d41f..61f9707 100644
--- a/src/layouts/components/Tools/index.vue
+++ b/src/layouts/components/Tools/index.vue
@@ -79,6 +79,7 @@
   // 断开 websocket
   // websocket.destroyWebSocket()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -89,18 +90,18 @@
           <svg-icon name="ep:search" />
         </el-icon>
       </span>
-      <span class="item" @click="board">
+      <span v-if="proxy.hasPerm('/fullscreen')" class="item" @click="board">
         <el-icon>
           <svg-icon name="ep:data-line" />
         </el-icon>
       </span>
-      <span v-if="settingsStore.mode === 'pc' && settingsStore.toolbar.enableFullscreen" class="item" @click="toggle">
+      <span class="item" @click="toggle">
         <el-icon>
           <svg-icon :name="isFullscreen ? 'fullscreen-exit' : 'fullscreen'" />
         </el-icon>
       </span>
       <!-- 报警信息列表 -->
-      <span class="item">
+      <span v-if="proxy.hasPerm('/alarmnotice')" class="item">
         <el-popover width="390">
           <template #reference>
             <div>
diff --git a/src/layouts/components/Topbar/index.vue b/src/layouts/components/Topbar/index.vue
index 2863cef..4e3120e 100644
--- a/src/layouts/components/Topbar/index.vue
+++ b/src/layouts/components/Topbar/index.vue
@@ -67,7 +67,7 @@
           </transition-group>
         </el-breadcrumb>
       </div>
-      <tools />
+      <!-- <tools /> -->
     </div>
   </div>
 </template>
diff --git a/src/router/modules/pc.ts b/src/router/modules/pc.ts
index aacd6fa..97ced45 100644
--- a/src/router/modules/pc.ts
+++ b/src/router/modules/pc.ts
@@ -40,7 +40,7 @@
       icon: 'ep:key',
       sidebar: false,
       breadcrumb: false,
-      // auth: '/fullscreen',
+      auth: '/fullscreen',
     },
   },
   {
@@ -155,7 +155,7 @@
           sidebar: false,
           breadcrumb: false,
           activeMenu: '/well',
-          auth: '/well/detail',
+          auth: '/well',
         },
       },
     ],
diff --git a/src/views/home/alarm/count/components/locationAnalysis.vue b/src/views/home/alarm/count/components/locationAnalysis.vue
index fc75b9e..bff1853 100644
--- a/src/views/home/alarm/count/components/locationAnalysis.vue
+++ b/src/views/home/alarm/count/components/locationAnalysis.vue
@@ -46,6 +46,7 @@
   })
 }
 fetchData()
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -75,6 +76,9 @@
         <el-button type="primary" style="margin: 0 5px;" @click="fetchData">
           搜索
         </el-button>
+        <el-button v-if="proxy.hasPerm('/alarm/count/exportLocation')" type="primary" style="margin: 0 5px;">
+          导出
+        </el-button>
       </div>
     </template>
     <template #content>
diff --git a/src/views/home/alarm/current/components/detail.vue b/src/views/home/alarm/current/components/detail.vue
index dd3b31a..4204c92 100644
--- a/src/views/home/alarm/current/components/detail.vue
+++ b/src/views/home/alarm/current/components/detail.vue
@@ -111,7 +111,7 @@
   const res2 = await getAlarmTypeListPage({ offset: 1, limit: 9999 });
   ($route.query.type === 'history' ? getAlarmDetail : getAlarmDetail)($route.query.id as string).then((res) => {
     detailInfo.value = toHumpObject(res.data)
-    detailInfo.value.realAlarmName = detailInfo.value.realAlarm === '1' ? '报警' : '误报'
+    detailInfo.value.realAlarmName = detailInfo.value.realAlarm === '0' ? '是' : '否'
     detailInfo.value.alarmTypeName = res2.data.rows.filter((item: any) => item.id === detailInfo.value.alarmTypeId)[0]?.alarmType || ''
     detailInfo.value.alarmLevelName = res1.data.rows.filter((item: any) => item.id === detailInfo.value.alarmLevel)[0]?.alarmLevel || ''
     detailInfo.value.duration = detailInfo.value.ts && detailInfo.value.cancelTime ? getDateDiff(detailInfo.value.ts, detailInfo.value.cancelTime) : ''
@@ -139,6 +139,7 @@
 }
 // 点击经纬度展示地图
 const mapRef = ref()
+const { proxy } = getCurrentInstance() as any
 const showMap = (data: any) => {
   console.log(data, 'data')
   if (data.text === '位置') {
@@ -148,6 +149,13 @@
         2: 'StationMonitorDetail',
         3: 'PipelineMonitorDetail',
       } as { [key: string]: string }
+      // 判断是否有菜单权限
+      const watchObjectAuth = {
+        1: '/well',
+        2: '/station/monitor',
+        3: '/pipeline',
+      } as { [key: string]: string }
+      if (!proxy.hasPerm(watchObjectAuth[detailInfo.value.watchObject])) { return }
       $router.push({
         name: watchObject[detailInfo.value.watchObject],
         query: {
diff --git a/src/views/home/alarm/current/components/detailInfoDialog.vue b/src/views/home/alarm/current/components/detailInfoDialog.vue
index c089449..7fbf06b 100644
--- a/src/views/home/alarm/current/components/detailInfoDialog.vue
+++ b/src/views/home/alarm/current/components/detailInfoDialog.vue
@@ -114,6 +114,7 @@
   })
 }
 defineExpose({ initDialog, close })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -131,7 +132,7 @@
     <!-- 头部 -->
     <div class="header">
       <span>{{ info.alarmContent }}</span>
-      <span class="more" @click="moreData">>>更多</span>
+      <span v-if="proxy.hasPerm(type === 'data' ? '/alarm/current/more' : '/alarm/device/more')" class="more" @click="moreData">>>更多</span>
     </div>
     <div class="content">
       <div v-show="type === 'device'" class="item">
@@ -162,7 +163,7 @@
         报警设备:
         <span style="padding-left: 6px;">{{ info.devcode }} </span>
         <el-button
-          v-if="info.devTypeName === '燃气智能监测终端' || info.devTypeName === '液位检测仪' || info.devTypeName === '井盖监测仪'"
+          v-if="(info.devTypeName === '燃气智能监测终端' || info.devTypeName === '液位检测仪' || info.devTypeName === '井盖监测仪') && proxy.hasPerm('/alarm/current/data')"
           size="small" style="margin-left: 6px;" @click="viewData"
         >
           查看数据
@@ -228,7 +229,7 @@
         <span style="padding-left: 6px;">
           {{ info.confirmContent }}
         </span>
-        <el-button v-if="type === 'data'" size="small" style="padding-left: 6px;" @click="viewProcess">
+        <el-button v-if="type === 'data' && proxy.hasPerm('/alarm/current/process')" size="small" style="padding-left: 6px;" @click="viewProcess">
           流程图
         </el-button>
       </div>
@@ -246,17 +247,17 @@
       </div>
     </div>
     <div class="footer">
-      <el-button v-if="Number(info.processStatus) < 4 && type === 'data'" size="small" @click="remind">
+      <el-button v-if="(Number(info.processStatus) < 4 && type === 'data') && proxy.hasPerm('/alarm/current/remind')" size="small" @click="remind">
         提醒责任人
       </el-button>
       <el-button
-        v-if="type === 'device' && (info.processStatusName === '待处置' || info.processStatusName === '挂起')"
+        v-if="(type === 'device' && (info.processStatusName === '待处置' || info.processStatusName === '挂起')) && proxy.hasPerm('/alarm/device/handler')"
         size="small" @click="handler"
       >
         报警处置
       </el-button>
       <el-button
-        v-if="Number(info.processStatus) <= 3 || (type === 'device' && info.processStatusName === '待处置') || info.processStatusName === '挂起'"
+        v-if="(Number(info.processStatus) <= 3 || (type === 'device' && info.processStatusName === '待处置') || info.processStatusName === '挂起') && proxy.hasPerm(type === 'device' ? '/alarm/device/pending' : '/alarm/current/pending')"
         type="primary" size="small" @click="pending"
       >
         挂起
diff --git a/src/views/home/alarm/current/index.vue b/src/views/home/alarm/current/index.vue
index d019bbf..e2714bb 100644
--- a/src/views/home/alarm/current/index.vue
+++ b/src/views/home/alarm/current/index.vue
@@ -4,6 +4,7 @@
   Date: 2023-06-28
  -->
 <script lang="ts" setup name="CurrentAlarm">
+import dayjs from 'dayjs'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import { ArrowLeftBold, ArrowRightBold } from '@element-plus/icons-vue'
 import MapCom from './components/map.vue'
@@ -100,6 +101,7 @@
       path: '/alarm/current',
     })
   }
+  datetimerange.value = []
   listQuery.value = {
     limit: 20,
     offset: 1,
@@ -131,8 +133,8 @@
   if ($route.query.row) {
     loadingTable.value = true
     const row = JSON.parse($route.query.row as string)
-    getCurrentAlarmListPage({ offset: 1, limit: 99999 }).then((res) => {
-      const data = res.data.rows.filter((item: any) => item.id === row.id)
+    getCurrentAlarmListPage({ offset: 1, limit: 50 }).then((res) => {
+      const data = res.data.rows.filter((item: any) => item.id === row.alarmId)
       if (data.length) {
         list1.value = data.map((item: any) => ({
           ...item,
@@ -153,7 +155,10 @@
     })
     return
   }
-  fetchData()
+  datetimerange.value = [dayjs().subtract(7, 'day').format('YYYY-MM-DD HH:mm:ss'), dayjs().format('YYYY-MM-DD HH:mm:ss')]
+  setTimeout(() => {
+    fetchData()
+  })
 })
 // 表格标识  地图或普通
 const tableFlag = ref('normal')
@@ -181,6 +186,10 @@
 const mapRef = ref()
 const mapData = ref({})
 async function detail(row: any) {
+  if (row.processStatusName === '未读') {
+    list1.value[list1.value.findIndex((item: any) => item.id === row.id)].processStatusName = '已读'
+    row.processStatusName = '已读'
+  }
   const res = await detailAlarm(row.id)
   const data = toHumpObject(res.data)
   mapData.value = row
@@ -362,7 +371,7 @@
               <el-button v-if="proxy.hasPerm('/alarm/current/delete')" type="primary" @click="batchDeleteRow">
                 批量删除
               </el-button>
-              <el-button type="primary" @click="exportList">
+              <el-button v-if="proxy.hasPerm('/alarm/current/export')" type="primary" @click="exportList">
                 导出
               </el-button>
             </div>
@@ -383,7 +392,7 @@
               </el-table-column>
             </template>
             <template #columns>
-              <el-table-column label="操作" align="center" width="80">
+              <el-table-column v-if="proxy.hasPerm('/alarm/current/detail')" label="操作" align="center" width="80">
                 <template #default="scope">
                   <el-button type="primary" link size="small" @click="detail(scope.row)">
                     查看
diff --git a/src/views/home/alarm/history/index.vue b/src/views/home/alarm/history/index.vue
index eeb49fc..3c810c3 100644
--- a/src/views/home/alarm/history/index.vue
+++ b/src/views/home/alarm/history/index.vue
@@ -97,6 +97,7 @@
 }
 // 重置查询条件f
 const reset = () => {
+  datetimerange.value = []
   listQuery.value = {
     limit: 20,
     offset: 1,
@@ -189,6 +190,7 @@
   })
 }
 fetchDict()
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -249,7 +251,7 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="exportList">
+          <el-button v-if="proxy.hasPerm('/alarm/history/export')" type="primary" @click="exportList">
             导出
           </el-button>
         </div>
@@ -272,7 +274,7 @@
           </el-table-column>
         </template>
         <template #columns>
-          <el-table-column label="操作" align="center" width="80">
+          <el-table-column v-if="proxy.hasPerm('/alarm/history/detail')" label="操作" align="center" width="80">
             <template #default="scope">
               <el-button type="primary" link size="small" @click="moreData(scope.row)">
                 查看
diff --git a/src/views/home/dashboard/index.vue b/src/views/home/dashboard/index.vue
index d2f7e3c..42dfbed 100644
--- a/src/views/home/dashboard/index.vue
+++ b/src/views/home/dashboard/index.vue
@@ -42,7 +42,7 @@
     value: '0',
     name: '在线',
     unit: '个',
-    id: '1',
+    id: '1,2',
   },
   {
     img: img.lixian,
@@ -56,7 +56,7 @@
     value: '0',
     name: '停用',
     unit: '个',
-    id: '2',
+    id: '3',
   },
 ])
 // 工作台数据
@@ -133,7 +133,11 @@
   deviceOperationLoading.value = true
   getDeviceStatus().then((res) => {
     res.data.forEach((element: any) => {
-      const index = deviceOperationData.value.findIndex((item: any) => item.id === element.name)
+      if (element.name === '1' || element.name === '2') {
+        deviceOperationData.value[0].value = Number(deviceOperationData.value[0].value || '0') + Number(element.value)
+        return
+      }
+      const index = deviceOperationData.value.findIndex((item: any) => item.id.includes(element.name))
       if (index !== -1) {
         deviceOperationData.value[index].value = element.value
       }
diff --git a/src/views/home/device/count/components/bottom.vue b/src/views/home/device/count/components/bottom.vue
index 28a4d78..e4e56fa 100644
--- a/src/views/home/device/count/components/bottom.vue
+++ b/src/views/home/device/count/components/bottom.vue
@@ -110,6 +110,7 @@
   })
 }
 fetchDict()
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -148,7 +149,7 @@
             <template #btns-right>
               <!-- 操作 -->
               <div>
-                <el-button type="primary">
+                <el-button v-if="proxy.hasPerm('/device/count/offline/export')" type="primary">
                   导出
                 </el-button>
               </div>
diff --git a/src/views/home/device/device/index.vue b/src/views/home/device/device/index.vue
index c3970b9..9cdd606 100644
--- a/src/views/home/device/device/index.vue
+++ b/src/views/home/device/device/index.vue
@@ -88,6 +88,7 @@
 }
 // 重置查询条件f
 const reset = () => {
+  datetimerange.value = []
   listQuery.value = {
     limit: 20,
     offset: 1,
@@ -296,6 +297,7 @@
   fetchDict()
   fetchData()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -372,17 +374,17 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="editRow('add', {})">
+          <el-button v-if="proxy.hasPerm('/device/manage/add')" type="primary" @click="editRow('add', {})">
             新建
           </el-button>
-          <el-button type="primary" @click="downloadTemplate">
+          <el-button v-if="proxy.hasPerm('/device/manage/down')" type="primary" @click="downloadTemplate">
             模板下载
           </el-button>
-          <el-button type="primary" @click="importList">
+          <el-button v-if="proxy.hasPerm('/device/manage/import')" type="primary" @click="importList">
             批量导入
           </el-button>
-          <el-button type="primary" @click="exportList">
-            导出列表
+          <el-button v-if="proxy.hasPerm('/device/manage/export')" type="primary" @click="exportList">
+            导出
           </el-button>
           <input ref="fileRef" style="display: none;" type="file" accept=".xls,.xlsx" @change="onFileChange">
         </div>
@@ -409,16 +411,16 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="150">
             <template #default="scope">
-              <el-button type="primary" link size="small" @click="editRow('detail', scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/manage/detail')" type="primary" link size="small" @click="editRow('detail', scope.row)">
                 查看
               </el-button>
-              <el-button type="primary" link size="small" @click="editRow('edit', scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/manage/update')" type="primary" link size="small" @click="editRow('edit', scope.row)">
                 编辑
               </el-button>
-              <el-button type="danger" link size="small" @click="changeDefense(scope.row)">
+              <!-- <el-button v-if="proxy.hasPerm('/device/manage/add')" type="danger" link size="small" @click="changeDefense(scope.row)">
                 撤防
-              </el-button>
-              <el-button type="danger" link size="small" @click="removeRow(scope.row)">
+              </el-button> -->
+              <el-button v-if="proxy.hasPerm('/device/manage/delete')" type="danger" link size="small" @click="removeRow(scope.row)">
                 删除
               </el-button>
             </template>
diff --git a/src/views/home/device/instruction/index.vue b/src/views/home/device/instruction/index.vue
index 1e598ed..1da6706 100644
--- a/src/views/home/device/instruction/index.vue
+++ b/src/views/home/device/instruction/index.vue
@@ -78,6 +78,7 @@
 }
 // 重置查询条件f
 const reset = () => {
+  datetimerange.value = []
   listQuery.value = {
     limit: 20,
     offset: 1,
@@ -158,6 +159,7 @@
     editRef.value.initDialog('addOther', {})
   }
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -213,10 +215,10 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary">
+          <el-button v-if="proxy.hasPerm('/device/instruction/batch')" type="primary">
             批量下发
           </el-button>
-          <el-button type="primary" @click="editRow('add', {})">
+          <el-button v-if="proxy.hasPerm('/device/instruction/add')" type="primary" @click="editRow('add', {})">
             新建
           </el-button>
         </div>
@@ -236,13 +238,13 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="120">
             <template #default="scope">
-              <el-button type="primary" link size="small" @click="editRow('detail', scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/instruction/detail')" type="primary" link size="small" @click="editRow('detail', scope.row)">
                 查看
               </el-button>
-              <el-button v-if="scope.row.status === '2'" type="primary" link size="small" @click="editRow('edit', scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/instruction/again') && scope.row.status === '2'" type="primary" link size="small" @click="editRow('edit', scope.row)">
                 重新下发
               </el-button>
-              <el-button type="danger" link size="small" @click="removeRow(scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/instruction/delete')" type="danger" link size="small" @click="removeRow(scope.row)">
                 删除
               </el-button>
             </template>
diff --git a/src/views/home/device/product/index.vue b/src/views/home/device/product/index.vue
index 799fc90..fdd5463 100644
--- a/src/views/home/device/product/index.vue
+++ b/src/views/home/device/product/index.vue
@@ -128,6 +128,7 @@
   await fetchDict()
   fetchData()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -164,7 +165,7 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="editRow('add', {})">
+          <el-button v-if="proxy.hasPerm('/device/product/add')" type="primary" @click="editRow('add', {})">
             新建
           </el-button>
         </div>
@@ -184,10 +185,10 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="120">
             <template #default="scope">
-              <el-button type="primary" link size="small" @click="editRow('edit', scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/product/update')" type="primary" link size="small" @click="editRow('edit', scope.row)">
                 编辑
               </el-button>
-              <el-button type="danger" link size="small" @click="removeRow(scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/product/delete')" type="danger" link size="small" @click="removeRow(scope.row)">
                 删除
               </el-button>
             </template>
diff --git a/src/views/home/device/type/index.vue b/src/views/home/device/type/index.vue
index 59f1343..2344e57 100644
--- a/src/views/home/device/type/index.vue
+++ b/src/views/home/device/type/index.vue
@@ -105,6 +105,7 @@
   await fetchDict()
   fetchData()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -131,7 +132,7 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="editRow('add', {})">
+          <el-button v-if="proxy.hasPerm('/device/type/add')" type="primary" @click="editRow('add', {})">
             新建
           </el-button>
         </div>
@@ -151,10 +152,10 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="120">
             <template #default="scope">
-              <el-button type="primary" link size="small" @click="editRow('edit', scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/type/update')" type="primary" link size="small" @click="editRow('edit', scope.row)">
                 编辑
               </el-button>
-              <el-button type="danger" link size="small" @click="removeRow(scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/type/delete')" type="danger" link size="small" @click="removeRow(scope.row)">
                 删除
               </el-button>
             </template>
diff --git a/src/views/home/ledger/ledger/components/gridList.vue b/src/views/home/ledger/ledger/components/gridList.vue
index d03cd9f..189edef 100644
--- a/src/views/home/ledger/ledger/components/gridList.vue
+++ b/src/views/home/ledger/ledger/components/gridList.vue
@@ -91,6 +91,7 @@
     // })
   })
 }
+const { proxy } = getCurrentInstance() as any
 // 同步日志
 const allSync = () => {
   $router.push({
@@ -139,10 +140,10 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="allSync">
+          <el-button v-if="proxy.hasPerm('/ledger/sync')" type="primary" @click="allSync">
             同步日志
           </el-button>
-          <el-button type="primary" @click="sync('all', {})">
+          <el-button v-if="proxy.hasPerm('/ledger/sync/all')" type="primary" @click="sync('all', {})">
             全量同步
           </el-button>
         </div>
@@ -160,9 +161,9 @@
           </el-table-column>
         </template>
         <template #columns>
-          <el-table-column label="操作" align="center" width="80">
+          <el-table-column v-if="proxy.hasPerm('/ledger/sync/single')" label="操作" align="center" width="80">
             <template #default="scope">
-              <el-button type="primary" link size="small" @click="sync('single', scope.row)">
+              <el-button v-if="proxy.hasPerm('/ledger/sync/single')" type="primary" link size="small" @click="sync('single', scope.row)">
                 同步
               </el-button>
             </template>
diff --git a/src/views/home/ledger/ledger/components/wellList.vue b/src/views/home/ledger/ledger/components/wellList.vue
index 9eb1f43..06f855a 100644
--- a/src/views/home/ledger/ledger/components/wellList.vue
+++ b/src/views/home/ledger/ledger/components/wellList.vue
@@ -123,6 +123,7 @@
   // await fetchDict()
   fetchData()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -159,11 +160,11 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="allSync">
+          <el-button v-if="proxy.hasPerm('/ledger/sync')" type="primary" @click="allSync">
             同步日志
           </el-button>
-          <el-button type="primary" @click="sync('all', {})">
-            全部同步
+          <el-button v-if="proxy.hasPerm('/ledger/sync/all')" type="primary" @click="sync('all', {})">
+            全量同步
           </el-button>
         </div>
       </template>
@@ -180,9 +181,9 @@
           </el-table-column>
         </template>
         <template #columns>
-          <el-table-column label="操作" align="center" width="80">
+          <el-table-column v-if="proxy.hasPerm('/ledger/sync/single')" label="操作" align="center" width="80">
             <template #default="scope">
-              <el-button type="primary" link size="small" @click="sync('single', scope.row)">
+              <el-button v-if="proxy.hasPerm('/ledger/sync/single')" type="primary" link size="small" @click="sync('single', scope.row)">
                 同步
               </el-button>
             </template>
diff --git a/src/views/home/ledger/ledger/index.vue b/src/views/home/ledger/ledger/index.vue
index a03aa12..8403fc5 100644
--- a/src/views/home/ledger/ledger/index.vue
+++ b/src/views/home/ledger/ledger/index.vue
@@ -7,7 +7,16 @@
 import type { TabsPaneContext } from 'element-plus'
 import wellList from './components/wellList.vue'
 import gridList from './components/gridList.vue'
-const activeName = ref('闸井')
+const { proxy } = getCurrentInstance() as any
+const activeName = ref(
+  proxy.hasPerm('/ledger/manage/well')
+    ? '闸井'
+    : proxy.hasPerm('/ledger/manage/station')
+      ? '场站'
+      : proxy.hasPerm('/ledger/manage/grid')
+        ? '网格'
+        : '',
+)
 const handleClick = (tab: TabsPaneContext, event: Event) => {
   // console.log(tab, event)
 }
@@ -17,13 +26,13 @@
   <!-- 布局 -->
   <app-container>
     <el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick">
-      <el-tab-pane label="闸井" name="闸井">
+      <el-tab-pane v-if="proxy.hasPerm('/ledger/manage/well')" label="闸井" name="闸井">
         <well-list v-if="activeName === '闸井'" type="1" />
       </el-tab-pane>
-      <el-tab-pane label="场站" name="场站">
+      <el-tab-pane v-if="proxy.hasPerm('/ledger/manage/station')" label="场站" name="场站">
         <well-list v-if="activeName === '场站'" type="2" />
       </el-tab-pane>
-      <el-tab-pane label="网格" name="网格">
+      <el-tab-pane v-if="proxy.hasPerm('/ledger/manage/grid')" label="网格" name="网格">
         <grid-list v-if="activeName === '网格'" />
       </el-tab-pane>
     </el-tabs>
diff --git a/src/views/home/ledger/pipeline/index.vue b/src/views/home/ledger/pipeline/index.vue
index e0d2512..01e95ac 100644
--- a/src/views/home/ledger/pipeline/index.vue
+++ b/src/views/home/ledger/pipeline/index.vue
@@ -160,6 +160,7 @@
 onMounted(async () => {
   fetchData()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -222,13 +223,13 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="editRow('add', {})">
+          <el-button v-if="proxy.hasPerm('/ledger/pipeline/add')" type="primary" @click="editRow('add', {})">
             新增
           </el-button>
-          <el-button type="primary" @click="importList">
+          <el-button v-if="proxy.hasPerm('/ledger/pipeline/import')" type="primary" @click="importList">
             批量导入
           </el-button>
-          <el-button type="primary" @click="exportList">
+          <el-button v-if="proxy.hasPerm('/ledger/pipeline/export')" type="primary" @click="exportList">
             批量导出
           </el-button>
         </div>
@@ -248,10 +249,10 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="100">
             <template #default="scope">
-              <el-button type="primary" link size="small" @click="editRow('edit', scope.row)">
+              <el-button v-if="proxy.hasPerm('/ledger/pipeline/update')" type="primary" link size="small" @click="editRow('edit', scope.row)">
                 编辑
               </el-button>
-              <el-button type="danger" link size="small" @click="removeRow(scope.row)">
+              <el-button v-if="proxy.hasPerm('/ledger/pipeline/delete')" type="danger" link size="small" @click="removeRow(scope.row)">
                 删除
               </el-button>
             </template>
diff --git a/src/views/home/ledger/sync/index.vue b/src/views/home/ledger/sync/index.vue
index 54a3218..a04bad9 100644
--- a/src/views/home/ledger/sync/index.vue
+++ b/src/views/home/ledger/sync/index.vue
@@ -62,6 +62,7 @@
 }
 // 重置查询条件f
 const reset = () => {
+  datetimerange.value = []
   listQuery.value = {
     limit: 20,
     offset: 1,
@@ -106,6 +107,8 @@
 onMounted(async () => {
   fetchData()
 })
+const { proxy } = getCurrentInstance() as any
+const $route = useRoute()
 </script>
 
 <template>
@@ -132,7 +135,7 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="goBak">
+          <el-button v-if="$route.type" type="primary" @click="goBak">
             返回
           </el-button>
         </div>
@@ -152,10 +155,10 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="80">
             <template #default="scope">
-              <el-button type="primary" link size="small">
+              <el-button v-if="proxy.hasPerm('/ledger/sync/detail')" type="primary" link size="small">
                 查看
               </el-button>
-              <el-button type="danger" link size="small" @click="removeRow(scope.row)">
+              <el-button v-if="proxy.hasPerm('/ledger/sync/delete')" type="danger" link size="small" @click="removeRow(scope.row)">
                 删除
               </el-button>
             </template>
diff --git a/src/views/home/monitor/service/index.vue b/src/views/home/monitor/service/index.vue
index 8df2239..570dc68 100644
--- a/src/views/home/monitor/service/index.vue
+++ b/src/views/home/monitor/service/index.vue
@@ -53,6 +53,7 @@
 onMounted(async () => {
   fetchData()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -66,7 +67,7 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary">
+          <el-button v-if="proxy.hasPerm('/monitor/service/add')" type="primary">
             新建
           </el-button>
         </div>
diff --git a/src/views/home/monitor/time/index.vue b/src/views/home/monitor/time/index.vue
index caa6d46..0f7f5a0 100644
--- a/src/views/home/monitor/time/index.vue
+++ b/src/views/home/monitor/time/index.vue
@@ -53,6 +53,7 @@
 onMounted(async () => {
   fetchData()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -66,7 +67,7 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary">
+          <el-button v-if="proxy.hasPerm('/monitor/time/add')" type="primary">
             新建
           </el-button>
         </div>
diff --git a/src/views/home/operation/alarm/components/detail.vue b/src/views/home/operation/alarm/components/detail.vue
index 8194cbd..4ae4a1f 100644
--- a/src/views/home/operation/alarm/components/detail.vue
+++ b/src/views/home/operation/alarm/components/detail.vue
@@ -151,6 +151,7 @@
 }
 // 点击经纬度展示地图
 const mapRef = ref()
+const { proxy } = getCurrentInstance() as any
 const showMap = (data: any) => {
   console.log(data, 'data')
   if (data.text === '位置') {
@@ -160,6 +161,13 @@
         2: 'StationMonitorDetail',
         3: 'PipelineMonitorDetail',
       } as { [key: string]: string }
+      // 判断是否有菜单权限
+      const watchObjectAuth = {
+        1: '/well',
+        2: '/station/monitor',
+        3: '/pipeline',
+      } as { [key: string]: string }
+      if (!proxy.hasPerm(watchObjectAuth[detailInfo.value.watchObject])) { return }
       $router.push({
         name: watchObject[detailInfo.value.watchObject],
         query: {
diff --git a/src/views/home/operation/alarm/index.vue b/src/views/home/operation/alarm/index.vue
index ac0f31b..e53c991 100644
--- a/src/views/home/operation/alarm/index.vue
+++ b/src/views/home/operation/alarm/index.vue
@@ -82,6 +82,7 @@
 }
 // 重置查询条件f
 const reset = () => {
+  datetimerange.value = []
   listQuery.value = {
     limit: 20,
     offset: 1,
@@ -315,7 +316,7 @@
               <el-button v-if="proxy.hasPerm('/alarm/device/delete')" type="primary" @click="batchDeleteRow">
                 批量删除
               </el-button>
-              <el-button type="primary" @click="exportList">
+              <el-button v-if="proxy.hasPerm('/alarm/device/export')" type="primary" @click="exportList">
                 导出
               </el-button>
             </div>
@@ -336,7 +337,7 @@
               </el-table-column>
             </template>
             <template #columns>
-              <el-table-column label="操作" align="center" width="80">
+              <el-table-column v-if="proxy.hasPerm('/alarm/device/detail')" label="操作" align="center" width="80">
                 <template #default="scope">
                   <el-button type="primary" link size="small" @click="detail(scope.row)">
                     查看
diff --git a/src/views/home/operation/history/index.vue b/src/views/home/operation/history/index.vue
index 5c04ff7..d96ac57 100644
--- a/src/views/home/operation/history/index.vue
+++ b/src/views/home/operation/history/index.vue
@@ -78,6 +78,7 @@
 }
 // 重置查询条件f
 const reset = () => {
+  datetimerange.value = []
   listQuery.value = {
     limit: 20,
     offset: 1,
@@ -161,6 +162,7 @@
     fetchData()
   })
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -218,7 +220,7 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="exportList">
+          <el-button v-if="proxy.hasPerm('/operation/history/export')" type="primary" @click="exportList">
             导出
           </el-button>
         </div>
@@ -241,7 +243,7 @@
           </el-table-column>
         </template>
         <template #columns>
-          <el-table-column label="操作" align="center" width="80">
+          <el-table-column v-if="proxy.hasPerm('/operation/history/detail')" label="操作" align="center" width="80">
             <template #default="scope">
               <el-button type="primary" link size="small" @click="detailRow(scope.row)">
                 查看
diff --git a/src/views/home/operation/manufacturer/index.vue b/src/views/home/operation/manufacturer/index.vue
index 4a5816a..5f647c3 100644
--- a/src/views/home/operation/manufacturer/index.vue
+++ b/src/views/home/operation/manufacturer/index.vue
@@ -75,6 +75,7 @@
 }
 // 重置查询条件f
 const reset = () => {
+  datetimerange.value = []
   listQuery.value = {
     limit: 20,
     offset: 1,
@@ -125,6 +126,7 @@
   await fetchDict()
   fetchData()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -178,7 +180,7 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="exportList">
+          <el-button v-if="proxy.hasPerm('/operation/manufacturer/export')" type="primary" @click="exportList">
             导出
           </el-button>
         </div>
diff --git a/src/views/home/operation/trajectory/index.vue b/src/views/home/operation/trajectory/index.vue
index 9312fd7..606958e 100644
--- a/src/views/home/operation/trajectory/index.vue
+++ b/src/views/home/operation/trajectory/index.vue
@@ -65,6 +65,7 @@
 }
 // 重置查询条件f
 const reset = () => {
+  datetimerange.value = []
   listQuery.value = {
     limit: 20,
     offset: 1,
@@ -114,6 +115,7 @@
   await fetchDict()
   fetchData()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -175,7 +177,7 @@
           </span>
         </template>
         <template #columns>
-          <el-table-column label="操作" width="80" align="center">
+          <el-table-column v-if="proxy.hasPerm('/operation/trajectory/detail')" label="操作" width="80" align="center">
             <template #default="scope">
               <el-button type="primary" link size="small" @click="detail(scope.row)">
                 查看
diff --git a/src/views/home/pipeline/components/detailData.vue b/src/views/home/pipeline/components/detailData.vue
index 80b6886..760b1c5 100644
--- a/src/views/home/pipeline/components/detailData.vue
+++ b/src/views/home/pipeline/components/detailData.vue
@@ -7,7 +7,13 @@
 import type { TabsPaneContext } from 'element-plus'
 import monitorData from './monitorDataList.vue'
 import maintenanceRecord from '@/views/home/well/components/maintenanceRecord.vue'
-const activeName = ref('监控数据')
+const { proxy } = getCurrentInstance() as any
+const activeName = ref(
+  proxy.hasPerm('/pipeline/monitor/data')
+    ? '监控数据'
+    : proxy.hasPerm('/pipeline/monitor/maintenance')
+      ? '监控设备维护记录'
+      : '')
 const handleClick = (tab: TabsPaneContext, event: Event) => {
   // console.log(tab, event)
 }
@@ -15,10 +21,10 @@
 
 <template>
   <el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick">
-    <el-tab-pane label="监控数据" name="监控数据">
+    <el-tab-pane v-if="proxy.hasPerm('/pipeline/monitor/data')" label="监控数据" name="监控数据">
       <monitor-data v-if="activeName === '监控数据'" />
     </el-tab-pane>
-    <el-tab-pane label="监控设备维护记录" name="监控设备维护记录">
+    <el-tab-pane v-if="proxy.hasPerm('/pipeline/monitor/maintenance')" label="监控设备维护记录" name="监控设备维护记录">
       <maintenance-record v-if="activeName === '监控设备维护记录'" />
     </el-tab-pane>
   </el-tabs>
diff --git a/src/views/home/pipeline/index.vue b/src/views/home/pipeline/index.vue
index 90baef0..4d66e51 100644
--- a/src/views/home/pipeline/index.vue
+++ b/src/views/home/pipeline/index.vue
@@ -254,6 +254,7 @@
     tableHeight.value = window.innerHeight - 60 - 50 - 10 - 98 - 10 - 52 - 52 - 10
   }
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -348,7 +349,7 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary">
+          <el-button v-if="proxy.hasPerm('/pipeline/export')" type="primary">
             导出
           </el-button>
         </div>
@@ -368,7 +369,7 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="80">
             <template #default="scope">
-              <el-button type="primary" link size="small" @click="editRow('detail', scope.row)">
+              <el-button v-if="proxy.hasPerm('/pipeline/detail')" type="primary" link size="small" @click="editRow('detail', scope.row)">
                 查看
               </el-button>
               <!-- <el-button type="primary" link size="small" @click="editRow('edit', scope.row)">
diff --git a/src/views/home/rule/agreement/index.vue b/src/views/home/rule/agreement/index.vue
index fd41cd3..f1cfe15 100644
--- a/src/views/home/rule/agreement/index.vue
+++ b/src/views/home/rule/agreement/index.vue
@@ -95,6 +95,7 @@
 onMounted(async () => {
   fetchData()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -119,7 +120,7 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="editRow('add', {})">
+          <el-button v-if="proxy.hasPerm('/rule/agreement/add')" type="primary" @click="editRow('add', {})">
             新建
           </el-button>
         </div>
@@ -139,10 +140,10 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="120">
             <template #default="scope">
-              <el-button type="primary" link size="small" @click="editRow('edit', scope.row)">
+              <el-button v-if="proxy.hasPerm('/rule/agreement/update')" type="primary" link size="small" @click="editRow('edit', scope.row)">
                 编辑
               </el-button>
-              <el-button type="danger" link size="small" @click="removeRow(scope.row)">
+              <el-button v-if="proxy.hasPerm('/rule/agreement/delete')" type="danger" link size="small" @click="removeRow(scope.row)">
                 删除
               </el-button>
             </template>
diff --git a/src/views/home/rule/alarm/components/alarmLevelList.vue b/src/views/home/rule/alarm/components/alarmLevelList.vue
index c8ffb7d..6c337c4 100644
--- a/src/views/home/rule/alarm/components/alarmLevelList.vue
+++ b/src/views/home/rule/alarm/components/alarmLevelList.vue
@@ -87,6 +87,7 @@
 const cancel = () => {
   dialogFormVisible.value = false
 }
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -97,7 +98,7 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="detailRow('create', {})">
+          <el-button v-if="proxy.hasPerm('/rule/alarm/level/add')" type="primary" @click="detailRow('create', {})">
             新增
           </el-button>
         </div>
@@ -117,10 +118,10 @@
         <template #columns>
           <el-table-column label="操作" width="120" align="center">
             <template #default="scope">
-              <el-button type="primary" link size="small" @click="detailRow('edit', scope.row)">
+              <el-button v-if="proxy.hasPerm('/rule/alarm/level/update')" type="primary" link size="small" @click="detailRow('edit', scope.row)">
                 编辑
               </el-button>
-              <el-button type="danger" link size="small" @click="removeRow(scope.row)">
+              <el-button v-if="proxy.hasPerm('/rule/alarm/level/delete')" type="danger" link size="small" @click="removeRow(scope.row)">
                 删除
               </el-button>
             </template>
diff --git a/src/views/home/rule/alarm/components/alarmTypeList.vue b/src/views/home/rule/alarm/components/alarmTypeList.vue
index 2cbf110..aa0cfed 100644
--- a/src/views/home/rule/alarm/components/alarmTypeList.vue
+++ b/src/views/home/rule/alarm/components/alarmTypeList.vue
@@ -80,6 +80,7 @@
 const cancel = () => {
   dialogFormVisible.value = false
 }
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -90,7 +91,7 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="detailRow('create', {})">
+          <el-button v-if="proxy.hasPerm('/rule/alarm/type/add')" type="primary" @click="detailRow('create', {})">
             新增
           </el-button>
         </div>
@@ -110,10 +111,10 @@
         <template #columns>
           <el-table-column label="操作" width="120" align="center">
             <template #default="scope">
-              <el-button type="primary" link size="small" @click="detailRow('edit', scope.row)">
+              <el-button v-if="proxy.hasPerm('/rule/alarm/type/update')" type="primary" link size="small" @click="detailRow('edit', scope.row)">
                 编辑
               </el-button>
-              <el-button type="danger" link size="small" @click="removeRow(scope.row)">
+              <el-button v-if="proxy.hasPerm('/rule/alarm/type/delete')" type="danger" link size="small" @click="removeRow(scope.row)">
                 删除
               </el-button>
             </template>
diff --git a/src/views/home/rule/alarm/index.vue b/src/views/home/rule/alarm/index.vue
index 110030c..4e66a34 100644
--- a/src/views/home/rule/alarm/index.vue
+++ b/src/views/home/rule/alarm/index.vue
@@ -20,11 +20,14 @@
 // 初始展示列
 const columns = ref<any>([
   { text: '报警类型', value: 'alarmTypeName', align: 'center' },
-  { text: '报警名称', value: 'alarmName', align: 'center' },
-  { text: '报警等级', value: 'alarmLevelName', align: 'center' },
-  { text: '报警提示方式', value: 'alarmNoteMethodName', align: 'center' },
-  { text: '状态', value: 'stateName', align: 'center', width: '130' },
-  { text: '创建时间', value: 'ts', align: 'center' },
+  { text: '设备类型', value: 'typeName', align: 'center' },
+  { text: '产品', value: 'productName', align: 'center' },
+  { text: '厂商', value: 'manufacturerName', align: 'center' },
+  // { text: '报警名称', value: 'alarmName', align: 'center' },
+  { text: '报警等级', value: 'alarmLevelName', align: 'center', width: '100' },
+  { text: '报警提示方式', value: 'alarmNoteMethodName', align: 'center', width: '130', isCustom: true },
+  { text: '状态', value: 'stateName', align: 'center', width: '100', isCustom: true },
+  { text: '创建时间', value: 'ts', align: 'center', width: '200' },
 ])
 // 最终展示列
 const columnsConfig = ref([])
@@ -158,6 +161,7 @@
   await fetchDict()
   fetchData()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -191,13 +195,13 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="showAlarmType">
+          <el-button v-if="proxy.hasPerm('/rule/alarm/type')" type="primary" @click="showAlarmType">
             报警类型管理
           </el-button>
-          <el-button type="primary" @click="showAlarmLevel">
+          <el-button v-if="proxy.hasPerm('/rule/alarm/level')" type="primary" @click="showAlarmLevel">
             报警等级管理
           </el-button>
-          <el-button type="primary" @click="detailRow('create', {})">
+          <el-button v-if="proxy.hasPerm('/rule/alarm/add')" type="primary" @click="detailRow('create', {})">
             新增
           </el-button>
         </div>
@@ -214,16 +218,28 @@
             </template>
           </el-table-column>
         </template>
+        <template #isCustom="{ scope, column }">
+          <!-- 报警提示方式 -->
+          <span v-if="column.text === '报警提示方式'">
+            <el-tag v-if="scope.row.alarmNoteMethodName === '消息提醒'" type="primary">消息提醒</el-tag>
+            <el-tag v-if="scope.row.alarmNoteMethodName === '弹窗'" type="danger">弹窗提醒</el-tag>
+          </span>
+          <!-- 报警提示方式 -->
+          <span v-if="column.text === '状态'">
+            <el-tag v-if="scope.row.stateName === '启用'" type="success">启用</el-tag>
+            <el-tag v-if="scope.row.stateName === '未启用'" type="info">未启用</el-tag>
+          </span>
+        </template>
         <template #columns>
           <el-table-column label="操作" width="140" align="center">
             <template #default="scope">
-              <el-button type="primary" link size="small" @click="switchStatusRow(scope.row)">
+              <el-button v-if="proxy.hasPerm('/rule/alarm/handler')" type="primary" link size="small" @click="switchStatusRow(scope.row)">
                 {{ scope.row.state === '1' ? '停用' : '启用' }}
               </el-button>
-              <el-button type="primary" link size="small" @click="detailRow('edit', scope.row)">
+              <el-button v-if="proxy.hasPerm('/rule/alarm/update')" type="primary" link size="small" @click="detailRow('edit', scope.row)">
                 编辑
               </el-button>
-              <el-button type="danger" link size="small" @click="removeRow(scope.row)">
+              <el-button v-if="proxy.hasPerm('/rule/alarm/delete')" type="danger" link size="small" @click="removeRow(scope.row)">
                 删除
               </el-button>
             </template>
diff --git a/src/views/home/rule/special/components/editDialog.vue b/src/views/home/rule/special/components/editDialog.vue
index bb494ec..5df205b 100644
--- a/src/views/home/rule/special/components/editDialog.vue
+++ b/src/views/home/rule/special/components/editDialog.vue
@@ -8,7 +8,7 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { getDictByCode } from '@/api/system/dict'
 import { getDeviceTypeListPage } from '@/api/home/device/type'
-import { getAlarmLevelListPage, getAlarmRuleListPage } from '@/api/home/rule/alarm'
+import { getAlarmLevelListPage, getAlarmTypeListPage } from '@/api/home/rule/alarm'
 import { addSpecialAlarmRule, editSpecialAlarmRule } from '@/api/home/rule/special'
 import { getDeviceListPage } from '@/api/home/device/device'
 import { getProductListPage } from '@/api/home/device/product'
@@ -57,13 +57,15 @@
 }
 const list = ref<any[]>([])
 const columns = ref<any>([
-  { text: '报警规则', value: 'alarmRule', align: 'center', type: 'select', code: 'alarm-rule', required: true },
+  { text: '报警类型', value: 'alarmTypeId', align: 'center', type: 'select', code: 'alarm-rule', required: true },
   { text: '报警等级', value: 'alarmLevelId', align: 'center', type: 'select', code: 'alarm-level', required: true },
   { text: '报警阈值', value: 'alarmThreshold', align: 'center', type: 'input', required: true },
 ])
 // 初始化对话框
+const isFirst = ref(true)
 const initDialog = (dialogStatusValue: string, row: any) => {
   dialogStatus.value = dialogStatusValue
+  isFirst.value = true
   dialogFormVisible.value = true
   if (dialogStatus.value === 'create') { // 如果是新增，清除验证
     resetForm()
@@ -83,9 +85,13 @@
         alarmRule: row.alarmRule,
         alarmLevelId: row.alarmLevelId,
         alarmThreshold: row.alarmThreshold,
+        alarmTypeId: row.alarmTypeId,
       },
     ]
   }
+  setTimeout(() => {
+    isFirst.value = false
+  })
 }
 defineExpose({
   initDialog,
@@ -143,6 +149,7 @@
 const saveData = () => {
   const data = list.value.map((item: any) => ({
     alarmLevelId: item.alarmLevelId,
+    alarmTypeId: item.alarmTypeId,
     alarmRule: item.alarmRule,
     alarmRuleName: `${item.alarmRule}[${alarmLevelList.value.filter((citem: any) => citem.id === item.alarmLevelId)[0]?.name || ''}]:${item.alarmThreshold}%LEL`,
     alarmThreshold: item.alarmThreshold,
@@ -151,7 +158,7 @@
     position: dataForm.value.position,
     tagNumber: dataForm.value.tagNumber,
     devTypeName: deviceList.value.filter((citem: any) => citem.value === dataForm.value.devcode)[0]?.name || '',
-    alarmTypeId: alarmRuleList.value.filter((citem: any) => citem.name === item.alarmRule)[0]?.alarmTypeId || '',
+    // alarmTypeId: alarmRuleList.value.filter((citem: any) => citem.name === item.alarmRule)[0]?.alarmTypeId || '',
   }))
   if (dialogStatus.value === 'edit') {
     updateData(data)
@@ -207,7 +214,7 @@
   // 设备列表
   getDeviceListPage({ offset: 1, limit: 9999 }).then((res) => {
     deviceList.value = res.data.rows.map((item: any) => ({
-      name: item.devTypeName,
+      name: item.typeName,
       id: item.id,
       value: item.devcode,
       productId: item.productId,
@@ -223,14 +230,14 @@
       }))
     })
     // 报警规则
-    getAlarmRuleListPage({ limit: 9999, offset: 1 }).then((res) => {
-      alarmRuleList.value = res.data.rows.map((item: any) => ({
-        name: item.alarmName,
-        id: item.id,
-        value: item.id,
-        alarmTypeId: item.alarmTypeId,
-      }))
-    })
+    // getAlarmRuleListPage({ limit: 9999, offset: 1 }).then((res) => {
+    //   alarmRuleList.value = res.data.rows.map((item: any) => ({
+    //     name: item.alarmName,
+    //     id: item.id,
+    //     value: item.id,
+    //     alarmTypeId: item.alarmTypeId,
+    //   }))
+    // })
     // 报警等级
     getAlarmLevelListPage({ limit: 9999, offset: 1 }).then((res) => {
       alarmLevelList.value = res.data.rows.map((item: any) => ({
@@ -247,11 +254,26 @@
 watch(() => dataForm.value.devcode, (newVal) => {
   if (newVal) {
     const current = deviceList.value.filter((item: any) => item.value === dataForm.value.devcode)
+    console.log(current, 'current')
     if (current.length) {
       dataForm.value.productId = current[0].productId
       dataForm.value.tagNumber = current[0].tagNumber
       dataForm.value.position = current[0].position
+      // 根据设备类型寻找报警类型
+      getAlarmTypeListPage({ limit: 9999, offset: 1 }).then((res) => {
+        alarmRuleList.value = res.data.rows.filter((item: any) => item.deviceTypeName.includes(current[0].name)).map((item: any) => ({
+          name: item.alarmType,
+          id: item.id,
+          value: item.id,
+          // alarmTypeId: item.id,
+        }))
+      })
     }
+    if (isFirst.value) {
+      return
+    }
+    alarmRuleList.value = []
+    list.value = []
   }
 }, {
   deep: true,
@@ -330,12 +352,12 @@
                         <!-- 报警规则 -->
                         <template v-if="item.type === 'select' && item.code === 'alarm-rule'">
                           <el-select
-                            v-model.trim="scope.row[item.value]" placeholder="报警规则" style="width: 100%;"
+                            v-model.trim="scope.row[item.value]" placeholder="报警类型" style="width: 100%;"
                             clearable filterable :disabled="!scope.row.edit"
                           >
                             <el-option
                               v-for="item in alarmRuleList" :key="item.id" :label="item.name"
-                              :value="item.name"
+                              :value="item.id"
                             />
                           </el-select>
                         </template>
diff --git a/src/views/home/rule/special/index.vue b/src/views/home/rule/special/index.vue
index 5c7b67c..7209dfa 100644
--- a/src/views/home/rule/special/index.vue
+++ b/src/views/home/rule/special/index.vue
@@ -99,6 +99,7 @@
   await fetchDict()
   fetchData()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -127,7 +128,7 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="detail('create', {})">
+          <el-button v-if="proxy.hasPerm('/rule/special/add')" type="primary" @click="detail('create', {})">
             新增
           </el-button>
         </div>
@@ -147,13 +148,13 @@
         <template #columns>
           <el-table-column label="操作" width="140" align="center">
             <template #default="scope">
-              <el-button type="primary" link size="small" @click="detail('detail', scope.row)">
+              <el-button v-if="proxy.hasPerm('/rule/special/detail')" type="primary" link size="small" @click="detail('detail', scope.row)">
                 查看
               </el-button>
-              <el-button type="primary" link size="small" @click="detail('edit', scope.row)">
+              <el-button v-if="proxy.hasPerm('/rule/special/update')" type="primary" link size="small" @click="detail('edit', scope.row)">
                 编辑
               </el-button>
-              <el-button type="danger" link size="small" @click="removeRow(scope.row)">
+              <el-button v-if="proxy.hasPerm('/rule/special/delete')" type="danger" link size="small" @click="removeRow(scope.row)">
                 删除
               </el-button>
             </template>
diff --git a/src/views/home/station/control/index.vue b/src/views/home/station/control/index.vue
index 4510922..6657c5d 100644
--- a/src/views/home/station/control/index.vue
+++ b/src/views/home/station/control/index.vue
@@ -71,6 +71,7 @@
     },
   ]
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -114,7 +115,7 @@
               </div>
             </div>
             <div class="right1">
-              <el-card shadow="always">
+              <el-card v-if="proxy.hasPerm('/station/control/video')" shadow="always">
                 <template #header>
                   <div class="clearfix">
                     <div>云台控制</div>
diff --git a/src/views/home/station/operation/index.vue b/src/views/home/station/operation/index.vue
index 02a5e44..d3d3d09 100644
--- a/src/views/home/station/operation/index.vue
+++ b/src/views/home/station/operation/index.vue
@@ -71,6 +71,7 @@
 }
 // 重置查询条件f
 const reset = () => {
+  datetimerange.value = []
   listQuery.value = {
     limit: 20,
     offset: 1,
@@ -121,6 +122,7 @@
   await fetchDict()
   fetchData()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -160,10 +162,10 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary">
+          <el-button v-if="proxy.hasPerm('/station/operation/add')" type="primary">
             新增
           </el-button>
-          <el-button type="primary" @click="exportList">
+          <el-button v-if="proxy.hasPerm('/station/operation/export')" type="primary" @click="exportList">
             导出
           </el-button>
         </div>
diff --git a/src/views/home/station/station/components/detailData.vue b/src/views/home/station/station/components/detailData.vue
index 237b22a..c936f30 100644
--- a/src/views/home/station/station/components/detailData.vue
+++ b/src/views/home/station/station/components/detailData.vue
@@ -8,7 +8,13 @@
 import monitorData from './monitorData.vue'
 import lifeCycleRecord from '@/views/home/well/components/lifeCycleRecord.vue'
 import maintenanceRecord from '@/views/home/well/components/maintenanceRecord.vue'
-const activeName = ref('监控数据')
+const { proxy } = getCurrentInstance() as any
+const activeName = ref(
+  proxy.hasPerm('/station/monitor/data')
+    ? '监控数据'
+    : proxy.hasPerm('/station/monitor/life')
+      ? '全生命周期记录'
+      : proxy.hasPerm('/station/monitor/maintenance') ? '监控设备维护记录' : '')
 const handleClick = (tab: TabsPaneContext, event: Event) => {
   console.log(tab, event)
 }
@@ -16,13 +22,13 @@
 
 <template>
   <el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick">
-    <el-tab-pane label="监控数据" name="监控数据">
+    <el-tab-pane v-if="proxy.hasPerm('/station/monitor/data')" label="监控数据" name="监控数据">
       <monitor-data v-if="activeName === '监控数据'" />
     </el-tab-pane>
-    <el-tab-pane label="全生命周期记录" name="全生命周期记录">
+    <el-tab-pane v-if="proxy.hasPerm('/station/monitor/life')" label="全生命周期记录" name="全生命周期记录">
       <life-cycle-record v-if="activeName === '全生命周期记录'" />
     </el-tab-pane>
-    <el-tab-pane label="监控设备维护记录" name="监控设备维护记录">
+    <el-tab-pane v-if="proxy.hasPerm('/station/monitor/maintenance')" label="监控设备维护记录" name="监控设备维护记录">
       <maintenance-record v-if="activeName === '监控设备维护记录'" />
     </el-tab-pane>
   </el-tabs>
diff --git a/src/views/home/station/station/index.vue b/src/views/home/station/station/index.vue
index 32eb20c..9cd1128 100644
--- a/src/views/home/station/station/index.vue
+++ b/src/views/home/station/station/index.vue
@@ -193,6 +193,7 @@
     tableHeight.value = window.innerHeight - 60 - 50 - 10 - 98 - 10 - 52 - 52 - 10
   }
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -254,7 +255,7 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary">
+          <el-button v-if="proxy.hasPerm('/station/monitor/export')" type="primary">
             导出
           </el-button>
         </div>
@@ -274,10 +275,10 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="120">
             <template #default="scope">
-              <el-button type="primary" link size="small" @click="editRow('detail', scope.row)">
+              <el-button v-if="proxy.hasPerm('/station/monitor/detail')" type="primary" link size="small" @click="editRow('detail', scope.row)">
                 查看
               </el-button>
-              <el-button type="primary" link size="small" @click="editRow('edit', scope.row)">
+              <el-button v-if="proxy.hasPerm('/station/monitor/update')" type="primary" link size="small" @click="editRow('edit', scope.row)">
                 编辑
               </el-button>
             </template>
diff --git a/src/views/home/well/components/detail.vue b/src/views/home/well/components/detail.vue
index eda3b06..55f4f08 100644
--- a/src/views/home/well/components/detail.vue
+++ b/src/views/home/well/components/detail.vue
@@ -147,6 +147,7 @@
 onMounted(() => {
   fetchWellDetail()
 })
+const detailRef = ref()
 </script>
 
 <template>
@@ -175,7 +176,7 @@
       </el-descriptions>
     </detail-block-com>
     <detail-block-com>
-      <detail-data />
+      <detail-data ref="detailRef" />
     </detail-block-com>
   </app-container>
 </template>
diff --git a/src/views/home/well/components/detailData.vue b/src/views/home/well/components/detailData.vue
index 7fcfe7b..3a1aed1 100644
--- a/src/views/home/well/components/detailData.vue
+++ b/src/views/home/well/components/detailData.vue
@@ -8,21 +8,31 @@
 import monitorData from './monitorData.vue'
 import lifeCycleRecord from './lifeCycleRecord.vue'
 import maintenanceRecord from './maintenanceRecord.vue'
-const activeName = ref('监控数据')
+const { proxy } = getCurrentInstance() as any
+const activeName = ref(
+  proxy.hasPerm('/well/monitor/data')
+    ? '监控数据'
+    : proxy.hasPerm('/well/monitor/life')
+      ? '全生命周期记录'
+      : proxy.hasPerm('/well/monitor/maintenance') ? '监控设备维护记录' : '',
+)
 const handleClick = (tab: TabsPaneContext, event: Event) => {
   console.log(tab, event)
 }
+defineExpose({
+  activeName,
+})
 </script>
 
 <template>
   <el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick">
-    <el-tab-pane label="监控数据" name="监控数据">
+    <el-tab-pane v-if="proxy.hasPerm('/well/monitor/data')" label="监控数据" name="监控数据">
       <monitor-data v-if="activeName === '监控数据'" />
     </el-tab-pane>
-    <el-tab-pane label="全生命周期记录" name="全生命周期记录">
+    <el-tab-pane v-if="proxy.hasPerm('/well/monitor/life')" label="全生命周期记录" name="全生命周期记录">
       <life-cycle-record v-if="activeName === '全生命周期记录'" />
     </el-tab-pane>
-    <el-tab-pane label="监控设备维护记录" name="监控设备维护记录">
+    <el-tab-pane v-if="proxy.hasPerm('/well/monitor/maintenance')" label="监控设备维护记录" name="监控设备维护记录">
       <maintenance-record v-if="activeName === '监控设备维护记录'" />
     </el-tab-pane>
   </el-tabs>
diff --git a/src/views/home/well/components/lifeCycleRecord.vue b/src/views/home/well/components/lifeCycleRecord.vue
index c56141d..d302836 100644
--- a/src/views/home/well/components/lifeCycleRecord.vue
+++ b/src/views/home/well/components/lifeCycleRecord.vue
@@ -17,7 +17,7 @@
   { text: '报警类型', value: 'alarmType', align: 'center' },
   { text: '报警等级', value: 'alarmLevel', align: 'center' },
   { text: '报警原因', value: 'alarmContent', align: 'center' },
-  { text: '是否误报', value: 'realAlarm', align: 'center' },
+  { text: '是否误报', value: 'realAlarmName', align: 'center' },
   { text: '报警解除时间', value: 'cancelTime', align: 'center' },
   { text: '处置时长', value: 'processDuration', align: 'center' },
 ])
@@ -62,6 +62,7 @@
 const detailRow = (row: any) => {
   console.log(row.id)
 }
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -75,7 +76,7 @@
       <el-button type="primary" style="margin-left: 10px;" @click="fetchData">
         搜索
       </el-button>
-      <el-button type="primary">
+      <el-button v-if="proxy.hasPerm($route.path.includes('well') ? '/well/lifeCycle/export' : '/station/monitor/exportLifeCycle')" type="primary">
         导出
       </el-button>
     </template>
@@ -84,13 +85,13 @@
       :pagination="false"
     >
       <template #columns>
-        <el-table-column label="操作" align="center" width="80">
+        <!-- <el-table-column label="操作" align="center" width="80">
           <template #default="scope">
             <el-button type="primary" link size="small" @click="detailRow(scope.row)">
               查看
             </el-button>
           </template>
-        </el-table-column>
+        </el-table-column> -->
       </template>
     </normal-table>
   </table-container>

diff --git a/src/App.vue b/src/App.vue
index cde81b3..8a00f5d 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -125,7 +125,7 @@
         '--g-sub-sidebar-actual-width': subSidebarActualWidth,
       }"
     />
-    <system-info v-if="browserType !== 'mobile'" />
+    <!-- <system-info v-if="browserType !== 'mobile'" /> -->
     <audio id="eventAudio" src="" autoplay />
   </el-config-provider>
 </template>
diff --git a/src/layouts/components/Tools/alarmDialog.vue b/src/layouts/components/Tools/alarmDialog.vue
index 1828375..df89ab8 100644
--- a/src/layouts/components/Tools/alarmDialog.vue
+++ b/src/layouts/components/Tools/alarmDialog.vue
@@ -116,7 +116,7 @@
     </div>
     <template #footer>
       <div class="dialog-footer">
-        <div class="btn" @click="detail">
+        <div v-if="proxy.hasPerm('/alarm/current')" class="btn" @click="detail">
           查看
         </div>
         <div v-if="info.isSound === '1'" class="btn" @click="closeSound">
diff --git a/src/layouts/components/Tools/alarmList.vue b/src/layouts/components/Tools/alarmList.vue
index c3a9d2a..5356b74 100644
--- a/src/layouts/components/Tools/alarmList.vue
+++ b/src/layouts/components/Tools/alarmList.vue
@@ -54,6 +54,7 @@
 }
 // 查看当前行
 const detailRow = (row: any) => {
+  if (!proxy.hasPerm('/alarm/current')) { return }
   $router.push({
     name: 'AlarmCurrent',
     query: {
@@ -77,21 +78,6 @@
   localStorage.setItem('eventAudio', 'pause')
 }
 const dialogRef = ref()
-// const dialog = () => {
-//   const row = {
-//     alarmNoteMethod: '1', // 消息提醒 1:弹窗，2:消息提醒
-//     isSound: '1', // 报警音效，1:开，0:关
-//     isSend: '1', // 报警推送，1:开，0:关
-//     isText: '1', // 报警短息，1:开，0:关
-//     alarmType: '浓度超限',
-//     tagNumber: 'NX5702',
-//     alarmTime: '2024-09-09',
-//     value: '20',
-//     typeName: '燃气智能终端',
-//     alarmLevel: '一级',
-//   }
-//   dialogRef.value.initDialog(row)
-// }
 const fetchData = (isLoading = false) => {
   loading.value = true
   if (isLoading) {
@@ -115,7 +101,10 @@
       dialogRef.value.initDialog(newVal)
     }
     if (newVal.isSound === '1') {
-      play()
+      // play()
+      if (!localStorage.getItem('eventAudio')) {
+        proxy.playAudio()
+      }
     }
     fetchData(false)
   }
@@ -146,6 +135,7 @@
 //     window.localStorage.removeItem('token')
 //   }
 // }
+// const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -180,7 +170,7 @@
                   {{ message.processStatus
                     === '未读' ? '未读' : '已读' }}
                 </el-tag>
-                <el-tag type="info" size="small" style="margin-left: 5px;">
+                <el-tag type="info" size="small" style="margin-left: 5px;" @click="detailRow(message)">
                   查看
                 </el-tag>
               </div>
@@ -214,7 +204,7 @@
       <!-- <div class="close" @click="dialog">
         弹窗
       </div> -->
-      <div class="more" @click="moreList">
+      <div v-if="proxy.hasPerm('/alarm/current')" class="more" @click="moreList">
         查看更多
       </div>
     </div>
diff --git a/src/layouts/components/Tools/index.vue b/src/layouts/components/Tools/index.vue
index 9f2d41f..61f9707 100644
--- a/src/layouts/components/Tools/index.vue
+++ b/src/layouts/components/Tools/index.vue
@@ -79,6 +79,7 @@
   // 断开 websocket
   // websocket.destroyWebSocket()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -89,18 +90,18 @@
           <svg-icon name="ep:search" />
         </el-icon>
       </span>
-      <span class="item" @click="board">
+      <span v-if="proxy.hasPerm('/fullscreen')" class="item" @click="board">
         <el-icon>
           <svg-icon name="ep:data-line" />
         </el-icon>
       </span>
-      <span v-if="settingsStore.mode === 'pc' && settingsStore.toolbar.enableFullscreen" class="item" @click="toggle">
+      <span class="item" @click="toggle">
         <el-icon>
           <svg-icon :name="isFullscreen ? 'fullscreen-exit' : 'fullscreen'" />
         </el-icon>
       </span>
       <!-- 报警信息列表 -->
-      <span class="item">
+      <span v-if="proxy.hasPerm('/alarmnotice')" class="item">
         <el-popover width="390">
           <template #reference>
             <div>
diff --git a/src/layouts/components/Topbar/index.vue b/src/layouts/components/Topbar/index.vue
index 2863cef..4e3120e 100644
--- a/src/layouts/components/Topbar/index.vue
+++ b/src/layouts/components/Topbar/index.vue
@@ -67,7 +67,7 @@
           </transition-group>
         </el-breadcrumb>
       </div>
-      <tools />
+      <!-- <tools /> -->
     </div>
   </div>
 </template>
diff --git a/src/router/modules/pc.ts b/src/router/modules/pc.ts
index aacd6fa..97ced45 100644
--- a/src/router/modules/pc.ts
+++ b/src/router/modules/pc.ts
@@ -40,7 +40,7 @@
       icon: 'ep:key',
       sidebar: false,
       breadcrumb: false,
-      // auth: '/fullscreen',
+      auth: '/fullscreen',
     },
   },
   {
@@ -155,7 +155,7 @@
           sidebar: false,
           breadcrumb: false,
           activeMenu: '/well',
-          auth: '/well/detail',
+          auth: '/well',
         },
       },
     ],
diff --git a/src/views/home/alarm/count/components/locationAnalysis.vue b/src/views/home/alarm/count/components/locationAnalysis.vue
index fc75b9e..bff1853 100644
--- a/src/views/home/alarm/count/components/locationAnalysis.vue
+++ b/src/views/home/alarm/count/components/locationAnalysis.vue
@@ -46,6 +46,7 @@
   })
 }
 fetchData()
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -75,6 +76,9 @@
         <el-button type="primary" style="margin: 0 5px;" @click="fetchData">
           搜索
         </el-button>
+        <el-button v-if="proxy.hasPerm('/alarm/count/exportLocation')" type="primary" style="margin: 0 5px;">
+          导出
+        </el-button>
       </div>
     </template>
     <template #content>
diff --git a/src/views/home/alarm/current/components/detail.vue b/src/views/home/alarm/current/components/detail.vue
index dd3b31a..4204c92 100644
--- a/src/views/home/alarm/current/components/detail.vue
+++ b/src/views/home/alarm/current/components/detail.vue
@@ -111,7 +111,7 @@
   const res2 = await getAlarmTypeListPage({ offset: 1, limit: 9999 });
   ($route.query.type === 'history' ? getAlarmDetail : getAlarmDetail)($route.query.id as string).then((res) => {
     detailInfo.value = toHumpObject(res.data)
-    detailInfo.value.realAlarmName = detailInfo.value.realAlarm === '1' ? '报警' : '误报'
+    detailInfo.value.realAlarmName = detailInfo.value.realAlarm === '0' ? '是' : '否'
     detailInfo.value.alarmTypeName = res2.data.rows.filter((item: any) => item.id === detailInfo.value.alarmTypeId)[0]?.alarmType || ''
     detailInfo.value.alarmLevelName = res1.data.rows.filter((item: any) => item.id === detailInfo.value.alarmLevel)[0]?.alarmLevel || ''
     detailInfo.value.duration = detailInfo.value.ts && detailInfo.value.cancelTime ? getDateDiff(detailInfo.value.ts, detailInfo.value.cancelTime) : ''
@@ -139,6 +139,7 @@
 }
 // 点击经纬度展示地图
 const mapRef = ref()
+const { proxy } = getCurrentInstance() as any
 const showMap = (data: any) => {
   console.log(data, 'data')
   if (data.text === '位置') {
@@ -148,6 +149,13 @@
         2: 'StationMonitorDetail',
         3: 'PipelineMonitorDetail',
       } as { [key: string]: string }
+      // 判断是否有菜单权限
+      const watchObjectAuth = {
+        1: '/well',
+        2: '/station/monitor',
+        3: '/pipeline',
+      } as { [key: string]: string }
+      if (!proxy.hasPerm(watchObjectAuth[detailInfo.value.watchObject])) { return }
       $router.push({
         name: watchObject[detailInfo.value.watchObject],
         query: {
diff --git a/src/views/home/alarm/current/components/detailInfoDialog.vue b/src/views/home/alarm/current/components/detailInfoDialog.vue
index c089449..7fbf06b 100644
--- a/src/views/home/alarm/current/components/detailInfoDialog.vue
+++ b/src/views/home/alarm/current/components/detailInfoDialog.vue
@@ -114,6 +114,7 @@
   })
 }
 defineExpose({ initDialog, close })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -131,7 +132,7 @@
     <!-- 头部 -->
     <div class="header">
       <span>{{ info.alarmContent }}</span>
-      <span class="more" @click="moreData">>>更多</span>
+      <span v-if="proxy.hasPerm(type === 'data' ? '/alarm/current/more' : '/alarm/device/more')" class="more" @click="moreData">>>更多</span>
     </div>
     <div class="content">
       <div v-show="type === 'device'" class="item">
@@ -162,7 +163,7 @@
         报警设备:
         <span style="padding-left: 6px;">{{ info.devcode }} </span>
         <el-button
-          v-if="info.devTypeName === '燃气智能监测终端' || info.devTypeName === '液位检测仪' || info.devTypeName === '井盖监测仪'"
+          v-if="(info.devTypeName === '燃气智能监测终端' || info.devTypeName === '液位检测仪' || info.devTypeName === '井盖监测仪') && proxy.hasPerm('/alarm/current/data')"
           size="small" style="margin-left: 6px;" @click="viewData"
         >
           查看数据
@@ -228,7 +229,7 @@
         <span style="padding-left: 6px;">
           {{ info.confirmContent }}
         </span>
-        <el-button v-if="type === 'data'" size="small" style="padding-left: 6px;" @click="viewProcess">
+        <el-button v-if="type === 'data' && proxy.hasPerm('/alarm/current/process')" size="small" style="padding-left: 6px;" @click="viewProcess">
           流程图
         </el-button>
       </div>
@@ -246,17 +247,17 @@
       </div>
     </div>
     <div class="footer">
-      <el-button v-if="Number(info.processStatus) < 4 && type === 'data'" size="small" @click="remind">
+      <el-button v-if="(Number(info.processStatus) < 4 && type === 'data') && proxy.hasPerm('/alarm/current/remind')" size="small" @click="remind">
         提醒责任人
       </el-button>
       <el-button
-        v-if="type === 'device' && (info.processStatusName === '待处置' || info.processStatusName === '挂起')"
+        v-if="(type === 'device' && (info.processStatusName === '待处置' || info.processStatusName === '挂起')) && proxy.hasPerm('/alarm/device/handler')"
         size="small" @click="handler"
       >
         报警处置
       </el-button>
       <el-button
-        v-if="Number(info.processStatus) <= 3 || (type === 'device' && info.processStatusName === '待处置') || info.processStatusName === '挂起'"
+        v-if="(Number(info.processStatus) <= 3 || (type === 'device' && info.processStatusName === '待处置') || info.processStatusName === '挂起') && proxy.hasPerm(type === 'device' ? '/alarm/device/pending' : '/alarm/current/pending')"
         type="primary" size="small" @click="pending"
       >
         挂起
diff --git a/src/views/home/alarm/current/index.vue b/src/views/home/alarm/current/index.vue
index d019bbf..e2714bb 100644
--- a/src/views/home/alarm/current/index.vue
+++ b/src/views/home/alarm/current/index.vue
@@ -4,6 +4,7 @@
   Date: 2023-06-28
  -->
 <script lang="ts" setup name="CurrentAlarm">
+import dayjs from 'dayjs'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import { ArrowLeftBold, ArrowRightBold } from '@element-plus/icons-vue'
 import MapCom from './components/map.vue'
@@ -100,6 +101,7 @@
       path: '/alarm/current',
     })
   }
+  datetimerange.value = []
   listQuery.value = {
     limit: 20,
     offset: 1,
@@ -131,8 +133,8 @@
   if ($route.query.row) {
     loadingTable.value = true
     const row = JSON.parse($route.query.row as string)
-    getCurrentAlarmListPage({ offset: 1, limit: 99999 }).then((res) => {
-      const data = res.data.rows.filter((item: any) => item.id === row.id)
+    getCurrentAlarmListPage({ offset: 1, limit: 50 }).then((res) => {
+      const data = res.data.rows.filter((item: any) => item.id === row.alarmId)
       if (data.length) {
         list1.value = data.map((item: any) => ({
           ...item,
@@ -153,7 +155,10 @@
     })
     return
   }
-  fetchData()
+  datetimerange.value = [dayjs().subtract(7, 'day').format('YYYY-MM-DD HH:mm:ss'), dayjs().format('YYYY-MM-DD HH:mm:ss')]
+  setTimeout(() => {
+    fetchData()
+  })
 })
 // 表格标识  地图或普通
 const tableFlag = ref('normal')
@@ -181,6 +186,10 @@
 const mapRef = ref()
 const mapData = ref({})
 async function detail(row: any) {
+  if (row.processStatusName === '未读') {
+    list1.value[list1.value.findIndex((item: any) => item.id === row.id)].processStatusName = '已读'
+    row.processStatusName = '已读'
+  }
   const res = await detailAlarm(row.id)
   const data = toHumpObject(res.data)
   mapData.value = row
@@ -362,7 +371,7 @@
               <el-button v-if="proxy.hasPerm('/alarm/current/delete')" type="primary" @click="batchDeleteRow">
                 批量删除
               </el-button>
-              <el-button type="primary" @click="exportList">
+              <el-button v-if="proxy.hasPerm('/alarm/current/export')" type="primary" @click="exportList">
                 导出
               </el-button>
             </div>
@@ -383,7 +392,7 @@
               </el-table-column>
             </template>
             <template #columns>
-              <el-table-column label="操作" align="center" width="80">
+              <el-table-column v-if="proxy.hasPerm('/alarm/current/detail')" label="操作" align="center" width="80">
                 <template #default="scope">
                   <el-button type="primary" link size="small" @click="detail(scope.row)">
                     查看
diff --git a/src/views/home/alarm/history/index.vue b/src/views/home/alarm/history/index.vue
index eeb49fc..3c810c3 100644
--- a/src/views/home/alarm/history/index.vue
+++ b/src/views/home/alarm/history/index.vue
@@ -97,6 +97,7 @@
 }
 // 重置查询条件f
 const reset = () => {
+  datetimerange.value = []
   listQuery.value = {
     limit: 20,
     offset: 1,
@@ -189,6 +190,7 @@
   })
 }
 fetchDict()
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -249,7 +251,7 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="exportList">
+          <el-button v-if="proxy.hasPerm('/alarm/history/export')" type="primary" @click="exportList">
             导出
           </el-button>
         </div>
@@ -272,7 +274,7 @@
           </el-table-column>
         </template>
         <template #columns>
-          <el-table-column label="操作" align="center" width="80">
+          <el-table-column v-if="proxy.hasPerm('/alarm/history/detail')" label="操作" align="center" width="80">
             <template #default="scope">
               <el-button type="primary" link size="small" @click="moreData(scope.row)">
                 查看
diff --git a/src/views/home/dashboard/index.vue b/src/views/home/dashboard/index.vue
index d2f7e3c..42dfbed 100644
--- a/src/views/home/dashboard/index.vue
+++ b/src/views/home/dashboard/index.vue
@@ -42,7 +42,7 @@
     value: '0',
     name: '在线',
     unit: '个',
-    id: '1',
+    id: '1,2',
   },
   {
     img: img.lixian,
@@ -56,7 +56,7 @@
     value: '0',
     name: '停用',
     unit: '个',
-    id: '2',
+    id: '3',
   },
 ])
 // 工作台数据
@@ -133,7 +133,11 @@
   deviceOperationLoading.value = true
   getDeviceStatus().then((res) => {
     res.data.forEach((element: any) => {
-      const index = deviceOperationData.value.findIndex((item: any) => item.id === element.name)
+      if (element.name === '1' || element.name === '2') {
+        deviceOperationData.value[0].value = Number(deviceOperationData.value[0].value || '0') + Number(element.value)
+        return
+      }
+      const index = deviceOperationData.value.findIndex((item: any) => item.id.includes(element.name))
       if (index !== -1) {
         deviceOperationData.value[index].value = element.value
       }
diff --git a/src/views/home/device/count/components/bottom.vue b/src/views/home/device/count/components/bottom.vue
index 28a4d78..e4e56fa 100644
--- a/src/views/home/device/count/components/bottom.vue
+++ b/src/views/home/device/count/components/bottom.vue
@@ -110,6 +110,7 @@
   })
 }
 fetchDict()
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -148,7 +149,7 @@
             <template #btns-right>
               <!-- 操作 -->
               <div>
-                <el-button type="primary">
+                <el-button v-if="proxy.hasPerm('/device/count/offline/export')" type="primary">
                   导出
                 </el-button>
               </div>
diff --git a/src/views/home/device/device/index.vue b/src/views/home/device/device/index.vue
index c3970b9..9cdd606 100644
--- a/src/views/home/device/device/index.vue
+++ b/src/views/home/device/device/index.vue
@@ -88,6 +88,7 @@
 }
 // 重置查询条件f
 const reset = () => {
+  datetimerange.value = []
   listQuery.value = {
     limit: 20,
     offset: 1,
@@ -296,6 +297,7 @@
   fetchDict()
   fetchData()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -372,17 +374,17 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="editRow('add', {})">
+          <el-button v-if="proxy.hasPerm('/device/manage/add')" type="primary" @click="editRow('add', {})">
             新建
           </el-button>
-          <el-button type="primary" @click="downloadTemplate">
+          <el-button v-if="proxy.hasPerm('/device/manage/down')" type="primary" @click="downloadTemplate">
             模板下载
           </el-button>
-          <el-button type="primary" @click="importList">
+          <el-button v-if="proxy.hasPerm('/device/manage/import')" type="primary" @click="importList">
             批量导入
           </el-button>
-          <el-button type="primary" @click="exportList">
-            导出列表
+          <el-button v-if="proxy.hasPerm('/device/manage/export')" type="primary" @click="exportList">
+            导出
           </el-button>
           <input ref="fileRef" style="display: none;" type="file" accept=".xls,.xlsx" @change="onFileChange">
         </div>
@@ -409,16 +411,16 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="150">
             <template #default="scope">
-              <el-button type="primary" link size="small" @click="editRow('detail', scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/manage/detail')" type="primary" link size="small" @click="editRow('detail', scope.row)">
                 查看
               </el-button>
-              <el-button type="primary" link size="small" @click="editRow('edit', scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/manage/update')" type="primary" link size="small" @click="editRow('edit', scope.row)">
                 编辑
               </el-button>
-              <el-button type="danger" link size="small" @click="changeDefense(scope.row)">
+              <!-- <el-button v-if="proxy.hasPerm('/device/manage/add')" type="danger" link size="small" @click="changeDefense(scope.row)">
                 撤防
-              </el-button>
-              <el-button type="danger" link size="small" @click="removeRow(scope.row)">
+              </el-button> -->
+              <el-button v-if="proxy.hasPerm('/device/manage/delete')" type="danger" link size="small" @click="removeRow(scope.row)">
                 删除
               </el-button>
             </template>
diff --git a/src/views/home/device/instruction/index.vue b/src/views/home/device/instruction/index.vue
index 1e598ed..1da6706 100644
--- a/src/views/home/device/instruction/index.vue
+++ b/src/views/home/device/instruction/index.vue
@@ -78,6 +78,7 @@
 }
 // 重置查询条件f
 const reset = () => {
+  datetimerange.value = []
   listQuery.value = {
     limit: 20,
     offset: 1,
@@ -158,6 +159,7 @@
     editRef.value.initDialog('addOther', {})
   }
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -213,10 +215,10 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary">
+          <el-button v-if="proxy.hasPerm('/device/instruction/batch')" type="primary">
             批量下发
           </el-button>
-          <el-button type="primary" @click="editRow('add', {})">
+          <el-button v-if="proxy.hasPerm('/device/instruction/add')" type="primary" @click="editRow('add', {})">
             新建
           </el-button>
         </div>
@@ -236,13 +238,13 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="120">
             <template #default="scope">
-              <el-button type="primary" link size="small" @click="editRow('detail', scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/instruction/detail')" type="primary" link size="small" @click="editRow('detail', scope.row)">
                 查看
               </el-button>
-              <el-button v-if="scope.row.status === '2'" type="primary" link size="small" @click="editRow('edit', scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/instruction/again') && scope.row.status === '2'" type="primary" link size="small" @click="editRow('edit', scope.row)">
                 重新下发
               </el-button>
-              <el-button type="danger" link size="small" @click="removeRow(scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/instruction/delete')" type="danger" link size="small" @click="removeRow(scope.row)">
                 删除
               </el-button>
             </template>
diff --git a/src/views/home/device/product/index.vue b/src/views/home/device/product/index.vue
index 799fc90..fdd5463 100644
--- a/src/views/home/device/product/index.vue
+++ b/src/views/home/device/product/index.vue
@@ -128,6 +128,7 @@
   await fetchDict()
   fetchData()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -164,7 +165,7 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="editRow('add', {})">
+          <el-button v-if="proxy.hasPerm('/device/product/add')" type="primary" @click="editRow('add', {})">
             新建
           </el-button>
         </div>
@@ -184,10 +185,10 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="120">
             <template #default="scope">
-              <el-button type="primary" link size="small" @click="editRow('edit', scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/product/update')" type="primary" link size="small" @click="editRow('edit', scope.row)">
                 编辑
               </el-button>
-              <el-button type="danger" link size="small" @click="removeRow(scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/product/delete')" type="danger" link size="small" @click="removeRow(scope.row)">
                 删除
               </el-button>
             </template>
diff --git a/src/views/home/device/type/index.vue b/src/views/home/device/type/index.vue
index 59f1343..2344e57 100644
--- a/src/views/home/device/type/index.vue
+++ b/src/views/home/device/type/index.vue
@@ -105,6 +105,7 @@
   await fetchDict()
   fetchData()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -131,7 +132,7 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="editRow('add', {})">
+          <el-button v-if="proxy.hasPerm('/device/type/add')" type="primary" @click="editRow('add', {})">
             新建
           </el-button>
         </div>
@@ -151,10 +152,10 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="120">
             <template #default="scope">
-              <el-button type="primary" link size="small" @click="editRow('edit', scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/type/update')" type="primary" link size="small" @click="editRow('edit', scope.row)">
                 编辑
               </el-button>
-              <el-button type="danger" link size="small" @click="removeRow(scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/type/delete')" type="danger" link size="small" @click="removeRow(scope.row)">
                 删除
               </el-button>
             </template>
diff --git a/src/views/home/ledger/ledger/components/gridList.vue b/src/views/home/ledger/ledger/components/gridList.vue
index d03cd9f..189edef 100644
--- a/src/views/home/ledger/ledger/components/gridList.vue
+++ b/src/views/home/ledger/ledger/components/gridList.vue
@@ -91,6 +91,7 @@
     // })
   })
 }
+const { proxy } = getCurrentInstance() as any
 // 同步日志
 const allSync = () => {
   $router.push({
@@ -139,10 +140,10 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="allSync">
+          <el-button v-if="proxy.hasPerm('/ledger/sync')" type="primary" @click="allSync">
             同步日志
           </el-button>
-          <el-button type="primary" @click="sync('all', {})">
+          <el-button v-if="proxy.hasPerm('/ledger/sync/all')" type="primary" @click="sync('all', {})">
             全量同步
           </el-button>
         </div>
@@ -160,9 +161,9 @@
           </el-table-column>
         </template>
         <template #columns>
-          <el-table-column label="操作" align="center" width="80">
+          <el-table-column v-if="proxy.hasPerm('/ledger/sync/single')" label="操作" align="center" width="80">
             <template #default="scope">
-              <el-button type="primary" link size="small" @click="sync('single', scope.row)">
+              <el-button v-if="proxy.hasPerm('/ledger/sync/single')" type="primary" link size="small" @click="sync('single', scope.row)">
                 同步
               </el-button>
             </template>
diff --git a/src/views/home/ledger/ledger/components/wellList.vue b/src/views/home/ledger/ledger/components/wellList.vue
index 9eb1f43..06f855a 100644
--- a/src/views/home/ledger/ledger/components/wellList.vue
+++ b/src/views/home/ledger/ledger/components/wellList.vue
@@ -123,6 +123,7 @@
   // await fetchDict()
   fetchData()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -159,11 +160,11 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="allSync">
+          <el-button v-if="proxy.hasPerm('/ledger/sync')" type="primary" @click="allSync">
             同步日志
           </el-button>
-          <el-button type="primary" @click="sync('all', {})">
-            全部同步
+          <el-button v-if="proxy.hasPerm('/ledger/sync/all')" type="primary" @click="sync('all', {})">
+            全量同步
           </el-button>
         </div>
       </template>
@@ -180,9 +181,9 @@
           </el-table-column>
         </template>
         <template #columns>
-          <el-table-column label="操作" align="center" width="80">
+          <el-table-column v-if="proxy.hasPerm('/ledger/sync/single')" label="操作" align="center" width="80">
             <template #default="scope">
-              <el-button type="primary" link size="small" @click="sync('single', scope.row)">
+              <el-button v-if="proxy.hasPerm('/ledger/sync/single')" type="primary" link size="small" @click="sync('single', scope.row)">
                 同步
               </el-button>
             </template>
diff --git a/src/views/home/ledger/ledger/index.vue b/src/views/home/ledger/ledger/index.vue
index a03aa12..8403fc5 100644
--- a/src/views/home/ledger/ledger/index.vue
+++ b/src/views/home/ledger/ledger/index.vue
@@ -7,7 +7,16 @@
 import type { TabsPaneContext } from 'element-plus'
 import wellList from './components/wellList.vue'
 import gridList from './components/gridList.vue'
-const activeName = ref('闸井')
+const { proxy } = getCurrentInstance() as any
+const activeName = ref(
+  proxy.hasPerm('/ledger/manage/well')
+    ? '闸井'
+    : proxy.hasPerm('/ledger/manage/station')
+      ? '场站'
+      : proxy.hasPerm('/ledger/manage/grid')
+        ? '网格'
+        : '',
+)
 const handleClick = (tab: TabsPaneContext, event: Event) => {
   // console.log(tab, event)
 }
@@ -17,13 +26,13 @@
   <!-- 布局 -->
   <app-container>
     <el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick">
-      <el-tab-pane label="闸井" name="闸井">
+      <el-tab-pane v-if="proxy.hasPerm('/ledger/manage/well')" label="闸井" name="闸井">
         <well-list v-if="activeName === '闸井'" type="1" />
       </el-tab-pane>
-      <el-tab-pane label="场站" name="场站">
+      <el-tab-pane v-if="proxy.hasPerm('/ledger/manage/station')" label="场站" name="场站">
         <well-list v-if="activeName === '场站'" type="2" />
       </el-tab-pane>
-      <el-tab-pane label="网格" name="网格">
+      <el-tab-pane v-if="proxy.hasPerm('/ledger/manage/grid')" label="网格" name="网格">
         <grid-list v-if="activeName === '网格'" />
       </el-tab-pane>
     </el-tabs>
diff --git a/src/views/home/ledger/pipeline/index.vue b/src/views/home/ledger/pipeline/index.vue
index e0d2512..01e95ac 100644
--- a/src/views/home/ledger/pipeline/index.vue
+++ b/src/views/home/ledger/pipeline/index.vue
@@ -160,6 +160,7 @@
 onMounted(async () => {
   fetchData()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -222,13 +223,13 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="editRow('add', {})">
+          <el-button v-if="proxy.hasPerm('/ledger/pipeline/add')" type="primary" @click="editRow('add', {})">
             新增
           </el-button>
-          <el-button type="primary" @click="importList">
+          <el-button v-if="proxy.hasPerm('/ledger/pipeline/import')" type="primary" @click="importList">
             批量导入
           </el-button>
-          <el-button type="primary" @click="exportList">
+          <el-button v-if="proxy.hasPerm('/ledger/pipeline/export')" type="primary" @click="exportList">
             批量导出
           </el-button>
         </div>
@@ -248,10 +249,10 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="100">
             <template #default="scope">
-              <el-button type="primary" link size="small" @click="editRow('edit', scope.row)">
+              <el-button v-if="proxy.hasPerm('/ledger/pipeline/update')" type="primary" link size="small" @click="editRow('edit', scope.row)">
                 编辑
               </el-button>
-              <el-button type="danger" link size="small" @click="removeRow(scope.row)">
+              <el-button v-if="proxy.hasPerm('/ledger/pipeline/delete')" type="danger" link size="small" @click="removeRow(scope.row)">
                 删除
               </el-button>
             </template>
diff --git a/src/views/home/ledger/sync/index.vue b/src/views/home/ledger/sync/index.vue
index 54a3218..a04bad9 100644
--- a/src/views/home/ledger/sync/index.vue
+++ b/src/views/home/ledger/sync/index.vue
@@ -62,6 +62,7 @@
 }
 // 重置查询条件f
 const reset = () => {
+  datetimerange.value = []
   listQuery.value = {
     limit: 20,
     offset: 1,
@@ -106,6 +107,8 @@
 onMounted(async () => {
   fetchData()
 })
+const { proxy } = getCurrentInstance() as any
+const $route = useRoute()
 </script>
 
 <template>
@@ -132,7 +135,7 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="goBak">
+          <el-button v-if="$route.type" type="primary" @click="goBak">
             返回
           </el-button>
         </div>
@@ -152,10 +155,10 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="80">
             <template #default="scope">
-              <el-button type="primary" link size="small">
+              <el-button v-if="proxy.hasPerm('/ledger/sync/detail')" type="primary" link size="small">
                 查看
               </el-button>
-              <el-button type="danger" link size="small" @click="removeRow(scope.row)">
+              <el-button v-if="proxy.hasPerm('/ledger/sync/delete')" type="danger" link size="small" @click="removeRow(scope.row)">
                 删除
               </el-button>
             </template>
diff --git a/src/views/home/monitor/service/index.vue b/src/views/home/monitor/service/index.vue
index 8df2239..570dc68 100644
--- a/src/views/home/monitor/service/index.vue
+++ b/src/views/home/monitor/service/index.vue
@@ -53,6 +53,7 @@
 onMounted(async () => {
   fetchData()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -66,7 +67,7 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary">
+          <el-button v-if="proxy.hasPerm('/monitor/service/add')" type="primary">
             新建
           </el-button>
         </div>
diff --git a/src/views/home/monitor/time/index.vue b/src/views/home/monitor/time/index.vue
index caa6d46..0f7f5a0 100644
--- a/src/views/home/monitor/time/index.vue
+++ b/src/views/home/monitor/time/index.vue
@@ -53,6 +53,7 @@
 onMounted(async () => {
   fetchData()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -66,7 +67,7 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary">
+          <el-button v-if="proxy.hasPerm('/monitor/time/add')" type="primary">
             新建
           </el-button>
         </div>
diff --git a/src/views/home/operation/alarm/components/detail.vue b/src/views/home/operation/alarm/components/detail.vue
index 8194cbd..4ae4a1f 100644
--- a/src/views/home/operation/alarm/components/detail.vue
+++ b/src/views/home/operation/alarm/components/detail.vue
@@ -151,6 +151,7 @@
 }
 // 点击经纬度展示地图
 const mapRef = ref()
+const { proxy } = getCurrentInstance() as any
 const showMap = (data: any) => {
   console.log(data, 'data')
   if (data.text === '位置') {
@@ -160,6 +161,13 @@
         2: 'StationMonitorDetail',
         3: 'PipelineMonitorDetail',
       } as { [key: string]: string }
+      // 判断是否有菜单权限
+      const watchObjectAuth = {
+        1: '/well',
+        2: '/station/monitor',
+        3: '/pipeline',
+      } as { [key: string]: string }
+      if (!proxy.hasPerm(watchObjectAuth[detailInfo.value.watchObject])) { return }
       $router.push({
         name: watchObject[detailInfo.value.watchObject],
         query: {
diff --git a/src/views/home/operation/alarm/index.vue b/src/views/home/operation/alarm/index.vue
index ac0f31b..e53c991 100644
--- a/src/views/home/operation/alarm/index.vue
+++ b/src/views/home/operation/alarm/index.vue
@@ -82,6 +82,7 @@
 }
 // 重置查询条件f
 const reset = () => {
+  datetimerange.value = []
   listQuery.value = {
     limit: 20,
     offset: 1,
@@ -315,7 +316,7 @@
               <el-button v-if="proxy.hasPerm('/alarm/device/delete')" type="primary" @click="batchDeleteRow">
                 批量删除
               </el-button>
-              <el-button type="primary" @click="exportList">
+              <el-button v-if="proxy.hasPerm('/alarm/device/export')" type="primary" @click="exportList">
                 导出
               </el-button>
             </div>
@@ -336,7 +337,7 @@
               </el-table-column>
             </template>
             <template #columns>
-              <el-table-column label="操作" align="center" width="80">
+              <el-table-column v-if="proxy.hasPerm('/alarm/device/detail')" label="操作" align="center" width="80">
                 <template #default="scope">
                   <el-button type="primary" link size="small" @click="detail(scope.row)">
                     查看
diff --git a/src/views/home/operation/history/index.vue b/src/views/home/operation/history/index.vue
index 5c04ff7..d96ac57 100644
--- a/src/views/home/operation/history/index.vue
+++ b/src/views/home/operation/history/index.vue
@@ -78,6 +78,7 @@
 }
 // 重置查询条件f
 const reset = () => {
+  datetimerange.value = []
   listQuery.value = {
     limit: 20,
     offset: 1,
@@ -161,6 +162,7 @@
     fetchData()
   })
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -218,7 +220,7 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="exportList">
+          <el-button v-if="proxy.hasPerm('/operation/history/export')" type="primary" @click="exportList">
             导出
           </el-button>
         </div>
@@ -241,7 +243,7 @@
           </el-table-column>
         </template>
         <template #columns>
-          <el-table-column label="操作" align="center" width="80">
+          <el-table-column v-if="proxy.hasPerm('/operation/history/detail')" label="操作" align="center" width="80">
             <template #default="scope">
               <el-button type="primary" link size="small" @click="detailRow(scope.row)">
                 查看
diff --git a/src/views/home/operation/manufacturer/index.vue b/src/views/home/operation/manufacturer/index.vue
index 4a5816a..5f647c3 100644
--- a/src/views/home/operation/manufacturer/index.vue
+++ b/src/views/home/operation/manufacturer/index.vue
@@ -75,6 +75,7 @@
 }
 // 重置查询条件f
 const reset = () => {
+  datetimerange.value = []
   listQuery.value = {
     limit: 20,
     offset: 1,
@@ -125,6 +126,7 @@
   await fetchDict()
   fetchData()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -178,7 +180,7 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="exportList">
+          <el-button v-if="proxy.hasPerm('/operation/manufacturer/export')" type="primary" @click="exportList">
             导出
           </el-button>
         </div>
diff --git a/src/views/home/operation/trajectory/index.vue b/src/views/home/operation/trajectory/index.vue
index 9312fd7..606958e 100644
--- a/src/views/home/operation/trajectory/index.vue
+++ b/src/views/home/operation/trajectory/index.vue
@@ -65,6 +65,7 @@
 }
 // 重置查询条件f
 const reset = () => {
+  datetimerange.value = []
   listQuery.value = {
     limit: 20,
     offset: 1,
@@ -114,6 +115,7 @@
   await fetchDict()
   fetchData()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -175,7 +177,7 @@
           </span>
         </template>
         <template #columns>
-          <el-table-column label="操作" width="80" align="center">
+          <el-table-column v-if="proxy.hasPerm('/operation/trajectory/detail')" label="操作" width="80" align="center">
             <template #default="scope">
               <el-button type="primary" link size="small" @click="detail(scope.row)">
                 查看
diff --git a/src/views/home/pipeline/components/detailData.vue b/src/views/home/pipeline/components/detailData.vue
index 80b6886..760b1c5 100644
--- a/src/views/home/pipeline/components/detailData.vue
+++ b/src/views/home/pipeline/components/detailData.vue
@@ -7,7 +7,13 @@
 import type { TabsPaneContext } from 'element-plus'
 import monitorData from './monitorDataList.vue'
 import maintenanceRecord from '@/views/home/well/components/maintenanceRecord.vue'
-const activeName = ref('监控数据')
+const { proxy } = getCurrentInstance() as any
+const activeName = ref(
+  proxy.hasPerm('/pipeline/monitor/data')
+    ? '监控数据'
+    : proxy.hasPerm('/pipeline/monitor/maintenance')
+      ? '监控设备维护记录'
+      : '')
 const handleClick = (tab: TabsPaneContext, event: Event) => {
   // console.log(tab, event)
 }
@@ -15,10 +21,10 @@
 
 <template>
   <el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick">
-    <el-tab-pane label="监控数据" name="监控数据">
+    <el-tab-pane v-if="proxy.hasPerm('/pipeline/monitor/data')" label="监控数据" name="监控数据">
       <monitor-data v-if="activeName === '监控数据'" />
     </el-tab-pane>
-    <el-tab-pane label="监控设备维护记录" name="监控设备维护记录">
+    <el-tab-pane v-if="proxy.hasPerm('/pipeline/monitor/maintenance')" label="监控设备维护记录" name="监控设备维护记录">
       <maintenance-record v-if="activeName === '监控设备维护记录'" />
     </el-tab-pane>
   </el-tabs>
diff --git a/src/views/home/pipeline/index.vue b/src/views/home/pipeline/index.vue
index 90baef0..4d66e51 100644
--- a/src/views/home/pipeline/index.vue
+++ b/src/views/home/pipeline/index.vue
@@ -254,6 +254,7 @@
     tableHeight.value = window.innerHeight - 60 - 50 - 10 - 98 - 10 - 52 - 52 - 10
   }
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -348,7 +349,7 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary">
+          <el-button v-if="proxy.hasPerm('/pipeline/export')" type="primary">
             导出
           </el-button>
         </div>
@@ -368,7 +369,7 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="80">
             <template #default="scope">
-              <el-button type="primary" link size="small" @click="editRow('detail', scope.row)">
+              <el-button v-if="proxy.hasPerm('/pipeline/detail')" type="primary" link size="small" @click="editRow('detail', scope.row)">
                 查看
               </el-button>
               <!-- <el-button type="primary" link size="small" @click="editRow('edit', scope.row)">
diff --git a/src/views/home/rule/agreement/index.vue b/src/views/home/rule/agreement/index.vue
index fd41cd3..f1cfe15 100644
--- a/src/views/home/rule/agreement/index.vue
+++ b/src/views/home/rule/agreement/index.vue
@@ -95,6 +95,7 @@
 onMounted(async () => {
   fetchData()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -119,7 +120,7 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="editRow('add', {})">
+          <el-button v-if="proxy.hasPerm('/rule/agreement/add')" type="primary" @click="editRow('add', {})">
             新建
           </el-button>
         </div>
@@ -139,10 +140,10 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="120">
             <template #default="scope">
-              <el-button type="primary" link size="small" @click="editRow('edit', scope.row)">
+              <el-button v-if="proxy.hasPerm('/rule/agreement/update')" type="primary" link size="small" @click="editRow('edit', scope.row)">
                 编辑
               </el-button>
-              <el-button type="danger" link size="small" @click="removeRow(scope.row)">
+              <el-button v-if="proxy.hasPerm('/rule/agreement/delete')" type="danger" link size="small" @click="removeRow(scope.row)">
                 删除
               </el-button>
             </template>
diff --git a/src/views/home/rule/alarm/components/alarmLevelList.vue b/src/views/home/rule/alarm/components/alarmLevelList.vue
index c8ffb7d..6c337c4 100644
--- a/src/views/home/rule/alarm/components/alarmLevelList.vue
+++ b/src/views/home/rule/alarm/components/alarmLevelList.vue
@@ -87,6 +87,7 @@
 const cancel = () => {
   dialogFormVisible.value = false
 }
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -97,7 +98,7 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="detailRow('create', {})">
+          <el-button v-if="proxy.hasPerm('/rule/alarm/level/add')" type="primary" @click="detailRow('create', {})">
             新增
           </el-button>
         </div>
@@ -117,10 +118,10 @@
         <template #columns>
           <el-table-column label="操作" width="120" align="center">
             <template #default="scope">
-              <el-button type="primary" link size="small" @click="detailRow('edit', scope.row)">
+              <el-button v-if="proxy.hasPerm('/rule/alarm/level/update')" type="primary" link size="small" @click="detailRow('edit', scope.row)">
                 编辑
               </el-button>
-              <el-button type="danger" link size="small" @click="removeRow(scope.row)">
+              <el-button v-if="proxy.hasPerm('/rule/alarm/level/delete')" type="danger" link size="small" @click="removeRow(scope.row)">
                 删除
               </el-button>
             </template>
diff --git a/src/views/home/rule/alarm/components/alarmTypeList.vue b/src/views/home/rule/alarm/components/alarmTypeList.vue
index 2cbf110..aa0cfed 100644
--- a/src/views/home/rule/alarm/components/alarmTypeList.vue
+++ b/src/views/home/rule/alarm/components/alarmTypeList.vue
@@ -80,6 +80,7 @@
 const cancel = () => {
   dialogFormVisible.value = false
 }
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -90,7 +91,7 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="detailRow('create', {})">
+          <el-button v-if="proxy.hasPerm('/rule/alarm/type/add')" type="primary" @click="detailRow('create', {})">
             新增
           </el-button>
         </div>
@@ -110,10 +111,10 @@
         <template #columns>
           <el-table-column label="操作" width="120" align="center">
             <template #default="scope">
-              <el-button type="primary" link size="small" @click="detailRow('edit', scope.row)">
+              <el-button v-if="proxy.hasPerm('/rule/alarm/type/update')" type="primary" link size="small" @click="detailRow('edit', scope.row)">
                 编辑
               </el-button>
-              <el-button type="danger" link size="small" @click="removeRow(scope.row)">
+              <el-button v-if="proxy.hasPerm('/rule/alarm/type/delete')" type="danger" link size="small" @click="removeRow(scope.row)">
                 删除
               </el-button>
             </template>
diff --git a/src/views/home/rule/alarm/index.vue b/src/views/home/rule/alarm/index.vue
index 110030c..4e66a34 100644
--- a/src/views/home/rule/alarm/index.vue
+++ b/src/views/home/rule/alarm/index.vue
@@ -20,11 +20,14 @@
 // 初始展示列
 const columns = ref<any>([
   { text: '报警类型', value: 'alarmTypeName', align: 'center' },
-  { text: '报警名称', value: 'alarmName', align: 'center' },
-  { text: '报警等级', value: 'alarmLevelName', align: 'center' },
-  { text: '报警提示方式', value: 'alarmNoteMethodName', align: 'center' },
-  { text: '状态', value: 'stateName', align: 'center', width: '130' },
-  { text: '创建时间', value: 'ts', align: 'center' },
+  { text: '设备类型', value: 'typeName', align: 'center' },
+  { text: '产品', value: 'productName', align: 'center' },
+  { text: '厂商', value: 'manufacturerName', align: 'center' },
+  // { text: '报警名称', value: 'alarmName', align: 'center' },
+  { text: '报警等级', value: 'alarmLevelName', align: 'center', width: '100' },
+  { text: '报警提示方式', value: 'alarmNoteMethodName', align: 'center', width: '130', isCustom: true },
+  { text: '状态', value: 'stateName', align: 'center', width: '100', isCustom: true },
+  { text: '创建时间', value: 'ts', align: 'center', width: '200' },
 ])
 // 最终展示列
 const columnsConfig = ref([])
@@ -158,6 +161,7 @@
   await fetchDict()
   fetchData()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -191,13 +195,13 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="showAlarmType">
+          <el-button v-if="proxy.hasPerm('/rule/alarm/type')" type="primary" @click="showAlarmType">
             报警类型管理
           </el-button>
-          <el-button type="primary" @click="showAlarmLevel">
+          <el-button v-if="proxy.hasPerm('/rule/alarm/level')" type="primary" @click="showAlarmLevel">
             报警等级管理
           </el-button>
-          <el-button type="primary" @click="detailRow('create', {})">
+          <el-button v-if="proxy.hasPerm('/rule/alarm/add')" type="primary" @click="detailRow('create', {})">
             新增
           </el-button>
         </div>
@@ -214,16 +218,28 @@
             </template>
           </el-table-column>
         </template>
+        <template #isCustom="{ scope, column }">
+          <!-- 报警提示方式 -->
+          <span v-if="column.text === '报警提示方式'">
+            <el-tag v-if="scope.row.alarmNoteMethodName === '消息提醒'" type="primary">消息提醒</el-tag>
+            <el-tag v-if="scope.row.alarmNoteMethodName === '弹窗'" type="danger">弹窗提醒</el-tag>
+          </span>
+          <!-- 报警提示方式 -->
+          <span v-if="column.text === '状态'">
+            <el-tag v-if="scope.row.stateName === '启用'" type="success">启用</el-tag>
+            <el-tag v-if="scope.row.stateName === '未启用'" type="info">未启用</el-tag>
+          </span>
+        </template>
         <template #columns>
           <el-table-column label="操作" width="140" align="center">
             <template #default="scope">
-              <el-button type="primary" link size="small" @click="switchStatusRow(scope.row)">
+              <el-button v-if="proxy.hasPerm('/rule/alarm/handler')" type="primary" link size="small" @click="switchStatusRow(scope.row)">
                 {{ scope.row.state === '1' ? '停用' : '启用' }}
               </el-button>
-              <el-button type="primary" link size="small" @click="detailRow('edit', scope.row)">
+              <el-button v-if="proxy.hasPerm('/rule/alarm/update')" type="primary" link size="small" @click="detailRow('edit', scope.row)">
                 编辑
               </el-button>
-              <el-button type="danger" link size="small" @click="removeRow(scope.row)">
+              <el-button v-if="proxy.hasPerm('/rule/alarm/delete')" type="danger" link size="small" @click="removeRow(scope.row)">
                 删除
               </el-button>
             </template>
diff --git a/src/views/home/rule/special/components/editDialog.vue b/src/views/home/rule/special/components/editDialog.vue
index bb494ec..5df205b 100644
--- a/src/views/home/rule/special/components/editDialog.vue
+++ b/src/views/home/rule/special/components/editDialog.vue
@@ -8,7 +8,7 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { getDictByCode } from '@/api/system/dict'
 import { getDeviceTypeListPage } from '@/api/home/device/type'
-import { getAlarmLevelListPage, getAlarmRuleListPage } from '@/api/home/rule/alarm'
+import { getAlarmLevelListPage, getAlarmTypeListPage } from '@/api/home/rule/alarm'
 import { addSpecialAlarmRule, editSpecialAlarmRule } from '@/api/home/rule/special'
 import { getDeviceListPage } from '@/api/home/device/device'
 import { getProductListPage } from '@/api/home/device/product'
@@ -57,13 +57,15 @@
 }
 const list = ref<any[]>([])
 const columns = ref<any>([
-  { text: '报警规则', value: 'alarmRule', align: 'center', type: 'select', code: 'alarm-rule', required: true },
+  { text: '报警类型', value: 'alarmTypeId', align: 'center', type: 'select', code: 'alarm-rule', required: true },
   { text: '报警等级', value: 'alarmLevelId', align: 'center', type: 'select', code: 'alarm-level', required: true },
   { text: '报警阈值', value: 'alarmThreshold', align: 'center', type: 'input', required: true },
 ])
 // 初始化对话框
+const isFirst = ref(true)
 const initDialog = (dialogStatusValue: string, row: any) => {
   dialogStatus.value = dialogStatusValue
+  isFirst.value = true
   dialogFormVisible.value = true
   if (dialogStatus.value === 'create') { // 如果是新增，清除验证
     resetForm()
@@ -83,9 +85,13 @@
         alarmRule: row.alarmRule,
         alarmLevelId: row.alarmLevelId,
         alarmThreshold: row.alarmThreshold,
+        alarmTypeId: row.alarmTypeId,
       },
     ]
   }
+  setTimeout(() => {
+    isFirst.value = false
+  })
 }
 defineExpose({
   initDialog,
@@ -143,6 +149,7 @@
 const saveData = () => {
   const data = list.value.map((item: any) => ({
     alarmLevelId: item.alarmLevelId,
+    alarmTypeId: item.alarmTypeId,
     alarmRule: item.alarmRule,
     alarmRuleName: `${item.alarmRule}[${alarmLevelList.value.filter((citem: any) => citem.id === item.alarmLevelId)[0]?.name || ''}]:${item.alarmThreshold}%LEL`,
     alarmThreshold: item.alarmThreshold,
@@ -151,7 +158,7 @@
     position: dataForm.value.position,
     tagNumber: dataForm.value.tagNumber,
     devTypeName: deviceList.value.filter((citem: any) => citem.value === dataForm.value.devcode)[0]?.name || '',
-    alarmTypeId: alarmRuleList.value.filter((citem: any) => citem.name === item.alarmRule)[0]?.alarmTypeId || '',
+    // alarmTypeId: alarmRuleList.value.filter((citem: any) => citem.name === item.alarmRule)[0]?.alarmTypeId || '',
   }))
   if (dialogStatus.value === 'edit') {
     updateData(data)
@@ -207,7 +214,7 @@
   // 设备列表
   getDeviceListPage({ offset: 1, limit: 9999 }).then((res) => {
     deviceList.value = res.data.rows.map((item: any) => ({
-      name: item.devTypeName,
+      name: item.typeName,
       id: item.id,
       value: item.devcode,
       productId: item.productId,
@@ -223,14 +230,14 @@
       }))
     })
     // 报警规则
-    getAlarmRuleListPage({ limit: 9999, offset: 1 }).then((res) => {
-      alarmRuleList.value = res.data.rows.map((item: any) => ({
-        name: item.alarmName,
-        id: item.id,
-        value: item.id,
-        alarmTypeId: item.alarmTypeId,
-      }))
-    })
+    // getAlarmRuleListPage({ limit: 9999, offset: 1 }).then((res) => {
+    //   alarmRuleList.value = res.data.rows.map((item: any) => ({
+    //     name: item.alarmName,
+    //     id: item.id,
+    //     value: item.id,
+    //     alarmTypeId: item.alarmTypeId,
+    //   }))
+    // })
     // 报警等级
     getAlarmLevelListPage({ limit: 9999, offset: 1 }).then((res) => {
       alarmLevelList.value = res.data.rows.map((item: any) => ({
@@ -247,11 +254,26 @@
 watch(() => dataForm.value.devcode, (newVal) => {
   if (newVal) {
     const current = deviceList.value.filter((item: any) => item.value === dataForm.value.devcode)
+    console.log(current, 'current')
     if (current.length) {
       dataForm.value.productId = current[0].productId
       dataForm.value.tagNumber = current[0].tagNumber
       dataForm.value.position = current[0].position
+      // 根据设备类型寻找报警类型
+      getAlarmTypeListPage({ limit: 9999, offset: 1 }).then((res) => {
+        alarmRuleList.value = res.data.rows.filter((item: any) => item.deviceTypeName.includes(current[0].name)).map((item: any) => ({
+          name: item.alarmType,
+          id: item.id,
+          value: item.id,
+          // alarmTypeId: item.id,
+        }))
+      })
     }
+    if (isFirst.value) {
+      return
+    }
+    alarmRuleList.value = []
+    list.value = []
   }
 }, {
   deep: true,
@@ -330,12 +352,12 @@
                         <!-- 报警规则 -->
                         <template v-if="item.type === 'select' && item.code === 'alarm-rule'">
                           <el-select
-                            v-model.trim="scope.row[item.value]" placeholder="报警规则" style="width: 100%;"
+                            v-model.trim="scope.row[item.value]" placeholder="报警类型" style="width: 100%;"
                             clearable filterable :disabled="!scope.row.edit"
                           >
                             <el-option
                               v-for="item in alarmRuleList" :key="item.id" :label="item.name"
-                              :value="item.name"
+                              :value="item.id"
                             />
                           </el-select>
                         </template>
diff --git a/src/views/home/rule/special/index.vue b/src/views/home/rule/special/index.vue
index 5c7b67c..7209dfa 100644
--- a/src/views/home/rule/special/index.vue
+++ b/src/views/home/rule/special/index.vue
@@ -99,6 +99,7 @@
   await fetchDict()
   fetchData()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -127,7 +128,7 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="detail('create', {})">
+          <el-button v-if="proxy.hasPerm('/rule/special/add')" type="primary" @click="detail('create', {})">
             新增
           </el-button>
         </div>
@@ -147,13 +148,13 @@
         <template #columns>
           <el-table-column label="操作" width="140" align="center">
             <template #default="scope">
-              <el-button type="primary" link size="small" @click="detail('detail', scope.row)">
+              <el-button v-if="proxy.hasPerm('/rule/special/detail')" type="primary" link size="small" @click="detail('detail', scope.row)">
                 查看
               </el-button>
-              <el-button type="primary" link size="small" @click="detail('edit', scope.row)">
+              <el-button v-if="proxy.hasPerm('/rule/special/update')" type="primary" link size="small" @click="detail('edit', scope.row)">
                 编辑
               </el-button>
-              <el-button type="danger" link size="small" @click="removeRow(scope.row)">
+              <el-button v-if="proxy.hasPerm('/rule/special/delete')" type="danger" link size="small" @click="removeRow(scope.row)">
                 删除
               </el-button>
             </template>
diff --git a/src/views/home/station/control/index.vue b/src/views/home/station/control/index.vue
index 4510922..6657c5d 100644
--- a/src/views/home/station/control/index.vue
+++ b/src/views/home/station/control/index.vue
@@ -71,6 +71,7 @@
     },
   ]
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -114,7 +115,7 @@
               </div>
             </div>
             <div class="right1">
-              <el-card shadow="always">
+              <el-card v-if="proxy.hasPerm('/station/control/video')" shadow="always">
                 <template #header>
                   <div class="clearfix">
                     <div>云台控制</div>
diff --git a/src/views/home/station/operation/index.vue b/src/views/home/station/operation/index.vue
index 02a5e44..d3d3d09 100644
--- a/src/views/home/station/operation/index.vue
+++ b/src/views/home/station/operation/index.vue
@@ -71,6 +71,7 @@
 }
 // 重置查询条件f
 const reset = () => {
+  datetimerange.value = []
   listQuery.value = {
     limit: 20,
     offset: 1,
@@ -121,6 +122,7 @@
   await fetchDict()
   fetchData()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -160,10 +162,10 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary">
+          <el-button v-if="proxy.hasPerm('/station/operation/add')" type="primary">
             新增
           </el-button>
-          <el-button type="primary" @click="exportList">
+          <el-button v-if="proxy.hasPerm('/station/operation/export')" type="primary" @click="exportList">
             导出
           </el-button>
         </div>
diff --git a/src/views/home/station/station/components/detailData.vue b/src/views/home/station/station/components/detailData.vue
index 237b22a..c936f30 100644
--- a/src/views/home/station/station/components/detailData.vue
+++ b/src/views/home/station/station/components/detailData.vue
@@ -8,7 +8,13 @@
 import monitorData from './monitorData.vue'
 import lifeCycleRecord from '@/views/home/well/components/lifeCycleRecord.vue'
 import maintenanceRecord from '@/views/home/well/components/maintenanceRecord.vue'
-const activeName = ref('监控数据')
+const { proxy } = getCurrentInstance() as any
+const activeName = ref(
+  proxy.hasPerm('/station/monitor/data')
+    ? '监控数据'
+    : proxy.hasPerm('/station/monitor/life')
+      ? '全生命周期记录'
+      : proxy.hasPerm('/station/monitor/maintenance') ? '监控设备维护记录' : '')
 const handleClick = (tab: TabsPaneContext, event: Event) => {
   console.log(tab, event)
 }
@@ -16,13 +22,13 @@
 
 <template>
   <el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick">
-    <el-tab-pane label="监控数据" name="监控数据">
+    <el-tab-pane v-if="proxy.hasPerm('/station/monitor/data')" label="监控数据" name="监控数据">
       <monitor-data v-if="activeName === '监控数据'" />
     </el-tab-pane>
-    <el-tab-pane label="全生命周期记录" name="全生命周期记录">
+    <el-tab-pane v-if="proxy.hasPerm('/station/monitor/life')" label="全生命周期记录" name="全生命周期记录">
       <life-cycle-record v-if="activeName === '全生命周期记录'" />
     </el-tab-pane>
-    <el-tab-pane label="监控设备维护记录" name="监控设备维护记录">
+    <el-tab-pane v-if="proxy.hasPerm('/station/monitor/maintenance')" label="监控设备维护记录" name="监控设备维护记录">
       <maintenance-record v-if="activeName === '监控设备维护记录'" />
     </el-tab-pane>
   </el-tabs>
diff --git a/src/views/home/station/station/index.vue b/src/views/home/station/station/index.vue
index 32eb20c..9cd1128 100644
--- a/src/views/home/station/station/index.vue
+++ b/src/views/home/station/station/index.vue
@@ -193,6 +193,7 @@
     tableHeight.value = window.innerHeight - 60 - 50 - 10 - 98 - 10 - 52 - 52 - 10
   }
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -254,7 +255,7 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary">
+          <el-button v-if="proxy.hasPerm('/station/monitor/export')" type="primary">
             导出
           </el-button>
         </div>
@@ -274,10 +275,10 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="120">
             <template #default="scope">
-              <el-button type="primary" link size="small" @click="editRow('detail', scope.row)">
+              <el-button v-if="proxy.hasPerm('/station/monitor/detail')" type="primary" link size="small" @click="editRow('detail', scope.row)">
                 查看
               </el-button>
-              <el-button type="primary" link size="small" @click="editRow('edit', scope.row)">
+              <el-button v-if="proxy.hasPerm('/station/monitor/update')" type="primary" link size="small" @click="editRow('edit', scope.row)">
                 编辑
               </el-button>
             </template>
diff --git a/src/views/home/well/components/detail.vue b/src/views/home/well/components/detail.vue
index eda3b06..55f4f08 100644
--- a/src/views/home/well/components/detail.vue
+++ b/src/views/home/well/components/detail.vue
@@ -147,6 +147,7 @@
 onMounted(() => {
   fetchWellDetail()
 })
+const detailRef = ref()
 </script>
 
 <template>
@@ -175,7 +176,7 @@
       </el-descriptions>
     </detail-block-com>
     <detail-block-com>
-      <detail-data />
+      <detail-data ref="detailRef" />
     </detail-block-com>
   </app-container>
 </template>
diff --git a/src/views/home/well/components/detailData.vue b/src/views/home/well/components/detailData.vue
index 7fcfe7b..3a1aed1 100644
--- a/src/views/home/well/components/detailData.vue
+++ b/src/views/home/well/components/detailData.vue
@@ -8,21 +8,31 @@
 import monitorData from './monitorData.vue'
 import lifeCycleRecord from './lifeCycleRecord.vue'
 import maintenanceRecord from './maintenanceRecord.vue'
-const activeName = ref('监控数据')
+const { proxy } = getCurrentInstance() as any
+const activeName = ref(
+  proxy.hasPerm('/well/monitor/data')
+    ? '监控数据'
+    : proxy.hasPerm('/well/monitor/life')
+      ? '全生命周期记录'
+      : proxy.hasPerm('/well/monitor/maintenance') ? '监控设备维护记录' : '',
+)
 const handleClick = (tab: TabsPaneContext, event: Event) => {
   console.log(tab, event)
 }
+defineExpose({
+  activeName,
+})
 </script>
 
 <template>
   <el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick">
-    <el-tab-pane label="监控数据" name="监控数据">
+    <el-tab-pane v-if="proxy.hasPerm('/well/monitor/data')" label="监控数据" name="监控数据">
       <monitor-data v-if="activeName === '监控数据'" />
     </el-tab-pane>
-    <el-tab-pane label="全生命周期记录" name="全生命周期记录">
+    <el-tab-pane v-if="proxy.hasPerm('/well/monitor/life')" label="全生命周期记录" name="全生命周期记录">
       <life-cycle-record v-if="activeName === '全生命周期记录'" />
     </el-tab-pane>
-    <el-tab-pane label="监控设备维护记录" name="监控设备维护记录">
+    <el-tab-pane v-if="proxy.hasPerm('/well/monitor/maintenance')" label="监控设备维护记录" name="监控设备维护记录">
       <maintenance-record v-if="activeName === '监控设备维护记录'" />
     </el-tab-pane>
   </el-tabs>
diff --git a/src/views/home/well/components/lifeCycleRecord.vue b/src/views/home/well/components/lifeCycleRecord.vue
index c56141d..d302836 100644
--- a/src/views/home/well/components/lifeCycleRecord.vue
+++ b/src/views/home/well/components/lifeCycleRecord.vue
@@ -17,7 +17,7 @@
   { text: '报警类型', value: 'alarmType', align: 'center' },
   { text: '报警等级', value: 'alarmLevel', align: 'center' },
   { text: '报警原因', value: 'alarmContent', align: 'center' },
-  { text: '是否误报', value: 'realAlarm', align: 'center' },
+  { text: '是否误报', value: 'realAlarmName', align: 'center' },
   { text: '报警解除时间', value: 'cancelTime', align: 'center' },
   { text: '处置时长', value: 'processDuration', align: 'center' },
 ])
@@ -62,6 +62,7 @@
 const detailRow = (row: any) => {
   console.log(row.id)
 }
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -75,7 +76,7 @@
       <el-button type="primary" style="margin-left: 10px;" @click="fetchData">
         搜索
       </el-button>
-      <el-button type="primary">
+      <el-button v-if="proxy.hasPerm($route.path.includes('well') ? '/well/lifeCycle/export' : '/station/monitor/exportLifeCycle')" type="primary">
         导出
       </el-button>
     </template>
@@ -84,13 +85,13 @@
       :pagination="false"
     >
       <template #columns>
-        <el-table-column label="操作" align="center" width="80">
+        <!-- <el-table-column label="操作" align="center" width="80">
           <template #default="scope">
             <el-button type="primary" link size="small" @click="detailRow(scope.row)">
               查看
             </el-button>
           </template>
-        </el-table-column>
+        </el-table-column> -->
       </template>
     </normal-table>
   </table-container>
diff --git a/src/views/home/well/index.vue b/src/views/home/well/index.vue
index 8cfd253..3e26cf2 100644
--- a/src/views/home/well/index.vue
+++ b/src/views/home/well/index.vue
@@ -225,6 +225,7 @@
     tableHeight.value = window.innerHeight - 60 - 50 - 10 - 98 - 10 - 52 - 52 - 10
   }
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -296,7 +297,7 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary">
+          <el-button v-if="proxy.hasPerm('/well/export')" type="primary">
             导出
           </el-button>
         </div>
@@ -328,10 +329,10 @@
   </el-table-column> -->
           <el-table-column label="操作" align="center" width="120">
             <template #default="scope">
-              <el-button type="primary" link size="small" @click="editRow('detail', scope.row)">
+              <el-button v-if="proxy.hasPerm('/well/detail')" type="primary" link size="small" @click="editRow('detail', scope.row)">
                 查看
               </el-button>
-              <el-button type="primary" link size="small" @click="editRow('edit', scope.row)">
+              <el-button v-if="proxy.hasPerm('/well/update')" type="primary" link size="small" @click="editRow('edit', scope.row)">
                 编辑
               </el-button>
             </template>

diff --git a/src/App.vue b/src/App.vue
index cde81b3..8a00f5d 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -125,7 +125,7 @@
         '--g-sub-sidebar-actual-width': subSidebarActualWidth,
       }"
     />
-    <system-info v-if="browserType !== 'mobile'" />
+    <!-- <system-info v-if="browserType !== 'mobile'" /> -->
     <audio id="eventAudio" src="" autoplay />
   </el-config-provider>
 </template>
diff --git a/src/layouts/components/Tools/alarmDialog.vue b/src/layouts/components/Tools/alarmDialog.vue
index 1828375..df89ab8 100644
--- a/src/layouts/components/Tools/alarmDialog.vue
+++ b/src/layouts/components/Tools/alarmDialog.vue
@@ -116,7 +116,7 @@
     </div>
     <template #footer>
       <div class="dialog-footer">
-        <div class="btn" @click="detail">
+        <div v-if="proxy.hasPerm('/alarm/current')" class="btn" @click="detail">
           查看
         </div>
         <div v-if="info.isSound === '1'" class="btn" @click="closeSound">
diff --git a/src/layouts/components/Tools/alarmList.vue b/src/layouts/components/Tools/alarmList.vue
index c3a9d2a..5356b74 100644
--- a/src/layouts/components/Tools/alarmList.vue
+++ b/src/layouts/components/Tools/alarmList.vue
@@ -54,6 +54,7 @@
 }
 // 查看当前行
 const detailRow = (row: any) => {
+  if (!proxy.hasPerm('/alarm/current')) { return }
   $router.push({
     name: 'AlarmCurrent',
     query: {
@@ -77,21 +78,6 @@
   localStorage.setItem('eventAudio', 'pause')
 }
 const dialogRef = ref()
-// const dialog = () => {
-//   const row = {
-//     alarmNoteMethod: '1', // 消息提醒 1:弹窗，2:消息提醒
-//     isSound: '1', // 报警音效，1:开，0:关
-//     isSend: '1', // 报警推送，1:开，0:关
-//     isText: '1', // 报警短息，1:开，0:关
-//     alarmType: '浓度超限',
-//     tagNumber: 'NX5702',
-//     alarmTime: '2024-09-09',
-//     value: '20',
-//     typeName: '燃气智能终端',
-//     alarmLevel: '一级',
-//   }
-//   dialogRef.value.initDialog(row)
-// }
 const fetchData = (isLoading = false) => {
   loading.value = true
   if (isLoading) {
@@ -115,7 +101,10 @@
       dialogRef.value.initDialog(newVal)
     }
     if (newVal.isSound === '1') {
-      play()
+      // play()
+      if (!localStorage.getItem('eventAudio')) {
+        proxy.playAudio()
+      }
     }
     fetchData(false)
   }
@@ -146,6 +135,7 @@
 //     window.localStorage.removeItem('token')
 //   }
 // }
+// const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -180,7 +170,7 @@
                   {{ message.processStatus
                     === '未读' ? '未读' : '已读' }}
                 </el-tag>
-                <el-tag type="info" size="small" style="margin-left: 5px;">
+                <el-tag type="info" size="small" style="margin-left: 5px;" @click="detailRow(message)">
                   查看
                 </el-tag>
               </div>
@@ -214,7 +204,7 @@
       <!-- <div class="close" @click="dialog">
         弹窗
       </div> -->
-      <div class="more" @click="moreList">
+      <div v-if="proxy.hasPerm('/alarm/current')" class="more" @click="moreList">
         查看更多
       </div>
     </div>
diff --git a/src/layouts/components/Tools/index.vue b/src/layouts/components/Tools/index.vue
index 9f2d41f..61f9707 100644
--- a/src/layouts/components/Tools/index.vue
+++ b/src/layouts/components/Tools/index.vue
@@ -79,6 +79,7 @@
   // 断开 websocket
   // websocket.destroyWebSocket()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -89,18 +90,18 @@
           <svg-icon name="ep:search" />
         </el-icon>
       </span>
-      <span class="item" @click="board">
+      <span v-if="proxy.hasPerm('/fullscreen')" class="item" @click="board">
         <el-icon>
           <svg-icon name="ep:data-line" />
         </el-icon>
       </span>
-      <span v-if="settingsStore.mode === 'pc' && settingsStore.toolbar.enableFullscreen" class="item" @click="toggle">
+      <span class="item" @click="toggle">
         <el-icon>
           <svg-icon :name="isFullscreen ? 'fullscreen-exit' : 'fullscreen'" />
         </el-icon>
       </span>
       <!-- 报警信息列表 -->
-      <span class="item">
+      <span v-if="proxy.hasPerm('/alarmnotice')" class="item">
         <el-popover width="390">
           <template #reference>
             <div>
diff --git a/src/layouts/components/Topbar/index.vue b/src/layouts/components/Topbar/index.vue
index 2863cef..4e3120e 100644
--- a/src/layouts/components/Topbar/index.vue
+++ b/src/layouts/components/Topbar/index.vue
@@ -67,7 +67,7 @@
           </transition-group>
         </el-breadcrumb>
       </div>
-      <tools />
+      <!-- <tools /> -->
     </div>
   </div>
 </template>
diff --git a/src/router/modules/pc.ts b/src/router/modules/pc.ts
index aacd6fa..97ced45 100644
--- a/src/router/modules/pc.ts
+++ b/src/router/modules/pc.ts
@@ -40,7 +40,7 @@
       icon: 'ep:key',
       sidebar: false,
       breadcrumb: false,
-      // auth: '/fullscreen',
+      auth: '/fullscreen',
     },
   },
   {
@@ -155,7 +155,7 @@
           sidebar: false,
           breadcrumb: false,
           activeMenu: '/well',
-          auth: '/well/detail',
+          auth: '/well',
         },
       },
     ],
diff --git a/src/views/home/alarm/count/components/locationAnalysis.vue b/src/views/home/alarm/count/components/locationAnalysis.vue
index fc75b9e..bff1853 100644
--- a/src/views/home/alarm/count/components/locationAnalysis.vue
+++ b/src/views/home/alarm/count/components/locationAnalysis.vue
@@ -46,6 +46,7 @@
   })
 }
 fetchData()
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -75,6 +76,9 @@
         <el-button type="primary" style="margin: 0 5px;" @click="fetchData">
           搜索
         </el-button>
+        <el-button v-if="proxy.hasPerm('/alarm/count/exportLocation')" type="primary" style="margin: 0 5px;">
+          导出
+        </el-button>
       </div>
     </template>
     <template #content>
diff --git a/src/views/home/alarm/current/components/detail.vue b/src/views/home/alarm/current/components/detail.vue
index dd3b31a..4204c92 100644
--- a/src/views/home/alarm/current/components/detail.vue
+++ b/src/views/home/alarm/current/components/detail.vue
@@ -111,7 +111,7 @@
   const res2 = await getAlarmTypeListPage({ offset: 1, limit: 9999 });
   ($route.query.type === 'history' ? getAlarmDetail : getAlarmDetail)($route.query.id as string).then((res) => {
     detailInfo.value = toHumpObject(res.data)
-    detailInfo.value.realAlarmName = detailInfo.value.realAlarm === '1' ? '报警' : '误报'
+    detailInfo.value.realAlarmName = detailInfo.value.realAlarm === '0' ? '是' : '否'
     detailInfo.value.alarmTypeName = res2.data.rows.filter((item: any) => item.id === detailInfo.value.alarmTypeId)[0]?.alarmType || ''
     detailInfo.value.alarmLevelName = res1.data.rows.filter((item: any) => item.id === detailInfo.value.alarmLevel)[0]?.alarmLevel || ''
     detailInfo.value.duration = detailInfo.value.ts && detailInfo.value.cancelTime ? getDateDiff(detailInfo.value.ts, detailInfo.value.cancelTime) : ''
@@ -139,6 +139,7 @@
 }
 // 点击经纬度展示地图
 const mapRef = ref()
+const { proxy } = getCurrentInstance() as any
 const showMap = (data: any) => {
   console.log(data, 'data')
   if (data.text === '位置') {
@@ -148,6 +149,13 @@
         2: 'StationMonitorDetail',
         3: 'PipelineMonitorDetail',
       } as { [key: string]: string }
+      // 判断是否有菜单权限
+      const watchObjectAuth = {
+        1: '/well',
+        2: '/station/monitor',
+        3: '/pipeline',
+      } as { [key: string]: string }
+      if (!proxy.hasPerm(watchObjectAuth[detailInfo.value.watchObject])) { return }
       $router.push({
         name: watchObject[detailInfo.value.watchObject],
         query: {
diff --git a/src/views/home/alarm/current/components/detailInfoDialog.vue b/src/views/home/alarm/current/components/detailInfoDialog.vue
index c089449..7fbf06b 100644
--- a/src/views/home/alarm/current/components/detailInfoDialog.vue
+++ b/src/views/home/alarm/current/components/detailInfoDialog.vue
@@ -114,6 +114,7 @@
   })
 }
 defineExpose({ initDialog, close })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -131,7 +132,7 @@
     <!-- 头部 -->
     <div class="header">
       <span>{{ info.alarmContent }}</span>
-      <span class="more" @click="moreData">>>更多</span>
+      <span v-if="proxy.hasPerm(type === 'data' ? '/alarm/current/more' : '/alarm/device/more')" class="more" @click="moreData">>>更多</span>
     </div>
     <div class="content">
       <div v-show="type === 'device'" class="item">
@@ -162,7 +163,7 @@
         报警设备:
         <span style="padding-left: 6px;">{{ info.devcode }} </span>
         <el-button
-          v-if="info.devTypeName === '燃气智能监测终端' || info.devTypeName === '液位检测仪' || info.devTypeName === '井盖监测仪'"
+          v-if="(info.devTypeName === '燃气智能监测终端' || info.devTypeName === '液位检测仪' || info.devTypeName === '井盖监测仪') && proxy.hasPerm('/alarm/current/data')"
           size="small" style="margin-left: 6px;" @click="viewData"
         >
           查看数据
@@ -228,7 +229,7 @@
         <span style="padding-left: 6px;">
           {{ info.confirmContent }}
         </span>
-        <el-button v-if="type === 'data'" size="small" style="padding-left: 6px;" @click="viewProcess">
+        <el-button v-if="type === 'data' && proxy.hasPerm('/alarm/current/process')" size="small" style="padding-left: 6px;" @click="viewProcess">
           流程图
         </el-button>
       </div>
@@ -246,17 +247,17 @@
       </div>
     </div>
     <div class="footer">
-      <el-button v-if="Number(info.processStatus) < 4 && type === 'data'" size="small" @click="remind">
+      <el-button v-if="(Number(info.processStatus) < 4 && type === 'data') && proxy.hasPerm('/alarm/current/remind')" size="small" @click="remind">
         提醒责任人
       </el-button>
       <el-button
-        v-if="type === 'device' && (info.processStatusName === '待处置' || info.processStatusName === '挂起')"
+        v-if="(type === 'device' && (info.processStatusName === '待处置' || info.processStatusName === '挂起')) && proxy.hasPerm('/alarm/device/handler')"
         size="small" @click="handler"
       >
         报警处置
       </el-button>
       <el-button
-        v-if="Number(info.processStatus) <= 3 || (type === 'device' && info.processStatusName === '待处置') || info.processStatusName === '挂起'"
+        v-if="(Number(info.processStatus) <= 3 || (type === 'device' && info.processStatusName === '待处置') || info.processStatusName === '挂起') && proxy.hasPerm(type === 'device' ? '/alarm/device/pending' : '/alarm/current/pending')"
         type="primary" size="small" @click="pending"
       >
         挂起
diff --git a/src/views/home/alarm/current/index.vue b/src/views/home/alarm/current/index.vue
index d019bbf..e2714bb 100644
--- a/src/views/home/alarm/current/index.vue
+++ b/src/views/home/alarm/current/index.vue
@@ -4,6 +4,7 @@
   Date: 2023-06-28
  -->
 <script lang="ts" setup name="CurrentAlarm">
+import dayjs from 'dayjs'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import { ArrowLeftBold, ArrowRightBold } from '@element-plus/icons-vue'
 import MapCom from './components/map.vue'
@@ -100,6 +101,7 @@
       path: '/alarm/current',
     })
   }
+  datetimerange.value = []
   listQuery.value = {
     limit: 20,
     offset: 1,
@@ -131,8 +133,8 @@
   if ($route.query.row) {
     loadingTable.value = true
     const row = JSON.parse($route.query.row as string)
-    getCurrentAlarmListPage({ offset: 1, limit: 99999 }).then((res) => {
-      const data = res.data.rows.filter((item: any) => item.id === row.id)
+    getCurrentAlarmListPage({ offset: 1, limit: 50 }).then((res) => {
+      const data = res.data.rows.filter((item: any) => item.id === row.alarmId)
       if (data.length) {
         list1.value = data.map((item: any) => ({
           ...item,
@@ -153,7 +155,10 @@
     })
     return
   }
-  fetchData()
+  datetimerange.value = [dayjs().subtract(7, 'day').format('YYYY-MM-DD HH:mm:ss'), dayjs().format('YYYY-MM-DD HH:mm:ss')]
+  setTimeout(() => {
+    fetchData()
+  })
 })
 // 表格标识  地图或普通
 const tableFlag = ref('normal')
@@ -181,6 +186,10 @@
 const mapRef = ref()
 const mapData = ref({})
 async function detail(row: any) {
+  if (row.processStatusName === '未读') {
+    list1.value[list1.value.findIndex((item: any) => item.id === row.id)].processStatusName = '已读'
+    row.processStatusName = '已读'
+  }
   const res = await detailAlarm(row.id)
   const data = toHumpObject(res.data)
   mapData.value = row
@@ -362,7 +371,7 @@
               <el-button v-if="proxy.hasPerm('/alarm/current/delete')" type="primary" @click="batchDeleteRow">
                 批量删除
               </el-button>
-              <el-button type="primary" @click="exportList">
+              <el-button v-if="proxy.hasPerm('/alarm/current/export')" type="primary" @click="exportList">
                 导出
               </el-button>
             </div>
@@ -383,7 +392,7 @@
               </el-table-column>
             </template>
             <template #columns>
-              <el-table-column label="操作" align="center" width="80">
+              <el-table-column v-if="proxy.hasPerm('/alarm/current/detail')" label="操作" align="center" width="80">
                 <template #default="scope">
                   <el-button type="primary" link size="small" @click="detail(scope.row)">
                     查看
diff --git a/src/views/home/alarm/history/index.vue b/src/views/home/alarm/history/index.vue
index eeb49fc..3c810c3 100644
--- a/src/views/home/alarm/history/index.vue
+++ b/src/views/home/alarm/history/index.vue
@@ -97,6 +97,7 @@
 }
 // 重置查询条件f
 const reset = () => {
+  datetimerange.value = []
   listQuery.value = {
     limit: 20,
     offset: 1,
@@ -189,6 +190,7 @@
   })
 }
 fetchDict()
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -249,7 +251,7 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="exportList">
+          <el-button v-if="proxy.hasPerm('/alarm/history/export')" type="primary" @click="exportList">
             导出
           </el-button>
         </div>
@@ -272,7 +274,7 @@
           </el-table-column>
         </template>
         <template #columns>
-          <el-table-column label="操作" align="center" width="80">
+          <el-table-column v-if="proxy.hasPerm('/alarm/history/detail')" label="操作" align="center" width="80">
             <template #default="scope">
               <el-button type="primary" link size="small" @click="moreData(scope.row)">
                 查看
diff --git a/src/views/home/dashboard/index.vue b/src/views/home/dashboard/index.vue
index d2f7e3c..42dfbed 100644
--- a/src/views/home/dashboard/index.vue
+++ b/src/views/home/dashboard/index.vue
@@ -42,7 +42,7 @@
     value: '0',
     name: '在线',
     unit: '个',
-    id: '1',
+    id: '1,2',
   },
   {
     img: img.lixian,
@@ -56,7 +56,7 @@
     value: '0',
     name: '停用',
     unit: '个',
-    id: '2',
+    id: '3',
   },
 ])
 // 工作台数据
@@ -133,7 +133,11 @@
   deviceOperationLoading.value = true
   getDeviceStatus().then((res) => {
     res.data.forEach((element: any) => {
-      const index = deviceOperationData.value.findIndex((item: any) => item.id === element.name)
+      if (element.name === '1' || element.name === '2') {
+        deviceOperationData.value[0].value = Number(deviceOperationData.value[0].value || '0') + Number(element.value)
+        return
+      }
+      const index = deviceOperationData.value.findIndex((item: any) => item.id.includes(element.name))
       if (index !== -1) {
         deviceOperationData.value[index].value = element.value
       }
diff --git a/src/views/home/device/count/components/bottom.vue b/src/views/home/device/count/components/bottom.vue
index 28a4d78..e4e56fa 100644
--- a/src/views/home/device/count/components/bottom.vue
+++ b/src/views/home/device/count/components/bottom.vue
@@ -110,6 +110,7 @@
   })
 }
 fetchDict()
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -148,7 +149,7 @@
             <template #btns-right>
               <!-- 操作 -->
               <div>
-                <el-button type="primary">
+                <el-button v-if="proxy.hasPerm('/device/count/offline/export')" type="primary">
                   导出
                 </el-button>
               </div>
diff --git a/src/views/home/device/device/index.vue b/src/views/home/device/device/index.vue
index c3970b9..9cdd606 100644
--- a/src/views/home/device/device/index.vue
+++ b/src/views/home/device/device/index.vue
@@ -88,6 +88,7 @@
 }
 // 重置查询条件f
 const reset = () => {
+  datetimerange.value = []
   listQuery.value = {
     limit: 20,
     offset: 1,
@@ -296,6 +297,7 @@
   fetchDict()
   fetchData()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -372,17 +374,17 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="editRow('add', {})">
+          <el-button v-if="proxy.hasPerm('/device/manage/add')" type="primary" @click="editRow('add', {})">
             新建
           </el-button>
-          <el-button type="primary" @click="downloadTemplate">
+          <el-button v-if="proxy.hasPerm('/device/manage/down')" type="primary" @click="downloadTemplate">
             模板下载
           </el-button>
-          <el-button type="primary" @click="importList">
+          <el-button v-if="proxy.hasPerm('/device/manage/import')" type="primary" @click="importList">
             批量导入
           </el-button>
-          <el-button type="primary" @click="exportList">
-            导出列表
+          <el-button v-if="proxy.hasPerm('/device/manage/export')" type="primary" @click="exportList">
+            导出
           </el-button>
           <input ref="fileRef" style="display: none;" type="file" accept=".xls,.xlsx" @change="onFileChange">
         </div>
@@ -409,16 +411,16 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="150">
             <template #default="scope">
-              <el-button type="primary" link size="small" @click="editRow('detail', scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/manage/detail')" type="primary" link size="small" @click="editRow('detail', scope.row)">
                 查看
               </el-button>
-              <el-button type="primary" link size="small" @click="editRow('edit', scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/manage/update')" type="primary" link size="small" @click="editRow('edit', scope.row)">
                 编辑
               </el-button>
-              <el-button type="danger" link size="small" @click="changeDefense(scope.row)">
+              <!-- <el-button v-if="proxy.hasPerm('/device/manage/add')" type="danger" link size="small" @click="changeDefense(scope.row)">
                 撤防
-              </el-button>
-              <el-button type="danger" link size="small" @click="removeRow(scope.row)">
+              </el-button> -->
+              <el-button v-if="proxy.hasPerm('/device/manage/delete')" type="danger" link size="small" @click="removeRow(scope.row)">
                 删除
               </el-button>
             </template>
diff --git a/src/views/home/device/instruction/index.vue b/src/views/home/device/instruction/index.vue
index 1e598ed..1da6706 100644
--- a/src/views/home/device/instruction/index.vue
+++ b/src/views/home/device/instruction/index.vue
@@ -78,6 +78,7 @@
 }
 // 重置查询条件f
 const reset = () => {
+  datetimerange.value = []
   listQuery.value = {
     limit: 20,
     offset: 1,
@@ -158,6 +159,7 @@
     editRef.value.initDialog('addOther', {})
   }
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -213,10 +215,10 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary">
+          <el-button v-if="proxy.hasPerm('/device/instruction/batch')" type="primary">
             批量下发
           </el-button>
-          <el-button type="primary" @click="editRow('add', {})">
+          <el-button v-if="proxy.hasPerm('/device/instruction/add')" type="primary" @click="editRow('add', {})">
             新建
           </el-button>
         </div>
@@ -236,13 +238,13 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="120">
             <template #default="scope">
-              <el-button type="primary" link size="small" @click="editRow('detail', scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/instruction/detail')" type="primary" link size="small" @click="editRow('detail', scope.row)">
                 查看
               </el-button>
-              <el-button v-if="scope.row.status === '2'" type="primary" link size="small" @click="editRow('edit', scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/instruction/again') && scope.row.status === '2'" type="primary" link size="small" @click="editRow('edit', scope.row)">
                 重新下发
               </el-button>
-              <el-button type="danger" link size="small" @click="removeRow(scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/instruction/delete')" type="danger" link size="small" @click="removeRow(scope.row)">
                 删除
               </el-button>
             </template>
diff --git a/src/views/home/device/product/index.vue b/src/views/home/device/product/index.vue
index 799fc90..fdd5463 100644
--- a/src/views/home/device/product/index.vue
+++ b/src/views/home/device/product/index.vue
@@ -128,6 +128,7 @@
   await fetchDict()
   fetchData()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -164,7 +165,7 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="editRow('add', {})">
+          <el-button v-if="proxy.hasPerm('/device/product/add')" type="primary" @click="editRow('add', {})">
             新建
           </el-button>
         </div>
@@ -184,10 +185,10 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="120">
             <template #default="scope">
-              <el-button type="primary" link size="small" @click="editRow('edit', scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/product/update')" type="primary" link size="small" @click="editRow('edit', scope.row)">
                 编辑
               </el-button>
-              <el-button type="danger" link size="small" @click="removeRow(scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/product/delete')" type="danger" link size="small" @click="removeRow(scope.row)">
                 删除
               </el-button>
             </template>
diff --git a/src/views/home/device/type/index.vue b/src/views/home/device/type/index.vue
index 59f1343..2344e57 100644
--- a/src/views/home/device/type/index.vue
+++ b/src/views/home/device/type/index.vue
@@ -105,6 +105,7 @@
   await fetchDict()
   fetchData()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -131,7 +132,7 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="editRow('add', {})">
+          <el-button v-if="proxy.hasPerm('/device/type/add')" type="primary" @click="editRow('add', {})">
             新建
           </el-button>
         </div>
@@ -151,10 +152,10 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="120">
             <template #default="scope">
-              <el-button type="primary" link size="small" @click="editRow('edit', scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/type/update')" type="primary" link size="small" @click="editRow('edit', scope.row)">
                 编辑
               </el-button>
-              <el-button type="danger" link size="small" @click="removeRow(scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/type/delete')" type="danger" link size="small" @click="removeRow(scope.row)">
                 删除
               </el-button>
             </template>
diff --git a/src/views/home/ledger/ledger/components/gridList.vue b/src/views/home/ledger/ledger/components/gridList.vue
index d03cd9f..189edef 100644
--- a/src/views/home/ledger/ledger/components/gridList.vue
+++ b/src/views/home/ledger/ledger/components/gridList.vue
@@ -91,6 +91,7 @@
     // })
   })
 }
+const { proxy } = getCurrentInstance() as any
 // 同步日志
 const allSync = () => {
   $router.push({
@@ -139,10 +140,10 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="allSync">
+          <el-button v-if="proxy.hasPerm('/ledger/sync')" type="primary" @click="allSync">
             同步日志
           </el-button>
-          <el-button type="primary" @click="sync('all', {})">
+          <el-button v-if="proxy.hasPerm('/ledger/sync/all')" type="primary" @click="sync('all', {})">
             全量同步
           </el-button>
         </div>
@@ -160,9 +161,9 @@
           </el-table-column>
         </template>
         <template #columns>
-          <el-table-column label="操作" align="center" width="80">
+          <el-table-column v-if="proxy.hasPerm('/ledger/sync/single')" label="操作" align="center" width="80">
             <template #default="scope">
-              <el-button type="primary" link size="small" @click="sync('single', scope.row)">
+              <el-button v-if="proxy.hasPerm('/ledger/sync/single')" type="primary" link size="small" @click="sync('single', scope.row)">
                 同步
               </el-button>
             </template>
diff --git a/src/views/home/ledger/ledger/components/wellList.vue b/src/views/home/ledger/ledger/components/wellList.vue
index 9eb1f43..06f855a 100644
--- a/src/views/home/ledger/ledger/components/wellList.vue
+++ b/src/views/home/ledger/ledger/components/wellList.vue
@@ -123,6 +123,7 @@
   // await fetchDict()
   fetchData()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -159,11 +160,11 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="allSync">
+          <el-button v-if="proxy.hasPerm('/ledger/sync')" type="primary" @click="allSync">
             同步日志
           </el-button>
-          <el-button type="primary" @click="sync('all', {})">
-            全部同步
+          <el-button v-if="proxy.hasPerm('/ledger/sync/all')" type="primary" @click="sync('all', {})">
+            全量同步
           </el-button>
         </div>
       </template>
@@ -180,9 +181,9 @@
           </el-table-column>
         </template>
         <template #columns>
-          <el-table-column label="操作" align="center" width="80">
+          <el-table-column v-if="proxy.hasPerm('/ledger/sync/single')" label="操作" align="center" width="80">
             <template #default="scope">
-              <el-button type="primary" link size="small" @click="sync('single', scope.row)">
+              <el-button v-if="proxy.hasPerm('/ledger/sync/single')" type="primary" link size="small" @click="sync('single', scope.row)">
                 同步
               </el-button>
             </template>
diff --git a/src/views/home/ledger/ledger/index.vue b/src/views/home/ledger/ledger/index.vue
index a03aa12..8403fc5 100644
--- a/src/views/home/ledger/ledger/index.vue
+++ b/src/views/home/ledger/ledger/index.vue
@@ -7,7 +7,16 @@
 import type { TabsPaneContext } from 'element-plus'
 import wellList from './components/wellList.vue'
 import gridList from './components/gridList.vue'
-const activeName = ref('闸井')
+const { proxy } = getCurrentInstance() as any
+const activeName = ref(
+  proxy.hasPerm('/ledger/manage/well')
+    ? '闸井'
+    : proxy.hasPerm('/ledger/manage/station')
+      ? '场站'
+      : proxy.hasPerm('/ledger/manage/grid')
+        ? '网格'
+        : '',
+)
 const handleClick = (tab: TabsPaneContext, event: Event) => {
   // console.log(tab, event)
 }
@@ -17,13 +26,13 @@
   <!-- 布局 -->
   <app-container>
     <el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick">
-      <el-tab-pane label="闸井" name="闸井">
+      <el-tab-pane v-if="proxy.hasPerm('/ledger/manage/well')" label="闸井" name="闸井">
         <well-list v-if="activeName === '闸井'" type="1" />
       </el-tab-pane>
-      <el-tab-pane label="场站" name="场站">
+      <el-tab-pane v-if="proxy.hasPerm('/ledger/manage/station')" label="场站" name="场站">
         <well-list v-if="activeName === '场站'" type="2" />
       </el-tab-pane>
-      <el-tab-pane label="网格" name="网格">
+      <el-tab-pane v-if="proxy.hasPerm('/ledger/manage/grid')" label="网格" name="网格">
         <grid-list v-if="activeName === '网格'" />
       </el-tab-pane>
     </el-tabs>
diff --git a/src/views/home/ledger/pipeline/index.vue b/src/views/home/ledger/pipeline/index.vue
index e0d2512..01e95ac 100644
--- a/src/views/home/ledger/pipeline/index.vue
+++ b/src/views/home/ledger/pipeline/index.vue
@@ -160,6 +160,7 @@
 onMounted(async () => {
   fetchData()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -222,13 +223,13 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="editRow('add', {})">
+          <el-button v-if="proxy.hasPerm('/ledger/pipeline/add')" type="primary" @click="editRow('add', {})">
             新增
           </el-button>
-          <el-button type="primary" @click="importList">
+          <el-button v-if="proxy.hasPerm('/ledger/pipeline/import')" type="primary" @click="importList">
             批量导入
           </el-button>
-          <el-button type="primary" @click="exportList">
+          <el-button v-if="proxy.hasPerm('/ledger/pipeline/export')" type="primary" @click="exportList">
             批量导出
           </el-button>
         </div>
@@ -248,10 +249,10 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="100">
             <template #default="scope">
-              <el-button type="primary" link size="small" @click="editRow('edit', scope.row)">
+              <el-button v-if="proxy.hasPerm('/ledger/pipeline/update')" type="primary" link size="small" @click="editRow('edit', scope.row)">
                 编辑
               </el-button>
-              <el-button type="danger" link size="small" @click="removeRow(scope.row)">
+              <el-button v-if="proxy.hasPerm('/ledger/pipeline/delete')" type="danger" link size="small" @click="removeRow(scope.row)">
                 删除
               </el-button>
             </template>
diff --git a/src/views/home/ledger/sync/index.vue b/src/views/home/ledger/sync/index.vue
index 54a3218..a04bad9 100644
--- a/src/views/home/ledger/sync/index.vue
+++ b/src/views/home/ledger/sync/index.vue
@@ -62,6 +62,7 @@
 }
 // 重置查询条件f
 const reset = () => {
+  datetimerange.value = []
   listQuery.value = {
     limit: 20,
     offset: 1,
@@ -106,6 +107,8 @@
 onMounted(async () => {
   fetchData()
 })
+const { proxy } = getCurrentInstance() as any
+const $route = useRoute()
 </script>
 
 <template>
@@ -132,7 +135,7 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="goBak">
+          <el-button v-if="$route.type" type="primary" @click="goBak">
             返回
           </el-button>
         </div>
@@ -152,10 +155,10 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="80">
             <template #default="scope">
-              <el-button type="primary" link size="small">
+              <el-button v-if="proxy.hasPerm('/ledger/sync/detail')" type="primary" link size="small">
                 查看
               </el-button>
-              <el-button type="danger" link size="small" @click="removeRow(scope.row)">
+              <el-button v-if="proxy.hasPerm('/ledger/sync/delete')" type="danger" link size="small" @click="removeRow(scope.row)">
                 删除
               </el-button>
             </template>
diff --git a/src/views/home/monitor/service/index.vue b/src/views/home/monitor/service/index.vue
index 8df2239..570dc68 100644
--- a/src/views/home/monitor/service/index.vue
+++ b/src/views/home/monitor/service/index.vue
@@ -53,6 +53,7 @@
 onMounted(async () => {
   fetchData()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -66,7 +67,7 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary">
+          <el-button v-if="proxy.hasPerm('/monitor/service/add')" type="primary">
             新建
           </el-button>
         </div>
diff --git a/src/views/home/monitor/time/index.vue b/src/views/home/monitor/time/index.vue
index caa6d46..0f7f5a0 100644
--- a/src/views/home/monitor/time/index.vue
+++ b/src/views/home/monitor/time/index.vue
@@ -53,6 +53,7 @@
 onMounted(async () => {
   fetchData()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -66,7 +67,7 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary">
+          <el-button v-if="proxy.hasPerm('/monitor/time/add')" type="primary">
             新建
           </el-button>
         </div>
diff --git a/src/views/home/operation/alarm/components/detail.vue b/src/views/home/operation/alarm/components/detail.vue
index 8194cbd..4ae4a1f 100644
--- a/src/views/home/operation/alarm/components/detail.vue
+++ b/src/views/home/operation/alarm/components/detail.vue
@@ -151,6 +151,7 @@
 }
 // 点击经纬度展示地图
 const mapRef = ref()
+const { proxy } = getCurrentInstance() as any
 const showMap = (data: any) => {
   console.log(data, 'data')
   if (data.text === '位置') {
@@ -160,6 +161,13 @@
         2: 'StationMonitorDetail',
         3: 'PipelineMonitorDetail',
       } as { [key: string]: string }
+      // 判断是否有菜单权限
+      const watchObjectAuth = {
+        1: '/well',
+        2: '/station/monitor',
+        3: '/pipeline',
+      } as { [key: string]: string }
+      if (!proxy.hasPerm(watchObjectAuth[detailInfo.value.watchObject])) { return }
       $router.push({
         name: watchObject[detailInfo.value.watchObject],
         query: {
diff --git a/src/views/home/operation/alarm/index.vue b/src/views/home/operation/alarm/index.vue
index ac0f31b..e53c991 100644
--- a/src/views/home/operation/alarm/index.vue
+++ b/src/views/home/operation/alarm/index.vue
@@ -82,6 +82,7 @@
 }
 // 重置查询条件f
 const reset = () => {
+  datetimerange.value = []
   listQuery.value = {
     limit: 20,
     offset: 1,
@@ -315,7 +316,7 @@
               <el-button v-if="proxy.hasPerm('/alarm/device/delete')" type="primary" @click="batchDeleteRow">
                 批量删除
               </el-button>
-              <el-button type="primary" @click="exportList">
+              <el-button v-if="proxy.hasPerm('/alarm/device/export')" type="primary" @click="exportList">
                 导出
               </el-button>
             </div>
@@ -336,7 +337,7 @@
               </el-table-column>
             </template>
             <template #columns>
-              <el-table-column label="操作" align="center" width="80">
+              <el-table-column v-if="proxy.hasPerm('/alarm/device/detail')" label="操作" align="center" width="80">
                 <template #default="scope">
                   <el-button type="primary" link size="small" @click="detail(scope.row)">
                     查看
diff --git a/src/views/home/operation/history/index.vue b/src/views/home/operation/history/index.vue
index 5c04ff7..d96ac57 100644
--- a/src/views/home/operation/history/index.vue
+++ b/src/views/home/operation/history/index.vue
@@ -78,6 +78,7 @@
 }
 // 重置查询条件f
 const reset = () => {
+  datetimerange.value = []
   listQuery.value = {
     limit: 20,
     offset: 1,
@@ -161,6 +162,7 @@
     fetchData()
   })
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -218,7 +220,7 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="exportList">
+          <el-button v-if="proxy.hasPerm('/operation/history/export')" type="primary" @click="exportList">
             导出
           </el-button>
         </div>
@@ -241,7 +243,7 @@
           </el-table-column>
         </template>
         <template #columns>
-          <el-table-column label="操作" align="center" width="80">
+          <el-table-column v-if="proxy.hasPerm('/operation/history/detail')" label="操作" align="center" width="80">
             <template #default="scope">
               <el-button type="primary" link size="small" @click="detailRow(scope.row)">
                 查看
diff --git a/src/views/home/operation/manufacturer/index.vue b/src/views/home/operation/manufacturer/index.vue
index 4a5816a..5f647c3 100644
--- a/src/views/home/operation/manufacturer/index.vue
+++ b/src/views/home/operation/manufacturer/index.vue
@@ -75,6 +75,7 @@
 }
 // 重置查询条件f
 const reset = () => {
+  datetimerange.value = []
   listQuery.value = {
     limit: 20,
     offset: 1,
@@ -125,6 +126,7 @@
   await fetchDict()
   fetchData()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -178,7 +180,7 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="exportList">
+          <el-button v-if="proxy.hasPerm('/operation/manufacturer/export')" type="primary" @click="exportList">
             导出
           </el-button>
         </div>
diff --git a/src/views/home/operation/trajectory/index.vue b/src/views/home/operation/trajectory/index.vue
index 9312fd7..606958e 100644
--- a/src/views/home/operation/trajectory/index.vue
+++ b/src/views/home/operation/trajectory/index.vue
@@ -65,6 +65,7 @@
 }
 // 重置查询条件f
 const reset = () => {
+  datetimerange.value = []
   listQuery.value = {
     limit: 20,
     offset: 1,
@@ -114,6 +115,7 @@
   await fetchDict()
   fetchData()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -175,7 +177,7 @@
           </span>
         </template>
         <template #columns>
-          <el-table-column label="操作" width="80" align="center">
+          <el-table-column v-if="proxy.hasPerm('/operation/trajectory/detail')" label="操作" width="80" align="center">
             <template #default="scope">
               <el-button type="primary" link size="small" @click="detail(scope.row)">
                 查看
diff --git a/src/views/home/pipeline/components/detailData.vue b/src/views/home/pipeline/components/detailData.vue
index 80b6886..760b1c5 100644
--- a/src/views/home/pipeline/components/detailData.vue
+++ b/src/views/home/pipeline/components/detailData.vue
@@ -7,7 +7,13 @@
 import type { TabsPaneContext } from 'element-plus'
 import monitorData from './monitorDataList.vue'
 import maintenanceRecord from '@/views/home/well/components/maintenanceRecord.vue'
-const activeName = ref('监控数据')
+const { proxy } = getCurrentInstance() as any
+const activeName = ref(
+  proxy.hasPerm('/pipeline/monitor/data')
+    ? '监控数据'
+    : proxy.hasPerm('/pipeline/monitor/maintenance')
+      ? '监控设备维护记录'
+      : '')
 const handleClick = (tab: TabsPaneContext, event: Event) => {
   // console.log(tab, event)
 }
@@ -15,10 +21,10 @@
 
 <template>
   <el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick">
-    <el-tab-pane label="监控数据" name="监控数据">
+    <el-tab-pane v-if="proxy.hasPerm('/pipeline/monitor/data')" label="监控数据" name="监控数据">
       <monitor-data v-if="activeName === '监控数据'" />
     </el-tab-pane>
-    <el-tab-pane label="监控设备维护记录" name="监控设备维护记录">
+    <el-tab-pane v-if="proxy.hasPerm('/pipeline/monitor/maintenance')" label="监控设备维护记录" name="监控设备维护记录">
       <maintenance-record v-if="activeName === '监控设备维护记录'" />
     </el-tab-pane>
   </el-tabs>
diff --git a/src/views/home/pipeline/index.vue b/src/views/home/pipeline/index.vue
index 90baef0..4d66e51 100644
--- a/src/views/home/pipeline/index.vue
+++ b/src/views/home/pipeline/index.vue
@@ -254,6 +254,7 @@
     tableHeight.value = window.innerHeight - 60 - 50 - 10 - 98 - 10 - 52 - 52 - 10
   }
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -348,7 +349,7 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary">
+          <el-button v-if="proxy.hasPerm('/pipeline/export')" type="primary">
             导出
           </el-button>
         </div>
@@ -368,7 +369,7 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="80">
             <template #default="scope">
-              <el-button type="primary" link size="small" @click="editRow('detail', scope.row)">
+              <el-button v-if="proxy.hasPerm('/pipeline/detail')" type="primary" link size="small" @click="editRow('detail', scope.row)">
                 查看
               </el-button>
               <!-- <el-button type="primary" link size="small" @click="editRow('edit', scope.row)">
diff --git a/src/views/home/rule/agreement/index.vue b/src/views/home/rule/agreement/index.vue
index fd41cd3..f1cfe15 100644
--- a/src/views/home/rule/agreement/index.vue
+++ b/src/views/home/rule/agreement/index.vue
@@ -95,6 +95,7 @@
 onMounted(async () => {
   fetchData()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -119,7 +120,7 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="editRow('add', {})">
+          <el-button v-if="proxy.hasPerm('/rule/agreement/add')" type="primary" @click="editRow('add', {})">
             新建
           </el-button>
         </div>
@@ -139,10 +140,10 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="120">
             <template #default="scope">
-              <el-button type="primary" link size="small" @click="editRow('edit', scope.row)">
+              <el-button v-if="proxy.hasPerm('/rule/agreement/update')" type="primary" link size="small" @click="editRow('edit', scope.row)">
                 编辑
               </el-button>
-              <el-button type="danger" link size="small" @click="removeRow(scope.row)">
+              <el-button v-if="proxy.hasPerm('/rule/agreement/delete')" type="danger" link size="small" @click="removeRow(scope.row)">
                 删除
               </el-button>
             </template>
diff --git a/src/views/home/rule/alarm/components/alarmLevelList.vue b/src/views/home/rule/alarm/components/alarmLevelList.vue
index c8ffb7d..6c337c4 100644
--- a/src/views/home/rule/alarm/components/alarmLevelList.vue
+++ b/src/views/home/rule/alarm/components/alarmLevelList.vue
@@ -87,6 +87,7 @@
 const cancel = () => {
   dialogFormVisible.value = false
 }
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -97,7 +98,7 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="detailRow('create', {})">
+          <el-button v-if="proxy.hasPerm('/rule/alarm/level/add')" type="primary" @click="detailRow('create', {})">
             新增
           </el-button>
         </div>
@@ -117,10 +118,10 @@
         <template #columns>
           <el-table-column label="操作" width="120" align="center">
             <template #default="scope">
-              <el-button type="primary" link size="small" @click="detailRow('edit', scope.row)">
+              <el-button v-if="proxy.hasPerm('/rule/alarm/level/update')" type="primary" link size="small" @click="detailRow('edit', scope.row)">
                 编辑
               </el-button>
-              <el-button type="danger" link size="small" @click="removeRow(scope.row)">
+              <el-button v-if="proxy.hasPerm('/rule/alarm/level/delete')" type="danger" link size="small" @click="removeRow(scope.row)">
                 删除
               </el-button>
             </template>
diff --git a/src/views/home/rule/alarm/components/alarmTypeList.vue b/src/views/home/rule/alarm/components/alarmTypeList.vue
index 2cbf110..aa0cfed 100644
--- a/src/views/home/rule/alarm/components/alarmTypeList.vue
+++ b/src/views/home/rule/alarm/components/alarmTypeList.vue
@@ -80,6 +80,7 @@
 const cancel = () => {
   dialogFormVisible.value = false
 }
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -90,7 +91,7 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="detailRow('create', {})">
+          <el-button v-if="proxy.hasPerm('/rule/alarm/type/add')" type="primary" @click="detailRow('create', {})">
             新增
           </el-button>
         </div>
@@ -110,10 +111,10 @@
         <template #columns>
           <el-table-column label="操作" width="120" align="center">
             <template #default="scope">
-              <el-button type="primary" link size="small" @click="detailRow('edit', scope.row)">
+              <el-button v-if="proxy.hasPerm('/rule/alarm/type/update')" type="primary" link size="small" @click="detailRow('edit', scope.row)">
                 编辑
               </el-button>
-              <el-button type="danger" link size="small" @click="removeRow(scope.row)">
+              <el-button v-if="proxy.hasPerm('/rule/alarm/type/delete')" type="danger" link size="small" @click="removeRow(scope.row)">
                 删除
               </el-button>
             </template>
diff --git a/src/views/home/rule/alarm/index.vue b/src/views/home/rule/alarm/index.vue
index 110030c..4e66a34 100644
--- a/src/views/home/rule/alarm/index.vue
+++ b/src/views/home/rule/alarm/index.vue
@@ -20,11 +20,14 @@
 // 初始展示列
 const columns = ref<any>([
   { text: '报警类型', value: 'alarmTypeName', align: 'center' },
-  { text: '报警名称', value: 'alarmName', align: 'center' },
-  { text: '报警等级', value: 'alarmLevelName', align: 'center' },
-  { text: '报警提示方式', value: 'alarmNoteMethodName', align: 'center' },
-  { text: '状态', value: 'stateName', align: 'center', width: '130' },
-  { text: '创建时间', value: 'ts', align: 'center' },
+  { text: '设备类型', value: 'typeName', align: 'center' },
+  { text: '产品', value: 'productName', align: 'center' },
+  { text: '厂商', value: 'manufacturerName', align: 'center' },
+  // { text: '报警名称', value: 'alarmName', align: 'center' },
+  { text: '报警等级', value: 'alarmLevelName', align: 'center', width: '100' },
+  { text: '报警提示方式', value: 'alarmNoteMethodName', align: 'center', width: '130', isCustom: true },
+  { text: '状态', value: 'stateName', align: 'center', width: '100', isCustom: true },
+  { text: '创建时间', value: 'ts', align: 'center', width: '200' },
 ])
 // 最终展示列
 const columnsConfig = ref([])
@@ -158,6 +161,7 @@
   await fetchDict()
   fetchData()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -191,13 +195,13 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="showAlarmType">
+          <el-button v-if="proxy.hasPerm('/rule/alarm/type')" type="primary" @click="showAlarmType">
             报警类型管理
           </el-button>
-          <el-button type="primary" @click="showAlarmLevel">
+          <el-button v-if="proxy.hasPerm('/rule/alarm/level')" type="primary" @click="showAlarmLevel">
             报警等级管理
           </el-button>
-          <el-button type="primary" @click="detailRow('create', {})">
+          <el-button v-if="proxy.hasPerm('/rule/alarm/add')" type="primary" @click="detailRow('create', {})">
             新增
           </el-button>
         </div>
@@ -214,16 +218,28 @@
             </template>
           </el-table-column>
         </template>
+        <template #isCustom="{ scope, column }">
+          <!-- 报警提示方式 -->
+          <span v-if="column.text === '报警提示方式'">
+            <el-tag v-if="scope.row.alarmNoteMethodName === '消息提醒'" type="primary">消息提醒</el-tag>
+            <el-tag v-if="scope.row.alarmNoteMethodName === '弹窗'" type="danger">弹窗提醒</el-tag>
+          </span>
+          <!-- 报警提示方式 -->
+          <span v-if="column.text === '状态'">
+            <el-tag v-if="scope.row.stateName === '启用'" type="success">启用</el-tag>
+            <el-tag v-if="scope.row.stateName === '未启用'" type="info">未启用</el-tag>
+          </span>
+        </template>
         <template #columns>
           <el-table-column label="操作" width="140" align="center">
             <template #default="scope">
-              <el-button type="primary" link size="small" @click="switchStatusRow(scope.row)">
+              <el-button v-if="proxy.hasPerm('/rule/alarm/handler')" type="primary" link size="small" @click="switchStatusRow(scope.row)">
                 {{ scope.row.state === '1' ? '停用' : '启用' }}
               </el-button>
-              <el-button type="primary" link size="small" @click="detailRow('edit', scope.row)">
+              <el-button v-if="proxy.hasPerm('/rule/alarm/update')" type="primary" link size="small" @click="detailRow('edit', scope.row)">
                 编辑
               </el-button>
-              <el-button type="danger" link size="small" @click="removeRow(scope.row)">
+              <el-button v-if="proxy.hasPerm('/rule/alarm/delete')" type="danger" link size="small" @click="removeRow(scope.row)">
                 删除
               </el-button>
             </template>
diff --git a/src/views/home/rule/special/components/editDialog.vue b/src/views/home/rule/special/components/editDialog.vue
index bb494ec..5df205b 100644
--- a/src/views/home/rule/special/components/editDialog.vue
+++ b/src/views/home/rule/special/components/editDialog.vue
@@ -8,7 +8,7 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { getDictByCode } from '@/api/system/dict'
 import { getDeviceTypeListPage } from '@/api/home/device/type'
-import { getAlarmLevelListPage, getAlarmRuleListPage } from '@/api/home/rule/alarm'
+import { getAlarmLevelListPage, getAlarmTypeListPage } from '@/api/home/rule/alarm'
 import { addSpecialAlarmRule, editSpecialAlarmRule } from '@/api/home/rule/special'
 import { getDeviceListPage } from '@/api/home/device/device'
 import { getProductListPage } from '@/api/home/device/product'
@@ -57,13 +57,15 @@
 }
 const list = ref<any[]>([])
 const columns = ref<any>([
-  { text: '报警规则', value: 'alarmRule', align: 'center', type: 'select', code: 'alarm-rule', required: true },
+  { text: '报警类型', value: 'alarmTypeId', align: 'center', type: 'select', code: 'alarm-rule', required: true },
   { text: '报警等级', value: 'alarmLevelId', align: 'center', type: 'select', code: 'alarm-level', required: true },
   { text: '报警阈值', value: 'alarmThreshold', align: 'center', type: 'input', required: true },
 ])
 // 初始化对话框
+const isFirst = ref(true)
 const initDialog = (dialogStatusValue: string, row: any) => {
   dialogStatus.value = dialogStatusValue
+  isFirst.value = true
   dialogFormVisible.value = true
   if (dialogStatus.value === 'create') { // 如果是新增，清除验证
     resetForm()
@@ -83,9 +85,13 @@
         alarmRule: row.alarmRule,
         alarmLevelId: row.alarmLevelId,
         alarmThreshold: row.alarmThreshold,
+        alarmTypeId: row.alarmTypeId,
       },
     ]
   }
+  setTimeout(() => {
+    isFirst.value = false
+  })
 }
 defineExpose({
   initDialog,
@@ -143,6 +149,7 @@
 const saveData = () => {
   const data = list.value.map((item: any) => ({
     alarmLevelId: item.alarmLevelId,
+    alarmTypeId: item.alarmTypeId,
     alarmRule: item.alarmRule,
     alarmRuleName: `${item.alarmRule}[${alarmLevelList.value.filter((citem: any) => citem.id === item.alarmLevelId)[0]?.name || ''}]:${item.alarmThreshold}%LEL`,
     alarmThreshold: item.alarmThreshold,
@@ -151,7 +158,7 @@
     position: dataForm.value.position,
     tagNumber: dataForm.value.tagNumber,
     devTypeName: deviceList.value.filter((citem: any) => citem.value === dataForm.value.devcode)[0]?.name || '',
-    alarmTypeId: alarmRuleList.value.filter((citem: any) => citem.name === item.alarmRule)[0]?.alarmTypeId || '',
+    // alarmTypeId: alarmRuleList.value.filter((citem: any) => citem.name === item.alarmRule)[0]?.alarmTypeId || '',
   }))
   if (dialogStatus.value === 'edit') {
     updateData(data)
@@ -207,7 +214,7 @@
   // 设备列表
   getDeviceListPage({ offset: 1, limit: 9999 }).then((res) => {
     deviceList.value = res.data.rows.map((item: any) => ({
-      name: item.devTypeName,
+      name: item.typeName,
       id: item.id,
       value: item.devcode,
       productId: item.productId,
@@ -223,14 +230,14 @@
       }))
     })
     // 报警规则
-    getAlarmRuleListPage({ limit: 9999, offset: 1 }).then((res) => {
-      alarmRuleList.value = res.data.rows.map((item: any) => ({
-        name: item.alarmName,
-        id: item.id,
-        value: item.id,
-        alarmTypeId: item.alarmTypeId,
-      }))
-    })
+    // getAlarmRuleListPage({ limit: 9999, offset: 1 }).then((res) => {
+    //   alarmRuleList.value = res.data.rows.map((item: any) => ({
+    //     name: item.alarmName,
+    //     id: item.id,
+    //     value: item.id,
+    //     alarmTypeId: item.alarmTypeId,
+    //   }))
+    // })
     // 报警等级
     getAlarmLevelListPage({ limit: 9999, offset: 1 }).then((res) => {
       alarmLevelList.value = res.data.rows.map((item: any) => ({
@@ -247,11 +254,26 @@
 watch(() => dataForm.value.devcode, (newVal) => {
   if (newVal) {
     const current = deviceList.value.filter((item: any) => item.value === dataForm.value.devcode)
+    console.log(current, 'current')
     if (current.length) {
       dataForm.value.productId = current[0].productId
       dataForm.value.tagNumber = current[0].tagNumber
       dataForm.value.position = current[0].position
+      // 根据设备类型寻找报警类型
+      getAlarmTypeListPage({ limit: 9999, offset: 1 }).then((res) => {
+        alarmRuleList.value = res.data.rows.filter((item: any) => item.deviceTypeName.includes(current[0].name)).map((item: any) => ({
+          name: item.alarmType,
+          id: item.id,
+          value: item.id,
+          // alarmTypeId: item.id,
+        }))
+      })
     }
+    if (isFirst.value) {
+      return
+    }
+    alarmRuleList.value = []
+    list.value = []
   }
 }, {
   deep: true,
@@ -330,12 +352,12 @@
                         <!-- 报警规则 -->
                         <template v-if="item.type === 'select' && item.code === 'alarm-rule'">
                           <el-select
-                            v-model.trim="scope.row[item.value]" placeholder="报警规则" style="width: 100%;"
+                            v-model.trim="scope.row[item.value]" placeholder="报警类型" style="width: 100%;"
                             clearable filterable :disabled="!scope.row.edit"
                           >
                             <el-option
                               v-for="item in alarmRuleList" :key="item.id" :label="item.name"
-                              :value="item.name"
+                              :value="item.id"
                             />
                           </el-select>
                         </template>
diff --git a/src/views/home/rule/special/index.vue b/src/views/home/rule/special/index.vue
index 5c7b67c..7209dfa 100644
--- a/src/views/home/rule/special/index.vue
+++ b/src/views/home/rule/special/index.vue
@@ -99,6 +99,7 @@
   await fetchDict()
   fetchData()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -127,7 +128,7 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary" @click="detail('create', {})">
+          <el-button v-if="proxy.hasPerm('/rule/special/add')" type="primary" @click="detail('create', {})">
             新增
           </el-button>
         </div>
@@ -147,13 +148,13 @@
         <template #columns>
           <el-table-column label="操作" width="140" align="center">
             <template #default="scope">
-              <el-button type="primary" link size="small" @click="detail('detail', scope.row)">
+              <el-button v-if="proxy.hasPerm('/rule/special/detail')" type="primary" link size="small" @click="detail('detail', scope.row)">
                 查看
               </el-button>
-              <el-button type="primary" link size="small" @click="detail('edit', scope.row)">
+              <el-button v-if="proxy.hasPerm('/rule/special/update')" type="primary" link size="small" @click="detail('edit', scope.row)">
                 编辑
               </el-button>
-              <el-button type="danger" link size="small" @click="removeRow(scope.row)">
+              <el-button v-if="proxy.hasPerm('/rule/special/delete')" type="danger" link size="small" @click="removeRow(scope.row)">
                 删除
               </el-button>
             </template>
diff --git a/src/views/home/station/control/index.vue b/src/views/home/station/control/index.vue
index 4510922..6657c5d 100644
--- a/src/views/home/station/control/index.vue
+++ b/src/views/home/station/control/index.vue
@@ -71,6 +71,7 @@
     },
   ]
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -114,7 +115,7 @@
               </div>
             </div>
             <div class="right1">
-              <el-card shadow="always">
+              <el-card v-if="proxy.hasPerm('/station/control/video')" shadow="always">
                 <template #header>
                   <div class="clearfix">
                     <div>云台控制</div>
diff --git a/src/views/home/station/operation/index.vue b/src/views/home/station/operation/index.vue
index 02a5e44..d3d3d09 100644
--- a/src/views/home/station/operation/index.vue
+++ b/src/views/home/station/operation/index.vue
@@ -71,6 +71,7 @@
 }
 // 重置查询条件f
 const reset = () => {
+  datetimerange.value = []
   listQuery.value = {
     limit: 20,
     offset: 1,
@@ -121,6 +122,7 @@
   await fetchDict()
   fetchData()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -160,10 +162,10 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary">
+          <el-button v-if="proxy.hasPerm('/station/operation/add')" type="primary">
             新增
           </el-button>
-          <el-button type="primary" @click="exportList">
+          <el-button v-if="proxy.hasPerm('/station/operation/export')" type="primary" @click="exportList">
             导出
           </el-button>
         </div>
diff --git a/src/views/home/station/station/components/detailData.vue b/src/views/home/station/station/components/detailData.vue
index 237b22a..c936f30 100644
--- a/src/views/home/station/station/components/detailData.vue
+++ b/src/views/home/station/station/components/detailData.vue
@@ -8,7 +8,13 @@
 import monitorData from './monitorData.vue'
 import lifeCycleRecord from '@/views/home/well/components/lifeCycleRecord.vue'
 import maintenanceRecord from '@/views/home/well/components/maintenanceRecord.vue'
-const activeName = ref('监控数据')
+const { proxy } = getCurrentInstance() as any
+const activeName = ref(
+  proxy.hasPerm('/station/monitor/data')
+    ? '监控数据'
+    : proxy.hasPerm('/station/monitor/life')
+      ? '全生命周期记录'
+      : proxy.hasPerm('/station/monitor/maintenance') ? '监控设备维护记录' : '')
 const handleClick = (tab: TabsPaneContext, event: Event) => {
   console.log(tab, event)
 }
@@ -16,13 +22,13 @@
 
 <template>
   <el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick">
-    <el-tab-pane label="监控数据" name="监控数据">
+    <el-tab-pane v-if="proxy.hasPerm('/station/monitor/data')" label="监控数据" name="监控数据">
       <monitor-data v-if="activeName === '监控数据'" />
     </el-tab-pane>
-    <el-tab-pane label="全生命周期记录" name="全生命周期记录">
+    <el-tab-pane v-if="proxy.hasPerm('/station/monitor/life')" label="全生命周期记录" name="全生命周期记录">
       <life-cycle-record v-if="activeName === '全生命周期记录'" />
     </el-tab-pane>
-    <el-tab-pane label="监控设备维护记录" name="监控设备维护记录">
+    <el-tab-pane v-if="proxy.hasPerm('/station/monitor/maintenance')" label="监控设备维护记录" name="监控设备维护记录">
       <maintenance-record v-if="activeName === '监控设备维护记录'" />
     </el-tab-pane>
   </el-tabs>
diff --git a/src/views/home/station/station/index.vue b/src/views/home/station/station/index.vue
index 32eb20c..9cd1128 100644
--- a/src/views/home/station/station/index.vue
+++ b/src/views/home/station/station/index.vue
@@ -193,6 +193,7 @@
     tableHeight.value = window.innerHeight - 60 - 50 - 10 - 98 - 10 - 52 - 52 - 10
   }
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -254,7 +255,7 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary">
+          <el-button v-if="proxy.hasPerm('/station/monitor/export')" type="primary">
             导出
           </el-button>
         </div>
@@ -274,10 +275,10 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="120">
             <template #default="scope">
-              <el-button type="primary" link size="small" @click="editRow('detail', scope.row)">
+              <el-button v-if="proxy.hasPerm('/station/monitor/detail')" type="primary" link size="small" @click="editRow('detail', scope.row)">
                 查看
               </el-button>
-              <el-button type="primary" link size="small" @click="editRow('edit', scope.row)">
+              <el-button v-if="proxy.hasPerm('/station/monitor/update')" type="primary" link size="small" @click="editRow('edit', scope.row)">
                 编辑
               </el-button>
             </template>
diff --git a/src/views/home/well/components/detail.vue b/src/views/home/well/components/detail.vue
index eda3b06..55f4f08 100644
--- a/src/views/home/well/components/detail.vue
+++ b/src/views/home/well/components/detail.vue
@@ -147,6 +147,7 @@
 onMounted(() => {
   fetchWellDetail()
 })
+const detailRef = ref()
 </script>
 
 <template>
@@ -175,7 +176,7 @@
       </el-descriptions>
     </detail-block-com>
     <detail-block-com>
-      <detail-data />
+      <detail-data ref="detailRef" />
     </detail-block-com>
   </app-container>
 </template>
diff --git a/src/views/home/well/components/detailData.vue b/src/views/home/well/components/detailData.vue
index 7fcfe7b..3a1aed1 100644
--- a/src/views/home/well/components/detailData.vue
+++ b/src/views/home/well/components/detailData.vue
@@ -8,21 +8,31 @@
 import monitorData from './monitorData.vue'
 import lifeCycleRecord from './lifeCycleRecord.vue'
 import maintenanceRecord from './maintenanceRecord.vue'
-const activeName = ref('监控数据')
+const { proxy } = getCurrentInstance() as any
+const activeName = ref(
+  proxy.hasPerm('/well/monitor/data')
+    ? '监控数据'
+    : proxy.hasPerm('/well/monitor/life')
+      ? '全生命周期记录'
+      : proxy.hasPerm('/well/monitor/maintenance') ? '监控设备维护记录' : '',
+)
 const handleClick = (tab: TabsPaneContext, event: Event) => {
   console.log(tab, event)
 }
+defineExpose({
+  activeName,
+})
 </script>
 
 <template>
   <el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick">
-    <el-tab-pane label="监控数据" name="监控数据">
+    <el-tab-pane v-if="proxy.hasPerm('/well/monitor/data')" label="监控数据" name="监控数据">
       <monitor-data v-if="activeName === '监控数据'" />
     </el-tab-pane>
-    <el-tab-pane label="全生命周期记录" name="全生命周期记录">
+    <el-tab-pane v-if="proxy.hasPerm('/well/monitor/life')" label="全生命周期记录" name="全生命周期记录">
       <life-cycle-record v-if="activeName === '全生命周期记录'" />
     </el-tab-pane>
-    <el-tab-pane label="监控设备维护记录" name="监控设备维护记录">
+    <el-tab-pane v-if="proxy.hasPerm('/well/monitor/maintenance')" label="监控设备维护记录" name="监控设备维护记录">
       <maintenance-record v-if="activeName === '监控设备维护记录'" />
     </el-tab-pane>
   </el-tabs>
diff --git a/src/views/home/well/components/lifeCycleRecord.vue b/src/views/home/well/components/lifeCycleRecord.vue
index c56141d..d302836 100644
--- a/src/views/home/well/components/lifeCycleRecord.vue
+++ b/src/views/home/well/components/lifeCycleRecord.vue
@@ -17,7 +17,7 @@
   { text: '报警类型', value: 'alarmType', align: 'center' },
   { text: '报警等级', value: 'alarmLevel', align: 'center' },
   { text: '报警原因', value: 'alarmContent', align: 'center' },
-  { text: '是否误报', value: 'realAlarm', align: 'center' },
+  { text: '是否误报', value: 'realAlarmName', align: 'center' },
   { text: '报警解除时间', value: 'cancelTime', align: 'center' },
   { text: '处置时长', value: 'processDuration', align: 'center' },
 ])
@@ -62,6 +62,7 @@
 const detailRow = (row: any) => {
   console.log(row.id)
 }
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -75,7 +76,7 @@
       <el-button type="primary" style="margin-left: 10px;" @click="fetchData">
         搜索
       </el-button>
-      <el-button type="primary">
+      <el-button v-if="proxy.hasPerm($route.path.includes('well') ? '/well/lifeCycle/export' : '/station/monitor/exportLifeCycle')" type="primary">
         导出
       </el-button>
     </template>
@@ -84,13 +85,13 @@
       :pagination="false"
     >
       <template #columns>
-        <el-table-column label="操作" align="center" width="80">
+        <!-- <el-table-column label="操作" align="center" width="80">
           <template #default="scope">
             <el-button type="primary" link size="small" @click="detailRow(scope.row)">
               查看
             </el-button>
           </template>
-        </el-table-column>
+        </el-table-column> -->
       </template>
     </normal-table>
   </table-container>
diff --git a/src/views/home/well/index.vue b/src/views/home/well/index.vue
index 8cfd253..3e26cf2 100644
--- a/src/views/home/well/index.vue
+++ b/src/views/home/well/index.vue
@@ -225,6 +225,7 @@
     tableHeight.value = window.innerHeight - 60 - 50 - 10 - 98 - 10 - 52 - 52 - 10
   }
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -296,7 +297,7 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary">
+          <el-button v-if="proxy.hasPerm('/well/export')" type="primary">
             导出
           </el-button>
         </div>
@@ -328,10 +329,10 @@
   </el-table-column> -->
           <el-table-column label="操作" align="center" width="120">
             <template #default="scope">
-              <el-button type="primary" link size="small" @click="editRow('detail', scope.row)">
+              <el-button v-if="proxy.hasPerm('/well/detail')" type="primary" link size="small" @click="editRow('detail', scope.row)">
                 查看
               </el-button>
-              <el-button type="primary" link size="small" @click="editRow('edit', scope.row)">
+              <el-button v-if="proxy.hasPerm('/well/update')" type="primary" link size="small" @click="editRow('edit', scope.row)">
                 编辑
               </el-button>
             </template>
diff --git a/src/views/system/manufacturer/index.vue b/src/views/system/manufacturer/index.vue
index a356fbc..ad219f8 100644
--- a/src/views/system/manufacturer/index.vue
+++ b/src/views/system/manufacturer/index.vue
@@ -60,7 +60,7 @@
 // 删除行
 function removeRow(row: any) {
   ElMessageBox.confirm(
-    `确定要删除${row.name}吗？`,
+    '确定要删除该数据吗？',
     '确认删除',
     {
       confirmButtonText: '确定',
@@ -93,6 +93,7 @@
 onMounted(() => {
   fetchData()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -111,7 +112,7 @@
     </search-area>
     <table-container>
       <template #btns-right>
-        <icon-button icon="icon-add" title="新增" @click="editRow('add', {})" />
+        <icon-button v-if="proxy.hasPerm('/sys/manufacturer/add')" icon="icon-add" title="新增" @click="editRow('add', {})" />
       </template>
       <normal-table
         :query="defaultQuery" :list-loading="loading" :columns="columns" :data="list" :total="total"
@@ -127,10 +128,10 @@
         <template #columns>
           <el-table-column label="操作" width="140" align="center">
             <template #default="scope">
-              <el-button type="primary" link size="small" class="table-text-button" @click="editRow('edit', scope.row)">
+              <el-button v-if="proxy.hasPerm('/sys/manufacturer/update')" type="primary" link size="small" class="table-text-button" @click="editRow('edit', scope.row)">
                 编辑
               </el-button>
-              <el-button type="danger" link size="small" class="table-text-button" @click="removeRow(scope.row)">
+              <el-button v-if="proxy.hasPerm('/sys/manufacturer/delete')" type="danger" link size="small" class="table-text-button" @click="removeRow(scope.row)">
                 删除
               </el-button>
             </template>