diff --git a/src/api/home/alarm/count.ts b/src/api/home/alarm/count.ts
new file mode 100644
index 0000000..1f4b59a
--- /dev/null
+++ b/src/api/home/alarm/count.ts
@@ -0,0 +1,36 @@
+/**
+ * 报警统计
+ */
+import request from '@/api/index'
+
+// 报警总体情况
+export function getOverallAlarm() {
+  return request({
+    url: '/statics/alarmRecords/overall',
+    method: 'post',
+  })
+}
+// 各类报警统计
+export function getAlarmType(data: any) {
+  return request({
+    url: '/statics/alarmRecords/alarmType',
+    method: 'post',
+    data,
+  })
+}
+// 各单位报警统计
+export function getAlarmCompany(data: any) {
+  return request({
+    url: '/statics/alarmRecords/alarmCompany',
+    method: 'post',
+    data,
+  })
+}
+// 异常位置分析
+export function getAlarmPosition(data: any) {
+  return request({
+    url: '/statics/alarmRecords/alarmPosition',
+    method: 'post',
+    data,
+  })
+}

diff --git a/src/api/home/alarm/count.ts b/src/api/home/alarm/count.ts
new file mode 100644
index 0000000..1f4b59a
--- /dev/null
+++ b/src/api/home/alarm/count.ts
@@ -0,0 +1,36 @@
+/**
+ * 报警统计
+ */
+import request from '@/api/index'
+
+// 报警总体情况
+export function getOverallAlarm() {
+  return request({
+    url: '/statics/alarmRecords/overall',
+    method: 'post',
+  })
+}
+// 各类报警统计
+export function getAlarmType(data: any) {
+  return request({
+    url: '/statics/alarmRecords/alarmType',
+    method: 'post',
+    data,
+  })
+}
+// 各单位报警统计
+export function getAlarmCompany(data: any) {
+  return request({
+    url: '/statics/alarmRecords/alarmCompany',
+    method: 'post',
+    data,
+  })
+}
+// 异常位置分析
+export function getAlarmPosition(data: any) {
+  return request({
+    url: '/statics/alarmRecords/alarmPosition',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/views/home/alarm/count/components/alarmStatistics.vue b/src/views/home/alarm/count/components/alarmStatistics.vue
index b009891..b088de2 100644
--- a/src/views/home/alarm/count/components/alarmStatistics.vue
+++ b/src/views/home/alarm/count/components/alarmStatistics.vue
@@ -5,30 +5,79 @@
  -->
 <script lang="ts" setup name="AlarmCount">
 import layout from './layout.vue'
+import { getAlarmType } from '@/api/home/alarm/count'
 const listQuery = ref({
-  type: 'day',
+  timeType: '2',
+  ledgerType: '',
+  deptid: '',
+  begTime: '',
+  endTime: '',
 })
 const selectTimeType = (type: string) => {
-  listQuery.value.type = type
+  listQuery.value.timeType = type
 }
+// 类别
+const ledgerTypeList = ref<{ id: string; name: string; value: string }[]>([
+  {
+    name: '闸井',
+    id: '1',
+    value: '1',
+  },
+  {
+    name: '场站',
+    id: '2',
+    value: '2',
+  },
+  {
+    name: '管线',
+    id: '3',
+    value: '3',
+  },
+])
 const xAxisData = ref([])
 const data = ref([])
 const list = ref([])
-setTimeout(() => {
-  xAxisData.value = [
-    '闸井浓度超限', '场站浓度超限', '场站火焰报警', '疑似第三方破坏', '场站烟雾报警',
-  ]
-  data.value = [
-    {
-      name: '报警数量',
-      data: [1, 3, 5, 1, 4],
-    },
-  ]
-  list.value = xAxisData.value.map((item, index) => ({
-    alarmType: item,
-    value: data.value[0].data[index],
-  }))
-}, 1000)
+const loading = ref(true)
+// 开始结束时间
+const datetimerange = ref()
+// 默认当天
+watch(() => datetimerange.value, (newVal) => {
+  listQuery.value.begTime = ''
+  listQuery.value.endTime = ''
+  if (Array.isArray(newVal)) {
+    if (newVal.length) {
+      listQuery.value.begTime = `${newVal[0]}`
+      listQuery.value.endTime = `${newVal[1]}`
+    }
+  }
+})
+// setTimeout(() => {
+//   xAxisData.value = [
+//     '闸井浓度超限', '场站浓度超限', '场站火焰报警', '疑似第三方破坏', '场站烟雾报警',
+//   ]
+//   data.value = [
+//     {
+//       name: '报警数量',
+//       data: [1, 3, 5, 1, 4],
+//     },
+//   ]
+//   list.value = xAxisData.value.map((item, index) => ({
+//     alarmType: item,
+//     value: data.value[0].data[index],
+//   }))
+// }, 1000)
+const fetchData = () => {
+  loading.value = true
+  getAlarmType(listQuery.value).then((res) => {
+    console.log(res.data, '各类报警统计')
+    loading.value = false
+  }).catch(() => {
+    loading.value = false
+  })
+}
+onMounted(() => {
+  fetchData()
+})
 </script>
 
 <template>
@@ -37,26 +86,22 @@
     <template #search>
       <div class="search">
         <el-button
-          :class="listQuery.type === 'day' ? 'active' : ''" round size="small"
-          @click="selectTimeType('day')"
-        >
-          今日
-        </el-button>
-        <el-button
-          :class="listQuery.type === 'week' ? 'active' : ''" round size="small"
-          @click="selectTimeType('week')"
+          :class="listQuery.timeType === '2' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+          @click="selectTimeType('2')"
         >
           本周
         </el-button>
         <el-button
-          :class="listQuery.type === 'month' ? 'active' : ''" round size="small"
-          @click="selectTimeType('month')"
+          :class="listQuery.timeType === '3' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+          @click="selectTimeType('3')"
         >
           本月
         </el-button>
-        <el-select v-model="listQuery.keywords" placeholder="全部类别" clearable style="width: 180px;margin: 0 5px;" />
+        <el-select v-model="listQuery.ledgerType" placeholder="全部类别" clearable style="width: 180px;margin: 0 5px;">
+          <el-option v-for="item in ledgerTypeList" :key="item.id" :label="item.name" :value="item.id" />
+        </el-select>
         <dept-select
-          v-model="listQuery.keywords" placeholder="管理单位" :clearable="true"
+          v-model="listQuery.deptid" placeholder="管理单位" :clearable="true"
           style="width: 220px;margin: 0 5px;"
         />
         <el-date-picker
@@ -64,18 +109,27 @@
           style="width: 340px;margin: 0 5px;" value-format="YYYY-MM-DD HH:mm:ss" range-separator="至"
           start-placeholder="报警开始时间" end-placeholder="报警结束时间" clearable
         />
-        <el-button type="primary" style="margin: 0 5px;">
+        <el-button type="primary" style="margin: 0 5px;" @click="fetchData">
           搜索
         </el-button>
       </div>
     </template>
     <template #content>
-      <div class="alarm-count">
+      <div v-loading="loading" class="alarm-count">
         <div class="bar">
           <bar-chart-vertical
+            v-show="xAxisData.length"
             :x-axis-data="xAxisData" :bar-coner="0" :data="data" :colors="[]" :bar-width="15"
             :legend="{ itemWidth: 8, itemHeight: 8, type: 'scroll', orient: 'horizontal', icon: 'roundRect', right: '0', top: '10' }"
+            :grid="{
+              top: 50,
+              left: 30,
+              right: 30,
+              bottom: 20,
+              containLabel: true, // 是否包含坐标轴的刻度标签
+            }"
           />
+          <el-empty v-show="!xAxisData.length" description="暂无数据" />
         </div>
         <div class="table">
           <el-table border :data="list" stripe style="width: 100%;" :height="440">
@@ -110,8 +164,9 @@
   }
 
   .table {
-    width: 40%;
+    width: 38%;
     padding: 10px;
+    margin-left: 20px;
   }
 }
 </style>

diff --git a/src/api/home/alarm/count.ts b/src/api/home/alarm/count.ts
new file mode 100644
index 0000000..1f4b59a
--- /dev/null
+++ b/src/api/home/alarm/count.ts
@@ -0,0 +1,36 @@
+/**
+ * 报警统计
+ */
+import request from '@/api/index'
+
+// 报警总体情况
+export function getOverallAlarm() {
+  return request({
+    url: '/statics/alarmRecords/overall',
+    method: 'post',
+  })
+}
+// 各类报警统计
+export function getAlarmType(data: any) {
+  return request({
+    url: '/statics/alarmRecords/alarmType',
+    method: 'post',
+    data,
+  })
+}
+// 各单位报警统计
+export function getAlarmCompany(data: any) {
+  return request({
+    url: '/statics/alarmRecords/alarmCompany',
+    method: 'post',
+    data,
+  })
+}
+// 异常位置分析
+export function getAlarmPosition(data: any) {
+  return request({
+    url: '/statics/alarmRecords/alarmPosition',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/views/home/alarm/count/components/alarmStatistics.vue b/src/views/home/alarm/count/components/alarmStatistics.vue
index b009891..b088de2 100644
--- a/src/views/home/alarm/count/components/alarmStatistics.vue
+++ b/src/views/home/alarm/count/components/alarmStatistics.vue
@@ -5,30 +5,79 @@
  -->
 <script lang="ts" setup name="AlarmCount">
 import layout from './layout.vue'
+import { getAlarmType } from '@/api/home/alarm/count'
 const listQuery = ref({
-  type: 'day',
+  timeType: '2',
+  ledgerType: '',
+  deptid: '',
+  begTime: '',
+  endTime: '',
 })
 const selectTimeType = (type: string) => {
-  listQuery.value.type = type
+  listQuery.value.timeType = type
 }
+// 类别
+const ledgerTypeList = ref<{ id: string; name: string; value: string }[]>([
+  {
+    name: '闸井',
+    id: '1',
+    value: '1',
+  },
+  {
+    name: '场站',
+    id: '2',
+    value: '2',
+  },
+  {
+    name: '管线',
+    id: '3',
+    value: '3',
+  },
+])
 const xAxisData = ref([])
 const data = ref([])
 const list = ref([])
-setTimeout(() => {
-  xAxisData.value = [
-    '闸井浓度超限', '场站浓度超限', '场站火焰报警', '疑似第三方破坏', '场站烟雾报警',
-  ]
-  data.value = [
-    {
-      name: '报警数量',
-      data: [1, 3, 5, 1, 4],
-    },
-  ]
-  list.value = xAxisData.value.map((item, index) => ({
-    alarmType: item,
-    value: data.value[0].data[index],
-  }))
-}, 1000)
+const loading = ref(true)
+// 开始结束时间
+const datetimerange = ref()
+// 默认当天
+watch(() => datetimerange.value, (newVal) => {
+  listQuery.value.begTime = ''
+  listQuery.value.endTime = ''
+  if (Array.isArray(newVal)) {
+    if (newVal.length) {
+      listQuery.value.begTime = `${newVal[0]}`
+      listQuery.value.endTime = `${newVal[1]}`
+    }
+  }
+})
+// setTimeout(() => {
+//   xAxisData.value = [
+//     '闸井浓度超限', '场站浓度超限', '场站火焰报警', '疑似第三方破坏', '场站烟雾报警',
+//   ]
+//   data.value = [
+//     {
+//       name: '报警数量',
+//       data: [1, 3, 5, 1, 4],
+//     },
+//   ]
+//   list.value = xAxisData.value.map((item, index) => ({
+//     alarmType: item,
+//     value: data.value[0].data[index],
+//   }))
+// }, 1000)
+const fetchData = () => {
+  loading.value = true
+  getAlarmType(listQuery.value).then((res) => {
+    console.log(res.data, '各类报警统计')
+    loading.value = false
+  }).catch(() => {
+    loading.value = false
+  })
+}
+onMounted(() => {
+  fetchData()
+})
 </script>
 
 <template>
@@ -37,26 +86,22 @@
     <template #search>
       <div class="search">
         <el-button
-          :class="listQuery.type === 'day' ? 'active' : ''" round size="small"
-          @click="selectTimeType('day')"
-        >
-          今日
-        </el-button>
-        <el-button
-          :class="listQuery.type === 'week' ? 'active' : ''" round size="small"
-          @click="selectTimeType('week')"
+          :class="listQuery.timeType === '2' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+          @click="selectTimeType('2')"
         >
           本周
         </el-button>
         <el-button
-          :class="listQuery.type === 'month' ? 'active' : ''" round size="small"
-          @click="selectTimeType('month')"
+          :class="listQuery.timeType === '3' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+          @click="selectTimeType('3')"
         >
           本月
         </el-button>
-        <el-select v-model="listQuery.keywords" placeholder="全部类别" clearable style="width: 180px;margin: 0 5px;" />
+        <el-select v-model="listQuery.ledgerType" placeholder="全部类别" clearable style="width: 180px;margin: 0 5px;">
+          <el-option v-for="item in ledgerTypeList" :key="item.id" :label="item.name" :value="item.id" />
+        </el-select>
         <dept-select
-          v-model="listQuery.keywords" placeholder="管理单位" :clearable="true"
+          v-model="listQuery.deptid" placeholder="管理单位" :clearable="true"
           style="width: 220px;margin: 0 5px;"
         />
         <el-date-picker
@@ -64,18 +109,27 @@
           style="width: 340px;margin: 0 5px;" value-format="YYYY-MM-DD HH:mm:ss" range-separator="至"
           start-placeholder="报警开始时间" end-placeholder="报警结束时间" clearable
         />
-        <el-button type="primary" style="margin: 0 5px;">
+        <el-button type="primary" style="margin: 0 5px;" @click="fetchData">
           搜索
         </el-button>
       </div>
     </template>
     <template #content>
-      <div class="alarm-count">
+      <div v-loading="loading" class="alarm-count">
         <div class="bar">
           <bar-chart-vertical
+            v-show="xAxisData.length"
             :x-axis-data="xAxisData" :bar-coner="0" :data="data" :colors="[]" :bar-width="15"
             :legend="{ itemWidth: 8, itemHeight: 8, type: 'scroll', orient: 'horizontal', icon: 'roundRect', right: '0', top: '10' }"
+            :grid="{
+              top: 50,
+              left: 30,
+              right: 30,
+              bottom: 20,
+              containLabel: true, // 是否包含坐标轴的刻度标签
+            }"
           />
+          <el-empty v-show="!xAxisData.length" description="暂无数据" />
         </div>
         <div class="table">
           <el-table border :data="list" stripe style="width: 100%;" :height="440">
@@ -110,8 +164,9 @@
   }
 
   .table {
-    width: 40%;
+    width: 38%;
     padding: 10px;
+    margin-left: 20px;
   }
 }
 </style>
diff --git a/src/views/home/alarm/count/components/deptCount.vue b/src/views/home/alarm/count/components/deptCount.vue
index 1579231..1ca5482 100644
--- a/src/views/home/alarm/count/components/deptCount.vue
+++ b/src/views/home/alarm/count/components/deptCount.vue
@@ -122,8 +122,9 @@
   }
 
   .table {
-    width: 40%;
+    width: 38%;
     padding: 10px;
+    margin-left: 20px;
   }
 }
 </style>

diff --git a/src/api/home/alarm/count.ts b/src/api/home/alarm/count.ts
new file mode 100644
index 0000000..1f4b59a
--- /dev/null
+++ b/src/api/home/alarm/count.ts
@@ -0,0 +1,36 @@
+/**
+ * 报警统计
+ */
+import request from '@/api/index'
+
+// 报警总体情况
+export function getOverallAlarm() {
+  return request({
+    url: '/statics/alarmRecords/overall',
+    method: 'post',
+  })
+}
+// 各类报警统计
+export function getAlarmType(data: any) {
+  return request({
+    url: '/statics/alarmRecords/alarmType',
+    method: 'post',
+    data,
+  })
+}
+// 各单位报警统计
+export function getAlarmCompany(data: any) {
+  return request({
+    url: '/statics/alarmRecords/alarmCompany',
+    method: 'post',
+    data,
+  })
+}
+// 异常位置分析
+export function getAlarmPosition(data: any) {
+  return request({
+    url: '/statics/alarmRecords/alarmPosition',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/views/home/alarm/count/components/alarmStatistics.vue b/src/views/home/alarm/count/components/alarmStatistics.vue
index b009891..b088de2 100644
--- a/src/views/home/alarm/count/components/alarmStatistics.vue
+++ b/src/views/home/alarm/count/components/alarmStatistics.vue
@@ -5,30 +5,79 @@
  -->
 <script lang="ts" setup name="AlarmCount">
 import layout from './layout.vue'
+import { getAlarmType } from '@/api/home/alarm/count'
 const listQuery = ref({
-  type: 'day',
+  timeType: '2',
+  ledgerType: '',
+  deptid: '',
+  begTime: '',
+  endTime: '',
 })
 const selectTimeType = (type: string) => {
-  listQuery.value.type = type
+  listQuery.value.timeType = type
 }
+// 类别
+const ledgerTypeList = ref<{ id: string; name: string; value: string }[]>([
+  {
+    name: '闸井',
+    id: '1',
+    value: '1',
+  },
+  {
+    name: '场站',
+    id: '2',
+    value: '2',
+  },
+  {
+    name: '管线',
+    id: '3',
+    value: '3',
+  },
+])
 const xAxisData = ref([])
 const data = ref([])
 const list = ref([])
-setTimeout(() => {
-  xAxisData.value = [
-    '闸井浓度超限', '场站浓度超限', '场站火焰报警', '疑似第三方破坏', '场站烟雾报警',
-  ]
-  data.value = [
-    {
-      name: '报警数量',
-      data: [1, 3, 5, 1, 4],
-    },
-  ]
-  list.value = xAxisData.value.map((item, index) => ({
-    alarmType: item,
-    value: data.value[0].data[index],
-  }))
-}, 1000)
+const loading = ref(true)
+// 开始结束时间
+const datetimerange = ref()
+// 默认当天
+watch(() => datetimerange.value, (newVal) => {
+  listQuery.value.begTime = ''
+  listQuery.value.endTime = ''
+  if (Array.isArray(newVal)) {
+    if (newVal.length) {
+      listQuery.value.begTime = `${newVal[0]}`
+      listQuery.value.endTime = `${newVal[1]}`
+    }
+  }
+})
+// setTimeout(() => {
+//   xAxisData.value = [
+//     '闸井浓度超限', '场站浓度超限', '场站火焰报警', '疑似第三方破坏', '场站烟雾报警',
+//   ]
+//   data.value = [
+//     {
+//       name: '报警数量',
+//       data: [1, 3, 5, 1, 4],
+//     },
+//   ]
+//   list.value = xAxisData.value.map((item, index) => ({
+//     alarmType: item,
+//     value: data.value[0].data[index],
+//   }))
+// }, 1000)
+const fetchData = () => {
+  loading.value = true
+  getAlarmType(listQuery.value).then((res) => {
+    console.log(res.data, '各类报警统计')
+    loading.value = false
+  }).catch(() => {
+    loading.value = false
+  })
+}
+onMounted(() => {
+  fetchData()
+})
 </script>
 
 <template>
@@ -37,26 +86,22 @@
     <template #search>
       <div class="search">
         <el-button
-          :class="listQuery.type === 'day' ? 'active' : ''" round size="small"
-          @click="selectTimeType('day')"
-        >
-          今日
-        </el-button>
-        <el-button
-          :class="listQuery.type === 'week' ? 'active' : ''" round size="small"
-          @click="selectTimeType('week')"
+          :class="listQuery.timeType === '2' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+          @click="selectTimeType('2')"
         >
           本周
         </el-button>
         <el-button
-          :class="listQuery.type === 'month' ? 'active' : ''" round size="small"
-          @click="selectTimeType('month')"
+          :class="listQuery.timeType === '3' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+          @click="selectTimeType('3')"
         >
           本月
         </el-button>
-        <el-select v-model="listQuery.keywords" placeholder="全部类别" clearable style="width: 180px;margin: 0 5px;" />
+        <el-select v-model="listQuery.ledgerType" placeholder="全部类别" clearable style="width: 180px;margin: 0 5px;">
+          <el-option v-for="item in ledgerTypeList" :key="item.id" :label="item.name" :value="item.id" />
+        </el-select>
         <dept-select
-          v-model="listQuery.keywords" placeholder="管理单位" :clearable="true"
+          v-model="listQuery.deptid" placeholder="管理单位" :clearable="true"
           style="width: 220px;margin: 0 5px;"
         />
         <el-date-picker
@@ -64,18 +109,27 @@
           style="width: 340px;margin: 0 5px;" value-format="YYYY-MM-DD HH:mm:ss" range-separator="至"
           start-placeholder="报警开始时间" end-placeholder="报警结束时间" clearable
         />
-        <el-button type="primary" style="margin: 0 5px;">
+        <el-button type="primary" style="margin: 0 5px;" @click="fetchData">
           搜索
         </el-button>
       </div>
     </template>
     <template #content>
-      <div class="alarm-count">
+      <div v-loading="loading" class="alarm-count">
         <div class="bar">
           <bar-chart-vertical
+            v-show="xAxisData.length"
             :x-axis-data="xAxisData" :bar-coner="0" :data="data" :colors="[]" :bar-width="15"
             :legend="{ itemWidth: 8, itemHeight: 8, type: 'scroll', orient: 'horizontal', icon: 'roundRect', right: '0', top: '10' }"
+            :grid="{
+              top: 50,
+              left: 30,
+              right: 30,
+              bottom: 20,
+              containLabel: true, // 是否包含坐标轴的刻度标签
+            }"
           />
+          <el-empty v-show="!xAxisData.length" description="暂无数据" />
         </div>
         <div class="table">
           <el-table border :data="list" stripe style="width: 100%;" :height="440">
@@ -110,8 +164,9 @@
   }
 
   .table {
-    width: 40%;
+    width: 38%;
     padding: 10px;
+    margin-left: 20px;
   }
 }
 </style>
diff --git a/src/views/home/alarm/count/components/deptCount.vue b/src/views/home/alarm/count/components/deptCount.vue
index 1579231..1ca5482 100644
--- a/src/views/home/alarm/count/components/deptCount.vue
+++ b/src/views/home/alarm/count/components/deptCount.vue
@@ -122,8 +122,9 @@
   }
 
   .table {
-    width: 40%;
+    width: 38%;
     padding: 10px;
+    margin-left: 20px;
   }
 }
 </style>
diff --git a/src/views/home/alarm/count/components/overallAlarm.vue b/src/views/home/alarm/count/components/overallAlarm.vue
index f14ee15..476add8 100644
--- a/src/views/home/alarm/count/components/overallAlarm.vue
+++ b/src/views/home/alarm/count/components/overallAlarm.vue
@@ -5,39 +5,64 @@
  -->
 <script lang="ts" setup name="AlarmCount">
 import layout from './layout.vue'
+import { getOverallAlarm } from '@/api/home/alarm/count'
 const alarmData = ref<any[]>([
   {
     name: '正在报警',
-    value: '7',
+    value: '0',
     unit: '个',
+    type: '1',
   },
   {
     name: '今日报警',
-    value: '2',
+    value: '0',
     unit: '个',
+    type: '2',
   },
   {
     name: '本周报警',
-    value: '12',
+    value: '0',
     unit: '个',
+    type: '3',
   },
   {
     name: '本月报警',
-    value: '25',
+    value: '0',
     unit: '个',
+    type: '4',
   },
   {
     name: '全年报警',
-    value: '208',
+    value: '0',
     unit: '个',
+    type: '5',
   },
 ])
+const loading = ref(true)
+const fetchData = () => {
+  loading.value = true
+  getOverallAlarm().then((res) => {
+    const data = res.data
+    data.forEach((item: any) => {
+      const cindex = alarmData.value.findIndex((citem: any) => citem.type === item.type)
+      if (cindex !== -1) {
+        alarmData.value[cindex].value = item.sum
+      }
+    })
+    loading.value = false
+  }).catch(() => {
+    loading.value = false
+  })
+}
+onMounted(() => {
+  fetchData()
+})
 </script>
 
 <template>
   <layout title="报警总体情况">
     <template #content>
-      <div class="alarm-container">
+      <div v-loading="loading" class="alarm-container">
         <div v-for="item in alarmData" :key="item.name" class="alarm-item">
           <div class="top">
             {{ item.name }}
@@ -63,18 +88,26 @@
     border-left: 4px solid #f24d4d;
     width: 18%;
     padding: 10px;
+    padding-top: 15px;
+    padding-bottom: 15px;
 
     .top {
       padding-left: 10px;
+      font-size: 22px;
+      font-weight: 700;
     }
 
     .bottom {
       text-align: center;
 
       .value {
-        font-size: 18px;
+        font-size: 22px;
         font-weight: 700;
       }
+
+      .unit {
+        font-size: 20px;
+      }
     }
   }
 }

diff --git a/src/api/home/alarm/count.ts b/src/api/home/alarm/count.ts
new file mode 100644
index 0000000..1f4b59a
--- /dev/null
+++ b/src/api/home/alarm/count.ts
@@ -0,0 +1,36 @@
+/**
+ * 报警统计
+ */
+import request from '@/api/index'
+
+// 报警总体情况
+export function getOverallAlarm() {
+  return request({
+    url: '/statics/alarmRecords/overall',
+    method: 'post',
+  })
+}
+// 各类报警统计
+export function getAlarmType(data: any) {
+  return request({
+    url: '/statics/alarmRecords/alarmType',
+    method: 'post',
+    data,
+  })
+}
+// 各单位报警统计
+export function getAlarmCompany(data: any) {
+  return request({
+    url: '/statics/alarmRecords/alarmCompany',
+    method: 'post',
+    data,
+  })
+}
+// 异常位置分析
+export function getAlarmPosition(data: any) {
+  return request({
+    url: '/statics/alarmRecords/alarmPosition',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/views/home/alarm/count/components/alarmStatistics.vue b/src/views/home/alarm/count/components/alarmStatistics.vue
index b009891..b088de2 100644
--- a/src/views/home/alarm/count/components/alarmStatistics.vue
+++ b/src/views/home/alarm/count/components/alarmStatistics.vue
@@ -5,30 +5,79 @@
  -->
 <script lang="ts" setup name="AlarmCount">
 import layout from './layout.vue'
+import { getAlarmType } from '@/api/home/alarm/count'
 const listQuery = ref({
-  type: 'day',
+  timeType: '2',
+  ledgerType: '',
+  deptid: '',
+  begTime: '',
+  endTime: '',
 })
 const selectTimeType = (type: string) => {
-  listQuery.value.type = type
+  listQuery.value.timeType = type
 }
+// 类别
+const ledgerTypeList = ref<{ id: string; name: string; value: string }[]>([
+  {
+    name: '闸井',
+    id: '1',
+    value: '1',
+  },
+  {
+    name: '场站',
+    id: '2',
+    value: '2',
+  },
+  {
+    name: '管线',
+    id: '3',
+    value: '3',
+  },
+])
 const xAxisData = ref([])
 const data = ref([])
 const list = ref([])
-setTimeout(() => {
-  xAxisData.value = [
-    '闸井浓度超限', '场站浓度超限', '场站火焰报警', '疑似第三方破坏', '场站烟雾报警',
-  ]
-  data.value = [
-    {
-      name: '报警数量',
-      data: [1, 3, 5, 1, 4],
-    },
-  ]
-  list.value = xAxisData.value.map((item, index) => ({
-    alarmType: item,
-    value: data.value[0].data[index],
-  }))
-}, 1000)
+const loading = ref(true)
+// 开始结束时间
+const datetimerange = ref()
+// 默认当天
+watch(() => datetimerange.value, (newVal) => {
+  listQuery.value.begTime = ''
+  listQuery.value.endTime = ''
+  if (Array.isArray(newVal)) {
+    if (newVal.length) {
+      listQuery.value.begTime = `${newVal[0]}`
+      listQuery.value.endTime = `${newVal[1]}`
+    }
+  }
+})
+// setTimeout(() => {
+//   xAxisData.value = [
+//     '闸井浓度超限', '场站浓度超限', '场站火焰报警', '疑似第三方破坏', '场站烟雾报警',
+//   ]
+//   data.value = [
+//     {
+//       name: '报警数量',
+//       data: [1, 3, 5, 1, 4],
+//     },
+//   ]
+//   list.value = xAxisData.value.map((item, index) => ({
+//     alarmType: item,
+//     value: data.value[0].data[index],
+//   }))
+// }, 1000)
+const fetchData = () => {
+  loading.value = true
+  getAlarmType(listQuery.value).then((res) => {
+    console.log(res.data, '各类报警统计')
+    loading.value = false
+  }).catch(() => {
+    loading.value = false
+  })
+}
+onMounted(() => {
+  fetchData()
+})
 </script>
 
 <template>
@@ -37,26 +86,22 @@
     <template #search>
       <div class="search">
         <el-button
-          :class="listQuery.type === 'day' ? 'active' : ''" round size="small"
-          @click="selectTimeType('day')"
-        >
-          今日
-        </el-button>
-        <el-button
-          :class="listQuery.type === 'week' ? 'active' : ''" round size="small"
-          @click="selectTimeType('week')"
+          :class="listQuery.timeType === '2' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+          @click="selectTimeType('2')"
         >
           本周
         </el-button>
         <el-button
-          :class="listQuery.type === 'month' ? 'active' : ''" round size="small"
-          @click="selectTimeType('month')"
+          :class="listQuery.timeType === '3' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+          @click="selectTimeType('3')"
         >
           本月
         </el-button>
-        <el-select v-model="listQuery.keywords" placeholder="全部类别" clearable style="width: 180px;margin: 0 5px;" />
+        <el-select v-model="listQuery.ledgerType" placeholder="全部类别" clearable style="width: 180px;margin: 0 5px;">
+          <el-option v-for="item in ledgerTypeList" :key="item.id" :label="item.name" :value="item.id" />
+        </el-select>
         <dept-select
-          v-model="listQuery.keywords" placeholder="管理单位" :clearable="true"
+          v-model="listQuery.deptid" placeholder="管理单位" :clearable="true"
           style="width: 220px;margin: 0 5px;"
         />
         <el-date-picker
@@ -64,18 +109,27 @@
           style="width: 340px;margin: 0 5px;" value-format="YYYY-MM-DD HH:mm:ss" range-separator="至"
           start-placeholder="报警开始时间" end-placeholder="报警结束时间" clearable
         />
-        <el-button type="primary" style="margin: 0 5px;">
+        <el-button type="primary" style="margin: 0 5px;" @click="fetchData">
           搜索
         </el-button>
       </div>
     </template>
     <template #content>
-      <div class="alarm-count">
+      <div v-loading="loading" class="alarm-count">
         <div class="bar">
           <bar-chart-vertical
+            v-show="xAxisData.length"
             :x-axis-data="xAxisData" :bar-coner="0" :data="data" :colors="[]" :bar-width="15"
             :legend="{ itemWidth: 8, itemHeight: 8, type: 'scroll', orient: 'horizontal', icon: 'roundRect', right: '0', top: '10' }"
+            :grid="{
+              top: 50,
+              left: 30,
+              right: 30,
+              bottom: 20,
+              containLabel: true, // 是否包含坐标轴的刻度标签
+            }"
           />
+          <el-empty v-show="!xAxisData.length" description="暂无数据" />
         </div>
         <div class="table">
           <el-table border :data="list" stripe style="width: 100%;" :height="440">
@@ -110,8 +164,9 @@
   }
 
   .table {
-    width: 40%;
+    width: 38%;
     padding: 10px;
+    margin-left: 20px;
   }
 }
 </style>
diff --git a/src/views/home/alarm/count/components/deptCount.vue b/src/views/home/alarm/count/components/deptCount.vue
index 1579231..1ca5482 100644
--- a/src/views/home/alarm/count/components/deptCount.vue
+++ b/src/views/home/alarm/count/components/deptCount.vue
@@ -122,8 +122,9 @@
   }
 
   .table {
-    width: 40%;
+    width: 38%;
     padding: 10px;
+    margin-left: 20px;
   }
 }
 </style>
diff --git a/src/views/home/alarm/count/components/overallAlarm.vue b/src/views/home/alarm/count/components/overallAlarm.vue
index f14ee15..476add8 100644
--- a/src/views/home/alarm/count/components/overallAlarm.vue
+++ b/src/views/home/alarm/count/components/overallAlarm.vue
@@ -5,39 +5,64 @@
  -->
 <script lang="ts" setup name="AlarmCount">
 import layout from './layout.vue'
+import { getOverallAlarm } from '@/api/home/alarm/count'
 const alarmData = ref<any[]>([
   {
     name: '正在报警',
-    value: '7',
+    value: '0',
     unit: '个',
+    type: '1',
   },
   {
     name: '今日报警',
-    value: '2',
+    value: '0',
     unit: '个',
+    type: '2',
   },
   {
     name: '本周报警',
-    value: '12',
+    value: '0',
     unit: '个',
+    type: '3',
   },
   {
     name: '本月报警',
-    value: '25',
+    value: '0',
     unit: '个',
+    type: '4',
   },
   {
     name: '全年报警',
-    value: '208',
+    value: '0',
     unit: '个',
+    type: '5',
   },
 ])
+const loading = ref(true)
+const fetchData = () => {
+  loading.value = true
+  getOverallAlarm().then((res) => {
+    const data = res.data
+    data.forEach((item: any) => {
+      const cindex = alarmData.value.findIndex((citem: any) => citem.type === item.type)
+      if (cindex !== -1) {
+        alarmData.value[cindex].value = item.sum
+      }
+    })
+    loading.value = false
+  }).catch(() => {
+    loading.value = false
+  })
+}
+onMounted(() => {
+  fetchData()
+})
 </script>
 
 <template>
   <layout title="报警总体情况">
     <template #content>
-      <div class="alarm-container">
+      <div v-loading="loading" class="alarm-container">
         <div v-for="item in alarmData" :key="item.name" class="alarm-item">
           <div class="top">
             {{ item.name }}
@@ -63,18 +88,26 @@
     border-left: 4px solid #f24d4d;
     width: 18%;
     padding: 10px;
+    padding-top: 15px;
+    padding-bottom: 15px;
 
     .top {
       padding-left: 10px;
+      font-size: 22px;
+      font-weight: 700;
     }
 
     .bottom {
       text-align: center;
 
       .value {
-        font-size: 18px;
+        font-size: 22px;
         font-weight: 700;
       }
+
+      .unit {
+        font-size: 20px;
+      }
     }
   }
 }
diff --git a/src/views/home/alarm/count/components/trendAnalysis.vue b/src/views/home/alarm/count/components/trendAnalysis.vue
index cea2495..73e18b0 100644
--- a/src/views/home/alarm/count/components/trendAnalysis.vue
+++ b/src/views/home/alarm/count/components/trendAnalysis.vue
@@ -131,8 +131,9 @@
   }
 
   .table {
-    width: 40%;
+    width: 38%;
     padding: 10px;
+    margin-left: 20px;
   }
 }
 </style>

diff --git a/src/api/home/alarm/count.ts b/src/api/home/alarm/count.ts
new file mode 100644
index 0000000..1f4b59a
--- /dev/null
+++ b/src/api/home/alarm/count.ts
@@ -0,0 +1,36 @@
+/**
+ * 报警统计
+ */
+import request from '@/api/index'
+
+// 报警总体情况
+export function getOverallAlarm() {
+  return request({
+    url: '/statics/alarmRecords/overall',
+    method: 'post',
+  })
+}
+// 各类报警统计
+export function getAlarmType(data: any) {
+  return request({
+    url: '/statics/alarmRecords/alarmType',
+    method: 'post',
+    data,
+  })
+}
+// 各单位报警统计
+export function getAlarmCompany(data: any) {
+  return request({
+    url: '/statics/alarmRecords/alarmCompany',
+    method: 'post',
+    data,
+  })
+}
+// 异常位置分析
+export function getAlarmPosition(data: any) {
+  return request({
+    url: '/statics/alarmRecords/alarmPosition',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/views/home/alarm/count/components/alarmStatistics.vue b/src/views/home/alarm/count/components/alarmStatistics.vue
index b009891..b088de2 100644
--- a/src/views/home/alarm/count/components/alarmStatistics.vue
+++ b/src/views/home/alarm/count/components/alarmStatistics.vue
@@ -5,30 +5,79 @@
  -->
 <script lang="ts" setup name="AlarmCount">
 import layout from './layout.vue'
+import { getAlarmType } from '@/api/home/alarm/count'
 const listQuery = ref({
-  type: 'day',
+  timeType: '2',
+  ledgerType: '',
+  deptid: '',
+  begTime: '',
+  endTime: '',
 })
 const selectTimeType = (type: string) => {
-  listQuery.value.type = type
+  listQuery.value.timeType = type
 }
+// 类别
+const ledgerTypeList = ref<{ id: string; name: string; value: string }[]>([
+  {
+    name: '闸井',
+    id: '1',
+    value: '1',
+  },
+  {
+    name: '场站',
+    id: '2',
+    value: '2',
+  },
+  {
+    name: '管线',
+    id: '3',
+    value: '3',
+  },
+])
 const xAxisData = ref([])
 const data = ref([])
 const list = ref([])
-setTimeout(() => {
-  xAxisData.value = [
-    '闸井浓度超限', '场站浓度超限', '场站火焰报警', '疑似第三方破坏', '场站烟雾报警',
-  ]
-  data.value = [
-    {
-      name: '报警数量',
-      data: [1, 3, 5, 1, 4],
-    },
-  ]
-  list.value = xAxisData.value.map((item, index) => ({
-    alarmType: item,
-    value: data.value[0].data[index],
-  }))
-}, 1000)
+const loading = ref(true)
+// 开始结束时间
+const datetimerange = ref()
+// 默认当天
+watch(() => datetimerange.value, (newVal) => {
+  listQuery.value.begTime = ''
+  listQuery.value.endTime = ''
+  if (Array.isArray(newVal)) {
+    if (newVal.length) {
+      listQuery.value.begTime = `${newVal[0]}`
+      listQuery.value.endTime = `${newVal[1]}`
+    }
+  }
+})
+// setTimeout(() => {
+//   xAxisData.value = [
+//     '闸井浓度超限', '场站浓度超限', '场站火焰报警', '疑似第三方破坏', '场站烟雾报警',
+//   ]
+//   data.value = [
+//     {
+//       name: '报警数量',
+//       data: [1, 3, 5, 1, 4],
+//     },
+//   ]
+//   list.value = xAxisData.value.map((item, index) => ({
+//     alarmType: item,
+//     value: data.value[0].data[index],
+//   }))
+// }, 1000)
+const fetchData = () => {
+  loading.value = true
+  getAlarmType(listQuery.value).then((res) => {
+    console.log(res.data, '各类报警统计')
+    loading.value = false
+  }).catch(() => {
+    loading.value = false
+  })
+}
+onMounted(() => {
+  fetchData()
+})
 </script>
 
 <template>
@@ -37,26 +86,22 @@
     <template #search>
       <div class="search">
         <el-button
-          :class="listQuery.type === 'day' ? 'active' : ''" round size="small"
-          @click="selectTimeType('day')"
-        >
-          今日
-        </el-button>
-        <el-button
-          :class="listQuery.type === 'week' ? 'active' : ''" round size="small"
-          @click="selectTimeType('week')"
+          :class="listQuery.timeType === '2' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+          @click="selectTimeType('2')"
         >
           本周
         </el-button>
         <el-button
-          :class="listQuery.type === 'month' ? 'active' : ''" round size="small"
-          @click="selectTimeType('month')"
+          :class="listQuery.timeType === '3' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+          @click="selectTimeType('3')"
         >
           本月
         </el-button>
-        <el-select v-model="listQuery.keywords" placeholder="全部类别" clearable style="width: 180px;margin: 0 5px;" />
+        <el-select v-model="listQuery.ledgerType" placeholder="全部类别" clearable style="width: 180px;margin: 0 5px;">
+          <el-option v-for="item in ledgerTypeList" :key="item.id" :label="item.name" :value="item.id" />
+        </el-select>
         <dept-select
-          v-model="listQuery.keywords" placeholder="管理单位" :clearable="true"
+          v-model="listQuery.deptid" placeholder="管理单位" :clearable="true"
           style="width: 220px;margin: 0 5px;"
         />
         <el-date-picker
@@ -64,18 +109,27 @@
           style="width: 340px;margin: 0 5px;" value-format="YYYY-MM-DD HH:mm:ss" range-separator="至"
           start-placeholder="报警开始时间" end-placeholder="报警结束时间" clearable
         />
-        <el-button type="primary" style="margin: 0 5px;">
+        <el-button type="primary" style="margin: 0 5px;" @click="fetchData">
           搜索
         </el-button>
       </div>
     </template>
     <template #content>
-      <div class="alarm-count">
+      <div v-loading="loading" class="alarm-count">
         <div class="bar">
           <bar-chart-vertical
+            v-show="xAxisData.length"
             :x-axis-data="xAxisData" :bar-coner="0" :data="data" :colors="[]" :bar-width="15"
             :legend="{ itemWidth: 8, itemHeight: 8, type: 'scroll', orient: 'horizontal', icon: 'roundRect', right: '0', top: '10' }"
+            :grid="{
+              top: 50,
+              left: 30,
+              right: 30,
+              bottom: 20,
+              containLabel: true, // 是否包含坐标轴的刻度标签
+            }"
           />
+          <el-empty v-show="!xAxisData.length" description="暂无数据" />
         </div>
         <div class="table">
           <el-table border :data="list" stripe style="width: 100%;" :height="440">
@@ -110,8 +164,9 @@
   }
 
   .table {
-    width: 40%;
+    width: 38%;
     padding: 10px;
+    margin-left: 20px;
   }
 }
 </style>
diff --git a/src/views/home/alarm/count/components/deptCount.vue b/src/views/home/alarm/count/components/deptCount.vue
index 1579231..1ca5482 100644
--- a/src/views/home/alarm/count/components/deptCount.vue
+++ b/src/views/home/alarm/count/components/deptCount.vue
@@ -122,8 +122,9 @@
   }
 
   .table {
-    width: 40%;
+    width: 38%;
     padding: 10px;
+    margin-left: 20px;
   }
 }
 </style>
diff --git a/src/views/home/alarm/count/components/overallAlarm.vue b/src/views/home/alarm/count/components/overallAlarm.vue
index f14ee15..476add8 100644
--- a/src/views/home/alarm/count/components/overallAlarm.vue
+++ b/src/views/home/alarm/count/components/overallAlarm.vue
@@ -5,39 +5,64 @@
  -->
 <script lang="ts" setup name="AlarmCount">
 import layout from './layout.vue'
+import { getOverallAlarm } from '@/api/home/alarm/count'
 const alarmData = ref<any[]>([
   {
     name: '正在报警',
-    value: '7',
+    value: '0',
     unit: '个',
+    type: '1',
   },
   {
     name: '今日报警',
-    value: '2',
+    value: '0',
     unit: '个',
+    type: '2',
   },
   {
     name: '本周报警',
-    value: '12',
+    value: '0',
     unit: '个',
+    type: '3',
   },
   {
     name: '本月报警',
-    value: '25',
+    value: '0',
     unit: '个',
+    type: '4',
   },
   {
     name: '全年报警',
-    value: '208',
+    value: '0',
     unit: '个',
+    type: '5',
   },
 ])
+const loading = ref(true)
+const fetchData = () => {
+  loading.value = true
+  getOverallAlarm().then((res) => {
+    const data = res.data
+    data.forEach((item: any) => {
+      const cindex = alarmData.value.findIndex((citem: any) => citem.type === item.type)
+      if (cindex !== -1) {
+        alarmData.value[cindex].value = item.sum
+      }
+    })
+    loading.value = false
+  }).catch(() => {
+    loading.value = false
+  })
+}
+onMounted(() => {
+  fetchData()
+})
 </script>
 
 <template>
   <layout title="报警总体情况">
     <template #content>
-      <div class="alarm-container">
+      <div v-loading="loading" class="alarm-container">
         <div v-for="item in alarmData" :key="item.name" class="alarm-item">
           <div class="top">
             {{ item.name }}
@@ -63,18 +88,26 @@
     border-left: 4px solid #f24d4d;
     width: 18%;
     padding: 10px;
+    padding-top: 15px;
+    padding-bottom: 15px;
 
     .top {
       padding-left: 10px;
+      font-size: 22px;
+      font-weight: 700;
     }
 
     .bottom {
       text-align: center;
 
       .value {
-        font-size: 18px;
+        font-size: 22px;
         font-weight: 700;
       }
+
+      .unit {
+        font-size: 20px;
+      }
     }
   }
 }
diff --git a/src/views/home/alarm/count/components/trendAnalysis.vue b/src/views/home/alarm/count/components/trendAnalysis.vue
index cea2495..73e18b0 100644
--- a/src/views/home/alarm/count/components/trendAnalysis.vue
+++ b/src/views/home/alarm/count/components/trendAnalysis.vue
@@ -131,8 +131,9 @@
   }
 
   .table {
-    width: 40%;
+    width: 38%;
     padding: 10px;
+    margin-left: 20px;
   }
 }
 </style>
diff --git a/src/views/home/device/device/index.vue b/src/views/home/device/device/index.vue
index 55f12a9..df2cf32 100644
--- a/src/views/home/device/device/index.vue
+++ b/src/views/home/device/device/index.vue
@@ -13,6 +13,7 @@
 import { exportFile } from '@/utils/exportUtils'
 const $router = useRouter()
 const useStatusList = ref<{ id: string; name: string; value: string }[]>([]) // 设备在用情况
+const deviceTypeList = ref<{ id: string; name: string; value: string }[]>([]) // 设备类型
 // 表格数据
 const list = ref<any[]>([])
 const total = ref(0)
@@ -20,18 +21,18 @@
 const columns = ref<any>([
   { text: '状态', value: 'onlineState', align: 'center', isCustom: true, width: '55' },
   { text: '设备编号', value: 'devcode', align: 'center', isRequired: true },
-  { text: '设备类型', value: 'deviceType', align: 'center', isRequired: true },
-  { text: '监测对象', value: 'watchObject', align: 'center' },
+  { text: '设备类型', value: 'deviceTypeName', align: 'center', isRequired: true },
+  { text: '监测对象', value: 'watchObject', align: 'center', width: '85' },
   { text: '设备型号', value: 'deviceModel', align: 'center' },
   { text: '厂商', value: 'manufactureName', align: 'center', isRequired: true },
-  { text: '安装位号', value: 'tagNumber', align: 'center', isRequired: true },
+  { text: '安装位号', value: 'tagNumber', align: 'center', isRequired: true, width: '110' },
   { text: '详细位置', value: 'position', align: 'center', isRequired: true },
   { text: '管理单位', value: 'deptName', align: 'center', isRequired: true },
-  { text: '在用情况', value: 'validName', align: 'center', isRequired: true },
+  { text: '在用情况', value: 'validName', align: 'center', isRequired: true, width: '85' },
   // { text: '布防状态', value: '', align: 'center', isRequired: true },
-  { text: '电量', value: 'cell', align: 'center', isRequired: true },
-  { text: '最新上报时间', value: 'logtime', align: 'center', isRequired: true },
-  { text: '安装日期', value: 'installDate', align: 'center', isRequired: true },
+  { text: '电量', value: 'cell', align: 'center', isRequired: true, width: '70' },
+  { text: '最新上报时间', value: 'logtime', align: 'center', isRequired: true, width: '180' },
+  { text: '安装日期', value: 'installDate', align: 'center', isRequired: true, width: '180' },
 ])
 // 最终展示列
 const columnsConfig = ref([])
@@ -75,6 +76,7 @@
     list.value = res.data.rows.map((item: any) => ({
       ...item,
       validName: useStatusList.value.length ? useStatusList.value[useStatusList.value.findIndex(citem => item.valid === citem.value)].name : '',
+      deviceTypeName: deviceTypeList.value.length ? deviceTypeList.value[deviceTypeList.value.findIndex(citem => item.deviceType === citem.value)].name : '',
     }))
     total.value = res.data.total
     loadingTable.value = false
@@ -178,7 +180,7 @@
   ElMessage.warning('敬请期待')
 }
 const isUsed = ref<{ id: string; name: string; value: string }[]>([]) // 是否启用
-const deviceTypeList = ref<{ id: string; name: string; value: string }[]>([]) // 设备类型
+
 const manufacturerList = ref<{ id: string; name: string; value: string }[]>([]) // 厂商列表
 const cellList = ref<{ id: string; name: string; value: string }[]>([]) // 厂商列表
 
@@ -217,6 +219,12 @@
   // 设备类型
   getDeviceTypeListPage({ limit: 9999, offset: 1 }).then((res) => {
     deviceTypeList.value = res.data.rows.map((item: any) => ({ id: item.id, name: item.typeName, value: item.id }))
+    if (list.value.length) {
+      list.value = list.value.map((item: any) => ({
+        ...item,
+        deviceTypeName: deviceTypeList.value.length ? deviceTypeList.value[deviceTypeList.value.findIndex(citem => item.deviceType === citem.value)].name : '',
+      }))
+    }
   })
   // 厂商
   getManufacturerListPage().then((res) => {

diff --git a/src/api/home/alarm/count.ts b/src/api/home/alarm/count.ts
new file mode 100644
index 0000000..1f4b59a
--- /dev/null
+++ b/src/api/home/alarm/count.ts
@@ -0,0 +1,36 @@
+/**
+ * 报警统计
+ */
+import request from '@/api/index'
+
+// 报警总体情况
+export function getOverallAlarm() {
+  return request({
+    url: '/statics/alarmRecords/overall',
+    method: 'post',
+  })
+}
+// 各类报警统计
+export function getAlarmType(data: any) {
+  return request({
+    url: '/statics/alarmRecords/alarmType',
+    method: 'post',
+    data,
+  })
+}
+// 各单位报警统计
+export function getAlarmCompany(data: any) {
+  return request({
+    url: '/statics/alarmRecords/alarmCompany',
+    method: 'post',
+    data,
+  })
+}
+// 异常位置分析
+export function getAlarmPosition(data: any) {
+  return request({
+    url: '/statics/alarmRecords/alarmPosition',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/views/home/alarm/count/components/alarmStatistics.vue b/src/views/home/alarm/count/components/alarmStatistics.vue
index b009891..b088de2 100644
--- a/src/views/home/alarm/count/components/alarmStatistics.vue
+++ b/src/views/home/alarm/count/components/alarmStatistics.vue
@@ -5,30 +5,79 @@
  -->
 <script lang="ts" setup name="AlarmCount">
 import layout from './layout.vue'
+import { getAlarmType } from '@/api/home/alarm/count'
 const listQuery = ref({
-  type: 'day',
+  timeType: '2',
+  ledgerType: '',
+  deptid: '',
+  begTime: '',
+  endTime: '',
 })
 const selectTimeType = (type: string) => {
-  listQuery.value.type = type
+  listQuery.value.timeType = type
 }
+// 类别
+const ledgerTypeList = ref<{ id: string; name: string; value: string }[]>([
+  {
+    name: '闸井',
+    id: '1',
+    value: '1',
+  },
+  {
+    name: '场站',
+    id: '2',
+    value: '2',
+  },
+  {
+    name: '管线',
+    id: '3',
+    value: '3',
+  },
+])
 const xAxisData = ref([])
 const data = ref([])
 const list = ref([])
-setTimeout(() => {
-  xAxisData.value = [
-    '闸井浓度超限', '场站浓度超限', '场站火焰报警', '疑似第三方破坏', '场站烟雾报警',
-  ]
-  data.value = [
-    {
-      name: '报警数量',
-      data: [1, 3, 5, 1, 4],
-    },
-  ]
-  list.value = xAxisData.value.map((item, index) => ({
-    alarmType: item,
-    value: data.value[0].data[index],
-  }))
-}, 1000)
+const loading = ref(true)
+// 开始结束时间
+const datetimerange = ref()
+// 默认当天
+watch(() => datetimerange.value, (newVal) => {
+  listQuery.value.begTime = ''
+  listQuery.value.endTime = ''
+  if (Array.isArray(newVal)) {
+    if (newVal.length) {
+      listQuery.value.begTime = `${newVal[0]}`
+      listQuery.value.endTime = `${newVal[1]}`
+    }
+  }
+})
+// setTimeout(() => {
+//   xAxisData.value = [
+//     '闸井浓度超限', '场站浓度超限', '场站火焰报警', '疑似第三方破坏', '场站烟雾报警',
+//   ]
+//   data.value = [
+//     {
+//       name: '报警数量',
+//       data: [1, 3, 5, 1, 4],
+//     },
+//   ]
+//   list.value = xAxisData.value.map((item, index) => ({
+//     alarmType: item,
+//     value: data.value[0].data[index],
+//   }))
+// }, 1000)
+const fetchData = () => {
+  loading.value = true
+  getAlarmType(listQuery.value).then((res) => {
+    console.log(res.data, '各类报警统计')
+    loading.value = false
+  }).catch(() => {
+    loading.value = false
+  })
+}
+onMounted(() => {
+  fetchData()
+})
 </script>
 
 <template>
@@ -37,26 +86,22 @@
     <template #search>
       <div class="search">
         <el-button
-          :class="listQuery.type === 'day' ? 'active' : ''" round size="small"
-          @click="selectTimeType('day')"
-        >
-          今日
-        </el-button>
-        <el-button
-          :class="listQuery.type === 'week' ? 'active' : ''" round size="small"
-          @click="selectTimeType('week')"
+          :class="listQuery.timeType === '2' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+          @click="selectTimeType('2')"
         >
           本周
         </el-button>
         <el-button
-          :class="listQuery.type === 'month' ? 'active' : ''" round size="small"
-          @click="selectTimeType('month')"
+          :class="listQuery.timeType === '3' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+          @click="selectTimeType('3')"
         >
           本月
         </el-button>
-        <el-select v-model="listQuery.keywords" placeholder="全部类别" clearable style="width: 180px;margin: 0 5px;" />
+        <el-select v-model="listQuery.ledgerType" placeholder="全部类别" clearable style="width: 180px;margin: 0 5px;">
+          <el-option v-for="item in ledgerTypeList" :key="item.id" :label="item.name" :value="item.id" />
+        </el-select>
         <dept-select
-          v-model="listQuery.keywords" placeholder="管理单位" :clearable="true"
+          v-model="listQuery.deptid" placeholder="管理单位" :clearable="true"
           style="width: 220px;margin: 0 5px;"
         />
         <el-date-picker
@@ -64,18 +109,27 @@
           style="width: 340px;margin: 0 5px;" value-format="YYYY-MM-DD HH:mm:ss" range-separator="至"
           start-placeholder="报警开始时间" end-placeholder="报警结束时间" clearable
         />
-        <el-button type="primary" style="margin: 0 5px;">
+        <el-button type="primary" style="margin: 0 5px;" @click="fetchData">
           搜索
         </el-button>
       </div>
     </template>
     <template #content>
-      <div class="alarm-count">
+      <div v-loading="loading" class="alarm-count">
         <div class="bar">
           <bar-chart-vertical
+            v-show="xAxisData.length"
             :x-axis-data="xAxisData" :bar-coner="0" :data="data" :colors="[]" :bar-width="15"
             :legend="{ itemWidth: 8, itemHeight: 8, type: 'scroll', orient: 'horizontal', icon: 'roundRect', right: '0', top: '10' }"
+            :grid="{
+              top: 50,
+              left: 30,
+              right: 30,
+              bottom: 20,
+              containLabel: true, // 是否包含坐标轴的刻度标签
+            }"
           />
+          <el-empty v-show="!xAxisData.length" description="暂无数据" />
         </div>
         <div class="table">
           <el-table border :data="list" stripe style="width: 100%;" :height="440">
@@ -110,8 +164,9 @@
   }
 
   .table {
-    width: 40%;
+    width: 38%;
     padding: 10px;
+    margin-left: 20px;
   }
 }
 </style>
diff --git a/src/views/home/alarm/count/components/deptCount.vue b/src/views/home/alarm/count/components/deptCount.vue
index 1579231..1ca5482 100644
--- a/src/views/home/alarm/count/components/deptCount.vue
+++ b/src/views/home/alarm/count/components/deptCount.vue
@@ -122,8 +122,9 @@
   }
 
   .table {
-    width: 40%;
+    width: 38%;
     padding: 10px;
+    margin-left: 20px;
   }
 }
 </style>
diff --git a/src/views/home/alarm/count/components/overallAlarm.vue b/src/views/home/alarm/count/components/overallAlarm.vue
index f14ee15..476add8 100644
--- a/src/views/home/alarm/count/components/overallAlarm.vue
+++ b/src/views/home/alarm/count/components/overallAlarm.vue
@@ -5,39 +5,64 @@
  -->
 <script lang="ts" setup name="AlarmCount">
 import layout from './layout.vue'
+import { getOverallAlarm } from '@/api/home/alarm/count'
 const alarmData = ref<any[]>([
   {
     name: '正在报警',
-    value: '7',
+    value: '0',
     unit: '个',
+    type: '1',
   },
   {
     name: '今日报警',
-    value: '2',
+    value: '0',
     unit: '个',
+    type: '2',
   },
   {
     name: '本周报警',
-    value: '12',
+    value: '0',
     unit: '个',
+    type: '3',
   },
   {
     name: '本月报警',
-    value: '25',
+    value: '0',
     unit: '个',
+    type: '4',
   },
   {
     name: '全年报警',
-    value: '208',
+    value: '0',
     unit: '个',
+    type: '5',
   },
 ])
+const loading = ref(true)
+const fetchData = () => {
+  loading.value = true
+  getOverallAlarm().then((res) => {
+    const data = res.data
+    data.forEach((item: any) => {
+      const cindex = alarmData.value.findIndex((citem: any) => citem.type === item.type)
+      if (cindex !== -1) {
+        alarmData.value[cindex].value = item.sum
+      }
+    })
+    loading.value = false
+  }).catch(() => {
+    loading.value = false
+  })
+}
+onMounted(() => {
+  fetchData()
+})
 </script>
 
 <template>
   <layout title="报警总体情况">
     <template #content>
-      <div class="alarm-container">
+      <div v-loading="loading" class="alarm-container">
         <div v-for="item in alarmData" :key="item.name" class="alarm-item">
           <div class="top">
             {{ item.name }}
@@ -63,18 +88,26 @@
     border-left: 4px solid #f24d4d;
     width: 18%;
     padding: 10px;
+    padding-top: 15px;
+    padding-bottom: 15px;
 
     .top {
       padding-left: 10px;
+      font-size: 22px;
+      font-weight: 700;
     }
 
     .bottom {
       text-align: center;
 
       .value {
-        font-size: 18px;
+        font-size: 22px;
         font-weight: 700;
       }
+
+      .unit {
+        font-size: 20px;
+      }
     }
   }
 }
diff --git a/src/views/home/alarm/count/components/trendAnalysis.vue b/src/views/home/alarm/count/components/trendAnalysis.vue
index cea2495..73e18b0 100644
--- a/src/views/home/alarm/count/components/trendAnalysis.vue
+++ b/src/views/home/alarm/count/components/trendAnalysis.vue
@@ -131,8 +131,9 @@
   }
 
   .table {
-    width: 40%;
+    width: 38%;
     padding: 10px;
+    margin-left: 20px;
   }
 }
 </style>
diff --git a/src/views/home/device/device/index.vue b/src/views/home/device/device/index.vue
index 55f12a9..df2cf32 100644
--- a/src/views/home/device/device/index.vue
+++ b/src/views/home/device/device/index.vue
@@ -13,6 +13,7 @@
 import { exportFile } from '@/utils/exportUtils'
 const $router = useRouter()
 const useStatusList = ref<{ id: string; name: string; value: string }[]>([]) // 设备在用情况
+const deviceTypeList = ref<{ id: string; name: string; value: string }[]>([]) // 设备类型
 // 表格数据
 const list = ref<any[]>([])
 const total = ref(0)
@@ -20,18 +21,18 @@
 const columns = ref<any>([
   { text: '状态', value: 'onlineState', align: 'center', isCustom: true, width: '55' },
   { text: '设备编号', value: 'devcode', align: 'center', isRequired: true },
-  { text: '设备类型', value: 'deviceType', align: 'center', isRequired: true },
-  { text: '监测对象', value: 'watchObject', align: 'center' },
+  { text: '设备类型', value: 'deviceTypeName', align: 'center', isRequired: true },
+  { text: '监测对象', value: 'watchObject', align: 'center', width: '85' },
   { text: '设备型号', value: 'deviceModel', align: 'center' },
   { text: '厂商', value: 'manufactureName', align: 'center', isRequired: true },
-  { text: '安装位号', value: 'tagNumber', align: 'center', isRequired: true },
+  { text: '安装位号', value: 'tagNumber', align: 'center', isRequired: true, width: '110' },
   { text: '详细位置', value: 'position', align: 'center', isRequired: true },
   { text: '管理单位', value: 'deptName', align: 'center', isRequired: true },
-  { text: '在用情况', value: 'validName', align: 'center', isRequired: true },
+  { text: '在用情况', value: 'validName', align: 'center', isRequired: true, width: '85' },
   // { text: '布防状态', value: '', align: 'center', isRequired: true },
-  { text: '电量', value: 'cell', align: 'center', isRequired: true },
-  { text: '最新上报时间', value: 'logtime', align: 'center', isRequired: true },
-  { text: '安装日期', value: 'installDate', align: 'center', isRequired: true },
+  { text: '电量', value: 'cell', align: 'center', isRequired: true, width: '70' },
+  { text: '最新上报时间', value: 'logtime', align: 'center', isRequired: true, width: '180' },
+  { text: '安装日期', value: 'installDate', align: 'center', isRequired: true, width: '180' },
 ])
 // 最终展示列
 const columnsConfig = ref([])
@@ -75,6 +76,7 @@
     list.value = res.data.rows.map((item: any) => ({
       ...item,
       validName: useStatusList.value.length ? useStatusList.value[useStatusList.value.findIndex(citem => item.valid === citem.value)].name : '',
+      deviceTypeName: deviceTypeList.value.length ? deviceTypeList.value[deviceTypeList.value.findIndex(citem => item.deviceType === citem.value)].name : '',
     }))
     total.value = res.data.total
     loadingTable.value = false
@@ -178,7 +180,7 @@
   ElMessage.warning('敬请期待')
 }
 const isUsed = ref<{ id: string; name: string; value: string }[]>([]) // 是否启用
-const deviceTypeList = ref<{ id: string; name: string; value: string }[]>([]) // 设备类型
+
 const manufacturerList = ref<{ id: string; name: string; value: string }[]>([]) // 厂商列表
 const cellList = ref<{ id: string; name: string; value: string }[]>([]) // 厂商列表
 
@@ -217,6 +219,12 @@
   // 设备类型
   getDeviceTypeListPage({ limit: 9999, offset: 1 }).then((res) => {
     deviceTypeList.value = res.data.rows.map((item: any) => ({ id: item.id, name: item.typeName, value: item.id }))
+    if (list.value.length) {
+      list.value = list.value.map((item: any) => ({
+        ...item,
+        deviceTypeName: deviceTypeList.value.length ? deviceTypeList.value[deviceTypeList.value.findIndex(citem => item.deviceType === citem.value)].name : '',
+      }))
+    }
   })
   // 厂商
   getManufacturerListPage().then((res) => {
diff --git a/src/views/home/pipeline/components/detailInfoDialog.vue b/src/views/home/pipeline/components/detailInfoDialog.vue
index 31f5635..1662e6e 100644
--- a/src/views/home/pipeline/components/detailInfoDialog.vue
+++ b/src/views/home/pipeline/components/detailInfoDialog.vue
@@ -123,44 +123,39 @@
       <span class="close" @click="close">x</span>
     </div>
     <div class="body">
-      <el-descriptions v-loading="loading" :column="2" border>
-        <el-descriptions-item v-for="item in descriptionsList" :key="item.text" :align="item.align">
-          <template #label>
-            <span class="label">
-              {{ item.text }}
-            </span>
-          </template>
-          {{ detailInfo[item.value] || '' }}
-        </el-descriptions-item>
-      </el-descriptions>
+      <div class="descriptions">
+        <div v-for="item in descriptionsList" :key="item.text" class="descriptions-item">
+          <div class="label">
+            {{ item.text }}
+          </div>
+          <div class="value" :title="detailInfo[item.value] || ''">
+            {{ detailInfo[item.value] || '' }}
+          </div>
+        </div>
+      </div>
     </div>
   </div>
 </template>
 
 <style lang="scss" scoped>
-::v-deep(.el-descriptions__label) {
-  width: 20%;
-}
-
-::v-deep(.el-descriptions__cell) {
-  padding: 0 !important;
-}
-
 .container {
-  // width: 500px;
-  // padding: 0 10px;
-  background: rgba($color: #feffff, $alpha: 95%);
-  border: 1.5px solid #79b5e6;
+  width: 600px;
+  background: #fff;
   position: relative;
+  border-radius: 8px;
+  border: 1px solid #e4e7ed;
+  overflow: hidden;
+  box-shadow: 0 0 12px rgb(0 0 0 / 12%);
 
   .header {
     float: right;
-    background-color: #ccc;
+    background-color: #5ea1ff;
     width: 100%;
     display: flex;
     justify-content: space-between;
     padding: 2px 10px;
     align-items: center;
+    color: #fff;
 
     .title {
       font-weight: 700;
@@ -172,7 +167,6 @@
     }
 
     .close {
-      color: #4875a0;
       font-size: 22px;
       font-weight: 700;
       text-align: right;
@@ -180,30 +174,55 @@
 
       &:hover {
         cursor: pointer;
-        color: #658eb4;
+        color: #ccc;
       }
     }
   }
 
   .body {
-    // padding: 10px;
-    // display: flex;
-    // flex-wrap: wrap;
     width: 100%;
 
-    .name {
-      width: 30%;
-    }
+    .descriptions {
+      width: 100%;
+      display: flex;
+      flex-wrap: wrap;
+      box-sizing: border-box;
+      padding: 10px 0;
 
-    .value {
-      width: 70%;
+      .descriptions-item {
+        width: 48%;
+        margin: 5px;
+        box-sizing: border-box;
+        display: flex;
+        padding: 0 5px;
+
+        .label {
+          width: 30%;
+          box-sizing: border-box;
+          padding: 0 5px;
+          font-size: 15px;
+          text-align: justify;
+          text-align-last: justify;
+        }
+
+        .value {
+          padding-left: 5px;
+          width: 68%;
+          box-sizing: border-box;
+          white-space: nowrap;
+          font-size: 14px;
+          color: #a39f9f;
+
+          /* 确保文本在一行内显示 */
+          overflow: hidden;
+
+          /* 超出容器部分隐藏 */
+          text-overflow: ellipsis;
+
+          /* 文字溢出显示省略号 */
+        }
+      }
     }
   }
 }
-
-.clearfix::after {
-  content: "";
-  display: table;
-  clear: both;
-}
 </style>

diff --git a/src/api/home/alarm/count.ts b/src/api/home/alarm/count.ts
new file mode 100644
index 0000000..1f4b59a
--- /dev/null
+++ b/src/api/home/alarm/count.ts
@@ -0,0 +1,36 @@
+/**
+ * 报警统计
+ */
+import request from '@/api/index'
+
+// 报警总体情况
+export function getOverallAlarm() {
+  return request({
+    url: '/statics/alarmRecords/overall',
+    method: 'post',
+  })
+}
+// 各类报警统计
+export function getAlarmType(data: any) {
+  return request({
+    url: '/statics/alarmRecords/alarmType',
+    method: 'post',
+    data,
+  })
+}
+// 各单位报警统计
+export function getAlarmCompany(data: any) {
+  return request({
+    url: '/statics/alarmRecords/alarmCompany',
+    method: 'post',
+    data,
+  })
+}
+// 异常位置分析
+export function getAlarmPosition(data: any) {
+  return request({
+    url: '/statics/alarmRecords/alarmPosition',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/views/home/alarm/count/components/alarmStatistics.vue b/src/views/home/alarm/count/components/alarmStatistics.vue
index b009891..b088de2 100644
--- a/src/views/home/alarm/count/components/alarmStatistics.vue
+++ b/src/views/home/alarm/count/components/alarmStatistics.vue
@@ -5,30 +5,79 @@
  -->
 <script lang="ts" setup name="AlarmCount">
 import layout from './layout.vue'
+import { getAlarmType } from '@/api/home/alarm/count'
 const listQuery = ref({
-  type: 'day',
+  timeType: '2',
+  ledgerType: '',
+  deptid: '',
+  begTime: '',
+  endTime: '',
 })
 const selectTimeType = (type: string) => {
-  listQuery.value.type = type
+  listQuery.value.timeType = type
 }
+// 类别
+const ledgerTypeList = ref<{ id: string; name: string; value: string }[]>([
+  {
+    name: '闸井',
+    id: '1',
+    value: '1',
+  },
+  {
+    name: '场站',
+    id: '2',
+    value: '2',
+  },
+  {
+    name: '管线',
+    id: '3',
+    value: '3',
+  },
+])
 const xAxisData = ref([])
 const data = ref([])
 const list = ref([])
-setTimeout(() => {
-  xAxisData.value = [
-    '闸井浓度超限', '场站浓度超限', '场站火焰报警', '疑似第三方破坏', '场站烟雾报警',
-  ]
-  data.value = [
-    {
-      name: '报警数量',
-      data: [1, 3, 5, 1, 4],
-    },
-  ]
-  list.value = xAxisData.value.map((item, index) => ({
-    alarmType: item,
-    value: data.value[0].data[index],
-  }))
-}, 1000)
+const loading = ref(true)
+// 开始结束时间
+const datetimerange = ref()
+// 默认当天
+watch(() => datetimerange.value, (newVal) => {
+  listQuery.value.begTime = ''
+  listQuery.value.endTime = ''
+  if (Array.isArray(newVal)) {
+    if (newVal.length) {
+      listQuery.value.begTime = `${newVal[0]}`
+      listQuery.value.endTime = `${newVal[1]}`
+    }
+  }
+})
+// setTimeout(() => {
+//   xAxisData.value = [
+//     '闸井浓度超限', '场站浓度超限', '场站火焰报警', '疑似第三方破坏', '场站烟雾报警',
+//   ]
+//   data.value = [
+//     {
+//       name: '报警数量',
+//       data: [1, 3, 5, 1, 4],
+//     },
+//   ]
+//   list.value = xAxisData.value.map((item, index) => ({
+//     alarmType: item,
+//     value: data.value[0].data[index],
+//   }))
+// }, 1000)
+const fetchData = () => {
+  loading.value = true
+  getAlarmType(listQuery.value).then((res) => {
+    console.log(res.data, '各类报警统计')
+    loading.value = false
+  }).catch(() => {
+    loading.value = false
+  })
+}
+onMounted(() => {
+  fetchData()
+})
 </script>
 
 <template>
@@ -37,26 +86,22 @@
     <template #search>
       <div class="search">
         <el-button
-          :class="listQuery.type === 'day' ? 'active' : ''" round size="small"
-          @click="selectTimeType('day')"
-        >
-          今日
-        </el-button>
-        <el-button
-          :class="listQuery.type === 'week' ? 'active' : ''" round size="small"
-          @click="selectTimeType('week')"
+          :class="listQuery.timeType === '2' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+          @click="selectTimeType('2')"
         >
           本周
         </el-button>
         <el-button
-          :class="listQuery.type === 'month' ? 'active' : ''" round size="small"
-          @click="selectTimeType('month')"
+          :class="listQuery.timeType === '3' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+          @click="selectTimeType('3')"
         >
           本月
         </el-button>
-        <el-select v-model="listQuery.keywords" placeholder="全部类别" clearable style="width: 180px;margin: 0 5px;" />
+        <el-select v-model="listQuery.ledgerType" placeholder="全部类别" clearable style="width: 180px;margin: 0 5px;">
+          <el-option v-for="item in ledgerTypeList" :key="item.id" :label="item.name" :value="item.id" />
+        </el-select>
         <dept-select
-          v-model="listQuery.keywords" placeholder="管理单位" :clearable="true"
+          v-model="listQuery.deptid" placeholder="管理单位" :clearable="true"
           style="width: 220px;margin: 0 5px;"
         />
         <el-date-picker
@@ -64,18 +109,27 @@
           style="width: 340px;margin: 0 5px;" value-format="YYYY-MM-DD HH:mm:ss" range-separator="至"
           start-placeholder="报警开始时间" end-placeholder="报警结束时间" clearable
         />
-        <el-button type="primary" style="margin: 0 5px;">
+        <el-button type="primary" style="margin: 0 5px;" @click="fetchData">
           搜索
         </el-button>
       </div>
     </template>
     <template #content>
-      <div class="alarm-count">
+      <div v-loading="loading" class="alarm-count">
         <div class="bar">
           <bar-chart-vertical
+            v-show="xAxisData.length"
             :x-axis-data="xAxisData" :bar-coner="0" :data="data" :colors="[]" :bar-width="15"
             :legend="{ itemWidth: 8, itemHeight: 8, type: 'scroll', orient: 'horizontal', icon: 'roundRect', right: '0', top: '10' }"
+            :grid="{
+              top: 50,
+              left: 30,
+              right: 30,
+              bottom: 20,
+              containLabel: true, // 是否包含坐标轴的刻度标签
+            }"
           />
+          <el-empty v-show="!xAxisData.length" description="暂无数据" />
         </div>
         <div class="table">
           <el-table border :data="list" stripe style="width: 100%;" :height="440">
@@ -110,8 +164,9 @@
   }
 
   .table {
-    width: 40%;
+    width: 38%;
     padding: 10px;
+    margin-left: 20px;
   }
 }
 </style>
diff --git a/src/views/home/alarm/count/components/deptCount.vue b/src/views/home/alarm/count/components/deptCount.vue
index 1579231..1ca5482 100644
--- a/src/views/home/alarm/count/components/deptCount.vue
+++ b/src/views/home/alarm/count/components/deptCount.vue
@@ -122,8 +122,9 @@
   }
 
   .table {
-    width: 40%;
+    width: 38%;
     padding: 10px;
+    margin-left: 20px;
   }
 }
 </style>
diff --git a/src/views/home/alarm/count/components/overallAlarm.vue b/src/views/home/alarm/count/components/overallAlarm.vue
index f14ee15..476add8 100644
--- a/src/views/home/alarm/count/components/overallAlarm.vue
+++ b/src/views/home/alarm/count/components/overallAlarm.vue
@@ -5,39 +5,64 @@
  -->
 <script lang="ts" setup name="AlarmCount">
 import layout from './layout.vue'
+import { getOverallAlarm } from '@/api/home/alarm/count'
 const alarmData = ref<any[]>([
   {
     name: '正在报警',
-    value: '7',
+    value: '0',
     unit: '个',
+    type: '1',
   },
   {
     name: '今日报警',
-    value: '2',
+    value: '0',
     unit: '个',
+    type: '2',
   },
   {
     name: '本周报警',
-    value: '12',
+    value: '0',
     unit: '个',
+    type: '3',
   },
   {
     name: '本月报警',
-    value: '25',
+    value: '0',
     unit: '个',
+    type: '4',
   },
   {
     name: '全年报警',
-    value: '208',
+    value: '0',
     unit: '个',
+    type: '5',
   },
 ])
+const loading = ref(true)
+const fetchData = () => {
+  loading.value = true
+  getOverallAlarm().then((res) => {
+    const data = res.data
+    data.forEach((item: any) => {
+      const cindex = alarmData.value.findIndex((citem: any) => citem.type === item.type)
+      if (cindex !== -1) {
+        alarmData.value[cindex].value = item.sum
+      }
+    })
+    loading.value = false
+  }).catch(() => {
+    loading.value = false
+  })
+}
+onMounted(() => {
+  fetchData()
+})
 </script>
 
 <template>
   <layout title="报警总体情况">
     <template #content>
-      <div class="alarm-container">
+      <div v-loading="loading" class="alarm-container">
         <div v-for="item in alarmData" :key="item.name" class="alarm-item">
           <div class="top">
             {{ item.name }}
@@ -63,18 +88,26 @@
     border-left: 4px solid #f24d4d;
     width: 18%;
     padding: 10px;
+    padding-top: 15px;
+    padding-bottom: 15px;
 
     .top {
       padding-left: 10px;
+      font-size: 22px;
+      font-weight: 700;
     }
 
     .bottom {
       text-align: center;
 
       .value {
-        font-size: 18px;
+        font-size: 22px;
         font-weight: 700;
       }
+
+      .unit {
+        font-size: 20px;
+      }
     }
   }
 }
diff --git a/src/views/home/alarm/count/components/trendAnalysis.vue b/src/views/home/alarm/count/components/trendAnalysis.vue
index cea2495..73e18b0 100644
--- a/src/views/home/alarm/count/components/trendAnalysis.vue
+++ b/src/views/home/alarm/count/components/trendAnalysis.vue
@@ -131,8 +131,9 @@
   }
 
   .table {
-    width: 40%;
+    width: 38%;
     padding: 10px;
+    margin-left: 20px;
   }
 }
 </style>
diff --git a/src/views/home/device/device/index.vue b/src/views/home/device/device/index.vue
index 55f12a9..df2cf32 100644
--- a/src/views/home/device/device/index.vue
+++ b/src/views/home/device/device/index.vue
@@ -13,6 +13,7 @@
 import { exportFile } from '@/utils/exportUtils'
 const $router = useRouter()
 const useStatusList = ref<{ id: string; name: string; value: string }[]>([]) // 设备在用情况
+const deviceTypeList = ref<{ id: string; name: string; value: string }[]>([]) // 设备类型
 // 表格数据
 const list = ref<any[]>([])
 const total = ref(0)
@@ -20,18 +21,18 @@
 const columns = ref<any>([
   { text: '状态', value: 'onlineState', align: 'center', isCustom: true, width: '55' },
   { text: '设备编号', value: 'devcode', align: 'center', isRequired: true },
-  { text: '设备类型', value: 'deviceType', align: 'center', isRequired: true },
-  { text: '监测对象', value: 'watchObject', align: 'center' },
+  { text: '设备类型', value: 'deviceTypeName', align: 'center', isRequired: true },
+  { text: '监测对象', value: 'watchObject', align: 'center', width: '85' },
   { text: '设备型号', value: 'deviceModel', align: 'center' },
   { text: '厂商', value: 'manufactureName', align: 'center', isRequired: true },
-  { text: '安装位号', value: 'tagNumber', align: 'center', isRequired: true },
+  { text: '安装位号', value: 'tagNumber', align: 'center', isRequired: true, width: '110' },
   { text: '详细位置', value: 'position', align: 'center', isRequired: true },
   { text: '管理单位', value: 'deptName', align: 'center', isRequired: true },
-  { text: '在用情况', value: 'validName', align: 'center', isRequired: true },
+  { text: '在用情况', value: 'validName', align: 'center', isRequired: true, width: '85' },
   // { text: '布防状态', value: '', align: 'center', isRequired: true },
-  { text: '电量', value: 'cell', align: 'center', isRequired: true },
-  { text: '最新上报时间', value: 'logtime', align: 'center', isRequired: true },
-  { text: '安装日期', value: 'installDate', align: 'center', isRequired: true },
+  { text: '电量', value: 'cell', align: 'center', isRequired: true, width: '70' },
+  { text: '最新上报时间', value: 'logtime', align: 'center', isRequired: true, width: '180' },
+  { text: '安装日期', value: 'installDate', align: 'center', isRequired: true, width: '180' },
 ])
 // 最终展示列
 const columnsConfig = ref([])
@@ -75,6 +76,7 @@
     list.value = res.data.rows.map((item: any) => ({
       ...item,
       validName: useStatusList.value.length ? useStatusList.value[useStatusList.value.findIndex(citem => item.valid === citem.value)].name : '',
+      deviceTypeName: deviceTypeList.value.length ? deviceTypeList.value[deviceTypeList.value.findIndex(citem => item.deviceType === citem.value)].name : '',
     }))
     total.value = res.data.total
     loadingTable.value = false
@@ -178,7 +180,7 @@
   ElMessage.warning('敬请期待')
 }
 const isUsed = ref<{ id: string; name: string; value: string }[]>([]) // 是否启用
-const deviceTypeList = ref<{ id: string; name: string; value: string }[]>([]) // 设备类型
+
 const manufacturerList = ref<{ id: string; name: string; value: string }[]>([]) // 厂商列表
 const cellList = ref<{ id: string; name: string; value: string }[]>([]) // 厂商列表
 
@@ -217,6 +219,12 @@
   // 设备类型
   getDeviceTypeListPage({ limit: 9999, offset: 1 }).then((res) => {
     deviceTypeList.value = res.data.rows.map((item: any) => ({ id: item.id, name: item.typeName, value: item.id }))
+    if (list.value.length) {
+      list.value = list.value.map((item: any) => ({
+        ...item,
+        deviceTypeName: deviceTypeList.value.length ? deviceTypeList.value[deviceTypeList.value.findIndex(citem => item.deviceType === citem.value)].name : '',
+      }))
+    }
   })
   // 厂商
   getManufacturerListPage().then((res) => {
diff --git a/src/views/home/pipeline/components/detailInfoDialog.vue b/src/views/home/pipeline/components/detailInfoDialog.vue
index 31f5635..1662e6e 100644
--- a/src/views/home/pipeline/components/detailInfoDialog.vue
+++ b/src/views/home/pipeline/components/detailInfoDialog.vue
@@ -123,44 +123,39 @@
       <span class="close" @click="close">x</span>
     </div>
     <div class="body">
-      <el-descriptions v-loading="loading" :column="2" border>
-        <el-descriptions-item v-for="item in descriptionsList" :key="item.text" :align="item.align">
-          <template #label>
-            <span class="label">
-              {{ item.text }}
-            </span>
-          </template>
-          {{ detailInfo[item.value] || '' }}
-        </el-descriptions-item>
-      </el-descriptions>
+      <div class="descriptions">
+        <div v-for="item in descriptionsList" :key="item.text" class="descriptions-item">
+          <div class="label">
+            {{ item.text }}
+          </div>
+          <div class="value" :title="detailInfo[item.value] || ''">
+            {{ detailInfo[item.value] || '' }}
+          </div>
+        </div>
+      </div>
     </div>
   </div>
 </template>
 
 <style lang="scss" scoped>
-::v-deep(.el-descriptions__label) {
-  width: 20%;
-}
-
-::v-deep(.el-descriptions__cell) {
-  padding: 0 !important;
-}
-
 .container {
-  // width: 500px;
-  // padding: 0 10px;
-  background: rgba($color: #feffff, $alpha: 95%);
-  border: 1.5px solid #79b5e6;
+  width: 600px;
+  background: #fff;
   position: relative;
+  border-radius: 8px;
+  border: 1px solid #e4e7ed;
+  overflow: hidden;
+  box-shadow: 0 0 12px rgb(0 0 0 / 12%);
 
   .header {
     float: right;
-    background-color: #ccc;
+    background-color: #5ea1ff;
     width: 100%;
     display: flex;
     justify-content: space-between;
     padding: 2px 10px;
     align-items: center;
+    color: #fff;
 
     .title {
       font-weight: 700;
@@ -172,7 +167,6 @@
     }
 
     .close {
-      color: #4875a0;
       font-size: 22px;
       font-weight: 700;
       text-align: right;
@@ -180,30 +174,55 @@
 
       &:hover {
         cursor: pointer;
-        color: #658eb4;
+        color: #ccc;
       }
     }
   }
 
   .body {
-    // padding: 10px;
-    // display: flex;
-    // flex-wrap: wrap;
     width: 100%;
 
-    .name {
-      width: 30%;
-    }
+    .descriptions {
+      width: 100%;
+      display: flex;
+      flex-wrap: wrap;
+      box-sizing: border-box;
+      padding: 10px 0;
 
-    .value {
-      width: 70%;
+      .descriptions-item {
+        width: 48%;
+        margin: 5px;
+        box-sizing: border-box;
+        display: flex;
+        padding: 0 5px;
+
+        .label {
+          width: 30%;
+          box-sizing: border-box;
+          padding: 0 5px;
+          font-size: 15px;
+          text-align: justify;
+          text-align-last: justify;
+        }
+
+        .value {
+          padding-left: 5px;
+          width: 68%;
+          box-sizing: border-box;
+          white-space: nowrap;
+          font-size: 14px;
+          color: #a39f9f;
+
+          /* 确保文本在一行内显示 */
+          overflow: hidden;
+
+          /* 超出容器部分隐藏 */
+          text-overflow: ellipsis;
+
+          /* 文字溢出显示省略号 */
+        }
+      }
     }
   }
 }
-
-.clearfix::after {
-  content: "";
-  display: table;
-  clear: both;
-}
 </style>
diff --git a/src/views/home/pipeline/components/map.vue b/src/views/home/pipeline/components/map.vue
index b956aa0..c7c37be 100644
--- a/src/views/home/pipeline/components/map.vue
+++ b/src/views/home/pipeline/components/map.vue
@@ -176,7 +176,10 @@
   setTimeout(() => {
     // mapRef.value.map.setZoom(14)
     // mapRef.value.map.setFitView()
-    mapRef.value.map.setCenter(data.event.data.lnglat)
+    // mapRef.value.map.setCenter(data.event.data.lnglat)
+    const center = JSON.parse(JSON.stringify(data.event.data.lnglat))
+    center[1] = Number(center[1]) + 0.0035
+    mapRef.value.map.setCenter(center)
   })
   // 关联的管线高亮
   const line = $props.pipe.filter((item: any) => item.pipeCode === data.event.data.row.pipeCode)
@@ -218,7 +221,10 @@
       info: data,
       map: mapRef.value.map,
     })
-    mapRef.value.map.setCenter(data.lnglat)
+    // mapRef.value.map.setCenter(data.lnglat)
+    const center = JSON.parse(JSON.stringify(data.lnglat))
+    center[1] = Number(center[1]) + 0.0035
+    mapRef.value.map.setCenter(center)
   })
 }
 // 重置标记点

diff --git a/src/api/home/alarm/count.ts b/src/api/home/alarm/count.ts
new file mode 100644
index 0000000..1f4b59a
--- /dev/null
+++ b/src/api/home/alarm/count.ts
@@ -0,0 +1,36 @@
+/**
+ * 报警统计
+ */
+import request from '@/api/index'
+
+// 报警总体情况
+export function getOverallAlarm() {
+  return request({
+    url: '/statics/alarmRecords/overall',
+    method: 'post',
+  })
+}
+// 各类报警统计
+export function getAlarmType(data: any) {
+  return request({
+    url: '/statics/alarmRecords/alarmType',
+    method: 'post',
+    data,
+  })
+}
+// 各单位报警统计
+export function getAlarmCompany(data: any) {
+  return request({
+    url: '/statics/alarmRecords/alarmCompany',
+    method: 'post',
+    data,
+  })
+}
+// 异常位置分析
+export function getAlarmPosition(data: any) {
+  return request({
+    url: '/statics/alarmRecords/alarmPosition',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/views/home/alarm/count/components/alarmStatistics.vue b/src/views/home/alarm/count/components/alarmStatistics.vue
index b009891..b088de2 100644
--- a/src/views/home/alarm/count/components/alarmStatistics.vue
+++ b/src/views/home/alarm/count/components/alarmStatistics.vue
@@ -5,30 +5,79 @@
  -->
 <script lang="ts" setup name="AlarmCount">
 import layout from './layout.vue'
+import { getAlarmType } from '@/api/home/alarm/count'
 const listQuery = ref({
-  type: 'day',
+  timeType: '2',
+  ledgerType: '',
+  deptid: '',
+  begTime: '',
+  endTime: '',
 })
 const selectTimeType = (type: string) => {
-  listQuery.value.type = type
+  listQuery.value.timeType = type
 }
+// 类别
+const ledgerTypeList = ref<{ id: string; name: string; value: string }[]>([
+  {
+    name: '闸井',
+    id: '1',
+    value: '1',
+  },
+  {
+    name: '场站',
+    id: '2',
+    value: '2',
+  },
+  {
+    name: '管线',
+    id: '3',
+    value: '3',
+  },
+])
 const xAxisData = ref([])
 const data = ref([])
 const list = ref([])
-setTimeout(() => {
-  xAxisData.value = [
-    '闸井浓度超限', '场站浓度超限', '场站火焰报警', '疑似第三方破坏', '场站烟雾报警',
-  ]
-  data.value = [
-    {
-      name: '报警数量',
-      data: [1, 3, 5, 1, 4],
-    },
-  ]
-  list.value = xAxisData.value.map((item, index) => ({
-    alarmType: item,
-    value: data.value[0].data[index],
-  }))
-}, 1000)
+const loading = ref(true)
+// 开始结束时间
+const datetimerange = ref()
+// 默认当天
+watch(() => datetimerange.value, (newVal) => {
+  listQuery.value.begTime = ''
+  listQuery.value.endTime = ''
+  if (Array.isArray(newVal)) {
+    if (newVal.length) {
+      listQuery.value.begTime = `${newVal[0]}`
+      listQuery.value.endTime = `${newVal[1]}`
+    }
+  }
+})
+// setTimeout(() => {
+//   xAxisData.value = [
+//     '闸井浓度超限', '场站浓度超限', '场站火焰报警', '疑似第三方破坏', '场站烟雾报警',
+//   ]
+//   data.value = [
+//     {
+//       name: '报警数量',
+//       data: [1, 3, 5, 1, 4],
+//     },
+//   ]
+//   list.value = xAxisData.value.map((item, index) => ({
+//     alarmType: item,
+//     value: data.value[0].data[index],
+//   }))
+// }, 1000)
+const fetchData = () => {
+  loading.value = true
+  getAlarmType(listQuery.value).then((res) => {
+    console.log(res.data, '各类报警统计')
+    loading.value = false
+  }).catch(() => {
+    loading.value = false
+  })
+}
+onMounted(() => {
+  fetchData()
+})
 </script>
 
 <template>
@@ -37,26 +86,22 @@
     <template #search>
       <div class="search">
         <el-button
-          :class="listQuery.type === 'day' ? 'active' : ''" round size="small"
-          @click="selectTimeType('day')"
-        >
-          今日
-        </el-button>
-        <el-button
-          :class="listQuery.type === 'week' ? 'active' : ''" round size="small"
-          @click="selectTimeType('week')"
+          :class="listQuery.timeType === '2' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+          @click="selectTimeType('2')"
         >
           本周
         </el-button>
         <el-button
-          :class="listQuery.type === 'month' ? 'active' : ''" round size="small"
-          @click="selectTimeType('month')"
+          :class="listQuery.timeType === '3' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+          @click="selectTimeType('3')"
         >
           本月
         </el-button>
-        <el-select v-model="listQuery.keywords" placeholder="全部类别" clearable style="width: 180px;margin: 0 5px;" />
+        <el-select v-model="listQuery.ledgerType" placeholder="全部类别" clearable style="width: 180px;margin: 0 5px;">
+          <el-option v-for="item in ledgerTypeList" :key="item.id" :label="item.name" :value="item.id" />
+        </el-select>
         <dept-select
-          v-model="listQuery.keywords" placeholder="管理单位" :clearable="true"
+          v-model="listQuery.deptid" placeholder="管理单位" :clearable="true"
           style="width: 220px;margin: 0 5px;"
         />
         <el-date-picker
@@ -64,18 +109,27 @@
           style="width: 340px;margin: 0 5px;" value-format="YYYY-MM-DD HH:mm:ss" range-separator="至"
           start-placeholder="报警开始时间" end-placeholder="报警结束时间" clearable
         />
-        <el-button type="primary" style="margin: 0 5px;">
+        <el-button type="primary" style="margin: 0 5px;" @click="fetchData">
           搜索
         </el-button>
       </div>
     </template>
     <template #content>
-      <div class="alarm-count">
+      <div v-loading="loading" class="alarm-count">
         <div class="bar">
           <bar-chart-vertical
+            v-show="xAxisData.length"
             :x-axis-data="xAxisData" :bar-coner="0" :data="data" :colors="[]" :bar-width="15"
             :legend="{ itemWidth: 8, itemHeight: 8, type: 'scroll', orient: 'horizontal', icon: 'roundRect', right: '0', top: '10' }"
+            :grid="{
+              top: 50,
+              left: 30,
+              right: 30,
+              bottom: 20,
+              containLabel: true, // 是否包含坐标轴的刻度标签
+            }"
           />
+          <el-empty v-show="!xAxisData.length" description="暂无数据" />
         </div>
         <div class="table">
           <el-table border :data="list" stripe style="width: 100%;" :height="440">
@@ -110,8 +164,9 @@
   }
 
   .table {
-    width: 40%;
+    width: 38%;
     padding: 10px;
+    margin-left: 20px;
   }
 }
 </style>
diff --git a/src/views/home/alarm/count/components/deptCount.vue b/src/views/home/alarm/count/components/deptCount.vue
index 1579231..1ca5482 100644
--- a/src/views/home/alarm/count/components/deptCount.vue
+++ b/src/views/home/alarm/count/components/deptCount.vue
@@ -122,8 +122,9 @@
   }
 
   .table {
-    width: 40%;
+    width: 38%;
     padding: 10px;
+    margin-left: 20px;
   }
 }
 </style>
diff --git a/src/views/home/alarm/count/components/overallAlarm.vue b/src/views/home/alarm/count/components/overallAlarm.vue
index f14ee15..476add8 100644
--- a/src/views/home/alarm/count/components/overallAlarm.vue
+++ b/src/views/home/alarm/count/components/overallAlarm.vue
@@ -5,39 +5,64 @@
  -->
 <script lang="ts" setup name="AlarmCount">
 import layout from './layout.vue'
+import { getOverallAlarm } from '@/api/home/alarm/count'
 const alarmData = ref<any[]>([
   {
     name: '正在报警',
-    value: '7',
+    value: '0',
     unit: '个',
+    type: '1',
   },
   {
     name: '今日报警',
-    value: '2',
+    value: '0',
     unit: '个',
+    type: '2',
   },
   {
     name: '本周报警',
-    value: '12',
+    value: '0',
     unit: '个',
+    type: '3',
   },
   {
     name: '本月报警',
-    value: '25',
+    value: '0',
     unit: '个',
+    type: '4',
   },
   {
     name: '全年报警',
-    value: '208',
+    value: '0',
     unit: '个',
+    type: '5',
   },
 ])
+const loading = ref(true)
+const fetchData = () => {
+  loading.value = true
+  getOverallAlarm().then((res) => {
+    const data = res.data
+    data.forEach((item: any) => {
+      const cindex = alarmData.value.findIndex((citem: any) => citem.type === item.type)
+      if (cindex !== -1) {
+        alarmData.value[cindex].value = item.sum
+      }
+    })
+    loading.value = false
+  }).catch(() => {
+    loading.value = false
+  })
+}
+onMounted(() => {
+  fetchData()
+})
 </script>
 
 <template>
   <layout title="报警总体情况">
     <template #content>
-      <div class="alarm-container">
+      <div v-loading="loading" class="alarm-container">
         <div v-for="item in alarmData" :key="item.name" class="alarm-item">
           <div class="top">
             {{ item.name }}
@@ -63,18 +88,26 @@
     border-left: 4px solid #f24d4d;
     width: 18%;
     padding: 10px;
+    padding-top: 15px;
+    padding-bottom: 15px;
 
     .top {
       padding-left: 10px;
+      font-size: 22px;
+      font-weight: 700;
     }
 
     .bottom {
       text-align: center;
 
       .value {
-        font-size: 18px;
+        font-size: 22px;
         font-weight: 700;
       }
+
+      .unit {
+        font-size: 20px;
+      }
     }
   }
 }
diff --git a/src/views/home/alarm/count/components/trendAnalysis.vue b/src/views/home/alarm/count/components/trendAnalysis.vue
index cea2495..73e18b0 100644
--- a/src/views/home/alarm/count/components/trendAnalysis.vue
+++ b/src/views/home/alarm/count/components/trendAnalysis.vue
@@ -131,8 +131,9 @@
   }
 
   .table {
-    width: 40%;
+    width: 38%;
     padding: 10px;
+    margin-left: 20px;
   }
 }
 </style>
diff --git a/src/views/home/device/device/index.vue b/src/views/home/device/device/index.vue
index 55f12a9..df2cf32 100644
--- a/src/views/home/device/device/index.vue
+++ b/src/views/home/device/device/index.vue
@@ -13,6 +13,7 @@
 import { exportFile } from '@/utils/exportUtils'
 const $router = useRouter()
 const useStatusList = ref<{ id: string; name: string; value: string }[]>([]) // 设备在用情况
+const deviceTypeList = ref<{ id: string; name: string; value: string }[]>([]) // 设备类型
 // 表格数据
 const list = ref<any[]>([])
 const total = ref(0)
@@ -20,18 +21,18 @@
 const columns = ref<any>([
   { text: '状态', value: 'onlineState', align: 'center', isCustom: true, width: '55' },
   { text: '设备编号', value: 'devcode', align: 'center', isRequired: true },
-  { text: '设备类型', value: 'deviceType', align: 'center', isRequired: true },
-  { text: '监测对象', value: 'watchObject', align: 'center' },
+  { text: '设备类型', value: 'deviceTypeName', align: 'center', isRequired: true },
+  { text: '监测对象', value: 'watchObject', align: 'center', width: '85' },
   { text: '设备型号', value: 'deviceModel', align: 'center' },
   { text: '厂商', value: 'manufactureName', align: 'center', isRequired: true },
-  { text: '安装位号', value: 'tagNumber', align: 'center', isRequired: true },
+  { text: '安装位号', value: 'tagNumber', align: 'center', isRequired: true, width: '110' },
   { text: '详细位置', value: 'position', align: 'center', isRequired: true },
   { text: '管理单位', value: 'deptName', align: 'center', isRequired: true },
-  { text: '在用情况', value: 'validName', align: 'center', isRequired: true },
+  { text: '在用情况', value: 'validName', align: 'center', isRequired: true, width: '85' },
   // { text: '布防状态', value: '', align: 'center', isRequired: true },
-  { text: '电量', value: 'cell', align: 'center', isRequired: true },
-  { text: '最新上报时间', value: 'logtime', align: 'center', isRequired: true },
-  { text: '安装日期', value: 'installDate', align: 'center', isRequired: true },
+  { text: '电量', value: 'cell', align: 'center', isRequired: true, width: '70' },
+  { text: '最新上报时间', value: 'logtime', align: 'center', isRequired: true, width: '180' },
+  { text: '安装日期', value: 'installDate', align: 'center', isRequired: true, width: '180' },
 ])
 // 最终展示列
 const columnsConfig = ref([])
@@ -75,6 +76,7 @@
     list.value = res.data.rows.map((item: any) => ({
       ...item,
       validName: useStatusList.value.length ? useStatusList.value[useStatusList.value.findIndex(citem => item.valid === citem.value)].name : '',
+      deviceTypeName: deviceTypeList.value.length ? deviceTypeList.value[deviceTypeList.value.findIndex(citem => item.deviceType === citem.value)].name : '',
     }))
     total.value = res.data.total
     loadingTable.value = false
@@ -178,7 +180,7 @@
   ElMessage.warning('敬请期待')
 }
 const isUsed = ref<{ id: string; name: string; value: string }[]>([]) // 是否启用
-const deviceTypeList = ref<{ id: string; name: string; value: string }[]>([]) // 设备类型
+
 const manufacturerList = ref<{ id: string; name: string; value: string }[]>([]) // 厂商列表
 const cellList = ref<{ id: string; name: string; value: string }[]>([]) // 厂商列表
 
@@ -217,6 +219,12 @@
   // 设备类型
   getDeviceTypeListPage({ limit: 9999, offset: 1 }).then((res) => {
     deviceTypeList.value = res.data.rows.map((item: any) => ({ id: item.id, name: item.typeName, value: item.id }))
+    if (list.value.length) {
+      list.value = list.value.map((item: any) => ({
+        ...item,
+        deviceTypeName: deviceTypeList.value.length ? deviceTypeList.value[deviceTypeList.value.findIndex(citem => item.deviceType === citem.value)].name : '',
+      }))
+    }
   })
   // 厂商
   getManufacturerListPage().then((res) => {
diff --git a/src/views/home/pipeline/components/detailInfoDialog.vue b/src/views/home/pipeline/components/detailInfoDialog.vue
index 31f5635..1662e6e 100644
--- a/src/views/home/pipeline/components/detailInfoDialog.vue
+++ b/src/views/home/pipeline/components/detailInfoDialog.vue
@@ -123,44 +123,39 @@
       <span class="close" @click="close">x</span>
     </div>
     <div class="body">
-      <el-descriptions v-loading="loading" :column="2" border>
-        <el-descriptions-item v-for="item in descriptionsList" :key="item.text" :align="item.align">
-          <template #label>
-            <span class="label">
-              {{ item.text }}
-            </span>
-          </template>
-          {{ detailInfo[item.value] || '' }}
-        </el-descriptions-item>
-      </el-descriptions>
+      <div class="descriptions">
+        <div v-for="item in descriptionsList" :key="item.text" class="descriptions-item">
+          <div class="label">
+            {{ item.text }}
+          </div>
+          <div class="value" :title="detailInfo[item.value] || ''">
+            {{ detailInfo[item.value] || '' }}
+          </div>
+        </div>
+      </div>
     </div>
   </div>
 </template>
 
 <style lang="scss" scoped>
-::v-deep(.el-descriptions__label) {
-  width: 20%;
-}
-
-::v-deep(.el-descriptions__cell) {
-  padding: 0 !important;
-}
-
 .container {
-  // width: 500px;
-  // padding: 0 10px;
-  background: rgba($color: #feffff, $alpha: 95%);
-  border: 1.5px solid #79b5e6;
+  width: 600px;
+  background: #fff;
   position: relative;
+  border-radius: 8px;
+  border: 1px solid #e4e7ed;
+  overflow: hidden;
+  box-shadow: 0 0 12px rgb(0 0 0 / 12%);
 
   .header {
     float: right;
-    background-color: #ccc;
+    background-color: #5ea1ff;
     width: 100%;
     display: flex;
     justify-content: space-between;
     padding: 2px 10px;
     align-items: center;
+    color: #fff;
 
     .title {
       font-weight: 700;
@@ -172,7 +167,6 @@
     }
 
     .close {
-      color: #4875a0;
       font-size: 22px;
       font-weight: 700;
       text-align: right;
@@ -180,30 +174,55 @@
 
       &:hover {
         cursor: pointer;
-        color: #658eb4;
+        color: #ccc;
       }
     }
   }
 
   .body {
-    // padding: 10px;
-    // display: flex;
-    // flex-wrap: wrap;
     width: 100%;
 
-    .name {
-      width: 30%;
-    }
+    .descriptions {
+      width: 100%;
+      display: flex;
+      flex-wrap: wrap;
+      box-sizing: border-box;
+      padding: 10px 0;
 
-    .value {
-      width: 70%;
+      .descriptions-item {
+        width: 48%;
+        margin: 5px;
+        box-sizing: border-box;
+        display: flex;
+        padding: 0 5px;
+
+        .label {
+          width: 30%;
+          box-sizing: border-box;
+          padding: 0 5px;
+          font-size: 15px;
+          text-align: justify;
+          text-align-last: justify;
+        }
+
+        .value {
+          padding-left: 5px;
+          width: 68%;
+          box-sizing: border-box;
+          white-space: nowrap;
+          font-size: 14px;
+          color: #a39f9f;
+
+          /* 确保文本在一行内显示 */
+          overflow: hidden;
+
+          /* 超出容器部分隐藏 */
+          text-overflow: ellipsis;
+
+          /* 文字溢出显示省略号 */
+        }
+      }
     }
   }
 }
-
-.clearfix::after {
-  content: "";
-  display: table;
-  clear: both;
-}
 </style>
diff --git a/src/views/home/pipeline/components/map.vue b/src/views/home/pipeline/components/map.vue
index b956aa0..c7c37be 100644
--- a/src/views/home/pipeline/components/map.vue
+++ b/src/views/home/pipeline/components/map.vue
@@ -176,7 +176,10 @@
   setTimeout(() => {
     // mapRef.value.map.setZoom(14)
     // mapRef.value.map.setFitView()
-    mapRef.value.map.setCenter(data.event.data.lnglat)
+    // mapRef.value.map.setCenter(data.event.data.lnglat)
+    const center = JSON.parse(JSON.stringify(data.event.data.lnglat))
+    center[1] = Number(center[1]) + 0.0035
+    mapRef.value.map.setCenter(center)
   })
   // 关联的管线高亮
   const line = $props.pipe.filter((item: any) => item.pipeCode === data.event.data.row.pipeCode)
@@ -218,7 +221,10 @@
       info: data,
       map: mapRef.value.map,
     })
-    mapRef.value.map.setCenter(data.lnglat)
+    // mapRef.value.map.setCenter(data.lnglat)
+    const center = JSON.parse(JSON.stringify(data.lnglat))
+    center[1] = Number(center[1]) + 0.0035
+    mapRef.value.map.setCenter(center)
   })
 }
 // 重置标记点
diff --git a/src/views/home/pipeline/index.vue b/src/views/home/pipeline/index.vue
index 9ef5426..7eb2f1d 100644
--- a/src/views/home/pipeline/index.vue
+++ b/src/views/home/pipeline/index.vue
@@ -12,8 +12,9 @@
 import { getDictByCode } from '@/api/system/dict'
 // 表格标识  地图或普通
 const mapRef = ref()
-const tableFlag = ref('normal')
+const tableFlag = ref('map')
 const mapLoading = ref(true)
+const mapLoad = ref(false)
 // 表格数据
 const list = ref([])
 const total = ref(0)
@@ -58,7 +59,6 @@
 // 查询数据
 const fetchData = () => {
   loadingTable.value = true
-  mapLoading.value = true
   // 判断是否有查询条件(是地图展示20条  否地图展示所有)
   const queryList = [] as Boolean[] // 长度大于2 即为是
   for (const i in listQuery.value) {
@@ -82,13 +82,13 @@
     }
   }).catch(() => {
     loadingTable.value = false
-    if (queryList.length <= 2) {
-      mapLoading.value = false
-    }
+    mapLoading.value = false
   })
-  if (queryList.length > 2) { return }
+  if (queryList.length > 2 || mapLoad.value) { return }
+  mapLoading.value = true
   // 获取地图全部数据
   getPipelineList(listQuery.value).then((res) => {
+    mapLoad.value = true
     //  管线
     pipeData.value = res.data.map((item: any) => ({
       pipeCode: item.PIPE_CODE,
@@ -104,6 +104,7 @@
     }, 500)
   })
   getPipelineDeviceList(listQuery.value).then((res) => {
+    mapLoad.value = true
     mapList.value = res.data.map((item: { [key: string]: string }) => ({
       deviceTypeName: item.TYPE_NAME,
       tagNumber: item.TAG_NUMBER,
@@ -126,6 +127,7 @@
 }
 // 重置查询条件f
 const reset = () => {
+  mapLoad.value = false
   listQuery.value = {
     limit: 20,
     offset: 1,
@@ -239,6 +241,19 @@
     },
   })
 }
+// 表格高度
+const tableHeight = ref(window.innerHeight - 60 - 50 - 10 - 350 - 98 - 10 - 52 - 52 - 10)
+window.addEventListener('resize', () => {
+  tableHeight.value = window.innerHeight - 60 - 50 - 10 - 350 - 98 - 10 - 52 - 52 - 10
+})
+watch(() => tableFlag.value, (newVal) => {
+  if (newVal === 'map') {
+    tableHeight.value = window.innerHeight - 60 - 50 - 10 - 350 - 98 - 10 - 52 - 52 - 10
+  }
+  else if (newVal === 'normal') {
+    tableHeight.value = window.innerHeight - 60 - 50 - 10 - 98 - 10 - 52 - 52 - 10
+  }
+})
 </script>
 
 <template>
@@ -247,11 +262,9 @@
     <edit-dialog ref="editRef" @refresh="fetchData" />
     <!-- 地图 -->
     <map-com
-      v-if="tableFlag === 'map'" ref="mapRef" v-loading="mapLoading" class="map" :height="450" :data="mapList"
+      v-if="tableFlag === 'map'" ref="mapRef" v-loading="mapLoading" :height="350" :data="mapList"
       :pipe="pipeData"
     />
-    <!-- 占位-地图 -->
-    <div v-if="tableFlag === 'map'" style="height: 450px;" />
     <!-- 收起地图-图标 -->
     <div v-if="tableFlag === 'map'" class="icon" @click="switchMode('normal')">
       <el-icon :size="25">
@@ -260,7 +273,7 @@
     </div>
     <!-- 筛选条件 -->
     <search-area
-      :class="`${tableFlag === 'map' ? 'search-area' : ''}`" :need-clear="true" @search="fetchData"
+      :need-clear="true" @search="fetchData"
       @clear="reset"
     >
       <search-item>
@@ -319,8 +332,6 @@
         </el-select>
       </search-item>
     </search-area>
-    <!-- 筛选条件-地图 -->
-    <div v-if="tableFlag === 'map'" style="height: 114px;" />
     <!-- 表头标题 -->
     <table-container
       :is-config="true" config-title="pipeline-monitor" :columns="columns"
@@ -344,7 +355,7 @@
       </template>
       <!-- 查询结果Table显示 -->
       <normal-table
-        :data="list" :total="total" :columns="columnsConfig" :query="listQuery" :list-loading="loadingTable"
+        :data="list" :total="total" :columns="columnsConfig" :query="listQuery" :list-loading="loadingTable" :height="tableHeight"
         @change="changePage" @rowDbClick="rowClick"
       >
         <template #preColumns>
@@ -382,7 +393,7 @@
 
   .icon {
     position: fixed;
-    top: 550px;
+    top: 450px;
     left: 50%;
     // transform: translateX(-50%);
     z-index: 901;

diff --git a/src/api/home/alarm/count.ts b/src/api/home/alarm/count.ts
new file mode 100644
index 0000000..1f4b59a
--- /dev/null
+++ b/src/api/home/alarm/count.ts
@@ -0,0 +1,36 @@
+/**
+ * 报警统计
+ */
+import request from '@/api/index'
+
+// 报警总体情况
+export function getOverallAlarm() {
+  return request({
+    url: '/statics/alarmRecords/overall',
+    method: 'post',
+  })
+}
+// 各类报警统计
+export function getAlarmType(data: any) {
+  return request({
+    url: '/statics/alarmRecords/alarmType',
+    method: 'post',
+    data,
+  })
+}
+// 各单位报警统计
+export function getAlarmCompany(data: any) {
+  return request({
+    url: '/statics/alarmRecords/alarmCompany',
+    method: 'post',
+    data,
+  })
+}
+// 异常位置分析
+export function getAlarmPosition(data: any) {
+  return request({
+    url: '/statics/alarmRecords/alarmPosition',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/views/home/alarm/count/components/alarmStatistics.vue b/src/views/home/alarm/count/components/alarmStatistics.vue
index b009891..b088de2 100644
--- a/src/views/home/alarm/count/components/alarmStatistics.vue
+++ b/src/views/home/alarm/count/components/alarmStatistics.vue
@@ -5,30 +5,79 @@
  -->
 <script lang="ts" setup name="AlarmCount">
 import layout from './layout.vue'
+import { getAlarmType } from '@/api/home/alarm/count'
 const listQuery = ref({
-  type: 'day',
+  timeType: '2',
+  ledgerType: '',
+  deptid: '',
+  begTime: '',
+  endTime: '',
 })
 const selectTimeType = (type: string) => {
-  listQuery.value.type = type
+  listQuery.value.timeType = type
 }
+// 类别
+const ledgerTypeList = ref<{ id: string; name: string; value: string }[]>([
+  {
+    name: '闸井',
+    id: '1',
+    value: '1',
+  },
+  {
+    name: '场站',
+    id: '2',
+    value: '2',
+  },
+  {
+    name: '管线',
+    id: '3',
+    value: '3',
+  },
+])
 const xAxisData = ref([])
 const data = ref([])
 const list = ref([])
-setTimeout(() => {
-  xAxisData.value = [
-    '闸井浓度超限', '场站浓度超限', '场站火焰报警', '疑似第三方破坏', '场站烟雾报警',
-  ]
-  data.value = [
-    {
-      name: '报警数量',
-      data: [1, 3, 5, 1, 4],
-    },
-  ]
-  list.value = xAxisData.value.map((item, index) => ({
-    alarmType: item,
-    value: data.value[0].data[index],
-  }))
-}, 1000)
+const loading = ref(true)
+// 开始结束时间
+const datetimerange = ref()
+// 默认当天
+watch(() => datetimerange.value, (newVal) => {
+  listQuery.value.begTime = ''
+  listQuery.value.endTime = ''
+  if (Array.isArray(newVal)) {
+    if (newVal.length) {
+      listQuery.value.begTime = `${newVal[0]}`
+      listQuery.value.endTime = `${newVal[1]}`
+    }
+  }
+})
+// setTimeout(() => {
+//   xAxisData.value = [
+//     '闸井浓度超限', '场站浓度超限', '场站火焰报警', '疑似第三方破坏', '场站烟雾报警',
+//   ]
+//   data.value = [
+//     {
+//       name: '报警数量',
+//       data: [1, 3, 5, 1, 4],
+//     },
+//   ]
+//   list.value = xAxisData.value.map((item, index) => ({
+//     alarmType: item,
+//     value: data.value[0].data[index],
+//   }))
+// }, 1000)
+const fetchData = () => {
+  loading.value = true
+  getAlarmType(listQuery.value).then((res) => {
+    console.log(res.data, '各类报警统计')
+    loading.value = false
+  }).catch(() => {
+    loading.value = false
+  })
+}
+onMounted(() => {
+  fetchData()
+})
 </script>
 
 <template>
@@ -37,26 +86,22 @@
     <template #search>
       <div class="search">
         <el-button
-          :class="listQuery.type === 'day' ? 'active' : ''" round size="small"
-          @click="selectTimeType('day')"
-        >
-          今日
-        </el-button>
-        <el-button
-          :class="listQuery.type === 'week' ? 'active' : ''" round size="small"
-          @click="selectTimeType('week')"
+          :class="listQuery.timeType === '2' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+          @click="selectTimeType('2')"
         >
           本周
         </el-button>
         <el-button
-          :class="listQuery.type === 'month' ? 'active' : ''" round size="small"
-          @click="selectTimeType('month')"
+          :class="listQuery.timeType === '3' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+          @click="selectTimeType('3')"
         >
           本月
         </el-button>
-        <el-select v-model="listQuery.keywords" placeholder="全部类别" clearable style="width: 180px;margin: 0 5px;" />
+        <el-select v-model="listQuery.ledgerType" placeholder="全部类别" clearable style="width: 180px;margin: 0 5px;">
+          <el-option v-for="item in ledgerTypeList" :key="item.id" :label="item.name" :value="item.id" />
+        </el-select>
         <dept-select
-          v-model="listQuery.keywords" placeholder="管理单位" :clearable="true"
+          v-model="listQuery.deptid" placeholder="管理单位" :clearable="true"
           style="width: 220px;margin: 0 5px;"
         />
         <el-date-picker
@@ -64,18 +109,27 @@
           style="width: 340px;margin: 0 5px;" value-format="YYYY-MM-DD HH:mm:ss" range-separator="至"
           start-placeholder="报警开始时间" end-placeholder="报警结束时间" clearable
         />
-        <el-button type="primary" style="margin: 0 5px;">
+        <el-button type="primary" style="margin: 0 5px;" @click="fetchData">
           搜索
         </el-button>
       </div>
     </template>
     <template #content>
-      <div class="alarm-count">
+      <div v-loading="loading" class="alarm-count">
         <div class="bar">
           <bar-chart-vertical
+            v-show="xAxisData.length"
             :x-axis-data="xAxisData" :bar-coner="0" :data="data" :colors="[]" :bar-width="15"
             :legend="{ itemWidth: 8, itemHeight: 8, type: 'scroll', orient: 'horizontal', icon: 'roundRect', right: '0', top: '10' }"
+            :grid="{
+              top: 50,
+              left: 30,
+              right: 30,
+              bottom: 20,
+              containLabel: true, // 是否包含坐标轴的刻度标签
+            }"
           />
+          <el-empty v-show="!xAxisData.length" description="暂无数据" />
         </div>
         <div class="table">
           <el-table border :data="list" stripe style="width: 100%;" :height="440">
@@ -110,8 +164,9 @@
   }
 
   .table {
-    width: 40%;
+    width: 38%;
     padding: 10px;
+    margin-left: 20px;
   }
 }
 </style>
diff --git a/src/views/home/alarm/count/components/deptCount.vue b/src/views/home/alarm/count/components/deptCount.vue
index 1579231..1ca5482 100644
--- a/src/views/home/alarm/count/components/deptCount.vue
+++ b/src/views/home/alarm/count/components/deptCount.vue
@@ -122,8 +122,9 @@
   }
 
   .table {
-    width: 40%;
+    width: 38%;
     padding: 10px;
+    margin-left: 20px;
   }
 }
 </style>
diff --git a/src/views/home/alarm/count/components/overallAlarm.vue b/src/views/home/alarm/count/components/overallAlarm.vue
index f14ee15..476add8 100644
--- a/src/views/home/alarm/count/components/overallAlarm.vue
+++ b/src/views/home/alarm/count/components/overallAlarm.vue
@@ -5,39 +5,64 @@
  -->
 <script lang="ts" setup name="AlarmCount">
 import layout from './layout.vue'
+import { getOverallAlarm } from '@/api/home/alarm/count'
 const alarmData = ref<any[]>([
   {
     name: '正在报警',
-    value: '7',
+    value: '0',
     unit: '个',
+    type: '1',
   },
   {
     name: '今日报警',
-    value: '2',
+    value: '0',
     unit: '个',
+    type: '2',
   },
   {
     name: '本周报警',
-    value: '12',
+    value: '0',
     unit: '个',
+    type: '3',
   },
   {
     name: '本月报警',
-    value: '25',
+    value: '0',
     unit: '个',
+    type: '4',
   },
   {
     name: '全年报警',
-    value: '208',
+    value: '0',
     unit: '个',
+    type: '5',
   },
 ])
+const loading = ref(true)
+const fetchData = () => {
+  loading.value = true
+  getOverallAlarm().then((res) => {
+    const data = res.data
+    data.forEach((item: any) => {
+      const cindex = alarmData.value.findIndex((citem: any) => citem.type === item.type)
+      if (cindex !== -1) {
+        alarmData.value[cindex].value = item.sum
+      }
+    })
+    loading.value = false
+  }).catch(() => {
+    loading.value = false
+  })
+}
+onMounted(() => {
+  fetchData()
+})
 </script>
 
 <template>
   <layout title="报警总体情况">
     <template #content>
-      <div class="alarm-container">
+      <div v-loading="loading" class="alarm-container">
         <div v-for="item in alarmData" :key="item.name" class="alarm-item">
           <div class="top">
             {{ item.name }}
@@ -63,18 +88,26 @@
     border-left: 4px solid #f24d4d;
     width: 18%;
     padding: 10px;
+    padding-top: 15px;
+    padding-bottom: 15px;
 
     .top {
       padding-left: 10px;
+      font-size: 22px;
+      font-weight: 700;
     }
 
     .bottom {
       text-align: center;
 
       .value {
-        font-size: 18px;
+        font-size: 22px;
         font-weight: 700;
       }
+
+      .unit {
+        font-size: 20px;
+      }
     }
   }
 }
diff --git a/src/views/home/alarm/count/components/trendAnalysis.vue b/src/views/home/alarm/count/components/trendAnalysis.vue
index cea2495..73e18b0 100644
--- a/src/views/home/alarm/count/components/trendAnalysis.vue
+++ b/src/views/home/alarm/count/components/trendAnalysis.vue
@@ -131,8 +131,9 @@
   }
 
   .table {
-    width: 40%;
+    width: 38%;
     padding: 10px;
+    margin-left: 20px;
   }
 }
 </style>
diff --git a/src/views/home/device/device/index.vue b/src/views/home/device/device/index.vue
index 55f12a9..df2cf32 100644
--- a/src/views/home/device/device/index.vue
+++ b/src/views/home/device/device/index.vue
@@ -13,6 +13,7 @@
 import { exportFile } from '@/utils/exportUtils'
 const $router = useRouter()
 const useStatusList = ref<{ id: string; name: string; value: string }[]>([]) // 设备在用情况
+const deviceTypeList = ref<{ id: string; name: string; value: string }[]>([]) // 设备类型
 // 表格数据
 const list = ref<any[]>([])
 const total = ref(0)
@@ -20,18 +21,18 @@
 const columns = ref<any>([
   { text: '状态', value: 'onlineState', align: 'center', isCustom: true, width: '55' },
   { text: '设备编号', value: 'devcode', align: 'center', isRequired: true },
-  { text: '设备类型', value: 'deviceType', align: 'center', isRequired: true },
-  { text: '监测对象', value: 'watchObject', align: 'center' },
+  { text: '设备类型', value: 'deviceTypeName', align: 'center', isRequired: true },
+  { text: '监测对象', value: 'watchObject', align: 'center', width: '85' },
   { text: '设备型号', value: 'deviceModel', align: 'center' },
   { text: '厂商', value: 'manufactureName', align: 'center', isRequired: true },
-  { text: '安装位号', value: 'tagNumber', align: 'center', isRequired: true },
+  { text: '安装位号', value: 'tagNumber', align: 'center', isRequired: true, width: '110' },
   { text: '详细位置', value: 'position', align: 'center', isRequired: true },
   { text: '管理单位', value: 'deptName', align: 'center', isRequired: true },
-  { text: '在用情况', value: 'validName', align: 'center', isRequired: true },
+  { text: '在用情况', value: 'validName', align: 'center', isRequired: true, width: '85' },
   // { text: '布防状态', value: '', align: 'center', isRequired: true },
-  { text: '电量', value: 'cell', align: 'center', isRequired: true },
-  { text: '最新上报时间', value: 'logtime', align: 'center', isRequired: true },
-  { text: '安装日期', value: 'installDate', align: 'center', isRequired: true },
+  { text: '电量', value: 'cell', align: 'center', isRequired: true, width: '70' },
+  { text: '最新上报时间', value: 'logtime', align: 'center', isRequired: true, width: '180' },
+  { text: '安装日期', value: 'installDate', align: 'center', isRequired: true, width: '180' },
 ])
 // 最终展示列
 const columnsConfig = ref([])
@@ -75,6 +76,7 @@
     list.value = res.data.rows.map((item: any) => ({
       ...item,
       validName: useStatusList.value.length ? useStatusList.value[useStatusList.value.findIndex(citem => item.valid === citem.value)].name : '',
+      deviceTypeName: deviceTypeList.value.length ? deviceTypeList.value[deviceTypeList.value.findIndex(citem => item.deviceType === citem.value)].name : '',
     }))
     total.value = res.data.total
     loadingTable.value = false
@@ -178,7 +180,7 @@
   ElMessage.warning('敬请期待')
 }
 const isUsed = ref<{ id: string; name: string; value: string }[]>([]) // 是否启用
-const deviceTypeList = ref<{ id: string; name: string; value: string }[]>([]) // 设备类型
+
 const manufacturerList = ref<{ id: string; name: string; value: string }[]>([]) // 厂商列表
 const cellList = ref<{ id: string; name: string; value: string }[]>([]) // 厂商列表
 
@@ -217,6 +219,12 @@
   // 设备类型
   getDeviceTypeListPage({ limit: 9999, offset: 1 }).then((res) => {
     deviceTypeList.value = res.data.rows.map((item: any) => ({ id: item.id, name: item.typeName, value: item.id }))
+    if (list.value.length) {
+      list.value = list.value.map((item: any) => ({
+        ...item,
+        deviceTypeName: deviceTypeList.value.length ? deviceTypeList.value[deviceTypeList.value.findIndex(citem => item.deviceType === citem.value)].name : '',
+      }))
+    }
   })
   // 厂商
   getManufacturerListPage().then((res) => {
diff --git a/src/views/home/pipeline/components/detailInfoDialog.vue b/src/views/home/pipeline/components/detailInfoDialog.vue
index 31f5635..1662e6e 100644
--- a/src/views/home/pipeline/components/detailInfoDialog.vue
+++ b/src/views/home/pipeline/components/detailInfoDialog.vue
@@ -123,44 +123,39 @@
       <span class="close" @click="close">x</span>
     </div>
     <div class="body">
-      <el-descriptions v-loading="loading" :column="2" border>
-        <el-descriptions-item v-for="item in descriptionsList" :key="item.text" :align="item.align">
-          <template #label>
-            <span class="label">
-              {{ item.text }}
-            </span>
-          </template>
-          {{ detailInfo[item.value] || '' }}
-        </el-descriptions-item>
-      </el-descriptions>
+      <div class="descriptions">
+        <div v-for="item in descriptionsList" :key="item.text" class="descriptions-item">
+          <div class="label">
+            {{ item.text }}
+          </div>
+          <div class="value" :title="detailInfo[item.value] || ''">
+            {{ detailInfo[item.value] || '' }}
+          </div>
+        </div>
+      </div>
     </div>
   </div>
 </template>
 
 <style lang="scss" scoped>
-::v-deep(.el-descriptions__label) {
-  width: 20%;
-}
-
-::v-deep(.el-descriptions__cell) {
-  padding: 0 !important;
-}
-
 .container {
-  // width: 500px;
-  // padding: 0 10px;
-  background: rgba($color: #feffff, $alpha: 95%);
-  border: 1.5px solid #79b5e6;
+  width: 600px;
+  background: #fff;
   position: relative;
+  border-radius: 8px;
+  border: 1px solid #e4e7ed;
+  overflow: hidden;
+  box-shadow: 0 0 12px rgb(0 0 0 / 12%);
 
   .header {
     float: right;
-    background-color: #ccc;
+    background-color: #5ea1ff;
     width: 100%;
     display: flex;
     justify-content: space-between;
     padding: 2px 10px;
     align-items: center;
+    color: #fff;
 
     .title {
       font-weight: 700;
@@ -172,7 +167,6 @@
     }
 
     .close {
-      color: #4875a0;
       font-size: 22px;
       font-weight: 700;
       text-align: right;
@@ -180,30 +174,55 @@
 
       &:hover {
         cursor: pointer;
-        color: #658eb4;
+        color: #ccc;
       }
     }
   }
 
   .body {
-    // padding: 10px;
-    // display: flex;
-    // flex-wrap: wrap;
     width: 100%;
 
-    .name {
-      width: 30%;
-    }
+    .descriptions {
+      width: 100%;
+      display: flex;
+      flex-wrap: wrap;
+      box-sizing: border-box;
+      padding: 10px 0;
 
-    .value {
-      width: 70%;
+      .descriptions-item {
+        width: 48%;
+        margin: 5px;
+        box-sizing: border-box;
+        display: flex;
+        padding: 0 5px;
+
+        .label {
+          width: 30%;
+          box-sizing: border-box;
+          padding: 0 5px;
+          font-size: 15px;
+          text-align: justify;
+          text-align-last: justify;
+        }
+
+        .value {
+          padding-left: 5px;
+          width: 68%;
+          box-sizing: border-box;
+          white-space: nowrap;
+          font-size: 14px;
+          color: #a39f9f;
+
+          /* 确保文本在一行内显示 */
+          overflow: hidden;
+
+          /* 超出容器部分隐藏 */
+          text-overflow: ellipsis;
+
+          /* 文字溢出显示省略号 */
+        }
+      }
     }
   }
 }
-
-.clearfix::after {
-  content: "";
-  display: table;
-  clear: both;
-}
 </style>
diff --git a/src/views/home/pipeline/components/map.vue b/src/views/home/pipeline/components/map.vue
index b956aa0..c7c37be 100644
--- a/src/views/home/pipeline/components/map.vue
+++ b/src/views/home/pipeline/components/map.vue
@@ -176,7 +176,10 @@
   setTimeout(() => {
     // mapRef.value.map.setZoom(14)
     // mapRef.value.map.setFitView()
-    mapRef.value.map.setCenter(data.event.data.lnglat)
+    // mapRef.value.map.setCenter(data.event.data.lnglat)
+    const center = JSON.parse(JSON.stringify(data.event.data.lnglat))
+    center[1] = Number(center[1]) + 0.0035
+    mapRef.value.map.setCenter(center)
   })
   // 关联的管线高亮
   const line = $props.pipe.filter((item: any) => item.pipeCode === data.event.data.row.pipeCode)
@@ -218,7 +221,10 @@
       info: data,
       map: mapRef.value.map,
     })
-    mapRef.value.map.setCenter(data.lnglat)
+    // mapRef.value.map.setCenter(data.lnglat)
+    const center = JSON.parse(JSON.stringify(data.lnglat))
+    center[1] = Number(center[1]) + 0.0035
+    mapRef.value.map.setCenter(center)
   })
 }
 // 重置标记点
diff --git a/src/views/home/pipeline/index.vue b/src/views/home/pipeline/index.vue
index 9ef5426..7eb2f1d 100644
--- a/src/views/home/pipeline/index.vue
+++ b/src/views/home/pipeline/index.vue
@@ -12,8 +12,9 @@
 import { getDictByCode } from '@/api/system/dict'
 // 表格标识  地图或普通
 const mapRef = ref()
-const tableFlag = ref('normal')
+const tableFlag = ref('map')
 const mapLoading = ref(true)
+const mapLoad = ref(false)
 // 表格数据
 const list = ref([])
 const total = ref(0)
@@ -58,7 +59,6 @@
 // 查询数据
 const fetchData = () => {
   loadingTable.value = true
-  mapLoading.value = true
   // 判断是否有查询条件(是地图展示20条  否地图展示所有)
   const queryList = [] as Boolean[] // 长度大于2 即为是
   for (const i in listQuery.value) {
@@ -82,13 +82,13 @@
     }
   }).catch(() => {
     loadingTable.value = false
-    if (queryList.length <= 2) {
-      mapLoading.value = false
-    }
+    mapLoading.value = false
   })
-  if (queryList.length > 2) { return }
+  if (queryList.length > 2 || mapLoad.value) { return }
+  mapLoading.value = true
   // 获取地图全部数据
   getPipelineList(listQuery.value).then((res) => {
+    mapLoad.value = true
     //  管线
     pipeData.value = res.data.map((item: any) => ({
       pipeCode: item.PIPE_CODE,
@@ -104,6 +104,7 @@
     }, 500)
   })
   getPipelineDeviceList(listQuery.value).then((res) => {
+    mapLoad.value = true
     mapList.value = res.data.map((item: { [key: string]: string }) => ({
       deviceTypeName: item.TYPE_NAME,
       tagNumber: item.TAG_NUMBER,
@@ -126,6 +127,7 @@
 }
 // 重置查询条件f
 const reset = () => {
+  mapLoad.value = false
   listQuery.value = {
     limit: 20,
     offset: 1,
@@ -239,6 +241,19 @@
     },
   })
 }
+// 表格高度
+const tableHeight = ref(window.innerHeight - 60 - 50 - 10 - 350 - 98 - 10 - 52 - 52 - 10)
+window.addEventListener('resize', () => {
+  tableHeight.value = window.innerHeight - 60 - 50 - 10 - 350 - 98 - 10 - 52 - 52 - 10
+})
+watch(() => tableFlag.value, (newVal) => {
+  if (newVal === 'map') {
+    tableHeight.value = window.innerHeight - 60 - 50 - 10 - 350 - 98 - 10 - 52 - 52 - 10
+  }
+  else if (newVal === 'normal') {
+    tableHeight.value = window.innerHeight - 60 - 50 - 10 - 98 - 10 - 52 - 52 - 10
+  }
+})
 </script>
 
 <template>
@@ -247,11 +262,9 @@
     <edit-dialog ref="editRef" @refresh="fetchData" />
     <!-- 地图 -->
     <map-com
-      v-if="tableFlag === 'map'" ref="mapRef" v-loading="mapLoading" class="map" :height="450" :data="mapList"
+      v-if="tableFlag === 'map'" ref="mapRef" v-loading="mapLoading" :height="350" :data="mapList"
       :pipe="pipeData"
     />
-    <!-- 占位-地图 -->
-    <div v-if="tableFlag === 'map'" style="height: 450px;" />
     <!-- 收起地图-图标 -->
     <div v-if="tableFlag === 'map'" class="icon" @click="switchMode('normal')">
       <el-icon :size="25">
@@ -260,7 +273,7 @@
     </div>
     <!-- 筛选条件 -->
     <search-area
-      :class="`${tableFlag === 'map' ? 'search-area' : ''}`" :need-clear="true" @search="fetchData"
+      :need-clear="true" @search="fetchData"
       @clear="reset"
     >
       <search-item>
@@ -319,8 +332,6 @@
         </el-select>
       </search-item>
     </search-area>
-    <!-- 筛选条件-地图 -->
-    <div v-if="tableFlag === 'map'" style="height: 114px;" />
     <!-- 表头标题 -->
     <table-container
       :is-config="true" config-title="pipeline-monitor" :columns="columns"
@@ -344,7 +355,7 @@
       </template>
       <!-- 查询结果Table显示 -->
       <normal-table
-        :data="list" :total="total" :columns="columnsConfig" :query="listQuery" :list-loading="loadingTable"
+        :data="list" :total="total" :columns="columnsConfig" :query="listQuery" :list-loading="loadingTable" :height="tableHeight"
         @change="changePage" @rowDbClick="rowClick"
       >
         <template #preColumns>
@@ -382,7 +393,7 @@
 
   .icon {
     position: fixed;
-    top: 550px;
+    top: 450px;
     left: 50%;
     // transform: translateX(-50%);
     z-index: 901;
diff --git a/src/views/home/rule/alarm/components/alarmLevelList.vue b/src/views/home/rule/alarm/components/alarmLevelList.vue
index c1b129d..40c1e43 100644
--- a/src/views/home/rule/alarm/components/alarmLevelList.vue
+++ b/src/views/home/rule/alarm/components/alarmLevelList.vue
@@ -18,7 +18,7 @@
   { text: '报警提示方式', value: 'alarmNoteMethodName', align: 'center' },
   { text: '报警音效', value: 'isSoundName', align: 'center' },
   { text: '报警推送', value: 'isSendName', align: 'center' },
-  { text: '报警短信', value: 'isTextName', align: 'center' },
+  // { text: '报警短信', value: 'isTextName', align: 'center' },
 ])
 const loadingTable = ref(true)
 //  查询条件

diff --git a/src/api/home/alarm/count.ts b/src/api/home/alarm/count.ts
new file mode 100644
index 0000000..1f4b59a
--- /dev/null
+++ b/src/api/home/alarm/count.ts
@@ -0,0 +1,36 @@
+/**
+ * 报警统计
+ */
+import request from '@/api/index'
+
+// 报警总体情况
+export function getOverallAlarm() {
+  return request({
+    url: '/statics/alarmRecords/overall',
+    method: 'post',
+  })
+}
+// 各类报警统计
+export function getAlarmType(data: any) {
+  return request({
+    url: '/statics/alarmRecords/alarmType',
+    method: 'post',
+    data,
+  })
+}
+// 各单位报警统计
+export function getAlarmCompany(data: any) {
+  return request({
+    url: '/statics/alarmRecords/alarmCompany',
+    method: 'post',
+    data,
+  })
+}
+// 异常位置分析
+export function getAlarmPosition(data: any) {
+  return request({
+    url: '/statics/alarmRecords/alarmPosition',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/views/home/alarm/count/components/alarmStatistics.vue b/src/views/home/alarm/count/components/alarmStatistics.vue
index b009891..b088de2 100644
--- a/src/views/home/alarm/count/components/alarmStatistics.vue
+++ b/src/views/home/alarm/count/components/alarmStatistics.vue
@@ -5,30 +5,79 @@
  -->
 <script lang="ts" setup name="AlarmCount">
 import layout from './layout.vue'
+import { getAlarmType } from '@/api/home/alarm/count'
 const listQuery = ref({
-  type: 'day',
+  timeType: '2',
+  ledgerType: '',
+  deptid: '',
+  begTime: '',
+  endTime: '',
 })
 const selectTimeType = (type: string) => {
-  listQuery.value.type = type
+  listQuery.value.timeType = type
 }
+// 类别
+const ledgerTypeList = ref<{ id: string; name: string; value: string }[]>([
+  {
+    name: '闸井',
+    id: '1',
+    value: '1',
+  },
+  {
+    name: '场站',
+    id: '2',
+    value: '2',
+  },
+  {
+    name: '管线',
+    id: '3',
+    value: '3',
+  },
+])
 const xAxisData = ref([])
 const data = ref([])
 const list = ref([])
-setTimeout(() => {
-  xAxisData.value = [
-    '闸井浓度超限', '场站浓度超限', '场站火焰报警', '疑似第三方破坏', '场站烟雾报警',
-  ]
-  data.value = [
-    {
-      name: '报警数量',
-      data: [1, 3, 5, 1, 4],
-    },
-  ]
-  list.value = xAxisData.value.map((item, index) => ({
-    alarmType: item,
-    value: data.value[0].data[index],
-  }))
-}, 1000)
+const loading = ref(true)
+// 开始结束时间
+const datetimerange = ref()
+// 默认当天
+watch(() => datetimerange.value, (newVal) => {
+  listQuery.value.begTime = ''
+  listQuery.value.endTime = ''
+  if (Array.isArray(newVal)) {
+    if (newVal.length) {
+      listQuery.value.begTime = `${newVal[0]}`
+      listQuery.value.endTime = `${newVal[1]}`
+    }
+  }
+})
+// setTimeout(() => {
+//   xAxisData.value = [
+//     '闸井浓度超限', '场站浓度超限', '场站火焰报警', '疑似第三方破坏', '场站烟雾报警',
+//   ]
+//   data.value = [
+//     {
+//       name: '报警数量',
+//       data: [1, 3, 5, 1, 4],
+//     },
+//   ]
+//   list.value = xAxisData.value.map((item, index) => ({
+//     alarmType: item,
+//     value: data.value[0].data[index],
+//   }))
+// }, 1000)
+const fetchData = () => {
+  loading.value = true
+  getAlarmType(listQuery.value).then((res) => {
+    console.log(res.data, '各类报警统计')
+    loading.value = false
+  }).catch(() => {
+    loading.value = false
+  })
+}
+onMounted(() => {
+  fetchData()
+})
 </script>
 
 <template>
@@ -37,26 +86,22 @@
     <template #search>
       <div class="search">
         <el-button
-          :class="listQuery.type === 'day' ? 'active' : ''" round size="small"
-          @click="selectTimeType('day')"
-        >
-          今日
-        </el-button>
-        <el-button
-          :class="listQuery.type === 'week' ? 'active' : ''" round size="small"
-          @click="selectTimeType('week')"
+          :class="listQuery.timeType === '2' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+          @click="selectTimeType('2')"
         >
           本周
         </el-button>
         <el-button
-          :class="listQuery.type === 'month' ? 'active' : ''" round size="small"
-          @click="selectTimeType('month')"
+          :class="listQuery.timeType === '3' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+          @click="selectTimeType('3')"
         >
           本月
         </el-button>
-        <el-select v-model="listQuery.keywords" placeholder="全部类别" clearable style="width: 180px;margin: 0 5px;" />
+        <el-select v-model="listQuery.ledgerType" placeholder="全部类别" clearable style="width: 180px;margin: 0 5px;">
+          <el-option v-for="item in ledgerTypeList" :key="item.id" :label="item.name" :value="item.id" />
+        </el-select>
         <dept-select
-          v-model="listQuery.keywords" placeholder="管理单位" :clearable="true"
+          v-model="listQuery.deptid" placeholder="管理单位" :clearable="true"
           style="width: 220px;margin: 0 5px;"
         />
         <el-date-picker
@@ -64,18 +109,27 @@
           style="width: 340px;margin: 0 5px;" value-format="YYYY-MM-DD HH:mm:ss" range-separator="至"
           start-placeholder="报警开始时间" end-placeholder="报警结束时间" clearable
         />
-        <el-button type="primary" style="margin: 0 5px;">
+        <el-button type="primary" style="margin: 0 5px;" @click="fetchData">
           搜索
         </el-button>
       </div>
     </template>
     <template #content>
-      <div class="alarm-count">
+      <div v-loading="loading" class="alarm-count">
         <div class="bar">
           <bar-chart-vertical
+            v-show="xAxisData.length"
             :x-axis-data="xAxisData" :bar-coner="0" :data="data" :colors="[]" :bar-width="15"
             :legend="{ itemWidth: 8, itemHeight: 8, type: 'scroll', orient: 'horizontal', icon: 'roundRect', right: '0', top: '10' }"
+            :grid="{
+              top: 50,
+              left: 30,
+              right: 30,
+              bottom: 20,
+              containLabel: true, // 是否包含坐标轴的刻度标签
+            }"
           />
+          <el-empty v-show="!xAxisData.length" description="暂无数据" />
         </div>
         <div class="table">
           <el-table border :data="list" stripe style="width: 100%;" :height="440">
@@ -110,8 +164,9 @@
   }
 
   .table {
-    width: 40%;
+    width: 38%;
     padding: 10px;
+    margin-left: 20px;
   }
 }
 </style>
diff --git a/src/views/home/alarm/count/components/deptCount.vue b/src/views/home/alarm/count/components/deptCount.vue
index 1579231..1ca5482 100644
--- a/src/views/home/alarm/count/components/deptCount.vue
+++ b/src/views/home/alarm/count/components/deptCount.vue
@@ -122,8 +122,9 @@
   }
 
   .table {
-    width: 40%;
+    width: 38%;
     padding: 10px;
+    margin-left: 20px;
   }
 }
 </style>
diff --git a/src/views/home/alarm/count/components/overallAlarm.vue b/src/views/home/alarm/count/components/overallAlarm.vue
index f14ee15..476add8 100644
--- a/src/views/home/alarm/count/components/overallAlarm.vue
+++ b/src/views/home/alarm/count/components/overallAlarm.vue
@@ -5,39 +5,64 @@
  -->
 <script lang="ts" setup name="AlarmCount">
 import layout from './layout.vue'
+import { getOverallAlarm } from '@/api/home/alarm/count'
 const alarmData = ref<any[]>([
   {
     name: '正在报警',
-    value: '7',
+    value: '0',
     unit: '个',
+    type: '1',
   },
   {
     name: '今日报警',
-    value: '2',
+    value: '0',
     unit: '个',
+    type: '2',
   },
   {
     name: '本周报警',
-    value: '12',
+    value: '0',
     unit: '个',
+    type: '3',
   },
   {
     name: '本月报警',
-    value: '25',
+    value: '0',
     unit: '个',
+    type: '4',
   },
   {
     name: '全年报警',
-    value: '208',
+    value: '0',
     unit: '个',
+    type: '5',
   },
 ])
+const loading = ref(true)
+const fetchData = () => {
+  loading.value = true
+  getOverallAlarm().then((res) => {
+    const data = res.data
+    data.forEach((item: any) => {
+      const cindex = alarmData.value.findIndex((citem: any) => citem.type === item.type)
+      if (cindex !== -1) {
+        alarmData.value[cindex].value = item.sum
+      }
+    })
+    loading.value = false
+  }).catch(() => {
+    loading.value = false
+  })
+}
+onMounted(() => {
+  fetchData()
+})
 </script>
 
 <template>
   <layout title="报警总体情况">
     <template #content>
-      <div class="alarm-container">
+      <div v-loading="loading" class="alarm-container">
         <div v-for="item in alarmData" :key="item.name" class="alarm-item">
           <div class="top">
             {{ item.name }}
@@ -63,18 +88,26 @@
     border-left: 4px solid #f24d4d;
     width: 18%;
     padding: 10px;
+    padding-top: 15px;
+    padding-bottom: 15px;
 
     .top {
       padding-left: 10px;
+      font-size: 22px;
+      font-weight: 700;
     }
 
     .bottom {
       text-align: center;
 
       .value {
-        font-size: 18px;
+        font-size: 22px;
         font-weight: 700;
       }
+
+      .unit {
+        font-size: 20px;
+      }
     }
   }
 }
diff --git a/src/views/home/alarm/count/components/trendAnalysis.vue b/src/views/home/alarm/count/components/trendAnalysis.vue
index cea2495..73e18b0 100644
--- a/src/views/home/alarm/count/components/trendAnalysis.vue
+++ b/src/views/home/alarm/count/components/trendAnalysis.vue
@@ -131,8 +131,9 @@
   }
 
   .table {
-    width: 40%;
+    width: 38%;
     padding: 10px;
+    margin-left: 20px;
   }
 }
 </style>
diff --git a/src/views/home/device/device/index.vue b/src/views/home/device/device/index.vue
index 55f12a9..df2cf32 100644
--- a/src/views/home/device/device/index.vue
+++ b/src/views/home/device/device/index.vue
@@ -13,6 +13,7 @@
 import { exportFile } from '@/utils/exportUtils'
 const $router = useRouter()
 const useStatusList = ref<{ id: string; name: string; value: string }[]>([]) // 设备在用情况
+const deviceTypeList = ref<{ id: string; name: string; value: string }[]>([]) // 设备类型
 // 表格数据
 const list = ref<any[]>([])
 const total = ref(0)
@@ -20,18 +21,18 @@
 const columns = ref<any>([
   { text: '状态', value: 'onlineState', align: 'center', isCustom: true, width: '55' },
   { text: '设备编号', value: 'devcode', align: 'center', isRequired: true },
-  { text: '设备类型', value: 'deviceType', align: 'center', isRequired: true },
-  { text: '监测对象', value: 'watchObject', align: 'center' },
+  { text: '设备类型', value: 'deviceTypeName', align: 'center', isRequired: true },
+  { text: '监测对象', value: 'watchObject', align: 'center', width: '85' },
   { text: '设备型号', value: 'deviceModel', align: 'center' },
   { text: '厂商', value: 'manufactureName', align: 'center', isRequired: true },
-  { text: '安装位号', value: 'tagNumber', align: 'center', isRequired: true },
+  { text: '安装位号', value: 'tagNumber', align: 'center', isRequired: true, width: '110' },
   { text: '详细位置', value: 'position', align: 'center', isRequired: true },
   { text: '管理单位', value: 'deptName', align: 'center', isRequired: true },
-  { text: '在用情况', value: 'validName', align: 'center', isRequired: true },
+  { text: '在用情况', value: 'validName', align: 'center', isRequired: true, width: '85' },
   // { text: '布防状态', value: '', align: 'center', isRequired: true },
-  { text: '电量', value: 'cell', align: 'center', isRequired: true },
-  { text: '最新上报时间', value: 'logtime', align: 'center', isRequired: true },
-  { text: '安装日期', value: 'installDate', align: 'center', isRequired: true },
+  { text: '电量', value: 'cell', align: 'center', isRequired: true, width: '70' },
+  { text: '最新上报时间', value: 'logtime', align: 'center', isRequired: true, width: '180' },
+  { text: '安装日期', value: 'installDate', align: 'center', isRequired: true, width: '180' },
 ])
 // 最终展示列
 const columnsConfig = ref([])
@@ -75,6 +76,7 @@
     list.value = res.data.rows.map((item: any) => ({
       ...item,
       validName: useStatusList.value.length ? useStatusList.value[useStatusList.value.findIndex(citem => item.valid === citem.value)].name : '',
+      deviceTypeName: deviceTypeList.value.length ? deviceTypeList.value[deviceTypeList.value.findIndex(citem => item.deviceType === citem.value)].name : '',
     }))
     total.value = res.data.total
     loadingTable.value = false
@@ -178,7 +180,7 @@
   ElMessage.warning('敬请期待')
 }
 const isUsed = ref<{ id: string; name: string; value: string }[]>([]) // 是否启用
-const deviceTypeList = ref<{ id: string; name: string; value: string }[]>([]) // 设备类型
+
 const manufacturerList = ref<{ id: string; name: string; value: string }[]>([]) // 厂商列表
 const cellList = ref<{ id: string; name: string; value: string }[]>([]) // 厂商列表
 
@@ -217,6 +219,12 @@
   // 设备类型
   getDeviceTypeListPage({ limit: 9999, offset: 1 }).then((res) => {
     deviceTypeList.value = res.data.rows.map((item: any) => ({ id: item.id, name: item.typeName, value: item.id }))
+    if (list.value.length) {
+      list.value = list.value.map((item: any) => ({
+        ...item,
+        deviceTypeName: deviceTypeList.value.length ? deviceTypeList.value[deviceTypeList.value.findIndex(citem => item.deviceType === citem.value)].name : '',
+      }))
+    }
   })
   // 厂商
   getManufacturerListPage().then((res) => {
diff --git a/src/views/home/pipeline/components/detailInfoDialog.vue b/src/views/home/pipeline/components/detailInfoDialog.vue
index 31f5635..1662e6e 100644
--- a/src/views/home/pipeline/components/detailInfoDialog.vue
+++ b/src/views/home/pipeline/components/detailInfoDialog.vue
@@ -123,44 +123,39 @@
       <span class="close" @click="close">x</span>
     </div>
     <div class="body">
-      <el-descriptions v-loading="loading" :column="2" border>
-        <el-descriptions-item v-for="item in descriptionsList" :key="item.text" :align="item.align">
-          <template #label>
-            <span class="label">
-              {{ item.text }}
-            </span>
-          </template>
-          {{ detailInfo[item.value] || '' }}
-        </el-descriptions-item>
-      </el-descriptions>
+      <div class="descriptions">
+        <div v-for="item in descriptionsList" :key="item.text" class="descriptions-item">
+          <div class="label">
+            {{ item.text }}
+          </div>
+          <div class="value" :title="detailInfo[item.value] || ''">
+            {{ detailInfo[item.value] || '' }}
+          </div>
+        </div>
+      </div>
     </div>
   </div>
 </template>
 
 <style lang="scss" scoped>
-::v-deep(.el-descriptions__label) {
-  width: 20%;
-}
-
-::v-deep(.el-descriptions__cell) {
-  padding: 0 !important;
-}
-
 .container {
-  // width: 500px;
-  // padding: 0 10px;
-  background: rgba($color: #feffff, $alpha: 95%);
-  border: 1.5px solid #79b5e6;
+  width: 600px;
+  background: #fff;
   position: relative;
+  border-radius: 8px;
+  border: 1px solid #e4e7ed;
+  overflow: hidden;
+  box-shadow: 0 0 12px rgb(0 0 0 / 12%);
 
   .header {
     float: right;
-    background-color: #ccc;
+    background-color: #5ea1ff;
     width: 100%;
     display: flex;
     justify-content: space-between;
     padding: 2px 10px;
     align-items: center;
+    color: #fff;
 
     .title {
       font-weight: 700;
@@ -172,7 +167,6 @@
     }
 
     .close {
-      color: #4875a0;
       font-size: 22px;
       font-weight: 700;
       text-align: right;
@@ -180,30 +174,55 @@
 
       &:hover {
         cursor: pointer;
-        color: #658eb4;
+        color: #ccc;
       }
     }
   }
 
   .body {
-    // padding: 10px;
-    // display: flex;
-    // flex-wrap: wrap;
     width: 100%;
 
-    .name {
-      width: 30%;
-    }
+    .descriptions {
+      width: 100%;
+      display: flex;
+      flex-wrap: wrap;
+      box-sizing: border-box;
+      padding: 10px 0;
 
-    .value {
-      width: 70%;
+      .descriptions-item {
+        width: 48%;
+        margin: 5px;
+        box-sizing: border-box;
+        display: flex;
+        padding: 0 5px;
+
+        .label {
+          width: 30%;
+          box-sizing: border-box;
+          padding: 0 5px;
+          font-size: 15px;
+          text-align: justify;
+          text-align-last: justify;
+        }
+
+        .value {
+          padding-left: 5px;
+          width: 68%;
+          box-sizing: border-box;
+          white-space: nowrap;
+          font-size: 14px;
+          color: #a39f9f;
+
+          /* 确保文本在一行内显示 */
+          overflow: hidden;
+
+          /* 超出容器部分隐藏 */
+          text-overflow: ellipsis;
+
+          /* 文字溢出显示省略号 */
+        }
+      }
     }
   }
 }
-
-.clearfix::after {
-  content: "";
-  display: table;
-  clear: both;
-}
 </style>
diff --git a/src/views/home/pipeline/components/map.vue b/src/views/home/pipeline/components/map.vue
index b956aa0..c7c37be 100644
--- a/src/views/home/pipeline/components/map.vue
+++ b/src/views/home/pipeline/components/map.vue
@@ -176,7 +176,10 @@
   setTimeout(() => {
     // mapRef.value.map.setZoom(14)
     // mapRef.value.map.setFitView()
-    mapRef.value.map.setCenter(data.event.data.lnglat)
+    // mapRef.value.map.setCenter(data.event.data.lnglat)
+    const center = JSON.parse(JSON.stringify(data.event.data.lnglat))
+    center[1] = Number(center[1]) + 0.0035
+    mapRef.value.map.setCenter(center)
   })
   // 关联的管线高亮
   const line = $props.pipe.filter((item: any) => item.pipeCode === data.event.data.row.pipeCode)
@@ -218,7 +221,10 @@
       info: data,
       map: mapRef.value.map,
     })
-    mapRef.value.map.setCenter(data.lnglat)
+    // mapRef.value.map.setCenter(data.lnglat)
+    const center = JSON.parse(JSON.stringify(data.lnglat))
+    center[1] = Number(center[1]) + 0.0035
+    mapRef.value.map.setCenter(center)
   })
 }
 // 重置标记点
diff --git a/src/views/home/pipeline/index.vue b/src/views/home/pipeline/index.vue
index 9ef5426..7eb2f1d 100644
--- a/src/views/home/pipeline/index.vue
+++ b/src/views/home/pipeline/index.vue
@@ -12,8 +12,9 @@
 import { getDictByCode } from '@/api/system/dict'
 // 表格标识  地图或普通
 const mapRef = ref()
-const tableFlag = ref('normal')
+const tableFlag = ref('map')
 const mapLoading = ref(true)
+const mapLoad = ref(false)
 // 表格数据
 const list = ref([])
 const total = ref(0)
@@ -58,7 +59,6 @@
 // 查询数据
 const fetchData = () => {
   loadingTable.value = true
-  mapLoading.value = true
   // 判断是否有查询条件(是地图展示20条  否地图展示所有)
   const queryList = [] as Boolean[] // 长度大于2 即为是
   for (const i in listQuery.value) {
@@ -82,13 +82,13 @@
     }
   }).catch(() => {
     loadingTable.value = false
-    if (queryList.length <= 2) {
-      mapLoading.value = false
-    }
+    mapLoading.value = false
   })
-  if (queryList.length > 2) { return }
+  if (queryList.length > 2 || mapLoad.value) { return }
+  mapLoading.value = true
   // 获取地图全部数据
   getPipelineList(listQuery.value).then((res) => {
+    mapLoad.value = true
     //  管线
     pipeData.value = res.data.map((item: any) => ({
       pipeCode: item.PIPE_CODE,
@@ -104,6 +104,7 @@
     }, 500)
   })
   getPipelineDeviceList(listQuery.value).then((res) => {
+    mapLoad.value = true
     mapList.value = res.data.map((item: { [key: string]: string }) => ({
       deviceTypeName: item.TYPE_NAME,
       tagNumber: item.TAG_NUMBER,
@@ -126,6 +127,7 @@
 }
 // 重置查询条件f
 const reset = () => {
+  mapLoad.value = false
   listQuery.value = {
     limit: 20,
     offset: 1,
@@ -239,6 +241,19 @@
     },
   })
 }
+// 表格高度
+const tableHeight = ref(window.innerHeight - 60 - 50 - 10 - 350 - 98 - 10 - 52 - 52 - 10)
+window.addEventListener('resize', () => {
+  tableHeight.value = window.innerHeight - 60 - 50 - 10 - 350 - 98 - 10 - 52 - 52 - 10
+})
+watch(() => tableFlag.value, (newVal) => {
+  if (newVal === 'map') {
+    tableHeight.value = window.innerHeight - 60 - 50 - 10 - 350 - 98 - 10 - 52 - 52 - 10
+  }
+  else if (newVal === 'normal') {
+    tableHeight.value = window.innerHeight - 60 - 50 - 10 - 98 - 10 - 52 - 52 - 10
+  }
+})
 </script>
 
 <template>
@@ -247,11 +262,9 @@
     <edit-dialog ref="editRef" @refresh="fetchData" />
     <!-- 地图 -->
     <map-com
-      v-if="tableFlag === 'map'" ref="mapRef" v-loading="mapLoading" class="map" :height="450" :data="mapList"
+      v-if="tableFlag === 'map'" ref="mapRef" v-loading="mapLoading" :height="350" :data="mapList"
       :pipe="pipeData"
     />
-    <!-- 占位-地图 -->
-    <div v-if="tableFlag === 'map'" style="height: 450px;" />
     <!-- 收起地图-图标 -->
     <div v-if="tableFlag === 'map'" class="icon" @click="switchMode('normal')">
       <el-icon :size="25">
@@ -260,7 +273,7 @@
     </div>
     <!-- 筛选条件 -->
     <search-area
-      :class="`${tableFlag === 'map' ? 'search-area' : ''}`" :need-clear="true" @search="fetchData"
+      :need-clear="true" @search="fetchData"
       @clear="reset"
     >
       <search-item>
@@ -319,8 +332,6 @@
         </el-select>
       </search-item>
     </search-area>
-    <!-- 筛选条件-地图 -->
-    <div v-if="tableFlag === 'map'" style="height: 114px;" />
     <!-- 表头标题 -->
     <table-container
       :is-config="true" config-title="pipeline-monitor" :columns="columns"
@@ -344,7 +355,7 @@
       </template>
       <!-- 查询结果Table显示 -->
       <normal-table
-        :data="list" :total="total" :columns="columnsConfig" :query="listQuery" :list-loading="loadingTable"
+        :data="list" :total="total" :columns="columnsConfig" :query="listQuery" :list-loading="loadingTable" :height="tableHeight"
         @change="changePage" @rowDbClick="rowClick"
       >
         <template #preColumns>
@@ -382,7 +393,7 @@
 
   .icon {
     position: fixed;
-    top: 550px;
+    top: 450px;
     left: 50%;
     // transform: translateX(-50%);
     z-index: 901;
diff --git a/src/views/home/rule/alarm/components/alarmLevelList.vue b/src/views/home/rule/alarm/components/alarmLevelList.vue
index c1b129d..40c1e43 100644
--- a/src/views/home/rule/alarm/components/alarmLevelList.vue
+++ b/src/views/home/rule/alarm/components/alarmLevelList.vue
@@ -18,7 +18,7 @@
   { text: '报警提示方式', value: 'alarmNoteMethodName', align: 'center' },
   { text: '报警音效', value: 'isSoundName', align: 'center' },
   { text: '报警推送', value: 'isSendName', align: 'center' },
-  { text: '报警短信', value: 'isTextName', align: 'center' },
+  // { text: '报警短信', value: 'isTextName', align: 'center' },
 ])
 const loadingTable = ref(true)
 //  查询条件
diff --git a/src/views/home/rule/alarm/components/editAlarmLevelDialog.vue b/src/views/home/rule/alarm/components/editAlarmLevelDialog.vue
index fe60451..757a42c 100644
--- a/src/views/home/rule/alarm/components/editAlarmLevelDialog.vue
+++ b/src/views/home/rule/alarm/components/editAlarmLevelDialog.vue
@@ -168,11 +168,11 @@
             <el-switch v-model="dataForm.isSend" size="large" active-text="开" inactive-text="关" active-value="1" inactive-value="0" />
           </el-form-item>
         </el-col>
-        <el-col :span="12">
+        <!-- <el-col :span="12">
           <el-form-item label="报警短信" prop="isText">
             <el-switch v-model="dataForm.isText" size="large" active-text="开" inactive-text="关" active-value="1" inactive-value="0" />
           </el-form-item>
-        </el-col>
+        </el-col> -->
       </el-row>
     </el-form>
     <template #footer>

diff --git a/src/api/home/alarm/count.ts b/src/api/home/alarm/count.ts
new file mode 100644
index 0000000..1f4b59a
--- /dev/null
+++ b/src/api/home/alarm/count.ts
@@ -0,0 +1,36 @@
+/**
+ * 报警统计
+ */
+import request from '@/api/index'
+
+// 报警总体情况
+export function getOverallAlarm() {
+  return request({
+    url: '/statics/alarmRecords/overall',
+    method: 'post',
+  })
+}
+// 各类报警统计
+export function getAlarmType(data: any) {
+  return request({
+    url: '/statics/alarmRecords/alarmType',
+    method: 'post',
+    data,
+  })
+}
+// 各单位报警统计
+export function getAlarmCompany(data: any) {
+  return request({
+    url: '/statics/alarmRecords/alarmCompany',
+    method: 'post',
+    data,
+  })
+}
+// 异常位置分析
+export function getAlarmPosition(data: any) {
+  return request({
+    url: '/statics/alarmRecords/alarmPosition',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/views/home/alarm/count/components/alarmStatistics.vue b/src/views/home/alarm/count/components/alarmStatistics.vue
index b009891..b088de2 100644
--- a/src/views/home/alarm/count/components/alarmStatistics.vue
+++ b/src/views/home/alarm/count/components/alarmStatistics.vue
@@ -5,30 +5,79 @@
  -->
 <script lang="ts" setup name="AlarmCount">
 import layout from './layout.vue'
+import { getAlarmType } from '@/api/home/alarm/count'
 const listQuery = ref({
-  type: 'day',
+  timeType: '2',
+  ledgerType: '',
+  deptid: '',
+  begTime: '',
+  endTime: '',
 })
 const selectTimeType = (type: string) => {
-  listQuery.value.type = type
+  listQuery.value.timeType = type
 }
+// 类别
+const ledgerTypeList = ref<{ id: string; name: string; value: string }[]>([
+  {
+    name: '闸井',
+    id: '1',
+    value: '1',
+  },
+  {
+    name: '场站',
+    id: '2',
+    value: '2',
+  },
+  {
+    name: '管线',
+    id: '3',
+    value: '3',
+  },
+])
 const xAxisData = ref([])
 const data = ref([])
 const list = ref([])
-setTimeout(() => {
-  xAxisData.value = [
-    '闸井浓度超限', '场站浓度超限', '场站火焰报警', '疑似第三方破坏', '场站烟雾报警',
-  ]
-  data.value = [
-    {
-      name: '报警数量',
-      data: [1, 3, 5, 1, 4],
-    },
-  ]
-  list.value = xAxisData.value.map((item, index) => ({
-    alarmType: item,
-    value: data.value[0].data[index],
-  }))
-}, 1000)
+const loading = ref(true)
+// 开始结束时间
+const datetimerange = ref()
+// 默认当天
+watch(() => datetimerange.value, (newVal) => {
+  listQuery.value.begTime = ''
+  listQuery.value.endTime = ''
+  if (Array.isArray(newVal)) {
+    if (newVal.length) {
+      listQuery.value.begTime = `${newVal[0]}`
+      listQuery.value.endTime = `${newVal[1]}`
+    }
+  }
+})
+// setTimeout(() => {
+//   xAxisData.value = [
+//     '闸井浓度超限', '场站浓度超限', '场站火焰报警', '疑似第三方破坏', '场站烟雾报警',
+//   ]
+//   data.value = [
+//     {
+//       name: '报警数量',
+//       data: [1, 3, 5, 1, 4],
+//     },
+//   ]
+//   list.value = xAxisData.value.map((item, index) => ({
+//     alarmType: item,
+//     value: data.value[0].data[index],
+//   }))
+// }, 1000)
+const fetchData = () => {
+  loading.value = true
+  getAlarmType(listQuery.value).then((res) => {
+    console.log(res.data, '各类报警统计')
+    loading.value = false
+  }).catch(() => {
+    loading.value = false
+  })
+}
+onMounted(() => {
+  fetchData()
+})
 </script>
 
 <template>
@@ -37,26 +86,22 @@
     <template #search>
       <div class="search">
         <el-button
-          :class="listQuery.type === 'day' ? 'active' : ''" round size="small"
-          @click="selectTimeType('day')"
-        >
-          今日
-        </el-button>
-        <el-button
-          :class="listQuery.type === 'week' ? 'active' : ''" round size="small"
-          @click="selectTimeType('week')"
+          :class="listQuery.timeType === '2' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+          @click="selectTimeType('2')"
         >
           本周
         </el-button>
         <el-button
-          :class="listQuery.type === 'month' ? 'active' : ''" round size="small"
-          @click="selectTimeType('month')"
+          :class="listQuery.timeType === '3' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+          @click="selectTimeType('3')"
         >
           本月
         </el-button>
-        <el-select v-model="listQuery.keywords" placeholder="全部类别" clearable style="width: 180px;margin: 0 5px;" />
+        <el-select v-model="listQuery.ledgerType" placeholder="全部类别" clearable style="width: 180px;margin: 0 5px;">
+          <el-option v-for="item in ledgerTypeList" :key="item.id" :label="item.name" :value="item.id" />
+        </el-select>
         <dept-select
-          v-model="listQuery.keywords" placeholder="管理单位" :clearable="true"
+          v-model="listQuery.deptid" placeholder="管理单位" :clearable="true"
           style="width: 220px;margin: 0 5px;"
         />
         <el-date-picker
@@ -64,18 +109,27 @@
           style="width: 340px;margin: 0 5px;" value-format="YYYY-MM-DD HH:mm:ss" range-separator="至"
           start-placeholder="报警开始时间" end-placeholder="报警结束时间" clearable
         />
-        <el-button type="primary" style="margin: 0 5px;">
+        <el-button type="primary" style="margin: 0 5px;" @click="fetchData">
           搜索
         </el-button>
       </div>
     </template>
     <template #content>
-      <div class="alarm-count">
+      <div v-loading="loading" class="alarm-count">
         <div class="bar">
           <bar-chart-vertical
+            v-show="xAxisData.length"
             :x-axis-data="xAxisData" :bar-coner="0" :data="data" :colors="[]" :bar-width="15"
             :legend="{ itemWidth: 8, itemHeight: 8, type: 'scroll', orient: 'horizontal', icon: 'roundRect', right: '0', top: '10' }"
+            :grid="{
+              top: 50,
+              left: 30,
+              right: 30,
+              bottom: 20,
+              containLabel: true, // 是否包含坐标轴的刻度标签
+            }"
           />
+          <el-empty v-show="!xAxisData.length" description="暂无数据" />
         </div>
         <div class="table">
           <el-table border :data="list" stripe style="width: 100%;" :height="440">
@@ -110,8 +164,9 @@
   }
 
   .table {
-    width: 40%;
+    width: 38%;
     padding: 10px;
+    margin-left: 20px;
   }
 }
 </style>
diff --git a/src/views/home/alarm/count/components/deptCount.vue b/src/views/home/alarm/count/components/deptCount.vue
index 1579231..1ca5482 100644
--- a/src/views/home/alarm/count/components/deptCount.vue
+++ b/src/views/home/alarm/count/components/deptCount.vue
@@ -122,8 +122,9 @@
   }
 
   .table {
-    width: 40%;
+    width: 38%;
     padding: 10px;
+    margin-left: 20px;
   }
 }
 </style>
diff --git a/src/views/home/alarm/count/components/overallAlarm.vue b/src/views/home/alarm/count/components/overallAlarm.vue
index f14ee15..476add8 100644
--- a/src/views/home/alarm/count/components/overallAlarm.vue
+++ b/src/views/home/alarm/count/components/overallAlarm.vue
@@ -5,39 +5,64 @@
  -->
 <script lang="ts" setup name="AlarmCount">
 import layout from './layout.vue'
+import { getOverallAlarm } from '@/api/home/alarm/count'
 const alarmData = ref<any[]>([
   {
     name: '正在报警',
-    value: '7',
+    value: '0',
     unit: '个',
+    type: '1',
   },
   {
     name: '今日报警',
-    value: '2',
+    value: '0',
     unit: '个',
+    type: '2',
   },
   {
     name: '本周报警',
-    value: '12',
+    value: '0',
     unit: '个',
+    type: '3',
   },
   {
     name: '本月报警',
-    value: '25',
+    value: '0',
     unit: '个',
+    type: '4',
   },
   {
     name: '全年报警',
-    value: '208',
+    value: '0',
     unit: '个',
+    type: '5',
   },
 ])
+const loading = ref(true)
+const fetchData = () => {
+  loading.value = true
+  getOverallAlarm().then((res) => {
+    const data = res.data
+    data.forEach((item: any) => {
+      const cindex = alarmData.value.findIndex((citem: any) => citem.type === item.type)
+      if (cindex !== -1) {
+        alarmData.value[cindex].value = item.sum
+      }
+    })
+    loading.value = false
+  }).catch(() => {
+    loading.value = false
+  })
+}
+onMounted(() => {
+  fetchData()
+})
 </script>
 
 <template>
   <layout title="报警总体情况">
     <template #content>
-      <div class="alarm-container">
+      <div v-loading="loading" class="alarm-container">
         <div v-for="item in alarmData" :key="item.name" class="alarm-item">
           <div class="top">
             {{ item.name }}
@@ -63,18 +88,26 @@
     border-left: 4px solid #f24d4d;
     width: 18%;
     padding: 10px;
+    padding-top: 15px;
+    padding-bottom: 15px;
 
     .top {
       padding-left: 10px;
+      font-size: 22px;
+      font-weight: 700;
     }
 
     .bottom {
       text-align: center;
 
       .value {
-        font-size: 18px;
+        font-size: 22px;
         font-weight: 700;
       }
+
+      .unit {
+        font-size: 20px;
+      }
     }
   }
 }
diff --git a/src/views/home/alarm/count/components/trendAnalysis.vue b/src/views/home/alarm/count/components/trendAnalysis.vue
index cea2495..73e18b0 100644
--- a/src/views/home/alarm/count/components/trendAnalysis.vue
+++ b/src/views/home/alarm/count/components/trendAnalysis.vue
@@ -131,8 +131,9 @@
   }
 
   .table {
-    width: 40%;
+    width: 38%;
     padding: 10px;
+    margin-left: 20px;
   }
 }
 </style>
diff --git a/src/views/home/device/device/index.vue b/src/views/home/device/device/index.vue
index 55f12a9..df2cf32 100644
--- a/src/views/home/device/device/index.vue
+++ b/src/views/home/device/device/index.vue
@@ -13,6 +13,7 @@
 import { exportFile } from '@/utils/exportUtils'
 const $router = useRouter()
 const useStatusList = ref<{ id: string; name: string; value: string }[]>([]) // 设备在用情况
+const deviceTypeList = ref<{ id: string; name: string; value: string }[]>([]) // 设备类型
 // 表格数据
 const list = ref<any[]>([])
 const total = ref(0)
@@ -20,18 +21,18 @@
 const columns = ref<any>([
   { text: '状态', value: 'onlineState', align: 'center', isCustom: true, width: '55' },
   { text: '设备编号', value: 'devcode', align: 'center', isRequired: true },
-  { text: '设备类型', value: 'deviceType', align: 'center', isRequired: true },
-  { text: '监测对象', value: 'watchObject', align: 'center' },
+  { text: '设备类型', value: 'deviceTypeName', align: 'center', isRequired: true },
+  { text: '监测对象', value: 'watchObject', align: 'center', width: '85' },
   { text: '设备型号', value: 'deviceModel', align: 'center' },
   { text: '厂商', value: 'manufactureName', align: 'center', isRequired: true },
-  { text: '安装位号', value: 'tagNumber', align: 'center', isRequired: true },
+  { text: '安装位号', value: 'tagNumber', align: 'center', isRequired: true, width: '110' },
   { text: '详细位置', value: 'position', align: 'center', isRequired: true },
   { text: '管理单位', value: 'deptName', align: 'center', isRequired: true },
-  { text: '在用情况', value: 'validName', align: 'center', isRequired: true },
+  { text: '在用情况', value: 'validName', align: 'center', isRequired: true, width: '85' },
   // { text: '布防状态', value: '', align: 'center', isRequired: true },
-  { text: '电量', value: 'cell', align: 'center', isRequired: true },
-  { text: '最新上报时间', value: 'logtime', align: 'center', isRequired: true },
-  { text: '安装日期', value: 'installDate', align: 'center', isRequired: true },
+  { text: '电量', value: 'cell', align: 'center', isRequired: true, width: '70' },
+  { text: '最新上报时间', value: 'logtime', align: 'center', isRequired: true, width: '180' },
+  { text: '安装日期', value: 'installDate', align: 'center', isRequired: true, width: '180' },
 ])
 // 最终展示列
 const columnsConfig = ref([])
@@ -75,6 +76,7 @@
     list.value = res.data.rows.map((item: any) => ({
       ...item,
       validName: useStatusList.value.length ? useStatusList.value[useStatusList.value.findIndex(citem => item.valid === citem.value)].name : '',
+      deviceTypeName: deviceTypeList.value.length ? deviceTypeList.value[deviceTypeList.value.findIndex(citem => item.deviceType === citem.value)].name : '',
     }))
     total.value = res.data.total
     loadingTable.value = false
@@ -178,7 +180,7 @@
   ElMessage.warning('敬请期待')
 }
 const isUsed = ref<{ id: string; name: string; value: string }[]>([]) // 是否启用
-const deviceTypeList = ref<{ id: string; name: string; value: string }[]>([]) // 设备类型
+
 const manufacturerList = ref<{ id: string; name: string; value: string }[]>([]) // 厂商列表
 const cellList = ref<{ id: string; name: string; value: string }[]>([]) // 厂商列表
 
@@ -217,6 +219,12 @@
   // 设备类型
   getDeviceTypeListPage({ limit: 9999, offset: 1 }).then((res) => {
     deviceTypeList.value = res.data.rows.map((item: any) => ({ id: item.id, name: item.typeName, value: item.id }))
+    if (list.value.length) {
+      list.value = list.value.map((item: any) => ({
+        ...item,
+        deviceTypeName: deviceTypeList.value.length ? deviceTypeList.value[deviceTypeList.value.findIndex(citem => item.deviceType === citem.value)].name : '',
+      }))
+    }
   })
   // 厂商
   getManufacturerListPage().then((res) => {
diff --git a/src/views/home/pipeline/components/detailInfoDialog.vue b/src/views/home/pipeline/components/detailInfoDialog.vue
index 31f5635..1662e6e 100644
--- a/src/views/home/pipeline/components/detailInfoDialog.vue
+++ b/src/views/home/pipeline/components/detailInfoDialog.vue
@@ -123,44 +123,39 @@
       <span class="close" @click="close">x</span>
     </div>
     <div class="body">
-      <el-descriptions v-loading="loading" :column="2" border>
-        <el-descriptions-item v-for="item in descriptionsList" :key="item.text" :align="item.align">
-          <template #label>
-            <span class="label">
-              {{ item.text }}
-            </span>
-          </template>
-          {{ detailInfo[item.value] || '' }}
-        </el-descriptions-item>
-      </el-descriptions>
+      <div class="descriptions">
+        <div v-for="item in descriptionsList" :key="item.text" class="descriptions-item">
+          <div class="label">
+            {{ item.text }}
+          </div>
+          <div class="value" :title="detailInfo[item.value] || ''">
+            {{ detailInfo[item.value] || '' }}
+          </div>
+        </div>
+      </div>
     </div>
   </div>
 </template>
 
 <style lang="scss" scoped>
-::v-deep(.el-descriptions__label) {
-  width: 20%;
-}
-
-::v-deep(.el-descriptions__cell) {
-  padding: 0 !important;
-}
-
 .container {
-  // width: 500px;
-  // padding: 0 10px;
-  background: rgba($color: #feffff, $alpha: 95%);
-  border: 1.5px solid #79b5e6;
+  width: 600px;
+  background: #fff;
   position: relative;
+  border-radius: 8px;
+  border: 1px solid #e4e7ed;
+  overflow: hidden;
+  box-shadow: 0 0 12px rgb(0 0 0 / 12%);
 
   .header {
     float: right;
-    background-color: #ccc;
+    background-color: #5ea1ff;
     width: 100%;
     display: flex;
     justify-content: space-between;
     padding: 2px 10px;
     align-items: center;
+    color: #fff;
 
     .title {
       font-weight: 700;
@@ -172,7 +167,6 @@
     }
 
     .close {
-      color: #4875a0;
       font-size: 22px;
       font-weight: 700;
       text-align: right;
@@ -180,30 +174,55 @@
 
       &:hover {
         cursor: pointer;
-        color: #658eb4;
+        color: #ccc;
       }
     }
   }
 
   .body {
-    // padding: 10px;
-    // display: flex;
-    // flex-wrap: wrap;
     width: 100%;
 
-    .name {
-      width: 30%;
-    }
+    .descriptions {
+      width: 100%;
+      display: flex;
+      flex-wrap: wrap;
+      box-sizing: border-box;
+      padding: 10px 0;
 
-    .value {
-      width: 70%;
+      .descriptions-item {
+        width: 48%;
+        margin: 5px;
+        box-sizing: border-box;
+        display: flex;
+        padding: 0 5px;
+
+        .label {
+          width: 30%;
+          box-sizing: border-box;
+          padding: 0 5px;
+          font-size: 15px;
+          text-align: justify;
+          text-align-last: justify;
+        }
+
+        .value {
+          padding-left: 5px;
+          width: 68%;
+          box-sizing: border-box;
+          white-space: nowrap;
+          font-size: 14px;
+          color: #a39f9f;
+
+          /* 确保文本在一行内显示 */
+          overflow: hidden;
+
+          /* 超出容器部分隐藏 */
+          text-overflow: ellipsis;
+
+          /* 文字溢出显示省略号 */
+        }
+      }
     }
   }
 }
-
-.clearfix::after {
-  content: "";
-  display: table;
-  clear: both;
-}
 </style>
diff --git a/src/views/home/pipeline/components/map.vue b/src/views/home/pipeline/components/map.vue
index b956aa0..c7c37be 100644
--- a/src/views/home/pipeline/components/map.vue
+++ b/src/views/home/pipeline/components/map.vue
@@ -176,7 +176,10 @@
   setTimeout(() => {
     // mapRef.value.map.setZoom(14)
     // mapRef.value.map.setFitView()
-    mapRef.value.map.setCenter(data.event.data.lnglat)
+    // mapRef.value.map.setCenter(data.event.data.lnglat)
+    const center = JSON.parse(JSON.stringify(data.event.data.lnglat))
+    center[1] = Number(center[1]) + 0.0035
+    mapRef.value.map.setCenter(center)
   })
   // 关联的管线高亮
   const line = $props.pipe.filter((item: any) => item.pipeCode === data.event.data.row.pipeCode)
@@ -218,7 +221,10 @@
       info: data,
       map: mapRef.value.map,
     })
-    mapRef.value.map.setCenter(data.lnglat)
+    // mapRef.value.map.setCenter(data.lnglat)
+    const center = JSON.parse(JSON.stringify(data.lnglat))
+    center[1] = Number(center[1]) + 0.0035
+    mapRef.value.map.setCenter(center)
   })
 }
 // 重置标记点
diff --git a/src/views/home/pipeline/index.vue b/src/views/home/pipeline/index.vue
index 9ef5426..7eb2f1d 100644
--- a/src/views/home/pipeline/index.vue
+++ b/src/views/home/pipeline/index.vue
@@ -12,8 +12,9 @@
 import { getDictByCode } from '@/api/system/dict'
 // 表格标识  地图或普通
 const mapRef = ref()
-const tableFlag = ref('normal')
+const tableFlag = ref('map')
 const mapLoading = ref(true)
+const mapLoad = ref(false)
 // 表格数据
 const list = ref([])
 const total = ref(0)
@@ -58,7 +59,6 @@
 // 查询数据
 const fetchData = () => {
   loadingTable.value = true
-  mapLoading.value = true
   // 判断是否有查询条件(是地图展示20条  否地图展示所有)
   const queryList = [] as Boolean[] // 长度大于2 即为是
   for (const i in listQuery.value) {
@@ -82,13 +82,13 @@
     }
   }).catch(() => {
     loadingTable.value = false
-    if (queryList.length <= 2) {
-      mapLoading.value = false
-    }
+    mapLoading.value = false
   })
-  if (queryList.length > 2) { return }
+  if (queryList.length > 2 || mapLoad.value) { return }
+  mapLoading.value = true
   // 获取地图全部数据
   getPipelineList(listQuery.value).then((res) => {
+    mapLoad.value = true
     //  管线
     pipeData.value = res.data.map((item: any) => ({
       pipeCode: item.PIPE_CODE,
@@ -104,6 +104,7 @@
     }, 500)
   })
   getPipelineDeviceList(listQuery.value).then((res) => {
+    mapLoad.value = true
     mapList.value = res.data.map((item: { [key: string]: string }) => ({
       deviceTypeName: item.TYPE_NAME,
       tagNumber: item.TAG_NUMBER,
@@ -126,6 +127,7 @@
 }
 // 重置查询条件f
 const reset = () => {
+  mapLoad.value = false
   listQuery.value = {
     limit: 20,
     offset: 1,
@@ -239,6 +241,19 @@
     },
   })
 }
+// 表格高度
+const tableHeight = ref(window.innerHeight - 60 - 50 - 10 - 350 - 98 - 10 - 52 - 52 - 10)
+window.addEventListener('resize', () => {
+  tableHeight.value = window.innerHeight - 60 - 50 - 10 - 350 - 98 - 10 - 52 - 52 - 10
+})
+watch(() => tableFlag.value, (newVal) => {
+  if (newVal === 'map') {
+    tableHeight.value = window.innerHeight - 60 - 50 - 10 - 350 - 98 - 10 - 52 - 52 - 10
+  }
+  else if (newVal === 'normal') {
+    tableHeight.value = window.innerHeight - 60 - 50 - 10 - 98 - 10 - 52 - 52 - 10
+  }
+})
 </script>
 
 <template>
@@ -247,11 +262,9 @@
     <edit-dialog ref="editRef" @refresh="fetchData" />
     <!-- 地图 -->
     <map-com
-      v-if="tableFlag === 'map'" ref="mapRef" v-loading="mapLoading" class="map" :height="450" :data="mapList"
+      v-if="tableFlag === 'map'" ref="mapRef" v-loading="mapLoading" :height="350" :data="mapList"
       :pipe="pipeData"
     />
-    <!-- 占位-地图 -->
-    <div v-if="tableFlag === 'map'" style="height: 450px;" />
     <!-- 收起地图-图标 -->
     <div v-if="tableFlag === 'map'" class="icon" @click="switchMode('normal')">
       <el-icon :size="25">
@@ -260,7 +273,7 @@
     </div>
     <!-- 筛选条件 -->
     <search-area
-      :class="`${tableFlag === 'map' ? 'search-area' : ''}`" :need-clear="true" @search="fetchData"
+      :need-clear="true" @search="fetchData"
       @clear="reset"
     >
       <search-item>
@@ -319,8 +332,6 @@
         </el-select>
       </search-item>
     </search-area>
-    <!-- 筛选条件-地图 -->
-    <div v-if="tableFlag === 'map'" style="height: 114px;" />
     <!-- 表头标题 -->
     <table-container
       :is-config="true" config-title="pipeline-monitor" :columns="columns"
@@ -344,7 +355,7 @@
       </template>
       <!-- 查询结果Table显示 -->
       <normal-table
-        :data="list" :total="total" :columns="columnsConfig" :query="listQuery" :list-loading="loadingTable"
+        :data="list" :total="total" :columns="columnsConfig" :query="listQuery" :list-loading="loadingTable" :height="tableHeight"
         @change="changePage" @rowDbClick="rowClick"
       >
         <template #preColumns>
@@ -382,7 +393,7 @@
 
   .icon {
     position: fixed;
-    top: 550px;
+    top: 450px;
     left: 50%;
     // transform: translateX(-50%);
     z-index: 901;
diff --git a/src/views/home/rule/alarm/components/alarmLevelList.vue b/src/views/home/rule/alarm/components/alarmLevelList.vue
index c1b129d..40c1e43 100644
--- a/src/views/home/rule/alarm/components/alarmLevelList.vue
+++ b/src/views/home/rule/alarm/components/alarmLevelList.vue
@@ -18,7 +18,7 @@
   { text: '报警提示方式', value: 'alarmNoteMethodName', align: 'center' },
   { text: '报警音效', value: 'isSoundName', align: 'center' },
   { text: '报警推送', value: 'isSendName', align: 'center' },
-  { text: '报警短信', value: 'isTextName', align: 'center' },
+  // { text: '报警短信', value: 'isTextName', align: 'center' },
 ])
 const loadingTable = ref(true)
 //  查询条件
diff --git a/src/views/home/rule/alarm/components/editAlarmLevelDialog.vue b/src/views/home/rule/alarm/components/editAlarmLevelDialog.vue
index fe60451..757a42c 100644
--- a/src/views/home/rule/alarm/components/editAlarmLevelDialog.vue
+++ b/src/views/home/rule/alarm/components/editAlarmLevelDialog.vue
@@ -168,11 +168,11 @@
             <el-switch v-model="dataForm.isSend" size="large" active-text="开" inactive-text="关" active-value="1" inactive-value="0" />
           </el-form-item>
         </el-col>
-        <el-col :span="12">
+        <!-- <el-col :span="12">
           <el-form-item label="报警短信" prop="isText">
             <el-switch v-model="dataForm.isText" size="large" active-text="开" inactive-text="关" active-value="1" inactive-value="0" />
           </el-form-item>
-        </el-col>
+        </el-col> -->
       </el-row>
     </el-form>
     <template #footer>
diff --git a/src/views/home/rule/alarm/components/editDialog.vue b/src/views/home/rule/alarm/components/editDialog.vue
index a8c565f..3bd2958 100644
--- a/src/views/home/rule/alarm/components/editDialog.vue
+++ b/src/views/home/rule/alarm/components/editDialog.vue
@@ -226,6 +226,9 @@
   else {
     alarmEventList.value = []
   }
+  if (newVal) {
+    dataForm.value.alarmThreshold = ''
+  }
 }, {
   deep: true,
   immediate: true,

diff --git a/src/api/home/alarm/count.ts b/src/api/home/alarm/count.ts
new file mode 100644
index 0000000..1f4b59a
--- /dev/null
+++ b/src/api/home/alarm/count.ts
@@ -0,0 +1,36 @@
+/**
+ * 报警统计
+ */
+import request from '@/api/index'
+
+// 报警总体情况
+export function getOverallAlarm() {
+  return request({
+    url: '/statics/alarmRecords/overall',
+    method: 'post',
+  })
+}
+// 各类报警统计
+export function getAlarmType(data: any) {
+  return request({
+    url: '/statics/alarmRecords/alarmType',
+    method: 'post',
+    data,
+  })
+}
+// 各单位报警统计
+export function getAlarmCompany(data: any) {
+  return request({
+    url: '/statics/alarmRecords/alarmCompany',
+    method: 'post',
+    data,
+  })
+}
+// 异常位置分析
+export function getAlarmPosition(data: any) {
+  return request({
+    url: '/statics/alarmRecords/alarmPosition',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/views/home/alarm/count/components/alarmStatistics.vue b/src/views/home/alarm/count/components/alarmStatistics.vue
index b009891..b088de2 100644
--- a/src/views/home/alarm/count/components/alarmStatistics.vue
+++ b/src/views/home/alarm/count/components/alarmStatistics.vue
@@ -5,30 +5,79 @@
  -->
 <script lang="ts" setup name="AlarmCount">
 import layout from './layout.vue'
+import { getAlarmType } from '@/api/home/alarm/count'
 const listQuery = ref({
-  type: 'day',
+  timeType: '2',
+  ledgerType: '',
+  deptid: '',
+  begTime: '',
+  endTime: '',
 })
 const selectTimeType = (type: string) => {
-  listQuery.value.type = type
+  listQuery.value.timeType = type
 }
+// 类别
+const ledgerTypeList = ref<{ id: string; name: string; value: string }[]>([
+  {
+    name: '闸井',
+    id: '1',
+    value: '1',
+  },
+  {
+    name: '场站',
+    id: '2',
+    value: '2',
+  },
+  {
+    name: '管线',
+    id: '3',
+    value: '3',
+  },
+])
 const xAxisData = ref([])
 const data = ref([])
 const list = ref([])
-setTimeout(() => {
-  xAxisData.value = [
-    '闸井浓度超限', '场站浓度超限', '场站火焰报警', '疑似第三方破坏', '场站烟雾报警',
-  ]
-  data.value = [
-    {
-      name: '报警数量',
-      data: [1, 3, 5, 1, 4],
-    },
-  ]
-  list.value = xAxisData.value.map((item, index) => ({
-    alarmType: item,
-    value: data.value[0].data[index],
-  }))
-}, 1000)
+const loading = ref(true)
+// 开始结束时间
+const datetimerange = ref()
+// 默认当天
+watch(() => datetimerange.value, (newVal) => {
+  listQuery.value.begTime = ''
+  listQuery.value.endTime = ''
+  if (Array.isArray(newVal)) {
+    if (newVal.length) {
+      listQuery.value.begTime = `${newVal[0]}`
+      listQuery.value.endTime = `${newVal[1]}`
+    }
+  }
+})
+// setTimeout(() => {
+//   xAxisData.value = [
+//     '闸井浓度超限', '场站浓度超限', '场站火焰报警', '疑似第三方破坏', '场站烟雾报警',
+//   ]
+//   data.value = [
+//     {
+//       name: '报警数量',
+//       data: [1, 3, 5, 1, 4],
+//     },
+//   ]
+//   list.value = xAxisData.value.map((item, index) => ({
+//     alarmType: item,
+//     value: data.value[0].data[index],
+//   }))
+// }, 1000)
+const fetchData = () => {
+  loading.value = true
+  getAlarmType(listQuery.value).then((res) => {
+    console.log(res.data, '各类报警统计')
+    loading.value = false
+  }).catch(() => {
+    loading.value = false
+  })
+}
+onMounted(() => {
+  fetchData()
+})
 </script>
 
 <template>
@@ -37,26 +86,22 @@
     <template #search>
       <div class="search">
         <el-button
-          :class="listQuery.type === 'day' ? 'active' : ''" round size="small"
-          @click="selectTimeType('day')"
-        >
-          今日
-        </el-button>
-        <el-button
-          :class="listQuery.type === 'week' ? 'active' : ''" round size="small"
-          @click="selectTimeType('week')"
+          :class="listQuery.timeType === '2' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+          @click="selectTimeType('2')"
         >
           本周
         </el-button>
         <el-button
-          :class="listQuery.type === 'month' ? 'active' : ''" round size="small"
-          @click="selectTimeType('month')"
+          :class="listQuery.timeType === '3' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+          @click="selectTimeType('3')"
         >
           本月
         </el-button>
-        <el-select v-model="listQuery.keywords" placeholder="全部类别" clearable style="width: 180px;margin: 0 5px;" />
+        <el-select v-model="listQuery.ledgerType" placeholder="全部类别" clearable style="width: 180px;margin: 0 5px;">
+          <el-option v-for="item in ledgerTypeList" :key="item.id" :label="item.name" :value="item.id" />
+        </el-select>
         <dept-select
-          v-model="listQuery.keywords" placeholder="管理单位" :clearable="true"
+          v-model="listQuery.deptid" placeholder="管理单位" :clearable="true"
           style="width: 220px;margin: 0 5px;"
         />
         <el-date-picker
@@ -64,18 +109,27 @@
           style="width: 340px;margin: 0 5px;" value-format="YYYY-MM-DD HH:mm:ss" range-separator="至"
           start-placeholder="报警开始时间" end-placeholder="报警结束时间" clearable
         />
-        <el-button type="primary" style="margin: 0 5px;">
+        <el-button type="primary" style="margin: 0 5px;" @click="fetchData">
           搜索
         </el-button>
       </div>
     </template>
     <template #content>
-      <div class="alarm-count">
+      <div v-loading="loading" class="alarm-count">
         <div class="bar">
           <bar-chart-vertical
+            v-show="xAxisData.length"
             :x-axis-data="xAxisData" :bar-coner="0" :data="data" :colors="[]" :bar-width="15"
             :legend="{ itemWidth: 8, itemHeight: 8, type: 'scroll', orient: 'horizontal', icon: 'roundRect', right: '0', top: '10' }"
+            :grid="{
+              top: 50,
+              left: 30,
+              right: 30,
+              bottom: 20,
+              containLabel: true, // 是否包含坐标轴的刻度标签
+            }"
           />
+          <el-empty v-show="!xAxisData.length" description="暂无数据" />
         </div>
         <div class="table">
           <el-table border :data="list" stripe style="width: 100%;" :height="440">
@@ -110,8 +164,9 @@
   }
 
   .table {
-    width: 40%;
+    width: 38%;
     padding: 10px;
+    margin-left: 20px;
   }
 }
 </style>
diff --git a/src/views/home/alarm/count/components/deptCount.vue b/src/views/home/alarm/count/components/deptCount.vue
index 1579231..1ca5482 100644
--- a/src/views/home/alarm/count/components/deptCount.vue
+++ b/src/views/home/alarm/count/components/deptCount.vue
@@ -122,8 +122,9 @@
   }
 
   .table {
-    width: 40%;
+    width: 38%;
     padding: 10px;
+    margin-left: 20px;
   }
 }
 </style>
diff --git a/src/views/home/alarm/count/components/overallAlarm.vue b/src/views/home/alarm/count/components/overallAlarm.vue
index f14ee15..476add8 100644
--- a/src/views/home/alarm/count/components/overallAlarm.vue
+++ b/src/views/home/alarm/count/components/overallAlarm.vue
@@ -5,39 +5,64 @@
  -->
 <script lang="ts" setup name="AlarmCount">
 import layout from './layout.vue'
+import { getOverallAlarm } from '@/api/home/alarm/count'
 const alarmData = ref<any[]>([
   {
     name: '正在报警',
-    value: '7',
+    value: '0',
     unit: '个',
+    type: '1',
   },
   {
     name: '今日报警',
-    value: '2',
+    value: '0',
     unit: '个',
+    type: '2',
   },
   {
     name: '本周报警',
-    value: '12',
+    value: '0',
     unit: '个',
+    type: '3',
   },
   {
     name: '本月报警',
-    value: '25',
+    value: '0',
     unit: '个',
+    type: '4',
   },
   {
     name: '全年报警',
-    value: '208',
+    value: '0',
     unit: '个',
+    type: '5',
   },
 ])
+const loading = ref(true)
+const fetchData = () => {
+  loading.value = true
+  getOverallAlarm().then((res) => {
+    const data = res.data
+    data.forEach((item: any) => {
+      const cindex = alarmData.value.findIndex((citem: any) => citem.type === item.type)
+      if (cindex !== -1) {
+        alarmData.value[cindex].value = item.sum
+      }
+    })
+    loading.value = false
+  }).catch(() => {
+    loading.value = false
+  })
+}
+onMounted(() => {
+  fetchData()
+})
 </script>
 
 <template>
   <layout title="报警总体情况">
     <template #content>
-      <div class="alarm-container">
+      <div v-loading="loading" class="alarm-container">
         <div v-for="item in alarmData" :key="item.name" class="alarm-item">
           <div class="top">
             {{ item.name }}
@@ -63,18 +88,26 @@
     border-left: 4px solid #f24d4d;
     width: 18%;
     padding: 10px;
+    padding-top: 15px;
+    padding-bottom: 15px;
 
     .top {
       padding-left: 10px;
+      font-size: 22px;
+      font-weight: 700;
     }
 
     .bottom {
       text-align: center;
 
       .value {
-        font-size: 18px;
+        font-size: 22px;
         font-weight: 700;
       }
+
+      .unit {
+        font-size: 20px;
+      }
     }
   }
 }
diff --git a/src/views/home/alarm/count/components/trendAnalysis.vue b/src/views/home/alarm/count/components/trendAnalysis.vue
index cea2495..73e18b0 100644
--- a/src/views/home/alarm/count/components/trendAnalysis.vue
+++ b/src/views/home/alarm/count/components/trendAnalysis.vue
@@ -131,8 +131,9 @@
   }
 
   .table {
-    width: 40%;
+    width: 38%;
     padding: 10px;
+    margin-left: 20px;
   }
 }
 </style>
diff --git a/src/views/home/device/device/index.vue b/src/views/home/device/device/index.vue
index 55f12a9..df2cf32 100644
--- a/src/views/home/device/device/index.vue
+++ b/src/views/home/device/device/index.vue
@@ -13,6 +13,7 @@
 import { exportFile } from '@/utils/exportUtils'
 const $router = useRouter()
 const useStatusList = ref<{ id: string; name: string; value: string }[]>([]) // 设备在用情况
+const deviceTypeList = ref<{ id: string; name: string; value: string }[]>([]) // 设备类型
 // 表格数据
 const list = ref<any[]>([])
 const total = ref(0)
@@ -20,18 +21,18 @@
 const columns = ref<any>([
   { text: '状态', value: 'onlineState', align: 'center', isCustom: true, width: '55' },
   { text: '设备编号', value: 'devcode', align: 'center', isRequired: true },
-  { text: '设备类型', value: 'deviceType', align: 'center', isRequired: true },
-  { text: '监测对象', value: 'watchObject', align: 'center' },
+  { text: '设备类型', value: 'deviceTypeName', align: 'center', isRequired: true },
+  { text: '监测对象', value: 'watchObject', align: 'center', width: '85' },
   { text: '设备型号', value: 'deviceModel', align: 'center' },
   { text: '厂商', value: 'manufactureName', align: 'center', isRequired: true },
-  { text: '安装位号', value: 'tagNumber', align: 'center', isRequired: true },
+  { text: '安装位号', value: 'tagNumber', align: 'center', isRequired: true, width: '110' },
   { text: '详细位置', value: 'position', align: 'center', isRequired: true },
   { text: '管理单位', value: 'deptName', align: 'center', isRequired: true },
-  { text: '在用情况', value: 'validName', align: 'center', isRequired: true },
+  { text: '在用情况', value: 'validName', align: 'center', isRequired: true, width: '85' },
   // { text: '布防状态', value: '', align: 'center', isRequired: true },
-  { text: '电量', value: 'cell', align: 'center', isRequired: true },
-  { text: '最新上报时间', value: 'logtime', align: 'center', isRequired: true },
-  { text: '安装日期', value: 'installDate', align: 'center', isRequired: true },
+  { text: '电量', value: 'cell', align: 'center', isRequired: true, width: '70' },
+  { text: '最新上报时间', value: 'logtime', align: 'center', isRequired: true, width: '180' },
+  { text: '安装日期', value: 'installDate', align: 'center', isRequired: true, width: '180' },
 ])
 // 最终展示列
 const columnsConfig = ref([])
@@ -75,6 +76,7 @@
     list.value = res.data.rows.map((item: any) => ({
       ...item,
       validName: useStatusList.value.length ? useStatusList.value[useStatusList.value.findIndex(citem => item.valid === citem.value)].name : '',
+      deviceTypeName: deviceTypeList.value.length ? deviceTypeList.value[deviceTypeList.value.findIndex(citem => item.deviceType === citem.value)].name : '',
     }))
     total.value = res.data.total
     loadingTable.value = false
@@ -178,7 +180,7 @@
   ElMessage.warning('敬请期待')
 }
 const isUsed = ref<{ id: string; name: string; value: string }[]>([]) // 是否启用
-const deviceTypeList = ref<{ id: string; name: string; value: string }[]>([]) // 设备类型
+
 const manufacturerList = ref<{ id: string; name: string; value: string }[]>([]) // 厂商列表
 const cellList = ref<{ id: string; name: string; value: string }[]>([]) // 厂商列表
 
@@ -217,6 +219,12 @@
   // 设备类型
   getDeviceTypeListPage({ limit: 9999, offset: 1 }).then((res) => {
     deviceTypeList.value = res.data.rows.map((item: any) => ({ id: item.id, name: item.typeName, value: item.id }))
+    if (list.value.length) {
+      list.value = list.value.map((item: any) => ({
+        ...item,
+        deviceTypeName: deviceTypeList.value.length ? deviceTypeList.value[deviceTypeList.value.findIndex(citem => item.deviceType === citem.value)].name : '',
+      }))
+    }
   })
   // 厂商
   getManufacturerListPage().then((res) => {
diff --git a/src/views/home/pipeline/components/detailInfoDialog.vue b/src/views/home/pipeline/components/detailInfoDialog.vue
index 31f5635..1662e6e 100644
--- a/src/views/home/pipeline/components/detailInfoDialog.vue
+++ b/src/views/home/pipeline/components/detailInfoDialog.vue
@@ -123,44 +123,39 @@
       <span class="close" @click="close">x</span>
     </div>
     <div class="body">
-      <el-descriptions v-loading="loading" :column="2" border>
-        <el-descriptions-item v-for="item in descriptionsList" :key="item.text" :align="item.align">
-          <template #label>
-            <span class="label">
-              {{ item.text }}
-            </span>
-          </template>
-          {{ detailInfo[item.value] || '' }}
-        </el-descriptions-item>
-      </el-descriptions>
+      <div class="descriptions">
+        <div v-for="item in descriptionsList" :key="item.text" class="descriptions-item">
+          <div class="label">
+            {{ item.text }}
+          </div>
+          <div class="value" :title="detailInfo[item.value] || ''">
+            {{ detailInfo[item.value] || '' }}
+          </div>
+        </div>
+      </div>
     </div>
   </div>
 </template>
 
 <style lang="scss" scoped>
-::v-deep(.el-descriptions__label) {
-  width: 20%;
-}
-
-::v-deep(.el-descriptions__cell) {
-  padding: 0 !important;
-}
-
 .container {
-  // width: 500px;
-  // padding: 0 10px;
-  background: rgba($color: #feffff, $alpha: 95%);
-  border: 1.5px solid #79b5e6;
+  width: 600px;
+  background: #fff;
   position: relative;
+  border-radius: 8px;
+  border: 1px solid #e4e7ed;
+  overflow: hidden;
+  box-shadow: 0 0 12px rgb(0 0 0 / 12%);
 
   .header {
     float: right;
-    background-color: #ccc;
+    background-color: #5ea1ff;
     width: 100%;
     display: flex;
     justify-content: space-between;
     padding: 2px 10px;
     align-items: center;
+    color: #fff;
 
     .title {
       font-weight: 700;
@@ -172,7 +167,6 @@
     }
 
     .close {
-      color: #4875a0;
       font-size: 22px;
       font-weight: 700;
       text-align: right;
@@ -180,30 +174,55 @@
 
       &:hover {
         cursor: pointer;
-        color: #658eb4;
+        color: #ccc;
       }
     }
   }
 
   .body {
-    // padding: 10px;
-    // display: flex;
-    // flex-wrap: wrap;
     width: 100%;
 
-    .name {
-      width: 30%;
-    }
+    .descriptions {
+      width: 100%;
+      display: flex;
+      flex-wrap: wrap;
+      box-sizing: border-box;
+      padding: 10px 0;
 
-    .value {
-      width: 70%;
+      .descriptions-item {
+        width: 48%;
+        margin: 5px;
+        box-sizing: border-box;
+        display: flex;
+        padding: 0 5px;
+
+        .label {
+          width: 30%;
+          box-sizing: border-box;
+          padding: 0 5px;
+          font-size: 15px;
+          text-align: justify;
+          text-align-last: justify;
+        }
+
+        .value {
+          padding-left: 5px;
+          width: 68%;
+          box-sizing: border-box;
+          white-space: nowrap;
+          font-size: 14px;
+          color: #a39f9f;
+
+          /* 确保文本在一行内显示 */
+          overflow: hidden;
+
+          /* 超出容器部分隐藏 */
+          text-overflow: ellipsis;
+
+          /* 文字溢出显示省略号 */
+        }
+      }
     }
   }
 }
-
-.clearfix::after {
-  content: "";
-  display: table;
-  clear: both;
-}
 </style>
diff --git a/src/views/home/pipeline/components/map.vue b/src/views/home/pipeline/components/map.vue
index b956aa0..c7c37be 100644
--- a/src/views/home/pipeline/components/map.vue
+++ b/src/views/home/pipeline/components/map.vue
@@ -176,7 +176,10 @@
   setTimeout(() => {
     // mapRef.value.map.setZoom(14)
     // mapRef.value.map.setFitView()
-    mapRef.value.map.setCenter(data.event.data.lnglat)
+    // mapRef.value.map.setCenter(data.event.data.lnglat)
+    const center = JSON.parse(JSON.stringify(data.event.data.lnglat))
+    center[1] = Number(center[1]) + 0.0035
+    mapRef.value.map.setCenter(center)
   })
   // 关联的管线高亮
   const line = $props.pipe.filter((item: any) => item.pipeCode === data.event.data.row.pipeCode)
@@ -218,7 +221,10 @@
       info: data,
       map: mapRef.value.map,
     })
-    mapRef.value.map.setCenter(data.lnglat)
+    // mapRef.value.map.setCenter(data.lnglat)
+    const center = JSON.parse(JSON.stringify(data.lnglat))
+    center[1] = Number(center[1]) + 0.0035
+    mapRef.value.map.setCenter(center)
   })
 }
 // 重置标记点
diff --git a/src/views/home/pipeline/index.vue b/src/views/home/pipeline/index.vue
index 9ef5426..7eb2f1d 100644
--- a/src/views/home/pipeline/index.vue
+++ b/src/views/home/pipeline/index.vue
@@ -12,8 +12,9 @@
 import { getDictByCode } from '@/api/system/dict'
 // 表格标识  地图或普通
 const mapRef = ref()
-const tableFlag = ref('normal')
+const tableFlag = ref('map')
 const mapLoading = ref(true)
+const mapLoad = ref(false)
 // 表格数据
 const list = ref([])
 const total = ref(0)
@@ -58,7 +59,6 @@
 // 查询数据
 const fetchData = () => {
   loadingTable.value = true
-  mapLoading.value = true
   // 判断是否有查询条件(是地图展示20条  否地图展示所有)
   const queryList = [] as Boolean[] // 长度大于2 即为是
   for (const i in listQuery.value) {
@@ -82,13 +82,13 @@
     }
   }).catch(() => {
     loadingTable.value = false
-    if (queryList.length <= 2) {
-      mapLoading.value = false
-    }
+    mapLoading.value = false
   })
-  if (queryList.length > 2) { return }
+  if (queryList.length > 2 || mapLoad.value) { return }
+  mapLoading.value = true
   // 获取地图全部数据
   getPipelineList(listQuery.value).then((res) => {
+    mapLoad.value = true
     //  管线
     pipeData.value = res.data.map((item: any) => ({
       pipeCode: item.PIPE_CODE,
@@ -104,6 +104,7 @@
     }, 500)
   })
   getPipelineDeviceList(listQuery.value).then((res) => {
+    mapLoad.value = true
     mapList.value = res.data.map((item: { [key: string]: string }) => ({
       deviceTypeName: item.TYPE_NAME,
       tagNumber: item.TAG_NUMBER,
@@ -126,6 +127,7 @@
 }
 // 重置查询条件f
 const reset = () => {
+  mapLoad.value = false
   listQuery.value = {
     limit: 20,
     offset: 1,
@@ -239,6 +241,19 @@
     },
   })
 }
+// 表格高度
+const tableHeight = ref(window.innerHeight - 60 - 50 - 10 - 350 - 98 - 10 - 52 - 52 - 10)
+window.addEventListener('resize', () => {
+  tableHeight.value = window.innerHeight - 60 - 50 - 10 - 350 - 98 - 10 - 52 - 52 - 10
+})
+watch(() => tableFlag.value, (newVal) => {
+  if (newVal === 'map') {
+    tableHeight.value = window.innerHeight - 60 - 50 - 10 - 350 - 98 - 10 - 52 - 52 - 10
+  }
+  else if (newVal === 'normal') {
+    tableHeight.value = window.innerHeight - 60 - 50 - 10 - 98 - 10 - 52 - 52 - 10
+  }
+})
 </script>
 
 <template>
@@ -247,11 +262,9 @@
     <edit-dialog ref="editRef" @refresh="fetchData" />
     <!-- 地图 -->
     <map-com
-      v-if="tableFlag === 'map'" ref="mapRef" v-loading="mapLoading" class="map" :height="450" :data="mapList"
+      v-if="tableFlag === 'map'" ref="mapRef" v-loading="mapLoading" :height="350" :data="mapList"
       :pipe="pipeData"
     />
-    <!-- 占位-地图 -->
-    <div v-if="tableFlag === 'map'" style="height: 450px;" />
     <!-- 收起地图-图标 -->
     <div v-if="tableFlag === 'map'" class="icon" @click="switchMode('normal')">
       <el-icon :size="25">
@@ -260,7 +273,7 @@
     </div>
     <!-- 筛选条件 -->
     <search-area
-      :class="`${tableFlag === 'map' ? 'search-area' : ''}`" :need-clear="true" @search="fetchData"
+      :need-clear="true" @search="fetchData"
       @clear="reset"
     >
       <search-item>
@@ -319,8 +332,6 @@
         </el-select>
       </search-item>
     </search-area>
-    <!-- 筛选条件-地图 -->
-    <div v-if="tableFlag === 'map'" style="height: 114px;" />
     <!-- 表头标题 -->
     <table-container
       :is-config="true" config-title="pipeline-monitor" :columns="columns"
@@ -344,7 +355,7 @@
       </template>
       <!-- 查询结果Table显示 -->
       <normal-table
-        :data="list" :total="total" :columns="columnsConfig" :query="listQuery" :list-loading="loadingTable"
+        :data="list" :total="total" :columns="columnsConfig" :query="listQuery" :list-loading="loadingTable" :height="tableHeight"
         @change="changePage" @rowDbClick="rowClick"
       >
         <template #preColumns>
@@ -382,7 +393,7 @@
 
   .icon {
     position: fixed;
-    top: 550px;
+    top: 450px;
     left: 50%;
     // transform: translateX(-50%);
     z-index: 901;
diff --git a/src/views/home/rule/alarm/components/alarmLevelList.vue b/src/views/home/rule/alarm/components/alarmLevelList.vue
index c1b129d..40c1e43 100644
--- a/src/views/home/rule/alarm/components/alarmLevelList.vue
+++ b/src/views/home/rule/alarm/components/alarmLevelList.vue
@@ -18,7 +18,7 @@
   { text: '报警提示方式', value: 'alarmNoteMethodName', align: 'center' },
   { text: '报警音效', value: 'isSoundName', align: 'center' },
   { text: '报警推送', value: 'isSendName', align: 'center' },
-  { text: '报警短信', value: 'isTextName', align: 'center' },
+  // { text: '报警短信', value: 'isTextName', align: 'center' },
 ])
 const loadingTable = ref(true)
 //  查询条件
diff --git a/src/views/home/rule/alarm/components/editAlarmLevelDialog.vue b/src/views/home/rule/alarm/components/editAlarmLevelDialog.vue
index fe60451..757a42c 100644
--- a/src/views/home/rule/alarm/components/editAlarmLevelDialog.vue
+++ b/src/views/home/rule/alarm/components/editAlarmLevelDialog.vue
@@ -168,11 +168,11 @@
             <el-switch v-model="dataForm.isSend" size="large" active-text="开" inactive-text="关" active-value="1" inactive-value="0" />
           </el-form-item>
         </el-col>
-        <el-col :span="12">
+        <!-- <el-col :span="12">
           <el-form-item label="报警短信" prop="isText">
             <el-switch v-model="dataForm.isText" size="large" active-text="开" inactive-text="关" active-value="1" inactive-value="0" />
           </el-form-item>
-        </el-col>
+        </el-col> -->
       </el-row>
     </el-form>
     <template #footer>
diff --git a/src/views/home/rule/alarm/components/editDialog.vue b/src/views/home/rule/alarm/components/editDialog.vue
index a8c565f..3bd2958 100644
--- a/src/views/home/rule/alarm/components/editDialog.vue
+++ b/src/views/home/rule/alarm/components/editDialog.vue
@@ -226,6 +226,9 @@
   else {
     alarmEventList.value = []
   }
+  if (newVal) {
+    dataForm.value.alarmThreshold = ''
+  }
 }, {
   deep: true,
   immediate: true,
diff --git a/src/views/home/rule/alarm/index.vue b/src/views/home/rule/alarm/index.vue
index fef4bf0..99084a0 100644
--- a/src/views/home/rule/alarm/index.vue
+++ b/src/views/home/rule/alarm/index.vue
@@ -147,7 +147,7 @@
   }))
 
   const res2 = await getAlarmTypeListPage({ offset: 1, limit: 9999 })
-  alarmTypeList.value = uniqueMultiArray(res.data.rows.map((item: any) => ({
+  alarmTypeList.value = uniqueMultiArray(res2.data.rows.map((item: any) => ({
     name: item.alarmType,
     value: item.id,
     id: item.id,

diff --git a/src/api/home/alarm/count.ts b/src/api/home/alarm/count.ts
new file mode 100644
index 0000000..1f4b59a
--- /dev/null
+++ b/src/api/home/alarm/count.ts
@@ -0,0 +1,36 @@
+/**
+ * 报警统计
+ */
+import request from '@/api/index'
+
+// 报警总体情况
+export function getOverallAlarm() {
+  return request({
+    url: '/statics/alarmRecords/overall',
+    method: 'post',
+  })
+}
+// 各类报警统计
+export function getAlarmType(data: any) {
+  return request({
+    url: '/statics/alarmRecords/alarmType',
+    method: 'post',
+    data,
+  })
+}
+// 各单位报警统计
+export function getAlarmCompany(data: any) {
+  return request({
+    url: '/statics/alarmRecords/alarmCompany',
+    method: 'post',
+    data,
+  })
+}
+// 异常位置分析
+export function getAlarmPosition(data: any) {
+  return request({
+    url: '/statics/alarmRecords/alarmPosition',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/views/home/alarm/count/components/alarmStatistics.vue b/src/views/home/alarm/count/components/alarmStatistics.vue
index b009891..b088de2 100644
--- a/src/views/home/alarm/count/components/alarmStatistics.vue
+++ b/src/views/home/alarm/count/components/alarmStatistics.vue
@@ -5,30 +5,79 @@
  -->
 <script lang="ts" setup name="AlarmCount">
 import layout from './layout.vue'
+import { getAlarmType } from '@/api/home/alarm/count'
 const listQuery = ref({
-  type: 'day',
+  timeType: '2',
+  ledgerType: '',
+  deptid: '',
+  begTime: '',
+  endTime: '',
 })
 const selectTimeType = (type: string) => {
-  listQuery.value.type = type
+  listQuery.value.timeType = type
 }
+// 类别
+const ledgerTypeList = ref<{ id: string; name: string; value: string }[]>([
+  {
+    name: '闸井',
+    id: '1',
+    value: '1',
+  },
+  {
+    name: '场站',
+    id: '2',
+    value: '2',
+  },
+  {
+    name: '管线',
+    id: '3',
+    value: '3',
+  },
+])
 const xAxisData = ref([])
 const data = ref([])
 const list = ref([])
-setTimeout(() => {
-  xAxisData.value = [
-    '闸井浓度超限', '场站浓度超限', '场站火焰报警', '疑似第三方破坏', '场站烟雾报警',
-  ]
-  data.value = [
-    {
-      name: '报警数量',
-      data: [1, 3, 5, 1, 4],
-    },
-  ]
-  list.value = xAxisData.value.map((item, index) => ({
-    alarmType: item,
-    value: data.value[0].data[index],
-  }))
-}, 1000)
+const loading = ref(true)
+// 开始结束时间
+const datetimerange = ref()
+// 默认当天
+watch(() => datetimerange.value, (newVal) => {
+  listQuery.value.begTime = ''
+  listQuery.value.endTime = ''
+  if (Array.isArray(newVal)) {
+    if (newVal.length) {
+      listQuery.value.begTime = `${newVal[0]}`
+      listQuery.value.endTime = `${newVal[1]}`
+    }
+  }
+})
+// setTimeout(() => {
+//   xAxisData.value = [
+//     '闸井浓度超限', '场站浓度超限', '场站火焰报警', '疑似第三方破坏', '场站烟雾报警',
+//   ]
+//   data.value = [
+//     {
+//       name: '报警数量',
+//       data: [1, 3, 5, 1, 4],
+//     },
+//   ]
+//   list.value = xAxisData.value.map((item, index) => ({
+//     alarmType: item,
+//     value: data.value[0].data[index],
+//   }))
+// }, 1000)
+const fetchData = () => {
+  loading.value = true
+  getAlarmType(listQuery.value).then((res) => {
+    console.log(res.data, '各类报警统计')
+    loading.value = false
+  }).catch(() => {
+    loading.value = false
+  })
+}
+onMounted(() => {
+  fetchData()
+})
 </script>
 
 <template>
@@ -37,26 +86,22 @@
     <template #search>
       <div class="search">
         <el-button
-          :class="listQuery.type === 'day' ? 'active' : ''" round size="small"
-          @click="selectTimeType('day')"
-        >
-          今日
-        </el-button>
-        <el-button
-          :class="listQuery.type === 'week' ? 'active' : ''" round size="small"
-          @click="selectTimeType('week')"
+          :class="listQuery.timeType === '2' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+          @click="selectTimeType('2')"
         >
           本周
         </el-button>
         <el-button
-          :class="listQuery.type === 'month' ? 'active' : ''" round size="small"
-          @click="selectTimeType('month')"
+          :class="listQuery.timeType === '3' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+          @click="selectTimeType('3')"
         >
           本月
         </el-button>
-        <el-select v-model="listQuery.keywords" placeholder="全部类别" clearable style="width: 180px;margin: 0 5px;" />
+        <el-select v-model="listQuery.ledgerType" placeholder="全部类别" clearable style="width: 180px;margin: 0 5px;">
+          <el-option v-for="item in ledgerTypeList" :key="item.id" :label="item.name" :value="item.id" />
+        </el-select>
         <dept-select
-          v-model="listQuery.keywords" placeholder="管理单位" :clearable="true"
+          v-model="listQuery.deptid" placeholder="管理单位" :clearable="true"
           style="width: 220px;margin: 0 5px;"
         />
         <el-date-picker
@@ -64,18 +109,27 @@
           style="width: 340px;margin: 0 5px;" value-format="YYYY-MM-DD HH:mm:ss" range-separator="至"
           start-placeholder="报警开始时间" end-placeholder="报警结束时间" clearable
         />
-        <el-button type="primary" style="margin: 0 5px;">
+        <el-button type="primary" style="margin: 0 5px;" @click="fetchData">
           搜索
         </el-button>
       </div>
     </template>
     <template #content>
-      <div class="alarm-count">
+      <div v-loading="loading" class="alarm-count">
         <div class="bar">
           <bar-chart-vertical
+            v-show="xAxisData.length"
             :x-axis-data="xAxisData" :bar-coner="0" :data="data" :colors="[]" :bar-width="15"
             :legend="{ itemWidth: 8, itemHeight: 8, type: 'scroll', orient: 'horizontal', icon: 'roundRect', right: '0', top: '10' }"
+            :grid="{
+              top: 50,
+              left: 30,
+              right: 30,
+              bottom: 20,
+              containLabel: true, // 是否包含坐标轴的刻度标签
+            }"
           />
+          <el-empty v-show="!xAxisData.length" description="暂无数据" />
         </div>
         <div class="table">
           <el-table border :data="list" stripe style="width: 100%;" :height="440">
@@ -110,8 +164,9 @@
   }
 
   .table {
-    width: 40%;
+    width: 38%;
     padding: 10px;
+    margin-left: 20px;
   }
 }
 </style>
diff --git a/src/views/home/alarm/count/components/deptCount.vue b/src/views/home/alarm/count/components/deptCount.vue
index 1579231..1ca5482 100644
--- a/src/views/home/alarm/count/components/deptCount.vue
+++ b/src/views/home/alarm/count/components/deptCount.vue
@@ -122,8 +122,9 @@
   }
 
   .table {
-    width: 40%;
+    width: 38%;
     padding: 10px;
+    margin-left: 20px;
   }
 }
 </style>
diff --git a/src/views/home/alarm/count/components/overallAlarm.vue b/src/views/home/alarm/count/components/overallAlarm.vue
index f14ee15..476add8 100644
--- a/src/views/home/alarm/count/components/overallAlarm.vue
+++ b/src/views/home/alarm/count/components/overallAlarm.vue
@@ -5,39 +5,64 @@
  -->
 <script lang="ts" setup name="AlarmCount">
 import layout from './layout.vue'
+import { getOverallAlarm } from '@/api/home/alarm/count'
 const alarmData = ref<any[]>([
   {
     name: '正在报警',
-    value: '7',
+    value: '0',
     unit: '个',
+    type: '1',
   },
   {
     name: '今日报警',
-    value: '2',
+    value: '0',
     unit: '个',
+    type: '2',
   },
   {
     name: '本周报警',
-    value: '12',
+    value: '0',
     unit: '个',
+    type: '3',
   },
   {
     name: '本月报警',
-    value: '25',
+    value: '0',
     unit: '个',
+    type: '4',
   },
   {
     name: '全年报警',
-    value: '208',
+    value: '0',
     unit: '个',
+    type: '5',
   },
 ])
+const loading = ref(true)
+const fetchData = () => {
+  loading.value = true
+  getOverallAlarm().then((res) => {
+    const data = res.data
+    data.forEach((item: any) => {
+      const cindex = alarmData.value.findIndex((citem: any) => citem.type === item.type)
+      if (cindex !== -1) {
+        alarmData.value[cindex].value = item.sum
+      }
+    })
+    loading.value = false
+  }).catch(() => {
+    loading.value = false
+  })
+}
+onMounted(() => {
+  fetchData()
+})
 </script>
 
 <template>
   <layout title="报警总体情况">
     <template #content>
-      <div class="alarm-container">
+      <div v-loading="loading" class="alarm-container">
         <div v-for="item in alarmData" :key="item.name" class="alarm-item">
           <div class="top">
             {{ item.name }}
@@ -63,18 +88,26 @@
     border-left: 4px solid #f24d4d;
     width: 18%;
     padding: 10px;
+    padding-top: 15px;
+    padding-bottom: 15px;
 
     .top {
       padding-left: 10px;
+      font-size: 22px;
+      font-weight: 700;
     }
 
     .bottom {
       text-align: center;
 
       .value {
-        font-size: 18px;
+        font-size: 22px;
         font-weight: 700;
       }
+
+      .unit {
+        font-size: 20px;
+      }
     }
   }
 }
diff --git a/src/views/home/alarm/count/components/trendAnalysis.vue b/src/views/home/alarm/count/components/trendAnalysis.vue
index cea2495..73e18b0 100644
--- a/src/views/home/alarm/count/components/trendAnalysis.vue
+++ b/src/views/home/alarm/count/components/trendAnalysis.vue
@@ -131,8 +131,9 @@
   }
 
   .table {
-    width: 40%;
+    width: 38%;
     padding: 10px;
+    margin-left: 20px;
   }
 }
 </style>
diff --git a/src/views/home/device/device/index.vue b/src/views/home/device/device/index.vue
index 55f12a9..df2cf32 100644
--- a/src/views/home/device/device/index.vue
+++ b/src/views/home/device/device/index.vue
@@ -13,6 +13,7 @@
 import { exportFile } from '@/utils/exportUtils'
 const $router = useRouter()
 const useStatusList = ref<{ id: string; name: string; value: string }[]>([]) // 设备在用情况
+const deviceTypeList = ref<{ id: string; name: string; value: string }[]>([]) // 设备类型
 // 表格数据
 const list = ref<any[]>([])
 const total = ref(0)
@@ -20,18 +21,18 @@
 const columns = ref<any>([
   { text: '状态', value: 'onlineState', align: 'center', isCustom: true, width: '55' },
   { text: '设备编号', value: 'devcode', align: 'center', isRequired: true },
-  { text: '设备类型', value: 'deviceType', align: 'center', isRequired: true },
-  { text: '监测对象', value: 'watchObject', align: 'center' },
+  { text: '设备类型', value: 'deviceTypeName', align: 'center', isRequired: true },
+  { text: '监测对象', value: 'watchObject', align: 'center', width: '85' },
   { text: '设备型号', value: 'deviceModel', align: 'center' },
   { text: '厂商', value: 'manufactureName', align: 'center', isRequired: true },
-  { text: '安装位号', value: 'tagNumber', align: 'center', isRequired: true },
+  { text: '安装位号', value: 'tagNumber', align: 'center', isRequired: true, width: '110' },
   { text: '详细位置', value: 'position', align: 'center', isRequired: true },
   { text: '管理单位', value: 'deptName', align: 'center', isRequired: true },
-  { text: '在用情况', value: 'validName', align: 'center', isRequired: true },
+  { text: '在用情况', value: 'validName', align: 'center', isRequired: true, width: '85' },
   // { text: '布防状态', value: '', align: 'center', isRequired: true },
-  { text: '电量', value: 'cell', align: 'center', isRequired: true },
-  { text: '最新上报时间', value: 'logtime', align: 'center', isRequired: true },
-  { text: '安装日期', value: 'installDate', align: 'center', isRequired: true },
+  { text: '电量', value: 'cell', align: 'center', isRequired: true, width: '70' },
+  { text: '最新上报时间', value: 'logtime', align: 'center', isRequired: true, width: '180' },
+  { text: '安装日期', value: 'installDate', align: 'center', isRequired: true, width: '180' },
 ])
 // 最终展示列
 const columnsConfig = ref([])
@@ -75,6 +76,7 @@
     list.value = res.data.rows.map((item: any) => ({
       ...item,
       validName: useStatusList.value.length ? useStatusList.value[useStatusList.value.findIndex(citem => item.valid === citem.value)].name : '',
+      deviceTypeName: deviceTypeList.value.length ? deviceTypeList.value[deviceTypeList.value.findIndex(citem => item.deviceType === citem.value)].name : '',
     }))
     total.value = res.data.total
     loadingTable.value = false
@@ -178,7 +180,7 @@
   ElMessage.warning('敬请期待')
 }
 const isUsed = ref<{ id: string; name: string; value: string }[]>([]) // 是否启用
-const deviceTypeList = ref<{ id: string; name: string; value: string }[]>([]) // 设备类型
+
 const manufacturerList = ref<{ id: string; name: string; value: string }[]>([]) // 厂商列表
 const cellList = ref<{ id: string; name: string; value: string }[]>([]) // 厂商列表
 
@@ -217,6 +219,12 @@
   // 设备类型
   getDeviceTypeListPage({ limit: 9999, offset: 1 }).then((res) => {
     deviceTypeList.value = res.data.rows.map((item: any) => ({ id: item.id, name: item.typeName, value: item.id }))
+    if (list.value.length) {
+      list.value = list.value.map((item: any) => ({
+        ...item,
+        deviceTypeName: deviceTypeList.value.length ? deviceTypeList.value[deviceTypeList.value.findIndex(citem => item.deviceType === citem.value)].name : '',
+      }))
+    }
   })
   // 厂商
   getManufacturerListPage().then((res) => {
diff --git a/src/views/home/pipeline/components/detailInfoDialog.vue b/src/views/home/pipeline/components/detailInfoDialog.vue
index 31f5635..1662e6e 100644
--- a/src/views/home/pipeline/components/detailInfoDialog.vue
+++ b/src/views/home/pipeline/components/detailInfoDialog.vue
@@ -123,44 +123,39 @@
       <span class="close" @click="close">x</span>
     </div>
     <div class="body">
-      <el-descriptions v-loading="loading" :column="2" border>
-        <el-descriptions-item v-for="item in descriptionsList" :key="item.text" :align="item.align">
-          <template #label>
-            <span class="label">
-              {{ item.text }}
-            </span>
-          </template>
-          {{ detailInfo[item.value] || '' }}
-        </el-descriptions-item>
-      </el-descriptions>
+      <div class="descriptions">
+        <div v-for="item in descriptionsList" :key="item.text" class="descriptions-item">
+          <div class="label">
+            {{ item.text }}
+          </div>
+          <div class="value" :title="detailInfo[item.value] || ''">
+            {{ detailInfo[item.value] || '' }}
+          </div>
+        </div>
+      </div>
     </div>
   </div>
 </template>
 
 <style lang="scss" scoped>
-::v-deep(.el-descriptions__label) {
-  width: 20%;
-}
-
-::v-deep(.el-descriptions__cell) {
-  padding: 0 !important;
-}
-
 .container {
-  // width: 500px;
-  // padding: 0 10px;
-  background: rgba($color: #feffff, $alpha: 95%);
-  border: 1.5px solid #79b5e6;
+  width: 600px;
+  background: #fff;
   position: relative;
+  border-radius: 8px;
+  border: 1px solid #e4e7ed;
+  overflow: hidden;
+  box-shadow: 0 0 12px rgb(0 0 0 / 12%);
 
   .header {
     float: right;
-    background-color: #ccc;
+    background-color: #5ea1ff;
     width: 100%;
     display: flex;
     justify-content: space-between;
     padding: 2px 10px;
     align-items: center;
+    color: #fff;
 
     .title {
       font-weight: 700;
@@ -172,7 +167,6 @@
     }
 
     .close {
-      color: #4875a0;
       font-size: 22px;
       font-weight: 700;
       text-align: right;
@@ -180,30 +174,55 @@
 
       &:hover {
         cursor: pointer;
-        color: #658eb4;
+        color: #ccc;
       }
     }
   }
 
   .body {
-    // padding: 10px;
-    // display: flex;
-    // flex-wrap: wrap;
     width: 100%;
 
-    .name {
-      width: 30%;
-    }
+    .descriptions {
+      width: 100%;
+      display: flex;
+      flex-wrap: wrap;
+      box-sizing: border-box;
+      padding: 10px 0;
 
-    .value {
-      width: 70%;
+      .descriptions-item {
+        width: 48%;
+        margin: 5px;
+        box-sizing: border-box;
+        display: flex;
+        padding: 0 5px;
+
+        .label {
+          width: 30%;
+          box-sizing: border-box;
+          padding: 0 5px;
+          font-size: 15px;
+          text-align: justify;
+          text-align-last: justify;
+        }
+
+        .value {
+          padding-left: 5px;
+          width: 68%;
+          box-sizing: border-box;
+          white-space: nowrap;
+          font-size: 14px;
+          color: #a39f9f;
+
+          /* 确保文本在一行内显示 */
+          overflow: hidden;
+
+          /* 超出容器部分隐藏 */
+          text-overflow: ellipsis;
+
+          /* 文字溢出显示省略号 */
+        }
+      }
     }
   }
 }
-
-.clearfix::after {
-  content: "";
-  display: table;
-  clear: both;
-}
 </style>
diff --git a/src/views/home/pipeline/components/map.vue b/src/views/home/pipeline/components/map.vue
index b956aa0..c7c37be 100644
--- a/src/views/home/pipeline/components/map.vue
+++ b/src/views/home/pipeline/components/map.vue
@@ -176,7 +176,10 @@
   setTimeout(() => {
     // mapRef.value.map.setZoom(14)
     // mapRef.value.map.setFitView()
-    mapRef.value.map.setCenter(data.event.data.lnglat)
+    // mapRef.value.map.setCenter(data.event.data.lnglat)
+    const center = JSON.parse(JSON.stringify(data.event.data.lnglat))
+    center[1] = Number(center[1]) + 0.0035
+    mapRef.value.map.setCenter(center)
   })
   // 关联的管线高亮
   const line = $props.pipe.filter((item: any) => item.pipeCode === data.event.data.row.pipeCode)
@@ -218,7 +221,10 @@
       info: data,
       map: mapRef.value.map,
     })
-    mapRef.value.map.setCenter(data.lnglat)
+    // mapRef.value.map.setCenter(data.lnglat)
+    const center = JSON.parse(JSON.stringify(data.lnglat))
+    center[1] = Number(center[1]) + 0.0035
+    mapRef.value.map.setCenter(center)
   })
 }
 // 重置标记点
diff --git a/src/views/home/pipeline/index.vue b/src/views/home/pipeline/index.vue
index 9ef5426..7eb2f1d 100644
--- a/src/views/home/pipeline/index.vue
+++ b/src/views/home/pipeline/index.vue
@@ -12,8 +12,9 @@
 import { getDictByCode } from '@/api/system/dict'
 // 表格标识  地图或普通
 const mapRef = ref()
-const tableFlag = ref('normal')
+const tableFlag = ref('map')
 const mapLoading = ref(true)
+const mapLoad = ref(false)
 // 表格数据
 const list = ref([])
 const total = ref(0)
@@ -58,7 +59,6 @@
 // 查询数据
 const fetchData = () => {
   loadingTable.value = true
-  mapLoading.value = true
   // 判断是否有查询条件(是地图展示20条  否地图展示所有)
   const queryList = [] as Boolean[] // 长度大于2 即为是
   for (const i in listQuery.value) {
@@ -82,13 +82,13 @@
     }
   }).catch(() => {
     loadingTable.value = false
-    if (queryList.length <= 2) {
-      mapLoading.value = false
-    }
+    mapLoading.value = false
   })
-  if (queryList.length > 2) { return }
+  if (queryList.length > 2 || mapLoad.value) { return }
+  mapLoading.value = true
   // 获取地图全部数据
   getPipelineList(listQuery.value).then((res) => {
+    mapLoad.value = true
     //  管线
     pipeData.value = res.data.map((item: any) => ({
       pipeCode: item.PIPE_CODE,
@@ -104,6 +104,7 @@
     }, 500)
   })
   getPipelineDeviceList(listQuery.value).then((res) => {
+    mapLoad.value = true
     mapList.value = res.data.map((item: { [key: string]: string }) => ({
       deviceTypeName: item.TYPE_NAME,
       tagNumber: item.TAG_NUMBER,
@@ -126,6 +127,7 @@
 }
 // 重置查询条件f
 const reset = () => {
+  mapLoad.value = false
   listQuery.value = {
     limit: 20,
     offset: 1,
@@ -239,6 +241,19 @@
     },
   })
 }
+// 表格高度
+const tableHeight = ref(window.innerHeight - 60 - 50 - 10 - 350 - 98 - 10 - 52 - 52 - 10)
+window.addEventListener('resize', () => {
+  tableHeight.value = window.innerHeight - 60 - 50 - 10 - 350 - 98 - 10 - 52 - 52 - 10
+})
+watch(() => tableFlag.value, (newVal) => {
+  if (newVal === 'map') {
+    tableHeight.value = window.innerHeight - 60 - 50 - 10 - 350 - 98 - 10 - 52 - 52 - 10
+  }
+  else if (newVal === 'normal') {
+    tableHeight.value = window.innerHeight - 60 - 50 - 10 - 98 - 10 - 52 - 52 - 10
+  }
+})
 </script>
 
 <template>
@@ -247,11 +262,9 @@
     <edit-dialog ref="editRef" @refresh="fetchData" />
     <!-- 地图 -->
     <map-com
-      v-if="tableFlag === 'map'" ref="mapRef" v-loading="mapLoading" class="map" :height="450" :data="mapList"
+      v-if="tableFlag === 'map'" ref="mapRef" v-loading="mapLoading" :height="350" :data="mapList"
       :pipe="pipeData"
     />
-    <!-- 占位-地图 -->
-    <div v-if="tableFlag === 'map'" style="height: 450px;" />
     <!-- 收起地图-图标 -->
     <div v-if="tableFlag === 'map'" class="icon" @click="switchMode('normal')">
       <el-icon :size="25">
@@ -260,7 +273,7 @@
     </div>
     <!-- 筛选条件 -->
     <search-area
-      :class="`${tableFlag === 'map' ? 'search-area' : ''}`" :need-clear="true" @search="fetchData"
+      :need-clear="true" @search="fetchData"
       @clear="reset"
     >
       <search-item>
@@ -319,8 +332,6 @@
         </el-select>
       </search-item>
     </search-area>
-    <!-- 筛选条件-地图 -->
-    <div v-if="tableFlag === 'map'" style="height: 114px;" />
     <!-- 表头标题 -->
     <table-container
       :is-config="true" config-title="pipeline-monitor" :columns="columns"
@@ -344,7 +355,7 @@
       </template>
       <!-- 查询结果Table显示 -->
       <normal-table
-        :data="list" :total="total" :columns="columnsConfig" :query="listQuery" :list-loading="loadingTable"
+        :data="list" :total="total" :columns="columnsConfig" :query="listQuery" :list-loading="loadingTable" :height="tableHeight"
         @change="changePage" @rowDbClick="rowClick"
       >
         <template #preColumns>
@@ -382,7 +393,7 @@
 
   .icon {
     position: fixed;
-    top: 550px;
+    top: 450px;
     left: 50%;
     // transform: translateX(-50%);
     z-index: 901;
diff --git a/src/views/home/rule/alarm/components/alarmLevelList.vue b/src/views/home/rule/alarm/components/alarmLevelList.vue
index c1b129d..40c1e43 100644
--- a/src/views/home/rule/alarm/components/alarmLevelList.vue
+++ b/src/views/home/rule/alarm/components/alarmLevelList.vue
@@ -18,7 +18,7 @@
   { text: '报警提示方式', value: 'alarmNoteMethodName', align: 'center' },
   { text: '报警音效', value: 'isSoundName', align: 'center' },
   { text: '报警推送', value: 'isSendName', align: 'center' },
-  { text: '报警短信', value: 'isTextName', align: 'center' },
+  // { text: '报警短信', value: 'isTextName', align: 'center' },
 ])
 const loadingTable = ref(true)
 //  查询条件
diff --git a/src/views/home/rule/alarm/components/editAlarmLevelDialog.vue b/src/views/home/rule/alarm/components/editAlarmLevelDialog.vue
index fe60451..757a42c 100644
--- a/src/views/home/rule/alarm/components/editAlarmLevelDialog.vue
+++ b/src/views/home/rule/alarm/components/editAlarmLevelDialog.vue
@@ -168,11 +168,11 @@
             <el-switch v-model="dataForm.isSend" size="large" active-text="开" inactive-text="关" active-value="1" inactive-value="0" />
           </el-form-item>
         </el-col>
-        <el-col :span="12">
+        <!-- <el-col :span="12">
           <el-form-item label="报警短信" prop="isText">
             <el-switch v-model="dataForm.isText" size="large" active-text="开" inactive-text="关" active-value="1" inactive-value="0" />
           </el-form-item>
-        </el-col>
+        </el-col> -->
       </el-row>
     </el-form>
     <template #footer>
diff --git a/src/views/home/rule/alarm/components/editDialog.vue b/src/views/home/rule/alarm/components/editDialog.vue
index a8c565f..3bd2958 100644
--- a/src/views/home/rule/alarm/components/editDialog.vue
+++ b/src/views/home/rule/alarm/components/editDialog.vue
@@ -226,6 +226,9 @@
   else {
     alarmEventList.value = []
   }
+  if (newVal) {
+    dataForm.value.alarmThreshold = ''
+  }
 }, {
   deep: true,
   immediate: true,
diff --git a/src/views/home/rule/alarm/index.vue b/src/views/home/rule/alarm/index.vue
index fef4bf0..99084a0 100644
--- a/src/views/home/rule/alarm/index.vue
+++ b/src/views/home/rule/alarm/index.vue
@@ -147,7 +147,7 @@
   }))
 
   const res2 = await getAlarmTypeListPage({ offset: 1, limit: 9999 })
-  alarmTypeList.value = uniqueMultiArray(res.data.rows.map((item: any) => ({
+  alarmTypeList.value = uniqueMultiArray(res2.data.rows.map((item: any) => ({
     name: item.alarmType,
     value: item.id,
     id: item.id,
diff --git a/src/views/home/station/control/components/control.vue b/src/views/home/station/control/components/control.vue
index 8d1f867..5ec4b26 100644
--- a/src/views/home/station/control/components/control.vue
+++ b/src/views/home/station/control/components/control.vue
@@ -129,7 +129,7 @@
   flex-wrap: wrap;
 
   .left {
-    width: 62%;
+    width: 55%;
     // background-color: aqua;
     display: flex;
     justify-content: space-around;
@@ -152,7 +152,7 @@
   }
 
   .right {
-    width: 37%;
+    width: 34%;
     // background-color: chartreuse;
     display: flex;
     justify-content: space-around;

diff --git a/src/api/home/alarm/count.ts b/src/api/home/alarm/count.ts
new file mode 100644
index 0000000..1f4b59a
--- /dev/null
+++ b/src/api/home/alarm/count.ts
@@ -0,0 +1,36 @@
+/**
+ * 报警统计
+ */
+import request from '@/api/index'
+
+// 报警总体情况
+export function getOverallAlarm() {
+  return request({
+    url: '/statics/alarmRecords/overall',
+    method: 'post',
+  })
+}
+// 各类报警统计
+export function getAlarmType(data: any) {
+  return request({
+    url: '/statics/alarmRecords/alarmType',
+    method: 'post',
+    data,
+  })
+}
+// 各单位报警统计
+export function getAlarmCompany(data: any) {
+  return request({
+    url: '/statics/alarmRecords/alarmCompany',
+    method: 'post',
+    data,
+  })
+}
+// 异常位置分析
+export function getAlarmPosition(data: any) {
+  return request({
+    url: '/statics/alarmRecords/alarmPosition',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/views/home/alarm/count/components/alarmStatistics.vue b/src/views/home/alarm/count/components/alarmStatistics.vue
index b009891..b088de2 100644
--- a/src/views/home/alarm/count/components/alarmStatistics.vue
+++ b/src/views/home/alarm/count/components/alarmStatistics.vue
@@ -5,30 +5,79 @@
  -->
 <script lang="ts" setup name="AlarmCount">
 import layout from './layout.vue'
+import { getAlarmType } from '@/api/home/alarm/count'
 const listQuery = ref({
-  type: 'day',
+  timeType: '2',
+  ledgerType: '',
+  deptid: '',
+  begTime: '',
+  endTime: '',
 })
 const selectTimeType = (type: string) => {
-  listQuery.value.type = type
+  listQuery.value.timeType = type
 }
+// 类别
+const ledgerTypeList = ref<{ id: string; name: string; value: string }[]>([
+  {
+    name: '闸井',
+    id: '1',
+    value: '1',
+  },
+  {
+    name: '场站',
+    id: '2',
+    value: '2',
+  },
+  {
+    name: '管线',
+    id: '3',
+    value: '3',
+  },
+])
 const xAxisData = ref([])
 const data = ref([])
 const list = ref([])
-setTimeout(() => {
-  xAxisData.value = [
-    '闸井浓度超限', '场站浓度超限', '场站火焰报警', '疑似第三方破坏', '场站烟雾报警',
-  ]
-  data.value = [
-    {
-      name: '报警数量',
-      data: [1, 3, 5, 1, 4],
-    },
-  ]
-  list.value = xAxisData.value.map((item, index) => ({
-    alarmType: item,
-    value: data.value[0].data[index],
-  }))
-}, 1000)
+const loading = ref(true)
+// 开始结束时间
+const datetimerange = ref()
+// 默认当天
+watch(() => datetimerange.value, (newVal) => {
+  listQuery.value.begTime = ''
+  listQuery.value.endTime = ''
+  if (Array.isArray(newVal)) {
+    if (newVal.length) {
+      listQuery.value.begTime = `${newVal[0]}`
+      listQuery.value.endTime = `${newVal[1]}`
+    }
+  }
+})
+// setTimeout(() => {
+//   xAxisData.value = [
+//     '闸井浓度超限', '场站浓度超限', '场站火焰报警', '疑似第三方破坏', '场站烟雾报警',
+//   ]
+//   data.value = [
+//     {
+//       name: '报警数量',
+//       data: [1, 3, 5, 1, 4],
+//     },
+//   ]
+//   list.value = xAxisData.value.map((item, index) => ({
+//     alarmType: item,
+//     value: data.value[0].data[index],
+//   }))
+// }, 1000)
+const fetchData = () => {
+  loading.value = true
+  getAlarmType(listQuery.value).then((res) => {
+    console.log(res.data, '各类报警统计')
+    loading.value = false
+  }).catch(() => {
+    loading.value = false
+  })
+}
+onMounted(() => {
+  fetchData()
+})
 </script>
 
 <template>
@@ -37,26 +86,22 @@
     <template #search>
       <div class="search">
         <el-button
-          :class="listQuery.type === 'day' ? 'active' : ''" round size="small"
-          @click="selectTimeType('day')"
-        >
-          今日
-        </el-button>
-        <el-button
-          :class="listQuery.type === 'week' ? 'active' : ''" round size="small"
-          @click="selectTimeType('week')"
+          :class="listQuery.timeType === '2' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+          @click="selectTimeType('2')"
         >
           本周
         </el-button>
         <el-button
-          :class="listQuery.type === 'month' ? 'active' : ''" round size="small"
-          @click="selectTimeType('month')"
+          :class="listQuery.timeType === '3' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+          @click="selectTimeType('3')"
         >
           本月
         </el-button>
-        <el-select v-model="listQuery.keywords" placeholder="全部类别" clearable style="width: 180px;margin: 0 5px;" />
+        <el-select v-model="listQuery.ledgerType" placeholder="全部类别" clearable style="width: 180px;margin: 0 5px;">
+          <el-option v-for="item in ledgerTypeList" :key="item.id" :label="item.name" :value="item.id" />
+        </el-select>
         <dept-select
-          v-model="listQuery.keywords" placeholder="管理单位" :clearable="true"
+          v-model="listQuery.deptid" placeholder="管理单位" :clearable="true"
           style="width: 220px;margin: 0 5px;"
         />
         <el-date-picker
@@ -64,18 +109,27 @@
           style="width: 340px;margin: 0 5px;" value-format="YYYY-MM-DD HH:mm:ss" range-separator="至"
           start-placeholder="报警开始时间" end-placeholder="报警结束时间" clearable
         />
-        <el-button type="primary" style="margin: 0 5px;">
+        <el-button type="primary" style="margin: 0 5px;" @click="fetchData">
           搜索
         </el-button>
       </div>
     </template>
     <template #content>
-      <div class="alarm-count">
+      <div v-loading="loading" class="alarm-count">
         <div class="bar">
           <bar-chart-vertical
+            v-show="xAxisData.length"
             :x-axis-data="xAxisData" :bar-coner="0" :data="data" :colors="[]" :bar-width="15"
             :legend="{ itemWidth: 8, itemHeight: 8, type: 'scroll', orient: 'horizontal', icon: 'roundRect', right: '0', top: '10' }"
+            :grid="{
+              top: 50,
+              left: 30,
+              right: 30,
+              bottom: 20,
+              containLabel: true, // 是否包含坐标轴的刻度标签
+            }"
           />
+          <el-empty v-show="!xAxisData.length" description="暂无数据" />
         </div>
         <div class="table">
           <el-table border :data="list" stripe style="width: 100%;" :height="440">
@@ -110,8 +164,9 @@
   }
 
   .table {
-    width: 40%;
+    width: 38%;
     padding: 10px;
+    margin-left: 20px;
   }
 }
 </style>
diff --git a/src/views/home/alarm/count/components/deptCount.vue b/src/views/home/alarm/count/components/deptCount.vue
index 1579231..1ca5482 100644
--- a/src/views/home/alarm/count/components/deptCount.vue
+++ b/src/views/home/alarm/count/components/deptCount.vue
@@ -122,8 +122,9 @@
   }
 
   .table {
-    width: 40%;
+    width: 38%;
     padding: 10px;
+    margin-left: 20px;
   }
 }
 </style>
diff --git a/src/views/home/alarm/count/components/overallAlarm.vue b/src/views/home/alarm/count/components/overallAlarm.vue
index f14ee15..476add8 100644
--- a/src/views/home/alarm/count/components/overallAlarm.vue
+++ b/src/views/home/alarm/count/components/overallAlarm.vue
@@ -5,39 +5,64 @@
  -->
 <script lang="ts" setup name="AlarmCount">
 import layout from './layout.vue'
+import { getOverallAlarm } from '@/api/home/alarm/count'
 const alarmData = ref<any[]>([
   {
     name: '正在报警',
-    value: '7',
+    value: '0',
     unit: '个',
+    type: '1',
   },
   {
     name: '今日报警',
-    value: '2',
+    value: '0',
     unit: '个',
+    type: '2',
   },
   {
     name: '本周报警',
-    value: '12',
+    value: '0',
     unit: '个',
+    type: '3',
   },
   {
     name: '本月报警',
-    value: '25',
+    value: '0',
     unit: '个',
+    type: '4',
   },
   {
     name: '全年报警',
-    value: '208',
+    value: '0',
     unit: '个',
+    type: '5',
   },
 ])
+const loading = ref(true)
+const fetchData = () => {
+  loading.value = true
+  getOverallAlarm().then((res) => {
+    const data = res.data
+    data.forEach((item: any) => {
+      const cindex = alarmData.value.findIndex((citem: any) => citem.type === item.type)
+      if (cindex !== -1) {
+        alarmData.value[cindex].value = item.sum
+      }
+    })
+    loading.value = false
+  }).catch(() => {
+    loading.value = false
+  })
+}
+onMounted(() => {
+  fetchData()
+})
 </script>
 
 <template>
   <layout title="报警总体情况">
     <template #content>
-      <div class="alarm-container">
+      <div v-loading="loading" class="alarm-container">
         <div v-for="item in alarmData" :key="item.name" class="alarm-item">
           <div class="top">
             {{ item.name }}
@@ -63,18 +88,26 @@
     border-left: 4px solid #f24d4d;
     width: 18%;
     padding: 10px;
+    padding-top: 15px;
+    padding-bottom: 15px;
 
     .top {
       padding-left: 10px;
+      font-size: 22px;
+      font-weight: 700;
     }
 
     .bottom {
       text-align: center;
 
       .value {
-        font-size: 18px;
+        font-size: 22px;
         font-weight: 700;
       }
+
+      .unit {
+        font-size: 20px;
+      }
     }
   }
 }
diff --git a/src/views/home/alarm/count/components/trendAnalysis.vue b/src/views/home/alarm/count/components/trendAnalysis.vue
index cea2495..73e18b0 100644
--- a/src/views/home/alarm/count/components/trendAnalysis.vue
+++ b/src/views/home/alarm/count/components/trendAnalysis.vue
@@ -131,8 +131,9 @@
   }
 
   .table {
-    width: 40%;
+    width: 38%;
     padding: 10px;
+    margin-left: 20px;
   }
 }
 </style>
diff --git a/src/views/home/device/device/index.vue b/src/views/home/device/device/index.vue
index 55f12a9..df2cf32 100644
--- a/src/views/home/device/device/index.vue
+++ b/src/views/home/device/device/index.vue
@@ -13,6 +13,7 @@
 import { exportFile } from '@/utils/exportUtils'
 const $router = useRouter()
 const useStatusList = ref<{ id: string; name: string; value: string }[]>([]) // 设备在用情况
+const deviceTypeList = ref<{ id: string; name: string; value: string }[]>([]) // 设备类型
 // 表格数据
 const list = ref<any[]>([])
 const total = ref(0)
@@ -20,18 +21,18 @@
 const columns = ref<any>([
   { text: '状态', value: 'onlineState', align: 'center', isCustom: true, width: '55' },
   { text: '设备编号', value: 'devcode', align: 'center', isRequired: true },
-  { text: '设备类型', value: 'deviceType', align: 'center', isRequired: true },
-  { text: '监测对象', value: 'watchObject', align: 'center' },
+  { text: '设备类型', value: 'deviceTypeName', align: 'center', isRequired: true },
+  { text: '监测对象', value: 'watchObject', align: 'center', width: '85' },
   { text: '设备型号', value: 'deviceModel', align: 'center' },
   { text: '厂商', value: 'manufactureName', align: 'center', isRequired: true },
-  { text: '安装位号', value: 'tagNumber', align: 'center', isRequired: true },
+  { text: '安装位号', value: 'tagNumber', align: 'center', isRequired: true, width: '110' },
   { text: '详细位置', value: 'position', align: 'center', isRequired: true },
   { text: '管理单位', value: 'deptName', align: 'center', isRequired: true },
-  { text: '在用情况', value: 'validName', align: 'center', isRequired: true },
+  { text: '在用情况', value: 'validName', align: 'center', isRequired: true, width: '85' },
   // { text: '布防状态', value: '', align: 'center', isRequired: true },
-  { text: '电量', value: 'cell', align: 'center', isRequired: true },
-  { text: '最新上报时间', value: 'logtime', align: 'center', isRequired: true },
-  { text: '安装日期', value: 'installDate', align: 'center', isRequired: true },
+  { text: '电量', value: 'cell', align: 'center', isRequired: true, width: '70' },
+  { text: '最新上报时间', value: 'logtime', align: 'center', isRequired: true, width: '180' },
+  { text: '安装日期', value: 'installDate', align: 'center', isRequired: true, width: '180' },
 ])
 // 最终展示列
 const columnsConfig = ref([])
@@ -75,6 +76,7 @@
     list.value = res.data.rows.map((item: any) => ({
       ...item,
       validName: useStatusList.value.length ? useStatusList.value[useStatusList.value.findIndex(citem => item.valid === citem.value)].name : '',
+      deviceTypeName: deviceTypeList.value.length ? deviceTypeList.value[deviceTypeList.value.findIndex(citem => item.deviceType === citem.value)].name : '',
     }))
     total.value = res.data.total
     loadingTable.value = false
@@ -178,7 +180,7 @@
   ElMessage.warning('敬请期待')
 }
 const isUsed = ref<{ id: string; name: string; value: string }[]>([]) // 是否启用
-const deviceTypeList = ref<{ id: string; name: string; value: string }[]>([]) // 设备类型
+
 const manufacturerList = ref<{ id: string; name: string; value: string }[]>([]) // 厂商列表
 const cellList = ref<{ id: string; name: string; value: string }[]>([]) // 厂商列表
 
@@ -217,6 +219,12 @@
   // 设备类型
   getDeviceTypeListPage({ limit: 9999, offset: 1 }).then((res) => {
     deviceTypeList.value = res.data.rows.map((item: any) => ({ id: item.id, name: item.typeName, value: item.id }))
+    if (list.value.length) {
+      list.value = list.value.map((item: any) => ({
+        ...item,
+        deviceTypeName: deviceTypeList.value.length ? deviceTypeList.value[deviceTypeList.value.findIndex(citem => item.deviceType === citem.value)].name : '',
+      }))
+    }
   })
   // 厂商
   getManufacturerListPage().then((res) => {
diff --git a/src/views/home/pipeline/components/detailInfoDialog.vue b/src/views/home/pipeline/components/detailInfoDialog.vue
index 31f5635..1662e6e 100644
--- a/src/views/home/pipeline/components/detailInfoDialog.vue
+++ b/src/views/home/pipeline/components/detailInfoDialog.vue
@@ -123,44 +123,39 @@
       <span class="close" @click="close">x</span>
     </div>
     <div class="body">
-      <el-descriptions v-loading="loading" :column="2" border>
-        <el-descriptions-item v-for="item in descriptionsList" :key="item.text" :align="item.align">
-          <template #label>
-            <span class="label">
-              {{ item.text }}
-            </span>
-          </template>
-          {{ detailInfo[item.value] || '' }}
-        </el-descriptions-item>
-      </el-descriptions>
+      <div class="descriptions">
+        <div v-for="item in descriptionsList" :key="item.text" class="descriptions-item">
+          <div class="label">
+            {{ item.text }}
+          </div>
+          <div class="value" :title="detailInfo[item.value] || ''">
+            {{ detailInfo[item.value] || '' }}
+          </div>
+        </div>
+      </div>
     </div>
   </div>
 </template>
 
 <style lang="scss" scoped>
-::v-deep(.el-descriptions__label) {
-  width: 20%;
-}
-
-::v-deep(.el-descriptions__cell) {
-  padding: 0 !important;
-}
-
 .container {
-  // width: 500px;
-  // padding: 0 10px;
-  background: rgba($color: #feffff, $alpha: 95%);
-  border: 1.5px solid #79b5e6;
+  width: 600px;
+  background: #fff;
   position: relative;
+  border-radius: 8px;
+  border: 1px solid #e4e7ed;
+  overflow: hidden;
+  box-shadow: 0 0 12px rgb(0 0 0 / 12%);
 
   .header {
     float: right;
-    background-color: #ccc;
+    background-color: #5ea1ff;
     width: 100%;
     display: flex;
     justify-content: space-between;
     padding: 2px 10px;
     align-items: center;
+    color: #fff;
 
     .title {
       font-weight: 700;
@@ -172,7 +167,6 @@
     }
 
     .close {
-      color: #4875a0;
       font-size: 22px;
       font-weight: 700;
       text-align: right;
@@ -180,30 +174,55 @@
 
       &:hover {
         cursor: pointer;
-        color: #658eb4;
+        color: #ccc;
       }
     }
   }
 
   .body {
-    // padding: 10px;
-    // display: flex;
-    // flex-wrap: wrap;
     width: 100%;
 
-    .name {
-      width: 30%;
-    }
+    .descriptions {
+      width: 100%;
+      display: flex;
+      flex-wrap: wrap;
+      box-sizing: border-box;
+      padding: 10px 0;
 
-    .value {
-      width: 70%;
+      .descriptions-item {
+        width: 48%;
+        margin: 5px;
+        box-sizing: border-box;
+        display: flex;
+        padding: 0 5px;
+
+        .label {
+          width: 30%;
+          box-sizing: border-box;
+          padding: 0 5px;
+          font-size: 15px;
+          text-align: justify;
+          text-align-last: justify;
+        }
+
+        .value {
+          padding-left: 5px;
+          width: 68%;
+          box-sizing: border-box;
+          white-space: nowrap;
+          font-size: 14px;
+          color: #a39f9f;
+
+          /* 确保文本在一行内显示 */
+          overflow: hidden;
+
+          /* 超出容器部分隐藏 */
+          text-overflow: ellipsis;
+
+          /* 文字溢出显示省略号 */
+        }
+      }
     }
   }
 }
-
-.clearfix::after {
-  content: "";
-  display: table;
-  clear: both;
-}
 </style>
diff --git a/src/views/home/pipeline/components/map.vue b/src/views/home/pipeline/components/map.vue
index b956aa0..c7c37be 100644
--- a/src/views/home/pipeline/components/map.vue
+++ b/src/views/home/pipeline/components/map.vue
@@ -176,7 +176,10 @@
   setTimeout(() => {
     // mapRef.value.map.setZoom(14)
     // mapRef.value.map.setFitView()
-    mapRef.value.map.setCenter(data.event.data.lnglat)
+    // mapRef.value.map.setCenter(data.event.data.lnglat)
+    const center = JSON.parse(JSON.stringify(data.event.data.lnglat))
+    center[1] = Number(center[1]) + 0.0035
+    mapRef.value.map.setCenter(center)
   })
   // 关联的管线高亮
   const line = $props.pipe.filter((item: any) => item.pipeCode === data.event.data.row.pipeCode)
@@ -218,7 +221,10 @@
       info: data,
       map: mapRef.value.map,
     })
-    mapRef.value.map.setCenter(data.lnglat)
+    // mapRef.value.map.setCenter(data.lnglat)
+    const center = JSON.parse(JSON.stringify(data.lnglat))
+    center[1] = Number(center[1]) + 0.0035
+    mapRef.value.map.setCenter(center)
   })
 }
 // 重置标记点
diff --git a/src/views/home/pipeline/index.vue b/src/views/home/pipeline/index.vue
index 9ef5426..7eb2f1d 100644
--- a/src/views/home/pipeline/index.vue
+++ b/src/views/home/pipeline/index.vue
@@ -12,8 +12,9 @@
 import { getDictByCode } from '@/api/system/dict'
 // 表格标识  地图或普通
 const mapRef = ref()
-const tableFlag = ref('normal')
+const tableFlag = ref('map')
 const mapLoading = ref(true)
+const mapLoad = ref(false)
 // 表格数据
 const list = ref([])
 const total = ref(0)
@@ -58,7 +59,6 @@
 // 查询数据
 const fetchData = () => {
   loadingTable.value = true
-  mapLoading.value = true
   // 判断是否有查询条件(是地图展示20条  否地图展示所有)
   const queryList = [] as Boolean[] // 长度大于2 即为是
   for (const i in listQuery.value) {
@@ -82,13 +82,13 @@
     }
   }).catch(() => {
     loadingTable.value = false
-    if (queryList.length <= 2) {
-      mapLoading.value = false
-    }
+    mapLoading.value = false
   })
-  if (queryList.length > 2) { return }
+  if (queryList.length > 2 || mapLoad.value) { return }
+  mapLoading.value = true
   // 获取地图全部数据
   getPipelineList(listQuery.value).then((res) => {
+    mapLoad.value = true
     //  管线
     pipeData.value = res.data.map((item: any) => ({
       pipeCode: item.PIPE_CODE,
@@ -104,6 +104,7 @@
     }, 500)
   })
   getPipelineDeviceList(listQuery.value).then((res) => {
+    mapLoad.value = true
     mapList.value = res.data.map((item: { [key: string]: string }) => ({
       deviceTypeName: item.TYPE_NAME,
       tagNumber: item.TAG_NUMBER,
@@ -126,6 +127,7 @@
 }
 // 重置查询条件f
 const reset = () => {
+  mapLoad.value = false
   listQuery.value = {
     limit: 20,
     offset: 1,
@@ -239,6 +241,19 @@
     },
   })
 }
+// 表格高度
+const tableHeight = ref(window.innerHeight - 60 - 50 - 10 - 350 - 98 - 10 - 52 - 52 - 10)
+window.addEventListener('resize', () => {
+  tableHeight.value = window.innerHeight - 60 - 50 - 10 - 350 - 98 - 10 - 52 - 52 - 10
+})
+watch(() => tableFlag.value, (newVal) => {
+  if (newVal === 'map') {
+    tableHeight.value = window.innerHeight - 60 - 50 - 10 - 350 - 98 - 10 - 52 - 52 - 10
+  }
+  else if (newVal === 'normal') {
+    tableHeight.value = window.innerHeight - 60 - 50 - 10 - 98 - 10 - 52 - 52 - 10
+  }
+})
 </script>
 
 <template>
@@ -247,11 +262,9 @@
     <edit-dialog ref="editRef" @refresh="fetchData" />
     <!-- 地图 -->
     <map-com
-      v-if="tableFlag === 'map'" ref="mapRef" v-loading="mapLoading" class="map" :height="450" :data="mapList"
+      v-if="tableFlag === 'map'" ref="mapRef" v-loading="mapLoading" :height="350" :data="mapList"
       :pipe="pipeData"
     />
-    <!-- 占位-地图 -->
-    <div v-if="tableFlag === 'map'" style="height: 450px;" />
     <!-- 收起地图-图标 -->
     <div v-if="tableFlag === 'map'" class="icon" @click="switchMode('normal')">
       <el-icon :size="25">
@@ -260,7 +273,7 @@
     </div>
     <!-- 筛选条件 -->
     <search-area
-      :class="`${tableFlag === 'map' ? 'search-area' : ''}`" :need-clear="true" @search="fetchData"
+      :need-clear="true" @search="fetchData"
       @clear="reset"
     >
       <search-item>
@@ -319,8 +332,6 @@
         </el-select>
       </search-item>
     </search-area>
-    <!-- 筛选条件-地图 -->
-    <div v-if="tableFlag === 'map'" style="height: 114px;" />
     <!-- 表头标题 -->
     <table-container
       :is-config="true" config-title="pipeline-monitor" :columns="columns"
@@ -344,7 +355,7 @@
       </template>
       <!-- 查询结果Table显示 -->
       <normal-table
-        :data="list" :total="total" :columns="columnsConfig" :query="listQuery" :list-loading="loadingTable"
+        :data="list" :total="total" :columns="columnsConfig" :query="listQuery" :list-loading="loadingTable" :height="tableHeight"
         @change="changePage" @rowDbClick="rowClick"
       >
         <template #preColumns>
@@ -382,7 +393,7 @@
 
   .icon {
     position: fixed;
-    top: 550px;
+    top: 450px;
     left: 50%;
     // transform: translateX(-50%);
     z-index: 901;
diff --git a/src/views/home/rule/alarm/components/alarmLevelList.vue b/src/views/home/rule/alarm/components/alarmLevelList.vue
index c1b129d..40c1e43 100644
--- a/src/views/home/rule/alarm/components/alarmLevelList.vue
+++ b/src/views/home/rule/alarm/components/alarmLevelList.vue
@@ -18,7 +18,7 @@
   { text: '报警提示方式', value: 'alarmNoteMethodName', align: 'center' },
   { text: '报警音效', value: 'isSoundName', align: 'center' },
   { text: '报警推送', value: 'isSendName', align: 'center' },
-  { text: '报警短信', value: 'isTextName', align: 'center' },
+  // { text: '报警短信', value: 'isTextName', align: 'center' },
 ])
 const loadingTable = ref(true)
 //  查询条件
diff --git a/src/views/home/rule/alarm/components/editAlarmLevelDialog.vue b/src/views/home/rule/alarm/components/editAlarmLevelDialog.vue
index fe60451..757a42c 100644
--- a/src/views/home/rule/alarm/components/editAlarmLevelDialog.vue
+++ b/src/views/home/rule/alarm/components/editAlarmLevelDialog.vue
@@ -168,11 +168,11 @@
             <el-switch v-model="dataForm.isSend" size="large" active-text="开" inactive-text="关" active-value="1" inactive-value="0" />
           </el-form-item>
         </el-col>
-        <el-col :span="12">
+        <!-- <el-col :span="12">
           <el-form-item label="报警短信" prop="isText">
             <el-switch v-model="dataForm.isText" size="large" active-text="开" inactive-text="关" active-value="1" inactive-value="0" />
           </el-form-item>
-        </el-col>
+        </el-col> -->
       </el-row>
     </el-form>
     <template #footer>
diff --git a/src/views/home/rule/alarm/components/editDialog.vue b/src/views/home/rule/alarm/components/editDialog.vue
index a8c565f..3bd2958 100644
--- a/src/views/home/rule/alarm/components/editDialog.vue
+++ b/src/views/home/rule/alarm/components/editDialog.vue
@@ -226,6 +226,9 @@
   else {
     alarmEventList.value = []
   }
+  if (newVal) {
+    dataForm.value.alarmThreshold = ''
+  }
 }, {
   deep: true,
   immediate: true,
diff --git a/src/views/home/rule/alarm/index.vue b/src/views/home/rule/alarm/index.vue
index fef4bf0..99084a0 100644
--- a/src/views/home/rule/alarm/index.vue
+++ b/src/views/home/rule/alarm/index.vue
@@ -147,7 +147,7 @@
   }))
 
   const res2 = await getAlarmTypeListPage({ offset: 1, limit: 9999 })
-  alarmTypeList.value = uniqueMultiArray(res.data.rows.map((item: any) => ({
+  alarmTypeList.value = uniqueMultiArray(res2.data.rows.map((item: any) => ({
     name: item.alarmType,
     value: item.id,
     id: item.id,
diff --git a/src/views/home/station/control/components/control.vue b/src/views/home/station/control/components/control.vue
index 8d1f867..5ec4b26 100644
--- a/src/views/home/station/control/components/control.vue
+++ b/src/views/home/station/control/components/control.vue
@@ -129,7 +129,7 @@
   flex-wrap: wrap;
 
   .left {
-    width: 62%;
+    width: 55%;
     // background-color: aqua;
     display: flex;
     justify-content: space-around;
@@ -152,7 +152,7 @@
   }
 
   .right {
-    width: 37%;
+    width: 34%;
     // background-color: chartreuse;
     display: flex;
     justify-content: space-around;
diff --git a/src/views/home/station/station/components/detailInfoDialog.vue b/src/views/home/station/station/components/detailInfoDialog.vue
index f44be1a..53bf430 100644
--- a/src/views/home/station/station/components/detailInfoDialog.vue
+++ b/src/views/home/station/station/components/detailInfoDialog.vue
@@ -127,44 +127,39 @@
       <span class="close" @click="close">x</span>
     </div>
     <div class="body">
-      <el-descriptions v-loading="loading" :column="2" border>
-        <el-descriptions-item v-for="item in descriptionsList" :key="item.text" :align="item.align">
-          <template #label>
-            <span class="label">
-              {{ item.text }}
-            </span>
-          </template>
-          {{ detailInfo[item.value] || '' }}
-        </el-descriptions-item>
-      </el-descriptions>
+      <div class="descriptions">
+        <div v-for="item in descriptionsList" :key="item.text" class="descriptions-item">
+          <div class="label">
+            {{ item.text }}
+          </div>
+          <div class="value">
+            {{ detailInfo[item.value] || '' }}
+          </div>
+        </div>
+      </div>
     </div>
   </div>
 </template>
 
 <style lang="scss" scoped>
-::v-deep(.el-descriptions__label) {
-  width: 20%;
-}
-
-::v-deep(.el-descriptions__cell) {
-  padding: 0 !important;
-}
-
 .container {
-  // width: 500px;
-  // padding: 0 10px;
-  background: rgba($color: #feffff, $alpha: 95%);
-  border: 1.5px solid #79b5e6;
+  width: 600px;
+  background: #fff;
   position: relative;
+  border-radius: 8px;
+  border: 1px solid #e4e7ed;
+  overflow: hidden;
+  box-shadow: 0 0 12px rgb(0 0 0 / 12%);
 
   .header {
     float: right;
-    background-color: #ccc;
+    background-color: #5ea1ff;
     width: 100%;
     display: flex;
     justify-content: space-between;
     padding: 2px 10px;
     align-items: center;
+    color: #fff;
 
     .title {
       font-weight: 700;
@@ -176,7 +171,6 @@
     }
 
     .close {
-      color: #4875a0;
       font-size: 22px;
       font-weight: 700;
       text-align: right;
@@ -184,30 +178,55 @@
 
       &:hover {
         cursor: pointer;
-        color: #658eb4;
+        color: #ccc;
       }
     }
   }
 
   .body {
-    // padding: 10px;
-    // display: flex;
-    // flex-wrap: wrap;
     width: 100%;
 
-    .name {
-      width: 30%;
-    }
+    .descriptions {
+      width: 100%;
+      display: flex;
+      flex-wrap: wrap;
+      box-sizing: border-box;
+      padding: 10px 0;
 
-    .value {
-      width: 70%;
+      .descriptions-item {
+        width: 48%;
+        margin: 5px;
+        box-sizing: border-box;
+        display: flex;
+        padding: 0 5px;
+
+        .label {
+          width: 28%;
+          box-sizing: border-box;
+          padding: 0 5px;
+          font-size: 15px;
+          text-align: justify;
+          text-align-last: justify;
+        }
+
+        .value {
+          padding-left: 5px;
+          width: 68%;
+          box-sizing: border-box;
+          white-space: nowrap;
+          font-size: 14px;
+          color: #a39f9f;
+
+          /* 确保文本在一行内显示 */
+          overflow: hidden;
+
+          /* 超出容器部分隐藏 */
+          text-overflow: ellipsis;
+
+          /* 文字溢出显示省略号 */
+        }
+      }
     }
   }
 }
-
-.clearfix::after {
-  content: "";
-  display: table;
-  clear: both;
-}
 </style>

diff --git a/src/api/home/alarm/count.ts b/src/api/home/alarm/count.ts
new file mode 100644
index 0000000..1f4b59a
--- /dev/null
+++ b/src/api/home/alarm/count.ts
@@ -0,0 +1,36 @@
+/**
+ * 报警统计
+ */
+import request from '@/api/index'
+
+// 报警总体情况
+export function getOverallAlarm() {
+  return request({
+    url: '/statics/alarmRecords/overall',
+    method: 'post',
+  })
+}
+// 各类报警统计
+export function getAlarmType(data: any) {
+  return request({
+    url: '/statics/alarmRecords/alarmType',
+    method: 'post',
+    data,
+  })
+}
+// 各单位报警统计
+export function getAlarmCompany(data: any) {
+  return request({
+    url: '/statics/alarmRecords/alarmCompany',
+    method: 'post',
+    data,
+  })
+}
+// 异常位置分析
+export function getAlarmPosition(data: any) {
+  return request({
+    url: '/statics/alarmRecords/alarmPosition',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/views/home/alarm/count/components/alarmStatistics.vue b/src/views/home/alarm/count/components/alarmStatistics.vue
index b009891..b088de2 100644
--- a/src/views/home/alarm/count/components/alarmStatistics.vue
+++ b/src/views/home/alarm/count/components/alarmStatistics.vue
@@ -5,30 +5,79 @@
  -->
 <script lang="ts" setup name="AlarmCount">
 import layout from './layout.vue'
+import { getAlarmType } from '@/api/home/alarm/count'
 const listQuery = ref({
-  type: 'day',
+  timeType: '2',
+  ledgerType: '',
+  deptid: '',
+  begTime: '',
+  endTime: '',
 })
 const selectTimeType = (type: string) => {
-  listQuery.value.type = type
+  listQuery.value.timeType = type
 }
+// 类别
+const ledgerTypeList = ref<{ id: string; name: string; value: string }[]>([
+  {
+    name: '闸井',
+    id: '1',
+    value: '1',
+  },
+  {
+    name: '场站',
+    id: '2',
+    value: '2',
+  },
+  {
+    name: '管线',
+    id: '3',
+    value: '3',
+  },
+])
 const xAxisData = ref([])
 const data = ref([])
 const list = ref([])
-setTimeout(() => {
-  xAxisData.value = [
-    '闸井浓度超限', '场站浓度超限', '场站火焰报警', '疑似第三方破坏', '场站烟雾报警',
-  ]
-  data.value = [
-    {
-      name: '报警数量',
-      data: [1, 3, 5, 1, 4],
-    },
-  ]
-  list.value = xAxisData.value.map((item, index) => ({
-    alarmType: item,
-    value: data.value[0].data[index],
-  }))
-}, 1000)
+const loading = ref(true)
+// 开始结束时间
+const datetimerange = ref()
+// 默认当天
+watch(() => datetimerange.value, (newVal) => {
+  listQuery.value.begTime = ''
+  listQuery.value.endTime = ''
+  if (Array.isArray(newVal)) {
+    if (newVal.length) {
+      listQuery.value.begTime = `${newVal[0]}`
+      listQuery.value.endTime = `${newVal[1]}`
+    }
+  }
+})
+// setTimeout(() => {
+//   xAxisData.value = [
+//     '闸井浓度超限', '场站浓度超限', '场站火焰报警', '疑似第三方破坏', '场站烟雾报警',
+//   ]
+//   data.value = [
+//     {
+//       name: '报警数量',
+//       data: [1, 3, 5, 1, 4],
+//     },
+//   ]
+//   list.value = xAxisData.value.map((item, index) => ({
+//     alarmType: item,
+//     value: data.value[0].data[index],
+//   }))
+// }, 1000)
+const fetchData = () => {
+  loading.value = true
+  getAlarmType(listQuery.value).then((res) => {
+    console.log(res.data, '各类报警统计')
+    loading.value = false
+  }).catch(() => {
+    loading.value = false
+  })
+}
+onMounted(() => {
+  fetchData()
+})
 </script>
 
 <template>
@@ -37,26 +86,22 @@
     <template #search>
       <div class="search">
         <el-button
-          :class="listQuery.type === 'day' ? 'active' : ''" round size="small"
-          @click="selectTimeType('day')"
-        >
-          今日
-        </el-button>
-        <el-button
-          :class="listQuery.type === 'week' ? 'active' : ''" round size="small"
-          @click="selectTimeType('week')"
+          :class="listQuery.timeType === '2' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+          @click="selectTimeType('2')"
         >
           本周
         </el-button>
         <el-button
-          :class="listQuery.type === 'month' ? 'active' : ''" round size="small"
-          @click="selectTimeType('month')"
+          :class="listQuery.timeType === '3' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+          @click="selectTimeType('3')"
         >
           本月
         </el-button>
-        <el-select v-model="listQuery.keywords" placeholder="全部类别" clearable style="width: 180px;margin: 0 5px;" />
+        <el-select v-model="listQuery.ledgerType" placeholder="全部类别" clearable style="width: 180px;margin: 0 5px;">
+          <el-option v-for="item in ledgerTypeList" :key="item.id" :label="item.name" :value="item.id" />
+        </el-select>
         <dept-select
-          v-model="listQuery.keywords" placeholder="管理单位" :clearable="true"
+          v-model="listQuery.deptid" placeholder="管理单位" :clearable="true"
           style="width: 220px;margin: 0 5px;"
         />
         <el-date-picker
@@ -64,18 +109,27 @@
           style="width: 340px;margin: 0 5px;" value-format="YYYY-MM-DD HH:mm:ss" range-separator="至"
           start-placeholder="报警开始时间" end-placeholder="报警结束时间" clearable
         />
-        <el-button type="primary" style="margin: 0 5px;">
+        <el-button type="primary" style="margin: 0 5px;" @click="fetchData">
           搜索
         </el-button>
       </div>
     </template>
     <template #content>
-      <div class="alarm-count">
+      <div v-loading="loading" class="alarm-count">
         <div class="bar">
           <bar-chart-vertical
+            v-show="xAxisData.length"
             :x-axis-data="xAxisData" :bar-coner="0" :data="data" :colors="[]" :bar-width="15"
             :legend="{ itemWidth: 8, itemHeight: 8, type: 'scroll', orient: 'horizontal', icon: 'roundRect', right: '0', top: '10' }"
+            :grid="{
+              top: 50,
+              left: 30,
+              right: 30,
+              bottom: 20,
+              containLabel: true, // 是否包含坐标轴的刻度标签
+            }"
           />
+          <el-empty v-show="!xAxisData.length" description="暂无数据" />
         </div>
         <div class="table">
           <el-table border :data="list" stripe style="width: 100%;" :height="440">
@@ -110,8 +164,9 @@
   }
 
   .table {
-    width: 40%;
+    width: 38%;
     padding: 10px;
+    margin-left: 20px;
   }
 }
 </style>
diff --git a/src/views/home/alarm/count/components/deptCount.vue b/src/views/home/alarm/count/components/deptCount.vue
index 1579231..1ca5482 100644
--- a/src/views/home/alarm/count/components/deptCount.vue
+++ b/src/views/home/alarm/count/components/deptCount.vue
@@ -122,8 +122,9 @@
   }
 
   .table {
-    width: 40%;
+    width: 38%;
     padding: 10px;
+    margin-left: 20px;
   }
 }
 </style>
diff --git a/src/views/home/alarm/count/components/overallAlarm.vue b/src/views/home/alarm/count/components/overallAlarm.vue
index f14ee15..476add8 100644
--- a/src/views/home/alarm/count/components/overallAlarm.vue
+++ b/src/views/home/alarm/count/components/overallAlarm.vue
@@ -5,39 +5,64 @@
  -->
 <script lang="ts" setup name="AlarmCount">
 import layout from './layout.vue'
+import { getOverallAlarm } from '@/api/home/alarm/count'
 const alarmData = ref<any[]>([
   {
     name: '正在报警',
-    value: '7',
+    value: '0',
     unit: '个',
+    type: '1',
   },
   {
     name: '今日报警',
-    value: '2',
+    value: '0',
     unit: '个',
+    type: '2',
   },
   {
     name: '本周报警',
-    value: '12',
+    value: '0',
     unit: '个',
+    type: '3',
   },
   {
     name: '本月报警',
-    value: '25',
+    value: '0',
     unit: '个',
+    type: '4',
   },
   {
     name: '全年报警',
-    value: '208',
+    value: '0',
     unit: '个',
+    type: '5',
   },
 ])
+const loading = ref(true)
+const fetchData = () => {
+  loading.value = true
+  getOverallAlarm().then((res) => {
+    const data = res.data
+    data.forEach((item: any) => {
+      const cindex = alarmData.value.findIndex((citem: any) => citem.type === item.type)
+      if (cindex !== -1) {
+        alarmData.value[cindex].value = item.sum
+      }
+    })
+    loading.value = false
+  }).catch(() => {
+    loading.value = false
+  })
+}
+onMounted(() => {
+  fetchData()
+})
 </script>
 
 <template>
   <layout title="报警总体情况">
     <template #content>
-      <div class="alarm-container">
+      <div v-loading="loading" class="alarm-container">
         <div v-for="item in alarmData" :key="item.name" class="alarm-item">
           <div class="top">
             {{ item.name }}
@@ -63,18 +88,26 @@
     border-left: 4px solid #f24d4d;
     width: 18%;
     padding: 10px;
+    padding-top: 15px;
+    padding-bottom: 15px;
 
     .top {
       padding-left: 10px;
+      font-size: 22px;
+      font-weight: 700;
     }
 
     .bottom {
       text-align: center;
 
       .value {
-        font-size: 18px;
+        font-size: 22px;
         font-weight: 700;
       }
+
+      .unit {
+        font-size: 20px;
+      }
     }
   }
 }
diff --git a/src/views/home/alarm/count/components/trendAnalysis.vue b/src/views/home/alarm/count/components/trendAnalysis.vue
index cea2495..73e18b0 100644
--- a/src/views/home/alarm/count/components/trendAnalysis.vue
+++ b/src/views/home/alarm/count/components/trendAnalysis.vue
@@ -131,8 +131,9 @@
   }
 
   .table {
-    width: 40%;
+    width: 38%;
     padding: 10px;
+    margin-left: 20px;
   }
 }
 </style>
diff --git a/src/views/home/device/device/index.vue b/src/views/home/device/device/index.vue
index 55f12a9..df2cf32 100644
--- a/src/views/home/device/device/index.vue
+++ b/src/views/home/device/device/index.vue
@@ -13,6 +13,7 @@
 import { exportFile } from '@/utils/exportUtils'
 const $router = useRouter()
 const useStatusList = ref<{ id: string; name: string; value: string }[]>([]) // 设备在用情况
+const deviceTypeList = ref<{ id: string; name: string; value: string }[]>([]) // 设备类型
 // 表格数据
 const list = ref<any[]>([])
 const total = ref(0)
@@ -20,18 +21,18 @@
 const columns = ref<any>([
   { text: '状态', value: 'onlineState', align: 'center', isCustom: true, width: '55' },
   { text: '设备编号', value: 'devcode', align: 'center', isRequired: true },
-  { text: '设备类型', value: 'deviceType', align: 'center', isRequired: true },
-  { text: '监测对象', value: 'watchObject', align: 'center' },
+  { text: '设备类型', value: 'deviceTypeName', align: 'center', isRequired: true },
+  { text: '监测对象', value: 'watchObject', align: 'center', width: '85' },
   { text: '设备型号', value: 'deviceModel', align: 'center' },
   { text: '厂商', value: 'manufactureName', align: 'center', isRequired: true },
-  { text: '安装位号', value: 'tagNumber', align: 'center', isRequired: true },
+  { text: '安装位号', value: 'tagNumber', align: 'center', isRequired: true, width: '110' },
   { text: '详细位置', value: 'position', align: 'center', isRequired: true },
   { text: '管理单位', value: 'deptName', align: 'center', isRequired: true },
-  { text: '在用情况', value: 'validName', align: 'center', isRequired: true },
+  { text: '在用情况', value: 'validName', align: 'center', isRequired: true, width: '85' },
   // { text: '布防状态', value: '', align: 'center', isRequired: true },
-  { text: '电量', value: 'cell', align: 'center', isRequired: true },
-  { text: '最新上报时间', value: 'logtime', align: 'center', isRequired: true },
-  { text: '安装日期', value: 'installDate', align: 'center', isRequired: true },
+  { text: '电量', value: 'cell', align: 'center', isRequired: true, width: '70' },
+  { text: '最新上报时间', value: 'logtime', align: 'center', isRequired: true, width: '180' },
+  { text: '安装日期', value: 'installDate', align: 'center', isRequired: true, width: '180' },
 ])
 // 最终展示列
 const columnsConfig = ref([])
@@ -75,6 +76,7 @@
     list.value = res.data.rows.map((item: any) => ({
       ...item,
       validName: useStatusList.value.length ? useStatusList.value[useStatusList.value.findIndex(citem => item.valid === citem.value)].name : '',
+      deviceTypeName: deviceTypeList.value.length ? deviceTypeList.value[deviceTypeList.value.findIndex(citem => item.deviceType === citem.value)].name : '',
     }))
     total.value = res.data.total
     loadingTable.value = false
@@ -178,7 +180,7 @@
   ElMessage.warning('敬请期待')
 }
 const isUsed = ref<{ id: string; name: string; value: string }[]>([]) // 是否启用
-const deviceTypeList = ref<{ id: string; name: string; value: string }[]>([]) // 设备类型
+
 const manufacturerList = ref<{ id: string; name: string; value: string }[]>([]) // 厂商列表
 const cellList = ref<{ id: string; name: string; value: string }[]>([]) // 厂商列表
 
@@ -217,6 +219,12 @@
   // 设备类型
   getDeviceTypeListPage({ limit: 9999, offset: 1 }).then((res) => {
     deviceTypeList.value = res.data.rows.map((item: any) => ({ id: item.id, name: item.typeName, value: item.id }))
+    if (list.value.length) {
+      list.value = list.value.map((item: any) => ({
+        ...item,
+        deviceTypeName: deviceTypeList.value.length ? deviceTypeList.value[deviceTypeList.value.findIndex(citem => item.deviceType === citem.value)].name : '',
+      }))
+    }
   })
   // 厂商
   getManufacturerListPage().then((res) => {
diff --git a/src/views/home/pipeline/components/detailInfoDialog.vue b/src/views/home/pipeline/components/detailInfoDialog.vue
index 31f5635..1662e6e 100644
--- a/src/views/home/pipeline/components/detailInfoDialog.vue
+++ b/src/views/home/pipeline/components/detailInfoDialog.vue
@@ -123,44 +123,39 @@
       <span class="close" @click="close">x</span>
     </div>
     <div class="body">
-      <el-descriptions v-loading="loading" :column="2" border>
-        <el-descriptions-item v-for="item in descriptionsList" :key="item.text" :align="item.align">
-          <template #label>
-            <span class="label">
-              {{ item.text }}
-            </span>
-          </template>
-          {{ detailInfo[item.value] || '' }}
-        </el-descriptions-item>
-      </el-descriptions>
+      <div class="descriptions">
+        <div v-for="item in descriptionsList" :key="item.text" class="descriptions-item">
+          <div class="label">
+            {{ item.text }}
+          </div>
+          <div class="value" :title="detailInfo[item.value] || ''">
+            {{ detailInfo[item.value] || '' }}
+          </div>
+        </div>
+      </div>
     </div>
   </div>
 </template>
 
 <style lang="scss" scoped>
-::v-deep(.el-descriptions__label) {
-  width: 20%;
-}
-
-::v-deep(.el-descriptions__cell) {
-  padding: 0 !important;
-}
-
 .container {
-  // width: 500px;
-  // padding: 0 10px;
-  background: rgba($color: #feffff, $alpha: 95%);
-  border: 1.5px solid #79b5e6;
+  width: 600px;
+  background: #fff;
   position: relative;
+  border-radius: 8px;
+  border: 1px solid #e4e7ed;
+  overflow: hidden;
+  box-shadow: 0 0 12px rgb(0 0 0 / 12%);
 
   .header {
     float: right;
-    background-color: #ccc;
+    background-color: #5ea1ff;
     width: 100%;
     display: flex;
     justify-content: space-between;
     padding: 2px 10px;
     align-items: center;
+    color: #fff;
 
     .title {
       font-weight: 700;
@@ -172,7 +167,6 @@
     }
 
     .close {
-      color: #4875a0;
       font-size: 22px;
       font-weight: 700;
       text-align: right;
@@ -180,30 +174,55 @@
 
       &:hover {
         cursor: pointer;
-        color: #658eb4;
+        color: #ccc;
       }
     }
   }
 
   .body {
-    // padding: 10px;
-    // display: flex;
-    // flex-wrap: wrap;
     width: 100%;
 
-    .name {
-      width: 30%;
-    }
+    .descriptions {
+      width: 100%;
+      display: flex;
+      flex-wrap: wrap;
+      box-sizing: border-box;
+      padding: 10px 0;
 
-    .value {
-      width: 70%;
+      .descriptions-item {
+        width: 48%;
+        margin: 5px;
+        box-sizing: border-box;
+        display: flex;
+        padding: 0 5px;
+
+        .label {
+          width: 30%;
+          box-sizing: border-box;
+          padding: 0 5px;
+          font-size: 15px;
+          text-align: justify;
+          text-align-last: justify;
+        }
+
+        .value {
+          padding-left: 5px;
+          width: 68%;
+          box-sizing: border-box;
+          white-space: nowrap;
+          font-size: 14px;
+          color: #a39f9f;
+
+          /* 确保文本在一行内显示 */
+          overflow: hidden;
+
+          /* 超出容器部分隐藏 */
+          text-overflow: ellipsis;
+
+          /* 文字溢出显示省略号 */
+        }
+      }
     }
   }
 }
-
-.clearfix::after {
-  content: "";
-  display: table;
-  clear: both;
-}
 </style>
diff --git a/src/views/home/pipeline/components/map.vue b/src/views/home/pipeline/components/map.vue
index b956aa0..c7c37be 100644
--- a/src/views/home/pipeline/components/map.vue
+++ b/src/views/home/pipeline/components/map.vue
@@ -176,7 +176,10 @@
   setTimeout(() => {
     // mapRef.value.map.setZoom(14)
     // mapRef.value.map.setFitView()
-    mapRef.value.map.setCenter(data.event.data.lnglat)
+    // mapRef.value.map.setCenter(data.event.data.lnglat)
+    const center = JSON.parse(JSON.stringify(data.event.data.lnglat))
+    center[1] = Number(center[1]) + 0.0035
+    mapRef.value.map.setCenter(center)
   })
   // 关联的管线高亮
   const line = $props.pipe.filter((item: any) => item.pipeCode === data.event.data.row.pipeCode)
@@ -218,7 +221,10 @@
       info: data,
       map: mapRef.value.map,
     })
-    mapRef.value.map.setCenter(data.lnglat)
+    // mapRef.value.map.setCenter(data.lnglat)
+    const center = JSON.parse(JSON.stringify(data.lnglat))
+    center[1] = Number(center[1]) + 0.0035
+    mapRef.value.map.setCenter(center)
   })
 }
 // 重置标记点
diff --git a/src/views/home/pipeline/index.vue b/src/views/home/pipeline/index.vue
index 9ef5426..7eb2f1d 100644
--- a/src/views/home/pipeline/index.vue
+++ b/src/views/home/pipeline/index.vue
@@ -12,8 +12,9 @@
 import { getDictByCode } from '@/api/system/dict'
 // 表格标识  地图或普通
 const mapRef = ref()
-const tableFlag = ref('normal')
+const tableFlag = ref('map')
 const mapLoading = ref(true)
+const mapLoad = ref(false)
 // 表格数据
 const list = ref([])
 const total = ref(0)
@@ -58,7 +59,6 @@
 // 查询数据
 const fetchData = () => {
   loadingTable.value = true
-  mapLoading.value = true
   // 判断是否有查询条件(是地图展示20条  否地图展示所有)
   const queryList = [] as Boolean[] // 长度大于2 即为是
   for (const i in listQuery.value) {
@@ -82,13 +82,13 @@
     }
   }).catch(() => {
     loadingTable.value = false
-    if (queryList.length <= 2) {
-      mapLoading.value = false
-    }
+    mapLoading.value = false
   })
-  if (queryList.length > 2) { return }
+  if (queryList.length > 2 || mapLoad.value) { return }
+  mapLoading.value = true
   // 获取地图全部数据
   getPipelineList(listQuery.value).then((res) => {
+    mapLoad.value = true
     //  管线
     pipeData.value = res.data.map((item: any) => ({
       pipeCode: item.PIPE_CODE,
@@ -104,6 +104,7 @@
     }, 500)
   })
   getPipelineDeviceList(listQuery.value).then((res) => {
+    mapLoad.value = true
     mapList.value = res.data.map((item: { [key: string]: string }) => ({
       deviceTypeName: item.TYPE_NAME,
       tagNumber: item.TAG_NUMBER,
@@ -126,6 +127,7 @@
 }
 // 重置查询条件f
 const reset = () => {
+  mapLoad.value = false
   listQuery.value = {
     limit: 20,
     offset: 1,
@@ -239,6 +241,19 @@
     },
   })
 }
+// 表格高度
+const tableHeight = ref(window.innerHeight - 60 - 50 - 10 - 350 - 98 - 10 - 52 - 52 - 10)
+window.addEventListener('resize', () => {
+  tableHeight.value = window.innerHeight - 60 - 50 - 10 - 350 - 98 - 10 - 52 - 52 - 10
+})
+watch(() => tableFlag.value, (newVal) => {
+  if (newVal === 'map') {
+    tableHeight.value = window.innerHeight - 60 - 50 - 10 - 350 - 98 - 10 - 52 - 52 - 10
+  }
+  else if (newVal === 'normal') {
+    tableHeight.value = window.innerHeight - 60 - 50 - 10 - 98 - 10 - 52 - 52 - 10
+  }
+})
 </script>
 
 <template>
@@ -247,11 +262,9 @@
     <edit-dialog ref="editRef" @refresh="fetchData" />
     <!-- 地图 -->
     <map-com
-      v-if="tableFlag === 'map'" ref="mapRef" v-loading="mapLoading" class="map" :height="450" :data="mapList"
+      v-if="tableFlag === 'map'" ref="mapRef" v-loading="mapLoading" :height="350" :data="mapList"
       :pipe="pipeData"
     />
-    <!-- 占位-地图 -->
-    <div v-if="tableFlag === 'map'" style="height: 450px;" />
     <!-- 收起地图-图标 -->
     <div v-if="tableFlag === 'map'" class="icon" @click="switchMode('normal')">
       <el-icon :size="25">
@@ -260,7 +273,7 @@
     </div>
     <!-- 筛选条件 -->
     <search-area
-      :class="`${tableFlag === 'map' ? 'search-area' : ''}`" :need-clear="true" @search="fetchData"
+      :need-clear="true" @search="fetchData"
       @clear="reset"
     >
       <search-item>
@@ -319,8 +332,6 @@
         </el-select>
       </search-item>
     </search-area>
-    <!-- 筛选条件-地图 -->
-    <div v-if="tableFlag === 'map'" style="height: 114px;" />
     <!-- 表头标题 -->
     <table-container
       :is-config="true" config-title="pipeline-monitor" :columns="columns"
@@ -344,7 +355,7 @@
       </template>
       <!-- 查询结果Table显示 -->
       <normal-table
-        :data="list" :total="total" :columns="columnsConfig" :query="listQuery" :list-loading="loadingTable"
+        :data="list" :total="total" :columns="columnsConfig" :query="listQuery" :list-loading="loadingTable" :height="tableHeight"
         @change="changePage" @rowDbClick="rowClick"
       >
         <template #preColumns>
@@ -382,7 +393,7 @@
 
   .icon {
     position: fixed;
-    top: 550px;
+    top: 450px;
     left: 50%;
     // transform: translateX(-50%);
     z-index: 901;
diff --git a/src/views/home/rule/alarm/components/alarmLevelList.vue b/src/views/home/rule/alarm/components/alarmLevelList.vue
index c1b129d..40c1e43 100644
--- a/src/views/home/rule/alarm/components/alarmLevelList.vue
+++ b/src/views/home/rule/alarm/components/alarmLevelList.vue
@@ -18,7 +18,7 @@
   { text: '报警提示方式', value: 'alarmNoteMethodName', align: 'center' },
   { text: '报警音效', value: 'isSoundName', align: 'center' },
   { text: '报警推送', value: 'isSendName', align: 'center' },
-  { text: '报警短信', value: 'isTextName', align: 'center' },
+  // { text: '报警短信', value: 'isTextName', align: 'center' },
 ])
 const loadingTable = ref(true)
 //  查询条件
diff --git a/src/views/home/rule/alarm/components/editAlarmLevelDialog.vue b/src/views/home/rule/alarm/components/editAlarmLevelDialog.vue
index fe60451..757a42c 100644
--- a/src/views/home/rule/alarm/components/editAlarmLevelDialog.vue
+++ b/src/views/home/rule/alarm/components/editAlarmLevelDialog.vue
@@ -168,11 +168,11 @@
             <el-switch v-model="dataForm.isSend" size="large" active-text="开" inactive-text="关" active-value="1" inactive-value="0" />
           </el-form-item>
         </el-col>
-        <el-col :span="12">
+        <!-- <el-col :span="12">
           <el-form-item label="报警短信" prop="isText">
             <el-switch v-model="dataForm.isText" size="large" active-text="开" inactive-text="关" active-value="1" inactive-value="0" />
           </el-form-item>
-        </el-col>
+        </el-col> -->
       </el-row>
     </el-form>
     <template #footer>
diff --git a/src/views/home/rule/alarm/components/editDialog.vue b/src/views/home/rule/alarm/components/editDialog.vue
index a8c565f..3bd2958 100644
--- a/src/views/home/rule/alarm/components/editDialog.vue
+++ b/src/views/home/rule/alarm/components/editDialog.vue
@@ -226,6 +226,9 @@
   else {
     alarmEventList.value = []
   }
+  if (newVal) {
+    dataForm.value.alarmThreshold = ''
+  }
 }, {
   deep: true,
   immediate: true,
diff --git a/src/views/home/rule/alarm/index.vue b/src/views/home/rule/alarm/index.vue
index fef4bf0..99084a0 100644
--- a/src/views/home/rule/alarm/index.vue
+++ b/src/views/home/rule/alarm/index.vue
@@ -147,7 +147,7 @@
   }))
 
   const res2 = await getAlarmTypeListPage({ offset: 1, limit: 9999 })
-  alarmTypeList.value = uniqueMultiArray(res.data.rows.map((item: any) => ({
+  alarmTypeList.value = uniqueMultiArray(res2.data.rows.map((item: any) => ({
     name: item.alarmType,
     value: item.id,
     id: item.id,
diff --git a/src/views/home/station/control/components/control.vue b/src/views/home/station/control/components/control.vue
index 8d1f867..5ec4b26 100644
--- a/src/views/home/station/control/components/control.vue
+++ b/src/views/home/station/control/components/control.vue
@@ -129,7 +129,7 @@
   flex-wrap: wrap;
 
   .left {
-    width: 62%;
+    width: 55%;
     // background-color: aqua;
     display: flex;
     justify-content: space-around;
@@ -152,7 +152,7 @@
   }
 
   .right {
-    width: 37%;
+    width: 34%;
     // background-color: chartreuse;
     display: flex;
     justify-content: space-around;
diff --git a/src/views/home/station/station/components/detailInfoDialog.vue b/src/views/home/station/station/components/detailInfoDialog.vue
index f44be1a..53bf430 100644
--- a/src/views/home/station/station/components/detailInfoDialog.vue
+++ b/src/views/home/station/station/components/detailInfoDialog.vue
@@ -127,44 +127,39 @@
       <span class="close" @click="close">x</span>
     </div>
     <div class="body">
-      <el-descriptions v-loading="loading" :column="2" border>
-        <el-descriptions-item v-for="item in descriptionsList" :key="item.text" :align="item.align">
-          <template #label>
-            <span class="label">
-              {{ item.text }}
-            </span>
-          </template>
-          {{ detailInfo[item.value] || '' }}
-        </el-descriptions-item>
-      </el-descriptions>
+      <div class="descriptions">
+        <div v-for="item in descriptionsList" :key="item.text" class="descriptions-item">
+          <div class="label">
+            {{ item.text }}
+          </div>
+          <div class="value">
+            {{ detailInfo[item.value] || '' }}
+          </div>
+        </div>
+      </div>
     </div>
   </div>
 </template>
 
 <style lang="scss" scoped>
-::v-deep(.el-descriptions__label) {
-  width: 20%;
-}
-
-::v-deep(.el-descriptions__cell) {
-  padding: 0 !important;
-}
-
 .container {
-  // width: 500px;
-  // padding: 0 10px;
-  background: rgba($color: #feffff, $alpha: 95%);
-  border: 1.5px solid #79b5e6;
+  width: 600px;
+  background: #fff;
   position: relative;
+  border-radius: 8px;
+  border: 1px solid #e4e7ed;
+  overflow: hidden;
+  box-shadow: 0 0 12px rgb(0 0 0 / 12%);
 
   .header {
     float: right;
-    background-color: #ccc;
+    background-color: #5ea1ff;
     width: 100%;
     display: flex;
     justify-content: space-between;
     padding: 2px 10px;
     align-items: center;
+    color: #fff;
 
     .title {
       font-weight: 700;
@@ -176,7 +171,6 @@
     }
 
     .close {
-      color: #4875a0;
       font-size: 22px;
       font-weight: 700;
       text-align: right;
@@ -184,30 +178,55 @@
 
       &:hover {
         cursor: pointer;
-        color: #658eb4;
+        color: #ccc;
       }
     }
   }
 
   .body {
-    // padding: 10px;
-    // display: flex;
-    // flex-wrap: wrap;
     width: 100%;
 
-    .name {
-      width: 30%;
-    }
+    .descriptions {
+      width: 100%;
+      display: flex;
+      flex-wrap: wrap;
+      box-sizing: border-box;
+      padding: 10px 0;
 
-    .value {
-      width: 70%;
+      .descriptions-item {
+        width: 48%;
+        margin: 5px;
+        box-sizing: border-box;
+        display: flex;
+        padding: 0 5px;
+
+        .label {
+          width: 28%;
+          box-sizing: border-box;
+          padding: 0 5px;
+          font-size: 15px;
+          text-align: justify;
+          text-align-last: justify;
+        }
+
+        .value {
+          padding-left: 5px;
+          width: 68%;
+          box-sizing: border-box;
+          white-space: nowrap;
+          font-size: 14px;
+          color: #a39f9f;
+
+          /* 确保文本在一行内显示 */
+          overflow: hidden;
+
+          /* 超出容器部分隐藏 */
+          text-overflow: ellipsis;
+
+          /* 文字溢出显示省略号 */
+        }
+      }
     }
   }
 }
-
-.clearfix::after {
-  content: "";
-  display: table;
-  clear: both;
-}
 </style>
diff --git a/src/views/home/station/station/components/map.vue b/src/views/home/station/station/components/map.vue
index 2351a1d..1c5a64c 100644
--- a/src/views/home/station/station/components/map.vue
+++ b/src/views/home/station/station/components/map.vue
@@ -139,8 +139,11 @@
   })
   setTimeout(() => {
     // mapRef.value.map.setZoom(14)
-    mapRef.value.map.setFitView()
-    mapRef.value.map.setCenter(data.event.data.lnglat)
+    // mapRef.value.map.setFitView()
+    // mapRef.value.map.setCenter(data.event.data.lnglat)
+    const center = JSON.parse(JSON.stringify(data.event.data.lnglat))
+    center[1] = Number(center[1]) + 0.0035
+    mapRef.value.map.setCenter(center)
   })
 }
 
@@ -164,7 +167,11 @@
       info: data,
       map: mapRef.value.map,
     })
-    mapRef.value.map.setCenter(data.lnglat)
+    // mapRef.value.map.setCenter(data.lnglat)
+    // mapRef.value.map.setFitView()
+    const center = JSON.parse(JSON.stringify(data.lnglat))
+    center[1] = Number(center[1]) + 0.0035
+    mapRef.value.map.setCenter(center)
   })
 }
 

diff --git a/src/api/home/alarm/count.ts b/src/api/home/alarm/count.ts
new file mode 100644
index 0000000..1f4b59a
--- /dev/null
+++ b/src/api/home/alarm/count.ts
@@ -0,0 +1,36 @@
+/**
+ * 报警统计
+ */
+import request from '@/api/index'
+
+// 报警总体情况
+export function getOverallAlarm() {
+  return request({
+    url: '/statics/alarmRecords/overall',
+    method: 'post',
+  })
+}
+// 各类报警统计
+export function getAlarmType(data: any) {
+  return request({
+    url: '/statics/alarmRecords/alarmType',
+    method: 'post',
+    data,
+  })
+}
+// 各单位报警统计
+export function getAlarmCompany(data: any) {
+  return request({
+    url: '/statics/alarmRecords/alarmCompany',
+    method: 'post',
+    data,
+  })
+}
+// 异常位置分析
+export function getAlarmPosition(data: any) {
+  return request({
+    url: '/statics/alarmRecords/alarmPosition',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/views/home/alarm/count/components/alarmStatistics.vue b/src/views/home/alarm/count/components/alarmStatistics.vue
index b009891..b088de2 100644
--- a/src/views/home/alarm/count/components/alarmStatistics.vue
+++ b/src/views/home/alarm/count/components/alarmStatistics.vue
@@ -5,30 +5,79 @@
  -->
 <script lang="ts" setup name="AlarmCount">
 import layout from './layout.vue'
+import { getAlarmType } from '@/api/home/alarm/count'
 const listQuery = ref({
-  type: 'day',
+  timeType: '2',
+  ledgerType: '',
+  deptid: '',
+  begTime: '',
+  endTime: '',
 })
 const selectTimeType = (type: string) => {
-  listQuery.value.type = type
+  listQuery.value.timeType = type
 }
+// 类别
+const ledgerTypeList = ref<{ id: string; name: string; value: string }[]>([
+  {
+    name: '闸井',
+    id: '1',
+    value: '1',
+  },
+  {
+    name: '场站',
+    id: '2',
+    value: '2',
+  },
+  {
+    name: '管线',
+    id: '3',
+    value: '3',
+  },
+])
 const xAxisData = ref([])
 const data = ref([])
 const list = ref([])
-setTimeout(() => {
-  xAxisData.value = [
-    '闸井浓度超限', '场站浓度超限', '场站火焰报警', '疑似第三方破坏', '场站烟雾报警',
-  ]
-  data.value = [
-    {
-      name: '报警数量',
-      data: [1, 3, 5, 1, 4],
-    },
-  ]
-  list.value = xAxisData.value.map((item, index) => ({
-    alarmType: item,
-    value: data.value[0].data[index],
-  }))
-}, 1000)
+const loading = ref(true)
+// 开始结束时间
+const datetimerange = ref()
+// 默认当天
+watch(() => datetimerange.value, (newVal) => {
+  listQuery.value.begTime = ''
+  listQuery.value.endTime = ''
+  if (Array.isArray(newVal)) {
+    if (newVal.length) {
+      listQuery.value.begTime = `${newVal[0]}`
+      listQuery.value.endTime = `${newVal[1]}`
+    }
+  }
+})
+// setTimeout(() => {
+//   xAxisData.value = [
+//     '闸井浓度超限', '场站浓度超限', '场站火焰报警', '疑似第三方破坏', '场站烟雾报警',
+//   ]
+//   data.value = [
+//     {
+//       name: '报警数量',
+//       data: [1, 3, 5, 1, 4],
+//     },
+//   ]
+//   list.value = xAxisData.value.map((item, index) => ({
+//     alarmType: item,
+//     value: data.value[0].data[index],
+//   }))
+// }, 1000)
+const fetchData = () => {
+  loading.value = true
+  getAlarmType(listQuery.value).then((res) => {
+    console.log(res.data, '各类报警统计')
+    loading.value = false
+  }).catch(() => {
+    loading.value = false
+  })
+}
+onMounted(() => {
+  fetchData()
+})
 </script>
 
 <template>
@@ -37,26 +86,22 @@
     <template #search>
       <div class="search">
         <el-button
-          :class="listQuery.type === 'day' ? 'active' : ''" round size="small"
-          @click="selectTimeType('day')"
-        >
-          今日
-        </el-button>
-        <el-button
-          :class="listQuery.type === 'week' ? 'active' : ''" round size="small"
-          @click="selectTimeType('week')"
+          :class="listQuery.timeType === '2' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+          @click="selectTimeType('2')"
         >
           本周
         </el-button>
         <el-button
-          :class="listQuery.type === 'month' ? 'active' : ''" round size="small"
-          @click="selectTimeType('month')"
+          :class="listQuery.timeType === '3' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+          @click="selectTimeType('3')"
         >
           本月
         </el-button>
-        <el-select v-model="listQuery.keywords" placeholder="全部类别" clearable style="width: 180px;margin: 0 5px;" />
+        <el-select v-model="listQuery.ledgerType" placeholder="全部类别" clearable style="width: 180px;margin: 0 5px;">
+          <el-option v-for="item in ledgerTypeList" :key="item.id" :label="item.name" :value="item.id" />
+        </el-select>
         <dept-select
-          v-model="listQuery.keywords" placeholder="管理单位" :clearable="true"
+          v-model="listQuery.deptid" placeholder="管理单位" :clearable="true"
           style="width: 220px;margin: 0 5px;"
         />
         <el-date-picker
@@ -64,18 +109,27 @@
           style="width: 340px;margin: 0 5px;" value-format="YYYY-MM-DD HH:mm:ss" range-separator="至"
           start-placeholder="报警开始时间" end-placeholder="报警结束时间" clearable
         />
-        <el-button type="primary" style="margin: 0 5px;">
+        <el-button type="primary" style="margin: 0 5px;" @click="fetchData">
           搜索
         </el-button>
       </div>
     </template>
     <template #content>
-      <div class="alarm-count">
+      <div v-loading="loading" class="alarm-count">
         <div class="bar">
           <bar-chart-vertical
+            v-show="xAxisData.length"
             :x-axis-data="xAxisData" :bar-coner="0" :data="data" :colors="[]" :bar-width="15"
             :legend="{ itemWidth: 8, itemHeight: 8, type: 'scroll', orient: 'horizontal', icon: 'roundRect', right: '0', top: '10' }"
+            :grid="{
+              top: 50,
+              left: 30,
+              right: 30,
+              bottom: 20,
+              containLabel: true, // 是否包含坐标轴的刻度标签
+            }"
           />
+          <el-empty v-show="!xAxisData.length" description="暂无数据" />
         </div>
         <div class="table">
           <el-table border :data="list" stripe style="width: 100%;" :height="440">
@@ -110,8 +164,9 @@
   }
 
   .table {
-    width: 40%;
+    width: 38%;
     padding: 10px;
+    margin-left: 20px;
   }
 }
 </style>
diff --git a/src/views/home/alarm/count/components/deptCount.vue b/src/views/home/alarm/count/components/deptCount.vue
index 1579231..1ca5482 100644
--- a/src/views/home/alarm/count/components/deptCount.vue
+++ b/src/views/home/alarm/count/components/deptCount.vue
@@ -122,8 +122,9 @@
   }
 
   .table {
-    width: 40%;
+    width: 38%;
     padding: 10px;
+    margin-left: 20px;
   }
 }
 </style>
diff --git a/src/views/home/alarm/count/components/overallAlarm.vue b/src/views/home/alarm/count/components/overallAlarm.vue
index f14ee15..476add8 100644
--- a/src/views/home/alarm/count/components/overallAlarm.vue
+++ b/src/views/home/alarm/count/components/overallAlarm.vue
@@ -5,39 +5,64 @@
  -->
 <script lang="ts" setup name="AlarmCount">
 import layout from './layout.vue'
+import { getOverallAlarm } from '@/api/home/alarm/count'
 const alarmData = ref<any[]>([
   {
     name: '正在报警',
-    value: '7',
+    value: '0',
     unit: '个',
+    type: '1',
   },
   {
     name: '今日报警',
-    value: '2',
+    value: '0',
     unit: '个',
+    type: '2',
   },
   {
     name: '本周报警',
-    value: '12',
+    value: '0',
     unit: '个',
+    type: '3',
   },
   {
     name: '本月报警',
-    value: '25',
+    value: '0',
     unit: '个',
+    type: '4',
   },
   {
     name: '全年报警',
-    value: '208',
+    value: '0',
     unit: '个',
+    type: '5',
   },
 ])
+const loading = ref(true)
+const fetchData = () => {
+  loading.value = true
+  getOverallAlarm().then((res) => {
+    const data = res.data
+    data.forEach((item: any) => {
+      const cindex = alarmData.value.findIndex((citem: any) => citem.type === item.type)
+      if (cindex !== -1) {
+        alarmData.value[cindex].value = item.sum
+      }
+    })
+    loading.value = false
+  }).catch(() => {
+    loading.value = false
+  })
+}
+onMounted(() => {
+  fetchData()
+})
 </script>
 
 <template>
   <layout title="报警总体情况">
     <template #content>
-      <div class="alarm-container">
+      <div v-loading="loading" class="alarm-container">
         <div v-for="item in alarmData" :key="item.name" class="alarm-item">
           <div class="top">
             {{ item.name }}
@@ -63,18 +88,26 @@
     border-left: 4px solid #f24d4d;
     width: 18%;
     padding: 10px;
+    padding-top: 15px;
+    padding-bottom: 15px;
 
     .top {
       padding-left: 10px;
+      font-size: 22px;
+      font-weight: 700;
     }
 
     .bottom {
       text-align: center;
 
       .value {
-        font-size: 18px;
+        font-size: 22px;
         font-weight: 700;
       }
+
+      .unit {
+        font-size: 20px;
+      }
     }
   }
 }
diff --git a/src/views/home/alarm/count/components/trendAnalysis.vue b/src/views/home/alarm/count/components/trendAnalysis.vue
index cea2495..73e18b0 100644
--- a/src/views/home/alarm/count/components/trendAnalysis.vue
+++ b/src/views/home/alarm/count/components/trendAnalysis.vue
@@ -131,8 +131,9 @@
   }
 
   .table {
-    width: 40%;
+    width: 38%;
     padding: 10px;
+    margin-left: 20px;
   }
 }
 </style>
diff --git a/src/views/home/device/device/index.vue b/src/views/home/device/device/index.vue
index 55f12a9..df2cf32 100644
--- a/src/views/home/device/device/index.vue
+++ b/src/views/home/device/device/index.vue
@@ -13,6 +13,7 @@
 import { exportFile } from '@/utils/exportUtils'
 const $router = useRouter()
 const useStatusList = ref<{ id: string; name: string; value: string }[]>([]) // 设备在用情况
+const deviceTypeList = ref<{ id: string; name: string; value: string }[]>([]) // 设备类型
 // 表格数据
 const list = ref<any[]>([])
 const total = ref(0)
@@ -20,18 +21,18 @@
 const columns = ref<any>([
   { text: '状态', value: 'onlineState', align: 'center', isCustom: true, width: '55' },
   { text: '设备编号', value: 'devcode', align: 'center', isRequired: true },
-  { text: '设备类型', value: 'deviceType', align: 'center', isRequired: true },
-  { text: '监测对象', value: 'watchObject', align: 'center' },
+  { text: '设备类型', value: 'deviceTypeName', align: 'center', isRequired: true },
+  { text: '监测对象', value: 'watchObject', align: 'center', width: '85' },
   { text: '设备型号', value: 'deviceModel', align: 'center' },
   { text: '厂商', value: 'manufactureName', align: 'center', isRequired: true },
-  { text: '安装位号', value: 'tagNumber', align: 'center', isRequired: true },
+  { text: '安装位号', value: 'tagNumber', align: 'center', isRequired: true, width: '110' },
   { text: '详细位置', value: 'position', align: 'center', isRequired: true },
   { text: '管理单位', value: 'deptName', align: 'center', isRequired: true },
-  { text: '在用情况', value: 'validName', align: 'center', isRequired: true },
+  { text: '在用情况', value: 'validName', align: 'center', isRequired: true, width: '85' },
   // { text: '布防状态', value: '', align: 'center', isRequired: true },
-  { text: '电量', value: 'cell', align: 'center', isRequired: true },
-  { text: '最新上报时间', value: 'logtime', align: 'center', isRequired: true },
-  { text: '安装日期', value: 'installDate', align: 'center', isRequired: true },
+  { text: '电量', value: 'cell', align: 'center', isRequired: true, width: '70' },
+  { text: '最新上报时间', value: 'logtime', align: 'center', isRequired: true, width: '180' },
+  { text: '安装日期', value: 'installDate', align: 'center', isRequired: true, width: '180' },
 ])
 // 最终展示列
 const columnsConfig = ref([])
@@ -75,6 +76,7 @@
     list.value = res.data.rows.map((item: any) => ({
       ...item,
       validName: useStatusList.value.length ? useStatusList.value[useStatusList.value.findIndex(citem => item.valid === citem.value)].name : '',
+      deviceTypeName: deviceTypeList.value.length ? deviceTypeList.value[deviceTypeList.value.findIndex(citem => item.deviceType === citem.value)].name : '',
     }))
     total.value = res.data.total
     loadingTable.value = false
@@ -178,7 +180,7 @@
   ElMessage.warning('敬请期待')
 }
 const isUsed = ref<{ id: string; name: string; value: string }[]>([]) // 是否启用
-const deviceTypeList = ref<{ id: string; name: string; value: string }[]>([]) // 设备类型
+
 const manufacturerList = ref<{ id: string; name: string; value: string }[]>([]) // 厂商列表
 const cellList = ref<{ id: string; name: string; value: string }[]>([]) // 厂商列表
 
@@ -217,6 +219,12 @@
   // 设备类型
   getDeviceTypeListPage({ limit: 9999, offset: 1 }).then((res) => {
     deviceTypeList.value = res.data.rows.map((item: any) => ({ id: item.id, name: item.typeName, value: item.id }))
+    if (list.value.length) {
+      list.value = list.value.map((item: any) => ({
+        ...item,
+        deviceTypeName: deviceTypeList.value.length ? deviceTypeList.value[deviceTypeList.value.findIndex(citem => item.deviceType === citem.value)].name : '',
+      }))
+    }
   })
   // 厂商
   getManufacturerListPage().then((res) => {
diff --git a/src/views/home/pipeline/components/detailInfoDialog.vue b/src/views/home/pipeline/components/detailInfoDialog.vue
index 31f5635..1662e6e 100644
--- a/src/views/home/pipeline/components/detailInfoDialog.vue
+++ b/src/views/home/pipeline/components/detailInfoDialog.vue
@@ -123,44 +123,39 @@
       <span class="close" @click="close">x</span>
     </div>
     <div class="body">
-      <el-descriptions v-loading="loading" :column="2" border>
-        <el-descriptions-item v-for="item in descriptionsList" :key="item.text" :align="item.align">
-          <template #label>
-            <span class="label">
-              {{ item.text }}
-            </span>
-          </template>
-          {{ detailInfo[item.value] || '' }}
-        </el-descriptions-item>
-      </el-descriptions>
+      <div class="descriptions">
+        <div v-for="item in descriptionsList" :key="item.text" class="descriptions-item">
+          <div class="label">
+            {{ item.text }}
+          </div>
+          <div class="value" :title="detailInfo[item.value] || ''">
+            {{ detailInfo[item.value] || '' }}
+          </div>
+        </div>
+      </div>
     </div>
   </div>
 </template>
 
 <style lang="scss" scoped>
-::v-deep(.el-descriptions__label) {
-  width: 20%;
-}
-
-::v-deep(.el-descriptions__cell) {
-  padding: 0 !important;
-}
-
 .container {
-  // width: 500px;
-  // padding: 0 10px;
-  background: rgba($color: #feffff, $alpha: 95%);
-  border: 1.5px solid #79b5e6;
+  width: 600px;
+  background: #fff;
   position: relative;
+  border-radius: 8px;
+  border: 1px solid #e4e7ed;
+  overflow: hidden;
+  box-shadow: 0 0 12px rgb(0 0 0 / 12%);
 
   .header {
     float: right;
-    background-color: #ccc;
+    background-color: #5ea1ff;
     width: 100%;
     display: flex;
     justify-content: space-between;
     padding: 2px 10px;
     align-items: center;
+    color: #fff;
 
     .title {
       font-weight: 700;
@@ -172,7 +167,6 @@
     }
 
     .close {
-      color: #4875a0;
       font-size: 22px;
       font-weight: 700;
       text-align: right;
@@ -180,30 +174,55 @@
 
       &:hover {
         cursor: pointer;
-        color: #658eb4;
+        color: #ccc;
       }
     }
   }
 
   .body {
-    // padding: 10px;
-    // display: flex;
-    // flex-wrap: wrap;
     width: 100%;
 
-    .name {
-      width: 30%;
-    }
+    .descriptions {
+      width: 100%;
+      display: flex;
+      flex-wrap: wrap;
+      box-sizing: border-box;
+      padding: 10px 0;
 
-    .value {
-      width: 70%;
+      .descriptions-item {
+        width: 48%;
+        margin: 5px;
+        box-sizing: border-box;
+        display: flex;
+        padding: 0 5px;
+
+        .label {
+          width: 30%;
+          box-sizing: border-box;
+          padding: 0 5px;
+          font-size: 15px;
+          text-align: justify;
+          text-align-last: justify;
+        }
+
+        .value {
+          padding-left: 5px;
+          width: 68%;
+          box-sizing: border-box;
+          white-space: nowrap;
+          font-size: 14px;
+          color: #a39f9f;
+
+          /* 确保文本在一行内显示 */
+          overflow: hidden;
+
+          /* 超出容器部分隐藏 */
+          text-overflow: ellipsis;
+
+          /* 文字溢出显示省略号 */
+        }
+      }
     }
   }
 }
-
-.clearfix::after {
-  content: "";
-  display: table;
-  clear: both;
-}
 </style>
diff --git a/src/views/home/pipeline/components/map.vue b/src/views/home/pipeline/components/map.vue
index b956aa0..c7c37be 100644
--- a/src/views/home/pipeline/components/map.vue
+++ b/src/views/home/pipeline/components/map.vue
@@ -176,7 +176,10 @@
   setTimeout(() => {
     // mapRef.value.map.setZoom(14)
     // mapRef.value.map.setFitView()
-    mapRef.value.map.setCenter(data.event.data.lnglat)
+    // mapRef.value.map.setCenter(data.event.data.lnglat)
+    const center = JSON.parse(JSON.stringify(data.event.data.lnglat))
+    center[1] = Number(center[1]) + 0.0035
+    mapRef.value.map.setCenter(center)
   })
   // 关联的管线高亮
   const line = $props.pipe.filter((item: any) => item.pipeCode === data.event.data.row.pipeCode)
@@ -218,7 +221,10 @@
       info: data,
       map: mapRef.value.map,
     })
-    mapRef.value.map.setCenter(data.lnglat)
+    // mapRef.value.map.setCenter(data.lnglat)
+    const center = JSON.parse(JSON.stringify(data.lnglat))
+    center[1] = Number(center[1]) + 0.0035
+    mapRef.value.map.setCenter(center)
   })
 }
 // 重置标记点
diff --git a/src/views/home/pipeline/index.vue b/src/views/home/pipeline/index.vue
index 9ef5426..7eb2f1d 100644
--- a/src/views/home/pipeline/index.vue
+++ b/src/views/home/pipeline/index.vue
@@ -12,8 +12,9 @@
 import { getDictByCode } from '@/api/system/dict'
 // 表格标识  地图或普通
 const mapRef = ref()
-const tableFlag = ref('normal')
+const tableFlag = ref('map')
 const mapLoading = ref(true)
+const mapLoad = ref(false)
 // 表格数据
 const list = ref([])
 const total = ref(0)
@@ -58,7 +59,6 @@
 // 查询数据
 const fetchData = () => {
   loadingTable.value = true
-  mapLoading.value = true
   // 判断是否有查询条件(是地图展示20条  否地图展示所有)
   const queryList = [] as Boolean[] // 长度大于2 即为是
   for (const i in listQuery.value) {
@@ -82,13 +82,13 @@
     }
   }).catch(() => {
     loadingTable.value = false
-    if (queryList.length <= 2) {
-      mapLoading.value = false
-    }
+    mapLoading.value = false
   })
-  if (queryList.length > 2) { return }
+  if (queryList.length > 2 || mapLoad.value) { return }
+  mapLoading.value = true
   // 获取地图全部数据
   getPipelineList(listQuery.value).then((res) => {
+    mapLoad.value = true
     //  管线
     pipeData.value = res.data.map((item: any) => ({
       pipeCode: item.PIPE_CODE,
@@ -104,6 +104,7 @@
     }, 500)
   })
   getPipelineDeviceList(listQuery.value).then((res) => {
+    mapLoad.value = true
     mapList.value = res.data.map((item: { [key: string]: string }) => ({
       deviceTypeName: item.TYPE_NAME,
       tagNumber: item.TAG_NUMBER,
@@ -126,6 +127,7 @@
 }
 // 重置查询条件f
 const reset = () => {
+  mapLoad.value = false
   listQuery.value = {
     limit: 20,
     offset: 1,
@@ -239,6 +241,19 @@
     },
   })
 }
+// 表格高度
+const tableHeight = ref(window.innerHeight - 60 - 50 - 10 - 350 - 98 - 10 - 52 - 52 - 10)
+window.addEventListener('resize', () => {
+  tableHeight.value = window.innerHeight - 60 - 50 - 10 - 350 - 98 - 10 - 52 - 52 - 10
+})
+watch(() => tableFlag.value, (newVal) => {
+  if (newVal === 'map') {
+    tableHeight.value = window.innerHeight - 60 - 50 - 10 - 350 - 98 - 10 - 52 - 52 - 10
+  }
+  else if (newVal === 'normal') {
+    tableHeight.value = window.innerHeight - 60 - 50 - 10 - 98 - 10 - 52 - 52 - 10
+  }
+})
 </script>
 
 <template>
@@ -247,11 +262,9 @@
     <edit-dialog ref="editRef" @refresh="fetchData" />
     <!-- 地图 -->
     <map-com
-      v-if="tableFlag === 'map'" ref="mapRef" v-loading="mapLoading" class="map" :height="450" :data="mapList"
+      v-if="tableFlag === 'map'" ref="mapRef" v-loading="mapLoading" :height="350" :data="mapList"
       :pipe="pipeData"
     />
-    <!-- 占位-地图 -->
-    <div v-if="tableFlag === 'map'" style="height: 450px;" />
     <!-- 收起地图-图标 -->
     <div v-if="tableFlag === 'map'" class="icon" @click="switchMode('normal')">
       <el-icon :size="25">
@@ -260,7 +273,7 @@
     </div>
     <!-- 筛选条件 -->
     <search-area
-      :class="`${tableFlag === 'map' ? 'search-area' : ''}`" :need-clear="true" @search="fetchData"
+      :need-clear="true" @search="fetchData"
       @clear="reset"
     >
       <search-item>
@@ -319,8 +332,6 @@
         </el-select>
       </search-item>
     </search-area>
-    <!-- 筛选条件-地图 -->
-    <div v-if="tableFlag === 'map'" style="height: 114px;" />
     <!-- 表头标题 -->
     <table-container
       :is-config="true" config-title="pipeline-monitor" :columns="columns"
@@ -344,7 +355,7 @@
       </template>
       <!-- 查询结果Table显示 -->
       <normal-table
-        :data="list" :total="total" :columns="columnsConfig" :query="listQuery" :list-loading="loadingTable"
+        :data="list" :total="total" :columns="columnsConfig" :query="listQuery" :list-loading="loadingTable" :height="tableHeight"
         @change="changePage" @rowDbClick="rowClick"
       >
         <template #preColumns>
@@ -382,7 +393,7 @@
 
   .icon {
     position: fixed;
-    top: 550px;
+    top: 450px;
     left: 50%;
     // transform: translateX(-50%);
     z-index: 901;
diff --git a/src/views/home/rule/alarm/components/alarmLevelList.vue b/src/views/home/rule/alarm/components/alarmLevelList.vue
index c1b129d..40c1e43 100644
--- a/src/views/home/rule/alarm/components/alarmLevelList.vue
+++ b/src/views/home/rule/alarm/components/alarmLevelList.vue
@@ -18,7 +18,7 @@
   { text: '报警提示方式', value: 'alarmNoteMethodName', align: 'center' },
   { text: '报警音效', value: 'isSoundName', align: 'center' },
   { text: '报警推送', value: 'isSendName', align: 'center' },
-  { text: '报警短信', value: 'isTextName', align: 'center' },
+  // { text: '报警短信', value: 'isTextName', align: 'center' },
 ])
 const loadingTable = ref(true)
 //  查询条件
diff --git a/src/views/home/rule/alarm/components/editAlarmLevelDialog.vue b/src/views/home/rule/alarm/components/editAlarmLevelDialog.vue
index fe60451..757a42c 100644
--- a/src/views/home/rule/alarm/components/editAlarmLevelDialog.vue
+++ b/src/views/home/rule/alarm/components/editAlarmLevelDialog.vue
@@ -168,11 +168,11 @@
             <el-switch v-model="dataForm.isSend" size="large" active-text="开" inactive-text="关" active-value="1" inactive-value="0" />
           </el-form-item>
         </el-col>
-        <el-col :span="12">
+        <!-- <el-col :span="12">
           <el-form-item label="报警短信" prop="isText">
             <el-switch v-model="dataForm.isText" size="large" active-text="开" inactive-text="关" active-value="1" inactive-value="0" />
           </el-form-item>
-        </el-col>
+        </el-col> -->
       </el-row>
     </el-form>
     <template #footer>
diff --git a/src/views/home/rule/alarm/components/editDialog.vue b/src/views/home/rule/alarm/components/editDialog.vue
index a8c565f..3bd2958 100644
--- a/src/views/home/rule/alarm/components/editDialog.vue
+++ b/src/views/home/rule/alarm/components/editDialog.vue
@@ -226,6 +226,9 @@
   else {
     alarmEventList.value = []
   }
+  if (newVal) {
+    dataForm.value.alarmThreshold = ''
+  }
 }, {
   deep: true,
   immediate: true,
diff --git a/src/views/home/rule/alarm/index.vue b/src/views/home/rule/alarm/index.vue
index fef4bf0..99084a0 100644
--- a/src/views/home/rule/alarm/index.vue
+++ b/src/views/home/rule/alarm/index.vue
@@ -147,7 +147,7 @@
   }))
 
   const res2 = await getAlarmTypeListPage({ offset: 1, limit: 9999 })
-  alarmTypeList.value = uniqueMultiArray(res.data.rows.map((item: any) => ({
+  alarmTypeList.value = uniqueMultiArray(res2.data.rows.map((item: any) => ({
     name: item.alarmType,
     value: item.id,
     id: item.id,
diff --git a/src/views/home/station/control/components/control.vue b/src/views/home/station/control/components/control.vue
index 8d1f867..5ec4b26 100644
--- a/src/views/home/station/control/components/control.vue
+++ b/src/views/home/station/control/components/control.vue
@@ -129,7 +129,7 @@
   flex-wrap: wrap;
 
   .left {
-    width: 62%;
+    width: 55%;
     // background-color: aqua;
     display: flex;
     justify-content: space-around;
@@ -152,7 +152,7 @@
   }
 
   .right {
-    width: 37%;
+    width: 34%;
     // background-color: chartreuse;
     display: flex;
     justify-content: space-around;
diff --git a/src/views/home/station/station/components/detailInfoDialog.vue b/src/views/home/station/station/components/detailInfoDialog.vue
index f44be1a..53bf430 100644
--- a/src/views/home/station/station/components/detailInfoDialog.vue
+++ b/src/views/home/station/station/components/detailInfoDialog.vue
@@ -127,44 +127,39 @@
       <span class="close" @click="close">x</span>
     </div>
     <div class="body">
-      <el-descriptions v-loading="loading" :column="2" border>
-        <el-descriptions-item v-for="item in descriptionsList" :key="item.text" :align="item.align">
-          <template #label>
-            <span class="label">
-              {{ item.text }}
-            </span>
-          </template>
-          {{ detailInfo[item.value] || '' }}
-        </el-descriptions-item>
-      </el-descriptions>
+      <div class="descriptions">
+        <div v-for="item in descriptionsList" :key="item.text" class="descriptions-item">
+          <div class="label">
+            {{ item.text }}
+          </div>
+          <div class="value">
+            {{ detailInfo[item.value] || '' }}
+          </div>
+        </div>
+      </div>
     </div>
   </div>
 </template>
 
 <style lang="scss" scoped>
-::v-deep(.el-descriptions__label) {
-  width: 20%;
-}
-
-::v-deep(.el-descriptions__cell) {
-  padding: 0 !important;
-}
-
 .container {
-  // width: 500px;
-  // padding: 0 10px;
-  background: rgba($color: #feffff, $alpha: 95%);
-  border: 1.5px solid #79b5e6;
+  width: 600px;
+  background: #fff;
   position: relative;
+  border-radius: 8px;
+  border: 1px solid #e4e7ed;
+  overflow: hidden;
+  box-shadow: 0 0 12px rgb(0 0 0 / 12%);
 
   .header {
     float: right;
-    background-color: #ccc;
+    background-color: #5ea1ff;
     width: 100%;
     display: flex;
     justify-content: space-between;
     padding: 2px 10px;
     align-items: center;
+    color: #fff;
 
     .title {
       font-weight: 700;
@@ -176,7 +171,6 @@
     }
 
     .close {
-      color: #4875a0;
       font-size: 22px;
       font-weight: 700;
       text-align: right;
@@ -184,30 +178,55 @@
 
       &:hover {
         cursor: pointer;
-        color: #658eb4;
+        color: #ccc;
       }
     }
   }
 
   .body {
-    // padding: 10px;
-    // display: flex;
-    // flex-wrap: wrap;
     width: 100%;
 
-    .name {
-      width: 30%;
-    }
+    .descriptions {
+      width: 100%;
+      display: flex;
+      flex-wrap: wrap;
+      box-sizing: border-box;
+      padding: 10px 0;
 
-    .value {
-      width: 70%;
+      .descriptions-item {
+        width: 48%;
+        margin: 5px;
+        box-sizing: border-box;
+        display: flex;
+        padding: 0 5px;
+
+        .label {
+          width: 28%;
+          box-sizing: border-box;
+          padding: 0 5px;
+          font-size: 15px;
+          text-align: justify;
+          text-align-last: justify;
+        }
+
+        .value {
+          padding-left: 5px;
+          width: 68%;
+          box-sizing: border-box;
+          white-space: nowrap;
+          font-size: 14px;
+          color: #a39f9f;
+
+          /* 确保文本在一行内显示 */
+          overflow: hidden;
+
+          /* 超出容器部分隐藏 */
+          text-overflow: ellipsis;
+
+          /* 文字溢出显示省略号 */
+        }
+      }
     }
   }
 }
-
-.clearfix::after {
-  content: "";
-  display: table;
-  clear: both;
-}
 </style>
diff --git a/src/views/home/station/station/components/map.vue b/src/views/home/station/station/components/map.vue
index 2351a1d..1c5a64c 100644
--- a/src/views/home/station/station/components/map.vue
+++ b/src/views/home/station/station/components/map.vue
@@ -139,8 +139,11 @@
   })
   setTimeout(() => {
     // mapRef.value.map.setZoom(14)
-    mapRef.value.map.setFitView()
-    mapRef.value.map.setCenter(data.event.data.lnglat)
+    // mapRef.value.map.setFitView()
+    // mapRef.value.map.setCenter(data.event.data.lnglat)
+    const center = JSON.parse(JSON.stringify(data.event.data.lnglat))
+    center[1] = Number(center[1]) + 0.0035
+    mapRef.value.map.setCenter(center)
   })
 }
 
@@ -164,7 +167,11 @@
       info: data,
       map: mapRef.value.map,
     })
-    mapRef.value.map.setCenter(data.lnglat)
+    // mapRef.value.map.setCenter(data.lnglat)
+    // mapRef.value.map.setFitView()
+    const center = JSON.parse(JSON.stringify(data.lnglat))
+    center[1] = Number(center[1]) + 0.0035
+    mapRef.value.map.setCenter(center)
   })
 }
 
diff --git a/src/views/home/station/station/index.vue b/src/views/home/station/station/index.vue
index 636cbad..0b2599e 100644
--- a/src/views/home/station/station/index.vue
+++ b/src/views/home/station/station/index.vue
@@ -12,8 +12,9 @@
 import { getDictByCode } from '@/api/system/dict'
 // 表格标识  地图或普通
 const mapRef = ref()
-const tableFlag = ref('normal')
+const tableFlag = ref('map')
 const mapLoading = ref(true)
+const mapLoad = ref(false)
 // 表格数据
 const list = ref([])
 const total = ref(0)
@@ -56,7 +57,6 @@
 // 查询数据
 const fetchData = () => {
   loadingTable.value = true
-  mapLoading.value = true
   // 判断是否有查询条件(是地图展示20条  否地图展示所有)
   const queryList = [] as Boolean[] // 长度大于2 即为是
   for (const i in listQuery.value) {
@@ -79,13 +79,13 @@
     }
   }).catch(() => {
     loadingTable.value = false
-    if (queryList.length <= 2) {
-      mapLoading.value = false
-    }
+    mapLoading.value = false
   })
-  if (queryList.length > 2) { return }
+  if (queryList.length > 2 || mapLoad.value) { return }
   // 获取地图全部数据
+  mapLoading.value = true
   getStationList(listQuery.value).then((res) => {
+    mapLoad.value = true
     mapList.value = res.data
     setTimeout(() => {
       if (tableFlag.value === 'map') {
@@ -99,6 +99,7 @@
 }
 // 重置查询条件f
 const reset = () => {
+  mapLoad.value = false
   listQuery.value = {
     limit: 20,
     offset: 1,
@@ -179,6 +180,19 @@
     },
   })
 }
+// 表格高度
+const tableHeight = ref(window.innerHeight - 60 - 50 - 10 - 350 - 98 - 10 - 52 - 52 - 10)
+window.addEventListener('resize', () => {
+  tableHeight.value = window.innerHeight - 60 - 50 - 10 - 350 - 98 - 10 - 52 - 52 - 10
+})
+watch(() => tableFlag.value, (newVal) => {
+  if (newVal === 'map') {
+    tableHeight.value = window.innerHeight - 60 - 50 - 10 - 350 - 98 - 10 - 52 - 52 - 10
+  }
+  else if (newVal === 'normal') {
+    tableHeight.value = window.innerHeight - 60 - 50 - 10 - 98 - 10 - 52 - 52 - 10
+  }
+})
 </script>
 
 <template>
@@ -186,9 +200,7 @@
   <app-container class="container">
     <edit-dialog ref="editRef" @refresh="fetchData" />
     <!-- 地图 -->
-    <map-com v-if="tableFlag === 'map'" ref="mapRef" v-loading="mapLoading" class="map" :height="450" :data="mapList" />
-    <!-- 占位-地图 -->
-    <div v-if="tableFlag === 'map'" style="height: 450px;" />
+    <map-com v-if="tableFlag === 'map'" ref="mapRef" v-loading="mapLoading" :height="350" :data="mapList" />
     <!-- 收起地图-图标 -->
     <div v-if="tableFlag === 'map'" class="icon" @click="switchMode('normal')">
       <el-icon :size="25">
@@ -197,7 +209,7 @@
     </div>
     <!-- 筛选条件 -->
     <search-area
-      :class="`${tableFlag === 'map' ? 'search-area' : ''}`" :need-clear="true" @search="fetchData"
+      :need-clear="true" @search="fetchData"
       @clear="reset"
     >
       <search-item>
@@ -229,8 +241,6 @@
         </el-select>
       </search-item>
     </search-area>
-    <!-- 筛选条件-地图 -->
-    <div v-if="tableFlag === 'map'" style="height: 56px;" />
     <!-- 表头标题 -->
     <table-container
       :is-config="true" config-title="station-monitor" :columns="columns" :config-columns="columnsConfig"
@@ -254,7 +264,7 @@
       </template>
       <!-- 查询结果Table显示 -->
       <normal-table
-        :data="list" :total="total" :columns="columnsConfig" :query="listQuery" :list-loading="loadingTable"
+        :data="list" :total="total" :columns="columnsConfig" :query="listQuery" :list-loading="loadingTable" :height="tableHeight"
         @change="changePage" @rowDbClick="rowClick"
       >
         <template #preColumns>
@@ -292,7 +302,7 @@
 
   .icon {
     position: fixed;
-    top: 550px;
+    top: 450px;
     left: 50%;
     // transform: translateX(-50%);
     z-index: 901;

diff --git a/src/api/home/alarm/count.ts b/src/api/home/alarm/count.ts
new file mode 100644
index 0000000..1f4b59a
--- /dev/null
+++ b/src/api/home/alarm/count.ts
@@ -0,0 +1,36 @@
+/**
+ * 报警统计
+ */
+import request from '@/api/index'
+
+// 报警总体情况
+export function getOverallAlarm() {
+  return request({
+    url: '/statics/alarmRecords/overall',
+    method: 'post',
+  })
+}
+// 各类报警统计
+export function getAlarmType(data: any) {
+  return request({
+    url: '/statics/alarmRecords/alarmType',
+    method: 'post',
+    data,
+  })
+}
+// 各单位报警统计
+export function getAlarmCompany(data: any) {
+  return request({
+    url: '/statics/alarmRecords/alarmCompany',
+    method: 'post',
+    data,
+  })
+}
+// 异常位置分析
+export function getAlarmPosition(data: any) {
+  return request({
+    url: '/statics/alarmRecords/alarmPosition',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/views/home/alarm/count/components/alarmStatistics.vue b/src/views/home/alarm/count/components/alarmStatistics.vue
index b009891..b088de2 100644
--- a/src/views/home/alarm/count/components/alarmStatistics.vue
+++ b/src/views/home/alarm/count/components/alarmStatistics.vue
@@ -5,30 +5,79 @@
  -->
 <script lang="ts" setup name="AlarmCount">
 import layout from './layout.vue'
+import { getAlarmType } from '@/api/home/alarm/count'
 const listQuery = ref({
-  type: 'day',
+  timeType: '2',
+  ledgerType: '',
+  deptid: '',
+  begTime: '',
+  endTime: '',
 })
 const selectTimeType = (type: string) => {
-  listQuery.value.type = type
+  listQuery.value.timeType = type
 }
+// 类别
+const ledgerTypeList = ref<{ id: string; name: string; value: string }[]>([
+  {
+    name: '闸井',
+    id: '1',
+    value: '1',
+  },
+  {
+    name: '场站',
+    id: '2',
+    value: '2',
+  },
+  {
+    name: '管线',
+    id: '3',
+    value: '3',
+  },
+])
 const xAxisData = ref([])
 const data = ref([])
 const list = ref([])
-setTimeout(() => {
-  xAxisData.value = [
-    '闸井浓度超限', '场站浓度超限', '场站火焰报警', '疑似第三方破坏', '场站烟雾报警',
-  ]
-  data.value = [
-    {
-      name: '报警数量',
-      data: [1, 3, 5, 1, 4],
-    },
-  ]
-  list.value = xAxisData.value.map((item, index) => ({
-    alarmType: item,
-    value: data.value[0].data[index],
-  }))
-}, 1000)
+const loading = ref(true)
+// 开始结束时间
+const datetimerange = ref()
+// 默认当天
+watch(() => datetimerange.value, (newVal) => {
+  listQuery.value.begTime = ''
+  listQuery.value.endTime = ''
+  if (Array.isArray(newVal)) {
+    if (newVal.length) {
+      listQuery.value.begTime = `${newVal[0]}`
+      listQuery.value.endTime = `${newVal[1]}`
+    }
+  }
+})
+// setTimeout(() => {
+//   xAxisData.value = [
+//     '闸井浓度超限', '场站浓度超限', '场站火焰报警', '疑似第三方破坏', '场站烟雾报警',
+//   ]
+//   data.value = [
+//     {
+//       name: '报警数量',
+//       data: [1, 3, 5, 1, 4],
+//     },
+//   ]
+//   list.value = xAxisData.value.map((item, index) => ({
+//     alarmType: item,
+//     value: data.value[0].data[index],
+//   }))
+// }, 1000)
+const fetchData = () => {
+  loading.value = true
+  getAlarmType(listQuery.value).then((res) => {
+    console.log(res.data, '各类报警统计')
+    loading.value = false
+  }).catch(() => {
+    loading.value = false
+  })
+}
+onMounted(() => {
+  fetchData()
+})
 </script>
 
 <template>
@@ -37,26 +86,22 @@
     <template #search>
       <div class="search">
         <el-button
-          :class="listQuery.type === 'day' ? 'active' : ''" round size="small"
-          @click="selectTimeType('day')"
-        >
-          今日
-        </el-button>
-        <el-button
-          :class="listQuery.type === 'week' ? 'active' : ''" round size="small"
-          @click="selectTimeType('week')"
+          :class="listQuery.timeType === '2' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+          @click="selectTimeType('2')"
         >
           本周
         </el-button>
         <el-button
-          :class="listQuery.type === 'month' ? 'active' : ''" round size="small"
-          @click="selectTimeType('month')"
+          :class="listQuery.timeType === '3' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+          @click="selectTimeType('3')"
         >
           本月
         </el-button>
-        <el-select v-model="listQuery.keywords" placeholder="全部类别" clearable style="width: 180px;margin: 0 5px;" />
+        <el-select v-model="listQuery.ledgerType" placeholder="全部类别" clearable style="width: 180px;margin: 0 5px;">
+          <el-option v-for="item in ledgerTypeList" :key="item.id" :label="item.name" :value="item.id" />
+        </el-select>
         <dept-select
-          v-model="listQuery.keywords" placeholder="管理单位" :clearable="true"
+          v-model="listQuery.deptid" placeholder="管理单位" :clearable="true"
           style="width: 220px;margin: 0 5px;"
         />
         <el-date-picker
@@ -64,18 +109,27 @@
           style="width: 340px;margin: 0 5px;" value-format="YYYY-MM-DD HH:mm:ss" range-separator="至"
           start-placeholder="报警开始时间" end-placeholder="报警结束时间" clearable
         />
-        <el-button type="primary" style="margin: 0 5px;">
+        <el-button type="primary" style="margin: 0 5px;" @click="fetchData">
           搜索
         </el-button>
       </div>
     </template>
     <template #content>
-      <div class="alarm-count">
+      <div v-loading="loading" class="alarm-count">
         <div class="bar">
           <bar-chart-vertical
+            v-show="xAxisData.length"
             :x-axis-data="xAxisData" :bar-coner="0" :data="data" :colors="[]" :bar-width="15"
             :legend="{ itemWidth: 8, itemHeight: 8, type: 'scroll', orient: 'horizontal', icon: 'roundRect', right: '0', top: '10' }"
+            :grid="{
+              top: 50,
+              left: 30,
+              right: 30,
+              bottom: 20,
+              containLabel: true, // 是否包含坐标轴的刻度标签
+            }"
           />
+          <el-empty v-show="!xAxisData.length" description="暂无数据" />
         </div>
         <div class="table">
           <el-table border :data="list" stripe style="width: 100%;" :height="440">
@@ -110,8 +164,9 @@
   }
 
   .table {
-    width: 40%;
+    width: 38%;
     padding: 10px;
+    margin-left: 20px;
   }
 }
 </style>
diff --git a/src/views/home/alarm/count/components/deptCount.vue b/src/views/home/alarm/count/components/deptCount.vue
index 1579231..1ca5482 100644
--- a/src/views/home/alarm/count/components/deptCount.vue
+++ b/src/views/home/alarm/count/components/deptCount.vue
@@ -122,8 +122,9 @@
   }
 
   .table {
-    width: 40%;
+    width: 38%;
     padding: 10px;
+    margin-left: 20px;
   }
 }
 </style>
diff --git a/src/views/home/alarm/count/components/overallAlarm.vue b/src/views/home/alarm/count/components/overallAlarm.vue
index f14ee15..476add8 100644
--- a/src/views/home/alarm/count/components/overallAlarm.vue
+++ b/src/views/home/alarm/count/components/overallAlarm.vue
@@ -5,39 +5,64 @@
  -->
 <script lang="ts" setup name="AlarmCount">
 import layout from './layout.vue'
+import { getOverallAlarm } from '@/api/home/alarm/count'
 const alarmData = ref<any[]>([
   {
     name: '正在报警',
-    value: '7',
+    value: '0',
     unit: '个',
+    type: '1',
   },
   {
     name: '今日报警',
-    value: '2',
+    value: '0',
     unit: '个',
+    type: '2',
   },
   {
     name: '本周报警',
-    value: '12',
+    value: '0',
     unit: '个',
+    type: '3',
   },
   {
     name: '本月报警',
-    value: '25',
+    value: '0',
     unit: '个',
+    type: '4',
   },
   {
     name: '全年报警',
-    value: '208',
+    value: '0',
     unit: '个',
+    type: '5',
   },
 ])
+const loading = ref(true)
+const fetchData = () => {
+  loading.value = true
+  getOverallAlarm().then((res) => {
+    const data = res.data
+    data.forEach((item: any) => {
+      const cindex = alarmData.value.findIndex((citem: any) => citem.type === item.type)
+      if (cindex !== -1) {
+        alarmData.value[cindex].value = item.sum
+      }
+    })
+    loading.value = false
+  }).catch(() => {
+    loading.value = false
+  })
+}
+onMounted(() => {
+  fetchData()
+})
 </script>
 
 <template>
   <layout title="报警总体情况">
     <template #content>
-      <div class="alarm-container">
+      <div v-loading="loading" class="alarm-container">
         <div v-for="item in alarmData" :key="item.name" class="alarm-item">
           <div class="top">
             {{ item.name }}
@@ -63,18 +88,26 @@
     border-left: 4px solid #f24d4d;
     width: 18%;
     padding: 10px;
+    padding-top: 15px;
+    padding-bottom: 15px;
 
     .top {
       padding-left: 10px;
+      font-size: 22px;
+      font-weight: 700;
     }
 
     .bottom {
       text-align: center;
 
       .value {
-        font-size: 18px;
+        font-size: 22px;
         font-weight: 700;
       }
+
+      .unit {
+        font-size: 20px;
+      }
     }
   }
 }
diff --git a/src/views/home/alarm/count/components/trendAnalysis.vue b/src/views/home/alarm/count/components/trendAnalysis.vue
index cea2495..73e18b0 100644
--- a/src/views/home/alarm/count/components/trendAnalysis.vue
+++ b/src/views/home/alarm/count/components/trendAnalysis.vue
@@ -131,8 +131,9 @@
   }
 
   .table {
-    width: 40%;
+    width: 38%;
     padding: 10px;
+    margin-left: 20px;
   }
 }
 </style>
diff --git a/src/views/home/device/device/index.vue b/src/views/home/device/device/index.vue
index 55f12a9..df2cf32 100644
--- a/src/views/home/device/device/index.vue
+++ b/src/views/home/device/device/index.vue
@@ -13,6 +13,7 @@
 import { exportFile } from '@/utils/exportUtils'
 const $router = useRouter()
 const useStatusList = ref<{ id: string; name: string; value: string }[]>([]) // 设备在用情况
+const deviceTypeList = ref<{ id: string; name: string; value: string }[]>([]) // 设备类型
 // 表格数据
 const list = ref<any[]>([])
 const total = ref(0)
@@ -20,18 +21,18 @@
 const columns = ref<any>([
   { text: '状态', value: 'onlineState', align: 'center', isCustom: true, width: '55' },
   { text: '设备编号', value: 'devcode', align: 'center', isRequired: true },
-  { text: '设备类型', value: 'deviceType', align: 'center', isRequired: true },
-  { text: '监测对象', value: 'watchObject', align: 'center' },
+  { text: '设备类型', value: 'deviceTypeName', align: 'center', isRequired: true },
+  { text: '监测对象', value: 'watchObject', align: 'center', width: '85' },
   { text: '设备型号', value: 'deviceModel', align: 'center' },
   { text: '厂商', value: 'manufactureName', align: 'center', isRequired: true },
-  { text: '安装位号', value: 'tagNumber', align: 'center', isRequired: true },
+  { text: '安装位号', value: 'tagNumber', align: 'center', isRequired: true, width: '110' },
   { text: '详细位置', value: 'position', align: 'center', isRequired: true },
   { text: '管理单位', value: 'deptName', align: 'center', isRequired: true },
-  { text: '在用情况', value: 'validName', align: 'center', isRequired: true },
+  { text: '在用情况', value: 'validName', align: 'center', isRequired: true, width: '85' },
   // { text: '布防状态', value: '', align: 'center', isRequired: true },
-  { text: '电量', value: 'cell', align: 'center', isRequired: true },
-  { text: '最新上报时间', value: 'logtime', align: 'center', isRequired: true },
-  { text: '安装日期', value: 'installDate', align: 'center', isRequired: true },
+  { text: '电量', value: 'cell', align: 'center', isRequired: true, width: '70' },
+  { text: '最新上报时间', value: 'logtime', align: 'center', isRequired: true, width: '180' },
+  { text: '安装日期', value: 'installDate', align: 'center', isRequired: true, width: '180' },
 ])
 // 最终展示列
 const columnsConfig = ref([])
@@ -75,6 +76,7 @@
     list.value = res.data.rows.map((item: any) => ({
       ...item,
       validName: useStatusList.value.length ? useStatusList.value[useStatusList.value.findIndex(citem => item.valid === citem.value)].name : '',
+      deviceTypeName: deviceTypeList.value.length ? deviceTypeList.value[deviceTypeList.value.findIndex(citem => item.deviceType === citem.value)].name : '',
     }))
     total.value = res.data.total
     loadingTable.value = false
@@ -178,7 +180,7 @@
   ElMessage.warning('敬请期待')
 }
 const isUsed = ref<{ id: string; name: string; value: string }[]>([]) // 是否启用
-const deviceTypeList = ref<{ id: string; name: string; value: string }[]>([]) // 设备类型
+
 const manufacturerList = ref<{ id: string; name: string; value: string }[]>([]) // 厂商列表
 const cellList = ref<{ id: string; name: string; value: string }[]>([]) // 厂商列表
 
@@ -217,6 +219,12 @@
   // 设备类型
   getDeviceTypeListPage({ limit: 9999, offset: 1 }).then((res) => {
     deviceTypeList.value = res.data.rows.map((item: any) => ({ id: item.id, name: item.typeName, value: item.id }))
+    if (list.value.length) {
+      list.value = list.value.map((item: any) => ({
+        ...item,
+        deviceTypeName: deviceTypeList.value.length ? deviceTypeList.value[deviceTypeList.value.findIndex(citem => item.deviceType === citem.value)].name : '',
+      }))
+    }
   })
   // 厂商
   getManufacturerListPage().then((res) => {
diff --git a/src/views/home/pipeline/components/detailInfoDialog.vue b/src/views/home/pipeline/components/detailInfoDialog.vue
index 31f5635..1662e6e 100644
--- a/src/views/home/pipeline/components/detailInfoDialog.vue
+++ b/src/views/home/pipeline/components/detailInfoDialog.vue
@@ -123,44 +123,39 @@
       <span class="close" @click="close">x</span>
     </div>
     <div class="body">
-      <el-descriptions v-loading="loading" :column="2" border>
-        <el-descriptions-item v-for="item in descriptionsList" :key="item.text" :align="item.align">
-          <template #label>
-            <span class="label">
-              {{ item.text }}
-            </span>
-          </template>
-          {{ detailInfo[item.value] || '' }}
-        </el-descriptions-item>
-      </el-descriptions>
+      <div class="descriptions">
+        <div v-for="item in descriptionsList" :key="item.text" class="descriptions-item">
+          <div class="label">
+            {{ item.text }}
+          </div>
+          <div class="value" :title="detailInfo[item.value] || ''">
+            {{ detailInfo[item.value] || '' }}
+          </div>
+        </div>
+      </div>
     </div>
   </div>
 </template>
 
 <style lang="scss" scoped>
-::v-deep(.el-descriptions__label) {
-  width: 20%;
-}
-
-::v-deep(.el-descriptions__cell) {
-  padding: 0 !important;
-}
-
 .container {
-  // width: 500px;
-  // padding: 0 10px;
-  background: rgba($color: #feffff, $alpha: 95%);
-  border: 1.5px solid #79b5e6;
+  width: 600px;
+  background: #fff;
   position: relative;
+  border-radius: 8px;
+  border: 1px solid #e4e7ed;
+  overflow: hidden;
+  box-shadow: 0 0 12px rgb(0 0 0 / 12%);
 
   .header {
     float: right;
-    background-color: #ccc;
+    background-color: #5ea1ff;
     width: 100%;
     display: flex;
     justify-content: space-between;
     padding: 2px 10px;
     align-items: center;
+    color: #fff;
 
     .title {
       font-weight: 700;
@@ -172,7 +167,6 @@
     }
 
     .close {
-      color: #4875a0;
       font-size: 22px;
       font-weight: 700;
       text-align: right;
@@ -180,30 +174,55 @@
 
       &:hover {
         cursor: pointer;
-        color: #658eb4;
+        color: #ccc;
       }
     }
   }
 
   .body {
-    // padding: 10px;
-    // display: flex;
-    // flex-wrap: wrap;
     width: 100%;
 
-    .name {
-      width: 30%;
-    }
+    .descriptions {
+      width: 100%;
+      display: flex;
+      flex-wrap: wrap;
+      box-sizing: border-box;
+      padding: 10px 0;
 
-    .value {
-      width: 70%;
+      .descriptions-item {
+        width: 48%;
+        margin: 5px;
+        box-sizing: border-box;
+        display: flex;
+        padding: 0 5px;
+
+        .label {
+          width: 30%;
+          box-sizing: border-box;
+          padding: 0 5px;
+          font-size: 15px;
+          text-align: justify;
+          text-align-last: justify;
+        }
+
+        .value {
+          padding-left: 5px;
+          width: 68%;
+          box-sizing: border-box;
+          white-space: nowrap;
+          font-size: 14px;
+          color: #a39f9f;
+
+          /* 确保文本在一行内显示 */
+          overflow: hidden;
+
+          /* 超出容器部分隐藏 */
+          text-overflow: ellipsis;
+
+          /* 文字溢出显示省略号 */
+        }
+      }
     }
   }
 }
-
-.clearfix::after {
-  content: "";
-  display: table;
-  clear: both;
-}
 </style>
diff --git a/src/views/home/pipeline/components/map.vue b/src/views/home/pipeline/components/map.vue
index b956aa0..c7c37be 100644
--- a/src/views/home/pipeline/components/map.vue
+++ b/src/views/home/pipeline/components/map.vue
@@ -176,7 +176,10 @@
   setTimeout(() => {
     // mapRef.value.map.setZoom(14)
     // mapRef.value.map.setFitView()
-    mapRef.value.map.setCenter(data.event.data.lnglat)
+    // mapRef.value.map.setCenter(data.event.data.lnglat)
+    const center = JSON.parse(JSON.stringify(data.event.data.lnglat))
+    center[1] = Number(center[1]) + 0.0035
+    mapRef.value.map.setCenter(center)
   })
   // 关联的管线高亮
   const line = $props.pipe.filter((item: any) => item.pipeCode === data.event.data.row.pipeCode)
@@ -218,7 +221,10 @@
       info: data,
       map: mapRef.value.map,
     })
-    mapRef.value.map.setCenter(data.lnglat)
+    // mapRef.value.map.setCenter(data.lnglat)
+    const center = JSON.parse(JSON.stringify(data.lnglat))
+    center[1] = Number(center[1]) + 0.0035
+    mapRef.value.map.setCenter(center)
   })
 }
 // 重置标记点
diff --git a/src/views/home/pipeline/index.vue b/src/views/home/pipeline/index.vue
index 9ef5426..7eb2f1d 100644
--- a/src/views/home/pipeline/index.vue
+++ b/src/views/home/pipeline/index.vue
@@ -12,8 +12,9 @@
 import { getDictByCode } from '@/api/system/dict'
 // 表格标识  地图或普通
 const mapRef = ref()
-const tableFlag = ref('normal')
+const tableFlag = ref('map')
 const mapLoading = ref(true)
+const mapLoad = ref(false)
 // 表格数据
 const list = ref([])
 const total = ref(0)
@@ -58,7 +59,6 @@
 // 查询数据
 const fetchData = () => {
   loadingTable.value = true
-  mapLoading.value = true
   // 判断是否有查询条件(是地图展示20条  否地图展示所有)
   const queryList = [] as Boolean[] // 长度大于2 即为是
   for (const i in listQuery.value) {
@@ -82,13 +82,13 @@
     }
   }).catch(() => {
     loadingTable.value = false
-    if (queryList.length <= 2) {
-      mapLoading.value = false
-    }
+    mapLoading.value = false
   })
-  if (queryList.length > 2) { return }
+  if (queryList.length > 2 || mapLoad.value) { return }
+  mapLoading.value = true
   // 获取地图全部数据
   getPipelineList(listQuery.value).then((res) => {
+    mapLoad.value = true
     //  管线
     pipeData.value = res.data.map((item: any) => ({
       pipeCode: item.PIPE_CODE,
@@ -104,6 +104,7 @@
     }, 500)
   })
   getPipelineDeviceList(listQuery.value).then((res) => {
+    mapLoad.value = true
     mapList.value = res.data.map((item: { [key: string]: string }) => ({
       deviceTypeName: item.TYPE_NAME,
       tagNumber: item.TAG_NUMBER,
@@ -126,6 +127,7 @@
 }
 // 重置查询条件f
 const reset = () => {
+  mapLoad.value = false
   listQuery.value = {
     limit: 20,
     offset: 1,
@@ -239,6 +241,19 @@
     },
   })
 }
+// 表格高度
+const tableHeight = ref(window.innerHeight - 60 - 50 - 10 - 350 - 98 - 10 - 52 - 52 - 10)
+window.addEventListener('resize', () => {
+  tableHeight.value = window.innerHeight - 60 - 50 - 10 - 350 - 98 - 10 - 52 - 52 - 10
+})
+watch(() => tableFlag.value, (newVal) => {
+  if (newVal === 'map') {
+    tableHeight.value = window.innerHeight - 60 - 50 - 10 - 350 - 98 - 10 - 52 - 52 - 10
+  }
+  else if (newVal === 'normal') {
+    tableHeight.value = window.innerHeight - 60 - 50 - 10 - 98 - 10 - 52 - 52 - 10
+  }
+})
 </script>
 
 <template>
@@ -247,11 +262,9 @@
     <edit-dialog ref="editRef" @refresh="fetchData" />
     <!-- 地图 -->
     <map-com
-      v-if="tableFlag === 'map'" ref="mapRef" v-loading="mapLoading" class="map" :height="450" :data="mapList"
+      v-if="tableFlag === 'map'" ref="mapRef" v-loading="mapLoading" :height="350" :data="mapList"
       :pipe="pipeData"
     />
-    <!-- 占位-地图 -->
-    <div v-if="tableFlag === 'map'" style="height: 450px;" />
     <!-- 收起地图-图标 -->
     <div v-if="tableFlag === 'map'" class="icon" @click="switchMode('normal')">
       <el-icon :size="25">
@@ -260,7 +273,7 @@
     </div>
     <!-- 筛选条件 -->
     <search-area
-      :class="`${tableFlag === 'map' ? 'search-area' : ''}`" :need-clear="true" @search="fetchData"
+      :need-clear="true" @search="fetchData"
       @clear="reset"
     >
       <search-item>
@@ -319,8 +332,6 @@
         </el-select>
       </search-item>
     </search-area>
-    <!-- 筛选条件-地图 -->
-    <div v-if="tableFlag === 'map'" style="height: 114px;" />
     <!-- 表头标题 -->
     <table-container
       :is-config="true" config-title="pipeline-monitor" :columns="columns"
@@ -344,7 +355,7 @@
       </template>
       <!-- 查询结果Table显示 -->
       <normal-table
-        :data="list" :total="total" :columns="columnsConfig" :query="listQuery" :list-loading="loadingTable"
+        :data="list" :total="total" :columns="columnsConfig" :query="listQuery" :list-loading="loadingTable" :height="tableHeight"
         @change="changePage" @rowDbClick="rowClick"
       >
         <template #preColumns>
@@ -382,7 +393,7 @@
 
   .icon {
     position: fixed;
-    top: 550px;
+    top: 450px;
     left: 50%;
     // transform: translateX(-50%);
     z-index: 901;
diff --git a/src/views/home/rule/alarm/components/alarmLevelList.vue b/src/views/home/rule/alarm/components/alarmLevelList.vue
index c1b129d..40c1e43 100644
--- a/src/views/home/rule/alarm/components/alarmLevelList.vue
+++ b/src/views/home/rule/alarm/components/alarmLevelList.vue
@@ -18,7 +18,7 @@
   { text: '报警提示方式', value: 'alarmNoteMethodName', align: 'center' },
   { text: '报警音效', value: 'isSoundName', align: 'center' },
   { text: '报警推送', value: 'isSendName', align: 'center' },
-  { text: '报警短信', value: 'isTextName', align: 'center' },
+  // { text: '报警短信', value: 'isTextName', align: 'center' },
 ])
 const loadingTable = ref(true)
 //  查询条件
diff --git a/src/views/home/rule/alarm/components/editAlarmLevelDialog.vue b/src/views/home/rule/alarm/components/editAlarmLevelDialog.vue
index fe60451..757a42c 100644
--- a/src/views/home/rule/alarm/components/editAlarmLevelDialog.vue
+++ b/src/views/home/rule/alarm/components/editAlarmLevelDialog.vue
@@ -168,11 +168,11 @@
             <el-switch v-model="dataForm.isSend" size="large" active-text="开" inactive-text="关" active-value="1" inactive-value="0" />
           </el-form-item>
         </el-col>
-        <el-col :span="12">
+        <!-- <el-col :span="12">
           <el-form-item label="报警短信" prop="isText">
             <el-switch v-model="dataForm.isText" size="large" active-text="开" inactive-text="关" active-value="1" inactive-value="0" />
           </el-form-item>
-        </el-col>
+        </el-col> -->
       </el-row>
     </el-form>
     <template #footer>
diff --git a/src/views/home/rule/alarm/components/editDialog.vue b/src/views/home/rule/alarm/components/editDialog.vue
index a8c565f..3bd2958 100644
--- a/src/views/home/rule/alarm/components/editDialog.vue
+++ b/src/views/home/rule/alarm/components/editDialog.vue
@@ -226,6 +226,9 @@
   else {
     alarmEventList.value = []
   }
+  if (newVal) {
+    dataForm.value.alarmThreshold = ''
+  }
 }, {
   deep: true,
   immediate: true,
diff --git a/src/views/home/rule/alarm/index.vue b/src/views/home/rule/alarm/index.vue
index fef4bf0..99084a0 100644
--- a/src/views/home/rule/alarm/index.vue
+++ b/src/views/home/rule/alarm/index.vue
@@ -147,7 +147,7 @@
   }))
 
   const res2 = await getAlarmTypeListPage({ offset: 1, limit: 9999 })
-  alarmTypeList.value = uniqueMultiArray(res.data.rows.map((item: any) => ({
+  alarmTypeList.value = uniqueMultiArray(res2.data.rows.map((item: any) => ({
     name: item.alarmType,
     value: item.id,
     id: item.id,
diff --git a/src/views/home/station/control/components/control.vue b/src/views/home/station/control/components/control.vue
index 8d1f867..5ec4b26 100644
--- a/src/views/home/station/control/components/control.vue
+++ b/src/views/home/station/control/components/control.vue
@@ -129,7 +129,7 @@
   flex-wrap: wrap;
 
   .left {
-    width: 62%;
+    width: 55%;
     // background-color: aqua;
     display: flex;
     justify-content: space-around;
@@ -152,7 +152,7 @@
   }
 
   .right {
-    width: 37%;
+    width: 34%;
     // background-color: chartreuse;
     display: flex;
     justify-content: space-around;
diff --git a/src/views/home/station/station/components/detailInfoDialog.vue b/src/views/home/station/station/components/detailInfoDialog.vue
index f44be1a..53bf430 100644
--- a/src/views/home/station/station/components/detailInfoDialog.vue
+++ b/src/views/home/station/station/components/detailInfoDialog.vue
@@ -127,44 +127,39 @@
       <span class="close" @click="close">x</span>
     </div>
     <div class="body">
-      <el-descriptions v-loading="loading" :column="2" border>
-        <el-descriptions-item v-for="item in descriptionsList" :key="item.text" :align="item.align">
-          <template #label>
-            <span class="label">
-              {{ item.text }}
-            </span>
-          </template>
-          {{ detailInfo[item.value] || '' }}
-        </el-descriptions-item>
-      </el-descriptions>
+      <div class="descriptions">
+        <div v-for="item in descriptionsList" :key="item.text" class="descriptions-item">
+          <div class="label">
+            {{ item.text }}
+          </div>
+          <div class="value">
+            {{ detailInfo[item.value] || '' }}
+          </div>
+        </div>
+      </div>
     </div>
   </div>
 </template>
 
 <style lang="scss" scoped>
-::v-deep(.el-descriptions__label) {
-  width: 20%;
-}
-
-::v-deep(.el-descriptions__cell) {
-  padding: 0 !important;
-}
-
 .container {
-  // width: 500px;
-  // padding: 0 10px;
-  background: rgba($color: #feffff, $alpha: 95%);
-  border: 1.5px solid #79b5e6;
+  width: 600px;
+  background: #fff;
   position: relative;
+  border-radius: 8px;
+  border: 1px solid #e4e7ed;
+  overflow: hidden;
+  box-shadow: 0 0 12px rgb(0 0 0 / 12%);
 
   .header {
     float: right;
-    background-color: #ccc;
+    background-color: #5ea1ff;
     width: 100%;
     display: flex;
     justify-content: space-between;
     padding: 2px 10px;
     align-items: center;
+    color: #fff;
 
     .title {
       font-weight: 700;
@@ -176,7 +171,6 @@
     }
 
     .close {
-      color: #4875a0;
       font-size: 22px;
       font-weight: 700;
       text-align: right;
@@ -184,30 +178,55 @@
 
       &:hover {
         cursor: pointer;
-        color: #658eb4;
+        color: #ccc;
       }
     }
   }
 
   .body {
-    // padding: 10px;
-    // display: flex;
-    // flex-wrap: wrap;
     width: 100%;
 
-    .name {
-      width: 30%;
-    }
+    .descriptions {
+      width: 100%;
+      display: flex;
+      flex-wrap: wrap;
+      box-sizing: border-box;
+      padding: 10px 0;
 
-    .value {
-      width: 70%;
+      .descriptions-item {
+        width: 48%;
+        margin: 5px;
+        box-sizing: border-box;
+        display: flex;
+        padding: 0 5px;
+
+        .label {
+          width: 28%;
+          box-sizing: border-box;
+          padding: 0 5px;
+          font-size: 15px;
+          text-align: justify;
+          text-align-last: justify;
+        }
+
+        .value {
+          padding-left: 5px;
+          width: 68%;
+          box-sizing: border-box;
+          white-space: nowrap;
+          font-size: 14px;
+          color: #a39f9f;
+
+          /* 确保文本在一行内显示 */
+          overflow: hidden;
+
+          /* 超出容器部分隐藏 */
+          text-overflow: ellipsis;
+
+          /* 文字溢出显示省略号 */
+        }
+      }
     }
   }
 }
-
-.clearfix::after {
-  content: "";
-  display: table;
-  clear: both;
-}
 </style>
diff --git a/src/views/home/station/station/components/map.vue b/src/views/home/station/station/components/map.vue
index 2351a1d..1c5a64c 100644
--- a/src/views/home/station/station/components/map.vue
+++ b/src/views/home/station/station/components/map.vue
@@ -139,8 +139,11 @@
   })
   setTimeout(() => {
     // mapRef.value.map.setZoom(14)
-    mapRef.value.map.setFitView()
-    mapRef.value.map.setCenter(data.event.data.lnglat)
+    // mapRef.value.map.setFitView()
+    // mapRef.value.map.setCenter(data.event.data.lnglat)
+    const center = JSON.parse(JSON.stringify(data.event.data.lnglat))
+    center[1] = Number(center[1]) + 0.0035
+    mapRef.value.map.setCenter(center)
   })
 }
 
@@ -164,7 +167,11 @@
       info: data,
       map: mapRef.value.map,
     })
-    mapRef.value.map.setCenter(data.lnglat)
+    // mapRef.value.map.setCenter(data.lnglat)
+    // mapRef.value.map.setFitView()
+    const center = JSON.parse(JSON.stringify(data.lnglat))
+    center[1] = Number(center[1]) + 0.0035
+    mapRef.value.map.setCenter(center)
   })
 }
 
diff --git a/src/views/home/station/station/index.vue b/src/views/home/station/station/index.vue
index 636cbad..0b2599e 100644
--- a/src/views/home/station/station/index.vue
+++ b/src/views/home/station/station/index.vue
@@ -12,8 +12,9 @@
 import { getDictByCode } from '@/api/system/dict'
 // 表格标识  地图或普通
 const mapRef = ref()
-const tableFlag = ref('normal')
+const tableFlag = ref('map')
 const mapLoading = ref(true)
+const mapLoad = ref(false)
 // 表格数据
 const list = ref([])
 const total = ref(0)
@@ -56,7 +57,6 @@
 // 查询数据
 const fetchData = () => {
   loadingTable.value = true
-  mapLoading.value = true
   // 判断是否有查询条件(是地图展示20条  否地图展示所有)
   const queryList = [] as Boolean[] // 长度大于2 即为是
   for (const i in listQuery.value) {
@@ -79,13 +79,13 @@
     }
   }).catch(() => {
     loadingTable.value = false
-    if (queryList.length <= 2) {
-      mapLoading.value = false
-    }
+    mapLoading.value = false
   })
-  if (queryList.length > 2) { return }
+  if (queryList.length > 2 || mapLoad.value) { return }
   // 获取地图全部数据
+  mapLoading.value = true
   getStationList(listQuery.value).then((res) => {
+    mapLoad.value = true
     mapList.value = res.data
     setTimeout(() => {
       if (tableFlag.value === 'map') {
@@ -99,6 +99,7 @@
 }
 // 重置查询条件f
 const reset = () => {
+  mapLoad.value = false
   listQuery.value = {
     limit: 20,
     offset: 1,
@@ -179,6 +180,19 @@
     },
   })
 }
+// 表格高度
+const tableHeight = ref(window.innerHeight - 60 - 50 - 10 - 350 - 98 - 10 - 52 - 52 - 10)
+window.addEventListener('resize', () => {
+  tableHeight.value = window.innerHeight - 60 - 50 - 10 - 350 - 98 - 10 - 52 - 52 - 10
+})
+watch(() => tableFlag.value, (newVal) => {
+  if (newVal === 'map') {
+    tableHeight.value = window.innerHeight - 60 - 50 - 10 - 350 - 98 - 10 - 52 - 52 - 10
+  }
+  else if (newVal === 'normal') {
+    tableHeight.value = window.innerHeight - 60 - 50 - 10 - 98 - 10 - 52 - 52 - 10
+  }
+})
 </script>
 
 <template>
@@ -186,9 +200,7 @@
   <app-container class="container">
     <edit-dialog ref="editRef" @refresh="fetchData" />
     <!-- 地图 -->
-    <map-com v-if="tableFlag === 'map'" ref="mapRef" v-loading="mapLoading" class="map" :height="450" :data="mapList" />
-    <!-- 占位-地图 -->
-    <div v-if="tableFlag === 'map'" style="height: 450px;" />
+    <map-com v-if="tableFlag === 'map'" ref="mapRef" v-loading="mapLoading" :height="350" :data="mapList" />
     <!-- 收起地图-图标 -->
     <div v-if="tableFlag === 'map'" class="icon" @click="switchMode('normal')">
       <el-icon :size="25">
@@ -197,7 +209,7 @@
     </div>
     <!-- 筛选条件 -->
     <search-area
-      :class="`${tableFlag === 'map' ? 'search-area' : ''}`" :need-clear="true" @search="fetchData"
+      :need-clear="true" @search="fetchData"
       @clear="reset"
     >
       <search-item>
@@ -229,8 +241,6 @@
         </el-select>
       </search-item>
     </search-area>
-    <!-- 筛选条件-地图 -->
-    <div v-if="tableFlag === 'map'" style="height: 56px;" />
     <!-- 表头标题 -->
     <table-container
       :is-config="true" config-title="station-monitor" :columns="columns" :config-columns="columnsConfig"
@@ -254,7 +264,7 @@
       </template>
       <!-- 查询结果Table显示 -->
       <normal-table
-        :data="list" :total="total" :columns="columnsConfig" :query="listQuery" :list-loading="loadingTable"
+        :data="list" :total="total" :columns="columnsConfig" :query="listQuery" :list-loading="loadingTable" :height="tableHeight"
         @change="changePage" @rowDbClick="rowClick"
       >
         <template #preColumns>
@@ -292,7 +302,7 @@
 
   .icon {
     position: fixed;
-    top: 550px;
+    top: 450px;
     left: 50%;
     // transform: translateX(-50%);
     z-index: 901;
diff --git a/src/views/home/well/components/detailInfoDialog.vue b/src/views/home/well/components/detailInfoDialog.vue
index 5d33d05..d0d4242 100644
--- a/src/views/home/well/components/detailInfoDialog.vue
+++ b/src/views/home/well/components/detailInfoDialog.vue
@@ -128,71 +128,39 @@
       <span class="close" @click="close">x</span>
     </div>
     <div class="body">
-      <el-descriptions v-loading="loading" :column="2" border>
-        <el-descriptions-item v-for="item in descriptionsList" :key="item.text" :align="item.align">
-          <template #label>
-            <span class="label">
-              {{ item.text }}
-            </span>
-          </template>
-          <span class="nowrap">
+      <div class="descriptions">
+        <div v-for="item in descriptionsList" :key="item.text" class="descriptions-item">
+          <div class="label">
+            {{ item.text }}
+          </div>
+          <div class="value">
             {{ detailInfo[item.value] || '' }}
-          </span>
-        </el-descriptions-item>
-      </el-descriptions>
+          </div>
+        </div>
+      </div>
     </div>
   </div>
 </template>
 
 <style lang="scss" scoped>
-::v-deep(.el-descriptions__cell) {
-  padding: 0 !important;
-
-  ::v-deep(.is-bordered-label) {
-    width: 100px !important;
-  }
-
-  ::v-deep(.el-descriptions__label) {
-    width: 100px !important;
-  }
-
-  ::v-deep(.el-descriptions__content) {
-    width: 170px !important;
-  }
-
-  ::v-deep(.is-bordered-content) {
-    width: 170px !important;
-  }
-}
-
-.nowrap {
-  width: 170px;
-  white-space: nowrap;
-
-  /* 确保文本在一行内显示 */
-  overflow: hidden;
-
-  /* 超出容器部分隐藏 */
-  text-overflow: ellipsis;
-
-  /* 文字溢出显示省略号 */
-}
-
 .container {
-  // width: 500px;
-  // padding: 0 10px;
-  background: rgba($color: #feffff, $alpha: 95%);
-  border: 1.5px solid #79b5e6;
+  width: 600px;
+  background: #fff;
   position: relative;
+  border-radius: 8px;
+  border: 1px solid #e4e7ed;
+  overflow: hidden;
+  box-shadow: 0 0 12px rgb(0 0 0 / 12%);
 
   .header {
     float: right;
-    background-color: #ccc;
+    background-color: #5ea1ff;
     width: 100%;
     display: flex;
     justify-content: space-between;
     padding: 2px 10px;
     align-items: center;
+    color: #fff;
 
     .title {
       font-weight: 700;
@@ -204,7 +172,6 @@
     }
 
     .close {
-      color: #4875a0;
       font-size: 22px;
       font-weight: 700;
       text-align: right;
@@ -212,30 +179,55 @@
 
       &:hover {
         cursor: pointer;
-        color: #658eb4;
+        color: #ccc;
       }
     }
   }
 
   .body {
-    // padding: 10px;
-    // display: flex;
-    // flex-wrap: wrap;
     width: 100%;
 
-    .name {
-      width: 30%;
-    }
+    .descriptions {
+      width: 100%;
+      display: flex;
+      flex-wrap: wrap;
+      box-sizing: border-box;
+      padding: 10px 0;
 
-    .value {
-      width: 70%;
+      .descriptions-item {
+        width: 48%;
+        margin: 5px;
+        box-sizing: border-box;
+        display: flex;
+        padding: 0 5px;
+
+        .label {
+          width: 28%;
+          box-sizing: border-box;
+          padding: 0 5px;
+          font-size: 15px;
+          text-align: justify;
+          text-align-last: justify;
+        }
+
+        .value {
+          padding-left: 5px;
+          width: 68%;
+          box-sizing: border-box;
+          white-space: nowrap;
+          font-size: 14px;
+          color: #a39f9f;
+
+          /* 确保文本在一行内显示 */
+          overflow: hidden;
+
+          /* 超出容器部分隐藏 */
+          text-overflow: ellipsis;
+
+          /* 文字溢出显示省略号 */
+        }
+      }
     }
   }
 }
-
-.clearfix::after {
-  content: "";
-  display: table;
-  clear: both;
-}
 </style>

diff --git a/src/api/home/alarm/count.ts b/src/api/home/alarm/count.ts
new file mode 100644
index 0000000..1f4b59a
--- /dev/null
+++ b/src/api/home/alarm/count.ts
@@ -0,0 +1,36 @@
+/**
+ * 报警统计
+ */
+import request from '@/api/index'
+
+// 报警总体情况
+export function getOverallAlarm() {
+  return request({
+    url: '/statics/alarmRecords/overall',
+    method: 'post',
+  })
+}
+// 各类报警统计
+export function getAlarmType(data: any) {
+  return request({
+    url: '/statics/alarmRecords/alarmType',
+    method: 'post',
+    data,
+  })
+}
+// 各单位报警统计
+export function getAlarmCompany(data: any) {
+  return request({
+    url: '/statics/alarmRecords/alarmCompany',
+    method: 'post',
+    data,
+  })
+}
+// 异常位置分析
+export function getAlarmPosition(data: any) {
+  return request({
+    url: '/statics/alarmRecords/alarmPosition',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/views/home/alarm/count/components/alarmStatistics.vue b/src/views/home/alarm/count/components/alarmStatistics.vue
index b009891..b088de2 100644
--- a/src/views/home/alarm/count/components/alarmStatistics.vue
+++ b/src/views/home/alarm/count/components/alarmStatistics.vue
@@ -5,30 +5,79 @@
  -->
 <script lang="ts" setup name="AlarmCount">
 import layout from './layout.vue'
+import { getAlarmType } from '@/api/home/alarm/count'
 const listQuery = ref({
-  type: 'day',
+  timeType: '2',
+  ledgerType: '',
+  deptid: '',
+  begTime: '',
+  endTime: '',
 })
 const selectTimeType = (type: string) => {
-  listQuery.value.type = type
+  listQuery.value.timeType = type
 }
+// 类别
+const ledgerTypeList = ref<{ id: string; name: string; value: string }[]>([
+  {
+    name: '闸井',
+    id: '1',
+    value: '1',
+  },
+  {
+    name: '场站',
+    id: '2',
+    value: '2',
+  },
+  {
+    name: '管线',
+    id: '3',
+    value: '3',
+  },
+])
 const xAxisData = ref([])
 const data = ref([])
 const list = ref([])
-setTimeout(() => {
-  xAxisData.value = [
-    '闸井浓度超限', '场站浓度超限', '场站火焰报警', '疑似第三方破坏', '场站烟雾报警',
-  ]
-  data.value = [
-    {
-      name: '报警数量',
-      data: [1, 3, 5, 1, 4],
-    },
-  ]
-  list.value = xAxisData.value.map((item, index) => ({
-    alarmType: item,
-    value: data.value[0].data[index],
-  }))
-}, 1000)
+const loading = ref(true)
+// 开始结束时间
+const datetimerange = ref()
+// 默认当天
+watch(() => datetimerange.value, (newVal) => {
+  listQuery.value.begTime = ''
+  listQuery.value.endTime = ''
+  if (Array.isArray(newVal)) {
+    if (newVal.length) {
+      listQuery.value.begTime = `${newVal[0]}`
+      listQuery.value.endTime = `${newVal[1]}`
+    }
+  }
+})
+// setTimeout(() => {
+//   xAxisData.value = [
+//     '闸井浓度超限', '场站浓度超限', '场站火焰报警', '疑似第三方破坏', '场站烟雾报警',
+//   ]
+//   data.value = [
+//     {
+//       name: '报警数量',
+//       data: [1, 3, 5, 1, 4],
+//     },
+//   ]
+//   list.value = xAxisData.value.map((item, index) => ({
+//     alarmType: item,
+//     value: data.value[0].data[index],
+//   }))
+// }, 1000)
+const fetchData = () => {
+  loading.value = true
+  getAlarmType(listQuery.value).then((res) => {
+    console.log(res.data, '各类报警统计')
+    loading.value = false
+  }).catch(() => {
+    loading.value = false
+  })
+}
+onMounted(() => {
+  fetchData()
+})
 </script>
 
 <template>
@@ -37,26 +86,22 @@
     <template #search>
       <div class="search">
         <el-button
-          :class="listQuery.type === 'day' ? 'active' : ''" round size="small"
-          @click="selectTimeType('day')"
-        >
-          今日
-        </el-button>
-        <el-button
-          :class="listQuery.type === 'week' ? 'active' : ''" round size="small"
-          @click="selectTimeType('week')"
+          :class="listQuery.timeType === '2' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+          @click="selectTimeType('2')"
         >
           本周
         </el-button>
         <el-button
-          :class="listQuery.type === 'month' ? 'active' : ''" round size="small"
-          @click="selectTimeType('month')"
+          :class="listQuery.timeType === '3' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+          @click="selectTimeType('3')"
         >
           本月
         </el-button>
-        <el-select v-model="listQuery.keywords" placeholder="全部类别" clearable style="width: 180px;margin: 0 5px;" />
+        <el-select v-model="listQuery.ledgerType" placeholder="全部类别" clearable style="width: 180px;margin: 0 5px;">
+          <el-option v-for="item in ledgerTypeList" :key="item.id" :label="item.name" :value="item.id" />
+        </el-select>
         <dept-select
-          v-model="listQuery.keywords" placeholder="管理单位" :clearable="true"
+          v-model="listQuery.deptid" placeholder="管理单位" :clearable="true"
           style="width: 220px;margin: 0 5px;"
         />
         <el-date-picker
@@ -64,18 +109,27 @@
           style="width: 340px;margin: 0 5px;" value-format="YYYY-MM-DD HH:mm:ss" range-separator="至"
           start-placeholder="报警开始时间" end-placeholder="报警结束时间" clearable
         />
-        <el-button type="primary" style="margin: 0 5px;">
+        <el-button type="primary" style="margin: 0 5px;" @click="fetchData">
           搜索
         </el-button>
       </div>
     </template>
     <template #content>
-      <div class="alarm-count">
+      <div v-loading="loading" class="alarm-count">
         <div class="bar">
           <bar-chart-vertical
+            v-show="xAxisData.length"
             :x-axis-data="xAxisData" :bar-coner="0" :data="data" :colors="[]" :bar-width="15"
             :legend="{ itemWidth: 8, itemHeight: 8, type: 'scroll', orient: 'horizontal', icon: 'roundRect', right: '0', top: '10' }"
+            :grid="{
+              top: 50,
+              left: 30,
+              right: 30,
+              bottom: 20,
+              containLabel: true, // 是否包含坐标轴的刻度标签
+            }"
           />
+          <el-empty v-show="!xAxisData.length" description="暂无数据" />
         </div>
         <div class="table">
           <el-table border :data="list" stripe style="width: 100%;" :height="440">
@@ -110,8 +164,9 @@
   }
 
   .table {
-    width: 40%;
+    width: 38%;
     padding: 10px;
+    margin-left: 20px;
   }
 }
 </style>
diff --git a/src/views/home/alarm/count/components/deptCount.vue b/src/views/home/alarm/count/components/deptCount.vue
index 1579231..1ca5482 100644
--- a/src/views/home/alarm/count/components/deptCount.vue
+++ b/src/views/home/alarm/count/components/deptCount.vue
@@ -122,8 +122,9 @@
   }
 
   .table {
-    width: 40%;
+    width: 38%;
     padding: 10px;
+    margin-left: 20px;
   }
 }
 </style>
diff --git a/src/views/home/alarm/count/components/overallAlarm.vue b/src/views/home/alarm/count/components/overallAlarm.vue
index f14ee15..476add8 100644
--- a/src/views/home/alarm/count/components/overallAlarm.vue
+++ b/src/views/home/alarm/count/components/overallAlarm.vue
@@ -5,39 +5,64 @@
  -->
 <script lang="ts" setup name="AlarmCount">
 import layout from './layout.vue'
+import { getOverallAlarm } from '@/api/home/alarm/count'
 const alarmData = ref<any[]>([
   {
     name: '正在报警',
-    value: '7',
+    value: '0',
     unit: '个',
+    type: '1',
   },
   {
     name: '今日报警',
-    value: '2',
+    value: '0',
     unit: '个',
+    type: '2',
   },
   {
     name: '本周报警',
-    value: '12',
+    value: '0',
     unit: '个',
+    type: '3',
   },
   {
     name: '本月报警',
-    value: '25',
+    value: '0',
     unit: '个',
+    type: '4',
   },
   {
     name: '全年报警',
-    value: '208',
+    value: '0',
     unit: '个',
+    type: '5',
   },
 ])
+const loading = ref(true)
+const fetchData = () => {
+  loading.value = true
+  getOverallAlarm().then((res) => {
+    const data = res.data
+    data.forEach((item: any) => {
+      const cindex = alarmData.value.findIndex((citem: any) => citem.type === item.type)
+      if (cindex !== -1) {
+        alarmData.value[cindex].value = item.sum
+      }
+    })
+    loading.value = false
+  }).catch(() => {
+    loading.value = false
+  })
+}
+onMounted(() => {
+  fetchData()
+})
 </script>
 
 <template>
   <layout title="报警总体情况">
     <template #content>
-      <div class="alarm-container">
+      <div v-loading="loading" class="alarm-container">
         <div v-for="item in alarmData" :key="item.name" class="alarm-item">
           <div class="top">
             {{ item.name }}
@@ -63,18 +88,26 @@
     border-left: 4px solid #f24d4d;
     width: 18%;
     padding: 10px;
+    padding-top: 15px;
+    padding-bottom: 15px;
 
     .top {
       padding-left: 10px;
+      font-size: 22px;
+      font-weight: 700;
     }
 
     .bottom {
       text-align: center;
 
       .value {
-        font-size: 18px;
+        font-size: 22px;
         font-weight: 700;
       }
+
+      .unit {
+        font-size: 20px;
+      }
     }
   }
 }
diff --git a/src/views/home/alarm/count/components/trendAnalysis.vue b/src/views/home/alarm/count/components/trendAnalysis.vue
index cea2495..73e18b0 100644
--- a/src/views/home/alarm/count/components/trendAnalysis.vue
+++ b/src/views/home/alarm/count/components/trendAnalysis.vue
@@ -131,8 +131,9 @@
   }
 
   .table {
-    width: 40%;
+    width: 38%;
     padding: 10px;
+    margin-left: 20px;
   }
 }
 </style>
diff --git a/src/views/home/device/device/index.vue b/src/views/home/device/device/index.vue
index 55f12a9..df2cf32 100644
--- a/src/views/home/device/device/index.vue
+++ b/src/views/home/device/device/index.vue
@@ -13,6 +13,7 @@
 import { exportFile } from '@/utils/exportUtils'
 const $router = useRouter()
 const useStatusList = ref<{ id: string; name: string; value: string }[]>([]) // 设备在用情况
+const deviceTypeList = ref<{ id: string; name: string; value: string }[]>([]) // 设备类型
 // 表格数据
 const list = ref<any[]>([])
 const total = ref(0)
@@ -20,18 +21,18 @@
 const columns = ref<any>([
   { text: '状态', value: 'onlineState', align: 'center', isCustom: true, width: '55' },
   { text: '设备编号', value: 'devcode', align: 'center', isRequired: true },
-  { text: '设备类型', value: 'deviceType', align: 'center', isRequired: true },
-  { text: '监测对象', value: 'watchObject', align: 'center' },
+  { text: '设备类型', value: 'deviceTypeName', align: 'center', isRequired: true },
+  { text: '监测对象', value: 'watchObject', align: 'center', width: '85' },
   { text: '设备型号', value: 'deviceModel', align: 'center' },
   { text: '厂商', value: 'manufactureName', align: 'center', isRequired: true },
-  { text: '安装位号', value: 'tagNumber', align: 'center', isRequired: true },
+  { text: '安装位号', value: 'tagNumber', align: 'center', isRequired: true, width: '110' },
   { text: '详细位置', value: 'position', align: 'center', isRequired: true },
   { text: '管理单位', value: 'deptName', align: 'center', isRequired: true },
-  { text: '在用情况', value: 'validName', align: 'center', isRequired: true },
+  { text: '在用情况', value: 'validName', align: 'center', isRequired: true, width: '85' },
   // { text: '布防状态', value: '', align: 'center', isRequired: true },
-  { text: '电量', value: 'cell', align: 'center', isRequired: true },
-  { text: '最新上报时间', value: 'logtime', align: 'center', isRequired: true },
-  { text: '安装日期', value: 'installDate', align: 'center', isRequired: true },
+  { text: '电量', value: 'cell', align: 'center', isRequired: true, width: '70' },
+  { text: '最新上报时间', value: 'logtime', align: 'center', isRequired: true, width: '180' },
+  { text: '安装日期', value: 'installDate', align: 'center', isRequired: true, width: '180' },
 ])
 // 最终展示列
 const columnsConfig = ref([])
@@ -75,6 +76,7 @@
     list.value = res.data.rows.map((item: any) => ({
       ...item,
       validName: useStatusList.value.length ? useStatusList.value[useStatusList.value.findIndex(citem => item.valid === citem.value)].name : '',
+      deviceTypeName: deviceTypeList.value.length ? deviceTypeList.value[deviceTypeList.value.findIndex(citem => item.deviceType === citem.value)].name : '',
     }))
     total.value = res.data.total
     loadingTable.value = false
@@ -178,7 +180,7 @@
   ElMessage.warning('敬请期待')
 }
 const isUsed = ref<{ id: string; name: string; value: string }[]>([]) // 是否启用
-const deviceTypeList = ref<{ id: string; name: string; value: string }[]>([]) // 设备类型
+
 const manufacturerList = ref<{ id: string; name: string; value: string }[]>([]) // 厂商列表
 const cellList = ref<{ id: string; name: string; value: string }[]>([]) // 厂商列表
 
@@ -217,6 +219,12 @@
   // 设备类型
   getDeviceTypeListPage({ limit: 9999, offset: 1 }).then((res) => {
     deviceTypeList.value = res.data.rows.map((item: any) => ({ id: item.id, name: item.typeName, value: item.id }))
+    if (list.value.length) {
+      list.value = list.value.map((item: any) => ({
+        ...item,
+        deviceTypeName: deviceTypeList.value.length ? deviceTypeList.value[deviceTypeList.value.findIndex(citem => item.deviceType === citem.value)].name : '',
+      }))
+    }
   })
   // 厂商
   getManufacturerListPage().then((res) => {
diff --git a/src/views/home/pipeline/components/detailInfoDialog.vue b/src/views/home/pipeline/components/detailInfoDialog.vue
index 31f5635..1662e6e 100644
--- a/src/views/home/pipeline/components/detailInfoDialog.vue
+++ b/src/views/home/pipeline/components/detailInfoDialog.vue
@@ -123,44 +123,39 @@
       <span class="close" @click="close">x</span>
     </div>
     <div class="body">
-      <el-descriptions v-loading="loading" :column="2" border>
-        <el-descriptions-item v-for="item in descriptionsList" :key="item.text" :align="item.align">
-          <template #label>
-            <span class="label">
-              {{ item.text }}
-            </span>
-          </template>
-          {{ detailInfo[item.value] || '' }}
-        </el-descriptions-item>
-      </el-descriptions>
+      <div class="descriptions">
+        <div v-for="item in descriptionsList" :key="item.text" class="descriptions-item">
+          <div class="label">
+            {{ item.text }}
+          </div>
+          <div class="value" :title="detailInfo[item.value] || ''">
+            {{ detailInfo[item.value] || '' }}
+          </div>
+        </div>
+      </div>
     </div>
   </div>
 </template>
 
 <style lang="scss" scoped>
-::v-deep(.el-descriptions__label) {
-  width: 20%;
-}
-
-::v-deep(.el-descriptions__cell) {
-  padding: 0 !important;
-}
-
 .container {
-  // width: 500px;
-  // padding: 0 10px;
-  background: rgba($color: #feffff, $alpha: 95%);
-  border: 1.5px solid #79b5e6;
+  width: 600px;
+  background: #fff;
   position: relative;
+  border-radius: 8px;
+  border: 1px solid #e4e7ed;
+  overflow: hidden;
+  box-shadow: 0 0 12px rgb(0 0 0 / 12%);
 
   .header {
     float: right;
-    background-color: #ccc;
+    background-color: #5ea1ff;
     width: 100%;
     display: flex;
     justify-content: space-between;
     padding: 2px 10px;
     align-items: center;
+    color: #fff;
 
     .title {
       font-weight: 700;
@@ -172,7 +167,6 @@
     }
 
     .close {
-      color: #4875a0;
       font-size: 22px;
       font-weight: 700;
       text-align: right;
@@ -180,30 +174,55 @@
 
       &:hover {
         cursor: pointer;
-        color: #658eb4;
+        color: #ccc;
       }
     }
   }
 
   .body {
-    // padding: 10px;
-    // display: flex;
-    // flex-wrap: wrap;
     width: 100%;
 
-    .name {
-      width: 30%;
-    }
+    .descriptions {
+      width: 100%;
+      display: flex;
+      flex-wrap: wrap;
+      box-sizing: border-box;
+      padding: 10px 0;
 
-    .value {
-      width: 70%;
+      .descriptions-item {
+        width: 48%;
+        margin: 5px;
+        box-sizing: border-box;
+        display: flex;
+        padding: 0 5px;
+
+        .label {
+          width: 30%;
+          box-sizing: border-box;
+          padding: 0 5px;
+          font-size: 15px;
+          text-align: justify;
+          text-align-last: justify;
+        }
+
+        .value {
+          padding-left: 5px;
+          width: 68%;
+          box-sizing: border-box;
+          white-space: nowrap;
+          font-size: 14px;
+          color: #a39f9f;
+
+          /* 确保文本在一行内显示 */
+          overflow: hidden;
+
+          /* 超出容器部分隐藏 */
+          text-overflow: ellipsis;
+
+          /* 文字溢出显示省略号 */
+        }
+      }
     }
   }
 }
-
-.clearfix::after {
-  content: "";
-  display: table;
-  clear: both;
-}
 </style>
diff --git a/src/views/home/pipeline/components/map.vue b/src/views/home/pipeline/components/map.vue
index b956aa0..c7c37be 100644
--- a/src/views/home/pipeline/components/map.vue
+++ b/src/views/home/pipeline/components/map.vue
@@ -176,7 +176,10 @@
   setTimeout(() => {
     // mapRef.value.map.setZoom(14)
     // mapRef.value.map.setFitView()
-    mapRef.value.map.setCenter(data.event.data.lnglat)
+    // mapRef.value.map.setCenter(data.event.data.lnglat)
+    const center = JSON.parse(JSON.stringify(data.event.data.lnglat))
+    center[1] = Number(center[1]) + 0.0035
+    mapRef.value.map.setCenter(center)
   })
   // 关联的管线高亮
   const line = $props.pipe.filter((item: any) => item.pipeCode === data.event.data.row.pipeCode)
@@ -218,7 +221,10 @@
       info: data,
       map: mapRef.value.map,
     })
-    mapRef.value.map.setCenter(data.lnglat)
+    // mapRef.value.map.setCenter(data.lnglat)
+    const center = JSON.parse(JSON.stringify(data.lnglat))
+    center[1] = Number(center[1]) + 0.0035
+    mapRef.value.map.setCenter(center)
   })
 }
 // 重置标记点
diff --git a/src/views/home/pipeline/index.vue b/src/views/home/pipeline/index.vue
index 9ef5426..7eb2f1d 100644
--- a/src/views/home/pipeline/index.vue
+++ b/src/views/home/pipeline/index.vue
@@ -12,8 +12,9 @@
 import { getDictByCode } from '@/api/system/dict'
 // 表格标识  地图或普通
 const mapRef = ref()
-const tableFlag = ref('normal')
+const tableFlag = ref('map')
 const mapLoading = ref(true)
+const mapLoad = ref(false)
 // 表格数据
 const list = ref([])
 const total = ref(0)
@@ -58,7 +59,6 @@
 // 查询数据
 const fetchData = () => {
   loadingTable.value = true
-  mapLoading.value = true
   // 判断是否有查询条件(是地图展示20条  否地图展示所有)
   const queryList = [] as Boolean[] // 长度大于2 即为是
   for (const i in listQuery.value) {
@@ -82,13 +82,13 @@
     }
   }).catch(() => {
     loadingTable.value = false
-    if (queryList.length <= 2) {
-      mapLoading.value = false
-    }
+    mapLoading.value = false
   })
-  if (queryList.length > 2) { return }
+  if (queryList.length > 2 || mapLoad.value) { return }
+  mapLoading.value = true
   // 获取地图全部数据
   getPipelineList(listQuery.value).then((res) => {
+    mapLoad.value = true
     //  管线
     pipeData.value = res.data.map((item: any) => ({
       pipeCode: item.PIPE_CODE,
@@ -104,6 +104,7 @@
     }, 500)
   })
   getPipelineDeviceList(listQuery.value).then((res) => {
+    mapLoad.value = true
     mapList.value = res.data.map((item: { [key: string]: string }) => ({
       deviceTypeName: item.TYPE_NAME,
       tagNumber: item.TAG_NUMBER,
@@ -126,6 +127,7 @@
 }
 // 重置查询条件f
 const reset = () => {
+  mapLoad.value = false
   listQuery.value = {
     limit: 20,
     offset: 1,
@@ -239,6 +241,19 @@
     },
   })
 }
+// 表格高度
+const tableHeight = ref(window.innerHeight - 60 - 50 - 10 - 350 - 98 - 10 - 52 - 52 - 10)
+window.addEventListener('resize', () => {
+  tableHeight.value = window.innerHeight - 60 - 50 - 10 - 350 - 98 - 10 - 52 - 52 - 10
+})
+watch(() => tableFlag.value, (newVal) => {
+  if (newVal === 'map') {
+    tableHeight.value = window.innerHeight - 60 - 50 - 10 - 350 - 98 - 10 - 52 - 52 - 10
+  }
+  else if (newVal === 'normal') {
+    tableHeight.value = window.innerHeight - 60 - 50 - 10 - 98 - 10 - 52 - 52 - 10
+  }
+})
 </script>
 
 <template>
@@ -247,11 +262,9 @@
     <edit-dialog ref="editRef" @refresh="fetchData" />
     <!-- 地图 -->
     <map-com
-      v-if="tableFlag === 'map'" ref="mapRef" v-loading="mapLoading" class="map" :height="450" :data="mapList"
+      v-if="tableFlag === 'map'" ref="mapRef" v-loading="mapLoading" :height="350" :data="mapList"
       :pipe="pipeData"
     />
-    <!-- 占位-地图 -->
-    <div v-if="tableFlag === 'map'" style="height: 450px;" />
     <!-- 收起地图-图标 -->
     <div v-if="tableFlag === 'map'" class="icon" @click="switchMode('normal')">
       <el-icon :size="25">
@@ -260,7 +273,7 @@
     </div>
     <!-- 筛选条件 -->
     <search-area
-      :class="`${tableFlag === 'map' ? 'search-area' : ''}`" :need-clear="true" @search="fetchData"
+      :need-clear="true" @search="fetchData"
       @clear="reset"
     >
       <search-item>
@@ -319,8 +332,6 @@
         </el-select>
       </search-item>
     </search-area>
-    <!-- 筛选条件-地图 -->
-    <div v-if="tableFlag === 'map'" style="height: 114px;" />
     <!-- 表头标题 -->
     <table-container
       :is-config="true" config-title="pipeline-monitor" :columns="columns"
@@ -344,7 +355,7 @@
       </template>
       <!-- 查询结果Table显示 -->
       <normal-table
-        :data="list" :total="total" :columns="columnsConfig" :query="listQuery" :list-loading="loadingTable"
+        :data="list" :total="total" :columns="columnsConfig" :query="listQuery" :list-loading="loadingTable" :height="tableHeight"
         @change="changePage" @rowDbClick="rowClick"
       >
         <template #preColumns>
@@ -382,7 +393,7 @@
 
   .icon {
     position: fixed;
-    top: 550px;
+    top: 450px;
     left: 50%;
     // transform: translateX(-50%);
     z-index: 901;
diff --git a/src/views/home/rule/alarm/components/alarmLevelList.vue b/src/views/home/rule/alarm/components/alarmLevelList.vue
index c1b129d..40c1e43 100644
--- a/src/views/home/rule/alarm/components/alarmLevelList.vue
+++ b/src/views/home/rule/alarm/components/alarmLevelList.vue
@@ -18,7 +18,7 @@
   { text: '报警提示方式', value: 'alarmNoteMethodName', align: 'center' },
   { text: '报警音效', value: 'isSoundName', align: 'center' },
   { text: '报警推送', value: 'isSendName', align: 'center' },
-  { text: '报警短信', value: 'isTextName', align: 'center' },
+  // { text: '报警短信', value: 'isTextName', align: 'center' },
 ])
 const loadingTable = ref(true)
 //  查询条件
diff --git a/src/views/home/rule/alarm/components/editAlarmLevelDialog.vue b/src/views/home/rule/alarm/components/editAlarmLevelDialog.vue
index fe60451..757a42c 100644
--- a/src/views/home/rule/alarm/components/editAlarmLevelDialog.vue
+++ b/src/views/home/rule/alarm/components/editAlarmLevelDialog.vue
@@ -168,11 +168,11 @@
             <el-switch v-model="dataForm.isSend" size="large" active-text="开" inactive-text="关" active-value="1" inactive-value="0" />
           </el-form-item>
         </el-col>
-        <el-col :span="12">
+        <!-- <el-col :span="12">
           <el-form-item label="报警短信" prop="isText">
             <el-switch v-model="dataForm.isText" size="large" active-text="开" inactive-text="关" active-value="1" inactive-value="0" />
           </el-form-item>
-        </el-col>
+        </el-col> -->
       </el-row>
     </el-form>
     <template #footer>
diff --git a/src/views/home/rule/alarm/components/editDialog.vue b/src/views/home/rule/alarm/components/editDialog.vue
index a8c565f..3bd2958 100644
--- a/src/views/home/rule/alarm/components/editDialog.vue
+++ b/src/views/home/rule/alarm/components/editDialog.vue
@@ -226,6 +226,9 @@
   else {
     alarmEventList.value = []
   }
+  if (newVal) {
+    dataForm.value.alarmThreshold = ''
+  }
 }, {
   deep: true,
   immediate: true,
diff --git a/src/views/home/rule/alarm/index.vue b/src/views/home/rule/alarm/index.vue
index fef4bf0..99084a0 100644
--- a/src/views/home/rule/alarm/index.vue
+++ b/src/views/home/rule/alarm/index.vue
@@ -147,7 +147,7 @@
   }))
 
   const res2 = await getAlarmTypeListPage({ offset: 1, limit: 9999 })
-  alarmTypeList.value = uniqueMultiArray(res.data.rows.map((item: any) => ({
+  alarmTypeList.value = uniqueMultiArray(res2.data.rows.map((item: any) => ({
     name: item.alarmType,
     value: item.id,
     id: item.id,
diff --git a/src/views/home/station/control/components/control.vue b/src/views/home/station/control/components/control.vue
index 8d1f867..5ec4b26 100644
--- a/src/views/home/station/control/components/control.vue
+++ b/src/views/home/station/control/components/control.vue
@@ -129,7 +129,7 @@
   flex-wrap: wrap;
 
   .left {
-    width: 62%;
+    width: 55%;
     // background-color: aqua;
     display: flex;
     justify-content: space-around;
@@ -152,7 +152,7 @@
   }
 
   .right {
-    width: 37%;
+    width: 34%;
     // background-color: chartreuse;
     display: flex;
     justify-content: space-around;
diff --git a/src/views/home/station/station/components/detailInfoDialog.vue b/src/views/home/station/station/components/detailInfoDialog.vue
index f44be1a..53bf430 100644
--- a/src/views/home/station/station/components/detailInfoDialog.vue
+++ b/src/views/home/station/station/components/detailInfoDialog.vue
@@ -127,44 +127,39 @@
       <span class="close" @click="close">x</span>
     </div>
     <div class="body">
-      <el-descriptions v-loading="loading" :column="2" border>
-        <el-descriptions-item v-for="item in descriptionsList" :key="item.text" :align="item.align">
-          <template #label>
-            <span class="label">
-              {{ item.text }}
-            </span>
-          </template>
-          {{ detailInfo[item.value] || '' }}
-        </el-descriptions-item>
-      </el-descriptions>
+      <div class="descriptions">
+        <div v-for="item in descriptionsList" :key="item.text" class="descriptions-item">
+          <div class="label">
+            {{ item.text }}
+          </div>
+          <div class="value">
+            {{ detailInfo[item.value] || '' }}
+          </div>
+        </div>
+      </div>
     </div>
   </div>
 </template>
 
 <style lang="scss" scoped>
-::v-deep(.el-descriptions__label) {
-  width: 20%;
-}
-
-::v-deep(.el-descriptions__cell) {
-  padding: 0 !important;
-}
-
 .container {
-  // width: 500px;
-  // padding: 0 10px;
-  background: rgba($color: #feffff, $alpha: 95%);
-  border: 1.5px solid #79b5e6;
+  width: 600px;
+  background: #fff;
   position: relative;
+  border-radius: 8px;
+  border: 1px solid #e4e7ed;
+  overflow: hidden;
+  box-shadow: 0 0 12px rgb(0 0 0 / 12%);
 
   .header {
     float: right;
-    background-color: #ccc;
+    background-color: #5ea1ff;
     width: 100%;
     display: flex;
     justify-content: space-between;
     padding: 2px 10px;
     align-items: center;
+    color: #fff;
 
     .title {
       font-weight: 700;
@@ -176,7 +171,6 @@
     }
 
     .close {
-      color: #4875a0;
       font-size: 22px;
       font-weight: 700;
       text-align: right;
@@ -184,30 +178,55 @@
 
       &:hover {
         cursor: pointer;
-        color: #658eb4;
+        color: #ccc;
       }
     }
   }
 
   .body {
-    // padding: 10px;
-    // display: flex;
-    // flex-wrap: wrap;
     width: 100%;
 
-    .name {
-      width: 30%;
-    }
+    .descriptions {
+      width: 100%;
+      display: flex;
+      flex-wrap: wrap;
+      box-sizing: border-box;
+      padding: 10px 0;
 
-    .value {
-      width: 70%;
+      .descriptions-item {
+        width: 48%;
+        margin: 5px;
+        box-sizing: border-box;
+        display: flex;
+        padding: 0 5px;
+
+        .label {
+          width: 28%;
+          box-sizing: border-box;
+          padding: 0 5px;
+          font-size: 15px;
+          text-align: justify;
+          text-align-last: justify;
+        }
+
+        .value {
+          padding-left: 5px;
+          width: 68%;
+          box-sizing: border-box;
+          white-space: nowrap;
+          font-size: 14px;
+          color: #a39f9f;
+
+          /* 确保文本在一行内显示 */
+          overflow: hidden;
+
+          /* 超出容器部分隐藏 */
+          text-overflow: ellipsis;
+
+          /* 文字溢出显示省略号 */
+        }
+      }
     }
   }
 }
-
-.clearfix::after {
-  content: "";
-  display: table;
-  clear: both;
-}
 </style>
diff --git a/src/views/home/station/station/components/map.vue b/src/views/home/station/station/components/map.vue
index 2351a1d..1c5a64c 100644
--- a/src/views/home/station/station/components/map.vue
+++ b/src/views/home/station/station/components/map.vue
@@ -139,8 +139,11 @@
   })
   setTimeout(() => {
     // mapRef.value.map.setZoom(14)
-    mapRef.value.map.setFitView()
-    mapRef.value.map.setCenter(data.event.data.lnglat)
+    // mapRef.value.map.setFitView()
+    // mapRef.value.map.setCenter(data.event.data.lnglat)
+    const center = JSON.parse(JSON.stringify(data.event.data.lnglat))
+    center[1] = Number(center[1]) + 0.0035
+    mapRef.value.map.setCenter(center)
   })
 }
 
@@ -164,7 +167,11 @@
       info: data,
       map: mapRef.value.map,
     })
-    mapRef.value.map.setCenter(data.lnglat)
+    // mapRef.value.map.setCenter(data.lnglat)
+    // mapRef.value.map.setFitView()
+    const center = JSON.parse(JSON.stringify(data.lnglat))
+    center[1] = Number(center[1]) + 0.0035
+    mapRef.value.map.setCenter(center)
   })
 }
 
diff --git a/src/views/home/station/station/index.vue b/src/views/home/station/station/index.vue
index 636cbad..0b2599e 100644
--- a/src/views/home/station/station/index.vue
+++ b/src/views/home/station/station/index.vue
@@ -12,8 +12,9 @@
 import { getDictByCode } from '@/api/system/dict'
 // 表格标识  地图或普通
 const mapRef = ref()
-const tableFlag = ref('normal')
+const tableFlag = ref('map')
 const mapLoading = ref(true)
+const mapLoad = ref(false)
 // 表格数据
 const list = ref([])
 const total = ref(0)
@@ -56,7 +57,6 @@
 // 查询数据
 const fetchData = () => {
   loadingTable.value = true
-  mapLoading.value = true
   // 判断是否有查询条件(是地图展示20条  否地图展示所有)
   const queryList = [] as Boolean[] // 长度大于2 即为是
   for (const i in listQuery.value) {
@@ -79,13 +79,13 @@
     }
   }).catch(() => {
     loadingTable.value = false
-    if (queryList.length <= 2) {
-      mapLoading.value = false
-    }
+    mapLoading.value = false
   })
-  if (queryList.length > 2) { return }
+  if (queryList.length > 2 || mapLoad.value) { return }
   // 获取地图全部数据
+  mapLoading.value = true
   getStationList(listQuery.value).then((res) => {
+    mapLoad.value = true
     mapList.value = res.data
     setTimeout(() => {
       if (tableFlag.value === 'map') {
@@ -99,6 +99,7 @@
 }
 // 重置查询条件f
 const reset = () => {
+  mapLoad.value = false
   listQuery.value = {
     limit: 20,
     offset: 1,
@@ -179,6 +180,19 @@
     },
   })
 }
+// 表格高度
+const tableHeight = ref(window.innerHeight - 60 - 50 - 10 - 350 - 98 - 10 - 52 - 52 - 10)
+window.addEventListener('resize', () => {
+  tableHeight.value = window.innerHeight - 60 - 50 - 10 - 350 - 98 - 10 - 52 - 52 - 10
+})
+watch(() => tableFlag.value, (newVal) => {
+  if (newVal === 'map') {
+    tableHeight.value = window.innerHeight - 60 - 50 - 10 - 350 - 98 - 10 - 52 - 52 - 10
+  }
+  else if (newVal === 'normal') {
+    tableHeight.value = window.innerHeight - 60 - 50 - 10 - 98 - 10 - 52 - 52 - 10
+  }
+})
 </script>
 
 <template>
@@ -186,9 +200,7 @@
   <app-container class="container">
     <edit-dialog ref="editRef" @refresh="fetchData" />
     <!-- 地图 -->
-    <map-com v-if="tableFlag === 'map'" ref="mapRef" v-loading="mapLoading" class="map" :height="450" :data="mapList" />
-    <!-- 占位-地图 -->
-    <div v-if="tableFlag === 'map'" style="height: 450px;" />
+    <map-com v-if="tableFlag === 'map'" ref="mapRef" v-loading="mapLoading" :height="350" :data="mapList" />
     <!-- 收起地图-图标 -->
     <div v-if="tableFlag === 'map'" class="icon" @click="switchMode('normal')">
       <el-icon :size="25">
@@ -197,7 +209,7 @@
     </div>
     <!-- 筛选条件 -->
     <search-area
-      :class="`${tableFlag === 'map' ? 'search-area' : ''}`" :need-clear="true" @search="fetchData"
+      :need-clear="true" @search="fetchData"
       @clear="reset"
     >
       <search-item>
@@ -229,8 +241,6 @@
         </el-select>
       </search-item>
     </search-area>
-    <!-- 筛选条件-地图 -->
-    <div v-if="tableFlag === 'map'" style="height: 56px;" />
     <!-- 表头标题 -->
     <table-container
       :is-config="true" config-title="station-monitor" :columns="columns" :config-columns="columnsConfig"
@@ -254,7 +264,7 @@
       </template>
       <!-- 查询结果Table显示 -->
       <normal-table
-        :data="list" :total="total" :columns="columnsConfig" :query="listQuery" :list-loading="loadingTable"
+        :data="list" :total="total" :columns="columnsConfig" :query="listQuery" :list-loading="loadingTable" :height="tableHeight"
         @change="changePage" @rowDbClick="rowClick"
       >
         <template #preColumns>
@@ -292,7 +302,7 @@
 
   .icon {
     position: fixed;
-    top: 550px;
+    top: 450px;
     left: 50%;
     // transform: translateX(-50%);
     z-index: 901;
diff --git a/src/views/home/well/components/detailInfoDialog.vue b/src/views/home/well/components/detailInfoDialog.vue
index 5d33d05..d0d4242 100644
--- a/src/views/home/well/components/detailInfoDialog.vue
+++ b/src/views/home/well/components/detailInfoDialog.vue
@@ -128,71 +128,39 @@
       <span class="close" @click="close">x</span>
     </div>
     <div class="body">
-      <el-descriptions v-loading="loading" :column="2" border>
-        <el-descriptions-item v-for="item in descriptionsList" :key="item.text" :align="item.align">
-          <template #label>
-            <span class="label">
-              {{ item.text }}
-            </span>
-          </template>
-          <span class="nowrap">
+      <div class="descriptions">
+        <div v-for="item in descriptionsList" :key="item.text" class="descriptions-item">
+          <div class="label">
+            {{ item.text }}
+          </div>
+          <div class="value">
             {{ detailInfo[item.value] || '' }}
-          </span>
-        </el-descriptions-item>
-      </el-descriptions>
+          </div>
+        </div>
+      </div>
     </div>
   </div>
 </template>
 
 <style lang="scss" scoped>
-::v-deep(.el-descriptions__cell) {
-  padding: 0 !important;
-
-  ::v-deep(.is-bordered-label) {
-    width: 100px !important;
-  }
-
-  ::v-deep(.el-descriptions__label) {
-    width: 100px !important;
-  }
-
-  ::v-deep(.el-descriptions__content) {
-    width: 170px !important;
-  }
-
-  ::v-deep(.is-bordered-content) {
-    width: 170px !important;
-  }
-}
-
-.nowrap {
-  width: 170px;
-  white-space: nowrap;
-
-  /* 确保文本在一行内显示 */
-  overflow: hidden;
-
-  /* 超出容器部分隐藏 */
-  text-overflow: ellipsis;
-
-  /* 文字溢出显示省略号 */
-}
-
 .container {
-  // width: 500px;
-  // padding: 0 10px;
-  background: rgba($color: #feffff, $alpha: 95%);
-  border: 1.5px solid #79b5e6;
+  width: 600px;
+  background: #fff;
   position: relative;
+  border-radius: 8px;
+  border: 1px solid #e4e7ed;
+  overflow: hidden;
+  box-shadow: 0 0 12px rgb(0 0 0 / 12%);
 
   .header {
     float: right;
-    background-color: #ccc;
+    background-color: #5ea1ff;
     width: 100%;
     display: flex;
     justify-content: space-between;
     padding: 2px 10px;
     align-items: center;
+    color: #fff;
 
     .title {
       font-weight: 700;
@@ -204,7 +172,6 @@
     }
 
     .close {
-      color: #4875a0;
       font-size: 22px;
       font-weight: 700;
       text-align: right;
@@ -212,30 +179,55 @@
 
       &:hover {
         cursor: pointer;
-        color: #658eb4;
+        color: #ccc;
       }
     }
   }
 
   .body {
-    // padding: 10px;
-    // display: flex;
-    // flex-wrap: wrap;
     width: 100%;
 
-    .name {
-      width: 30%;
-    }
+    .descriptions {
+      width: 100%;
+      display: flex;
+      flex-wrap: wrap;
+      box-sizing: border-box;
+      padding: 10px 0;
 
-    .value {
-      width: 70%;
+      .descriptions-item {
+        width: 48%;
+        margin: 5px;
+        box-sizing: border-box;
+        display: flex;
+        padding: 0 5px;
+
+        .label {
+          width: 28%;
+          box-sizing: border-box;
+          padding: 0 5px;
+          font-size: 15px;
+          text-align: justify;
+          text-align-last: justify;
+        }
+
+        .value {
+          padding-left: 5px;
+          width: 68%;
+          box-sizing: border-box;
+          white-space: nowrap;
+          font-size: 14px;
+          color: #a39f9f;
+
+          /* 确保文本在一行内显示 */
+          overflow: hidden;
+
+          /* 超出容器部分隐藏 */
+          text-overflow: ellipsis;
+
+          /* 文字溢出显示省略号 */
+        }
+      }
     }
   }
 }
-
-.clearfix::after {
-  content: "";
-  display: table;
-  clear: both;
-}
 </style>
diff --git a/src/views/home/well/components/map.vue b/src/views/home/well/components/map.vue
index fa2634a..5d9ec48 100644
--- a/src/views/home/well/components/map.vue
+++ b/src/views/home/well/components/map.vue
@@ -139,8 +139,11 @@
   })
   setTimeout(() => {
     // mapRef.value.map.setZoom(14)
-    mapRef.value.map.setFitView()
-    mapRef.value.map.setCenter(data.event.data.lnglat)
+    // mapRef.value.map.setFitView()
+    // mapRef.value.map.setCenter(data.event.data.lnglat)
+    const center = JSON.parse(JSON.stringify(data.event.data.lnglat))
+    center[1] = Number(center[1]) + 0.0035
+    mapRef.value.map.setCenter(center)
   })
 }
 
@@ -164,7 +167,9 @@
       info: data,
       map: mapRef.value.map,
     })
-    mapRef.value.map.setCenter(data.lnglat)
+    const center = JSON.parse(JSON.stringify(data.lnglat))
+    center[1] = Number(center[1]) + 0.0035
+    mapRef.value.map.setCenter(center)
   })
 }
 

diff --git a/src/api/home/alarm/count.ts b/src/api/home/alarm/count.ts
new file mode 100644
index 0000000..1f4b59a
--- /dev/null
+++ b/src/api/home/alarm/count.ts
@@ -0,0 +1,36 @@
+/**
+ * 报警统计
+ */
+import request from '@/api/index'
+
+// 报警总体情况
+export function getOverallAlarm() {
+  return request({
+    url: '/statics/alarmRecords/overall',
+    method: 'post',
+  })
+}
+// 各类报警统计
+export function getAlarmType(data: any) {
+  return request({
+    url: '/statics/alarmRecords/alarmType',
+    method: 'post',
+    data,
+  })
+}
+// 各单位报警统计
+export function getAlarmCompany(data: any) {
+  return request({
+    url: '/statics/alarmRecords/alarmCompany',
+    method: 'post',
+    data,
+  })
+}
+// 异常位置分析
+export function getAlarmPosition(data: any) {
+  return request({
+    url: '/statics/alarmRecords/alarmPosition',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/views/home/alarm/count/components/alarmStatistics.vue b/src/views/home/alarm/count/components/alarmStatistics.vue
index b009891..b088de2 100644
--- a/src/views/home/alarm/count/components/alarmStatistics.vue
+++ b/src/views/home/alarm/count/components/alarmStatistics.vue
@@ -5,30 +5,79 @@
  -->
 <script lang="ts" setup name="AlarmCount">
 import layout from './layout.vue'
+import { getAlarmType } from '@/api/home/alarm/count'
 const listQuery = ref({
-  type: 'day',
+  timeType: '2',
+  ledgerType: '',
+  deptid: '',
+  begTime: '',
+  endTime: '',
 })
 const selectTimeType = (type: string) => {
-  listQuery.value.type = type
+  listQuery.value.timeType = type
 }
+// 类别
+const ledgerTypeList = ref<{ id: string; name: string; value: string }[]>([
+  {
+    name: '闸井',
+    id: '1',
+    value: '1',
+  },
+  {
+    name: '场站',
+    id: '2',
+    value: '2',
+  },
+  {
+    name: '管线',
+    id: '3',
+    value: '3',
+  },
+])
 const xAxisData = ref([])
 const data = ref([])
 const list = ref([])
-setTimeout(() => {
-  xAxisData.value = [
-    '闸井浓度超限', '场站浓度超限', '场站火焰报警', '疑似第三方破坏', '场站烟雾报警',
-  ]
-  data.value = [
-    {
-      name: '报警数量',
-      data: [1, 3, 5, 1, 4],
-    },
-  ]
-  list.value = xAxisData.value.map((item, index) => ({
-    alarmType: item,
-    value: data.value[0].data[index],
-  }))
-}, 1000)
+const loading = ref(true)
+// 开始结束时间
+const datetimerange = ref()
+// 默认当天
+watch(() => datetimerange.value, (newVal) => {
+  listQuery.value.begTime = ''
+  listQuery.value.endTime = ''
+  if (Array.isArray(newVal)) {
+    if (newVal.length) {
+      listQuery.value.begTime = `${newVal[0]}`
+      listQuery.value.endTime = `${newVal[1]}`
+    }
+  }
+})
+// setTimeout(() => {
+//   xAxisData.value = [
+//     '闸井浓度超限', '场站浓度超限', '场站火焰报警', '疑似第三方破坏', '场站烟雾报警',
+//   ]
+//   data.value = [
+//     {
+//       name: '报警数量',
+//       data: [1, 3, 5, 1, 4],
+//     },
+//   ]
+//   list.value = xAxisData.value.map((item, index) => ({
+//     alarmType: item,
+//     value: data.value[0].data[index],
+//   }))
+// }, 1000)
+const fetchData = () => {
+  loading.value = true
+  getAlarmType(listQuery.value).then((res) => {
+    console.log(res.data, '各类报警统计')
+    loading.value = false
+  }).catch(() => {
+    loading.value = false
+  })
+}
+onMounted(() => {
+  fetchData()
+})
 </script>
 
 <template>
@@ -37,26 +86,22 @@
     <template #search>
       <div class="search">
         <el-button
-          :class="listQuery.type === 'day' ? 'active' : ''" round size="small"
-          @click="selectTimeType('day')"
-        >
-          今日
-        </el-button>
-        <el-button
-          :class="listQuery.type === 'week' ? 'active' : ''" round size="small"
-          @click="selectTimeType('week')"
+          :class="listQuery.timeType === '2' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+          @click="selectTimeType('2')"
         >
           本周
         </el-button>
         <el-button
-          :class="listQuery.type === 'month' ? 'active' : ''" round size="small"
-          @click="selectTimeType('month')"
+          :class="listQuery.timeType === '3' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+          @click="selectTimeType('3')"
         >
           本月
         </el-button>
-        <el-select v-model="listQuery.keywords" placeholder="全部类别" clearable style="width: 180px;margin: 0 5px;" />
+        <el-select v-model="listQuery.ledgerType" placeholder="全部类别" clearable style="width: 180px;margin: 0 5px;">
+          <el-option v-for="item in ledgerTypeList" :key="item.id" :label="item.name" :value="item.id" />
+        </el-select>
         <dept-select
-          v-model="listQuery.keywords" placeholder="管理单位" :clearable="true"
+          v-model="listQuery.deptid" placeholder="管理单位" :clearable="true"
           style="width: 220px;margin: 0 5px;"
         />
         <el-date-picker
@@ -64,18 +109,27 @@
           style="width: 340px;margin: 0 5px;" value-format="YYYY-MM-DD HH:mm:ss" range-separator="至"
           start-placeholder="报警开始时间" end-placeholder="报警结束时间" clearable
         />
-        <el-button type="primary" style="margin: 0 5px;">
+        <el-button type="primary" style="margin: 0 5px;" @click="fetchData">
           搜索
         </el-button>
       </div>
     </template>
     <template #content>
-      <div class="alarm-count">
+      <div v-loading="loading" class="alarm-count">
         <div class="bar">
           <bar-chart-vertical
+            v-show="xAxisData.length"
             :x-axis-data="xAxisData" :bar-coner="0" :data="data" :colors="[]" :bar-width="15"
             :legend="{ itemWidth: 8, itemHeight: 8, type: 'scroll', orient: 'horizontal', icon: 'roundRect', right: '0', top: '10' }"
+            :grid="{
+              top: 50,
+              left: 30,
+              right: 30,
+              bottom: 20,
+              containLabel: true, // 是否包含坐标轴的刻度标签
+            }"
           />
+          <el-empty v-show="!xAxisData.length" description="暂无数据" />
         </div>
         <div class="table">
           <el-table border :data="list" stripe style="width: 100%;" :height="440">
@@ -110,8 +164,9 @@
   }
 
   .table {
-    width: 40%;
+    width: 38%;
     padding: 10px;
+    margin-left: 20px;
   }
 }
 </style>
diff --git a/src/views/home/alarm/count/components/deptCount.vue b/src/views/home/alarm/count/components/deptCount.vue
index 1579231..1ca5482 100644
--- a/src/views/home/alarm/count/components/deptCount.vue
+++ b/src/views/home/alarm/count/components/deptCount.vue
@@ -122,8 +122,9 @@
   }
 
   .table {
-    width: 40%;
+    width: 38%;
     padding: 10px;
+    margin-left: 20px;
   }
 }
 </style>
diff --git a/src/views/home/alarm/count/components/overallAlarm.vue b/src/views/home/alarm/count/components/overallAlarm.vue
index f14ee15..476add8 100644
--- a/src/views/home/alarm/count/components/overallAlarm.vue
+++ b/src/views/home/alarm/count/components/overallAlarm.vue
@@ -5,39 +5,64 @@
  -->
 <script lang="ts" setup name="AlarmCount">
 import layout from './layout.vue'
+import { getOverallAlarm } from '@/api/home/alarm/count'
 const alarmData = ref<any[]>([
   {
     name: '正在报警',
-    value: '7',
+    value: '0',
     unit: '个',
+    type: '1',
   },
   {
     name: '今日报警',
-    value: '2',
+    value: '0',
     unit: '个',
+    type: '2',
   },
   {
     name: '本周报警',
-    value: '12',
+    value: '0',
     unit: '个',
+    type: '3',
   },
   {
     name: '本月报警',
-    value: '25',
+    value: '0',
     unit: '个',
+    type: '4',
   },
   {
     name: '全年报警',
-    value: '208',
+    value: '0',
     unit: '个',
+    type: '5',
   },
 ])
+const loading = ref(true)
+const fetchData = () => {
+  loading.value = true
+  getOverallAlarm().then((res) => {
+    const data = res.data
+    data.forEach((item: any) => {
+      const cindex = alarmData.value.findIndex((citem: any) => citem.type === item.type)
+      if (cindex !== -1) {
+        alarmData.value[cindex].value = item.sum
+      }
+    })
+    loading.value = false
+  }).catch(() => {
+    loading.value = false
+  })
+}
+onMounted(() => {
+  fetchData()
+})
 </script>
 
 <template>
   <layout title="报警总体情况">
     <template #content>
-      <div class="alarm-container">
+      <div v-loading="loading" class="alarm-container">
         <div v-for="item in alarmData" :key="item.name" class="alarm-item">
           <div class="top">
             {{ item.name }}
@@ -63,18 +88,26 @@
     border-left: 4px solid #f24d4d;
     width: 18%;
     padding: 10px;
+    padding-top: 15px;
+    padding-bottom: 15px;
 
     .top {
       padding-left: 10px;
+      font-size: 22px;
+      font-weight: 700;
     }
 
     .bottom {
       text-align: center;
 
       .value {
-        font-size: 18px;
+        font-size: 22px;
         font-weight: 700;
       }
+
+      .unit {
+        font-size: 20px;
+      }
     }
   }
 }
diff --git a/src/views/home/alarm/count/components/trendAnalysis.vue b/src/views/home/alarm/count/components/trendAnalysis.vue
index cea2495..73e18b0 100644
--- a/src/views/home/alarm/count/components/trendAnalysis.vue
+++ b/src/views/home/alarm/count/components/trendAnalysis.vue
@@ -131,8 +131,9 @@
   }
 
   .table {
-    width: 40%;
+    width: 38%;
     padding: 10px;
+    margin-left: 20px;
   }
 }
 </style>
diff --git a/src/views/home/device/device/index.vue b/src/views/home/device/device/index.vue
index 55f12a9..df2cf32 100644
--- a/src/views/home/device/device/index.vue
+++ b/src/views/home/device/device/index.vue
@@ -13,6 +13,7 @@
 import { exportFile } from '@/utils/exportUtils'
 const $router = useRouter()
 const useStatusList = ref<{ id: string; name: string; value: string }[]>([]) // 设备在用情况
+const deviceTypeList = ref<{ id: string; name: string; value: string }[]>([]) // 设备类型
 // 表格数据
 const list = ref<any[]>([])
 const total = ref(0)
@@ -20,18 +21,18 @@
 const columns = ref<any>([
   { text: '状态', value: 'onlineState', align: 'center', isCustom: true, width: '55' },
   { text: '设备编号', value: 'devcode', align: 'center', isRequired: true },
-  { text: '设备类型', value: 'deviceType', align: 'center', isRequired: true },
-  { text: '监测对象', value: 'watchObject', align: 'center' },
+  { text: '设备类型', value: 'deviceTypeName', align: 'center', isRequired: true },
+  { text: '监测对象', value: 'watchObject', align: 'center', width: '85' },
   { text: '设备型号', value: 'deviceModel', align: 'center' },
   { text: '厂商', value: 'manufactureName', align: 'center', isRequired: true },
-  { text: '安装位号', value: 'tagNumber', align: 'center', isRequired: true },
+  { text: '安装位号', value: 'tagNumber', align: 'center', isRequired: true, width: '110' },
   { text: '详细位置', value: 'position', align: 'center', isRequired: true },
   { text: '管理单位', value: 'deptName', align: 'center', isRequired: true },
-  { text: '在用情况', value: 'validName', align: 'center', isRequired: true },
+  { text: '在用情况', value: 'validName', align: 'center', isRequired: true, width: '85' },
   // { text: '布防状态', value: '', align: 'center', isRequired: true },
-  { text: '电量', value: 'cell', align: 'center', isRequired: true },
-  { text: '最新上报时间', value: 'logtime', align: 'center', isRequired: true },
-  { text: '安装日期', value: 'installDate', align: 'center', isRequired: true },
+  { text: '电量', value: 'cell', align: 'center', isRequired: true, width: '70' },
+  { text: '最新上报时间', value: 'logtime', align: 'center', isRequired: true, width: '180' },
+  { text: '安装日期', value: 'installDate', align: 'center', isRequired: true, width: '180' },
 ])
 // 最终展示列
 const columnsConfig = ref([])
@@ -75,6 +76,7 @@
     list.value = res.data.rows.map((item: any) => ({
       ...item,
       validName: useStatusList.value.length ? useStatusList.value[useStatusList.value.findIndex(citem => item.valid === citem.value)].name : '',
+      deviceTypeName: deviceTypeList.value.length ? deviceTypeList.value[deviceTypeList.value.findIndex(citem => item.deviceType === citem.value)].name : '',
     }))
     total.value = res.data.total
     loadingTable.value = false
@@ -178,7 +180,7 @@
   ElMessage.warning('敬请期待')
 }
 const isUsed = ref<{ id: string; name: string; value: string }[]>([]) // 是否启用
-const deviceTypeList = ref<{ id: string; name: string; value: string }[]>([]) // 设备类型
+
 const manufacturerList = ref<{ id: string; name: string; value: string }[]>([]) // 厂商列表
 const cellList = ref<{ id: string; name: string; value: string }[]>([]) // 厂商列表
 
@@ -217,6 +219,12 @@
   // 设备类型
   getDeviceTypeListPage({ limit: 9999, offset: 1 }).then((res) => {
     deviceTypeList.value = res.data.rows.map((item: any) => ({ id: item.id, name: item.typeName, value: item.id }))
+    if (list.value.length) {
+      list.value = list.value.map((item: any) => ({
+        ...item,
+        deviceTypeName: deviceTypeList.value.length ? deviceTypeList.value[deviceTypeList.value.findIndex(citem => item.deviceType === citem.value)].name : '',
+      }))
+    }
   })
   // 厂商
   getManufacturerListPage().then((res) => {
diff --git a/src/views/home/pipeline/components/detailInfoDialog.vue b/src/views/home/pipeline/components/detailInfoDialog.vue
index 31f5635..1662e6e 100644
--- a/src/views/home/pipeline/components/detailInfoDialog.vue
+++ b/src/views/home/pipeline/components/detailInfoDialog.vue
@@ -123,44 +123,39 @@
       <span class="close" @click="close">x</span>
     </div>
     <div class="body">
-      <el-descriptions v-loading="loading" :column="2" border>
-        <el-descriptions-item v-for="item in descriptionsList" :key="item.text" :align="item.align">
-          <template #label>
-            <span class="label">
-              {{ item.text }}
-            </span>
-          </template>
-          {{ detailInfo[item.value] || '' }}
-        </el-descriptions-item>
-      </el-descriptions>
+      <div class="descriptions">
+        <div v-for="item in descriptionsList" :key="item.text" class="descriptions-item">
+          <div class="label">
+            {{ item.text }}
+          </div>
+          <div class="value" :title="detailInfo[item.value] || ''">
+            {{ detailInfo[item.value] || '' }}
+          </div>
+        </div>
+      </div>
     </div>
   </div>
 </template>
 
 <style lang="scss" scoped>
-::v-deep(.el-descriptions__label) {
-  width: 20%;
-}
-
-::v-deep(.el-descriptions__cell) {
-  padding: 0 !important;
-}
-
 .container {
-  // width: 500px;
-  // padding: 0 10px;
-  background: rgba($color: #feffff, $alpha: 95%);
-  border: 1.5px solid #79b5e6;
+  width: 600px;
+  background: #fff;
   position: relative;
+  border-radius: 8px;
+  border: 1px solid #e4e7ed;
+  overflow: hidden;
+  box-shadow: 0 0 12px rgb(0 0 0 / 12%);
 
   .header {
     float: right;
-    background-color: #ccc;
+    background-color: #5ea1ff;
     width: 100%;
     display: flex;
     justify-content: space-between;
     padding: 2px 10px;
     align-items: center;
+    color: #fff;
 
     .title {
       font-weight: 700;
@@ -172,7 +167,6 @@
     }
 
     .close {
-      color: #4875a0;
       font-size: 22px;
       font-weight: 700;
       text-align: right;
@@ -180,30 +174,55 @@
 
       &:hover {
         cursor: pointer;
-        color: #658eb4;
+        color: #ccc;
       }
     }
   }
 
   .body {
-    // padding: 10px;
-    // display: flex;
-    // flex-wrap: wrap;
     width: 100%;
 
-    .name {
-      width: 30%;
-    }
+    .descriptions {
+      width: 100%;
+      display: flex;
+      flex-wrap: wrap;
+      box-sizing: border-box;
+      padding: 10px 0;
 
-    .value {
-      width: 70%;
+      .descriptions-item {
+        width: 48%;
+        margin: 5px;
+        box-sizing: border-box;
+        display: flex;
+        padding: 0 5px;
+
+        .label {
+          width: 30%;
+          box-sizing: border-box;
+          padding: 0 5px;
+          font-size: 15px;
+          text-align: justify;
+          text-align-last: justify;
+        }
+
+        .value {
+          padding-left: 5px;
+          width: 68%;
+          box-sizing: border-box;
+          white-space: nowrap;
+          font-size: 14px;
+          color: #a39f9f;
+
+          /* 确保文本在一行内显示 */
+          overflow: hidden;
+
+          /* 超出容器部分隐藏 */
+          text-overflow: ellipsis;
+
+          /* 文字溢出显示省略号 */
+        }
+      }
     }
   }
 }
-
-.clearfix::after {
-  content: "";
-  display: table;
-  clear: both;
-}
 </style>
diff --git a/src/views/home/pipeline/components/map.vue b/src/views/home/pipeline/components/map.vue
index b956aa0..c7c37be 100644
--- a/src/views/home/pipeline/components/map.vue
+++ b/src/views/home/pipeline/components/map.vue
@@ -176,7 +176,10 @@
   setTimeout(() => {
     // mapRef.value.map.setZoom(14)
     // mapRef.value.map.setFitView()
-    mapRef.value.map.setCenter(data.event.data.lnglat)
+    // mapRef.value.map.setCenter(data.event.data.lnglat)
+    const center = JSON.parse(JSON.stringify(data.event.data.lnglat))
+    center[1] = Number(center[1]) + 0.0035
+    mapRef.value.map.setCenter(center)
   })
   // 关联的管线高亮
   const line = $props.pipe.filter((item: any) => item.pipeCode === data.event.data.row.pipeCode)
@@ -218,7 +221,10 @@
       info: data,
       map: mapRef.value.map,
     })
-    mapRef.value.map.setCenter(data.lnglat)
+    // mapRef.value.map.setCenter(data.lnglat)
+    const center = JSON.parse(JSON.stringify(data.lnglat))
+    center[1] = Number(center[1]) + 0.0035
+    mapRef.value.map.setCenter(center)
   })
 }
 // 重置标记点
diff --git a/src/views/home/pipeline/index.vue b/src/views/home/pipeline/index.vue
index 9ef5426..7eb2f1d 100644
--- a/src/views/home/pipeline/index.vue
+++ b/src/views/home/pipeline/index.vue
@@ -12,8 +12,9 @@
 import { getDictByCode } from '@/api/system/dict'
 // 表格标识  地图或普通
 const mapRef = ref()
-const tableFlag = ref('normal')
+const tableFlag = ref('map')
 const mapLoading = ref(true)
+const mapLoad = ref(false)
 // 表格数据
 const list = ref([])
 const total = ref(0)
@@ -58,7 +59,6 @@
 // 查询数据
 const fetchData = () => {
   loadingTable.value = true
-  mapLoading.value = true
   // 判断是否有查询条件(是地图展示20条  否地图展示所有)
   const queryList = [] as Boolean[] // 长度大于2 即为是
   for (const i in listQuery.value) {
@@ -82,13 +82,13 @@
     }
   }).catch(() => {
     loadingTable.value = false
-    if (queryList.length <= 2) {
-      mapLoading.value = false
-    }
+    mapLoading.value = false
   })
-  if (queryList.length > 2) { return }
+  if (queryList.length > 2 || mapLoad.value) { return }
+  mapLoading.value = true
   // 获取地图全部数据
   getPipelineList(listQuery.value).then((res) => {
+    mapLoad.value = true
     //  管线
     pipeData.value = res.data.map((item: any) => ({
       pipeCode: item.PIPE_CODE,
@@ -104,6 +104,7 @@
     }, 500)
   })
   getPipelineDeviceList(listQuery.value).then((res) => {
+    mapLoad.value = true
     mapList.value = res.data.map((item: { [key: string]: string }) => ({
       deviceTypeName: item.TYPE_NAME,
       tagNumber: item.TAG_NUMBER,
@@ -126,6 +127,7 @@
 }
 // 重置查询条件f
 const reset = () => {
+  mapLoad.value = false
   listQuery.value = {
     limit: 20,
     offset: 1,
@@ -239,6 +241,19 @@
     },
   })
 }
+// 表格高度
+const tableHeight = ref(window.innerHeight - 60 - 50 - 10 - 350 - 98 - 10 - 52 - 52 - 10)
+window.addEventListener('resize', () => {
+  tableHeight.value = window.innerHeight - 60 - 50 - 10 - 350 - 98 - 10 - 52 - 52 - 10
+})
+watch(() => tableFlag.value, (newVal) => {
+  if (newVal === 'map') {
+    tableHeight.value = window.innerHeight - 60 - 50 - 10 - 350 - 98 - 10 - 52 - 52 - 10
+  }
+  else if (newVal === 'normal') {
+    tableHeight.value = window.innerHeight - 60 - 50 - 10 - 98 - 10 - 52 - 52 - 10
+  }
+})
 </script>
 
 <template>
@@ -247,11 +262,9 @@
     <edit-dialog ref="editRef" @refresh="fetchData" />
     <!-- 地图 -->
     <map-com
-      v-if="tableFlag === 'map'" ref="mapRef" v-loading="mapLoading" class="map" :height="450" :data="mapList"
+      v-if="tableFlag === 'map'" ref="mapRef" v-loading="mapLoading" :height="350" :data="mapList"
       :pipe="pipeData"
     />
-    <!-- 占位-地图 -->
-    <div v-if="tableFlag === 'map'" style="height: 450px;" />
     <!-- 收起地图-图标 -->
     <div v-if="tableFlag === 'map'" class="icon" @click="switchMode('normal')">
       <el-icon :size="25">
@@ -260,7 +273,7 @@
     </div>
     <!-- 筛选条件 -->
     <search-area
-      :class="`${tableFlag === 'map' ? 'search-area' : ''}`" :need-clear="true" @search="fetchData"
+      :need-clear="true" @search="fetchData"
       @clear="reset"
     >
       <search-item>
@@ -319,8 +332,6 @@
         </el-select>
       </search-item>
     </search-area>
-    <!-- 筛选条件-地图 -->
-    <div v-if="tableFlag === 'map'" style="height: 114px;" />
     <!-- 表头标题 -->
     <table-container
       :is-config="true" config-title="pipeline-monitor" :columns="columns"
@@ -344,7 +355,7 @@
       </template>
       <!-- 查询结果Table显示 -->
       <normal-table
-        :data="list" :total="total" :columns="columnsConfig" :query="listQuery" :list-loading="loadingTable"
+        :data="list" :total="total" :columns="columnsConfig" :query="listQuery" :list-loading="loadingTable" :height="tableHeight"
         @change="changePage" @rowDbClick="rowClick"
       >
         <template #preColumns>
@@ -382,7 +393,7 @@
 
   .icon {
     position: fixed;
-    top: 550px;
+    top: 450px;
     left: 50%;
     // transform: translateX(-50%);
     z-index: 901;
diff --git a/src/views/home/rule/alarm/components/alarmLevelList.vue b/src/views/home/rule/alarm/components/alarmLevelList.vue
index c1b129d..40c1e43 100644
--- a/src/views/home/rule/alarm/components/alarmLevelList.vue
+++ b/src/views/home/rule/alarm/components/alarmLevelList.vue
@@ -18,7 +18,7 @@
   { text: '报警提示方式', value: 'alarmNoteMethodName', align: 'center' },
   { text: '报警音效', value: 'isSoundName', align: 'center' },
   { text: '报警推送', value: 'isSendName', align: 'center' },
-  { text: '报警短信', value: 'isTextName', align: 'center' },
+  // { text: '报警短信', value: 'isTextName', align: 'center' },
 ])
 const loadingTable = ref(true)
 //  查询条件
diff --git a/src/views/home/rule/alarm/components/editAlarmLevelDialog.vue b/src/views/home/rule/alarm/components/editAlarmLevelDialog.vue
index fe60451..757a42c 100644
--- a/src/views/home/rule/alarm/components/editAlarmLevelDialog.vue
+++ b/src/views/home/rule/alarm/components/editAlarmLevelDialog.vue
@@ -168,11 +168,11 @@
             <el-switch v-model="dataForm.isSend" size="large" active-text="开" inactive-text="关" active-value="1" inactive-value="0" />
           </el-form-item>
         </el-col>
-        <el-col :span="12">
+        <!-- <el-col :span="12">
           <el-form-item label="报警短信" prop="isText">
             <el-switch v-model="dataForm.isText" size="large" active-text="开" inactive-text="关" active-value="1" inactive-value="0" />
           </el-form-item>
-        </el-col>
+        </el-col> -->
       </el-row>
     </el-form>
     <template #footer>
diff --git a/src/views/home/rule/alarm/components/editDialog.vue b/src/views/home/rule/alarm/components/editDialog.vue
index a8c565f..3bd2958 100644
--- a/src/views/home/rule/alarm/components/editDialog.vue
+++ b/src/views/home/rule/alarm/components/editDialog.vue
@@ -226,6 +226,9 @@
   else {
     alarmEventList.value = []
   }
+  if (newVal) {
+    dataForm.value.alarmThreshold = ''
+  }
 }, {
   deep: true,
   immediate: true,
diff --git a/src/views/home/rule/alarm/index.vue b/src/views/home/rule/alarm/index.vue
index fef4bf0..99084a0 100644
--- a/src/views/home/rule/alarm/index.vue
+++ b/src/views/home/rule/alarm/index.vue
@@ -147,7 +147,7 @@
   }))
 
   const res2 = await getAlarmTypeListPage({ offset: 1, limit: 9999 })
-  alarmTypeList.value = uniqueMultiArray(res.data.rows.map((item: any) => ({
+  alarmTypeList.value = uniqueMultiArray(res2.data.rows.map((item: any) => ({
     name: item.alarmType,
     value: item.id,
     id: item.id,
diff --git a/src/views/home/station/control/components/control.vue b/src/views/home/station/control/components/control.vue
index 8d1f867..5ec4b26 100644
--- a/src/views/home/station/control/components/control.vue
+++ b/src/views/home/station/control/components/control.vue
@@ -129,7 +129,7 @@
   flex-wrap: wrap;
 
   .left {
-    width: 62%;
+    width: 55%;
     // background-color: aqua;
     display: flex;
     justify-content: space-around;
@@ -152,7 +152,7 @@
   }
 
   .right {
-    width: 37%;
+    width: 34%;
     // background-color: chartreuse;
     display: flex;
     justify-content: space-around;
diff --git a/src/views/home/station/station/components/detailInfoDialog.vue b/src/views/home/station/station/components/detailInfoDialog.vue
index f44be1a..53bf430 100644
--- a/src/views/home/station/station/components/detailInfoDialog.vue
+++ b/src/views/home/station/station/components/detailInfoDialog.vue
@@ -127,44 +127,39 @@
       <span class="close" @click="close">x</span>
     </div>
     <div class="body">
-      <el-descriptions v-loading="loading" :column="2" border>
-        <el-descriptions-item v-for="item in descriptionsList" :key="item.text" :align="item.align">
-          <template #label>
-            <span class="label">
-              {{ item.text }}
-            </span>
-          </template>
-          {{ detailInfo[item.value] || '' }}
-        </el-descriptions-item>
-      </el-descriptions>
+      <div class="descriptions">
+        <div v-for="item in descriptionsList" :key="item.text" class="descriptions-item">
+          <div class="label">
+            {{ item.text }}
+          </div>
+          <div class="value">
+            {{ detailInfo[item.value] || '' }}
+          </div>
+        </div>
+      </div>
     </div>
   </div>
 </template>
 
 <style lang="scss" scoped>
-::v-deep(.el-descriptions__label) {
-  width: 20%;
-}
-
-::v-deep(.el-descriptions__cell) {
-  padding: 0 !important;
-}
-
 .container {
-  // width: 500px;
-  // padding: 0 10px;
-  background: rgba($color: #feffff, $alpha: 95%);
-  border: 1.5px solid #79b5e6;
+  width: 600px;
+  background: #fff;
   position: relative;
+  border-radius: 8px;
+  border: 1px solid #e4e7ed;
+  overflow: hidden;
+  box-shadow: 0 0 12px rgb(0 0 0 / 12%);
 
   .header {
     float: right;
-    background-color: #ccc;
+    background-color: #5ea1ff;
     width: 100%;
     display: flex;
     justify-content: space-between;
     padding: 2px 10px;
     align-items: center;
+    color: #fff;
 
     .title {
       font-weight: 700;
@@ -176,7 +171,6 @@
     }
 
     .close {
-      color: #4875a0;
       font-size: 22px;
       font-weight: 700;
       text-align: right;
@@ -184,30 +178,55 @@
 
       &:hover {
         cursor: pointer;
-        color: #658eb4;
+        color: #ccc;
       }
     }
   }
 
   .body {
-    // padding: 10px;
-    // display: flex;
-    // flex-wrap: wrap;
     width: 100%;
 
-    .name {
-      width: 30%;
-    }
+    .descriptions {
+      width: 100%;
+      display: flex;
+      flex-wrap: wrap;
+      box-sizing: border-box;
+      padding: 10px 0;
 
-    .value {
-      width: 70%;
+      .descriptions-item {
+        width: 48%;
+        margin: 5px;
+        box-sizing: border-box;
+        display: flex;
+        padding: 0 5px;
+
+        .label {
+          width: 28%;
+          box-sizing: border-box;
+          padding: 0 5px;
+          font-size: 15px;
+          text-align: justify;
+          text-align-last: justify;
+        }
+
+        .value {
+          padding-left: 5px;
+          width: 68%;
+          box-sizing: border-box;
+          white-space: nowrap;
+          font-size: 14px;
+          color: #a39f9f;
+
+          /* 确保文本在一行内显示 */
+          overflow: hidden;
+
+          /* 超出容器部分隐藏 */
+          text-overflow: ellipsis;
+
+          /* 文字溢出显示省略号 */
+        }
+      }
     }
   }
 }
-
-.clearfix::after {
-  content: "";
-  display: table;
-  clear: both;
-}
 </style>
diff --git a/src/views/home/station/station/components/map.vue b/src/views/home/station/station/components/map.vue
index 2351a1d..1c5a64c 100644
--- a/src/views/home/station/station/components/map.vue
+++ b/src/views/home/station/station/components/map.vue
@@ -139,8 +139,11 @@
   })
   setTimeout(() => {
     // mapRef.value.map.setZoom(14)
-    mapRef.value.map.setFitView()
-    mapRef.value.map.setCenter(data.event.data.lnglat)
+    // mapRef.value.map.setFitView()
+    // mapRef.value.map.setCenter(data.event.data.lnglat)
+    const center = JSON.parse(JSON.stringify(data.event.data.lnglat))
+    center[1] = Number(center[1]) + 0.0035
+    mapRef.value.map.setCenter(center)
   })
 }
 
@@ -164,7 +167,11 @@
       info: data,
       map: mapRef.value.map,
     })
-    mapRef.value.map.setCenter(data.lnglat)
+    // mapRef.value.map.setCenter(data.lnglat)
+    // mapRef.value.map.setFitView()
+    const center = JSON.parse(JSON.stringify(data.lnglat))
+    center[1] = Number(center[1]) + 0.0035
+    mapRef.value.map.setCenter(center)
   })
 }
 
diff --git a/src/views/home/station/station/index.vue b/src/views/home/station/station/index.vue
index 636cbad..0b2599e 100644
--- a/src/views/home/station/station/index.vue
+++ b/src/views/home/station/station/index.vue
@@ -12,8 +12,9 @@
 import { getDictByCode } from '@/api/system/dict'
 // 表格标识  地图或普通
 const mapRef = ref()
-const tableFlag = ref('normal')
+const tableFlag = ref('map')
 const mapLoading = ref(true)
+const mapLoad = ref(false)
 // 表格数据
 const list = ref([])
 const total = ref(0)
@@ -56,7 +57,6 @@
 // 查询数据
 const fetchData = () => {
   loadingTable.value = true
-  mapLoading.value = true
   // 判断是否有查询条件(是地图展示20条  否地图展示所有)
   const queryList = [] as Boolean[] // 长度大于2 即为是
   for (const i in listQuery.value) {
@@ -79,13 +79,13 @@
     }
   }).catch(() => {
     loadingTable.value = false
-    if (queryList.length <= 2) {
-      mapLoading.value = false
-    }
+    mapLoading.value = false
   })
-  if (queryList.length > 2) { return }
+  if (queryList.length > 2 || mapLoad.value) { return }
   // 获取地图全部数据
+  mapLoading.value = true
   getStationList(listQuery.value).then((res) => {
+    mapLoad.value = true
     mapList.value = res.data
     setTimeout(() => {
       if (tableFlag.value === 'map') {
@@ -99,6 +99,7 @@
 }
 // 重置查询条件f
 const reset = () => {
+  mapLoad.value = false
   listQuery.value = {
     limit: 20,
     offset: 1,
@@ -179,6 +180,19 @@
     },
   })
 }
+// 表格高度
+const tableHeight = ref(window.innerHeight - 60 - 50 - 10 - 350 - 98 - 10 - 52 - 52 - 10)
+window.addEventListener('resize', () => {
+  tableHeight.value = window.innerHeight - 60 - 50 - 10 - 350 - 98 - 10 - 52 - 52 - 10
+})
+watch(() => tableFlag.value, (newVal) => {
+  if (newVal === 'map') {
+    tableHeight.value = window.innerHeight - 60 - 50 - 10 - 350 - 98 - 10 - 52 - 52 - 10
+  }
+  else if (newVal === 'normal') {
+    tableHeight.value = window.innerHeight - 60 - 50 - 10 - 98 - 10 - 52 - 52 - 10
+  }
+})
 </script>
 
 <template>
@@ -186,9 +200,7 @@
   <app-container class="container">
     <edit-dialog ref="editRef" @refresh="fetchData" />
     <!-- 地图 -->
-    <map-com v-if="tableFlag === 'map'" ref="mapRef" v-loading="mapLoading" class="map" :height="450" :data="mapList" />
-    <!-- 占位-地图 -->
-    <div v-if="tableFlag === 'map'" style="height: 450px;" />
+    <map-com v-if="tableFlag === 'map'" ref="mapRef" v-loading="mapLoading" :height="350" :data="mapList" />
     <!-- 收起地图-图标 -->
     <div v-if="tableFlag === 'map'" class="icon" @click="switchMode('normal')">
       <el-icon :size="25">
@@ -197,7 +209,7 @@
     </div>
     <!-- 筛选条件 -->
     <search-area
-      :class="`${tableFlag === 'map' ? 'search-area' : ''}`" :need-clear="true" @search="fetchData"
+      :need-clear="true" @search="fetchData"
       @clear="reset"
     >
       <search-item>
@@ -229,8 +241,6 @@
         </el-select>
       </search-item>
     </search-area>
-    <!-- 筛选条件-地图 -->
-    <div v-if="tableFlag === 'map'" style="height: 56px;" />
     <!-- 表头标题 -->
     <table-container
       :is-config="true" config-title="station-monitor" :columns="columns" :config-columns="columnsConfig"
@@ -254,7 +264,7 @@
       </template>
       <!-- 查询结果Table显示 -->
       <normal-table
-        :data="list" :total="total" :columns="columnsConfig" :query="listQuery" :list-loading="loadingTable"
+        :data="list" :total="total" :columns="columnsConfig" :query="listQuery" :list-loading="loadingTable" :height="tableHeight"
         @change="changePage" @rowDbClick="rowClick"
       >
         <template #preColumns>
@@ -292,7 +302,7 @@
 
   .icon {
     position: fixed;
-    top: 550px;
+    top: 450px;
     left: 50%;
     // transform: translateX(-50%);
     z-index: 901;
diff --git a/src/views/home/well/components/detailInfoDialog.vue b/src/views/home/well/components/detailInfoDialog.vue
index 5d33d05..d0d4242 100644
--- a/src/views/home/well/components/detailInfoDialog.vue
+++ b/src/views/home/well/components/detailInfoDialog.vue
@@ -128,71 +128,39 @@
       <span class="close" @click="close">x</span>
     </div>
     <div class="body">
-      <el-descriptions v-loading="loading" :column="2" border>
-        <el-descriptions-item v-for="item in descriptionsList" :key="item.text" :align="item.align">
-          <template #label>
-            <span class="label">
-              {{ item.text }}
-            </span>
-          </template>
-          <span class="nowrap">
+      <div class="descriptions">
+        <div v-for="item in descriptionsList" :key="item.text" class="descriptions-item">
+          <div class="label">
+            {{ item.text }}
+          </div>
+          <div class="value">
             {{ detailInfo[item.value] || '' }}
-          </span>
-        </el-descriptions-item>
-      </el-descriptions>
+          </div>
+        </div>
+      </div>
     </div>
   </div>
 </template>
 
 <style lang="scss" scoped>
-::v-deep(.el-descriptions__cell) {
-  padding: 0 !important;
-
-  ::v-deep(.is-bordered-label) {
-    width: 100px !important;
-  }
-
-  ::v-deep(.el-descriptions__label) {
-    width: 100px !important;
-  }
-
-  ::v-deep(.el-descriptions__content) {
-    width: 170px !important;
-  }
-
-  ::v-deep(.is-bordered-content) {
-    width: 170px !important;
-  }
-}
-
-.nowrap {
-  width: 170px;
-  white-space: nowrap;
-
-  /* 确保文本在一行内显示 */
-  overflow: hidden;
-
-  /* 超出容器部分隐藏 */
-  text-overflow: ellipsis;
-
-  /* 文字溢出显示省略号 */
-}
-
 .container {
-  // width: 500px;
-  // padding: 0 10px;
-  background: rgba($color: #feffff, $alpha: 95%);
-  border: 1.5px solid #79b5e6;
+  width: 600px;
+  background: #fff;
   position: relative;
+  border-radius: 8px;
+  border: 1px solid #e4e7ed;
+  overflow: hidden;
+  box-shadow: 0 0 12px rgb(0 0 0 / 12%);
 
   .header {
     float: right;
-    background-color: #ccc;
+    background-color: #5ea1ff;
     width: 100%;
     display: flex;
     justify-content: space-between;
     padding: 2px 10px;
     align-items: center;
+    color: #fff;
 
     .title {
       font-weight: 700;
@@ -204,7 +172,6 @@
     }
 
     .close {
-      color: #4875a0;
       font-size: 22px;
       font-weight: 700;
       text-align: right;
@@ -212,30 +179,55 @@
 
       &:hover {
         cursor: pointer;
-        color: #658eb4;
+        color: #ccc;
       }
     }
   }
 
   .body {
-    // padding: 10px;
-    // display: flex;
-    // flex-wrap: wrap;
     width: 100%;
 
-    .name {
-      width: 30%;
-    }
+    .descriptions {
+      width: 100%;
+      display: flex;
+      flex-wrap: wrap;
+      box-sizing: border-box;
+      padding: 10px 0;
 
-    .value {
-      width: 70%;
+      .descriptions-item {
+        width: 48%;
+        margin: 5px;
+        box-sizing: border-box;
+        display: flex;
+        padding: 0 5px;
+
+        .label {
+          width: 28%;
+          box-sizing: border-box;
+          padding: 0 5px;
+          font-size: 15px;
+          text-align: justify;
+          text-align-last: justify;
+        }
+
+        .value {
+          padding-left: 5px;
+          width: 68%;
+          box-sizing: border-box;
+          white-space: nowrap;
+          font-size: 14px;
+          color: #a39f9f;
+
+          /* 确保文本在一行内显示 */
+          overflow: hidden;
+
+          /* 超出容器部分隐藏 */
+          text-overflow: ellipsis;
+
+          /* 文字溢出显示省略号 */
+        }
+      }
     }
   }
 }
-
-.clearfix::after {
-  content: "";
-  display: table;
-  clear: both;
-}
 </style>
diff --git a/src/views/home/well/components/map.vue b/src/views/home/well/components/map.vue
index fa2634a..5d9ec48 100644
--- a/src/views/home/well/components/map.vue
+++ b/src/views/home/well/components/map.vue
@@ -139,8 +139,11 @@
   })
   setTimeout(() => {
     // mapRef.value.map.setZoom(14)
-    mapRef.value.map.setFitView()
-    mapRef.value.map.setCenter(data.event.data.lnglat)
+    // mapRef.value.map.setFitView()
+    // mapRef.value.map.setCenter(data.event.data.lnglat)
+    const center = JSON.parse(JSON.stringify(data.event.data.lnglat))
+    center[1] = Number(center[1]) + 0.0035
+    mapRef.value.map.setCenter(center)
   })
 }
 
@@ -164,7 +167,9 @@
       info: data,
       map: mapRef.value.map,
     })
-    mapRef.value.map.setCenter(data.lnglat)
+    const center = JSON.parse(JSON.stringify(data.lnglat))
+    center[1] = Number(center[1]) + 0.0035
+    mapRef.value.map.setCenter(center)
   })
 }
 
diff --git a/src/views/home/well/index.vue b/src/views/home/well/index.vue
index f9294e5..30163be 100644
--- a/src/views/home/well/index.vue
+++ b/src/views/home/well/index.vue
@@ -12,8 +12,9 @@
 import { getDictByCode } from '@/api/system/dict'
 // 表格标识  地图或普通
 const mapRef = ref()
-const tableFlag = ref('normal')
+const tableFlag = ref('map')
 const mapLoading = ref(true)
+const mapLoad = ref(false)
 // 表格数据
 const list = ref([])
 const total = ref(0)
@@ -59,7 +60,6 @@
 // 查询数据
 const fetchData = () => {
   loadingTable.value = true
-  mapLoading.value = true
   // 判断是否有查询条件(是地图展示20条  否地图展示所有)
   const queryList = [] as Boolean[] // 长度大于2 即为是
   for (const i in listQuery.value) {
@@ -67,6 +67,7 @@
       queryList.push(true)
     }
   }
+  console.log(queryList.length, 'queryList')
   getWellListPage(listQuery.value).then((res) => {
     list.value = res.data.rows.map((item: any) => ({ ...item, bfztName: item.bfzt === '1' ? '布防' : '撤防' }))
     total.value = res.data.total
@@ -75,24 +76,24 @@
       mapList.value = list.value
       setTimeout(() => {
         if (tableFlag.value === 'map') {
-          mapRef.value.resetDraw()
+          mapRef.value?.resetDraw()
         }
         mapLoading.value = false
       }, 500)
     }
   }).catch(() => {
     loadingTable.value = false
-    if (queryList.length <= 2) {
-      mapLoading.value = false
-    }
+    mapLoading.value = false
   })
-  if (queryList.length > 2) { return }
+  if (queryList.length > 2 || mapLoad.value) { return }
   // 获取地图全部数据
+  mapLoading.value = true
   getWellList(listQuery.value).then((res) => {
     mapList.value = res.data
+    mapLoad.value = true
     setTimeout(() => {
       if (tableFlag.value === 'map') {
-        mapRef.value.resetDraw()
+        mapRef.value?.resetDraw()
       }
       mapLoading.value = false
     }, 500)
@@ -102,6 +103,7 @@
 }
 // 重置查询条件f
 const reset = () => {
+  mapLoad.value = false
   listQuery.value = {
     limit: 20,
     offset: 1,
@@ -210,6 +212,19 @@
     },
   })
 }
+// 表格高度
+const tableHeight = ref(window.innerHeight - 60 - 50 - 10 - 350 - 98 - 10 - 52 - 52 - 10)
+window.addEventListener('resize', () => {
+  tableHeight.value = window.innerHeight - 60 - 50 - 10 - 350 - 98 - 10 - 52 - 52 - 10
+})
+watch(() => tableFlag.value, (newVal) => {
+  if (newVal === 'map') {
+    tableHeight.value = window.innerHeight - 60 - 50 - 10 - 350 - 98 - 10 - 52 - 52 - 10
+  }
+  else if (newVal === 'normal') {
+    tableHeight.value = window.innerHeight - 60 - 50 - 10 - 98 - 10 - 52 - 52 - 10
+  }
+})
 </script>
 
 <template>
@@ -217,9 +232,7 @@
   <app-container class="container">
     <edit-dialog ref="editRef" @refresh="fetchData" />
     <!-- 地图 -->
-    <map-com v-if="tableFlag === 'map'" ref="mapRef" v-loading="mapLoading" class="map" :height="450" :data="mapList" />
-    <!-- 占位-地图 -->
-    <div v-if="tableFlag === 'map'" style="height: 450px;" />
+    <map-com v-if="tableFlag === 'map'" ref="mapRef" v-loading="mapLoading" :height="350" :data="mapList" />
     <!-- 收起地图-图标 -->
     <div v-if="tableFlag === 'map'" class="icon" @click="switchMode('normal')">
       <el-icon :size="25">
@@ -227,10 +240,7 @@
       </el-icon>
     </div>
     <!-- 筛选条件 -->
-    <search-area
-      :class="`${tableFlag === 'map' ? 'search-area' : ''}`" :need-clear="true" @search="fetchData"
-      @clear="reset"
-    >
+    <search-area :need-clear="true" @search="fetchData" @clear="reset">
       <search-item>
         <el-input v-model.trim="listQuery.tagNumber" placeholder="闸井位号" clearable />
       </search-item>
@@ -270,8 +280,6 @@
         <el-input v-model.trim="listQuery.marker" placeholder="标签" clearable class="select" />
       </search-item>
     </search-area>
-    <!-- 筛选条件-地图 -->
-    <div v-if="tableFlag === 'map'" style="height: 114px;" />
     <!-- 表头标题 -->
     <table-container
       :is-config="true" config-title="well-monitor" :columns="columns" :config-columns="columnsConfig"
@@ -296,7 +304,7 @@
       <!-- 查询结果Table显示 -->
       <normal-table
         :data="list" :total="total" :columns="columnsConfig" :query="listQuery" :list-loading="loadingTable"
-        @change="changePage" @rowDbClick="rowClick"
+        :height="tableHeight" @change="changePage" @rowDbClick="rowClick"
       >
         <template #preColumns>
           <!-- <el-table-column label="选择" width="55" align="center">
@@ -345,7 +353,7 @@
 
   .icon {
     position: fixed;
-    top: 550px;
+    top: 450px;
     left: 50%;
     // transform: translateX(-50%);
     z-index: 901;