diff --git a/src/assets/fullscren/br-logo.png b/src/assets/fullscren/br-logo.png
new file mode 100644
index 0000000..f3db083
--- /dev/null
+++ b/src/assets/fullscren/br-logo.png
Binary files differ

diff --git a/src/assets/fullscren/br-logo.png b/src/assets/fullscren/br-logo.png
new file mode 100644
index 0000000..f3db083
--- /dev/null
+++ b/src/assets/fullscren/br-logo.png
Binary files differ
diff --git a/src/assets/fullscren/br-title.png b/src/assets/fullscren/br-title.png
new file mode 100644
index 0000000..9c7237e
--- /dev/null
+++ b/src/assets/fullscren/br-title.png
Binary files differ

diff --git a/src/assets/fullscren/br-logo.png b/src/assets/fullscren/br-logo.png
new file mode 100644
index 0000000..f3db083
--- /dev/null
+++ b/src/assets/fullscren/br-logo.png
Binary files differ
diff --git a/src/assets/fullscren/br-title.png b/src/assets/fullscren/br-title.png
new file mode 100644
index 0000000..9c7237e
--- /dev/null
+++ b/src/assets/fullscren/br-title.png
Binary files differ
diff --git a/src/components/DeptSelect/index.vue b/src/components/DeptSelect/index.vue
index ef7bd91..948bd8b 100644
--- a/src/components/DeptSelect/index.vue
+++ b/src/components/DeptSelect/index.vue
@@ -68,16 +68,17 @@
 function fetchPcode() {
   // 如果未指定需要展示的部门类型，获取全部部门
   if (!props.deptType) {
-    if (dictStore.allDeptList.length === 0) { // 如果store中未存储，从服务器上获取
-      getDeptTreeList().then((res) => {
-        const list = res.data
-        dictStore.setAllDeptList(list)
-        refreshList(list)
-      })
-    }
-    else {
-      refreshList(dictStore.allDeptList)
-    }
+    // if (dictStore.allDeptList.length === 0) { // 如果store中未存储，从服务器上获取
+    getDeptTreeList().then((res) => {
+      const list = res.data.filter((item: any) => item.id !== '0')
+      dictStore.setAllDeptList(list)
+      refreshList(list)
+      console.log(list, 'list')
+    })
+    // }
+    // else {
+    //   refreshList(dictStore.allDeptList)
+    // }
   }
   else { // 如果指定了需要展示的部门类型
     if (dictStore.companyList.length === 0) { // 如果store中未存储，从服务器上获取
@@ -159,24 +160,15 @@
 <template>
   <div style="width: 100%;">
     <el-tree-select
-      v-if="multiData"
-      v-model="value"
-      :data="deptTreeList"
-      node-key="id"
-      :filter-node-method="filterTree"
-      :props="defaultProps"
-      :expand-on-click-node="false"
-      :render-after-expand="false"
-      :size="props.size"
-      :placeholder="props.placeholder"
-      :clearable="props.clearable"
-      check-strictly
-      check-on-click-node
-      filterable
-      class="full-width-input"
-      :disabled="props.disabled"
+      v-if="multiData" v-model="value" :data="deptTreeList" node-key="id" :filter-node-method="filterTree"
+      :props="defaultProps" :expand-on-click-node="false" :render-after-expand="false" :size="props.size"
+      :placeholder="props.placeholder" :clearable="props.clearable" check-strictly check-on-click-node filterable
+      class="full-width-input" :disabled="props.disabled"
     />
-    <el-select v-else v-model="value" :placeholder="props.placeholder" :size="props.size" :disabled="props.disabled" :clearable="props.clearable" class="full-width-input">
+    <el-select
+      v-else v-model="value" :placeholder="props.placeholder" :size="props.size" :disabled="props.disabled"
+      :clearable="props.clearable" class="full-width-input"
+    >
       <el-option v-for="(item, index) in deptTreeList" :key="index" :label="item.name" :value="item.id" />
     </el-select>
   </div>

diff --git a/src/assets/fullscren/br-logo.png b/src/assets/fullscren/br-logo.png
new file mode 100644
index 0000000..f3db083
--- /dev/null
+++ b/src/assets/fullscren/br-logo.png
Binary files differ
diff --git a/src/assets/fullscren/br-title.png b/src/assets/fullscren/br-title.png
new file mode 100644
index 0000000..9c7237e
--- /dev/null
+++ b/src/assets/fullscren/br-title.png
Binary files differ
diff --git a/src/components/DeptSelect/index.vue b/src/components/DeptSelect/index.vue
index ef7bd91..948bd8b 100644
--- a/src/components/DeptSelect/index.vue
+++ b/src/components/DeptSelect/index.vue
@@ -68,16 +68,17 @@
 function fetchPcode() {
   // 如果未指定需要展示的部门类型，获取全部部门
   if (!props.deptType) {
-    if (dictStore.allDeptList.length === 0) { // 如果store中未存储，从服务器上获取
-      getDeptTreeList().then((res) => {
-        const list = res.data
-        dictStore.setAllDeptList(list)
-        refreshList(list)
-      })
-    }
-    else {
-      refreshList(dictStore.allDeptList)
-    }
+    // if (dictStore.allDeptList.length === 0) { // 如果store中未存储，从服务器上获取
+    getDeptTreeList().then((res) => {
+      const list = res.data.filter((item: any) => item.id !== '0')
+      dictStore.setAllDeptList(list)
+      refreshList(list)
+      console.log(list, 'list')
+    })
+    // }
+    // else {
+    //   refreshList(dictStore.allDeptList)
+    // }
   }
   else { // 如果指定了需要展示的部门类型
     if (dictStore.companyList.length === 0) { // 如果store中未存储，从服务器上获取
@@ -159,24 +160,15 @@
 <template>
   <div style="width: 100%;">
     <el-tree-select
-      v-if="multiData"
-      v-model="value"
-      :data="deptTreeList"
-      node-key="id"
-      :filter-node-method="filterTree"
-      :props="defaultProps"
-      :expand-on-click-node="false"
-      :render-after-expand="false"
-      :size="props.size"
-      :placeholder="props.placeholder"
-      :clearable="props.clearable"
-      check-strictly
-      check-on-click-node
-      filterable
-      class="full-width-input"
-      :disabled="props.disabled"
+      v-if="multiData" v-model="value" :data="deptTreeList" node-key="id" :filter-node-method="filterTree"
+      :props="defaultProps" :expand-on-click-node="false" :render-after-expand="false" :size="props.size"
+      :placeholder="props.placeholder" :clearable="props.clearable" check-strictly check-on-click-node filterable
+      class="full-width-input" :disabled="props.disabled"
     />
-    <el-select v-else v-model="value" :placeholder="props.placeholder" :size="props.size" :disabled="props.disabled" :clearable="props.clearable" class="full-width-input">
+    <el-select
+      v-else v-model="value" :placeholder="props.placeholder" :size="props.size" :disabled="props.disabled"
+      :clearable="props.clearable" class="full-width-input"
+    >
       <el-option v-for="(item, index) in deptTreeList" :key="index" :label="item.name" :value="item.id" />
     </el-select>
   </div>
diff --git a/src/components/Echart/BarChart3D.vue b/src/components/Echart/BarChart3D.vue
index 8b8d8ea..ee7dbba 100644
--- a/src/components/Echart/BarChart3D.vue
+++ b/src/components/Echart/BarChart3D.vue
@@ -276,12 +276,12 @@
       textStyle: {
         fontSize: 16,
       },
-      axisPointer: {
-        type: 'cross',
-        label: {
-          fontSize: 13,
-        },
-      },
+      // axisPointer: {
+      //   type: 'cross',
+      //   label: {
+      //     fontSize: 13,
+      //   },
+      // },
       valueFormatter: (value: string | number) => {
         return value ? value + props.unit : value === 0 ? '0' : ''
       },

diff --git a/src/assets/fullscren/br-logo.png b/src/assets/fullscren/br-logo.png
new file mode 100644
index 0000000..f3db083
--- /dev/null
+++ b/src/assets/fullscren/br-logo.png
Binary files differ
diff --git a/src/assets/fullscren/br-title.png b/src/assets/fullscren/br-title.png
new file mode 100644
index 0000000..9c7237e
--- /dev/null
+++ b/src/assets/fullscren/br-title.png
Binary files differ
diff --git a/src/components/DeptSelect/index.vue b/src/components/DeptSelect/index.vue
index ef7bd91..948bd8b 100644
--- a/src/components/DeptSelect/index.vue
+++ b/src/components/DeptSelect/index.vue
@@ -68,16 +68,17 @@
 function fetchPcode() {
   // 如果未指定需要展示的部门类型，获取全部部门
   if (!props.deptType) {
-    if (dictStore.allDeptList.length === 0) { // 如果store中未存储，从服务器上获取
-      getDeptTreeList().then((res) => {
-        const list = res.data
-        dictStore.setAllDeptList(list)
-        refreshList(list)
-      })
-    }
-    else {
-      refreshList(dictStore.allDeptList)
-    }
+    // if (dictStore.allDeptList.length === 0) { // 如果store中未存储，从服务器上获取
+    getDeptTreeList().then((res) => {
+      const list = res.data.filter((item: any) => item.id !== '0')
+      dictStore.setAllDeptList(list)
+      refreshList(list)
+      console.log(list, 'list')
+    })
+    // }
+    // else {
+    //   refreshList(dictStore.allDeptList)
+    // }
   }
   else { // 如果指定了需要展示的部门类型
     if (dictStore.companyList.length === 0) { // 如果store中未存储，从服务器上获取
@@ -159,24 +160,15 @@
 <template>
   <div style="width: 100%;">
     <el-tree-select
-      v-if="multiData"
-      v-model="value"
-      :data="deptTreeList"
-      node-key="id"
-      :filter-node-method="filterTree"
-      :props="defaultProps"
-      :expand-on-click-node="false"
-      :render-after-expand="false"
-      :size="props.size"
-      :placeholder="props.placeholder"
-      :clearable="props.clearable"
-      check-strictly
-      check-on-click-node
-      filterable
-      class="full-width-input"
-      :disabled="props.disabled"
+      v-if="multiData" v-model="value" :data="deptTreeList" node-key="id" :filter-node-method="filterTree"
+      :props="defaultProps" :expand-on-click-node="false" :render-after-expand="false" :size="props.size"
+      :placeholder="props.placeholder" :clearable="props.clearable" check-strictly check-on-click-node filterable
+      class="full-width-input" :disabled="props.disabled"
     />
-    <el-select v-else v-model="value" :placeholder="props.placeholder" :size="props.size" :disabled="props.disabled" :clearable="props.clearable" class="full-width-input">
+    <el-select
+      v-else v-model="value" :placeholder="props.placeholder" :size="props.size" :disabled="props.disabled"
+      :clearable="props.clearable" class="full-width-input"
+    >
       <el-option v-for="(item, index) in deptTreeList" :key="index" :label="item.name" :value="item.id" />
     </el-select>
   </div>
diff --git a/src/components/Echart/BarChart3D.vue b/src/components/Echart/BarChart3D.vue
index 8b8d8ea..ee7dbba 100644
--- a/src/components/Echart/BarChart3D.vue
+++ b/src/components/Echart/BarChart3D.vue
@@ -276,12 +276,12 @@
       textStyle: {
         fontSize: 16,
       },
-      axisPointer: {
-        type: 'cross',
-        label: {
-          fontSize: 13,
-        },
-      },
+      // axisPointer: {
+      //   type: 'cross',
+      //   label: {
+      //     fontSize: 13,
+      //   },
+      // },
       valueFormatter: (value: string | number) => {
         return value ? value + props.unit : value === 0 ? '0' : ''
       },
diff --git a/src/components/Echart/BarChartHorizontal.vue b/src/components/Echart/BarChartHorizontal.vue
index 6a3c107..366e064 100644
--- a/src/components/Echart/BarChartHorizontal.vue
+++ b/src/components/Echart/BarChartHorizontal.vue
@@ -265,12 +265,12 @@
       textStyle: {
         fontSize: 16,
       },
-      axisPointer: {
-        type: 'cross',
-        label: {
-          fontSize: 13,
-        },
-      },
+      // axisPointer: {
+      //   type: 'cross',
+      //   label: {
+      //     fontSize: 13,
+      //   },
+      // },
       valueFormatter: (value: string | number) => {
         return value ? value + props.unit : ''
       },

diff --git a/src/assets/fullscren/br-logo.png b/src/assets/fullscren/br-logo.png
new file mode 100644
index 0000000..f3db083
--- /dev/null
+++ b/src/assets/fullscren/br-logo.png
Binary files differ
diff --git a/src/assets/fullscren/br-title.png b/src/assets/fullscren/br-title.png
new file mode 100644
index 0000000..9c7237e
--- /dev/null
+++ b/src/assets/fullscren/br-title.png
Binary files differ
diff --git a/src/components/DeptSelect/index.vue b/src/components/DeptSelect/index.vue
index ef7bd91..948bd8b 100644
--- a/src/components/DeptSelect/index.vue
+++ b/src/components/DeptSelect/index.vue
@@ -68,16 +68,17 @@
 function fetchPcode() {
   // 如果未指定需要展示的部门类型，获取全部部门
   if (!props.deptType) {
-    if (dictStore.allDeptList.length === 0) { // 如果store中未存储，从服务器上获取
-      getDeptTreeList().then((res) => {
-        const list = res.data
-        dictStore.setAllDeptList(list)
-        refreshList(list)
-      })
-    }
-    else {
-      refreshList(dictStore.allDeptList)
-    }
+    // if (dictStore.allDeptList.length === 0) { // 如果store中未存储，从服务器上获取
+    getDeptTreeList().then((res) => {
+      const list = res.data.filter((item: any) => item.id !== '0')
+      dictStore.setAllDeptList(list)
+      refreshList(list)
+      console.log(list, 'list')
+    })
+    // }
+    // else {
+    //   refreshList(dictStore.allDeptList)
+    // }
   }
   else { // 如果指定了需要展示的部门类型
     if (dictStore.companyList.length === 0) { // 如果store中未存储，从服务器上获取
@@ -159,24 +160,15 @@
 <template>
   <div style="width: 100%;">
     <el-tree-select
-      v-if="multiData"
-      v-model="value"
-      :data="deptTreeList"
-      node-key="id"
-      :filter-node-method="filterTree"
-      :props="defaultProps"
-      :expand-on-click-node="false"
-      :render-after-expand="false"
-      :size="props.size"
-      :placeholder="props.placeholder"
-      :clearable="props.clearable"
-      check-strictly
-      check-on-click-node
-      filterable
-      class="full-width-input"
-      :disabled="props.disabled"
+      v-if="multiData" v-model="value" :data="deptTreeList" node-key="id" :filter-node-method="filterTree"
+      :props="defaultProps" :expand-on-click-node="false" :render-after-expand="false" :size="props.size"
+      :placeholder="props.placeholder" :clearable="props.clearable" check-strictly check-on-click-node filterable
+      class="full-width-input" :disabled="props.disabled"
     />
-    <el-select v-else v-model="value" :placeholder="props.placeholder" :size="props.size" :disabled="props.disabled" :clearable="props.clearable" class="full-width-input">
+    <el-select
+      v-else v-model="value" :placeholder="props.placeholder" :size="props.size" :disabled="props.disabled"
+      :clearable="props.clearable" class="full-width-input"
+    >
       <el-option v-for="(item, index) in deptTreeList" :key="index" :label="item.name" :value="item.id" />
     </el-select>
   </div>
diff --git a/src/components/Echart/BarChart3D.vue b/src/components/Echart/BarChart3D.vue
index 8b8d8ea..ee7dbba 100644
--- a/src/components/Echart/BarChart3D.vue
+++ b/src/components/Echart/BarChart3D.vue
@@ -276,12 +276,12 @@
       textStyle: {
         fontSize: 16,
       },
-      axisPointer: {
-        type: 'cross',
-        label: {
-          fontSize: 13,
-        },
-      },
+      // axisPointer: {
+      //   type: 'cross',
+      //   label: {
+      //     fontSize: 13,
+      //   },
+      // },
       valueFormatter: (value: string | number) => {
         return value ? value + props.unit : value === 0 ? '0' : ''
       },
diff --git a/src/components/Echart/BarChartHorizontal.vue b/src/components/Echart/BarChartHorizontal.vue
index 6a3c107..366e064 100644
--- a/src/components/Echart/BarChartHorizontal.vue
+++ b/src/components/Echart/BarChartHorizontal.vue
@@ -265,12 +265,12 @@
       textStyle: {
         fontSize: 16,
       },
-      axisPointer: {
-        type: 'cross',
-        label: {
-          fontSize: 13,
-        },
-      },
+      // axisPointer: {
+      //   type: 'cross',
+      //   label: {
+      //     fontSize: 13,
+      //   },
+      // },
       valueFormatter: (value: string | number) => {
         return value ? value + props.unit : ''
       },
diff --git a/src/components/Echart/BarChartVertical.vue b/src/components/Echart/BarChartVertical.vue
index 7701800..8f36130 100644
--- a/src/components/Echart/BarChartVertical.vue
+++ b/src/components/Echart/BarChartVertical.vue
@@ -253,12 +253,12 @@
       textStyle: {
         fontSize: 16,
       },
-      axisPointer: {
-        type: 'cross',
-        label: {
-          fontSize: 13,
-        },
-      },
+      // axisPointer: {
+      //   type: 'cross',
+      //   label: {
+      //     fontSize: 13,
+      //   },
+      // },
       valueFormatter: (value: string | number) => {
         return value ? value + props.unit : value === 0 ? '0' : ''
       },

diff --git a/src/assets/fullscren/br-logo.png b/src/assets/fullscren/br-logo.png
new file mode 100644
index 0000000..f3db083
--- /dev/null
+++ b/src/assets/fullscren/br-logo.png
Binary files differ
diff --git a/src/assets/fullscren/br-title.png b/src/assets/fullscren/br-title.png
new file mode 100644
index 0000000..9c7237e
--- /dev/null
+++ b/src/assets/fullscren/br-title.png
Binary files differ
diff --git a/src/components/DeptSelect/index.vue b/src/components/DeptSelect/index.vue
index ef7bd91..948bd8b 100644
--- a/src/components/DeptSelect/index.vue
+++ b/src/components/DeptSelect/index.vue
@@ -68,16 +68,17 @@
 function fetchPcode() {
   // 如果未指定需要展示的部门类型，获取全部部门
   if (!props.deptType) {
-    if (dictStore.allDeptList.length === 0) { // 如果store中未存储，从服务器上获取
-      getDeptTreeList().then((res) => {
-        const list = res.data
-        dictStore.setAllDeptList(list)
-        refreshList(list)
-      })
-    }
-    else {
-      refreshList(dictStore.allDeptList)
-    }
+    // if (dictStore.allDeptList.length === 0) { // 如果store中未存储，从服务器上获取
+    getDeptTreeList().then((res) => {
+      const list = res.data.filter((item: any) => item.id !== '0')
+      dictStore.setAllDeptList(list)
+      refreshList(list)
+      console.log(list, 'list')
+    })
+    // }
+    // else {
+    //   refreshList(dictStore.allDeptList)
+    // }
   }
   else { // 如果指定了需要展示的部门类型
     if (dictStore.companyList.length === 0) { // 如果store中未存储，从服务器上获取
@@ -159,24 +160,15 @@
 <template>
   <div style="width: 100%;">
     <el-tree-select
-      v-if="multiData"
-      v-model="value"
-      :data="deptTreeList"
-      node-key="id"
-      :filter-node-method="filterTree"
-      :props="defaultProps"
-      :expand-on-click-node="false"
-      :render-after-expand="false"
-      :size="props.size"
-      :placeholder="props.placeholder"
-      :clearable="props.clearable"
-      check-strictly
-      check-on-click-node
-      filterable
-      class="full-width-input"
-      :disabled="props.disabled"
+      v-if="multiData" v-model="value" :data="deptTreeList" node-key="id" :filter-node-method="filterTree"
+      :props="defaultProps" :expand-on-click-node="false" :render-after-expand="false" :size="props.size"
+      :placeholder="props.placeholder" :clearable="props.clearable" check-strictly check-on-click-node filterable
+      class="full-width-input" :disabled="props.disabled"
     />
-    <el-select v-else v-model="value" :placeholder="props.placeholder" :size="props.size" :disabled="props.disabled" :clearable="props.clearable" class="full-width-input">
+    <el-select
+      v-else v-model="value" :placeholder="props.placeholder" :size="props.size" :disabled="props.disabled"
+      :clearable="props.clearable" class="full-width-input"
+    >
       <el-option v-for="(item, index) in deptTreeList" :key="index" :label="item.name" :value="item.id" />
     </el-select>
   </div>
diff --git a/src/components/Echart/BarChart3D.vue b/src/components/Echart/BarChart3D.vue
index 8b8d8ea..ee7dbba 100644
--- a/src/components/Echart/BarChart3D.vue
+++ b/src/components/Echart/BarChart3D.vue
@@ -276,12 +276,12 @@
       textStyle: {
         fontSize: 16,
       },
-      axisPointer: {
-        type: 'cross',
-        label: {
-          fontSize: 13,
-        },
-      },
+      // axisPointer: {
+      //   type: 'cross',
+      //   label: {
+      //     fontSize: 13,
+      //   },
+      // },
       valueFormatter: (value: string | number) => {
         return value ? value + props.unit : value === 0 ? '0' : ''
       },
diff --git a/src/components/Echart/BarChartHorizontal.vue b/src/components/Echart/BarChartHorizontal.vue
index 6a3c107..366e064 100644
--- a/src/components/Echart/BarChartHorizontal.vue
+++ b/src/components/Echart/BarChartHorizontal.vue
@@ -265,12 +265,12 @@
       textStyle: {
         fontSize: 16,
       },
-      axisPointer: {
-        type: 'cross',
-        label: {
-          fontSize: 13,
-        },
-      },
+      // axisPointer: {
+      //   type: 'cross',
+      //   label: {
+      //     fontSize: 13,
+      //   },
+      // },
       valueFormatter: (value: string | number) => {
         return value ? value + props.unit : ''
       },
diff --git a/src/components/Echart/BarChartVertical.vue b/src/components/Echart/BarChartVertical.vue
index 7701800..8f36130 100644
--- a/src/components/Echart/BarChartVertical.vue
+++ b/src/components/Echart/BarChartVertical.vue
@@ -253,12 +253,12 @@
       textStyle: {
         fontSize: 16,
       },
-      axisPointer: {
-        type: 'cross',
-        label: {
-          fontSize: 13,
-        },
-      },
+      // axisPointer: {
+      //   type: 'cross',
+      //   label: {
+      //     fontSize: 13,
+      //   },
+      // },
       valueFormatter: (value: string | number) => {
         return value ? value + props.unit : value === 0 ? '0' : ''
       },
diff --git a/src/components/Echart/LineChart.vue b/src/components/Echart/LineChart.vue
index faf6777..751133f 100644
--- a/src/components/Echart/LineChart.vue
+++ b/src/components/Echart/LineChart.vue
@@ -200,12 +200,12 @@
       textStyle: {
         fontSize: 16,
       },
-      axisPointer: {
-        type: 'cross',
-        label: {
-          fontSize: 13,
-        },
-      },
+      // axisPointer: {
+      //   type: 'cross',
+      //   label: {
+      //     fontSize: 13,
+      //   },
+      // },
       valueFormatter: (value: string | number) => {
         return value ? value + props.unit : value === 0 ? '0' : ''
       },

diff --git a/src/assets/fullscren/br-logo.png b/src/assets/fullscren/br-logo.png
new file mode 100644
index 0000000..f3db083
--- /dev/null
+++ b/src/assets/fullscren/br-logo.png
Binary files differ
diff --git a/src/assets/fullscren/br-title.png b/src/assets/fullscren/br-title.png
new file mode 100644
index 0000000..9c7237e
--- /dev/null
+++ b/src/assets/fullscren/br-title.png
Binary files differ
diff --git a/src/components/DeptSelect/index.vue b/src/components/DeptSelect/index.vue
index ef7bd91..948bd8b 100644
--- a/src/components/DeptSelect/index.vue
+++ b/src/components/DeptSelect/index.vue
@@ -68,16 +68,17 @@
 function fetchPcode() {
   // 如果未指定需要展示的部门类型，获取全部部门
   if (!props.deptType) {
-    if (dictStore.allDeptList.length === 0) { // 如果store中未存储，从服务器上获取
-      getDeptTreeList().then((res) => {
-        const list = res.data
-        dictStore.setAllDeptList(list)
-        refreshList(list)
-      })
-    }
-    else {
-      refreshList(dictStore.allDeptList)
-    }
+    // if (dictStore.allDeptList.length === 0) { // 如果store中未存储，从服务器上获取
+    getDeptTreeList().then((res) => {
+      const list = res.data.filter((item: any) => item.id !== '0')
+      dictStore.setAllDeptList(list)
+      refreshList(list)
+      console.log(list, 'list')
+    })
+    // }
+    // else {
+    //   refreshList(dictStore.allDeptList)
+    // }
   }
   else { // 如果指定了需要展示的部门类型
     if (dictStore.companyList.length === 0) { // 如果store中未存储，从服务器上获取
@@ -159,24 +160,15 @@
 <template>
   <div style="width: 100%;">
     <el-tree-select
-      v-if="multiData"
-      v-model="value"
-      :data="deptTreeList"
-      node-key="id"
-      :filter-node-method="filterTree"
-      :props="defaultProps"
-      :expand-on-click-node="false"
-      :render-after-expand="false"
-      :size="props.size"
-      :placeholder="props.placeholder"
-      :clearable="props.clearable"
-      check-strictly
-      check-on-click-node
-      filterable
-      class="full-width-input"
-      :disabled="props.disabled"
+      v-if="multiData" v-model="value" :data="deptTreeList" node-key="id" :filter-node-method="filterTree"
+      :props="defaultProps" :expand-on-click-node="false" :render-after-expand="false" :size="props.size"
+      :placeholder="props.placeholder" :clearable="props.clearable" check-strictly check-on-click-node filterable
+      class="full-width-input" :disabled="props.disabled"
     />
-    <el-select v-else v-model="value" :placeholder="props.placeholder" :size="props.size" :disabled="props.disabled" :clearable="props.clearable" class="full-width-input">
+    <el-select
+      v-else v-model="value" :placeholder="props.placeholder" :size="props.size" :disabled="props.disabled"
+      :clearable="props.clearable" class="full-width-input"
+    >
       <el-option v-for="(item, index) in deptTreeList" :key="index" :label="item.name" :value="item.id" />
     </el-select>
   </div>
diff --git a/src/components/Echart/BarChart3D.vue b/src/components/Echart/BarChart3D.vue
index 8b8d8ea..ee7dbba 100644
--- a/src/components/Echart/BarChart3D.vue
+++ b/src/components/Echart/BarChart3D.vue
@@ -276,12 +276,12 @@
       textStyle: {
         fontSize: 16,
       },
-      axisPointer: {
-        type: 'cross',
-        label: {
-          fontSize: 13,
-        },
-      },
+      // axisPointer: {
+      //   type: 'cross',
+      //   label: {
+      //     fontSize: 13,
+      //   },
+      // },
       valueFormatter: (value: string | number) => {
         return value ? value + props.unit : value === 0 ? '0' : ''
       },
diff --git a/src/components/Echart/BarChartHorizontal.vue b/src/components/Echart/BarChartHorizontal.vue
index 6a3c107..366e064 100644
--- a/src/components/Echart/BarChartHorizontal.vue
+++ b/src/components/Echart/BarChartHorizontal.vue
@@ -265,12 +265,12 @@
       textStyle: {
         fontSize: 16,
       },
-      axisPointer: {
-        type: 'cross',
-        label: {
-          fontSize: 13,
-        },
-      },
+      // axisPointer: {
+      //   type: 'cross',
+      //   label: {
+      //     fontSize: 13,
+      //   },
+      // },
       valueFormatter: (value: string | number) => {
         return value ? value + props.unit : ''
       },
diff --git a/src/components/Echart/BarChartVertical.vue b/src/components/Echart/BarChartVertical.vue
index 7701800..8f36130 100644
--- a/src/components/Echart/BarChartVertical.vue
+++ b/src/components/Echart/BarChartVertical.vue
@@ -253,12 +253,12 @@
       textStyle: {
         fontSize: 16,
       },
-      axisPointer: {
-        type: 'cross',
-        label: {
-          fontSize: 13,
-        },
-      },
+      // axisPointer: {
+      //   type: 'cross',
+      //   label: {
+      //     fontSize: 13,
+      //   },
+      // },
       valueFormatter: (value: string | number) => {
         return value ? value + props.unit : value === 0 ? '0' : ''
       },
diff --git a/src/components/Echart/LineChart.vue b/src/components/Echart/LineChart.vue
index faf6777..751133f 100644
--- a/src/components/Echart/LineChart.vue
+++ b/src/components/Echart/LineChart.vue
@@ -200,12 +200,12 @@
       textStyle: {
         fontSize: 16,
       },
-      axisPointer: {
-        type: 'cross',
-        label: {
-          fontSize: 13,
-        },
-      },
+      // axisPointer: {
+      //   type: 'cross',
+      //   label: {
+      //     fontSize: 13,
+      //   },
+      // },
       valueFormatter: (value: string | number) => {
         return value ? value + props.unit : value === 0 ? '0' : ''
       },
diff --git a/src/components/map/index offline.vue b/src/components/map/index offline.vue
index 5bf7bb9..e8c31b0 100644
--- a/src/components/map/index offline.vue
+++ b/src/components/map/index offline.vue
@@ -512,7 +512,7 @@
 <template>
   <div class="container">
     <!-- 地图 -->
-    <div id="map" ref="wrapRef " v-loading="loading" />
+    <div id="map" ref="wrapRef" v-loading="loading" />
   </div>
 </template>
 

diff --git a/src/assets/fullscren/br-logo.png b/src/assets/fullscren/br-logo.png
new file mode 100644
index 0000000..f3db083
--- /dev/null
+++ b/src/assets/fullscren/br-logo.png
Binary files differ
diff --git a/src/assets/fullscren/br-title.png b/src/assets/fullscren/br-title.png
new file mode 100644
index 0000000..9c7237e
--- /dev/null
+++ b/src/assets/fullscren/br-title.png
Binary files differ
diff --git a/src/components/DeptSelect/index.vue b/src/components/DeptSelect/index.vue
index ef7bd91..948bd8b 100644
--- a/src/components/DeptSelect/index.vue
+++ b/src/components/DeptSelect/index.vue
@@ -68,16 +68,17 @@
 function fetchPcode() {
   // 如果未指定需要展示的部门类型，获取全部部门
   if (!props.deptType) {
-    if (dictStore.allDeptList.length === 0) { // 如果store中未存储，从服务器上获取
-      getDeptTreeList().then((res) => {
-        const list = res.data
-        dictStore.setAllDeptList(list)
-        refreshList(list)
-      })
-    }
-    else {
-      refreshList(dictStore.allDeptList)
-    }
+    // if (dictStore.allDeptList.length === 0) { // 如果store中未存储，从服务器上获取
+    getDeptTreeList().then((res) => {
+      const list = res.data.filter((item: any) => item.id !== '0')
+      dictStore.setAllDeptList(list)
+      refreshList(list)
+      console.log(list, 'list')
+    })
+    // }
+    // else {
+    //   refreshList(dictStore.allDeptList)
+    // }
   }
   else { // 如果指定了需要展示的部门类型
     if (dictStore.companyList.length === 0) { // 如果store中未存储，从服务器上获取
@@ -159,24 +160,15 @@
 <template>
   <div style="width: 100%;">
     <el-tree-select
-      v-if="multiData"
-      v-model="value"
-      :data="deptTreeList"
-      node-key="id"
-      :filter-node-method="filterTree"
-      :props="defaultProps"
-      :expand-on-click-node="false"
-      :render-after-expand="false"
-      :size="props.size"
-      :placeholder="props.placeholder"
-      :clearable="props.clearable"
-      check-strictly
-      check-on-click-node
-      filterable
-      class="full-width-input"
-      :disabled="props.disabled"
+      v-if="multiData" v-model="value" :data="deptTreeList" node-key="id" :filter-node-method="filterTree"
+      :props="defaultProps" :expand-on-click-node="false" :render-after-expand="false" :size="props.size"
+      :placeholder="props.placeholder" :clearable="props.clearable" check-strictly check-on-click-node filterable
+      class="full-width-input" :disabled="props.disabled"
     />
-    <el-select v-else v-model="value" :placeholder="props.placeholder" :size="props.size" :disabled="props.disabled" :clearable="props.clearable" class="full-width-input">
+    <el-select
+      v-else v-model="value" :placeholder="props.placeholder" :size="props.size" :disabled="props.disabled"
+      :clearable="props.clearable" class="full-width-input"
+    >
       <el-option v-for="(item, index) in deptTreeList" :key="index" :label="item.name" :value="item.id" />
     </el-select>
   </div>
diff --git a/src/components/Echart/BarChart3D.vue b/src/components/Echart/BarChart3D.vue
index 8b8d8ea..ee7dbba 100644
--- a/src/components/Echart/BarChart3D.vue
+++ b/src/components/Echart/BarChart3D.vue
@@ -276,12 +276,12 @@
       textStyle: {
         fontSize: 16,
       },
-      axisPointer: {
-        type: 'cross',
-        label: {
-          fontSize: 13,
-        },
-      },
+      // axisPointer: {
+      //   type: 'cross',
+      //   label: {
+      //     fontSize: 13,
+      //   },
+      // },
       valueFormatter: (value: string | number) => {
         return value ? value + props.unit : value === 0 ? '0' : ''
       },
diff --git a/src/components/Echart/BarChartHorizontal.vue b/src/components/Echart/BarChartHorizontal.vue
index 6a3c107..366e064 100644
--- a/src/components/Echart/BarChartHorizontal.vue
+++ b/src/components/Echart/BarChartHorizontal.vue
@@ -265,12 +265,12 @@
       textStyle: {
         fontSize: 16,
       },
-      axisPointer: {
-        type: 'cross',
-        label: {
-          fontSize: 13,
-        },
-      },
+      // axisPointer: {
+      //   type: 'cross',
+      //   label: {
+      //     fontSize: 13,
+      //   },
+      // },
       valueFormatter: (value: string | number) => {
         return value ? value + props.unit : ''
       },
diff --git a/src/components/Echart/BarChartVertical.vue b/src/components/Echart/BarChartVertical.vue
index 7701800..8f36130 100644
--- a/src/components/Echart/BarChartVertical.vue
+++ b/src/components/Echart/BarChartVertical.vue
@@ -253,12 +253,12 @@
       textStyle: {
         fontSize: 16,
       },
-      axisPointer: {
-        type: 'cross',
-        label: {
-          fontSize: 13,
-        },
-      },
+      // axisPointer: {
+      //   type: 'cross',
+      //   label: {
+      //     fontSize: 13,
+      //   },
+      // },
       valueFormatter: (value: string | number) => {
         return value ? value + props.unit : value === 0 ? '0' : ''
       },
diff --git a/src/components/Echart/LineChart.vue b/src/components/Echart/LineChart.vue
index faf6777..751133f 100644
--- a/src/components/Echart/LineChart.vue
+++ b/src/components/Echart/LineChart.vue
@@ -200,12 +200,12 @@
       textStyle: {
         fontSize: 16,
       },
-      axisPointer: {
-        type: 'cross',
-        label: {
-          fontSize: 13,
-        },
-      },
+      // axisPointer: {
+      //   type: 'cross',
+      //   label: {
+      //     fontSize: 13,
+      //   },
+      // },
       valueFormatter: (value: string | number) => {
         return value ? value + props.unit : value === 0 ? '0' : ''
       },
diff --git a/src/components/map/index offline.vue b/src/components/map/index offline.vue
index 5bf7bb9..e8c31b0 100644
--- a/src/components/map/index offline.vue
+++ b/src/components/map/index offline.vue
@@ -512,7 +512,7 @@
 <template>
   <div class="container">
     <!-- 地图 -->
-    <div id="map" ref="wrapRef " v-loading="loading" />
+    <div id="map" ref="wrapRef" v-loading="loading" />
   </div>
 </template>
 
diff --git a/src/layouts/components/Tools/alarmList.vue b/src/layouts/components/Tools/alarmList.vue
index 425ec3d..1274d52 100644
--- a/src/layouts/components/Tools/alarmList.vue
+++ b/src/layouts/components/Tools/alarmList.vue
@@ -151,7 +151,7 @@
       <template v-else>
         <div v-for="message of messageList" :key="message.id" class="message-item">
           <div class="message-content" @click="detailRow(message)">
-            <div class="title">
+            <div class="title" :title="`${message.alarmMsg}${message.alarmTime}`">
               <div class="container">
                 <div
                   :class="`mar circle circle-${message.alarmLevelName.includes('一级') ? '1' : message.alarmLevelName.includes('二级') ? '2' : message.alarmLevelName.includes('三级') ? '3' : 'other'}`"

diff --git a/src/assets/fullscren/br-logo.png b/src/assets/fullscren/br-logo.png
new file mode 100644
index 0000000..f3db083
--- /dev/null
+++ b/src/assets/fullscren/br-logo.png
Binary files differ
diff --git a/src/assets/fullscren/br-title.png b/src/assets/fullscren/br-title.png
new file mode 100644
index 0000000..9c7237e
--- /dev/null
+++ b/src/assets/fullscren/br-title.png
Binary files differ
diff --git a/src/components/DeptSelect/index.vue b/src/components/DeptSelect/index.vue
index ef7bd91..948bd8b 100644
--- a/src/components/DeptSelect/index.vue
+++ b/src/components/DeptSelect/index.vue
@@ -68,16 +68,17 @@
 function fetchPcode() {
   // 如果未指定需要展示的部门类型，获取全部部门
   if (!props.deptType) {
-    if (dictStore.allDeptList.length === 0) { // 如果store中未存储，从服务器上获取
-      getDeptTreeList().then((res) => {
-        const list = res.data
-        dictStore.setAllDeptList(list)
-        refreshList(list)
-      })
-    }
-    else {
-      refreshList(dictStore.allDeptList)
-    }
+    // if (dictStore.allDeptList.length === 0) { // 如果store中未存储，从服务器上获取
+    getDeptTreeList().then((res) => {
+      const list = res.data.filter((item: any) => item.id !== '0')
+      dictStore.setAllDeptList(list)
+      refreshList(list)
+      console.log(list, 'list')
+    })
+    // }
+    // else {
+    //   refreshList(dictStore.allDeptList)
+    // }
   }
   else { // 如果指定了需要展示的部门类型
     if (dictStore.companyList.length === 0) { // 如果store中未存储，从服务器上获取
@@ -159,24 +160,15 @@
 <template>
   <div style="width: 100%;">
     <el-tree-select
-      v-if="multiData"
-      v-model="value"
-      :data="deptTreeList"
-      node-key="id"
-      :filter-node-method="filterTree"
-      :props="defaultProps"
-      :expand-on-click-node="false"
-      :render-after-expand="false"
-      :size="props.size"
-      :placeholder="props.placeholder"
-      :clearable="props.clearable"
-      check-strictly
-      check-on-click-node
-      filterable
-      class="full-width-input"
-      :disabled="props.disabled"
+      v-if="multiData" v-model="value" :data="deptTreeList" node-key="id" :filter-node-method="filterTree"
+      :props="defaultProps" :expand-on-click-node="false" :render-after-expand="false" :size="props.size"
+      :placeholder="props.placeholder" :clearable="props.clearable" check-strictly check-on-click-node filterable
+      class="full-width-input" :disabled="props.disabled"
     />
-    <el-select v-else v-model="value" :placeholder="props.placeholder" :size="props.size" :disabled="props.disabled" :clearable="props.clearable" class="full-width-input">
+    <el-select
+      v-else v-model="value" :placeholder="props.placeholder" :size="props.size" :disabled="props.disabled"
+      :clearable="props.clearable" class="full-width-input"
+    >
       <el-option v-for="(item, index) in deptTreeList" :key="index" :label="item.name" :value="item.id" />
     </el-select>
   </div>
diff --git a/src/components/Echart/BarChart3D.vue b/src/components/Echart/BarChart3D.vue
index 8b8d8ea..ee7dbba 100644
--- a/src/components/Echart/BarChart3D.vue
+++ b/src/components/Echart/BarChart3D.vue
@@ -276,12 +276,12 @@
       textStyle: {
         fontSize: 16,
       },
-      axisPointer: {
-        type: 'cross',
-        label: {
-          fontSize: 13,
-        },
-      },
+      // axisPointer: {
+      //   type: 'cross',
+      //   label: {
+      //     fontSize: 13,
+      //   },
+      // },
       valueFormatter: (value: string | number) => {
         return value ? value + props.unit : value === 0 ? '0' : ''
       },
diff --git a/src/components/Echart/BarChartHorizontal.vue b/src/components/Echart/BarChartHorizontal.vue
index 6a3c107..366e064 100644
--- a/src/components/Echart/BarChartHorizontal.vue
+++ b/src/components/Echart/BarChartHorizontal.vue
@@ -265,12 +265,12 @@
       textStyle: {
         fontSize: 16,
       },
-      axisPointer: {
-        type: 'cross',
-        label: {
-          fontSize: 13,
-        },
-      },
+      // axisPointer: {
+      //   type: 'cross',
+      //   label: {
+      //     fontSize: 13,
+      //   },
+      // },
       valueFormatter: (value: string | number) => {
         return value ? value + props.unit : ''
       },
diff --git a/src/components/Echart/BarChartVertical.vue b/src/components/Echart/BarChartVertical.vue
index 7701800..8f36130 100644
--- a/src/components/Echart/BarChartVertical.vue
+++ b/src/components/Echart/BarChartVertical.vue
@@ -253,12 +253,12 @@
       textStyle: {
         fontSize: 16,
       },
-      axisPointer: {
-        type: 'cross',
-        label: {
-          fontSize: 13,
-        },
-      },
+      // axisPointer: {
+      //   type: 'cross',
+      //   label: {
+      //     fontSize: 13,
+      //   },
+      // },
       valueFormatter: (value: string | number) => {
         return value ? value + props.unit : value === 0 ? '0' : ''
       },
diff --git a/src/components/Echart/LineChart.vue b/src/components/Echart/LineChart.vue
index faf6777..751133f 100644
--- a/src/components/Echart/LineChart.vue
+++ b/src/components/Echart/LineChart.vue
@@ -200,12 +200,12 @@
       textStyle: {
         fontSize: 16,
       },
-      axisPointer: {
-        type: 'cross',
-        label: {
-          fontSize: 13,
-        },
-      },
+      // axisPointer: {
+      //   type: 'cross',
+      //   label: {
+      //     fontSize: 13,
+      //   },
+      // },
       valueFormatter: (value: string | number) => {
         return value ? value + props.unit : value === 0 ? '0' : ''
       },
diff --git a/src/components/map/index offline.vue b/src/components/map/index offline.vue
index 5bf7bb9..e8c31b0 100644
--- a/src/components/map/index offline.vue
+++ b/src/components/map/index offline.vue
@@ -512,7 +512,7 @@
 <template>
   <div class="container">
     <!-- 地图 -->
-    <div id="map" ref="wrapRef " v-loading="loading" />
+    <div id="map" ref="wrapRef" v-loading="loading" />
   </div>
 </template>
 
diff --git a/src/layouts/components/Tools/alarmList.vue b/src/layouts/components/Tools/alarmList.vue
index 425ec3d..1274d52 100644
--- a/src/layouts/components/Tools/alarmList.vue
+++ b/src/layouts/components/Tools/alarmList.vue
@@ -151,7 +151,7 @@
       <template v-else>
         <div v-for="message of messageList" :key="message.id" class="message-item">
           <div class="message-content" @click="detailRow(message)">
-            <div class="title">
+            <div class="title" :title="`${message.alarmMsg}${message.alarmTime}`">
               <div class="container">
                 <div
                   :class="`mar circle circle-${message.alarmLevelName.includes('一级') ? '1' : message.alarmLevelName.includes('二级') ? '2' : message.alarmLevelName.includes('三级') ? '3' : 'other'}`"
diff --git a/src/views/home/dashboard/components/controlMap.vue b/src/views/home/dashboard/components/controlMap.vue
index e1d0651..388cec5 100644
--- a/src/views/home/dashboard/components/controlMap.vue
+++ b/src/views/home/dashboard/components/controlMap.vue
@@ -326,6 +326,7 @@
   setTimeout(() => {
     ele.setAttribute('style', 'font-size: 16px')
   }, 50)
+  detailRef.value.close()
 }
 const publicPath = window.location.href.split('#')[0]
 watch(() => showStatus.value, (newVal) => {

diff --git a/src/assets/fullscren/br-logo.png b/src/assets/fullscren/br-logo.png
new file mode 100644
index 0000000..f3db083
--- /dev/null
+++ b/src/assets/fullscren/br-logo.png
Binary files differ
diff --git a/src/assets/fullscren/br-title.png b/src/assets/fullscren/br-title.png
new file mode 100644
index 0000000..9c7237e
--- /dev/null
+++ b/src/assets/fullscren/br-title.png
Binary files differ
diff --git a/src/components/DeptSelect/index.vue b/src/components/DeptSelect/index.vue
index ef7bd91..948bd8b 100644
--- a/src/components/DeptSelect/index.vue
+++ b/src/components/DeptSelect/index.vue
@@ -68,16 +68,17 @@
 function fetchPcode() {
   // 如果未指定需要展示的部门类型，获取全部部门
   if (!props.deptType) {
-    if (dictStore.allDeptList.length === 0) { // 如果store中未存储，从服务器上获取
-      getDeptTreeList().then((res) => {
-        const list = res.data
-        dictStore.setAllDeptList(list)
-        refreshList(list)
-      })
-    }
-    else {
-      refreshList(dictStore.allDeptList)
-    }
+    // if (dictStore.allDeptList.length === 0) { // 如果store中未存储，从服务器上获取
+    getDeptTreeList().then((res) => {
+      const list = res.data.filter((item: any) => item.id !== '0')
+      dictStore.setAllDeptList(list)
+      refreshList(list)
+      console.log(list, 'list')
+    })
+    // }
+    // else {
+    //   refreshList(dictStore.allDeptList)
+    // }
   }
   else { // 如果指定了需要展示的部门类型
     if (dictStore.companyList.length === 0) { // 如果store中未存储，从服务器上获取
@@ -159,24 +160,15 @@
 <template>
   <div style="width: 100%;">
     <el-tree-select
-      v-if="multiData"
-      v-model="value"
-      :data="deptTreeList"
-      node-key="id"
-      :filter-node-method="filterTree"
-      :props="defaultProps"
-      :expand-on-click-node="false"
-      :render-after-expand="false"
-      :size="props.size"
-      :placeholder="props.placeholder"
-      :clearable="props.clearable"
-      check-strictly
-      check-on-click-node
-      filterable
-      class="full-width-input"
-      :disabled="props.disabled"
+      v-if="multiData" v-model="value" :data="deptTreeList" node-key="id" :filter-node-method="filterTree"
+      :props="defaultProps" :expand-on-click-node="false" :render-after-expand="false" :size="props.size"
+      :placeholder="props.placeholder" :clearable="props.clearable" check-strictly check-on-click-node filterable
+      class="full-width-input" :disabled="props.disabled"
     />
-    <el-select v-else v-model="value" :placeholder="props.placeholder" :size="props.size" :disabled="props.disabled" :clearable="props.clearable" class="full-width-input">
+    <el-select
+      v-else v-model="value" :placeholder="props.placeholder" :size="props.size" :disabled="props.disabled"
+      :clearable="props.clearable" class="full-width-input"
+    >
       <el-option v-for="(item, index) in deptTreeList" :key="index" :label="item.name" :value="item.id" />
     </el-select>
   </div>
diff --git a/src/components/Echart/BarChart3D.vue b/src/components/Echart/BarChart3D.vue
index 8b8d8ea..ee7dbba 100644
--- a/src/components/Echart/BarChart3D.vue
+++ b/src/components/Echart/BarChart3D.vue
@@ -276,12 +276,12 @@
       textStyle: {
         fontSize: 16,
       },
-      axisPointer: {
-        type: 'cross',
-        label: {
-          fontSize: 13,
-        },
-      },
+      // axisPointer: {
+      //   type: 'cross',
+      //   label: {
+      //     fontSize: 13,
+      //   },
+      // },
       valueFormatter: (value: string | number) => {
         return value ? value + props.unit : value === 0 ? '0' : ''
       },
diff --git a/src/components/Echart/BarChartHorizontal.vue b/src/components/Echart/BarChartHorizontal.vue
index 6a3c107..366e064 100644
--- a/src/components/Echart/BarChartHorizontal.vue
+++ b/src/components/Echart/BarChartHorizontal.vue
@@ -265,12 +265,12 @@
       textStyle: {
         fontSize: 16,
       },
-      axisPointer: {
-        type: 'cross',
-        label: {
-          fontSize: 13,
-        },
-      },
+      // axisPointer: {
+      //   type: 'cross',
+      //   label: {
+      //     fontSize: 13,
+      //   },
+      // },
       valueFormatter: (value: string | number) => {
         return value ? value + props.unit : ''
       },
diff --git a/src/components/Echart/BarChartVertical.vue b/src/components/Echart/BarChartVertical.vue
index 7701800..8f36130 100644
--- a/src/components/Echart/BarChartVertical.vue
+++ b/src/components/Echart/BarChartVertical.vue
@@ -253,12 +253,12 @@
       textStyle: {
         fontSize: 16,
       },
-      axisPointer: {
-        type: 'cross',
-        label: {
-          fontSize: 13,
-        },
-      },
+      // axisPointer: {
+      //   type: 'cross',
+      //   label: {
+      //     fontSize: 13,
+      //   },
+      // },
       valueFormatter: (value: string | number) => {
         return value ? value + props.unit : value === 0 ? '0' : ''
       },
diff --git a/src/components/Echart/LineChart.vue b/src/components/Echart/LineChart.vue
index faf6777..751133f 100644
--- a/src/components/Echart/LineChart.vue
+++ b/src/components/Echart/LineChart.vue
@@ -200,12 +200,12 @@
       textStyle: {
         fontSize: 16,
       },
-      axisPointer: {
-        type: 'cross',
-        label: {
-          fontSize: 13,
-        },
-      },
+      // axisPointer: {
+      //   type: 'cross',
+      //   label: {
+      //     fontSize: 13,
+      //   },
+      // },
       valueFormatter: (value: string | number) => {
         return value ? value + props.unit : value === 0 ? '0' : ''
       },
diff --git a/src/components/map/index offline.vue b/src/components/map/index offline.vue
index 5bf7bb9..e8c31b0 100644
--- a/src/components/map/index offline.vue
+++ b/src/components/map/index offline.vue
@@ -512,7 +512,7 @@
 <template>
   <div class="container">
     <!-- 地图 -->
-    <div id="map" ref="wrapRef " v-loading="loading" />
+    <div id="map" ref="wrapRef" v-loading="loading" />
   </div>
 </template>
 
diff --git a/src/layouts/components/Tools/alarmList.vue b/src/layouts/components/Tools/alarmList.vue
index 425ec3d..1274d52 100644
--- a/src/layouts/components/Tools/alarmList.vue
+++ b/src/layouts/components/Tools/alarmList.vue
@@ -151,7 +151,7 @@
       <template v-else>
         <div v-for="message of messageList" :key="message.id" class="message-item">
           <div class="message-content" @click="detailRow(message)">
-            <div class="title">
+            <div class="title" :title="`${message.alarmMsg}${message.alarmTime}`">
               <div class="container">
                 <div
                   :class="`mar circle circle-${message.alarmLevelName.includes('一级') ? '1' : message.alarmLevelName.includes('二级') ? '2' : message.alarmLevelName.includes('三级') ? '3' : 'other'}`"
diff --git a/src/views/home/dashboard/components/controlMap.vue b/src/views/home/dashboard/components/controlMap.vue
index e1d0651..388cec5 100644
--- a/src/views/home/dashboard/components/controlMap.vue
+++ b/src/views/home/dashboard/components/controlMap.vue
@@ -326,6 +326,7 @@
   setTimeout(() => {
     ele.setAttribute('style', 'font-size: 16px')
   }, 50)
+  detailRef.value.close()
 }
 const publicPath = window.location.href.split('#')[0]
 watch(() => showStatus.value, (newVal) => {
diff --git a/src/views/home/dashboard/components/demonstration.vue b/src/views/home/dashboard/components/demonstration.vue
index 4677f14..f9c4f14 100644
--- a/src/views/home/dashboard/components/demonstration.vue
+++ b/src/views/home/dashboard/components/demonstration.vue
@@ -30,31 +30,71 @@
     <div class="district-header">
       {{ $props.data.name }}
     </div>
+    <div class="content">
+      <div class="name">
+        设备类型:
+      </div>
+      <div class="value">
+        {{ $props.data.type }}
+      </div>
+    </div>
+    <div class="content">
+      <div class="name">
+        设备编号:
+      </div>
+      <div class="value">
+        {{ }}
+      </div>
+    </div>
+    <div class="content">
+      <div class="name">
+        厂商:
+      </div>
+      <div class="value">
+        北京无线电计量测试研究所
+      </div>
+    </div>
+    <div class="content">
+      <div class="name">
+        负责人:
+      </div>
+      <div class="value">
+        {{ }}
+      </div>
+    </div>
+    <div class="content">
+      <div class="name">
+        联系方式:
+      </div>
+      <div class="value" />
+    </div>
+    <div class="content">
+      <div class="name">
+        管理单位:
+      </div>
+      <div class="value">
+        第一分公司
+      </div>
+    </div>
+    <div class="content">
+      <div class="name">
+        详细位置:
+      </div>
+      <div class="value" />
+    </div>
     <!-- <div class="content">
-      <div class="name">面积:</div>
-      <div class="value">{{ $props.data.area }}平方公里</div>
-    </div>
-    <div class="content">
-      <div class="name">管理公司:</div>
-      <div class="value">{{ $props.data.deptName }}</div>
-    </div>
-    <div class="content">
-      <div class="name">管线长度:</div>
-      <div class="value">{{ $props.data.long }}公里</div>
-    </div>
-    <div class="content">
       <div class="name">调压站:</div>
       <div class="value">{{ $props.data.tyz }}座</div>
-    </div>
-    <div class="content">
+    </div> -->
+    <!-- <div class="content">
       <div class="name">调压箱:</div>
       <div class="value"> {{ $props.data.tyx }}座</div>
-    </div>
-    <div class="content">
+    </div> -->
+    <!-- <div class="content">
       <div class="name">闸井:</div>
       <div class="value">{{ $props.data.well }}个</div>
-    </div>
-    <div class="content">
+    </div> -->
+    <!-- <div class="content">
       <div class="name">监控覆盖率:</div>
       <div class="value">{{ $props.data.rate }}%</div>
     </div> -->

diff --git a/src/assets/fullscren/br-logo.png b/src/assets/fullscren/br-logo.png
new file mode 100644
index 0000000..f3db083
--- /dev/null
+++ b/src/assets/fullscren/br-logo.png
Binary files differ
diff --git a/src/assets/fullscren/br-title.png b/src/assets/fullscren/br-title.png
new file mode 100644
index 0000000..9c7237e
--- /dev/null
+++ b/src/assets/fullscren/br-title.png
Binary files differ
diff --git a/src/components/DeptSelect/index.vue b/src/components/DeptSelect/index.vue
index ef7bd91..948bd8b 100644
--- a/src/components/DeptSelect/index.vue
+++ b/src/components/DeptSelect/index.vue
@@ -68,16 +68,17 @@
 function fetchPcode() {
   // 如果未指定需要展示的部门类型，获取全部部门
   if (!props.deptType) {
-    if (dictStore.allDeptList.length === 0) { // 如果store中未存储，从服务器上获取
-      getDeptTreeList().then((res) => {
-        const list = res.data
-        dictStore.setAllDeptList(list)
-        refreshList(list)
-      })
-    }
-    else {
-      refreshList(dictStore.allDeptList)
-    }
+    // if (dictStore.allDeptList.length === 0) { // 如果store中未存储，从服务器上获取
+    getDeptTreeList().then((res) => {
+      const list = res.data.filter((item: any) => item.id !== '0')
+      dictStore.setAllDeptList(list)
+      refreshList(list)
+      console.log(list, 'list')
+    })
+    // }
+    // else {
+    //   refreshList(dictStore.allDeptList)
+    // }
   }
   else { // 如果指定了需要展示的部门类型
     if (dictStore.companyList.length === 0) { // 如果store中未存储，从服务器上获取
@@ -159,24 +160,15 @@
 <template>
   <div style="width: 100%;">
     <el-tree-select
-      v-if="multiData"
-      v-model="value"
-      :data="deptTreeList"
-      node-key="id"
-      :filter-node-method="filterTree"
-      :props="defaultProps"
-      :expand-on-click-node="false"
-      :render-after-expand="false"
-      :size="props.size"
-      :placeholder="props.placeholder"
-      :clearable="props.clearable"
-      check-strictly
-      check-on-click-node
-      filterable
-      class="full-width-input"
-      :disabled="props.disabled"
+      v-if="multiData" v-model="value" :data="deptTreeList" node-key="id" :filter-node-method="filterTree"
+      :props="defaultProps" :expand-on-click-node="false" :render-after-expand="false" :size="props.size"
+      :placeholder="props.placeholder" :clearable="props.clearable" check-strictly check-on-click-node filterable
+      class="full-width-input" :disabled="props.disabled"
     />
-    <el-select v-else v-model="value" :placeholder="props.placeholder" :size="props.size" :disabled="props.disabled" :clearable="props.clearable" class="full-width-input">
+    <el-select
+      v-else v-model="value" :placeholder="props.placeholder" :size="props.size" :disabled="props.disabled"
+      :clearable="props.clearable" class="full-width-input"
+    >
       <el-option v-for="(item, index) in deptTreeList" :key="index" :label="item.name" :value="item.id" />
     </el-select>
   </div>
diff --git a/src/components/Echart/BarChart3D.vue b/src/components/Echart/BarChart3D.vue
index 8b8d8ea..ee7dbba 100644
--- a/src/components/Echart/BarChart3D.vue
+++ b/src/components/Echart/BarChart3D.vue
@@ -276,12 +276,12 @@
       textStyle: {
         fontSize: 16,
       },
-      axisPointer: {
-        type: 'cross',
-        label: {
-          fontSize: 13,
-        },
-      },
+      // axisPointer: {
+      //   type: 'cross',
+      //   label: {
+      //     fontSize: 13,
+      //   },
+      // },
       valueFormatter: (value: string | number) => {
         return value ? value + props.unit : value === 0 ? '0' : ''
       },
diff --git a/src/components/Echart/BarChartHorizontal.vue b/src/components/Echart/BarChartHorizontal.vue
index 6a3c107..366e064 100644
--- a/src/components/Echart/BarChartHorizontal.vue
+++ b/src/components/Echart/BarChartHorizontal.vue
@@ -265,12 +265,12 @@
       textStyle: {
         fontSize: 16,
       },
-      axisPointer: {
-        type: 'cross',
-        label: {
-          fontSize: 13,
-        },
-      },
+      // axisPointer: {
+      //   type: 'cross',
+      //   label: {
+      //     fontSize: 13,
+      //   },
+      // },
       valueFormatter: (value: string | number) => {
         return value ? value + props.unit : ''
       },
diff --git a/src/components/Echart/BarChartVertical.vue b/src/components/Echart/BarChartVertical.vue
index 7701800..8f36130 100644
--- a/src/components/Echart/BarChartVertical.vue
+++ b/src/components/Echart/BarChartVertical.vue
@@ -253,12 +253,12 @@
       textStyle: {
         fontSize: 16,
       },
-      axisPointer: {
-        type: 'cross',
-        label: {
-          fontSize: 13,
-        },
-      },
+      // axisPointer: {
+      //   type: 'cross',
+      //   label: {
+      //     fontSize: 13,
+      //   },
+      // },
       valueFormatter: (value: string | number) => {
         return value ? value + props.unit : value === 0 ? '0' : ''
       },
diff --git a/src/components/Echart/LineChart.vue b/src/components/Echart/LineChart.vue
index faf6777..751133f 100644
--- a/src/components/Echart/LineChart.vue
+++ b/src/components/Echart/LineChart.vue
@@ -200,12 +200,12 @@
       textStyle: {
         fontSize: 16,
       },
-      axisPointer: {
-        type: 'cross',
-        label: {
-          fontSize: 13,
-        },
-      },
+      // axisPointer: {
+      //   type: 'cross',
+      //   label: {
+      //     fontSize: 13,
+      //   },
+      // },
       valueFormatter: (value: string | number) => {
         return value ? value + props.unit : value === 0 ? '0' : ''
       },
diff --git a/src/components/map/index offline.vue b/src/components/map/index offline.vue
index 5bf7bb9..e8c31b0 100644
--- a/src/components/map/index offline.vue
+++ b/src/components/map/index offline.vue
@@ -512,7 +512,7 @@
 <template>
   <div class="container">
     <!-- 地图 -->
-    <div id="map" ref="wrapRef " v-loading="loading" />
+    <div id="map" ref="wrapRef" v-loading="loading" />
   </div>
 </template>
 
diff --git a/src/layouts/components/Tools/alarmList.vue b/src/layouts/components/Tools/alarmList.vue
index 425ec3d..1274d52 100644
--- a/src/layouts/components/Tools/alarmList.vue
+++ b/src/layouts/components/Tools/alarmList.vue
@@ -151,7 +151,7 @@
       <template v-else>
         <div v-for="message of messageList" :key="message.id" class="message-item">
           <div class="message-content" @click="detailRow(message)">
-            <div class="title">
+            <div class="title" :title="`${message.alarmMsg}${message.alarmTime}`">
               <div class="container">
                 <div
                   :class="`mar circle circle-${message.alarmLevelName.includes('一级') ? '1' : message.alarmLevelName.includes('二级') ? '2' : message.alarmLevelName.includes('三级') ? '3' : 'other'}`"
diff --git a/src/views/home/dashboard/components/controlMap.vue b/src/views/home/dashboard/components/controlMap.vue
index e1d0651..388cec5 100644
--- a/src/views/home/dashboard/components/controlMap.vue
+++ b/src/views/home/dashboard/components/controlMap.vue
@@ -326,6 +326,7 @@
   setTimeout(() => {
     ele.setAttribute('style', 'font-size: 16px')
   }, 50)
+  detailRef.value.close()
 }
 const publicPath = window.location.href.split('#')[0]
 watch(() => showStatus.value, (newVal) => {
diff --git a/src/views/home/dashboard/components/demonstration.vue b/src/views/home/dashboard/components/demonstration.vue
index 4677f14..f9c4f14 100644
--- a/src/views/home/dashboard/components/demonstration.vue
+++ b/src/views/home/dashboard/components/demonstration.vue
@@ -30,31 +30,71 @@
     <div class="district-header">
       {{ $props.data.name }}
     </div>
+    <div class="content">
+      <div class="name">
+        设备类型:
+      </div>
+      <div class="value">
+        {{ $props.data.type }}
+      </div>
+    </div>
+    <div class="content">
+      <div class="name">
+        设备编号:
+      </div>
+      <div class="value">
+        {{ }}
+      </div>
+    </div>
+    <div class="content">
+      <div class="name">
+        厂商:
+      </div>
+      <div class="value">
+        北京无线电计量测试研究所
+      </div>
+    </div>
+    <div class="content">
+      <div class="name">
+        负责人:
+      </div>
+      <div class="value">
+        {{ }}
+      </div>
+    </div>
+    <div class="content">
+      <div class="name">
+        联系方式:
+      </div>
+      <div class="value" />
+    </div>
+    <div class="content">
+      <div class="name">
+        管理单位:
+      </div>
+      <div class="value">
+        第一分公司
+      </div>
+    </div>
+    <div class="content">
+      <div class="name">
+        详细位置:
+      </div>
+      <div class="value" />
+    </div>
     <!-- <div class="content">
-      <div class="name">面积:</div>
-      <div class="value">{{ $props.data.area }}平方公里</div>
-    </div>
-    <div class="content">
-      <div class="name">管理公司:</div>
-      <div class="value">{{ $props.data.deptName }}</div>
-    </div>
-    <div class="content">
-      <div class="name">管线长度:</div>
-      <div class="value">{{ $props.data.long }}公里</div>
-    </div>
-    <div class="content">
       <div class="name">调压站:</div>
       <div class="value">{{ $props.data.tyz }}座</div>
-    </div>
-    <div class="content">
+    </div> -->
+    <!-- <div class="content">
       <div class="name">调压箱:</div>
       <div class="value"> {{ $props.data.tyx }}座</div>
-    </div>
-    <div class="content">
+    </div> -->
+    <!-- <div class="content">
       <div class="name">闸井:</div>
       <div class="value">{{ $props.data.well }}个</div>
-    </div>
-    <div class="content">
+    </div> -->
+    <!-- <div class="content">
       <div class="name">监控覆盖率:</div>
       <div class="value">{{ $props.data.rate }}%</div>
     </div> -->
diff --git a/src/views/home/dashboard/components/detailInfoDialog.vue b/src/views/home/dashboard/components/detailInfoDialog.vue
index 1aad185..351fbf9 100644
--- a/src/views/home/dashboard/components/detailInfoDialog.vue
+++ b/src/views/home/dashboard/components/detailInfoDialog.vue
@@ -28,11 +28,13 @@
   }
   dialogFormVisible.value = true
 }
-defineExpose({ initDialog })
+
 // 关闭
 const close = () => {
   infoWindow.value.close()
 }
+
+defineExpose({ initDialog, close })
 </script>
 
 <template>

diff --git a/src/assets/fullscren/br-logo.png b/src/assets/fullscren/br-logo.png
new file mode 100644
index 0000000..f3db083
--- /dev/null
+++ b/src/assets/fullscren/br-logo.png
Binary files differ
diff --git a/src/assets/fullscren/br-title.png b/src/assets/fullscren/br-title.png
new file mode 100644
index 0000000..9c7237e
--- /dev/null
+++ b/src/assets/fullscren/br-title.png
Binary files differ
diff --git a/src/components/DeptSelect/index.vue b/src/components/DeptSelect/index.vue
index ef7bd91..948bd8b 100644
--- a/src/components/DeptSelect/index.vue
+++ b/src/components/DeptSelect/index.vue
@@ -68,16 +68,17 @@
 function fetchPcode() {
   // 如果未指定需要展示的部门类型，获取全部部门
   if (!props.deptType) {
-    if (dictStore.allDeptList.length === 0) { // 如果store中未存储，从服务器上获取
-      getDeptTreeList().then((res) => {
-        const list = res.data
-        dictStore.setAllDeptList(list)
-        refreshList(list)
-      })
-    }
-    else {
-      refreshList(dictStore.allDeptList)
-    }
+    // if (dictStore.allDeptList.length === 0) { // 如果store中未存储，从服务器上获取
+    getDeptTreeList().then((res) => {
+      const list = res.data.filter((item: any) => item.id !== '0')
+      dictStore.setAllDeptList(list)
+      refreshList(list)
+      console.log(list, 'list')
+    })
+    // }
+    // else {
+    //   refreshList(dictStore.allDeptList)
+    // }
   }
   else { // 如果指定了需要展示的部门类型
     if (dictStore.companyList.length === 0) { // 如果store中未存储，从服务器上获取
@@ -159,24 +160,15 @@
 <template>
   <div style="width: 100%;">
     <el-tree-select
-      v-if="multiData"
-      v-model="value"
-      :data="deptTreeList"
-      node-key="id"
-      :filter-node-method="filterTree"
-      :props="defaultProps"
-      :expand-on-click-node="false"
-      :render-after-expand="false"
-      :size="props.size"
-      :placeholder="props.placeholder"
-      :clearable="props.clearable"
-      check-strictly
-      check-on-click-node
-      filterable
-      class="full-width-input"
-      :disabled="props.disabled"
+      v-if="multiData" v-model="value" :data="deptTreeList" node-key="id" :filter-node-method="filterTree"
+      :props="defaultProps" :expand-on-click-node="false" :render-after-expand="false" :size="props.size"
+      :placeholder="props.placeholder" :clearable="props.clearable" check-strictly check-on-click-node filterable
+      class="full-width-input" :disabled="props.disabled"
     />
-    <el-select v-else v-model="value" :placeholder="props.placeholder" :size="props.size" :disabled="props.disabled" :clearable="props.clearable" class="full-width-input">
+    <el-select
+      v-else v-model="value" :placeholder="props.placeholder" :size="props.size" :disabled="props.disabled"
+      :clearable="props.clearable" class="full-width-input"
+    >
       <el-option v-for="(item, index) in deptTreeList" :key="index" :label="item.name" :value="item.id" />
     </el-select>
   </div>
diff --git a/src/components/Echart/BarChart3D.vue b/src/components/Echart/BarChart3D.vue
index 8b8d8ea..ee7dbba 100644
--- a/src/components/Echart/BarChart3D.vue
+++ b/src/components/Echart/BarChart3D.vue
@@ -276,12 +276,12 @@
       textStyle: {
         fontSize: 16,
       },
-      axisPointer: {
-        type: 'cross',
-        label: {
-          fontSize: 13,
-        },
-      },
+      // axisPointer: {
+      //   type: 'cross',
+      //   label: {
+      //     fontSize: 13,
+      //   },
+      // },
       valueFormatter: (value: string | number) => {
         return value ? value + props.unit : value === 0 ? '0' : ''
       },
diff --git a/src/components/Echart/BarChartHorizontal.vue b/src/components/Echart/BarChartHorizontal.vue
index 6a3c107..366e064 100644
--- a/src/components/Echart/BarChartHorizontal.vue
+++ b/src/components/Echart/BarChartHorizontal.vue
@@ -265,12 +265,12 @@
       textStyle: {
         fontSize: 16,
       },
-      axisPointer: {
-        type: 'cross',
-        label: {
-          fontSize: 13,
-        },
-      },
+      // axisPointer: {
+      //   type: 'cross',
+      //   label: {
+      //     fontSize: 13,
+      //   },
+      // },
       valueFormatter: (value: string | number) => {
         return value ? value + props.unit : ''
       },
diff --git a/src/components/Echart/BarChartVertical.vue b/src/components/Echart/BarChartVertical.vue
index 7701800..8f36130 100644
--- a/src/components/Echart/BarChartVertical.vue
+++ b/src/components/Echart/BarChartVertical.vue
@@ -253,12 +253,12 @@
       textStyle: {
         fontSize: 16,
       },
-      axisPointer: {
-        type: 'cross',
-        label: {
-          fontSize: 13,
-        },
-      },
+      // axisPointer: {
+      //   type: 'cross',
+      //   label: {
+      //     fontSize: 13,
+      //   },
+      // },
       valueFormatter: (value: string | number) => {
         return value ? value + props.unit : value === 0 ? '0' : ''
       },
diff --git a/src/components/Echart/LineChart.vue b/src/components/Echart/LineChart.vue
index faf6777..751133f 100644
--- a/src/components/Echart/LineChart.vue
+++ b/src/components/Echart/LineChart.vue
@@ -200,12 +200,12 @@
       textStyle: {
         fontSize: 16,
       },
-      axisPointer: {
-        type: 'cross',
-        label: {
-          fontSize: 13,
-        },
-      },
+      // axisPointer: {
+      //   type: 'cross',
+      //   label: {
+      //     fontSize: 13,
+      //   },
+      // },
       valueFormatter: (value: string | number) => {
         return value ? value + props.unit : value === 0 ? '0' : ''
       },
diff --git a/src/components/map/index offline.vue b/src/components/map/index offline.vue
index 5bf7bb9..e8c31b0 100644
--- a/src/components/map/index offline.vue
+++ b/src/components/map/index offline.vue
@@ -512,7 +512,7 @@
 <template>
   <div class="container">
     <!-- 地图 -->
-    <div id="map" ref="wrapRef " v-loading="loading" />
+    <div id="map" ref="wrapRef" v-loading="loading" />
   </div>
 </template>
 
diff --git a/src/layouts/components/Tools/alarmList.vue b/src/layouts/components/Tools/alarmList.vue
index 425ec3d..1274d52 100644
--- a/src/layouts/components/Tools/alarmList.vue
+++ b/src/layouts/components/Tools/alarmList.vue
@@ -151,7 +151,7 @@
       <template v-else>
         <div v-for="message of messageList" :key="message.id" class="message-item">
           <div class="message-content" @click="detailRow(message)">
-            <div class="title">
+            <div class="title" :title="`${message.alarmMsg}${message.alarmTime}`">
               <div class="container">
                 <div
                   :class="`mar circle circle-${message.alarmLevelName.includes('一级') ? '1' : message.alarmLevelName.includes('二级') ? '2' : message.alarmLevelName.includes('三级') ? '3' : 'other'}`"
diff --git a/src/views/home/dashboard/components/controlMap.vue b/src/views/home/dashboard/components/controlMap.vue
index e1d0651..388cec5 100644
--- a/src/views/home/dashboard/components/controlMap.vue
+++ b/src/views/home/dashboard/components/controlMap.vue
@@ -326,6 +326,7 @@
   setTimeout(() => {
     ele.setAttribute('style', 'font-size: 16px')
   }, 50)
+  detailRef.value.close()
 }
 const publicPath = window.location.href.split('#')[0]
 watch(() => showStatus.value, (newVal) => {
diff --git a/src/views/home/dashboard/components/demonstration.vue b/src/views/home/dashboard/components/demonstration.vue
index 4677f14..f9c4f14 100644
--- a/src/views/home/dashboard/components/demonstration.vue
+++ b/src/views/home/dashboard/components/demonstration.vue
@@ -30,31 +30,71 @@
     <div class="district-header">
       {{ $props.data.name }}
     </div>
+    <div class="content">
+      <div class="name">
+        设备类型:
+      </div>
+      <div class="value">
+        {{ $props.data.type }}
+      </div>
+    </div>
+    <div class="content">
+      <div class="name">
+        设备编号:
+      </div>
+      <div class="value">
+        {{ }}
+      </div>
+    </div>
+    <div class="content">
+      <div class="name">
+        厂商:
+      </div>
+      <div class="value">
+        北京无线电计量测试研究所
+      </div>
+    </div>
+    <div class="content">
+      <div class="name">
+        负责人:
+      </div>
+      <div class="value">
+        {{ }}
+      </div>
+    </div>
+    <div class="content">
+      <div class="name">
+        联系方式:
+      </div>
+      <div class="value" />
+    </div>
+    <div class="content">
+      <div class="name">
+        管理单位:
+      </div>
+      <div class="value">
+        第一分公司
+      </div>
+    </div>
+    <div class="content">
+      <div class="name">
+        详细位置:
+      </div>
+      <div class="value" />
+    </div>
     <!-- <div class="content">
-      <div class="name">面积:</div>
-      <div class="value">{{ $props.data.area }}平方公里</div>
-    </div>
-    <div class="content">
-      <div class="name">管理公司:</div>
-      <div class="value">{{ $props.data.deptName }}</div>
-    </div>
-    <div class="content">
-      <div class="name">管线长度:</div>
-      <div class="value">{{ $props.data.long }}公里</div>
-    </div>
-    <div class="content">
       <div class="name">调压站:</div>
       <div class="value">{{ $props.data.tyz }}座</div>
-    </div>
-    <div class="content">
+    </div> -->
+    <!-- <div class="content">
       <div class="name">调压箱:</div>
       <div class="value"> {{ $props.data.tyx }}座</div>
-    </div>
-    <div class="content">
+    </div> -->
+    <!-- <div class="content">
       <div class="name">闸井:</div>
       <div class="value">{{ $props.data.well }}个</div>
-    </div>
-    <div class="content">
+    </div> -->
+    <!-- <div class="content">
       <div class="name">监控覆盖率:</div>
       <div class="value">{{ $props.data.rate }}%</div>
     </div> -->
diff --git a/src/views/home/dashboard/components/detailInfoDialog.vue b/src/views/home/dashboard/components/detailInfoDialog.vue
index 1aad185..351fbf9 100644
--- a/src/views/home/dashboard/components/detailInfoDialog.vue
+++ b/src/views/home/dashboard/components/detailInfoDialog.vue
@@ -28,11 +28,13 @@
   }
   dialogFormVisible.value = true
 }
-defineExpose({ initDialog })
+
 // 关闭
 const close = () => {
   infoWindow.value.close()
 }
+
+defineExpose({ initDialog, close })
 </script>
 
 <template>
diff --git a/src/views/home/dashboard/components/noticeDialog.vue b/src/views/home/dashboard/components/noticeDialog.vue
new file mode 100644
index 0000000..4152ae2
--- /dev/null
+++ b/src/views/home/dashboard/components/noticeDialog.vue
@@ -0,0 +1,95 @@
+<!--
+  Description: 消息通知-更多消息弹窗
+  Author: 李亚光
+  Date: 2024-10-10
+ -->
+<script lang="ts" setup name="NoticeMoreDialog">
+import { ElMessage } from 'element-plus'
+import { getMessage } from '@/api/home/dashboard/index'
+const $router = useRouter()
+const dialogFormVisible = ref(false) // 对话框是否显示
+const list = ref<any[]>([])
+const columns = ref<any>([
+  { text: '消息提醒类型', value: 'messageTypeDetail', align: 'center', width: '200' },
+  { text: '消息提醒内容', value: 'messageContent', align: 'center' },
+  { text: '时间', value: 'ts', align: 'center', width: '180' },
+])
+const loadingTable = ref(true)
+const initDialog = () => {
+  dialogFormVisible.value = true
+}
+const cancel = () => {
+  dialogFormVisible.value = false
+}
+const fetchData = () => {
+  loadingTable.value = true
+  getMessage().then((res) => {
+    list.value = res.data.rows.reverse()
+    loadingTable.value = false
+  }).catch(() => {
+    loadingTable.value = false
+  })
+}
+fetchData()
+defineExpose({
+  initDialog,
+})
+// 查看详情
+const detail = (row: any) => {
+  // 报警类跳转
+  if (row.messageTypeDetail.includes('报警')) {
+    if (row.alarmId) {
+      $router.push({
+        name: 'AlarmCurrentDetail',
+        query: {
+          id: row.alarmId,
+          row: JSON.stringify(row),
+        },
+      })
+    }
+    else {
+      ElMessage.warning('该数据缺少报警信息')
+    }
+  }
+}
+</script>
+
+<template>
+  <el-dialog v-model="dialogFormVisible" title="消息通知" append-to-body>
+    <normal-table
+      :data="list" :total="0" :columns="columns" :query="{}" :list-loading="loadingTable"
+      :pagination="false" :height="400"
+    >
+      <template #columns>
+        <el-table-column label="操作" align="center" width="80">
+          <template #default="scope">
+            <el-button
+              type="primary" link size="small"
+              :disabled="!((scope.row.messageTypeDetail.includes('报警') && !scope.row.messageTypeDetail.includes('解除')) || scope.row.messageTypeDetail.includes('施工'))"
+              @click="detail(scope.row)"
+            >
+              查看
+            </el-button>
+          </template>
+        </el-table-column>
+      </template>
+    </normal-table>
+    <template #footer>
+      <div class="dialog-footer">
+        <el-button type="primary" @click="cancel">
+          确认
+        </el-button>
+      </div>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+.el-dialog {
+  width: 700px;
+}
+
+.el-select {
+  width: 100%;
+}
+</style>

diff --git a/src/assets/fullscren/br-logo.png b/src/assets/fullscren/br-logo.png
new file mode 100644
index 0000000..f3db083
--- /dev/null
+++ b/src/assets/fullscren/br-logo.png
Binary files differ
diff --git a/src/assets/fullscren/br-title.png b/src/assets/fullscren/br-title.png
new file mode 100644
index 0000000..9c7237e
--- /dev/null
+++ b/src/assets/fullscren/br-title.png
Binary files differ
diff --git a/src/components/DeptSelect/index.vue b/src/components/DeptSelect/index.vue
index ef7bd91..948bd8b 100644
--- a/src/components/DeptSelect/index.vue
+++ b/src/components/DeptSelect/index.vue
@@ -68,16 +68,17 @@
 function fetchPcode() {
   // 如果未指定需要展示的部门类型，获取全部部门
   if (!props.deptType) {
-    if (dictStore.allDeptList.length === 0) { // 如果store中未存储，从服务器上获取
-      getDeptTreeList().then((res) => {
-        const list = res.data
-        dictStore.setAllDeptList(list)
-        refreshList(list)
-      })
-    }
-    else {
-      refreshList(dictStore.allDeptList)
-    }
+    // if (dictStore.allDeptList.length === 0) { // 如果store中未存储，从服务器上获取
+    getDeptTreeList().then((res) => {
+      const list = res.data.filter((item: any) => item.id !== '0')
+      dictStore.setAllDeptList(list)
+      refreshList(list)
+      console.log(list, 'list')
+    })
+    // }
+    // else {
+    //   refreshList(dictStore.allDeptList)
+    // }
   }
   else { // 如果指定了需要展示的部门类型
     if (dictStore.companyList.length === 0) { // 如果store中未存储，从服务器上获取
@@ -159,24 +160,15 @@
 <template>
   <div style="width: 100%;">
     <el-tree-select
-      v-if="multiData"
-      v-model="value"
-      :data="deptTreeList"
-      node-key="id"
-      :filter-node-method="filterTree"
-      :props="defaultProps"
-      :expand-on-click-node="false"
-      :render-after-expand="false"
-      :size="props.size"
-      :placeholder="props.placeholder"
-      :clearable="props.clearable"
-      check-strictly
-      check-on-click-node
-      filterable
-      class="full-width-input"
-      :disabled="props.disabled"
+      v-if="multiData" v-model="value" :data="deptTreeList" node-key="id" :filter-node-method="filterTree"
+      :props="defaultProps" :expand-on-click-node="false" :render-after-expand="false" :size="props.size"
+      :placeholder="props.placeholder" :clearable="props.clearable" check-strictly check-on-click-node filterable
+      class="full-width-input" :disabled="props.disabled"
     />
-    <el-select v-else v-model="value" :placeholder="props.placeholder" :size="props.size" :disabled="props.disabled" :clearable="props.clearable" class="full-width-input">
+    <el-select
+      v-else v-model="value" :placeholder="props.placeholder" :size="props.size" :disabled="props.disabled"
+      :clearable="props.clearable" class="full-width-input"
+    >
       <el-option v-for="(item, index) in deptTreeList" :key="index" :label="item.name" :value="item.id" />
     </el-select>
   </div>
diff --git a/src/components/Echart/BarChart3D.vue b/src/components/Echart/BarChart3D.vue
index 8b8d8ea..ee7dbba 100644
--- a/src/components/Echart/BarChart3D.vue
+++ b/src/components/Echart/BarChart3D.vue
@@ -276,12 +276,12 @@
       textStyle: {
         fontSize: 16,
       },
-      axisPointer: {
-        type: 'cross',
-        label: {
-          fontSize: 13,
-        },
-      },
+      // axisPointer: {
+      //   type: 'cross',
+      //   label: {
+      //     fontSize: 13,
+      //   },
+      // },
       valueFormatter: (value: string | number) => {
         return value ? value + props.unit : value === 0 ? '0' : ''
       },
diff --git a/src/components/Echart/BarChartHorizontal.vue b/src/components/Echart/BarChartHorizontal.vue
index 6a3c107..366e064 100644
--- a/src/components/Echart/BarChartHorizontal.vue
+++ b/src/components/Echart/BarChartHorizontal.vue
@@ -265,12 +265,12 @@
       textStyle: {
         fontSize: 16,
       },
-      axisPointer: {
-        type: 'cross',
-        label: {
-          fontSize: 13,
-        },
-      },
+      // axisPointer: {
+      //   type: 'cross',
+      //   label: {
+      //     fontSize: 13,
+      //   },
+      // },
       valueFormatter: (value: string | number) => {
         return value ? value + props.unit : ''
       },
diff --git a/src/components/Echart/BarChartVertical.vue b/src/components/Echart/BarChartVertical.vue
index 7701800..8f36130 100644
--- a/src/components/Echart/BarChartVertical.vue
+++ b/src/components/Echart/BarChartVertical.vue
@@ -253,12 +253,12 @@
       textStyle: {
         fontSize: 16,
       },
-      axisPointer: {
-        type: 'cross',
-        label: {
-          fontSize: 13,
-        },
-      },
+      // axisPointer: {
+      //   type: 'cross',
+      //   label: {
+      //     fontSize: 13,
+      //   },
+      // },
       valueFormatter: (value: string | number) => {
         return value ? value + props.unit : value === 0 ? '0' : ''
       },
diff --git a/src/components/Echart/LineChart.vue b/src/components/Echart/LineChart.vue
index faf6777..751133f 100644
--- a/src/components/Echart/LineChart.vue
+++ b/src/components/Echart/LineChart.vue
@@ -200,12 +200,12 @@
       textStyle: {
         fontSize: 16,
       },
-      axisPointer: {
-        type: 'cross',
-        label: {
-          fontSize: 13,
-        },
-      },
+      // axisPointer: {
+      //   type: 'cross',
+      //   label: {
+      //     fontSize: 13,
+      //   },
+      // },
       valueFormatter: (value: string | number) => {
         return value ? value + props.unit : value === 0 ? '0' : ''
       },
diff --git a/src/components/map/index offline.vue b/src/components/map/index offline.vue
index 5bf7bb9..e8c31b0 100644
--- a/src/components/map/index offline.vue
+++ b/src/components/map/index offline.vue
@@ -512,7 +512,7 @@
 <template>
   <div class="container">
     <!-- 地图 -->
-    <div id="map" ref="wrapRef " v-loading="loading" />
+    <div id="map" ref="wrapRef" v-loading="loading" />
   </div>
 </template>
 
diff --git a/src/layouts/components/Tools/alarmList.vue b/src/layouts/components/Tools/alarmList.vue
index 425ec3d..1274d52 100644
--- a/src/layouts/components/Tools/alarmList.vue
+++ b/src/layouts/components/Tools/alarmList.vue
@@ -151,7 +151,7 @@
       <template v-else>
         <div v-for="message of messageList" :key="message.id" class="message-item">
           <div class="message-content" @click="detailRow(message)">
-            <div class="title">
+            <div class="title" :title="`${message.alarmMsg}${message.alarmTime}`">
               <div class="container">
                 <div
                   :class="`mar circle circle-${message.alarmLevelName.includes('一级') ? '1' : message.alarmLevelName.includes('二级') ? '2' : message.alarmLevelName.includes('三级') ? '3' : 'other'}`"
diff --git a/src/views/home/dashboard/components/controlMap.vue b/src/views/home/dashboard/components/controlMap.vue
index e1d0651..388cec5 100644
--- a/src/views/home/dashboard/components/controlMap.vue
+++ b/src/views/home/dashboard/components/controlMap.vue
@@ -326,6 +326,7 @@
   setTimeout(() => {
     ele.setAttribute('style', 'font-size: 16px')
   }, 50)
+  detailRef.value.close()
 }
 const publicPath = window.location.href.split('#')[0]
 watch(() => showStatus.value, (newVal) => {
diff --git a/src/views/home/dashboard/components/demonstration.vue b/src/views/home/dashboard/components/demonstration.vue
index 4677f14..f9c4f14 100644
--- a/src/views/home/dashboard/components/demonstration.vue
+++ b/src/views/home/dashboard/components/demonstration.vue
@@ -30,31 +30,71 @@
     <div class="district-header">
       {{ $props.data.name }}
     </div>
+    <div class="content">
+      <div class="name">
+        设备类型:
+      </div>
+      <div class="value">
+        {{ $props.data.type }}
+      </div>
+    </div>
+    <div class="content">
+      <div class="name">
+        设备编号:
+      </div>
+      <div class="value">
+        {{ }}
+      </div>
+    </div>
+    <div class="content">
+      <div class="name">
+        厂商:
+      </div>
+      <div class="value">
+        北京无线电计量测试研究所
+      </div>
+    </div>
+    <div class="content">
+      <div class="name">
+        负责人:
+      </div>
+      <div class="value">
+        {{ }}
+      </div>
+    </div>
+    <div class="content">
+      <div class="name">
+        联系方式:
+      </div>
+      <div class="value" />
+    </div>
+    <div class="content">
+      <div class="name">
+        管理单位:
+      </div>
+      <div class="value">
+        第一分公司
+      </div>
+    </div>
+    <div class="content">
+      <div class="name">
+        详细位置:
+      </div>
+      <div class="value" />
+    </div>
     <!-- <div class="content">
-      <div class="name">面积:</div>
-      <div class="value">{{ $props.data.area }}平方公里</div>
-    </div>
-    <div class="content">
-      <div class="name">管理公司:</div>
-      <div class="value">{{ $props.data.deptName }}</div>
-    </div>
-    <div class="content">
-      <div class="name">管线长度:</div>
-      <div class="value">{{ $props.data.long }}公里</div>
-    </div>
-    <div class="content">
       <div class="name">调压站:</div>
       <div class="value">{{ $props.data.tyz }}座</div>
-    </div>
-    <div class="content">
+    </div> -->
+    <!-- <div class="content">
       <div class="name">调压箱:</div>
       <div class="value"> {{ $props.data.tyx }}座</div>
-    </div>
-    <div class="content">
+    </div> -->
+    <!-- <div class="content">
       <div class="name">闸井:</div>
       <div class="value">{{ $props.data.well }}个</div>
-    </div>
-    <div class="content">
+    </div> -->
+    <!-- <div class="content">
       <div class="name">监控覆盖率:</div>
       <div class="value">{{ $props.data.rate }}%</div>
     </div> -->
diff --git a/src/views/home/dashboard/components/detailInfoDialog.vue b/src/views/home/dashboard/components/detailInfoDialog.vue
index 1aad185..351fbf9 100644
--- a/src/views/home/dashboard/components/detailInfoDialog.vue
+++ b/src/views/home/dashboard/components/detailInfoDialog.vue
@@ -28,11 +28,13 @@
   }
   dialogFormVisible.value = true
 }
-defineExpose({ initDialog })
+
 // 关闭
 const close = () => {
   infoWindow.value.close()
 }
+
+defineExpose({ initDialog, close })
 </script>
 
 <template>
diff --git a/src/views/home/dashboard/components/noticeDialog.vue b/src/views/home/dashboard/components/noticeDialog.vue
new file mode 100644
index 0000000..4152ae2
--- /dev/null
+++ b/src/views/home/dashboard/components/noticeDialog.vue
@@ -0,0 +1,95 @@
+<!--
+  Description: 消息通知-更多消息弹窗
+  Author: 李亚光
+  Date: 2024-10-10
+ -->
+<script lang="ts" setup name="NoticeMoreDialog">
+import { ElMessage } from 'element-plus'
+import { getMessage } from '@/api/home/dashboard/index'
+const $router = useRouter()
+const dialogFormVisible = ref(false) // 对话框是否显示
+const list = ref<any[]>([])
+const columns = ref<any>([
+  { text: '消息提醒类型', value: 'messageTypeDetail', align: 'center', width: '200' },
+  { text: '消息提醒内容', value: 'messageContent', align: 'center' },
+  { text: '时间', value: 'ts', align: 'center', width: '180' },
+])
+const loadingTable = ref(true)
+const initDialog = () => {
+  dialogFormVisible.value = true
+}
+const cancel = () => {
+  dialogFormVisible.value = false
+}
+const fetchData = () => {
+  loadingTable.value = true
+  getMessage().then((res) => {
+    list.value = res.data.rows.reverse()
+    loadingTable.value = false
+  }).catch(() => {
+    loadingTable.value = false
+  })
+}
+fetchData()
+defineExpose({
+  initDialog,
+})
+// 查看详情
+const detail = (row: any) => {
+  // 报警类跳转
+  if (row.messageTypeDetail.includes('报警')) {
+    if (row.alarmId) {
+      $router.push({
+        name: 'AlarmCurrentDetail',
+        query: {
+          id: row.alarmId,
+          row: JSON.stringify(row),
+        },
+      })
+    }
+    else {
+      ElMessage.warning('该数据缺少报警信息')
+    }
+  }
+}
+</script>
+
+<template>
+  <el-dialog v-model="dialogFormVisible" title="消息通知" append-to-body>
+    <normal-table
+      :data="list" :total="0" :columns="columns" :query="{}" :list-loading="loadingTable"
+      :pagination="false" :height="400"
+    >
+      <template #columns>
+        <el-table-column label="操作" align="center" width="80">
+          <template #default="scope">
+            <el-button
+              type="primary" link size="small"
+              :disabled="!((scope.row.messageTypeDetail.includes('报警') && !scope.row.messageTypeDetail.includes('解除')) || scope.row.messageTypeDetail.includes('施工'))"
+              @click="detail(scope.row)"
+            >
+              查看
+            </el-button>
+          </template>
+        </el-table-column>
+      </template>
+    </normal-table>
+    <template #footer>
+      <div class="dialog-footer">
+        <el-button type="primary" @click="cancel">
+          确认
+        </el-button>
+      </div>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+.el-dialog {
+  width: 700px;
+}
+
+.el-select {
+  width: 100%;
+}
+</style>
diff --git a/src/views/home/dashboard/fullScreen-components/alarmCount.vue b/src/views/home/dashboard/fullScreen-components/alarmCount.vue
index d65e913..ba24ad9 100644
--- a/src/views/home/dashboard/fullScreen-components/alarmCount.vue
+++ b/src/views/home/dashboard/fullScreen-components/alarmCount.vue
@@ -96,9 +96,10 @@
 // }
 
 .active {
-  color: #3d7eff;
+  color: #1c3444;
   border-color: #e6ebf5;
   outline: none;
-  background-color: rgba($color: #98a7bb, $alpha: 80%);
+  font-weight: 700;
+  background-color: rgba($color: #98a7bb, $alpha: 100%);
 }
 </style>

diff --git a/src/assets/fullscren/br-logo.png b/src/assets/fullscren/br-logo.png
new file mode 100644
index 0000000..f3db083
--- /dev/null
+++ b/src/assets/fullscren/br-logo.png
Binary files differ
diff --git a/src/assets/fullscren/br-title.png b/src/assets/fullscren/br-title.png
new file mode 100644
index 0000000..9c7237e
--- /dev/null
+++ b/src/assets/fullscren/br-title.png
Binary files differ
diff --git a/src/components/DeptSelect/index.vue b/src/components/DeptSelect/index.vue
index ef7bd91..948bd8b 100644
--- a/src/components/DeptSelect/index.vue
+++ b/src/components/DeptSelect/index.vue
@@ -68,16 +68,17 @@
 function fetchPcode() {
   // 如果未指定需要展示的部门类型，获取全部部门
   if (!props.deptType) {
-    if (dictStore.allDeptList.length === 0) { // 如果store中未存储，从服务器上获取
-      getDeptTreeList().then((res) => {
-        const list = res.data
-        dictStore.setAllDeptList(list)
-        refreshList(list)
-      })
-    }
-    else {
-      refreshList(dictStore.allDeptList)
-    }
+    // if (dictStore.allDeptList.length === 0) { // 如果store中未存储，从服务器上获取
+    getDeptTreeList().then((res) => {
+      const list = res.data.filter((item: any) => item.id !== '0')
+      dictStore.setAllDeptList(list)
+      refreshList(list)
+      console.log(list, 'list')
+    })
+    // }
+    // else {
+    //   refreshList(dictStore.allDeptList)
+    // }
   }
   else { // 如果指定了需要展示的部门类型
     if (dictStore.companyList.length === 0) { // 如果store中未存储，从服务器上获取
@@ -159,24 +160,15 @@
 <template>
   <div style="width: 100%;">
     <el-tree-select
-      v-if="multiData"
-      v-model="value"
-      :data="deptTreeList"
-      node-key="id"
-      :filter-node-method="filterTree"
-      :props="defaultProps"
-      :expand-on-click-node="false"
-      :render-after-expand="false"
-      :size="props.size"
-      :placeholder="props.placeholder"
-      :clearable="props.clearable"
-      check-strictly
-      check-on-click-node
-      filterable
-      class="full-width-input"
-      :disabled="props.disabled"
+      v-if="multiData" v-model="value" :data="deptTreeList" node-key="id" :filter-node-method="filterTree"
+      :props="defaultProps" :expand-on-click-node="false" :render-after-expand="false" :size="props.size"
+      :placeholder="props.placeholder" :clearable="props.clearable" check-strictly check-on-click-node filterable
+      class="full-width-input" :disabled="props.disabled"
     />
-    <el-select v-else v-model="value" :placeholder="props.placeholder" :size="props.size" :disabled="props.disabled" :clearable="props.clearable" class="full-width-input">
+    <el-select
+      v-else v-model="value" :placeholder="props.placeholder" :size="props.size" :disabled="props.disabled"
+      :clearable="props.clearable" class="full-width-input"
+    >
       <el-option v-for="(item, index) in deptTreeList" :key="index" :label="item.name" :value="item.id" />
     </el-select>
   </div>
diff --git a/src/components/Echart/BarChart3D.vue b/src/components/Echart/BarChart3D.vue
index 8b8d8ea..ee7dbba 100644
--- a/src/components/Echart/BarChart3D.vue
+++ b/src/components/Echart/BarChart3D.vue
@@ -276,12 +276,12 @@
       textStyle: {
         fontSize: 16,
       },
-      axisPointer: {
-        type: 'cross',
-        label: {
-          fontSize: 13,
-        },
-      },
+      // axisPointer: {
+      //   type: 'cross',
+      //   label: {
+      //     fontSize: 13,
+      //   },
+      // },
       valueFormatter: (value: string | number) => {
         return value ? value + props.unit : value === 0 ? '0' : ''
       },
diff --git a/src/components/Echart/BarChartHorizontal.vue b/src/components/Echart/BarChartHorizontal.vue
index 6a3c107..366e064 100644
--- a/src/components/Echart/BarChartHorizontal.vue
+++ b/src/components/Echart/BarChartHorizontal.vue
@@ -265,12 +265,12 @@
       textStyle: {
         fontSize: 16,
       },
-      axisPointer: {
-        type: 'cross',
-        label: {
-          fontSize: 13,
-        },
-      },
+      // axisPointer: {
+      //   type: 'cross',
+      //   label: {
+      //     fontSize: 13,
+      //   },
+      // },
       valueFormatter: (value: string | number) => {
         return value ? value + props.unit : ''
       },
diff --git a/src/components/Echart/BarChartVertical.vue b/src/components/Echart/BarChartVertical.vue
index 7701800..8f36130 100644
--- a/src/components/Echart/BarChartVertical.vue
+++ b/src/components/Echart/BarChartVertical.vue
@@ -253,12 +253,12 @@
       textStyle: {
         fontSize: 16,
       },
-      axisPointer: {
-        type: 'cross',
-        label: {
-          fontSize: 13,
-        },
-      },
+      // axisPointer: {
+      //   type: 'cross',
+      //   label: {
+      //     fontSize: 13,
+      //   },
+      // },
       valueFormatter: (value: string | number) => {
         return value ? value + props.unit : value === 0 ? '0' : ''
       },
diff --git a/src/components/Echart/LineChart.vue b/src/components/Echart/LineChart.vue
index faf6777..751133f 100644
--- a/src/components/Echart/LineChart.vue
+++ b/src/components/Echart/LineChart.vue
@@ -200,12 +200,12 @@
       textStyle: {
         fontSize: 16,
       },
-      axisPointer: {
-        type: 'cross',
-        label: {
-          fontSize: 13,
-        },
-      },
+      // axisPointer: {
+      //   type: 'cross',
+      //   label: {
+      //     fontSize: 13,
+      //   },
+      // },
       valueFormatter: (value: string | number) => {
         return value ? value + props.unit : value === 0 ? '0' : ''
       },
diff --git a/src/components/map/index offline.vue b/src/components/map/index offline.vue
index 5bf7bb9..e8c31b0 100644
--- a/src/components/map/index offline.vue
+++ b/src/components/map/index offline.vue
@@ -512,7 +512,7 @@
 <template>
   <div class="container">
     <!-- 地图 -->
-    <div id="map" ref="wrapRef " v-loading="loading" />
+    <div id="map" ref="wrapRef" v-loading="loading" />
   </div>
 </template>
 
diff --git a/src/layouts/components/Tools/alarmList.vue b/src/layouts/components/Tools/alarmList.vue
index 425ec3d..1274d52 100644
--- a/src/layouts/components/Tools/alarmList.vue
+++ b/src/layouts/components/Tools/alarmList.vue
@@ -151,7 +151,7 @@
       <template v-else>
         <div v-for="message of messageList" :key="message.id" class="message-item">
           <div class="message-content" @click="detailRow(message)">
-            <div class="title">
+            <div class="title" :title="`${message.alarmMsg}${message.alarmTime}`">
               <div class="container">
                 <div
                   :class="`mar circle circle-${message.alarmLevelName.includes('一级') ? '1' : message.alarmLevelName.includes('二级') ? '2' : message.alarmLevelName.includes('三级') ? '3' : 'other'}`"
diff --git a/src/views/home/dashboard/components/controlMap.vue b/src/views/home/dashboard/components/controlMap.vue
index e1d0651..388cec5 100644
--- a/src/views/home/dashboard/components/controlMap.vue
+++ b/src/views/home/dashboard/components/controlMap.vue
@@ -326,6 +326,7 @@
   setTimeout(() => {
     ele.setAttribute('style', 'font-size: 16px')
   }, 50)
+  detailRef.value.close()
 }
 const publicPath = window.location.href.split('#')[0]
 watch(() => showStatus.value, (newVal) => {
diff --git a/src/views/home/dashboard/components/demonstration.vue b/src/views/home/dashboard/components/demonstration.vue
index 4677f14..f9c4f14 100644
--- a/src/views/home/dashboard/components/demonstration.vue
+++ b/src/views/home/dashboard/components/demonstration.vue
@@ -30,31 +30,71 @@
     <div class="district-header">
       {{ $props.data.name }}
     </div>
+    <div class="content">
+      <div class="name">
+        设备类型:
+      </div>
+      <div class="value">
+        {{ $props.data.type }}
+      </div>
+    </div>
+    <div class="content">
+      <div class="name">
+        设备编号:
+      </div>
+      <div class="value">
+        {{ }}
+      </div>
+    </div>
+    <div class="content">
+      <div class="name">
+        厂商:
+      </div>
+      <div class="value">
+        北京无线电计量测试研究所
+      </div>
+    </div>
+    <div class="content">
+      <div class="name">
+        负责人:
+      </div>
+      <div class="value">
+        {{ }}
+      </div>
+    </div>
+    <div class="content">
+      <div class="name">
+        联系方式:
+      </div>
+      <div class="value" />
+    </div>
+    <div class="content">
+      <div class="name">
+        管理单位:
+      </div>
+      <div class="value">
+        第一分公司
+      </div>
+    </div>
+    <div class="content">
+      <div class="name">
+        详细位置:
+      </div>
+      <div class="value" />
+    </div>
     <!-- <div class="content">
-      <div class="name">面积:</div>
-      <div class="value">{{ $props.data.area }}平方公里</div>
-    </div>
-    <div class="content">
-      <div class="name">管理公司:</div>
-      <div class="value">{{ $props.data.deptName }}</div>
-    </div>
-    <div class="content">
-      <div class="name">管线长度:</div>
-      <div class="value">{{ $props.data.long }}公里</div>
-    </div>
-    <div class="content">
       <div class="name">调压站:</div>
       <div class="value">{{ $props.data.tyz }}座</div>
-    </div>
-    <div class="content">
+    </div> -->
+    <!-- <div class="content">
       <div class="name">调压箱:</div>
       <div class="value"> {{ $props.data.tyx }}座</div>
-    </div>
-    <div class="content">
+    </div> -->
+    <!-- <div class="content">
       <div class="name">闸井:</div>
       <div class="value">{{ $props.data.well }}个</div>
-    </div>
-    <div class="content">
+    </div> -->
+    <!-- <div class="content">
       <div class="name">监控覆盖率:</div>
       <div class="value">{{ $props.data.rate }}%</div>
     </div> -->
diff --git a/src/views/home/dashboard/components/detailInfoDialog.vue b/src/views/home/dashboard/components/detailInfoDialog.vue
index 1aad185..351fbf9 100644
--- a/src/views/home/dashboard/components/detailInfoDialog.vue
+++ b/src/views/home/dashboard/components/detailInfoDialog.vue
@@ -28,11 +28,13 @@
   }
   dialogFormVisible.value = true
 }
-defineExpose({ initDialog })
+
 // 关闭
 const close = () => {
   infoWindow.value.close()
 }
+
+defineExpose({ initDialog, close })
 </script>
 
 <template>
diff --git a/src/views/home/dashboard/components/noticeDialog.vue b/src/views/home/dashboard/components/noticeDialog.vue
new file mode 100644
index 0000000..4152ae2
--- /dev/null
+++ b/src/views/home/dashboard/components/noticeDialog.vue
@@ -0,0 +1,95 @@
+<!--
+  Description: 消息通知-更多消息弹窗
+  Author: 李亚光
+  Date: 2024-10-10
+ -->
+<script lang="ts" setup name="NoticeMoreDialog">
+import { ElMessage } from 'element-plus'
+import { getMessage } from '@/api/home/dashboard/index'
+const $router = useRouter()
+const dialogFormVisible = ref(false) // 对话框是否显示
+const list = ref<any[]>([])
+const columns = ref<any>([
+  { text: '消息提醒类型', value: 'messageTypeDetail', align: 'center', width: '200' },
+  { text: '消息提醒内容', value: 'messageContent', align: 'center' },
+  { text: '时间', value: 'ts', align: 'center', width: '180' },
+])
+const loadingTable = ref(true)
+const initDialog = () => {
+  dialogFormVisible.value = true
+}
+const cancel = () => {
+  dialogFormVisible.value = false
+}
+const fetchData = () => {
+  loadingTable.value = true
+  getMessage().then((res) => {
+    list.value = res.data.rows.reverse()
+    loadingTable.value = false
+  }).catch(() => {
+    loadingTable.value = false
+  })
+}
+fetchData()
+defineExpose({
+  initDialog,
+})
+// 查看详情
+const detail = (row: any) => {
+  // 报警类跳转
+  if (row.messageTypeDetail.includes('报警')) {
+    if (row.alarmId) {
+      $router.push({
+        name: 'AlarmCurrentDetail',
+        query: {
+          id: row.alarmId,
+          row: JSON.stringify(row),
+        },
+      })
+    }
+    else {
+      ElMessage.warning('该数据缺少报警信息')
+    }
+  }
+}
+</script>
+
+<template>
+  <el-dialog v-model="dialogFormVisible" title="消息通知" append-to-body>
+    <normal-table
+      :data="list" :total="0" :columns="columns" :query="{}" :list-loading="loadingTable"
+      :pagination="false" :height="400"
+    >
+      <template #columns>
+        <el-table-column label="操作" align="center" width="80">
+          <template #default="scope">
+            <el-button
+              type="primary" link size="small"
+              :disabled="!((scope.row.messageTypeDetail.includes('报警') && !scope.row.messageTypeDetail.includes('解除')) || scope.row.messageTypeDetail.includes('施工'))"
+              @click="detail(scope.row)"
+            >
+              查看
+            </el-button>
+          </template>
+        </el-table-column>
+      </template>
+    </normal-table>
+    <template #footer>
+      <div class="dialog-footer">
+        <el-button type="primary" @click="cancel">
+          确认
+        </el-button>
+      </div>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+.el-dialog {
+  width: 700px;
+}
+
+.el-select {
+  width: 100%;
+}
+</style>
diff --git a/src/views/home/dashboard/fullScreen-components/alarmCount.vue b/src/views/home/dashboard/fullScreen-components/alarmCount.vue
index d65e913..ba24ad9 100644
--- a/src/views/home/dashboard/fullScreen-components/alarmCount.vue
+++ b/src/views/home/dashboard/fullScreen-components/alarmCount.vue
@@ -96,9 +96,10 @@
 // }
 
 .active {
-  color: #3d7eff;
+  color: #1c3444;
   border-color: #e6ebf5;
   outline: none;
-  background-color: rgba($color: #98a7bb, $alpha: 80%);
+  font-weight: 700;
+  background-color: rgba($color: #98a7bb, $alpha: 100%);
 }
 </style>
diff --git a/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue b/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue
index 08d7a93..f723273 100644
--- a/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue
+++ b/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue
@@ -196,7 +196,7 @@
           text-align: center;
           font-size: 24px;
           font-weight: 700;
-          color: #fff;
+          color: #d81010;
         }
 
         .title1 {

diff --git a/src/assets/fullscren/br-logo.png b/src/assets/fullscren/br-logo.png
new file mode 100644
index 0000000..f3db083
--- /dev/null
+++ b/src/assets/fullscren/br-logo.png
Binary files differ
diff --git a/src/assets/fullscren/br-title.png b/src/assets/fullscren/br-title.png
new file mode 100644
index 0000000..9c7237e
--- /dev/null
+++ b/src/assets/fullscren/br-title.png
Binary files differ
diff --git a/src/components/DeptSelect/index.vue b/src/components/DeptSelect/index.vue
index ef7bd91..948bd8b 100644
--- a/src/components/DeptSelect/index.vue
+++ b/src/components/DeptSelect/index.vue
@@ -68,16 +68,17 @@
 function fetchPcode() {
   // 如果未指定需要展示的部门类型，获取全部部门
   if (!props.deptType) {
-    if (dictStore.allDeptList.length === 0) { // 如果store中未存储，从服务器上获取
-      getDeptTreeList().then((res) => {
-        const list = res.data
-        dictStore.setAllDeptList(list)
-        refreshList(list)
-      })
-    }
-    else {
-      refreshList(dictStore.allDeptList)
-    }
+    // if (dictStore.allDeptList.length === 0) { // 如果store中未存储，从服务器上获取
+    getDeptTreeList().then((res) => {
+      const list = res.data.filter((item: any) => item.id !== '0')
+      dictStore.setAllDeptList(list)
+      refreshList(list)
+      console.log(list, 'list')
+    })
+    // }
+    // else {
+    //   refreshList(dictStore.allDeptList)
+    // }
   }
   else { // 如果指定了需要展示的部门类型
     if (dictStore.companyList.length === 0) { // 如果store中未存储，从服务器上获取
@@ -159,24 +160,15 @@
 <template>
   <div style="width: 100%;">
     <el-tree-select
-      v-if="multiData"
-      v-model="value"
-      :data="deptTreeList"
-      node-key="id"
-      :filter-node-method="filterTree"
-      :props="defaultProps"
-      :expand-on-click-node="false"
-      :render-after-expand="false"
-      :size="props.size"
-      :placeholder="props.placeholder"
-      :clearable="props.clearable"
-      check-strictly
-      check-on-click-node
-      filterable
-      class="full-width-input"
-      :disabled="props.disabled"
+      v-if="multiData" v-model="value" :data="deptTreeList" node-key="id" :filter-node-method="filterTree"
+      :props="defaultProps" :expand-on-click-node="false" :render-after-expand="false" :size="props.size"
+      :placeholder="props.placeholder" :clearable="props.clearable" check-strictly check-on-click-node filterable
+      class="full-width-input" :disabled="props.disabled"
     />
-    <el-select v-else v-model="value" :placeholder="props.placeholder" :size="props.size" :disabled="props.disabled" :clearable="props.clearable" class="full-width-input">
+    <el-select
+      v-else v-model="value" :placeholder="props.placeholder" :size="props.size" :disabled="props.disabled"
+      :clearable="props.clearable" class="full-width-input"
+    >
       <el-option v-for="(item, index) in deptTreeList" :key="index" :label="item.name" :value="item.id" />
     </el-select>
   </div>
diff --git a/src/components/Echart/BarChart3D.vue b/src/components/Echart/BarChart3D.vue
index 8b8d8ea..ee7dbba 100644
--- a/src/components/Echart/BarChart3D.vue
+++ b/src/components/Echart/BarChart3D.vue
@@ -276,12 +276,12 @@
       textStyle: {
         fontSize: 16,
       },
-      axisPointer: {
-        type: 'cross',
-        label: {
-          fontSize: 13,
-        },
-      },
+      // axisPointer: {
+      //   type: 'cross',
+      //   label: {
+      //     fontSize: 13,
+      //   },
+      // },
       valueFormatter: (value: string | number) => {
         return value ? value + props.unit : value === 0 ? '0' : ''
       },
diff --git a/src/components/Echart/BarChartHorizontal.vue b/src/components/Echart/BarChartHorizontal.vue
index 6a3c107..366e064 100644
--- a/src/components/Echart/BarChartHorizontal.vue
+++ b/src/components/Echart/BarChartHorizontal.vue
@@ -265,12 +265,12 @@
       textStyle: {
         fontSize: 16,
       },
-      axisPointer: {
-        type: 'cross',
-        label: {
-          fontSize: 13,
-        },
-      },
+      // axisPointer: {
+      //   type: 'cross',
+      //   label: {
+      //     fontSize: 13,
+      //   },
+      // },
       valueFormatter: (value: string | number) => {
         return value ? value + props.unit : ''
       },
diff --git a/src/components/Echart/BarChartVertical.vue b/src/components/Echart/BarChartVertical.vue
index 7701800..8f36130 100644
--- a/src/components/Echart/BarChartVertical.vue
+++ b/src/components/Echart/BarChartVertical.vue
@@ -253,12 +253,12 @@
       textStyle: {
         fontSize: 16,
       },
-      axisPointer: {
-        type: 'cross',
-        label: {
-          fontSize: 13,
-        },
-      },
+      // axisPointer: {
+      //   type: 'cross',
+      //   label: {
+      //     fontSize: 13,
+      //   },
+      // },
       valueFormatter: (value: string | number) => {
         return value ? value + props.unit : value === 0 ? '0' : ''
       },
diff --git a/src/components/Echart/LineChart.vue b/src/components/Echart/LineChart.vue
index faf6777..751133f 100644
--- a/src/components/Echart/LineChart.vue
+++ b/src/components/Echart/LineChart.vue
@@ -200,12 +200,12 @@
       textStyle: {
         fontSize: 16,
       },
-      axisPointer: {
-        type: 'cross',
-        label: {
-          fontSize: 13,
-        },
-      },
+      // axisPointer: {
+      //   type: 'cross',
+      //   label: {
+      //     fontSize: 13,
+      //   },
+      // },
       valueFormatter: (value: string | number) => {
         return value ? value + props.unit : value === 0 ? '0' : ''
       },
diff --git a/src/components/map/index offline.vue b/src/components/map/index offline.vue
index 5bf7bb9..e8c31b0 100644
--- a/src/components/map/index offline.vue
+++ b/src/components/map/index offline.vue
@@ -512,7 +512,7 @@
 <template>
   <div class="container">
     <!-- 地图 -->
-    <div id="map" ref="wrapRef " v-loading="loading" />
+    <div id="map" ref="wrapRef" v-loading="loading" />
   </div>
 </template>
 
diff --git a/src/layouts/components/Tools/alarmList.vue b/src/layouts/components/Tools/alarmList.vue
index 425ec3d..1274d52 100644
--- a/src/layouts/components/Tools/alarmList.vue
+++ b/src/layouts/components/Tools/alarmList.vue
@@ -151,7 +151,7 @@
       <template v-else>
         <div v-for="message of messageList" :key="message.id" class="message-item">
           <div class="message-content" @click="detailRow(message)">
-            <div class="title">
+            <div class="title" :title="`${message.alarmMsg}${message.alarmTime}`">
               <div class="container">
                 <div
                   :class="`mar circle circle-${message.alarmLevelName.includes('一级') ? '1' : message.alarmLevelName.includes('二级') ? '2' : message.alarmLevelName.includes('三级') ? '3' : 'other'}`"
diff --git a/src/views/home/dashboard/components/controlMap.vue b/src/views/home/dashboard/components/controlMap.vue
index e1d0651..388cec5 100644
--- a/src/views/home/dashboard/components/controlMap.vue
+++ b/src/views/home/dashboard/components/controlMap.vue
@@ -326,6 +326,7 @@
   setTimeout(() => {
     ele.setAttribute('style', 'font-size: 16px')
   }, 50)
+  detailRef.value.close()
 }
 const publicPath = window.location.href.split('#')[0]
 watch(() => showStatus.value, (newVal) => {
diff --git a/src/views/home/dashboard/components/demonstration.vue b/src/views/home/dashboard/components/demonstration.vue
index 4677f14..f9c4f14 100644
--- a/src/views/home/dashboard/components/demonstration.vue
+++ b/src/views/home/dashboard/components/demonstration.vue
@@ -30,31 +30,71 @@
     <div class="district-header">
       {{ $props.data.name }}
     </div>
+    <div class="content">
+      <div class="name">
+        设备类型:
+      </div>
+      <div class="value">
+        {{ $props.data.type }}
+      </div>
+    </div>
+    <div class="content">
+      <div class="name">
+        设备编号:
+      </div>
+      <div class="value">
+        {{ }}
+      </div>
+    </div>
+    <div class="content">
+      <div class="name">
+        厂商:
+      </div>
+      <div class="value">
+        北京无线电计量测试研究所
+      </div>
+    </div>
+    <div class="content">
+      <div class="name">
+        负责人:
+      </div>
+      <div class="value">
+        {{ }}
+      </div>
+    </div>
+    <div class="content">
+      <div class="name">
+        联系方式:
+      </div>
+      <div class="value" />
+    </div>
+    <div class="content">
+      <div class="name">
+        管理单位:
+      </div>
+      <div class="value">
+        第一分公司
+      </div>
+    </div>
+    <div class="content">
+      <div class="name">
+        详细位置:
+      </div>
+      <div class="value" />
+    </div>
     <!-- <div class="content">
-      <div class="name">面积:</div>
-      <div class="value">{{ $props.data.area }}平方公里</div>
-    </div>
-    <div class="content">
-      <div class="name">管理公司:</div>
-      <div class="value">{{ $props.data.deptName }}</div>
-    </div>
-    <div class="content">
-      <div class="name">管线长度:</div>
-      <div class="value">{{ $props.data.long }}公里</div>
-    </div>
-    <div class="content">
       <div class="name">调压站:</div>
       <div class="value">{{ $props.data.tyz }}座</div>
-    </div>
-    <div class="content">
+    </div> -->
+    <!-- <div class="content">
       <div class="name">调压箱:</div>
       <div class="value"> {{ $props.data.tyx }}座</div>
-    </div>
-    <div class="content">
+    </div> -->
+    <!-- <div class="content">
       <div class="name">闸井:</div>
       <div class="value">{{ $props.data.well }}个</div>
-    </div>
-    <div class="content">
+    </div> -->
+    <!-- <div class="content">
       <div class="name">监控覆盖率:</div>
       <div class="value">{{ $props.data.rate }}%</div>
     </div> -->
diff --git a/src/views/home/dashboard/components/detailInfoDialog.vue b/src/views/home/dashboard/components/detailInfoDialog.vue
index 1aad185..351fbf9 100644
--- a/src/views/home/dashboard/components/detailInfoDialog.vue
+++ b/src/views/home/dashboard/components/detailInfoDialog.vue
@@ -28,11 +28,13 @@
   }
   dialogFormVisible.value = true
 }
-defineExpose({ initDialog })
+
 // 关闭
 const close = () => {
   infoWindow.value.close()
 }
+
+defineExpose({ initDialog, close })
 </script>
 
 <template>
diff --git a/src/views/home/dashboard/components/noticeDialog.vue b/src/views/home/dashboard/components/noticeDialog.vue
new file mode 100644
index 0000000..4152ae2
--- /dev/null
+++ b/src/views/home/dashboard/components/noticeDialog.vue
@@ -0,0 +1,95 @@
+<!--
+  Description: 消息通知-更多消息弹窗
+  Author: 李亚光
+  Date: 2024-10-10
+ -->
+<script lang="ts" setup name="NoticeMoreDialog">
+import { ElMessage } from 'element-plus'
+import { getMessage } from '@/api/home/dashboard/index'
+const $router = useRouter()
+const dialogFormVisible = ref(false) // 对话框是否显示
+const list = ref<any[]>([])
+const columns = ref<any>([
+  { text: '消息提醒类型', value: 'messageTypeDetail', align: 'center', width: '200' },
+  { text: '消息提醒内容', value: 'messageContent', align: 'center' },
+  { text: '时间', value: 'ts', align: 'center', width: '180' },
+])
+const loadingTable = ref(true)
+const initDialog = () => {
+  dialogFormVisible.value = true
+}
+const cancel = () => {
+  dialogFormVisible.value = false
+}
+const fetchData = () => {
+  loadingTable.value = true
+  getMessage().then((res) => {
+    list.value = res.data.rows.reverse()
+    loadingTable.value = false
+  }).catch(() => {
+    loadingTable.value = false
+  })
+}
+fetchData()
+defineExpose({
+  initDialog,
+})
+// 查看详情
+const detail = (row: any) => {
+  // 报警类跳转
+  if (row.messageTypeDetail.includes('报警')) {
+    if (row.alarmId) {
+      $router.push({
+        name: 'AlarmCurrentDetail',
+        query: {
+          id: row.alarmId,
+          row: JSON.stringify(row),
+        },
+      })
+    }
+    else {
+      ElMessage.warning('该数据缺少报警信息')
+    }
+  }
+}
+</script>
+
+<template>
+  <el-dialog v-model="dialogFormVisible" title="消息通知" append-to-body>
+    <normal-table
+      :data="list" :total="0" :columns="columns" :query="{}" :list-loading="loadingTable"
+      :pagination="false" :height="400"
+    >
+      <template #columns>
+        <el-table-column label="操作" align="center" width="80">
+          <template #default="scope">
+            <el-button
+              type="primary" link size="small"
+              :disabled="!((scope.row.messageTypeDetail.includes('报警') && !scope.row.messageTypeDetail.includes('解除')) || scope.row.messageTypeDetail.includes('施工'))"
+              @click="detail(scope.row)"
+            >
+              查看
+            </el-button>
+          </template>
+        </el-table-column>
+      </template>
+    </normal-table>
+    <template #footer>
+      <div class="dialog-footer">
+        <el-button type="primary" @click="cancel">
+          确认
+        </el-button>
+      </div>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+.el-dialog {
+  width: 700px;
+}
+
+.el-select {
+  width: 100%;
+}
+</style>
diff --git a/src/views/home/dashboard/fullScreen-components/alarmCount.vue b/src/views/home/dashboard/fullScreen-components/alarmCount.vue
index d65e913..ba24ad9 100644
--- a/src/views/home/dashboard/fullScreen-components/alarmCount.vue
+++ b/src/views/home/dashboard/fullScreen-components/alarmCount.vue
@@ -96,9 +96,10 @@
 // }
 
 .active {
-  color: #3d7eff;
+  color: #1c3444;
   border-color: #e6ebf5;
   outline: none;
-  background-color: rgba($color: #98a7bb, $alpha: 80%);
+  font-weight: 700;
+  background-color: rgba($color: #98a7bb, $alpha: 100%);
 }
 </style>
diff --git a/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue b/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue
index 08d7a93..f723273 100644
--- a/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue
+++ b/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue
@@ -196,7 +196,7 @@
           text-align: center;
           font-size: 24px;
           font-weight: 700;
-          color: #fff;
+          color: #d81010;
         }
 
         .title1 {
diff --git a/src/views/home/dashboard/fullScreen-components/baseOverView.vue b/src/views/home/dashboard/fullScreen-components/baseOverView.vue
index e973da6..bd3a653 100644
--- a/src/views/home/dashboard/fullScreen-components/baseOverView.vue
+++ b/src/views/home/dashboard/fullScreen-components/baseOverView.vue
@@ -90,15 +90,24 @@
     // justify-content: space-between;
     margin: 20px 0;
 
-    img {
-      width: 90%;
+    .img {
+      width: 50%;
+      box-sizing: border-box;
+      // flex: 1;
+
+      img {
+        width: 90%;
+        height: 100%;
+      }
     }
 
     .data {
       box-sizing: border-box;
       margin-left: 5px;
+
       // display: flex;
       .value {
+
         // padding-left: 10px;
         .value {
           color: #fff;

diff --git a/src/assets/fullscren/br-logo.png b/src/assets/fullscren/br-logo.png
new file mode 100644
index 0000000..f3db083
--- /dev/null
+++ b/src/assets/fullscren/br-logo.png
Binary files differ
diff --git a/src/assets/fullscren/br-title.png b/src/assets/fullscren/br-title.png
new file mode 100644
index 0000000..9c7237e
--- /dev/null
+++ b/src/assets/fullscren/br-title.png
Binary files differ
diff --git a/src/components/DeptSelect/index.vue b/src/components/DeptSelect/index.vue
index ef7bd91..948bd8b 100644
--- a/src/components/DeptSelect/index.vue
+++ b/src/components/DeptSelect/index.vue
@@ -68,16 +68,17 @@
 function fetchPcode() {
   // 如果未指定需要展示的部门类型，获取全部部门
   if (!props.deptType) {
-    if (dictStore.allDeptList.length === 0) { // 如果store中未存储，从服务器上获取
-      getDeptTreeList().then((res) => {
-        const list = res.data
-        dictStore.setAllDeptList(list)
-        refreshList(list)
-      })
-    }
-    else {
-      refreshList(dictStore.allDeptList)
-    }
+    // if (dictStore.allDeptList.length === 0) { // 如果store中未存储，从服务器上获取
+    getDeptTreeList().then((res) => {
+      const list = res.data.filter((item: any) => item.id !== '0')
+      dictStore.setAllDeptList(list)
+      refreshList(list)
+      console.log(list, 'list')
+    })
+    // }
+    // else {
+    //   refreshList(dictStore.allDeptList)
+    // }
   }
   else { // 如果指定了需要展示的部门类型
     if (dictStore.companyList.length === 0) { // 如果store中未存储，从服务器上获取
@@ -159,24 +160,15 @@
 <template>
   <div style="width: 100%;">
     <el-tree-select
-      v-if="multiData"
-      v-model="value"
-      :data="deptTreeList"
-      node-key="id"
-      :filter-node-method="filterTree"
-      :props="defaultProps"
-      :expand-on-click-node="false"
-      :render-after-expand="false"
-      :size="props.size"
-      :placeholder="props.placeholder"
-      :clearable="props.clearable"
-      check-strictly
-      check-on-click-node
-      filterable
-      class="full-width-input"
-      :disabled="props.disabled"
+      v-if="multiData" v-model="value" :data="deptTreeList" node-key="id" :filter-node-method="filterTree"
+      :props="defaultProps" :expand-on-click-node="false" :render-after-expand="false" :size="props.size"
+      :placeholder="props.placeholder" :clearable="props.clearable" check-strictly check-on-click-node filterable
+      class="full-width-input" :disabled="props.disabled"
     />
-    <el-select v-else v-model="value" :placeholder="props.placeholder" :size="props.size" :disabled="props.disabled" :clearable="props.clearable" class="full-width-input">
+    <el-select
+      v-else v-model="value" :placeholder="props.placeholder" :size="props.size" :disabled="props.disabled"
+      :clearable="props.clearable" class="full-width-input"
+    >
       <el-option v-for="(item, index) in deptTreeList" :key="index" :label="item.name" :value="item.id" />
     </el-select>
   </div>
diff --git a/src/components/Echart/BarChart3D.vue b/src/components/Echart/BarChart3D.vue
index 8b8d8ea..ee7dbba 100644
--- a/src/components/Echart/BarChart3D.vue
+++ b/src/components/Echart/BarChart3D.vue
@@ -276,12 +276,12 @@
       textStyle: {
         fontSize: 16,
       },
-      axisPointer: {
-        type: 'cross',
-        label: {
-          fontSize: 13,
-        },
-      },
+      // axisPointer: {
+      //   type: 'cross',
+      //   label: {
+      //     fontSize: 13,
+      //   },
+      // },
       valueFormatter: (value: string | number) => {
         return value ? value + props.unit : value === 0 ? '0' : ''
       },
diff --git a/src/components/Echart/BarChartHorizontal.vue b/src/components/Echart/BarChartHorizontal.vue
index 6a3c107..366e064 100644
--- a/src/components/Echart/BarChartHorizontal.vue
+++ b/src/components/Echart/BarChartHorizontal.vue
@@ -265,12 +265,12 @@
       textStyle: {
         fontSize: 16,
       },
-      axisPointer: {
-        type: 'cross',
-        label: {
-          fontSize: 13,
-        },
-      },
+      // axisPointer: {
+      //   type: 'cross',
+      //   label: {
+      //     fontSize: 13,
+      //   },
+      // },
       valueFormatter: (value: string | number) => {
         return value ? value + props.unit : ''
       },
diff --git a/src/components/Echart/BarChartVertical.vue b/src/components/Echart/BarChartVertical.vue
index 7701800..8f36130 100644
--- a/src/components/Echart/BarChartVertical.vue
+++ b/src/components/Echart/BarChartVertical.vue
@@ -253,12 +253,12 @@
       textStyle: {
         fontSize: 16,
       },
-      axisPointer: {
-        type: 'cross',
-        label: {
-          fontSize: 13,
-        },
-      },
+      // axisPointer: {
+      //   type: 'cross',
+      //   label: {
+      //     fontSize: 13,
+      //   },
+      // },
       valueFormatter: (value: string | number) => {
         return value ? value + props.unit : value === 0 ? '0' : ''
       },
diff --git a/src/components/Echart/LineChart.vue b/src/components/Echart/LineChart.vue
index faf6777..751133f 100644
--- a/src/components/Echart/LineChart.vue
+++ b/src/components/Echart/LineChart.vue
@@ -200,12 +200,12 @@
       textStyle: {
         fontSize: 16,
       },
-      axisPointer: {
-        type: 'cross',
-        label: {
-          fontSize: 13,
-        },
-      },
+      // axisPointer: {
+      //   type: 'cross',
+      //   label: {
+      //     fontSize: 13,
+      //   },
+      // },
       valueFormatter: (value: string | number) => {
         return value ? value + props.unit : value === 0 ? '0' : ''
       },
diff --git a/src/components/map/index offline.vue b/src/components/map/index offline.vue
index 5bf7bb9..e8c31b0 100644
--- a/src/components/map/index offline.vue
+++ b/src/components/map/index offline.vue
@@ -512,7 +512,7 @@
 <template>
   <div class="container">
     <!-- 地图 -->
-    <div id="map" ref="wrapRef " v-loading="loading" />
+    <div id="map" ref="wrapRef" v-loading="loading" />
   </div>
 </template>
 
diff --git a/src/layouts/components/Tools/alarmList.vue b/src/layouts/components/Tools/alarmList.vue
index 425ec3d..1274d52 100644
--- a/src/layouts/components/Tools/alarmList.vue
+++ b/src/layouts/components/Tools/alarmList.vue
@@ -151,7 +151,7 @@
       <template v-else>
         <div v-for="message of messageList" :key="message.id" class="message-item">
           <div class="message-content" @click="detailRow(message)">
-            <div class="title">
+            <div class="title" :title="`${message.alarmMsg}${message.alarmTime}`">
               <div class="container">
                 <div
                   :class="`mar circle circle-${message.alarmLevelName.includes('一级') ? '1' : message.alarmLevelName.includes('二级') ? '2' : message.alarmLevelName.includes('三级') ? '3' : 'other'}`"
diff --git a/src/views/home/dashboard/components/controlMap.vue b/src/views/home/dashboard/components/controlMap.vue
index e1d0651..388cec5 100644
--- a/src/views/home/dashboard/components/controlMap.vue
+++ b/src/views/home/dashboard/components/controlMap.vue
@@ -326,6 +326,7 @@
   setTimeout(() => {
     ele.setAttribute('style', 'font-size: 16px')
   }, 50)
+  detailRef.value.close()
 }
 const publicPath = window.location.href.split('#')[0]
 watch(() => showStatus.value, (newVal) => {
diff --git a/src/views/home/dashboard/components/demonstration.vue b/src/views/home/dashboard/components/demonstration.vue
index 4677f14..f9c4f14 100644
--- a/src/views/home/dashboard/components/demonstration.vue
+++ b/src/views/home/dashboard/components/demonstration.vue
@@ -30,31 +30,71 @@
     <div class="district-header">
       {{ $props.data.name }}
     </div>
+    <div class="content">
+      <div class="name">
+        设备类型:
+      </div>
+      <div class="value">
+        {{ $props.data.type }}
+      </div>
+    </div>
+    <div class="content">
+      <div class="name">
+        设备编号:
+      </div>
+      <div class="value">
+        {{ }}
+      </div>
+    </div>
+    <div class="content">
+      <div class="name">
+        厂商:
+      </div>
+      <div class="value">
+        北京无线电计量测试研究所
+      </div>
+    </div>
+    <div class="content">
+      <div class="name">
+        负责人:
+      </div>
+      <div class="value">
+        {{ }}
+      </div>
+    </div>
+    <div class="content">
+      <div class="name">
+        联系方式:
+      </div>
+      <div class="value" />
+    </div>
+    <div class="content">
+      <div class="name">
+        管理单位:
+      </div>
+      <div class="value">
+        第一分公司
+      </div>
+    </div>
+    <div class="content">
+      <div class="name">
+        详细位置:
+      </div>
+      <div class="value" />
+    </div>
     <!-- <div class="content">
-      <div class="name">面积:</div>
-      <div class="value">{{ $props.data.area }}平方公里</div>
-    </div>
-    <div class="content">
-      <div class="name">管理公司:</div>
-      <div class="value">{{ $props.data.deptName }}</div>
-    </div>
-    <div class="content">
-      <div class="name">管线长度:</div>
-      <div class="value">{{ $props.data.long }}公里</div>
-    </div>
-    <div class="content">
       <div class="name">调压站:</div>
       <div class="value">{{ $props.data.tyz }}座</div>
-    </div>
-    <div class="content">
+    </div> -->
+    <!-- <div class="content">
       <div class="name">调压箱:</div>
       <div class="value"> {{ $props.data.tyx }}座</div>
-    </div>
-    <div class="content">
+    </div> -->
+    <!-- <div class="content">
       <div class="name">闸井:</div>
       <div class="value">{{ $props.data.well }}个</div>
-    </div>
-    <div class="content">
+    </div> -->
+    <!-- <div class="content">
       <div class="name">监控覆盖率:</div>
       <div class="value">{{ $props.data.rate }}%</div>
     </div> -->
diff --git a/src/views/home/dashboard/components/detailInfoDialog.vue b/src/views/home/dashboard/components/detailInfoDialog.vue
index 1aad185..351fbf9 100644
--- a/src/views/home/dashboard/components/detailInfoDialog.vue
+++ b/src/views/home/dashboard/components/detailInfoDialog.vue
@@ -28,11 +28,13 @@
   }
   dialogFormVisible.value = true
 }
-defineExpose({ initDialog })
+
 // 关闭
 const close = () => {
   infoWindow.value.close()
 }
+
+defineExpose({ initDialog, close })
 </script>
 
 <template>
diff --git a/src/views/home/dashboard/components/noticeDialog.vue b/src/views/home/dashboard/components/noticeDialog.vue
new file mode 100644
index 0000000..4152ae2
--- /dev/null
+++ b/src/views/home/dashboard/components/noticeDialog.vue
@@ -0,0 +1,95 @@
+<!--
+  Description: 消息通知-更多消息弹窗
+  Author: 李亚光
+  Date: 2024-10-10
+ -->
+<script lang="ts" setup name="NoticeMoreDialog">
+import { ElMessage } from 'element-plus'
+import { getMessage } from '@/api/home/dashboard/index'
+const $router = useRouter()
+const dialogFormVisible = ref(false) // 对话框是否显示
+const list = ref<any[]>([])
+const columns = ref<any>([
+  { text: '消息提醒类型', value: 'messageTypeDetail', align: 'center', width: '200' },
+  { text: '消息提醒内容', value: 'messageContent', align: 'center' },
+  { text: '时间', value: 'ts', align: 'center', width: '180' },
+])
+const loadingTable = ref(true)
+const initDialog = () => {
+  dialogFormVisible.value = true
+}
+const cancel = () => {
+  dialogFormVisible.value = false
+}
+const fetchData = () => {
+  loadingTable.value = true
+  getMessage().then((res) => {
+    list.value = res.data.rows.reverse()
+    loadingTable.value = false
+  }).catch(() => {
+    loadingTable.value = false
+  })
+}
+fetchData()
+defineExpose({
+  initDialog,
+})
+// 查看详情
+const detail = (row: any) => {
+  // 报警类跳转
+  if (row.messageTypeDetail.includes('报警')) {
+    if (row.alarmId) {
+      $router.push({
+        name: 'AlarmCurrentDetail',
+        query: {
+          id: row.alarmId,
+          row: JSON.stringify(row),
+        },
+      })
+    }
+    else {
+      ElMessage.warning('该数据缺少报警信息')
+    }
+  }
+}
+</script>
+
+<template>
+  <el-dialog v-model="dialogFormVisible" title="消息通知" append-to-body>
+    <normal-table
+      :data="list" :total="0" :columns="columns" :query="{}" :list-loading="loadingTable"
+      :pagination="false" :height="400"
+    >
+      <template #columns>
+        <el-table-column label="操作" align="center" width="80">
+          <template #default="scope">
+            <el-button
+              type="primary" link size="small"
+              :disabled="!((scope.row.messageTypeDetail.includes('报警') && !scope.row.messageTypeDetail.includes('解除')) || scope.row.messageTypeDetail.includes('施工'))"
+              @click="detail(scope.row)"
+            >
+              查看
+            </el-button>
+          </template>
+        </el-table-column>
+      </template>
+    </normal-table>
+    <template #footer>
+      <div class="dialog-footer">
+        <el-button type="primary" @click="cancel">
+          确认
+        </el-button>
+      </div>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+.el-dialog {
+  width: 700px;
+}
+
+.el-select {
+  width: 100%;
+}
+</style>
diff --git a/src/views/home/dashboard/fullScreen-components/alarmCount.vue b/src/views/home/dashboard/fullScreen-components/alarmCount.vue
index d65e913..ba24ad9 100644
--- a/src/views/home/dashboard/fullScreen-components/alarmCount.vue
+++ b/src/views/home/dashboard/fullScreen-components/alarmCount.vue
@@ -96,9 +96,10 @@
 // }
 
 .active {
-  color: #3d7eff;
+  color: #1c3444;
   border-color: #e6ebf5;
   outline: none;
-  background-color: rgba($color: #98a7bb, $alpha: 80%);
+  font-weight: 700;
+  background-color: rgba($color: #98a7bb, $alpha: 100%);
 }
 </style>
diff --git a/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue b/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue
index 08d7a93..f723273 100644
--- a/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue
+++ b/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue
@@ -196,7 +196,7 @@
           text-align: center;
           font-size: 24px;
           font-weight: 700;
-          color: #fff;
+          color: #d81010;
         }
 
         .title1 {
diff --git a/src/views/home/dashboard/fullScreen-components/baseOverView.vue b/src/views/home/dashboard/fullScreen-components/baseOverView.vue
index e973da6..bd3a653 100644
--- a/src/views/home/dashboard/fullScreen-components/baseOverView.vue
+++ b/src/views/home/dashboard/fullScreen-components/baseOverView.vue
@@ -90,15 +90,24 @@
     // justify-content: space-between;
     margin: 20px 0;
 
-    img {
-      width: 90%;
+    .img {
+      width: 50%;
+      box-sizing: border-box;
+      // flex: 1;
+
+      img {
+        width: 90%;
+        height: 100%;
+      }
     }
 
     .data {
       box-sizing: border-box;
       margin-left: 5px;
+
       // display: flex;
       .value {
+
         // padding-left: 10px;
         .value {
           color: #fff;
diff --git a/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue b/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue
index 3dd0897..eb2c2fd 100644
--- a/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue
+++ b/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue
@@ -18,7 +18,7 @@
 
 onMounted(() => {
   setTimeout(() => {
-    xAxisData.value = ['第一分公司', '第二分公司', '第三分公司', '第四分公司', '第五分公司']
+    xAxisData.value = ['第一分公司', '第二分公司', '第三分公司', '第四分公司', '第五分公司'].reverse()
     data.value = [
       {
         name: '数量',

diff --git a/src/assets/fullscren/br-logo.png b/src/assets/fullscren/br-logo.png
new file mode 100644
index 0000000..f3db083
--- /dev/null
+++ b/src/assets/fullscren/br-logo.png
Binary files differ
diff --git a/src/assets/fullscren/br-title.png b/src/assets/fullscren/br-title.png
new file mode 100644
index 0000000..9c7237e
--- /dev/null
+++ b/src/assets/fullscren/br-title.png
Binary files differ
diff --git a/src/components/DeptSelect/index.vue b/src/components/DeptSelect/index.vue
index ef7bd91..948bd8b 100644
--- a/src/components/DeptSelect/index.vue
+++ b/src/components/DeptSelect/index.vue
@@ -68,16 +68,17 @@
 function fetchPcode() {
   // 如果未指定需要展示的部门类型，获取全部部门
   if (!props.deptType) {
-    if (dictStore.allDeptList.length === 0) { // 如果store中未存储，从服务器上获取
-      getDeptTreeList().then((res) => {
-        const list = res.data
-        dictStore.setAllDeptList(list)
-        refreshList(list)
-      })
-    }
-    else {
-      refreshList(dictStore.allDeptList)
-    }
+    // if (dictStore.allDeptList.length === 0) { // 如果store中未存储，从服务器上获取
+    getDeptTreeList().then((res) => {
+      const list = res.data.filter((item: any) => item.id !== '0')
+      dictStore.setAllDeptList(list)
+      refreshList(list)
+      console.log(list, 'list')
+    })
+    // }
+    // else {
+    //   refreshList(dictStore.allDeptList)
+    // }
   }
   else { // 如果指定了需要展示的部门类型
     if (dictStore.companyList.length === 0) { // 如果store中未存储，从服务器上获取
@@ -159,24 +160,15 @@
 <template>
   <div style="width: 100%;">
     <el-tree-select
-      v-if="multiData"
-      v-model="value"
-      :data="deptTreeList"
-      node-key="id"
-      :filter-node-method="filterTree"
-      :props="defaultProps"
-      :expand-on-click-node="false"
-      :render-after-expand="false"
-      :size="props.size"
-      :placeholder="props.placeholder"
-      :clearable="props.clearable"
-      check-strictly
-      check-on-click-node
-      filterable
-      class="full-width-input"
-      :disabled="props.disabled"
+      v-if="multiData" v-model="value" :data="deptTreeList" node-key="id" :filter-node-method="filterTree"
+      :props="defaultProps" :expand-on-click-node="false" :render-after-expand="false" :size="props.size"
+      :placeholder="props.placeholder" :clearable="props.clearable" check-strictly check-on-click-node filterable
+      class="full-width-input" :disabled="props.disabled"
     />
-    <el-select v-else v-model="value" :placeholder="props.placeholder" :size="props.size" :disabled="props.disabled" :clearable="props.clearable" class="full-width-input">
+    <el-select
+      v-else v-model="value" :placeholder="props.placeholder" :size="props.size" :disabled="props.disabled"
+      :clearable="props.clearable" class="full-width-input"
+    >
       <el-option v-for="(item, index) in deptTreeList" :key="index" :label="item.name" :value="item.id" />
     </el-select>
   </div>
diff --git a/src/components/Echart/BarChart3D.vue b/src/components/Echart/BarChart3D.vue
index 8b8d8ea..ee7dbba 100644
--- a/src/components/Echart/BarChart3D.vue
+++ b/src/components/Echart/BarChart3D.vue
@@ -276,12 +276,12 @@
       textStyle: {
         fontSize: 16,
       },
-      axisPointer: {
-        type: 'cross',
-        label: {
-          fontSize: 13,
-        },
-      },
+      // axisPointer: {
+      //   type: 'cross',
+      //   label: {
+      //     fontSize: 13,
+      //   },
+      // },
       valueFormatter: (value: string | number) => {
         return value ? value + props.unit : value === 0 ? '0' : ''
       },
diff --git a/src/components/Echart/BarChartHorizontal.vue b/src/components/Echart/BarChartHorizontal.vue
index 6a3c107..366e064 100644
--- a/src/components/Echart/BarChartHorizontal.vue
+++ b/src/components/Echart/BarChartHorizontal.vue
@@ -265,12 +265,12 @@
       textStyle: {
         fontSize: 16,
       },
-      axisPointer: {
-        type: 'cross',
-        label: {
-          fontSize: 13,
-        },
-      },
+      // axisPointer: {
+      //   type: 'cross',
+      //   label: {
+      //     fontSize: 13,
+      //   },
+      // },
       valueFormatter: (value: string | number) => {
         return value ? value + props.unit : ''
       },
diff --git a/src/components/Echart/BarChartVertical.vue b/src/components/Echart/BarChartVertical.vue
index 7701800..8f36130 100644
--- a/src/components/Echart/BarChartVertical.vue
+++ b/src/components/Echart/BarChartVertical.vue
@@ -253,12 +253,12 @@
       textStyle: {
         fontSize: 16,
       },
-      axisPointer: {
-        type: 'cross',
-        label: {
-          fontSize: 13,
-        },
-      },
+      // axisPointer: {
+      //   type: 'cross',
+      //   label: {
+      //     fontSize: 13,
+      //   },
+      // },
       valueFormatter: (value: string | number) => {
         return value ? value + props.unit : value === 0 ? '0' : ''
       },
diff --git a/src/components/Echart/LineChart.vue b/src/components/Echart/LineChart.vue
index faf6777..751133f 100644
--- a/src/components/Echart/LineChart.vue
+++ b/src/components/Echart/LineChart.vue
@@ -200,12 +200,12 @@
       textStyle: {
         fontSize: 16,
       },
-      axisPointer: {
-        type: 'cross',
-        label: {
-          fontSize: 13,
-        },
-      },
+      // axisPointer: {
+      //   type: 'cross',
+      //   label: {
+      //     fontSize: 13,
+      //   },
+      // },
       valueFormatter: (value: string | number) => {
         return value ? value + props.unit : value === 0 ? '0' : ''
       },
diff --git a/src/components/map/index offline.vue b/src/components/map/index offline.vue
index 5bf7bb9..e8c31b0 100644
--- a/src/components/map/index offline.vue
+++ b/src/components/map/index offline.vue
@@ -512,7 +512,7 @@
 <template>
   <div class="container">
     <!-- 地图 -->
-    <div id="map" ref="wrapRef " v-loading="loading" />
+    <div id="map" ref="wrapRef" v-loading="loading" />
   </div>
 </template>
 
diff --git a/src/layouts/components/Tools/alarmList.vue b/src/layouts/components/Tools/alarmList.vue
index 425ec3d..1274d52 100644
--- a/src/layouts/components/Tools/alarmList.vue
+++ b/src/layouts/components/Tools/alarmList.vue
@@ -151,7 +151,7 @@
       <template v-else>
         <div v-for="message of messageList" :key="message.id" class="message-item">
           <div class="message-content" @click="detailRow(message)">
-            <div class="title">
+            <div class="title" :title="`${message.alarmMsg}${message.alarmTime}`">
               <div class="container">
                 <div
                   :class="`mar circle circle-${message.alarmLevelName.includes('一级') ? '1' : message.alarmLevelName.includes('二级') ? '2' : message.alarmLevelName.includes('三级') ? '3' : 'other'}`"
diff --git a/src/views/home/dashboard/components/controlMap.vue b/src/views/home/dashboard/components/controlMap.vue
index e1d0651..388cec5 100644
--- a/src/views/home/dashboard/components/controlMap.vue
+++ b/src/views/home/dashboard/components/controlMap.vue
@@ -326,6 +326,7 @@
   setTimeout(() => {
     ele.setAttribute('style', 'font-size: 16px')
   }, 50)
+  detailRef.value.close()
 }
 const publicPath = window.location.href.split('#')[0]
 watch(() => showStatus.value, (newVal) => {
diff --git a/src/views/home/dashboard/components/demonstration.vue b/src/views/home/dashboard/components/demonstration.vue
index 4677f14..f9c4f14 100644
--- a/src/views/home/dashboard/components/demonstration.vue
+++ b/src/views/home/dashboard/components/demonstration.vue
@@ -30,31 +30,71 @@
     <div class="district-header">
       {{ $props.data.name }}
     </div>
+    <div class="content">
+      <div class="name">
+        设备类型:
+      </div>
+      <div class="value">
+        {{ $props.data.type }}
+      </div>
+    </div>
+    <div class="content">
+      <div class="name">
+        设备编号:
+      </div>
+      <div class="value">
+        {{ }}
+      </div>
+    </div>
+    <div class="content">
+      <div class="name">
+        厂商:
+      </div>
+      <div class="value">
+        北京无线电计量测试研究所
+      </div>
+    </div>
+    <div class="content">
+      <div class="name">
+        负责人:
+      </div>
+      <div class="value">
+        {{ }}
+      </div>
+    </div>
+    <div class="content">
+      <div class="name">
+        联系方式:
+      </div>
+      <div class="value" />
+    </div>
+    <div class="content">
+      <div class="name">
+        管理单位:
+      </div>
+      <div class="value">
+        第一分公司
+      </div>
+    </div>
+    <div class="content">
+      <div class="name">
+        详细位置:
+      </div>
+      <div class="value" />
+    </div>
     <!-- <div class="content">
-      <div class="name">面积:</div>
-      <div class="value">{{ $props.data.area }}平方公里</div>
-    </div>
-    <div class="content">
-      <div class="name">管理公司:</div>
-      <div class="value">{{ $props.data.deptName }}</div>
-    </div>
-    <div class="content">
-      <div class="name">管线长度:</div>
-      <div class="value">{{ $props.data.long }}公里</div>
-    </div>
-    <div class="content">
       <div class="name">调压站:</div>
       <div class="value">{{ $props.data.tyz }}座</div>
-    </div>
-    <div class="content">
+    </div> -->
+    <!-- <div class="content">
       <div class="name">调压箱:</div>
       <div class="value"> {{ $props.data.tyx }}座</div>
-    </div>
-    <div class="content">
+    </div> -->
+    <!-- <div class="content">
       <div class="name">闸井:</div>
       <div class="value">{{ $props.data.well }}个</div>
-    </div>
-    <div class="content">
+    </div> -->
+    <!-- <div class="content">
       <div class="name">监控覆盖率:</div>
       <div class="value">{{ $props.data.rate }}%</div>
     </div> -->
diff --git a/src/views/home/dashboard/components/detailInfoDialog.vue b/src/views/home/dashboard/components/detailInfoDialog.vue
index 1aad185..351fbf9 100644
--- a/src/views/home/dashboard/components/detailInfoDialog.vue
+++ b/src/views/home/dashboard/components/detailInfoDialog.vue
@@ -28,11 +28,13 @@
   }
   dialogFormVisible.value = true
 }
-defineExpose({ initDialog })
+
 // 关闭
 const close = () => {
   infoWindow.value.close()
 }
+
+defineExpose({ initDialog, close })
 </script>
 
 <template>
diff --git a/src/views/home/dashboard/components/noticeDialog.vue b/src/views/home/dashboard/components/noticeDialog.vue
new file mode 100644
index 0000000..4152ae2
--- /dev/null
+++ b/src/views/home/dashboard/components/noticeDialog.vue
@@ -0,0 +1,95 @@
+<!--
+  Description: 消息通知-更多消息弹窗
+  Author: 李亚光
+  Date: 2024-10-10
+ -->
+<script lang="ts" setup name="NoticeMoreDialog">
+import { ElMessage } from 'element-plus'
+import { getMessage } from '@/api/home/dashboard/index'
+const $router = useRouter()
+const dialogFormVisible = ref(false) // 对话框是否显示
+const list = ref<any[]>([])
+const columns = ref<any>([
+  { text: '消息提醒类型', value: 'messageTypeDetail', align: 'center', width: '200' },
+  { text: '消息提醒内容', value: 'messageContent', align: 'center' },
+  { text: '时间', value: 'ts', align: 'center', width: '180' },
+])
+const loadingTable = ref(true)
+const initDialog = () => {
+  dialogFormVisible.value = true
+}
+const cancel = () => {
+  dialogFormVisible.value = false
+}
+const fetchData = () => {
+  loadingTable.value = true
+  getMessage().then((res) => {
+    list.value = res.data.rows.reverse()
+    loadingTable.value = false
+  }).catch(() => {
+    loadingTable.value = false
+  })
+}
+fetchData()
+defineExpose({
+  initDialog,
+})
+// 查看详情
+const detail = (row: any) => {
+  // 报警类跳转
+  if (row.messageTypeDetail.includes('报警')) {
+    if (row.alarmId) {
+      $router.push({
+        name: 'AlarmCurrentDetail',
+        query: {
+          id: row.alarmId,
+          row: JSON.stringify(row),
+        },
+      })
+    }
+    else {
+      ElMessage.warning('该数据缺少报警信息')
+    }
+  }
+}
+</script>
+
+<template>
+  <el-dialog v-model="dialogFormVisible" title="消息通知" append-to-body>
+    <normal-table
+      :data="list" :total="0" :columns="columns" :query="{}" :list-loading="loadingTable"
+      :pagination="false" :height="400"
+    >
+      <template #columns>
+        <el-table-column label="操作" align="center" width="80">
+          <template #default="scope">
+            <el-button
+              type="primary" link size="small"
+              :disabled="!((scope.row.messageTypeDetail.includes('报警') && !scope.row.messageTypeDetail.includes('解除')) || scope.row.messageTypeDetail.includes('施工'))"
+              @click="detail(scope.row)"
+            >
+              查看
+            </el-button>
+          </template>
+        </el-table-column>
+      </template>
+    </normal-table>
+    <template #footer>
+      <div class="dialog-footer">
+        <el-button type="primary" @click="cancel">
+          确认
+        </el-button>
+      </div>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+.el-dialog {
+  width: 700px;
+}
+
+.el-select {
+  width: 100%;
+}
+</style>
diff --git a/src/views/home/dashboard/fullScreen-components/alarmCount.vue b/src/views/home/dashboard/fullScreen-components/alarmCount.vue
index d65e913..ba24ad9 100644
--- a/src/views/home/dashboard/fullScreen-components/alarmCount.vue
+++ b/src/views/home/dashboard/fullScreen-components/alarmCount.vue
@@ -96,9 +96,10 @@
 // }
 
 .active {
-  color: #3d7eff;
+  color: #1c3444;
   border-color: #e6ebf5;
   outline: none;
-  background-color: rgba($color: #98a7bb, $alpha: 80%);
+  font-weight: 700;
+  background-color: rgba($color: #98a7bb, $alpha: 100%);
 }
 </style>
diff --git a/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue b/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue
index 08d7a93..f723273 100644
--- a/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue
+++ b/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue
@@ -196,7 +196,7 @@
           text-align: center;
           font-size: 24px;
           font-weight: 700;
-          color: #fff;
+          color: #d81010;
         }
 
         .title1 {
diff --git a/src/views/home/dashboard/fullScreen-components/baseOverView.vue b/src/views/home/dashboard/fullScreen-components/baseOverView.vue
index e973da6..bd3a653 100644
--- a/src/views/home/dashboard/fullScreen-components/baseOverView.vue
+++ b/src/views/home/dashboard/fullScreen-components/baseOverView.vue
@@ -90,15 +90,24 @@
     // justify-content: space-between;
     margin: 20px 0;
 
-    img {
-      width: 90%;
+    .img {
+      width: 50%;
+      box-sizing: border-box;
+      // flex: 1;
+
+      img {
+        width: 90%;
+        height: 100%;
+      }
     }
 
     .data {
       box-sizing: border-box;
       margin-left: 5px;
+
       // display: flex;
       .value {
+
         // padding-left: 10px;
         .value {
           color: #fff;
diff --git a/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue b/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue
index 3dd0897..eb2c2fd 100644
--- a/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue
+++ b/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue
@@ -18,7 +18,7 @@
 
 onMounted(() => {
   setTimeout(() => {
-    xAxisData.value = ['第一分公司', '第二分公司', '第三分公司', '第四分公司', '第五分公司']
+    xAxisData.value = ['第一分公司', '第二分公司', '第三分公司', '第四分公司', '第五分公司'].reverse()
     data.value = [
       {
         name: '数量',
diff --git a/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue b/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue
index c933977..81e19fa 100644
--- a/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue
+++ b/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue
@@ -113,10 +113,11 @@
 }
 
 .active {
-  color: #3d7eff;
+  color: #1c3444;
   border-color: #e6ebf5;
   outline: none;
-  background-color: rgba($color: #98a7bb, $alpha: 80%);
+  font-weight: 700;
+  background-color: rgba($color: #98a7bb, $alpha: 100%);
 }
 
 // .layout {

diff --git a/src/assets/fullscren/br-logo.png b/src/assets/fullscren/br-logo.png
new file mode 100644
index 0000000..f3db083
--- /dev/null
+++ b/src/assets/fullscren/br-logo.png
Binary files differ
diff --git a/src/assets/fullscren/br-title.png b/src/assets/fullscren/br-title.png
new file mode 100644
index 0000000..9c7237e
--- /dev/null
+++ b/src/assets/fullscren/br-title.png
Binary files differ
diff --git a/src/components/DeptSelect/index.vue b/src/components/DeptSelect/index.vue
index ef7bd91..948bd8b 100644
--- a/src/components/DeptSelect/index.vue
+++ b/src/components/DeptSelect/index.vue
@@ -68,16 +68,17 @@
 function fetchPcode() {
   // 如果未指定需要展示的部门类型，获取全部部门
   if (!props.deptType) {
-    if (dictStore.allDeptList.length === 0) { // 如果store中未存储，从服务器上获取
-      getDeptTreeList().then((res) => {
-        const list = res.data
-        dictStore.setAllDeptList(list)
-        refreshList(list)
-      })
-    }
-    else {
-      refreshList(dictStore.allDeptList)
-    }
+    // if (dictStore.allDeptList.length === 0) { // 如果store中未存储，从服务器上获取
+    getDeptTreeList().then((res) => {
+      const list = res.data.filter((item: any) => item.id !== '0')
+      dictStore.setAllDeptList(list)
+      refreshList(list)
+      console.log(list, 'list')
+    })
+    // }
+    // else {
+    //   refreshList(dictStore.allDeptList)
+    // }
   }
   else { // 如果指定了需要展示的部门类型
     if (dictStore.companyList.length === 0) { // 如果store中未存储，从服务器上获取
@@ -159,24 +160,15 @@
 <template>
   <div style="width: 100%;">
     <el-tree-select
-      v-if="multiData"
-      v-model="value"
-      :data="deptTreeList"
-      node-key="id"
-      :filter-node-method="filterTree"
-      :props="defaultProps"
-      :expand-on-click-node="false"
-      :render-after-expand="false"
-      :size="props.size"
-      :placeholder="props.placeholder"
-      :clearable="props.clearable"
-      check-strictly
-      check-on-click-node
-      filterable
-      class="full-width-input"
-      :disabled="props.disabled"
+      v-if="multiData" v-model="value" :data="deptTreeList" node-key="id" :filter-node-method="filterTree"
+      :props="defaultProps" :expand-on-click-node="false" :render-after-expand="false" :size="props.size"
+      :placeholder="props.placeholder" :clearable="props.clearable" check-strictly check-on-click-node filterable
+      class="full-width-input" :disabled="props.disabled"
     />
-    <el-select v-else v-model="value" :placeholder="props.placeholder" :size="props.size" :disabled="props.disabled" :clearable="props.clearable" class="full-width-input">
+    <el-select
+      v-else v-model="value" :placeholder="props.placeholder" :size="props.size" :disabled="props.disabled"
+      :clearable="props.clearable" class="full-width-input"
+    >
       <el-option v-for="(item, index) in deptTreeList" :key="index" :label="item.name" :value="item.id" />
     </el-select>
   </div>
diff --git a/src/components/Echart/BarChart3D.vue b/src/components/Echart/BarChart3D.vue
index 8b8d8ea..ee7dbba 100644
--- a/src/components/Echart/BarChart3D.vue
+++ b/src/components/Echart/BarChart3D.vue
@@ -276,12 +276,12 @@
       textStyle: {
         fontSize: 16,
       },
-      axisPointer: {
-        type: 'cross',
-        label: {
-          fontSize: 13,
-        },
-      },
+      // axisPointer: {
+      //   type: 'cross',
+      //   label: {
+      //     fontSize: 13,
+      //   },
+      // },
       valueFormatter: (value: string | number) => {
         return value ? value + props.unit : value === 0 ? '0' : ''
       },
diff --git a/src/components/Echart/BarChartHorizontal.vue b/src/components/Echart/BarChartHorizontal.vue
index 6a3c107..366e064 100644
--- a/src/components/Echart/BarChartHorizontal.vue
+++ b/src/components/Echart/BarChartHorizontal.vue
@@ -265,12 +265,12 @@
       textStyle: {
         fontSize: 16,
       },
-      axisPointer: {
-        type: 'cross',
-        label: {
-          fontSize: 13,
-        },
-      },
+      // axisPointer: {
+      //   type: 'cross',
+      //   label: {
+      //     fontSize: 13,
+      //   },
+      // },
       valueFormatter: (value: string | number) => {
         return value ? value + props.unit : ''
       },
diff --git a/src/components/Echart/BarChartVertical.vue b/src/components/Echart/BarChartVertical.vue
index 7701800..8f36130 100644
--- a/src/components/Echart/BarChartVertical.vue
+++ b/src/components/Echart/BarChartVertical.vue
@@ -253,12 +253,12 @@
       textStyle: {
         fontSize: 16,
       },
-      axisPointer: {
-        type: 'cross',
-        label: {
-          fontSize: 13,
-        },
-      },
+      // axisPointer: {
+      //   type: 'cross',
+      //   label: {
+      //     fontSize: 13,
+      //   },
+      // },
       valueFormatter: (value: string | number) => {
         return value ? value + props.unit : value === 0 ? '0' : ''
       },
diff --git a/src/components/Echart/LineChart.vue b/src/components/Echart/LineChart.vue
index faf6777..751133f 100644
--- a/src/components/Echart/LineChart.vue
+++ b/src/components/Echart/LineChart.vue
@@ -200,12 +200,12 @@
       textStyle: {
         fontSize: 16,
       },
-      axisPointer: {
-        type: 'cross',
-        label: {
-          fontSize: 13,
-        },
-      },
+      // axisPointer: {
+      //   type: 'cross',
+      //   label: {
+      //     fontSize: 13,
+      //   },
+      // },
       valueFormatter: (value: string | number) => {
         return value ? value + props.unit : value === 0 ? '0' : ''
       },
diff --git a/src/components/map/index offline.vue b/src/components/map/index offline.vue
index 5bf7bb9..e8c31b0 100644
--- a/src/components/map/index offline.vue
+++ b/src/components/map/index offline.vue
@@ -512,7 +512,7 @@
 <template>
   <div class="container">
     <!-- 地图 -->
-    <div id="map" ref="wrapRef " v-loading="loading" />
+    <div id="map" ref="wrapRef" v-loading="loading" />
   </div>
 </template>
 
diff --git a/src/layouts/components/Tools/alarmList.vue b/src/layouts/components/Tools/alarmList.vue
index 425ec3d..1274d52 100644
--- a/src/layouts/components/Tools/alarmList.vue
+++ b/src/layouts/components/Tools/alarmList.vue
@@ -151,7 +151,7 @@
       <template v-else>
         <div v-for="message of messageList" :key="message.id" class="message-item">
           <div class="message-content" @click="detailRow(message)">
-            <div class="title">
+            <div class="title" :title="`${message.alarmMsg}${message.alarmTime}`">
               <div class="container">
                 <div
                   :class="`mar circle circle-${message.alarmLevelName.includes('一级') ? '1' : message.alarmLevelName.includes('二级') ? '2' : message.alarmLevelName.includes('三级') ? '3' : 'other'}`"
diff --git a/src/views/home/dashboard/components/controlMap.vue b/src/views/home/dashboard/components/controlMap.vue
index e1d0651..388cec5 100644
--- a/src/views/home/dashboard/components/controlMap.vue
+++ b/src/views/home/dashboard/components/controlMap.vue
@@ -326,6 +326,7 @@
   setTimeout(() => {
     ele.setAttribute('style', 'font-size: 16px')
   }, 50)
+  detailRef.value.close()
 }
 const publicPath = window.location.href.split('#')[0]
 watch(() => showStatus.value, (newVal) => {
diff --git a/src/views/home/dashboard/components/demonstration.vue b/src/views/home/dashboard/components/demonstration.vue
index 4677f14..f9c4f14 100644
--- a/src/views/home/dashboard/components/demonstration.vue
+++ b/src/views/home/dashboard/components/demonstration.vue
@@ -30,31 +30,71 @@
     <div class="district-header">
       {{ $props.data.name }}
     </div>
+    <div class="content">
+      <div class="name">
+        设备类型:
+      </div>
+      <div class="value">
+        {{ $props.data.type }}
+      </div>
+    </div>
+    <div class="content">
+      <div class="name">
+        设备编号:
+      </div>
+      <div class="value">
+        {{ }}
+      </div>
+    </div>
+    <div class="content">
+      <div class="name">
+        厂商:
+      </div>
+      <div class="value">
+        北京无线电计量测试研究所
+      </div>
+    </div>
+    <div class="content">
+      <div class="name">
+        负责人:
+      </div>
+      <div class="value">
+        {{ }}
+      </div>
+    </div>
+    <div class="content">
+      <div class="name">
+        联系方式:
+      </div>
+      <div class="value" />
+    </div>
+    <div class="content">
+      <div class="name">
+        管理单位:
+      </div>
+      <div class="value">
+        第一分公司
+      </div>
+    </div>
+    <div class="content">
+      <div class="name">
+        详细位置:
+      </div>
+      <div class="value" />
+    </div>
     <!-- <div class="content">
-      <div class="name">面积:</div>
-      <div class="value">{{ $props.data.area }}平方公里</div>
-    </div>
-    <div class="content">
-      <div class="name">管理公司:</div>
-      <div class="value">{{ $props.data.deptName }}</div>
-    </div>
-    <div class="content">
-      <div class="name">管线长度:</div>
-      <div class="value">{{ $props.data.long }}公里</div>
-    </div>
-    <div class="content">
       <div class="name">调压站:</div>
       <div class="value">{{ $props.data.tyz }}座</div>
-    </div>
-    <div class="content">
+    </div> -->
+    <!-- <div class="content">
       <div class="name">调压箱:</div>
       <div class="value"> {{ $props.data.tyx }}座</div>
-    </div>
-    <div class="content">
+    </div> -->
+    <!-- <div class="content">
       <div class="name">闸井:</div>
       <div class="value">{{ $props.data.well }}个</div>
-    </div>
-    <div class="content">
+    </div> -->
+    <!-- <div class="content">
       <div class="name">监控覆盖率:</div>
       <div class="value">{{ $props.data.rate }}%</div>
     </div> -->
diff --git a/src/views/home/dashboard/components/detailInfoDialog.vue b/src/views/home/dashboard/components/detailInfoDialog.vue
index 1aad185..351fbf9 100644
--- a/src/views/home/dashboard/components/detailInfoDialog.vue
+++ b/src/views/home/dashboard/components/detailInfoDialog.vue
@@ -28,11 +28,13 @@
   }
   dialogFormVisible.value = true
 }
-defineExpose({ initDialog })
+
 // 关闭
 const close = () => {
   infoWindow.value.close()
 }
+
+defineExpose({ initDialog, close })
 </script>
 
 <template>
diff --git a/src/views/home/dashboard/components/noticeDialog.vue b/src/views/home/dashboard/components/noticeDialog.vue
new file mode 100644
index 0000000..4152ae2
--- /dev/null
+++ b/src/views/home/dashboard/components/noticeDialog.vue
@@ -0,0 +1,95 @@
+<!--
+  Description: 消息通知-更多消息弹窗
+  Author: 李亚光
+  Date: 2024-10-10
+ -->
+<script lang="ts" setup name="NoticeMoreDialog">
+import { ElMessage } from 'element-plus'
+import { getMessage } from '@/api/home/dashboard/index'
+const $router = useRouter()
+const dialogFormVisible = ref(false) // 对话框是否显示
+const list = ref<any[]>([])
+const columns = ref<any>([
+  { text: '消息提醒类型', value: 'messageTypeDetail', align: 'center', width: '200' },
+  { text: '消息提醒内容', value: 'messageContent', align: 'center' },
+  { text: '时间', value: 'ts', align: 'center', width: '180' },
+])
+const loadingTable = ref(true)
+const initDialog = () => {
+  dialogFormVisible.value = true
+}
+const cancel = () => {
+  dialogFormVisible.value = false
+}
+const fetchData = () => {
+  loadingTable.value = true
+  getMessage().then((res) => {
+    list.value = res.data.rows.reverse()
+    loadingTable.value = false
+  }).catch(() => {
+    loadingTable.value = false
+  })
+}
+fetchData()
+defineExpose({
+  initDialog,
+})
+// 查看详情
+const detail = (row: any) => {
+  // 报警类跳转
+  if (row.messageTypeDetail.includes('报警')) {
+    if (row.alarmId) {
+      $router.push({
+        name: 'AlarmCurrentDetail',
+        query: {
+          id: row.alarmId,
+          row: JSON.stringify(row),
+        },
+      })
+    }
+    else {
+      ElMessage.warning('该数据缺少报警信息')
+    }
+  }
+}
+</script>
+
+<template>
+  <el-dialog v-model="dialogFormVisible" title="消息通知" append-to-body>
+    <normal-table
+      :data="list" :total="0" :columns="columns" :query="{}" :list-loading="loadingTable"
+      :pagination="false" :height="400"
+    >
+      <template #columns>
+        <el-table-column label="操作" align="center" width="80">
+          <template #default="scope">
+            <el-button
+              type="primary" link size="small"
+              :disabled="!((scope.row.messageTypeDetail.includes('报警') && !scope.row.messageTypeDetail.includes('解除')) || scope.row.messageTypeDetail.includes('施工'))"
+              @click="detail(scope.row)"
+            >
+              查看
+            </el-button>
+          </template>
+        </el-table-column>
+      </template>
+    </normal-table>
+    <template #footer>
+      <div class="dialog-footer">
+        <el-button type="primary" @click="cancel">
+          确认
+        </el-button>
+      </div>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+.el-dialog {
+  width: 700px;
+}
+
+.el-select {
+  width: 100%;
+}
+</style>
diff --git a/src/views/home/dashboard/fullScreen-components/alarmCount.vue b/src/views/home/dashboard/fullScreen-components/alarmCount.vue
index d65e913..ba24ad9 100644
--- a/src/views/home/dashboard/fullScreen-components/alarmCount.vue
+++ b/src/views/home/dashboard/fullScreen-components/alarmCount.vue
@@ -96,9 +96,10 @@
 // }
 
 .active {
-  color: #3d7eff;
+  color: #1c3444;
   border-color: #e6ebf5;
   outline: none;
-  background-color: rgba($color: #98a7bb, $alpha: 80%);
+  font-weight: 700;
+  background-color: rgba($color: #98a7bb, $alpha: 100%);
 }
 </style>
diff --git a/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue b/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue
index 08d7a93..f723273 100644
--- a/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue
+++ b/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue
@@ -196,7 +196,7 @@
           text-align: center;
           font-size: 24px;
           font-weight: 700;
-          color: #fff;
+          color: #d81010;
         }
 
         .title1 {
diff --git a/src/views/home/dashboard/fullScreen-components/baseOverView.vue b/src/views/home/dashboard/fullScreen-components/baseOverView.vue
index e973da6..bd3a653 100644
--- a/src/views/home/dashboard/fullScreen-components/baseOverView.vue
+++ b/src/views/home/dashboard/fullScreen-components/baseOverView.vue
@@ -90,15 +90,24 @@
     // justify-content: space-between;
     margin: 20px 0;
 
-    img {
-      width: 90%;
+    .img {
+      width: 50%;
+      box-sizing: border-box;
+      // flex: 1;
+
+      img {
+        width: 90%;
+        height: 100%;
+      }
     }
 
     .data {
       box-sizing: border-box;
       margin-left: 5px;
+
       // display: flex;
       .value {
+
         // padding-left: 10px;
         .value {
           color: #fff;
diff --git a/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue b/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue
index 3dd0897..eb2c2fd 100644
--- a/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue
+++ b/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue
@@ -18,7 +18,7 @@
 
 onMounted(() => {
   setTimeout(() => {
-    xAxisData.value = ['第一分公司', '第二分公司', '第三分公司', '第四分公司', '第五分公司']
+    xAxisData.value = ['第一分公司', '第二分公司', '第三分公司', '第四分公司', '第五分公司'].reverse()
     data.value = [
       {
         name: '数量',
diff --git a/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue b/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue
index c933977..81e19fa 100644
--- a/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue
+++ b/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue
@@ -113,10 +113,11 @@
 }
 
 .active {
-  color: #3d7eff;
+  color: #1c3444;
   border-color: #e6ebf5;
   outline: none;
-  background-color: rgba($color: #98a7bb, $alpha: 80%);
+  font-weight: 700;
+  background-color: rgba($color: #98a7bb, $alpha: 100%);
 }
 
 // .layout {
diff --git a/src/views/home/dashboard/fullScreen.vue b/src/views/home/dashboard/fullScreen.vue
index 410e728..21f89e0 100644
--- a/src/views/home/dashboard/fullScreen.vue
+++ b/src/views/home/dashboard/fullScreen.vue
@@ -27,7 +27,12 @@
 <template>
   <div class="container-full">
     <!-- banner区域 -->
-    <div class="banner" />
+    <div class="banner">
+      <div class="title">
+        <div class="logo" />
+        <div class="name" />
+      </div>
+    </div>
     <!-- 关闭按钮 -->
     <div class="close">
       <div class="icon" @click="closePage">
@@ -72,7 +77,29 @@
     z-index: 98;
     height: 100px;
     width: 100%;
-    background: url("@/assets/fullscren/banner.png") no-repeat;
+    background: url("@/assets/fullscren/banner-bg.png") no-repeat;
+
+    .title {
+      height: 100px;
+      width: 100%;
+      position: absolute;
+      top: 0;
+      left: 0;
+      z-index: 99;
+
+      // .logo {
+      //   width: 200px;
+      //   height: 100px;
+      //   background: url("@/assets/fullscren/br-logo.png") no-repeat;
+      // }
+
+      .name {
+        // width: 400px;
+        height: 80px;
+        width: 100%;
+        background: url("@/assets/fullscren/br-title.png") no-repeat center;
+      }
+    }
   }
 
   .close {

diff --git a/src/assets/fullscren/br-logo.png b/src/assets/fullscren/br-logo.png
new file mode 100644
index 0000000..f3db083
--- /dev/null
+++ b/src/assets/fullscren/br-logo.png
Binary files differ
diff --git a/src/assets/fullscren/br-title.png b/src/assets/fullscren/br-title.png
new file mode 100644
index 0000000..9c7237e
--- /dev/null
+++ b/src/assets/fullscren/br-title.png
Binary files differ
diff --git a/src/components/DeptSelect/index.vue b/src/components/DeptSelect/index.vue
index ef7bd91..948bd8b 100644
--- a/src/components/DeptSelect/index.vue
+++ b/src/components/DeptSelect/index.vue
@@ -68,16 +68,17 @@
 function fetchPcode() {
   // 如果未指定需要展示的部门类型，获取全部部门
   if (!props.deptType) {
-    if (dictStore.allDeptList.length === 0) { // 如果store中未存储，从服务器上获取
-      getDeptTreeList().then((res) => {
-        const list = res.data
-        dictStore.setAllDeptList(list)
-        refreshList(list)
-      })
-    }
-    else {
-      refreshList(dictStore.allDeptList)
-    }
+    // if (dictStore.allDeptList.length === 0) { // 如果store中未存储，从服务器上获取
+    getDeptTreeList().then((res) => {
+      const list = res.data.filter((item: any) => item.id !== '0')
+      dictStore.setAllDeptList(list)
+      refreshList(list)
+      console.log(list, 'list')
+    })
+    // }
+    // else {
+    //   refreshList(dictStore.allDeptList)
+    // }
   }
   else { // 如果指定了需要展示的部门类型
     if (dictStore.companyList.length === 0) { // 如果store中未存储，从服务器上获取
@@ -159,24 +160,15 @@
 <template>
   <div style="width: 100%;">
     <el-tree-select
-      v-if="multiData"
-      v-model="value"
-      :data="deptTreeList"
-      node-key="id"
-      :filter-node-method="filterTree"
-      :props="defaultProps"
-      :expand-on-click-node="false"
-      :render-after-expand="false"
-      :size="props.size"
-      :placeholder="props.placeholder"
-      :clearable="props.clearable"
-      check-strictly
-      check-on-click-node
-      filterable
-      class="full-width-input"
-      :disabled="props.disabled"
+      v-if="multiData" v-model="value" :data="deptTreeList" node-key="id" :filter-node-method="filterTree"
+      :props="defaultProps" :expand-on-click-node="false" :render-after-expand="false" :size="props.size"
+      :placeholder="props.placeholder" :clearable="props.clearable" check-strictly check-on-click-node filterable
+      class="full-width-input" :disabled="props.disabled"
     />
-    <el-select v-else v-model="value" :placeholder="props.placeholder" :size="props.size" :disabled="props.disabled" :clearable="props.clearable" class="full-width-input">
+    <el-select
+      v-else v-model="value" :placeholder="props.placeholder" :size="props.size" :disabled="props.disabled"
+      :clearable="props.clearable" class="full-width-input"
+    >
       <el-option v-for="(item, index) in deptTreeList" :key="index" :label="item.name" :value="item.id" />
     </el-select>
   </div>
diff --git a/src/components/Echart/BarChart3D.vue b/src/components/Echart/BarChart3D.vue
index 8b8d8ea..ee7dbba 100644
--- a/src/components/Echart/BarChart3D.vue
+++ b/src/components/Echart/BarChart3D.vue
@@ -276,12 +276,12 @@
       textStyle: {
         fontSize: 16,
       },
-      axisPointer: {
-        type: 'cross',
-        label: {
-          fontSize: 13,
-        },
-      },
+      // axisPointer: {
+      //   type: 'cross',
+      //   label: {
+      //     fontSize: 13,
+      //   },
+      // },
       valueFormatter: (value: string | number) => {
         return value ? value + props.unit : value === 0 ? '0' : ''
       },
diff --git a/src/components/Echart/BarChartHorizontal.vue b/src/components/Echart/BarChartHorizontal.vue
index 6a3c107..366e064 100644
--- a/src/components/Echart/BarChartHorizontal.vue
+++ b/src/components/Echart/BarChartHorizontal.vue
@@ -265,12 +265,12 @@
       textStyle: {
         fontSize: 16,
       },
-      axisPointer: {
-        type: 'cross',
-        label: {
-          fontSize: 13,
-        },
-      },
+      // axisPointer: {
+      //   type: 'cross',
+      //   label: {
+      //     fontSize: 13,
+      //   },
+      // },
       valueFormatter: (value: string | number) => {
         return value ? value + props.unit : ''
       },
diff --git a/src/components/Echart/BarChartVertical.vue b/src/components/Echart/BarChartVertical.vue
index 7701800..8f36130 100644
--- a/src/components/Echart/BarChartVertical.vue
+++ b/src/components/Echart/BarChartVertical.vue
@@ -253,12 +253,12 @@
       textStyle: {
         fontSize: 16,
       },
-      axisPointer: {
-        type: 'cross',
-        label: {
-          fontSize: 13,
-        },
-      },
+      // axisPointer: {
+      //   type: 'cross',
+      //   label: {
+      //     fontSize: 13,
+      //   },
+      // },
       valueFormatter: (value: string | number) => {
         return value ? value + props.unit : value === 0 ? '0' : ''
       },
diff --git a/src/components/Echart/LineChart.vue b/src/components/Echart/LineChart.vue
index faf6777..751133f 100644
--- a/src/components/Echart/LineChart.vue
+++ b/src/components/Echart/LineChart.vue
@@ -200,12 +200,12 @@
       textStyle: {
         fontSize: 16,
       },
-      axisPointer: {
-        type: 'cross',
-        label: {
-          fontSize: 13,
-        },
-      },
+      // axisPointer: {
+      //   type: 'cross',
+      //   label: {
+      //     fontSize: 13,
+      //   },
+      // },
       valueFormatter: (value: string | number) => {
         return value ? value + props.unit : value === 0 ? '0' : ''
       },
diff --git a/src/components/map/index offline.vue b/src/components/map/index offline.vue
index 5bf7bb9..e8c31b0 100644
--- a/src/components/map/index offline.vue
+++ b/src/components/map/index offline.vue
@@ -512,7 +512,7 @@
 <template>
   <div class="container">
     <!-- 地图 -->
-    <div id="map" ref="wrapRef " v-loading="loading" />
+    <div id="map" ref="wrapRef" v-loading="loading" />
   </div>
 </template>
 
diff --git a/src/layouts/components/Tools/alarmList.vue b/src/layouts/components/Tools/alarmList.vue
index 425ec3d..1274d52 100644
--- a/src/layouts/components/Tools/alarmList.vue
+++ b/src/layouts/components/Tools/alarmList.vue
@@ -151,7 +151,7 @@
       <template v-else>
         <div v-for="message of messageList" :key="message.id" class="message-item">
           <div class="message-content" @click="detailRow(message)">
-            <div class="title">
+            <div class="title" :title="`${message.alarmMsg}${message.alarmTime}`">
               <div class="container">
                 <div
                   :class="`mar circle circle-${message.alarmLevelName.includes('一级') ? '1' : message.alarmLevelName.includes('二级') ? '2' : message.alarmLevelName.includes('三级') ? '3' : 'other'}`"
diff --git a/src/views/home/dashboard/components/controlMap.vue b/src/views/home/dashboard/components/controlMap.vue
index e1d0651..388cec5 100644
--- a/src/views/home/dashboard/components/controlMap.vue
+++ b/src/views/home/dashboard/components/controlMap.vue
@@ -326,6 +326,7 @@
   setTimeout(() => {
     ele.setAttribute('style', 'font-size: 16px')
   }, 50)
+  detailRef.value.close()
 }
 const publicPath = window.location.href.split('#')[0]
 watch(() => showStatus.value, (newVal) => {
diff --git a/src/views/home/dashboard/components/demonstration.vue b/src/views/home/dashboard/components/demonstration.vue
index 4677f14..f9c4f14 100644
--- a/src/views/home/dashboard/components/demonstration.vue
+++ b/src/views/home/dashboard/components/demonstration.vue
@@ -30,31 +30,71 @@
     <div class="district-header">
       {{ $props.data.name }}
     </div>
+    <div class="content">
+      <div class="name">
+        设备类型:
+      </div>
+      <div class="value">
+        {{ $props.data.type }}
+      </div>
+    </div>
+    <div class="content">
+      <div class="name">
+        设备编号:
+      </div>
+      <div class="value">
+        {{ }}
+      </div>
+    </div>
+    <div class="content">
+      <div class="name">
+        厂商:
+      </div>
+      <div class="value">
+        北京无线电计量测试研究所
+      </div>
+    </div>
+    <div class="content">
+      <div class="name">
+        负责人:
+      </div>
+      <div class="value">
+        {{ }}
+      </div>
+    </div>
+    <div class="content">
+      <div class="name">
+        联系方式:
+      </div>
+      <div class="value" />
+    </div>
+    <div class="content">
+      <div class="name">
+        管理单位:
+      </div>
+      <div class="value">
+        第一分公司
+      </div>
+    </div>
+    <div class="content">
+      <div class="name">
+        详细位置:
+      </div>
+      <div class="value" />
+    </div>
     <!-- <div class="content">
-      <div class="name">面积:</div>
-      <div class="value">{{ $props.data.area }}平方公里</div>
-    </div>
-    <div class="content">
-      <div class="name">管理公司:</div>
-      <div class="value">{{ $props.data.deptName }}</div>
-    </div>
-    <div class="content">
-      <div class="name">管线长度:</div>
-      <div class="value">{{ $props.data.long }}公里</div>
-    </div>
-    <div class="content">
       <div class="name">调压站:</div>
       <div class="value">{{ $props.data.tyz }}座</div>
-    </div>
-    <div class="content">
+    </div> -->
+    <!-- <div class="content">
       <div class="name">调压箱:</div>
       <div class="value"> {{ $props.data.tyx }}座</div>
-    </div>
-    <div class="content">
+    </div> -->
+    <!-- <div class="content">
       <div class="name">闸井:</div>
       <div class="value">{{ $props.data.well }}个</div>
-    </div>
-    <div class="content">
+    </div> -->
+    <!-- <div class="content">
       <div class="name">监控覆盖率:</div>
       <div class="value">{{ $props.data.rate }}%</div>
     </div> -->
diff --git a/src/views/home/dashboard/components/detailInfoDialog.vue b/src/views/home/dashboard/components/detailInfoDialog.vue
index 1aad185..351fbf9 100644
--- a/src/views/home/dashboard/components/detailInfoDialog.vue
+++ b/src/views/home/dashboard/components/detailInfoDialog.vue
@@ -28,11 +28,13 @@
   }
   dialogFormVisible.value = true
 }
-defineExpose({ initDialog })
+
 // 关闭
 const close = () => {
   infoWindow.value.close()
 }
+
+defineExpose({ initDialog, close })
 </script>
 
 <template>
diff --git a/src/views/home/dashboard/components/noticeDialog.vue b/src/views/home/dashboard/components/noticeDialog.vue
new file mode 100644
index 0000000..4152ae2
--- /dev/null
+++ b/src/views/home/dashboard/components/noticeDialog.vue
@@ -0,0 +1,95 @@
+<!--
+  Description: 消息通知-更多消息弹窗
+  Author: 李亚光
+  Date: 2024-10-10
+ -->
+<script lang="ts" setup name="NoticeMoreDialog">
+import { ElMessage } from 'element-plus'
+import { getMessage } from '@/api/home/dashboard/index'
+const $router = useRouter()
+const dialogFormVisible = ref(false) // 对话框是否显示
+const list = ref<any[]>([])
+const columns = ref<any>([
+  { text: '消息提醒类型', value: 'messageTypeDetail', align: 'center', width: '200' },
+  { text: '消息提醒内容', value: 'messageContent', align: 'center' },
+  { text: '时间', value: 'ts', align: 'center', width: '180' },
+])
+const loadingTable = ref(true)
+const initDialog = () => {
+  dialogFormVisible.value = true
+}
+const cancel = () => {
+  dialogFormVisible.value = false
+}
+const fetchData = () => {
+  loadingTable.value = true
+  getMessage().then((res) => {
+    list.value = res.data.rows.reverse()
+    loadingTable.value = false
+  }).catch(() => {
+    loadingTable.value = false
+  })
+}
+fetchData()
+defineExpose({
+  initDialog,
+})
+// 查看详情
+const detail = (row: any) => {
+  // 报警类跳转
+  if (row.messageTypeDetail.includes('报警')) {
+    if (row.alarmId) {
+      $router.push({
+        name: 'AlarmCurrentDetail',
+        query: {
+          id: row.alarmId,
+          row: JSON.stringify(row),
+        },
+      })
+    }
+    else {
+      ElMessage.warning('该数据缺少报警信息')
+    }
+  }
+}
+</script>
+
+<template>
+  <el-dialog v-model="dialogFormVisible" title="消息通知" append-to-body>
+    <normal-table
+      :data="list" :total="0" :columns="columns" :query="{}" :list-loading="loadingTable"
+      :pagination="false" :height="400"
+    >
+      <template #columns>
+        <el-table-column label="操作" align="center" width="80">
+          <template #default="scope">
+            <el-button
+              type="primary" link size="small"
+              :disabled="!((scope.row.messageTypeDetail.includes('报警') && !scope.row.messageTypeDetail.includes('解除')) || scope.row.messageTypeDetail.includes('施工'))"
+              @click="detail(scope.row)"
+            >
+              查看
+            </el-button>
+          </template>
+        </el-table-column>
+      </template>
+    </normal-table>
+    <template #footer>
+      <div class="dialog-footer">
+        <el-button type="primary" @click="cancel">
+          确认
+        </el-button>
+      </div>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+.el-dialog {
+  width: 700px;
+}
+
+.el-select {
+  width: 100%;
+}
+</style>
diff --git a/src/views/home/dashboard/fullScreen-components/alarmCount.vue b/src/views/home/dashboard/fullScreen-components/alarmCount.vue
index d65e913..ba24ad9 100644
--- a/src/views/home/dashboard/fullScreen-components/alarmCount.vue
+++ b/src/views/home/dashboard/fullScreen-components/alarmCount.vue
@@ -96,9 +96,10 @@
 // }
 
 .active {
-  color: #3d7eff;
+  color: #1c3444;
   border-color: #e6ebf5;
   outline: none;
-  background-color: rgba($color: #98a7bb, $alpha: 80%);
+  font-weight: 700;
+  background-color: rgba($color: #98a7bb, $alpha: 100%);
 }
 </style>
diff --git a/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue b/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue
index 08d7a93..f723273 100644
--- a/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue
+++ b/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue
@@ -196,7 +196,7 @@
           text-align: center;
           font-size: 24px;
           font-weight: 700;
-          color: #fff;
+          color: #d81010;
         }
 
         .title1 {
diff --git a/src/views/home/dashboard/fullScreen-components/baseOverView.vue b/src/views/home/dashboard/fullScreen-components/baseOverView.vue
index e973da6..bd3a653 100644
--- a/src/views/home/dashboard/fullScreen-components/baseOverView.vue
+++ b/src/views/home/dashboard/fullScreen-components/baseOverView.vue
@@ -90,15 +90,24 @@
     // justify-content: space-between;
     margin: 20px 0;
 
-    img {
-      width: 90%;
+    .img {
+      width: 50%;
+      box-sizing: border-box;
+      // flex: 1;
+
+      img {
+        width: 90%;
+        height: 100%;
+      }
     }
 
     .data {
       box-sizing: border-box;
       margin-left: 5px;
+
       // display: flex;
       .value {
+
         // padding-left: 10px;
         .value {
           color: #fff;
diff --git a/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue b/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue
index 3dd0897..eb2c2fd 100644
--- a/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue
+++ b/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue
@@ -18,7 +18,7 @@
 
 onMounted(() => {
   setTimeout(() => {
-    xAxisData.value = ['第一分公司', '第二分公司', '第三分公司', '第四分公司', '第五分公司']
+    xAxisData.value = ['第一分公司', '第二分公司', '第三分公司', '第四分公司', '第五分公司'].reverse()
     data.value = [
       {
         name: '数量',
diff --git a/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue b/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue
index c933977..81e19fa 100644
--- a/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue
+++ b/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue
@@ -113,10 +113,11 @@
 }
 
 .active {
-  color: #3d7eff;
+  color: #1c3444;
   border-color: #e6ebf5;
   outline: none;
-  background-color: rgba($color: #98a7bb, $alpha: 80%);
+  font-weight: 700;
+  background-color: rgba($color: #98a7bb, $alpha: 100%);
 }
 
 // .layout {
diff --git a/src/views/home/dashboard/fullScreen.vue b/src/views/home/dashboard/fullScreen.vue
index 410e728..21f89e0 100644
--- a/src/views/home/dashboard/fullScreen.vue
+++ b/src/views/home/dashboard/fullScreen.vue
@@ -27,7 +27,12 @@
 <template>
   <div class="container-full">
     <!-- banner区域 -->
-    <div class="banner" />
+    <div class="banner">
+      <div class="title">
+        <div class="logo" />
+        <div class="name" />
+      </div>
+    </div>
     <!-- 关闭按钮 -->
     <div class="close">
       <div class="icon" @click="closePage">
@@ -72,7 +77,29 @@
     z-index: 98;
     height: 100px;
     width: 100%;
-    background: url("@/assets/fullscren/banner.png") no-repeat;
+    background: url("@/assets/fullscren/banner-bg.png") no-repeat;
+
+    .title {
+      height: 100px;
+      width: 100%;
+      position: absolute;
+      top: 0;
+      left: 0;
+      z-index: 99;
+
+      // .logo {
+      //   width: 200px;
+      //   height: 100px;
+      //   background: url("@/assets/fullscren/br-logo.png") no-repeat;
+      // }
+
+      .name {
+        // width: 400px;
+        height: 80px;
+        width: 100%;
+        background: url("@/assets/fullscren/br-title.png") no-repeat center;
+      }
+    }
   }
 
   .close {
diff --git a/src/views/home/dashboard/index.vue b/src/views/home/dashboard/index.vue
index 42dfbed..df9f331 100644
--- a/src/views/home/dashboard/index.vue
+++ b/src/views/home/dashboard/index.vue
@@ -6,6 +6,7 @@
 <script lang="ts" setup name="Dashboard">
 import card from './components/showCard.vue'
 import { img } from './components/imgData'
+import moreNotice from './components/noticeDialog.vue'
 import { getBase, getDeviceStatus, getMessage } from '@/api/home/dashboard/index'
 import locationAnalysis from '@/views/home/alarm/count/components/locationAnalysis.vue'
 import layout from '@/views/home/alarm/count/components/layout.vue'
@@ -101,10 +102,10 @@
 // 消息通知数据
 const messageLoading = ref(true)
 const messageData = ref<any[]>([])
-// 更多跳转
-const more = (type: string) => {
+// // 更多跳转
+// const  = (type: string) => {
 
-}
+// }
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
 const routeToPage = (item: any) => {
@@ -149,18 +150,26 @@
   // 消息通知
   messageLoading.value = true
   getMessage().then((res) => {
-    messageData.value = res.data.rows
+    messageData.value = res.data.rows.reverse()
     messageLoading.value = false
   }).catch(() => {
     messageLoading.value = false
   })
 }
 fetchData()
+
+// 消息通知-更多
+const noticeRef = ref()
+const more = () => {
+  noticeRef.value.initDialog()
+}
 </script>
 
 <template>
   <!-- 布局 -->
   <app-container>
+    <!-- 消息通知-更多 -->
+    <more-notice ref="noticeRef" />
     <!-- 上部 -->
     <div class="top-container">
       <div class="top-left-container">
@@ -233,8 +242,8 @@
         <template #search>
           <div class="search">
             <div />
-            <div class="more">
-              <!-- >>更多 -->
+            <div class="more" @click="more">
+              >>更多
             </div>
           </div>
         </template>

diff --git a/src/assets/fullscren/br-logo.png b/src/assets/fullscren/br-logo.png
new file mode 100644
index 0000000..f3db083
--- /dev/null
+++ b/src/assets/fullscren/br-logo.png
Binary files differ
diff --git a/src/assets/fullscren/br-title.png b/src/assets/fullscren/br-title.png
new file mode 100644
index 0000000..9c7237e
--- /dev/null
+++ b/src/assets/fullscren/br-title.png
Binary files differ
diff --git a/src/components/DeptSelect/index.vue b/src/components/DeptSelect/index.vue
index ef7bd91..948bd8b 100644
--- a/src/components/DeptSelect/index.vue
+++ b/src/components/DeptSelect/index.vue
@@ -68,16 +68,17 @@
 function fetchPcode() {
   // 如果未指定需要展示的部门类型，获取全部部门
   if (!props.deptType) {
-    if (dictStore.allDeptList.length === 0) { // 如果store中未存储，从服务器上获取
-      getDeptTreeList().then((res) => {
-        const list = res.data
-        dictStore.setAllDeptList(list)
-        refreshList(list)
-      })
-    }
-    else {
-      refreshList(dictStore.allDeptList)
-    }
+    // if (dictStore.allDeptList.length === 0) { // 如果store中未存储，从服务器上获取
+    getDeptTreeList().then((res) => {
+      const list = res.data.filter((item: any) => item.id !== '0')
+      dictStore.setAllDeptList(list)
+      refreshList(list)
+      console.log(list, 'list')
+    })
+    // }
+    // else {
+    //   refreshList(dictStore.allDeptList)
+    // }
   }
   else { // 如果指定了需要展示的部门类型
     if (dictStore.companyList.length === 0) { // 如果store中未存储，从服务器上获取
@@ -159,24 +160,15 @@
 <template>
   <div style="width: 100%;">
     <el-tree-select
-      v-if="multiData"
-      v-model="value"
-      :data="deptTreeList"
-      node-key="id"
-      :filter-node-method="filterTree"
-      :props="defaultProps"
-      :expand-on-click-node="false"
-      :render-after-expand="false"
-      :size="props.size"
-      :placeholder="props.placeholder"
-      :clearable="props.clearable"
-      check-strictly
-      check-on-click-node
-      filterable
-      class="full-width-input"
-      :disabled="props.disabled"
+      v-if="multiData" v-model="value" :data="deptTreeList" node-key="id" :filter-node-method="filterTree"
+      :props="defaultProps" :expand-on-click-node="false" :render-after-expand="false" :size="props.size"
+      :placeholder="props.placeholder" :clearable="props.clearable" check-strictly check-on-click-node filterable
+      class="full-width-input" :disabled="props.disabled"
     />
-    <el-select v-else v-model="value" :placeholder="props.placeholder" :size="props.size" :disabled="props.disabled" :clearable="props.clearable" class="full-width-input">
+    <el-select
+      v-else v-model="value" :placeholder="props.placeholder" :size="props.size" :disabled="props.disabled"
+      :clearable="props.clearable" class="full-width-input"
+    >
       <el-option v-for="(item, index) in deptTreeList" :key="index" :label="item.name" :value="item.id" />
     </el-select>
   </div>
diff --git a/src/components/Echart/BarChart3D.vue b/src/components/Echart/BarChart3D.vue
index 8b8d8ea..ee7dbba 100644
--- a/src/components/Echart/BarChart3D.vue
+++ b/src/components/Echart/BarChart3D.vue
@@ -276,12 +276,12 @@
       textStyle: {
         fontSize: 16,
       },
-      axisPointer: {
-        type: 'cross',
-        label: {
-          fontSize: 13,
-        },
-      },
+      // axisPointer: {
+      //   type: 'cross',
+      //   label: {
+      //     fontSize: 13,
+      //   },
+      // },
       valueFormatter: (value: string | number) => {
         return value ? value + props.unit : value === 0 ? '0' : ''
       },
diff --git a/src/components/Echart/BarChartHorizontal.vue b/src/components/Echart/BarChartHorizontal.vue
index 6a3c107..366e064 100644
--- a/src/components/Echart/BarChartHorizontal.vue
+++ b/src/components/Echart/BarChartHorizontal.vue
@@ -265,12 +265,12 @@
       textStyle: {
         fontSize: 16,
       },
-      axisPointer: {
-        type: 'cross',
-        label: {
-          fontSize: 13,
-        },
-      },
+      // axisPointer: {
+      //   type: 'cross',
+      //   label: {
+      //     fontSize: 13,
+      //   },
+      // },
       valueFormatter: (value: string | number) => {
         return value ? value + props.unit : ''
       },
diff --git a/src/components/Echart/BarChartVertical.vue b/src/components/Echart/BarChartVertical.vue
index 7701800..8f36130 100644
--- a/src/components/Echart/BarChartVertical.vue
+++ b/src/components/Echart/BarChartVertical.vue
@@ -253,12 +253,12 @@
       textStyle: {
         fontSize: 16,
       },
-      axisPointer: {
-        type: 'cross',
-        label: {
-          fontSize: 13,
-        },
-      },
+      // axisPointer: {
+      //   type: 'cross',
+      //   label: {
+      //     fontSize: 13,
+      //   },
+      // },
       valueFormatter: (value: string | number) => {
         return value ? value + props.unit : value === 0 ? '0' : ''
       },
diff --git a/src/components/Echart/LineChart.vue b/src/components/Echart/LineChart.vue
index faf6777..751133f 100644
--- a/src/components/Echart/LineChart.vue
+++ b/src/components/Echart/LineChart.vue
@@ -200,12 +200,12 @@
       textStyle: {
         fontSize: 16,
       },
-      axisPointer: {
-        type: 'cross',
-        label: {
-          fontSize: 13,
-        },
-      },
+      // axisPointer: {
+      //   type: 'cross',
+      //   label: {
+      //     fontSize: 13,
+      //   },
+      // },
       valueFormatter: (value: string | number) => {
         return value ? value + props.unit : value === 0 ? '0' : ''
       },
diff --git a/src/components/map/index offline.vue b/src/components/map/index offline.vue
index 5bf7bb9..e8c31b0 100644
--- a/src/components/map/index offline.vue
+++ b/src/components/map/index offline.vue
@@ -512,7 +512,7 @@
 <template>
   <div class="container">
     <!-- 地图 -->
-    <div id="map" ref="wrapRef " v-loading="loading" />
+    <div id="map" ref="wrapRef" v-loading="loading" />
   </div>
 </template>
 
diff --git a/src/layouts/components/Tools/alarmList.vue b/src/layouts/components/Tools/alarmList.vue
index 425ec3d..1274d52 100644
--- a/src/layouts/components/Tools/alarmList.vue
+++ b/src/layouts/components/Tools/alarmList.vue
@@ -151,7 +151,7 @@
       <template v-else>
         <div v-for="message of messageList" :key="message.id" class="message-item">
           <div class="message-content" @click="detailRow(message)">
-            <div class="title">
+            <div class="title" :title="`${message.alarmMsg}${message.alarmTime}`">
               <div class="container">
                 <div
                   :class="`mar circle circle-${message.alarmLevelName.includes('一级') ? '1' : message.alarmLevelName.includes('二级') ? '2' : message.alarmLevelName.includes('三级') ? '3' : 'other'}`"
diff --git a/src/views/home/dashboard/components/controlMap.vue b/src/views/home/dashboard/components/controlMap.vue
index e1d0651..388cec5 100644
--- a/src/views/home/dashboard/components/controlMap.vue
+++ b/src/views/home/dashboard/components/controlMap.vue
@@ -326,6 +326,7 @@
   setTimeout(() => {
     ele.setAttribute('style', 'font-size: 16px')
   }, 50)
+  detailRef.value.close()
 }
 const publicPath = window.location.href.split('#')[0]
 watch(() => showStatus.value, (newVal) => {
diff --git a/src/views/home/dashboard/components/demonstration.vue b/src/views/home/dashboard/components/demonstration.vue
index 4677f14..f9c4f14 100644
--- a/src/views/home/dashboard/components/demonstration.vue
+++ b/src/views/home/dashboard/components/demonstration.vue
@@ -30,31 +30,71 @@
     <div class="district-header">
       {{ $props.data.name }}
     </div>
+    <div class="content">
+      <div class="name">
+        设备类型:
+      </div>
+      <div class="value">
+        {{ $props.data.type }}
+      </div>
+    </div>
+    <div class="content">
+      <div class="name">
+        设备编号:
+      </div>
+      <div class="value">
+        {{ }}
+      </div>
+    </div>
+    <div class="content">
+      <div class="name">
+        厂商:
+      </div>
+      <div class="value">
+        北京无线电计量测试研究所
+      </div>
+    </div>
+    <div class="content">
+      <div class="name">
+        负责人:
+      </div>
+      <div class="value">
+        {{ }}
+      </div>
+    </div>
+    <div class="content">
+      <div class="name">
+        联系方式:
+      </div>
+      <div class="value" />
+    </div>
+    <div class="content">
+      <div class="name">
+        管理单位:
+      </div>
+      <div class="value">
+        第一分公司
+      </div>
+    </div>
+    <div class="content">
+      <div class="name">
+        详细位置:
+      </div>
+      <div class="value" />
+    </div>
     <!-- <div class="content">
-      <div class="name">面积:</div>
-      <div class="value">{{ $props.data.area }}平方公里</div>
-    </div>
-    <div class="content">
-      <div class="name">管理公司:</div>
-      <div class="value">{{ $props.data.deptName }}</div>
-    </div>
-    <div class="content">
-      <div class="name">管线长度:</div>
-      <div class="value">{{ $props.data.long }}公里</div>
-    </div>
-    <div class="content">
       <div class="name">调压站:</div>
       <div class="value">{{ $props.data.tyz }}座</div>
-    </div>
-    <div class="content">
+    </div> -->
+    <!-- <div class="content">
       <div class="name">调压箱:</div>
       <div class="value"> {{ $props.data.tyx }}座</div>
-    </div>
-    <div class="content">
+    </div> -->
+    <!-- <div class="content">
       <div class="name">闸井:</div>
       <div class="value">{{ $props.data.well }}个</div>
-    </div>
-    <div class="content">
+    </div> -->
+    <!-- <div class="content">
       <div class="name">监控覆盖率:</div>
       <div class="value">{{ $props.data.rate }}%</div>
     </div> -->
diff --git a/src/views/home/dashboard/components/detailInfoDialog.vue b/src/views/home/dashboard/components/detailInfoDialog.vue
index 1aad185..351fbf9 100644
--- a/src/views/home/dashboard/components/detailInfoDialog.vue
+++ b/src/views/home/dashboard/components/detailInfoDialog.vue
@@ -28,11 +28,13 @@
   }
   dialogFormVisible.value = true
 }
-defineExpose({ initDialog })
+
 // 关闭
 const close = () => {
   infoWindow.value.close()
 }
+
+defineExpose({ initDialog, close })
 </script>
 
 <template>
diff --git a/src/views/home/dashboard/components/noticeDialog.vue b/src/views/home/dashboard/components/noticeDialog.vue
new file mode 100644
index 0000000..4152ae2
--- /dev/null
+++ b/src/views/home/dashboard/components/noticeDialog.vue
@@ -0,0 +1,95 @@
+<!--
+  Description: 消息通知-更多消息弹窗
+  Author: 李亚光
+  Date: 2024-10-10
+ -->
+<script lang="ts" setup name="NoticeMoreDialog">
+import { ElMessage } from 'element-plus'
+import { getMessage } from '@/api/home/dashboard/index'
+const $router = useRouter()
+const dialogFormVisible = ref(false) // 对话框是否显示
+const list = ref<any[]>([])
+const columns = ref<any>([
+  { text: '消息提醒类型', value: 'messageTypeDetail', align: 'center', width: '200' },
+  { text: '消息提醒内容', value: 'messageContent', align: 'center' },
+  { text: '时间', value: 'ts', align: 'center', width: '180' },
+])
+const loadingTable = ref(true)
+const initDialog = () => {
+  dialogFormVisible.value = true
+}
+const cancel = () => {
+  dialogFormVisible.value = false
+}
+const fetchData = () => {
+  loadingTable.value = true
+  getMessage().then((res) => {
+    list.value = res.data.rows.reverse()
+    loadingTable.value = false
+  }).catch(() => {
+    loadingTable.value = false
+  })
+}
+fetchData()
+defineExpose({
+  initDialog,
+})
+// 查看详情
+const detail = (row: any) => {
+  // 报警类跳转
+  if (row.messageTypeDetail.includes('报警')) {
+    if (row.alarmId) {
+      $router.push({
+        name: 'AlarmCurrentDetail',
+        query: {
+          id: row.alarmId,
+          row: JSON.stringify(row),
+        },
+      })
+    }
+    else {
+      ElMessage.warning('该数据缺少报警信息')
+    }
+  }
+}
+</script>
+
+<template>
+  <el-dialog v-model="dialogFormVisible" title="消息通知" append-to-body>
+    <normal-table
+      :data="list" :total="0" :columns="columns" :query="{}" :list-loading="loadingTable"
+      :pagination="false" :height="400"
+    >
+      <template #columns>
+        <el-table-column label="操作" align="center" width="80">
+          <template #default="scope">
+            <el-button
+              type="primary" link size="small"
+              :disabled="!((scope.row.messageTypeDetail.includes('报警') && !scope.row.messageTypeDetail.includes('解除')) || scope.row.messageTypeDetail.includes('施工'))"
+              @click="detail(scope.row)"
+            >
+              查看
+            </el-button>
+          </template>
+        </el-table-column>
+      </template>
+    </normal-table>
+    <template #footer>
+      <div class="dialog-footer">
+        <el-button type="primary" @click="cancel">
+          确认
+        </el-button>
+      </div>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+.el-dialog {
+  width: 700px;
+}
+
+.el-select {
+  width: 100%;
+}
+</style>
diff --git a/src/views/home/dashboard/fullScreen-components/alarmCount.vue b/src/views/home/dashboard/fullScreen-components/alarmCount.vue
index d65e913..ba24ad9 100644
--- a/src/views/home/dashboard/fullScreen-components/alarmCount.vue
+++ b/src/views/home/dashboard/fullScreen-components/alarmCount.vue
@@ -96,9 +96,10 @@
 // }
 
 .active {
-  color: #3d7eff;
+  color: #1c3444;
   border-color: #e6ebf5;
   outline: none;
-  background-color: rgba($color: #98a7bb, $alpha: 80%);
+  font-weight: 700;
+  background-color: rgba($color: #98a7bb, $alpha: 100%);
 }
 </style>
diff --git a/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue b/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue
index 08d7a93..f723273 100644
--- a/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue
+++ b/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue
@@ -196,7 +196,7 @@
           text-align: center;
           font-size: 24px;
           font-weight: 700;
-          color: #fff;
+          color: #d81010;
         }
 
         .title1 {
diff --git a/src/views/home/dashboard/fullScreen-components/baseOverView.vue b/src/views/home/dashboard/fullScreen-components/baseOverView.vue
index e973da6..bd3a653 100644
--- a/src/views/home/dashboard/fullScreen-components/baseOverView.vue
+++ b/src/views/home/dashboard/fullScreen-components/baseOverView.vue
@@ -90,15 +90,24 @@
     // justify-content: space-between;
     margin: 20px 0;
 
-    img {
-      width: 90%;
+    .img {
+      width: 50%;
+      box-sizing: border-box;
+      // flex: 1;
+
+      img {
+        width: 90%;
+        height: 100%;
+      }
     }
 
     .data {
       box-sizing: border-box;
       margin-left: 5px;
+
       // display: flex;
       .value {
+
         // padding-left: 10px;
         .value {
           color: #fff;
diff --git a/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue b/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue
index 3dd0897..eb2c2fd 100644
--- a/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue
+++ b/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue
@@ -18,7 +18,7 @@
 
 onMounted(() => {
   setTimeout(() => {
-    xAxisData.value = ['第一分公司', '第二分公司', '第三分公司', '第四分公司', '第五分公司']
+    xAxisData.value = ['第一分公司', '第二分公司', '第三分公司', '第四分公司', '第五分公司'].reverse()
     data.value = [
       {
         name: '数量',
diff --git a/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue b/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue
index c933977..81e19fa 100644
--- a/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue
+++ b/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue
@@ -113,10 +113,11 @@
 }
 
 .active {
-  color: #3d7eff;
+  color: #1c3444;
   border-color: #e6ebf5;
   outline: none;
-  background-color: rgba($color: #98a7bb, $alpha: 80%);
+  font-weight: 700;
+  background-color: rgba($color: #98a7bb, $alpha: 100%);
 }
 
 // .layout {
diff --git a/src/views/home/dashboard/fullScreen.vue b/src/views/home/dashboard/fullScreen.vue
index 410e728..21f89e0 100644
--- a/src/views/home/dashboard/fullScreen.vue
+++ b/src/views/home/dashboard/fullScreen.vue
@@ -27,7 +27,12 @@
 <template>
   <div class="container-full">
     <!-- banner区域 -->
-    <div class="banner" />
+    <div class="banner">
+      <div class="title">
+        <div class="logo" />
+        <div class="name" />
+      </div>
+    </div>
     <!-- 关闭按钮 -->
     <div class="close">
       <div class="icon" @click="closePage">
@@ -72,7 +77,29 @@
     z-index: 98;
     height: 100px;
     width: 100%;
-    background: url("@/assets/fullscren/banner.png") no-repeat;
+    background: url("@/assets/fullscren/banner-bg.png") no-repeat;
+
+    .title {
+      height: 100px;
+      width: 100%;
+      position: absolute;
+      top: 0;
+      left: 0;
+      z-index: 99;
+
+      // .logo {
+      //   width: 200px;
+      //   height: 100px;
+      //   background: url("@/assets/fullscren/br-logo.png") no-repeat;
+      // }
+
+      .name {
+        // width: 400px;
+        height: 80px;
+        width: 100%;
+        background: url("@/assets/fullscren/br-title.png") no-repeat center;
+      }
+    }
   }
 
   .close {
diff --git a/src/views/home/dashboard/index.vue b/src/views/home/dashboard/index.vue
index 42dfbed..df9f331 100644
--- a/src/views/home/dashboard/index.vue
+++ b/src/views/home/dashboard/index.vue
@@ -6,6 +6,7 @@
 <script lang="ts" setup name="Dashboard">
 import card from './components/showCard.vue'
 import { img } from './components/imgData'
+import moreNotice from './components/noticeDialog.vue'
 import { getBase, getDeviceStatus, getMessage } from '@/api/home/dashboard/index'
 import locationAnalysis from '@/views/home/alarm/count/components/locationAnalysis.vue'
 import layout from '@/views/home/alarm/count/components/layout.vue'
@@ -101,10 +102,10 @@
 // 消息通知数据
 const messageLoading = ref(true)
 const messageData = ref<any[]>([])
-// 更多跳转
-const more = (type: string) => {
+// // 更多跳转
+// const  = (type: string) => {
 
-}
+// }
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
 const routeToPage = (item: any) => {
@@ -149,18 +150,26 @@
   // 消息通知
   messageLoading.value = true
   getMessage().then((res) => {
-    messageData.value = res.data.rows
+    messageData.value = res.data.rows.reverse()
     messageLoading.value = false
   }).catch(() => {
     messageLoading.value = false
   })
 }
 fetchData()
+
+// 消息通知-更多
+const noticeRef = ref()
+const more = () => {
+  noticeRef.value.initDialog()
+}
 </script>
 
 <template>
   <!-- 布局 -->
   <app-container>
+    <!-- 消息通知-更多 -->
+    <more-notice ref="noticeRef" />
     <!-- 上部 -->
     <div class="top-container">
       <div class="top-left-container">
@@ -233,8 +242,8 @@
         <template #search>
           <div class="search">
             <div />
-            <div class="more">
-              <!-- >>更多 -->
+            <div class="more" @click="more">
+              >>更多
             </div>
           </div>
         </template>
diff --git a/src/views/home/device/device/components/controlRecord.vue b/src/views/home/device/device/components/controlRecord.vue
index 185348e..6553e62 100644
--- a/src/views/home/device/device/components/controlRecord.vue
+++ b/src/views/home/device/device/components/controlRecord.vue
@@ -73,6 +73,7 @@
   await fetchDict()
   fetchData()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -88,7 +89,7 @@
       </el-button>
     </template>
     <template #btns-right>
-      <el-button type="primary" @click="addControl">
+      <el-button v-if="proxy.hasPerm('/device/instruction/add') && proxy.hasPerm('/device/instruction')" type="primary" @click="addControl">
         新建
       </el-button>
     </template>

diff --git a/src/assets/fullscren/br-logo.png b/src/assets/fullscren/br-logo.png
new file mode 100644
index 0000000..f3db083
--- /dev/null
+++ b/src/assets/fullscren/br-logo.png
Binary files differ
diff --git a/src/assets/fullscren/br-title.png b/src/assets/fullscren/br-title.png
new file mode 100644
index 0000000..9c7237e
--- /dev/null
+++ b/src/assets/fullscren/br-title.png
Binary files differ
diff --git a/src/components/DeptSelect/index.vue b/src/components/DeptSelect/index.vue
index ef7bd91..948bd8b 100644
--- a/src/components/DeptSelect/index.vue
+++ b/src/components/DeptSelect/index.vue
@@ -68,16 +68,17 @@
 function fetchPcode() {
   // 如果未指定需要展示的部门类型，获取全部部门
   if (!props.deptType) {
-    if (dictStore.allDeptList.length === 0) { // 如果store中未存储，从服务器上获取
-      getDeptTreeList().then((res) => {
-        const list = res.data
-        dictStore.setAllDeptList(list)
-        refreshList(list)
-      })
-    }
-    else {
-      refreshList(dictStore.allDeptList)
-    }
+    // if (dictStore.allDeptList.length === 0) { // 如果store中未存储，从服务器上获取
+    getDeptTreeList().then((res) => {
+      const list = res.data.filter((item: any) => item.id !== '0')
+      dictStore.setAllDeptList(list)
+      refreshList(list)
+      console.log(list, 'list')
+    })
+    // }
+    // else {
+    //   refreshList(dictStore.allDeptList)
+    // }
   }
   else { // 如果指定了需要展示的部门类型
     if (dictStore.companyList.length === 0) { // 如果store中未存储，从服务器上获取
@@ -159,24 +160,15 @@
 <template>
   <div style="width: 100%;">
     <el-tree-select
-      v-if="multiData"
-      v-model="value"
-      :data="deptTreeList"
-      node-key="id"
-      :filter-node-method="filterTree"
-      :props="defaultProps"
-      :expand-on-click-node="false"
-      :render-after-expand="false"
-      :size="props.size"
-      :placeholder="props.placeholder"
-      :clearable="props.clearable"
-      check-strictly
-      check-on-click-node
-      filterable
-      class="full-width-input"
-      :disabled="props.disabled"
+      v-if="multiData" v-model="value" :data="deptTreeList" node-key="id" :filter-node-method="filterTree"
+      :props="defaultProps" :expand-on-click-node="false" :render-after-expand="false" :size="props.size"
+      :placeholder="props.placeholder" :clearable="props.clearable" check-strictly check-on-click-node filterable
+      class="full-width-input" :disabled="props.disabled"
     />
-    <el-select v-else v-model="value" :placeholder="props.placeholder" :size="props.size" :disabled="props.disabled" :clearable="props.clearable" class="full-width-input">
+    <el-select
+      v-else v-model="value" :placeholder="props.placeholder" :size="props.size" :disabled="props.disabled"
+      :clearable="props.clearable" class="full-width-input"
+    >
       <el-option v-for="(item, index) in deptTreeList" :key="index" :label="item.name" :value="item.id" />
     </el-select>
   </div>
diff --git a/src/components/Echart/BarChart3D.vue b/src/components/Echart/BarChart3D.vue
index 8b8d8ea..ee7dbba 100644
--- a/src/components/Echart/BarChart3D.vue
+++ b/src/components/Echart/BarChart3D.vue
@@ -276,12 +276,12 @@
       textStyle: {
         fontSize: 16,
       },
-      axisPointer: {
-        type: 'cross',
-        label: {
-          fontSize: 13,
-        },
-      },
+      // axisPointer: {
+      //   type: 'cross',
+      //   label: {
+      //     fontSize: 13,
+      //   },
+      // },
       valueFormatter: (value: string | number) => {
         return value ? value + props.unit : value === 0 ? '0' : ''
       },
diff --git a/src/components/Echart/BarChartHorizontal.vue b/src/components/Echart/BarChartHorizontal.vue
index 6a3c107..366e064 100644
--- a/src/components/Echart/BarChartHorizontal.vue
+++ b/src/components/Echart/BarChartHorizontal.vue
@@ -265,12 +265,12 @@
       textStyle: {
         fontSize: 16,
       },
-      axisPointer: {
-        type: 'cross',
-        label: {
-          fontSize: 13,
-        },
-      },
+      // axisPointer: {
+      //   type: 'cross',
+      //   label: {
+      //     fontSize: 13,
+      //   },
+      // },
       valueFormatter: (value: string | number) => {
         return value ? value + props.unit : ''
       },
diff --git a/src/components/Echart/BarChartVertical.vue b/src/components/Echart/BarChartVertical.vue
index 7701800..8f36130 100644
--- a/src/components/Echart/BarChartVertical.vue
+++ b/src/components/Echart/BarChartVertical.vue
@@ -253,12 +253,12 @@
       textStyle: {
         fontSize: 16,
       },
-      axisPointer: {
-        type: 'cross',
-        label: {
-          fontSize: 13,
-        },
-      },
+      // axisPointer: {
+      //   type: 'cross',
+      //   label: {
+      //     fontSize: 13,
+      //   },
+      // },
       valueFormatter: (value: string | number) => {
         return value ? value + props.unit : value === 0 ? '0' : ''
       },
diff --git a/src/components/Echart/LineChart.vue b/src/components/Echart/LineChart.vue
index faf6777..751133f 100644
--- a/src/components/Echart/LineChart.vue
+++ b/src/components/Echart/LineChart.vue
@@ -200,12 +200,12 @@
       textStyle: {
         fontSize: 16,
       },
-      axisPointer: {
-        type: 'cross',
-        label: {
-          fontSize: 13,
-        },
-      },
+      // axisPointer: {
+      //   type: 'cross',
+      //   label: {
+      //     fontSize: 13,
+      //   },
+      // },
       valueFormatter: (value: string | number) => {
         return value ? value + props.unit : value === 0 ? '0' : ''
       },
diff --git a/src/components/map/index offline.vue b/src/components/map/index offline.vue
index 5bf7bb9..e8c31b0 100644
--- a/src/components/map/index offline.vue
+++ b/src/components/map/index offline.vue
@@ -512,7 +512,7 @@
 <template>
   <div class="container">
     <!-- 地图 -->
-    <div id="map" ref="wrapRef " v-loading="loading" />
+    <div id="map" ref="wrapRef" v-loading="loading" />
   </div>
 </template>
 
diff --git a/src/layouts/components/Tools/alarmList.vue b/src/layouts/components/Tools/alarmList.vue
index 425ec3d..1274d52 100644
--- a/src/layouts/components/Tools/alarmList.vue
+++ b/src/layouts/components/Tools/alarmList.vue
@@ -151,7 +151,7 @@
       <template v-else>
         <div v-for="message of messageList" :key="message.id" class="message-item">
           <div class="message-content" @click="detailRow(message)">
-            <div class="title">
+            <div class="title" :title="`${message.alarmMsg}${message.alarmTime}`">
               <div class="container">
                 <div
                   :class="`mar circle circle-${message.alarmLevelName.includes('一级') ? '1' : message.alarmLevelName.includes('二级') ? '2' : message.alarmLevelName.includes('三级') ? '3' : 'other'}`"
diff --git a/src/views/home/dashboard/components/controlMap.vue b/src/views/home/dashboard/components/controlMap.vue
index e1d0651..388cec5 100644
--- a/src/views/home/dashboard/components/controlMap.vue
+++ b/src/views/home/dashboard/components/controlMap.vue
@@ -326,6 +326,7 @@
   setTimeout(() => {
     ele.setAttribute('style', 'font-size: 16px')
   }, 50)
+  detailRef.value.close()
 }
 const publicPath = window.location.href.split('#')[0]
 watch(() => showStatus.value, (newVal) => {
diff --git a/src/views/home/dashboard/components/demonstration.vue b/src/views/home/dashboard/components/demonstration.vue
index 4677f14..f9c4f14 100644
--- a/src/views/home/dashboard/components/demonstration.vue
+++ b/src/views/home/dashboard/components/demonstration.vue
@@ -30,31 +30,71 @@
     <div class="district-header">
       {{ $props.data.name }}
     </div>
+    <div class="content">
+      <div class="name">
+        设备类型:
+      </div>
+      <div class="value">
+        {{ $props.data.type }}
+      </div>
+    </div>
+    <div class="content">
+      <div class="name">
+        设备编号:
+      </div>
+      <div class="value">
+        {{ }}
+      </div>
+    </div>
+    <div class="content">
+      <div class="name">
+        厂商:
+      </div>
+      <div class="value">
+        北京无线电计量测试研究所
+      </div>
+    </div>
+    <div class="content">
+      <div class="name">
+        负责人:
+      </div>
+      <div class="value">
+        {{ }}
+      </div>
+    </div>
+    <div class="content">
+      <div class="name">
+        联系方式:
+      </div>
+      <div class="value" />
+    </div>
+    <div class="content">
+      <div class="name">
+        管理单位:
+      </div>
+      <div class="value">
+        第一分公司
+      </div>
+    </div>
+    <div class="content">
+      <div class="name">
+        详细位置:
+      </div>
+      <div class="value" />
+    </div>
     <!-- <div class="content">
-      <div class="name">面积:</div>
-      <div class="value">{{ $props.data.area }}平方公里</div>
-    </div>
-    <div class="content">
-      <div class="name">管理公司:</div>
-      <div class="value">{{ $props.data.deptName }}</div>
-    </div>
-    <div class="content">
-      <div class="name">管线长度:</div>
-      <div class="value">{{ $props.data.long }}公里</div>
-    </div>
-    <div class="content">
       <div class="name">调压站:</div>
       <div class="value">{{ $props.data.tyz }}座</div>
-    </div>
-    <div class="content">
+    </div> -->
+    <!-- <div class="content">
       <div class="name">调压箱:</div>
       <div class="value"> {{ $props.data.tyx }}座</div>
-    </div>
-    <div class="content">
+    </div> -->
+    <!-- <div class="content">
       <div class="name">闸井:</div>
       <div class="value">{{ $props.data.well }}个</div>
-    </div>
-    <div class="content">
+    </div> -->
+    <!-- <div class="content">
       <div class="name">监控覆盖率:</div>
       <div class="value">{{ $props.data.rate }}%</div>
     </div> -->
diff --git a/src/views/home/dashboard/components/detailInfoDialog.vue b/src/views/home/dashboard/components/detailInfoDialog.vue
index 1aad185..351fbf9 100644
--- a/src/views/home/dashboard/components/detailInfoDialog.vue
+++ b/src/views/home/dashboard/components/detailInfoDialog.vue
@@ -28,11 +28,13 @@
   }
   dialogFormVisible.value = true
 }
-defineExpose({ initDialog })
+
 // 关闭
 const close = () => {
   infoWindow.value.close()
 }
+
+defineExpose({ initDialog, close })
 </script>
 
 <template>
diff --git a/src/views/home/dashboard/components/noticeDialog.vue b/src/views/home/dashboard/components/noticeDialog.vue
new file mode 100644
index 0000000..4152ae2
--- /dev/null
+++ b/src/views/home/dashboard/components/noticeDialog.vue
@@ -0,0 +1,95 @@
+<!--
+  Description: 消息通知-更多消息弹窗
+  Author: 李亚光
+  Date: 2024-10-10
+ -->
+<script lang="ts" setup name="NoticeMoreDialog">
+import { ElMessage } from 'element-plus'
+import { getMessage } from '@/api/home/dashboard/index'
+const $router = useRouter()
+const dialogFormVisible = ref(false) // 对话框是否显示
+const list = ref<any[]>([])
+const columns = ref<any>([
+  { text: '消息提醒类型', value: 'messageTypeDetail', align: 'center', width: '200' },
+  { text: '消息提醒内容', value: 'messageContent', align: 'center' },
+  { text: '时间', value: 'ts', align: 'center', width: '180' },
+])
+const loadingTable = ref(true)
+const initDialog = () => {
+  dialogFormVisible.value = true
+}
+const cancel = () => {
+  dialogFormVisible.value = false
+}
+const fetchData = () => {
+  loadingTable.value = true
+  getMessage().then((res) => {
+    list.value = res.data.rows.reverse()
+    loadingTable.value = false
+  }).catch(() => {
+    loadingTable.value = false
+  })
+}
+fetchData()
+defineExpose({
+  initDialog,
+})
+// 查看详情
+const detail = (row: any) => {
+  // 报警类跳转
+  if (row.messageTypeDetail.includes('报警')) {
+    if (row.alarmId) {
+      $router.push({
+        name: 'AlarmCurrentDetail',
+        query: {
+          id: row.alarmId,
+          row: JSON.stringify(row),
+        },
+      })
+    }
+    else {
+      ElMessage.warning('该数据缺少报警信息')
+    }
+  }
+}
+</script>
+
+<template>
+  <el-dialog v-model="dialogFormVisible" title="消息通知" append-to-body>
+    <normal-table
+      :data="list" :total="0" :columns="columns" :query="{}" :list-loading="loadingTable"
+      :pagination="false" :height="400"
+    >
+      <template #columns>
+        <el-table-column label="操作" align="center" width="80">
+          <template #default="scope">
+            <el-button
+              type="primary" link size="small"
+              :disabled="!((scope.row.messageTypeDetail.includes('报警') && !scope.row.messageTypeDetail.includes('解除')) || scope.row.messageTypeDetail.includes('施工'))"
+              @click="detail(scope.row)"
+            >
+              查看
+            </el-button>
+          </template>
+        </el-table-column>
+      </template>
+    </normal-table>
+    <template #footer>
+      <div class="dialog-footer">
+        <el-button type="primary" @click="cancel">
+          确认
+        </el-button>
+      </div>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+.el-dialog {
+  width: 700px;
+}
+
+.el-select {
+  width: 100%;
+}
+</style>
diff --git a/src/views/home/dashboard/fullScreen-components/alarmCount.vue b/src/views/home/dashboard/fullScreen-components/alarmCount.vue
index d65e913..ba24ad9 100644
--- a/src/views/home/dashboard/fullScreen-components/alarmCount.vue
+++ b/src/views/home/dashboard/fullScreen-components/alarmCount.vue
@@ -96,9 +96,10 @@
 // }
 
 .active {
-  color: #3d7eff;
+  color: #1c3444;
   border-color: #e6ebf5;
   outline: none;
-  background-color: rgba($color: #98a7bb, $alpha: 80%);
+  font-weight: 700;
+  background-color: rgba($color: #98a7bb, $alpha: 100%);
 }
 </style>
diff --git a/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue b/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue
index 08d7a93..f723273 100644
--- a/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue
+++ b/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue
@@ -196,7 +196,7 @@
           text-align: center;
           font-size: 24px;
           font-weight: 700;
-          color: #fff;
+          color: #d81010;
         }
 
         .title1 {
diff --git a/src/views/home/dashboard/fullScreen-components/baseOverView.vue b/src/views/home/dashboard/fullScreen-components/baseOverView.vue
index e973da6..bd3a653 100644
--- a/src/views/home/dashboard/fullScreen-components/baseOverView.vue
+++ b/src/views/home/dashboard/fullScreen-components/baseOverView.vue
@@ -90,15 +90,24 @@
     // justify-content: space-between;
     margin: 20px 0;
 
-    img {
-      width: 90%;
+    .img {
+      width: 50%;
+      box-sizing: border-box;
+      // flex: 1;
+
+      img {
+        width: 90%;
+        height: 100%;
+      }
     }
 
     .data {
       box-sizing: border-box;
       margin-left: 5px;
+
       // display: flex;
       .value {
+
         // padding-left: 10px;
         .value {
           color: #fff;
diff --git a/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue b/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue
index 3dd0897..eb2c2fd 100644
--- a/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue
+++ b/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue
@@ -18,7 +18,7 @@
 
 onMounted(() => {
   setTimeout(() => {
-    xAxisData.value = ['第一分公司', '第二分公司', '第三分公司', '第四分公司', '第五分公司']
+    xAxisData.value = ['第一分公司', '第二分公司', '第三分公司', '第四分公司', '第五分公司'].reverse()
     data.value = [
       {
         name: '数量',
diff --git a/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue b/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue
index c933977..81e19fa 100644
--- a/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue
+++ b/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue
@@ -113,10 +113,11 @@
 }
 
 .active {
-  color: #3d7eff;
+  color: #1c3444;
   border-color: #e6ebf5;
   outline: none;
-  background-color: rgba($color: #98a7bb, $alpha: 80%);
+  font-weight: 700;
+  background-color: rgba($color: #98a7bb, $alpha: 100%);
 }
 
 // .layout {
diff --git a/src/views/home/dashboard/fullScreen.vue b/src/views/home/dashboard/fullScreen.vue
index 410e728..21f89e0 100644
--- a/src/views/home/dashboard/fullScreen.vue
+++ b/src/views/home/dashboard/fullScreen.vue
@@ -27,7 +27,12 @@
 <template>
   <div class="container-full">
     <!-- banner区域 -->
-    <div class="banner" />
+    <div class="banner">
+      <div class="title">
+        <div class="logo" />
+        <div class="name" />
+      </div>
+    </div>
     <!-- 关闭按钮 -->
     <div class="close">
       <div class="icon" @click="closePage">
@@ -72,7 +77,29 @@
     z-index: 98;
     height: 100px;
     width: 100%;
-    background: url("@/assets/fullscren/banner.png") no-repeat;
+    background: url("@/assets/fullscren/banner-bg.png") no-repeat;
+
+    .title {
+      height: 100px;
+      width: 100%;
+      position: absolute;
+      top: 0;
+      left: 0;
+      z-index: 99;
+
+      // .logo {
+      //   width: 200px;
+      //   height: 100px;
+      //   background: url("@/assets/fullscren/br-logo.png") no-repeat;
+      // }
+
+      .name {
+        // width: 400px;
+        height: 80px;
+        width: 100%;
+        background: url("@/assets/fullscren/br-title.png") no-repeat center;
+      }
+    }
   }
 
   .close {
diff --git a/src/views/home/dashboard/index.vue b/src/views/home/dashboard/index.vue
index 42dfbed..df9f331 100644
--- a/src/views/home/dashboard/index.vue
+++ b/src/views/home/dashboard/index.vue
@@ -6,6 +6,7 @@
 <script lang="ts" setup name="Dashboard">
 import card from './components/showCard.vue'
 import { img } from './components/imgData'
+import moreNotice from './components/noticeDialog.vue'
 import { getBase, getDeviceStatus, getMessage } from '@/api/home/dashboard/index'
 import locationAnalysis from '@/views/home/alarm/count/components/locationAnalysis.vue'
 import layout from '@/views/home/alarm/count/components/layout.vue'
@@ -101,10 +102,10 @@
 // 消息通知数据
 const messageLoading = ref(true)
 const messageData = ref<any[]>([])
-// 更多跳转
-const more = (type: string) => {
+// // 更多跳转
+// const  = (type: string) => {
 
-}
+// }
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
 const routeToPage = (item: any) => {
@@ -149,18 +150,26 @@
   // 消息通知
   messageLoading.value = true
   getMessage().then((res) => {
-    messageData.value = res.data.rows
+    messageData.value = res.data.rows.reverse()
     messageLoading.value = false
   }).catch(() => {
     messageLoading.value = false
   })
 }
 fetchData()
+
+// 消息通知-更多
+const noticeRef = ref()
+const more = () => {
+  noticeRef.value.initDialog()
+}
 </script>
 
 <template>
   <!-- 布局 -->
   <app-container>
+    <!-- 消息通知-更多 -->
+    <more-notice ref="noticeRef" />
     <!-- 上部 -->
     <div class="top-container">
       <div class="top-left-container">
@@ -233,8 +242,8 @@
         <template #search>
           <div class="search">
             <div />
-            <div class="more">
-              <!-- >>更多 -->
+            <div class="more" @click="more">
+              >>更多
             </div>
           </div>
         </template>
diff --git a/src/views/home/device/device/components/controlRecord.vue b/src/views/home/device/device/components/controlRecord.vue
index 185348e..6553e62 100644
--- a/src/views/home/device/device/components/controlRecord.vue
+++ b/src/views/home/device/device/components/controlRecord.vue
@@ -73,6 +73,7 @@
   await fetchDict()
   fetchData()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -88,7 +89,7 @@
       </el-button>
     </template>
     <template #btns-right>
-      <el-button type="primary" @click="addControl">
+      <el-button v-if="proxy.hasPerm('/device/instruction/add') && proxy.hasPerm('/device/instruction')" type="primary" @click="addControl">
         新建
       </el-button>
     </template>
diff --git a/src/views/home/device/device/components/dataSearch.vue b/src/views/home/device/device/components/dataSearch.vue
index 3bea05e..1b1e313 100644
--- a/src/views/home/device/device/components/dataSearch.vue
+++ b/src/views/home/device/device/components/dataSearch.vue
@@ -58,13 +58,79 @@
 const data = ref<any[]>([])
 //  列表展示列
 const columns = ref<any>([
-  { text: '设备编号', value: 'devcode', align: 'center' },
-  { text: '燃气浓度（%LEL)', value: 'snr', align: 'center' },
-  { text: '电量(%)', value: 'cell', align: 'center' },
-  { text: '信号强度', value: 'strength', align: 'center' },
-  { text: '采集时间', value: 'uptime', align: 'center' },
-  { text: '上传时间', value: 'logtime', align: 'center' },
+  // { text: '设备编号', value: 'devcode', align: 'center' },
+  // { text: '燃气浓度（%LEL)', value: 'snr', align: 'center' },
+  // { text: '电量(%)', value: 'cell', align: 'center' },
+  // { text: '信号强度', value: 'strength', align: 'center' },
+  // { text: '采集时间', value: 'uptime', align: 'center' },
+  // { text: '上传时间', value: 'logtime', align: 'center' },
 ])
+
+// 燃气智能监测终端
+const columns1 = ref<any>([
+  { text: '设备编号', value: 'devcode', align: 'center' },
+  { text: '燃气浓度（%LEL)', value: 'strength', align: 'center' },
+  { text: '电量(%)', value: 'cell', align: 'center' },
+  { text: '信号强度', value: 'pci', align: 'center' },
+  { text: '采集时间', value: 'logtime', align: 'center' },
+  { text: '上传时间', value: 'uptime', align: 'center' },
+])
+// 管网哨兵
+const columns2 = ref<any>([
+  { text: '设备编号', value: 'devcode', align: 'center' },
+  { text: '燃气浓度（%LEL)', value: 'gasval', align: 'center' },
+  { text: '电池电压(V)', value: 'vbat', align: 'center' },
+  { text: '采集时间', value: 'logtime', align: 'center' },
+  { text: '上传时间', value: 'uptime', align: 'center' },
+])
+// DATA_GAS("燃气智能监测终端", "data_gas", "devcode,uptime,logtime", "id,well_code,devcode设备编号,cell电量,strength浓度,descn,uptime采集时间,logtime上传时间,pci,rsrp,snr", "logtime"),
+// DATA_TUBE_OTHER("管网哨兵", "data_tube_other", "devcode,uptime,logtime", "DEVCODE设备编号,GASVAL浓度, VBAT电压,SIN,RSRP,SINR,UPTIME采集时间,LOGTIME上传时间", "logtime"),
+// DATA_MONITOR_PIPE_OTHER("智能警示桩", "data_monitor_pipe_other", "devcode,uptime,logtime", "TEMPERATURE,HUMIDITY,VBAT,PIPE_INCLINE_ALARM,PIPE_BREAK_ALARM,LEFT_OFF_LINE_ALARM,LEFT_VIBRATE_ALARM,RIGHT_OFF_LINE_ALARM,RIGHT_VIBRATE_ALARM,PICTURE_ALARM,LEFT_GAS,RIGHT_GAS,LOGTIME,UPTIME ", "logtime"),
+// DATA_PAN_GAS("场站监测云台", "data_pan_gas", "DEVICE_CODE,,logtime", "ID,LEDGER_NUMBER,DEVICE_CODE设备编号,CONCENTRATION浓度,LOGTIME,DIRCETION水平位置,PITCH垂直位置", "LOGTIME采集时间");
+// 智能警示桩
+const columns3 = ref<any>([
+  { text: '左侧甲烷值', value: 'leftGas', align: 'center', width: '110' },
+  { text: '右侧甲烷值', value: 'rightGas', align: 'center', width: '110' },
+  { text: '电池电压(V)', value: 'vbat', align: 'center', width: '110' },
+  { text: '桩倾斜报警', value: 'pipeInclineAlarm', align: 'center', width: '110' },
+  { text: '桩拆卸报警', value: 'pipeBreakAlarm', align: 'center', width: '110' },
+  { text: '左断线报警', value: 'leftOffLineAlarm', align: 'center', width: '110' },
+  { text: '左振动报警', value: 'leftVibrateAlarm', align: 'center', width: '110' },
+  { text: '右断线报警', value: 'rightOffLineAlarm', align: 'center', width: '110' },
+  { text: '右振动报警', value: 'rightVibrateAlarm', align: 'center', width: '110' },
+  { text: '采集时间', value: 'logtime', align: 'center' },
+  { text: '上传时间', value: 'uptime', align: 'center' },
+])
+// 场站监测云台
+const columns4 = ref<any>([
+  { text: '设备编号', value: 'deviceCode', align: 'center' },
+  { text: '浓度', value: 'concentration', align: 'center' },
+  { text: '水平位置', value: 'dircetion', align: 'center' },
+  { text: '垂直位置', value: 'pitch', align: 'center' },
+  { text: '采集时间', value: 'logtime', align: 'center' },
+  { text: '上传时间', value: 'uptime', align: 'center' },
+])
+const row = JSON.parse($route.query.row as string)
+if (row.deviceTypeName) {
+  if (row.deviceTypeName === '燃气智能监测终端') {
+    columns.value = columns1.value
+  }
+  else if (row.deviceTypeName === '管网哨兵') {
+    columns.value = columns2.value
+  }
+  else if (row.deviceTypeName === '智能警示桩') {
+    columns.value = columns3.value
+  }
+  else if (row.deviceTypeName === '场站监测云台') {
+    columns.value = columns4.value
+  }
+  else {
+    columns.value = columns1.value
+  }
+}
+else {
+  columns.value = columns1.value
+}
 const fetchData = () => {
   const data = JSON.parse($route.query.row as string)
   listQuery.value.devcode = data.devcode
@@ -73,20 +139,55 @@
   getDataSearch(listQuery.value).then((res) => {
     list.value = res.data.map((item: any) => toHumpObject(item))
     xAxisData.value = list.value.slice().reverse().map(item => item.logtime)
-    data.value = [
-      {
-        name: '燃气浓度',
-        data: list.value.slice().reverse().map(item => item.snr || '0'),
-      },
-      {
-        name: '电量',
-        data: list.value.slice().reverse().map(item => item.cell || '0'),
-      },
-      {
-        name: '信号强度',
-        data: list.value.slice().reverse().map(item => item.strength || '0'),
-      },
-    ]
+    if (!data.deviceTypeName || data.deviceTypeName === '燃气智能监测终端') {
+      data.value = [
+        {
+          name: '燃气浓度',
+          data: list.value.slice().reverse().map(item => item.snr || '0'),
+        },
+        {
+          name: '电量',
+          data: list.value.slice().reverse().map(item => item.cell || '0'),
+        },
+        {
+          name: '信号强度',
+          data: list.value.slice().reverse().map(item => item.strength || '0'),
+        },
+      ]
+    }
+    else if (data.deviceTypeName === '管网哨兵') {
+      data.value = [
+        {
+          name: '燃气浓度',
+          data: list.value.slice().reverse().map(item => item.gasval || '0'),
+        },
+        {
+          name: '电压',
+          data: list.value.slice().reverse().map(item => item.vbat || '0'),
+        },
+      ]
+    }
+    else if (data.deviceTypeName === '智能警示桩') {
+      data.value = [
+        {
+          name: '左侧甲烷值',
+          data: list.value.slice().reverse().map(item => item.leftGas || '0'),
+        },
+        {
+          name: '右侧甲烷值',
+          data: list.value.slice().reverse().map(item => item.rightGas || '0'),
+        },
+      ]
+    }
+    else if (data.deviceTypeName === '场站监测云台') {
+      data.value = [
+        {
+          name: '浓度',
+          data: list.value.slice().reverse().map(item => item.concentration || '0'),
+        },
+      ]
+    }
+
     console.log(xAxisData.value, data.value)
     loadingTable.value = false
     if (!showTable.value) {

diff --git a/src/assets/fullscren/br-logo.png b/src/assets/fullscren/br-logo.png
new file mode 100644
index 0000000..f3db083
--- /dev/null
+++ b/src/assets/fullscren/br-logo.png
Binary files differ
diff --git a/src/assets/fullscren/br-title.png b/src/assets/fullscren/br-title.png
new file mode 100644
index 0000000..9c7237e
--- /dev/null
+++ b/src/assets/fullscren/br-title.png
Binary files differ
diff --git a/src/components/DeptSelect/index.vue b/src/components/DeptSelect/index.vue
index ef7bd91..948bd8b 100644
--- a/src/components/DeptSelect/index.vue
+++ b/src/components/DeptSelect/index.vue
@@ -68,16 +68,17 @@
 function fetchPcode() {
   // 如果未指定需要展示的部门类型，获取全部部门
   if (!props.deptType) {
-    if (dictStore.allDeptList.length === 0) { // 如果store中未存储，从服务器上获取
-      getDeptTreeList().then((res) => {
-        const list = res.data
-        dictStore.setAllDeptList(list)
-        refreshList(list)
-      })
-    }
-    else {
-      refreshList(dictStore.allDeptList)
-    }
+    // if (dictStore.allDeptList.length === 0) { // 如果store中未存储，从服务器上获取
+    getDeptTreeList().then((res) => {
+      const list = res.data.filter((item: any) => item.id !== '0')
+      dictStore.setAllDeptList(list)
+      refreshList(list)
+      console.log(list, 'list')
+    })
+    // }
+    // else {
+    //   refreshList(dictStore.allDeptList)
+    // }
   }
   else { // 如果指定了需要展示的部门类型
     if (dictStore.companyList.length === 0) { // 如果store中未存储，从服务器上获取
@@ -159,24 +160,15 @@
 <template>
   <div style="width: 100%;">
     <el-tree-select
-      v-if="multiData"
-      v-model="value"
-      :data="deptTreeList"
-      node-key="id"
-      :filter-node-method="filterTree"
-      :props="defaultProps"
-      :expand-on-click-node="false"
-      :render-after-expand="false"
-      :size="props.size"
-      :placeholder="props.placeholder"
-      :clearable="props.clearable"
-      check-strictly
-      check-on-click-node
-      filterable
-      class="full-width-input"
-      :disabled="props.disabled"
+      v-if="multiData" v-model="value" :data="deptTreeList" node-key="id" :filter-node-method="filterTree"
+      :props="defaultProps" :expand-on-click-node="false" :render-after-expand="false" :size="props.size"
+      :placeholder="props.placeholder" :clearable="props.clearable" check-strictly check-on-click-node filterable
+      class="full-width-input" :disabled="props.disabled"
     />
-    <el-select v-else v-model="value" :placeholder="props.placeholder" :size="props.size" :disabled="props.disabled" :clearable="props.clearable" class="full-width-input">
+    <el-select
+      v-else v-model="value" :placeholder="props.placeholder" :size="props.size" :disabled="props.disabled"
+      :clearable="props.clearable" class="full-width-input"
+    >
       <el-option v-for="(item, index) in deptTreeList" :key="index" :label="item.name" :value="item.id" />
     </el-select>
   </div>
diff --git a/src/components/Echart/BarChart3D.vue b/src/components/Echart/BarChart3D.vue
index 8b8d8ea..ee7dbba 100644
--- a/src/components/Echart/BarChart3D.vue
+++ b/src/components/Echart/BarChart3D.vue
@@ -276,12 +276,12 @@
       textStyle: {
         fontSize: 16,
       },
-      axisPointer: {
-        type: 'cross',
-        label: {
-          fontSize: 13,
-        },
-      },
+      // axisPointer: {
+      //   type: 'cross',
+      //   label: {
+      //     fontSize: 13,
+      //   },
+      // },
       valueFormatter: (value: string | number) => {
         return value ? value + props.unit : value === 0 ? '0' : ''
       },
diff --git a/src/components/Echart/BarChartHorizontal.vue b/src/components/Echart/BarChartHorizontal.vue
index 6a3c107..366e064 100644
--- a/src/components/Echart/BarChartHorizontal.vue
+++ b/src/components/Echart/BarChartHorizontal.vue
@@ -265,12 +265,12 @@
       textStyle: {
         fontSize: 16,
       },
-      axisPointer: {
-        type: 'cross',
-        label: {
-          fontSize: 13,
-        },
-      },
+      // axisPointer: {
+      //   type: 'cross',
+      //   label: {
+      //     fontSize: 13,
+      //   },
+      // },
       valueFormatter: (value: string | number) => {
         return value ? value + props.unit : ''
       },
diff --git a/src/components/Echart/BarChartVertical.vue b/src/components/Echart/BarChartVertical.vue
index 7701800..8f36130 100644
--- a/src/components/Echart/BarChartVertical.vue
+++ b/src/components/Echart/BarChartVertical.vue
@@ -253,12 +253,12 @@
       textStyle: {
         fontSize: 16,
       },
-      axisPointer: {
-        type: 'cross',
-        label: {
-          fontSize: 13,
-        },
-      },
+      // axisPointer: {
+      //   type: 'cross',
+      //   label: {
+      //     fontSize: 13,
+      //   },
+      // },
       valueFormatter: (value: string | number) => {
         return value ? value + props.unit : value === 0 ? '0' : ''
       },
diff --git a/src/components/Echart/LineChart.vue b/src/components/Echart/LineChart.vue
index faf6777..751133f 100644
--- a/src/components/Echart/LineChart.vue
+++ b/src/components/Echart/LineChart.vue
@@ -200,12 +200,12 @@
       textStyle: {
         fontSize: 16,
       },
-      axisPointer: {
-        type: 'cross',
-        label: {
-          fontSize: 13,
-        },
-      },
+      // axisPointer: {
+      //   type: 'cross',
+      //   label: {
+      //     fontSize: 13,
+      //   },
+      // },
       valueFormatter: (value: string | number) => {
         return value ? value + props.unit : value === 0 ? '0' : ''
       },
diff --git a/src/components/map/index offline.vue b/src/components/map/index offline.vue
index 5bf7bb9..e8c31b0 100644
--- a/src/components/map/index offline.vue
+++ b/src/components/map/index offline.vue
@@ -512,7 +512,7 @@
 <template>
   <div class="container">
     <!-- 地图 -->
-    <div id="map" ref="wrapRef " v-loading="loading" />
+    <div id="map" ref="wrapRef" v-loading="loading" />
   </div>
 </template>
 
diff --git a/src/layouts/components/Tools/alarmList.vue b/src/layouts/components/Tools/alarmList.vue
index 425ec3d..1274d52 100644
--- a/src/layouts/components/Tools/alarmList.vue
+++ b/src/layouts/components/Tools/alarmList.vue
@@ -151,7 +151,7 @@
       <template v-else>
         <div v-for="message of messageList" :key="message.id" class="message-item">
           <div class="message-content" @click="detailRow(message)">
-            <div class="title">
+            <div class="title" :title="`${message.alarmMsg}${message.alarmTime}`">
               <div class="container">
                 <div
                   :class="`mar circle circle-${message.alarmLevelName.includes('一级') ? '1' : message.alarmLevelName.includes('二级') ? '2' : message.alarmLevelName.includes('三级') ? '3' : 'other'}`"
diff --git a/src/views/home/dashboard/components/controlMap.vue b/src/views/home/dashboard/components/controlMap.vue
index e1d0651..388cec5 100644
--- a/src/views/home/dashboard/components/controlMap.vue
+++ b/src/views/home/dashboard/components/controlMap.vue
@@ -326,6 +326,7 @@
   setTimeout(() => {
     ele.setAttribute('style', 'font-size: 16px')
   }, 50)
+  detailRef.value.close()
 }
 const publicPath = window.location.href.split('#')[0]
 watch(() => showStatus.value, (newVal) => {
diff --git a/src/views/home/dashboard/components/demonstration.vue b/src/views/home/dashboard/components/demonstration.vue
index 4677f14..f9c4f14 100644
--- a/src/views/home/dashboard/components/demonstration.vue
+++ b/src/views/home/dashboard/components/demonstration.vue
@@ -30,31 +30,71 @@
     <div class="district-header">
       {{ $props.data.name }}
     </div>
+    <div class="content">
+      <div class="name">
+        设备类型:
+      </div>
+      <div class="value">
+        {{ $props.data.type }}
+      </div>
+    </div>
+    <div class="content">
+      <div class="name">
+        设备编号:
+      </div>
+      <div class="value">
+        {{ }}
+      </div>
+    </div>
+    <div class="content">
+      <div class="name">
+        厂商:
+      </div>
+      <div class="value">
+        北京无线电计量测试研究所
+      </div>
+    </div>
+    <div class="content">
+      <div class="name">
+        负责人:
+      </div>
+      <div class="value">
+        {{ }}
+      </div>
+    </div>
+    <div class="content">
+      <div class="name">
+        联系方式:
+      </div>
+      <div class="value" />
+    </div>
+    <div class="content">
+      <div class="name">
+        管理单位:
+      </div>
+      <div class="value">
+        第一分公司
+      </div>
+    </div>
+    <div class="content">
+      <div class="name">
+        详细位置:
+      </div>
+      <div class="value" />
+    </div>
     <!-- <div class="content">
-      <div class="name">面积:</div>
-      <div class="value">{{ $props.data.area }}平方公里</div>
-    </div>
-    <div class="content">
-      <div class="name">管理公司:</div>
-      <div class="value">{{ $props.data.deptName }}</div>
-    </div>
-    <div class="content">
-      <div class="name">管线长度:</div>
-      <div class="value">{{ $props.data.long }}公里</div>
-    </div>
-    <div class="content">
       <div class="name">调压站:</div>
       <div class="value">{{ $props.data.tyz }}座</div>
-    </div>
-    <div class="content">
+    </div> -->
+    <!-- <div class="content">
       <div class="name">调压箱:</div>
       <div class="value"> {{ $props.data.tyx }}座</div>
-    </div>
-    <div class="content">
+    </div> -->
+    <!-- <div class="content">
       <div class="name">闸井:</div>
       <div class="value">{{ $props.data.well }}个</div>
-    </div>
-    <div class="content">
+    </div> -->
+    <!-- <div class="content">
       <div class="name">监控覆盖率:</div>
       <div class="value">{{ $props.data.rate }}%</div>
     </div> -->
diff --git a/src/views/home/dashboard/components/detailInfoDialog.vue b/src/views/home/dashboard/components/detailInfoDialog.vue
index 1aad185..351fbf9 100644
--- a/src/views/home/dashboard/components/detailInfoDialog.vue
+++ b/src/views/home/dashboard/components/detailInfoDialog.vue
@@ -28,11 +28,13 @@
   }
   dialogFormVisible.value = true
 }
-defineExpose({ initDialog })
+
 // 关闭
 const close = () => {
   infoWindow.value.close()
 }
+
+defineExpose({ initDialog, close })
 </script>
 
 <template>
diff --git a/src/views/home/dashboard/components/noticeDialog.vue b/src/views/home/dashboard/components/noticeDialog.vue
new file mode 100644
index 0000000..4152ae2
--- /dev/null
+++ b/src/views/home/dashboard/components/noticeDialog.vue
@@ -0,0 +1,95 @@
+<!--
+  Description: 消息通知-更多消息弹窗
+  Author: 李亚光
+  Date: 2024-10-10
+ -->
+<script lang="ts" setup name="NoticeMoreDialog">
+import { ElMessage } from 'element-plus'
+import { getMessage } from '@/api/home/dashboard/index'
+const $router = useRouter()
+const dialogFormVisible = ref(false) // 对话框是否显示
+const list = ref<any[]>([])
+const columns = ref<any>([
+  { text: '消息提醒类型', value: 'messageTypeDetail', align: 'center', width: '200' },
+  { text: '消息提醒内容', value: 'messageContent', align: 'center' },
+  { text: '时间', value: 'ts', align: 'center', width: '180' },
+])
+const loadingTable = ref(true)
+const initDialog = () => {
+  dialogFormVisible.value = true
+}
+const cancel = () => {
+  dialogFormVisible.value = false
+}
+const fetchData = () => {
+  loadingTable.value = true
+  getMessage().then((res) => {
+    list.value = res.data.rows.reverse()
+    loadingTable.value = false
+  }).catch(() => {
+    loadingTable.value = false
+  })
+}
+fetchData()
+defineExpose({
+  initDialog,
+})
+// 查看详情
+const detail = (row: any) => {
+  // 报警类跳转
+  if (row.messageTypeDetail.includes('报警')) {
+    if (row.alarmId) {
+      $router.push({
+        name: 'AlarmCurrentDetail',
+        query: {
+          id: row.alarmId,
+          row: JSON.stringify(row),
+        },
+      })
+    }
+    else {
+      ElMessage.warning('该数据缺少报警信息')
+    }
+  }
+}
+</script>
+
+<template>
+  <el-dialog v-model="dialogFormVisible" title="消息通知" append-to-body>
+    <normal-table
+      :data="list" :total="0" :columns="columns" :query="{}" :list-loading="loadingTable"
+      :pagination="false" :height="400"
+    >
+      <template #columns>
+        <el-table-column label="操作" align="center" width="80">
+          <template #default="scope">
+            <el-button
+              type="primary" link size="small"
+              :disabled="!((scope.row.messageTypeDetail.includes('报警') && !scope.row.messageTypeDetail.includes('解除')) || scope.row.messageTypeDetail.includes('施工'))"
+              @click="detail(scope.row)"
+            >
+              查看
+            </el-button>
+          </template>
+        </el-table-column>
+      </template>
+    </normal-table>
+    <template #footer>
+      <div class="dialog-footer">
+        <el-button type="primary" @click="cancel">
+          确认
+        </el-button>
+      </div>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+.el-dialog {
+  width: 700px;
+}
+
+.el-select {
+  width: 100%;
+}
+</style>
diff --git a/src/views/home/dashboard/fullScreen-components/alarmCount.vue b/src/views/home/dashboard/fullScreen-components/alarmCount.vue
index d65e913..ba24ad9 100644
--- a/src/views/home/dashboard/fullScreen-components/alarmCount.vue
+++ b/src/views/home/dashboard/fullScreen-components/alarmCount.vue
@@ -96,9 +96,10 @@
 // }
 
 .active {
-  color: #3d7eff;
+  color: #1c3444;
   border-color: #e6ebf5;
   outline: none;
-  background-color: rgba($color: #98a7bb, $alpha: 80%);
+  font-weight: 700;
+  background-color: rgba($color: #98a7bb, $alpha: 100%);
 }
 </style>
diff --git a/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue b/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue
index 08d7a93..f723273 100644
--- a/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue
+++ b/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue
@@ -196,7 +196,7 @@
           text-align: center;
           font-size: 24px;
           font-weight: 700;
-          color: #fff;
+          color: #d81010;
         }
 
         .title1 {
diff --git a/src/views/home/dashboard/fullScreen-components/baseOverView.vue b/src/views/home/dashboard/fullScreen-components/baseOverView.vue
index e973da6..bd3a653 100644
--- a/src/views/home/dashboard/fullScreen-components/baseOverView.vue
+++ b/src/views/home/dashboard/fullScreen-components/baseOverView.vue
@@ -90,15 +90,24 @@
     // justify-content: space-between;
     margin: 20px 0;
 
-    img {
-      width: 90%;
+    .img {
+      width: 50%;
+      box-sizing: border-box;
+      // flex: 1;
+
+      img {
+        width: 90%;
+        height: 100%;
+      }
     }
 
     .data {
       box-sizing: border-box;
       margin-left: 5px;
+
       // display: flex;
       .value {
+
         // padding-left: 10px;
         .value {
           color: #fff;
diff --git a/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue b/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue
index 3dd0897..eb2c2fd 100644
--- a/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue
+++ b/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue
@@ -18,7 +18,7 @@
 
 onMounted(() => {
   setTimeout(() => {
-    xAxisData.value = ['第一分公司', '第二分公司', '第三分公司', '第四分公司', '第五分公司']
+    xAxisData.value = ['第一分公司', '第二分公司', '第三分公司', '第四分公司', '第五分公司'].reverse()
     data.value = [
       {
         name: '数量',
diff --git a/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue b/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue
index c933977..81e19fa 100644
--- a/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue
+++ b/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue
@@ -113,10 +113,11 @@
 }
 
 .active {
-  color: #3d7eff;
+  color: #1c3444;
   border-color: #e6ebf5;
   outline: none;
-  background-color: rgba($color: #98a7bb, $alpha: 80%);
+  font-weight: 700;
+  background-color: rgba($color: #98a7bb, $alpha: 100%);
 }
 
 // .layout {
diff --git a/src/views/home/dashboard/fullScreen.vue b/src/views/home/dashboard/fullScreen.vue
index 410e728..21f89e0 100644
--- a/src/views/home/dashboard/fullScreen.vue
+++ b/src/views/home/dashboard/fullScreen.vue
@@ -27,7 +27,12 @@
 <template>
   <div class="container-full">
     <!-- banner区域 -->
-    <div class="banner" />
+    <div class="banner">
+      <div class="title">
+        <div class="logo" />
+        <div class="name" />
+      </div>
+    </div>
     <!-- 关闭按钮 -->
     <div class="close">
       <div class="icon" @click="closePage">
@@ -72,7 +77,29 @@
     z-index: 98;
     height: 100px;
     width: 100%;
-    background: url("@/assets/fullscren/banner.png") no-repeat;
+    background: url("@/assets/fullscren/banner-bg.png") no-repeat;
+
+    .title {
+      height: 100px;
+      width: 100%;
+      position: absolute;
+      top: 0;
+      left: 0;
+      z-index: 99;
+
+      // .logo {
+      //   width: 200px;
+      //   height: 100px;
+      //   background: url("@/assets/fullscren/br-logo.png") no-repeat;
+      // }
+
+      .name {
+        // width: 400px;
+        height: 80px;
+        width: 100%;
+        background: url("@/assets/fullscren/br-title.png") no-repeat center;
+      }
+    }
   }
 
   .close {
diff --git a/src/views/home/dashboard/index.vue b/src/views/home/dashboard/index.vue
index 42dfbed..df9f331 100644
--- a/src/views/home/dashboard/index.vue
+++ b/src/views/home/dashboard/index.vue
@@ -6,6 +6,7 @@
 <script lang="ts" setup name="Dashboard">
 import card from './components/showCard.vue'
 import { img } from './components/imgData'
+import moreNotice from './components/noticeDialog.vue'
 import { getBase, getDeviceStatus, getMessage } from '@/api/home/dashboard/index'
 import locationAnalysis from '@/views/home/alarm/count/components/locationAnalysis.vue'
 import layout from '@/views/home/alarm/count/components/layout.vue'
@@ -101,10 +102,10 @@
 // 消息通知数据
 const messageLoading = ref(true)
 const messageData = ref<any[]>([])
-// 更多跳转
-const more = (type: string) => {
+// // 更多跳转
+// const  = (type: string) => {
 
-}
+// }
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
 const routeToPage = (item: any) => {
@@ -149,18 +150,26 @@
   // 消息通知
   messageLoading.value = true
   getMessage().then((res) => {
-    messageData.value = res.data.rows
+    messageData.value = res.data.rows.reverse()
     messageLoading.value = false
   }).catch(() => {
     messageLoading.value = false
   })
 }
 fetchData()
+
+// 消息通知-更多
+const noticeRef = ref()
+const more = () => {
+  noticeRef.value.initDialog()
+}
 </script>
 
 <template>
   <!-- 布局 -->
   <app-container>
+    <!-- 消息通知-更多 -->
+    <more-notice ref="noticeRef" />
     <!-- 上部 -->
     <div class="top-container">
       <div class="top-left-container">
@@ -233,8 +242,8 @@
         <template #search>
           <div class="search">
             <div />
-            <div class="more">
-              <!-- >>更多 -->
+            <div class="more" @click="more">
+              >>更多
             </div>
           </div>
         </template>
diff --git a/src/views/home/device/device/components/controlRecord.vue b/src/views/home/device/device/components/controlRecord.vue
index 185348e..6553e62 100644
--- a/src/views/home/device/device/components/controlRecord.vue
+++ b/src/views/home/device/device/components/controlRecord.vue
@@ -73,6 +73,7 @@
   await fetchDict()
   fetchData()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -88,7 +89,7 @@
       </el-button>
     </template>
     <template #btns-right>
-      <el-button type="primary" @click="addControl">
+      <el-button v-if="proxy.hasPerm('/device/instruction/add') && proxy.hasPerm('/device/instruction')" type="primary" @click="addControl">
         新建
       </el-button>
     </template>
diff --git a/src/views/home/device/device/components/dataSearch.vue b/src/views/home/device/device/components/dataSearch.vue
index 3bea05e..1b1e313 100644
--- a/src/views/home/device/device/components/dataSearch.vue
+++ b/src/views/home/device/device/components/dataSearch.vue
@@ -58,13 +58,79 @@
 const data = ref<any[]>([])
 //  列表展示列
 const columns = ref<any>([
-  { text: '设备编号', value: 'devcode', align: 'center' },
-  { text: '燃气浓度（%LEL)', value: 'snr', align: 'center' },
-  { text: '电量(%)', value: 'cell', align: 'center' },
-  { text: '信号强度', value: 'strength', align: 'center' },
-  { text: '采集时间', value: 'uptime', align: 'center' },
-  { text: '上传时间', value: 'logtime', align: 'center' },
+  // { text: '设备编号', value: 'devcode', align: 'center' },
+  // { text: '燃气浓度（%LEL)', value: 'snr', align: 'center' },
+  // { text: '电量(%)', value: 'cell', align: 'center' },
+  // { text: '信号强度', value: 'strength', align: 'center' },
+  // { text: '采集时间', value: 'uptime', align: 'center' },
+  // { text: '上传时间', value: 'logtime', align: 'center' },
 ])
+
+// 燃气智能监测终端
+const columns1 = ref<any>([
+  { text: '设备编号', value: 'devcode', align: 'center' },
+  { text: '燃气浓度（%LEL)', value: 'strength', align: 'center' },
+  { text: '电量(%)', value: 'cell', align: 'center' },
+  { text: '信号强度', value: 'pci', align: 'center' },
+  { text: '采集时间', value: 'logtime', align: 'center' },
+  { text: '上传时间', value: 'uptime', align: 'center' },
+])
+// 管网哨兵
+const columns2 = ref<any>([
+  { text: '设备编号', value: 'devcode', align: 'center' },
+  { text: '燃气浓度（%LEL)', value: 'gasval', align: 'center' },
+  { text: '电池电压(V)', value: 'vbat', align: 'center' },
+  { text: '采集时间', value: 'logtime', align: 'center' },
+  { text: '上传时间', value: 'uptime', align: 'center' },
+])
+// DATA_GAS("燃气智能监测终端", "data_gas", "devcode,uptime,logtime", "id,well_code,devcode设备编号,cell电量,strength浓度,descn,uptime采集时间,logtime上传时间,pci,rsrp,snr", "logtime"),
+// DATA_TUBE_OTHER("管网哨兵", "data_tube_other", "devcode,uptime,logtime", "DEVCODE设备编号,GASVAL浓度, VBAT电压,SIN,RSRP,SINR,UPTIME采集时间,LOGTIME上传时间", "logtime"),
+// DATA_MONITOR_PIPE_OTHER("智能警示桩", "data_monitor_pipe_other", "devcode,uptime,logtime", "TEMPERATURE,HUMIDITY,VBAT,PIPE_INCLINE_ALARM,PIPE_BREAK_ALARM,LEFT_OFF_LINE_ALARM,LEFT_VIBRATE_ALARM,RIGHT_OFF_LINE_ALARM,RIGHT_VIBRATE_ALARM,PICTURE_ALARM,LEFT_GAS,RIGHT_GAS,LOGTIME,UPTIME ", "logtime"),
+// DATA_PAN_GAS("场站监测云台", "data_pan_gas", "DEVICE_CODE,,logtime", "ID,LEDGER_NUMBER,DEVICE_CODE设备编号,CONCENTRATION浓度,LOGTIME,DIRCETION水平位置,PITCH垂直位置", "LOGTIME采集时间");
+// 智能警示桩
+const columns3 = ref<any>([
+  { text: '左侧甲烷值', value: 'leftGas', align: 'center', width: '110' },
+  { text: '右侧甲烷值', value: 'rightGas', align: 'center', width: '110' },
+  { text: '电池电压(V)', value: 'vbat', align: 'center', width: '110' },
+  { text: '桩倾斜报警', value: 'pipeInclineAlarm', align: 'center', width: '110' },
+  { text: '桩拆卸报警', value: 'pipeBreakAlarm', align: 'center', width: '110' },
+  { text: '左断线报警', value: 'leftOffLineAlarm', align: 'center', width: '110' },
+  { text: '左振动报警', value: 'leftVibrateAlarm', align: 'center', width: '110' },
+  { text: '右断线报警', value: 'rightOffLineAlarm', align: 'center', width: '110' },
+  { text: '右振动报警', value: 'rightVibrateAlarm', align: 'center', width: '110' },
+  { text: '采集时间', value: 'logtime', align: 'center' },
+  { text: '上传时间', value: 'uptime', align: 'center' },
+])
+// 场站监测云台
+const columns4 = ref<any>([
+  { text: '设备编号', value: 'deviceCode', align: 'center' },
+  { text: '浓度', value: 'concentration', align: 'center' },
+  { text: '水平位置', value: 'dircetion', align: 'center' },
+  { text: '垂直位置', value: 'pitch', align: 'center' },
+  { text: '采集时间', value: 'logtime', align: 'center' },
+  { text: '上传时间', value: 'uptime', align: 'center' },
+])
+const row = JSON.parse($route.query.row as string)
+if (row.deviceTypeName) {
+  if (row.deviceTypeName === '燃气智能监测终端') {
+    columns.value = columns1.value
+  }
+  else if (row.deviceTypeName === '管网哨兵') {
+    columns.value = columns2.value
+  }
+  else if (row.deviceTypeName === '智能警示桩') {
+    columns.value = columns3.value
+  }
+  else if (row.deviceTypeName === '场站监测云台') {
+    columns.value = columns4.value
+  }
+  else {
+    columns.value = columns1.value
+  }
+}
+else {
+  columns.value = columns1.value
+}
 const fetchData = () => {
   const data = JSON.parse($route.query.row as string)
   listQuery.value.devcode = data.devcode
@@ -73,20 +139,55 @@
   getDataSearch(listQuery.value).then((res) => {
     list.value = res.data.map((item: any) => toHumpObject(item))
     xAxisData.value = list.value.slice().reverse().map(item => item.logtime)
-    data.value = [
-      {
-        name: '燃气浓度',
-        data: list.value.slice().reverse().map(item => item.snr || '0'),
-      },
-      {
-        name: '电量',
-        data: list.value.slice().reverse().map(item => item.cell || '0'),
-      },
-      {
-        name: '信号强度',
-        data: list.value.slice().reverse().map(item => item.strength || '0'),
-      },
-    ]
+    if (!data.deviceTypeName || data.deviceTypeName === '燃气智能监测终端') {
+      data.value = [
+        {
+          name: '燃气浓度',
+          data: list.value.slice().reverse().map(item => item.snr || '0'),
+        },
+        {
+          name: '电量',
+          data: list.value.slice().reverse().map(item => item.cell || '0'),
+        },
+        {
+          name: '信号强度',
+          data: list.value.slice().reverse().map(item => item.strength || '0'),
+        },
+      ]
+    }
+    else if (data.deviceTypeName === '管网哨兵') {
+      data.value = [
+        {
+          name: '燃气浓度',
+          data: list.value.slice().reverse().map(item => item.gasval || '0'),
+        },
+        {
+          name: '电压',
+          data: list.value.slice().reverse().map(item => item.vbat || '0'),
+        },
+      ]
+    }
+    else if (data.deviceTypeName === '智能警示桩') {
+      data.value = [
+        {
+          name: '左侧甲烷值',
+          data: list.value.slice().reverse().map(item => item.leftGas || '0'),
+        },
+        {
+          name: '右侧甲烷值',
+          data: list.value.slice().reverse().map(item => item.rightGas || '0'),
+        },
+      ]
+    }
+    else if (data.deviceTypeName === '场站监测云台') {
+      data.value = [
+        {
+          name: '浓度',
+          data: list.value.slice().reverse().map(item => item.concentration || '0'),
+        },
+      ]
+    }
+
     console.log(xAxisData.value, data.value)
     loadingTable.value = false
     if (!showTable.value) {
diff --git a/src/views/home/pipeline/components/monitorDataList.vue b/src/views/home/pipeline/components/monitorDataList.vue
index 283de83..92e5f81 100644
--- a/src/views/home/pipeline/components/monitorDataList.vue
+++ b/src/views/home/pipeline/components/monitorDataList.vue
@@ -5,29 +5,68 @@
  -->
 <script lang="ts" setup name="WellDetailMonitorDataGasList">
 import dayjs from 'dayjs'
-import { getMonitorData } from '@/api/home/pipeline/pipeline'
+// import { getMonitorData } from '@/api/home/pipeline/pipeline'
+import { getDataSearch } from '@/api/home/device/device'
+import { toHumpObject } from '@/utils/String'
 const $route = useRoute()
 // 列表loading
 const loadingTable = ref(true)
 //  列表展示数据
 const list = ref([])
 //  列表展示列
-const columns = ref<any>([
-  { text: '左侧甲烷值', value: 'CH4L', align: 'center', width: '110' },
-  { text: '右侧甲烷值', value: 'CH4R', align: 'center', width: '110' },
-  // { text: '地层温度(℃)', value: 'TEMPERATURE', align: 'center', width: '110' },
-  // { text: '地层湿度(%RH)', value: 'HUMIDITY', align: 'center', width: '140' },
-  { text: '电池电压(V)', value: 'VBAT', align: 'center', width: '110' },
-  { text: '桩倾斜报警', value: 'PIPE_INCLINE_ALARM', align: 'center', width: '110' },
-  { text: '桩拆卸报警', value: 'PIPE_BREAK_ALARM', align: 'center', width: '110' },
-  { text: '左断线报警', value: 'LEFT_OFF_LINE_ALARM', align: 'center', width: '110' },
-  { text: '左振动报警', value: 'LEFT_VIBRATE_ALARM', align: 'center', width: '110' },
-  { text: '右断线报警', value: 'RIGHT_OFF_LINE_ALARM', align: 'center', width: '110' },
-  { text: '右振动报警', value: 'RIGHT_VIBRATE_ALARM', align: 'center', width: '110' },
-  // { text: '报警图像输出', value: 'PICTURE_ALARM', align: 'center' },
-  { text: '采集时间', value: 'LOGTIME', align: 'center' },
-  { text: '上传时间', value: 'UPTIME', align: 'center' },
+const columns = ref<any>([])
+// 燃气智能监测终端
+const columns1 = ref<any>([
+  { text: '设备编号', value: 'devcode', align: 'center' },
+  { text: '燃气浓度（%LEL)', value: 'strength', align: 'center' },
+  { text: '电量(%)', value: 'cell', align: 'center' },
+  { text: '信号强度', value: 'pci', align: 'center' },
+  { text: '采集时间', value: 'logtime', align: 'center' },
+  { text: '上传时间', value: 'uptime', align: 'center' },
 ])
+// 管网哨兵
+const columns2 = ref<any>([
+  { text: '设备编号', value: 'devcode', align: 'center' },
+  { text: '燃气浓度（%LEL)', value: 'gasval', align: 'center' },
+  { text: '电池电压(V)', value: 'vbat', align: 'center' },
+  { text: '采集时间', value: 'logtime', align: 'center' },
+  { text: '上传时间', value: 'uptime', align: 'center' },
+])
+// 智能警示桩
+const columns3 = ref<any>([
+  { text: '左侧甲烷值', value: 'leftGas', align: 'center', width: '110' },
+  { text: '右侧甲烷值', value: 'rightGas', align: 'center', width: '110' },
+  { text: '电池电压(V)', value: 'vbat', align: 'center', width: '110' },
+  { text: '桩倾斜报警', value: 'pipeInclineAlarm', align: 'center', width: '110' },
+  { text: '桩拆卸报警', value: 'pipeBreakAlarm', align: 'center', width: '110' },
+  { text: '左断线报警', value: 'leftOffLineAlarm', align: 'center', width: '110' },
+  { text: '左振动报警', value: 'leftVibrateAlarm', align: 'center', width: '110' },
+  { text: '右断线报警', value: 'rightOffLineAlarm', align: 'center', width: '110' },
+  { text: '右振动报警', value: 'rightVibrateAlarm', align: 'center', width: '110' },
+  { text: '采集时间', value: 'logtime', align: 'center' },
+  { text: '上传时间', value: 'uptime', align: 'center' },
+])
+// 场站监测云台
+const columns4 = ref<any>([
+  { text: '设备编号', value: 'deviceCode', align: 'center' },
+  { text: '浓度', value: 'concentration', align: 'center' },
+  { text: '水平位置', value: 'dircetion', align: 'center' },
+  { text: '垂直位置', value: 'pitch', align: 'center' },
+  { text: '采集时间', value: 'logtime', align: 'center' },
+  { text: '上传时间', value: 'uptime', align: 'center' },
+])
+if (!$route.query.typeName || $route.query.typeName === '燃气智能监测终端') {
+  columns.value = columns1.value
+}
+else if ($route.query.typeName === '管网哨兵') {
+  columns.value = columns2.value
+}
+else if ($route.query.typeName === '智能警示桩') {
+  columns.value = columns3.value
+}
+else if ($route.query.typeName === '场站监测云台') {
+  columns.value = columns4.value
+}
 const listQuery = ref({
   devcode: '',
   logBegTime: '',
@@ -75,20 +114,21 @@
   loadingTable.value = true
   listQuery.value.devcode = $route.query.deviceCode as string
   listQuery.value.typeName = $route.query.typeName as string
-  getMonitorData(listQuery.value).then((res) => {
-    list.value = res.data.map((item: any) => {
-      for (const i in item) {
-        if (i.includes('ALARM')) {
-          if (i === 'PICTURE_ALARM') {
-            item[i] = item[i] === '0' ? '/' : item[i]
-          }
-          else {
-            item[i] = item[i] === '0' ? '正常' : '报警'
-          }
-        }
-      }
-      return item
-    })
+  getDataSearch(listQuery.value).then((res) => {
+    // list.value = res.data.map((item: any) => {
+    //   for (const i in item) {
+    //     if (i.includes('ALARM')) {
+    //       if (i === 'PICTURE_ALARM') {
+    //         item[i] = item[i] === '0' ? '/' : item[i]
+    //       }
+    //       else {
+    //         item[i] = item[i] === '0' ? '正常' : '报警'
+    //       }
+    //     }
+    //   }
+    //   return item
+    // })
+    list.value = res.data.map((item: any) => toHumpObject(item))
     loadingTable.value = false
   }).catch(() => {
     loadingTable.value = false

diff --git a/src/assets/fullscren/br-logo.png b/src/assets/fullscren/br-logo.png
new file mode 100644
index 0000000..f3db083
--- /dev/null
+++ b/src/assets/fullscren/br-logo.png
Binary files differ
diff --git a/src/assets/fullscren/br-title.png b/src/assets/fullscren/br-title.png
new file mode 100644
index 0000000..9c7237e
--- /dev/null
+++ b/src/assets/fullscren/br-title.png
Binary files differ
diff --git a/src/components/DeptSelect/index.vue b/src/components/DeptSelect/index.vue
index ef7bd91..948bd8b 100644
--- a/src/components/DeptSelect/index.vue
+++ b/src/components/DeptSelect/index.vue
@@ -68,16 +68,17 @@
 function fetchPcode() {
   // 如果未指定需要展示的部门类型，获取全部部门
   if (!props.deptType) {
-    if (dictStore.allDeptList.length === 0) { // 如果store中未存储，从服务器上获取
-      getDeptTreeList().then((res) => {
-        const list = res.data
-        dictStore.setAllDeptList(list)
-        refreshList(list)
-      })
-    }
-    else {
-      refreshList(dictStore.allDeptList)
-    }
+    // if (dictStore.allDeptList.length === 0) { // 如果store中未存储，从服务器上获取
+    getDeptTreeList().then((res) => {
+      const list = res.data.filter((item: any) => item.id !== '0')
+      dictStore.setAllDeptList(list)
+      refreshList(list)
+      console.log(list, 'list')
+    })
+    // }
+    // else {
+    //   refreshList(dictStore.allDeptList)
+    // }
   }
   else { // 如果指定了需要展示的部门类型
     if (dictStore.companyList.length === 0) { // 如果store中未存储，从服务器上获取
@@ -159,24 +160,15 @@
 <template>
   <div style="width: 100%;">
     <el-tree-select
-      v-if="multiData"
-      v-model="value"
-      :data="deptTreeList"
-      node-key="id"
-      :filter-node-method="filterTree"
-      :props="defaultProps"
-      :expand-on-click-node="false"
-      :render-after-expand="false"
-      :size="props.size"
-      :placeholder="props.placeholder"
-      :clearable="props.clearable"
-      check-strictly
-      check-on-click-node
-      filterable
-      class="full-width-input"
-      :disabled="props.disabled"
+      v-if="multiData" v-model="value" :data="deptTreeList" node-key="id" :filter-node-method="filterTree"
+      :props="defaultProps" :expand-on-click-node="false" :render-after-expand="false" :size="props.size"
+      :placeholder="props.placeholder" :clearable="props.clearable" check-strictly check-on-click-node filterable
+      class="full-width-input" :disabled="props.disabled"
     />
-    <el-select v-else v-model="value" :placeholder="props.placeholder" :size="props.size" :disabled="props.disabled" :clearable="props.clearable" class="full-width-input">
+    <el-select
+      v-else v-model="value" :placeholder="props.placeholder" :size="props.size" :disabled="props.disabled"
+      :clearable="props.clearable" class="full-width-input"
+    >
       <el-option v-for="(item, index) in deptTreeList" :key="index" :label="item.name" :value="item.id" />
     </el-select>
   </div>
diff --git a/src/components/Echart/BarChart3D.vue b/src/components/Echart/BarChart3D.vue
index 8b8d8ea..ee7dbba 100644
--- a/src/components/Echart/BarChart3D.vue
+++ b/src/components/Echart/BarChart3D.vue
@@ -276,12 +276,12 @@
       textStyle: {
         fontSize: 16,
       },
-      axisPointer: {
-        type: 'cross',
-        label: {
-          fontSize: 13,
-        },
-      },
+      // axisPointer: {
+      //   type: 'cross',
+      //   label: {
+      //     fontSize: 13,
+      //   },
+      // },
       valueFormatter: (value: string | number) => {
         return value ? value + props.unit : value === 0 ? '0' : ''
       },
diff --git a/src/components/Echart/BarChartHorizontal.vue b/src/components/Echart/BarChartHorizontal.vue
index 6a3c107..366e064 100644
--- a/src/components/Echart/BarChartHorizontal.vue
+++ b/src/components/Echart/BarChartHorizontal.vue
@@ -265,12 +265,12 @@
       textStyle: {
         fontSize: 16,
       },
-      axisPointer: {
-        type: 'cross',
-        label: {
-          fontSize: 13,
-        },
-      },
+      // axisPointer: {
+      //   type: 'cross',
+      //   label: {
+      //     fontSize: 13,
+      //   },
+      // },
       valueFormatter: (value: string | number) => {
         return value ? value + props.unit : ''
       },
diff --git a/src/components/Echart/BarChartVertical.vue b/src/components/Echart/BarChartVertical.vue
index 7701800..8f36130 100644
--- a/src/components/Echart/BarChartVertical.vue
+++ b/src/components/Echart/BarChartVertical.vue
@@ -253,12 +253,12 @@
       textStyle: {
         fontSize: 16,
       },
-      axisPointer: {
-        type: 'cross',
-        label: {
-          fontSize: 13,
-        },
-      },
+      // axisPointer: {
+      //   type: 'cross',
+      //   label: {
+      //     fontSize: 13,
+      //   },
+      // },
       valueFormatter: (value: string | number) => {
         return value ? value + props.unit : value === 0 ? '0' : ''
       },
diff --git a/src/components/Echart/LineChart.vue b/src/components/Echart/LineChart.vue
index faf6777..751133f 100644
--- a/src/components/Echart/LineChart.vue
+++ b/src/components/Echart/LineChart.vue
@@ -200,12 +200,12 @@
       textStyle: {
         fontSize: 16,
       },
-      axisPointer: {
-        type: 'cross',
-        label: {
-          fontSize: 13,
-        },
-      },
+      // axisPointer: {
+      //   type: 'cross',
+      //   label: {
+      //     fontSize: 13,
+      //   },
+      // },
       valueFormatter: (value: string | number) => {
         return value ? value + props.unit : value === 0 ? '0' : ''
       },
diff --git a/src/components/map/index offline.vue b/src/components/map/index offline.vue
index 5bf7bb9..e8c31b0 100644
--- a/src/components/map/index offline.vue
+++ b/src/components/map/index offline.vue
@@ -512,7 +512,7 @@
 <template>
   <div class="container">
     <!-- 地图 -->
-    <div id="map" ref="wrapRef " v-loading="loading" />
+    <div id="map" ref="wrapRef" v-loading="loading" />
   </div>
 </template>
 
diff --git a/src/layouts/components/Tools/alarmList.vue b/src/layouts/components/Tools/alarmList.vue
index 425ec3d..1274d52 100644
--- a/src/layouts/components/Tools/alarmList.vue
+++ b/src/layouts/components/Tools/alarmList.vue
@@ -151,7 +151,7 @@
       <template v-else>
         <div v-for="message of messageList" :key="message.id" class="message-item">
           <div class="message-content" @click="detailRow(message)">
-            <div class="title">
+            <div class="title" :title="`${message.alarmMsg}${message.alarmTime}`">
               <div class="container">
                 <div
                   :class="`mar circle circle-${message.alarmLevelName.includes('一级') ? '1' : message.alarmLevelName.includes('二级') ? '2' : message.alarmLevelName.includes('三级') ? '3' : 'other'}`"
diff --git a/src/views/home/dashboard/components/controlMap.vue b/src/views/home/dashboard/components/controlMap.vue
index e1d0651..388cec5 100644
--- a/src/views/home/dashboard/components/controlMap.vue
+++ b/src/views/home/dashboard/components/controlMap.vue
@@ -326,6 +326,7 @@
   setTimeout(() => {
     ele.setAttribute('style', 'font-size: 16px')
   }, 50)
+  detailRef.value.close()
 }
 const publicPath = window.location.href.split('#')[0]
 watch(() => showStatus.value, (newVal) => {
diff --git a/src/views/home/dashboard/components/demonstration.vue b/src/views/home/dashboard/components/demonstration.vue
index 4677f14..f9c4f14 100644
--- a/src/views/home/dashboard/components/demonstration.vue
+++ b/src/views/home/dashboard/components/demonstration.vue
@@ -30,31 +30,71 @@
     <div class="district-header">
       {{ $props.data.name }}
     </div>
+    <div class="content">
+      <div class="name">
+        设备类型:
+      </div>
+      <div class="value">
+        {{ $props.data.type }}
+      </div>
+    </div>
+    <div class="content">
+      <div class="name">
+        设备编号:
+      </div>
+      <div class="value">
+        {{ }}
+      </div>
+    </div>
+    <div class="content">
+      <div class="name">
+        厂商:
+      </div>
+      <div class="value">
+        北京无线电计量测试研究所
+      </div>
+    </div>
+    <div class="content">
+      <div class="name">
+        负责人:
+      </div>
+      <div class="value">
+        {{ }}
+      </div>
+    </div>
+    <div class="content">
+      <div class="name">
+        联系方式:
+      </div>
+      <div class="value" />
+    </div>
+    <div class="content">
+      <div class="name">
+        管理单位:
+      </div>
+      <div class="value">
+        第一分公司
+      </div>
+    </div>
+    <div class="content">
+      <div class="name">
+        详细位置:
+      </div>
+      <div class="value" />
+    </div>
     <!-- <div class="content">
-      <div class="name">面积:</div>
-      <div class="value">{{ $props.data.area }}平方公里</div>
-    </div>
-    <div class="content">
-      <div class="name">管理公司:</div>
-      <div class="value">{{ $props.data.deptName }}</div>
-    </div>
-    <div class="content">
-      <div class="name">管线长度:</div>
-      <div class="value">{{ $props.data.long }}公里</div>
-    </div>
-    <div class="content">
       <div class="name">调压站:</div>
       <div class="value">{{ $props.data.tyz }}座</div>
-    </div>
-    <div class="content">
+    </div> -->
+    <!-- <div class="content">
       <div class="name">调压箱:</div>
       <div class="value"> {{ $props.data.tyx }}座</div>
-    </div>
-    <div class="content">
+    </div> -->
+    <!-- <div class="content">
       <div class="name">闸井:</div>
       <div class="value">{{ $props.data.well }}个</div>
-    </div>
-    <div class="content">
+    </div> -->
+    <!-- <div class="content">
       <div class="name">监控覆盖率:</div>
       <div class="value">{{ $props.data.rate }}%</div>
     </div> -->
diff --git a/src/views/home/dashboard/components/detailInfoDialog.vue b/src/views/home/dashboard/components/detailInfoDialog.vue
index 1aad185..351fbf9 100644
--- a/src/views/home/dashboard/components/detailInfoDialog.vue
+++ b/src/views/home/dashboard/components/detailInfoDialog.vue
@@ -28,11 +28,13 @@
   }
   dialogFormVisible.value = true
 }
-defineExpose({ initDialog })
+
 // 关闭
 const close = () => {
   infoWindow.value.close()
 }
+
+defineExpose({ initDialog, close })
 </script>
 
 <template>
diff --git a/src/views/home/dashboard/components/noticeDialog.vue b/src/views/home/dashboard/components/noticeDialog.vue
new file mode 100644
index 0000000..4152ae2
--- /dev/null
+++ b/src/views/home/dashboard/components/noticeDialog.vue
@@ -0,0 +1,95 @@
+<!--
+  Description: 消息通知-更多消息弹窗
+  Author: 李亚光
+  Date: 2024-10-10
+ -->
+<script lang="ts" setup name="NoticeMoreDialog">
+import { ElMessage } from 'element-plus'
+import { getMessage } from '@/api/home/dashboard/index'
+const $router = useRouter()
+const dialogFormVisible = ref(false) // 对话框是否显示
+const list = ref<any[]>([])
+const columns = ref<any>([
+  { text: '消息提醒类型', value: 'messageTypeDetail', align: 'center', width: '200' },
+  { text: '消息提醒内容', value: 'messageContent', align: 'center' },
+  { text: '时间', value: 'ts', align: 'center', width: '180' },
+])
+const loadingTable = ref(true)
+const initDialog = () => {
+  dialogFormVisible.value = true
+}
+const cancel = () => {
+  dialogFormVisible.value = false
+}
+const fetchData = () => {
+  loadingTable.value = true
+  getMessage().then((res) => {
+    list.value = res.data.rows.reverse()
+    loadingTable.value = false
+  }).catch(() => {
+    loadingTable.value = false
+  })
+}
+fetchData()
+defineExpose({
+  initDialog,
+})
+// 查看详情
+const detail = (row: any) => {
+  // 报警类跳转
+  if (row.messageTypeDetail.includes('报警')) {
+    if (row.alarmId) {
+      $router.push({
+        name: 'AlarmCurrentDetail',
+        query: {
+          id: row.alarmId,
+          row: JSON.stringify(row),
+        },
+      })
+    }
+    else {
+      ElMessage.warning('该数据缺少报警信息')
+    }
+  }
+}
+</script>
+
+<template>
+  <el-dialog v-model="dialogFormVisible" title="消息通知" append-to-body>
+    <normal-table
+      :data="list" :total="0" :columns="columns" :query="{}" :list-loading="loadingTable"
+      :pagination="false" :height="400"
+    >
+      <template #columns>
+        <el-table-column label="操作" align="center" width="80">
+          <template #default="scope">
+            <el-button
+              type="primary" link size="small"
+              :disabled="!((scope.row.messageTypeDetail.includes('报警') && !scope.row.messageTypeDetail.includes('解除')) || scope.row.messageTypeDetail.includes('施工'))"
+              @click="detail(scope.row)"
+            >
+              查看
+            </el-button>
+          </template>
+        </el-table-column>
+      </template>
+    </normal-table>
+    <template #footer>
+      <div class="dialog-footer">
+        <el-button type="primary" @click="cancel">
+          确认
+        </el-button>
+      </div>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+.el-dialog {
+  width: 700px;
+}
+
+.el-select {
+  width: 100%;
+}
+</style>
diff --git a/src/views/home/dashboard/fullScreen-components/alarmCount.vue b/src/views/home/dashboard/fullScreen-components/alarmCount.vue
index d65e913..ba24ad9 100644
--- a/src/views/home/dashboard/fullScreen-components/alarmCount.vue
+++ b/src/views/home/dashboard/fullScreen-components/alarmCount.vue
@@ -96,9 +96,10 @@
 // }
 
 .active {
-  color: #3d7eff;
+  color: #1c3444;
   border-color: #e6ebf5;
   outline: none;
-  background-color: rgba($color: #98a7bb, $alpha: 80%);
+  font-weight: 700;
+  background-color: rgba($color: #98a7bb, $alpha: 100%);
 }
 </style>
diff --git a/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue b/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue
index 08d7a93..f723273 100644
--- a/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue
+++ b/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue
@@ -196,7 +196,7 @@
           text-align: center;
           font-size: 24px;
           font-weight: 700;
-          color: #fff;
+          color: #d81010;
         }
 
         .title1 {
diff --git a/src/views/home/dashboard/fullScreen-components/baseOverView.vue b/src/views/home/dashboard/fullScreen-components/baseOverView.vue
index e973da6..bd3a653 100644
--- a/src/views/home/dashboard/fullScreen-components/baseOverView.vue
+++ b/src/views/home/dashboard/fullScreen-components/baseOverView.vue
@@ -90,15 +90,24 @@
     // justify-content: space-between;
     margin: 20px 0;
 
-    img {
-      width: 90%;
+    .img {
+      width: 50%;
+      box-sizing: border-box;
+      // flex: 1;
+
+      img {
+        width: 90%;
+        height: 100%;
+      }
     }
 
     .data {
       box-sizing: border-box;
       margin-left: 5px;
+
       // display: flex;
       .value {
+
         // padding-left: 10px;
         .value {
           color: #fff;
diff --git a/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue b/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue
index 3dd0897..eb2c2fd 100644
--- a/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue
+++ b/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue
@@ -18,7 +18,7 @@
 
 onMounted(() => {
   setTimeout(() => {
-    xAxisData.value = ['第一分公司', '第二分公司', '第三分公司', '第四分公司', '第五分公司']
+    xAxisData.value = ['第一分公司', '第二分公司', '第三分公司', '第四分公司', '第五分公司'].reverse()
     data.value = [
       {
         name: '数量',
diff --git a/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue b/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue
index c933977..81e19fa 100644
--- a/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue
+++ b/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue
@@ -113,10 +113,11 @@
 }
 
 .active {
-  color: #3d7eff;
+  color: #1c3444;
   border-color: #e6ebf5;
   outline: none;
-  background-color: rgba($color: #98a7bb, $alpha: 80%);
+  font-weight: 700;
+  background-color: rgba($color: #98a7bb, $alpha: 100%);
 }
 
 // .layout {
diff --git a/src/views/home/dashboard/fullScreen.vue b/src/views/home/dashboard/fullScreen.vue
index 410e728..21f89e0 100644
--- a/src/views/home/dashboard/fullScreen.vue
+++ b/src/views/home/dashboard/fullScreen.vue
@@ -27,7 +27,12 @@
 <template>
   <div class="container-full">
     <!-- banner区域 -->
-    <div class="banner" />
+    <div class="banner">
+      <div class="title">
+        <div class="logo" />
+        <div class="name" />
+      </div>
+    </div>
     <!-- 关闭按钮 -->
     <div class="close">
       <div class="icon" @click="closePage">
@@ -72,7 +77,29 @@
     z-index: 98;
     height: 100px;
     width: 100%;
-    background: url("@/assets/fullscren/banner.png") no-repeat;
+    background: url("@/assets/fullscren/banner-bg.png") no-repeat;
+
+    .title {
+      height: 100px;
+      width: 100%;
+      position: absolute;
+      top: 0;
+      left: 0;
+      z-index: 99;
+
+      // .logo {
+      //   width: 200px;
+      //   height: 100px;
+      //   background: url("@/assets/fullscren/br-logo.png") no-repeat;
+      // }
+
+      .name {
+        // width: 400px;
+        height: 80px;
+        width: 100%;
+        background: url("@/assets/fullscren/br-title.png") no-repeat center;
+      }
+    }
   }
 
   .close {
diff --git a/src/views/home/dashboard/index.vue b/src/views/home/dashboard/index.vue
index 42dfbed..df9f331 100644
--- a/src/views/home/dashboard/index.vue
+++ b/src/views/home/dashboard/index.vue
@@ -6,6 +6,7 @@
 <script lang="ts" setup name="Dashboard">
 import card from './components/showCard.vue'
 import { img } from './components/imgData'
+import moreNotice from './components/noticeDialog.vue'
 import { getBase, getDeviceStatus, getMessage } from '@/api/home/dashboard/index'
 import locationAnalysis from '@/views/home/alarm/count/components/locationAnalysis.vue'
 import layout from '@/views/home/alarm/count/components/layout.vue'
@@ -101,10 +102,10 @@
 // 消息通知数据
 const messageLoading = ref(true)
 const messageData = ref<any[]>([])
-// 更多跳转
-const more = (type: string) => {
+// // 更多跳转
+// const  = (type: string) => {
 
-}
+// }
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
 const routeToPage = (item: any) => {
@@ -149,18 +150,26 @@
   // 消息通知
   messageLoading.value = true
   getMessage().then((res) => {
-    messageData.value = res.data.rows
+    messageData.value = res.data.rows.reverse()
     messageLoading.value = false
   }).catch(() => {
     messageLoading.value = false
   })
 }
 fetchData()
+
+// 消息通知-更多
+const noticeRef = ref()
+const more = () => {
+  noticeRef.value.initDialog()
+}
 </script>
 
 <template>
   <!-- 布局 -->
   <app-container>
+    <!-- 消息通知-更多 -->
+    <more-notice ref="noticeRef" />
     <!-- 上部 -->
     <div class="top-container">
       <div class="top-left-container">
@@ -233,8 +242,8 @@
         <template #search>
           <div class="search">
             <div />
-            <div class="more">
-              <!-- >>更多 -->
+            <div class="more" @click="more">
+              >>更多
             </div>
           </div>
         </template>
diff --git a/src/views/home/device/device/components/controlRecord.vue b/src/views/home/device/device/components/controlRecord.vue
index 185348e..6553e62 100644
--- a/src/views/home/device/device/components/controlRecord.vue
+++ b/src/views/home/device/device/components/controlRecord.vue
@@ -73,6 +73,7 @@
   await fetchDict()
   fetchData()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -88,7 +89,7 @@
       </el-button>
     </template>
     <template #btns-right>
-      <el-button type="primary" @click="addControl">
+      <el-button v-if="proxy.hasPerm('/device/instruction/add') && proxy.hasPerm('/device/instruction')" type="primary" @click="addControl">
         新建
       </el-button>
     </template>
diff --git a/src/views/home/device/device/components/dataSearch.vue b/src/views/home/device/device/components/dataSearch.vue
index 3bea05e..1b1e313 100644
--- a/src/views/home/device/device/components/dataSearch.vue
+++ b/src/views/home/device/device/components/dataSearch.vue
@@ -58,13 +58,79 @@
 const data = ref<any[]>([])
 //  列表展示列
 const columns = ref<any>([
-  { text: '设备编号', value: 'devcode', align: 'center' },
-  { text: '燃气浓度（%LEL)', value: 'snr', align: 'center' },
-  { text: '电量(%)', value: 'cell', align: 'center' },
-  { text: '信号强度', value: 'strength', align: 'center' },
-  { text: '采集时间', value: 'uptime', align: 'center' },
-  { text: '上传时间', value: 'logtime', align: 'center' },
+  // { text: '设备编号', value: 'devcode', align: 'center' },
+  // { text: '燃气浓度（%LEL)', value: 'snr', align: 'center' },
+  // { text: '电量(%)', value: 'cell', align: 'center' },
+  // { text: '信号强度', value: 'strength', align: 'center' },
+  // { text: '采集时间', value: 'uptime', align: 'center' },
+  // { text: '上传时间', value: 'logtime', align: 'center' },
 ])
+
+// 燃气智能监测终端
+const columns1 = ref<any>([
+  { text: '设备编号', value: 'devcode', align: 'center' },
+  { text: '燃气浓度（%LEL)', value: 'strength', align: 'center' },
+  { text: '电量(%)', value: 'cell', align: 'center' },
+  { text: '信号强度', value: 'pci', align: 'center' },
+  { text: '采集时间', value: 'logtime', align: 'center' },
+  { text: '上传时间', value: 'uptime', align: 'center' },
+])
+// 管网哨兵
+const columns2 = ref<any>([
+  { text: '设备编号', value: 'devcode', align: 'center' },
+  { text: '燃气浓度（%LEL)', value: 'gasval', align: 'center' },
+  { text: '电池电压(V)', value: 'vbat', align: 'center' },
+  { text: '采集时间', value: 'logtime', align: 'center' },
+  { text: '上传时间', value: 'uptime', align: 'center' },
+])
+// DATA_GAS("燃气智能监测终端", "data_gas", "devcode,uptime,logtime", "id,well_code,devcode设备编号,cell电量,strength浓度,descn,uptime采集时间,logtime上传时间,pci,rsrp,snr", "logtime"),
+// DATA_TUBE_OTHER("管网哨兵", "data_tube_other", "devcode,uptime,logtime", "DEVCODE设备编号,GASVAL浓度, VBAT电压,SIN,RSRP,SINR,UPTIME采集时间,LOGTIME上传时间", "logtime"),
+// DATA_MONITOR_PIPE_OTHER("智能警示桩", "data_monitor_pipe_other", "devcode,uptime,logtime", "TEMPERATURE,HUMIDITY,VBAT,PIPE_INCLINE_ALARM,PIPE_BREAK_ALARM,LEFT_OFF_LINE_ALARM,LEFT_VIBRATE_ALARM,RIGHT_OFF_LINE_ALARM,RIGHT_VIBRATE_ALARM,PICTURE_ALARM,LEFT_GAS,RIGHT_GAS,LOGTIME,UPTIME ", "logtime"),
+// DATA_PAN_GAS("场站监测云台", "data_pan_gas", "DEVICE_CODE,,logtime", "ID,LEDGER_NUMBER,DEVICE_CODE设备编号,CONCENTRATION浓度,LOGTIME,DIRCETION水平位置,PITCH垂直位置", "LOGTIME采集时间");
+// 智能警示桩
+const columns3 = ref<any>([
+  { text: '左侧甲烷值', value: 'leftGas', align: 'center', width: '110' },
+  { text: '右侧甲烷值', value: 'rightGas', align: 'center', width: '110' },
+  { text: '电池电压(V)', value: 'vbat', align: 'center', width: '110' },
+  { text: '桩倾斜报警', value: 'pipeInclineAlarm', align: 'center', width: '110' },
+  { text: '桩拆卸报警', value: 'pipeBreakAlarm', align: 'center', width: '110' },
+  { text: '左断线报警', value: 'leftOffLineAlarm', align: 'center', width: '110' },
+  { text: '左振动报警', value: 'leftVibrateAlarm', align: 'center', width: '110' },
+  { text: '右断线报警', value: 'rightOffLineAlarm', align: 'center', width: '110' },
+  { text: '右振动报警', value: 'rightVibrateAlarm', align: 'center', width: '110' },
+  { text: '采集时间', value: 'logtime', align: 'center' },
+  { text: '上传时间', value: 'uptime', align: 'center' },
+])
+// 场站监测云台
+const columns4 = ref<any>([
+  { text: '设备编号', value: 'deviceCode', align: 'center' },
+  { text: '浓度', value: 'concentration', align: 'center' },
+  { text: '水平位置', value: 'dircetion', align: 'center' },
+  { text: '垂直位置', value: 'pitch', align: 'center' },
+  { text: '采集时间', value: 'logtime', align: 'center' },
+  { text: '上传时间', value: 'uptime', align: 'center' },
+])
+const row = JSON.parse($route.query.row as string)
+if (row.deviceTypeName) {
+  if (row.deviceTypeName === '燃气智能监测终端') {
+    columns.value = columns1.value
+  }
+  else if (row.deviceTypeName === '管网哨兵') {
+    columns.value = columns2.value
+  }
+  else if (row.deviceTypeName === '智能警示桩') {
+    columns.value = columns3.value
+  }
+  else if (row.deviceTypeName === '场站监测云台') {
+    columns.value = columns4.value
+  }
+  else {
+    columns.value = columns1.value
+  }
+}
+else {
+  columns.value = columns1.value
+}
 const fetchData = () => {
   const data = JSON.parse($route.query.row as string)
   listQuery.value.devcode = data.devcode
@@ -73,20 +139,55 @@
   getDataSearch(listQuery.value).then((res) => {
     list.value = res.data.map((item: any) => toHumpObject(item))
     xAxisData.value = list.value.slice().reverse().map(item => item.logtime)
-    data.value = [
-      {
-        name: '燃气浓度',
-        data: list.value.slice().reverse().map(item => item.snr || '0'),
-      },
-      {
-        name: '电量',
-        data: list.value.slice().reverse().map(item => item.cell || '0'),
-      },
-      {
-        name: '信号强度',
-        data: list.value.slice().reverse().map(item => item.strength || '0'),
-      },
-    ]
+    if (!data.deviceTypeName || data.deviceTypeName === '燃气智能监测终端') {
+      data.value = [
+        {
+          name: '燃气浓度',
+          data: list.value.slice().reverse().map(item => item.snr || '0'),
+        },
+        {
+          name: '电量',
+          data: list.value.slice().reverse().map(item => item.cell || '0'),
+        },
+        {
+          name: '信号强度',
+          data: list.value.slice().reverse().map(item => item.strength || '0'),
+        },
+      ]
+    }
+    else if (data.deviceTypeName === '管网哨兵') {
+      data.value = [
+        {
+          name: '燃气浓度',
+          data: list.value.slice().reverse().map(item => item.gasval || '0'),
+        },
+        {
+          name: '电压',
+          data: list.value.slice().reverse().map(item => item.vbat || '0'),
+        },
+      ]
+    }
+    else if (data.deviceTypeName === '智能警示桩') {
+      data.value = [
+        {
+          name: '左侧甲烷值',
+          data: list.value.slice().reverse().map(item => item.leftGas || '0'),
+        },
+        {
+          name: '右侧甲烷值',
+          data: list.value.slice().reverse().map(item => item.rightGas || '0'),
+        },
+      ]
+    }
+    else if (data.deviceTypeName === '场站监测云台') {
+      data.value = [
+        {
+          name: '浓度',
+          data: list.value.slice().reverse().map(item => item.concentration || '0'),
+        },
+      ]
+    }
+
     console.log(xAxisData.value, data.value)
     loadingTable.value = false
     if (!showTable.value) {
diff --git a/src/views/home/pipeline/components/monitorDataList.vue b/src/views/home/pipeline/components/monitorDataList.vue
index 283de83..92e5f81 100644
--- a/src/views/home/pipeline/components/monitorDataList.vue
+++ b/src/views/home/pipeline/components/monitorDataList.vue
@@ -5,29 +5,68 @@
  -->
 <script lang="ts" setup name="WellDetailMonitorDataGasList">
 import dayjs from 'dayjs'
-import { getMonitorData } from '@/api/home/pipeline/pipeline'
+// import { getMonitorData } from '@/api/home/pipeline/pipeline'
+import { getDataSearch } from '@/api/home/device/device'
+import { toHumpObject } from '@/utils/String'
 const $route = useRoute()
 // 列表loading
 const loadingTable = ref(true)
 //  列表展示数据
 const list = ref([])
 //  列表展示列
-const columns = ref<any>([
-  { text: '左侧甲烷值', value: 'CH4L', align: 'center', width: '110' },
-  { text: '右侧甲烷值', value: 'CH4R', align: 'center', width: '110' },
-  // { text: '地层温度(℃)', value: 'TEMPERATURE', align: 'center', width: '110' },
-  // { text: '地层湿度(%RH)', value: 'HUMIDITY', align: 'center', width: '140' },
-  { text: '电池电压(V)', value: 'VBAT', align: 'center', width: '110' },
-  { text: '桩倾斜报警', value: 'PIPE_INCLINE_ALARM', align: 'center', width: '110' },
-  { text: '桩拆卸报警', value: 'PIPE_BREAK_ALARM', align: 'center', width: '110' },
-  { text: '左断线报警', value: 'LEFT_OFF_LINE_ALARM', align: 'center', width: '110' },
-  { text: '左振动报警', value: 'LEFT_VIBRATE_ALARM', align: 'center', width: '110' },
-  { text: '右断线报警', value: 'RIGHT_OFF_LINE_ALARM', align: 'center', width: '110' },
-  { text: '右振动报警', value: 'RIGHT_VIBRATE_ALARM', align: 'center', width: '110' },
-  // { text: '报警图像输出', value: 'PICTURE_ALARM', align: 'center' },
-  { text: '采集时间', value: 'LOGTIME', align: 'center' },
-  { text: '上传时间', value: 'UPTIME', align: 'center' },
+const columns = ref<any>([])
+// 燃气智能监测终端
+const columns1 = ref<any>([
+  { text: '设备编号', value: 'devcode', align: 'center' },
+  { text: '燃气浓度（%LEL)', value: 'strength', align: 'center' },
+  { text: '电量(%)', value: 'cell', align: 'center' },
+  { text: '信号强度', value: 'pci', align: 'center' },
+  { text: '采集时间', value: 'logtime', align: 'center' },
+  { text: '上传时间', value: 'uptime', align: 'center' },
 ])
+// 管网哨兵
+const columns2 = ref<any>([
+  { text: '设备编号', value: 'devcode', align: 'center' },
+  { text: '燃气浓度（%LEL)', value: 'gasval', align: 'center' },
+  { text: '电池电压(V)', value: 'vbat', align: 'center' },
+  { text: '采集时间', value: 'logtime', align: 'center' },
+  { text: '上传时间', value: 'uptime', align: 'center' },
+])
+// 智能警示桩
+const columns3 = ref<any>([
+  { text: '左侧甲烷值', value: 'leftGas', align: 'center', width: '110' },
+  { text: '右侧甲烷值', value: 'rightGas', align: 'center', width: '110' },
+  { text: '电池电压(V)', value: 'vbat', align: 'center', width: '110' },
+  { text: '桩倾斜报警', value: 'pipeInclineAlarm', align: 'center', width: '110' },
+  { text: '桩拆卸报警', value: 'pipeBreakAlarm', align: 'center', width: '110' },
+  { text: '左断线报警', value: 'leftOffLineAlarm', align: 'center', width: '110' },
+  { text: '左振动报警', value: 'leftVibrateAlarm', align: 'center', width: '110' },
+  { text: '右断线报警', value: 'rightOffLineAlarm', align: 'center', width: '110' },
+  { text: '右振动报警', value: 'rightVibrateAlarm', align: 'center', width: '110' },
+  { text: '采集时间', value: 'logtime', align: 'center' },
+  { text: '上传时间', value: 'uptime', align: 'center' },
+])
+// 场站监测云台
+const columns4 = ref<any>([
+  { text: '设备编号', value: 'deviceCode', align: 'center' },
+  { text: '浓度', value: 'concentration', align: 'center' },
+  { text: '水平位置', value: 'dircetion', align: 'center' },
+  { text: '垂直位置', value: 'pitch', align: 'center' },
+  { text: '采集时间', value: 'logtime', align: 'center' },
+  { text: '上传时间', value: 'uptime', align: 'center' },
+])
+if (!$route.query.typeName || $route.query.typeName === '燃气智能监测终端') {
+  columns.value = columns1.value
+}
+else if ($route.query.typeName === '管网哨兵') {
+  columns.value = columns2.value
+}
+else if ($route.query.typeName === '智能警示桩') {
+  columns.value = columns3.value
+}
+else if ($route.query.typeName === '场站监测云台') {
+  columns.value = columns4.value
+}
 const listQuery = ref({
   devcode: '',
   logBegTime: '',
@@ -75,20 +114,21 @@
   loadingTable.value = true
   listQuery.value.devcode = $route.query.deviceCode as string
   listQuery.value.typeName = $route.query.typeName as string
-  getMonitorData(listQuery.value).then((res) => {
-    list.value = res.data.map((item: any) => {
-      for (const i in item) {
-        if (i.includes('ALARM')) {
-          if (i === 'PICTURE_ALARM') {
-            item[i] = item[i] === '0' ? '/' : item[i]
-          }
-          else {
-            item[i] = item[i] === '0' ? '正常' : '报警'
-          }
-        }
-      }
-      return item
-    })
+  getDataSearch(listQuery.value).then((res) => {
+    // list.value = res.data.map((item: any) => {
+    //   for (const i in item) {
+    //     if (i.includes('ALARM')) {
+    //       if (i === 'PICTURE_ALARM') {
+    //         item[i] = item[i] === '0' ? '/' : item[i]
+    //       }
+    //       else {
+    //         item[i] = item[i] === '0' ? '正常' : '报警'
+    //       }
+    //     }
+    //   }
+    //   return item
+    // })
+    list.value = res.data.map((item: any) => toHumpObject(item))
     loadingTable.value = false
   }).catch(() => {
     loadingTable.value = false
diff --git a/src/views/home/pipeline/index.vue b/src/views/home/pipeline/index.vue
index 8c23ef1..613d789 100644
--- a/src/views/home/pipeline/index.vue
+++ b/src/views/home/pipeline/index.vue
@@ -192,6 +192,10 @@
     ElMessage.warning('该数据缺少坐标信息')
     return
   }
+  if (!data.devcode || !data.id) {
+    ElMessage.warning('暂无详情数据')
+    return
+  }
   // 打开地图弹窗
   mapRef.value.openInfoDetail({
     lnglat: [data.lngGaode, data.latGaode],

diff --git a/src/assets/fullscren/br-logo.png b/src/assets/fullscren/br-logo.png
new file mode 100644
index 0000000..f3db083
--- /dev/null
+++ b/src/assets/fullscren/br-logo.png
Binary files differ
diff --git a/src/assets/fullscren/br-title.png b/src/assets/fullscren/br-title.png
new file mode 100644
index 0000000..9c7237e
--- /dev/null
+++ b/src/assets/fullscren/br-title.png
Binary files differ
diff --git a/src/components/DeptSelect/index.vue b/src/components/DeptSelect/index.vue
index ef7bd91..948bd8b 100644
--- a/src/components/DeptSelect/index.vue
+++ b/src/components/DeptSelect/index.vue
@@ -68,16 +68,17 @@
 function fetchPcode() {
   // 如果未指定需要展示的部门类型，获取全部部门
   if (!props.deptType) {
-    if (dictStore.allDeptList.length === 0) { // 如果store中未存储，从服务器上获取
-      getDeptTreeList().then((res) => {
-        const list = res.data
-        dictStore.setAllDeptList(list)
-        refreshList(list)
-      })
-    }
-    else {
-      refreshList(dictStore.allDeptList)
-    }
+    // if (dictStore.allDeptList.length === 0) { // 如果store中未存储，从服务器上获取
+    getDeptTreeList().then((res) => {
+      const list = res.data.filter((item: any) => item.id !== '0')
+      dictStore.setAllDeptList(list)
+      refreshList(list)
+      console.log(list, 'list')
+    })
+    // }
+    // else {
+    //   refreshList(dictStore.allDeptList)
+    // }
   }
   else { // 如果指定了需要展示的部门类型
     if (dictStore.companyList.length === 0) { // 如果store中未存储，从服务器上获取
@@ -159,24 +160,15 @@
 <template>
   <div style="width: 100%;">
     <el-tree-select
-      v-if="multiData"
-      v-model="value"
-      :data="deptTreeList"
-      node-key="id"
-      :filter-node-method="filterTree"
-      :props="defaultProps"
-      :expand-on-click-node="false"
-      :render-after-expand="false"
-      :size="props.size"
-      :placeholder="props.placeholder"
-      :clearable="props.clearable"
-      check-strictly
-      check-on-click-node
-      filterable
-      class="full-width-input"
-      :disabled="props.disabled"
+      v-if="multiData" v-model="value" :data="deptTreeList" node-key="id" :filter-node-method="filterTree"
+      :props="defaultProps" :expand-on-click-node="false" :render-after-expand="false" :size="props.size"
+      :placeholder="props.placeholder" :clearable="props.clearable" check-strictly check-on-click-node filterable
+      class="full-width-input" :disabled="props.disabled"
     />
-    <el-select v-else v-model="value" :placeholder="props.placeholder" :size="props.size" :disabled="props.disabled" :clearable="props.clearable" class="full-width-input">
+    <el-select
+      v-else v-model="value" :placeholder="props.placeholder" :size="props.size" :disabled="props.disabled"
+      :clearable="props.clearable" class="full-width-input"
+    >
       <el-option v-for="(item, index) in deptTreeList" :key="index" :label="item.name" :value="item.id" />
     </el-select>
   </div>
diff --git a/src/components/Echart/BarChart3D.vue b/src/components/Echart/BarChart3D.vue
index 8b8d8ea..ee7dbba 100644
--- a/src/components/Echart/BarChart3D.vue
+++ b/src/components/Echart/BarChart3D.vue
@@ -276,12 +276,12 @@
       textStyle: {
         fontSize: 16,
       },
-      axisPointer: {
-        type: 'cross',
-        label: {
-          fontSize: 13,
-        },
-      },
+      // axisPointer: {
+      //   type: 'cross',
+      //   label: {
+      //     fontSize: 13,
+      //   },
+      // },
       valueFormatter: (value: string | number) => {
         return value ? value + props.unit : value === 0 ? '0' : ''
       },
diff --git a/src/components/Echart/BarChartHorizontal.vue b/src/components/Echart/BarChartHorizontal.vue
index 6a3c107..366e064 100644
--- a/src/components/Echart/BarChartHorizontal.vue
+++ b/src/components/Echart/BarChartHorizontal.vue
@@ -265,12 +265,12 @@
       textStyle: {
         fontSize: 16,
       },
-      axisPointer: {
-        type: 'cross',
-        label: {
-          fontSize: 13,
-        },
-      },
+      // axisPointer: {
+      //   type: 'cross',
+      //   label: {
+      //     fontSize: 13,
+      //   },
+      // },
       valueFormatter: (value: string | number) => {
         return value ? value + props.unit : ''
       },
diff --git a/src/components/Echart/BarChartVertical.vue b/src/components/Echart/BarChartVertical.vue
index 7701800..8f36130 100644
--- a/src/components/Echart/BarChartVertical.vue
+++ b/src/components/Echart/BarChartVertical.vue
@@ -253,12 +253,12 @@
       textStyle: {
         fontSize: 16,
       },
-      axisPointer: {
-        type: 'cross',
-        label: {
-          fontSize: 13,
-        },
-      },
+      // axisPointer: {
+      //   type: 'cross',
+      //   label: {
+      //     fontSize: 13,
+      //   },
+      // },
       valueFormatter: (value: string | number) => {
         return value ? value + props.unit : value === 0 ? '0' : ''
       },
diff --git a/src/components/Echart/LineChart.vue b/src/components/Echart/LineChart.vue
index faf6777..751133f 100644
--- a/src/components/Echart/LineChart.vue
+++ b/src/components/Echart/LineChart.vue
@@ -200,12 +200,12 @@
       textStyle: {
         fontSize: 16,
       },
-      axisPointer: {
-        type: 'cross',
-        label: {
-          fontSize: 13,
-        },
-      },
+      // axisPointer: {
+      //   type: 'cross',
+      //   label: {
+      //     fontSize: 13,
+      //   },
+      // },
       valueFormatter: (value: string | number) => {
         return value ? value + props.unit : value === 0 ? '0' : ''
       },
diff --git a/src/components/map/index offline.vue b/src/components/map/index offline.vue
index 5bf7bb9..e8c31b0 100644
--- a/src/components/map/index offline.vue
+++ b/src/components/map/index offline.vue
@@ -512,7 +512,7 @@
 <template>
   <div class="container">
     <!-- 地图 -->
-    <div id="map" ref="wrapRef " v-loading="loading" />
+    <div id="map" ref="wrapRef" v-loading="loading" />
   </div>
 </template>
 
diff --git a/src/layouts/components/Tools/alarmList.vue b/src/layouts/components/Tools/alarmList.vue
index 425ec3d..1274d52 100644
--- a/src/layouts/components/Tools/alarmList.vue
+++ b/src/layouts/components/Tools/alarmList.vue
@@ -151,7 +151,7 @@
       <template v-else>
         <div v-for="message of messageList" :key="message.id" class="message-item">
           <div class="message-content" @click="detailRow(message)">
-            <div class="title">
+            <div class="title" :title="`${message.alarmMsg}${message.alarmTime}`">
               <div class="container">
                 <div
                   :class="`mar circle circle-${message.alarmLevelName.includes('一级') ? '1' : message.alarmLevelName.includes('二级') ? '2' : message.alarmLevelName.includes('三级') ? '3' : 'other'}`"
diff --git a/src/views/home/dashboard/components/controlMap.vue b/src/views/home/dashboard/components/controlMap.vue
index e1d0651..388cec5 100644
--- a/src/views/home/dashboard/components/controlMap.vue
+++ b/src/views/home/dashboard/components/controlMap.vue
@@ -326,6 +326,7 @@
   setTimeout(() => {
     ele.setAttribute('style', 'font-size: 16px')
   }, 50)
+  detailRef.value.close()
 }
 const publicPath = window.location.href.split('#')[0]
 watch(() => showStatus.value, (newVal) => {
diff --git a/src/views/home/dashboard/components/demonstration.vue b/src/views/home/dashboard/components/demonstration.vue
index 4677f14..f9c4f14 100644
--- a/src/views/home/dashboard/components/demonstration.vue
+++ b/src/views/home/dashboard/components/demonstration.vue
@@ -30,31 +30,71 @@
     <div class="district-header">
       {{ $props.data.name }}
     </div>
+    <div class="content">
+      <div class="name">
+        设备类型:
+      </div>
+      <div class="value">
+        {{ $props.data.type }}
+      </div>
+    </div>
+    <div class="content">
+      <div class="name">
+        设备编号:
+      </div>
+      <div class="value">
+        {{ }}
+      </div>
+    </div>
+    <div class="content">
+      <div class="name">
+        厂商:
+      </div>
+      <div class="value">
+        北京无线电计量测试研究所
+      </div>
+    </div>
+    <div class="content">
+      <div class="name">
+        负责人:
+      </div>
+      <div class="value">
+        {{ }}
+      </div>
+    </div>
+    <div class="content">
+      <div class="name">
+        联系方式:
+      </div>
+      <div class="value" />
+    </div>
+    <div class="content">
+      <div class="name">
+        管理单位:
+      </div>
+      <div class="value">
+        第一分公司
+      </div>
+    </div>
+    <div class="content">
+      <div class="name">
+        详细位置:
+      </div>
+      <div class="value" />
+    </div>
     <!-- <div class="content">
-      <div class="name">面积:</div>
-      <div class="value">{{ $props.data.area }}平方公里</div>
-    </div>
-    <div class="content">
-      <div class="name">管理公司:</div>
-      <div class="value">{{ $props.data.deptName }}</div>
-    </div>
-    <div class="content">
-      <div class="name">管线长度:</div>
-      <div class="value">{{ $props.data.long }}公里</div>
-    </div>
-    <div class="content">
       <div class="name">调压站:</div>
       <div class="value">{{ $props.data.tyz }}座</div>
-    </div>
-    <div class="content">
+    </div> -->
+    <!-- <div class="content">
       <div class="name">调压箱:</div>
       <div class="value"> {{ $props.data.tyx }}座</div>
-    </div>
-    <div class="content">
+    </div> -->
+    <!-- <div class="content">
       <div class="name">闸井:</div>
       <div class="value">{{ $props.data.well }}个</div>
-    </div>
-    <div class="content">
+    </div> -->
+    <!-- <div class="content">
       <div class="name">监控覆盖率:</div>
       <div class="value">{{ $props.data.rate }}%</div>
     </div> -->
diff --git a/src/views/home/dashboard/components/detailInfoDialog.vue b/src/views/home/dashboard/components/detailInfoDialog.vue
index 1aad185..351fbf9 100644
--- a/src/views/home/dashboard/components/detailInfoDialog.vue
+++ b/src/views/home/dashboard/components/detailInfoDialog.vue
@@ -28,11 +28,13 @@
   }
   dialogFormVisible.value = true
 }
-defineExpose({ initDialog })
+
 // 关闭
 const close = () => {
   infoWindow.value.close()
 }
+
+defineExpose({ initDialog, close })
 </script>
 
 <template>
diff --git a/src/views/home/dashboard/components/noticeDialog.vue b/src/views/home/dashboard/components/noticeDialog.vue
new file mode 100644
index 0000000..4152ae2
--- /dev/null
+++ b/src/views/home/dashboard/components/noticeDialog.vue
@@ -0,0 +1,95 @@
+<!--
+  Description: 消息通知-更多消息弹窗
+  Author: 李亚光
+  Date: 2024-10-10
+ -->
+<script lang="ts" setup name="NoticeMoreDialog">
+import { ElMessage } from 'element-plus'
+import { getMessage } from '@/api/home/dashboard/index'
+const $router = useRouter()
+const dialogFormVisible = ref(false) // 对话框是否显示
+const list = ref<any[]>([])
+const columns = ref<any>([
+  { text: '消息提醒类型', value: 'messageTypeDetail', align: 'center', width: '200' },
+  { text: '消息提醒内容', value: 'messageContent', align: 'center' },
+  { text: '时间', value: 'ts', align: 'center', width: '180' },
+])
+const loadingTable = ref(true)
+const initDialog = () => {
+  dialogFormVisible.value = true
+}
+const cancel = () => {
+  dialogFormVisible.value = false
+}
+const fetchData = () => {
+  loadingTable.value = true
+  getMessage().then((res) => {
+    list.value = res.data.rows.reverse()
+    loadingTable.value = false
+  }).catch(() => {
+    loadingTable.value = false
+  })
+}
+fetchData()
+defineExpose({
+  initDialog,
+})
+// 查看详情
+const detail = (row: any) => {
+  // 报警类跳转
+  if (row.messageTypeDetail.includes('报警')) {
+    if (row.alarmId) {
+      $router.push({
+        name: 'AlarmCurrentDetail',
+        query: {
+          id: row.alarmId,
+          row: JSON.stringify(row),
+        },
+      })
+    }
+    else {
+      ElMessage.warning('该数据缺少报警信息')
+    }
+  }
+}
+</script>
+
+<template>
+  <el-dialog v-model="dialogFormVisible" title="消息通知" append-to-body>
+    <normal-table
+      :data="list" :total="0" :columns="columns" :query="{}" :list-loading="loadingTable"
+      :pagination="false" :height="400"
+    >
+      <template #columns>
+        <el-table-column label="操作" align="center" width="80">
+          <template #default="scope">
+            <el-button
+              type="primary" link size="small"
+              :disabled="!((scope.row.messageTypeDetail.includes('报警') && !scope.row.messageTypeDetail.includes('解除')) || scope.row.messageTypeDetail.includes('施工'))"
+              @click="detail(scope.row)"
+            >
+              查看
+            </el-button>
+          </template>
+        </el-table-column>
+      </template>
+    </normal-table>
+    <template #footer>
+      <div class="dialog-footer">
+        <el-button type="primary" @click="cancel">
+          确认
+        </el-button>
+      </div>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+.el-dialog {
+  width: 700px;
+}
+
+.el-select {
+  width: 100%;
+}
+</style>
diff --git a/src/views/home/dashboard/fullScreen-components/alarmCount.vue b/src/views/home/dashboard/fullScreen-components/alarmCount.vue
index d65e913..ba24ad9 100644
--- a/src/views/home/dashboard/fullScreen-components/alarmCount.vue
+++ b/src/views/home/dashboard/fullScreen-components/alarmCount.vue
@@ -96,9 +96,10 @@
 // }
 
 .active {
-  color: #3d7eff;
+  color: #1c3444;
   border-color: #e6ebf5;
   outline: none;
-  background-color: rgba($color: #98a7bb, $alpha: 80%);
+  font-weight: 700;
+  background-color: rgba($color: #98a7bb, $alpha: 100%);
 }
 </style>
diff --git a/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue b/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue
index 08d7a93..f723273 100644
--- a/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue
+++ b/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue
@@ -196,7 +196,7 @@
           text-align: center;
           font-size: 24px;
           font-weight: 700;
-          color: #fff;
+          color: #d81010;
         }
 
         .title1 {
diff --git a/src/views/home/dashboard/fullScreen-components/baseOverView.vue b/src/views/home/dashboard/fullScreen-components/baseOverView.vue
index e973da6..bd3a653 100644
--- a/src/views/home/dashboard/fullScreen-components/baseOverView.vue
+++ b/src/views/home/dashboard/fullScreen-components/baseOverView.vue
@@ -90,15 +90,24 @@
     // justify-content: space-between;
     margin: 20px 0;
 
-    img {
-      width: 90%;
+    .img {
+      width: 50%;
+      box-sizing: border-box;
+      // flex: 1;
+
+      img {
+        width: 90%;
+        height: 100%;
+      }
     }
 
     .data {
       box-sizing: border-box;
       margin-left: 5px;
+
       // display: flex;
       .value {
+
         // padding-left: 10px;
         .value {
           color: #fff;
diff --git a/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue b/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue
index 3dd0897..eb2c2fd 100644
--- a/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue
+++ b/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue
@@ -18,7 +18,7 @@
 
 onMounted(() => {
   setTimeout(() => {
-    xAxisData.value = ['第一分公司', '第二分公司', '第三分公司', '第四分公司', '第五分公司']
+    xAxisData.value = ['第一分公司', '第二分公司', '第三分公司', '第四分公司', '第五分公司'].reverse()
     data.value = [
       {
         name: '数量',
diff --git a/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue b/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue
index c933977..81e19fa 100644
--- a/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue
+++ b/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue
@@ -113,10 +113,11 @@
 }
 
 .active {
-  color: #3d7eff;
+  color: #1c3444;
   border-color: #e6ebf5;
   outline: none;
-  background-color: rgba($color: #98a7bb, $alpha: 80%);
+  font-weight: 700;
+  background-color: rgba($color: #98a7bb, $alpha: 100%);
 }
 
 // .layout {
diff --git a/src/views/home/dashboard/fullScreen.vue b/src/views/home/dashboard/fullScreen.vue
index 410e728..21f89e0 100644
--- a/src/views/home/dashboard/fullScreen.vue
+++ b/src/views/home/dashboard/fullScreen.vue
@@ -27,7 +27,12 @@
 <template>
   <div class="container-full">
     <!-- banner区域 -->
-    <div class="banner" />
+    <div class="banner">
+      <div class="title">
+        <div class="logo" />
+        <div class="name" />
+      </div>
+    </div>
     <!-- 关闭按钮 -->
     <div class="close">
       <div class="icon" @click="closePage">
@@ -72,7 +77,29 @@
     z-index: 98;
     height: 100px;
     width: 100%;
-    background: url("@/assets/fullscren/banner.png") no-repeat;
+    background: url("@/assets/fullscren/banner-bg.png") no-repeat;
+
+    .title {
+      height: 100px;
+      width: 100%;
+      position: absolute;
+      top: 0;
+      left: 0;
+      z-index: 99;
+
+      // .logo {
+      //   width: 200px;
+      //   height: 100px;
+      //   background: url("@/assets/fullscren/br-logo.png") no-repeat;
+      // }
+
+      .name {
+        // width: 400px;
+        height: 80px;
+        width: 100%;
+        background: url("@/assets/fullscren/br-title.png") no-repeat center;
+      }
+    }
   }
 
   .close {
diff --git a/src/views/home/dashboard/index.vue b/src/views/home/dashboard/index.vue
index 42dfbed..df9f331 100644
--- a/src/views/home/dashboard/index.vue
+++ b/src/views/home/dashboard/index.vue
@@ -6,6 +6,7 @@
 <script lang="ts" setup name="Dashboard">
 import card from './components/showCard.vue'
 import { img } from './components/imgData'
+import moreNotice from './components/noticeDialog.vue'
 import { getBase, getDeviceStatus, getMessage } from '@/api/home/dashboard/index'
 import locationAnalysis from '@/views/home/alarm/count/components/locationAnalysis.vue'
 import layout from '@/views/home/alarm/count/components/layout.vue'
@@ -101,10 +102,10 @@
 // 消息通知数据
 const messageLoading = ref(true)
 const messageData = ref<any[]>([])
-// 更多跳转
-const more = (type: string) => {
+// // 更多跳转
+// const  = (type: string) => {
 
-}
+// }
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
 const routeToPage = (item: any) => {
@@ -149,18 +150,26 @@
   // 消息通知
   messageLoading.value = true
   getMessage().then((res) => {
-    messageData.value = res.data.rows
+    messageData.value = res.data.rows.reverse()
     messageLoading.value = false
   }).catch(() => {
     messageLoading.value = false
   })
 }
 fetchData()
+
+// 消息通知-更多
+const noticeRef = ref()
+const more = () => {
+  noticeRef.value.initDialog()
+}
 </script>
 
 <template>
   <!-- 布局 -->
   <app-container>
+    <!-- 消息通知-更多 -->
+    <more-notice ref="noticeRef" />
     <!-- 上部 -->
     <div class="top-container">
       <div class="top-left-container">
@@ -233,8 +242,8 @@
         <template #search>
           <div class="search">
             <div />
-            <div class="more">
-              <!-- >>更多 -->
+            <div class="more" @click="more">
+              >>更多
             </div>
           </div>
         </template>
diff --git a/src/views/home/device/device/components/controlRecord.vue b/src/views/home/device/device/components/controlRecord.vue
index 185348e..6553e62 100644
--- a/src/views/home/device/device/components/controlRecord.vue
+++ b/src/views/home/device/device/components/controlRecord.vue
@@ -73,6 +73,7 @@
   await fetchDict()
   fetchData()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -88,7 +89,7 @@
       </el-button>
     </template>
     <template #btns-right>
-      <el-button type="primary" @click="addControl">
+      <el-button v-if="proxy.hasPerm('/device/instruction/add') && proxy.hasPerm('/device/instruction')" type="primary" @click="addControl">
         新建
       </el-button>
     </template>
diff --git a/src/views/home/device/device/components/dataSearch.vue b/src/views/home/device/device/components/dataSearch.vue
index 3bea05e..1b1e313 100644
--- a/src/views/home/device/device/components/dataSearch.vue
+++ b/src/views/home/device/device/components/dataSearch.vue
@@ -58,13 +58,79 @@
 const data = ref<any[]>([])
 //  列表展示列
 const columns = ref<any>([
-  { text: '设备编号', value: 'devcode', align: 'center' },
-  { text: '燃气浓度（%LEL)', value: 'snr', align: 'center' },
-  { text: '电量(%)', value: 'cell', align: 'center' },
-  { text: '信号强度', value: 'strength', align: 'center' },
-  { text: '采集时间', value: 'uptime', align: 'center' },
-  { text: '上传时间', value: 'logtime', align: 'center' },
+  // { text: '设备编号', value: 'devcode', align: 'center' },
+  // { text: '燃气浓度（%LEL)', value: 'snr', align: 'center' },
+  // { text: '电量(%)', value: 'cell', align: 'center' },
+  // { text: '信号强度', value: 'strength', align: 'center' },
+  // { text: '采集时间', value: 'uptime', align: 'center' },
+  // { text: '上传时间', value: 'logtime', align: 'center' },
 ])
+
+// 燃气智能监测终端
+const columns1 = ref<any>([
+  { text: '设备编号', value: 'devcode', align: 'center' },
+  { text: '燃气浓度（%LEL)', value: 'strength', align: 'center' },
+  { text: '电量(%)', value: 'cell', align: 'center' },
+  { text: '信号强度', value: 'pci', align: 'center' },
+  { text: '采集时间', value: 'logtime', align: 'center' },
+  { text: '上传时间', value: 'uptime', align: 'center' },
+])
+// 管网哨兵
+const columns2 = ref<any>([
+  { text: '设备编号', value: 'devcode', align: 'center' },
+  { text: '燃气浓度（%LEL)', value: 'gasval', align: 'center' },
+  { text: '电池电压(V)', value: 'vbat', align: 'center' },
+  { text: '采集时间', value: 'logtime', align: 'center' },
+  { text: '上传时间', value: 'uptime', align: 'center' },
+])
+// DATA_GAS("燃气智能监测终端", "data_gas", "devcode,uptime,logtime", "id,well_code,devcode设备编号,cell电量,strength浓度,descn,uptime采集时间,logtime上传时间,pci,rsrp,snr", "logtime"),
+// DATA_TUBE_OTHER("管网哨兵", "data_tube_other", "devcode,uptime,logtime", "DEVCODE设备编号,GASVAL浓度, VBAT电压,SIN,RSRP,SINR,UPTIME采集时间,LOGTIME上传时间", "logtime"),
+// DATA_MONITOR_PIPE_OTHER("智能警示桩", "data_monitor_pipe_other", "devcode,uptime,logtime", "TEMPERATURE,HUMIDITY,VBAT,PIPE_INCLINE_ALARM,PIPE_BREAK_ALARM,LEFT_OFF_LINE_ALARM,LEFT_VIBRATE_ALARM,RIGHT_OFF_LINE_ALARM,RIGHT_VIBRATE_ALARM,PICTURE_ALARM,LEFT_GAS,RIGHT_GAS,LOGTIME,UPTIME ", "logtime"),
+// DATA_PAN_GAS("场站监测云台", "data_pan_gas", "DEVICE_CODE,,logtime", "ID,LEDGER_NUMBER,DEVICE_CODE设备编号,CONCENTRATION浓度,LOGTIME,DIRCETION水平位置,PITCH垂直位置", "LOGTIME采集时间");
+// 智能警示桩
+const columns3 = ref<any>([
+  { text: '左侧甲烷值', value: 'leftGas', align: 'center', width: '110' },
+  { text: '右侧甲烷值', value: 'rightGas', align: 'center', width: '110' },
+  { text: '电池电压(V)', value: 'vbat', align: 'center', width: '110' },
+  { text: '桩倾斜报警', value: 'pipeInclineAlarm', align: 'center', width: '110' },
+  { text: '桩拆卸报警', value: 'pipeBreakAlarm', align: 'center', width: '110' },
+  { text: '左断线报警', value: 'leftOffLineAlarm', align: 'center', width: '110' },
+  { text: '左振动报警', value: 'leftVibrateAlarm', align: 'center', width: '110' },
+  { text: '右断线报警', value: 'rightOffLineAlarm', align: 'center', width: '110' },
+  { text: '右振动报警', value: 'rightVibrateAlarm', align: 'center', width: '110' },
+  { text: '采集时间', value: 'logtime', align: 'center' },
+  { text: '上传时间', value: 'uptime', align: 'center' },
+])
+// 场站监测云台
+const columns4 = ref<any>([
+  { text: '设备编号', value: 'deviceCode', align: 'center' },
+  { text: '浓度', value: 'concentration', align: 'center' },
+  { text: '水平位置', value: 'dircetion', align: 'center' },
+  { text: '垂直位置', value: 'pitch', align: 'center' },
+  { text: '采集时间', value: 'logtime', align: 'center' },
+  { text: '上传时间', value: 'uptime', align: 'center' },
+])
+const row = JSON.parse($route.query.row as string)
+if (row.deviceTypeName) {
+  if (row.deviceTypeName === '燃气智能监测终端') {
+    columns.value = columns1.value
+  }
+  else if (row.deviceTypeName === '管网哨兵') {
+    columns.value = columns2.value
+  }
+  else if (row.deviceTypeName === '智能警示桩') {
+    columns.value = columns3.value
+  }
+  else if (row.deviceTypeName === '场站监测云台') {
+    columns.value = columns4.value
+  }
+  else {
+    columns.value = columns1.value
+  }
+}
+else {
+  columns.value = columns1.value
+}
 const fetchData = () => {
   const data = JSON.parse($route.query.row as string)
   listQuery.value.devcode = data.devcode
@@ -73,20 +139,55 @@
   getDataSearch(listQuery.value).then((res) => {
     list.value = res.data.map((item: any) => toHumpObject(item))
     xAxisData.value = list.value.slice().reverse().map(item => item.logtime)
-    data.value = [
-      {
-        name: '燃气浓度',
-        data: list.value.slice().reverse().map(item => item.snr || '0'),
-      },
-      {
-        name: '电量',
-        data: list.value.slice().reverse().map(item => item.cell || '0'),
-      },
-      {
-        name: '信号强度',
-        data: list.value.slice().reverse().map(item => item.strength || '0'),
-      },
-    ]
+    if (!data.deviceTypeName || data.deviceTypeName === '燃气智能监测终端') {
+      data.value = [
+        {
+          name: '燃气浓度',
+          data: list.value.slice().reverse().map(item => item.snr || '0'),
+        },
+        {
+          name: '电量',
+          data: list.value.slice().reverse().map(item => item.cell || '0'),
+        },
+        {
+          name: '信号强度',
+          data: list.value.slice().reverse().map(item => item.strength || '0'),
+        },
+      ]
+    }
+    else if (data.deviceTypeName === '管网哨兵') {
+      data.value = [
+        {
+          name: '燃气浓度',
+          data: list.value.slice().reverse().map(item => item.gasval || '0'),
+        },
+        {
+          name: '电压',
+          data: list.value.slice().reverse().map(item => item.vbat || '0'),
+        },
+      ]
+    }
+    else if (data.deviceTypeName === '智能警示桩') {
+      data.value = [
+        {
+          name: '左侧甲烷值',
+          data: list.value.slice().reverse().map(item => item.leftGas || '0'),
+        },
+        {
+          name: '右侧甲烷值',
+          data: list.value.slice().reverse().map(item => item.rightGas || '0'),
+        },
+      ]
+    }
+    else if (data.deviceTypeName === '场站监测云台') {
+      data.value = [
+        {
+          name: '浓度',
+          data: list.value.slice().reverse().map(item => item.concentration || '0'),
+        },
+      ]
+    }
+
     console.log(xAxisData.value, data.value)
     loadingTable.value = false
     if (!showTable.value) {
diff --git a/src/views/home/pipeline/components/monitorDataList.vue b/src/views/home/pipeline/components/monitorDataList.vue
index 283de83..92e5f81 100644
--- a/src/views/home/pipeline/components/monitorDataList.vue
+++ b/src/views/home/pipeline/components/monitorDataList.vue
@@ -5,29 +5,68 @@
  -->
 <script lang="ts" setup name="WellDetailMonitorDataGasList">
 import dayjs from 'dayjs'
-import { getMonitorData } from '@/api/home/pipeline/pipeline'
+// import { getMonitorData } from '@/api/home/pipeline/pipeline'
+import { getDataSearch } from '@/api/home/device/device'
+import { toHumpObject } from '@/utils/String'
 const $route = useRoute()
 // 列表loading
 const loadingTable = ref(true)
 //  列表展示数据
 const list = ref([])
 //  列表展示列
-const columns = ref<any>([
-  { text: '左侧甲烷值', value: 'CH4L', align: 'center', width: '110' },
-  { text: '右侧甲烷值', value: 'CH4R', align: 'center', width: '110' },
-  // { text: '地层温度(℃)', value: 'TEMPERATURE', align: 'center', width: '110' },
-  // { text: '地层湿度(%RH)', value: 'HUMIDITY', align: 'center', width: '140' },
-  { text: '电池电压(V)', value: 'VBAT', align: 'center', width: '110' },
-  { text: '桩倾斜报警', value: 'PIPE_INCLINE_ALARM', align: 'center', width: '110' },
-  { text: '桩拆卸报警', value: 'PIPE_BREAK_ALARM', align: 'center', width: '110' },
-  { text: '左断线报警', value: 'LEFT_OFF_LINE_ALARM', align: 'center', width: '110' },
-  { text: '左振动报警', value: 'LEFT_VIBRATE_ALARM', align: 'center', width: '110' },
-  { text: '右断线报警', value: 'RIGHT_OFF_LINE_ALARM', align: 'center', width: '110' },
-  { text: '右振动报警', value: 'RIGHT_VIBRATE_ALARM', align: 'center', width: '110' },
-  // { text: '报警图像输出', value: 'PICTURE_ALARM', align: 'center' },
-  { text: '采集时间', value: 'LOGTIME', align: 'center' },
-  { text: '上传时间', value: 'UPTIME', align: 'center' },
+const columns = ref<any>([])
+// 燃气智能监测终端
+const columns1 = ref<any>([
+  { text: '设备编号', value: 'devcode', align: 'center' },
+  { text: '燃气浓度（%LEL)', value: 'strength', align: 'center' },
+  { text: '电量(%)', value: 'cell', align: 'center' },
+  { text: '信号强度', value: 'pci', align: 'center' },
+  { text: '采集时间', value: 'logtime', align: 'center' },
+  { text: '上传时间', value: 'uptime', align: 'center' },
 ])
+// 管网哨兵
+const columns2 = ref<any>([
+  { text: '设备编号', value: 'devcode', align: 'center' },
+  { text: '燃气浓度（%LEL)', value: 'gasval', align: 'center' },
+  { text: '电池电压(V)', value: 'vbat', align: 'center' },
+  { text: '采集时间', value: 'logtime', align: 'center' },
+  { text: '上传时间', value: 'uptime', align: 'center' },
+])
+// 智能警示桩
+const columns3 = ref<any>([
+  { text: '左侧甲烷值', value: 'leftGas', align: 'center', width: '110' },
+  { text: '右侧甲烷值', value: 'rightGas', align: 'center', width: '110' },
+  { text: '电池电压(V)', value: 'vbat', align: 'center', width: '110' },
+  { text: '桩倾斜报警', value: 'pipeInclineAlarm', align: 'center', width: '110' },
+  { text: '桩拆卸报警', value: 'pipeBreakAlarm', align: 'center', width: '110' },
+  { text: '左断线报警', value: 'leftOffLineAlarm', align: 'center', width: '110' },
+  { text: '左振动报警', value: 'leftVibrateAlarm', align: 'center', width: '110' },
+  { text: '右断线报警', value: 'rightOffLineAlarm', align: 'center', width: '110' },
+  { text: '右振动报警', value: 'rightVibrateAlarm', align: 'center', width: '110' },
+  { text: '采集时间', value: 'logtime', align: 'center' },
+  { text: '上传时间', value: 'uptime', align: 'center' },
+])
+// 场站监测云台
+const columns4 = ref<any>([
+  { text: '设备编号', value: 'deviceCode', align: 'center' },
+  { text: '浓度', value: 'concentration', align: 'center' },
+  { text: '水平位置', value: 'dircetion', align: 'center' },
+  { text: '垂直位置', value: 'pitch', align: 'center' },
+  { text: '采集时间', value: 'logtime', align: 'center' },
+  { text: '上传时间', value: 'uptime', align: 'center' },
+])
+if (!$route.query.typeName || $route.query.typeName === '燃气智能监测终端') {
+  columns.value = columns1.value
+}
+else if ($route.query.typeName === '管网哨兵') {
+  columns.value = columns2.value
+}
+else if ($route.query.typeName === '智能警示桩') {
+  columns.value = columns3.value
+}
+else if ($route.query.typeName === '场站监测云台') {
+  columns.value = columns4.value
+}
 const listQuery = ref({
   devcode: '',
   logBegTime: '',
@@ -75,20 +114,21 @@
   loadingTable.value = true
   listQuery.value.devcode = $route.query.deviceCode as string
   listQuery.value.typeName = $route.query.typeName as string
-  getMonitorData(listQuery.value).then((res) => {
-    list.value = res.data.map((item: any) => {
-      for (const i in item) {
-        if (i.includes('ALARM')) {
-          if (i === 'PICTURE_ALARM') {
-            item[i] = item[i] === '0' ? '/' : item[i]
-          }
-          else {
-            item[i] = item[i] === '0' ? '正常' : '报警'
-          }
-        }
-      }
-      return item
-    })
+  getDataSearch(listQuery.value).then((res) => {
+    // list.value = res.data.map((item: any) => {
+    //   for (const i in item) {
+    //     if (i.includes('ALARM')) {
+    //       if (i === 'PICTURE_ALARM') {
+    //         item[i] = item[i] === '0' ? '/' : item[i]
+    //       }
+    //       else {
+    //         item[i] = item[i] === '0' ? '正常' : '报警'
+    //       }
+    //     }
+    //   }
+    //   return item
+    // })
+    list.value = res.data.map((item: any) => toHumpObject(item))
     loadingTable.value = false
   }).catch(() => {
     loadingTable.value = false
diff --git a/src/views/home/pipeline/index.vue b/src/views/home/pipeline/index.vue
index 8c23ef1..613d789 100644
--- a/src/views/home/pipeline/index.vue
+++ b/src/views/home/pipeline/index.vue
@@ -192,6 +192,10 @@
     ElMessage.warning('该数据缺少坐标信息')
     return
   }
+  if (!data.devcode || !data.id) {
+    ElMessage.warning('暂无详情数据')
+    return
+  }
   // 打开地图弹窗
   mapRef.value.openInfoDetail({
     lnglat: [data.lngGaode, data.latGaode],
diff --git a/src/views/home/well/components/monitorDataGasList.vue b/src/views/home/well/components/monitorDataGasList.vue
index 0bf58f8..2112eee 100644
--- a/src/views/home/well/components/monitorDataGasList.vue
+++ b/src/views/home/well/components/monitorDataGasList.vue
@@ -23,11 +23,11 @@
 //  列表展示列
 const columns = ref<any>([
   { text: '设备编号', value: 'devcode', align: 'center' },
-  { text: '燃气浓度（%LEL)', value: 'strength', align: 'center' },
+  { text: '燃气浓度（%LEL)', value: 'snr', align: 'center' },
   { text: '电量(%)', value: 'cell', align: 'center' },
-  { text: '信号强度', value: 'pci', align: 'center' },
-  { text: '采集时间', value: 'logtime', align: 'center' },
-  { text: '上传时间', value: 'uptime', align: 'center' },
+  { text: '信号强度', value: 'strength', align: 'center' },
+  { text: '采集时间', value: 'uptime', align: 'center' },
+  { text: '上传时间', value: 'logtime', align: 'center' },
 ])
 const listQuery = ref({
   begTime: '',