diff --git a/src/utils/dateutils.js b/src/utils/dateutils.js
index ae7ae6d..36161f2 100644
--- a/src/utils/dateutils.js
+++ b/src/utils/dateutils.js
@@ -88,6 +88,11 @@
   return fmt
 }
 
+export function getSearchTodayTime() {
+  const startTime = getDayTime(new Date().getTime()).Format('yyyy-MM-dd hh:mm:ss')
+  const endTime = getDayTime(new Date().getTime()+ 3599 * 1000 * 24).Format('yyyy-MM-dd hh:mm:ss')
+  return [startTime, endTime]
+}
 /**
  * 获取近1周日期范围
  * @returns {*[]}

diff --git a/src/utils/dateutils.js b/src/utils/dateutils.js
index ae7ae6d..36161f2 100644
--- a/src/utils/dateutils.js
+++ b/src/utils/dateutils.js
@@ -88,6 +88,11 @@
   return fmt
 }
 
+export function getSearchTodayTime() {
+  const startTime = getDayTime(new Date().getTime()).Format('yyyy-MM-dd hh:mm:ss')
+  const endTime = getDayTime(new Date().getTime()+ 3599 * 1000 * 24).Format('yyyy-MM-dd hh:mm:ss')
+  return [startTime, endTime]
+}
 /**
  * 获取近1周日期范围
  * @returns {*[]}
diff --git a/src/views/alarmRule/components/editRule.vue b/src/views/alarmRule/components/editRule.vue
index 135a723..0e6a56e 100644
--- a/src/views/alarmRule/components/editRule.vue
+++ b/src/views/alarmRule/components/editRule.vue
@@ -3,12 +3,12 @@
     <el-form ref="dataForm" :rules="rules" :model="alarmRuleForm" label-position="right" label-width="120px">
       <el-row v-if="dialogStatus=='update'" :gutter="20">
         <el-col :span="12">
-          <el-form-item label="点位编号" prop="concencode">
+          <el-form-item label="点位编号">
             <el-input v-model="baseInfo.wellCode" type="text" placeholder="未知" disabled />
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="井深" prop="simid">
+          <el-form-item label="井深">
             <el-input v-model="baseInfo.deep" type="text" placeholder="未知" disabled />
           </el-form-item>
         </el-col>

diff --git a/src/utils/dateutils.js b/src/utils/dateutils.js
index ae7ae6d..36161f2 100644
--- a/src/utils/dateutils.js
+++ b/src/utils/dateutils.js
@@ -88,6 +88,11 @@
   return fmt
 }
 
+export function getSearchTodayTime() {
+  const startTime = getDayTime(new Date().getTime()).Format('yyyy-MM-dd hh:mm:ss')
+  const endTime = getDayTime(new Date().getTime()+ 3599 * 1000 * 24).Format('yyyy-MM-dd hh:mm:ss')
+  return [startTime, endTime]
+}
 /**
  * 获取近1周日期范围
  * @returns {*[]}
diff --git a/src/views/alarmRule/components/editRule.vue b/src/views/alarmRule/components/editRule.vue
index 135a723..0e6a56e 100644
--- a/src/views/alarmRule/components/editRule.vue
+++ b/src/views/alarmRule/components/editRule.vue
@@ -3,12 +3,12 @@
     <el-form ref="dataForm" :rules="rules" :model="alarmRuleForm" label-position="right" label-width="120px">
       <el-row v-if="dialogStatus=='update'" :gutter="20">
         <el-col :span="12">
-          <el-form-item label="点位编号" prop="concencode">
+          <el-form-item label="点位编号">
             <el-input v-model="baseInfo.wellCode" type="text" placeholder="未知" disabled />
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="井深" prop="simid">
+          <el-form-item label="井深">
             <el-input v-model="baseInfo.deep" type="text" placeholder="未知" disabled />
           </el-form-item>
         </el-col>
diff --git a/src/views/alarmStatics/alarmStatics.vue b/src/views/alarmStatics/alarmStatics.vue
index baf8cba..1195d22 100644
--- a/src/views/alarmStatics/alarmStatics.vue
+++ b/src/views/alarmStatics/alarmStatics.vue
@@ -33,6 +33,9 @@
 import SimpleCard from '@/components/BigData/Card/simpleCard'
 import AlarmWellRank from './components/alarmWellRank'
 import AlarmStaticsByContent from '@/views/alarmStatics/components/alarmStaticsByContent'
+import { alarmNowStatic } from '@/api/data/dataStatics'
+import { getSearchTodayTime } from '@/utils/dateutils'
+import { getAlarmList } from '@/api/alarm/alarm'
 export default {
   name: 'AlarmStatics',
   components: {
@@ -47,10 +50,38 @@
     return {
       alarmNow: 0,
       todayAlarm: 0
-
+    }
+  },
+  created() {
+    this.getAlarmCount()
+    this.getTodayAlarmCount()
+  },
+  methods: {
+    getAlarmCount() {
+      alarmNowStatic().then(response => {
+        this.alarmNow = response.data.total
+      })
+    },
+    getTodayAlarmCount() {
+      const date = getSearchTodayTime()
+      debugger
+      const listQuery = {
+        keywords: '',
+        alarmType: '',
+        alarmContentType: '',
+        beginTime: date[0],
+        endTime: date[1],
+        status: '1',
+        offset: 1,
+        limit: 20,
+        sort: '',
+        order: ''
+      } // 筛选条件
+      getAlarmList(listQuery).then(response => {
+        this.todayAlarm = parseInt(response.data.total)
+      })
     }
   }
-
 }
 </script>
 

diff --git a/src/utils/dateutils.js b/src/utils/dateutils.js
index ae7ae6d..36161f2 100644
--- a/src/utils/dateutils.js
+++ b/src/utils/dateutils.js
@@ -88,6 +88,11 @@
   return fmt
 }
 
+export function getSearchTodayTime() {
+  const startTime = getDayTime(new Date().getTime()).Format('yyyy-MM-dd hh:mm:ss')
+  const endTime = getDayTime(new Date().getTime()+ 3599 * 1000 * 24).Format('yyyy-MM-dd hh:mm:ss')
+  return [startTime, endTime]
+}
 /**
  * 获取近1周日期范围
  * @returns {*[]}
diff --git a/src/views/alarmRule/components/editRule.vue b/src/views/alarmRule/components/editRule.vue
index 135a723..0e6a56e 100644
--- a/src/views/alarmRule/components/editRule.vue
+++ b/src/views/alarmRule/components/editRule.vue
@@ -3,12 +3,12 @@
     <el-form ref="dataForm" :rules="rules" :model="alarmRuleForm" label-position="right" label-width="120px">
       <el-row v-if="dialogStatus=='update'" :gutter="20">
         <el-col :span="12">
-          <el-form-item label="点位编号" prop="concencode">
+          <el-form-item label="点位编号">
             <el-input v-model="baseInfo.wellCode" type="text" placeholder="未知" disabled />
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="井深" prop="simid">
+          <el-form-item label="井深">
             <el-input v-model="baseInfo.deep" type="text" placeholder="未知" disabled />
           </el-form-item>
         </el-col>
diff --git a/src/views/alarmStatics/alarmStatics.vue b/src/views/alarmStatics/alarmStatics.vue
index baf8cba..1195d22 100644
--- a/src/views/alarmStatics/alarmStatics.vue
+++ b/src/views/alarmStatics/alarmStatics.vue
@@ -33,6 +33,9 @@
 import SimpleCard from '@/components/BigData/Card/simpleCard'
 import AlarmWellRank from './components/alarmWellRank'
 import AlarmStaticsByContent from '@/views/alarmStatics/components/alarmStaticsByContent'
+import { alarmNowStatic } from '@/api/data/dataStatics'
+import { getSearchTodayTime } from '@/utils/dateutils'
+import { getAlarmList } from '@/api/alarm/alarm'
 export default {
   name: 'AlarmStatics',
   components: {
@@ -47,10 +50,38 @@
     return {
       alarmNow: 0,
       todayAlarm: 0
-
+    }
+  },
+  created() {
+    this.getAlarmCount()
+    this.getTodayAlarmCount()
+  },
+  methods: {
+    getAlarmCount() {
+      alarmNowStatic().then(response => {
+        this.alarmNow = response.data.total
+      })
+    },
+    getTodayAlarmCount() {
+      const date = getSearchTodayTime()
+      debugger
+      const listQuery = {
+        keywords: '',
+        alarmType: '',
+        alarmContentType: '',
+        beginTime: date[0],
+        endTime: date[1],
+        status: '1',
+        offset: 1,
+        limit: 20,
+        sort: '',
+        order: ''
+      } // 筛选条件
+      getAlarmList(listQuery).then(response => {
+        this.todayAlarm = parseInt(response.data.total)
+      })
     }
   }
-
 }
 </script>
 
diff --git a/src/views/alarmStatics/components/alarmWellRank.vue b/src/views/alarmStatics/components/alarmWellRank.vue
index f666639..f752abe 100644
--- a/src/views/alarmStatics/components/alarmWellRank.vue
+++ b/src/views/alarmStatics/components/alarmWellRank.vue
@@ -40,18 +40,7 @@
         endTime: '' // 结束时间
       }, // 查询结果
       alarmContentTypeList: [],
-      list: [
-        { wellCode: 'aaaa', position: '中关村南大街5号院', alarmCount: 5, count: 0 },
-        { wellCode: 'aaaa', position: '中关村南大街5号院', alarmCount: 5, count: 0 },
-        { wellCode: 'aaaa', position: '中关村南大街5号院', alarmCount: 5, count: 0 },
-        { wellCode: 'aaaa', position: '中关村南大街5号院', alarmCount: 5, count: 0 },
-        { wellCode: 'aaaa', position: '中关村南大街5号院', alarmCount: 5, count: 0 },
-        { wellCode: 'aaaa', position: '中关村南大街5号院', alarmCount: 5, count: 0 },
-        { wellCode: 'aaaa', position: '中关村南大街5号院', alarmCount: 5, count: 0 },
-        { wellCode: 'aaaa', position: '中关村南大街5号院', alarmCount: 5, count: 0 },
-        { wellCode: 'aaaa', position: '中关村南大街5号院', alarmCount: 5, count: 0 },
-        { wellCode: 'aaaa', position: '中关村南大街5号院', alarmCount: 5, count: 0 }
-      ],
+      list: [],
       total: 0
     }
   },

diff --git a/src/utils/dateutils.js b/src/utils/dateutils.js
index ae7ae6d..36161f2 100644
--- a/src/utils/dateutils.js
+++ b/src/utils/dateutils.js
@@ -88,6 +88,11 @@
   return fmt
 }
 
+export function getSearchTodayTime() {
+  const startTime = getDayTime(new Date().getTime()).Format('yyyy-MM-dd hh:mm:ss')
+  const endTime = getDayTime(new Date().getTime()+ 3599 * 1000 * 24).Format('yyyy-MM-dd hh:mm:ss')
+  return [startTime, endTime]
+}
 /**
  * 获取近1周日期范围
  * @returns {*[]}
diff --git a/src/views/alarmRule/components/editRule.vue b/src/views/alarmRule/components/editRule.vue
index 135a723..0e6a56e 100644
--- a/src/views/alarmRule/components/editRule.vue
+++ b/src/views/alarmRule/components/editRule.vue
@@ -3,12 +3,12 @@
     <el-form ref="dataForm" :rules="rules" :model="alarmRuleForm" label-position="right" label-width="120px">
       <el-row v-if="dialogStatus=='update'" :gutter="20">
         <el-col :span="12">
-          <el-form-item label="点位编号" prop="concencode">
+          <el-form-item label="点位编号">
             <el-input v-model="baseInfo.wellCode" type="text" placeholder="未知" disabled />
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="井深" prop="simid">
+          <el-form-item label="井深">
             <el-input v-model="baseInfo.deep" type="text" placeholder="未知" disabled />
           </el-form-item>
         </el-col>
diff --git a/src/views/alarmStatics/alarmStatics.vue b/src/views/alarmStatics/alarmStatics.vue
index baf8cba..1195d22 100644
--- a/src/views/alarmStatics/alarmStatics.vue
+++ b/src/views/alarmStatics/alarmStatics.vue
@@ -33,6 +33,9 @@
 import SimpleCard from '@/components/BigData/Card/simpleCard'
 import AlarmWellRank from './components/alarmWellRank'
 import AlarmStaticsByContent from '@/views/alarmStatics/components/alarmStaticsByContent'
+import { alarmNowStatic } from '@/api/data/dataStatics'
+import { getSearchTodayTime } from '@/utils/dateutils'
+import { getAlarmList } from '@/api/alarm/alarm'
 export default {
   name: 'AlarmStatics',
   components: {
@@ -47,10 +50,38 @@
     return {
       alarmNow: 0,
       todayAlarm: 0
-
+    }
+  },
+  created() {
+    this.getAlarmCount()
+    this.getTodayAlarmCount()
+  },
+  methods: {
+    getAlarmCount() {
+      alarmNowStatic().then(response => {
+        this.alarmNow = response.data.total
+      })
+    },
+    getTodayAlarmCount() {
+      const date = getSearchTodayTime()
+      debugger
+      const listQuery = {
+        keywords: '',
+        alarmType: '',
+        alarmContentType: '',
+        beginTime: date[0],
+        endTime: date[1],
+        status: '1',
+        offset: 1,
+        limit: 20,
+        sort: '',
+        order: ''
+      } // 筛选条件
+      getAlarmList(listQuery).then(response => {
+        this.todayAlarm = parseInt(response.data.total)
+      })
     }
   }
-
 }
 </script>
 
diff --git a/src/views/alarmStatics/components/alarmWellRank.vue b/src/views/alarmStatics/components/alarmWellRank.vue
index f666639..f752abe 100644
--- a/src/views/alarmStatics/components/alarmWellRank.vue
+++ b/src/views/alarmStatics/components/alarmWellRank.vue
@@ -40,18 +40,7 @@
         endTime: '' // 结束时间
       }, // 查询结果
       alarmContentTypeList: [],
-      list: [
-        { wellCode: 'aaaa', position: '中关村南大街5号院', alarmCount: 5, count: 0 },
-        { wellCode: 'aaaa', position: '中关村南大街5号院', alarmCount: 5, count: 0 },
-        { wellCode: 'aaaa', position: '中关村南大街5号院', alarmCount: 5, count: 0 },
-        { wellCode: 'aaaa', position: '中关村南大街5号院', alarmCount: 5, count: 0 },
-        { wellCode: 'aaaa', position: '中关村南大街5号院', alarmCount: 5, count: 0 },
-        { wellCode: 'aaaa', position: '中关村南大街5号院', alarmCount: 5, count: 0 },
-        { wellCode: 'aaaa', position: '中关村南大街5号院', alarmCount: 5, count: 0 },
-        { wellCode: 'aaaa', position: '中关村南大街5号院', alarmCount: 5, count: 0 },
-        { wellCode: 'aaaa', position: '中关村南大街5号院', alarmCount: 5, count: 0 },
-        { wellCode: 'aaaa', position: '中关村南大街5号院', alarmCount: 5, count: 0 }
-      ],
+      list: [],
       total: 0
     }
   },
diff --git a/src/views/dashboard/components/AlarmNowList.vue b/src/views/dashboard/components/AlarmNowList.vue
index 890325f..3bb5c4d 100644
--- a/src/views/dashboard/components/AlarmNowList.vue
+++ b/src/views/dashboard/components/AlarmNowList.vue
@@ -1,6 +1,4 @@
-<template>
-
-</template>
+<template />
 
 <script>
 export default {
@@ -11,7 +9,7 @@
     }
     this.chartSettings = {
       labelMap: {
-        'alarmWells': '报警井数',
+        'alarmWells': '报警点位数',
         'alarmTimes': '报警次数'
       },
       metrics: ['alarmTimes', 'alarmWells'],

diff --git a/src/utils/dateutils.js b/src/utils/dateutils.js
index ae7ae6d..36161f2 100644
--- a/src/utils/dateutils.js
+++ b/src/utils/dateutils.js
@@ -88,6 +88,11 @@
   return fmt
 }
 
+export function getSearchTodayTime() {
+  const startTime = getDayTime(new Date().getTime()).Format('yyyy-MM-dd hh:mm:ss')
+  const endTime = getDayTime(new Date().getTime()+ 3599 * 1000 * 24).Format('yyyy-MM-dd hh:mm:ss')
+  return [startTime, endTime]
+}
 /**
  * 获取近1周日期范围
  * @returns {*[]}
diff --git a/src/views/alarmRule/components/editRule.vue b/src/views/alarmRule/components/editRule.vue
index 135a723..0e6a56e 100644
--- a/src/views/alarmRule/components/editRule.vue
+++ b/src/views/alarmRule/components/editRule.vue
@@ -3,12 +3,12 @@
     <el-form ref="dataForm" :rules="rules" :model="alarmRuleForm" label-position="right" label-width="120px">
       <el-row v-if="dialogStatus=='update'" :gutter="20">
         <el-col :span="12">
-          <el-form-item label="点位编号" prop="concencode">
+          <el-form-item label="点位编号">
             <el-input v-model="baseInfo.wellCode" type="text" placeholder="未知" disabled />
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="井深" prop="simid">
+          <el-form-item label="井深">
             <el-input v-model="baseInfo.deep" type="text" placeholder="未知" disabled />
           </el-form-item>
         </el-col>
diff --git a/src/views/alarmStatics/alarmStatics.vue b/src/views/alarmStatics/alarmStatics.vue
index baf8cba..1195d22 100644
--- a/src/views/alarmStatics/alarmStatics.vue
+++ b/src/views/alarmStatics/alarmStatics.vue
@@ -33,6 +33,9 @@
 import SimpleCard from '@/components/BigData/Card/simpleCard'
 import AlarmWellRank from './components/alarmWellRank'
 import AlarmStaticsByContent from '@/views/alarmStatics/components/alarmStaticsByContent'
+import { alarmNowStatic } from '@/api/data/dataStatics'
+import { getSearchTodayTime } from '@/utils/dateutils'
+import { getAlarmList } from '@/api/alarm/alarm'
 export default {
   name: 'AlarmStatics',
   components: {
@@ -47,10 +50,38 @@
     return {
       alarmNow: 0,
       todayAlarm: 0
-
+    }
+  },
+  created() {
+    this.getAlarmCount()
+    this.getTodayAlarmCount()
+  },
+  methods: {
+    getAlarmCount() {
+      alarmNowStatic().then(response => {
+        this.alarmNow = response.data.total
+      })
+    },
+    getTodayAlarmCount() {
+      const date = getSearchTodayTime()
+      debugger
+      const listQuery = {
+        keywords: '',
+        alarmType: '',
+        alarmContentType: '',
+        beginTime: date[0],
+        endTime: date[1],
+        status: '1',
+        offset: 1,
+        limit: 20,
+        sort: '',
+        order: ''
+      } // 筛选条件
+      getAlarmList(listQuery).then(response => {
+        this.todayAlarm = parseInt(response.data.total)
+      })
     }
   }
-
 }
 </script>
 
diff --git a/src/views/alarmStatics/components/alarmWellRank.vue b/src/views/alarmStatics/components/alarmWellRank.vue
index f666639..f752abe 100644
--- a/src/views/alarmStatics/components/alarmWellRank.vue
+++ b/src/views/alarmStatics/components/alarmWellRank.vue
@@ -40,18 +40,7 @@
         endTime: '' // 结束时间
       }, // 查询结果
       alarmContentTypeList: [],
-      list: [
-        { wellCode: 'aaaa', position: '中关村南大街5号院', alarmCount: 5, count: 0 },
-        { wellCode: 'aaaa', position: '中关村南大街5号院', alarmCount: 5, count: 0 },
-        { wellCode: 'aaaa', position: '中关村南大街5号院', alarmCount: 5, count: 0 },
-        { wellCode: 'aaaa', position: '中关村南大街5号院', alarmCount: 5, count: 0 },
-        { wellCode: 'aaaa', position: '中关村南大街5号院', alarmCount: 5, count: 0 },
-        { wellCode: 'aaaa', position: '中关村南大街5号院', alarmCount: 5, count: 0 },
-        { wellCode: 'aaaa', position: '中关村南大街5号院', alarmCount: 5, count: 0 },
-        { wellCode: 'aaaa', position: '中关村南大街5号院', alarmCount: 5, count: 0 },
-        { wellCode: 'aaaa', position: '中关村南大街5号院', alarmCount: 5, count: 0 },
-        { wellCode: 'aaaa', position: '中关村南大街5号院', alarmCount: 5, count: 0 }
-      ],
+      list: [],
       total: 0
     }
   },
diff --git a/src/views/dashboard/components/AlarmNowList.vue b/src/views/dashboard/components/AlarmNowList.vue
index 890325f..3bb5c4d 100644
--- a/src/views/dashboard/components/AlarmNowList.vue
+++ b/src/views/dashboard/components/AlarmNowList.vue
@@ -1,6 +1,4 @@
-<template>
-
-</template>
+<template />
 
 <script>
 export default {
@@ -11,7 +9,7 @@
     }
     this.chartSettings = {
       labelMap: {
-        'alarmWells': '报警井数',
+        'alarmWells': '报警点位数',
         'alarmTimes': '报警次数'
       },
       metrics: ['alarmTimes', 'alarmWells'],
diff --git a/src/views/dataManage/dataManage.vue b/src/views/dataManage/dataManage.vue
index b6bceb8..b1d6a3b 100644
--- a/src/views/dataManage/dataManage.vue
+++ b/src/views/dataManage/dataManage.vue
@@ -42,10 +42,10 @@
         { permission: '/welllocadata/list-page', label: '井盖定位监测仪', name: 'wellloca', type: '7', comp: 'list-well-loca-data' },
         { permission: '/liquidGasData/list-page', label: '燃气智能终端(一体化)', name: 'liquidgas', type: '10', comp: 'list-liquid-gas-data' },
         { permission: '/tubedata/list-page', label: '管盯', name: 'tube', type: '12', comp: 'list-tube-data' },
-        { permission: '/gasdector/list-page', label: '可燃气体智能监测终端', name: 'gasdector', type: '1', comp: 'list-gasdector-data' },
-        { permission: '/pantilt/list-page', label: '激光甲烷遥测云台', name: 'pantilt', type: '1', comp: 'list-pantilt-data' },
+        { permission: '/gasdector/list-page', label: '可燃气体智能监测终端', name: 'gasdector', type: '101', comp: 'list-gasdector-data' },
+        { permission: '/pantilt/list-page', label: '激光甲烷遥测云台', name: 'pantilt', type: '21', comp: 'list-pantilt-data' },
         { permission: '/hydrantdata/list-page', label: '消防栓防盗水监测仪', name: 'hydrant', type: '11', comp: 'list-hydrant-data' },
-        { permission: '/h2s/list-page', label: '硫化氢浓度监测仪', name: 'H2S', type: '11', comp: 'list-H2S-data' }
+        { permission: '/h2s/list-page', label: '硫化氢浓度监测仪', name: 'H2S', type: '14', comp: 'list-H2S-data' }
       ] // 所有tab列表
     }
   },

diff --git a/src/utils/dateutils.js b/src/utils/dateutils.js
index ae7ae6d..36161f2 100644
--- a/src/utils/dateutils.js
+++ b/src/utils/dateutils.js
@@ -88,6 +88,11 @@
   return fmt
 }
 
+export function getSearchTodayTime() {
+  const startTime = getDayTime(new Date().getTime()).Format('yyyy-MM-dd hh:mm:ss')
+  const endTime = getDayTime(new Date().getTime()+ 3599 * 1000 * 24).Format('yyyy-MM-dd hh:mm:ss')
+  return [startTime, endTime]
+}
 /**
  * 获取近1周日期范围
  * @returns {*[]}
diff --git a/src/views/alarmRule/components/editRule.vue b/src/views/alarmRule/components/editRule.vue
index 135a723..0e6a56e 100644
--- a/src/views/alarmRule/components/editRule.vue
+++ b/src/views/alarmRule/components/editRule.vue
@@ -3,12 +3,12 @@
     <el-form ref="dataForm" :rules="rules" :model="alarmRuleForm" label-position="right" label-width="120px">
       <el-row v-if="dialogStatus=='update'" :gutter="20">
         <el-col :span="12">
-          <el-form-item label="点位编号" prop="concencode">
+          <el-form-item label="点位编号">
             <el-input v-model="baseInfo.wellCode" type="text" placeholder="未知" disabled />
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="井深" prop="simid">
+          <el-form-item label="井深">
             <el-input v-model="baseInfo.deep" type="text" placeholder="未知" disabled />
           </el-form-item>
         </el-col>
diff --git a/src/views/alarmStatics/alarmStatics.vue b/src/views/alarmStatics/alarmStatics.vue
index baf8cba..1195d22 100644
--- a/src/views/alarmStatics/alarmStatics.vue
+++ b/src/views/alarmStatics/alarmStatics.vue
@@ -33,6 +33,9 @@
 import SimpleCard from '@/components/BigData/Card/simpleCard'
 import AlarmWellRank from './components/alarmWellRank'
 import AlarmStaticsByContent from '@/views/alarmStatics/components/alarmStaticsByContent'
+import { alarmNowStatic } from '@/api/data/dataStatics'
+import { getSearchTodayTime } from '@/utils/dateutils'
+import { getAlarmList } from '@/api/alarm/alarm'
 export default {
   name: 'AlarmStatics',
   components: {
@@ -47,10 +50,38 @@
     return {
       alarmNow: 0,
       todayAlarm: 0
-
+    }
+  },
+  created() {
+    this.getAlarmCount()
+    this.getTodayAlarmCount()
+  },
+  methods: {
+    getAlarmCount() {
+      alarmNowStatic().then(response => {
+        this.alarmNow = response.data.total
+      })
+    },
+    getTodayAlarmCount() {
+      const date = getSearchTodayTime()
+      debugger
+      const listQuery = {
+        keywords: '',
+        alarmType: '',
+        alarmContentType: '',
+        beginTime: date[0],
+        endTime: date[1],
+        status: '1',
+        offset: 1,
+        limit: 20,
+        sort: '',
+        order: ''
+      } // 筛选条件
+      getAlarmList(listQuery).then(response => {
+        this.todayAlarm = parseInt(response.data.total)
+      })
     }
   }
-
 }
 </script>
 
diff --git a/src/views/alarmStatics/components/alarmWellRank.vue b/src/views/alarmStatics/components/alarmWellRank.vue
index f666639..f752abe 100644
--- a/src/views/alarmStatics/components/alarmWellRank.vue
+++ b/src/views/alarmStatics/components/alarmWellRank.vue
@@ -40,18 +40,7 @@
         endTime: '' // 结束时间
       }, // 查询结果
       alarmContentTypeList: [],
-      list: [
-        { wellCode: 'aaaa', position: '中关村南大街5号院', alarmCount: 5, count: 0 },
-        { wellCode: 'aaaa', position: '中关村南大街5号院', alarmCount: 5, count: 0 },
-        { wellCode: 'aaaa', position: '中关村南大街5号院', alarmCount: 5, count: 0 },
-        { wellCode: 'aaaa', position: '中关村南大街5号院', alarmCount: 5, count: 0 },
-        { wellCode: 'aaaa', position: '中关村南大街5号院', alarmCount: 5, count: 0 },
-        { wellCode: 'aaaa', position: '中关村南大街5号院', alarmCount: 5, count: 0 },
-        { wellCode: 'aaaa', position: '中关村南大街5号院', alarmCount: 5, count: 0 },
-        { wellCode: 'aaaa', position: '中关村南大街5号院', alarmCount: 5, count: 0 },
-        { wellCode: 'aaaa', position: '中关村南大街5号院', alarmCount: 5, count: 0 },
-        { wellCode: 'aaaa', position: '中关村南大街5号院', alarmCount: 5, count: 0 }
-      ],
+      list: [],
       total: 0
     }
   },
diff --git a/src/views/dashboard/components/AlarmNowList.vue b/src/views/dashboard/components/AlarmNowList.vue
index 890325f..3bb5c4d 100644
--- a/src/views/dashboard/components/AlarmNowList.vue
+++ b/src/views/dashboard/components/AlarmNowList.vue
@@ -1,6 +1,4 @@
-<template>
-
-</template>
+<template />
 
 <script>
 export default {
@@ -11,7 +9,7 @@
     }
     this.chartSettings = {
       labelMap: {
-        'alarmWells': '报警井数',
+        'alarmWells': '报警点位数',
         'alarmTimes': '报警次数'
       },
       metrics: ['alarmTimes', 'alarmWells'],
diff --git a/src/views/dataManage/dataManage.vue b/src/views/dataManage/dataManage.vue
index b6bceb8..b1d6a3b 100644
--- a/src/views/dataManage/dataManage.vue
+++ b/src/views/dataManage/dataManage.vue
@@ -42,10 +42,10 @@
         { permission: '/welllocadata/list-page', label: '井盖定位监测仪', name: 'wellloca', type: '7', comp: 'list-well-loca-data' },
         { permission: '/liquidGasData/list-page', label: '燃气智能终端(一体化)', name: 'liquidgas', type: '10', comp: 'list-liquid-gas-data' },
         { permission: '/tubedata/list-page', label: '管盯', name: 'tube', type: '12', comp: 'list-tube-data' },
-        { permission: '/gasdector/list-page', label: '可燃气体智能监测终端', name: 'gasdector', type: '1', comp: 'list-gasdector-data' },
-        { permission: '/pantilt/list-page', label: '激光甲烷遥测云台', name: 'pantilt', type: '1', comp: 'list-pantilt-data' },
+        { permission: '/gasdector/list-page', label: '可燃气体智能监测终端', name: 'gasdector', type: '101', comp: 'list-gasdector-data' },
+        { permission: '/pantilt/list-page', label: '激光甲烷遥测云台', name: 'pantilt', type: '21', comp: 'list-pantilt-data' },
         { permission: '/hydrantdata/list-page', label: '消防栓防盗水监测仪', name: 'hydrant', type: '11', comp: 'list-hydrant-data' },
-        { permission: '/h2s/list-page', label: '硫化氢浓度监测仪', name: 'H2S', type: '11', comp: 'list-H2S-data' }
+        { permission: '/h2s/list-page', label: '硫化氢浓度监测仪', name: 'H2S', type: '14', comp: 'list-H2S-data' }
       ] // 所有tab列表
     }
   },
diff --git a/src/views/dataManage/deviceData/listTubeData.vue b/src/views/dataManage/deviceData/listTubeData.vue
index b56fb95..777594c 100644
--- a/src/views/dataManage/deviceData/listTubeData.vue
+++ b/src/views/dataManage/deviceData/listTubeData.vue
@@ -86,7 +86,7 @@
         { text: '点位编号', value: 'wellCode', align: 'center' },
         { text: '设备类型', value: 'deviceTypeName', align: 'center' },
         { text: '燃气浓度(%LEL)', value: 'strength', align: 'center' },
-        // { text: '电量(%)', value: 'cell', width: 80, align: 'center', checkCell: true },
+        { text: '电量(%)', value: 'cell', width: 80, align: 'center', checkCell: true },
         // { text: '状态描述', value: 'descn', align: 'center' },
         { text: '权属单位', value: 'deptName', align: 'center' },
         { text: '上传时间', value: 'uptime', width: 170, align: 'center' }

diff --git a/src/utils/dateutils.js b/src/utils/dateutils.js
index ae7ae6d..36161f2 100644
--- a/src/utils/dateutils.js
+++ b/src/utils/dateutils.js
@@ -88,6 +88,11 @@
   return fmt
 }
 
+export function getSearchTodayTime() {
+  const startTime = getDayTime(new Date().getTime()).Format('yyyy-MM-dd hh:mm:ss')
+  const endTime = getDayTime(new Date().getTime()+ 3599 * 1000 * 24).Format('yyyy-MM-dd hh:mm:ss')
+  return [startTime, endTime]
+}
 /**
  * 获取近1周日期范围
  * @returns {*[]}
diff --git a/src/views/alarmRule/components/editRule.vue b/src/views/alarmRule/components/editRule.vue
index 135a723..0e6a56e 100644
--- a/src/views/alarmRule/components/editRule.vue
+++ b/src/views/alarmRule/components/editRule.vue
@@ -3,12 +3,12 @@
     <el-form ref="dataForm" :rules="rules" :model="alarmRuleForm" label-position="right" label-width="120px">
       <el-row v-if="dialogStatus=='update'" :gutter="20">
         <el-col :span="12">
-          <el-form-item label="点位编号" prop="concencode">
+          <el-form-item label="点位编号">
             <el-input v-model="baseInfo.wellCode" type="text" placeholder="未知" disabled />
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="井深" prop="simid">
+          <el-form-item label="井深">
             <el-input v-model="baseInfo.deep" type="text" placeholder="未知" disabled />
           </el-form-item>
         </el-col>
diff --git a/src/views/alarmStatics/alarmStatics.vue b/src/views/alarmStatics/alarmStatics.vue
index baf8cba..1195d22 100644
--- a/src/views/alarmStatics/alarmStatics.vue
+++ b/src/views/alarmStatics/alarmStatics.vue
@@ -33,6 +33,9 @@
 import SimpleCard from '@/components/BigData/Card/simpleCard'
 import AlarmWellRank from './components/alarmWellRank'
 import AlarmStaticsByContent from '@/views/alarmStatics/components/alarmStaticsByContent'
+import { alarmNowStatic } from '@/api/data/dataStatics'
+import { getSearchTodayTime } from '@/utils/dateutils'
+import { getAlarmList } from '@/api/alarm/alarm'
 export default {
   name: 'AlarmStatics',
   components: {
@@ -47,10 +50,38 @@
     return {
       alarmNow: 0,
       todayAlarm: 0
-
+    }
+  },
+  created() {
+    this.getAlarmCount()
+    this.getTodayAlarmCount()
+  },
+  methods: {
+    getAlarmCount() {
+      alarmNowStatic().then(response => {
+        this.alarmNow = response.data.total
+      })
+    },
+    getTodayAlarmCount() {
+      const date = getSearchTodayTime()
+      debugger
+      const listQuery = {
+        keywords: '',
+        alarmType: '',
+        alarmContentType: '',
+        beginTime: date[0],
+        endTime: date[1],
+        status: '1',
+        offset: 1,
+        limit: 20,
+        sort: '',
+        order: ''
+      } // 筛选条件
+      getAlarmList(listQuery).then(response => {
+        this.todayAlarm = parseInt(response.data.total)
+      })
     }
   }
-
 }
 </script>
 
diff --git a/src/views/alarmStatics/components/alarmWellRank.vue b/src/views/alarmStatics/components/alarmWellRank.vue
index f666639..f752abe 100644
--- a/src/views/alarmStatics/components/alarmWellRank.vue
+++ b/src/views/alarmStatics/components/alarmWellRank.vue
@@ -40,18 +40,7 @@
         endTime: '' // 结束时间
       }, // 查询结果
       alarmContentTypeList: [],
-      list: [
-        { wellCode: 'aaaa', position: '中关村南大街5号院', alarmCount: 5, count: 0 },
-        { wellCode: 'aaaa', position: '中关村南大街5号院', alarmCount: 5, count: 0 },
-        { wellCode: 'aaaa', position: '中关村南大街5号院', alarmCount: 5, count: 0 },
-        { wellCode: 'aaaa', position: '中关村南大街5号院', alarmCount: 5, count: 0 },
-        { wellCode: 'aaaa', position: '中关村南大街5号院', alarmCount: 5, count: 0 },
-        { wellCode: 'aaaa', position: '中关村南大街5号院', alarmCount: 5, count: 0 },
-        { wellCode: 'aaaa', position: '中关村南大街5号院', alarmCount: 5, count: 0 },
-        { wellCode: 'aaaa', position: '中关村南大街5号院', alarmCount: 5, count: 0 },
-        { wellCode: 'aaaa', position: '中关村南大街5号院', alarmCount: 5, count: 0 },
-        { wellCode: 'aaaa', position: '中关村南大街5号院', alarmCount: 5, count: 0 }
-      ],
+      list: [],
       total: 0
     }
   },
diff --git a/src/views/dashboard/components/AlarmNowList.vue b/src/views/dashboard/components/AlarmNowList.vue
index 890325f..3bb5c4d 100644
--- a/src/views/dashboard/components/AlarmNowList.vue
+++ b/src/views/dashboard/components/AlarmNowList.vue
@@ -1,6 +1,4 @@
-<template>
-
-</template>
+<template />
 
 <script>
 export default {
@@ -11,7 +9,7 @@
     }
     this.chartSettings = {
       labelMap: {
-        'alarmWells': '报警井数',
+        'alarmWells': '报警点位数',
         'alarmTimes': '报警次数'
       },
       metrics: ['alarmTimes', 'alarmWells'],
diff --git a/src/views/dataManage/dataManage.vue b/src/views/dataManage/dataManage.vue
index b6bceb8..b1d6a3b 100644
--- a/src/views/dataManage/dataManage.vue
+++ b/src/views/dataManage/dataManage.vue
@@ -42,10 +42,10 @@
         { permission: '/welllocadata/list-page', label: '井盖定位监测仪', name: 'wellloca', type: '7', comp: 'list-well-loca-data' },
         { permission: '/liquidGasData/list-page', label: '燃气智能终端(一体化)', name: 'liquidgas', type: '10', comp: 'list-liquid-gas-data' },
         { permission: '/tubedata/list-page', label: '管盯', name: 'tube', type: '12', comp: 'list-tube-data' },
-        { permission: '/gasdector/list-page', label: '可燃气体智能监测终端', name: 'gasdector', type: '1', comp: 'list-gasdector-data' },
-        { permission: '/pantilt/list-page', label: '激光甲烷遥测云台', name: 'pantilt', type: '1', comp: 'list-pantilt-data' },
+        { permission: '/gasdector/list-page', label: '可燃气体智能监测终端', name: 'gasdector', type: '101', comp: 'list-gasdector-data' },
+        { permission: '/pantilt/list-page', label: '激光甲烷遥测云台', name: 'pantilt', type: '21', comp: 'list-pantilt-data' },
         { permission: '/hydrantdata/list-page', label: '消防栓防盗水监测仪', name: 'hydrant', type: '11', comp: 'list-hydrant-data' },
-        { permission: '/h2s/list-page', label: '硫化氢浓度监测仪', name: 'H2S', type: '11', comp: 'list-H2S-data' }
+        { permission: '/h2s/list-page', label: '硫化氢浓度监测仪', name: 'H2S', type: '14', comp: 'list-H2S-data' }
       ] // 所有tab列表
     }
   },
diff --git a/src/views/dataManage/deviceData/listTubeData.vue b/src/views/dataManage/deviceData/listTubeData.vue
index b56fb95..777594c 100644
--- a/src/views/dataManage/deviceData/listTubeData.vue
+++ b/src/views/dataManage/deviceData/listTubeData.vue
@@ -86,7 +86,7 @@
         { text: '点位编号', value: 'wellCode', align: 'center' },
         { text: '设备类型', value: 'deviceTypeName', align: 'center' },
         { text: '燃气浓度(%LEL)', value: 'strength', align: 'center' },
-        // { text: '电量(%)', value: 'cell', width: 80, align: 'center', checkCell: true },
+        { text: '电量(%)', value: 'cell', width: 80, align: 'center', checkCell: true },
         // { text: '状态描述', value: 'descn', align: 'center' },
         { text: '权属单位', value: 'deptName', align: 'center' },
         { text: '上传时间', value: 'uptime', width: 170, align: 'center' }
diff --git a/src/views/dataStatics/dataStatics.vue b/src/views/dataStatics/dataStatics.vue
index 4383d7f..1d72324 100644
--- a/src/views/dataStatics/dataStatics.vue
+++ b/src/views/dataStatics/dataStatics.vue
@@ -58,11 +58,11 @@
         <p>使用方法：请在上方输入框中输入要查询的完整的点位编号，选择监测指标后点击搜索按钮。默认查询7天数据。</p>
       </el-row>
       <el-row>
-        <el-image
-          :src="chartSample"
-          style="width: 90%"
-          fit="fill"
-        />
+        <!--        <el-image-->
+        <!--          :src="chartSample"-->
+        <!--          style="width: 90%"-->
+        <!--          fit="fill"-->
+        <!--        />-->
       </el-row>
     </div>
   </app-container>

diff --git a/src/utils/dateutils.js b/src/utils/dateutils.js
index ae7ae6d..36161f2 100644
--- a/src/utils/dateutils.js
+++ b/src/utils/dateutils.js
@@ -88,6 +88,11 @@
   return fmt
 }
 
+export function getSearchTodayTime() {
+  const startTime = getDayTime(new Date().getTime()).Format('yyyy-MM-dd hh:mm:ss')
+  const endTime = getDayTime(new Date().getTime()+ 3599 * 1000 * 24).Format('yyyy-MM-dd hh:mm:ss')
+  return [startTime, endTime]
+}
 /**
  * 获取近1周日期范围
  * @returns {*[]}
diff --git a/src/views/alarmRule/components/editRule.vue b/src/views/alarmRule/components/editRule.vue
index 135a723..0e6a56e 100644
--- a/src/views/alarmRule/components/editRule.vue
+++ b/src/views/alarmRule/components/editRule.vue
@@ -3,12 +3,12 @@
     <el-form ref="dataForm" :rules="rules" :model="alarmRuleForm" label-position="right" label-width="120px">
       <el-row v-if="dialogStatus=='update'" :gutter="20">
         <el-col :span="12">
-          <el-form-item label="点位编号" prop="concencode">
+          <el-form-item label="点位编号">
             <el-input v-model="baseInfo.wellCode" type="text" placeholder="未知" disabled />
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="井深" prop="simid">
+          <el-form-item label="井深">
             <el-input v-model="baseInfo.deep" type="text" placeholder="未知" disabled />
           </el-form-item>
         </el-col>
diff --git a/src/views/alarmStatics/alarmStatics.vue b/src/views/alarmStatics/alarmStatics.vue
index baf8cba..1195d22 100644
--- a/src/views/alarmStatics/alarmStatics.vue
+++ b/src/views/alarmStatics/alarmStatics.vue
@@ -33,6 +33,9 @@
 import SimpleCard from '@/components/BigData/Card/simpleCard'
 import AlarmWellRank from './components/alarmWellRank'
 import AlarmStaticsByContent from '@/views/alarmStatics/components/alarmStaticsByContent'
+import { alarmNowStatic } from '@/api/data/dataStatics'
+import { getSearchTodayTime } from '@/utils/dateutils'
+import { getAlarmList } from '@/api/alarm/alarm'
 export default {
   name: 'AlarmStatics',
   components: {
@@ -47,10 +50,38 @@
     return {
       alarmNow: 0,
       todayAlarm: 0
-
+    }
+  },
+  created() {
+    this.getAlarmCount()
+    this.getTodayAlarmCount()
+  },
+  methods: {
+    getAlarmCount() {
+      alarmNowStatic().then(response => {
+        this.alarmNow = response.data.total
+      })
+    },
+    getTodayAlarmCount() {
+      const date = getSearchTodayTime()
+      debugger
+      const listQuery = {
+        keywords: '',
+        alarmType: '',
+        alarmContentType: '',
+        beginTime: date[0],
+        endTime: date[1],
+        status: '1',
+        offset: 1,
+        limit: 20,
+        sort: '',
+        order: ''
+      } // 筛选条件
+      getAlarmList(listQuery).then(response => {
+        this.todayAlarm = parseInt(response.data.total)
+      })
     }
   }
-
 }
 </script>
 
diff --git a/src/views/alarmStatics/components/alarmWellRank.vue b/src/views/alarmStatics/components/alarmWellRank.vue
index f666639..f752abe 100644
--- a/src/views/alarmStatics/components/alarmWellRank.vue
+++ b/src/views/alarmStatics/components/alarmWellRank.vue
@@ -40,18 +40,7 @@
         endTime: '' // 结束时间
       }, // 查询结果
       alarmContentTypeList: [],
-      list: [
-        { wellCode: 'aaaa', position: '中关村南大街5号院', alarmCount: 5, count: 0 },
-        { wellCode: 'aaaa', position: '中关村南大街5号院', alarmCount: 5, count: 0 },
-        { wellCode: 'aaaa', position: '中关村南大街5号院', alarmCount: 5, count: 0 },
-        { wellCode: 'aaaa', position: '中关村南大街5号院', alarmCount: 5, count: 0 },
-        { wellCode: 'aaaa', position: '中关村南大街5号院', alarmCount: 5, count: 0 },
-        { wellCode: 'aaaa', position: '中关村南大街5号院', alarmCount: 5, count: 0 },
-        { wellCode: 'aaaa', position: '中关村南大街5号院', alarmCount: 5, count: 0 },
-        { wellCode: 'aaaa', position: '中关村南大街5号院', alarmCount: 5, count: 0 },
-        { wellCode: 'aaaa', position: '中关村南大街5号院', alarmCount: 5, count: 0 },
-        { wellCode: 'aaaa', position: '中关村南大街5号院', alarmCount: 5, count: 0 }
-      ],
+      list: [],
       total: 0
     }
   },
diff --git a/src/views/dashboard/components/AlarmNowList.vue b/src/views/dashboard/components/AlarmNowList.vue
index 890325f..3bb5c4d 100644
--- a/src/views/dashboard/components/AlarmNowList.vue
+++ b/src/views/dashboard/components/AlarmNowList.vue
@@ -1,6 +1,4 @@
-<template>
-
-</template>
+<template />
 
 <script>
 export default {
@@ -11,7 +9,7 @@
     }
     this.chartSettings = {
       labelMap: {
-        'alarmWells': '报警井数',
+        'alarmWells': '报警点位数',
         'alarmTimes': '报警次数'
       },
       metrics: ['alarmTimes', 'alarmWells'],
diff --git a/src/views/dataManage/dataManage.vue b/src/views/dataManage/dataManage.vue
index b6bceb8..b1d6a3b 100644
--- a/src/views/dataManage/dataManage.vue
+++ b/src/views/dataManage/dataManage.vue
@@ -42,10 +42,10 @@
         { permission: '/welllocadata/list-page', label: '井盖定位监测仪', name: 'wellloca', type: '7', comp: 'list-well-loca-data' },
         { permission: '/liquidGasData/list-page', label: '燃气智能终端(一体化)', name: 'liquidgas', type: '10', comp: 'list-liquid-gas-data' },
         { permission: '/tubedata/list-page', label: '管盯', name: 'tube', type: '12', comp: 'list-tube-data' },
-        { permission: '/gasdector/list-page', label: '可燃气体智能监测终端', name: 'gasdector', type: '1', comp: 'list-gasdector-data' },
-        { permission: '/pantilt/list-page', label: '激光甲烷遥测云台', name: 'pantilt', type: '1', comp: 'list-pantilt-data' },
+        { permission: '/gasdector/list-page', label: '可燃气体智能监测终端', name: 'gasdector', type: '101', comp: 'list-gasdector-data' },
+        { permission: '/pantilt/list-page', label: '激光甲烷遥测云台', name: 'pantilt', type: '21', comp: 'list-pantilt-data' },
         { permission: '/hydrantdata/list-page', label: '消防栓防盗水监测仪', name: 'hydrant', type: '11', comp: 'list-hydrant-data' },
-        { permission: '/h2s/list-page', label: '硫化氢浓度监测仪', name: 'H2S', type: '11', comp: 'list-H2S-data' }
+        { permission: '/h2s/list-page', label: '硫化氢浓度监测仪', name: 'H2S', type: '14', comp: 'list-H2S-data' }
       ] // 所有tab列表
     }
   },
diff --git a/src/views/dataManage/deviceData/listTubeData.vue b/src/views/dataManage/deviceData/listTubeData.vue
index b56fb95..777594c 100644
--- a/src/views/dataManage/deviceData/listTubeData.vue
+++ b/src/views/dataManage/deviceData/listTubeData.vue
@@ -86,7 +86,7 @@
         { text: '点位编号', value: 'wellCode', align: 'center' },
         { text: '设备类型', value: 'deviceTypeName', align: 'center' },
         { text: '燃气浓度(%LEL)', value: 'strength', align: 'center' },
-        // { text: '电量(%)', value: 'cell', width: 80, align: 'center', checkCell: true },
+        { text: '电量(%)', value: 'cell', width: 80, align: 'center', checkCell: true },
         // { text: '状态描述', value: 'descn', align: 'center' },
         { text: '权属单位', value: 'deptName', align: 'center' },
         { text: '上传时间', value: 'uptime', width: 170, align: 'center' }
diff --git a/src/views/dataStatics/dataStatics.vue b/src/views/dataStatics/dataStatics.vue
index 4383d7f..1d72324 100644
--- a/src/views/dataStatics/dataStatics.vue
+++ b/src/views/dataStatics/dataStatics.vue
@@ -58,11 +58,11 @@
         <p>使用方法：请在上方输入框中输入要查询的完整的点位编号，选择监测指标后点击搜索按钮。默认查询7天数据。</p>
       </el-row>
       <el-row>
-        <el-image
-          :src="chartSample"
-          style="width: 90%"
-          fit="fill"
-        />
+        <!--        <el-image-->
+        <!--          :src="chartSample"-->
+        <!--          style="width: 90%"-->
+        <!--          fit="fill"-->
+        <!--        />-->
       </el-row>
     </div>
   </app-container>
diff --git a/src/views/deviceConfig/components/listTubeConfig.vue b/src/views/deviceConfig/components/listTubeConfig.vue
index 9f27e0e..6a719b9 100644
--- a/src/views/deviceConfig/components/listTubeConfig.vue
+++ b/src/views/deviceConfig/components/listTubeConfig.vue
@@ -159,7 +159,7 @@
       fullscreenLoading: false, // 全屏加载动画
       editShow: false, // 是否显示编辑框
       detailShow: false, // 是否显示编辑框
-      filename: 'methane_config_template.xlsx',
+      filename: 'tube_config_template.xlsx',
       deptShowTop: false,
       fileList: []
     }

diff --git a/src/utils/dateutils.js b/src/utils/dateutils.js
index ae7ae6d..36161f2 100644
--- a/src/utils/dateutils.js
+++ b/src/utils/dateutils.js
@@ -88,6 +88,11 @@
   return fmt
 }
 
+export function getSearchTodayTime() {
+  const startTime = getDayTime(new Date().getTime()).Format('yyyy-MM-dd hh:mm:ss')
+  const endTime = getDayTime(new Date().getTime()+ 3599 * 1000 * 24).Format('yyyy-MM-dd hh:mm:ss')
+  return [startTime, endTime]
+}
 /**
  * 获取近1周日期范围
  * @returns {*[]}
diff --git a/src/views/alarmRule/components/editRule.vue b/src/views/alarmRule/components/editRule.vue
index 135a723..0e6a56e 100644
--- a/src/views/alarmRule/components/editRule.vue
+++ b/src/views/alarmRule/components/editRule.vue
@@ -3,12 +3,12 @@
     <el-form ref="dataForm" :rules="rules" :model="alarmRuleForm" label-position="right" label-width="120px">
       <el-row v-if="dialogStatus=='update'" :gutter="20">
         <el-col :span="12">
-          <el-form-item label="点位编号" prop="concencode">
+          <el-form-item label="点位编号">
             <el-input v-model="baseInfo.wellCode" type="text" placeholder="未知" disabled />
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="井深" prop="simid">
+          <el-form-item label="井深">
             <el-input v-model="baseInfo.deep" type="text" placeholder="未知" disabled />
           </el-form-item>
         </el-col>
diff --git a/src/views/alarmStatics/alarmStatics.vue b/src/views/alarmStatics/alarmStatics.vue
index baf8cba..1195d22 100644
--- a/src/views/alarmStatics/alarmStatics.vue
+++ b/src/views/alarmStatics/alarmStatics.vue
@@ -33,6 +33,9 @@
 import SimpleCard from '@/components/BigData/Card/simpleCard'
 import AlarmWellRank from './components/alarmWellRank'
 import AlarmStaticsByContent from '@/views/alarmStatics/components/alarmStaticsByContent'
+import { alarmNowStatic } from '@/api/data/dataStatics'
+import { getSearchTodayTime } from '@/utils/dateutils'
+import { getAlarmList } from '@/api/alarm/alarm'
 export default {
   name: 'AlarmStatics',
   components: {
@@ -47,10 +50,38 @@
     return {
       alarmNow: 0,
       todayAlarm: 0
-
+    }
+  },
+  created() {
+    this.getAlarmCount()
+    this.getTodayAlarmCount()
+  },
+  methods: {
+    getAlarmCount() {
+      alarmNowStatic().then(response => {
+        this.alarmNow = response.data.total
+      })
+    },
+    getTodayAlarmCount() {
+      const date = getSearchTodayTime()
+      debugger
+      const listQuery = {
+        keywords: '',
+        alarmType: '',
+        alarmContentType: '',
+        beginTime: date[0],
+        endTime: date[1],
+        status: '1',
+        offset: 1,
+        limit: 20,
+        sort: '',
+        order: ''
+      } // 筛选条件
+      getAlarmList(listQuery).then(response => {
+        this.todayAlarm = parseInt(response.data.total)
+      })
     }
   }
-
 }
 </script>
 
diff --git a/src/views/alarmStatics/components/alarmWellRank.vue b/src/views/alarmStatics/components/alarmWellRank.vue
index f666639..f752abe 100644
--- a/src/views/alarmStatics/components/alarmWellRank.vue
+++ b/src/views/alarmStatics/components/alarmWellRank.vue
@@ -40,18 +40,7 @@
         endTime: '' // 结束时间
       }, // 查询结果
       alarmContentTypeList: [],
-      list: [
-        { wellCode: 'aaaa', position: '中关村南大街5号院', alarmCount: 5, count: 0 },
-        { wellCode: 'aaaa', position: '中关村南大街5号院', alarmCount: 5, count: 0 },
-        { wellCode: 'aaaa', position: '中关村南大街5号院', alarmCount: 5, count: 0 },
-        { wellCode: 'aaaa', position: '中关村南大街5号院', alarmCount: 5, count: 0 },
-        { wellCode: 'aaaa', position: '中关村南大街5号院', alarmCount: 5, count: 0 },
-        { wellCode: 'aaaa', position: '中关村南大街5号院', alarmCount: 5, count: 0 },
-        { wellCode: 'aaaa', position: '中关村南大街5号院', alarmCount: 5, count: 0 },
-        { wellCode: 'aaaa', position: '中关村南大街5号院', alarmCount: 5, count: 0 },
-        { wellCode: 'aaaa', position: '中关村南大街5号院', alarmCount: 5, count: 0 },
-        { wellCode: 'aaaa', position: '中关村南大街5号院', alarmCount: 5, count: 0 }
-      ],
+      list: [],
       total: 0
     }
   },
diff --git a/src/views/dashboard/components/AlarmNowList.vue b/src/views/dashboard/components/AlarmNowList.vue
index 890325f..3bb5c4d 100644
--- a/src/views/dashboard/components/AlarmNowList.vue
+++ b/src/views/dashboard/components/AlarmNowList.vue
@@ -1,6 +1,4 @@
-<template>
-
-</template>
+<template />
 
 <script>
 export default {
@@ -11,7 +9,7 @@
     }
     this.chartSettings = {
       labelMap: {
-        'alarmWells': '报警井数',
+        'alarmWells': '报警点位数',
         'alarmTimes': '报警次数'
       },
       metrics: ['alarmTimes', 'alarmWells'],
diff --git a/src/views/dataManage/dataManage.vue b/src/views/dataManage/dataManage.vue
index b6bceb8..b1d6a3b 100644
--- a/src/views/dataManage/dataManage.vue
+++ b/src/views/dataManage/dataManage.vue
@@ -42,10 +42,10 @@
         { permission: '/welllocadata/list-page', label: '井盖定位监测仪', name: 'wellloca', type: '7', comp: 'list-well-loca-data' },
         { permission: '/liquidGasData/list-page', label: '燃气智能终端(一体化)', name: 'liquidgas', type: '10', comp: 'list-liquid-gas-data' },
         { permission: '/tubedata/list-page', label: '管盯', name: 'tube', type: '12', comp: 'list-tube-data' },
-        { permission: '/gasdector/list-page', label: '可燃气体智能监测终端', name: 'gasdector', type: '1', comp: 'list-gasdector-data' },
-        { permission: '/pantilt/list-page', label: '激光甲烷遥测云台', name: 'pantilt', type: '1', comp: 'list-pantilt-data' },
+        { permission: '/gasdector/list-page', label: '可燃气体智能监测终端', name: 'gasdector', type: '101', comp: 'list-gasdector-data' },
+        { permission: '/pantilt/list-page', label: '激光甲烷遥测云台', name: 'pantilt', type: '21', comp: 'list-pantilt-data' },
         { permission: '/hydrantdata/list-page', label: '消防栓防盗水监测仪', name: 'hydrant', type: '11', comp: 'list-hydrant-data' },
-        { permission: '/h2s/list-page', label: '硫化氢浓度监测仪', name: 'H2S', type: '11', comp: 'list-H2S-data' }
+        { permission: '/h2s/list-page', label: '硫化氢浓度监测仪', name: 'H2S', type: '14', comp: 'list-H2S-data' }
       ] // 所有tab列表
     }
   },
diff --git a/src/views/dataManage/deviceData/listTubeData.vue b/src/views/dataManage/deviceData/listTubeData.vue
index b56fb95..777594c 100644
--- a/src/views/dataManage/deviceData/listTubeData.vue
+++ b/src/views/dataManage/deviceData/listTubeData.vue
@@ -86,7 +86,7 @@
         { text: '点位编号', value: 'wellCode', align: 'center' },
         { text: '设备类型', value: 'deviceTypeName', align: 'center' },
         { text: '燃气浓度(%LEL)', value: 'strength', align: 'center' },
-        // { text: '电量(%)', value: 'cell', width: 80, align: 'center', checkCell: true },
+        { text: '电量(%)', value: 'cell', width: 80, align: 'center', checkCell: true },
         // { text: '状态描述', value: 'descn', align: 'center' },
         { text: '权属单位', value: 'deptName', align: 'center' },
         { text: '上传时间', value: 'uptime', width: 170, align: 'center' }
diff --git a/src/views/dataStatics/dataStatics.vue b/src/views/dataStatics/dataStatics.vue
index 4383d7f..1d72324 100644
--- a/src/views/dataStatics/dataStatics.vue
+++ b/src/views/dataStatics/dataStatics.vue
@@ -58,11 +58,11 @@
         <p>使用方法：请在上方输入框中输入要查询的完整的点位编号，选择监测指标后点击搜索按钮。默认查询7天数据。</p>
       </el-row>
       <el-row>
-        <el-image
-          :src="chartSample"
-          style="width: 90%"
-          fit="fill"
-        />
+        <!--        <el-image-->
+        <!--          :src="chartSample"-->
+        <!--          style="width: 90%"-->
+        <!--          fit="fill"-->
+        <!--        />-->
       </el-row>
     </div>
   </app-container>
diff --git a/src/views/deviceConfig/components/listTubeConfig.vue b/src/views/deviceConfig/components/listTubeConfig.vue
index 9f27e0e..6a719b9 100644
--- a/src/views/deviceConfig/components/listTubeConfig.vue
+++ b/src/views/deviceConfig/components/listTubeConfig.vue
@@ -159,7 +159,7 @@
       fullscreenLoading: false, // 全屏加载动画
       editShow: false, // 是否显示编辑框
       detailShow: false, // 是否显示编辑框
-      filename: 'methane_config_template.xlsx',
+      filename: 'tube_config_template.xlsx',
       deptShowTop: false,
       fileList: []
     }
diff --git a/src/views/deviceManage/deviceType/deviceType.vue b/src/views/deviceManage/deviceType/deviceType.vue
index 9429fb0..848d3b3 100644
--- a/src/views/deviceManage/deviceType/deviceType.vue
+++ b/src/views/deviceManage/deviceType/deviceType.vue
@@ -73,6 +73,10 @@
         sort: 'id',
         order: 'asc'
       }, // 查询条件
+      isValidList: [
+        { label: '是', value: '1' },
+        { label: '否', value: '0' }
+      ], // 是否下拉
       columns: [
         {
           text: '设备类型编号',

diff --git a/src/utils/dateutils.js b/src/utils/dateutils.js
index ae7ae6d..36161f2 100644
--- a/src/utils/dateutils.js
+++ b/src/utils/dateutils.js
@@ -88,6 +88,11 @@
   return fmt
 }
 
+export function getSearchTodayTime() {
+  const startTime = getDayTime(new Date().getTime()).Format('yyyy-MM-dd hh:mm:ss')
+  const endTime = getDayTime(new Date().getTime()+ 3599 * 1000 * 24).Format('yyyy-MM-dd hh:mm:ss')
+  return [startTime, endTime]
+}
 /**
  * 获取近1周日期范围
  * @returns {*[]}
diff --git a/src/views/alarmRule/components/editRule.vue b/src/views/alarmRule/components/editRule.vue
index 135a723..0e6a56e 100644
--- a/src/views/alarmRule/components/editRule.vue
+++ b/src/views/alarmRule/components/editRule.vue
@@ -3,12 +3,12 @@
     <el-form ref="dataForm" :rules="rules" :model="alarmRuleForm" label-position="right" label-width="120px">
       <el-row v-if="dialogStatus=='update'" :gutter="20">
         <el-col :span="12">
-          <el-form-item label="点位编号" prop="concencode">
+          <el-form-item label="点位编号">
             <el-input v-model="baseInfo.wellCode" type="text" placeholder="未知" disabled />
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="井深" prop="simid">
+          <el-form-item label="井深">
             <el-input v-model="baseInfo.deep" type="text" placeholder="未知" disabled />
           </el-form-item>
         </el-col>
diff --git a/src/views/alarmStatics/alarmStatics.vue b/src/views/alarmStatics/alarmStatics.vue
index baf8cba..1195d22 100644
--- a/src/views/alarmStatics/alarmStatics.vue
+++ b/src/views/alarmStatics/alarmStatics.vue
@@ -33,6 +33,9 @@
 import SimpleCard from '@/components/BigData/Card/simpleCard'
 import AlarmWellRank from './components/alarmWellRank'
 import AlarmStaticsByContent from '@/views/alarmStatics/components/alarmStaticsByContent'
+import { alarmNowStatic } from '@/api/data/dataStatics'
+import { getSearchTodayTime } from '@/utils/dateutils'
+import { getAlarmList } from '@/api/alarm/alarm'
 export default {
   name: 'AlarmStatics',
   components: {
@@ -47,10 +50,38 @@
     return {
       alarmNow: 0,
       todayAlarm: 0
-
+    }
+  },
+  created() {
+    this.getAlarmCount()
+    this.getTodayAlarmCount()
+  },
+  methods: {
+    getAlarmCount() {
+      alarmNowStatic().then(response => {
+        this.alarmNow = response.data.total
+      })
+    },
+    getTodayAlarmCount() {
+      const date = getSearchTodayTime()
+      debugger
+      const listQuery = {
+        keywords: '',
+        alarmType: '',
+        alarmContentType: '',
+        beginTime: date[0],
+        endTime: date[1],
+        status: '1',
+        offset: 1,
+        limit: 20,
+        sort: '',
+        order: ''
+      } // 筛选条件
+      getAlarmList(listQuery).then(response => {
+        this.todayAlarm = parseInt(response.data.total)
+      })
     }
   }
-
 }
 </script>
 
diff --git a/src/views/alarmStatics/components/alarmWellRank.vue b/src/views/alarmStatics/components/alarmWellRank.vue
index f666639..f752abe 100644
--- a/src/views/alarmStatics/components/alarmWellRank.vue
+++ b/src/views/alarmStatics/components/alarmWellRank.vue
@@ -40,18 +40,7 @@
         endTime: '' // 结束时间
       }, // 查询结果
       alarmContentTypeList: [],
-      list: [
-        { wellCode: 'aaaa', position: '中关村南大街5号院', alarmCount: 5, count: 0 },
-        { wellCode: 'aaaa', position: '中关村南大街5号院', alarmCount: 5, count: 0 },
-        { wellCode: 'aaaa', position: '中关村南大街5号院', alarmCount: 5, count: 0 },
-        { wellCode: 'aaaa', position: '中关村南大街5号院', alarmCount: 5, count: 0 },
-        { wellCode: 'aaaa', position: '中关村南大街5号院', alarmCount: 5, count: 0 },
-        { wellCode: 'aaaa', position: '中关村南大街5号院', alarmCount: 5, count: 0 },
-        { wellCode: 'aaaa', position: '中关村南大街5号院', alarmCount: 5, count: 0 },
-        { wellCode: 'aaaa', position: '中关村南大街5号院', alarmCount: 5, count: 0 },
-        { wellCode: 'aaaa', position: '中关村南大街5号院', alarmCount: 5, count: 0 },
-        { wellCode: 'aaaa', position: '中关村南大街5号院', alarmCount: 5, count: 0 }
-      ],
+      list: [],
       total: 0
     }
   },
diff --git a/src/views/dashboard/components/AlarmNowList.vue b/src/views/dashboard/components/AlarmNowList.vue
index 890325f..3bb5c4d 100644
--- a/src/views/dashboard/components/AlarmNowList.vue
+++ b/src/views/dashboard/components/AlarmNowList.vue
@@ -1,6 +1,4 @@
-<template>
-
-</template>
+<template />
 
 <script>
 export default {
@@ -11,7 +9,7 @@
     }
     this.chartSettings = {
       labelMap: {
-        'alarmWells': '报警井数',
+        'alarmWells': '报警点位数',
         'alarmTimes': '报警次数'
       },
       metrics: ['alarmTimes', 'alarmWells'],
diff --git a/src/views/dataManage/dataManage.vue b/src/views/dataManage/dataManage.vue
index b6bceb8..b1d6a3b 100644
--- a/src/views/dataManage/dataManage.vue
+++ b/src/views/dataManage/dataManage.vue
@@ -42,10 +42,10 @@
         { permission: '/welllocadata/list-page', label: '井盖定位监测仪', name: 'wellloca', type: '7', comp: 'list-well-loca-data' },
         { permission: '/liquidGasData/list-page', label: '燃气智能终端(一体化)', name: 'liquidgas', type: '10', comp: 'list-liquid-gas-data' },
         { permission: '/tubedata/list-page', label: '管盯', name: 'tube', type: '12', comp: 'list-tube-data' },
-        { permission: '/gasdector/list-page', label: '可燃气体智能监测终端', name: 'gasdector', type: '1', comp: 'list-gasdector-data' },
-        { permission: '/pantilt/list-page', label: '激光甲烷遥测云台', name: 'pantilt', type: '1', comp: 'list-pantilt-data' },
+        { permission: '/gasdector/list-page', label: '可燃气体智能监测终端', name: 'gasdector', type: '101', comp: 'list-gasdector-data' },
+        { permission: '/pantilt/list-page', label: '激光甲烷遥测云台', name: 'pantilt', type: '21', comp: 'list-pantilt-data' },
         { permission: '/hydrantdata/list-page', label: '消防栓防盗水监测仪', name: 'hydrant', type: '11', comp: 'list-hydrant-data' },
-        { permission: '/h2s/list-page', label: '硫化氢浓度监测仪', name: 'H2S', type: '11', comp: 'list-H2S-data' }
+        { permission: '/h2s/list-page', label: '硫化氢浓度监测仪', name: 'H2S', type: '14', comp: 'list-H2S-data' }
       ] // 所有tab列表
     }
   },
diff --git a/src/views/dataManage/deviceData/listTubeData.vue b/src/views/dataManage/deviceData/listTubeData.vue
index b56fb95..777594c 100644
--- a/src/views/dataManage/deviceData/listTubeData.vue
+++ b/src/views/dataManage/deviceData/listTubeData.vue
@@ -86,7 +86,7 @@
         { text: '点位编号', value: 'wellCode', align: 'center' },
         { text: '设备类型', value: 'deviceTypeName', align: 'center' },
         { text: '燃气浓度(%LEL)', value: 'strength', align: 'center' },
-        // { text: '电量(%)', value: 'cell', width: 80, align: 'center', checkCell: true },
+        { text: '电量(%)', value: 'cell', width: 80, align: 'center', checkCell: true },
         // { text: '状态描述', value: 'descn', align: 'center' },
         { text: '权属单位', value: 'deptName', align: 'center' },
         { text: '上传时间', value: 'uptime', width: 170, align: 'center' }
diff --git a/src/views/dataStatics/dataStatics.vue b/src/views/dataStatics/dataStatics.vue
index 4383d7f..1d72324 100644
--- a/src/views/dataStatics/dataStatics.vue
+++ b/src/views/dataStatics/dataStatics.vue
@@ -58,11 +58,11 @@
         <p>使用方法：请在上方输入框中输入要查询的完整的点位编号，选择监测指标后点击搜索按钮。默认查询7天数据。</p>
       </el-row>
       <el-row>
-        <el-image
-          :src="chartSample"
-          style="width: 90%"
-          fit="fill"
-        />
+        <!--        <el-image-->
+        <!--          :src="chartSample"-->
+        <!--          style="width: 90%"-->
+        <!--          fit="fill"-->
+        <!--        />-->
       </el-row>
     </div>
   </app-container>
diff --git a/src/views/deviceConfig/components/listTubeConfig.vue b/src/views/deviceConfig/components/listTubeConfig.vue
index 9f27e0e..6a719b9 100644
--- a/src/views/deviceConfig/components/listTubeConfig.vue
+++ b/src/views/deviceConfig/components/listTubeConfig.vue
@@ -159,7 +159,7 @@
       fullscreenLoading: false, // 全屏加载动画
       editShow: false, // 是否显示编辑框
       detailShow: false, // 是否显示编辑框
-      filename: 'methane_config_template.xlsx',
+      filename: 'tube_config_template.xlsx',
       deptShowTop: false,
       fileList: []
     }
diff --git a/src/views/deviceManage/deviceType/deviceType.vue b/src/views/deviceManage/deviceType/deviceType.vue
index 9429fb0..848d3b3 100644
--- a/src/views/deviceManage/deviceType/deviceType.vue
+++ b/src/views/deviceManage/deviceType/deviceType.vue
@@ -73,6 +73,10 @@
         sort: 'id',
         order: 'asc'
       }, // 查询条件
+      isValidList: [
+        { label: '是', value: '1' },
+        { label: '否', value: '0' }
+      ], // 是否下拉
       columns: [
         {
           text: '设备类型编号',
diff --git a/src/views/jobManage/listJobs.vue b/src/views/jobManage/listJobs.vue
index b241503..026467f 100644
--- a/src/views/jobManage/listJobs.vue
+++ b/src/views/jobManage/listJobs.vue
@@ -137,6 +137,7 @@
         keywords: '',
         alarmType: '',
         alarmContentType: '',
+        jobStatus: '',
         beginTime: '',
         endTime: '',
         offset: 1,
@@ -258,10 +259,10 @@
     }
   },
   created() {
-    console.log('create')
     this.fetchAlarmType() // 告警类型下拉菜单
     this.fetchAlarmContentType() // 告警内容下拉菜单
     this.fetchJobStatus() // 工单状态
+    this.fetchData()
   },
   beforeRouteEnter(to, from, next) {
     if (from.name) {
@@ -275,9 +276,6 @@
     }
     next()
   },
-  mounted() {
-    this.fetchData()
-  },
   activated() {
     if (!isFromDetail) {
       this.listQuery.keywords = ''

diff --git a/src/utils/dateutils.js b/src/utils/dateutils.js
index ae7ae6d..36161f2 100644
--- a/src/utils/dateutils.js
+++ b/src/utils/dateutils.js
@@ -88,6 +88,11 @@
   return fmt
 }
 
+export function getSearchTodayTime() {
+  const startTime = getDayTime(new Date().getTime()).Format('yyyy-MM-dd hh:mm:ss')
+  const endTime = getDayTime(new Date().getTime()+ 3599 * 1000 * 24).Format('yyyy-MM-dd hh:mm:ss')
+  return [startTime, endTime]
+}
 /**
  * 获取近1周日期范围
  * @returns {*[]}
diff --git a/src/views/alarmRule/components/editRule.vue b/src/views/alarmRule/components/editRule.vue
index 135a723..0e6a56e 100644
--- a/src/views/alarmRule/components/editRule.vue
+++ b/src/views/alarmRule/components/editRule.vue
@@ -3,12 +3,12 @@
     <el-form ref="dataForm" :rules="rules" :model="alarmRuleForm" label-position="right" label-width="120px">
       <el-row v-if="dialogStatus=='update'" :gutter="20">
         <el-col :span="12">
-          <el-form-item label="点位编号" prop="concencode">
+          <el-form-item label="点位编号">
             <el-input v-model="baseInfo.wellCode" type="text" placeholder="未知" disabled />
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="井深" prop="simid">
+          <el-form-item label="井深">
             <el-input v-model="baseInfo.deep" type="text" placeholder="未知" disabled />
           </el-form-item>
         </el-col>
diff --git a/src/views/alarmStatics/alarmStatics.vue b/src/views/alarmStatics/alarmStatics.vue
index baf8cba..1195d22 100644
--- a/src/views/alarmStatics/alarmStatics.vue
+++ b/src/views/alarmStatics/alarmStatics.vue
@@ -33,6 +33,9 @@
 import SimpleCard from '@/components/BigData/Card/simpleCard'
 import AlarmWellRank from './components/alarmWellRank'
 import AlarmStaticsByContent from '@/views/alarmStatics/components/alarmStaticsByContent'
+import { alarmNowStatic } from '@/api/data/dataStatics'
+import { getSearchTodayTime } from '@/utils/dateutils'
+import { getAlarmList } from '@/api/alarm/alarm'
 export default {
   name: 'AlarmStatics',
   components: {
@@ -47,10 +50,38 @@
     return {
       alarmNow: 0,
       todayAlarm: 0
-
+    }
+  },
+  created() {
+    this.getAlarmCount()
+    this.getTodayAlarmCount()
+  },
+  methods: {
+    getAlarmCount() {
+      alarmNowStatic().then(response => {
+        this.alarmNow = response.data.total
+      })
+    },
+    getTodayAlarmCount() {
+      const date = getSearchTodayTime()
+      debugger
+      const listQuery = {
+        keywords: '',
+        alarmType: '',
+        alarmContentType: '',
+        beginTime: date[0],
+        endTime: date[1],
+        status: '1',
+        offset: 1,
+        limit: 20,
+        sort: '',
+        order: ''
+      } // 筛选条件
+      getAlarmList(listQuery).then(response => {
+        this.todayAlarm = parseInt(response.data.total)
+      })
     }
   }
-
 }
 </script>
 
diff --git a/src/views/alarmStatics/components/alarmWellRank.vue b/src/views/alarmStatics/components/alarmWellRank.vue
index f666639..f752abe 100644
--- a/src/views/alarmStatics/components/alarmWellRank.vue
+++ b/src/views/alarmStatics/components/alarmWellRank.vue
@@ -40,18 +40,7 @@
         endTime: '' // 结束时间
       }, // 查询结果
       alarmContentTypeList: [],
-      list: [
-        { wellCode: 'aaaa', position: '中关村南大街5号院', alarmCount: 5, count: 0 },
-        { wellCode: 'aaaa', position: '中关村南大街5号院', alarmCount: 5, count: 0 },
-        { wellCode: 'aaaa', position: '中关村南大街5号院', alarmCount: 5, count: 0 },
-        { wellCode: 'aaaa', position: '中关村南大街5号院', alarmCount: 5, count: 0 },
-        { wellCode: 'aaaa', position: '中关村南大街5号院', alarmCount: 5, count: 0 },
-        { wellCode: 'aaaa', position: '中关村南大街5号院', alarmCount: 5, count: 0 },
-        { wellCode: 'aaaa', position: '中关村南大街5号院', alarmCount: 5, count: 0 },
-        { wellCode: 'aaaa', position: '中关村南大街5号院', alarmCount: 5, count: 0 },
-        { wellCode: 'aaaa', position: '中关村南大街5号院', alarmCount: 5, count: 0 },
-        { wellCode: 'aaaa', position: '中关村南大街5号院', alarmCount: 5, count: 0 }
-      ],
+      list: [],
       total: 0
     }
   },
diff --git a/src/views/dashboard/components/AlarmNowList.vue b/src/views/dashboard/components/AlarmNowList.vue
index 890325f..3bb5c4d 100644
--- a/src/views/dashboard/components/AlarmNowList.vue
+++ b/src/views/dashboard/components/AlarmNowList.vue
@@ -1,6 +1,4 @@
-<template>
-
-</template>
+<template />
 
 <script>
 export default {
@@ -11,7 +9,7 @@
     }
     this.chartSettings = {
       labelMap: {
-        'alarmWells': '报警井数',
+        'alarmWells': '报警点位数',
         'alarmTimes': '报警次数'
       },
       metrics: ['alarmTimes', 'alarmWells'],
diff --git a/src/views/dataManage/dataManage.vue b/src/views/dataManage/dataManage.vue
index b6bceb8..b1d6a3b 100644
--- a/src/views/dataManage/dataManage.vue
+++ b/src/views/dataManage/dataManage.vue
@@ -42,10 +42,10 @@
         { permission: '/welllocadata/list-page', label: '井盖定位监测仪', name: 'wellloca', type: '7', comp: 'list-well-loca-data' },
         { permission: '/liquidGasData/list-page', label: '燃气智能终端(一体化)', name: 'liquidgas', type: '10', comp: 'list-liquid-gas-data' },
         { permission: '/tubedata/list-page', label: '管盯', name: 'tube', type: '12', comp: 'list-tube-data' },
-        { permission: '/gasdector/list-page', label: '可燃气体智能监测终端', name: 'gasdector', type: '1', comp: 'list-gasdector-data' },
-        { permission: '/pantilt/list-page', label: '激光甲烷遥测云台', name: 'pantilt', type: '1', comp: 'list-pantilt-data' },
+        { permission: '/gasdector/list-page', label: '可燃气体智能监测终端', name: 'gasdector', type: '101', comp: 'list-gasdector-data' },
+        { permission: '/pantilt/list-page', label: '激光甲烷遥测云台', name: 'pantilt', type: '21', comp: 'list-pantilt-data' },
         { permission: '/hydrantdata/list-page', label: '消防栓防盗水监测仪', name: 'hydrant', type: '11', comp: 'list-hydrant-data' },
-        { permission: '/h2s/list-page', label: '硫化氢浓度监测仪', name: 'H2S', type: '11', comp: 'list-H2S-data' }
+        { permission: '/h2s/list-page', label: '硫化氢浓度监测仪', name: 'H2S', type: '14', comp: 'list-H2S-data' }
       ] // 所有tab列表
     }
   },
diff --git a/src/views/dataManage/deviceData/listTubeData.vue b/src/views/dataManage/deviceData/listTubeData.vue
index b56fb95..777594c 100644
--- a/src/views/dataManage/deviceData/listTubeData.vue
+++ b/src/views/dataManage/deviceData/listTubeData.vue
@@ -86,7 +86,7 @@
         { text: '点位编号', value: 'wellCode', align: 'center' },
         { text: '设备类型', value: 'deviceTypeName', align: 'center' },
         { text: '燃气浓度(%LEL)', value: 'strength', align: 'center' },
-        // { text: '电量(%)', value: 'cell', width: 80, align: 'center', checkCell: true },
+        { text: '电量(%)', value: 'cell', width: 80, align: 'center', checkCell: true },
         // { text: '状态描述', value: 'descn', align: 'center' },
         { text: '权属单位', value: 'deptName', align: 'center' },
         { text: '上传时间', value: 'uptime', width: 170, align: 'center' }
diff --git a/src/views/dataStatics/dataStatics.vue b/src/views/dataStatics/dataStatics.vue
index 4383d7f..1d72324 100644
--- a/src/views/dataStatics/dataStatics.vue
+++ b/src/views/dataStatics/dataStatics.vue
@@ -58,11 +58,11 @@
         <p>使用方法：请在上方输入框中输入要查询的完整的点位编号，选择监测指标后点击搜索按钮。默认查询7天数据。</p>
       </el-row>
       <el-row>
-        <el-image
-          :src="chartSample"
-          style="width: 90%"
-          fit="fill"
-        />
+        <!--        <el-image-->
+        <!--          :src="chartSample"-->
+        <!--          style="width: 90%"-->
+        <!--          fit="fill"-->
+        <!--        />-->
       </el-row>
     </div>
   </app-container>
diff --git a/src/views/deviceConfig/components/listTubeConfig.vue b/src/views/deviceConfig/components/listTubeConfig.vue
index 9f27e0e..6a719b9 100644
--- a/src/views/deviceConfig/components/listTubeConfig.vue
+++ b/src/views/deviceConfig/components/listTubeConfig.vue
@@ -159,7 +159,7 @@
       fullscreenLoading: false, // 全屏加载动画
       editShow: false, // 是否显示编辑框
       detailShow: false, // 是否显示编辑框
-      filename: 'methane_config_template.xlsx',
+      filename: 'tube_config_template.xlsx',
       deptShowTop: false,
       fileList: []
     }
diff --git a/src/views/deviceManage/deviceType/deviceType.vue b/src/views/deviceManage/deviceType/deviceType.vue
index 9429fb0..848d3b3 100644
--- a/src/views/deviceManage/deviceType/deviceType.vue
+++ b/src/views/deviceManage/deviceType/deviceType.vue
@@ -73,6 +73,10 @@
         sort: 'id',
         order: 'asc'
       }, // 查询条件
+      isValidList: [
+        { label: '是', value: '1' },
+        { label: '否', value: '0' }
+      ], // 是否下拉
       columns: [
         {
           text: '设备类型编号',
diff --git a/src/views/jobManage/listJobs.vue b/src/views/jobManage/listJobs.vue
index b241503..026467f 100644
--- a/src/views/jobManage/listJobs.vue
+++ b/src/views/jobManage/listJobs.vue
@@ -137,6 +137,7 @@
         keywords: '',
         alarmType: '',
         alarmContentType: '',
+        jobStatus: '',
         beginTime: '',
         endTime: '',
         offset: 1,
@@ -258,10 +259,10 @@
     }
   },
   created() {
-    console.log('create')
     this.fetchAlarmType() // 告警类型下拉菜单
     this.fetchAlarmContentType() // 告警内容下拉菜单
     this.fetchJobStatus() // 工单状态
+    this.fetchData()
   },
   beforeRouteEnter(to, from, next) {
     if (from.name) {
@@ -275,9 +276,6 @@
     }
     next()
   },
-  mounted() {
-    this.fetchData()
-  },
   activated() {
     if (!isFromDetail) {
       this.listQuery.keywords = ''
diff --git a/src/views/overview/overview.vue b/src/views/overview/overview.vue
index 03ef9dc..c8509f9 100644
--- a/src/views/overview/overview.vue
+++ b/src/views/overview/overview.vue
@@ -29,7 +29,7 @@
           </el-button>
           <el-form-item style="margin-left:10px">
             <el-checkbox v-model="showAll">
-              显示全部井
+              显示全部点位
             </el-checkbox>
           </el-form-item>
         </el-row>

diff --git a/src/utils/dateutils.js b/src/utils/dateutils.js
index ae7ae6d..36161f2 100644
--- a/src/utils/dateutils.js
+++ b/src/utils/dateutils.js
@@ -88,6 +88,11 @@
   return fmt
 }
 
+export function getSearchTodayTime() {
+  const startTime = getDayTime(new Date().getTime()).Format('yyyy-MM-dd hh:mm:ss')
+  const endTime = getDayTime(new Date().getTime()+ 3599 * 1000 * 24).Format('yyyy-MM-dd hh:mm:ss')
+  return [startTime, endTime]
+}
 /**
  * 获取近1周日期范围
  * @returns {*[]}
diff --git a/src/views/alarmRule/components/editRule.vue b/src/views/alarmRule/components/editRule.vue
index 135a723..0e6a56e 100644
--- a/src/views/alarmRule/components/editRule.vue
+++ b/src/views/alarmRule/components/editRule.vue
@@ -3,12 +3,12 @@
     <el-form ref="dataForm" :rules="rules" :model="alarmRuleForm" label-position="right" label-width="120px">
       <el-row v-if="dialogStatus=='update'" :gutter="20">
         <el-col :span="12">
-          <el-form-item label="点位编号" prop="concencode">
+          <el-form-item label="点位编号">
             <el-input v-model="baseInfo.wellCode" type="text" placeholder="未知" disabled />
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="井深" prop="simid">
+          <el-form-item label="井深">
             <el-input v-model="baseInfo.deep" type="text" placeholder="未知" disabled />
           </el-form-item>
         </el-col>
diff --git a/src/views/alarmStatics/alarmStatics.vue b/src/views/alarmStatics/alarmStatics.vue
index baf8cba..1195d22 100644
--- a/src/views/alarmStatics/alarmStatics.vue
+++ b/src/views/alarmStatics/alarmStatics.vue
@@ -33,6 +33,9 @@
 import SimpleCard from '@/components/BigData/Card/simpleCard'
 import AlarmWellRank from './components/alarmWellRank'
 import AlarmStaticsByContent from '@/views/alarmStatics/components/alarmStaticsByContent'
+import { alarmNowStatic } from '@/api/data/dataStatics'
+import { getSearchTodayTime } from '@/utils/dateutils'
+import { getAlarmList } from '@/api/alarm/alarm'
 export default {
   name: 'AlarmStatics',
   components: {
@@ -47,10 +50,38 @@
     return {
       alarmNow: 0,
       todayAlarm: 0
-
+    }
+  },
+  created() {
+    this.getAlarmCount()
+    this.getTodayAlarmCount()
+  },
+  methods: {
+    getAlarmCount() {
+      alarmNowStatic().then(response => {
+        this.alarmNow = response.data.total
+      })
+    },
+    getTodayAlarmCount() {
+      const date = getSearchTodayTime()
+      debugger
+      const listQuery = {
+        keywords: '',
+        alarmType: '',
+        alarmContentType: '',
+        beginTime: date[0],
+        endTime: date[1],
+        status: '1',
+        offset: 1,
+        limit: 20,
+        sort: '',
+        order: ''
+      } // 筛选条件
+      getAlarmList(listQuery).then(response => {
+        this.todayAlarm = parseInt(response.data.total)
+      })
     }
   }
-
 }
 </script>
 
diff --git a/src/views/alarmStatics/components/alarmWellRank.vue b/src/views/alarmStatics/components/alarmWellRank.vue
index f666639..f752abe 100644
--- a/src/views/alarmStatics/components/alarmWellRank.vue
+++ b/src/views/alarmStatics/components/alarmWellRank.vue
@@ -40,18 +40,7 @@
         endTime: '' // 结束时间
       }, // 查询结果
       alarmContentTypeList: [],
-      list: [
-        { wellCode: 'aaaa', position: '中关村南大街5号院', alarmCount: 5, count: 0 },
-        { wellCode: 'aaaa', position: '中关村南大街5号院', alarmCount: 5, count: 0 },
-        { wellCode: 'aaaa', position: '中关村南大街5号院', alarmCount: 5, count: 0 },
-        { wellCode: 'aaaa', position: '中关村南大街5号院', alarmCount: 5, count: 0 },
-        { wellCode: 'aaaa', position: '中关村南大街5号院', alarmCount: 5, count: 0 },
-        { wellCode: 'aaaa', position: '中关村南大街5号院', alarmCount: 5, count: 0 },
-        { wellCode: 'aaaa', position: '中关村南大街5号院', alarmCount: 5, count: 0 },
-        { wellCode: 'aaaa', position: '中关村南大街5号院', alarmCount: 5, count: 0 },
-        { wellCode: 'aaaa', position: '中关村南大街5号院', alarmCount: 5, count: 0 },
-        { wellCode: 'aaaa', position: '中关村南大街5号院', alarmCount: 5, count: 0 }
-      ],
+      list: [],
       total: 0
     }
   },
diff --git a/src/views/dashboard/components/AlarmNowList.vue b/src/views/dashboard/components/AlarmNowList.vue
index 890325f..3bb5c4d 100644
--- a/src/views/dashboard/components/AlarmNowList.vue
+++ b/src/views/dashboard/components/AlarmNowList.vue
@@ -1,6 +1,4 @@
-<template>
-
-</template>
+<template />
 
 <script>
 export default {
@@ -11,7 +9,7 @@
     }
     this.chartSettings = {
       labelMap: {
-        'alarmWells': '报警井数',
+        'alarmWells': '报警点位数',
         'alarmTimes': '报警次数'
       },
       metrics: ['alarmTimes', 'alarmWells'],
diff --git a/src/views/dataManage/dataManage.vue b/src/views/dataManage/dataManage.vue
index b6bceb8..b1d6a3b 100644
--- a/src/views/dataManage/dataManage.vue
+++ b/src/views/dataManage/dataManage.vue
@@ -42,10 +42,10 @@
         { permission: '/welllocadata/list-page', label: '井盖定位监测仪', name: 'wellloca', type: '7', comp: 'list-well-loca-data' },
         { permission: '/liquidGasData/list-page', label: '燃气智能终端(一体化)', name: 'liquidgas', type: '10', comp: 'list-liquid-gas-data' },
         { permission: '/tubedata/list-page', label: '管盯', name: 'tube', type: '12', comp: 'list-tube-data' },
-        { permission: '/gasdector/list-page', label: '可燃气体智能监测终端', name: 'gasdector', type: '1', comp: 'list-gasdector-data' },
-        { permission: '/pantilt/list-page', label: '激光甲烷遥测云台', name: 'pantilt', type: '1', comp: 'list-pantilt-data' },
+        { permission: '/gasdector/list-page', label: '可燃气体智能监测终端', name: 'gasdector', type: '101', comp: 'list-gasdector-data' },
+        { permission: '/pantilt/list-page', label: '激光甲烷遥测云台', name: 'pantilt', type: '21', comp: 'list-pantilt-data' },
         { permission: '/hydrantdata/list-page', label: '消防栓防盗水监测仪', name: 'hydrant', type: '11', comp: 'list-hydrant-data' },
-        { permission: '/h2s/list-page', label: '硫化氢浓度监测仪', name: 'H2S', type: '11', comp: 'list-H2S-data' }
+        { permission: '/h2s/list-page', label: '硫化氢浓度监测仪', name: 'H2S', type: '14', comp: 'list-H2S-data' }
       ] // 所有tab列表
     }
   },
diff --git a/src/views/dataManage/deviceData/listTubeData.vue b/src/views/dataManage/deviceData/listTubeData.vue
index b56fb95..777594c 100644
--- a/src/views/dataManage/deviceData/listTubeData.vue
+++ b/src/views/dataManage/deviceData/listTubeData.vue
@@ -86,7 +86,7 @@
         { text: '点位编号', value: 'wellCode', align: 'center' },
         { text: '设备类型', value: 'deviceTypeName', align: 'center' },
         { text: '燃气浓度(%LEL)', value: 'strength', align: 'center' },
-        // { text: '电量(%)', value: 'cell', width: 80, align: 'center', checkCell: true },
+        { text: '电量(%)', value: 'cell', width: 80, align: 'center', checkCell: true },
         // { text: '状态描述', value: 'descn', align: 'center' },
         { text: '权属单位', value: 'deptName', align: 'center' },
         { text: '上传时间', value: 'uptime', width: 170, align: 'center' }
diff --git a/src/views/dataStatics/dataStatics.vue b/src/views/dataStatics/dataStatics.vue
index 4383d7f..1d72324 100644
--- a/src/views/dataStatics/dataStatics.vue
+++ b/src/views/dataStatics/dataStatics.vue
@@ -58,11 +58,11 @@
         <p>使用方法：请在上方输入框中输入要查询的完整的点位编号，选择监测指标后点击搜索按钮。默认查询7天数据。</p>
       </el-row>
       <el-row>
-        <el-image
-          :src="chartSample"
-          style="width: 90%"
-          fit="fill"
-        />
+        <!--        <el-image-->
+        <!--          :src="chartSample"-->
+        <!--          style="width: 90%"-->
+        <!--          fit="fill"-->
+        <!--        />-->
       </el-row>
     </div>
   </app-container>
diff --git a/src/views/deviceConfig/components/listTubeConfig.vue b/src/views/deviceConfig/components/listTubeConfig.vue
index 9f27e0e..6a719b9 100644
--- a/src/views/deviceConfig/components/listTubeConfig.vue
+++ b/src/views/deviceConfig/components/listTubeConfig.vue
@@ -159,7 +159,7 @@
       fullscreenLoading: false, // 全屏加载动画
       editShow: false, // 是否显示编辑框
       detailShow: false, // 是否显示编辑框
-      filename: 'methane_config_template.xlsx',
+      filename: 'tube_config_template.xlsx',
       deptShowTop: false,
       fileList: []
     }
diff --git a/src/views/deviceManage/deviceType/deviceType.vue b/src/views/deviceManage/deviceType/deviceType.vue
index 9429fb0..848d3b3 100644
--- a/src/views/deviceManage/deviceType/deviceType.vue
+++ b/src/views/deviceManage/deviceType/deviceType.vue
@@ -73,6 +73,10 @@
         sort: 'id',
         order: 'asc'
       }, // 查询条件
+      isValidList: [
+        { label: '是', value: '1' },
+        { label: '否', value: '0' }
+      ], // 是否下拉
       columns: [
         {
           text: '设备类型编号',
diff --git a/src/views/jobManage/listJobs.vue b/src/views/jobManage/listJobs.vue
index b241503..026467f 100644
--- a/src/views/jobManage/listJobs.vue
+++ b/src/views/jobManage/listJobs.vue
@@ -137,6 +137,7 @@
         keywords: '',
         alarmType: '',
         alarmContentType: '',
+        jobStatus: '',
         beginTime: '',
         endTime: '',
         offset: 1,
@@ -258,10 +259,10 @@
     }
   },
   created() {
-    console.log('create')
     this.fetchAlarmType() // 告警类型下拉菜单
     this.fetchAlarmContentType() // 告警内容下拉菜单
     this.fetchJobStatus() // 工单状态
+    this.fetchData()
   },
   beforeRouteEnter(to, from, next) {
     if (from.name) {
@@ -275,9 +276,6 @@
     }
     next()
   },
-  mounted() {
-    this.fetchData()
-  },
   activated() {
     if (!isFromDetail) {
       this.listQuery.keywords = ''
diff --git a/src/views/overview/overview.vue b/src/views/overview/overview.vue
index 03ef9dc..c8509f9 100644
--- a/src/views/overview/overview.vue
+++ b/src/views/overview/overview.vue
@@ -29,7 +29,7 @@
           </el-button>
           <el-form-item style="margin-left:10px">
             <el-checkbox v-model="showAll">
-              显示全部井
+              显示全部点位
             </el-checkbox>
           </el-form-item>
         </el-row>
diff --git a/src/views/overview/overviewAmap.vue b/src/views/overview/overviewAmap.vue
index 58a4a29..ddbf42d 100644
--- a/src/views/overview/overviewAmap.vue
+++ b/src/views/overview/overviewAmap.vue
@@ -19,7 +19,7 @@
         </a-map-marker>
       </a-map-container>
       <!--搜索框-->
-      <map-search-comp :list="resultList" placeholder="点位编号/名称/位置" @search="search" @change-page="searchPageChange" @click-item="searchItemClick" @clear="clearSearch" />
+      <map-search-comp :list="resultList" placeholder="点位编号/名称/位置" @search="search(arguments)" @change-page="searchPageChange" @click-item="searchItemClick" @clear="clearSearch" />
       <!--报警列表-->
       <alarm-list :show="showAlarm" :data="alarmList" @row-click="alarmRowClick" />
       <!--工具箱-->

diff --git a/src/utils/dateutils.js b/src/utils/dateutils.js
index ae7ae6d..36161f2 100644
--- a/src/utils/dateutils.js
+++ b/src/utils/dateutils.js
@@ -88,6 +88,11 @@
   return fmt
 }
 
+export function getSearchTodayTime() {
+  const startTime = getDayTime(new Date().getTime()).Format('yyyy-MM-dd hh:mm:ss')
+  const endTime = getDayTime(new Date().getTime()+ 3599 * 1000 * 24).Format('yyyy-MM-dd hh:mm:ss')
+  return [startTime, endTime]
+}
 /**
  * 获取近1周日期范围
  * @returns {*[]}
diff --git a/src/views/alarmRule/components/editRule.vue b/src/views/alarmRule/components/editRule.vue
index 135a723..0e6a56e 100644
--- a/src/views/alarmRule/components/editRule.vue
+++ b/src/views/alarmRule/components/editRule.vue
@@ -3,12 +3,12 @@
     <el-form ref="dataForm" :rules="rules" :model="alarmRuleForm" label-position="right" label-width="120px">
       <el-row v-if="dialogStatus=='update'" :gutter="20">
         <el-col :span="12">
-          <el-form-item label="点位编号" prop="concencode">
+          <el-form-item label="点位编号">
             <el-input v-model="baseInfo.wellCode" type="text" placeholder="未知" disabled />
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="井深" prop="simid">
+          <el-form-item label="井深">
             <el-input v-model="baseInfo.deep" type="text" placeholder="未知" disabled />
           </el-form-item>
         </el-col>
diff --git a/src/views/alarmStatics/alarmStatics.vue b/src/views/alarmStatics/alarmStatics.vue
index baf8cba..1195d22 100644
--- a/src/views/alarmStatics/alarmStatics.vue
+++ b/src/views/alarmStatics/alarmStatics.vue
@@ -33,6 +33,9 @@
 import SimpleCard from '@/components/BigData/Card/simpleCard'
 import AlarmWellRank from './components/alarmWellRank'
 import AlarmStaticsByContent from '@/views/alarmStatics/components/alarmStaticsByContent'
+import { alarmNowStatic } from '@/api/data/dataStatics'
+import { getSearchTodayTime } from '@/utils/dateutils'
+import { getAlarmList } from '@/api/alarm/alarm'
 export default {
   name: 'AlarmStatics',
   components: {
@@ -47,10 +50,38 @@
     return {
       alarmNow: 0,
       todayAlarm: 0
-
+    }
+  },
+  created() {
+    this.getAlarmCount()
+    this.getTodayAlarmCount()
+  },
+  methods: {
+    getAlarmCount() {
+      alarmNowStatic().then(response => {
+        this.alarmNow = response.data.total
+      })
+    },
+    getTodayAlarmCount() {
+      const date = getSearchTodayTime()
+      debugger
+      const listQuery = {
+        keywords: '',
+        alarmType: '',
+        alarmContentType: '',
+        beginTime: date[0],
+        endTime: date[1],
+        status: '1',
+        offset: 1,
+        limit: 20,
+        sort: '',
+        order: ''
+      } // 筛选条件
+      getAlarmList(listQuery).then(response => {
+        this.todayAlarm = parseInt(response.data.total)
+      })
     }
   }
-
 }
 </script>
 
diff --git a/src/views/alarmStatics/components/alarmWellRank.vue b/src/views/alarmStatics/components/alarmWellRank.vue
index f666639..f752abe 100644
--- a/src/views/alarmStatics/components/alarmWellRank.vue
+++ b/src/views/alarmStatics/components/alarmWellRank.vue
@@ -40,18 +40,7 @@
         endTime: '' // 结束时间
       }, // 查询结果
       alarmContentTypeList: [],
-      list: [
-        { wellCode: 'aaaa', position: '中关村南大街5号院', alarmCount: 5, count: 0 },
-        { wellCode: 'aaaa', position: '中关村南大街5号院', alarmCount: 5, count: 0 },
-        { wellCode: 'aaaa', position: '中关村南大街5号院', alarmCount: 5, count: 0 },
-        { wellCode: 'aaaa', position: '中关村南大街5号院', alarmCount: 5, count: 0 },
-        { wellCode: 'aaaa', position: '中关村南大街5号院', alarmCount: 5, count: 0 },
-        { wellCode: 'aaaa', position: '中关村南大街5号院', alarmCount: 5, count: 0 },
-        { wellCode: 'aaaa', position: '中关村南大街5号院', alarmCount: 5, count: 0 },
-        { wellCode: 'aaaa', position: '中关村南大街5号院', alarmCount: 5, count: 0 },
-        { wellCode: 'aaaa', position: '中关村南大街5号院', alarmCount: 5, count: 0 },
-        { wellCode: 'aaaa', position: '中关村南大街5号院', alarmCount: 5, count: 0 }
-      ],
+      list: [],
       total: 0
     }
   },
diff --git a/src/views/dashboard/components/AlarmNowList.vue b/src/views/dashboard/components/AlarmNowList.vue
index 890325f..3bb5c4d 100644
--- a/src/views/dashboard/components/AlarmNowList.vue
+++ b/src/views/dashboard/components/AlarmNowList.vue
@@ -1,6 +1,4 @@
-<template>
-
-</template>
+<template />
 
 <script>
 export default {
@@ -11,7 +9,7 @@
     }
     this.chartSettings = {
       labelMap: {
-        'alarmWells': '报警井数',
+        'alarmWells': '报警点位数',
         'alarmTimes': '报警次数'
       },
       metrics: ['alarmTimes', 'alarmWells'],
diff --git a/src/views/dataManage/dataManage.vue b/src/views/dataManage/dataManage.vue
index b6bceb8..b1d6a3b 100644
--- a/src/views/dataManage/dataManage.vue
+++ b/src/views/dataManage/dataManage.vue
@@ -42,10 +42,10 @@
         { permission: '/welllocadata/list-page', label: '井盖定位监测仪', name: 'wellloca', type: '7', comp: 'list-well-loca-data' },
         { permission: '/liquidGasData/list-page', label: '燃气智能终端(一体化)', name: 'liquidgas', type: '10', comp: 'list-liquid-gas-data' },
         { permission: '/tubedata/list-page', label: '管盯', name: 'tube', type: '12', comp: 'list-tube-data' },
-        { permission: '/gasdector/list-page', label: '可燃气体智能监测终端', name: 'gasdector', type: '1', comp: 'list-gasdector-data' },
-        { permission: '/pantilt/list-page', label: '激光甲烷遥测云台', name: 'pantilt', type: '1', comp: 'list-pantilt-data' },
+        { permission: '/gasdector/list-page', label: '可燃气体智能监测终端', name: 'gasdector', type: '101', comp: 'list-gasdector-data' },
+        { permission: '/pantilt/list-page', label: '激光甲烷遥测云台', name: 'pantilt', type: '21', comp: 'list-pantilt-data' },
         { permission: '/hydrantdata/list-page', label: '消防栓防盗水监测仪', name: 'hydrant', type: '11', comp: 'list-hydrant-data' },
-        { permission: '/h2s/list-page', label: '硫化氢浓度监测仪', name: 'H2S', type: '11', comp: 'list-H2S-data' }
+        { permission: '/h2s/list-page', label: '硫化氢浓度监测仪', name: 'H2S', type: '14', comp: 'list-H2S-data' }
       ] // 所有tab列表
     }
   },
diff --git a/src/views/dataManage/deviceData/listTubeData.vue b/src/views/dataManage/deviceData/listTubeData.vue
index b56fb95..777594c 100644
--- a/src/views/dataManage/deviceData/listTubeData.vue
+++ b/src/views/dataManage/deviceData/listTubeData.vue
@@ -86,7 +86,7 @@
         { text: '点位编号', value: 'wellCode', align: 'center' },
         { text: '设备类型', value: 'deviceTypeName', align: 'center' },
         { text: '燃气浓度(%LEL)', value: 'strength', align: 'center' },
-        // { text: '电量(%)', value: 'cell', width: 80, align: 'center', checkCell: true },
+        { text: '电量(%)', value: 'cell', width: 80, align: 'center', checkCell: true },
         // { text: '状态描述', value: 'descn', align: 'center' },
         { text: '权属单位', value: 'deptName', align: 'center' },
         { text: '上传时间', value: 'uptime', width: 170, align: 'center' }
diff --git a/src/views/dataStatics/dataStatics.vue b/src/views/dataStatics/dataStatics.vue
index 4383d7f..1d72324 100644
--- a/src/views/dataStatics/dataStatics.vue
+++ b/src/views/dataStatics/dataStatics.vue
@@ -58,11 +58,11 @@
         <p>使用方法：请在上方输入框中输入要查询的完整的点位编号，选择监测指标后点击搜索按钮。默认查询7天数据。</p>
       </el-row>
       <el-row>
-        <el-image
-          :src="chartSample"
-          style="width: 90%"
-          fit="fill"
-        />
+        <!--        <el-image-->
+        <!--          :src="chartSample"-->
+        <!--          style="width: 90%"-->
+        <!--          fit="fill"-->
+        <!--        />-->
       </el-row>
     </div>
   </app-container>
diff --git a/src/views/deviceConfig/components/listTubeConfig.vue b/src/views/deviceConfig/components/listTubeConfig.vue
index 9f27e0e..6a719b9 100644
--- a/src/views/deviceConfig/components/listTubeConfig.vue
+++ b/src/views/deviceConfig/components/listTubeConfig.vue
@@ -159,7 +159,7 @@
       fullscreenLoading: false, // 全屏加载动画
       editShow: false, // 是否显示编辑框
       detailShow: false, // 是否显示编辑框
-      filename: 'methane_config_template.xlsx',
+      filename: 'tube_config_template.xlsx',
       deptShowTop: false,
       fileList: []
     }
diff --git a/src/views/deviceManage/deviceType/deviceType.vue b/src/views/deviceManage/deviceType/deviceType.vue
index 9429fb0..848d3b3 100644
--- a/src/views/deviceManage/deviceType/deviceType.vue
+++ b/src/views/deviceManage/deviceType/deviceType.vue
@@ -73,6 +73,10 @@
         sort: 'id',
         order: 'asc'
       }, // 查询条件
+      isValidList: [
+        { label: '是', value: '1' },
+        { label: '否', value: '0' }
+      ], // 是否下拉
       columns: [
         {
           text: '设备类型编号',
diff --git a/src/views/jobManage/listJobs.vue b/src/views/jobManage/listJobs.vue
index b241503..026467f 100644
--- a/src/views/jobManage/listJobs.vue
+++ b/src/views/jobManage/listJobs.vue
@@ -137,6 +137,7 @@
         keywords: '',
         alarmType: '',
         alarmContentType: '',
+        jobStatus: '',
         beginTime: '',
         endTime: '',
         offset: 1,
@@ -258,10 +259,10 @@
     }
   },
   created() {
-    console.log('create')
     this.fetchAlarmType() // 告警类型下拉菜单
     this.fetchAlarmContentType() // 告警内容下拉菜单
     this.fetchJobStatus() // 工单状态
+    this.fetchData()
   },
   beforeRouteEnter(to, from, next) {
     if (from.name) {
@@ -275,9 +276,6 @@
     }
     next()
   },
-  mounted() {
-    this.fetchData()
-  },
   activated() {
     if (!isFromDetail) {
       this.listQuery.keywords = ''
diff --git a/src/views/overview/overview.vue b/src/views/overview/overview.vue
index 03ef9dc..c8509f9 100644
--- a/src/views/overview/overview.vue
+++ b/src/views/overview/overview.vue
@@ -29,7 +29,7 @@
           </el-button>
           <el-form-item style="margin-left:10px">
             <el-checkbox v-model="showAll">
-              显示全部井
+              显示全部点位
             </el-checkbox>
           </el-form-item>
         </el-row>
diff --git a/src/views/overview/overviewAmap.vue b/src/views/overview/overviewAmap.vue
index 58a4a29..ddbf42d 100644
--- a/src/views/overview/overviewAmap.vue
+++ b/src/views/overview/overviewAmap.vue
@@ -19,7 +19,7 @@
         </a-map-marker>
       </a-map-container>
       <!--搜索框-->
-      <map-search-comp :list="resultList" placeholder="点位编号/名称/位置" @search="search" @change-page="searchPageChange" @click-item="searchItemClick" @clear="clearSearch" />
+      <map-search-comp :list="resultList" placeholder="点位编号/名称/位置" @search="search(arguments)" @change-page="searchPageChange" @click-item="searchItemClick" @clear="clearSearch" />
       <!--报警列表-->
       <alarm-list :show="showAlarm" :data="alarmList" @row-click="alarmRowClick" />
       <!--工具箱-->
diff --git a/src/views/system/area/editArea.vue b/src/views/system/area/editArea.vue
index cb8cafb..735e706 100644
--- a/src/views/system/area/editArea.vue
+++ b/src/views/system/area/editArea.vue
@@ -8,8 +8,8 @@
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="区域简称" prop="simplename">
-            <el-input v-model.trim="areaForm.simplename" type="text" placeholder="必填" />
+          <el-form-item label="区域简称" prop="simpleName">
+            <el-input v-model.trim="areaForm.simpleName" type="text" placeholder="必填" />
           </el-form-item>
         </el-col>
       </el-row>
@@ -75,7 +75,7 @@
         pid: '', // 父级编号
         pName: '', // 父级名称
         areaName: '', // 区域名
-        simplename: '', // 别名，
+        simpleName: '', // 别名，
         level: '',
         num: 99 // 排序
       }, // 表单
@@ -89,7 +89,7 @@
       rules: {
         id: [{ required: true, message: '区域编号不能为空', trigger: ['blur', 'change'] }],
         areaName: [{ required: true, message: '区域名称不能为空', trigger: ['blur', 'change'] }],
-        simplename: [{ required: true, message: '区域简称不能为空', trigger: ['blur', 'change'] }],
+        simpleName: [{ required: true, message: '区域简称不能为空', trigger: ['blur', 'change'] }],
         pName: [{ required: true, message: '上级区域必选', trigger: ['blur', 'change'] }],
         level: [{ required: true, message: '区域等级必选', trigger: ['blur', 'change'] }],
         num: [{ required: true, message: '排序必填' }, { type: 'number', message: '必须为数字值' }]
@@ -123,8 +123,8 @@
           id: row.id, // 编号
           pid: row.pid, // 父级编号
           pName: row.pName, // 父级编号
-          areaName: row.name, // 区域名
-          simplename: row.simplename, // 别名，
+          areaName: row.areaName, // 区域名
+          simpleName: row.simpleName, // 别名，
           level: '' + row.level,
           num: row.num // 排序
         }
@@ -154,7 +154,7 @@
         pid: '', // 父级编号
         pName: '', // 父级名称
         areaName: '', // 区域名
-        simplename: '', // 别名，
+        simpleName: '', // 别名，
         level: '',
         num: 99 // 排序
       }

diff --git a/src/utils/dateutils.js b/src/utils/dateutils.js
index ae7ae6d..36161f2 100644
--- a/src/utils/dateutils.js
+++ b/src/utils/dateutils.js
@@ -88,6 +88,11 @@
   return fmt
 }
 
+export function getSearchTodayTime() {
+  const startTime = getDayTime(new Date().getTime()).Format('yyyy-MM-dd hh:mm:ss')
+  const endTime = getDayTime(new Date().getTime()+ 3599 * 1000 * 24).Format('yyyy-MM-dd hh:mm:ss')
+  return [startTime, endTime]
+}
 /**
  * 获取近1周日期范围
  * @returns {*[]}
diff --git a/src/views/alarmRule/components/editRule.vue b/src/views/alarmRule/components/editRule.vue
index 135a723..0e6a56e 100644
--- a/src/views/alarmRule/components/editRule.vue
+++ b/src/views/alarmRule/components/editRule.vue
@@ -3,12 +3,12 @@
     <el-form ref="dataForm" :rules="rules" :model="alarmRuleForm" label-position="right" label-width="120px">
       <el-row v-if="dialogStatus=='update'" :gutter="20">
         <el-col :span="12">
-          <el-form-item label="点位编号" prop="concencode">
+          <el-form-item label="点位编号">
             <el-input v-model="baseInfo.wellCode" type="text" placeholder="未知" disabled />
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="井深" prop="simid">
+          <el-form-item label="井深">
             <el-input v-model="baseInfo.deep" type="text" placeholder="未知" disabled />
           </el-form-item>
         </el-col>
diff --git a/src/views/alarmStatics/alarmStatics.vue b/src/views/alarmStatics/alarmStatics.vue
index baf8cba..1195d22 100644
--- a/src/views/alarmStatics/alarmStatics.vue
+++ b/src/views/alarmStatics/alarmStatics.vue
@@ -33,6 +33,9 @@
 import SimpleCard from '@/components/BigData/Card/simpleCard'
 import AlarmWellRank from './components/alarmWellRank'
 import AlarmStaticsByContent from '@/views/alarmStatics/components/alarmStaticsByContent'
+import { alarmNowStatic } from '@/api/data/dataStatics'
+import { getSearchTodayTime } from '@/utils/dateutils'
+import { getAlarmList } from '@/api/alarm/alarm'
 export default {
   name: 'AlarmStatics',
   components: {
@@ -47,10 +50,38 @@
     return {
       alarmNow: 0,
       todayAlarm: 0
-
+    }
+  },
+  created() {
+    this.getAlarmCount()
+    this.getTodayAlarmCount()
+  },
+  methods: {
+    getAlarmCount() {
+      alarmNowStatic().then(response => {
+        this.alarmNow = response.data.total
+      })
+    },
+    getTodayAlarmCount() {
+      const date = getSearchTodayTime()
+      debugger
+      const listQuery = {
+        keywords: '',
+        alarmType: '',
+        alarmContentType: '',
+        beginTime: date[0],
+        endTime: date[1],
+        status: '1',
+        offset: 1,
+        limit: 20,
+        sort: '',
+        order: ''
+      } // 筛选条件
+      getAlarmList(listQuery).then(response => {
+        this.todayAlarm = parseInt(response.data.total)
+      })
     }
   }
-
 }
 </script>
 
diff --git a/src/views/alarmStatics/components/alarmWellRank.vue b/src/views/alarmStatics/components/alarmWellRank.vue
index f666639..f752abe 100644
--- a/src/views/alarmStatics/components/alarmWellRank.vue
+++ b/src/views/alarmStatics/components/alarmWellRank.vue
@@ -40,18 +40,7 @@
         endTime: '' // 结束时间
       }, // 查询结果
       alarmContentTypeList: [],
-      list: [
-        { wellCode: 'aaaa', position: '中关村南大街5号院', alarmCount: 5, count: 0 },
-        { wellCode: 'aaaa', position: '中关村南大街5号院', alarmCount: 5, count: 0 },
-        { wellCode: 'aaaa', position: '中关村南大街5号院', alarmCount: 5, count: 0 },
-        { wellCode: 'aaaa', position: '中关村南大街5号院', alarmCount: 5, count: 0 },
-        { wellCode: 'aaaa', position: '中关村南大街5号院', alarmCount: 5, count: 0 },
-        { wellCode: 'aaaa', position: '中关村南大街5号院', alarmCount: 5, count: 0 },
-        { wellCode: 'aaaa', position: '中关村南大街5号院', alarmCount: 5, count: 0 },
-        { wellCode: 'aaaa', position: '中关村南大街5号院', alarmCount: 5, count: 0 },
-        { wellCode: 'aaaa', position: '中关村南大街5号院', alarmCount: 5, count: 0 },
-        { wellCode: 'aaaa', position: '中关村南大街5号院', alarmCount: 5, count: 0 }
-      ],
+      list: [],
       total: 0
     }
   },
diff --git a/src/views/dashboard/components/AlarmNowList.vue b/src/views/dashboard/components/AlarmNowList.vue
index 890325f..3bb5c4d 100644
--- a/src/views/dashboard/components/AlarmNowList.vue
+++ b/src/views/dashboard/components/AlarmNowList.vue
@@ -1,6 +1,4 @@
-<template>
-
-</template>
+<template />
 
 <script>
 export default {
@@ -11,7 +9,7 @@
     }
     this.chartSettings = {
       labelMap: {
-        'alarmWells': '报警井数',
+        'alarmWells': '报警点位数',
         'alarmTimes': '报警次数'
       },
       metrics: ['alarmTimes', 'alarmWells'],
diff --git a/src/views/dataManage/dataManage.vue b/src/views/dataManage/dataManage.vue
index b6bceb8..b1d6a3b 100644
--- a/src/views/dataManage/dataManage.vue
+++ b/src/views/dataManage/dataManage.vue
@@ -42,10 +42,10 @@
         { permission: '/welllocadata/list-page', label: '井盖定位监测仪', name: 'wellloca', type: '7', comp: 'list-well-loca-data' },
         { permission: '/liquidGasData/list-page', label: '燃气智能终端(一体化)', name: 'liquidgas', type: '10', comp: 'list-liquid-gas-data' },
         { permission: '/tubedata/list-page', label: '管盯', name: 'tube', type: '12', comp: 'list-tube-data' },
-        { permission: '/gasdector/list-page', label: '可燃气体智能监测终端', name: 'gasdector', type: '1', comp: 'list-gasdector-data' },
-        { permission: '/pantilt/list-page', label: '激光甲烷遥测云台', name: 'pantilt', type: '1', comp: 'list-pantilt-data' },
+        { permission: '/gasdector/list-page', label: '可燃气体智能监测终端', name: 'gasdector', type: '101', comp: 'list-gasdector-data' },
+        { permission: '/pantilt/list-page', label: '激光甲烷遥测云台', name: 'pantilt', type: '21', comp: 'list-pantilt-data' },
         { permission: '/hydrantdata/list-page', label: '消防栓防盗水监测仪', name: 'hydrant', type: '11', comp: 'list-hydrant-data' },
-        { permission: '/h2s/list-page', label: '硫化氢浓度监测仪', name: 'H2S', type: '11', comp: 'list-H2S-data' }
+        { permission: '/h2s/list-page', label: '硫化氢浓度监测仪', name: 'H2S', type: '14', comp: 'list-H2S-data' }
       ] // 所有tab列表
     }
   },
diff --git a/src/views/dataManage/deviceData/listTubeData.vue b/src/views/dataManage/deviceData/listTubeData.vue
index b56fb95..777594c 100644
--- a/src/views/dataManage/deviceData/listTubeData.vue
+++ b/src/views/dataManage/deviceData/listTubeData.vue
@@ -86,7 +86,7 @@
         { text: '点位编号', value: 'wellCode', align: 'center' },
         { text: '设备类型', value: 'deviceTypeName', align: 'center' },
         { text: '燃气浓度(%LEL)', value: 'strength', align: 'center' },
-        // { text: '电量(%)', value: 'cell', width: 80, align: 'center', checkCell: true },
+        { text: '电量(%)', value: 'cell', width: 80, align: 'center', checkCell: true },
         // { text: '状态描述', value: 'descn', align: 'center' },
         { text: '权属单位', value: 'deptName', align: 'center' },
         { text: '上传时间', value: 'uptime', width: 170, align: 'center' }
diff --git a/src/views/dataStatics/dataStatics.vue b/src/views/dataStatics/dataStatics.vue
index 4383d7f..1d72324 100644
--- a/src/views/dataStatics/dataStatics.vue
+++ b/src/views/dataStatics/dataStatics.vue
@@ -58,11 +58,11 @@
         <p>使用方法：请在上方输入框中输入要查询的完整的点位编号，选择监测指标后点击搜索按钮。默认查询7天数据。</p>
       </el-row>
       <el-row>
-        <el-image
-          :src="chartSample"
-          style="width: 90%"
-          fit="fill"
-        />
+        <!--        <el-image-->
+        <!--          :src="chartSample"-->
+        <!--          style="width: 90%"-->
+        <!--          fit="fill"-->
+        <!--        />-->
       </el-row>
     </div>
   </app-container>
diff --git a/src/views/deviceConfig/components/listTubeConfig.vue b/src/views/deviceConfig/components/listTubeConfig.vue
index 9f27e0e..6a719b9 100644
--- a/src/views/deviceConfig/components/listTubeConfig.vue
+++ b/src/views/deviceConfig/components/listTubeConfig.vue
@@ -159,7 +159,7 @@
       fullscreenLoading: false, // 全屏加载动画
       editShow: false, // 是否显示编辑框
       detailShow: false, // 是否显示编辑框
-      filename: 'methane_config_template.xlsx',
+      filename: 'tube_config_template.xlsx',
       deptShowTop: false,
       fileList: []
     }
diff --git a/src/views/deviceManage/deviceType/deviceType.vue b/src/views/deviceManage/deviceType/deviceType.vue
index 9429fb0..848d3b3 100644
--- a/src/views/deviceManage/deviceType/deviceType.vue
+++ b/src/views/deviceManage/deviceType/deviceType.vue
@@ -73,6 +73,10 @@
         sort: 'id',
         order: 'asc'
       }, // 查询条件
+      isValidList: [
+        { label: '是', value: '1' },
+        { label: '否', value: '0' }
+      ], // 是否下拉
       columns: [
         {
           text: '设备类型编号',
diff --git a/src/views/jobManage/listJobs.vue b/src/views/jobManage/listJobs.vue
index b241503..026467f 100644
--- a/src/views/jobManage/listJobs.vue
+++ b/src/views/jobManage/listJobs.vue
@@ -137,6 +137,7 @@
         keywords: '',
         alarmType: '',
         alarmContentType: '',
+        jobStatus: '',
         beginTime: '',
         endTime: '',
         offset: 1,
@@ -258,10 +259,10 @@
     }
   },
   created() {
-    console.log('create')
     this.fetchAlarmType() // 告警类型下拉菜单
     this.fetchAlarmContentType() // 告警内容下拉菜单
     this.fetchJobStatus() // 工单状态
+    this.fetchData()
   },
   beforeRouteEnter(to, from, next) {
     if (from.name) {
@@ -275,9 +276,6 @@
     }
     next()
   },
-  mounted() {
-    this.fetchData()
-  },
   activated() {
     if (!isFromDetail) {
       this.listQuery.keywords = ''
diff --git a/src/views/overview/overview.vue b/src/views/overview/overview.vue
index 03ef9dc..c8509f9 100644
--- a/src/views/overview/overview.vue
+++ b/src/views/overview/overview.vue
@@ -29,7 +29,7 @@
           </el-button>
           <el-form-item style="margin-left:10px">
             <el-checkbox v-model="showAll">
-              显示全部井
+              显示全部点位
             </el-checkbox>
           </el-form-item>
         </el-row>
diff --git a/src/views/overview/overviewAmap.vue b/src/views/overview/overviewAmap.vue
index 58a4a29..ddbf42d 100644
--- a/src/views/overview/overviewAmap.vue
+++ b/src/views/overview/overviewAmap.vue
@@ -19,7 +19,7 @@
         </a-map-marker>
       </a-map-container>
       <!--搜索框-->
-      <map-search-comp :list="resultList" placeholder="点位编号/名称/位置" @search="search" @change-page="searchPageChange" @click-item="searchItemClick" @clear="clearSearch" />
+      <map-search-comp :list="resultList" placeholder="点位编号/名称/位置" @search="search(arguments)" @change-page="searchPageChange" @click-item="searchItemClick" @clear="clearSearch" />
       <!--报警列表-->
       <alarm-list :show="showAlarm" :data="alarmList" @row-click="alarmRowClick" />
       <!--工具箱-->
diff --git a/src/views/system/area/editArea.vue b/src/views/system/area/editArea.vue
index cb8cafb..735e706 100644
--- a/src/views/system/area/editArea.vue
+++ b/src/views/system/area/editArea.vue
@@ -8,8 +8,8 @@
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="区域简称" prop="simplename">
-            <el-input v-model.trim="areaForm.simplename" type="text" placeholder="必填" />
+          <el-form-item label="区域简称" prop="simpleName">
+            <el-input v-model.trim="areaForm.simpleName" type="text" placeholder="必填" />
           </el-form-item>
         </el-col>
       </el-row>
@@ -75,7 +75,7 @@
         pid: '', // 父级编号
         pName: '', // 父级名称
         areaName: '', // 区域名
-        simplename: '', // 别名，
+        simpleName: '', // 别名，
         level: '',
         num: 99 // 排序
       }, // 表单
@@ -89,7 +89,7 @@
       rules: {
         id: [{ required: true, message: '区域编号不能为空', trigger: ['blur', 'change'] }],
         areaName: [{ required: true, message: '区域名称不能为空', trigger: ['blur', 'change'] }],
-        simplename: [{ required: true, message: '区域简称不能为空', trigger: ['blur', 'change'] }],
+        simpleName: [{ required: true, message: '区域简称不能为空', trigger: ['blur', 'change'] }],
         pName: [{ required: true, message: '上级区域必选', trigger: ['blur', 'change'] }],
         level: [{ required: true, message: '区域等级必选', trigger: ['blur', 'change'] }],
         num: [{ required: true, message: '排序必填' }, { type: 'number', message: '必须为数字值' }]
@@ -123,8 +123,8 @@
           id: row.id, // 编号
           pid: row.pid, // 父级编号
           pName: row.pName, // 父级编号
-          areaName: row.name, // 区域名
-          simplename: row.simplename, // 别名，
+          areaName: row.areaName, // 区域名
+          simpleName: row.simpleName, // 别名，
           level: '' + row.level,
           num: row.num // 排序
         }
@@ -154,7 +154,7 @@
         pid: '', // 父级编号
         pName: '', // 父级名称
         areaName: '', // 区域名
-        simplename: '', // 别名，
+        simpleName: '', // 别名，
         level: '',
         num: 99 // 排序
       }
diff --git a/src/views/wellManage/components/mapSearchComp.vue b/src/views/wellManage/components/mapSearchComp.vue
index 22ef568..69600be 100644
--- a/src/views/wellManage/components/mapSearchComp.vue
+++ b/src/views/wellManage/components/mapSearchComp.vue
@@ -48,7 +48,7 @@
   props: {
     name: {
       type: String,
-      default: '井'
+      default: '点位'
     }, // 结果展示类型
     placeholder: {
       type: String,

diff --git a/src/utils/dateutils.js b/src/utils/dateutils.js
index ae7ae6d..36161f2 100644
--- a/src/utils/dateutils.js
+++ b/src/utils/dateutils.js
@@ -88,6 +88,11 @@
   return fmt
 }
 
+export function getSearchTodayTime() {
+  const startTime = getDayTime(new Date().getTime()).Format('yyyy-MM-dd hh:mm:ss')
+  const endTime = getDayTime(new Date().getTime()+ 3599 * 1000 * 24).Format('yyyy-MM-dd hh:mm:ss')
+  return [startTime, endTime]
+}
 /**
  * 获取近1周日期范围
  * @returns {*[]}
diff --git a/src/views/alarmRule/components/editRule.vue b/src/views/alarmRule/components/editRule.vue
index 135a723..0e6a56e 100644
--- a/src/views/alarmRule/components/editRule.vue
+++ b/src/views/alarmRule/components/editRule.vue
@@ -3,12 +3,12 @@
     <el-form ref="dataForm" :rules="rules" :model="alarmRuleForm" label-position="right" label-width="120px">
       <el-row v-if="dialogStatus=='update'" :gutter="20">
         <el-col :span="12">
-          <el-form-item label="点位编号" prop="concencode">
+          <el-form-item label="点位编号">
             <el-input v-model="baseInfo.wellCode" type="text" placeholder="未知" disabled />
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="井深" prop="simid">
+          <el-form-item label="井深">
             <el-input v-model="baseInfo.deep" type="text" placeholder="未知" disabled />
           </el-form-item>
         </el-col>
diff --git a/src/views/alarmStatics/alarmStatics.vue b/src/views/alarmStatics/alarmStatics.vue
index baf8cba..1195d22 100644
--- a/src/views/alarmStatics/alarmStatics.vue
+++ b/src/views/alarmStatics/alarmStatics.vue
@@ -33,6 +33,9 @@
 import SimpleCard from '@/components/BigData/Card/simpleCard'
 import AlarmWellRank from './components/alarmWellRank'
 import AlarmStaticsByContent from '@/views/alarmStatics/components/alarmStaticsByContent'
+import { alarmNowStatic } from '@/api/data/dataStatics'
+import { getSearchTodayTime } from '@/utils/dateutils'
+import { getAlarmList } from '@/api/alarm/alarm'
 export default {
   name: 'AlarmStatics',
   components: {
@@ -47,10 +50,38 @@
     return {
       alarmNow: 0,
       todayAlarm: 0
-
+    }
+  },
+  created() {
+    this.getAlarmCount()
+    this.getTodayAlarmCount()
+  },
+  methods: {
+    getAlarmCount() {
+      alarmNowStatic().then(response => {
+        this.alarmNow = response.data.total
+      })
+    },
+    getTodayAlarmCount() {
+      const date = getSearchTodayTime()
+      debugger
+      const listQuery = {
+        keywords: '',
+        alarmType: '',
+        alarmContentType: '',
+        beginTime: date[0],
+        endTime: date[1],
+        status: '1',
+        offset: 1,
+        limit: 20,
+        sort: '',
+        order: ''
+      } // 筛选条件
+      getAlarmList(listQuery).then(response => {
+        this.todayAlarm = parseInt(response.data.total)
+      })
     }
   }
-
 }
 </script>
 
diff --git a/src/views/alarmStatics/components/alarmWellRank.vue b/src/views/alarmStatics/components/alarmWellRank.vue
index f666639..f752abe 100644
--- a/src/views/alarmStatics/components/alarmWellRank.vue
+++ b/src/views/alarmStatics/components/alarmWellRank.vue
@@ -40,18 +40,7 @@
         endTime: '' // 结束时间
       }, // 查询结果
       alarmContentTypeList: [],
-      list: [
-        { wellCode: 'aaaa', position: '中关村南大街5号院', alarmCount: 5, count: 0 },
-        { wellCode: 'aaaa', position: '中关村南大街5号院', alarmCount: 5, count: 0 },
-        { wellCode: 'aaaa', position: '中关村南大街5号院', alarmCount: 5, count: 0 },
-        { wellCode: 'aaaa', position: '中关村南大街5号院', alarmCount: 5, count: 0 },
-        { wellCode: 'aaaa', position: '中关村南大街5号院', alarmCount: 5, count: 0 },
-        { wellCode: 'aaaa', position: '中关村南大街5号院', alarmCount: 5, count: 0 },
-        { wellCode: 'aaaa', position: '中关村南大街5号院', alarmCount: 5, count: 0 },
-        { wellCode: 'aaaa', position: '中关村南大街5号院', alarmCount: 5, count: 0 },
-        { wellCode: 'aaaa', position: '中关村南大街5号院', alarmCount: 5, count: 0 },
-        { wellCode: 'aaaa', position: '中关村南大街5号院', alarmCount: 5, count: 0 }
-      ],
+      list: [],
       total: 0
     }
   },
diff --git a/src/views/dashboard/components/AlarmNowList.vue b/src/views/dashboard/components/AlarmNowList.vue
index 890325f..3bb5c4d 100644
--- a/src/views/dashboard/components/AlarmNowList.vue
+++ b/src/views/dashboard/components/AlarmNowList.vue
@@ -1,6 +1,4 @@
-<template>
-
-</template>
+<template />
 
 <script>
 export default {
@@ -11,7 +9,7 @@
     }
     this.chartSettings = {
       labelMap: {
-        'alarmWells': '报警井数',
+        'alarmWells': '报警点位数',
         'alarmTimes': '报警次数'
       },
       metrics: ['alarmTimes', 'alarmWells'],
diff --git a/src/views/dataManage/dataManage.vue b/src/views/dataManage/dataManage.vue
index b6bceb8..b1d6a3b 100644
--- a/src/views/dataManage/dataManage.vue
+++ b/src/views/dataManage/dataManage.vue
@@ -42,10 +42,10 @@
         { permission: '/welllocadata/list-page', label: '井盖定位监测仪', name: 'wellloca', type: '7', comp: 'list-well-loca-data' },
         { permission: '/liquidGasData/list-page', label: '燃气智能终端(一体化)', name: 'liquidgas', type: '10', comp: 'list-liquid-gas-data' },
         { permission: '/tubedata/list-page', label: '管盯', name: 'tube', type: '12', comp: 'list-tube-data' },
-        { permission: '/gasdector/list-page', label: '可燃气体智能监测终端', name: 'gasdector', type: '1', comp: 'list-gasdector-data' },
-        { permission: '/pantilt/list-page', label: '激光甲烷遥测云台', name: 'pantilt', type: '1', comp: 'list-pantilt-data' },
+        { permission: '/gasdector/list-page', label: '可燃气体智能监测终端', name: 'gasdector', type: '101', comp: 'list-gasdector-data' },
+        { permission: '/pantilt/list-page', label: '激光甲烷遥测云台', name: 'pantilt', type: '21', comp: 'list-pantilt-data' },
         { permission: '/hydrantdata/list-page', label: '消防栓防盗水监测仪', name: 'hydrant', type: '11', comp: 'list-hydrant-data' },
-        { permission: '/h2s/list-page', label: '硫化氢浓度监测仪', name: 'H2S', type: '11', comp: 'list-H2S-data' }
+        { permission: '/h2s/list-page', label: '硫化氢浓度监测仪', name: 'H2S', type: '14', comp: 'list-H2S-data' }
       ] // 所有tab列表
     }
   },
diff --git a/src/views/dataManage/deviceData/listTubeData.vue b/src/views/dataManage/deviceData/listTubeData.vue
index b56fb95..777594c 100644
--- a/src/views/dataManage/deviceData/listTubeData.vue
+++ b/src/views/dataManage/deviceData/listTubeData.vue
@@ -86,7 +86,7 @@
         { text: '点位编号', value: 'wellCode', align: 'center' },
         { text: '设备类型', value: 'deviceTypeName', align: 'center' },
         { text: '燃气浓度(%LEL)', value: 'strength', align: 'center' },
-        // { text: '电量(%)', value: 'cell', width: 80, align: 'center', checkCell: true },
+        { text: '电量(%)', value: 'cell', width: 80, align: 'center', checkCell: true },
         // { text: '状态描述', value: 'descn', align: 'center' },
         { text: '权属单位', value: 'deptName', align: 'center' },
         { text: '上传时间', value: 'uptime', width: 170, align: 'center' }
diff --git a/src/views/dataStatics/dataStatics.vue b/src/views/dataStatics/dataStatics.vue
index 4383d7f..1d72324 100644
--- a/src/views/dataStatics/dataStatics.vue
+++ b/src/views/dataStatics/dataStatics.vue
@@ -58,11 +58,11 @@
         <p>使用方法：请在上方输入框中输入要查询的完整的点位编号，选择监测指标后点击搜索按钮。默认查询7天数据。</p>
       </el-row>
       <el-row>
-        <el-image
-          :src="chartSample"
-          style="width: 90%"
-          fit="fill"
-        />
+        <!--        <el-image-->
+        <!--          :src="chartSample"-->
+        <!--          style="width: 90%"-->
+        <!--          fit="fill"-->
+        <!--        />-->
       </el-row>
     </div>
   </app-container>
diff --git a/src/views/deviceConfig/components/listTubeConfig.vue b/src/views/deviceConfig/components/listTubeConfig.vue
index 9f27e0e..6a719b9 100644
--- a/src/views/deviceConfig/components/listTubeConfig.vue
+++ b/src/views/deviceConfig/components/listTubeConfig.vue
@@ -159,7 +159,7 @@
       fullscreenLoading: false, // 全屏加载动画
       editShow: false, // 是否显示编辑框
       detailShow: false, // 是否显示编辑框
-      filename: 'methane_config_template.xlsx',
+      filename: 'tube_config_template.xlsx',
       deptShowTop: false,
       fileList: []
     }
diff --git a/src/views/deviceManage/deviceType/deviceType.vue b/src/views/deviceManage/deviceType/deviceType.vue
index 9429fb0..848d3b3 100644
--- a/src/views/deviceManage/deviceType/deviceType.vue
+++ b/src/views/deviceManage/deviceType/deviceType.vue
@@ -73,6 +73,10 @@
         sort: 'id',
         order: 'asc'
       }, // 查询条件
+      isValidList: [
+        { label: '是', value: '1' },
+        { label: '否', value: '0' }
+      ], // 是否下拉
       columns: [
         {
           text: '设备类型编号',
diff --git a/src/views/jobManage/listJobs.vue b/src/views/jobManage/listJobs.vue
index b241503..026467f 100644
--- a/src/views/jobManage/listJobs.vue
+++ b/src/views/jobManage/listJobs.vue
@@ -137,6 +137,7 @@
         keywords: '',
         alarmType: '',
         alarmContentType: '',
+        jobStatus: '',
         beginTime: '',
         endTime: '',
         offset: 1,
@@ -258,10 +259,10 @@
     }
   },
   created() {
-    console.log('create')
     this.fetchAlarmType() // 告警类型下拉菜单
     this.fetchAlarmContentType() // 告警内容下拉菜单
     this.fetchJobStatus() // 工单状态
+    this.fetchData()
   },
   beforeRouteEnter(to, from, next) {
     if (from.name) {
@@ -275,9 +276,6 @@
     }
     next()
   },
-  mounted() {
-    this.fetchData()
-  },
   activated() {
     if (!isFromDetail) {
       this.listQuery.keywords = ''
diff --git a/src/views/overview/overview.vue b/src/views/overview/overview.vue
index 03ef9dc..c8509f9 100644
--- a/src/views/overview/overview.vue
+++ b/src/views/overview/overview.vue
@@ -29,7 +29,7 @@
           </el-button>
           <el-form-item style="margin-left:10px">
             <el-checkbox v-model="showAll">
-              显示全部井
+              显示全部点位
             </el-checkbox>
           </el-form-item>
         </el-row>
diff --git a/src/views/overview/overviewAmap.vue b/src/views/overview/overviewAmap.vue
index 58a4a29..ddbf42d 100644
--- a/src/views/overview/overviewAmap.vue
+++ b/src/views/overview/overviewAmap.vue
@@ -19,7 +19,7 @@
         </a-map-marker>
       </a-map-container>
       <!--搜索框-->
-      <map-search-comp :list="resultList" placeholder="点位编号/名称/位置" @search="search" @change-page="searchPageChange" @click-item="searchItemClick" @clear="clearSearch" />
+      <map-search-comp :list="resultList" placeholder="点位编号/名称/位置" @search="search(arguments)" @change-page="searchPageChange" @click-item="searchItemClick" @clear="clearSearch" />
       <!--报警列表-->
       <alarm-list :show="showAlarm" :data="alarmList" @row-click="alarmRowClick" />
       <!--工具箱-->
diff --git a/src/views/system/area/editArea.vue b/src/views/system/area/editArea.vue
index cb8cafb..735e706 100644
--- a/src/views/system/area/editArea.vue
+++ b/src/views/system/area/editArea.vue
@@ -8,8 +8,8 @@
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="区域简称" prop="simplename">
-            <el-input v-model.trim="areaForm.simplename" type="text" placeholder="必填" />
+          <el-form-item label="区域简称" prop="simpleName">
+            <el-input v-model.trim="areaForm.simpleName" type="text" placeholder="必填" />
           </el-form-item>
         </el-col>
       </el-row>
@@ -75,7 +75,7 @@
         pid: '', // 父级编号
         pName: '', // 父级名称
         areaName: '', // 区域名
-        simplename: '', // 别名，
+        simpleName: '', // 别名，
         level: '',
         num: 99 // 排序
       }, // 表单
@@ -89,7 +89,7 @@
       rules: {
         id: [{ required: true, message: '区域编号不能为空', trigger: ['blur', 'change'] }],
         areaName: [{ required: true, message: '区域名称不能为空', trigger: ['blur', 'change'] }],
-        simplename: [{ required: true, message: '区域简称不能为空', trigger: ['blur', 'change'] }],
+        simpleName: [{ required: true, message: '区域简称不能为空', trigger: ['blur', 'change'] }],
         pName: [{ required: true, message: '上级区域必选', trigger: ['blur', 'change'] }],
         level: [{ required: true, message: '区域等级必选', trigger: ['blur', 'change'] }],
         num: [{ required: true, message: '排序必填' }, { type: 'number', message: '必须为数字值' }]
@@ -123,8 +123,8 @@
           id: row.id, // 编号
           pid: row.pid, // 父级编号
           pName: row.pName, // 父级编号
-          areaName: row.name, // 区域名
-          simplename: row.simplename, // 别名，
+          areaName: row.areaName, // 区域名
+          simpleName: row.simpleName, // 别名，
           level: '' + row.level,
           num: row.num // 排序
         }
@@ -154,7 +154,7 @@
         pid: '', // 父级编号
         pName: '', // 父级名称
         areaName: '', // 区域名
-        simplename: '', // 别名，
+        simpleName: '', // 别名，
         level: '',
         num: 99 // 排序
       }
diff --git a/src/views/wellManage/components/mapSearchComp.vue b/src/views/wellManage/components/mapSearchComp.vue
index 22ef568..69600be 100644
--- a/src/views/wellManage/components/mapSearchComp.vue
+++ b/src/views/wellManage/components/mapSearchComp.vue
@@ -48,7 +48,7 @@
   props: {
     name: {
       type: String,
-      default: '井'
+      default: '点位'
     }, // 结果展示类型
     placeholder: {
       type: String,
diff --git a/src/views/wellManage/detailWell.vue b/src/views/wellManage/detailWell.vue
index 3819393..96ae71d 100644
--- a/src/views/wellManage/detailWell.vue
+++ b/src/views/wellManage/detailWell.vue
@@ -10,7 +10,7 @@
             {{ wellForm[config.value]?wellForm[config.value]:config.placeholder }}
           </template>
           <template v-if="config.type=='areaName'">
-            {{ areaName }}
+            {{ wellForm.quName?wellForm.quName:'' }}{{ wellForm.areaName?wellForm.areaName:'' }}
           </template>
           <template v-if="config.type=='images'">
             <div v-if="imageList.length==0">
@@ -84,6 +84,7 @@
         { type: 'text', label: '详细地址', value: 'position', placeholder: '未知', span: 5 },
         { type: 'images', label: '路标图片', value: 'imageList', placeholder: '无', span: 5 }
       ], // 表单配置项
+      areaName: '',
       wellForm: {
         id: null, // 井id
         wellCode: '', // 点位编号
@@ -126,15 +127,6 @@
       loading: true
     }
   },
-  computed: {
-    areaName() {
-      if (this.wellForm.quName) {
-        return this.wellForm.quName + this.wellForm.areaName
-      } else {
-        return ''
-      }
-    }
-  },
   methods: {
     // 初始化对话框
     initDialog: function(dialogFormVisible, row = null) {
@@ -193,7 +185,8 @@
       }
       getAreaListPage(query).then(response => {
         this.quList = response.data.rows.filter(item => item.id === this.wellForm.qu)
-        this.wellForm.quName = this.quList.length > 0 ? this.quList[0].areaName : ''
+        const quName = this.quList.length > 0 ? this.quList[0].areaName : ''
+        this.$set(this.wellForm, 'quName', quName)
       })
     },
     // 获取区域2
@@ -207,7 +200,8 @@
       }
       getAreaListPage(query).then(response => {
         this.jiedaoList = response.data.rows
-        this.wellForm.areaName = this.jiedaoList.length > 0 ? this.jiedaoList[0].areaName : ''
+        const areaName = this.jiedaoList.length > 0 ? this.jiedaoList[0].areaName : ''
+        this.$set(this.wellForm, 'areaName', areaName)
       })
     },
     showData(row) {

diff --git a/src/utils/dateutils.js b/src/utils/dateutils.js
index ae7ae6d..36161f2 100644
--- a/src/utils/dateutils.js
+++ b/src/utils/dateutils.js
@@ -88,6 +88,11 @@
   return fmt
 }
 
+export function getSearchTodayTime() {
+  const startTime = getDayTime(new Date().getTime()).Format('yyyy-MM-dd hh:mm:ss')
+  const endTime = getDayTime(new Date().getTime()+ 3599 * 1000 * 24).Format('yyyy-MM-dd hh:mm:ss')
+  return [startTime, endTime]
+}
 /**
  * 获取近1周日期范围
  * @returns {*[]}
diff --git a/src/views/alarmRule/components/editRule.vue b/src/views/alarmRule/components/editRule.vue
index 135a723..0e6a56e 100644
--- a/src/views/alarmRule/components/editRule.vue
+++ b/src/views/alarmRule/components/editRule.vue
@@ -3,12 +3,12 @@
     <el-form ref="dataForm" :rules="rules" :model="alarmRuleForm" label-position="right" label-width="120px">
       <el-row v-if="dialogStatus=='update'" :gutter="20">
         <el-col :span="12">
-          <el-form-item label="点位编号" prop="concencode">
+          <el-form-item label="点位编号">
             <el-input v-model="baseInfo.wellCode" type="text" placeholder="未知" disabled />
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="井深" prop="simid">
+          <el-form-item label="井深">
             <el-input v-model="baseInfo.deep" type="text" placeholder="未知" disabled />
           </el-form-item>
         </el-col>
diff --git a/src/views/alarmStatics/alarmStatics.vue b/src/views/alarmStatics/alarmStatics.vue
index baf8cba..1195d22 100644
--- a/src/views/alarmStatics/alarmStatics.vue
+++ b/src/views/alarmStatics/alarmStatics.vue
@@ -33,6 +33,9 @@
 import SimpleCard from '@/components/BigData/Card/simpleCard'
 import AlarmWellRank from './components/alarmWellRank'
 import AlarmStaticsByContent from '@/views/alarmStatics/components/alarmStaticsByContent'
+import { alarmNowStatic } from '@/api/data/dataStatics'
+import { getSearchTodayTime } from '@/utils/dateutils'
+import { getAlarmList } from '@/api/alarm/alarm'
 export default {
   name: 'AlarmStatics',
   components: {
@@ -47,10 +50,38 @@
     return {
       alarmNow: 0,
       todayAlarm: 0
-
+    }
+  },
+  created() {
+    this.getAlarmCount()
+    this.getTodayAlarmCount()
+  },
+  methods: {
+    getAlarmCount() {
+      alarmNowStatic().then(response => {
+        this.alarmNow = response.data.total
+      })
+    },
+    getTodayAlarmCount() {
+      const date = getSearchTodayTime()
+      debugger
+      const listQuery = {
+        keywords: '',
+        alarmType: '',
+        alarmContentType: '',
+        beginTime: date[0],
+        endTime: date[1],
+        status: '1',
+        offset: 1,
+        limit: 20,
+        sort: '',
+        order: ''
+      } // 筛选条件
+      getAlarmList(listQuery).then(response => {
+        this.todayAlarm = parseInt(response.data.total)
+      })
     }
   }
-
 }
 </script>
 
diff --git a/src/views/alarmStatics/components/alarmWellRank.vue b/src/views/alarmStatics/components/alarmWellRank.vue
index f666639..f752abe 100644
--- a/src/views/alarmStatics/components/alarmWellRank.vue
+++ b/src/views/alarmStatics/components/alarmWellRank.vue
@@ -40,18 +40,7 @@
         endTime: '' // 结束时间
       }, // 查询结果
       alarmContentTypeList: [],
-      list: [
-        { wellCode: 'aaaa', position: '中关村南大街5号院', alarmCount: 5, count: 0 },
-        { wellCode: 'aaaa', position: '中关村南大街5号院', alarmCount: 5, count: 0 },
-        { wellCode: 'aaaa', position: '中关村南大街5号院', alarmCount: 5, count: 0 },
-        { wellCode: 'aaaa', position: '中关村南大街5号院', alarmCount: 5, count: 0 },
-        { wellCode: 'aaaa', position: '中关村南大街5号院', alarmCount: 5, count: 0 },
-        { wellCode: 'aaaa', position: '中关村南大街5号院', alarmCount: 5, count: 0 },
-        { wellCode: 'aaaa', position: '中关村南大街5号院', alarmCount: 5, count: 0 },
-        { wellCode: 'aaaa', position: '中关村南大街5号院', alarmCount: 5, count: 0 },
-        { wellCode: 'aaaa', position: '中关村南大街5号院', alarmCount: 5, count: 0 },
-        { wellCode: 'aaaa', position: '中关村南大街5号院', alarmCount: 5, count: 0 }
-      ],
+      list: [],
       total: 0
     }
   },
diff --git a/src/views/dashboard/components/AlarmNowList.vue b/src/views/dashboard/components/AlarmNowList.vue
index 890325f..3bb5c4d 100644
--- a/src/views/dashboard/components/AlarmNowList.vue
+++ b/src/views/dashboard/components/AlarmNowList.vue
@@ -1,6 +1,4 @@
-<template>
-
-</template>
+<template />
 
 <script>
 export default {
@@ -11,7 +9,7 @@
     }
     this.chartSettings = {
       labelMap: {
-        'alarmWells': '报警井数',
+        'alarmWells': '报警点位数',
         'alarmTimes': '报警次数'
       },
       metrics: ['alarmTimes', 'alarmWells'],
diff --git a/src/views/dataManage/dataManage.vue b/src/views/dataManage/dataManage.vue
index b6bceb8..b1d6a3b 100644
--- a/src/views/dataManage/dataManage.vue
+++ b/src/views/dataManage/dataManage.vue
@@ -42,10 +42,10 @@
         { permission: '/welllocadata/list-page', label: '井盖定位监测仪', name: 'wellloca', type: '7', comp: 'list-well-loca-data' },
         { permission: '/liquidGasData/list-page', label: '燃气智能终端(一体化)', name: 'liquidgas', type: '10', comp: 'list-liquid-gas-data' },
         { permission: '/tubedata/list-page', label: '管盯', name: 'tube', type: '12', comp: 'list-tube-data' },
-        { permission: '/gasdector/list-page', label: '可燃气体智能监测终端', name: 'gasdector', type: '1', comp: 'list-gasdector-data' },
-        { permission: '/pantilt/list-page', label: '激光甲烷遥测云台', name: 'pantilt', type: '1', comp: 'list-pantilt-data' },
+        { permission: '/gasdector/list-page', label: '可燃气体智能监测终端', name: 'gasdector', type: '101', comp: 'list-gasdector-data' },
+        { permission: '/pantilt/list-page', label: '激光甲烷遥测云台', name: 'pantilt', type: '21', comp: 'list-pantilt-data' },
         { permission: '/hydrantdata/list-page', label: '消防栓防盗水监测仪', name: 'hydrant', type: '11', comp: 'list-hydrant-data' },
-        { permission: '/h2s/list-page', label: '硫化氢浓度监测仪', name: 'H2S', type: '11', comp: 'list-H2S-data' }
+        { permission: '/h2s/list-page', label: '硫化氢浓度监测仪', name: 'H2S', type: '14', comp: 'list-H2S-data' }
       ] // 所有tab列表
     }
   },
diff --git a/src/views/dataManage/deviceData/listTubeData.vue b/src/views/dataManage/deviceData/listTubeData.vue
index b56fb95..777594c 100644
--- a/src/views/dataManage/deviceData/listTubeData.vue
+++ b/src/views/dataManage/deviceData/listTubeData.vue
@@ -86,7 +86,7 @@
         { text: '点位编号', value: 'wellCode', align: 'center' },
         { text: '设备类型', value: 'deviceTypeName', align: 'center' },
         { text: '燃气浓度(%LEL)', value: 'strength', align: 'center' },
-        // { text: '电量(%)', value: 'cell', width: 80, align: 'center', checkCell: true },
+        { text: '电量(%)', value: 'cell', width: 80, align: 'center', checkCell: true },
         // { text: '状态描述', value: 'descn', align: 'center' },
         { text: '权属单位', value: 'deptName', align: 'center' },
         { text: '上传时间', value: 'uptime', width: 170, align: 'center' }
diff --git a/src/views/dataStatics/dataStatics.vue b/src/views/dataStatics/dataStatics.vue
index 4383d7f..1d72324 100644
--- a/src/views/dataStatics/dataStatics.vue
+++ b/src/views/dataStatics/dataStatics.vue
@@ -58,11 +58,11 @@
         <p>使用方法：请在上方输入框中输入要查询的完整的点位编号，选择监测指标后点击搜索按钮。默认查询7天数据。</p>
       </el-row>
       <el-row>
-        <el-image
-          :src="chartSample"
-          style="width: 90%"
-          fit="fill"
-        />
+        <!--        <el-image-->
+        <!--          :src="chartSample"-->
+        <!--          style="width: 90%"-->
+        <!--          fit="fill"-->
+        <!--        />-->
       </el-row>
     </div>
   </app-container>
diff --git a/src/views/deviceConfig/components/listTubeConfig.vue b/src/views/deviceConfig/components/listTubeConfig.vue
index 9f27e0e..6a719b9 100644
--- a/src/views/deviceConfig/components/listTubeConfig.vue
+++ b/src/views/deviceConfig/components/listTubeConfig.vue
@@ -159,7 +159,7 @@
       fullscreenLoading: false, // 全屏加载动画
       editShow: false, // 是否显示编辑框
       detailShow: false, // 是否显示编辑框
-      filename: 'methane_config_template.xlsx',
+      filename: 'tube_config_template.xlsx',
       deptShowTop: false,
       fileList: []
     }
diff --git a/src/views/deviceManage/deviceType/deviceType.vue b/src/views/deviceManage/deviceType/deviceType.vue
index 9429fb0..848d3b3 100644
--- a/src/views/deviceManage/deviceType/deviceType.vue
+++ b/src/views/deviceManage/deviceType/deviceType.vue
@@ -73,6 +73,10 @@
         sort: 'id',
         order: 'asc'
       }, // 查询条件
+      isValidList: [
+        { label: '是', value: '1' },
+        { label: '否', value: '0' }
+      ], // 是否下拉
       columns: [
         {
           text: '设备类型编号',
diff --git a/src/views/jobManage/listJobs.vue b/src/views/jobManage/listJobs.vue
index b241503..026467f 100644
--- a/src/views/jobManage/listJobs.vue
+++ b/src/views/jobManage/listJobs.vue
@@ -137,6 +137,7 @@
         keywords: '',
         alarmType: '',
         alarmContentType: '',
+        jobStatus: '',
         beginTime: '',
         endTime: '',
         offset: 1,
@@ -258,10 +259,10 @@
     }
   },
   created() {
-    console.log('create')
     this.fetchAlarmType() // 告警类型下拉菜单
     this.fetchAlarmContentType() // 告警内容下拉菜单
     this.fetchJobStatus() // 工单状态
+    this.fetchData()
   },
   beforeRouteEnter(to, from, next) {
     if (from.name) {
@@ -275,9 +276,6 @@
     }
     next()
   },
-  mounted() {
-    this.fetchData()
-  },
   activated() {
     if (!isFromDetail) {
       this.listQuery.keywords = ''
diff --git a/src/views/overview/overview.vue b/src/views/overview/overview.vue
index 03ef9dc..c8509f9 100644
--- a/src/views/overview/overview.vue
+++ b/src/views/overview/overview.vue
@@ -29,7 +29,7 @@
           </el-button>
           <el-form-item style="margin-left:10px">
             <el-checkbox v-model="showAll">
-              显示全部井
+              显示全部点位
             </el-checkbox>
           </el-form-item>
         </el-row>
diff --git a/src/views/overview/overviewAmap.vue b/src/views/overview/overviewAmap.vue
index 58a4a29..ddbf42d 100644
--- a/src/views/overview/overviewAmap.vue
+++ b/src/views/overview/overviewAmap.vue
@@ -19,7 +19,7 @@
         </a-map-marker>
       </a-map-container>
       <!--搜索框-->
-      <map-search-comp :list="resultList" placeholder="点位编号/名称/位置" @search="search" @change-page="searchPageChange" @click-item="searchItemClick" @clear="clearSearch" />
+      <map-search-comp :list="resultList" placeholder="点位编号/名称/位置" @search="search(arguments)" @change-page="searchPageChange" @click-item="searchItemClick" @clear="clearSearch" />
       <!--报警列表-->
       <alarm-list :show="showAlarm" :data="alarmList" @row-click="alarmRowClick" />
       <!--工具箱-->
diff --git a/src/views/system/area/editArea.vue b/src/views/system/area/editArea.vue
index cb8cafb..735e706 100644
--- a/src/views/system/area/editArea.vue
+++ b/src/views/system/area/editArea.vue
@@ -8,8 +8,8 @@
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="区域简称" prop="simplename">
-            <el-input v-model.trim="areaForm.simplename" type="text" placeholder="必填" />
+          <el-form-item label="区域简称" prop="simpleName">
+            <el-input v-model.trim="areaForm.simpleName" type="text" placeholder="必填" />
           </el-form-item>
         </el-col>
       </el-row>
@@ -75,7 +75,7 @@
         pid: '', // 父级编号
         pName: '', // 父级名称
         areaName: '', // 区域名
-        simplename: '', // 别名，
+        simpleName: '', // 别名，
         level: '',
         num: 99 // 排序
       }, // 表单
@@ -89,7 +89,7 @@
       rules: {
         id: [{ required: true, message: '区域编号不能为空', trigger: ['blur', 'change'] }],
         areaName: [{ required: true, message: '区域名称不能为空', trigger: ['blur', 'change'] }],
-        simplename: [{ required: true, message: '区域简称不能为空', trigger: ['blur', 'change'] }],
+        simpleName: [{ required: true, message: '区域简称不能为空', trigger: ['blur', 'change'] }],
         pName: [{ required: true, message: '上级区域必选', trigger: ['blur', 'change'] }],
         level: [{ required: true, message: '区域等级必选', trigger: ['blur', 'change'] }],
         num: [{ required: true, message: '排序必填' }, { type: 'number', message: '必须为数字值' }]
@@ -123,8 +123,8 @@
           id: row.id, // 编号
           pid: row.pid, // 父级编号
           pName: row.pName, // 父级编号
-          areaName: row.name, // 区域名
-          simplename: row.simplename, // 别名，
+          areaName: row.areaName, // 区域名
+          simpleName: row.simpleName, // 别名，
           level: '' + row.level,
           num: row.num // 排序
         }
@@ -154,7 +154,7 @@
         pid: '', // 父级编号
         pName: '', // 父级名称
         areaName: '', // 区域名
-        simplename: '', // 别名，
+        simpleName: '', // 别名，
         level: '',
         num: 99 // 排序
       }
diff --git a/src/views/wellManage/components/mapSearchComp.vue b/src/views/wellManage/components/mapSearchComp.vue
index 22ef568..69600be 100644
--- a/src/views/wellManage/components/mapSearchComp.vue
+++ b/src/views/wellManage/components/mapSearchComp.vue
@@ -48,7 +48,7 @@
   props: {
     name: {
       type: String,
-      default: '井'
+      default: '点位'
     }, // 结果展示类型
     placeholder: {
       type: String,
diff --git a/src/views/wellManage/detailWell.vue b/src/views/wellManage/detailWell.vue
index 3819393..96ae71d 100644
--- a/src/views/wellManage/detailWell.vue
+++ b/src/views/wellManage/detailWell.vue
@@ -10,7 +10,7 @@
             {{ wellForm[config.value]?wellForm[config.value]:config.placeholder }}
           </template>
           <template v-if="config.type=='areaName'">
-            {{ areaName }}
+            {{ wellForm.quName?wellForm.quName:'' }}{{ wellForm.areaName?wellForm.areaName:'' }}
           </template>
           <template v-if="config.type=='images'">
             <div v-if="imageList.length==0">
@@ -84,6 +84,7 @@
         { type: 'text', label: '详细地址', value: 'position', placeholder: '未知', span: 5 },
         { type: 'images', label: '路标图片', value: 'imageList', placeholder: '无', span: 5 }
       ], // 表单配置项
+      areaName: '',
       wellForm: {
         id: null, // 井id
         wellCode: '', // 点位编号
@@ -126,15 +127,6 @@
       loading: true
     }
   },
-  computed: {
-    areaName() {
-      if (this.wellForm.quName) {
-        return this.wellForm.quName + this.wellForm.areaName
-      } else {
-        return ''
-      }
-    }
-  },
   methods: {
     // 初始化对话框
     initDialog: function(dialogFormVisible, row = null) {
@@ -193,7 +185,8 @@
       }
       getAreaListPage(query).then(response => {
         this.quList = response.data.rows.filter(item => item.id === this.wellForm.qu)
-        this.wellForm.quName = this.quList.length > 0 ? this.quList[0].areaName : ''
+        const quName = this.quList.length > 0 ? this.quList[0].areaName : ''
+        this.$set(this.wellForm, 'quName', quName)
       })
     },
     // 获取区域2
@@ -207,7 +200,8 @@
       }
       getAreaListPage(query).then(response => {
         this.jiedaoList = response.data.rows
-        this.wellForm.areaName = this.jiedaoList.length > 0 ? this.jiedaoList[0].areaName : ''
+        const areaName = this.jiedaoList.length > 0 ? this.jiedaoList[0].areaName : ''
+        this.$set(this.wellForm, 'areaName', areaName)
       })
     },
     showData(row) {
diff --git a/src/views/wellManage/infoWell.vue b/src/views/wellManage/infoWell.vue
index d62c0b5..c565c4f 100644
--- a/src/views/wellManage/infoWell.vue
+++ b/src/views/wellManage/infoWell.vue
@@ -16,7 +16,7 @@
             无
           </div>
           <div v-else>
-            <el-image v-for="image of imageList" :key="image" style="width: 100px; height: 100px" :src="image" :preview-src-list="imageList" />
+            <el-image v-for="image of imageList" :key="image" style="width: 100px; height: 100px" :src="image.url" :preview-src-list="imageList" />
           </div>
         </template>
       </el-descriptions-item>
@@ -157,7 +157,8 @@
       }
       getAreaListPage(query).then(response => {
         this.quList = response.data.rows.filter(item => item.id === this.wellForm.qu)
-        this.wellForm.quName = this.quList.length > 0 ? this.quList[0].areaName : ''
+        const quName = this.quList.length > 0 ? this.quList[0].areaName : ''
+        this.$set(this.wellForm, 'quName', quName)
       })
     },
     // 获取区域2
@@ -171,7 +172,8 @@
       }
       getAreaListPage(query).then(response => {
         this.jiedaoList = response.data.rows
-        this.wellForm.areaName = this.jiedaoList.length > 0 ? this.jiedaoList[0].areaName : ''
+        const areaName = this.jiedaoList.length > 0 ? this.jiedaoList[0].areaName : ''
+        this.$set(this.wellForm, 'areaName', areaName)
       })
     },
     // 取消

diff --git a/src/utils/dateutils.js b/src/utils/dateutils.js
index ae7ae6d..36161f2 100644
--- a/src/utils/dateutils.js
+++ b/src/utils/dateutils.js
@@ -88,6 +88,11 @@
   return fmt
 }
 
+export function getSearchTodayTime() {
+  const startTime = getDayTime(new Date().getTime()).Format('yyyy-MM-dd hh:mm:ss')
+  const endTime = getDayTime(new Date().getTime()+ 3599 * 1000 * 24).Format('yyyy-MM-dd hh:mm:ss')
+  return [startTime, endTime]
+}
 /**
  * 获取近1周日期范围
  * @returns {*[]}
diff --git a/src/views/alarmRule/components/editRule.vue b/src/views/alarmRule/components/editRule.vue
index 135a723..0e6a56e 100644
--- a/src/views/alarmRule/components/editRule.vue
+++ b/src/views/alarmRule/components/editRule.vue
@@ -3,12 +3,12 @@
     <el-form ref="dataForm" :rules="rules" :model="alarmRuleForm" label-position="right" label-width="120px">
       <el-row v-if="dialogStatus=='update'" :gutter="20">
         <el-col :span="12">
-          <el-form-item label="点位编号" prop="concencode">
+          <el-form-item label="点位编号">
             <el-input v-model="baseInfo.wellCode" type="text" placeholder="未知" disabled />
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="井深" prop="simid">
+          <el-form-item label="井深">
             <el-input v-model="baseInfo.deep" type="text" placeholder="未知" disabled />
           </el-form-item>
         </el-col>
diff --git a/src/views/alarmStatics/alarmStatics.vue b/src/views/alarmStatics/alarmStatics.vue
index baf8cba..1195d22 100644
--- a/src/views/alarmStatics/alarmStatics.vue
+++ b/src/views/alarmStatics/alarmStatics.vue
@@ -33,6 +33,9 @@
 import SimpleCard from '@/components/BigData/Card/simpleCard'
 import AlarmWellRank from './components/alarmWellRank'
 import AlarmStaticsByContent from '@/views/alarmStatics/components/alarmStaticsByContent'
+import { alarmNowStatic } from '@/api/data/dataStatics'
+import { getSearchTodayTime } from '@/utils/dateutils'
+import { getAlarmList } from '@/api/alarm/alarm'
 export default {
   name: 'AlarmStatics',
   components: {
@@ -47,10 +50,38 @@
     return {
       alarmNow: 0,
       todayAlarm: 0
-
+    }
+  },
+  created() {
+    this.getAlarmCount()
+    this.getTodayAlarmCount()
+  },
+  methods: {
+    getAlarmCount() {
+      alarmNowStatic().then(response => {
+        this.alarmNow = response.data.total
+      })
+    },
+    getTodayAlarmCount() {
+      const date = getSearchTodayTime()
+      debugger
+      const listQuery = {
+        keywords: '',
+        alarmType: '',
+        alarmContentType: '',
+        beginTime: date[0],
+        endTime: date[1],
+        status: '1',
+        offset: 1,
+        limit: 20,
+        sort: '',
+        order: ''
+      } // 筛选条件
+      getAlarmList(listQuery).then(response => {
+        this.todayAlarm = parseInt(response.data.total)
+      })
     }
   }
-
 }
 </script>
 
diff --git a/src/views/alarmStatics/components/alarmWellRank.vue b/src/views/alarmStatics/components/alarmWellRank.vue
index f666639..f752abe 100644
--- a/src/views/alarmStatics/components/alarmWellRank.vue
+++ b/src/views/alarmStatics/components/alarmWellRank.vue
@@ -40,18 +40,7 @@
         endTime: '' // 结束时间
       }, // 查询结果
       alarmContentTypeList: [],
-      list: [
-        { wellCode: 'aaaa', position: '中关村南大街5号院', alarmCount: 5, count: 0 },
-        { wellCode: 'aaaa', position: '中关村南大街5号院', alarmCount: 5, count: 0 },
-        { wellCode: 'aaaa', position: '中关村南大街5号院', alarmCount: 5, count: 0 },
-        { wellCode: 'aaaa', position: '中关村南大街5号院', alarmCount: 5, count: 0 },
-        { wellCode: 'aaaa', position: '中关村南大街5号院', alarmCount: 5, count: 0 },
-        { wellCode: 'aaaa', position: '中关村南大街5号院', alarmCount: 5, count: 0 },
-        { wellCode: 'aaaa', position: '中关村南大街5号院', alarmCount: 5, count: 0 },
-        { wellCode: 'aaaa', position: '中关村南大街5号院', alarmCount: 5, count: 0 },
-        { wellCode: 'aaaa', position: '中关村南大街5号院', alarmCount: 5, count: 0 },
-        { wellCode: 'aaaa', position: '中关村南大街5号院', alarmCount: 5, count: 0 }
-      ],
+      list: [],
       total: 0
     }
   },
diff --git a/src/views/dashboard/components/AlarmNowList.vue b/src/views/dashboard/components/AlarmNowList.vue
index 890325f..3bb5c4d 100644
--- a/src/views/dashboard/components/AlarmNowList.vue
+++ b/src/views/dashboard/components/AlarmNowList.vue
@@ -1,6 +1,4 @@
-<template>
-
-</template>
+<template />
 
 <script>
 export default {
@@ -11,7 +9,7 @@
     }
     this.chartSettings = {
       labelMap: {
-        'alarmWells': '报警井数',
+        'alarmWells': '报警点位数',
         'alarmTimes': '报警次数'
       },
       metrics: ['alarmTimes', 'alarmWells'],
diff --git a/src/views/dataManage/dataManage.vue b/src/views/dataManage/dataManage.vue
index b6bceb8..b1d6a3b 100644
--- a/src/views/dataManage/dataManage.vue
+++ b/src/views/dataManage/dataManage.vue
@@ -42,10 +42,10 @@
         { permission: '/welllocadata/list-page', label: '井盖定位监测仪', name: 'wellloca', type: '7', comp: 'list-well-loca-data' },
         { permission: '/liquidGasData/list-page', label: '燃气智能终端(一体化)', name: 'liquidgas', type: '10', comp: 'list-liquid-gas-data' },
         { permission: '/tubedata/list-page', label: '管盯', name: 'tube', type: '12', comp: 'list-tube-data' },
-        { permission: '/gasdector/list-page', label: '可燃气体智能监测终端', name: 'gasdector', type: '1', comp: 'list-gasdector-data' },
-        { permission: '/pantilt/list-page', label: '激光甲烷遥测云台', name: 'pantilt', type: '1', comp: 'list-pantilt-data' },
+        { permission: '/gasdector/list-page', label: '可燃气体智能监测终端', name: 'gasdector', type: '101', comp: 'list-gasdector-data' },
+        { permission: '/pantilt/list-page', label: '激光甲烷遥测云台', name: 'pantilt', type: '21', comp: 'list-pantilt-data' },
         { permission: '/hydrantdata/list-page', label: '消防栓防盗水监测仪', name: 'hydrant', type: '11', comp: 'list-hydrant-data' },
-        { permission: '/h2s/list-page', label: '硫化氢浓度监测仪', name: 'H2S', type: '11', comp: 'list-H2S-data' }
+        { permission: '/h2s/list-page', label: '硫化氢浓度监测仪', name: 'H2S', type: '14', comp: 'list-H2S-data' }
       ] // 所有tab列表
     }
   },
diff --git a/src/views/dataManage/deviceData/listTubeData.vue b/src/views/dataManage/deviceData/listTubeData.vue
index b56fb95..777594c 100644
--- a/src/views/dataManage/deviceData/listTubeData.vue
+++ b/src/views/dataManage/deviceData/listTubeData.vue
@@ -86,7 +86,7 @@
         { text: '点位编号', value: 'wellCode', align: 'center' },
         { text: '设备类型', value: 'deviceTypeName', align: 'center' },
         { text: '燃气浓度(%LEL)', value: 'strength', align: 'center' },
-        // { text: '电量(%)', value: 'cell', width: 80, align: 'center', checkCell: true },
+        { text: '电量(%)', value: 'cell', width: 80, align: 'center', checkCell: true },
         // { text: '状态描述', value: 'descn', align: 'center' },
         { text: '权属单位', value: 'deptName', align: 'center' },
         { text: '上传时间', value: 'uptime', width: 170, align: 'center' }
diff --git a/src/views/dataStatics/dataStatics.vue b/src/views/dataStatics/dataStatics.vue
index 4383d7f..1d72324 100644
--- a/src/views/dataStatics/dataStatics.vue
+++ b/src/views/dataStatics/dataStatics.vue
@@ -58,11 +58,11 @@
         <p>使用方法：请在上方输入框中输入要查询的完整的点位编号，选择监测指标后点击搜索按钮。默认查询7天数据。</p>
       </el-row>
       <el-row>
-        <el-image
-          :src="chartSample"
-          style="width: 90%"
-          fit="fill"
-        />
+        <!--        <el-image-->
+        <!--          :src="chartSample"-->
+        <!--          style="width: 90%"-->
+        <!--          fit="fill"-->
+        <!--        />-->
       </el-row>
     </div>
   </app-container>
diff --git a/src/views/deviceConfig/components/listTubeConfig.vue b/src/views/deviceConfig/components/listTubeConfig.vue
index 9f27e0e..6a719b9 100644
--- a/src/views/deviceConfig/components/listTubeConfig.vue
+++ b/src/views/deviceConfig/components/listTubeConfig.vue
@@ -159,7 +159,7 @@
       fullscreenLoading: false, // 全屏加载动画
       editShow: false, // 是否显示编辑框
       detailShow: false, // 是否显示编辑框
-      filename: 'methane_config_template.xlsx',
+      filename: 'tube_config_template.xlsx',
       deptShowTop: false,
       fileList: []
     }
diff --git a/src/views/deviceManage/deviceType/deviceType.vue b/src/views/deviceManage/deviceType/deviceType.vue
index 9429fb0..848d3b3 100644
--- a/src/views/deviceManage/deviceType/deviceType.vue
+++ b/src/views/deviceManage/deviceType/deviceType.vue
@@ -73,6 +73,10 @@
         sort: 'id',
         order: 'asc'
       }, // 查询条件
+      isValidList: [
+        { label: '是', value: '1' },
+        { label: '否', value: '0' }
+      ], // 是否下拉
       columns: [
         {
           text: '设备类型编号',
diff --git a/src/views/jobManage/listJobs.vue b/src/views/jobManage/listJobs.vue
index b241503..026467f 100644
--- a/src/views/jobManage/listJobs.vue
+++ b/src/views/jobManage/listJobs.vue
@@ -137,6 +137,7 @@
         keywords: '',
         alarmType: '',
         alarmContentType: '',
+        jobStatus: '',
         beginTime: '',
         endTime: '',
         offset: 1,
@@ -258,10 +259,10 @@
     }
   },
   created() {
-    console.log('create')
     this.fetchAlarmType() // 告警类型下拉菜单
     this.fetchAlarmContentType() // 告警内容下拉菜单
     this.fetchJobStatus() // 工单状态
+    this.fetchData()
   },
   beforeRouteEnter(to, from, next) {
     if (from.name) {
@@ -275,9 +276,6 @@
     }
     next()
   },
-  mounted() {
-    this.fetchData()
-  },
   activated() {
     if (!isFromDetail) {
       this.listQuery.keywords = ''
diff --git a/src/views/overview/overview.vue b/src/views/overview/overview.vue
index 03ef9dc..c8509f9 100644
--- a/src/views/overview/overview.vue
+++ b/src/views/overview/overview.vue
@@ -29,7 +29,7 @@
           </el-button>
           <el-form-item style="margin-left:10px">
             <el-checkbox v-model="showAll">
-              显示全部井
+              显示全部点位
             </el-checkbox>
           </el-form-item>
         </el-row>
diff --git a/src/views/overview/overviewAmap.vue b/src/views/overview/overviewAmap.vue
index 58a4a29..ddbf42d 100644
--- a/src/views/overview/overviewAmap.vue
+++ b/src/views/overview/overviewAmap.vue
@@ -19,7 +19,7 @@
         </a-map-marker>
       </a-map-container>
       <!--搜索框-->
-      <map-search-comp :list="resultList" placeholder="点位编号/名称/位置" @search="search" @change-page="searchPageChange" @click-item="searchItemClick" @clear="clearSearch" />
+      <map-search-comp :list="resultList" placeholder="点位编号/名称/位置" @search="search(arguments)" @change-page="searchPageChange" @click-item="searchItemClick" @clear="clearSearch" />
       <!--报警列表-->
       <alarm-list :show="showAlarm" :data="alarmList" @row-click="alarmRowClick" />
       <!--工具箱-->
diff --git a/src/views/system/area/editArea.vue b/src/views/system/area/editArea.vue
index cb8cafb..735e706 100644
--- a/src/views/system/area/editArea.vue
+++ b/src/views/system/area/editArea.vue
@@ -8,8 +8,8 @@
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="区域简称" prop="simplename">
-            <el-input v-model.trim="areaForm.simplename" type="text" placeholder="必填" />
+          <el-form-item label="区域简称" prop="simpleName">
+            <el-input v-model.trim="areaForm.simpleName" type="text" placeholder="必填" />
           </el-form-item>
         </el-col>
       </el-row>
@@ -75,7 +75,7 @@
         pid: '', // 父级编号
         pName: '', // 父级名称
         areaName: '', // 区域名
-        simplename: '', // 别名，
+        simpleName: '', // 别名，
         level: '',
         num: 99 // 排序
       }, // 表单
@@ -89,7 +89,7 @@
       rules: {
         id: [{ required: true, message: '区域编号不能为空', trigger: ['blur', 'change'] }],
         areaName: [{ required: true, message: '区域名称不能为空', trigger: ['blur', 'change'] }],
-        simplename: [{ required: true, message: '区域简称不能为空', trigger: ['blur', 'change'] }],
+        simpleName: [{ required: true, message: '区域简称不能为空', trigger: ['blur', 'change'] }],
         pName: [{ required: true, message: '上级区域必选', trigger: ['blur', 'change'] }],
         level: [{ required: true, message: '区域等级必选', trigger: ['blur', 'change'] }],
         num: [{ required: true, message: '排序必填' }, { type: 'number', message: '必须为数字值' }]
@@ -123,8 +123,8 @@
           id: row.id, // 编号
           pid: row.pid, // 父级编号
           pName: row.pName, // 父级编号
-          areaName: row.name, // 区域名
-          simplename: row.simplename, // 别名，
+          areaName: row.areaName, // 区域名
+          simpleName: row.simpleName, // 别名，
           level: '' + row.level,
           num: row.num // 排序
         }
@@ -154,7 +154,7 @@
         pid: '', // 父级编号
         pName: '', // 父级名称
         areaName: '', // 区域名
-        simplename: '', // 别名，
+        simpleName: '', // 别名，
         level: '',
         num: 99 // 排序
       }
diff --git a/src/views/wellManage/components/mapSearchComp.vue b/src/views/wellManage/components/mapSearchComp.vue
index 22ef568..69600be 100644
--- a/src/views/wellManage/components/mapSearchComp.vue
+++ b/src/views/wellManage/components/mapSearchComp.vue
@@ -48,7 +48,7 @@
   props: {
     name: {
       type: String,
-      default: '井'
+      default: '点位'
     }, // 结果展示类型
     placeholder: {
       type: String,
diff --git a/src/views/wellManage/detailWell.vue b/src/views/wellManage/detailWell.vue
index 3819393..96ae71d 100644
--- a/src/views/wellManage/detailWell.vue
+++ b/src/views/wellManage/detailWell.vue
@@ -10,7 +10,7 @@
             {{ wellForm[config.value]?wellForm[config.value]:config.placeholder }}
           </template>
           <template v-if="config.type=='areaName'">
-            {{ areaName }}
+            {{ wellForm.quName?wellForm.quName:'' }}{{ wellForm.areaName?wellForm.areaName:'' }}
           </template>
           <template v-if="config.type=='images'">
             <div v-if="imageList.length==0">
@@ -84,6 +84,7 @@
         { type: 'text', label: '详细地址', value: 'position', placeholder: '未知', span: 5 },
         { type: 'images', label: '路标图片', value: 'imageList', placeholder: '无', span: 5 }
       ], // 表单配置项
+      areaName: '',
       wellForm: {
         id: null, // 井id
         wellCode: '', // 点位编号
@@ -126,15 +127,6 @@
       loading: true
     }
   },
-  computed: {
-    areaName() {
-      if (this.wellForm.quName) {
-        return this.wellForm.quName + this.wellForm.areaName
-      } else {
-        return ''
-      }
-    }
-  },
   methods: {
     // 初始化对话框
     initDialog: function(dialogFormVisible, row = null) {
@@ -193,7 +185,8 @@
       }
       getAreaListPage(query).then(response => {
         this.quList = response.data.rows.filter(item => item.id === this.wellForm.qu)
-        this.wellForm.quName = this.quList.length > 0 ? this.quList[0].areaName : ''
+        const quName = this.quList.length > 0 ? this.quList[0].areaName : ''
+        this.$set(this.wellForm, 'quName', quName)
       })
     },
     // 获取区域2
@@ -207,7 +200,8 @@
       }
       getAreaListPage(query).then(response => {
         this.jiedaoList = response.data.rows
-        this.wellForm.areaName = this.jiedaoList.length > 0 ? this.jiedaoList[0].areaName : ''
+        const areaName = this.jiedaoList.length > 0 ? this.jiedaoList[0].areaName : ''
+        this.$set(this.wellForm, 'areaName', areaName)
       })
     },
     showData(row) {
diff --git a/src/views/wellManage/infoWell.vue b/src/views/wellManage/infoWell.vue
index d62c0b5..c565c4f 100644
--- a/src/views/wellManage/infoWell.vue
+++ b/src/views/wellManage/infoWell.vue
@@ -16,7 +16,7 @@
             无
           </div>
           <div v-else>
-            <el-image v-for="image of imageList" :key="image" style="width: 100px; height: 100px" :src="image" :preview-src-list="imageList" />
+            <el-image v-for="image of imageList" :key="image" style="width: 100px; height: 100px" :src="image.url" :preview-src-list="imageList" />
           </div>
         </template>
       </el-descriptions-item>
@@ -157,7 +157,8 @@
       }
       getAreaListPage(query).then(response => {
         this.quList = response.data.rows.filter(item => item.id === this.wellForm.qu)
-        this.wellForm.quName = this.quList.length > 0 ? this.quList[0].areaName : ''
+        const quName = this.quList.length > 0 ? this.quList[0].areaName : ''
+        this.$set(this.wellForm, 'quName', quName)
       })
     },
     // 获取区域2
@@ -171,7 +172,8 @@
       }
       getAreaListPage(query).then(response => {
         this.jiedaoList = response.data.rows
-        this.wellForm.areaName = this.jiedaoList.length > 0 ? this.jiedaoList[0].areaName : ''
+        const areaName = this.jiedaoList.length > 0 ? this.jiedaoList[0].areaName : ''
+        this.$set(this.wellForm, 'areaName', areaName)
       })
     },
     // 取消
diff --git a/src/views/wellManage/listWell.vue b/src/views/wellManage/listWell.vue
index 59fbe92..9ff1d10 100644
--- a/src/views/wellManage/listWell.vue
+++ b/src/views/wellManage/listWell.vue
@@ -279,7 +279,7 @@
         const downloadElement = document.createElement('a')
         const href = window.URL.createObjectURL(blob) // 创建下载的链接
         downloadElement.href = href
-        downloadElement.download = `井列表.xlsx` // 下载后文件名
+        downloadElement.download = `点位列表.xlsx` // 下载后文件名
         document.body.appendChild(downloadElement)
         downloadElement.click() // 点击下载
         document.body.removeChild(downloadElement) // 下载完成移除元素