diff --git a/src/api/config/wellcoverconfig.js b/src/api/config/wellcoverconfig.js
index ecdd676..6b83752 100644
--- a/src/api/config/wellcoverconfig.js
+++ b/src/api/config/wellcoverconfig.js
@@ -12,11 +12,11 @@
 }
 
 // 修改燃气配置
-export function editWellcoverConfig(params) {
+export function editWellcoverConfig(data) {
   return request({
     url: 'busConfig/wellcoverConfig/config',
     method: 'post',
-    params
+    data
   })
 }
 

diff --git a/src/api/config/wellcoverconfig.js b/src/api/config/wellcoverconfig.js
index ecdd676..6b83752 100644
--- a/src/api/config/wellcoverconfig.js
+++ b/src/api/config/wellcoverconfig.js
@@ -12,11 +12,11 @@
 }
 
 // 修改燃气配置
-export function editWellcoverConfig(params) {
+export function editWellcoverConfig(data) {
   return request({
     url: 'busConfig/wellcoverConfig/config',
     method: 'post',
-    params
+    data
   })
 }
 
diff --git a/src/api/config/wellliquidconfig.js b/src/api/config/wellliquidconfig.js
new file mode 100644
index 0000000..c7c4838
--- /dev/null
+++ b/src/api/config/wellliquidconfig.js
@@ -0,0 +1,42 @@
+/**
+ * 井盖配置接口
+ */
+import request from '@/utils/request'
+// 燃气配置查询
+export function getWellliquidConfigList(params) {
+  return request({
+    url: 'busConfig/wellliquidConfig/list',
+    method: 'get',
+    params
+  })
+}
+
+// 修改燃气配置
+export function editWellliquidConfig(data) {
+  return request({
+    url: 'busConfig/wellliquidConfig/config',
+    method: 'post',
+    data
+  })
+}
+
+// 批量导入
+export function batchImportWellliquidConfig(fileobj) {
+  const param = new FormData()
+  param.append('file', fileobj)
+  return request({
+    url: 'busConfig/wellliquidConfig/batchImport',
+    method: 'post',
+    headers: { 'Content-Type': 'multipart/form-data' },
+    data: param
+  })
+}
+// 批量导出
+export function batchExportWellliquidConfig(params) {
+  return request({
+    url: 'busConfig/wellliquidConfig/batchExport',
+    method: 'get',
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}

diff --git a/src/api/config/wellcoverconfig.js b/src/api/config/wellcoverconfig.js
index ecdd676..6b83752 100644
--- a/src/api/config/wellcoverconfig.js
+++ b/src/api/config/wellcoverconfig.js
@@ -12,11 +12,11 @@
 }
 
 // 修改燃气配置
-export function editWellcoverConfig(params) {
+export function editWellcoverConfig(data) {
   return request({
     url: 'busConfig/wellcoverConfig/config',
     method: 'post',
-    params
+    data
   })
 }
 
diff --git a/src/api/config/wellliquidconfig.js b/src/api/config/wellliquidconfig.js
new file mode 100644
index 0000000..c7c4838
--- /dev/null
+++ b/src/api/config/wellliquidconfig.js
@@ -0,0 +1,42 @@
+/**
+ * 井盖配置接口
+ */
+import request from '@/utils/request'
+// 燃气配置查询
+export function getWellliquidConfigList(params) {
+  return request({
+    url: 'busConfig/wellliquidConfig/list',
+    method: 'get',
+    params
+  })
+}
+
+// 修改燃气配置
+export function editWellliquidConfig(data) {
+  return request({
+    url: 'busConfig/wellliquidConfig/config',
+    method: 'post',
+    data
+  })
+}
+
+// 批量导入
+export function batchImportWellliquidConfig(fileobj) {
+  const param = new FormData()
+  param.append('file', fileobj)
+  return request({
+    url: 'busConfig/wellliquidConfig/batchImport',
+    method: 'post',
+    headers: { 'Content-Type': 'multipart/form-data' },
+    data: param
+  })
+}
+// 批量导出
+export function batchExportWellliquidConfig(params) {
+  return request({
+    url: 'busConfig/wellliquidConfig/batchExport',
+    method: 'get',
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
diff --git a/src/api/data/data.js b/src/api/data/data.js
index c437d7b..cba92e9 100644
--- a/src/api/data/data.js
+++ b/src/api/data/data.js
@@ -394,3 +394,31 @@
     responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
   })
 }
+
+// 井盖数据查询
+export function getWellLiquidData(params) {
+  return request({
+    url: 'wellliquiddata/list-page',
+    method: 'get',
+    params
+  })
+}
+// 井盖数据查询，不分页
+export function getWellLiquidDataSingle(params) {
+  return request({
+    url: 'wellliquiddata/list',
+    method: 'get',
+    params
+  })
+}
+// 批量导出井盖数据
+export function batchExportWellLiquidData(params) {
+  return request({
+    url: 'wellliquiddata/export',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+

diff --git a/src/api/config/wellcoverconfig.js b/src/api/config/wellcoverconfig.js
index ecdd676..6b83752 100644
--- a/src/api/config/wellcoverconfig.js
+++ b/src/api/config/wellcoverconfig.js
@@ -12,11 +12,11 @@
 }
 
 // 修改燃气配置
-export function editWellcoverConfig(params) {
+export function editWellcoverConfig(data) {
   return request({
     url: 'busConfig/wellcoverConfig/config',
     method: 'post',
-    params
+    data
   })
 }
 
diff --git a/src/api/config/wellliquidconfig.js b/src/api/config/wellliquidconfig.js
new file mode 100644
index 0000000..c7c4838
--- /dev/null
+++ b/src/api/config/wellliquidconfig.js
@@ -0,0 +1,42 @@
+/**
+ * 井盖配置接口
+ */
+import request from '@/utils/request'
+// 燃气配置查询
+export function getWellliquidConfigList(params) {
+  return request({
+    url: 'busConfig/wellliquidConfig/list',
+    method: 'get',
+    params
+  })
+}
+
+// 修改燃气配置
+export function editWellliquidConfig(data) {
+  return request({
+    url: 'busConfig/wellliquidConfig/config',
+    method: 'post',
+    data
+  })
+}
+
+// 批量导入
+export function batchImportWellliquidConfig(fileobj) {
+  const param = new FormData()
+  param.append('file', fileobj)
+  return request({
+    url: 'busConfig/wellliquidConfig/batchImport',
+    method: 'post',
+    headers: { 'Content-Type': 'multipart/form-data' },
+    data: param
+  })
+}
+// 批量导出
+export function batchExportWellliquidConfig(params) {
+  return request({
+    url: 'busConfig/wellliquidConfig/batchExport',
+    method: 'get',
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
diff --git a/src/api/data/data.js b/src/api/data/data.js
index c437d7b..cba92e9 100644
--- a/src/api/data/data.js
+++ b/src/api/data/data.js
@@ -394,3 +394,31 @@
     responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
   })
 }
+
+// 井盖数据查询
+export function getWellLiquidData(params) {
+  return request({
+    url: 'wellliquiddata/list-page',
+    method: 'get',
+    params
+  })
+}
+// 井盖数据查询，不分页
+export function getWellLiquidDataSingle(params) {
+  return request({
+    url: 'wellliquiddata/list',
+    method: 'get',
+    params
+  })
+}
+// 批量导出井盖数据
+export function batchExportWellLiquidData(params) {
+  return request({
+    url: 'wellliquiddata/export',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
diff --git a/src/components/BigData/Card/panelCard.vue b/src/components/BigData/Card/panelCard.vue
index d6a7b89..8283d7f 100644
--- a/src/components/BigData/Card/panelCard.vue
+++ b/src/components/BigData/Card/panelCard.vue
@@ -35,12 +35,13 @@
     font-size: 16px;
     font-weight: bold;
     padding: 0px 10px;
+    padding-right: 0px;
     border-left: 5px solid #66b1ff;
     position: relative;
     .title-right{
       display: inline-block;
       position: absolute;
-      right: 10px;
+      right: 0px;
     }
   }
   .panel-body{

diff --git a/src/api/config/wellcoverconfig.js b/src/api/config/wellcoverconfig.js
index ecdd676..6b83752 100644
--- a/src/api/config/wellcoverconfig.js
+++ b/src/api/config/wellcoverconfig.js
@@ -12,11 +12,11 @@
 }
 
 // 修改燃气配置
-export function editWellcoverConfig(params) {
+export function editWellcoverConfig(data) {
   return request({
     url: 'busConfig/wellcoverConfig/config',
     method: 'post',
-    params
+    data
   })
 }
 
diff --git a/src/api/config/wellliquidconfig.js b/src/api/config/wellliquidconfig.js
new file mode 100644
index 0000000..c7c4838
--- /dev/null
+++ b/src/api/config/wellliquidconfig.js
@@ -0,0 +1,42 @@
+/**
+ * 井盖配置接口
+ */
+import request from '@/utils/request'
+// 燃气配置查询
+export function getWellliquidConfigList(params) {
+  return request({
+    url: 'busConfig/wellliquidConfig/list',
+    method: 'get',
+    params
+  })
+}
+
+// 修改燃气配置
+export function editWellliquidConfig(data) {
+  return request({
+    url: 'busConfig/wellliquidConfig/config',
+    method: 'post',
+    data
+  })
+}
+
+// 批量导入
+export function batchImportWellliquidConfig(fileobj) {
+  const param = new FormData()
+  param.append('file', fileobj)
+  return request({
+    url: 'busConfig/wellliquidConfig/batchImport',
+    method: 'post',
+    headers: { 'Content-Type': 'multipart/form-data' },
+    data: param
+  })
+}
+// 批量导出
+export function batchExportWellliquidConfig(params) {
+  return request({
+    url: 'busConfig/wellliquidConfig/batchExport',
+    method: 'get',
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
diff --git a/src/api/data/data.js b/src/api/data/data.js
index c437d7b..cba92e9 100644
--- a/src/api/data/data.js
+++ b/src/api/data/data.js
@@ -394,3 +394,31 @@
     responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
   })
 }
+
+// 井盖数据查询
+export function getWellLiquidData(params) {
+  return request({
+    url: 'wellliquiddata/list-page',
+    method: 'get',
+    params
+  })
+}
+// 井盖数据查询，不分页
+export function getWellLiquidDataSingle(params) {
+  return request({
+    url: 'wellliquiddata/list',
+    method: 'get',
+    params
+  })
+}
+// 批量导出井盖数据
+export function batchExportWellLiquidData(params) {
+  return request({
+    url: 'wellliquiddata/export',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
diff --git a/src/components/BigData/Card/panelCard.vue b/src/components/BigData/Card/panelCard.vue
index d6a7b89..8283d7f 100644
--- a/src/components/BigData/Card/panelCard.vue
+++ b/src/components/BigData/Card/panelCard.vue
@@ -35,12 +35,13 @@
     font-size: 16px;
     font-weight: bold;
     padding: 0px 10px;
+    padding-right: 0px;
     border-left: 5px solid #66b1ff;
     position: relative;
     .title-right{
       display: inline-block;
       position: absolute;
-      right: 10px;
+      right: 0px;
     }
   }
   .panel-body{
diff --git a/src/views/alarmManage/listAlarmNow.vue b/src/views/alarmManage/listAlarmNow.vue
index 7392a4a..9f5a0b6 100644
--- a/src/views/alarmManage/listAlarmNow.vue
+++ b/src/views/alarmManage/listAlarmNow.vue
@@ -361,7 +361,7 @@
         const supportDeviceTypes = this.$store.getters.deviceTypes
         for (const item of response.data.list) {
           const deviceType = '' + item.deviceType
-          if (supportDeviceTypes.indexOf(deviceType) !== -1) {
+          if (supportDeviceTypes.indexOf(deviceType) !== -1 && this.alarmContentTypeList.findIndex(t => t.name === item.name) === -1) {
             this.alarmContentTypeList.push(item)
           }
         }

diff --git a/src/api/config/wellcoverconfig.js b/src/api/config/wellcoverconfig.js
index ecdd676..6b83752 100644
--- a/src/api/config/wellcoverconfig.js
+++ b/src/api/config/wellcoverconfig.js
@@ -12,11 +12,11 @@
 }
 
 // 修改燃气配置
-export function editWellcoverConfig(params) {
+export function editWellcoverConfig(data) {
   return request({
     url: 'busConfig/wellcoverConfig/config',
     method: 'post',
-    params
+    data
   })
 }
 
diff --git a/src/api/config/wellliquidconfig.js b/src/api/config/wellliquidconfig.js
new file mode 100644
index 0000000..c7c4838
--- /dev/null
+++ b/src/api/config/wellliquidconfig.js
@@ -0,0 +1,42 @@
+/**
+ * 井盖配置接口
+ */
+import request from '@/utils/request'
+// 燃气配置查询
+export function getWellliquidConfigList(params) {
+  return request({
+    url: 'busConfig/wellliquidConfig/list',
+    method: 'get',
+    params
+  })
+}
+
+// 修改燃气配置
+export function editWellliquidConfig(data) {
+  return request({
+    url: 'busConfig/wellliquidConfig/config',
+    method: 'post',
+    data
+  })
+}
+
+// 批量导入
+export function batchImportWellliquidConfig(fileobj) {
+  const param = new FormData()
+  param.append('file', fileobj)
+  return request({
+    url: 'busConfig/wellliquidConfig/batchImport',
+    method: 'post',
+    headers: { 'Content-Type': 'multipart/form-data' },
+    data: param
+  })
+}
+// 批量导出
+export function batchExportWellliquidConfig(params) {
+  return request({
+    url: 'busConfig/wellliquidConfig/batchExport',
+    method: 'get',
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
diff --git a/src/api/data/data.js b/src/api/data/data.js
index c437d7b..cba92e9 100644
--- a/src/api/data/data.js
+++ b/src/api/data/data.js
@@ -394,3 +394,31 @@
     responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
   })
 }
+
+// 井盖数据查询
+export function getWellLiquidData(params) {
+  return request({
+    url: 'wellliquiddata/list-page',
+    method: 'get',
+    params
+  })
+}
+// 井盖数据查询，不分页
+export function getWellLiquidDataSingle(params) {
+  return request({
+    url: 'wellliquiddata/list',
+    method: 'get',
+    params
+  })
+}
+// 批量导出井盖数据
+export function batchExportWellLiquidData(params) {
+  return request({
+    url: 'wellliquiddata/export',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
diff --git a/src/components/BigData/Card/panelCard.vue b/src/components/BigData/Card/panelCard.vue
index d6a7b89..8283d7f 100644
--- a/src/components/BigData/Card/panelCard.vue
+++ b/src/components/BigData/Card/panelCard.vue
@@ -35,12 +35,13 @@
     font-size: 16px;
     font-weight: bold;
     padding: 0px 10px;
+    padding-right: 0px;
     border-left: 5px solid #66b1ff;
     position: relative;
     .title-right{
       display: inline-block;
       position: absolute;
-      right: 10px;
+      right: 0px;
     }
   }
   .panel-body{
diff --git a/src/views/alarmManage/listAlarmNow.vue b/src/views/alarmManage/listAlarmNow.vue
index 7392a4a..9f5a0b6 100644
--- a/src/views/alarmManage/listAlarmNow.vue
+++ b/src/views/alarmManage/listAlarmNow.vue
@@ -361,7 +361,7 @@
         const supportDeviceTypes = this.$store.getters.deviceTypes
         for (const item of response.data.list) {
           const deviceType = '' + item.deviceType
-          if (supportDeviceTypes.indexOf(deviceType) !== -1) {
+          if (supportDeviceTypes.indexOf(deviceType) !== -1 && this.alarmContentTypeList.findIndex(t => t.name === item.name) === -1) {
             this.alarmContentTypeList.push(item)
           }
         }
diff --git a/src/views/alarmManage/listAlarmRecords.vue b/src/views/alarmManage/listAlarmRecords.vue
index 2e34a39..b5d233c 100644
--- a/src/views/alarmManage/listAlarmRecords.vue
+++ b/src/views/alarmManage/listAlarmRecords.vue
@@ -352,7 +352,7 @@
         const supportDeviceTypes = this.$store.getters.deviceTypes
         for (const item of response.data.list) {
           const deviceType = '' + item.deviceType
-          if (supportDeviceTypes.indexOf(deviceType) !== -1) {
+          if (supportDeviceTypes.indexOf(deviceType) !== -1 && this.alarmContentTypeList.findIndex(t => t.name === item.name) === -1) {
             this.alarmContentTypeList.push(item)
           }
         }

diff --git a/src/api/config/wellcoverconfig.js b/src/api/config/wellcoverconfig.js
index ecdd676..6b83752 100644
--- a/src/api/config/wellcoverconfig.js
+++ b/src/api/config/wellcoverconfig.js
@@ -12,11 +12,11 @@
 }
 
 // 修改燃气配置
-export function editWellcoverConfig(params) {
+export function editWellcoverConfig(data) {
   return request({
     url: 'busConfig/wellcoverConfig/config',
     method: 'post',
-    params
+    data
   })
 }
 
diff --git a/src/api/config/wellliquidconfig.js b/src/api/config/wellliquidconfig.js
new file mode 100644
index 0000000..c7c4838
--- /dev/null
+++ b/src/api/config/wellliquidconfig.js
@@ -0,0 +1,42 @@
+/**
+ * 井盖配置接口
+ */
+import request from '@/utils/request'
+// 燃气配置查询
+export function getWellliquidConfigList(params) {
+  return request({
+    url: 'busConfig/wellliquidConfig/list',
+    method: 'get',
+    params
+  })
+}
+
+// 修改燃气配置
+export function editWellliquidConfig(data) {
+  return request({
+    url: 'busConfig/wellliquidConfig/config',
+    method: 'post',
+    data
+  })
+}
+
+// 批量导入
+export function batchImportWellliquidConfig(fileobj) {
+  const param = new FormData()
+  param.append('file', fileobj)
+  return request({
+    url: 'busConfig/wellliquidConfig/batchImport',
+    method: 'post',
+    headers: { 'Content-Type': 'multipart/form-data' },
+    data: param
+  })
+}
+// 批量导出
+export function batchExportWellliquidConfig(params) {
+  return request({
+    url: 'busConfig/wellliquidConfig/batchExport',
+    method: 'get',
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
diff --git a/src/api/data/data.js b/src/api/data/data.js
index c437d7b..cba92e9 100644
--- a/src/api/data/data.js
+++ b/src/api/data/data.js
@@ -394,3 +394,31 @@
     responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
   })
 }
+
+// 井盖数据查询
+export function getWellLiquidData(params) {
+  return request({
+    url: 'wellliquiddata/list-page',
+    method: 'get',
+    params
+  })
+}
+// 井盖数据查询，不分页
+export function getWellLiquidDataSingle(params) {
+  return request({
+    url: 'wellliquiddata/list',
+    method: 'get',
+    params
+  })
+}
+// 批量导出井盖数据
+export function batchExportWellLiquidData(params) {
+  return request({
+    url: 'wellliquiddata/export',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
diff --git a/src/components/BigData/Card/panelCard.vue b/src/components/BigData/Card/panelCard.vue
index d6a7b89..8283d7f 100644
--- a/src/components/BigData/Card/panelCard.vue
+++ b/src/components/BigData/Card/panelCard.vue
@@ -35,12 +35,13 @@
     font-size: 16px;
     font-weight: bold;
     padding: 0px 10px;
+    padding-right: 0px;
     border-left: 5px solid #66b1ff;
     position: relative;
     .title-right{
       display: inline-block;
       position: absolute;
-      right: 10px;
+      right: 0px;
     }
   }
   .panel-body{
diff --git a/src/views/alarmManage/listAlarmNow.vue b/src/views/alarmManage/listAlarmNow.vue
index 7392a4a..9f5a0b6 100644
--- a/src/views/alarmManage/listAlarmNow.vue
+++ b/src/views/alarmManage/listAlarmNow.vue
@@ -361,7 +361,7 @@
         const supportDeviceTypes = this.$store.getters.deviceTypes
         for (const item of response.data.list) {
           const deviceType = '' + item.deviceType
-          if (supportDeviceTypes.indexOf(deviceType) !== -1) {
+          if (supportDeviceTypes.indexOf(deviceType) !== -1 && this.alarmContentTypeList.findIndex(t => t.name === item.name) === -1) {
             this.alarmContentTypeList.push(item)
           }
         }
diff --git a/src/views/alarmManage/listAlarmRecords.vue b/src/views/alarmManage/listAlarmRecords.vue
index 2e34a39..b5d233c 100644
--- a/src/views/alarmManage/listAlarmRecords.vue
+++ b/src/views/alarmManage/listAlarmRecords.vue
@@ -352,7 +352,7 @@
         const supportDeviceTypes = this.$store.getters.deviceTypes
         for (const item of response.data.list) {
           const deviceType = '' + item.deviceType
-          if (supportDeviceTypes.indexOf(deviceType) !== -1) {
+          if (supportDeviceTypes.indexOf(deviceType) !== -1 && this.alarmContentTypeList.findIndex(t => t.name === item.name) === -1) {
             this.alarmContentTypeList.push(item)
           }
         }
diff --git a/src/views/alarmStatics/components/alarmWellRank.vue b/src/views/alarmStatics/components/alarmWellRank.vue
index 89ffa18..acf1598 100644
--- a/src/views/alarmStatics/components/alarmWellRank.vue
+++ b/src/views/alarmStatics/components/alarmWellRank.vue
@@ -75,7 +75,7 @@
       getAlarmContentType('1').then(response => {
         const supportDeviceTypes = this.$store.getters.deviceTypes
         for (const item of response.data.list) {
-          if (supportDeviceTypes.indexOf('' + item.deviceType) !== -1) {
+          if (supportDeviceTypes.indexOf('' + item.deviceType) !== -1 && this.alarmContentTypeList.findIndex(t => t.name === item.name) === -1) {
             this.alarmContentTypeList.push(item)
           }
         }

diff --git a/src/api/config/wellcoverconfig.js b/src/api/config/wellcoverconfig.js
index ecdd676..6b83752 100644
--- a/src/api/config/wellcoverconfig.js
+++ b/src/api/config/wellcoverconfig.js
@@ -12,11 +12,11 @@
 }
 
 // 修改燃气配置
-export function editWellcoverConfig(params) {
+export function editWellcoverConfig(data) {
   return request({
     url: 'busConfig/wellcoverConfig/config',
     method: 'post',
-    params
+    data
   })
 }
 
diff --git a/src/api/config/wellliquidconfig.js b/src/api/config/wellliquidconfig.js
new file mode 100644
index 0000000..c7c4838
--- /dev/null
+++ b/src/api/config/wellliquidconfig.js
@@ -0,0 +1,42 @@
+/**
+ * 井盖配置接口
+ */
+import request from '@/utils/request'
+// 燃气配置查询
+export function getWellliquidConfigList(params) {
+  return request({
+    url: 'busConfig/wellliquidConfig/list',
+    method: 'get',
+    params
+  })
+}
+
+// 修改燃气配置
+export function editWellliquidConfig(data) {
+  return request({
+    url: 'busConfig/wellliquidConfig/config',
+    method: 'post',
+    data
+  })
+}
+
+// 批量导入
+export function batchImportWellliquidConfig(fileobj) {
+  const param = new FormData()
+  param.append('file', fileobj)
+  return request({
+    url: 'busConfig/wellliquidConfig/batchImport',
+    method: 'post',
+    headers: { 'Content-Type': 'multipart/form-data' },
+    data: param
+  })
+}
+// 批量导出
+export function batchExportWellliquidConfig(params) {
+  return request({
+    url: 'busConfig/wellliquidConfig/batchExport',
+    method: 'get',
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
diff --git a/src/api/data/data.js b/src/api/data/data.js
index c437d7b..cba92e9 100644
--- a/src/api/data/data.js
+++ b/src/api/data/data.js
@@ -394,3 +394,31 @@
     responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
   })
 }
+
+// 井盖数据查询
+export function getWellLiquidData(params) {
+  return request({
+    url: 'wellliquiddata/list-page',
+    method: 'get',
+    params
+  })
+}
+// 井盖数据查询，不分页
+export function getWellLiquidDataSingle(params) {
+  return request({
+    url: 'wellliquiddata/list',
+    method: 'get',
+    params
+  })
+}
+// 批量导出井盖数据
+export function batchExportWellLiquidData(params) {
+  return request({
+    url: 'wellliquiddata/export',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
diff --git a/src/components/BigData/Card/panelCard.vue b/src/components/BigData/Card/panelCard.vue
index d6a7b89..8283d7f 100644
--- a/src/components/BigData/Card/panelCard.vue
+++ b/src/components/BigData/Card/panelCard.vue
@@ -35,12 +35,13 @@
     font-size: 16px;
     font-weight: bold;
     padding: 0px 10px;
+    padding-right: 0px;
     border-left: 5px solid #66b1ff;
     position: relative;
     .title-right{
       display: inline-block;
       position: absolute;
-      right: 10px;
+      right: 0px;
     }
   }
   .panel-body{
diff --git a/src/views/alarmManage/listAlarmNow.vue b/src/views/alarmManage/listAlarmNow.vue
index 7392a4a..9f5a0b6 100644
--- a/src/views/alarmManage/listAlarmNow.vue
+++ b/src/views/alarmManage/listAlarmNow.vue
@@ -361,7 +361,7 @@
         const supportDeviceTypes = this.$store.getters.deviceTypes
         for (const item of response.data.list) {
           const deviceType = '' + item.deviceType
-          if (supportDeviceTypes.indexOf(deviceType) !== -1) {
+          if (supportDeviceTypes.indexOf(deviceType) !== -1 && this.alarmContentTypeList.findIndex(t => t.name === item.name) === -1) {
             this.alarmContentTypeList.push(item)
           }
         }
diff --git a/src/views/alarmManage/listAlarmRecords.vue b/src/views/alarmManage/listAlarmRecords.vue
index 2e34a39..b5d233c 100644
--- a/src/views/alarmManage/listAlarmRecords.vue
+++ b/src/views/alarmManage/listAlarmRecords.vue
@@ -352,7 +352,7 @@
         const supportDeviceTypes = this.$store.getters.deviceTypes
         for (const item of response.data.list) {
           const deviceType = '' + item.deviceType
-          if (supportDeviceTypes.indexOf(deviceType) !== -1) {
+          if (supportDeviceTypes.indexOf(deviceType) !== -1 && this.alarmContentTypeList.findIndex(t => t.name === item.name) === -1) {
             this.alarmContentTypeList.push(item)
           }
         }
diff --git a/src/views/alarmStatics/components/alarmWellRank.vue b/src/views/alarmStatics/components/alarmWellRank.vue
index 89ffa18..acf1598 100644
--- a/src/views/alarmStatics/components/alarmWellRank.vue
+++ b/src/views/alarmStatics/components/alarmWellRank.vue
@@ -75,7 +75,7 @@
       getAlarmContentType('1').then(response => {
         const supportDeviceTypes = this.$store.getters.deviceTypes
         for (const item of response.data.list) {
-          if (supportDeviceTypes.indexOf('' + item.deviceType) !== -1) {
+          if (supportDeviceTypes.indexOf('' + item.deviceType) !== -1 && this.alarmContentTypeList.findIndex(t => t.name === item.name) === -1) {
             this.alarmContentTypeList.push(item)
           }
         }
diff --git a/src/views/dataManage/dataManage.vue b/src/views/dataManage/dataManage.vue
index b1d6a3b..44c099a 100644
--- a/src/views/dataManage/dataManage.vue
+++ b/src/views/dataManage/dataManage.vue
@@ -23,11 +23,12 @@
 import ListPantiltData from '@/views/dataManage/deviceData/listPantiltData'
 import ListHydrantData from '@/views/dataManage/deviceData/listHydrantData'
 import ListH2SData from '@/views/dataManage/deviceData/listH2SData'
+import ListWellLiquidData from '@/views/dataManage/deviceData/listWellLiquidData'
 import { parseUrl } from '@/utils/parseutils'
 
 export default {
   name: 'DataManage',
-  components: { ListH2SData, ListHydrantData, ListPantiltData, ListGasdectorData, ListTubeData, ListNoiseData, ListWellLocaData, ListTempData, ListHarmfulData, ListDigData, ListGasData, ListLiquidData, ListWellCoverData, ListLiquidGasData },
+  components: { ListH2SData, ListHydrantData, ListPantiltData, ListGasdectorData, ListTubeData, ListNoiseData, ListWellLocaData, ListTempData, ListHarmfulData, ListDigData, ListGasData, ListLiquidData, ListWellCoverData, ListLiquidGasData, ListWellLiquidData },
   data() {
     return {
       activeName: 'wellcover',
@@ -45,7 +46,8 @@
         { 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: '14', comp: 'list-H2S-data' }
+        { permission: '/wellliquiddata/list-page', label: '硫化氢浓度监测仪', name: 'H2S', type: '14', comp: 'list-H2S-data' },
+        { permission: '/wellliquiddata/list-page', label: '井盖液位一体机', name: 'wellliquid', type: '13', comp: 'list-well-liquid-data' }
       ] // 所有tab列表
     }
   },

diff --git a/src/api/config/wellcoverconfig.js b/src/api/config/wellcoverconfig.js
index ecdd676..6b83752 100644
--- a/src/api/config/wellcoverconfig.js
+++ b/src/api/config/wellcoverconfig.js
@@ -12,11 +12,11 @@
 }
 
 // 修改燃气配置
-export function editWellcoverConfig(params) {
+export function editWellcoverConfig(data) {
   return request({
     url: 'busConfig/wellcoverConfig/config',
     method: 'post',
-    params
+    data
   })
 }
 
diff --git a/src/api/config/wellliquidconfig.js b/src/api/config/wellliquidconfig.js
new file mode 100644
index 0000000..c7c4838
--- /dev/null
+++ b/src/api/config/wellliquidconfig.js
@@ -0,0 +1,42 @@
+/**
+ * 井盖配置接口
+ */
+import request from '@/utils/request'
+// 燃气配置查询
+export function getWellliquidConfigList(params) {
+  return request({
+    url: 'busConfig/wellliquidConfig/list',
+    method: 'get',
+    params
+  })
+}
+
+// 修改燃气配置
+export function editWellliquidConfig(data) {
+  return request({
+    url: 'busConfig/wellliquidConfig/config',
+    method: 'post',
+    data
+  })
+}
+
+// 批量导入
+export function batchImportWellliquidConfig(fileobj) {
+  const param = new FormData()
+  param.append('file', fileobj)
+  return request({
+    url: 'busConfig/wellliquidConfig/batchImport',
+    method: 'post',
+    headers: { 'Content-Type': 'multipart/form-data' },
+    data: param
+  })
+}
+// 批量导出
+export function batchExportWellliquidConfig(params) {
+  return request({
+    url: 'busConfig/wellliquidConfig/batchExport',
+    method: 'get',
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
diff --git a/src/api/data/data.js b/src/api/data/data.js
index c437d7b..cba92e9 100644
--- a/src/api/data/data.js
+++ b/src/api/data/data.js
@@ -394,3 +394,31 @@
     responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
   })
 }
+
+// 井盖数据查询
+export function getWellLiquidData(params) {
+  return request({
+    url: 'wellliquiddata/list-page',
+    method: 'get',
+    params
+  })
+}
+// 井盖数据查询，不分页
+export function getWellLiquidDataSingle(params) {
+  return request({
+    url: 'wellliquiddata/list',
+    method: 'get',
+    params
+  })
+}
+// 批量导出井盖数据
+export function batchExportWellLiquidData(params) {
+  return request({
+    url: 'wellliquiddata/export',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
diff --git a/src/components/BigData/Card/panelCard.vue b/src/components/BigData/Card/panelCard.vue
index d6a7b89..8283d7f 100644
--- a/src/components/BigData/Card/panelCard.vue
+++ b/src/components/BigData/Card/panelCard.vue
@@ -35,12 +35,13 @@
     font-size: 16px;
     font-weight: bold;
     padding: 0px 10px;
+    padding-right: 0px;
     border-left: 5px solid #66b1ff;
     position: relative;
     .title-right{
       display: inline-block;
       position: absolute;
-      right: 10px;
+      right: 0px;
     }
   }
   .panel-body{
diff --git a/src/views/alarmManage/listAlarmNow.vue b/src/views/alarmManage/listAlarmNow.vue
index 7392a4a..9f5a0b6 100644
--- a/src/views/alarmManage/listAlarmNow.vue
+++ b/src/views/alarmManage/listAlarmNow.vue
@@ -361,7 +361,7 @@
         const supportDeviceTypes = this.$store.getters.deviceTypes
         for (const item of response.data.list) {
           const deviceType = '' + item.deviceType
-          if (supportDeviceTypes.indexOf(deviceType) !== -1) {
+          if (supportDeviceTypes.indexOf(deviceType) !== -1 && this.alarmContentTypeList.findIndex(t => t.name === item.name) === -1) {
             this.alarmContentTypeList.push(item)
           }
         }
diff --git a/src/views/alarmManage/listAlarmRecords.vue b/src/views/alarmManage/listAlarmRecords.vue
index 2e34a39..b5d233c 100644
--- a/src/views/alarmManage/listAlarmRecords.vue
+++ b/src/views/alarmManage/listAlarmRecords.vue
@@ -352,7 +352,7 @@
         const supportDeviceTypes = this.$store.getters.deviceTypes
         for (const item of response.data.list) {
           const deviceType = '' + item.deviceType
-          if (supportDeviceTypes.indexOf(deviceType) !== -1) {
+          if (supportDeviceTypes.indexOf(deviceType) !== -1 && this.alarmContentTypeList.findIndex(t => t.name === item.name) === -1) {
             this.alarmContentTypeList.push(item)
           }
         }
diff --git a/src/views/alarmStatics/components/alarmWellRank.vue b/src/views/alarmStatics/components/alarmWellRank.vue
index 89ffa18..acf1598 100644
--- a/src/views/alarmStatics/components/alarmWellRank.vue
+++ b/src/views/alarmStatics/components/alarmWellRank.vue
@@ -75,7 +75,7 @@
       getAlarmContentType('1').then(response => {
         const supportDeviceTypes = this.$store.getters.deviceTypes
         for (const item of response.data.list) {
-          if (supportDeviceTypes.indexOf('' + item.deviceType) !== -1) {
+          if (supportDeviceTypes.indexOf('' + item.deviceType) !== -1 && this.alarmContentTypeList.findIndex(t => t.name === item.name) === -1) {
             this.alarmContentTypeList.push(item)
           }
         }
diff --git a/src/views/dataManage/dataManage.vue b/src/views/dataManage/dataManage.vue
index b1d6a3b..44c099a 100644
--- a/src/views/dataManage/dataManage.vue
+++ b/src/views/dataManage/dataManage.vue
@@ -23,11 +23,12 @@
 import ListPantiltData from '@/views/dataManage/deviceData/listPantiltData'
 import ListHydrantData from '@/views/dataManage/deviceData/listHydrantData'
 import ListH2SData from '@/views/dataManage/deviceData/listH2SData'
+import ListWellLiquidData from '@/views/dataManage/deviceData/listWellLiquidData'
 import { parseUrl } from '@/utils/parseutils'
 
 export default {
   name: 'DataManage',
-  components: { ListH2SData, ListHydrantData, ListPantiltData, ListGasdectorData, ListTubeData, ListNoiseData, ListWellLocaData, ListTempData, ListHarmfulData, ListDigData, ListGasData, ListLiquidData, ListWellCoverData, ListLiquidGasData },
+  components: { ListH2SData, ListHydrantData, ListPantiltData, ListGasdectorData, ListTubeData, ListNoiseData, ListWellLocaData, ListTempData, ListHarmfulData, ListDigData, ListGasData, ListLiquidData, ListWellCoverData, ListLiquidGasData, ListWellLiquidData },
   data() {
     return {
       activeName: 'wellcover',
@@ -45,7 +46,8 @@
         { 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: '14', comp: 'list-H2S-data' }
+        { permission: '/wellliquiddata/list-page', label: '硫化氢浓度监测仪', name: 'H2S', type: '14', comp: 'list-H2S-data' },
+        { permission: '/wellliquiddata/list-page', label: '井盖液位一体机', name: 'wellliquid', type: '13', comp: 'list-well-liquid-data' }
       ] // 所有tab列表
     }
   },
diff --git a/src/views/dataManage/deviceData/listWellLiquidData.vue b/src/views/dataManage/deviceData/listWellLiquidData.vue
new file mode 100644
index 0000000..599039e
--- /dev/null
+++ b/src/views/dataManage/deviceData/listWellLiquidData.vue
@@ -0,0 +1,228 @@
+<template>
+  <app-container>
+    <!--筛选条件-->
+    <search-area size="small" @search="search">
+      <search-item>
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
+      </search-item>
+      <search-item>
+        <dept-select
+          v-model="listQuery.deptid"
+          :need-top="false"
+          dept-type="03"
+          size="small"
+          placeholder="选择权属单位"
+        />
+      </search-item>
+      <search-item>
+        <el-date-picker
+          v-model="timeRange"
+          size="small"
+          type="datetimerange"
+          range-separator="至"
+          value-format="yyyy-MM-dd HH:mm:ss"
+          start-placeholder="开始时间"
+          end-placeholder="结束时间"
+        />
+      </search-item>
+    </search-area>
+    <!--查询结果Table显示-->
+    <normal-table
+      ref="normalTable"
+      :data="list"
+      :total="total"
+      :query="listQuery"
+      :list-loading="listLoading"
+      :options="options"
+      size="small"
+      @change="changePage"
+    >
+      <template slot="btns">
+        <el-button v-if="hasPerm('/wellLiquidData/export')" size="small" @click="batchExport">
+          导出记录
+        </el-button>
+      </template>
+      <template slot="columns">
+        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
+          <template slot-scope="scope">
+            <span v-if="column.checkCell" :class="checkCell(scope.row.cell)">{{ scope.row[column.value] }}</span>
+            <span v-else>{{ scope.row[column.value] }}</span>
+          </template>
+        </el-table-column>
+      </template>
+    </normal-table>
+  </app-container>
+</template>
+
+<script>
+import { getWellLiquidData, batchExportWellLiquidData } from '@/api/data/data'
+import DeptSelect from '../../../components/DeptSelect/index'
+import { parseUrl } from '@/utils/parseutils'
+import { getSearchLastWeekTime } from '@/utils/dateutils'
+import { exportFile } from '@/utils/exportutils'
+
+export default {
+  name: 'ListWellLiquidData',
+  components: { DeptSelect },
+  props: {
+    type: {
+      type: String,
+      required: true
+    }, // 设备类型
+    name: {
+      type: String,
+      default: ''
+    } // 设备名称
+  },
+  data() {
+    return {
+      listQuery: {
+        keywords: '', // 关键字
+        deptid: '', // 部门id
+        beginTime: '', // 开始时间
+        endTime: '', // 结束时间
+        offset: 1,
+        limit: 20,
+        sort: '',
+        order: ''
+      }, // 筛选条件
+      timeRange: [], // 时间范围
+      columns: [
+        {
+          text: '设备编号',
+          value: 'devcode',
+          align: 'center'
+        },
+        {
+          text: '点位编号',
+          value: 'wellCode',
+          align: 'center'
+        },
+        {
+          text: '设备类型',
+          value: 'deviceTypeName',
+          align: 'center'
+        },
+        {
+          text: '状态描述',
+          value: 'descn',
+          align: 'center',
+          checkState: true
+        },
+        {
+          text: '权属单位',
+          value: 'deptName',
+          align: 'center'
+        },
+        {
+          text: '上传时间',
+          value: 'logtime',
+          width: 170,
+          align: 'center'
+        }
+      ], // 显示列
+      list: [], // 列表数据
+      total: 0, // 数据总数
+      options: {
+        needIndex: true, // 是否需要序号列
+        border: true // 是否需要上方边框
+      },
+      listLoading: true, // 加载动画
+      fullscreenLoading: false, // 全屏加载动画
+      editShow: false // 是否显示编辑框
+    }
+  },
+  mounted() {
+    // 如果路径里带参数，解析devcode参数
+    this.timeRange = getSearchLastWeekTime()
+    if (window.location.href) {
+      const params = parseUrl(window.location.href)
+      if (params && params.deviceType === this.type && params.devcode) {
+        this.listQuery.keywords = params.devcode
+        this.fetchData()
+      } else {
+        this.fetchData()
+      }
+    }
+  },
+  activated() {
+    // 要是路由里有参数
+    if (this.$route.query && this.$route.query.devcode) {
+      this.listQuery.keywords = this.$route.query.devcode
+      this.fetchData(false)// 获取数据
+    } else {
+      this.fetchData()
+    }
+  },
+  methods: {
+    // 批量导出
+    batchExport() {
+      // this.handleDateTime()
+      // 全屏加载动画
+      const loading = this.$loading({
+        lock: true,
+        text: '下载中,请稍后...',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
+      })
+      batchExportWellLiquidData(this.listQuery).then(res => {
+        loading.close() // 关闭加载动画
+        let fileName = `${this.name}数据-${this.listQuery.beginTime}-${this.listQuery.endTime}.xlsx`
+        fileName = fileName.replace(/-|:| /g, '')
+        const blob = new Blob([res.data])
+        exportFile(blob, fileName)
+      }).catch((res) => {
+        loading.close()
+      })
+    },
+    // 查询数据
+    search() {
+      this.fetchData(false)
+    },
+    // 获取井盖数据
+    fetchData(isNowPage = true) {
+      this.listLoading = true
+      if (!isNowPage) { // 是否显示当前页，否则跳转第一页
+        this.listQuery.offset = 1
+      }
+      this.handleDateTime()
+      getWellLiquidData(this.listQuery).then(response => {
+        this.list = response.data.rows
+        this.total = response.data.total
+        this.listLoading = false
+      })
+    },
+    // 处理时间
+    handleDateTime() {
+      if (this.timeRange && this.timeRange.length > 0) {
+        this.listQuery.beginTime = this.timeRange[0]
+        this.listQuery.endTime = this.timeRange[1]
+      } else {
+        this.listQuery.beginTime = ''
+        this.listQuery.endTime = ''
+      }
+    },
+    checkState(row) {
+      if (row.status !== '0') {
+        return 'warning-state'
+      }
+    },
+    // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+    changePage(val) {
+      if (val && val.size) {
+        this.listQuery.limit = val.size
+      }
+      if (val && val.page) {
+        this.listQuery.offset = val.page
+      }
+      this.fetchData()
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+.warning-state{
+  color:red
+}
+</style>

diff --git a/src/api/config/wellcoverconfig.js b/src/api/config/wellcoverconfig.js
index ecdd676..6b83752 100644
--- a/src/api/config/wellcoverconfig.js
+++ b/src/api/config/wellcoverconfig.js
@@ -12,11 +12,11 @@
 }
 
 // 修改燃气配置
-export function editWellcoverConfig(params) {
+export function editWellcoverConfig(data) {
   return request({
     url: 'busConfig/wellcoverConfig/config',
     method: 'post',
-    params
+    data
   })
 }
 
diff --git a/src/api/config/wellliquidconfig.js b/src/api/config/wellliquidconfig.js
new file mode 100644
index 0000000..c7c4838
--- /dev/null
+++ b/src/api/config/wellliquidconfig.js
@@ -0,0 +1,42 @@
+/**
+ * 井盖配置接口
+ */
+import request from '@/utils/request'
+// 燃气配置查询
+export function getWellliquidConfigList(params) {
+  return request({
+    url: 'busConfig/wellliquidConfig/list',
+    method: 'get',
+    params
+  })
+}
+
+// 修改燃气配置
+export function editWellliquidConfig(data) {
+  return request({
+    url: 'busConfig/wellliquidConfig/config',
+    method: 'post',
+    data
+  })
+}
+
+// 批量导入
+export function batchImportWellliquidConfig(fileobj) {
+  const param = new FormData()
+  param.append('file', fileobj)
+  return request({
+    url: 'busConfig/wellliquidConfig/batchImport',
+    method: 'post',
+    headers: { 'Content-Type': 'multipart/form-data' },
+    data: param
+  })
+}
+// 批量导出
+export function batchExportWellliquidConfig(params) {
+  return request({
+    url: 'busConfig/wellliquidConfig/batchExport',
+    method: 'get',
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
diff --git a/src/api/data/data.js b/src/api/data/data.js
index c437d7b..cba92e9 100644
--- a/src/api/data/data.js
+++ b/src/api/data/data.js
@@ -394,3 +394,31 @@
     responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
   })
 }
+
+// 井盖数据查询
+export function getWellLiquidData(params) {
+  return request({
+    url: 'wellliquiddata/list-page',
+    method: 'get',
+    params
+  })
+}
+// 井盖数据查询，不分页
+export function getWellLiquidDataSingle(params) {
+  return request({
+    url: 'wellliquiddata/list',
+    method: 'get',
+    params
+  })
+}
+// 批量导出井盖数据
+export function batchExportWellLiquidData(params) {
+  return request({
+    url: 'wellliquiddata/export',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
diff --git a/src/components/BigData/Card/panelCard.vue b/src/components/BigData/Card/panelCard.vue
index d6a7b89..8283d7f 100644
--- a/src/components/BigData/Card/panelCard.vue
+++ b/src/components/BigData/Card/panelCard.vue
@@ -35,12 +35,13 @@
     font-size: 16px;
     font-weight: bold;
     padding: 0px 10px;
+    padding-right: 0px;
     border-left: 5px solid #66b1ff;
     position: relative;
     .title-right{
       display: inline-block;
       position: absolute;
-      right: 10px;
+      right: 0px;
     }
   }
   .panel-body{
diff --git a/src/views/alarmManage/listAlarmNow.vue b/src/views/alarmManage/listAlarmNow.vue
index 7392a4a..9f5a0b6 100644
--- a/src/views/alarmManage/listAlarmNow.vue
+++ b/src/views/alarmManage/listAlarmNow.vue
@@ -361,7 +361,7 @@
         const supportDeviceTypes = this.$store.getters.deviceTypes
         for (const item of response.data.list) {
           const deviceType = '' + item.deviceType
-          if (supportDeviceTypes.indexOf(deviceType) !== -1) {
+          if (supportDeviceTypes.indexOf(deviceType) !== -1 && this.alarmContentTypeList.findIndex(t => t.name === item.name) === -1) {
             this.alarmContentTypeList.push(item)
           }
         }
diff --git a/src/views/alarmManage/listAlarmRecords.vue b/src/views/alarmManage/listAlarmRecords.vue
index 2e34a39..b5d233c 100644
--- a/src/views/alarmManage/listAlarmRecords.vue
+++ b/src/views/alarmManage/listAlarmRecords.vue
@@ -352,7 +352,7 @@
         const supportDeviceTypes = this.$store.getters.deviceTypes
         for (const item of response.data.list) {
           const deviceType = '' + item.deviceType
-          if (supportDeviceTypes.indexOf(deviceType) !== -1) {
+          if (supportDeviceTypes.indexOf(deviceType) !== -1 && this.alarmContentTypeList.findIndex(t => t.name === item.name) === -1) {
             this.alarmContentTypeList.push(item)
           }
         }
diff --git a/src/views/alarmStatics/components/alarmWellRank.vue b/src/views/alarmStatics/components/alarmWellRank.vue
index 89ffa18..acf1598 100644
--- a/src/views/alarmStatics/components/alarmWellRank.vue
+++ b/src/views/alarmStatics/components/alarmWellRank.vue
@@ -75,7 +75,7 @@
       getAlarmContentType('1').then(response => {
         const supportDeviceTypes = this.$store.getters.deviceTypes
         for (const item of response.data.list) {
-          if (supportDeviceTypes.indexOf('' + item.deviceType) !== -1) {
+          if (supportDeviceTypes.indexOf('' + item.deviceType) !== -1 && this.alarmContentTypeList.findIndex(t => t.name === item.name) === -1) {
             this.alarmContentTypeList.push(item)
           }
         }
diff --git a/src/views/dataManage/dataManage.vue b/src/views/dataManage/dataManage.vue
index b1d6a3b..44c099a 100644
--- a/src/views/dataManage/dataManage.vue
+++ b/src/views/dataManage/dataManage.vue
@@ -23,11 +23,12 @@
 import ListPantiltData from '@/views/dataManage/deviceData/listPantiltData'
 import ListHydrantData from '@/views/dataManage/deviceData/listHydrantData'
 import ListH2SData from '@/views/dataManage/deviceData/listH2SData'
+import ListWellLiquidData from '@/views/dataManage/deviceData/listWellLiquidData'
 import { parseUrl } from '@/utils/parseutils'
 
 export default {
   name: 'DataManage',
-  components: { ListH2SData, ListHydrantData, ListPantiltData, ListGasdectorData, ListTubeData, ListNoiseData, ListWellLocaData, ListTempData, ListHarmfulData, ListDigData, ListGasData, ListLiquidData, ListWellCoverData, ListLiquidGasData },
+  components: { ListH2SData, ListHydrantData, ListPantiltData, ListGasdectorData, ListTubeData, ListNoiseData, ListWellLocaData, ListTempData, ListHarmfulData, ListDigData, ListGasData, ListLiquidData, ListWellCoverData, ListLiquidGasData, ListWellLiquidData },
   data() {
     return {
       activeName: 'wellcover',
@@ -45,7 +46,8 @@
         { 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: '14', comp: 'list-H2S-data' }
+        { permission: '/wellliquiddata/list-page', label: '硫化氢浓度监测仪', name: 'H2S', type: '14', comp: 'list-H2S-data' },
+        { permission: '/wellliquiddata/list-page', label: '井盖液位一体机', name: 'wellliquid', type: '13', comp: 'list-well-liquid-data' }
       ] // 所有tab列表
     }
   },
diff --git a/src/views/dataManage/deviceData/listWellLiquidData.vue b/src/views/dataManage/deviceData/listWellLiquidData.vue
new file mode 100644
index 0000000..599039e
--- /dev/null
+++ b/src/views/dataManage/deviceData/listWellLiquidData.vue
@@ -0,0 +1,228 @@
+<template>
+  <app-container>
+    <!--筛选条件-->
+    <search-area size="small" @search="search">
+      <search-item>
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
+      </search-item>
+      <search-item>
+        <dept-select
+          v-model="listQuery.deptid"
+          :need-top="false"
+          dept-type="03"
+          size="small"
+          placeholder="选择权属单位"
+        />
+      </search-item>
+      <search-item>
+        <el-date-picker
+          v-model="timeRange"
+          size="small"
+          type="datetimerange"
+          range-separator="至"
+          value-format="yyyy-MM-dd HH:mm:ss"
+          start-placeholder="开始时间"
+          end-placeholder="结束时间"
+        />
+      </search-item>
+    </search-area>
+    <!--查询结果Table显示-->
+    <normal-table
+      ref="normalTable"
+      :data="list"
+      :total="total"
+      :query="listQuery"
+      :list-loading="listLoading"
+      :options="options"
+      size="small"
+      @change="changePage"
+    >
+      <template slot="btns">
+        <el-button v-if="hasPerm('/wellLiquidData/export')" size="small" @click="batchExport">
+          导出记录
+        </el-button>
+      </template>
+      <template slot="columns">
+        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
+          <template slot-scope="scope">
+            <span v-if="column.checkCell" :class="checkCell(scope.row.cell)">{{ scope.row[column.value] }}</span>
+            <span v-else>{{ scope.row[column.value] }}</span>
+          </template>
+        </el-table-column>
+      </template>
+    </normal-table>
+  </app-container>
+</template>
+
+<script>
+import { getWellLiquidData, batchExportWellLiquidData } from '@/api/data/data'
+import DeptSelect from '../../../components/DeptSelect/index'
+import { parseUrl } from '@/utils/parseutils'
+import { getSearchLastWeekTime } from '@/utils/dateutils'
+import { exportFile } from '@/utils/exportutils'
+
+export default {
+  name: 'ListWellLiquidData',
+  components: { DeptSelect },
+  props: {
+    type: {
+      type: String,
+      required: true
+    }, // 设备类型
+    name: {
+      type: String,
+      default: ''
+    } // 设备名称
+  },
+  data() {
+    return {
+      listQuery: {
+        keywords: '', // 关键字
+        deptid: '', // 部门id
+        beginTime: '', // 开始时间
+        endTime: '', // 结束时间
+        offset: 1,
+        limit: 20,
+        sort: '',
+        order: ''
+      }, // 筛选条件
+      timeRange: [], // 时间范围
+      columns: [
+        {
+          text: '设备编号',
+          value: 'devcode',
+          align: 'center'
+        },
+        {
+          text: '点位编号',
+          value: 'wellCode',
+          align: 'center'
+        },
+        {
+          text: '设备类型',
+          value: 'deviceTypeName',
+          align: 'center'
+        },
+        {
+          text: '状态描述',
+          value: 'descn',
+          align: 'center',
+          checkState: true
+        },
+        {
+          text: '权属单位',
+          value: 'deptName',
+          align: 'center'
+        },
+        {
+          text: '上传时间',
+          value: 'logtime',
+          width: 170,
+          align: 'center'
+        }
+      ], // 显示列
+      list: [], // 列表数据
+      total: 0, // 数据总数
+      options: {
+        needIndex: true, // 是否需要序号列
+        border: true // 是否需要上方边框
+      },
+      listLoading: true, // 加载动画
+      fullscreenLoading: false, // 全屏加载动画
+      editShow: false // 是否显示编辑框
+    }
+  },
+  mounted() {
+    // 如果路径里带参数，解析devcode参数
+    this.timeRange = getSearchLastWeekTime()
+    if (window.location.href) {
+      const params = parseUrl(window.location.href)
+      if (params && params.deviceType === this.type && params.devcode) {
+        this.listQuery.keywords = params.devcode
+        this.fetchData()
+      } else {
+        this.fetchData()
+      }
+    }
+  },
+  activated() {
+    // 要是路由里有参数
+    if (this.$route.query && this.$route.query.devcode) {
+      this.listQuery.keywords = this.$route.query.devcode
+      this.fetchData(false)// 获取数据
+    } else {
+      this.fetchData()
+    }
+  },
+  methods: {
+    // 批量导出
+    batchExport() {
+      // this.handleDateTime()
+      // 全屏加载动画
+      const loading = this.$loading({
+        lock: true,
+        text: '下载中,请稍后...',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
+      })
+      batchExportWellLiquidData(this.listQuery).then(res => {
+        loading.close() // 关闭加载动画
+        let fileName = `${this.name}数据-${this.listQuery.beginTime}-${this.listQuery.endTime}.xlsx`
+        fileName = fileName.replace(/-|:| /g, '')
+        const blob = new Blob([res.data])
+        exportFile(blob, fileName)
+      }).catch((res) => {
+        loading.close()
+      })
+    },
+    // 查询数据
+    search() {
+      this.fetchData(false)
+    },
+    // 获取井盖数据
+    fetchData(isNowPage = true) {
+      this.listLoading = true
+      if (!isNowPage) { // 是否显示当前页，否则跳转第一页
+        this.listQuery.offset = 1
+      }
+      this.handleDateTime()
+      getWellLiquidData(this.listQuery).then(response => {
+        this.list = response.data.rows
+        this.total = response.data.total
+        this.listLoading = false
+      })
+    },
+    // 处理时间
+    handleDateTime() {
+      if (this.timeRange && this.timeRange.length > 0) {
+        this.listQuery.beginTime = this.timeRange[0]
+        this.listQuery.endTime = this.timeRange[1]
+      } else {
+        this.listQuery.beginTime = ''
+        this.listQuery.endTime = ''
+      }
+    },
+    checkState(row) {
+      if (row.status !== '0') {
+        return 'warning-state'
+      }
+    },
+    // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+    changePage(val) {
+      if (val && val.size) {
+        this.listQuery.limit = val.size
+      }
+      if (val && val.page) {
+        this.listQuery.offset = val.page
+      }
+      this.fetchData()
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+.warning-state{
+  color:red
+}
+</style>
diff --git a/src/views/dataView/components/alarmAnalysis.vue b/src/views/dataView/components/alarmAnalysis.vue
index 3ac21d8..f9949ea 100644
--- a/src/views/dataView/components/alarmAnalysis.vue
+++ b/src/views/dataView/components/alarmAnalysis.vue
@@ -76,7 +76,12 @@
     },
     // 获取各类报警的列表
     fetchAlarmByContent() {
-      alarmStaticsByContent(this.listQuery).then(response => {
+      const query = {
+        alarmType: '1',
+        beginTime: this.listQuery.beginTime,
+        endTime: this.listQuery.endTime
+      }
+      alarmStaticsByContent(query).then(response => {
         this.tableList = response.data
       })
     },

diff --git a/src/api/config/wellcoverconfig.js b/src/api/config/wellcoverconfig.js
index ecdd676..6b83752 100644
--- a/src/api/config/wellcoverconfig.js
+++ b/src/api/config/wellcoverconfig.js
@@ -12,11 +12,11 @@
 }
 
 // 修改燃气配置
-export function editWellcoverConfig(params) {
+export function editWellcoverConfig(data) {
   return request({
     url: 'busConfig/wellcoverConfig/config',
     method: 'post',
-    params
+    data
   })
 }
 
diff --git a/src/api/config/wellliquidconfig.js b/src/api/config/wellliquidconfig.js
new file mode 100644
index 0000000..c7c4838
--- /dev/null
+++ b/src/api/config/wellliquidconfig.js
@@ -0,0 +1,42 @@
+/**
+ * 井盖配置接口
+ */
+import request from '@/utils/request'
+// 燃气配置查询
+export function getWellliquidConfigList(params) {
+  return request({
+    url: 'busConfig/wellliquidConfig/list',
+    method: 'get',
+    params
+  })
+}
+
+// 修改燃气配置
+export function editWellliquidConfig(data) {
+  return request({
+    url: 'busConfig/wellliquidConfig/config',
+    method: 'post',
+    data
+  })
+}
+
+// 批量导入
+export function batchImportWellliquidConfig(fileobj) {
+  const param = new FormData()
+  param.append('file', fileobj)
+  return request({
+    url: 'busConfig/wellliquidConfig/batchImport',
+    method: 'post',
+    headers: { 'Content-Type': 'multipart/form-data' },
+    data: param
+  })
+}
+// 批量导出
+export function batchExportWellliquidConfig(params) {
+  return request({
+    url: 'busConfig/wellliquidConfig/batchExport',
+    method: 'get',
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
diff --git a/src/api/data/data.js b/src/api/data/data.js
index c437d7b..cba92e9 100644
--- a/src/api/data/data.js
+++ b/src/api/data/data.js
@@ -394,3 +394,31 @@
     responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
   })
 }
+
+// 井盖数据查询
+export function getWellLiquidData(params) {
+  return request({
+    url: 'wellliquiddata/list-page',
+    method: 'get',
+    params
+  })
+}
+// 井盖数据查询，不分页
+export function getWellLiquidDataSingle(params) {
+  return request({
+    url: 'wellliquiddata/list',
+    method: 'get',
+    params
+  })
+}
+// 批量导出井盖数据
+export function batchExportWellLiquidData(params) {
+  return request({
+    url: 'wellliquiddata/export',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
diff --git a/src/components/BigData/Card/panelCard.vue b/src/components/BigData/Card/panelCard.vue
index d6a7b89..8283d7f 100644
--- a/src/components/BigData/Card/panelCard.vue
+++ b/src/components/BigData/Card/panelCard.vue
@@ -35,12 +35,13 @@
     font-size: 16px;
     font-weight: bold;
     padding: 0px 10px;
+    padding-right: 0px;
     border-left: 5px solid #66b1ff;
     position: relative;
     .title-right{
       display: inline-block;
       position: absolute;
-      right: 10px;
+      right: 0px;
     }
   }
   .panel-body{
diff --git a/src/views/alarmManage/listAlarmNow.vue b/src/views/alarmManage/listAlarmNow.vue
index 7392a4a..9f5a0b6 100644
--- a/src/views/alarmManage/listAlarmNow.vue
+++ b/src/views/alarmManage/listAlarmNow.vue
@@ -361,7 +361,7 @@
         const supportDeviceTypes = this.$store.getters.deviceTypes
         for (const item of response.data.list) {
           const deviceType = '' + item.deviceType
-          if (supportDeviceTypes.indexOf(deviceType) !== -1) {
+          if (supportDeviceTypes.indexOf(deviceType) !== -1 && this.alarmContentTypeList.findIndex(t => t.name === item.name) === -1) {
             this.alarmContentTypeList.push(item)
           }
         }
diff --git a/src/views/alarmManage/listAlarmRecords.vue b/src/views/alarmManage/listAlarmRecords.vue
index 2e34a39..b5d233c 100644
--- a/src/views/alarmManage/listAlarmRecords.vue
+++ b/src/views/alarmManage/listAlarmRecords.vue
@@ -352,7 +352,7 @@
         const supportDeviceTypes = this.$store.getters.deviceTypes
         for (const item of response.data.list) {
           const deviceType = '' + item.deviceType
-          if (supportDeviceTypes.indexOf(deviceType) !== -1) {
+          if (supportDeviceTypes.indexOf(deviceType) !== -1 && this.alarmContentTypeList.findIndex(t => t.name === item.name) === -1) {
             this.alarmContentTypeList.push(item)
           }
         }
diff --git a/src/views/alarmStatics/components/alarmWellRank.vue b/src/views/alarmStatics/components/alarmWellRank.vue
index 89ffa18..acf1598 100644
--- a/src/views/alarmStatics/components/alarmWellRank.vue
+++ b/src/views/alarmStatics/components/alarmWellRank.vue
@@ -75,7 +75,7 @@
       getAlarmContentType('1').then(response => {
         const supportDeviceTypes = this.$store.getters.deviceTypes
         for (const item of response.data.list) {
-          if (supportDeviceTypes.indexOf('' + item.deviceType) !== -1) {
+          if (supportDeviceTypes.indexOf('' + item.deviceType) !== -1 && this.alarmContentTypeList.findIndex(t => t.name === item.name) === -1) {
             this.alarmContentTypeList.push(item)
           }
         }
diff --git a/src/views/dataManage/dataManage.vue b/src/views/dataManage/dataManage.vue
index b1d6a3b..44c099a 100644
--- a/src/views/dataManage/dataManage.vue
+++ b/src/views/dataManage/dataManage.vue
@@ -23,11 +23,12 @@
 import ListPantiltData from '@/views/dataManage/deviceData/listPantiltData'
 import ListHydrantData from '@/views/dataManage/deviceData/listHydrantData'
 import ListH2SData from '@/views/dataManage/deviceData/listH2SData'
+import ListWellLiquidData from '@/views/dataManage/deviceData/listWellLiquidData'
 import { parseUrl } from '@/utils/parseutils'
 
 export default {
   name: 'DataManage',
-  components: { ListH2SData, ListHydrantData, ListPantiltData, ListGasdectorData, ListTubeData, ListNoiseData, ListWellLocaData, ListTempData, ListHarmfulData, ListDigData, ListGasData, ListLiquidData, ListWellCoverData, ListLiquidGasData },
+  components: { ListH2SData, ListHydrantData, ListPantiltData, ListGasdectorData, ListTubeData, ListNoiseData, ListWellLocaData, ListTempData, ListHarmfulData, ListDigData, ListGasData, ListLiquidData, ListWellCoverData, ListLiquidGasData, ListWellLiquidData },
   data() {
     return {
       activeName: 'wellcover',
@@ -45,7 +46,8 @@
         { 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: '14', comp: 'list-H2S-data' }
+        { permission: '/wellliquiddata/list-page', label: '硫化氢浓度监测仪', name: 'H2S', type: '14', comp: 'list-H2S-data' },
+        { permission: '/wellliquiddata/list-page', label: '井盖液位一体机', name: 'wellliquid', type: '13', comp: 'list-well-liquid-data' }
       ] // 所有tab列表
     }
   },
diff --git a/src/views/dataManage/deviceData/listWellLiquidData.vue b/src/views/dataManage/deviceData/listWellLiquidData.vue
new file mode 100644
index 0000000..599039e
--- /dev/null
+++ b/src/views/dataManage/deviceData/listWellLiquidData.vue
@@ -0,0 +1,228 @@
+<template>
+  <app-container>
+    <!--筛选条件-->
+    <search-area size="small" @search="search">
+      <search-item>
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
+      </search-item>
+      <search-item>
+        <dept-select
+          v-model="listQuery.deptid"
+          :need-top="false"
+          dept-type="03"
+          size="small"
+          placeholder="选择权属单位"
+        />
+      </search-item>
+      <search-item>
+        <el-date-picker
+          v-model="timeRange"
+          size="small"
+          type="datetimerange"
+          range-separator="至"
+          value-format="yyyy-MM-dd HH:mm:ss"
+          start-placeholder="开始时间"
+          end-placeholder="结束时间"
+        />
+      </search-item>
+    </search-area>
+    <!--查询结果Table显示-->
+    <normal-table
+      ref="normalTable"
+      :data="list"
+      :total="total"
+      :query="listQuery"
+      :list-loading="listLoading"
+      :options="options"
+      size="small"
+      @change="changePage"
+    >
+      <template slot="btns">
+        <el-button v-if="hasPerm('/wellLiquidData/export')" size="small" @click="batchExport">
+          导出记录
+        </el-button>
+      </template>
+      <template slot="columns">
+        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
+          <template slot-scope="scope">
+            <span v-if="column.checkCell" :class="checkCell(scope.row.cell)">{{ scope.row[column.value] }}</span>
+            <span v-else>{{ scope.row[column.value] }}</span>
+          </template>
+        </el-table-column>
+      </template>
+    </normal-table>
+  </app-container>
+</template>
+
+<script>
+import { getWellLiquidData, batchExportWellLiquidData } from '@/api/data/data'
+import DeptSelect from '../../../components/DeptSelect/index'
+import { parseUrl } from '@/utils/parseutils'
+import { getSearchLastWeekTime } from '@/utils/dateutils'
+import { exportFile } from '@/utils/exportutils'
+
+export default {
+  name: 'ListWellLiquidData',
+  components: { DeptSelect },
+  props: {
+    type: {
+      type: String,
+      required: true
+    }, // 设备类型
+    name: {
+      type: String,
+      default: ''
+    } // 设备名称
+  },
+  data() {
+    return {
+      listQuery: {
+        keywords: '', // 关键字
+        deptid: '', // 部门id
+        beginTime: '', // 开始时间
+        endTime: '', // 结束时间
+        offset: 1,
+        limit: 20,
+        sort: '',
+        order: ''
+      }, // 筛选条件
+      timeRange: [], // 时间范围
+      columns: [
+        {
+          text: '设备编号',
+          value: 'devcode',
+          align: 'center'
+        },
+        {
+          text: '点位编号',
+          value: 'wellCode',
+          align: 'center'
+        },
+        {
+          text: '设备类型',
+          value: 'deviceTypeName',
+          align: 'center'
+        },
+        {
+          text: '状态描述',
+          value: 'descn',
+          align: 'center',
+          checkState: true
+        },
+        {
+          text: '权属单位',
+          value: 'deptName',
+          align: 'center'
+        },
+        {
+          text: '上传时间',
+          value: 'logtime',
+          width: 170,
+          align: 'center'
+        }
+      ], // 显示列
+      list: [], // 列表数据
+      total: 0, // 数据总数
+      options: {
+        needIndex: true, // 是否需要序号列
+        border: true // 是否需要上方边框
+      },
+      listLoading: true, // 加载动画
+      fullscreenLoading: false, // 全屏加载动画
+      editShow: false // 是否显示编辑框
+    }
+  },
+  mounted() {
+    // 如果路径里带参数，解析devcode参数
+    this.timeRange = getSearchLastWeekTime()
+    if (window.location.href) {
+      const params = parseUrl(window.location.href)
+      if (params && params.deviceType === this.type && params.devcode) {
+        this.listQuery.keywords = params.devcode
+        this.fetchData()
+      } else {
+        this.fetchData()
+      }
+    }
+  },
+  activated() {
+    // 要是路由里有参数
+    if (this.$route.query && this.$route.query.devcode) {
+      this.listQuery.keywords = this.$route.query.devcode
+      this.fetchData(false)// 获取数据
+    } else {
+      this.fetchData()
+    }
+  },
+  methods: {
+    // 批量导出
+    batchExport() {
+      // this.handleDateTime()
+      // 全屏加载动画
+      const loading = this.$loading({
+        lock: true,
+        text: '下载中,请稍后...',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
+      })
+      batchExportWellLiquidData(this.listQuery).then(res => {
+        loading.close() // 关闭加载动画
+        let fileName = `${this.name}数据-${this.listQuery.beginTime}-${this.listQuery.endTime}.xlsx`
+        fileName = fileName.replace(/-|:| /g, '')
+        const blob = new Blob([res.data])
+        exportFile(blob, fileName)
+      }).catch((res) => {
+        loading.close()
+      })
+    },
+    // 查询数据
+    search() {
+      this.fetchData(false)
+    },
+    // 获取井盖数据
+    fetchData(isNowPage = true) {
+      this.listLoading = true
+      if (!isNowPage) { // 是否显示当前页，否则跳转第一页
+        this.listQuery.offset = 1
+      }
+      this.handleDateTime()
+      getWellLiquidData(this.listQuery).then(response => {
+        this.list = response.data.rows
+        this.total = response.data.total
+        this.listLoading = false
+      })
+    },
+    // 处理时间
+    handleDateTime() {
+      if (this.timeRange && this.timeRange.length > 0) {
+        this.listQuery.beginTime = this.timeRange[0]
+        this.listQuery.endTime = this.timeRange[1]
+      } else {
+        this.listQuery.beginTime = ''
+        this.listQuery.endTime = ''
+      }
+    },
+    checkState(row) {
+      if (row.status !== '0') {
+        return 'warning-state'
+      }
+    },
+    // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+    changePage(val) {
+      if (val && val.size) {
+        this.listQuery.limit = val.size
+      }
+      if (val && val.page) {
+        this.listQuery.offset = val.page
+      }
+      this.fetchData()
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+.warning-state{
+  color:red
+}
+</style>
diff --git a/src/views/dataView/components/alarmAnalysis.vue b/src/views/dataView/components/alarmAnalysis.vue
index 3ac21d8..f9949ea 100644
--- a/src/views/dataView/components/alarmAnalysis.vue
+++ b/src/views/dataView/components/alarmAnalysis.vue
@@ -76,7 +76,12 @@
     },
     // 获取各类报警的列表
     fetchAlarmByContent() {
-      alarmStaticsByContent(this.listQuery).then(response => {
+      const query = {
+        alarmType: '1',
+        beginTime: this.listQuery.beginTime,
+        endTime: this.listQuery.endTime
+      }
+      alarmStaticsByContent(query).then(response => {
         this.tableList = response.data
       })
     },
diff --git a/src/views/deviceConfig/components/editWellliquidConfig.vue b/src/views/deviceConfig/components/editWellliquidConfig.vue
new file mode 100644
index 0000000..70277d4
--- /dev/null
+++ b/src/views/deviceConfig/components/editWellliquidConfig.vue
@@ -0,0 +1,241 @@
+<template>
+  <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" append-to-body>
+    <el-form ref="dataForm" :rules="rules" :model="configForm" label-well-code="right" label-width="110px">
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item v-if="dialogStatus=='create'" label="设备编号" prop="deviceId">
+            <el-select
+              v-model="configForm.deviceId"
+              :loading="loading"
+              :disabled="dialogStatus=='update'?true:false"
+              filterable
+              placeholder="请输入设备编号"
+            >
+              <el-option
+                v-for="item in devices"
+                :key="item.id"
+                :label="item.devcode"
+                :value="item.id"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item v-if="dialogStatus=='update'" label="设备编号">
+            <el-input v-model="deviceForm.devcode" type="text" placeholder="未知" disabled />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item v-if="deviceForm.deviceName!=''" label="设备名称">
+            <el-input v-model="deviceForm.deviceName" type="text" placeholder="未知" disabled />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item v-if="deviceForm.deviceTypeName!=''" label="设备类型" prop="deviceType">
+            <el-input v-model="deviceForm.deviceTypeName" type="text" placeholder="未知" disabled />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item v-if="deviceForm.deptName!=''" label="权属单位" prop="deptName">
+            <el-input v-model="deviceForm.deptName" type="text" placeholder="未知" disabled />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row v-if="showIp" :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="ip地址" prop="ip">
+            <el-input v-model.trim="configForm.ip" type="text" placeholder="非必填" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="端口号" prop="port">
+            <el-input v-model.trim="configForm.port" type="text" placeholder="非必填" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="最大尝试次数">
+            <el-input-number v-model="configForm.attemptsMax" :min="1" :max="100" type="text" placeholder="必填" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <div slot="footer" class="dialog-footer">
+      <el-button :disabled="!canEdit" type="primary" @click="saveData">
+        保存
+      </el-button>
+      <el-button @click="cancel">
+        取消
+      </el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { editWellliquidConfig } from '@/api/config/wellliquidconfig'
+import { getDeviceSimpleList } from '@/api/config/liquidconfig'
+export default {
+  name: 'EditWellliquidConfig',
+  data() {
+    const validateIp = (rule, value, callback) => {
+      if (value !== '') {
+        if ((/((25[0-5]|2[0-4]\d|((1\d{2})|([1-9]?\d)))\.){3}(25[0-5]|2[0-4]\d|((1\d{2})|([1-9]?\d)))/).test(value) === false) {
+          callback(new Error('请填写正确的ip地址'))
+        } else {
+          callback()
+        }
+      } else {
+        // callback(new Error('ip地址不能为空'))
+        callback()
+      }
+    }
+    const validatePort = (rule, value, callback) => {
+      if (value !== '') {
+        if ((/[1-9]$|(^[1-9][0-9]$)|(^[1-9][0-9][0-9]$)|(^[1-9][0-9][0-9][0-9]$)|(^[1-6][0-5][0-5][0-3][0-5]$)/).test(value) === false) {
+          callback(new Error('请填写正确的端口号'))
+        } else {
+          callback()
+        }
+      } else {
+        // callback(new Error('端口号不能为空'))
+        callback()
+      }
+    }
+    return {
+      dialogFormVisible: false, // 对话框是否显示
+      dialogStatus: '', // 对话框类型：create,update
+      deviceForm: {
+        deviceName: '',
+        deviceTypeName: '',
+        deptName: '',
+        devcode: '',
+        deviceType: ''
+      }, // 设备基本信息
+      configForm: {
+        id: '', // config id
+        deviceId: '', // 设备id
+        attemptsMax: '3', // 最大尝试次数
+        ip: '', // ip地址
+        port: '' // 端口号
+      },
+      textMap: {
+        update: '编辑',
+        create: '新增'
+      }, // 表头显示标题
+      devices: [], // 设备下拉选择列表
+      loading: false, // 加载动画是否显示
+      canEdit: true, // 是否允许点击保存按钮
+      rules: {
+        deviceId: [{ required: true, message: '设备编号不能为空', trigger: ['blur', 'change'] }],
+        ip: [{ trigger: ['blur', 'change'], validator: validateIp }],
+        port: [{ trigger: ['blur', 'change'], validator: validatePort }]
+      } // 前端校验规则
+    }
+  },
+  computed: {
+    watchDeviceId() { // 监控权属单位变化
+      return this.configForm.deviceId
+    },
+    showIp() { // 是否显示ip配置
+      return true
+    }
+  },
+  watch: {
+    watchDeviceId(newValue, oldValue) {
+      for (const device of this.devices) {
+        if (device.id === newValue) {
+          this.deviceForm.deviceTypeName = device.deviceTypeName
+          this.deviceForm.deptName = device.deptName
+          this.deviceForm.deviceName = device.deviceName
+          return
+        }
+      }
+    }
+  },
+  methods: {
+    // 初始化对话框
+    initDialog: function(dialogStatus, dialogFormVisible, row = null) {
+      this.dialogStatus = dialogStatus
+      this.dialogFormVisible = dialogFormVisible
+      this.canEdit = true
+      if (dialogStatus === 'create') { // 如果是新增，清除验证
+        this.resetForm()
+        this.fetchDevice()
+        this.$nextTick(() => {
+          this.$refs['dataForm'].clearValidate()
+        })
+      } else if (dialogStatus === 'update') { // 如果是修改，将row中数据填写到输入框中
+        this.deviceForm = {
+          deviceName: row.deviceName,
+          devcode: row.devcode,
+          deptName: row.deptName,
+          deviceType: row.deviceType,
+          deviceTypeName: row.deviceTypeName
+        }
+        this.configForm = {
+          id: row.id,
+          deviceId: row.deviceId, // 设备id
+          ip: row.ip, // ip地址
+          port: row.port, // 端口号
+          attemptsMax: row.attemptsMax // 最大尝试次数
+        }
+      }
+    },
+    // 重置表单
+    resetForm() {
+      this.deviceForm = {
+        deviceName: '',
+        deviceTypeName: '',
+        deptName: '',
+        devcode: ''
+      }
+      this.configForm = {
+        deviceId: '', // 设备id
+        ip: '', // ip地址
+        port: '', // 端口号
+        attemptsMax: '3' // 最大尝试次数
+      }
+    },
+    // 保存数据
+    saveData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          this.canEdit = false
+          editWellliquidConfig(this.configForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('配置成功')
+              this.$emit('watchChild')
+              this.dialogFormVisible = false
+            }
+            this.canEdit = false
+          }).catch(_ => {
+            this.canEdit = true
+          })
+        }
+      })
+    },
+    // 获取未下发配置的设备列表
+    fetchDevice() {
+      this.loading = true
+      getDeviceSimpleList('13', '0').then(response => {
+        this.loading = false
+        this.devices = response.data
+      })
+    },
+    cancel: function() {
+      this.dialogFormVisible = false
+      this.$emit('watchChild')
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .el-select{
+    width: 100%;
+  }
+  .el-input-number{
+    width: 100%;
+  }
+</style>

diff --git a/src/api/config/wellcoverconfig.js b/src/api/config/wellcoverconfig.js
index ecdd676..6b83752 100644
--- a/src/api/config/wellcoverconfig.js
+++ b/src/api/config/wellcoverconfig.js
@@ -12,11 +12,11 @@
 }
 
 // 修改燃气配置
-export function editWellcoverConfig(params) {
+export function editWellcoverConfig(data) {
   return request({
     url: 'busConfig/wellcoverConfig/config',
     method: 'post',
-    params
+    data
   })
 }
 
diff --git a/src/api/config/wellliquidconfig.js b/src/api/config/wellliquidconfig.js
new file mode 100644
index 0000000..c7c4838
--- /dev/null
+++ b/src/api/config/wellliquidconfig.js
@@ -0,0 +1,42 @@
+/**
+ * 井盖配置接口
+ */
+import request from '@/utils/request'
+// 燃气配置查询
+export function getWellliquidConfigList(params) {
+  return request({
+    url: 'busConfig/wellliquidConfig/list',
+    method: 'get',
+    params
+  })
+}
+
+// 修改燃气配置
+export function editWellliquidConfig(data) {
+  return request({
+    url: 'busConfig/wellliquidConfig/config',
+    method: 'post',
+    data
+  })
+}
+
+// 批量导入
+export function batchImportWellliquidConfig(fileobj) {
+  const param = new FormData()
+  param.append('file', fileobj)
+  return request({
+    url: 'busConfig/wellliquidConfig/batchImport',
+    method: 'post',
+    headers: { 'Content-Type': 'multipart/form-data' },
+    data: param
+  })
+}
+// 批量导出
+export function batchExportWellliquidConfig(params) {
+  return request({
+    url: 'busConfig/wellliquidConfig/batchExport',
+    method: 'get',
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
diff --git a/src/api/data/data.js b/src/api/data/data.js
index c437d7b..cba92e9 100644
--- a/src/api/data/data.js
+++ b/src/api/data/data.js
@@ -394,3 +394,31 @@
     responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
   })
 }
+
+// 井盖数据查询
+export function getWellLiquidData(params) {
+  return request({
+    url: 'wellliquiddata/list-page',
+    method: 'get',
+    params
+  })
+}
+// 井盖数据查询，不分页
+export function getWellLiquidDataSingle(params) {
+  return request({
+    url: 'wellliquiddata/list',
+    method: 'get',
+    params
+  })
+}
+// 批量导出井盖数据
+export function batchExportWellLiquidData(params) {
+  return request({
+    url: 'wellliquiddata/export',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
diff --git a/src/components/BigData/Card/panelCard.vue b/src/components/BigData/Card/panelCard.vue
index d6a7b89..8283d7f 100644
--- a/src/components/BigData/Card/panelCard.vue
+++ b/src/components/BigData/Card/panelCard.vue
@@ -35,12 +35,13 @@
     font-size: 16px;
     font-weight: bold;
     padding: 0px 10px;
+    padding-right: 0px;
     border-left: 5px solid #66b1ff;
     position: relative;
     .title-right{
       display: inline-block;
       position: absolute;
-      right: 10px;
+      right: 0px;
     }
   }
   .panel-body{
diff --git a/src/views/alarmManage/listAlarmNow.vue b/src/views/alarmManage/listAlarmNow.vue
index 7392a4a..9f5a0b6 100644
--- a/src/views/alarmManage/listAlarmNow.vue
+++ b/src/views/alarmManage/listAlarmNow.vue
@@ -361,7 +361,7 @@
         const supportDeviceTypes = this.$store.getters.deviceTypes
         for (const item of response.data.list) {
           const deviceType = '' + item.deviceType
-          if (supportDeviceTypes.indexOf(deviceType) !== -1) {
+          if (supportDeviceTypes.indexOf(deviceType) !== -1 && this.alarmContentTypeList.findIndex(t => t.name === item.name) === -1) {
             this.alarmContentTypeList.push(item)
           }
         }
diff --git a/src/views/alarmManage/listAlarmRecords.vue b/src/views/alarmManage/listAlarmRecords.vue
index 2e34a39..b5d233c 100644
--- a/src/views/alarmManage/listAlarmRecords.vue
+++ b/src/views/alarmManage/listAlarmRecords.vue
@@ -352,7 +352,7 @@
         const supportDeviceTypes = this.$store.getters.deviceTypes
         for (const item of response.data.list) {
           const deviceType = '' + item.deviceType
-          if (supportDeviceTypes.indexOf(deviceType) !== -1) {
+          if (supportDeviceTypes.indexOf(deviceType) !== -1 && this.alarmContentTypeList.findIndex(t => t.name === item.name) === -1) {
             this.alarmContentTypeList.push(item)
           }
         }
diff --git a/src/views/alarmStatics/components/alarmWellRank.vue b/src/views/alarmStatics/components/alarmWellRank.vue
index 89ffa18..acf1598 100644
--- a/src/views/alarmStatics/components/alarmWellRank.vue
+++ b/src/views/alarmStatics/components/alarmWellRank.vue
@@ -75,7 +75,7 @@
       getAlarmContentType('1').then(response => {
         const supportDeviceTypes = this.$store.getters.deviceTypes
         for (const item of response.data.list) {
-          if (supportDeviceTypes.indexOf('' + item.deviceType) !== -1) {
+          if (supportDeviceTypes.indexOf('' + item.deviceType) !== -1 && this.alarmContentTypeList.findIndex(t => t.name === item.name) === -1) {
             this.alarmContentTypeList.push(item)
           }
         }
diff --git a/src/views/dataManage/dataManage.vue b/src/views/dataManage/dataManage.vue
index b1d6a3b..44c099a 100644
--- a/src/views/dataManage/dataManage.vue
+++ b/src/views/dataManage/dataManage.vue
@@ -23,11 +23,12 @@
 import ListPantiltData from '@/views/dataManage/deviceData/listPantiltData'
 import ListHydrantData from '@/views/dataManage/deviceData/listHydrantData'
 import ListH2SData from '@/views/dataManage/deviceData/listH2SData'
+import ListWellLiquidData from '@/views/dataManage/deviceData/listWellLiquidData'
 import { parseUrl } from '@/utils/parseutils'
 
 export default {
   name: 'DataManage',
-  components: { ListH2SData, ListHydrantData, ListPantiltData, ListGasdectorData, ListTubeData, ListNoiseData, ListWellLocaData, ListTempData, ListHarmfulData, ListDigData, ListGasData, ListLiquidData, ListWellCoverData, ListLiquidGasData },
+  components: { ListH2SData, ListHydrantData, ListPantiltData, ListGasdectorData, ListTubeData, ListNoiseData, ListWellLocaData, ListTempData, ListHarmfulData, ListDigData, ListGasData, ListLiquidData, ListWellCoverData, ListLiquidGasData, ListWellLiquidData },
   data() {
     return {
       activeName: 'wellcover',
@@ -45,7 +46,8 @@
         { 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: '14', comp: 'list-H2S-data' }
+        { permission: '/wellliquiddata/list-page', label: '硫化氢浓度监测仪', name: 'H2S', type: '14', comp: 'list-H2S-data' },
+        { permission: '/wellliquiddata/list-page', label: '井盖液位一体机', name: 'wellliquid', type: '13', comp: 'list-well-liquid-data' }
       ] // 所有tab列表
     }
   },
diff --git a/src/views/dataManage/deviceData/listWellLiquidData.vue b/src/views/dataManage/deviceData/listWellLiquidData.vue
new file mode 100644
index 0000000..599039e
--- /dev/null
+++ b/src/views/dataManage/deviceData/listWellLiquidData.vue
@@ -0,0 +1,228 @@
+<template>
+  <app-container>
+    <!--筛选条件-->
+    <search-area size="small" @search="search">
+      <search-item>
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
+      </search-item>
+      <search-item>
+        <dept-select
+          v-model="listQuery.deptid"
+          :need-top="false"
+          dept-type="03"
+          size="small"
+          placeholder="选择权属单位"
+        />
+      </search-item>
+      <search-item>
+        <el-date-picker
+          v-model="timeRange"
+          size="small"
+          type="datetimerange"
+          range-separator="至"
+          value-format="yyyy-MM-dd HH:mm:ss"
+          start-placeholder="开始时间"
+          end-placeholder="结束时间"
+        />
+      </search-item>
+    </search-area>
+    <!--查询结果Table显示-->
+    <normal-table
+      ref="normalTable"
+      :data="list"
+      :total="total"
+      :query="listQuery"
+      :list-loading="listLoading"
+      :options="options"
+      size="small"
+      @change="changePage"
+    >
+      <template slot="btns">
+        <el-button v-if="hasPerm('/wellLiquidData/export')" size="small" @click="batchExport">
+          导出记录
+        </el-button>
+      </template>
+      <template slot="columns">
+        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
+          <template slot-scope="scope">
+            <span v-if="column.checkCell" :class="checkCell(scope.row.cell)">{{ scope.row[column.value] }}</span>
+            <span v-else>{{ scope.row[column.value] }}</span>
+          </template>
+        </el-table-column>
+      </template>
+    </normal-table>
+  </app-container>
+</template>
+
+<script>
+import { getWellLiquidData, batchExportWellLiquidData } from '@/api/data/data'
+import DeptSelect from '../../../components/DeptSelect/index'
+import { parseUrl } from '@/utils/parseutils'
+import { getSearchLastWeekTime } from '@/utils/dateutils'
+import { exportFile } from '@/utils/exportutils'
+
+export default {
+  name: 'ListWellLiquidData',
+  components: { DeptSelect },
+  props: {
+    type: {
+      type: String,
+      required: true
+    }, // 设备类型
+    name: {
+      type: String,
+      default: ''
+    } // 设备名称
+  },
+  data() {
+    return {
+      listQuery: {
+        keywords: '', // 关键字
+        deptid: '', // 部门id
+        beginTime: '', // 开始时间
+        endTime: '', // 结束时间
+        offset: 1,
+        limit: 20,
+        sort: '',
+        order: ''
+      }, // 筛选条件
+      timeRange: [], // 时间范围
+      columns: [
+        {
+          text: '设备编号',
+          value: 'devcode',
+          align: 'center'
+        },
+        {
+          text: '点位编号',
+          value: 'wellCode',
+          align: 'center'
+        },
+        {
+          text: '设备类型',
+          value: 'deviceTypeName',
+          align: 'center'
+        },
+        {
+          text: '状态描述',
+          value: 'descn',
+          align: 'center',
+          checkState: true
+        },
+        {
+          text: '权属单位',
+          value: 'deptName',
+          align: 'center'
+        },
+        {
+          text: '上传时间',
+          value: 'logtime',
+          width: 170,
+          align: 'center'
+        }
+      ], // 显示列
+      list: [], // 列表数据
+      total: 0, // 数据总数
+      options: {
+        needIndex: true, // 是否需要序号列
+        border: true // 是否需要上方边框
+      },
+      listLoading: true, // 加载动画
+      fullscreenLoading: false, // 全屏加载动画
+      editShow: false // 是否显示编辑框
+    }
+  },
+  mounted() {
+    // 如果路径里带参数，解析devcode参数
+    this.timeRange = getSearchLastWeekTime()
+    if (window.location.href) {
+      const params = parseUrl(window.location.href)
+      if (params && params.deviceType === this.type && params.devcode) {
+        this.listQuery.keywords = params.devcode
+        this.fetchData()
+      } else {
+        this.fetchData()
+      }
+    }
+  },
+  activated() {
+    // 要是路由里有参数
+    if (this.$route.query && this.$route.query.devcode) {
+      this.listQuery.keywords = this.$route.query.devcode
+      this.fetchData(false)// 获取数据
+    } else {
+      this.fetchData()
+    }
+  },
+  methods: {
+    // 批量导出
+    batchExport() {
+      // this.handleDateTime()
+      // 全屏加载动画
+      const loading = this.$loading({
+        lock: true,
+        text: '下载中,请稍后...',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
+      })
+      batchExportWellLiquidData(this.listQuery).then(res => {
+        loading.close() // 关闭加载动画
+        let fileName = `${this.name}数据-${this.listQuery.beginTime}-${this.listQuery.endTime}.xlsx`
+        fileName = fileName.replace(/-|:| /g, '')
+        const blob = new Blob([res.data])
+        exportFile(blob, fileName)
+      }).catch((res) => {
+        loading.close()
+      })
+    },
+    // 查询数据
+    search() {
+      this.fetchData(false)
+    },
+    // 获取井盖数据
+    fetchData(isNowPage = true) {
+      this.listLoading = true
+      if (!isNowPage) { // 是否显示当前页，否则跳转第一页
+        this.listQuery.offset = 1
+      }
+      this.handleDateTime()
+      getWellLiquidData(this.listQuery).then(response => {
+        this.list = response.data.rows
+        this.total = response.data.total
+        this.listLoading = false
+      })
+    },
+    // 处理时间
+    handleDateTime() {
+      if (this.timeRange && this.timeRange.length > 0) {
+        this.listQuery.beginTime = this.timeRange[0]
+        this.listQuery.endTime = this.timeRange[1]
+      } else {
+        this.listQuery.beginTime = ''
+        this.listQuery.endTime = ''
+      }
+    },
+    checkState(row) {
+      if (row.status !== '0') {
+        return 'warning-state'
+      }
+    },
+    // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+    changePage(val) {
+      if (val && val.size) {
+        this.listQuery.limit = val.size
+      }
+      if (val && val.page) {
+        this.listQuery.offset = val.page
+      }
+      this.fetchData()
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+.warning-state{
+  color:red
+}
+</style>
diff --git a/src/views/dataView/components/alarmAnalysis.vue b/src/views/dataView/components/alarmAnalysis.vue
index 3ac21d8..f9949ea 100644
--- a/src/views/dataView/components/alarmAnalysis.vue
+++ b/src/views/dataView/components/alarmAnalysis.vue
@@ -76,7 +76,12 @@
     },
     // 获取各类报警的列表
     fetchAlarmByContent() {
-      alarmStaticsByContent(this.listQuery).then(response => {
+      const query = {
+        alarmType: '1',
+        beginTime: this.listQuery.beginTime,
+        endTime: this.listQuery.endTime
+      }
+      alarmStaticsByContent(query).then(response => {
         this.tableList = response.data
       })
     },
diff --git a/src/views/deviceConfig/components/editWellliquidConfig.vue b/src/views/deviceConfig/components/editWellliquidConfig.vue
new file mode 100644
index 0000000..70277d4
--- /dev/null
+++ b/src/views/deviceConfig/components/editWellliquidConfig.vue
@@ -0,0 +1,241 @@
+<template>
+  <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" append-to-body>
+    <el-form ref="dataForm" :rules="rules" :model="configForm" label-well-code="right" label-width="110px">
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item v-if="dialogStatus=='create'" label="设备编号" prop="deviceId">
+            <el-select
+              v-model="configForm.deviceId"
+              :loading="loading"
+              :disabled="dialogStatus=='update'?true:false"
+              filterable
+              placeholder="请输入设备编号"
+            >
+              <el-option
+                v-for="item in devices"
+                :key="item.id"
+                :label="item.devcode"
+                :value="item.id"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item v-if="dialogStatus=='update'" label="设备编号">
+            <el-input v-model="deviceForm.devcode" type="text" placeholder="未知" disabled />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item v-if="deviceForm.deviceName!=''" label="设备名称">
+            <el-input v-model="deviceForm.deviceName" type="text" placeholder="未知" disabled />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item v-if="deviceForm.deviceTypeName!=''" label="设备类型" prop="deviceType">
+            <el-input v-model="deviceForm.deviceTypeName" type="text" placeholder="未知" disabled />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item v-if="deviceForm.deptName!=''" label="权属单位" prop="deptName">
+            <el-input v-model="deviceForm.deptName" type="text" placeholder="未知" disabled />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row v-if="showIp" :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="ip地址" prop="ip">
+            <el-input v-model.trim="configForm.ip" type="text" placeholder="非必填" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="端口号" prop="port">
+            <el-input v-model.trim="configForm.port" type="text" placeholder="非必填" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="最大尝试次数">
+            <el-input-number v-model="configForm.attemptsMax" :min="1" :max="100" type="text" placeholder="必填" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <div slot="footer" class="dialog-footer">
+      <el-button :disabled="!canEdit" type="primary" @click="saveData">
+        保存
+      </el-button>
+      <el-button @click="cancel">
+        取消
+      </el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { editWellliquidConfig } from '@/api/config/wellliquidconfig'
+import { getDeviceSimpleList } from '@/api/config/liquidconfig'
+export default {
+  name: 'EditWellliquidConfig',
+  data() {
+    const validateIp = (rule, value, callback) => {
+      if (value !== '') {
+        if ((/((25[0-5]|2[0-4]\d|((1\d{2})|([1-9]?\d)))\.){3}(25[0-5]|2[0-4]\d|((1\d{2})|([1-9]?\d)))/).test(value) === false) {
+          callback(new Error('请填写正确的ip地址'))
+        } else {
+          callback()
+        }
+      } else {
+        // callback(new Error('ip地址不能为空'))
+        callback()
+      }
+    }
+    const validatePort = (rule, value, callback) => {
+      if (value !== '') {
+        if ((/[1-9]$|(^[1-9][0-9]$)|(^[1-9][0-9][0-9]$)|(^[1-9][0-9][0-9][0-9]$)|(^[1-6][0-5][0-5][0-3][0-5]$)/).test(value) === false) {
+          callback(new Error('请填写正确的端口号'))
+        } else {
+          callback()
+        }
+      } else {
+        // callback(new Error('端口号不能为空'))
+        callback()
+      }
+    }
+    return {
+      dialogFormVisible: false, // 对话框是否显示
+      dialogStatus: '', // 对话框类型：create,update
+      deviceForm: {
+        deviceName: '',
+        deviceTypeName: '',
+        deptName: '',
+        devcode: '',
+        deviceType: ''
+      }, // 设备基本信息
+      configForm: {
+        id: '', // config id
+        deviceId: '', // 设备id
+        attemptsMax: '3', // 最大尝试次数
+        ip: '', // ip地址
+        port: '' // 端口号
+      },
+      textMap: {
+        update: '编辑',
+        create: '新增'
+      }, // 表头显示标题
+      devices: [], // 设备下拉选择列表
+      loading: false, // 加载动画是否显示
+      canEdit: true, // 是否允许点击保存按钮
+      rules: {
+        deviceId: [{ required: true, message: '设备编号不能为空', trigger: ['blur', 'change'] }],
+        ip: [{ trigger: ['blur', 'change'], validator: validateIp }],
+        port: [{ trigger: ['blur', 'change'], validator: validatePort }]
+      } // 前端校验规则
+    }
+  },
+  computed: {
+    watchDeviceId() { // 监控权属单位变化
+      return this.configForm.deviceId
+    },
+    showIp() { // 是否显示ip配置
+      return true
+    }
+  },
+  watch: {
+    watchDeviceId(newValue, oldValue) {
+      for (const device of this.devices) {
+        if (device.id === newValue) {
+          this.deviceForm.deviceTypeName = device.deviceTypeName
+          this.deviceForm.deptName = device.deptName
+          this.deviceForm.deviceName = device.deviceName
+          return
+        }
+      }
+    }
+  },
+  methods: {
+    // 初始化对话框
+    initDialog: function(dialogStatus, dialogFormVisible, row = null) {
+      this.dialogStatus = dialogStatus
+      this.dialogFormVisible = dialogFormVisible
+      this.canEdit = true
+      if (dialogStatus === 'create') { // 如果是新增，清除验证
+        this.resetForm()
+        this.fetchDevice()
+        this.$nextTick(() => {
+          this.$refs['dataForm'].clearValidate()
+        })
+      } else if (dialogStatus === 'update') { // 如果是修改，将row中数据填写到输入框中
+        this.deviceForm = {
+          deviceName: row.deviceName,
+          devcode: row.devcode,
+          deptName: row.deptName,
+          deviceType: row.deviceType,
+          deviceTypeName: row.deviceTypeName
+        }
+        this.configForm = {
+          id: row.id,
+          deviceId: row.deviceId, // 设备id
+          ip: row.ip, // ip地址
+          port: row.port, // 端口号
+          attemptsMax: row.attemptsMax // 最大尝试次数
+        }
+      }
+    },
+    // 重置表单
+    resetForm() {
+      this.deviceForm = {
+        deviceName: '',
+        deviceTypeName: '',
+        deptName: '',
+        devcode: ''
+      }
+      this.configForm = {
+        deviceId: '', // 设备id
+        ip: '', // ip地址
+        port: '', // 端口号
+        attemptsMax: '3' // 最大尝试次数
+      }
+    },
+    // 保存数据
+    saveData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          this.canEdit = false
+          editWellliquidConfig(this.configForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('配置成功')
+              this.$emit('watchChild')
+              this.dialogFormVisible = false
+            }
+            this.canEdit = false
+          }).catch(_ => {
+            this.canEdit = true
+          })
+        }
+      })
+    },
+    // 获取未下发配置的设备列表
+    fetchDevice() {
+      this.loading = true
+      getDeviceSimpleList('13', '0').then(response => {
+        this.loading = false
+        this.devices = response.data
+      })
+    },
+    cancel: function() {
+      this.dialogFormVisible = false
+      this.$emit('watchChild')
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .el-select{
+    width: 100%;
+  }
+  .el-input-number{
+    width: 100%;
+  }
+</style>
diff --git a/src/views/deviceConfig/components/listWellLiquidConfig.vue b/src/views/deviceConfig/components/listWellLiquidConfig.vue
new file mode 100644
index 0000000..34fcf41
--- /dev/null
+++ b/src/views/deviceConfig/components/listWellLiquidConfig.vue
@@ -0,0 +1,299 @@
+<template>
+  <app-container>
+    <!--筛选条件-->
+    <search-area size="small" @search="search">
+      <search-item>
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="设备编号" clearable />
+      </search-item>
+      <search-item>
+        <dept-select v-model="listQuery.deptid" :need-top="deptShowTop" dept-type="03" placeholder="选择权属单位" />
+      </search-item>
+    </search-area>
+    <!--查询结果Table显示-->
+    <div>
+      <el-row class="table-title">
+        <el-col :span="6">
+          <div class="title-header">
+            <i class="el-icon-menu" />数据列表
+          </div>
+        </el-col>
+        <el-col :span="12" :offset="6" class="edit_btns">
+          <el-button v-if="hasPerm('/busConfig/wellliquidConfig/batchExport')" class="edit_btn" size="small" @click="batchExport">
+            导出记录
+          </el-button>
+          <download-template :filename="filename" />
+          <el-upload
+            v-if="hasPerm('/busConfig/wellliquidConfig/batchImport')"
+            :limit="1"
+            :show-file-list="false"
+            :http-request="uploadFile"
+            :file-list="fileList"
+            action="string"
+            accept=".xls,.xlsx"
+            class="edit_btn"
+          >
+            <el-button v-if="hasPerm('/busConfig/wellliquidConfig/batchImport')" slot="trigger" size="small">
+              批量导入
+            </el-button>
+          </el-upload>
+          <el-button v-if="hasPerm('/busConfig/wellliquidConfig/config')" class="edit_btn" size="small" @click="add">
+            新增
+          </el-button>
+        </el-col>
+      </el-row>
+      <el-table v-loading="listLoading" :data="list" class="table" border @selection-change="handleSelectionChange">
+        <!--<el-table-column align="center" type="selection" width="55"/>-->
+        <el-table-column :index="indexMethod" align="center" type="index" />
+        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
+          <template slot-scope="scope">
+            {{ scope.row[column.value] }}
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" align="center" width="60">
+          <template slot-scope="scope">
+            <el-button type="text" @click="edit(scope.row)">
+              编辑
+            </el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+    </div>
+    <!--分页-->
+    <div class="pagination-container">
+      <el-pagination
+        v-show="total>listQuery.limit"
+        :current-page="listQuery.offset"
+        :page-sizes="[20,30,50]"
+        :page-size="listQuery.limit"
+        :total="total"
+        align="center"
+        layout="total, sizes, prev, pager, next"
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"
+      />
+    </div>
+    <edit-wellliquid-config v-show="editShow" ref="editconfig" @watchChild="fetchData" />
+  </app-container>
+</template>
+
+<script>
+import { getWellliquidConfigList, batchImportWellliquidConfig, batchExportWellliquidConfig } from '@/api/config/wellliquidconfig'
+import EditWellliquidConfig from './editWellliquidConfig'
+import DownloadTemplate from '@/components/DownloadTemplate/index'
+import DeptSelect from '@/components/DeptSelect/index'
+
+export default {
+  name: 'ListWellliquidConfig',
+  components: { DeptSelect, DownloadTemplate, EditWellliquidConfig },
+  data() {
+    return {
+      listQuery: {
+        keywords: '',
+        offset: 1,
+        limit: 20,
+        sort: '',
+        order: ''
+      }, // 筛选条件
+      columns: [
+        {
+          text: '设备编号',
+          value: 'devcode',
+          align: 'center'
+        },
+        {
+          text: 'IP地址',
+          value: 'ip',
+          align: 'center'
+        },
+        {
+          text: '端口',
+          value: 'port',
+          align: 'center'
+        },
+        {
+          text: '最大尝试次数',
+          value: 'attemptsMax',
+          align: 'center'
+        },
+        {
+          text: '已尝试次数',
+          value: 'attemptsCurrent',
+          align: 'center'
+        },
+        {
+          text: '下发状态',
+          value: 'statusName',
+          width: 80,
+          align: 'center'
+        }
+      ], // 显示列
+      multipleSelection: [], // 多选选中项
+      list: [], // 列表数据
+      total: 0, // 数据总数
+      deviceTypeList: [], // 燃气配置类型列表
+      deptProps: {
+        parent: 'pid',
+        value: 'id',
+        label: 'name',
+        children: 'children'
+      }, // 权属单位树形下拉菜单
+      deptTreeList: null, // 组织树列表数据
+      showDeptTree: 0, // 是否显示权属单位下拉
+      showDeviceType: true, // 是否显示设备类型下拉
+      listLoading: true, // 加载动画
+      fullscreenLoading: false, // 全屏加载动画
+      editShow: false, // 是否显示编辑框
+      detailShow: false, // 是否显示编辑框
+      filename: 'wellliquid_config_template.xlsx',
+      deptShowTop: false,
+      fileList: []
+    }
+  },
+  created() {
+    this.fetchData()// 获取数据
+  },
+  methods: {
+    // 打开详情对话框
+    checkSelection() {
+      if (this.multipleSelection.length === 0) {
+        return false
+      } else {
+        return true
+      }
+    },
+    // 新增设备
+    add() {
+      this.dialogFormVisible = true
+      this.editShow = true
+      this.$refs.editconfig.initDialog('create', this.dialogFormVisible)
+    },
+    // 编辑燃气配置信息
+    edit(row) {
+      this.dialogFormVisible = true
+      this.editShow = true
+      this.$refs.editconfig.initDialog('update', this.dialogFormVisible, row)
+    },
+    // 批量导入燃气配置
+    uploadFile(param) {
+      // 判断文件大小是否符合要求
+      const _file = param.file
+      const isLt5M = _file.size / 1024 / 1024 < 5
+      if (!isLt5M) {
+        this.$message.error('请上传5M以下的excel文件')
+        return false
+      }
+      // 全屏加载动画
+      const loading = this.$loading({
+        lock: true,
+        text: '导入中,请稍后...',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
+      })
+      // 发起导入请求
+      batchImportWellliquidConfig(_file).then(res => {
+        loading.close() // 关闭加载动画
+        if (res.code === 200) {
+          this.$message.success('导入成功')
+          this.fetchData(false)
+        } else {
+          this.$message.error(res.message)
+        }
+      }).catch(() => {
+        loading.close() // 关闭加载动画
+      })
+      this.fileList = []
+    },
+    // 批量导出
+    batchExport() {
+      // 全屏加载动画
+      const loading = this.$loading({
+        lock: true,
+        text: '数据处理中,请稍后...',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
+      })
+      batchExportWellliquidConfig(this.listQuery).then(res => {
+        loading.close() // 关闭加载动画
+        console.log('download===', res)
+        const blob = new Blob([res.data])
+        const downloadElement = document.createElement('a')
+        const href = window.URL.createObjectURL(blob) // 创建下载的链接
+        downloadElement.href = href
+        downloadElement.download = `井盖配置列表.xlsx` // 下载后文件名
+        document.body.appendChild(downloadElement)
+        downloadElement.click() // 点击下载
+        document.body.removeChild(downloadElement) // 下载完成移除元素
+        window.URL.revokeObjectURL(href) // 释放blob对象
+      }).catch((res) => {
+        loading.close()
+        this.$message.error(res.message)
+      })
+    },
+    // 查询数据
+    search() {
+      this.fetchData(false)
+    },
+    // 获取燃气配置数据
+    fetchData(isNowPage = true) {
+      this.listLoading = true
+      if (!isNowPage) { // 是否显示当前页，否则跳转第一页
+        this.listQuery.offset = 1
+      }
+      getWellliquidConfigList(this.listQuery).then(response => {
+        this.list = response.data.rows
+        this.total = parseInt(response.data.total)
+        this.listLoading = false
+      })
+    },
+    indexMethod(index) {
+      return this.listQuery.limit * (this.listQuery.offset - 1) + index + 1
+    },
+    // 改变页容量
+    handleSizeChange(val) {
+      this.listQuery.limit = val
+      this.fetchData()
+    },
+    // 改变当前页
+    handleCurrentChange(val) {
+      this.listQuery.offset = val
+      this.fetchData()
+    },
+    // 多选触发方法
+    handleSelectionChange(val) {
+      this.multipleSelection = val
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .app-container{
+    padding: 10px;
+  }
+  $tableTitleHeight:46px;
+  .table{
+    margin-bottom: 20px;
+  }
+  .pagination-container{
+    margin-bottom: 50px;
+  }
+  .table-title{
+    background-color:rgba(243, 243, 243, 1);
+    height: $tableTitleHeight;
+    .title-header{
+      line-height:$tableTitleHeight;
+      color: #606266;
+      font-size: 15px;
+      i{
+        margin-left: 5px;
+        margin-right: 5px;
+      }
+    }
+  }
+  .edit_btns{
+    .edit_btn{
+      float:right;
+      margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2
+    }
+  }
+</style>

diff --git a/src/api/config/wellcoverconfig.js b/src/api/config/wellcoverconfig.js
index ecdd676..6b83752 100644
--- a/src/api/config/wellcoverconfig.js
+++ b/src/api/config/wellcoverconfig.js
@@ -12,11 +12,11 @@
 }
 
 // 修改燃气配置
-export function editWellcoverConfig(params) {
+export function editWellcoverConfig(data) {
   return request({
     url: 'busConfig/wellcoverConfig/config',
     method: 'post',
-    params
+    data
   })
 }
 
diff --git a/src/api/config/wellliquidconfig.js b/src/api/config/wellliquidconfig.js
new file mode 100644
index 0000000..c7c4838
--- /dev/null
+++ b/src/api/config/wellliquidconfig.js
@@ -0,0 +1,42 @@
+/**
+ * 井盖配置接口
+ */
+import request from '@/utils/request'
+// 燃气配置查询
+export function getWellliquidConfigList(params) {
+  return request({
+    url: 'busConfig/wellliquidConfig/list',
+    method: 'get',
+    params
+  })
+}
+
+// 修改燃气配置
+export function editWellliquidConfig(data) {
+  return request({
+    url: 'busConfig/wellliquidConfig/config',
+    method: 'post',
+    data
+  })
+}
+
+// 批量导入
+export function batchImportWellliquidConfig(fileobj) {
+  const param = new FormData()
+  param.append('file', fileobj)
+  return request({
+    url: 'busConfig/wellliquidConfig/batchImport',
+    method: 'post',
+    headers: { 'Content-Type': 'multipart/form-data' },
+    data: param
+  })
+}
+// 批量导出
+export function batchExportWellliquidConfig(params) {
+  return request({
+    url: 'busConfig/wellliquidConfig/batchExport',
+    method: 'get',
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
diff --git a/src/api/data/data.js b/src/api/data/data.js
index c437d7b..cba92e9 100644
--- a/src/api/data/data.js
+++ b/src/api/data/data.js
@@ -394,3 +394,31 @@
     responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
   })
 }
+
+// 井盖数据查询
+export function getWellLiquidData(params) {
+  return request({
+    url: 'wellliquiddata/list-page',
+    method: 'get',
+    params
+  })
+}
+// 井盖数据查询，不分页
+export function getWellLiquidDataSingle(params) {
+  return request({
+    url: 'wellliquiddata/list',
+    method: 'get',
+    params
+  })
+}
+// 批量导出井盖数据
+export function batchExportWellLiquidData(params) {
+  return request({
+    url: 'wellliquiddata/export',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
diff --git a/src/components/BigData/Card/panelCard.vue b/src/components/BigData/Card/panelCard.vue
index d6a7b89..8283d7f 100644
--- a/src/components/BigData/Card/panelCard.vue
+++ b/src/components/BigData/Card/panelCard.vue
@@ -35,12 +35,13 @@
     font-size: 16px;
     font-weight: bold;
     padding: 0px 10px;
+    padding-right: 0px;
     border-left: 5px solid #66b1ff;
     position: relative;
     .title-right{
       display: inline-block;
       position: absolute;
-      right: 10px;
+      right: 0px;
     }
   }
   .panel-body{
diff --git a/src/views/alarmManage/listAlarmNow.vue b/src/views/alarmManage/listAlarmNow.vue
index 7392a4a..9f5a0b6 100644
--- a/src/views/alarmManage/listAlarmNow.vue
+++ b/src/views/alarmManage/listAlarmNow.vue
@@ -361,7 +361,7 @@
         const supportDeviceTypes = this.$store.getters.deviceTypes
         for (const item of response.data.list) {
           const deviceType = '' + item.deviceType
-          if (supportDeviceTypes.indexOf(deviceType) !== -1) {
+          if (supportDeviceTypes.indexOf(deviceType) !== -1 && this.alarmContentTypeList.findIndex(t => t.name === item.name) === -1) {
             this.alarmContentTypeList.push(item)
           }
         }
diff --git a/src/views/alarmManage/listAlarmRecords.vue b/src/views/alarmManage/listAlarmRecords.vue
index 2e34a39..b5d233c 100644
--- a/src/views/alarmManage/listAlarmRecords.vue
+++ b/src/views/alarmManage/listAlarmRecords.vue
@@ -352,7 +352,7 @@
         const supportDeviceTypes = this.$store.getters.deviceTypes
         for (const item of response.data.list) {
           const deviceType = '' + item.deviceType
-          if (supportDeviceTypes.indexOf(deviceType) !== -1) {
+          if (supportDeviceTypes.indexOf(deviceType) !== -1 && this.alarmContentTypeList.findIndex(t => t.name === item.name) === -1) {
             this.alarmContentTypeList.push(item)
           }
         }
diff --git a/src/views/alarmStatics/components/alarmWellRank.vue b/src/views/alarmStatics/components/alarmWellRank.vue
index 89ffa18..acf1598 100644
--- a/src/views/alarmStatics/components/alarmWellRank.vue
+++ b/src/views/alarmStatics/components/alarmWellRank.vue
@@ -75,7 +75,7 @@
       getAlarmContentType('1').then(response => {
         const supportDeviceTypes = this.$store.getters.deviceTypes
         for (const item of response.data.list) {
-          if (supportDeviceTypes.indexOf('' + item.deviceType) !== -1) {
+          if (supportDeviceTypes.indexOf('' + item.deviceType) !== -1 && this.alarmContentTypeList.findIndex(t => t.name === item.name) === -1) {
             this.alarmContentTypeList.push(item)
           }
         }
diff --git a/src/views/dataManage/dataManage.vue b/src/views/dataManage/dataManage.vue
index b1d6a3b..44c099a 100644
--- a/src/views/dataManage/dataManage.vue
+++ b/src/views/dataManage/dataManage.vue
@@ -23,11 +23,12 @@
 import ListPantiltData from '@/views/dataManage/deviceData/listPantiltData'
 import ListHydrantData from '@/views/dataManage/deviceData/listHydrantData'
 import ListH2SData from '@/views/dataManage/deviceData/listH2SData'
+import ListWellLiquidData from '@/views/dataManage/deviceData/listWellLiquidData'
 import { parseUrl } from '@/utils/parseutils'
 
 export default {
   name: 'DataManage',
-  components: { ListH2SData, ListHydrantData, ListPantiltData, ListGasdectorData, ListTubeData, ListNoiseData, ListWellLocaData, ListTempData, ListHarmfulData, ListDigData, ListGasData, ListLiquidData, ListWellCoverData, ListLiquidGasData },
+  components: { ListH2SData, ListHydrantData, ListPantiltData, ListGasdectorData, ListTubeData, ListNoiseData, ListWellLocaData, ListTempData, ListHarmfulData, ListDigData, ListGasData, ListLiquidData, ListWellCoverData, ListLiquidGasData, ListWellLiquidData },
   data() {
     return {
       activeName: 'wellcover',
@@ -45,7 +46,8 @@
         { 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: '14', comp: 'list-H2S-data' }
+        { permission: '/wellliquiddata/list-page', label: '硫化氢浓度监测仪', name: 'H2S', type: '14', comp: 'list-H2S-data' },
+        { permission: '/wellliquiddata/list-page', label: '井盖液位一体机', name: 'wellliquid', type: '13', comp: 'list-well-liquid-data' }
       ] // 所有tab列表
     }
   },
diff --git a/src/views/dataManage/deviceData/listWellLiquidData.vue b/src/views/dataManage/deviceData/listWellLiquidData.vue
new file mode 100644
index 0000000..599039e
--- /dev/null
+++ b/src/views/dataManage/deviceData/listWellLiquidData.vue
@@ -0,0 +1,228 @@
+<template>
+  <app-container>
+    <!--筛选条件-->
+    <search-area size="small" @search="search">
+      <search-item>
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
+      </search-item>
+      <search-item>
+        <dept-select
+          v-model="listQuery.deptid"
+          :need-top="false"
+          dept-type="03"
+          size="small"
+          placeholder="选择权属单位"
+        />
+      </search-item>
+      <search-item>
+        <el-date-picker
+          v-model="timeRange"
+          size="small"
+          type="datetimerange"
+          range-separator="至"
+          value-format="yyyy-MM-dd HH:mm:ss"
+          start-placeholder="开始时间"
+          end-placeholder="结束时间"
+        />
+      </search-item>
+    </search-area>
+    <!--查询结果Table显示-->
+    <normal-table
+      ref="normalTable"
+      :data="list"
+      :total="total"
+      :query="listQuery"
+      :list-loading="listLoading"
+      :options="options"
+      size="small"
+      @change="changePage"
+    >
+      <template slot="btns">
+        <el-button v-if="hasPerm('/wellLiquidData/export')" size="small" @click="batchExport">
+          导出记录
+        </el-button>
+      </template>
+      <template slot="columns">
+        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
+          <template slot-scope="scope">
+            <span v-if="column.checkCell" :class="checkCell(scope.row.cell)">{{ scope.row[column.value] }}</span>
+            <span v-else>{{ scope.row[column.value] }}</span>
+          </template>
+        </el-table-column>
+      </template>
+    </normal-table>
+  </app-container>
+</template>
+
+<script>
+import { getWellLiquidData, batchExportWellLiquidData } from '@/api/data/data'
+import DeptSelect from '../../../components/DeptSelect/index'
+import { parseUrl } from '@/utils/parseutils'
+import { getSearchLastWeekTime } from '@/utils/dateutils'
+import { exportFile } from '@/utils/exportutils'
+
+export default {
+  name: 'ListWellLiquidData',
+  components: { DeptSelect },
+  props: {
+    type: {
+      type: String,
+      required: true
+    }, // 设备类型
+    name: {
+      type: String,
+      default: ''
+    } // 设备名称
+  },
+  data() {
+    return {
+      listQuery: {
+        keywords: '', // 关键字
+        deptid: '', // 部门id
+        beginTime: '', // 开始时间
+        endTime: '', // 结束时间
+        offset: 1,
+        limit: 20,
+        sort: '',
+        order: ''
+      }, // 筛选条件
+      timeRange: [], // 时间范围
+      columns: [
+        {
+          text: '设备编号',
+          value: 'devcode',
+          align: 'center'
+        },
+        {
+          text: '点位编号',
+          value: 'wellCode',
+          align: 'center'
+        },
+        {
+          text: '设备类型',
+          value: 'deviceTypeName',
+          align: 'center'
+        },
+        {
+          text: '状态描述',
+          value: 'descn',
+          align: 'center',
+          checkState: true
+        },
+        {
+          text: '权属单位',
+          value: 'deptName',
+          align: 'center'
+        },
+        {
+          text: '上传时间',
+          value: 'logtime',
+          width: 170,
+          align: 'center'
+        }
+      ], // 显示列
+      list: [], // 列表数据
+      total: 0, // 数据总数
+      options: {
+        needIndex: true, // 是否需要序号列
+        border: true // 是否需要上方边框
+      },
+      listLoading: true, // 加载动画
+      fullscreenLoading: false, // 全屏加载动画
+      editShow: false // 是否显示编辑框
+    }
+  },
+  mounted() {
+    // 如果路径里带参数，解析devcode参数
+    this.timeRange = getSearchLastWeekTime()
+    if (window.location.href) {
+      const params = parseUrl(window.location.href)
+      if (params && params.deviceType === this.type && params.devcode) {
+        this.listQuery.keywords = params.devcode
+        this.fetchData()
+      } else {
+        this.fetchData()
+      }
+    }
+  },
+  activated() {
+    // 要是路由里有参数
+    if (this.$route.query && this.$route.query.devcode) {
+      this.listQuery.keywords = this.$route.query.devcode
+      this.fetchData(false)// 获取数据
+    } else {
+      this.fetchData()
+    }
+  },
+  methods: {
+    // 批量导出
+    batchExport() {
+      // this.handleDateTime()
+      // 全屏加载动画
+      const loading = this.$loading({
+        lock: true,
+        text: '下载中,请稍后...',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
+      })
+      batchExportWellLiquidData(this.listQuery).then(res => {
+        loading.close() // 关闭加载动画
+        let fileName = `${this.name}数据-${this.listQuery.beginTime}-${this.listQuery.endTime}.xlsx`
+        fileName = fileName.replace(/-|:| /g, '')
+        const blob = new Blob([res.data])
+        exportFile(blob, fileName)
+      }).catch((res) => {
+        loading.close()
+      })
+    },
+    // 查询数据
+    search() {
+      this.fetchData(false)
+    },
+    // 获取井盖数据
+    fetchData(isNowPage = true) {
+      this.listLoading = true
+      if (!isNowPage) { // 是否显示当前页，否则跳转第一页
+        this.listQuery.offset = 1
+      }
+      this.handleDateTime()
+      getWellLiquidData(this.listQuery).then(response => {
+        this.list = response.data.rows
+        this.total = response.data.total
+        this.listLoading = false
+      })
+    },
+    // 处理时间
+    handleDateTime() {
+      if (this.timeRange && this.timeRange.length > 0) {
+        this.listQuery.beginTime = this.timeRange[0]
+        this.listQuery.endTime = this.timeRange[1]
+      } else {
+        this.listQuery.beginTime = ''
+        this.listQuery.endTime = ''
+      }
+    },
+    checkState(row) {
+      if (row.status !== '0') {
+        return 'warning-state'
+      }
+    },
+    // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+    changePage(val) {
+      if (val && val.size) {
+        this.listQuery.limit = val.size
+      }
+      if (val && val.page) {
+        this.listQuery.offset = val.page
+      }
+      this.fetchData()
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+.warning-state{
+  color:red
+}
+</style>
diff --git a/src/views/dataView/components/alarmAnalysis.vue b/src/views/dataView/components/alarmAnalysis.vue
index 3ac21d8..f9949ea 100644
--- a/src/views/dataView/components/alarmAnalysis.vue
+++ b/src/views/dataView/components/alarmAnalysis.vue
@@ -76,7 +76,12 @@
     },
     // 获取各类报警的列表
     fetchAlarmByContent() {
-      alarmStaticsByContent(this.listQuery).then(response => {
+      const query = {
+        alarmType: '1',
+        beginTime: this.listQuery.beginTime,
+        endTime: this.listQuery.endTime
+      }
+      alarmStaticsByContent(query).then(response => {
         this.tableList = response.data
       })
     },
diff --git a/src/views/deviceConfig/components/editWellliquidConfig.vue b/src/views/deviceConfig/components/editWellliquidConfig.vue
new file mode 100644
index 0000000..70277d4
--- /dev/null
+++ b/src/views/deviceConfig/components/editWellliquidConfig.vue
@@ -0,0 +1,241 @@
+<template>
+  <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" append-to-body>
+    <el-form ref="dataForm" :rules="rules" :model="configForm" label-well-code="right" label-width="110px">
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item v-if="dialogStatus=='create'" label="设备编号" prop="deviceId">
+            <el-select
+              v-model="configForm.deviceId"
+              :loading="loading"
+              :disabled="dialogStatus=='update'?true:false"
+              filterable
+              placeholder="请输入设备编号"
+            >
+              <el-option
+                v-for="item in devices"
+                :key="item.id"
+                :label="item.devcode"
+                :value="item.id"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item v-if="dialogStatus=='update'" label="设备编号">
+            <el-input v-model="deviceForm.devcode" type="text" placeholder="未知" disabled />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item v-if="deviceForm.deviceName!=''" label="设备名称">
+            <el-input v-model="deviceForm.deviceName" type="text" placeholder="未知" disabled />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item v-if="deviceForm.deviceTypeName!=''" label="设备类型" prop="deviceType">
+            <el-input v-model="deviceForm.deviceTypeName" type="text" placeholder="未知" disabled />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item v-if="deviceForm.deptName!=''" label="权属单位" prop="deptName">
+            <el-input v-model="deviceForm.deptName" type="text" placeholder="未知" disabled />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row v-if="showIp" :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="ip地址" prop="ip">
+            <el-input v-model.trim="configForm.ip" type="text" placeholder="非必填" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="端口号" prop="port">
+            <el-input v-model.trim="configForm.port" type="text" placeholder="非必填" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="最大尝试次数">
+            <el-input-number v-model="configForm.attemptsMax" :min="1" :max="100" type="text" placeholder="必填" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <div slot="footer" class="dialog-footer">
+      <el-button :disabled="!canEdit" type="primary" @click="saveData">
+        保存
+      </el-button>
+      <el-button @click="cancel">
+        取消
+      </el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { editWellliquidConfig } from '@/api/config/wellliquidconfig'
+import { getDeviceSimpleList } from '@/api/config/liquidconfig'
+export default {
+  name: 'EditWellliquidConfig',
+  data() {
+    const validateIp = (rule, value, callback) => {
+      if (value !== '') {
+        if ((/((25[0-5]|2[0-4]\d|((1\d{2})|([1-9]?\d)))\.){3}(25[0-5]|2[0-4]\d|((1\d{2})|([1-9]?\d)))/).test(value) === false) {
+          callback(new Error('请填写正确的ip地址'))
+        } else {
+          callback()
+        }
+      } else {
+        // callback(new Error('ip地址不能为空'))
+        callback()
+      }
+    }
+    const validatePort = (rule, value, callback) => {
+      if (value !== '') {
+        if ((/[1-9]$|(^[1-9][0-9]$)|(^[1-9][0-9][0-9]$)|(^[1-9][0-9][0-9][0-9]$)|(^[1-6][0-5][0-5][0-3][0-5]$)/).test(value) === false) {
+          callback(new Error('请填写正确的端口号'))
+        } else {
+          callback()
+        }
+      } else {
+        // callback(new Error('端口号不能为空'))
+        callback()
+      }
+    }
+    return {
+      dialogFormVisible: false, // 对话框是否显示
+      dialogStatus: '', // 对话框类型：create,update
+      deviceForm: {
+        deviceName: '',
+        deviceTypeName: '',
+        deptName: '',
+        devcode: '',
+        deviceType: ''
+      }, // 设备基本信息
+      configForm: {
+        id: '', // config id
+        deviceId: '', // 设备id
+        attemptsMax: '3', // 最大尝试次数
+        ip: '', // ip地址
+        port: '' // 端口号
+      },
+      textMap: {
+        update: '编辑',
+        create: '新增'
+      }, // 表头显示标题
+      devices: [], // 设备下拉选择列表
+      loading: false, // 加载动画是否显示
+      canEdit: true, // 是否允许点击保存按钮
+      rules: {
+        deviceId: [{ required: true, message: '设备编号不能为空', trigger: ['blur', 'change'] }],
+        ip: [{ trigger: ['blur', 'change'], validator: validateIp }],
+        port: [{ trigger: ['blur', 'change'], validator: validatePort }]
+      } // 前端校验规则
+    }
+  },
+  computed: {
+    watchDeviceId() { // 监控权属单位变化
+      return this.configForm.deviceId
+    },
+    showIp() { // 是否显示ip配置
+      return true
+    }
+  },
+  watch: {
+    watchDeviceId(newValue, oldValue) {
+      for (const device of this.devices) {
+        if (device.id === newValue) {
+          this.deviceForm.deviceTypeName = device.deviceTypeName
+          this.deviceForm.deptName = device.deptName
+          this.deviceForm.deviceName = device.deviceName
+          return
+        }
+      }
+    }
+  },
+  methods: {
+    // 初始化对话框
+    initDialog: function(dialogStatus, dialogFormVisible, row = null) {
+      this.dialogStatus = dialogStatus
+      this.dialogFormVisible = dialogFormVisible
+      this.canEdit = true
+      if (dialogStatus === 'create') { // 如果是新增，清除验证
+        this.resetForm()
+        this.fetchDevice()
+        this.$nextTick(() => {
+          this.$refs['dataForm'].clearValidate()
+        })
+      } else if (dialogStatus === 'update') { // 如果是修改，将row中数据填写到输入框中
+        this.deviceForm = {
+          deviceName: row.deviceName,
+          devcode: row.devcode,
+          deptName: row.deptName,
+          deviceType: row.deviceType,
+          deviceTypeName: row.deviceTypeName
+        }
+        this.configForm = {
+          id: row.id,
+          deviceId: row.deviceId, // 设备id
+          ip: row.ip, // ip地址
+          port: row.port, // 端口号
+          attemptsMax: row.attemptsMax // 最大尝试次数
+        }
+      }
+    },
+    // 重置表单
+    resetForm() {
+      this.deviceForm = {
+        deviceName: '',
+        deviceTypeName: '',
+        deptName: '',
+        devcode: ''
+      }
+      this.configForm = {
+        deviceId: '', // 设备id
+        ip: '', // ip地址
+        port: '', // 端口号
+        attemptsMax: '3' // 最大尝试次数
+      }
+    },
+    // 保存数据
+    saveData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          this.canEdit = false
+          editWellliquidConfig(this.configForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('配置成功')
+              this.$emit('watchChild')
+              this.dialogFormVisible = false
+            }
+            this.canEdit = false
+          }).catch(_ => {
+            this.canEdit = true
+          })
+        }
+      })
+    },
+    // 获取未下发配置的设备列表
+    fetchDevice() {
+      this.loading = true
+      getDeviceSimpleList('13', '0').then(response => {
+        this.loading = false
+        this.devices = response.data
+      })
+    },
+    cancel: function() {
+      this.dialogFormVisible = false
+      this.$emit('watchChild')
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .el-select{
+    width: 100%;
+  }
+  .el-input-number{
+    width: 100%;
+  }
+</style>
diff --git a/src/views/deviceConfig/components/listWellLiquidConfig.vue b/src/views/deviceConfig/components/listWellLiquidConfig.vue
new file mode 100644
index 0000000..34fcf41
--- /dev/null
+++ b/src/views/deviceConfig/components/listWellLiquidConfig.vue
@@ -0,0 +1,299 @@
+<template>
+  <app-container>
+    <!--筛选条件-->
+    <search-area size="small" @search="search">
+      <search-item>
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="设备编号" clearable />
+      </search-item>
+      <search-item>
+        <dept-select v-model="listQuery.deptid" :need-top="deptShowTop" dept-type="03" placeholder="选择权属单位" />
+      </search-item>
+    </search-area>
+    <!--查询结果Table显示-->
+    <div>
+      <el-row class="table-title">
+        <el-col :span="6">
+          <div class="title-header">
+            <i class="el-icon-menu" />数据列表
+          </div>
+        </el-col>
+        <el-col :span="12" :offset="6" class="edit_btns">
+          <el-button v-if="hasPerm('/busConfig/wellliquidConfig/batchExport')" class="edit_btn" size="small" @click="batchExport">
+            导出记录
+          </el-button>
+          <download-template :filename="filename" />
+          <el-upload
+            v-if="hasPerm('/busConfig/wellliquidConfig/batchImport')"
+            :limit="1"
+            :show-file-list="false"
+            :http-request="uploadFile"
+            :file-list="fileList"
+            action="string"
+            accept=".xls,.xlsx"
+            class="edit_btn"
+          >
+            <el-button v-if="hasPerm('/busConfig/wellliquidConfig/batchImport')" slot="trigger" size="small">
+              批量导入
+            </el-button>
+          </el-upload>
+          <el-button v-if="hasPerm('/busConfig/wellliquidConfig/config')" class="edit_btn" size="small" @click="add">
+            新增
+          </el-button>
+        </el-col>
+      </el-row>
+      <el-table v-loading="listLoading" :data="list" class="table" border @selection-change="handleSelectionChange">
+        <!--<el-table-column align="center" type="selection" width="55"/>-->
+        <el-table-column :index="indexMethod" align="center" type="index" />
+        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
+          <template slot-scope="scope">
+            {{ scope.row[column.value] }}
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" align="center" width="60">
+          <template slot-scope="scope">
+            <el-button type="text" @click="edit(scope.row)">
+              编辑
+            </el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+    </div>
+    <!--分页-->
+    <div class="pagination-container">
+      <el-pagination
+        v-show="total>listQuery.limit"
+        :current-page="listQuery.offset"
+        :page-sizes="[20,30,50]"
+        :page-size="listQuery.limit"
+        :total="total"
+        align="center"
+        layout="total, sizes, prev, pager, next"
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"
+      />
+    </div>
+    <edit-wellliquid-config v-show="editShow" ref="editconfig" @watchChild="fetchData" />
+  </app-container>
+</template>
+
+<script>
+import { getWellliquidConfigList, batchImportWellliquidConfig, batchExportWellliquidConfig } from '@/api/config/wellliquidconfig'
+import EditWellliquidConfig from './editWellliquidConfig'
+import DownloadTemplate from '@/components/DownloadTemplate/index'
+import DeptSelect from '@/components/DeptSelect/index'
+
+export default {
+  name: 'ListWellliquidConfig',
+  components: { DeptSelect, DownloadTemplate, EditWellliquidConfig },
+  data() {
+    return {
+      listQuery: {
+        keywords: '',
+        offset: 1,
+        limit: 20,
+        sort: '',
+        order: ''
+      }, // 筛选条件
+      columns: [
+        {
+          text: '设备编号',
+          value: 'devcode',
+          align: 'center'
+        },
+        {
+          text: 'IP地址',
+          value: 'ip',
+          align: 'center'
+        },
+        {
+          text: '端口',
+          value: 'port',
+          align: 'center'
+        },
+        {
+          text: '最大尝试次数',
+          value: 'attemptsMax',
+          align: 'center'
+        },
+        {
+          text: '已尝试次数',
+          value: 'attemptsCurrent',
+          align: 'center'
+        },
+        {
+          text: '下发状态',
+          value: 'statusName',
+          width: 80,
+          align: 'center'
+        }
+      ], // 显示列
+      multipleSelection: [], // 多选选中项
+      list: [], // 列表数据
+      total: 0, // 数据总数
+      deviceTypeList: [], // 燃气配置类型列表
+      deptProps: {
+        parent: 'pid',
+        value: 'id',
+        label: 'name',
+        children: 'children'
+      }, // 权属单位树形下拉菜单
+      deptTreeList: null, // 组织树列表数据
+      showDeptTree: 0, // 是否显示权属单位下拉
+      showDeviceType: true, // 是否显示设备类型下拉
+      listLoading: true, // 加载动画
+      fullscreenLoading: false, // 全屏加载动画
+      editShow: false, // 是否显示编辑框
+      detailShow: false, // 是否显示编辑框
+      filename: 'wellliquid_config_template.xlsx',
+      deptShowTop: false,
+      fileList: []
+    }
+  },
+  created() {
+    this.fetchData()// 获取数据
+  },
+  methods: {
+    // 打开详情对话框
+    checkSelection() {
+      if (this.multipleSelection.length === 0) {
+        return false
+      } else {
+        return true
+      }
+    },
+    // 新增设备
+    add() {
+      this.dialogFormVisible = true
+      this.editShow = true
+      this.$refs.editconfig.initDialog('create', this.dialogFormVisible)
+    },
+    // 编辑燃气配置信息
+    edit(row) {
+      this.dialogFormVisible = true
+      this.editShow = true
+      this.$refs.editconfig.initDialog('update', this.dialogFormVisible, row)
+    },
+    // 批量导入燃气配置
+    uploadFile(param) {
+      // 判断文件大小是否符合要求
+      const _file = param.file
+      const isLt5M = _file.size / 1024 / 1024 < 5
+      if (!isLt5M) {
+        this.$message.error('请上传5M以下的excel文件')
+        return false
+      }
+      // 全屏加载动画
+      const loading = this.$loading({
+        lock: true,
+        text: '导入中,请稍后...',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
+      })
+      // 发起导入请求
+      batchImportWellliquidConfig(_file).then(res => {
+        loading.close() // 关闭加载动画
+        if (res.code === 200) {
+          this.$message.success('导入成功')
+          this.fetchData(false)
+        } else {
+          this.$message.error(res.message)
+        }
+      }).catch(() => {
+        loading.close() // 关闭加载动画
+      })
+      this.fileList = []
+    },
+    // 批量导出
+    batchExport() {
+      // 全屏加载动画
+      const loading = this.$loading({
+        lock: true,
+        text: '数据处理中,请稍后...',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
+      })
+      batchExportWellliquidConfig(this.listQuery).then(res => {
+        loading.close() // 关闭加载动画
+        console.log('download===', res)
+        const blob = new Blob([res.data])
+        const downloadElement = document.createElement('a')
+        const href = window.URL.createObjectURL(blob) // 创建下载的链接
+        downloadElement.href = href
+        downloadElement.download = `井盖配置列表.xlsx` // 下载后文件名
+        document.body.appendChild(downloadElement)
+        downloadElement.click() // 点击下载
+        document.body.removeChild(downloadElement) // 下载完成移除元素
+        window.URL.revokeObjectURL(href) // 释放blob对象
+      }).catch((res) => {
+        loading.close()
+        this.$message.error(res.message)
+      })
+    },
+    // 查询数据
+    search() {
+      this.fetchData(false)
+    },
+    // 获取燃气配置数据
+    fetchData(isNowPage = true) {
+      this.listLoading = true
+      if (!isNowPage) { // 是否显示当前页，否则跳转第一页
+        this.listQuery.offset = 1
+      }
+      getWellliquidConfigList(this.listQuery).then(response => {
+        this.list = response.data.rows
+        this.total = parseInt(response.data.total)
+        this.listLoading = false
+      })
+    },
+    indexMethod(index) {
+      return this.listQuery.limit * (this.listQuery.offset - 1) + index + 1
+    },
+    // 改变页容量
+    handleSizeChange(val) {
+      this.listQuery.limit = val
+      this.fetchData()
+    },
+    // 改变当前页
+    handleCurrentChange(val) {
+      this.listQuery.offset = val
+      this.fetchData()
+    },
+    // 多选触发方法
+    handleSelectionChange(val) {
+      this.multipleSelection = val
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .app-container{
+    padding: 10px;
+  }
+  $tableTitleHeight:46px;
+  .table{
+    margin-bottom: 20px;
+  }
+  .pagination-container{
+    margin-bottom: 50px;
+  }
+  .table-title{
+    background-color:rgba(243, 243, 243, 1);
+    height: $tableTitleHeight;
+    .title-header{
+      line-height:$tableTitleHeight;
+      color: #606266;
+      font-size: 15px;
+      i{
+        margin-left: 5px;
+        margin-right: 5px;
+      }
+    }
+  }
+  .edit_btns{
+    .edit_btn{
+      float:right;
+      margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2
+    }
+  }
+</style>
diff --git a/src/views/deviceConfig/deviceConfig.vue b/src/views/deviceConfig/deviceConfig.vue
index f6189ff..eac828c 100644
--- a/src/views/deviceConfig/deviceConfig.vue
+++ b/src/views/deviceConfig/deviceConfig.vue
@@ -31,6 +31,9 @@
       <el-tab-pane v-if="hasPerm('/busConfig/H2sConfig/list')" label="硫化氢检测终端" name="h2s">
         <list-h2s-config ref="h2sConfig" />
       </el-tab-pane>
+      <el-tab-pane v-if="hasPerm('/busConfig/wellliquidConfig/list')" label="井盖液位一体机" name="wellliquid">
+        <list-wellliquid-config ref="wellliquidConfig" />
+      </el-tab-pane>
     </el-tabs>
   </div>
 </template>
@@ -47,9 +50,10 @@
 import ListTubeConfig from './components/listTubeConfig'
 import ListH2sConfig from './components/listH2sConfig'
 import ListWellcoverConfig from '@/views/deviceConfig/components/listWellCoverConfig'
+import ListWellliquidConfig from '@/views/deviceConfig/components/listWellLiquidConfig'
 export default {
   name: 'DeviceConfig',
-  components: { ListWellcoverConfig, ListH2sConfig, ListTubeConfig, ListLiquidGasConfig, ListNoiseConfig, ListDigConfig, ListTempConfig, ListHarmfulConfig, ListGasConfig, ListLiquidConfig },
+  components: { ListWellliquidConfig, ListWellcoverConfig, ListH2sConfig, ListTubeConfig, ListLiquidGasConfig, ListNoiseConfig, ListDigConfig, ListTempConfig, ListHarmfulConfig, ListGasConfig, ListLiquidConfig },
   data() {
     return {
       activeName: 'liquid'
@@ -61,7 +65,7 @@
   methods: {
     handleClick(tab, event) {
       if (tab.name === 'wellcover') {
-        this.$refs.wellcoveConfig.fetchData()
+        this.$refs.wellcoverConfig.fetchData()
       } else if (tab.name === 'liquid') {
         this.$refs.liquidConfig.fetchData()
       } else if (tab.name === 'harmful') {
@@ -80,12 +84,14 @@
         this.$refs.tubeConfig.fetchData()
       } else if (tab.name === 'h2s') {
         this.$refs.h2sConfig.fetchData()
+      } else if (tab.name === 'wellliquid') {
+        this.$refs.wellliquidConfig.fetchData()
       }
     },
     // 计算那个是当前第一个tab
     caclActive() {
       if (hasPermission('/busConfig/wellcoverConfig/list')) {
-        this.activeName = 'liquid'
+        this.activeName = 'wellcover'
       } else if (hasPermission('/busConfig/liquidConfig/list')) {
         this.activeName = 'liquid'
       } else if (hasPermission('/busConfig/gasConfig/list')) {
@@ -104,6 +110,8 @@
         this.activeName = 'tube'
       } else if (hasPermission('/busConfig/h2sConfig/list')) {
         this.activeName = 'h2s'
+      } else if (hasPermission('/busConfig/wellliquidConfig/list')) {
+        this.activeName = 'wellliquid'
       }
     }
   }

diff --git a/src/api/config/wellcoverconfig.js b/src/api/config/wellcoverconfig.js
index ecdd676..6b83752 100644
--- a/src/api/config/wellcoverconfig.js
+++ b/src/api/config/wellcoverconfig.js
@@ -12,11 +12,11 @@
 }
 
 // 修改燃气配置
-export function editWellcoverConfig(params) {
+export function editWellcoverConfig(data) {
   return request({
     url: 'busConfig/wellcoverConfig/config',
     method: 'post',
-    params
+    data
   })
 }
 
diff --git a/src/api/config/wellliquidconfig.js b/src/api/config/wellliquidconfig.js
new file mode 100644
index 0000000..c7c4838
--- /dev/null
+++ b/src/api/config/wellliquidconfig.js
@@ -0,0 +1,42 @@
+/**
+ * 井盖配置接口
+ */
+import request from '@/utils/request'
+// 燃气配置查询
+export function getWellliquidConfigList(params) {
+  return request({
+    url: 'busConfig/wellliquidConfig/list',
+    method: 'get',
+    params
+  })
+}
+
+// 修改燃气配置
+export function editWellliquidConfig(data) {
+  return request({
+    url: 'busConfig/wellliquidConfig/config',
+    method: 'post',
+    data
+  })
+}
+
+// 批量导入
+export function batchImportWellliquidConfig(fileobj) {
+  const param = new FormData()
+  param.append('file', fileobj)
+  return request({
+    url: 'busConfig/wellliquidConfig/batchImport',
+    method: 'post',
+    headers: { 'Content-Type': 'multipart/form-data' },
+    data: param
+  })
+}
+// 批量导出
+export function batchExportWellliquidConfig(params) {
+  return request({
+    url: 'busConfig/wellliquidConfig/batchExport',
+    method: 'get',
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
diff --git a/src/api/data/data.js b/src/api/data/data.js
index c437d7b..cba92e9 100644
--- a/src/api/data/data.js
+++ b/src/api/data/data.js
@@ -394,3 +394,31 @@
     responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
   })
 }
+
+// 井盖数据查询
+export function getWellLiquidData(params) {
+  return request({
+    url: 'wellliquiddata/list-page',
+    method: 'get',
+    params
+  })
+}
+// 井盖数据查询，不分页
+export function getWellLiquidDataSingle(params) {
+  return request({
+    url: 'wellliquiddata/list',
+    method: 'get',
+    params
+  })
+}
+// 批量导出井盖数据
+export function batchExportWellLiquidData(params) {
+  return request({
+    url: 'wellliquiddata/export',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
diff --git a/src/components/BigData/Card/panelCard.vue b/src/components/BigData/Card/panelCard.vue
index d6a7b89..8283d7f 100644
--- a/src/components/BigData/Card/panelCard.vue
+++ b/src/components/BigData/Card/panelCard.vue
@@ -35,12 +35,13 @@
     font-size: 16px;
     font-weight: bold;
     padding: 0px 10px;
+    padding-right: 0px;
     border-left: 5px solid #66b1ff;
     position: relative;
     .title-right{
       display: inline-block;
       position: absolute;
-      right: 10px;
+      right: 0px;
     }
   }
   .panel-body{
diff --git a/src/views/alarmManage/listAlarmNow.vue b/src/views/alarmManage/listAlarmNow.vue
index 7392a4a..9f5a0b6 100644
--- a/src/views/alarmManage/listAlarmNow.vue
+++ b/src/views/alarmManage/listAlarmNow.vue
@@ -361,7 +361,7 @@
         const supportDeviceTypes = this.$store.getters.deviceTypes
         for (const item of response.data.list) {
           const deviceType = '' + item.deviceType
-          if (supportDeviceTypes.indexOf(deviceType) !== -1) {
+          if (supportDeviceTypes.indexOf(deviceType) !== -1 && this.alarmContentTypeList.findIndex(t => t.name === item.name) === -1) {
             this.alarmContentTypeList.push(item)
           }
         }
diff --git a/src/views/alarmManage/listAlarmRecords.vue b/src/views/alarmManage/listAlarmRecords.vue
index 2e34a39..b5d233c 100644
--- a/src/views/alarmManage/listAlarmRecords.vue
+++ b/src/views/alarmManage/listAlarmRecords.vue
@@ -352,7 +352,7 @@
         const supportDeviceTypes = this.$store.getters.deviceTypes
         for (const item of response.data.list) {
           const deviceType = '' + item.deviceType
-          if (supportDeviceTypes.indexOf(deviceType) !== -1) {
+          if (supportDeviceTypes.indexOf(deviceType) !== -1 && this.alarmContentTypeList.findIndex(t => t.name === item.name) === -1) {
             this.alarmContentTypeList.push(item)
           }
         }
diff --git a/src/views/alarmStatics/components/alarmWellRank.vue b/src/views/alarmStatics/components/alarmWellRank.vue
index 89ffa18..acf1598 100644
--- a/src/views/alarmStatics/components/alarmWellRank.vue
+++ b/src/views/alarmStatics/components/alarmWellRank.vue
@@ -75,7 +75,7 @@
       getAlarmContentType('1').then(response => {
         const supportDeviceTypes = this.$store.getters.deviceTypes
         for (const item of response.data.list) {
-          if (supportDeviceTypes.indexOf('' + item.deviceType) !== -1) {
+          if (supportDeviceTypes.indexOf('' + item.deviceType) !== -1 && this.alarmContentTypeList.findIndex(t => t.name === item.name) === -1) {
             this.alarmContentTypeList.push(item)
           }
         }
diff --git a/src/views/dataManage/dataManage.vue b/src/views/dataManage/dataManage.vue
index b1d6a3b..44c099a 100644
--- a/src/views/dataManage/dataManage.vue
+++ b/src/views/dataManage/dataManage.vue
@@ -23,11 +23,12 @@
 import ListPantiltData from '@/views/dataManage/deviceData/listPantiltData'
 import ListHydrantData from '@/views/dataManage/deviceData/listHydrantData'
 import ListH2SData from '@/views/dataManage/deviceData/listH2SData'
+import ListWellLiquidData from '@/views/dataManage/deviceData/listWellLiquidData'
 import { parseUrl } from '@/utils/parseutils'
 
 export default {
   name: 'DataManage',
-  components: { ListH2SData, ListHydrantData, ListPantiltData, ListGasdectorData, ListTubeData, ListNoiseData, ListWellLocaData, ListTempData, ListHarmfulData, ListDigData, ListGasData, ListLiquidData, ListWellCoverData, ListLiquidGasData },
+  components: { ListH2SData, ListHydrantData, ListPantiltData, ListGasdectorData, ListTubeData, ListNoiseData, ListWellLocaData, ListTempData, ListHarmfulData, ListDigData, ListGasData, ListLiquidData, ListWellCoverData, ListLiquidGasData, ListWellLiquidData },
   data() {
     return {
       activeName: 'wellcover',
@@ -45,7 +46,8 @@
         { 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: '14', comp: 'list-H2S-data' }
+        { permission: '/wellliquiddata/list-page', label: '硫化氢浓度监测仪', name: 'H2S', type: '14', comp: 'list-H2S-data' },
+        { permission: '/wellliquiddata/list-page', label: '井盖液位一体机', name: 'wellliquid', type: '13', comp: 'list-well-liquid-data' }
       ] // 所有tab列表
     }
   },
diff --git a/src/views/dataManage/deviceData/listWellLiquidData.vue b/src/views/dataManage/deviceData/listWellLiquidData.vue
new file mode 100644
index 0000000..599039e
--- /dev/null
+++ b/src/views/dataManage/deviceData/listWellLiquidData.vue
@@ -0,0 +1,228 @@
+<template>
+  <app-container>
+    <!--筛选条件-->
+    <search-area size="small" @search="search">
+      <search-item>
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
+      </search-item>
+      <search-item>
+        <dept-select
+          v-model="listQuery.deptid"
+          :need-top="false"
+          dept-type="03"
+          size="small"
+          placeholder="选择权属单位"
+        />
+      </search-item>
+      <search-item>
+        <el-date-picker
+          v-model="timeRange"
+          size="small"
+          type="datetimerange"
+          range-separator="至"
+          value-format="yyyy-MM-dd HH:mm:ss"
+          start-placeholder="开始时间"
+          end-placeholder="结束时间"
+        />
+      </search-item>
+    </search-area>
+    <!--查询结果Table显示-->
+    <normal-table
+      ref="normalTable"
+      :data="list"
+      :total="total"
+      :query="listQuery"
+      :list-loading="listLoading"
+      :options="options"
+      size="small"
+      @change="changePage"
+    >
+      <template slot="btns">
+        <el-button v-if="hasPerm('/wellLiquidData/export')" size="small" @click="batchExport">
+          导出记录
+        </el-button>
+      </template>
+      <template slot="columns">
+        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
+          <template slot-scope="scope">
+            <span v-if="column.checkCell" :class="checkCell(scope.row.cell)">{{ scope.row[column.value] }}</span>
+            <span v-else>{{ scope.row[column.value] }}</span>
+          </template>
+        </el-table-column>
+      </template>
+    </normal-table>
+  </app-container>
+</template>
+
+<script>
+import { getWellLiquidData, batchExportWellLiquidData } from '@/api/data/data'
+import DeptSelect from '../../../components/DeptSelect/index'
+import { parseUrl } from '@/utils/parseutils'
+import { getSearchLastWeekTime } from '@/utils/dateutils'
+import { exportFile } from '@/utils/exportutils'
+
+export default {
+  name: 'ListWellLiquidData',
+  components: { DeptSelect },
+  props: {
+    type: {
+      type: String,
+      required: true
+    }, // 设备类型
+    name: {
+      type: String,
+      default: ''
+    } // 设备名称
+  },
+  data() {
+    return {
+      listQuery: {
+        keywords: '', // 关键字
+        deptid: '', // 部门id
+        beginTime: '', // 开始时间
+        endTime: '', // 结束时间
+        offset: 1,
+        limit: 20,
+        sort: '',
+        order: ''
+      }, // 筛选条件
+      timeRange: [], // 时间范围
+      columns: [
+        {
+          text: '设备编号',
+          value: 'devcode',
+          align: 'center'
+        },
+        {
+          text: '点位编号',
+          value: 'wellCode',
+          align: 'center'
+        },
+        {
+          text: '设备类型',
+          value: 'deviceTypeName',
+          align: 'center'
+        },
+        {
+          text: '状态描述',
+          value: 'descn',
+          align: 'center',
+          checkState: true
+        },
+        {
+          text: '权属单位',
+          value: 'deptName',
+          align: 'center'
+        },
+        {
+          text: '上传时间',
+          value: 'logtime',
+          width: 170,
+          align: 'center'
+        }
+      ], // 显示列
+      list: [], // 列表数据
+      total: 0, // 数据总数
+      options: {
+        needIndex: true, // 是否需要序号列
+        border: true // 是否需要上方边框
+      },
+      listLoading: true, // 加载动画
+      fullscreenLoading: false, // 全屏加载动画
+      editShow: false // 是否显示编辑框
+    }
+  },
+  mounted() {
+    // 如果路径里带参数，解析devcode参数
+    this.timeRange = getSearchLastWeekTime()
+    if (window.location.href) {
+      const params = parseUrl(window.location.href)
+      if (params && params.deviceType === this.type && params.devcode) {
+        this.listQuery.keywords = params.devcode
+        this.fetchData()
+      } else {
+        this.fetchData()
+      }
+    }
+  },
+  activated() {
+    // 要是路由里有参数
+    if (this.$route.query && this.$route.query.devcode) {
+      this.listQuery.keywords = this.$route.query.devcode
+      this.fetchData(false)// 获取数据
+    } else {
+      this.fetchData()
+    }
+  },
+  methods: {
+    // 批量导出
+    batchExport() {
+      // this.handleDateTime()
+      // 全屏加载动画
+      const loading = this.$loading({
+        lock: true,
+        text: '下载中,请稍后...',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
+      })
+      batchExportWellLiquidData(this.listQuery).then(res => {
+        loading.close() // 关闭加载动画
+        let fileName = `${this.name}数据-${this.listQuery.beginTime}-${this.listQuery.endTime}.xlsx`
+        fileName = fileName.replace(/-|:| /g, '')
+        const blob = new Blob([res.data])
+        exportFile(blob, fileName)
+      }).catch((res) => {
+        loading.close()
+      })
+    },
+    // 查询数据
+    search() {
+      this.fetchData(false)
+    },
+    // 获取井盖数据
+    fetchData(isNowPage = true) {
+      this.listLoading = true
+      if (!isNowPage) { // 是否显示当前页，否则跳转第一页
+        this.listQuery.offset = 1
+      }
+      this.handleDateTime()
+      getWellLiquidData(this.listQuery).then(response => {
+        this.list = response.data.rows
+        this.total = response.data.total
+        this.listLoading = false
+      })
+    },
+    // 处理时间
+    handleDateTime() {
+      if (this.timeRange && this.timeRange.length > 0) {
+        this.listQuery.beginTime = this.timeRange[0]
+        this.listQuery.endTime = this.timeRange[1]
+      } else {
+        this.listQuery.beginTime = ''
+        this.listQuery.endTime = ''
+      }
+    },
+    checkState(row) {
+      if (row.status !== '0') {
+        return 'warning-state'
+      }
+    },
+    // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+    changePage(val) {
+      if (val && val.size) {
+        this.listQuery.limit = val.size
+      }
+      if (val && val.page) {
+        this.listQuery.offset = val.page
+      }
+      this.fetchData()
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+.warning-state{
+  color:red
+}
+</style>
diff --git a/src/views/dataView/components/alarmAnalysis.vue b/src/views/dataView/components/alarmAnalysis.vue
index 3ac21d8..f9949ea 100644
--- a/src/views/dataView/components/alarmAnalysis.vue
+++ b/src/views/dataView/components/alarmAnalysis.vue
@@ -76,7 +76,12 @@
     },
     // 获取各类报警的列表
     fetchAlarmByContent() {
-      alarmStaticsByContent(this.listQuery).then(response => {
+      const query = {
+        alarmType: '1',
+        beginTime: this.listQuery.beginTime,
+        endTime: this.listQuery.endTime
+      }
+      alarmStaticsByContent(query).then(response => {
         this.tableList = response.data
       })
     },
diff --git a/src/views/deviceConfig/components/editWellliquidConfig.vue b/src/views/deviceConfig/components/editWellliquidConfig.vue
new file mode 100644
index 0000000..70277d4
--- /dev/null
+++ b/src/views/deviceConfig/components/editWellliquidConfig.vue
@@ -0,0 +1,241 @@
+<template>
+  <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" append-to-body>
+    <el-form ref="dataForm" :rules="rules" :model="configForm" label-well-code="right" label-width="110px">
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item v-if="dialogStatus=='create'" label="设备编号" prop="deviceId">
+            <el-select
+              v-model="configForm.deviceId"
+              :loading="loading"
+              :disabled="dialogStatus=='update'?true:false"
+              filterable
+              placeholder="请输入设备编号"
+            >
+              <el-option
+                v-for="item in devices"
+                :key="item.id"
+                :label="item.devcode"
+                :value="item.id"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item v-if="dialogStatus=='update'" label="设备编号">
+            <el-input v-model="deviceForm.devcode" type="text" placeholder="未知" disabled />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item v-if="deviceForm.deviceName!=''" label="设备名称">
+            <el-input v-model="deviceForm.deviceName" type="text" placeholder="未知" disabled />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item v-if="deviceForm.deviceTypeName!=''" label="设备类型" prop="deviceType">
+            <el-input v-model="deviceForm.deviceTypeName" type="text" placeholder="未知" disabled />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item v-if="deviceForm.deptName!=''" label="权属单位" prop="deptName">
+            <el-input v-model="deviceForm.deptName" type="text" placeholder="未知" disabled />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row v-if="showIp" :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="ip地址" prop="ip">
+            <el-input v-model.trim="configForm.ip" type="text" placeholder="非必填" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="端口号" prop="port">
+            <el-input v-model.trim="configForm.port" type="text" placeholder="非必填" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="最大尝试次数">
+            <el-input-number v-model="configForm.attemptsMax" :min="1" :max="100" type="text" placeholder="必填" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <div slot="footer" class="dialog-footer">
+      <el-button :disabled="!canEdit" type="primary" @click="saveData">
+        保存
+      </el-button>
+      <el-button @click="cancel">
+        取消
+      </el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { editWellliquidConfig } from '@/api/config/wellliquidconfig'
+import { getDeviceSimpleList } from '@/api/config/liquidconfig'
+export default {
+  name: 'EditWellliquidConfig',
+  data() {
+    const validateIp = (rule, value, callback) => {
+      if (value !== '') {
+        if ((/((25[0-5]|2[0-4]\d|((1\d{2})|([1-9]?\d)))\.){3}(25[0-5]|2[0-4]\d|((1\d{2})|([1-9]?\d)))/).test(value) === false) {
+          callback(new Error('请填写正确的ip地址'))
+        } else {
+          callback()
+        }
+      } else {
+        // callback(new Error('ip地址不能为空'))
+        callback()
+      }
+    }
+    const validatePort = (rule, value, callback) => {
+      if (value !== '') {
+        if ((/[1-9]$|(^[1-9][0-9]$)|(^[1-9][0-9][0-9]$)|(^[1-9][0-9][0-9][0-9]$)|(^[1-6][0-5][0-5][0-3][0-5]$)/).test(value) === false) {
+          callback(new Error('请填写正确的端口号'))
+        } else {
+          callback()
+        }
+      } else {
+        // callback(new Error('端口号不能为空'))
+        callback()
+      }
+    }
+    return {
+      dialogFormVisible: false, // 对话框是否显示
+      dialogStatus: '', // 对话框类型：create,update
+      deviceForm: {
+        deviceName: '',
+        deviceTypeName: '',
+        deptName: '',
+        devcode: '',
+        deviceType: ''
+      }, // 设备基本信息
+      configForm: {
+        id: '', // config id
+        deviceId: '', // 设备id
+        attemptsMax: '3', // 最大尝试次数
+        ip: '', // ip地址
+        port: '' // 端口号
+      },
+      textMap: {
+        update: '编辑',
+        create: '新增'
+      }, // 表头显示标题
+      devices: [], // 设备下拉选择列表
+      loading: false, // 加载动画是否显示
+      canEdit: true, // 是否允许点击保存按钮
+      rules: {
+        deviceId: [{ required: true, message: '设备编号不能为空', trigger: ['blur', 'change'] }],
+        ip: [{ trigger: ['blur', 'change'], validator: validateIp }],
+        port: [{ trigger: ['blur', 'change'], validator: validatePort }]
+      } // 前端校验规则
+    }
+  },
+  computed: {
+    watchDeviceId() { // 监控权属单位变化
+      return this.configForm.deviceId
+    },
+    showIp() { // 是否显示ip配置
+      return true
+    }
+  },
+  watch: {
+    watchDeviceId(newValue, oldValue) {
+      for (const device of this.devices) {
+        if (device.id === newValue) {
+          this.deviceForm.deviceTypeName = device.deviceTypeName
+          this.deviceForm.deptName = device.deptName
+          this.deviceForm.deviceName = device.deviceName
+          return
+        }
+      }
+    }
+  },
+  methods: {
+    // 初始化对话框
+    initDialog: function(dialogStatus, dialogFormVisible, row = null) {
+      this.dialogStatus = dialogStatus
+      this.dialogFormVisible = dialogFormVisible
+      this.canEdit = true
+      if (dialogStatus === 'create') { // 如果是新增，清除验证
+        this.resetForm()
+        this.fetchDevice()
+        this.$nextTick(() => {
+          this.$refs['dataForm'].clearValidate()
+        })
+      } else if (dialogStatus === 'update') { // 如果是修改，将row中数据填写到输入框中
+        this.deviceForm = {
+          deviceName: row.deviceName,
+          devcode: row.devcode,
+          deptName: row.deptName,
+          deviceType: row.deviceType,
+          deviceTypeName: row.deviceTypeName
+        }
+        this.configForm = {
+          id: row.id,
+          deviceId: row.deviceId, // 设备id
+          ip: row.ip, // ip地址
+          port: row.port, // 端口号
+          attemptsMax: row.attemptsMax // 最大尝试次数
+        }
+      }
+    },
+    // 重置表单
+    resetForm() {
+      this.deviceForm = {
+        deviceName: '',
+        deviceTypeName: '',
+        deptName: '',
+        devcode: ''
+      }
+      this.configForm = {
+        deviceId: '', // 设备id
+        ip: '', // ip地址
+        port: '', // 端口号
+        attemptsMax: '3' // 最大尝试次数
+      }
+    },
+    // 保存数据
+    saveData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          this.canEdit = false
+          editWellliquidConfig(this.configForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('配置成功')
+              this.$emit('watchChild')
+              this.dialogFormVisible = false
+            }
+            this.canEdit = false
+          }).catch(_ => {
+            this.canEdit = true
+          })
+        }
+      })
+    },
+    // 获取未下发配置的设备列表
+    fetchDevice() {
+      this.loading = true
+      getDeviceSimpleList('13', '0').then(response => {
+        this.loading = false
+        this.devices = response.data
+      })
+    },
+    cancel: function() {
+      this.dialogFormVisible = false
+      this.$emit('watchChild')
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .el-select{
+    width: 100%;
+  }
+  .el-input-number{
+    width: 100%;
+  }
+</style>
diff --git a/src/views/deviceConfig/components/listWellLiquidConfig.vue b/src/views/deviceConfig/components/listWellLiquidConfig.vue
new file mode 100644
index 0000000..34fcf41
--- /dev/null
+++ b/src/views/deviceConfig/components/listWellLiquidConfig.vue
@@ -0,0 +1,299 @@
+<template>
+  <app-container>
+    <!--筛选条件-->
+    <search-area size="small" @search="search">
+      <search-item>
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="设备编号" clearable />
+      </search-item>
+      <search-item>
+        <dept-select v-model="listQuery.deptid" :need-top="deptShowTop" dept-type="03" placeholder="选择权属单位" />
+      </search-item>
+    </search-area>
+    <!--查询结果Table显示-->
+    <div>
+      <el-row class="table-title">
+        <el-col :span="6">
+          <div class="title-header">
+            <i class="el-icon-menu" />数据列表
+          </div>
+        </el-col>
+        <el-col :span="12" :offset="6" class="edit_btns">
+          <el-button v-if="hasPerm('/busConfig/wellliquidConfig/batchExport')" class="edit_btn" size="small" @click="batchExport">
+            导出记录
+          </el-button>
+          <download-template :filename="filename" />
+          <el-upload
+            v-if="hasPerm('/busConfig/wellliquidConfig/batchImport')"
+            :limit="1"
+            :show-file-list="false"
+            :http-request="uploadFile"
+            :file-list="fileList"
+            action="string"
+            accept=".xls,.xlsx"
+            class="edit_btn"
+          >
+            <el-button v-if="hasPerm('/busConfig/wellliquidConfig/batchImport')" slot="trigger" size="small">
+              批量导入
+            </el-button>
+          </el-upload>
+          <el-button v-if="hasPerm('/busConfig/wellliquidConfig/config')" class="edit_btn" size="small" @click="add">
+            新增
+          </el-button>
+        </el-col>
+      </el-row>
+      <el-table v-loading="listLoading" :data="list" class="table" border @selection-change="handleSelectionChange">
+        <!--<el-table-column align="center" type="selection" width="55"/>-->
+        <el-table-column :index="indexMethod" align="center" type="index" />
+        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
+          <template slot-scope="scope">
+            {{ scope.row[column.value] }}
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" align="center" width="60">
+          <template slot-scope="scope">
+            <el-button type="text" @click="edit(scope.row)">
+              编辑
+            </el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+    </div>
+    <!--分页-->
+    <div class="pagination-container">
+      <el-pagination
+        v-show="total>listQuery.limit"
+        :current-page="listQuery.offset"
+        :page-sizes="[20,30,50]"
+        :page-size="listQuery.limit"
+        :total="total"
+        align="center"
+        layout="total, sizes, prev, pager, next"
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"
+      />
+    </div>
+    <edit-wellliquid-config v-show="editShow" ref="editconfig" @watchChild="fetchData" />
+  </app-container>
+</template>
+
+<script>
+import { getWellliquidConfigList, batchImportWellliquidConfig, batchExportWellliquidConfig } from '@/api/config/wellliquidconfig'
+import EditWellliquidConfig from './editWellliquidConfig'
+import DownloadTemplate from '@/components/DownloadTemplate/index'
+import DeptSelect from '@/components/DeptSelect/index'
+
+export default {
+  name: 'ListWellliquidConfig',
+  components: { DeptSelect, DownloadTemplate, EditWellliquidConfig },
+  data() {
+    return {
+      listQuery: {
+        keywords: '',
+        offset: 1,
+        limit: 20,
+        sort: '',
+        order: ''
+      }, // 筛选条件
+      columns: [
+        {
+          text: '设备编号',
+          value: 'devcode',
+          align: 'center'
+        },
+        {
+          text: 'IP地址',
+          value: 'ip',
+          align: 'center'
+        },
+        {
+          text: '端口',
+          value: 'port',
+          align: 'center'
+        },
+        {
+          text: '最大尝试次数',
+          value: 'attemptsMax',
+          align: 'center'
+        },
+        {
+          text: '已尝试次数',
+          value: 'attemptsCurrent',
+          align: 'center'
+        },
+        {
+          text: '下发状态',
+          value: 'statusName',
+          width: 80,
+          align: 'center'
+        }
+      ], // 显示列
+      multipleSelection: [], // 多选选中项
+      list: [], // 列表数据
+      total: 0, // 数据总数
+      deviceTypeList: [], // 燃气配置类型列表
+      deptProps: {
+        parent: 'pid',
+        value: 'id',
+        label: 'name',
+        children: 'children'
+      }, // 权属单位树形下拉菜单
+      deptTreeList: null, // 组织树列表数据
+      showDeptTree: 0, // 是否显示权属单位下拉
+      showDeviceType: true, // 是否显示设备类型下拉
+      listLoading: true, // 加载动画
+      fullscreenLoading: false, // 全屏加载动画
+      editShow: false, // 是否显示编辑框
+      detailShow: false, // 是否显示编辑框
+      filename: 'wellliquid_config_template.xlsx',
+      deptShowTop: false,
+      fileList: []
+    }
+  },
+  created() {
+    this.fetchData()// 获取数据
+  },
+  methods: {
+    // 打开详情对话框
+    checkSelection() {
+      if (this.multipleSelection.length === 0) {
+        return false
+      } else {
+        return true
+      }
+    },
+    // 新增设备
+    add() {
+      this.dialogFormVisible = true
+      this.editShow = true
+      this.$refs.editconfig.initDialog('create', this.dialogFormVisible)
+    },
+    // 编辑燃气配置信息
+    edit(row) {
+      this.dialogFormVisible = true
+      this.editShow = true
+      this.$refs.editconfig.initDialog('update', this.dialogFormVisible, row)
+    },
+    // 批量导入燃气配置
+    uploadFile(param) {
+      // 判断文件大小是否符合要求
+      const _file = param.file
+      const isLt5M = _file.size / 1024 / 1024 < 5
+      if (!isLt5M) {
+        this.$message.error('请上传5M以下的excel文件')
+        return false
+      }
+      // 全屏加载动画
+      const loading = this.$loading({
+        lock: true,
+        text: '导入中,请稍后...',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
+      })
+      // 发起导入请求
+      batchImportWellliquidConfig(_file).then(res => {
+        loading.close() // 关闭加载动画
+        if (res.code === 200) {
+          this.$message.success('导入成功')
+          this.fetchData(false)
+        } else {
+          this.$message.error(res.message)
+        }
+      }).catch(() => {
+        loading.close() // 关闭加载动画
+      })
+      this.fileList = []
+    },
+    // 批量导出
+    batchExport() {
+      // 全屏加载动画
+      const loading = this.$loading({
+        lock: true,
+        text: '数据处理中,请稍后...',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
+      })
+      batchExportWellliquidConfig(this.listQuery).then(res => {
+        loading.close() // 关闭加载动画
+        console.log('download===', res)
+        const blob = new Blob([res.data])
+        const downloadElement = document.createElement('a')
+        const href = window.URL.createObjectURL(blob) // 创建下载的链接
+        downloadElement.href = href
+        downloadElement.download = `井盖配置列表.xlsx` // 下载后文件名
+        document.body.appendChild(downloadElement)
+        downloadElement.click() // 点击下载
+        document.body.removeChild(downloadElement) // 下载完成移除元素
+        window.URL.revokeObjectURL(href) // 释放blob对象
+      }).catch((res) => {
+        loading.close()
+        this.$message.error(res.message)
+      })
+    },
+    // 查询数据
+    search() {
+      this.fetchData(false)
+    },
+    // 获取燃气配置数据
+    fetchData(isNowPage = true) {
+      this.listLoading = true
+      if (!isNowPage) { // 是否显示当前页，否则跳转第一页
+        this.listQuery.offset = 1
+      }
+      getWellliquidConfigList(this.listQuery).then(response => {
+        this.list = response.data.rows
+        this.total = parseInt(response.data.total)
+        this.listLoading = false
+      })
+    },
+    indexMethod(index) {
+      return this.listQuery.limit * (this.listQuery.offset - 1) + index + 1
+    },
+    // 改变页容量
+    handleSizeChange(val) {
+      this.listQuery.limit = val
+      this.fetchData()
+    },
+    // 改变当前页
+    handleCurrentChange(val) {
+      this.listQuery.offset = val
+      this.fetchData()
+    },
+    // 多选触发方法
+    handleSelectionChange(val) {
+      this.multipleSelection = val
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .app-container{
+    padding: 10px;
+  }
+  $tableTitleHeight:46px;
+  .table{
+    margin-bottom: 20px;
+  }
+  .pagination-container{
+    margin-bottom: 50px;
+  }
+  .table-title{
+    background-color:rgba(243, 243, 243, 1);
+    height: $tableTitleHeight;
+    .title-header{
+      line-height:$tableTitleHeight;
+      color: #606266;
+      font-size: 15px;
+      i{
+        margin-left: 5px;
+        margin-right: 5px;
+      }
+    }
+  }
+  .edit_btns{
+    .edit_btn{
+      float:right;
+      margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2
+    }
+  }
+</style>
diff --git a/src/views/deviceConfig/deviceConfig.vue b/src/views/deviceConfig/deviceConfig.vue
index f6189ff..eac828c 100644
--- a/src/views/deviceConfig/deviceConfig.vue
+++ b/src/views/deviceConfig/deviceConfig.vue
@@ -31,6 +31,9 @@
       <el-tab-pane v-if="hasPerm('/busConfig/H2sConfig/list')" label="硫化氢检测终端" name="h2s">
         <list-h2s-config ref="h2sConfig" />
       </el-tab-pane>
+      <el-tab-pane v-if="hasPerm('/busConfig/wellliquidConfig/list')" label="井盖液位一体机" name="wellliquid">
+        <list-wellliquid-config ref="wellliquidConfig" />
+      </el-tab-pane>
     </el-tabs>
   </div>
 </template>
@@ -47,9 +50,10 @@
 import ListTubeConfig from './components/listTubeConfig'
 import ListH2sConfig from './components/listH2sConfig'
 import ListWellcoverConfig from '@/views/deviceConfig/components/listWellCoverConfig'
+import ListWellliquidConfig from '@/views/deviceConfig/components/listWellLiquidConfig'
 export default {
   name: 'DeviceConfig',
-  components: { ListWellcoverConfig, ListH2sConfig, ListTubeConfig, ListLiquidGasConfig, ListNoiseConfig, ListDigConfig, ListTempConfig, ListHarmfulConfig, ListGasConfig, ListLiquidConfig },
+  components: { ListWellliquidConfig, ListWellcoverConfig, ListH2sConfig, ListTubeConfig, ListLiquidGasConfig, ListNoiseConfig, ListDigConfig, ListTempConfig, ListHarmfulConfig, ListGasConfig, ListLiquidConfig },
   data() {
     return {
       activeName: 'liquid'
@@ -61,7 +65,7 @@
   methods: {
     handleClick(tab, event) {
       if (tab.name === 'wellcover') {
-        this.$refs.wellcoveConfig.fetchData()
+        this.$refs.wellcoverConfig.fetchData()
       } else if (tab.name === 'liquid') {
         this.$refs.liquidConfig.fetchData()
       } else if (tab.name === 'harmful') {
@@ -80,12 +84,14 @@
         this.$refs.tubeConfig.fetchData()
       } else if (tab.name === 'h2s') {
         this.$refs.h2sConfig.fetchData()
+      } else if (tab.name === 'wellliquid') {
+        this.$refs.wellliquidConfig.fetchData()
       }
     },
     // 计算那个是当前第一个tab
     caclActive() {
       if (hasPermission('/busConfig/wellcoverConfig/list')) {
-        this.activeName = 'liquid'
+        this.activeName = 'wellcover'
       } else if (hasPermission('/busConfig/liquidConfig/list')) {
         this.activeName = 'liquid'
       } else if (hasPermission('/busConfig/gasConfig/list')) {
@@ -104,6 +110,8 @@
         this.activeName = 'tube'
       } else if (hasPermission('/busConfig/h2sConfig/list')) {
         this.activeName = 'h2s'
+      } else if (hasPermission('/busConfig/wellliquidConfig/list')) {
+        this.activeName = 'wellliquid'
       }
     }
   }
diff --git a/src/views/deviceManage/editDevice.vue b/src/views/deviceManage/editDevice.vue
index 1d3601d..97c9d34 100644
--- a/src/views/deviceManage/editDevice.vue
+++ b/src/views/deviceManage/editDevice.vue
@@ -1,6 +1,6 @@
 <template>
   <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" append-to-body>
-    <el-form ref="dataForm" :rules="rules" :model="deviceForm" label-well-code="right" label-width="100px">
+    <el-form ref="dataForm" :rules="rules" :model="deviceForm" label-well-code="right" label-width="120px">
       <el-row :gutter="20">
         <el-col :span="12">
           <el-form-item label="设备编号" prop="devcode">
@@ -62,6 +62,12 @@
             <el-input v-model.trim="deviceForm.installHeight" :disabled="isDetailMode" type="text" placeholder="必填" />
           </el-form-item>
         </el-col>
+        <!--井盖液位一体机需要-->
+        <el-col v-if="deviceForm.deviceType=='13'" :span="12">
+          <el-form-item label="浮子电线长度" prop="lineLength">
+            <el-input v-model.trim="deviceForm.lineLength" :disabled="isDetailMode" type="text" placeholder="单位m, 必填" />
+          </el-form-item>
+        </el-col>
       </el-row>
     </el-form>
     <div v-show="!isDetailMode" slot="footer" class="dialog-footer">
@@ -111,7 +117,8 @@
         deviceType: [{ required: true, message: '设备类型必选', trigger: ['blur', 'change'] }],
         modelId: [{ required: true, message: '设备型号必选', trigger: ['blur', 'change'] }],
         installDate: [{ required: true, message: '安装日期必选', trigger: ['blur', 'change'] }],
-        installHeight: [{ required: true, message: '设备安装高度不能为空', trigger: ['blur', 'change'] }]
+        installHeight: [{ required: true, message: '设备安装高度不能为空', trigger: ['blur', 'change'] }],
+        lineLength: [{ required: true, message: '浮子电线长度不能为空', trigger: ['blur', 'change'] }, { pattern: /^([1-9]+(\.\d+)?|0\.\d+)$/, message: '浮子电线长度必须为正数', trigger: 'blur' }]
       }, // 前端校验规则
       isEditMode: false, // 编辑模式
       isDetailMode: false // 详情模式

diff --git a/src/api/config/wellcoverconfig.js b/src/api/config/wellcoverconfig.js
index ecdd676..6b83752 100644
--- a/src/api/config/wellcoverconfig.js
+++ b/src/api/config/wellcoverconfig.js
@@ -12,11 +12,11 @@
 }
 
 // 修改燃气配置
-export function editWellcoverConfig(params) {
+export function editWellcoverConfig(data) {
   return request({
     url: 'busConfig/wellcoverConfig/config',
     method: 'post',
-    params
+    data
   })
 }
 
diff --git a/src/api/config/wellliquidconfig.js b/src/api/config/wellliquidconfig.js
new file mode 100644
index 0000000..c7c4838
--- /dev/null
+++ b/src/api/config/wellliquidconfig.js
@@ -0,0 +1,42 @@
+/**
+ * 井盖配置接口
+ */
+import request from '@/utils/request'
+// 燃气配置查询
+export function getWellliquidConfigList(params) {
+  return request({
+    url: 'busConfig/wellliquidConfig/list',
+    method: 'get',
+    params
+  })
+}
+
+// 修改燃气配置
+export function editWellliquidConfig(data) {
+  return request({
+    url: 'busConfig/wellliquidConfig/config',
+    method: 'post',
+    data
+  })
+}
+
+// 批量导入
+export function batchImportWellliquidConfig(fileobj) {
+  const param = new FormData()
+  param.append('file', fileobj)
+  return request({
+    url: 'busConfig/wellliquidConfig/batchImport',
+    method: 'post',
+    headers: { 'Content-Type': 'multipart/form-data' },
+    data: param
+  })
+}
+// 批量导出
+export function batchExportWellliquidConfig(params) {
+  return request({
+    url: 'busConfig/wellliquidConfig/batchExport',
+    method: 'get',
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
diff --git a/src/api/data/data.js b/src/api/data/data.js
index c437d7b..cba92e9 100644
--- a/src/api/data/data.js
+++ b/src/api/data/data.js
@@ -394,3 +394,31 @@
     responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
   })
 }
+
+// 井盖数据查询
+export function getWellLiquidData(params) {
+  return request({
+    url: 'wellliquiddata/list-page',
+    method: 'get',
+    params
+  })
+}
+// 井盖数据查询，不分页
+export function getWellLiquidDataSingle(params) {
+  return request({
+    url: 'wellliquiddata/list',
+    method: 'get',
+    params
+  })
+}
+// 批量导出井盖数据
+export function batchExportWellLiquidData(params) {
+  return request({
+    url: 'wellliquiddata/export',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
diff --git a/src/components/BigData/Card/panelCard.vue b/src/components/BigData/Card/panelCard.vue
index d6a7b89..8283d7f 100644
--- a/src/components/BigData/Card/panelCard.vue
+++ b/src/components/BigData/Card/panelCard.vue
@@ -35,12 +35,13 @@
     font-size: 16px;
     font-weight: bold;
     padding: 0px 10px;
+    padding-right: 0px;
     border-left: 5px solid #66b1ff;
     position: relative;
     .title-right{
       display: inline-block;
       position: absolute;
-      right: 10px;
+      right: 0px;
     }
   }
   .panel-body{
diff --git a/src/views/alarmManage/listAlarmNow.vue b/src/views/alarmManage/listAlarmNow.vue
index 7392a4a..9f5a0b6 100644
--- a/src/views/alarmManage/listAlarmNow.vue
+++ b/src/views/alarmManage/listAlarmNow.vue
@@ -361,7 +361,7 @@
         const supportDeviceTypes = this.$store.getters.deviceTypes
         for (const item of response.data.list) {
           const deviceType = '' + item.deviceType
-          if (supportDeviceTypes.indexOf(deviceType) !== -1) {
+          if (supportDeviceTypes.indexOf(deviceType) !== -1 && this.alarmContentTypeList.findIndex(t => t.name === item.name) === -1) {
             this.alarmContentTypeList.push(item)
           }
         }
diff --git a/src/views/alarmManage/listAlarmRecords.vue b/src/views/alarmManage/listAlarmRecords.vue
index 2e34a39..b5d233c 100644
--- a/src/views/alarmManage/listAlarmRecords.vue
+++ b/src/views/alarmManage/listAlarmRecords.vue
@@ -352,7 +352,7 @@
         const supportDeviceTypes = this.$store.getters.deviceTypes
         for (const item of response.data.list) {
           const deviceType = '' + item.deviceType
-          if (supportDeviceTypes.indexOf(deviceType) !== -1) {
+          if (supportDeviceTypes.indexOf(deviceType) !== -1 && this.alarmContentTypeList.findIndex(t => t.name === item.name) === -1) {
             this.alarmContentTypeList.push(item)
           }
         }
diff --git a/src/views/alarmStatics/components/alarmWellRank.vue b/src/views/alarmStatics/components/alarmWellRank.vue
index 89ffa18..acf1598 100644
--- a/src/views/alarmStatics/components/alarmWellRank.vue
+++ b/src/views/alarmStatics/components/alarmWellRank.vue
@@ -75,7 +75,7 @@
       getAlarmContentType('1').then(response => {
         const supportDeviceTypes = this.$store.getters.deviceTypes
         for (const item of response.data.list) {
-          if (supportDeviceTypes.indexOf('' + item.deviceType) !== -1) {
+          if (supportDeviceTypes.indexOf('' + item.deviceType) !== -1 && this.alarmContentTypeList.findIndex(t => t.name === item.name) === -1) {
             this.alarmContentTypeList.push(item)
           }
         }
diff --git a/src/views/dataManage/dataManage.vue b/src/views/dataManage/dataManage.vue
index b1d6a3b..44c099a 100644
--- a/src/views/dataManage/dataManage.vue
+++ b/src/views/dataManage/dataManage.vue
@@ -23,11 +23,12 @@
 import ListPantiltData from '@/views/dataManage/deviceData/listPantiltData'
 import ListHydrantData from '@/views/dataManage/deviceData/listHydrantData'
 import ListH2SData from '@/views/dataManage/deviceData/listH2SData'
+import ListWellLiquidData from '@/views/dataManage/deviceData/listWellLiquidData'
 import { parseUrl } from '@/utils/parseutils'
 
 export default {
   name: 'DataManage',
-  components: { ListH2SData, ListHydrantData, ListPantiltData, ListGasdectorData, ListTubeData, ListNoiseData, ListWellLocaData, ListTempData, ListHarmfulData, ListDigData, ListGasData, ListLiquidData, ListWellCoverData, ListLiquidGasData },
+  components: { ListH2SData, ListHydrantData, ListPantiltData, ListGasdectorData, ListTubeData, ListNoiseData, ListWellLocaData, ListTempData, ListHarmfulData, ListDigData, ListGasData, ListLiquidData, ListWellCoverData, ListLiquidGasData, ListWellLiquidData },
   data() {
     return {
       activeName: 'wellcover',
@@ -45,7 +46,8 @@
         { 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: '14', comp: 'list-H2S-data' }
+        { permission: '/wellliquiddata/list-page', label: '硫化氢浓度监测仪', name: 'H2S', type: '14', comp: 'list-H2S-data' },
+        { permission: '/wellliquiddata/list-page', label: '井盖液位一体机', name: 'wellliquid', type: '13', comp: 'list-well-liquid-data' }
       ] // 所有tab列表
     }
   },
diff --git a/src/views/dataManage/deviceData/listWellLiquidData.vue b/src/views/dataManage/deviceData/listWellLiquidData.vue
new file mode 100644
index 0000000..599039e
--- /dev/null
+++ b/src/views/dataManage/deviceData/listWellLiquidData.vue
@@ -0,0 +1,228 @@
+<template>
+  <app-container>
+    <!--筛选条件-->
+    <search-area size="small" @search="search">
+      <search-item>
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
+      </search-item>
+      <search-item>
+        <dept-select
+          v-model="listQuery.deptid"
+          :need-top="false"
+          dept-type="03"
+          size="small"
+          placeholder="选择权属单位"
+        />
+      </search-item>
+      <search-item>
+        <el-date-picker
+          v-model="timeRange"
+          size="small"
+          type="datetimerange"
+          range-separator="至"
+          value-format="yyyy-MM-dd HH:mm:ss"
+          start-placeholder="开始时间"
+          end-placeholder="结束时间"
+        />
+      </search-item>
+    </search-area>
+    <!--查询结果Table显示-->
+    <normal-table
+      ref="normalTable"
+      :data="list"
+      :total="total"
+      :query="listQuery"
+      :list-loading="listLoading"
+      :options="options"
+      size="small"
+      @change="changePage"
+    >
+      <template slot="btns">
+        <el-button v-if="hasPerm('/wellLiquidData/export')" size="small" @click="batchExport">
+          导出记录
+        </el-button>
+      </template>
+      <template slot="columns">
+        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
+          <template slot-scope="scope">
+            <span v-if="column.checkCell" :class="checkCell(scope.row.cell)">{{ scope.row[column.value] }}</span>
+            <span v-else>{{ scope.row[column.value] }}</span>
+          </template>
+        </el-table-column>
+      </template>
+    </normal-table>
+  </app-container>
+</template>
+
+<script>
+import { getWellLiquidData, batchExportWellLiquidData } from '@/api/data/data'
+import DeptSelect from '../../../components/DeptSelect/index'
+import { parseUrl } from '@/utils/parseutils'
+import { getSearchLastWeekTime } from '@/utils/dateutils'
+import { exportFile } from '@/utils/exportutils'
+
+export default {
+  name: 'ListWellLiquidData',
+  components: { DeptSelect },
+  props: {
+    type: {
+      type: String,
+      required: true
+    }, // 设备类型
+    name: {
+      type: String,
+      default: ''
+    } // 设备名称
+  },
+  data() {
+    return {
+      listQuery: {
+        keywords: '', // 关键字
+        deptid: '', // 部门id
+        beginTime: '', // 开始时间
+        endTime: '', // 结束时间
+        offset: 1,
+        limit: 20,
+        sort: '',
+        order: ''
+      }, // 筛选条件
+      timeRange: [], // 时间范围
+      columns: [
+        {
+          text: '设备编号',
+          value: 'devcode',
+          align: 'center'
+        },
+        {
+          text: '点位编号',
+          value: 'wellCode',
+          align: 'center'
+        },
+        {
+          text: '设备类型',
+          value: 'deviceTypeName',
+          align: 'center'
+        },
+        {
+          text: '状态描述',
+          value: 'descn',
+          align: 'center',
+          checkState: true
+        },
+        {
+          text: '权属单位',
+          value: 'deptName',
+          align: 'center'
+        },
+        {
+          text: '上传时间',
+          value: 'logtime',
+          width: 170,
+          align: 'center'
+        }
+      ], // 显示列
+      list: [], // 列表数据
+      total: 0, // 数据总数
+      options: {
+        needIndex: true, // 是否需要序号列
+        border: true // 是否需要上方边框
+      },
+      listLoading: true, // 加载动画
+      fullscreenLoading: false, // 全屏加载动画
+      editShow: false // 是否显示编辑框
+    }
+  },
+  mounted() {
+    // 如果路径里带参数，解析devcode参数
+    this.timeRange = getSearchLastWeekTime()
+    if (window.location.href) {
+      const params = parseUrl(window.location.href)
+      if (params && params.deviceType === this.type && params.devcode) {
+        this.listQuery.keywords = params.devcode
+        this.fetchData()
+      } else {
+        this.fetchData()
+      }
+    }
+  },
+  activated() {
+    // 要是路由里有参数
+    if (this.$route.query && this.$route.query.devcode) {
+      this.listQuery.keywords = this.$route.query.devcode
+      this.fetchData(false)// 获取数据
+    } else {
+      this.fetchData()
+    }
+  },
+  methods: {
+    // 批量导出
+    batchExport() {
+      // this.handleDateTime()
+      // 全屏加载动画
+      const loading = this.$loading({
+        lock: true,
+        text: '下载中,请稍后...',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
+      })
+      batchExportWellLiquidData(this.listQuery).then(res => {
+        loading.close() // 关闭加载动画
+        let fileName = `${this.name}数据-${this.listQuery.beginTime}-${this.listQuery.endTime}.xlsx`
+        fileName = fileName.replace(/-|:| /g, '')
+        const blob = new Blob([res.data])
+        exportFile(blob, fileName)
+      }).catch((res) => {
+        loading.close()
+      })
+    },
+    // 查询数据
+    search() {
+      this.fetchData(false)
+    },
+    // 获取井盖数据
+    fetchData(isNowPage = true) {
+      this.listLoading = true
+      if (!isNowPage) { // 是否显示当前页，否则跳转第一页
+        this.listQuery.offset = 1
+      }
+      this.handleDateTime()
+      getWellLiquidData(this.listQuery).then(response => {
+        this.list = response.data.rows
+        this.total = response.data.total
+        this.listLoading = false
+      })
+    },
+    // 处理时间
+    handleDateTime() {
+      if (this.timeRange && this.timeRange.length > 0) {
+        this.listQuery.beginTime = this.timeRange[0]
+        this.listQuery.endTime = this.timeRange[1]
+      } else {
+        this.listQuery.beginTime = ''
+        this.listQuery.endTime = ''
+      }
+    },
+    checkState(row) {
+      if (row.status !== '0') {
+        return 'warning-state'
+      }
+    },
+    // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+    changePage(val) {
+      if (val && val.size) {
+        this.listQuery.limit = val.size
+      }
+      if (val && val.page) {
+        this.listQuery.offset = val.page
+      }
+      this.fetchData()
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+.warning-state{
+  color:red
+}
+</style>
diff --git a/src/views/dataView/components/alarmAnalysis.vue b/src/views/dataView/components/alarmAnalysis.vue
index 3ac21d8..f9949ea 100644
--- a/src/views/dataView/components/alarmAnalysis.vue
+++ b/src/views/dataView/components/alarmAnalysis.vue
@@ -76,7 +76,12 @@
     },
     // 获取各类报警的列表
     fetchAlarmByContent() {
-      alarmStaticsByContent(this.listQuery).then(response => {
+      const query = {
+        alarmType: '1',
+        beginTime: this.listQuery.beginTime,
+        endTime: this.listQuery.endTime
+      }
+      alarmStaticsByContent(query).then(response => {
         this.tableList = response.data
       })
     },
diff --git a/src/views/deviceConfig/components/editWellliquidConfig.vue b/src/views/deviceConfig/components/editWellliquidConfig.vue
new file mode 100644
index 0000000..70277d4
--- /dev/null
+++ b/src/views/deviceConfig/components/editWellliquidConfig.vue
@@ -0,0 +1,241 @@
+<template>
+  <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" append-to-body>
+    <el-form ref="dataForm" :rules="rules" :model="configForm" label-well-code="right" label-width="110px">
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item v-if="dialogStatus=='create'" label="设备编号" prop="deviceId">
+            <el-select
+              v-model="configForm.deviceId"
+              :loading="loading"
+              :disabled="dialogStatus=='update'?true:false"
+              filterable
+              placeholder="请输入设备编号"
+            >
+              <el-option
+                v-for="item in devices"
+                :key="item.id"
+                :label="item.devcode"
+                :value="item.id"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item v-if="dialogStatus=='update'" label="设备编号">
+            <el-input v-model="deviceForm.devcode" type="text" placeholder="未知" disabled />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item v-if="deviceForm.deviceName!=''" label="设备名称">
+            <el-input v-model="deviceForm.deviceName" type="text" placeholder="未知" disabled />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item v-if="deviceForm.deviceTypeName!=''" label="设备类型" prop="deviceType">
+            <el-input v-model="deviceForm.deviceTypeName" type="text" placeholder="未知" disabled />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item v-if="deviceForm.deptName!=''" label="权属单位" prop="deptName">
+            <el-input v-model="deviceForm.deptName" type="text" placeholder="未知" disabled />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row v-if="showIp" :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="ip地址" prop="ip">
+            <el-input v-model.trim="configForm.ip" type="text" placeholder="非必填" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="端口号" prop="port">
+            <el-input v-model.trim="configForm.port" type="text" placeholder="非必填" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="最大尝试次数">
+            <el-input-number v-model="configForm.attemptsMax" :min="1" :max="100" type="text" placeholder="必填" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <div slot="footer" class="dialog-footer">
+      <el-button :disabled="!canEdit" type="primary" @click="saveData">
+        保存
+      </el-button>
+      <el-button @click="cancel">
+        取消
+      </el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { editWellliquidConfig } from '@/api/config/wellliquidconfig'
+import { getDeviceSimpleList } from '@/api/config/liquidconfig'
+export default {
+  name: 'EditWellliquidConfig',
+  data() {
+    const validateIp = (rule, value, callback) => {
+      if (value !== '') {
+        if ((/((25[0-5]|2[0-4]\d|((1\d{2})|([1-9]?\d)))\.){3}(25[0-5]|2[0-4]\d|((1\d{2})|([1-9]?\d)))/).test(value) === false) {
+          callback(new Error('请填写正确的ip地址'))
+        } else {
+          callback()
+        }
+      } else {
+        // callback(new Error('ip地址不能为空'))
+        callback()
+      }
+    }
+    const validatePort = (rule, value, callback) => {
+      if (value !== '') {
+        if ((/[1-9]$|(^[1-9][0-9]$)|(^[1-9][0-9][0-9]$)|(^[1-9][0-9][0-9][0-9]$)|(^[1-6][0-5][0-5][0-3][0-5]$)/).test(value) === false) {
+          callback(new Error('请填写正确的端口号'))
+        } else {
+          callback()
+        }
+      } else {
+        // callback(new Error('端口号不能为空'))
+        callback()
+      }
+    }
+    return {
+      dialogFormVisible: false, // 对话框是否显示
+      dialogStatus: '', // 对话框类型：create,update
+      deviceForm: {
+        deviceName: '',
+        deviceTypeName: '',
+        deptName: '',
+        devcode: '',
+        deviceType: ''
+      }, // 设备基本信息
+      configForm: {
+        id: '', // config id
+        deviceId: '', // 设备id
+        attemptsMax: '3', // 最大尝试次数
+        ip: '', // ip地址
+        port: '' // 端口号
+      },
+      textMap: {
+        update: '编辑',
+        create: '新增'
+      }, // 表头显示标题
+      devices: [], // 设备下拉选择列表
+      loading: false, // 加载动画是否显示
+      canEdit: true, // 是否允许点击保存按钮
+      rules: {
+        deviceId: [{ required: true, message: '设备编号不能为空', trigger: ['blur', 'change'] }],
+        ip: [{ trigger: ['blur', 'change'], validator: validateIp }],
+        port: [{ trigger: ['blur', 'change'], validator: validatePort }]
+      } // 前端校验规则
+    }
+  },
+  computed: {
+    watchDeviceId() { // 监控权属单位变化
+      return this.configForm.deviceId
+    },
+    showIp() { // 是否显示ip配置
+      return true
+    }
+  },
+  watch: {
+    watchDeviceId(newValue, oldValue) {
+      for (const device of this.devices) {
+        if (device.id === newValue) {
+          this.deviceForm.deviceTypeName = device.deviceTypeName
+          this.deviceForm.deptName = device.deptName
+          this.deviceForm.deviceName = device.deviceName
+          return
+        }
+      }
+    }
+  },
+  methods: {
+    // 初始化对话框
+    initDialog: function(dialogStatus, dialogFormVisible, row = null) {
+      this.dialogStatus = dialogStatus
+      this.dialogFormVisible = dialogFormVisible
+      this.canEdit = true
+      if (dialogStatus === 'create') { // 如果是新增，清除验证
+        this.resetForm()
+        this.fetchDevice()
+        this.$nextTick(() => {
+          this.$refs['dataForm'].clearValidate()
+        })
+      } else if (dialogStatus === 'update') { // 如果是修改，将row中数据填写到输入框中
+        this.deviceForm = {
+          deviceName: row.deviceName,
+          devcode: row.devcode,
+          deptName: row.deptName,
+          deviceType: row.deviceType,
+          deviceTypeName: row.deviceTypeName
+        }
+        this.configForm = {
+          id: row.id,
+          deviceId: row.deviceId, // 设备id
+          ip: row.ip, // ip地址
+          port: row.port, // 端口号
+          attemptsMax: row.attemptsMax // 最大尝试次数
+        }
+      }
+    },
+    // 重置表单
+    resetForm() {
+      this.deviceForm = {
+        deviceName: '',
+        deviceTypeName: '',
+        deptName: '',
+        devcode: ''
+      }
+      this.configForm = {
+        deviceId: '', // 设备id
+        ip: '', // ip地址
+        port: '', // 端口号
+        attemptsMax: '3' // 最大尝试次数
+      }
+    },
+    // 保存数据
+    saveData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          this.canEdit = false
+          editWellliquidConfig(this.configForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('配置成功')
+              this.$emit('watchChild')
+              this.dialogFormVisible = false
+            }
+            this.canEdit = false
+          }).catch(_ => {
+            this.canEdit = true
+          })
+        }
+      })
+    },
+    // 获取未下发配置的设备列表
+    fetchDevice() {
+      this.loading = true
+      getDeviceSimpleList('13', '0').then(response => {
+        this.loading = false
+        this.devices = response.data
+      })
+    },
+    cancel: function() {
+      this.dialogFormVisible = false
+      this.$emit('watchChild')
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .el-select{
+    width: 100%;
+  }
+  .el-input-number{
+    width: 100%;
+  }
+</style>
diff --git a/src/views/deviceConfig/components/listWellLiquidConfig.vue b/src/views/deviceConfig/components/listWellLiquidConfig.vue
new file mode 100644
index 0000000..34fcf41
--- /dev/null
+++ b/src/views/deviceConfig/components/listWellLiquidConfig.vue
@@ -0,0 +1,299 @@
+<template>
+  <app-container>
+    <!--筛选条件-->
+    <search-area size="small" @search="search">
+      <search-item>
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="设备编号" clearable />
+      </search-item>
+      <search-item>
+        <dept-select v-model="listQuery.deptid" :need-top="deptShowTop" dept-type="03" placeholder="选择权属单位" />
+      </search-item>
+    </search-area>
+    <!--查询结果Table显示-->
+    <div>
+      <el-row class="table-title">
+        <el-col :span="6">
+          <div class="title-header">
+            <i class="el-icon-menu" />数据列表
+          </div>
+        </el-col>
+        <el-col :span="12" :offset="6" class="edit_btns">
+          <el-button v-if="hasPerm('/busConfig/wellliquidConfig/batchExport')" class="edit_btn" size="small" @click="batchExport">
+            导出记录
+          </el-button>
+          <download-template :filename="filename" />
+          <el-upload
+            v-if="hasPerm('/busConfig/wellliquidConfig/batchImport')"
+            :limit="1"
+            :show-file-list="false"
+            :http-request="uploadFile"
+            :file-list="fileList"
+            action="string"
+            accept=".xls,.xlsx"
+            class="edit_btn"
+          >
+            <el-button v-if="hasPerm('/busConfig/wellliquidConfig/batchImport')" slot="trigger" size="small">
+              批量导入
+            </el-button>
+          </el-upload>
+          <el-button v-if="hasPerm('/busConfig/wellliquidConfig/config')" class="edit_btn" size="small" @click="add">
+            新增
+          </el-button>
+        </el-col>
+      </el-row>
+      <el-table v-loading="listLoading" :data="list" class="table" border @selection-change="handleSelectionChange">
+        <!--<el-table-column align="center" type="selection" width="55"/>-->
+        <el-table-column :index="indexMethod" align="center" type="index" />
+        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
+          <template slot-scope="scope">
+            {{ scope.row[column.value] }}
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" align="center" width="60">
+          <template slot-scope="scope">
+            <el-button type="text" @click="edit(scope.row)">
+              编辑
+            </el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+    </div>
+    <!--分页-->
+    <div class="pagination-container">
+      <el-pagination
+        v-show="total>listQuery.limit"
+        :current-page="listQuery.offset"
+        :page-sizes="[20,30,50]"
+        :page-size="listQuery.limit"
+        :total="total"
+        align="center"
+        layout="total, sizes, prev, pager, next"
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"
+      />
+    </div>
+    <edit-wellliquid-config v-show="editShow" ref="editconfig" @watchChild="fetchData" />
+  </app-container>
+</template>
+
+<script>
+import { getWellliquidConfigList, batchImportWellliquidConfig, batchExportWellliquidConfig } from '@/api/config/wellliquidconfig'
+import EditWellliquidConfig from './editWellliquidConfig'
+import DownloadTemplate from '@/components/DownloadTemplate/index'
+import DeptSelect from '@/components/DeptSelect/index'
+
+export default {
+  name: 'ListWellliquidConfig',
+  components: { DeptSelect, DownloadTemplate, EditWellliquidConfig },
+  data() {
+    return {
+      listQuery: {
+        keywords: '',
+        offset: 1,
+        limit: 20,
+        sort: '',
+        order: ''
+      }, // 筛选条件
+      columns: [
+        {
+          text: '设备编号',
+          value: 'devcode',
+          align: 'center'
+        },
+        {
+          text: 'IP地址',
+          value: 'ip',
+          align: 'center'
+        },
+        {
+          text: '端口',
+          value: 'port',
+          align: 'center'
+        },
+        {
+          text: '最大尝试次数',
+          value: 'attemptsMax',
+          align: 'center'
+        },
+        {
+          text: '已尝试次数',
+          value: 'attemptsCurrent',
+          align: 'center'
+        },
+        {
+          text: '下发状态',
+          value: 'statusName',
+          width: 80,
+          align: 'center'
+        }
+      ], // 显示列
+      multipleSelection: [], // 多选选中项
+      list: [], // 列表数据
+      total: 0, // 数据总数
+      deviceTypeList: [], // 燃气配置类型列表
+      deptProps: {
+        parent: 'pid',
+        value: 'id',
+        label: 'name',
+        children: 'children'
+      }, // 权属单位树形下拉菜单
+      deptTreeList: null, // 组织树列表数据
+      showDeptTree: 0, // 是否显示权属单位下拉
+      showDeviceType: true, // 是否显示设备类型下拉
+      listLoading: true, // 加载动画
+      fullscreenLoading: false, // 全屏加载动画
+      editShow: false, // 是否显示编辑框
+      detailShow: false, // 是否显示编辑框
+      filename: 'wellliquid_config_template.xlsx',
+      deptShowTop: false,
+      fileList: []
+    }
+  },
+  created() {
+    this.fetchData()// 获取数据
+  },
+  methods: {
+    // 打开详情对话框
+    checkSelection() {
+      if (this.multipleSelection.length === 0) {
+        return false
+      } else {
+        return true
+      }
+    },
+    // 新增设备
+    add() {
+      this.dialogFormVisible = true
+      this.editShow = true
+      this.$refs.editconfig.initDialog('create', this.dialogFormVisible)
+    },
+    // 编辑燃气配置信息
+    edit(row) {
+      this.dialogFormVisible = true
+      this.editShow = true
+      this.$refs.editconfig.initDialog('update', this.dialogFormVisible, row)
+    },
+    // 批量导入燃气配置
+    uploadFile(param) {
+      // 判断文件大小是否符合要求
+      const _file = param.file
+      const isLt5M = _file.size / 1024 / 1024 < 5
+      if (!isLt5M) {
+        this.$message.error('请上传5M以下的excel文件')
+        return false
+      }
+      // 全屏加载动画
+      const loading = this.$loading({
+        lock: true,
+        text: '导入中,请稍后...',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
+      })
+      // 发起导入请求
+      batchImportWellliquidConfig(_file).then(res => {
+        loading.close() // 关闭加载动画
+        if (res.code === 200) {
+          this.$message.success('导入成功')
+          this.fetchData(false)
+        } else {
+          this.$message.error(res.message)
+        }
+      }).catch(() => {
+        loading.close() // 关闭加载动画
+      })
+      this.fileList = []
+    },
+    // 批量导出
+    batchExport() {
+      // 全屏加载动画
+      const loading = this.$loading({
+        lock: true,
+        text: '数据处理中,请稍后...',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
+      })
+      batchExportWellliquidConfig(this.listQuery).then(res => {
+        loading.close() // 关闭加载动画
+        console.log('download===', res)
+        const blob = new Blob([res.data])
+        const downloadElement = document.createElement('a')
+        const href = window.URL.createObjectURL(blob) // 创建下载的链接
+        downloadElement.href = href
+        downloadElement.download = `井盖配置列表.xlsx` // 下载后文件名
+        document.body.appendChild(downloadElement)
+        downloadElement.click() // 点击下载
+        document.body.removeChild(downloadElement) // 下载完成移除元素
+        window.URL.revokeObjectURL(href) // 释放blob对象
+      }).catch((res) => {
+        loading.close()
+        this.$message.error(res.message)
+      })
+    },
+    // 查询数据
+    search() {
+      this.fetchData(false)
+    },
+    // 获取燃气配置数据
+    fetchData(isNowPage = true) {
+      this.listLoading = true
+      if (!isNowPage) { // 是否显示当前页，否则跳转第一页
+        this.listQuery.offset = 1
+      }
+      getWellliquidConfigList(this.listQuery).then(response => {
+        this.list = response.data.rows
+        this.total = parseInt(response.data.total)
+        this.listLoading = false
+      })
+    },
+    indexMethod(index) {
+      return this.listQuery.limit * (this.listQuery.offset - 1) + index + 1
+    },
+    // 改变页容量
+    handleSizeChange(val) {
+      this.listQuery.limit = val
+      this.fetchData()
+    },
+    // 改变当前页
+    handleCurrentChange(val) {
+      this.listQuery.offset = val
+      this.fetchData()
+    },
+    // 多选触发方法
+    handleSelectionChange(val) {
+      this.multipleSelection = val
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .app-container{
+    padding: 10px;
+  }
+  $tableTitleHeight:46px;
+  .table{
+    margin-bottom: 20px;
+  }
+  .pagination-container{
+    margin-bottom: 50px;
+  }
+  .table-title{
+    background-color:rgba(243, 243, 243, 1);
+    height: $tableTitleHeight;
+    .title-header{
+      line-height:$tableTitleHeight;
+      color: #606266;
+      font-size: 15px;
+      i{
+        margin-left: 5px;
+        margin-right: 5px;
+      }
+    }
+  }
+  .edit_btns{
+    .edit_btn{
+      float:right;
+      margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2
+    }
+  }
+</style>
diff --git a/src/views/deviceConfig/deviceConfig.vue b/src/views/deviceConfig/deviceConfig.vue
index f6189ff..eac828c 100644
--- a/src/views/deviceConfig/deviceConfig.vue
+++ b/src/views/deviceConfig/deviceConfig.vue
@@ -31,6 +31,9 @@
       <el-tab-pane v-if="hasPerm('/busConfig/H2sConfig/list')" label="硫化氢检测终端" name="h2s">
         <list-h2s-config ref="h2sConfig" />
       </el-tab-pane>
+      <el-tab-pane v-if="hasPerm('/busConfig/wellliquidConfig/list')" label="井盖液位一体机" name="wellliquid">
+        <list-wellliquid-config ref="wellliquidConfig" />
+      </el-tab-pane>
     </el-tabs>
   </div>
 </template>
@@ -47,9 +50,10 @@
 import ListTubeConfig from './components/listTubeConfig'
 import ListH2sConfig from './components/listH2sConfig'
 import ListWellcoverConfig from '@/views/deviceConfig/components/listWellCoverConfig'
+import ListWellliquidConfig from '@/views/deviceConfig/components/listWellLiquidConfig'
 export default {
   name: 'DeviceConfig',
-  components: { ListWellcoverConfig, ListH2sConfig, ListTubeConfig, ListLiquidGasConfig, ListNoiseConfig, ListDigConfig, ListTempConfig, ListHarmfulConfig, ListGasConfig, ListLiquidConfig },
+  components: { ListWellliquidConfig, ListWellcoverConfig, ListH2sConfig, ListTubeConfig, ListLiquidGasConfig, ListNoiseConfig, ListDigConfig, ListTempConfig, ListHarmfulConfig, ListGasConfig, ListLiquidConfig },
   data() {
     return {
       activeName: 'liquid'
@@ -61,7 +65,7 @@
   methods: {
     handleClick(tab, event) {
       if (tab.name === 'wellcover') {
-        this.$refs.wellcoveConfig.fetchData()
+        this.$refs.wellcoverConfig.fetchData()
       } else if (tab.name === 'liquid') {
         this.$refs.liquidConfig.fetchData()
       } else if (tab.name === 'harmful') {
@@ -80,12 +84,14 @@
         this.$refs.tubeConfig.fetchData()
       } else if (tab.name === 'h2s') {
         this.$refs.h2sConfig.fetchData()
+      } else if (tab.name === 'wellliquid') {
+        this.$refs.wellliquidConfig.fetchData()
       }
     },
     // 计算那个是当前第一个tab
     caclActive() {
       if (hasPermission('/busConfig/wellcoverConfig/list')) {
-        this.activeName = 'liquid'
+        this.activeName = 'wellcover'
       } else if (hasPermission('/busConfig/liquidConfig/list')) {
         this.activeName = 'liquid'
       } else if (hasPermission('/busConfig/gasConfig/list')) {
@@ -104,6 +110,8 @@
         this.activeName = 'tube'
       } else if (hasPermission('/busConfig/h2sConfig/list')) {
         this.activeName = 'h2s'
+      } else if (hasPermission('/busConfig/wellliquidConfig/list')) {
+        this.activeName = 'wellliquid'
       }
     }
   }
diff --git a/src/views/deviceManage/editDevice.vue b/src/views/deviceManage/editDevice.vue
index 1d3601d..97c9d34 100644
--- a/src/views/deviceManage/editDevice.vue
+++ b/src/views/deviceManage/editDevice.vue
@@ -1,6 +1,6 @@
 <template>
   <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" append-to-body>
-    <el-form ref="dataForm" :rules="rules" :model="deviceForm" label-well-code="right" label-width="100px">
+    <el-form ref="dataForm" :rules="rules" :model="deviceForm" label-well-code="right" label-width="120px">
       <el-row :gutter="20">
         <el-col :span="12">
           <el-form-item label="设备编号" prop="devcode">
@@ -62,6 +62,12 @@
             <el-input v-model.trim="deviceForm.installHeight" :disabled="isDetailMode" type="text" placeholder="必填" />
           </el-form-item>
         </el-col>
+        <!--井盖液位一体机需要-->
+        <el-col v-if="deviceForm.deviceType=='13'" :span="12">
+          <el-form-item label="浮子电线长度" prop="lineLength">
+            <el-input v-model.trim="deviceForm.lineLength" :disabled="isDetailMode" type="text" placeholder="单位m, 必填" />
+          </el-form-item>
+        </el-col>
       </el-row>
     </el-form>
     <div v-show="!isDetailMode" slot="footer" class="dialog-footer">
@@ -111,7 +117,8 @@
         deviceType: [{ required: true, message: '设备类型必选', trigger: ['blur', 'change'] }],
         modelId: [{ required: true, message: '设备型号必选', trigger: ['blur', 'change'] }],
         installDate: [{ required: true, message: '安装日期必选', trigger: ['blur', 'change'] }],
-        installHeight: [{ required: true, message: '设备安装高度不能为空', trigger: ['blur', 'change'] }]
+        installHeight: [{ required: true, message: '设备安装高度不能为空', trigger: ['blur', 'change'] }],
+        lineLength: [{ required: true, message: '浮子电线长度不能为空', trigger: ['blur', 'change'] }, { pattern: /^([1-9]+(\.\d+)?|0\.\d+)$/, message: '浮子电线长度必须为正数', trigger: 'blur' }]
       }, // 前端校验规则
       isEditMode: false, // 编辑模式
       isDetailMode: false // 详情模式
diff --git a/src/views/deviceStatics/components/deviceCountByOffline.vue b/src/views/deviceStatics/components/deviceCountByOffline.vue
index c499e1c..44c02f9 100644
--- a/src/views/deviceStatics/components/deviceCountByOffline.vue
+++ b/src/views/deviceStatics/components/deviceCountByOffline.vue
@@ -139,7 +139,7 @@
         devcode: '',
         deviceType: '',
         offset: 1,
-        limit: 15,
+        limit: 20,
         sort: 'offlineDays',
         order: 'desc'
       }, // 查询条件

diff --git a/src/api/config/wellcoverconfig.js b/src/api/config/wellcoverconfig.js
index ecdd676..6b83752 100644
--- a/src/api/config/wellcoverconfig.js
+++ b/src/api/config/wellcoverconfig.js
@@ -12,11 +12,11 @@
 }
 
 // 修改燃气配置
-export function editWellcoverConfig(params) {
+export function editWellcoverConfig(data) {
   return request({
     url: 'busConfig/wellcoverConfig/config',
     method: 'post',
-    params
+    data
   })
 }
 
diff --git a/src/api/config/wellliquidconfig.js b/src/api/config/wellliquidconfig.js
new file mode 100644
index 0000000..c7c4838
--- /dev/null
+++ b/src/api/config/wellliquidconfig.js
@@ -0,0 +1,42 @@
+/**
+ * 井盖配置接口
+ */
+import request from '@/utils/request'
+// 燃气配置查询
+export function getWellliquidConfigList(params) {
+  return request({
+    url: 'busConfig/wellliquidConfig/list',
+    method: 'get',
+    params
+  })
+}
+
+// 修改燃气配置
+export function editWellliquidConfig(data) {
+  return request({
+    url: 'busConfig/wellliquidConfig/config',
+    method: 'post',
+    data
+  })
+}
+
+// 批量导入
+export function batchImportWellliquidConfig(fileobj) {
+  const param = new FormData()
+  param.append('file', fileobj)
+  return request({
+    url: 'busConfig/wellliquidConfig/batchImport',
+    method: 'post',
+    headers: { 'Content-Type': 'multipart/form-data' },
+    data: param
+  })
+}
+// 批量导出
+export function batchExportWellliquidConfig(params) {
+  return request({
+    url: 'busConfig/wellliquidConfig/batchExport',
+    method: 'get',
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
diff --git a/src/api/data/data.js b/src/api/data/data.js
index c437d7b..cba92e9 100644
--- a/src/api/data/data.js
+++ b/src/api/data/data.js
@@ -394,3 +394,31 @@
     responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
   })
 }
+
+// 井盖数据查询
+export function getWellLiquidData(params) {
+  return request({
+    url: 'wellliquiddata/list-page',
+    method: 'get',
+    params
+  })
+}
+// 井盖数据查询，不分页
+export function getWellLiquidDataSingle(params) {
+  return request({
+    url: 'wellliquiddata/list',
+    method: 'get',
+    params
+  })
+}
+// 批量导出井盖数据
+export function batchExportWellLiquidData(params) {
+  return request({
+    url: 'wellliquiddata/export',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
diff --git a/src/components/BigData/Card/panelCard.vue b/src/components/BigData/Card/panelCard.vue
index d6a7b89..8283d7f 100644
--- a/src/components/BigData/Card/panelCard.vue
+++ b/src/components/BigData/Card/panelCard.vue
@@ -35,12 +35,13 @@
     font-size: 16px;
     font-weight: bold;
     padding: 0px 10px;
+    padding-right: 0px;
     border-left: 5px solid #66b1ff;
     position: relative;
     .title-right{
       display: inline-block;
       position: absolute;
-      right: 10px;
+      right: 0px;
     }
   }
   .panel-body{
diff --git a/src/views/alarmManage/listAlarmNow.vue b/src/views/alarmManage/listAlarmNow.vue
index 7392a4a..9f5a0b6 100644
--- a/src/views/alarmManage/listAlarmNow.vue
+++ b/src/views/alarmManage/listAlarmNow.vue
@@ -361,7 +361,7 @@
         const supportDeviceTypes = this.$store.getters.deviceTypes
         for (const item of response.data.list) {
           const deviceType = '' + item.deviceType
-          if (supportDeviceTypes.indexOf(deviceType) !== -1) {
+          if (supportDeviceTypes.indexOf(deviceType) !== -1 && this.alarmContentTypeList.findIndex(t => t.name === item.name) === -1) {
             this.alarmContentTypeList.push(item)
           }
         }
diff --git a/src/views/alarmManage/listAlarmRecords.vue b/src/views/alarmManage/listAlarmRecords.vue
index 2e34a39..b5d233c 100644
--- a/src/views/alarmManage/listAlarmRecords.vue
+++ b/src/views/alarmManage/listAlarmRecords.vue
@@ -352,7 +352,7 @@
         const supportDeviceTypes = this.$store.getters.deviceTypes
         for (const item of response.data.list) {
           const deviceType = '' + item.deviceType
-          if (supportDeviceTypes.indexOf(deviceType) !== -1) {
+          if (supportDeviceTypes.indexOf(deviceType) !== -1 && this.alarmContentTypeList.findIndex(t => t.name === item.name) === -1) {
             this.alarmContentTypeList.push(item)
           }
         }
diff --git a/src/views/alarmStatics/components/alarmWellRank.vue b/src/views/alarmStatics/components/alarmWellRank.vue
index 89ffa18..acf1598 100644
--- a/src/views/alarmStatics/components/alarmWellRank.vue
+++ b/src/views/alarmStatics/components/alarmWellRank.vue
@@ -75,7 +75,7 @@
       getAlarmContentType('1').then(response => {
         const supportDeviceTypes = this.$store.getters.deviceTypes
         for (const item of response.data.list) {
-          if (supportDeviceTypes.indexOf('' + item.deviceType) !== -1) {
+          if (supportDeviceTypes.indexOf('' + item.deviceType) !== -1 && this.alarmContentTypeList.findIndex(t => t.name === item.name) === -1) {
             this.alarmContentTypeList.push(item)
           }
         }
diff --git a/src/views/dataManage/dataManage.vue b/src/views/dataManage/dataManage.vue
index b1d6a3b..44c099a 100644
--- a/src/views/dataManage/dataManage.vue
+++ b/src/views/dataManage/dataManage.vue
@@ -23,11 +23,12 @@
 import ListPantiltData from '@/views/dataManage/deviceData/listPantiltData'
 import ListHydrantData from '@/views/dataManage/deviceData/listHydrantData'
 import ListH2SData from '@/views/dataManage/deviceData/listH2SData'
+import ListWellLiquidData from '@/views/dataManage/deviceData/listWellLiquidData'
 import { parseUrl } from '@/utils/parseutils'
 
 export default {
   name: 'DataManage',
-  components: { ListH2SData, ListHydrantData, ListPantiltData, ListGasdectorData, ListTubeData, ListNoiseData, ListWellLocaData, ListTempData, ListHarmfulData, ListDigData, ListGasData, ListLiquidData, ListWellCoverData, ListLiquidGasData },
+  components: { ListH2SData, ListHydrantData, ListPantiltData, ListGasdectorData, ListTubeData, ListNoiseData, ListWellLocaData, ListTempData, ListHarmfulData, ListDigData, ListGasData, ListLiquidData, ListWellCoverData, ListLiquidGasData, ListWellLiquidData },
   data() {
     return {
       activeName: 'wellcover',
@@ -45,7 +46,8 @@
         { 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: '14', comp: 'list-H2S-data' }
+        { permission: '/wellliquiddata/list-page', label: '硫化氢浓度监测仪', name: 'H2S', type: '14', comp: 'list-H2S-data' },
+        { permission: '/wellliquiddata/list-page', label: '井盖液位一体机', name: 'wellliquid', type: '13', comp: 'list-well-liquid-data' }
       ] // 所有tab列表
     }
   },
diff --git a/src/views/dataManage/deviceData/listWellLiquidData.vue b/src/views/dataManage/deviceData/listWellLiquidData.vue
new file mode 100644
index 0000000..599039e
--- /dev/null
+++ b/src/views/dataManage/deviceData/listWellLiquidData.vue
@@ -0,0 +1,228 @@
+<template>
+  <app-container>
+    <!--筛选条件-->
+    <search-area size="small" @search="search">
+      <search-item>
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
+      </search-item>
+      <search-item>
+        <dept-select
+          v-model="listQuery.deptid"
+          :need-top="false"
+          dept-type="03"
+          size="small"
+          placeholder="选择权属单位"
+        />
+      </search-item>
+      <search-item>
+        <el-date-picker
+          v-model="timeRange"
+          size="small"
+          type="datetimerange"
+          range-separator="至"
+          value-format="yyyy-MM-dd HH:mm:ss"
+          start-placeholder="开始时间"
+          end-placeholder="结束时间"
+        />
+      </search-item>
+    </search-area>
+    <!--查询结果Table显示-->
+    <normal-table
+      ref="normalTable"
+      :data="list"
+      :total="total"
+      :query="listQuery"
+      :list-loading="listLoading"
+      :options="options"
+      size="small"
+      @change="changePage"
+    >
+      <template slot="btns">
+        <el-button v-if="hasPerm('/wellLiquidData/export')" size="small" @click="batchExport">
+          导出记录
+        </el-button>
+      </template>
+      <template slot="columns">
+        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
+          <template slot-scope="scope">
+            <span v-if="column.checkCell" :class="checkCell(scope.row.cell)">{{ scope.row[column.value] }}</span>
+            <span v-else>{{ scope.row[column.value] }}</span>
+          </template>
+        </el-table-column>
+      </template>
+    </normal-table>
+  </app-container>
+</template>
+
+<script>
+import { getWellLiquidData, batchExportWellLiquidData } from '@/api/data/data'
+import DeptSelect from '../../../components/DeptSelect/index'
+import { parseUrl } from '@/utils/parseutils'
+import { getSearchLastWeekTime } from '@/utils/dateutils'
+import { exportFile } from '@/utils/exportutils'
+
+export default {
+  name: 'ListWellLiquidData',
+  components: { DeptSelect },
+  props: {
+    type: {
+      type: String,
+      required: true
+    }, // 设备类型
+    name: {
+      type: String,
+      default: ''
+    } // 设备名称
+  },
+  data() {
+    return {
+      listQuery: {
+        keywords: '', // 关键字
+        deptid: '', // 部门id
+        beginTime: '', // 开始时间
+        endTime: '', // 结束时间
+        offset: 1,
+        limit: 20,
+        sort: '',
+        order: ''
+      }, // 筛选条件
+      timeRange: [], // 时间范围
+      columns: [
+        {
+          text: '设备编号',
+          value: 'devcode',
+          align: 'center'
+        },
+        {
+          text: '点位编号',
+          value: 'wellCode',
+          align: 'center'
+        },
+        {
+          text: '设备类型',
+          value: 'deviceTypeName',
+          align: 'center'
+        },
+        {
+          text: '状态描述',
+          value: 'descn',
+          align: 'center',
+          checkState: true
+        },
+        {
+          text: '权属单位',
+          value: 'deptName',
+          align: 'center'
+        },
+        {
+          text: '上传时间',
+          value: 'logtime',
+          width: 170,
+          align: 'center'
+        }
+      ], // 显示列
+      list: [], // 列表数据
+      total: 0, // 数据总数
+      options: {
+        needIndex: true, // 是否需要序号列
+        border: true // 是否需要上方边框
+      },
+      listLoading: true, // 加载动画
+      fullscreenLoading: false, // 全屏加载动画
+      editShow: false // 是否显示编辑框
+    }
+  },
+  mounted() {
+    // 如果路径里带参数，解析devcode参数
+    this.timeRange = getSearchLastWeekTime()
+    if (window.location.href) {
+      const params = parseUrl(window.location.href)
+      if (params && params.deviceType === this.type && params.devcode) {
+        this.listQuery.keywords = params.devcode
+        this.fetchData()
+      } else {
+        this.fetchData()
+      }
+    }
+  },
+  activated() {
+    // 要是路由里有参数
+    if (this.$route.query && this.$route.query.devcode) {
+      this.listQuery.keywords = this.$route.query.devcode
+      this.fetchData(false)// 获取数据
+    } else {
+      this.fetchData()
+    }
+  },
+  methods: {
+    // 批量导出
+    batchExport() {
+      // this.handleDateTime()
+      // 全屏加载动画
+      const loading = this.$loading({
+        lock: true,
+        text: '下载中,请稍后...',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
+      })
+      batchExportWellLiquidData(this.listQuery).then(res => {
+        loading.close() // 关闭加载动画
+        let fileName = `${this.name}数据-${this.listQuery.beginTime}-${this.listQuery.endTime}.xlsx`
+        fileName = fileName.replace(/-|:| /g, '')
+        const blob = new Blob([res.data])
+        exportFile(blob, fileName)
+      }).catch((res) => {
+        loading.close()
+      })
+    },
+    // 查询数据
+    search() {
+      this.fetchData(false)
+    },
+    // 获取井盖数据
+    fetchData(isNowPage = true) {
+      this.listLoading = true
+      if (!isNowPage) { // 是否显示当前页，否则跳转第一页
+        this.listQuery.offset = 1
+      }
+      this.handleDateTime()
+      getWellLiquidData(this.listQuery).then(response => {
+        this.list = response.data.rows
+        this.total = response.data.total
+        this.listLoading = false
+      })
+    },
+    // 处理时间
+    handleDateTime() {
+      if (this.timeRange && this.timeRange.length > 0) {
+        this.listQuery.beginTime = this.timeRange[0]
+        this.listQuery.endTime = this.timeRange[1]
+      } else {
+        this.listQuery.beginTime = ''
+        this.listQuery.endTime = ''
+      }
+    },
+    checkState(row) {
+      if (row.status !== '0') {
+        return 'warning-state'
+      }
+    },
+    // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+    changePage(val) {
+      if (val && val.size) {
+        this.listQuery.limit = val.size
+      }
+      if (val && val.page) {
+        this.listQuery.offset = val.page
+      }
+      this.fetchData()
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+.warning-state{
+  color:red
+}
+</style>
diff --git a/src/views/dataView/components/alarmAnalysis.vue b/src/views/dataView/components/alarmAnalysis.vue
index 3ac21d8..f9949ea 100644
--- a/src/views/dataView/components/alarmAnalysis.vue
+++ b/src/views/dataView/components/alarmAnalysis.vue
@@ -76,7 +76,12 @@
     },
     // 获取各类报警的列表
     fetchAlarmByContent() {
-      alarmStaticsByContent(this.listQuery).then(response => {
+      const query = {
+        alarmType: '1',
+        beginTime: this.listQuery.beginTime,
+        endTime: this.listQuery.endTime
+      }
+      alarmStaticsByContent(query).then(response => {
         this.tableList = response.data
       })
     },
diff --git a/src/views/deviceConfig/components/editWellliquidConfig.vue b/src/views/deviceConfig/components/editWellliquidConfig.vue
new file mode 100644
index 0000000..70277d4
--- /dev/null
+++ b/src/views/deviceConfig/components/editWellliquidConfig.vue
@@ -0,0 +1,241 @@
+<template>
+  <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" append-to-body>
+    <el-form ref="dataForm" :rules="rules" :model="configForm" label-well-code="right" label-width="110px">
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item v-if="dialogStatus=='create'" label="设备编号" prop="deviceId">
+            <el-select
+              v-model="configForm.deviceId"
+              :loading="loading"
+              :disabled="dialogStatus=='update'?true:false"
+              filterable
+              placeholder="请输入设备编号"
+            >
+              <el-option
+                v-for="item in devices"
+                :key="item.id"
+                :label="item.devcode"
+                :value="item.id"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item v-if="dialogStatus=='update'" label="设备编号">
+            <el-input v-model="deviceForm.devcode" type="text" placeholder="未知" disabled />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item v-if="deviceForm.deviceName!=''" label="设备名称">
+            <el-input v-model="deviceForm.deviceName" type="text" placeholder="未知" disabled />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item v-if="deviceForm.deviceTypeName!=''" label="设备类型" prop="deviceType">
+            <el-input v-model="deviceForm.deviceTypeName" type="text" placeholder="未知" disabled />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item v-if="deviceForm.deptName!=''" label="权属单位" prop="deptName">
+            <el-input v-model="deviceForm.deptName" type="text" placeholder="未知" disabled />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row v-if="showIp" :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="ip地址" prop="ip">
+            <el-input v-model.trim="configForm.ip" type="text" placeholder="非必填" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="端口号" prop="port">
+            <el-input v-model.trim="configForm.port" type="text" placeholder="非必填" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="最大尝试次数">
+            <el-input-number v-model="configForm.attemptsMax" :min="1" :max="100" type="text" placeholder="必填" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <div slot="footer" class="dialog-footer">
+      <el-button :disabled="!canEdit" type="primary" @click="saveData">
+        保存
+      </el-button>
+      <el-button @click="cancel">
+        取消
+      </el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { editWellliquidConfig } from '@/api/config/wellliquidconfig'
+import { getDeviceSimpleList } from '@/api/config/liquidconfig'
+export default {
+  name: 'EditWellliquidConfig',
+  data() {
+    const validateIp = (rule, value, callback) => {
+      if (value !== '') {
+        if ((/((25[0-5]|2[0-4]\d|((1\d{2})|([1-9]?\d)))\.){3}(25[0-5]|2[0-4]\d|((1\d{2})|([1-9]?\d)))/).test(value) === false) {
+          callback(new Error('请填写正确的ip地址'))
+        } else {
+          callback()
+        }
+      } else {
+        // callback(new Error('ip地址不能为空'))
+        callback()
+      }
+    }
+    const validatePort = (rule, value, callback) => {
+      if (value !== '') {
+        if ((/[1-9]$|(^[1-9][0-9]$)|(^[1-9][0-9][0-9]$)|(^[1-9][0-9][0-9][0-9]$)|(^[1-6][0-5][0-5][0-3][0-5]$)/).test(value) === false) {
+          callback(new Error('请填写正确的端口号'))
+        } else {
+          callback()
+        }
+      } else {
+        // callback(new Error('端口号不能为空'))
+        callback()
+      }
+    }
+    return {
+      dialogFormVisible: false, // 对话框是否显示
+      dialogStatus: '', // 对话框类型：create,update
+      deviceForm: {
+        deviceName: '',
+        deviceTypeName: '',
+        deptName: '',
+        devcode: '',
+        deviceType: ''
+      }, // 设备基本信息
+      configForm: {
+        id: '', // config id
+        deviceId: '', // 设备id
+        attemptsMax: '3', // 最大尝试次数
+        ip: '', // ip地址
+        port: '' // 端口号
+      },
+      textMap: {
+        update: '编辑',
+        create: '新增'
+      }, // 表头显示标题
+      devices: [], // 设备下拉选择列表
+      loading: false, // 加载动画是否显示
+      canEdit: true, // 是否允许点击保存按钮
+      rules: {
+        deviceId: [{ required: true, message: '设备编号不能为空', trigger: ['blur', 'change'] }],
+        ip: [{ trigger: ['blur', 'change'], validator: validateIp }],
+        port: [{ trigger: ['blur', 'change'], validator: validatePort }]
+      } // 前端校验规则
+    }
+  },
+  computed: {
+    watchDeviceId() { // 监控权属单位变化
+      return this.configForm.deviceId
+    },
+    showIp() { // 是否显示ip配置
+      return true
+    }
+  },
+  watch: {
+    watchDeviceId(newValue, oldValue) {
+      for (const device of this.devices) {
+        if (device.id === newValue) {
+          this.deviceForm.deviceTypeName = device.deviceTypeName
+          this.deviceForm.deptName = device.deptName
+          this.deviceForm.deviceName = device.deviceName
+          return
+        }
+      }
+    }
+  },
+  methods: {
+    // 初始化对话框
+    initDialog: function(dialogStatus, dialogFormVisible, row = null) {
+      this.dialogStatus = dialogStatus
+      this.dialogFormVisible = dialogFormVisible
+      this.canEdit = true
+      if (dialogStatus === 'create') { // 如果是新增，清除验证
+        this.resetForm()
+        this.fetchDevice()
+        this.$nextTick(() => {
+          this.$refs['dataForm'].clearValidate()
+        })
+      } else if (dialogStatus === 'update') { // 如果是修改，将row中数据填写到输入框中
+        this.deviceForm = {
+          deviceName: row.deviceName,
+          devcode: row.devcode,
+          deptName: row.deptName,
+          deviceType: row.deviceType,
+          deviceTypeName: row.deviceTypeName
+        }
+        this.configForm = {
+          id: row.id,
+          deviceId: row.deviceId, // 设备id
+          ip: row.ip, // ip地址
+          port: row.port, // 端口号
+          attemptsMax: row.attemptsMax // 最大尝试次数
+        }
+      }
+    },
+    // 重置表单
+    resetForm() {
+      this.deviceForm = {
+        deviceName: '',
+        deviceTypeName: '',
+        deptName: '',
+        devcode: ''
+      }
+      this.configForm = {
+        deviceId: '', // 设备id
+        ip: '', // ip地址
+        port: '', // 端口号
+        attemptsMax: '3' // 最大尝试次数
+      }
+    },
+    // 保存数据
+    saveData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          this.canEdit = false
+          editWellliquidConfig(this.configForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('配置成功')
+              this.$emit('watchChild')
+              this.dialogFormVisible = false
+            }
+            this.canEdit = false
+          }).catch(_ => {
+            this.canEdit = true
+          })
+        }
+      })
+    },
+    // 获取未下发配置的设备列表
+    fetchDevice() {
+      this.loading = true
+      getDeviceSimpleList('13', '0').then(response => {
+        this.loading = false
+        this.devices = response.data
+      })
+    },
+    cancel: function() {
+      this.dialogFormVisible = false
+      this.$emit('watchChild')
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .el-select{
+    width: 100%;
+  }
+  .el-input-number{
+    width: 100%;
+  }
+</style>
diff --git a/src/views/deviceConfig/components/listWellLiquidConfig.vue b/src/views/deviceConfig/components/listWellLiquidConfig.vue
new file mode 100644
index 0000000..34fcf41
--- /dev/null
+++ b/src/views/deviceConfig/components/listWellLiquidConfig.vue
@@ -0,0 +1,299 @@
+<template>
+  <app-container>
+    <!--筛选条件-->
+    <search-area size="small" @search="search">
+      <search-item>
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="设备编号" clearable />
+      </search-item>
+      <search-item>
+        <dept-select v-model="listQuery.deptid" :need-top="deptShowTop" dept-type="03" placeholder="选择权属单位" />
+      </search-item>
+    </search-area>
+    <!--查询结果Table显示-->
+    <div>
+      <el-row class="table-title">
+        <el-col :span="6">
+          <div class="title-header">
+            <i class="el-icon-menu" />数据列表
+          </div>
+        </el-col>
+        <el-col :span="12" :offset="6" class="edit_btns">
+          <el-button v-if="hasPerm('/busConfig/wellliquidConfig/batchExport')" class="edit_btn" size="small" @click="batchExport">
+            导出记录
+          </el-button>
+          <download-template :filename="filename" />
+          <el-upload
+            v-if="hasPerm('/busConfig/wellliquidConfig/batchImport')"
+            :limit="1"
+            :show-file-list="false"
+            :http-request="uploadFile"
+            :file-list="fileList"
+            action="string"
+            accept=".xls,.xlsx"
+            class="edit_btn"
+          >
+            <el-button v-if="hasPerm('/busConfig/wellliquidConfig/batchImport')" slot="trigger" size="small">
+              批量导入
+            </el-button>
+          </el-upload>
+          <el-button v-if="hasPerm('/busConfig/wellliquidConfig/config')" class="edit_btn" size="small" @click="add">
+            新增
+          </el-button>
+        </el-col>
+      </el-row>
+      <el-table v-loading="listLoading" :data="list" class="table" border @selection-change="handleSelectionChange">
+        <!--<el-table-column align="center" type="selection" width="55"/>-->
+        <el-table-column :index="indexMethod" align="center" type="index" />
+        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
+          <template slot-scope="scope">
+            {{ scope.row[column.value] }}
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" align="center" width="60">
+          <template slot-scope="scope">
+            <el-button type="text" @click="edit(scope.row)">
+              编辑
+            </el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+    </div>
+    <!--分页-->
+    <div class="pagination-container">
+      <el-pagination
+        v-show="total>listQuery.limit"
+        :current-page="listQuery.offset"
+        :page-sizes="[20,30,50]"
+        :page-size="listQuery.limit"
+        :total="total"
+        align="center"
+        layout="total, sizes, prev, pager, next"
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"
+      />
+    </div>
+    <edit-wellliquid-config v-show="editShow" ref="editconfig" @watchChild="fetchData" />
+  </app-container>
+</template>
+
+<script>
+import { getWellliquidConfigList, batchImportWellliquidConfig, batchExportWellliquidConfig } from '@/api/config/wellliquidconfig'
+import EditWellliquidConfig from './editWellliquidConfig'
+import DownloadTemplate from '@/components/DownloadTemplate/index'
+import DeptSelect from '@/components/DeptSelect/index'
+
+export default {
+  name: 'ListWellliquidConfig',
+  components: { DeptSelect, DownloadTemplate, EditWellliquidConfig },
+  data() {
+    return {
+      listQuery: {
+        keywords: '',
+        offset: 1,
+        limit: 20,
+        sort: '',
+        order: ''
+      }, // 筛选条件
+      columns: [
+        {
+          text: '设备编号',
+          value: 'devcode',
+          align: 'center'
+        },
+        {
+          text: 'IP地址',
+          value: 'ip',
+          align: 'center'
+        },
+        {
+          text: '端口',
+          value: 'port',
+          align: 'center'
+        },
+        {
+          text: '最大尝试次数',
+          value: 'attemptsMax',
+          align: 'center'
+        },
+        {
+          text: '已尝试次数',
+          value: 'attemptsCurrent',
+          align: 'center'
+        },
+        {
+          text: '下发状态',
+          value: 'statusName',
+          width: 80,
+          align: 'center'
+        }
+      ], // 显示列
+      multipleSelection: [], // 多选选中项
+      list: [], // 列表数据
+      total: 0, // 数据总数
+      deviceTypeList: [], // 燃气配置类型列表
+      deptProps: {
+        parent: 'pid',
+        value: 'id',
+        label: 'name',
+        children: 'children'
+      }, // 权属单位树形下拉菜单
+      deptTreeList: null, // 组织树列表数据
+      showDeptTree: 0, // 是否显示权属单位下拉
+      showDeviceType: true, // 是否显示设备类型下拉
+      listLoading: true, // 加载动画
+      fullscreenLoading: false, // 全屏加载动画
+      editShow: false, // 是否显示编辑框
+      detailShow: false, // 是否显示编辑框
+      filename: 'wellliquid_config_template.xlsx',
+      deptShowTop: false,
+      fileList: []
+    }
+  },
+  created() {
+    this.fetchData()// 获取数据
+  },
+  methods: {
+    // 打开详情对话框
+    checkSelection() {
+      if (this.multipleSelection.length === 0) {
+        return false
+      } else {
+        return true
+      }
+    },
+    // 新增设备
+    add() {
+      this.dialogFormVisible = true
+      this.editShow = true
+      this.$refs.editconfig.initDialog('create', this.dialogFormVisible)
+    },
+    // 编辑燃气配置信息
+    edit(row) {
+      this.dialogFormVisible = true
+      this.editShow = true
+      this.$refs.editconfig.initDialog('update', this.dialogFormVisible, row)
+    },
+    // 批量导入燃气配置
+    uploadFile(param) {
+      // 判断文件大小是否符合要求
+      const _file = param.file
+      const isLt5M = _file.size / 1024 / 1024 < 5
+      if (!isLt5M) {
+        this.$message.error('请上传5M以下的excel文件')
+        return false
+      }
+      // 全屏加载动画
+      const loading = this.$loading({
+        lock: true,
+        text: '导入中,请稍后...',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
+      })
+      // 发起导入请求
+      batchImportWellliquidConfig(_file).then(res => {
+        loading.close() // 关闭加载动画
+        if (res.code === 200) {
+          this.$message.success('导入成功')
+          this.fetchData(false)
+        } else {
+          this.$message.error(res.message)
+        }
+      }).catch(() => {
+        loading.close() // 关闭加载动画
+      })
+      this.fileList = []
+    },
+    // 批量导出
+    batchExport() {
+      // 全屏加载动画
+      const loading = this.$loading({
+        lock: true,
+        text: '数据处理中,请稍后...',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
+      })
+      batchExportWellliquidConfig(this.listQuery).then(res => {
+        loading.close() // 关闭加载动画
+        console.log('download===', res)
+        const blob = new Blob([res.data])
+        const downloadElement = document.createElement('a')
+        const href = window.URL.createObjectURL(blob) // 创建下载的链接
+        downloadElement.href = href
+        downloadElement.download = `井盖配置列表.xlsx` // 下载后文件名
+        document.body.appendChild(downloadElement)
+        downloadElement.click() // 点击下载
+        document.body.removeChild(downloadElement) // 下载完成移除元素
+        window.URL.revokeObjectURL(href) // 释放blob对象
+      }).catch((res) => {
+        loading.close()
+        this.$message.error(res.message)
+      })
+    },
+    // 查询数据
+    search() {
+      this.fetchData(false)
+    },
+    // 获取燃气配置数据
+    fetchData(isNowPage = true) {
+      this.listLoading = true
+      if (!isNowPage) { // 是否显示当前页，否则跳转第一页
+        this.listQuery.offset = 1
+      }
+      getWellliquidConfigList(this.listQuery).then(response => {
+        this.list = response.data.rows
+        this.total = parseInt(response.data.total)
+        this.listLoading = false
+      })
+    },
+    indexMethod(index) {
+      return this.listQuery.limit * (this.listQuery.offset - 1) + index + 1
+    },
+    // 改变页容量
+    handleSizeChange(val) {
+      this.listQuery.limit = val
+      this.fetchData()
+    },
+    // 改变当前页
+    handleCurrentChange(val) {
+      this.listQuery.offset = val
+      this.fetchData()
+    },
+    // 多选触发方法
+    handleSelectionChange(val) {
+      this.multipleSelection = val
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .app-container{
+    padding: 10px;
+  }
+  $tableTitleHeight:46px;
+  .table{
+    margin-bottom: 20px;
+  }
+  .pagination-container{
+    margin-bottom: 50px;
+  }
+  .table-title{
+    background-color:rgba(243, 243, 243, 1);
+    height: $tableTitleHeight;
+    .title-header{
+      line-height:$tableTitleHeight;
+      color: #606266;
+      font-size: 15px;
+      i{
+        margin-left: 5px;
+        margin-right: 5px;
+      }
+    }
+  }
+  .edit_btns{
+    .edit_btn{
+      float:right;
+      margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2
+    }
+  }
+</style>
diff --git a/src/views/deviceConfig/deviceConfig.vue b/src/views/deviceConfig/deviceConfig.vue
index f6189ff..eac828c 100644
--- a/src/views/deviceConfig/deviceConfig.vue
+++ b/src/views/deviceConfig/deviceConfig.vue
@@ -31,6 +31,9 @@
       <el-tab-pane v-if="hasPerm('/busConfig/H2sConfig/list')" label="硫化氢检测终端" name="h2s">
         <list-h2s-config ref="h2sConfig" />
       </el-tab-pane>
+      <el-tab-pane v-if="hasPerm('/busConfig/wellliquidConfig/list')" label="井盖液位一体机" name="wellliquid">
+        <list-wellliquid-config ref="wellliquidConfig" />
+      </el-tab-pane>
     </el-tabs>
   </div>
 </template>
@@ -47,9 +50,10 @@
 import ListTubeConfig from './components/listTubeConfig'
 import ListH2sConfig from './components/listH2sConfig'
 import ListWellcoverConfig from '@/views/deviceConfig/components/listWellCoverConfig'
+import ListWellliquidConfig from '@/views/deviceConfig/components/listWellLiquidConfig'
 export default {
   name: 'DeviceConfig',
-  components: { ListWellcoverConfig, ListH2sConfig, ListTubeConfig, ListLiquidGasConfig, ListNoiseConfig, ListDigConfig, ListTempConfig, ListHarmfulConfig, ListGasConfig, ListLiquidConfig },
+  components: { ListWellliquidConfig, ListWellcoverConfig, ListH2sConfig, ListTubeConfig, ListLiquidGasConfig, ListNoiseConfig, ListDigConfig, ListTempConfig, ListHarmfulConfig, ListGasConfig, ListLiquidConfig },
   data() {
     return {
       activeName: 'liquid'
@@ -61,7 +65,7 @@
   methods: {
     handleClick(tab, event) {
       if (tab.name === 'wellcover') {
-        this.$refs.wellcoveConfig.fetchData()
+        this.$refs.wellcoverConfig.fetchData()
       } else if (tab.name === 'liquid') {
         this.$refs.liquidConfig.fetchData()
       } else if (tab.name === 'harmful') {
@@ -80,12 +84,14 @@
         this.$refs.tubeConfig.fetchData()
       } else if (tab.name === 'h2s') {
         this.$refs.h2sConfig.fetchData()
+      } else if (tab.name === 'wellliquid') {
+        this.$refs.wellliquidConfig.fetchData()
       }
     },
     // 计算那个是当前第一个tab
     caclActive() {
       if (hasPermission('/busConfig/wellcoverConfig/list')) {
-        this.activeName = 'liquid'
+        this.activeName = 'wellcover'
       } else if (hasPermission('/busConfig/liquidConfig/list')) {
         this.activeName = 'liquid'
       } else if (hasPermission('/busConfig/gasConfig/list')) {
@@ -104,6 +110,8 @@
         this.activeName = 'tube'
       } else if (hasPermission('/busConfig/h2sConfig/list')) {
         this.activeName = 'h2s'
+      } else if (hasPermission('/busConfig/wellliquidConfig/list')) {
+        this.activeName = 'wellliquid'
       }
     }
   }
diff --git a/src/views/deviceManage/editDevice.vue b/src/views/deviceManage/editDevice.vue
index 1d3601d..97c9d34 100644
--- a/src/views/deviceManage/editDevice.vue
+++ b/src/views/deviceManage/editDevice.vue
@@ -1,6 +1,6 @@
 <template>
   <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" append-to-body>
-    <el-form ref="dataForm" :rules="rules" :model="deviceForm" label-well-code="right" label-width="100px">
+    <el-form ref="dataForm" :rules="rules" :model="deviceForm" label-well-code="right" label-width="120px">
       <el-row :gutter="20">
         <el-col :span="12">
           <el-form-item label="设备编号" prop="devcode">
@@ -62,6 +62,12 @@
             <el-input v-model.trim="deviceForm.installHeight" :disabled="isDetailMode" type="text" placeholder="必填" />
           </el-form-item>
         </el-col>
+        <!--井盖液位一体机需要-->
+        <el-col v-if="deviceForm.deviceType=='13'" :span="12">
+          <el-form-item label="浮子电线长度" prop="lineLength">
+            <el-input v-model.trim="deviceForm.lineLength" :disabled="isDetailMode" type="text" placeholder="单位m, 必填" />
+          </el-form-item>
+        </el-col>
       </el-row>
     </el-form>
     <div v-show="!isDetailMode" slot="footer" class="dialog-footer">
@@ -111,7 +117,8 @@
         deviceType: [{ required: true, message: '设备类型必选', trigger: ['blur', 'change'] }],
         modelId: [{ required: true, message: '设备型号必选', trigger: ['blur', 'change'] }],
         installDate: [{ required: true, message: '安装日期必选', trigger: ['blur', 'change'] }],
-        installHeight: [{ required: true, message: '设备安装高度不能为空', trigger: ['blur', 'change'] }]
+        installHeight: [{ required: true, message: '设备安装高度不能为空', trigger: ['blur', 'change'] }],
+        lineLength: [{ required: true, message: '浮子电线长度不能为空', trigger: ['blur', 'change'] }, { pattern: /^([1-9]+(\.\d+)?|0\.\d+)$/, message: '浮子电线长度必须为正数', trigger: 'blur' }]
       }, // 前端校验规则
       isEditMode: false, // 编辑模式
       isDetailMode: false // 详情模式
diff --git a/src/views/deviceStatics/components/deviceCountByOffline.vue b/src/views/deviceStatics/components/deviceCountByOffline.vue
index c499e1c..44c02f9 100644
--- a/src/views/deviceStatics/components/deviceCountByOffline.vue
+++ b/src/views/deviceStatics/components/deviceCountByOffline.vue
@@ -139,7 +139,7 @@
         devcode: '',
         deviceType: '',
         offset: 1,
-        limit: 15,
+        limit: 20,
         sort: 'offlineDays',
         order: 'desc'
       }, // 查询条件
diff --git a/src/views/jobManage/listJobs.vue b/src/views/jobManage/listJobs.vue
index 0f6ed2c..bf42b18 100644
--- a/src/views/jobManage/listJobs.vue
+++ b/src/views/jobManage/listJobs.vue
@@ -384,7 +384,7 @@
         const supportDeviceTypes = this.$store.getters.deviceTypes
         for (const item of response.data.list) {
           const deviceType = '' + item.deviceType
-          if (supportDeviceTypes.indexOf(deviceType) !== -1) {
+          if (supportDeviceTypes.indexOf(deviceType) !== -1 && this.alarmContentTypeList.findIndex(t => t.name === item.name) === -1) {
             this.alarmContentTypeList.push(item)
           }
         }

diff --git a/src/api/config/wellcoverconfig.js b/src/api/config/wellcoverconfig.js
index ecdd676..6b83752 100644
--- a/src/api/config/wellcoverconfig.js
+++ b/src/api/config/wellcoverconfig.js
@@ -12,11 +12,11 @@
 }
 
 // 修改燃气配置
-export function editWellcoverConfig(params) {
+export function editWellcoverConfig(data) {
   return request({
     url: 'busConfig/wellcoverConfig/config',
     method: 'post',
-    params
+    data
   })
 }
 
diff --git a/src/api/config/wellliquidconfig.js b/src/api/config/wellliquidconfig.js
new file mode 100644
index 0000000..c7c4838
--- /dev/null
+++ b/src/api/config/wellliquidconfig.js
@@ -0,0 +1,42 @@
+/**
+ * 井盖配置接口
+ */
+import request from '@/utils/request'
+// 燃气配置查询
+export function getWellliquidConfigList(params) {
+  return request({
+    url: 'busConfig/wellliquidConfig/list',
+    method: 'get',
+    params
+  })
+}
+
+// 修改燃气配置
+export function editWellliquidConfig(data) {
+  return request({
+    url: 'busConfig/wellliquidConfig/config',
+    method: 'post',
+    data
+  })
+}
+
+// 批量导入
+export function batchImportWellliquidConfig(fileobj) {
+  const param = new FormData()
+  param.append('file', fileobj)
+  return request({
+    url: 'busConfig/wellliquidConfig/batchImport',
+    method: 'post',
+    headers: { 'Content-Type': 'multipart/form-data' },
+    data: param
+  })
+}
+// 批量导出
+export function batchExportWellliquidConfig(params) {
+  return request({
+    url: 'busConfig/wellliquidConfig/batchExport',
+    method: 'get',
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
diff --git a/src/api/data/data.js b/src/api/data/data.js
index c437d7b..cba92e9 100644
--- a/src/api/data/data.js
+++ b/src/api/data/data.js
@@ -394,3 +394,31 @@
     responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
   })
 }
+
+// 井盖数据查询
+export function getWellLiquidData(params) {
+  return request({
+    url: 'wellliquiddata/list-page',
+    method: 'get',
+    params
+  })
+}
+// 井盖数据查询，不分页
+export function getWellLiquidDataSingle(params) {
+  return request({
+    url: 'wellliquiddata/list',
+    method: 'get',
+    params
+  })
+}
+// 批量导出井盖数据
+export function batchExportWellLiquidData(params) {
+  return request({
+    url: 'wellliquiddata/export',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
diff --git a/src/components/BigData/Card/panelCard.vue b/src/components/BigData/Card/panelCard.vue
index d6a7b89..8283d7f 100644
--- a/src/components/BigData/Card/panelCard.vue
+++ b/src/components/BigData/Card/panelCard.vue
@@ -35,12 +35,13 @@
     font-size: 16px;
     font-weight: bold;
     padding: 0px 10px;
+    padding-right: 0px;
     border-left: 5px solid #66b1ff;
     position: relative;
     .title-right{
       display: inline-block;
       position: absolute;
-      right: 10px;
+      right: 0px;
     }
   }
   .panel-body{
diff --git a/src/views/alarmManage/listAlarmNow.vue b/src/views/alarmManage/listAlarmNow.vue
index 7392a4a..9f5a0b6 100644
--- a/src/views/alarmManage/listAlarmNow.vue
+++ b/src/views/alarmManage/listAlarmNow.vue
@@ -361,7 +361,7 @@
         const supportDeviceTypes = this.$store.getters.deviceTypes
         for (const item of response.data.list) {
           const deviceType = '' + item.deviceType
-          if (supportDeviceTypes.indexOf(deviceType) !== -1) {
+          if (supportDeviceTypes.indexOf(deviceType) !== -1 && this.alarmContentTypeList.findIndex(t => t.name === item.name) === -1) {
             this.alarmContentTypeList.push(item)
           }
         }
diff --git a/src/views/alarmManage/listAlarmRecords.vue b/src/views/alarmManage/listAlarmRecords.vue
index 2e34a39..b5d233c 100644
--- a/src/views/alarmManage/listAlarmRecords.vue
+++ b/src/views/alarmManage/listAlarmRecords.vue
@@ -352,7 +352,7 @@
         const supportDeviceTypes = this.$store.getters.deviceTypes
         for (const item of response.data.list) {
           const deviceType = '' + item.deviceType
-          if (supportDeviceTypes.indexOf(deviceType) !== -1) {
+          if (supportDeviceTypes.indexOf(deviceType) !== -1 && this.alarmContentTypeList.findIndex(t => t.name === item.name) === -1) {
             this.alarmContentTypeList.push(item)
           }
         }
diff --git a/src/views/alarmStatics/components/alarmWellRank.vue b/src/views/alarmStatics/components/alarmWellRank.vue
index 89ffa18..acf1598 100644
--- a/src/views/alarmStatics/components/alarmWellRank.vue
+++ b/src/views/alarmStatics/components/alarmWellRank.vue
@@ -75,7 +75,7 @@
       getAlarmContentType('1').then(response => {
         const supportDeviceTypes = this.$store.getters.deviceTypes
         for (const item of response.data.list) {
-          if (supportDeviceTypes.indexOf('' + item.deviceType) !== -1) {
+          if (supportDeviceTypes.indexOf('' + item.deviceType) !== -1 && this.alarmContentTypeList.findIndex(t => t.name === item.name) === -1) {
             this.alarmContentTypeList.push(item)
           }
         }
diff --git a/src/views/dataManage/dataManage.vue b/src/views/dataManage/dataManage.vue
index b1d6a3b..44c099a 100644
--- a/src/views/dataManage/dataManage.vue
+++ b/src/views/dataManage/dataManage.vue
@@ -23,11 +23,12 @@
 import ListPantiltData from '@/views/dataManage/deviceData/listPantiltData'
 import ListHydrantData from '@/views/dataManage/deviceData/listHydrantData'
 import ListH2SData from '@/views/dataManage/deviceData/listH2SData'
+import ListWellLiquidData from '@/views/dataManage/deviceData/listWellLiquidData'
 import { parseUrl } from '@/utils/parseutils'
 
 export default {
   name: 'DataManage',
-  components: { ListH2SData, ListHydrantData, ListPantiltData, ListGasdectorData, ListTubeData, ListNoiseData, ListWellLocaData, ListTempData, ListHarmfulData, ListDigData, ListGasData, ListLiquidData, ListWellCoverData, ListLiquidGasData },
+  components: { ListH2SData, ListHydrantData, ListPantiltData, ListGasdectorData, ListTubeData, ListNoiseData, ListWellLocaData, ListTempData, ListHarmfulData, ListDigData, ListGasData, ListLiquidData, ListWellCoverData, ListLiquidGasData, ListWellLiquidData },
   data() {
     return {
       activeName: 'wellcover',
@@ -45,7 +46,8 @@
         { 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: '14', comp: 'list-H2S-data' }
+        { permission: '/wellliquiddata/list-page', label: '硫化氢浓度监测仪', name: 'H2S', type: '14', comp: 'list-H2S-data' },
+        { permission: '/wellliquiddata/list-page', label: '井盖液位一体机', name: 'wellliquid', type: '13', comp: 'list-well-liquid-data' }
       ] // 所有tab列表
     }
   },
diff --git a/src/views/dataManage/deviceData/listWellLiquidData.vue b/src/views/dataManage/deviceData/listWellLiquidData.vue
new file mode 100644
index 0000000..599039e
--- /dev/null
+++ b/src/views/dataManage/deviceData/listWellLiquidData.vue
@@ -0,0 +1,228 @@
+<template>
+  <app-container>
+    <!--筛选条件-->
+    <search-area size="small" @search="search">
+      <search-item>
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
+      </search-item>
+      <search-item>
+        <dept-select
+          v-model="listQuery.deptid"
+          :need-top="false"
+          dept-type="03"
+          size="small"
+          placeholder="选择权属单位"
+        />
+      </search-item>
+      <search-item>
+        <el-date-picker
+          v-model="timeRange"
+          size="small"
+          type="datetimerange"
+          range-separator="至"
+          value-format="yyyy-MM-dd HH:mm:ss"
+          start-placeholder="开始时间"
+          end-placeholder="结束时间"
+        />
+      </search-item>
+    </search-area>
+    <!--查询结果Table显示-->
+    <normal-table
+      ref="normalTable"
+      :data="list"
+      :total="total"
+      :query="listQuery"
+      :list-loading="listLoading"
+      :options="options"
+      size="small"
+      @change="changePage"
+    >
+      <template slot="btns">
+        <el-button v-if="hasPerm('/wellLiquidData/export')" size="small" @click="batchExport">
+          导出记录
+        </el-button>
+      </template>
+      <template slot="columns">
+        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
+          <template slot-scope="scope">
+            <span v-if="column.checkCell" :class="checkCell(scope.row.cell)">{{ scope.row[column.value] }}</span>
+            <span v-else>{{ scope.row[column.value] }}</span>
+          </template>
+        </el-table-column>
+      </template>
+    </normal-table>
+  </app-container>
+</template>
+
+<script>
+import { getWellLiquidData, batchExportWellLiquidData } from '@/api/data/data'
+import DeptSelect from '../../../components/DeptSelect/index'
+import { parseUrl } from '@/utils/parseutils'
+import { getSearchLastWeekTime } from '@/utils/dateutils'
+import { exportFile } from '@/utils/exportutils'
+
+export default {
+  name: 'ListWellLiquidData',
+  components: { DeptSelect },
+  props: {
+    type: {
+      type: String,
+      required: true
+    }, // 设备类型
+    name: {
+      type: String,
+      default: ''
+    } // 设备名称
+  },
+  data() {
+    return {
+      listQuery: {
+        keywords: '', // 关键字
+        deptid: '', // 部门id
+        beginTime: '', // 开始时间
+        endTime: '', // 结束时间
+        offset: 1,
+        limit: 20,
+        sort: '',
+        order: ''
+      }, // 筛选条件
+      timeRange: [], // 时间范围
+      columns: [
+        {
+          text: '设备编号',
+          value: 'devcode',
+          align: 'center'
+        },
+        {
+          text: '点位编号',
+          value: 'wellCode',
+          align: 'center'
+        },
+        {
+          text: '设备类型',
+          value: 'deviceTypeName',
+          align: 'center'
+        },
+        {
+          text: '状态描述',
+          value: 'descn',
+          align: 'center',
+          checkState: true
+        },
+        {
+          text: '权属单位',
+          value: 'deptName',
+          align: 'center'
+        },
+        {
+          text: '上传时间',
+          value: 'logtime',
+          width: 170,
+          align: 'center'
+        }
+      ], // 显示列
+      list: [], // 列表数据
+      total: 0, // 数据总数
+      options: {
+        needIndex: true, // 是否需要序号列
+        border: true // 是否需要上方边框
+      },
+      listLoading: true, // 加载动画
+      fullscreenLoading: false, // 全屏加载动画
+      editShow: false // 是否显示编辑框
+    }
+  },
+  mounted() {
+    // 如果路径里带参数，解析devcode参数
+    this.timeRange = getSearchLastWeekTime()
+    if (window.location.href) {
+      const params = parseUrl(window.location.href)
+      if (params && params.deviceType === this.type && params.devcode) {
+        this.listQuery.keywords = params.devcode
+        this.fetchData()
+      } else {
+        this.fetchData()
+      }
+    }
+  },
+  activated() {
+    // 要是路由里有参数
+    if (this.$route.query && this.$route.query.devcode) {
+      this.listQuery.keywords = this.$route.query.devcode
+      this.fetchData(false)// 获取数据
+    } else {
+      this.fetchData()
+    }
+  },
+  methods: {
+    // 批量导出
+    batchExport() {
+      // this.handleDateTime()
+      // 全屏加载动画
+      const loading = this.$loading({
+        lock: true,
+        text: '下载中,请稍后...',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
+      })
+      batchExportWellLiquidData(this.listQuery).then(res => {
+        loading.close() // 关闭加载动画
+        let fileName = `${this.name}数据-${this.listQuery.beginTime}-${this.listQuery.endTime}.xlsx`
+        fileName = fileName.replace(/-|:| /g, '')
+        const blob = new Blob([res.data])
+        exportFile(blob, fileName)
+      }).catch((res) => {
+        loading.close()
+      })
+    },
+    // 查询数据
+    search() {
+      this.fetchData(false)
+    },
+    // 获取井盖数据
+    fetchData(isNowPage = true) {
+      this.listLoading = true
+      if (!isNowPage) { // 是否显示当前页，否则跳转第一页
+        this.listQuery.offset = 1
+      }
+      this.handleDateTime()
+      getWellLiquidData(this.listQuery).then(response => {
+        this.list = response.data.rows
+        this.total = response.data.total
+        this.listLoading = false
+      })
+    },
+    // 处理时间
+    handleDateTime() {
+      if (this.timeRange && this.timeRange.length > 0) {
+        this.listQuery.beginTime = this.timeRange[0]
+        this.listQuery.endTime = this.timeRange[1]
+      } else {
+        this.listQuery.beginTime = ''
+        this.listQuery.endTime = ''
+      }
+    },
+    checkState(row) {
+      if (row.status !== '0') {
+        return 'warning-state'
+      }
+    },
+    // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+    changePage(val) {
+      if (val && val.size) {
+        this.listQuery.limit = val.size
+      }
+      if (val && val.page) {
+        this.listQuery.offset = val.page
+      }
+      this.fetchData()
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+.warning-state{
+  color:red
+}
+</style>
diff --git a/src/views/dataView/components/alarmAnalysis.vue b/src/views/dataView/components/alarmAnalysis.vue
index 3ac21d8..f9949ea 100644
--- a/src/views/dataView/components/alarmAnalysis.vue
+++ b/src/views/dataView/components/alarmAnalysis.vue
@@ -76,7 +76,12 @@
     },
     // 获取各类报警的列表
     fetchAlarmByContent() {
-      alarmStaticsByContent(this.listQuery).then(response => {
+      const query = {
+        alarmType: '1',
+        beginTime: this.listQuery.beginTime,
+        endTime: this.listQuery.endTime
+      }
+      alarmStaticsByContent(query).then(response => {
         this.tableList = response.data
       })
     },
diff --git a/src/views/deviceConfig/components/editWellliquidConfig.vue b/src/views/deviceConfig/components/editWellliquidConfig.vue
new file mode 100644
index 0000000..70277d4
--- /dev/null
+++ b/src/views/deviceConfig/components/editWellliquidConfig.vue
@@ -0,0 +1,241 @@
+<template>
+  <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" append-to-body>
+    <el-form ref="dataForm" :rules="rules" :model="configForm" label-well-code="right" label-width="110px">
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item v-if="dialogStatus=='create'" label="设备编号" prop="deviceId">
+            <el-select
+              v-model="configForm.deviceId"
+              :loading="loading"
+              :disabled="dialogStatus=='update'?true:false"
+              filterable
+              placeholder="请输入设备编号"
+            >
+              <el-option
+                v-for="item in devices"
+                :key="item.id"
+                :label="item.devcode"
+                :value="item.id"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item v-if="dialogStatus=='update'" label="设备编号">
+            <el-input v-model="deviceForm.devcode" type="text" placeholder="未知" disabled />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item v-if="deviceForm.deviceName!=''" label="设备名称">
+            <el-input v-model="deviceForm.deviceName" type="text" placeholder="未知" disabled />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item v-if="deviceForm.deviceTypeName!=''" label="设备类型" prop="deviceType">
+            <el-input v-model="deviceForm.deviceTypeName" type="text" placeholder="未知" disabled />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item v-if="deviceForm.deptName!=''" label="权属单位" prop="deptName">
+            <el-input v-model="deviceForm.deptName" type="text" placeholder="未知" disabled />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row v-if="showIp" :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="ip地址" prop="ip">
+            <el-input v-model.trim="configForm.ip" type="text" placeholder="非必填" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="端口号" prop="port">
+            <el-input v-model.trim="configForm.port" type="text" placeholder="非必填" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="最大尝试次数">
+            <el-input-number v-model="configForm.attemptsMax" :min="1" :max="100" type="text" placeholder="必填" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <div slot="footer" class="dialog-footer">
+      <el-button :disabled="!canEdit" type="primary" @click="saveData">
+        保存
+      </el-button>
+      <el-button @click="cancel">
+        取消
+      </el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { editWellliquidConfig } from '@/api/config/wellliquidconfig'
+import { getDeviceSimpleList } from '@/api/config/liquidconfig'
+export default {
+  name: 'EditWellliquidConfig',
+  data() {
+    const validateIp = (rule, value, callback) => {
+      if (value !== '') {
+        if ((/((25[0-5]|2[0-4]\d|((1\d{2})|([1-9]?\d)))\.){3}(25[0-5]|2[0-4]\d|((1\d{2})|([1-9]?\d)))/).test(value) === false) {
+          callback(new Error('请填写正确的ip地址'))
+        } else {
+          callback()
+        }
+      } else {
+        // callback(new Error('ip地址不能为空'))
+        callback()
+      }
+    }
+    const validatePort = (rule, value, callback) => {
+      if (value !== '') {
+        if ((/[1-9]$|(^[1-9][0-9]$)|(^[1-9][0-9][0-9]$)|(^[1-9][0-9][0-9][0-9]$)|(^[1-6][0-5][0-5][0-3][0-5]$)/).test(value) === false) {
+          callback(new Error('请填写正确的端口号'))
+        } else {
+          callback()
+        }
+      } else {
+        // callback(new Error('端口号不能为空'))
+        callback()
+      }
+    }
+    return {
+      dialogFormVisible: false, // 对话框是否显示
+      dialogStatus: '', // 对话框类型：create,update
+      deviceForm: {
+        deviceName: '',
+        deviceTypeName: '',
+        deptName: '',
+        devcode: '',
+        deviceType: ''
+      }, // 设备基本信息
+      configForm: {
+        id: '', // config id
+        deviceId: '', // 设备id
+        attemptsMax: '3', // 最大尝试次数
+        ip: '', // ip地址
+        port: '' // 端口号
+      },
+      textMap: {
+        update: '编辑',
+        create: '新增'
+      }, // 表头显示标题
+      devices: [], // 设备下拉选择列表
+      loading: false, // 加载动画是否显示
+      canEdit: true, // 是否允许点击保存按钮
+      rules: {
+        deviceId: [{ required: true, message: '设备编号不能为空', trigger: ['blur', 'change'] }],
+        ip: [{ trigger: ['blur', 'change'], validator: validateIp }],
+        port: [{ trigger: ['blur', 'change'], validator: validatePort }]
+      } // 前端校验规则
+    }
+  },
+  computed: {
+    watchDeviceId() { // 监控权属单位变化
+      return this.configForm.deviceId
+    },
+    showIp() { // 是否显示ip配置
+      return true
+    }
+  },
+  watch: {
+    watchDeviceId(newValue, oldValue) {
+      for (const device of this.devices) {
+        if (device.id === newValue) {
+          this.deviceForm.deviceTypeName = device.deviceTypeName
+          this.deviceForm.deptName = device.deptName
+          this.deviceForm.deviceName = device.deviceName
+          return
+        }
+      }
+    }
+  },
+  methods: {
+    // 初始化对话框
+    initDialog: function(dialogStatus, dialogFormVisible, row = null) {
+      this.dialogStatus = dialogStatus
+      this.dialogFormVisible = dialogFormVisible
+      this.canEdit = true
+      if (dialogStatus === 'create') { // 如果是新增，清除验证
+        this.resetForm()
+        this.fetchDevice()
+        this.$nextTick(() => {
+          this.$refs['dataForm'].clearValidate()
+        })
+      } else if (dialogStatus === 'update') { // 如果是修改，将row中数据填写到输入框中
+        this.deviceForm = {
+          deviceName: row.deviceName,
+          devcode: row.devcode,
+          deptName: row.deptName,
+          deviceType: row.deviceType,
+          deviceTypeName: row.deviceTypeName
+        }
+        this.configForm = {
+          id: row.id,
+          deviceId: row.deviceId, // 设备id
+          ip: row.ip, // ip地址
+          port: row.port, // 端口号
+          attemptsMax: row.attemptsMax // 最大尝试次数
+        }
+      }
+    },
+    // 重置表单
+    resetForm() {
+      this.deviceForm = {
+        deviceName: '',
+        deviceTypeName: '',
+        deptName: '',
+        devcode: ''
+      }
+      this.configForm = {
+        deviceId: '', // 设备id
+        ip: '', // ip地址
+        port: '', // 端口号
+        attemptsMax: '3' // 最大尝试次数
+      }
+    },
+    // 保存数据
+    saveData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          this.canEdit = false
+          editWellliquidConfig(this.configForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('配置成功')
+              this.$emit('watchChild')
+              this.dialogFormVisible = false
+            }
+            this.canEdit = false
+          }).catch(_ => {
+            this.canEdit = true
+          })
+        }
+      })
+    },
+    // 获取未下发配置的设备列表
+    fetchDevice() {
+      this.loading = true
+      getDeviceSimpleList('13', '0').then(response => {
+        this.loading = false
+        this.devices = response.data
+      })
+    },
+    cancel: function() {
+      this.dialogFormVisible = false
+      this.$emit('watchChild')
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .el-select{
+    width: 100%;
+  }
+  .el-input-number{
+    width: 100%;
+  }
+</style>
diff --git a/src/views/deviceConfig/components/listWellLiquidConfig.vue b/src/views/deviceConfig/components/listWellLiquidConfig.vue
new file mode 100644
index 0000000..34fcf41
--- /dev/null
+++ b/src/views/deviceConfig/components/listWellLiquidConfig.vue
@@ -0,0 +1,299 @@
+<template>
+  <app-container>
+    <!--筛选条件-->
+    <search-area size="small" @search="search">
+      <search-item>
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="设备编号" clearable />
+      </search-item>
+      <search-item>
+        <dept-select v-model="listQuery.deptid" :need-top="deptShowTop" dept-type="03" placeholder="选择权属单位" />
+      </search-item>
+    </search-area>
+    <!--查询结果Table显示-->
+    <div>
+      <el-row class="table-title">
+        <el-col :span="6">
+          <div class="title-header">
+            <i class="el-icon-menu" />数据列表
+          </div>
+        </el-col>
+        <el-col :span="12" :offset="6" class="edit_btns">
+          <el-button v-if="hasPerm('/busConfig/wellliquidConfig/batchExport')" class="edit_btn" size="small" @click="batchExport">
+            导出记录
+          </el-button>
+          <download-template :filename="filename" />
+          <el-upload
+            v-if="hasPerm('/busConfig/wellliquidConfig/batchImport')"
+            :limit="1"
+            :show-file-list="false"
+            :http-request="uploadFile"
+            :file-list="fileList"
+            action="string"
+            accept=".xls,.xlsx"
+            class="edit_btn"
+          >
+            <el-button v-if="hasPerm('/busConfig/wellliquidConfig/batchImport')" slot="trigger" size="small">
+              批量导入
+            </el-button>
+          </el-upload>
+          <el-button v-if="hasPerm('/busConfig/wellliquidConfig/config')" class="edit_btn" size="small" @click="add">
+            新增
+          </el-button>
+        </el-col>
+      </el-row>
+      <el-table v-loading="listLoading" :data="list" class="table" border @selection-change="handleSelectionChange">
+        <!--<el-table-column align="center" type="selection" width="55"/>-->
+        <el-table-column :index="indexMethod" align="center" type="index" />
+        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
+          <template slot-scope="scope">
+            {{ scope.row[column.value] }}
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" align="center" width="60">
+          <template slot-scope="scope">
+            <el-button type="text" @click="edit(scope.row)">
+              编辑
+            </el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+    </div>
+    <!--分页-->
+    <div class="pagination-container">
+      <el-pagination
+        v-show="total>listQuery.limit"
+        :current-page="listQuery.offset"
+        :page-sizes="[20,30,50]"
+        :page-size="listQuery.limit"
+        :total="total"
+        align="center"
+        layout="total, sizes, prev, pager, next"
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"
+      />
+    </div>
+    <edit-wellliquid-config v-show="editShow" ref="editconfig" @watchChild="fetchData" />
+  </app-container>
+</template>
+
+<script>
+import { getWellliquidConfigList, batchImportWellliquidConfig, batchExportWellliquidConfig } from '@/api/config/wellliquidconfig'
+import EditWellliquidConfig from './editWellliquidConfig'
+import DownloadTemplate from '@/components/DownloadTemplate/index'
+import DeptSelect from '@/components/DeptSelect/index'
+
+export default {
+  name: 'ListWellliquidConfig',
+  components: { DeptSelect, DownloadTemplate, EditWellliquidConfig },
+  data() {
+    return {
+      listQuery: {
+        keywords: '',
+        offset: 1,
+        limit: 20,
+        sort: '',
+        order: ''
+      }, // 筛选条件
+      columns: [
+        {
+          text: '设备编号',
+          value: 'devcode',
+          align: 'center'
+        },
+        {
+          text: 'IP地址',
+          value: 'ip',
+          align: 'center'
+        },
+        {
+          text: '端口',
+          value: 'port',
+          align: 'center'
+        },
+        {
+          text: '最大尝试次数',
+          value: 'attemptsMax',
+          align: 'center'
+        },
+        {
+          text: '已尝试次数',
+          value: 'attemptsCurrent',
+          align: 'center'
+        },
+        {
+          text: '下发状态',
+          value: 'statusName',
+          width: 80,
+          align: 'center'
+        }
+      ], // 显示列
+      multipleSelection: [], // 多选选中项
+      list: [], // 列表数据
+      total: 0, // 数据总数
+      deviceTypeList: [], // 燃气配置类型列表
+      deptProps: {
+        parent: 'pid',
+        value: 'id',
+        label: 'name',
+        children: 'children'
+      }, // 权属单位树形下拉菜单
+      deptTreeList: null, // 组织树列表数据
+      showDeptTree: 0, // 是否显示权属单位下拉
+      showDeviceType: true, // 是否显示设备类型下拉
+      listLoading: true, // 加载动画
+      fullscreenLoading: false, // 全屏加载动画
+      editShow: false, // 是否显示编辑框
+      detailShow: false, // 是否显示编辑框
+      filename: 'wellliquid_config_template.xlsx',
+      deptShowTop: false,
+      fileList: []
+    }
+  },
+  created() {
+    this.fetchData()// 获取数据
+  },
+  methods: {
+    // 打开详情对话框
+    checkSelection() {
+      if (this.multipleSelection.length === 0) {
+        return false
+      } else {
+        return true
+      }
+    },
+    // 新增设备
+    add() {
+      this.dialogFormVisible = true
+      this.editShow = true
+      this.$refs.editconfig.initDialog('create', this.dialogFormVisible)
+    },
+    // 编辑燃气配置信息
+    edit(row) {
+      this.dialogFormVisible = true
+      this.editShow = true
+      this.$refs.editconfig.initDialog('update', this.dialogFormVisible, row)
+    },
+    // 批量导入燃气配置
+    uploadFile(param) {
+      // 判断文件大小是否符合要求
+      const _file = param.file
+      const isLt5M = _file.size / 1024 / 1024 < 5
+      if (!isLt5M) {
+        this.$message.error('请上传5M以下的excel文件')
+        return false
+      }
+      // 全屏加载动画
+      const loading = this.$loading({
+        lock: true,
+        text: '导入中,请稍后...',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
+      })
+      // 发起导入请求
+      batchImportWellliquidConfig(_file).then(res => {
+        loading.close() // 关闭加载动画
+        if (res.code === 200) {
+          this.$message.success('导入成功')
+          this.fetchData(false)
+        } else {
+          this.$message.error(res.message)
+        }
+      }).catch(() => {
+        loading.close() // 关闭加载动画
+      })
+      this.fileList = []
+    },
+    // 批量导出
+    batchExport() {
+      // 全屏加载动画
+      const loading = this.$loading({
+        lock: true,
+        text: '数据处理中,请稍后...',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
+      })
+      batchExportWellliquidConfig(this.listQuery).then(res => {
+        loading.close() // 关闭加载动画
+        console.log('download===', res)
+        const blob = new Blob([res.data])
+        const downloadElement = document.createElement('a')
+        const href = window.URL.createObjectURL(blob) // 创建下载的链接
+        downloadElement.href = href
+        downloadElement.download = `井盖配置列表.xlsx` // 下载后文件名
+        document.body.appendChild(downloadElement)
+        downloadElement.click() // 点击下载
+        document.body.removeChild(downloadElement) // 下载完成移除元素
+        window.URL.revokeObjectURL(href) // 释放blob对象
+      }).catch((res) => {
+        loading.close()
+        this.$message.error(res.message)
+      })
+    },
+    // 查询数据
+    search() {
+      this.fetchData(false)
+    },
+    // 获取燃气配置数据
+    fetchData(isNowPage = true) {
+      this.listLoading = true
+      if (!isNowPage) { // 是否显示当前页，否则跳转第一页
+        this.listQuery.offset = 1
+      }
+      getWellliquidConfigList(this.listQuery).then(response => {
+        this.list = response.data.rows
+        this.total = parseInt(response.data.total)
+        this.listLoading = false
+      })
+    },
+    indexMethod(index) {
+      return this.listQuery.limit * (this.listQuery.offset - 1) + index + 1
+    },
+    // 改变页容量
+    handleSizeChange(val) {
+      this.listQuery.limit = val
+      this.fetchData()
+    },
+    // 改变当前页
+    handleCurrentChange(val) {
+      this.listQuery.offset = val
+      this.fetchData()
+    },
+    // 多选触发方法
+    handleSelectionChange(val) {
+      this.multipleSelection = val
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .app-container{
+    padding: 10px;
+  }
+  $tableTitleHeight:46px;
+  .table{
+    margin-bottom: 20px;
+  }
+  .pagination-container{
+    margin-bottom: 50px;
+  }
+  .table-title{
+    background-color:rgba(243, 243, 243, 1);
+    height: $tableTitleHeight;
+    .title-header{
+      line-height:$tableTitleHeight;
+      color: #606266;
+      font-size: 15px;
+      i{
+        margin-left: 5px;
+        margin-right: 5px;
+      }
+    }
+  }
+  .edit_btns{
+    .edit_btn{
+      float:right;
+      margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2
+    }
+  }
+</style>
diff --git a/src/views/deviceConfig/deviceConfig.vue b/src/views/deviceConfig/deviceConfig.vue
index f6189ff..eac828c 100644
--- a/src/views/deviceConfig/deviceConfig.vue
+++ b/src/views/deviceConfig/deviceConfig.vue
@@ -31,6 +31,9 @@
       <el-tab-pane v-if="hasPerm('/busConfig/H2sConfig/list')" label="硫化氢检测终端" name="h2s">
         <list-h2s-config ref="h2sConfig" />
       </el-tab-pane>
+      <el-tab-pane v-if="hasPerm('/busConfig/wellliquidConfig/list')" label="井盖液位一体机" name="wellliquid">
+        <list-wellliquid-config ref="wellliquidConfig" />
+      </el-tab-pane>
     </el-tabs>
   </div>
 </template>
@@ -47,9 +50,10 @@
 import ListTubeConfig from './components/listTubeConfig'
 import ListH2sConfig from './components/listH2sConfig'
 import ListWellcoverConfig from '@/views/deviceConfig/components/listWellCoverConfig'
+import ListWellliquidConfig from '@/views/deviceConfig/components/listWellLiquidConfig'
 export default {
   name: 'DeviceConfig',
-  components: { ListWellcoverConfig, ListH2sConfig, ListTubeConfig, ListLiquidGasConfig, ListNoiseConfig, ListDigConfig, ListTempConfig, ListHarmfulConfig, ListGasConfig, ListLiquidConfig },
+  components: { ListWellliquidConfig, ListWellcoverConfig, ListH2sConfig, ListTubeConfig, ListLiquidGasConfig, ListNoiseConfig, ListDigConfig, ListTempConfig, ListHarmfulConfig, ListGasConfig, ListLiquidConfig },
   data() {
     return {
       activeName: 'liquid'
@@ -61,7 +65,7 @@
   methods: {
     handleClick(tab, event) {
       if (tab.name === 'wellcover') {
-        this.$refs.wellcoveConfig.fetchData()
+        this.$refs.wellcoverConfig.fetchData()
       } else if (tab.name === 'liquid') {
         this.$refs.liquidConfig.fetchData()
       } else if (tab.name === 'harmful') {
@@ -80,12 +84,14 @@
         this.$refs.tubeConfig.fetchData()
       } else if (tab.name === 'h2s') {
         this.$refs.h2sConfig.fetchData()
+      } else if (tab.name === 'wellliquid') {
+        this.$refs.wellliquidConfig.fetchData()
       }
     },
     // 计算那个是当前第一个tab
     caclActive() {
       if (hasPermission('/busConfig/wellcoverConfig/list')) {
-        this.activeName = 'liquid'
+        this.activeName = 'wellcover'
       } else if (hasPermission('/busConfig/liquidConfig/list')) {
         this.activeName = 'liquid'
       } else if (hasPermission('/busConfig/gasConfig/list')) {
@@ -104,6 +110,8 @@
         this.activeName = 'tube'
       } else if (hasPermission('/busConfig/h2sConfig/list')) {
         this.activeName = 'h2s'
+      } else if (hasPermission('/busConfig/wellliquidConfig/list')) {
+        this.activeName = 'wellliquid'
       }
     }
   }
diff --git a/src/views/deviceManage/editDevice.vue b/src/views/deviceManage/editDevice.vue
index 1d3601d..97c9d34 100644
--- a/src/views/deviceManage/editDevice.vue
+++ b/src/views/deviceManage/editDevice.vue
@@ -1,6 +1,6 @@
 <template>
   <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" append-to-body>
-    <el-form ref="dataForm" :rules="rules" :model="deviceForm" label-well-code="right" label-width="100px">
+    <el-form ref="dataForm" :rules="rules" :model="deviceForm" label-well-code="right" label-width="120px">
       <el-row :gutter="20">
         <el-col :span="12">
           <el-form-item label="设备编号" prop="devcode">
@@ -62,6 +62,12 @@
             <el-input v-model.trim="deviceForm.installHeight" :disabled="isDetailMode" type="text" placeholder="必填" />
           </el-form-item>
         </el-col>
+        <!--井盖液位一体机需要-->
+        <el-col v-if="deviceForm.deviceType=='13'" :span="12">
+          <el-form-item label="浮子电线长度" prop="lineLength">
+            <el-input v-model.trim="deviceForm.lineLength" :disabled="isDetailMode" type="text" placeholder="单位m, 必填" />
+          </el-form-item>
+        </el-col>
       </el-row>
     </el-form>
     <div v-show="!isDetailMode" slot="footer" class="dialog-footer">
@@ -111,7 +117,8 @@
         deviceType: [{ required: true, message: '设备类型必选', trigger: ['blur', 'change'] }],
         modelId: [{ required: true, message: '设备型号必选', trigger: ['blur', 'change'] }],
         installDate: [{ required: true, message: '安装日期必选', trigger: ['blur', 'change'] }],
-        installHeight: [{ required: true, message: '设备安装高度不能为空', trigger: ['blur', 'change'] }]
+        installHeight: [{ required: true, message: '设备安装高度不能为空', trigger: ['blur', 'change'] }],
+        lineLength: [{ required: true, message: '浮子电线长度不能为空', trigger: ['blur', 'change'] }, { pattern: /^([1-9]+(\.\d+)?|0\.\d+)$/, message: '浮子电线长度必须为正数', trigger: 'blur' }]
       }, // 前端校验规则
       isEditMode: false, // 编辑模式
       isDetailMode: false // 详情模式
diff --git a/src/views/deviceStatics/components/deviceCountByOffline.vue b/src/views/deviceStatics/components/deviceCountByOffline.vue
index c499e1c..44c02f9 100644
--- a/src/views/deviceStatics/components/deviceCountByOffline.vue
+++ b/src/views/deviceStatics/components/deviceCountByOffline.vue
@@ -139,7 +139,7 @@
         devcode: '',
         deviceType: '',
         offset: 1,
-        limit: 15,
+        limit: 20,
         sort: 'offlineDays',
         order: 'desc'
       }, // 查询条件
diff --git a/src/views/jobManage/listJobs.vue b/src/views/jobManage/listJobs.vue
index 0f6ed2c..bf42b18 100644
--- a/src/views/jobManage/listJobs.vue
+++ b/src/views/jobManage/listJobs.vue
@@ -384,7 +384,7 @@
         const supportDeviceTypes = this.$store.getters.deviceTypes
         for (const item of response.data.list) {
           const deviceType = '' + item.deviceType
-          if (supportDeviceTypes.indexOf(deviceType) !== -1) {
+          if (supportDeviceTypes.indexOf(deviceType) !== -1 && this.alarmContentTypeList.findIndex(t => t.name === item.name) === -1) {
             this.alarmContentTypeList.push(item)
           }
         }
diff --git a/src/views/jobManage/listJobsOverTimeGet.vue b/src/views/jobManage/listJobsOverTimeGet.vue
index 14d72fd..27cbea5 100644
--- a/src/views/jobManage/listJobsOverTimeGet.vue
+++ b/src/views/jobManage/listJobsOverTimeGet.vue
@@ -323,7 +323,7 @@
         const supportDeviceTypes = this.$store.getters.deviceTypes
         for (const item of response.data.list) {
           const deviceType = '' + item.deviceType
-          if (supportDeviceTypes.indexOf(deviceType) !== -1) {
+          if (supportDeviceTypes.indexOf(deviceType) !== -1 && this.alarmContentTypeList.findIndex(t => t.name === item.name) === -1) {
             this.alarmContentTypeList.push(item)
           }
         }

diff --git a/src/api/config/wellcoverconfig.js b/src/api/config/wellcoverconfig.js
index ecdd676..6b83752 100644
--- a/src/api/config/wellcoverconfig.js
+++ b/src/api/config/wellcoverconfig.js
@@ -12,11 +12,11 @@
 }
 
 // 修改燃气配置
-export function editWellcoverConfig(params) {
+export function editWellcoverConfig(data) {
   return request({
     url: 'busConfig/wellcoverConfig/config',
     method: 'post',
-    params
+    data
   })
 }
 
diff --git a/src/api/config/wellliquidconfig.js b/src/api/config/wellliquidconfig.js
new file mode 100644
index 0000000..c7c4838
--- /dev/null
+++ b/src/api/config/wellliquidconfig.js
@@ -0,0 +1,42 @@
+/**
+ * 井盖配置接口
+ */
+import request from '@/utils/request'
+// 燃气配置查询
+export function getWellliquidConfigList(params) {
+  return request({
+    url: 'busConfig/wellliquidConfig/list',
+    method: 'get',
+    params
+  })
+}
+
+// 修改燃气配置
+export function editWellliquidConfig(data) {
+  return request({
+    url: 'busConfig/wellliquidConfig/config',
+    method: 'post',
+    data
+  })
+}
+
+// 批量导入
+export function batchImportWellliquidConfig(fileobj) {
+  const param = new FormData()
+  param.append('file', fileobj)
+  return request({
+    url: 'busConfig/wellliquidConfig/batchImport',
+    method: 'post',
+    headers: { 'Content-Type': 'multipart/form-data' },
+    data: param
+  })
+}
+// 批量导出
+export function batchExportWellliquidConfig(params) {
+  return request({
+    url: 'busConfig/wellliquidConfig/batchExport',
+    method: 'get',
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
diff --git a/src/api/data/data.js b/src/api/data/data.js
index c437d7b..cba92e9 100644
--- a/src/api/data/data.js
+++ b/src/api/data/data.js
@@ -394,3 +394,31 @@
     responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
   })
 }
+
+// 井盖数据查询
+export function getWellLiquidData(params) {
+  return request({
+    url: 'wellliquiddata/list-page',
+    method: 'get',
+    params
+  })
+}
+// 井盖数据查询，不分页
+export function getWellLiquidDataSingle(params) {
+  return request({
+    url: 'wellliquiddata/list',
+    method: 'get',
+    params
+  })
+}
+// 批量导出井盖数据
+export function batchExportWellLiquidData(params) {
+  return request({
+    url: 'wellliquiddata/export',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
diff --git a/src/components/BigData/Card/panelCard.vue b/src/components/BigData/Card/panelCard.vue
index d6a7b89..8283d7f 100644
--- a/src/components/BigData/Card/panelCard.vue
+++ b/src/components/BigData/Card/panelCard.vue
@@ -35,12 +35,13 @@
     font-size: 16px;
     font-weight: bold;
     padding: 0px 10px;
+    padding-right: 0px;
     border-left: 5px solid #66b1ff;
     position: relative;
     .title-right{
       display: inline-block;
       position: absolute;
-      right: 10px;
+      right: 0px;
     }
   }
   .panel-body{
diff --git a/src/views/alarmManage/listAlarmNow.vue b/src/views/alarmManage/listAlarmNow.vue
index 7392a4a..9f5a0b6 100644
--- a/src/views/alarmManage/listAlarmNow.vue
+++ b/src/views/alarmManage/listAlarmNow.vue
@@ -361,7 +361,7 @@
         const supportDeviceTypes = this.$store.getters.deviceTypes
         for (const item of response.data.list) {
           const deviceType = '' + item.deviceType
-          if (supportDeviceTypes.indexOf(deviceType) !== -1) {
+          if (supportDeviceTypes.indexOf(deviceType) !== -1 && this.alarmContentTypeList.findIndex(t => t.name === item.name) === -1) {
             this.alarmContentTypeList.push(item)
           }
         }
diff --git a/src/views/alarmManage/listAlarmRecords.vue b/src/views/alarmManage/listAlarmRecords.vue
index 2e34a39..b5d233c 100644
--- a/src/views/alarmManage/listAlarmRecords.vue
+++ b/src/views/alarmManage/listAlarmRecords.vue
@@ -352,7 +352,7 @@
         const supportDeviceTypes = this.$store.getters.deviceTypes
         for (const item of response.data.list) {
           const deviceType = '' + item.deviceType
-          if (supportDeviceTypes.indexOf(deviceType) !== -1) {
+          if (supportDeviceTypes.indexOf(deviceType) !== -1 && this.alarmContentTypeList.findIndex(t => t.name === item.name) === -1) {
             this.alarmContentTypeList.push(item)
           }
         }
diff --git a/src/views/alarmStatics/components/alarmWellRank.vue b/src/views/alarmStatics/components/alarmWellRank.vue
index 89ffa18..acf1598 100644
--- a/src/views/alarmStatics/components/alarmWellRank.vue
+++ b/src/views/alarmStatics/components/alarmWellRank.vue
@@ -75,7 +75,7 @@
       getAlarmContentType('1').then(response => {
         const supportDeviceTypes = this.$store.getters.deviceTypes
         for (const item of response.data.list) {
-          if (supportDeviceTypes.indexOf('' + item.deviceType) !== -1) {
+          if (supportDeviceTypes.indexOf('' + item.deviceType) !== -1 && this.alarmContentTypeList.findIndex(t => t.name === item.name) === -1) {
             this.alarmContentTypeList.push(item)
           }
         }
diff --git a/src/views/dataManage/dataManage.vue b/src/views/dataManage/dataManage.vue
index b1d6a3b..44c099a 100644
--- a/src/views/dataManage/dataManage.vue
+++ b/src/views/dataManage/dataManage.vue
@@ -23,11 +23,12 @@
 import ListPantiltData from '@/views/dataManage/deviceData/listPantiltData'
 import ListHydrantData from '@/views/dataManage/deviceData/listHydrantData'
 import ListH2SData from '@/views/dataManage/deviceData/listH2SData'
+import ListWellLiquidData from '@/views/dataManage/deviceData/listWellLiquidData'
 import { parseUrl } from '@/utils/parseutils'
 
 export default {
   name: 'DataManage',
-  components: { ListH2SData, ListHydrantData, ListPantiltData, ListGasdectorData, ListTubeData, ListNoiseData, ListWellLocaData, ListTempData, ListHarmfulData, ListDigData, ListGasData, ListLiquidData, ListWellCoverData, ListLiquidGasData },
+  components: { ListH2SData, ListHydrantData, ListPantiltData, ListGasdectorData, ListTubeData, ListNoiseData, ListWellLocaData, ListTempData, ListHarmfulData, ListDigData, ListGasData, ListLiquidData, ListWellCoverData, ListLiquidGasData, ListWellLiquidData },
   data() {
     return {
       activeName: 'wellcover',
@@ -45,7 +46,8 @@
         { 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: '14', comp: 'list-H2S-data' }
+        { permission: '/wellliquiddata/list-page', label: '硫化氢浓度监测仪', name: 'H2S', type: '14', comp: 'list-H2S-data' },
+        { permission: '/wellliquiddata/list-page', label: '井盖液位一体机', name: 'wellliquid', type: '13', comp: 'list-well-liquid-data' }
       ] // 所有tab列表
     }
   },
diff --git a/src/views/dataManage/deviceData/listWellLiquidData.vue b/src/views/dataManage/deviceData/listWellLiquidData.vue
new file mode 100644
index 0000000..599039e
--- /dev/null
+++ b/src/views/dataManage/deviceData/listWellLiquidData.vue
@@ -0,0 +1,228 @@
+<template>
+  <app-container>
+    <!--筛选条件-->
+    <search-area size="small" @search="search">
+      <search-item>
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
+      </search-item>
+      <search-item>
+        <dept-select
+          v-model="listQuery.deptid"
+          :need-top="false"
+          dept-type="03"
+          size="small"
+          placeholder="选择权属单位"
+        />
+      </search-item>
+      <search-item>
+        <el-date-picker
+          v-model="timeRange"
+          size="small"
+          type="datetimerange"
+          range-separator="至"
+          value-format="yyyy-MM-dd HH:mm:ss"
+          start-placeholder="开始时间"
+          end-placeholder="结束时间"
+        />
+      </search-item>
+    </search-area>
+    <!--查询结果Table显示-->
+    <normal-table
+      ref="normalTable"
+      :data="list"
+      :total="total"
+      :query="listQuery"
+      :list-loading="listLoading"
+      :options="options"
+      size="small"
+      @change="changePage"
+    >
+      <template slot="btns">
+        <el-button v-if="hasPerm('/wellLiquidData/export')" size="small" @click="batchExport">
+          导出记录
+        </el-button>
+      </template>
+      <template slot="columns">
+        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
+          <template slot-scope="scope">
+            <span v-if="column.checkCell" :class="checkCell(scope.row.cell)">{{ scope.row[column.value] }}</span>
+            <span v-else>{{ scope.row[column.value] }}</span>
+          </template>
+        </el-table-column>
+      </template>
+    </normal-table>
+  </app-container>
+</template>
+
+<script>
+import { getWellLiquidData, batchExportWellLiquidData } from '@/api/data/data'
+import DeptSelect from '../../../components/DeptSelect/index'
+import { parseUrl } from '@/utils/parseutils'
+import { getSearchLastWeekTime } from '@/utils/dateutils'
+import { exportFile } from '@/utils/exportutils'
+
+export default {
+  name: 'ListWellLiquidData',
+  components: { DeptSelect },
+  props: {
+    type: {
+      type: String,
+      required: true
+    }, // 设备类型
+    name: {
+      type: String,
+      default: ''
+    } // 设备名称
+  },
+  data() {
+    return {
+      listQuery: {
+        keywords: '', // 关键字
+        deptid: '', // 部门id
+        beginTime: '', // 开始时间
+        endTime: '', // 结束时间
+        offset: 1,
+        limit: 20,
+        sort: '',
+        order: ''
+      }, // 筛选条件
+      timeRange: [], // 时间范围
+      columns: [
+        {
+          text: '设备编号',
+          value: 'devcode',
+          align: 'center'
+        },
+        {
+          text: '点位编号',
+          value: 'wellCode',
+          align: 'center'
+        },
+        {
+          text: '设备类型',
+          value: 'deviceTypeName',
+          align: 'center'
+        },
+        {
+          text: '状态描述',
+          value: 'descn',
+          align: 'center',
+          checkState: true
+        },
+        {
+          text: '权属单位',
+          value: 'deptName',
+          align: 'center'
+        },
+        {
+          text: '上传时间',
+          value: 'logtime',
+          width: 170,
+          align: 'center'
+        }
+      ], // 显示列
+      list: [], // 列表数据
+      total: 0, // 数据总数
+      options: {
+        needIndex: true, // 是否需要序号列
+        border: true // 是否需要上方边框
+      },
+      listLoading: true, // 加载动画
+      fullscreenLoading: false, // 全屏加载动画
+      editShow: false // 是否显示编辑框
+    }
+  },
+  mounted() {
+    // 如果路径里带参数，解析devcode参数
+    this.timeRange = getSearchLastWeekTime()
+    if (window.location.href) {
+      const params = parseUrl(window.location.href)
+      if (params && params.deviceType === this.type && params.devcode) {
+        this.listQuery.keywords = params.devcode
+        this.fetchData()
+      } else {
+        this.fetchData()
+      }
+    }
+  },
+  activated() {
+    // 要是路由里有参数
+    if (this.$route.query && this.$route.query.devcode) {
+      this.listQuery.keywords = this.$route.query.devcode
+      this.fetchData(false)// 获取数据
+    } else {
+      this.fetchData()
+    }
+  },
+  methods: {
+    // 批量导出
+    batchExport() {
+      // this.handleDateTime()
+      // 全屏加载动画
+      const loading = this.$loading({
+        lock: true,
+        text: '下载中,请稍后...',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
+      })
+      batchExportWellLiquidData(this.listQuery).then(res => {
+        loading.close() // 关闭加载动画
+        let fileName = `${this.name}数据-${this.listQuery.beginTime}-${this.listQuery.endTime}.xlsx`
+        fileName = fileName.replace(/-|:| /g, '')
+        const blob = new Blob([res.data])
+        exportFile(blob, fileName)
+      }).catch((res) => {
+        loading.close()
+      })
+    },
+    // 查询数据
+    search() {
+      this.fetchData(false)
+    },
+    // 获取井盖数据
+    fetchData(isNowPage = true) {
+      this.listLoading = true
+      if (!isNowPage) { // 是否显示当前页，否则跳转第一页
+        this.listQuery.offset = 1
+      }
+      this.handleDateTime()
+      getWellLiquidData(this.listQuery).then(response => {
+        this.list = response.data.rows
+        this.total = response.data.total
+        this.listLoading = false
+      })
+    },
+    // 处理时间
+    handleDateTime() {
+      if (this.timeRange && this.timeRange.length > 0) {
+        this.listQuery.beginTime = this.timeRange[0]
+        this.listQuery.endTime = this.timeRange[1]
+      } else {
+        this.listQuery.beginTime = ''
+        this.listQuery.endTime = ''
+      }
+    },
+    checkState(row) {
+      if (row.status !== '0') {
+        return 'warning-state'
+      }
+    },
+    // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+    changePage(val) {
+      if (val && val.size) {
+        this.listQuery.limit = val.size
+      }
+      if (val && val.page) {
+        this.listQuery.offset = val.page
+      }
+      this.fetchData()
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+.warning-state{
+  color:red
+}
+</style>
diff --git a/src/views/dataView/components/alarmAnalysis.vue b/src/views/dataView/components/alarmAnalysis.vue
index 3ac21d8..f9949ea 100644
--- a/src/views/dataView/components/alarmAnalysis.vue
+++ b/src/views/dataView/components/alarmAnalysis.vue
@@ -76,7 +76,12 @@
     },
     // 获取各类报警的列表
     fetchAlarmByContent() {
-      alarmStaticsByContent(this.listQuery).then(response => {
+      const query = {
+        alarmType: '1',
+        beginTime: this.listQuery.beginTime,
+        endTime: this.listQuery.endTime
+      }
+      alarmStaticsByContent(query).then(response => {
         this.tableList = response.data
       })
     },
diff --git a/src/views/deviceConfig/components/editWellliquidConfig.vue b/src/views/deviceConfig/components/editWellliquidConfig.vue
new file mode 100644
index 0000000..70277d4
--- /dev/null
+++ b/src/views/deviceConfig/components/editWellliquidConfig.vue
@@ -0,0 +1,241 @@
+<template>
+  <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" append-to-body>
+    <el-form ref="dataForm" :rules="rules" :model="configForm" label-well-code="right" label-width="110px">
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item v-if="dialogStatus=='create'" label="设备编号" prop="deviceId">
+            <el-select
+              v-model="configForm.deviceId"
+              :loading="loading"
+              :disabled="dialogStatus=='update'?true:false"
+              filterable
+              placeholder="请输入设备编号"
+            >
+              <el-option
+                v-for="item in devices"
+                :key="item.id"
+                :label="item.devcode"
+                :value="item.id"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item v-if="dialogStatus=='update'" label="设备编号">
+            <el-input v-model="deviceForm.devcode" type="text" placeholder="未知" disabled />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item v-if="deviceForm.deviceName!=''" label="设备名称">
+            <el-input v-model="deviceForm.deviceName" type="text" placeholder="未知" disabled />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item v-if="deviceForm.deviceTypeName!=''" label="设备类型" prop="deviceType">
+            <el-input v-model="deviceForm.deviceTypeName" type="text" placeholder="未知" disabled />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item v-if="deviceForm.deptName!=''" label="权属单位" prop="deptName">
+            <el-input v-model="deviceForm.deptName" type="text" placeholder="未知" disabled />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row v-if="showIp" :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="ip地址" prop="ip">
+            <el-input v-model.trim="configForm.ip" type="text" placeholder="非必填" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="端口号" prop="port">
+            <el-input v-model.trim="configForm.port" type="text" placeholder="非必填" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="最大尝试次数">
+            <el-input-number v-model="configForm.attemptsMax" :min="1" :max="100" type="text" placeholder="必填" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <div slot="footer" class="dialog-footer">
+      <el-button :disabled="!canEdit" type="primary" @click="saveData">
+        保存
+      </el-button>
+      <el-button @click="cancel">
+        取消
+      </el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { editWellliquidConfig } from '@/api/config/wellliquidconfig'
+import { getDeviceSimpleList } from '@/api/config/liquidconfig'
+export default {
+  name: 'EditWellliquidConfig',
+  data() {
+    const validateIp = (rule, value, callback) => {
+      if (value !== '') {
+        if ((/((25[0-5]|2[0-4]\d|((1\d{2})|([1-9]?\d)))\.){3}(25[0-5]|2[0-4]\d|((1\d{2})|([1-9]?\d)))/).test(value) === false) {
+          callback(new Error('请填写正确的ip地址'))
+        } else {
+          callback()
+        }
+      } else {
+        // callback(new Error('ip地址不能为空'))
+        callback()
+      }
+    }
+    const validatePort = (rule, value, callback) => {
+      if (value !== '') {
+        if ((/[1-9]$|(^[1-9][0-9]$)|(^[1-9][0-9][0-9]$)|(^[1-9][0-9][0-9][0-9]$)|(^[1-6][0-5][0-5][0-3][0-5]$)/).test(value) === false) {
+          callback(new Error('请填写正确的端口号'))
+        } else {
+          callback()
+        }
+      } else {
+        // callback(new Error('端口号不能为空'))
+        callback()
+      }
+    }
+    return {
+      dialogFormVisible: false, // 对话框是否显示
+      dialogStatus: '', // 对话框类型：create,update
+      deviceForm: {
+        deviceName: '',
+        deviceTypeName: '',
+        deptName: '',
+        devcode: '',
+        deviceType: ''
+      }, // 设备基本信息
+      configForm: {
+        id: '', // config id
+        deviceId: '', // 设备id
+        attemptsMax: '3', // 最大尝试次数
+        ip: '', // ip地址
+        port: '' // 端口号
+      },
+      textMap: {
+        update: '编辑',
+        create: '新增'
+      }, // 表头显示标题
+      devices: [], // 设备下拉选择列表
+      loading: false, // 加载动画是否显示
+      canEdit: true, // 是否允许点击保存按钮
+      rules: {
+        deviceId: [{ required: true, message: '设备编号不能为空', trigger: ['blur', 'change'] }],
+        ip: [{ trigger: ['blur', 'change'], validator: validateIp }],
+        port: [{ trigger: ['blur', 'change'], validator: validatePort }]
+      } // 前端校验规则
+    }
+  },
+  computed: {
+    watchDeviceId() { // 监控权属单位变化
+      return this.configForm.deviceId
+    },
+    showIp() { // 是否显示ip配置
+      return true
+    }
+  },
+  watch: {
+    watchDeviceId(newValue, oldValue) {
+      for (const device of this.devices) {
+        if (device.id === newValue) {
+          this.deviceForm.deviceTypeName = device.deviceTypeName
+          this.deviceForm.deptName = device.deptName
+          this.deviceForm.deviceName = device.deviceName
+          return
+        }
+      }
+    }
+  },
+  methods: {
+    // 初始化对话框
+    initDialog: function(dialogStatus, dialogFormVisible, row = null) {
+      this.dialogStatus = dialogStatus
+      this.dialogFormVisible = dialogFormVisible
+      this.canEdit = true
+      if (dialogStatus === 'create') { // 如果是新增，清除验证
+        this.resetForm()
+        this.fetchDevice()
+        this.$nextTick(() => {
+          this.$refs['dataForm'].clearValidate()
+        })
+      } else if (dialogStatus === 'update') { // 如果是修改，将row中数据填写到输入框中
+        this.deviceForm = {
+          deviceName: row.deviceName,
+          devcode: row.devcode,
+          deptName: row.deptName,
+          deviceType: row.deviceType,
+          deviceTypeName: row.deviceTypeName
+        }
+        this.configForm = {
+          id: row.id,
+          deviceId: row.deviceId, // 设备id
+          ip: row.ip, // ip地址
+          port: row.port, // 端口号
+          attemptsMax: row.attemptsMax // 最大尝试次数
+        }
+      }
+    },
+    // 重置表单
+    resetForm() {
+      this.deviceForm = {
+        deviceName: '',
+        deviceTypeName: '',
+        deptName: '',
+        devcode: ''
+      }
+      this.configForm = {
+        deviceId: '', // 设备id
+        ip: '', // ip地址
+        port: '', // 端口号
+        attemptsMax: '3' // 最大尝试次数
+      }
+    },
+    // 保存数据
+    saveData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          this.canEdit = false
+          editWellliquidConfig(this.configForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('配置成功')
+              this.$emit('watchChild')
+              this.dialogFormVisible = false
+            }
+            this.canEdit = false
+          }).catch(_ => {
+            this.canEdit = true
+          })
+        }
+      })
+    },
+    // 获取未下发配置的设备列表
+    fetchDevice() {
+      this.loading = true
+      getDeviceSimpleList('13', '0').then(response => {
+        this.loading = false
+        this.devices = response.data
+      })
+    },
+    cancel: function() {
+      this.dialogFormVisible = false
+      this.$emit('watchChild')
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .el-select{
+    width: 100%;
+  }
+  .el-input-number{
+    width: 100%;
+  }
+</style>
diff --git a/src/views/deviceConfig/components/listWellLiquidConfig.vue b/src/views/deviceConfig/components/listWellLiquidConfig.vue
new file mode 100644
index 0000000..34fcf41
--- /dev/null
+++ b/src/views/deviceConfig/components/listWellLiquidConfig.vue
@@ -0,0 +1,299 @@
+<template>
+  <app-container>
+    <!--筛选条件-->
+    <search-area size="small" @search="search">
+      <search-item>
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="设备编号" clearable />
+      </search-item>
+      <search-item>
+        <dept-select v-model="listQuery.deptid" :need-top="deptShowTop" dept-type="03" placeholder="选择权属单位" />
+      </search-item>
+    </search-area>
+    <!--查询结果Table显示-->
+    <div>
+      <el-row class="table-title">
+        <el-col :span="6">
+          <div class="title-header">
+            <i class="el-icon-menu" />数据列表
+          </div>
+        </el-col>
+        <el-col :span="12" :offset="6" class="edit_btns">
+          <el-button v-if="hasPerm('/busConfig/wellliquidConfig/batchExport')" class="edit_btn" size="small" @click="batchExport">
+            导出记录
+          </el-button>
+          <download-template :filename="filename" />
+          <el-upload
+            v-if="hasPerm('/busConfig/wellliquidConfig/batchImport')"
+            :limit="1"
+            :show-file-list="false"
+            :http-request="uploadFile"
+            :file-list="fileList"
+            action="string"
+            accept=".xls,.xlsx"
+            class="edit_btn"
+          >
+            <el-button v-if="hasPerm('/busConfig/wellliquidConfig/batchImport')" slot="trigger" size="small">
+              批量导入
+            </el-button>
+          </el-upload>
+          <el-button v-if="hasPerm('/busConfig/wellliquidConfig/config')" class="edit_btn" size="small" @click="add">
+            新增
+          </el-button>
+        </el-col>
+      </el-row>
+      <el-table v-loading="listLoading" :data="list" class="table" border @selection-change="handleSelectionChange">
+        <!--<el-table-column align="center" type="selection" width="55"/>-->
+        <el-table-column :index="indexMethod" align="center" type="index" />
+        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
+          <template slot-scope="scope">
+            {{ scope.row[column.value] }}
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" align="center" width="60">
+          <template slot-scope="scope">
+            <el-button type="text" @click="edit(scope.row)">
+              编辑
+            </el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+    </div>
+    <!--分页-->
+    <div class="pagination-container">
+      <el-pagination
+        v-show="total>listQuery.limit"
+        :current-page="listQuery.offset"
+        :page-sizes="[20,30,50]"
+        :page-size="listQuery.limit"
+        :total="total"
+        align="center"
+        layout="total, sizes, prev, pager, next"
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"
+      />
+    </div>
+    <edit-wellliquid-config v-show="editShow" ref="editconfig" @watchChild="fetchData" />
+  </app-container>
+</template>
+
+<script>
+import { getWellliquidConfigList, batchImportWellliquidConfig, batchExportWellliquidConfig } from '@/api/config/wellliquidconfig'
+import EditWellliquidConfig from './editWellliquidConfig'
+import DownloadTemplate from '@/components/DownloadTemplate/index'
+import DeptSelect from '@/components/DeptSelect/index'
+
+export default {
+  name: 'ListWellliquidConfig',
+  components: { DeptSelect, DownloadTemplate, EditWellliquidConfig },
+  data() {
+    return {
+      listQuery: {
+        keywords: '',
+        offset: 1,
+        limit: 20,
+        sort: '',
+        order: ''
+      }, // 筛选条件
+      columns: [
+        {
+          text: '设备编号',
+          value: 'devcode',
+          align: 'center'
+        },
+        {
+          text: 'IP地址',
+          value: 'ip',
+          align: 'center'
+        },
+        {
+          text: '端口',
+          value: 'port',
+          align: 'center'
+        },
+        {
+          text: '最大尝试次数',
+          value: 'attemptsMax',
+          align: 'center'
+        },
+        {
+          text: '已尝试次数',
+          value: 'attemptsCurrent',
+          align: 'center'
+        },
+        {
+          text: '下发状态',
+          value: 'statusName',
+          width: 80,
+          align: 'center'
+        }
+      ], // 显示列
+      multipleSelection: [], // 多选选中项
+      list: [], // 列表数据
+      total: 0, // 数据总数
+      deviceTypeList: [], // 燃气配置类型列表
+      deptProps: {
+        parent: 'pid',
+        value: 'id',
+        label: 'name',
+        children: 'children'
+      }, // 权属单位树形下拉菜单
+      deptTreeList: null, // 组织树列表数据
+      showDeptTree: 0, // 是否显示权属单位下拉
+      showDeviceType: true, // 是否显示设备类型下拉
+      listLoading: true, // 加载动画
+      fullscreenLoading: false, // 全屏加载动画
+      editShow: false, // 是否显示编辑框
+      detailShow: false, // 是否显示编辑框
+      filename: 'wellliquid_config_template.xlsx',
+      deptShowTop: false,
+      fileList: []
+    }
+  },
+  created() {
+    this.fetchData()// 获取数据
+  },
+  methods: {
+    // 打开详情对话框
+    checkSelection() {
+      if (this.multipleSelection.length === 0) {
+        return false
+      } else {
+        return true
+      }
+    },
+    // 新增设备
+    add() {
+      this.dialogFormVisible = true
+      this.editShow = true
+      this.$refs.editconfig.initDialog('create', this.dialogFormVisible)
+    },
+    // 编辑燃气配置信息
+    edit(row) {
+      this.dialogFormVisible = true
+      this.editShow = true
+      this.$refs.editconfig.initDialog('update', this.dialogFormVisible, row)
+    },
+    // 批量导入燃气配置
+    uploadFile(param) {
+      // 判断文件大小是否符合要求
+      const _file = param.file
+      const isLt5M = _file.size / 1024 / 1024 < 5
+      if (!isLt5M) {
+        this.$message.error('请上传5M以下的excel文件')
+        return false
+      }
+      // 全屏加载动画
+      const loading = this.$loading({
+        lock: true,
+        text: '导入中,请稍后...',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
+      })
+      // 发起导入请求
+      batchImportWellliquidConfig(_file).then(res => {
+        loading.close() // 关闭加载动画
+        if (res.code === 200) {
+          this.$message.success('导入成功')
+          this.fetchData(false)
+        } else {
+          this.$message.error(res.message)
+        }
+      }).catch(() => {
+        loading.close() // 关闭加载动画
+      })
+      this.fileList = []
+    },
+    // 批量导出
+    batchExport() {
+      // 全屏加载动画
+      const loading = this.$loading({
+        lock: true,
+        text: '数据处理中,请稍后...',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
+      })
+      batchExportWellliquidConfig(this.listQuery).then(res => {
+        loading.close() // 关闭加载动画
+        console.log('download===', res)
+        const blob = new Blob([res.data])
+        const downloadElement = document.createElement('a')
+        const href = window.URL.createObjectURL(blob) // 创建下载的链接
+        downloadElement.href = href
+        downloadElement.download = `井盖配置列表.xlsx` // 下载后文件名
+        document.body.appendChild(downloadElement)
+        downloadElement.click() // 点击下载
+        document.body.removeChild(downloadElement) // 下载完成移除元素
+        window.URL.revokeObjectURL(href) // 释放blob对象
+      }).catch((res) => {
+        loading.close()
+        this.$message.error(res.message)
+      })
+    },
+    // 查询数据
+    search() {
+      this.fetchData(false)
+    },
+    // 获取燃气配置数据
+    fetchData(isNowPage = true) {
+      this.listLoading = true
+      if (!isNowPage) { // 是否显示当前页，否则跳转第一页
+        this.listQuery.offset = 1
+      }
+      getWellliquidConfigList(this.listQuery).then(response => {
+        this.list = response.data.rows
+        this.total = parseInt(response.data.total)
+        this.listLoading = false
+      })
+    },
+    indexMethod(index) {
+      return this.listQuery.limit * (this.listQuery.offset - 1) + index + 1
+    },
+    // 改变页容量
+    handleSizeChange(val) {
+      this.listQuery.limit = val
+      this.fetchData()
+    },
+    // 改变当前页
+    handleCurrentChange(val) {
+      this.listQuery.offset = val
+      this.fetchData()
+    },
+    // 多选触发方法
+    handleSelectionChange(val) {
+      this.multipleSelection = val
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .app-container{
+    padding: 10px;
+  }
+  $tableTitleHeight:46px;
+  .table{
+    margin-bottom: 20px;
+  }
+  .pagination-container{
+    margin-bottom: 50px;
+  }
+  .table-title{
+    background-color:rgba(243, 243, 243, 1);
+    height: $tableTitleHeight;
+    .title-header{
+      line-height:$tableTitleHeight;
+      color: #606266;
+      font-size: 15px;
+      i{
+        margin-left: 5px;
+        margin-right: 5px;
+      }
+    }
+  }
+  .edit_btns{
+    .edit_btn{
+      float:right;
+      margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2
+    }
+  }
+</style>
diff --git a/src/views/deviceConfig/deviceConfig.vue b/src/views/deviceConfig/deviceConfig.vue
index f6189ff..eac828c 100644
--- a/src/views/deviceConfig/deviceConfig.vue
+++ b/src/views/deviceConfig/deviceConfig.vue
@@ -31,6 +31,9 @@
       <el-tab-pane v-if="hasPerm('/busConfig/H2sConfig/list')" label="硫化氢检测终端" name="h2s">
         <list-h2s-config ref="h2sConfig" />
       </el-tab-pane>
+      <el-tab-pane v-if="hasPerm('/busConfig/wellliquidConfig/list')" label="井盖液位一体机" name="wellliquid">
+        <list-wellliquid-config ref="wellliquidConfig" />
+      </el-tab-pane>
     </el-tabs>
   </div>
 </template>
@@ -47,9 +50,10 @@
 import ListTubeConfig from './components/listTubeConfig'
 import ListH2sConfig from './components/listH2sConfig'
 import ListWellcoverConfig from '@/views/deviceConfig/components/listWellCoverConfig'
+import ListWellliquidConfig from '@/views/deviceConfig/components/listWellLiquidConfig'
 export default {
   name: 'DeviceConfig',
-  components: { ListWellcoverConfig, ListH2sConfig, ListTubeConfig, ListLiquidGasConfig, ListNoiseConfig, ListDigConfig, ListTempConfig, ListHarmfulConfig, ListGasConfig, ListLiquidConfig },
+  components: { ListWellliquidConfig, ListWellcoverConfig, ListH2sConfig, ListTubeConfig, ListLiquidGasConfig, ListNoiseConfig, ListDigConfig, ListTempConfig, ListHarmfulConfig, ListGasConfig, ListLiquidConfig },
   data() {
     return {
       activeName: 'liquid'
@@ -61,7 +65,7 @@
   methods: {
     handleClick(tab, event) {
       if (tab.name === 'wellcover') {
-        this.$refs.wellcoveConfig.fetchData()
+        this.$refs.wellcoverConfig.fetchData()
       } else if (tab.name === 'liquid') {
         this.$refs.liquidConfig.fetchData()
       } else if (tab.name === 'harmful') {
@@ -80,12 +84,14 @@
         this.$refs.tubeConfig.fetchData()
       } else if (tab.name === 'h2s') {
         this.$refs.h2sConfig.fetchData()
+      } else if (tab.name === 'wellliquid') {
+        this.$refs.wellliquidConfig.fetchData()
       }
     },
     // 计算那个是当前第一个tab
     caclActive() {
       if (hasPermission('/busConfig/wellcoverConfig/list')) {
-        this.activeName = 'liquid'
+        this.activeName = 'wellcover'
       } else if (hasPermission('/busConfig/liquidConfig/list')) {
         this.activeName = 'liquid'
       } else if (hasPermission('/busConfig/gasConfig/list')) {
@@ -104,6 +110,8 @@
         this.activeName = 'tube'
       } else if (hasPermission('/busConfig/h2sConfig/list')) {
         this.activeName = 'h2s'
+      } else if (hasPermission('/busConfig/wellliquidConfig/list')) {
+        this.activeName = 'wellliquid'
       }
     }
   }
diff --git a/src/views/deviceManage/editDevice.vue b/src/views/deviceManage/editDevice.vue
index 1d3601d..97c9d34 100644
--- a/src/views/deviceManage/editDevice.vue
+++ b/src/views/deviceManage/editDevice.vue
@@ -1,6 +1,6 @@
 <template>
   <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" append-to-body>
-    <el-form ref="dataForm" :rules="rules" :model="deviceForm" label-well-code="right" label-width="100px">
+    <el-form ref="dataForm" :rules="rules" :model="deviceForm" label-well-code="right" label-width="120px">
       <el-row :gutter="20">
         <el-col :span="12">
           <el-form-item label="设备编号" prop="devcode">
@@ -62,6 +62,12 @@
             <el-input v-model.trim="deviceForm.installHeight" :disabled="isDetailMode" type="text" placeholder="必填" />
           </el-form-item>
         </el-col>
+        <!--井盖液位一体机需要-->
+        <el-col v-if="deviceForm.deviceType=='13'" :span="12">
+          <el-form-item label="浮子电线长度" prop="lineLength">
+            <el-input v-model.trim="deviceForm.lineLength" :disabled="isDetailMode" type="text" placeholder="单位m, 必填" />
+          </el-form-item>
+        </el-col>
       </el-row>
     </el-form>
     <div v-show="!isDetailMode" slot="footer" class="dialog-footer">
@@ -111,7 +117,8 @@
         deviceType: [{ required: true, message: '设备类型必选', trigger: ['blur', 'change'] }],
         modelId: [{ required: true, message: '设备型号必选', trigger: ['blur', 'change'] }],
         installDate: [{ required: true, message: '安装日期必选', trigger: ['blur', 'change'] }],
-        installHeight: [{ required: true, message: '设备安装高度不能为空', trigger: ['blur', 'change'] }]
+        installHeight: [{ required: true, message: '设备安装高度不能为空', trigger: ['blur', 'change'] }],
+        lineLength: [{ required: true, message: '浮子电线长度不能为空', trigger: ['blur', 'change'] }, { pattern: /^([1-9]+(\.\d+)?|0\.\d+)$/, message: '浮子电线长度必须为正数', trigger: 'blur' }]
       }, // 前端校验规则
       isEditMode: false, // 编辑模式
       isDetailMode: false // 详情模式
diff --git a/src/views/deviceStatics/components/deviceCountByOffline.vue b/src/views/deviceStatics/components/deviceCountByOffline.vue
index c499e1c..44c02f9 100644
--- a/src/views/deviceStatics/components/deviceCountByOffline.vue
+++ b/src/views/deviceStatics/components/deviceCountByOffline.vue
@@ -139,7 +139,7 @@
         devcode: '',
         deviceType: '',
         offset: 1,
-        limit: 15,
+        limit: 20,
         sort: 'offlineDays',
         order: 'desc'
       }, // 查询条件
diff --git a/src/views/jobManage/listJobs.vue b/src/views/jobManage/listJobs.vue
index 0f6ed2c..bf42b18 100644
--- a/src/views/jobManage/listJobs.vue
+++ b/src/views/jobManage/listJobs.vue
@@ -384,7 +384,7 @@
         const supportDeviceTypes = this.$store.getters.deviceTypes
         for (const item of response.data.list) {
           const deviceType = '' + item.deviceType
-          if (supportDeviceTypes.indexOf(deviceType) !== -1) {
+          if (supportDeviceTypes.indexOf(deviceType) !== -1 && this.alarmContentTypeList.findIndex(t => t.name === item.name) === -1) {
             this.alarmContentTypeList.push(item)
           }
         }
diff --git a/src/views/jobManage/listJobsOverTimeGet.vue b/src/views/jobManage/listJobsOverTimeGet.vue
index 14d72fd..27cbea5 100644
--- a/src/views/jobManage/listJobsOverTimeGet.vue
+++ b/src/views/jobManage/listJobsOverTimeGet.vue
@@ -323,7 +323,7 @@
         const supportDeviceTypes = this.$store.getters.deviceTypes
         for (const item of response.data.list) {
           const deviceType = '' + item.deviceType
-          if (supportDeviceTypes.indexOf(deviceType) !== -1) {
+          if (supportDeviceTypes.indexOf(deviceType) !== -1 && this.alarmContentTypeList.findIndex(t => t.name === item.name) === -1) {
             this.alarmContentTypeList.push(item)
           }
         }
diff --git a/src/views/jobManage/listJobsOverTimeHandle.vue b/src/views/jobManage/listJobsOverTimeHandle.vue
index 468b9cd..f2d634b 100644
--- a/src/views/jobManage/listJobsOverTimeHandle.vue
+++ b/src/views/jobManage/listJobsOverTimeHandle.vue
@@ -343,7 +343,7 @@
         const supportDeviceTypes = this.$store.getters.deviceTypes
         for (const item of response.data.list) {
           const deviceType = '' + item.deviceType
-          if (supportDeviceTypes.indexOf(deviceType) !== -1) {
+          if (supportDeviceTypes.indexOf(deviceType) !== -1 && this.alarmContentTypeList.findIndex(t => t.name === item.name) === -1) {
             this.alarmContentTypeList.push(item)
           }
         }