diff --git a/src/api/data.js b/src/api/data.js
index afeee10..0353d91 100644
--- a/src/api/data.js
+++ b/src/api/data.js
@@ -66,6 +66,14 @@
     params
   })
 }
+// 液位燃气一体化设备数据查询
+export function getLiquidGasData(params) {
+  return request({
+    url: 'liquidGasData/list',
+    method: 'get',
+    params
+  })
+}
 
 // 批量导出井盖数据
 export function batchExportWellData(params) {
@@ -154,4 +162,23 @@
     responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
   })
 }
+// 批量导出液位燃气一体化设备数据
+export function batchExportLiquidGasData(params) {
+  return request({
+    url: '/liquidGasData/export',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 数据统计接口
+export function getStaticData(params) {
+  return request({
+    url: 'data/list',
+    method: 'get',
+    params
+  })
+}
 

diff --git a/src/api/data.js b/src/api/data.js
index afeee10..0353d91 100644
--- a/src/api/data.js
+++ b/src/api/data.js
@@ -66,6 +66,14 @@
     params
   })
 }
+// 液位燃气一体化设备数据查询
+export function getLiquidGasData(params) {
+  return request({
+    url: 'liquidGasData/list',
+    method: 'get',
+    params
+  })
+}
 
 // 批量导出井盖数据
 export function batchExportWellData(params) {
@@ -154,4 +162,23 @@
     responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
   })
 }
+// 批量导出液位燃气一体化设备数据
+export function batchExportLiquidGasData(params) {
+  return request({
+    url: '/liquidGasData/export',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 数据统计接口
+export function getStaticData(params) {
+  return request({
+    url: 'data/list',
+    method: 'get',
+    params
+  })
+}
 
diff --git a/src/api/liquidgasconfig.js b/src/api/liquidgasconfig.js
new file mode 100644
index 0000000..9d0fd6b
--- /dev/null
+++ b/src/api/liquidgasconfig.js
@@ -0,0 +1,42 @@
+/**
+ * 液位燃气一体化设备配置接口
+ */
+import request from '@/utils/request'
+// 燃气配置查询
+export function getLiquidGasConfigList(params) {
+  return request({
+    url: 'busConfig/liquidGasConfig/list',
+    method: 'get',
+    params
+  })
+}
+
+// 修改燃气配置
+export function editLiquidGasConfig(params) {
+  return request({
+    url: 'busConfig/liquidGasConfig/config',
+    method: 'post',
+    params
+  })
+}
+
+// 批量导入
+export function batchImportLiquidGasConfig(fileobj) {
+  const param = new FormData()
+  param.append('file', fileobj)
+  return request({
+    url: 'busConfig/gasLiquidConfig/batchImport',
+    method: 'post',
+    headers: { 'Content-Type': 'multipart/form-data' },
+    data: param
+  })
+}
+// 批量导出
+export function batchExportLiquidGasConfig(params) {
+  return request({
+    url: 'busConfig/liquidGasConfig/batchExport',
+    method: 'get',
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}

diff --git a/src/api/data.js b/src/api/data.js
index afeee10..0353d91 100644
--- a/src/api/data.js
+++ b/src/api/data.js
@@ -66,6 +66,14 @@
     params
   })
 }
+// 液位燃气一体化设备数据查询
+export function getLiquidGasData(params) {
+  return request({
+    url: 'liquidGasData/list',
+    method: 'get',
+    params
+  })
+}
 
 // 批量导出井盖数据
 export function batchExportWellData(params) {
@@ -154,4 +162,23 @@
     responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
   })
 }
+// 批量导出液位燃气一体化设备数据
+export function batchExportLiquidGasData(params) {
+  return request({
+    url: '/liquidGasData/export',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 数据统计接口
+export function getStaticData(params) {
+  return request({
+    url: 'data/list',
+    method: 'get',
+    params
+  })
+}
 
diff --git a/src/api/liquidgasconfig.js b/src/api/liquidgasconfig.js
new file mode 100644
index 0000000..9d0fd6b
--- /dev/null
+++ b/src/api/liquidgasconfig.js
@@ -0,0 +1,42 @@
+/**
+ * 液位燃气一体化设备配置接口
+ */
+import request from '@/utils/request'
+// 燃气配置查询
+export function getLiquidGasConfigList(params) {
+  return request({
+    url: 'busConfig/liquidGasConfig/list',
+    method: 'get',
+    params
+  })
+}
+
+// 修改燃气配置
+export function editLiquidGasConfig(params) {
+  return request({
+    url: 'busConfig/liquidGasConfig/config',
+    method: 'post',
+    params
+  })
+}
+
+// 批量导入
+export function batchImportLiquidGasConfig(fileobj) {
+  const param = new FormData()
+  param.append('file', fileobj)
+  return request({
+    url: 'busConfig/gasLiquidConfig/batchImport',
+    method: 'post',
+    headers: { 'Content-Type': 'multipart/form-data' },
+    data: param
+  })
+}
+// 批量导出
+export function batchExportLiquidGasConfig(params) {
+  return request({
+    url: 'busConfig/liquidGasConfig/batchExport',
+    method: 'get',
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
diff --git a/src/views/dataManage/dataManage.vue b/src/views/dataManage/dataManage.vue
index a46b904..cdad03f 100644
--- a/src/views/dataManage/dataManage.vue
+++ b/src/views/dataManage/dataManage.vue
@@ -25,6 +25,9 @@
       <el-tab-pane v-if="hasPerm('/welllocadata/list')" label="井盖定位监测仪" name="wellloca">
         <list-well-loca-data ref="welllocadatacomp"/>
       </el-tab-pane>
+      <el-tab-pane v-if="hasPerm('/liquidGasData/list')" label="燃气智能终端(一体化)" name="liquidgas">
+        <list-liquid-gas-data ref="liquidgasdatacomp"/>
+      </el-tab-pane>
     </el-tabs>
   </div>
 </template>
@@ -37,13 +40,14 @@
 import ListHarmfulData from './deviceData/listHarmfulData'
 import ListTempData from './deviceData/listTempData'
 import ListWellLocaData from './deviceData/listWellLocaData'
+import ListLiquidGasData from './deviceData/listLiquidGasData'
 import { parseUrl } from '@/utils/parseutils'
 import { hasPermission } from '@/utils/permission'
 import ListNoiseData from './deviceData/listNoiseData'
 
 export default {
   name: 'DataManage',
-  components: { ListNoiseData, ListWellLocaData, ListTempData, ListHarmfulData, ListDigData, ListGasData, ListLiquidData, ListWellCoverData },
+  components: { ListNoiseData, ListWellLocaData, ListTempData, ListHarmfulData, ListDigData, ListGasData, ListLiquidData, ListWellCoverData, ListLiquidGasData },
   data() {
     return {
       activeName: 'wellcover'
@@ -86,6 +90,8 @@
         this.$refs.digdatacomp.fetchData()
       } else if (tab.name === 'wellloca') {
         this.$refs.welllocadatacomp.fetchData()
+      } else if (tab.name === 'liquidgas') {
+        this.$refs.liquidgasdatacomp.fetchData()
       }
     },
     changeTab(deviceType) {
@@ -105,6 +111,8 @@
         this.activeName = 'wellloca'
       } else if (deviceType === '8') {
         this.activeName = 'noise'
+      } else if (deviceType === '10') {
+        this.activeName = 'liquidgas'
       }
     },
     // 计算那个是当前第一个tab
@@ -125,6 +133,8 @@
         this.activeName = 'wellloca'
       } else if (hasPermission('/noisedata/list')) {
         this.activeName = 'noise'
+      } else if (hasPermission('/liquidGasData/list')) {
+        this.activeName = 'liquidgas'
       }
     }
   }

diff --git a/src/api/data.js b/src/api/data.js
index afeee10..0353d91 100644
--- a/src/api/data.js
+++ b/src/api/data.js
@@ -66,6 +66,14 @@
     params
   })
 }
+// 液位燃气一体化设备数据查询
+export function getLiquidGasData(params) {
+  return request({
+    url: 'liquidGasData/list',
+    method: 'get',
+    params
+  })
+}
 
 // 批量导出井盖数据
 export function batchExportWellData(params) {
@@ -154,4 +162,23 @@
     responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
   })
 }
+// 批量导出液位燃气一体化设备数据
+export function batchExportLiquidGasData(params) {
+  return request({
+    url: '/liquidGasData/export',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 数据统计接口
+export function getStaticData(params) {
+  return request({
+    url: 'data/list',
+    method: 'get',
+    params
+  })
+}
 
diff --git a/src/api/liquidgasconfig.js b/src/api/liquidgasconfig.js
new file mode 100644
index 0000000..9d0fd6b
--- /dev/null
+++ b/src/api/liquidgasconfig.js
@@ -0,0 +1,42 @@
+/**
+ * 液位燃气一体化设备配置接口
+ */
+import request from '@/utils/request'
+// 燃气配置查询
+export function getLiquidGasConfigList(params) {
+  return request({
+    url: 'busConfig/liquidGasConfig/list',
+    method: 'get',
+    params
+  })
+}
+
+// 修改燃气配置
+export function editLiquidGasConfig(params) {
+  return request({
+    url: 'busConfig/liquidGasConfig/config',
+    method: 'post',
+    params
+  })
+}
+
+// 批量导入
+export function batchImportLiquidGasConfig(fileobj) {
+  const param = new FormData()
+  param.append('file', fileobj)
+  return request({
+    url: 'busConfig/gasLiquidConfig/batchImport',
+    method: 'post',
+    headers: { 'Content-Type': 'multipart/form-data' },
+    data: param
+  })
+}
+// 批量导出
+export function batchExportLiquidGasConfig(params) {
+  return request({
+    url: 'busConfig/liquidGasConfig/batchExport',
+    method: 'get',
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
diff --git a/src/views/dataManage/dataManage.vue b/src/views/dataManage/dataManage.vue
index a46b904..cdad03f 100644
--- a/src/views/dataManage/dataManage.vue
+++ b/src/views/dataManage/dataManage.vue
@@ -25,6 +25,9 @@
       <el-tab-pane v-if="hasPerm('/welllocadata/list')" label="井盖定位监测仪" name="wellloca">
         <list-well-loca-data ref="welllocadatacomp"/>
       </el-tab-pane>
+      <el-tab-pane v-if="hasPerm('/liquidGasData/list')" label="燃气智能终端(一体化)" name="liquidgas">
+        <list-liquid-gas-data ref="liquidgasdatacomp"/>
+      </el-tab-pane>
     </el-tabs>
   </div>
 </template>
@@ -37,13 +40,14 @@
 import ListHarmfulData from './deviceData/listHarmfulData'
 import ListTempData from './deviceData/listTempData'
 import ListWellLocaData from './deviceData/listWellLocaData'
+import ListLiquidGasData from './deviceData/listLiquidGasData'
 import { parseUrl } from '@/utils/parseutils'
 import { hasPermission } from '@/utils/permission'
 import ListNoiseData from './deviceData/listNoiseData'
 
 export default {
   name: 'DataManage',
-  components: { ListNoiseData, ListWellLocaData, ListTempData, ListHarmfulData, ListDigData, ListGasData, ListLiquidData, ListWellCoverData },
+  components: { ListNoiseData, ListWellLocaData, ListTempData, ListHarmfulData, ListDigData, ListGasData, ListLiquidData, ListWellCoverData, ListLiquidGasData },
   data() {
     return {
       activeName: 'wellcover'
@@ -86,6 +90,8 @@
         this.$refs.digdatacomp.fetchData()
       } else if (tab.name === 'wellloca') {
         this.$refs.welllocadatacomp.fetchData()
+      } else if (tab.name === 'liquidgas') {
+        this.$refs.liquidgasdatacomp.fetchData()
       }
     },
     changeTab(deviceType) {
@@ -105,6 +111,8 @@
         this.activeName = 'wellloca'
       } else if (deviceType === '8') {
         this.activeName = 'noise'
+      } else if (deviceType === '10') {
+        this.activeName = 'liquidgas'
       }
     },
     // 计算那个是当前第一个tab
@@ -125,6 +133,8 @@
         this.activeName = 'wellloca'
       } else if (hasPermission('/noisedata/list')) {
         this.activeName = 'noise'
+      } else if (hasPermission('/liquidGasData/list')) {
+        this.activeName = 'liquidgas'
       }
     }
   }
diff --git a/src/views/dataManage/deviceData/listDigData.vue b/src/views/dataManage/deviceData/listDigData.vue
index 775af19..5308300 100644
--- a/src/views/dataManage/deviceData/listDigData.vue
+++ b/src/views/dataManage/deviceData/listDigData.vue
@@ -63,6 +63,7 @@
 import { getDigData, batchExportDigData } from '@/api/data'
 import DeptSelect from '../../../components/DeptSelect/index'
 import { parseUrl } from '@/utils/parseutils'
+import { getDayTime } from '@/utils/dateutils'
 
 export default {
   name: 'ListDigData',
@@ -165,6 +166,9 @@
       if (params && params.deviceType === '6' && params.devcode) {
         this.listQuery.keywords = params.devcode
       }
+      const defaultBeginTime = getDayTime(new Date().getTime() - 24 * 7 * 60 * 60 * 1000).Format('yyyy-MM-dd hh:mm:ss')
+      const defaultEndTime = new Date().Format('yyyy-MM-dd hh:mm:ss')
+      this.timeRange = [defaultBeginTime, defaultEndTime]
       this.fetchData()
     }
   },

diff --git a/src/api/data.js b/src/api/data.js
index afeee10..0353d91 100644
--- a/src/api/data.js
+++ b/src/api/data.js
@@ -66,6 +66,14 @@
     params
   })
 }
+// 液位燃气一体化设备数据查询
+export function getLiquidGasData(params) {
+  return request({
+    url: 'liquidGasData/list',
+    method: 'get',
+    params
+  })
+}
 
 // 批量导出井盖数据
 export function batchExportWellData(params) {
@@ -154,4 +162,23 @@
     responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
   })
 }
+// 批量导出液位燃气一体化设备数据
+export function batchExportLiquidGasData(params) {
+  return request({
+    url: '/liquidGasData/export',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 数据统计接口
+export function getStaticData(params) {
+  return request({
+    url: 'data/list',
+    method: 'get',
+    params
+  })
+}
 
diff --git a/src/api/liquidgasconfig.js b/src/api/liquidgasconfig.js
new file mode 100644
index 0000000..9d0fd6b
--- /dev/null
+++ b/src/api/liquidgasconfig.js
@@ -0,0 +1,42 @@
+/**
+ * 液位燃气一体化设备配置接口
+ */
+import request from '@/utils/request'
+// 燃气配置查询
+export function getLiquidGasConfigList(params) {
+  return request({
+    url: 'busConfig/liquidGasConfig/list',
+    method: 'get',
+    params
+  })
+}
+
+// 修改燃气配置
+export function editLiquidGasConfig(params) {
+  return request({
+    url: 'busConfig/liquidGasConfig/config',
+    method: 'post',
+    params
+  })
+}
+
+// 批量导入
+export function batchImportLiquidGasConfig(fileobj) {
+  const param = new FormData()
+  param.append('file', fileobj)
+  return request({
+    url: 'busConfig/gasLiquidConfig/batchImport',
+    method: 'post',
+    headers: { 'Content-Type': 'multipart/form-data' },
+    data: param
+  })
+}
+// 批量导出
+export function batchExportLiquidGasConfig(params) {
+  return request({
+    url: 'busConfig/liquidGasConfig/batchExport',
+    method: 'get',
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
diff --git a/src/views/dataManage/dataManage.vue b/src/views/dataManage/dataManage.vue
index a46b904..cdad03f 100644
--- a/src/views/dataManage/dataManage.vue
+++ b/src/views/dataManage/dataManage.vue
@@ -25,6 +25,9 @@
       <el-tab-pane v-if="hasPerm('/welllocadata/list')" label="井盖定位监测仪" name="wellloca">
         <list-well-loca-data ref="welllocadatacomp"/>
       </el-tab-pane>
+      <el-tab-pane v-if="hasPerm('/liquidGasData/list')" label="燃气智能终端(一体化)" name="liquidgas">
+        <list-liquid-gas-data ref="liquidgasdatacomp"/>
+      </el-tab-pane>
     </el-tabs>
   </div>
 </template>
@@ -37,13 +40,14 @@
 import ListHarmfulData from './deviceData/listHarmfulData'
 import ListTempData from './deviceData/listTempData'
 import ListWellLocaData from './deviceData/listWellLocaData'
+import ListLiquidGasData from './deviceData/listLiquidGasData'
 import { parseUrl } from '@/utils/parseutils'
 import { hasPermission } from '@/utils/permission'
 import ListNoiseData from './deviceData/listNoiseData'
 
 export default {
   name: 'DataManage',
-  components: { ListNoiseData, ListWellLocaData, ListTempData, ListHarmfulData, ListDigData, ListGasData, ListLiquidData, ListWellCoverData },
+  components: { ListNoiseData, ListWellLocaData, ListTempData, ListHarmfulData, ListDigData, ListGasData, ListLiquidData, ListWellCoverData, ListLiquidGasData },
   data() {
     return {
       activeName: 'wellcover'
@@ -86,6 +90,8 @@
         this.$refs.digdatacomp.fetchData()
       } else if (tab.name === 'wellloca') {
         this.$refs.welllocadatacomp.fetchData()
+      } else if (tab.name === 'liquidgas') {
+        this.$refs.liquidgasdatacomp.fetchData()
       }
     },
     changeTab(deviceType) {
@@ -105,6 +111,8 @@
         this.activeName = 'wellloca'
       } else if (deviceType === '8') {
         this.activeName = 'noise'
+      } else if (deviceType === '10') {
+        this.activeName = 'liquidgas'
       }
     },
     // 计算那个是当前第一个tab
@@ -125,6 +133,8 @@
         this.activeName = 'wellloca'
       } else if (hasPermission('/noisedata/list')) {
         this.activeName = 'noise'
+      } else if (hasPermission('/liquidGasData/list')) {
+        this.activeName = 'liquidgas'
       }
     }
   }
diff --git a/src/views/dataManage/deviceData/listDigData.vue b/src/views/dataManage/deviceData/listDigData.vue
index 775af19..5308300 100644
--- a/src/views/dataManage/deviceData/listDigData.vue
+++ b/src/views/dataManage/deviceData/listDigData.vue
@@ -63,6 +63,7 @@
 import { getDigData, batchExportDigData } from '@/api/data'
 import DeptSelect from '../../../components/DeptSelect/index'
 import { parseUrl } from '@/utils/parseutils'
+import { getDayTime } from '@/utils/dateutils'
 
 export default {
   name: 'ListDigData',
@@ -165,6 +166,9 @@
       if (params && params.deviceType === '6' && params.devcode) {
         this.listQuery.keywords = params.devcode
       }
+      const defaultBeginTime = getDayTime(new Date().getTime() - 24 * 7 * 60 * 60 * 1000).Format('yyyy-MM-dd hh:mm:ss')
+      const defaultEndTime = new Date().Format('yyyy-MM-dd hh:mm:ss')
+      this.timeRange = [defaultBeginTime, defaultEndTime]
       this.fetchData()
     }
   },
diff --git a/src/views/dataManage/deviceData/listGasData.vue b/src/views/dataManage/deviceData/listGasData.vue
index 97cdfdb..e365ee9 100644
--- a/src/views/dataManage/deviceData/listGasData.vue
+++ b/src/views/dataManage/deviceData/listGasData.vue
@@ -63,6 +63,7 @@
 import { getGasData, batchExportGasData } from '@/api/data'
 import DeptSelect from '../../../components/DeptSelect/index'
 import { parseUrl } from '@/utils/parseutils'
+import { getDayTime } from '@/utils/dateutils'
 
 export default {
   name: 'ListGasData',
@@ -163,6 +164,9 @@
       if (params && params.deviceType === '4' && params.devcode) {
         this.listQuery.keywords = params.devcode
       }
+      const defaultBeginTime = getDayTime(new Date().getTime() - 24 * 7 * 60 * 60 * 1000).Format('yyyy-MM-dd hh:mm:ss')
+      const defaultEndTime = new Date().Format('yyyy-MM-dd hh:mm:ss')
+      this.timeRange = [defaultBeginTime, defaultEndTime]
       this.fetchData()
     }
   },

diff --git a/src/api/data.js b/src/api/data.js
index afeee10..0353d91 100644
--- a/src/api/data.js
+++ b/src/api/data.js
@@ -66,6 +66,14 @@
     params
   })
 }
+// 液位燃气一体化设备数据查询
+export function getLiquidGasData(params) {
+  return request({
+    url: 'liquidGasData/list',
+    method: 'get',
+    params
+  })
+}
 
 // 批量导出井盖数据
 export function batchExportWellData(params) {
@@ -154,4 +162,23 @@
     responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
   })
 }
+// 批量导出液位燃气一体化设备数据
+export function batchExportLiquidGasData(params) {
+  return request({
+    url: '/liquidGasData/export',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 数据统计接口
+export function getStaticData(params) {
+  return request({
+    url: 'data/list',
+    method: 'get',
+    params
+  })
+}
 
diff --git a/src/api/liquidgasconfig.js b/src/api/liquidgasconfig.js
new file mode 100644
index 0000000..9d0fd6b
--- /dev/null
+++ b/src/api/liquidgasconfig.js
@@ -0,0 +1,42 @@
+/**
+ * 液位燃气一体化设备配置接口
+ */
+import request from '@/utils/request'
+// 燃气配置查询
+export function getLiquidGasConfigList(params) {
+  return request({
+    url: 'busConfig/liquidGasConfig/list',
+    method: 'get',
+    params
+  })
+}
+
+// 修改燃气配置
+export function editLiquidGasConfig(params) {
+  return request({
+    url: 'busConfig/liquidGasConfig/config',
+    method: 'post',
+    params
+  })
+}
+
+// 批量导入
+export function batchImportLiquidGasConfig(fileobj) {
+  const param = new FormData()
+  param.append('file', fileobj)
+  return request({
+    url: 'busConfig/gasLiquidConfig/batchImport',
+    method: 'post',
+    headers: { 'Content-Type': 'multipart/form-data' },
+    data: param
+  })
+}
+// 批量导出
+export function batchExportLiquidGasConfig(params) {
+  return request({
+    url: 'busConfig/liquidGasConfig/batchExport',
+    method: 'get',
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
diff --git a/src/views/dataManage/dataManage.vue b/src/views/dataManage/dataManage.vue
index a46b904..cdad03f 100644
--- a/src/views/dataManage/dataManage.vue
+++ b/src/views/dataManage/dataManage.vue
@@ -25,6 +25,9 @@
       <el-tab-pane v-if="hasPerm('/welllocadata/list')" label="井盖定位监测仪" name="wellloca">
         <list-well-loca-data ref="welllocadatacomp"/>
       </el-tab-pane>
+      <el-tab-pane v-if="hasPerm('/liquidGasData/list')" label="燃气智能终端(一体化)" name="liquidgas">
+        <list-liquid-gas-data ref="liquidgasdatacomp"/>
+      </el-tab-pane>
     </el-tabs>
   </div>
 </template>
@@ -37,13 +40,14 @@
 import ListHarmfulData from './deviceData/listHarmfulData'
 import ListTempData from './deviceData/listTempData'
 import ListWellLocaData from './deviceData/listWellLocaData'
+import ListLiquidGasData from './deviceData/listLiquidGasData'
 import { parseUrl } from '@/utils/parseutils'
 import { hasPermission } from '@/utils/permission'
 import ListNoiseData from './deviceData/listNoiseData'
 
 export default {
   name: 'DataManage',
-  components: { ListNoiseData, ListWellLocaData, ListTempData, ListHarmfulData, ListDigData, ListGasData, ListLiquidData, ListWellCoverData },
+  components: { ListNoiseData, ListWellLocaData, ListTempData, ListHarmfulData, ListDigData, ListGasData, ListLiquidData, ListWellCoverData, ListLiquidGasData },
   data() {
     return {
       activeName: 'wellcover'
@@ -86,6 +90,8 @@
         this.$refs.digdatacomp.fetchData()
       } else if (tab.name === 'wellloca') {
         this.$refs.welllocadatacomp.fetchData()
+      } else if (tab.name === 'liquidgas') {
+        this.$refs.liquidgasdatacomp.fetchData()
       }
     },
     changeTab(deviceType) {
@@ -105,6 +111,8 @@
         this.activeName = 'wellloca'
       } else if (deviceType === '8') {
         this.activeName = 'noise'
+      } else if (deviceType === '10') {
+        this.activeName = 'liquidgas'
       }
     },
     // 计算那个是当前第一个tab
@@ -125,6 +133,8 @@
         this.activeName = 'wellloca'
       } else if (hasPermission('/noisedata/list')) {
         this.activeName = 'noise'
+      } else if (hasPermission('/liquidGasData/list')) {
+        this.activeName = 'liquidgas'
       }
     }
   }
diff --git a/src/views/dataManage/deviceData/listDigData.vue b/src/views/dataManage/deviceData/listDigData.vue
index 775af19..5308300 100644
--- a/src/views/dataManage/deviceData/listDigData.vue
+++ b/src/views/dataManage/deviceData/listDigData.vue
@@ -63,6 +63,7 @@
 import { getDigData, batchExportDigData } from '@/api/data'
 import DeptSelect from '../../../components/DeptSelect/index'
 import { parseUrl } from '@/utils/parseutils'
+import { getDayTime } from '@/utils/dateutils'
 
 export default {
   name: 'ListDigData',
@@ -165,6 +166,9 @@
       if (params && params.deviceType === '6' && params.devcode) {
         this.listQuery.keywords = params.devcode
       }
+      const defaultBeginTime = getDayTime(new Date().getTime() - 24 * 7 * 60 * 60 * 1000).Format('yyyy-MM-dd hh:mm:ss')
+      const defaultEndTime = new Date().Format('yyyy-MM-dd hh:mm:ss')
+      this.timeRange = [defaultBeginTime, defaultEndTime]
       this.fetchData()
     }
   },
diff --git a/src/views/dataManage/deviceData/listGasData.vue b/src/views/dataManage/deviceData/listGasData.vue
index 97cdfdb..e365ee9 100644
--- a/src/views/dataManage/deviceData/listGasData.vue
+++ b/src/views/dataManage/deviceData/listGasData.vue
@@ -63,6 +63,7 @@
 import { getGasData, batchExportGasData } from '@/api/data'
 import DeptSelect from '../../../components/DeptSelect/index'
 import { parseUrl } from '@/utils/parseutils'
+import { getDayTime } from '@/utils/dateutils'
 
 export default {
   name: 'ListGasData',
@@ -163,6 +164,9 @@
       if (params && params.deviceType === '4' && params.devcode) {
         this.listQuery.keywords = params.devcode
       }
+      const defaultBeginTime = getDayTime(new Date().getTime() - 24 * 7 * 60 * 60 * 1000).Format('yyyy-MM-dd hh:mm:ss')
+      const defaultEndTime = new Date().Format('yyyy-MM-dd hh:mm:ss')
+      this.timeRange = [defaultBeginTime, defaultEndTime]
       this.fetchData()
     }
   },
diff --git a/src/views/dataManage/deviceData/listHarmfulData.vue b/src/views/dataManage/deviceData/listHarmfulData.vue
index e6a795c..d2398cf 100644
--- a/src/views/dataManage/deviceData/listHarmfulData.vue
+++ b/src/views/dataManage/deviceData/listHarmfulData.vue
@@ -63,6 +63,7 @@
 import { getHarmfulData, batchExportHarmfulData } from '@/api/data'
 import DeptSelect from '../../../components/DeptSelect/index'
 import { parseUrl } from '@/utils/parseutils'
+import { getDayTime } from '@/utils/dateutils'
 
 export default {
   name: 'ListHarmfulData',
@@ -176,6 +177,9 @@
       if (params && params.deviceType === '3' && params.devcode) {
         this.listQuery.keywords = params.devcode
       }
+      const defaultBeginTime = getDayTime(new Date().getTime() - 24 * 7 * 60 * 60 * 1000).Format('yyyy-MM-dd hh:mm:ss')
+      const defaultEndTime = new Date().Format('yyyy-MM-dd hh:mm:ss')
+      this.timeRange = [defaultBeginTime, defaultEndTime]
       this.fetchData()
     }
   },

diff --git a/src/api/data.js b/src/api/data.js
index afeee10..0353d91 100644
--- a/src/api/data.js
+++ b/src/api/data.js
@@ -66,6 +66,14 @@
     params
   })
 }
+// 液位燃气一体化设备数据查询
+export function getLiquidGasData(params) {
+  return request({
+    url: 'liquidGasData/list',
+    method: 'get',
+    params
+  })
+}
 
 // 批量导出井盖数据
 export function batchExportWellData(params) {
@@ -154,4 +162,23 @@
     responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
   })
 }
+// 批量导出液位燃气一体化设备数据
+export function batchExportLiquidGasData(params) {
+  return request({
+    url: '/liquidGasData/export',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 数据统计接口
+export function getStaticData(params) {
+  return request({
+    url: 'data/list',
+    method: 'get',
+    params
+  })
+}
 
diff --git a/src/api/liquidgasconfig.js b/src/api/liquidgasconfig.js
new file mode 100644
index 0000000..9d0fd6b
--- /dev/null
+++ b/src/api/liquidgasconfig.js
@@ -0,0 +1,42 @@
+/**
+ * 液位燃气一体化设备配置接口
+ */
+import request from '@/utils/request'
+// 燃气配置查询
+export function getLiquidGasConfigList(params) {
+  return request({
+    url: 'busConfig/liquidGasConfig/list',
+    method: 'get',
+    params
+  })
+}
+
+// 修改燃气配置
+export function editLiquidGasConfig(params) {
+  return request({
+    url: 'busConfig/liquidGasConfig/config',
+    method: 'post',
+    params
+  })
+}
+
+// 批量导入
+export function batchImportLiquidGasConfig(fileobj) {
+  const param = new FormData()
+  param.append('file', fileobj)
+  return request({
+    url: 'busConfig/gasLiquidConfig/batchImport',
+    method: 'post',
+    headers: { 'Content-Type': 'multipart/form-data' },
+    data: param
+  })
+}
+// 批量导出
+export function batchExportLiquidGasConfig(params) {
+  return request({
+    url: 'busConfig/liquidGasConfig/batchExport',
+    method: 'get',
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
diff --git a/src/views/dataManage/dataManage.vue b/src/views/dataManage/dataManage.vue
index a46b904..cdad03f 100644
--- a/src/views/dataManage/dataManage.vue
+++ b/src/views/dataManage/dataManage.vue
@@ -25,6 +25,9 @@
       <el-tab-pane v-if="hasPerm('/welllocadata/list')" label="井盖定位监测仪" name="wellloca">
         <list-well-loca-data ref="welllocadatacomp"/>
       </el-tab-pane>
+      <el-tab-pane v-if="hasPerm('/liquidGasData/list')" label="燃气智能终端(一体化)" name="liquidgas">
+        <list-liquid-gas-data ref="liquidgasdatacomp"/>
+      </el-tab-pane>
     </el-tabs>
   </div>
 </template>
@@ -37,13 +40,14 @@
 import ListHarmfulData from './deviceData/listHarmfulData'
 import ListTempData from './deviceData/listTempData'
 import ListWellLocaData from './deviceData/listWellLocaData'
+import ListLiquidGasData from './deviceData/listLiquidGasData'
 import { parseUrl } from '@/utils/parseutils'
 import { hasPermission } from '@/utils/permission'
 import ListNoiseData from './deviceData/listNoiseData'
 
 export default {
   name: 'DataManage',
-  components: { ListNoiseData, ListWellLocaData, ListTempData, ListHarmfulData, ListDigData, ListGasData, ListLiquidData, ListWellCoverData },
+  components: { ListNoiseData, ListWellLocaData, ListTempData, ListHarmfulData, ListDigData, ListGasData, ListLiquidData, ListWellCoverData, ListLiquidGasData },
   data() {
     return {
       activeName: 'wellcover'
@@ -86,6 +90,8 @@
         this.$refs.digdatacomp.fetchData()
       } else if (tab.name === 'wellloca') {
         this.$refs.welllocadatacomp.fetchData()
+      } else if (tab.name === 'liquidgas') {
+        this.$refs.liquidgasdatacomp.fetchData()
       }
     },
     changeTab(deviceType) {
@@ -105,6 +111,8 @@
         this.activeName = 'wellloca'
       } else if (deviceType === '8') {
         this.activeName = 'noise'
+      } else if (deviceType === '10') {
+        this.activeName = 'liquidgas'
       }
     },
     // 计算那个是当前第一个tab
@@ -125,6 +133,8 @@
         this.activeName = 'wellloca'
       } else if (hasPermission('/noisedata/list')) {
         this.activeName = 'noise'
+      } else if (hasPermission('/liquidGasData/list')) {
+        this.activeName = 'liquidgas'
       }
     }
   }
diff --git a/src/views/dataManage/deviceData/listDigData.vue b/src/views/dataManage/deviceData/listDigData.vue
index 775af19..5308300 100644
--- a/src/views/dataManage/deviceData/listDigData.vue
+++ b/src/views/dataManage/deviceData/listDigData.vue
@@ -63,6 +63,7 @@
 import { getDigData, batchExportDigData } from '@/api/data'
 import DeptSelect from '../../../components/DeptSelect/index'
 import { parseUrl } from '@/utils/parseutils'
+import { getDayTime } from '@/utils/dateutils'
 
 export default {
   name: 'ListDigData',
@@ -165,6 +166,9 @@
       if (params && params.deviceType === '6' && params.devcode) {
         this.listQuery.keywords = params.devcode
       }
+      const defaultBeginTime = getDayTime(new Date().getTime() - 24 * 7 * 60 * 60 * 1000).Format('yyyy-MM-dd hh:mm:ss')
+      const defaultEndTime = new Date().Format('yyyy-MM-dd hh:mm:ss')
+      this.timeRange = [defaultBeginTime, defaultEndTime]
       this.fetchData()
     }
   },
diff --git a/src/views/dataManage/deviceData/listGasData.vue b/src/views/dataManage/deviceData/listGasData.vue
index 97cdfdb..e365ee9 100644
--- a/src/views/dataManage/deviceData/listGasData.vue
+++ b/src/views/dataManage/deviceData/listGasData.vue
@@ -63,6 +63,7 @@
 import { getGasData, batchExportGasData } from '@/api/data'
 import DeptSelect from '../../../components/DeptSelect/index'
 import { parseUrl } from '@/utils/parseutils'
+import { getDayTime } from '@/utils/dateutils'
 
 export default {
   name: 'ListGasData',
@@ -163,6 +164,9 @@
       if (params && params.deviceType === '4' && params.devcode) {
         this.listQuery.keywords = params.devcode
       }
+      const defaultBeginTime = getDayTime(new Date().getTime() - 24 * 7 * 60 * 60 * 1000).Format('yyyy-MM-dd hh:mm:ss')
+      const defaultEndTime = new Date().Format('yyyy-MM-dd hh:mm:ss')
+      this.timeRange = [defaultBeginTime, defaultEndTime]
       this.fetchData()
     }
   },
diff --git a/src/views/dataManage/deviceData/listHarmfulData.vue b/src/views/dataManage/deviceData/listHarmfulData.vue
index e6a795c..d2398cf 100644
--- a/src/views/dataManage/deviceData/listHarmfulData.vue
+++ b/src/views/dataManage/deviceData/listHarmfulData.vue
@@ -63,6 +63,7 @@
 import { getHarmfulData, batchExportHarmfulData } from '@/api/data'
 import DeptSelect from '../../../components/DeptSelect/index'
 import { parseUrl } from '@/utils/parseutils'
+import { getDayTime } from '@/utils/dateutils'
 
 export default {
   name: 'ListHarmfulData',
@@ -176,6 +177,9 @@
       if (params && params.deviceType === '3' && params.devcode) {
         this.listQuery.keywords = params.devcode
       }
+      const defaultBeginTime = getDayTime(new Date().getTime() - 24 * 7 * 60 * 60 * 1000).Format('yyyy-MM-dd hh:mm:ss')
+      const defaultEndTime = new Date().Format('yyyy-MM-dd hh:mm:ss')
+      this.timeRange = [defaultBeginTime, defaultEndTime]
       this.fetchData()
     }
   },
diff --git a/src/views/dataManage/deviceData/listLiquidData.vue b/src/views/dataManage/deviceData/listLiquidData.vue
index 709e3a8..dea0ba5 100644
--- a/src/views/dataManage/deviceData/listLiquidData.vue
+++ b/src/views/dataManage/deviceData/listLiquidData.vue
@@ -63,6 +63,7 @@
 import { getLiquidData, batchExportLiquidData } from '@/api/data'
 import DeptSelect from '../../../components/DeptSelect/index'
 import { parseUrl } from '@/utils/parseutils'
+import { getDayTime } from '@/utils/dateutils'
 
 export default {
   name: 'ListLiquidData',
@@ -158,6 +159,9 @@
       if (params && params.deviceType === '2' && params.devcode) {
         this.listQuery.keywords = params.devcode
       }
+      const defaultBeginTime = getDayTime(new Date().getTime() - 24 * 7 * 60 * 60 * 1000).Format('yyyy-MM-dd hh:mm:ss')
+      const defaultEndTime = new Date().Format('yyyy-MM-dd hh:mm:ss')
+      this.timeRange = [defaultBeginTime, defaultEndTime]
       this.fetchData()
     }
   },

diff --git a/src/api/data.js b/src/api/data.js
index afeee10..0353d91 100644
--- a/src/api/data.js
+++ b/src/api/data.js
@@ -66,6 +66,14 @@
     params
   })
 }
+// 液位燃气一体化设备数据查询
+export function getLiquidGasData(params) {
+  return request({
+    url: 'liquidGasData/list',
+    method: 'get',
+    params
+  })
+}
 
 // 批量导出井盖数据
 export function batchExportWellData(params) {
@@ -154,4 +162,23 @@
     responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
   })
 }
+// 批量导出液位燃气一体化设备数据
+export function batchExportLiquidGasData(params) {
+  return request({
+    url: '/liquidGasData/export',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 数据统计接口
+export function getStaticData(params) {
+  return request({
+    url: 'data/list',
+    method: 'get',
+    params
+  })
+}
 
diff --git a/src/api/liquidgasconfig.js b/src/api/liquidgasconfig.js
new file mode 100644
index 0000000..9d0fd6b
--- /dev/null
+++ b/src/api/liquidgasconfig.js
@@ -0,0 +1,42 @@
+/**
+ * 液位燃气一体化设备配置接口
+ */
+import request from '@/utils/request'
+// 燃气配置查询
+export function getLiquidGasConfigList(params) {
+  return request({
+    url: 'busConfig/liquidGasConfig/list',
+    method: 'get',
+    params
+  })
+}
+
+// 修改燃气配置
+export function editLiquidGasConfig(params) {
+  return request({
+    url: 'busConfig/liquidGasConfig/config',
+    method: 'post',
+    params
+  })
+}
+
+// 批量导入
+export function batchImportLiquidGasConfig(fileobj) {
+  const param = new FormData()
+  param.append('file', fileobj)
+  return request({
+    url: 'busConfig/gasLiquidConfig/batchImport',
+    method: 'post',
+    headers: { 'Content-Type': 'multipart/form-data' },
+    data: param
+  })
+}
+// 批量导出
+export function batchExportLiquidGasConfig(params) {
+  return request({
+    url: 'busConfig/liquidGasConfig/batchExport',
+    method: 'get',
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
diff --git a/src/views/dataManage/dataManage.vue b/src/views/dataManage/dataManage.vue
index a46b904..cdad03f 100644
--- a/src/views/dataManage/dataManage.vue
+++ b/src/views/dataManage/dataManage.vue
@@ -25,6 +25,9 @@
       <el-tab-pane v-if="hasPerm('/welllocadata/list')" label="井盖定位监测仪" name="wellloca">
         <list-well-loca-data ref="welllocadatacomp"/>
       </el-tab-pane>
+      <el-tab-pane v-if="hasPerm('/liquidGasData/list')" label="燃气智能终端(一体化)" name="liquidgas">
+        <list-liquid-gas-data ref="liquidgasdatacomp"/>
+      </el-tab-pane>
     </el-tabs>
   </div>
 </template>
@@ -37,13 +40,14 @@
 import ListHarmfulData from './deviceData/listHarmfulData'
 import ListTempData from './deviceData/listTempData'
 import ListWellLocaData from './deviceData/listWellLocaData'
+import ListLiquidGasData from './deviceData/listLiquidGasData'
 import { parseUrl } from '@/utils/parseutils'
 import { hasPermission } from '@/utils/permission'
 import ListNoiseData from './deviceData/listNoiseData'
 
 export default {
   name: 'DataManage',
-  components: { ListNoiseData, ListWellLocaData, ListTempData, ListHarmfulData, ListDigData, ListGasData, ListLiquidData, ListWellCoverData },
+  components: { ListNoiseData, ListWellLocaData, ListTempData, ListHarmfulData, ListDigData, ListGasData, ListLiquidData, ListWellCoverData, ListLiquidGasData },
   data() {
     return {
       activeName: 'wellcover'
@@ -86,6 +90,8 @@
         this.$refs.digdatacomp.fetchData()
       } else if (tab.name === 'wellloca') {
         this.$refs.welllocadatacomp.fetchData()
+      } else if (tab.name === 'liquidgas') {
+        this.$refs.liquidgasdatacomp.fetchData()
       }
     },
     changeTab(deviceType) {
@@ -105,6 +111,8 @@
         this.activeName = 'wellloca'
       } else if (deviceType === '8') {
         this.activeName = 'noise'
+      } else if (deviceType === '10') {
+        this.activeName = 'liquidgas'
       }
     },
     // 计算那个是当前第一个tab
@@ -125,6 +133,8 @@
         this.activeName = 'wellloca'
       } else if (hasPermission('/noisedata/list')) {
         this.activeName = 'noise'
+      } else if (hasPermission('/liquidGasData/list')) {
+        this.activeName = 'liquidgas'
       }
     }
   }
diff --git a/src/views/dataManage/deviceData/listDigData.vue b/src/views/dataManage/deviceData/listDigData.vue
index 775af19..5308300 100644
--- a/src/views/dataManage/deviceData/listDigData.vue
+++ b/src/views/dataManage/deviceData/listDigData.vue
@@ -63,6 +63,7 @@
 import { getDigData, batchExportDigData } from '@/api/data'
 import DeptSelect from '../../../components/DeptSelect/index'
 import { parseUrl } from '@/utils/parseutils'
+import { getDayTime } from '@/utils/dateutils'
 
 export default {
   name: 'ListDigData',
@@ -165,6 +166,9 @@
       if (params && params.deviceType === '6' && params.devcode) {
         this.listQuery.keywords = params.devcode
       }
+      const defaultBeginTime = getDayTime(new Date().getTime() - 24 * 7 * 60 * 60 * 1000).Format('yyyy-MM-dd hh:mm:ss')
+      const defaultEndTime = new Date().Format('yyyy-MM-dd hh:mm:ss')
+      this.timeRange = [defaultBeginTime, defaultEndTime]
       this.fetchData()
     }
   },
diff --git a/src/views/dataManage/deviceData/listGasData.vue b/src/views/dataManage/deviceData/listGasData.vue
index 97cdfdb..e365ee9 100644
--- a/src/views/dataManage/deviceData/listGasData.vue
+++ b/src/views/dataManage/deviceData/listGasData.vue
@@ -63,6 +63,7 @@
 import { getGasData, batchExportGasData } from '@/api/data'
 import DeptSelect from '../../../components/DeptSelect/index'
 import { parseUrl } from '@/utils/parseutils'
+import { getDayTime } from '@/utils/dateutils'
 
 export default {
   name: 'ListGasData',
@@ -163,6 +164,9 @@
       if (params && params.deviceType === '4' && params.devcode) {
         this.listQuery.keywords = params.devcode
       }
+      const defaultBeginTime = getDayTime(new Date().getTime() - 24 * 7 * 60 * 60 * 1000).Format('yyyy-MM-dd hh:mm:ss')
+      const defaultEndTime = new Date().Format('yyyy-MM-dd hh:mm:ss')
+      this.timeRange = [defaultBeginTime, defaultEndTime]
       this.fetchData()
     }
   },
diff --git a/src/views/dataManage/deviceData/listHarmfulData.vue b/src/views/dataManage/deviceData/listHarmfulData.vue
index e6a795c..d2398cf 100644
--- a/src/views/dataManage/deviceData/listHarmfulData.vue
+++ b/src/views/dataManage/deviceData/listHarmfulData.vue
@@ -63,6 +63,7 @@
 import { getHarmfulData, batchExportHarmfulData } from '@/api/data'
 import DeptSelect from '../../../components/DeptSelect/index'
 import { parseUrl } from '@/utils/parseutils'
+import { getDayTime } from '@/utils/dateutils'
 
 export default {
   name: 'ListHarmfulData',
@@ -176,6 +177,9 @@
       if (params && params.deviceType === '3' && params.devcode) {
         this.listQuery.keywords = params.devcode
       }
+      const defaultBeginTime = getDayTime(new Date().getTime() - 24 * 7 * 60 * 60 * 1000).Format('yyyy-MM-dd hh:mm:ss')
+      const defaultEndTime = new Date().Format('yyyy-MM-dd hh:mm:ss')
+      this.timeRange = [defaultBeginTime, defaultEndTime]
       this.fetchData()
     }
   },
diff --git a/src/views/dataManage/deviceData/listLiquidData.vue b/src/views/dataManage/deviceData/listLiquidData.vue
index 709e3a8..dea0ba5 100644
--- a/src/views/dataManage/deviceData/listLiquidData.vue
+++ b/src/views/dataManage/deviceData/listLiquidData.vue
@@ -63,6 +63,7 @@
 import { getLiquidData, batchExportLiquidData } from '@/api/data'
 import DeptSelect from '../../../components/DeptSelect/index'
 import { parseUrl } from '@/utils/parseutils'
+import { getDayTime } from '@/utils/dateutils'
 
 export default {
   name: 'ListLiquidData',
@@ -158,6 +159,9 @@
       if (params && params.deviceType === '2' && params.devcode) {
         this.listQuery.keywords = params.devcode
       }
+      const defaultBeginTime = getDayTime(new Date().getTime() - 24 * 7 * 60 * 60 * 1000).Format('yyyy-MM-dd hh:mm:ss')
+      const defaultEndTime = new Date().Format('yyyy-MM-dd hh:mm:ss')
+      this.timeRange = [defaultBeginTime, defaultEndTime]
       this.fetchData()
     }
   },
diff --git a/src/views/dataManage/deviceData/listLiquidGasData.vue b/src/views/dataManage/deviceData/listLiquidGasData.vue
new file mode 100644
index 0000000..9ba38ed
--- /dev/null
+++ b/src/views/dataManage/deviceData/listLiquidGasData.vue
@@ -0,0 +1,413 @@
+<!--液位燃气一体化设备数列表-->
+<template>
+  <div class="app-container">
+    <!--筛选条件-->
+    <div class="search-div">
+      <el-form ref="selectForm" :inline="true" :model="listQuery" class="form-container">
+        <el-row>
+          <el-form-item class="selectForm-container-item" prop="keywords">
+            <el-input v-model.trim="listQuery.keywords" placeholder="井编号/设备编号" clearable/>
+          </el-form-item>
+          <el-form-item class="selectForm-container-item">
+            <dept-select v-model="listQuery.deptid" :need-top="deptShowTop" dept-type="03" placeholder="选择权属单位/使用单位"/>
+          </el-form-item>
+          <el-form-item class="selectForm-container-item">
+            <el-select v-model="listQuery.sensorType" placeholder="请选择传感器类型">
+              <el-option label="液位" value="liquid"/>
+              <el-option label="燃气" value="gas"/>
+            </el-select>
+          </el-form-item>
+          <el-form-item class="selectForm-container-item" prop="beginTime">
+            <el-date-picker
+              v-model="timeRange"
+              type="datetimerange"
+              range-separator="至"
+              value-format="yyyy-MM-dd HH:mm:ss"
+              start-placeholder="开始时间"
+              end-placeholder="结束时间"/>
+          </el-form-item>
+          <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
+        </el-row>
+      </el-form>
+    </div>
+    <!--查询结果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('/liquidGasData/export')" :disabled="list.length === 0" class="edit_btn" size="small" @click="batchExport">导出记录</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">
+            <span v-if="column.checkCell" :class="checkCell(scope.row.cell)">{{ scope.row[column.value] }}</span>
+            <span v-else-if="column.unitFilter">{{ scope.row[column.value]|unit }}</span>
+            <span v-else>{{ scope.row[column.value] }}</span>
+          </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>
+  </div>
+</template>
+
+<script>
+import selectTree from '@/components/SelectTree/singleSelect'
+import { getLiquidGasData, batchExportLiquidGasData } from '@/api/data'
+import DeptSelect from '../../../components/DeptSelect/index'
+import { parseUrl } from '@/utils/parseutils'
+import { getDayTime } from '@/utils/dateutils'
+
+export default {
+  name: 'ListLiquidGasData',
+  components: { DeptSelect, selectTree },
+  filters: {
+    // 燃气浓度单位换算：小于20时单位为%LEL，大于20后，先除以20，加%VOL
+    unit: function(value) {
+      if (value <= 20) {
+        return value + '%LEL'
+      } else {
+        return (value / 20.0).toFixed(2) + '%VOL'
+      }
+    }
+  },
+  data() {
+    return {
+      listQuery: {
+        keywords: '', // 关键字
+        deptid: '', // 部门id
+        sensorType: 'gas', // 传感器类型
+        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: 'data',
+          align: 'center',
+          unitFilter: true
+        },
+        {
+          text: '电量(%)',
+          value: 'cell',
+          width: 80,
+          align: 'center',
+          checkCell: true
+        },
+        {
+          text: '权属单位',
+          value: 'companyName',
+          align: 'center'
+        },
+        {
+          text: '使用单位',
+          value: 'deptName',
+          align: 'center'
+        },
+        {
+          text: '上传时间',
+          value: 'uptime',
+          width: 170,
+          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, // 是否显示编辑框
+      deptShowTop: false
+    }
+  },
+  watch: {
+    timeRange(val) {
+      if (val && val.length > 0) {
+        this.listQuery.beginTime = val[0]
+        this.listQuery.endTime = val[1]
+      } else {
+        this.listQuery.beginTime = ''
+        this.listQuery.endTime = ''
+      }
+    }
+  },
+  created() {
+    // 如果路径里带参数，解析devcode参数
+    if (window.location.href) {
+      const params = parseUrl(window.location.href)
+      if (params && params.deviceType === '10' && params.devcode) {
+        this.listQuery.keywords = params.devcode
+      }
+      const defaultBeginTime = getDayTime(new Date().getTime() - 24 * 7 * 60 * 60 * 1000).Format('yyyy-MM-dd hh:mm:ss')
+      const defaultEndTime = new Date().Format('yyyy-MM-dd hh:mm:ss')
+      this.timeRange = [defaultBeginTime, defaultEndTime]
+      this.fetchData()
+    }
+  },
+  activated() {
+    // 要是路由里有参数
+    if (this.$route.query && this.$route.query.devcode) {
+      this.listQuery.keywords = this.$route.query.devcode
+      const defaultBeginTime = getDayTime(new Date().getTime() - 24 * 7 * 60 * 60 * 1000).Format('yyyy-MM-dd hh:mm:ss')
+      const defaultEndTime = new Date().Format('yyyy-MM-dd hh:mm:ss')
+      this.timeRange = [defaultBeginTime, defaultEndTime]
+      this.fetchData(false)// 获取数据
+    } else {
+      // if (this.timeRange.length === 0) {
+      const defaultBeginTime = getDayTime(new Date().getTime() - 24 * 7 * 60 * 60 * 1000).Format('yyyy-MM-dd hh:mm:ss')
+      const defaultEndTime = new Date().Format('yyyy-MM-dd hh:mm:ss')
+      this.timeRange = [defaultBeginTime, defaultEndTime]
+      // }
+      this.fetchData()
+    }
+  },
+  methods: {
+    // 批量导出
+    batchExport() {
+      console.log('批量导出液位配置')
+      // 全屏加载动画
+      const loading = this.$loading({
+        lock: true,
+        text: '数据处理中,请稍后...',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
+      })
+      batchExportLiquidGasData(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
+        if (this.listQuery.sensorType === 'liquid') {
+          downloadElement.download = `燃气智能终端（一体化）数据-液位.xlsx` // 下载后文件名
+        } else {
+          downloadElement.download = `燃气智能终端（一体化）数据-燃气.xlsx` // 下载后文件名
+        }
+        document.body.appendChild(downloadElement)
+        downloadElement.click() // 点击下载
+        document.body.removeChild(downloadElement) // 下载完成移除元素
+        window.URL.revokeObjectURL(href) // 释放blob对象
+      }).catch((res) => {
+        loading.close()
+      })
+    },
+    // 查询数据
+    search() {
+      // 判断查询类型并更新columns
+      if (this.listQuery.sensorType === 'liquid') {
+        this.columns = [
+          {
+            text: '设备编号',
+            value: 'devcode',
+            align: 'center'
+          },
+          {
+            text: '井编号',
+            value: 'wellCode',
+            align: 'center'
+          },
+          {
+            text: '设备类型',
+            value: 'deviceTypeName',
+            align: 'center'
+          },
+          {
+            text: '液位值(m)',
+            value: 'data',
+            align: 'center'
+          },
+          {
+            text: '电量(%)',
+            value: 'cell',
+            width: 80,
+            align: 'center',
+            checkCell: true
+          },
+          {
+            text: '权属单位',
+            value: 'companyName',
+            align: 'center'
+          },
+          {
+            text: '使用单位',
+            value: 'deptName',
+            align: 'center'
+          },
+          {
+            text: '上传时间',
+            value: 'uptime',
+            width: 170,
+            align: 'center'
+          }
+        ]// 显示列
+      } else {
+        this.columns = [
+          {
+            text: '设备编号',
+            value: 'devcode',
+            align: 'center'
+          },
+          {
+            text: '井编号',
+            value: 'wellCode',
+            align: 'center'
+          },
+          {
+            text: '设备类型',
+            value: 'deviceTypeName',
+            align: 'center'
+          },
+          {
+            text: '燃气浓度',
+            value: 'data',
+            align: 'center',
+            unitFilter: true
+          },
+          {
+            text: '电量(%)',
+            value: 'cell',
+            width: 80,
+            align: 'center',
+            checkCell: true
+          },
+          {
+            text: '权属单位',
+            value: 'companyName',
+            align: 'center'
+          },
+          {
+            text: '使用单位',
+            value: 'deptName',
+            align: 'center'
+          },
+          {
+            text: '上传时间',
+            value: 'uptime',
+            width: 170,
+            align: 'center'
+          }
+        ]
+      }
+      this.list = []
+      this.fetchData(false)
+    },
+    // 获取液位配置数据
+    fetchData(isNowPage = true) {
+      this.listLoading = true
+      if (!isNowPage) { // 是否显示当前页，否则跳转第一页
+        this.listQuery.offset = 1
+      }
+      getLiquidGasData(this.listQuery).then(response => {
+        this.list = response.data.rows
+        this.total = parseInt(response.data.total)
+        this.listLoading = false
+      })
+    },
+    checkCell(value) {
+      var cell = parseFloat(value)
+      if (cell < 10) {
+        return 'warning-state'
+      }
+    },
+    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
+    }
+  }
+  .warning-state{
+    color:red
+  }
+</style>

diff --git a/src/api/data.js b/src/api/data.js
index afeee10..0353d91 100644
--- a/src/api/data.js
+++ b/src/api/data.js
@@ -66,6 +66,14 @@
     params
   })
 }
+// 液位燃气一体化设备数据查询
+export function getLiquidGasData(params) {
+  return request({
+    url: 'liquidGasData/list',
+    method: 'get',
+    params
+  })
+}
 
 // 批量导出井盖数据
 export function batchExportWellData(params) {
@@ -154,4 +162,23 @@
     responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
   })
 }
+// 批量导出液位燃气一体化设备数据
+export function batchExportLiquidGasData(params) {
+  return request({
+    url: '/liquidGasData/export',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 数据统计接口
+export function getStaticData(params) {
+  return request({
+    url: 'data/list',
+    method: 'get',
+    params
+  })
+}
 
diff --git a/src/api/liquidgasconfig.js b/src/api/liquidgasconfig.js
new file mode 100644
index 0000000..9d0fd6b
--- /dev/null
+++ b/src/api/liquidgasconfig.js
@@ -0,0 +1,42 @@
+/**
+ * 液位燃气一体化设备配置接口
+ */
+import request from '@/utils/request'
+// 燃气配置查询
+export function getLiquidGasConfigList(params) {
+  return request({
+    url: 'busConfig/liquidGasConfig/list',
+    method: 'get',
+    params
+  })
+}
+
+// 修改燃气配置
+export function editLiquidGasConfig(params) {
+  return request({
+    url: 'busConfig/liquidGasConfig/config',
+    method: 'post',
+    params
+  })
+}
+
+// 批量导入
+export function batchImportLiquidGasConfig(fileobj) {
+  const param = new FormData()
+  param.append('file', fileobj)
+  return request({
+    url: 'busConfig/gasLiquidConfig/batchImport',
+    method: 'post',
+    headers: { 'Content-Type': 'multipart/form-data' },
+    data: param
+  })
+}
+// 批量导出
+export function batchExportLiquidGasConfig(params) {
+  return request({
+    url: 'busConfig/liquidGasConfig/batchExport',
+    method: 'get',
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
diff --git a/src/views/dataManage/dataManage.vue b/src/views/dataManage/dataManage.vue
index a46b904..cdad03f 100644
--- a/src/views/dataManage/dataManage.vue
+++ b/src/views/dataManage/dataManage.vue
@@ -25,6 +25,9 @@
       <el-tab-pane v-if="hasPerm('/welllocadata/list')" label="井盖定位监测仪" name="wellloca">
         <list-well-loca-data ref="welllocadatacomp"/>
       </el-tab-pane>
+      <el-tab-pane v-if="hasPerm('/liquidGasData/list')" label="燃气智能终端(一体化)" name="liquidgas">
+        <list-liquid-gas-data ref="liquidgasdatacomp"/>
+      </el-tab-pane>
     </el-tabs>
   </div>
 </template>
@@ -37,13 +40,14 @@
 import ListHarmfulData from './deviceData/listHarmfulData'
 import ListTempData from './deviceData/listTempData'
 import ListWellLocaData from './deviceData/listWellLocaData'
+import ListLiquidGasData from './deviceData/listLiquidGasData'
 import { parseUrl } from '@/utils/parseutils'
 import { hasPermission } from '@/utils/permission'
 import ListNoiseData from './deviceData/listNoiseData'
 
 export default {
   name: 'DataManage',
-  components: { ListNoiseData, ListWellLocaData, ListTempData, ListHarmfulData, ListDigData, ListGasData, ListLiquidData, ListWellCoverData },
+  components: { ListNoiseData, ListWellLocaData, ListTempData, ListHarmfulData, ListDigData, ListGasData, ListLiquidData, ListWellCoverData, ListLiquidGasData },
   data() {
     return {
       activeName: 'wellcover'
@@ -86,6 +90,8 @@
         this.$refs.digdatacomp.fetchData()
       } else if (tab.name === 'wellloca') {
         this.$refs.welllocadatacomp.fetchData()
+      } else if (tab.name === 'liquidgas') {
+        this.$refs.liquidgasdatacomp.fetchData()
       }
     },
     changeTab(deviceType) {
@@ -105,6 +111,8 @@
         this.activeName = 'wellloca'
       } else if (deviceType === '8') {
         this.activeName = 'noise'
+      } else if (deviceType === '10') {
+        this.activeName = 'liquidgas'
       }
     },
     // 计算那个是当前第一个tab
@@ -125,6 +133,8 @@
         this.activeName = 'wellloca'
       } else if (hasPermission('/noisedata/list')) {
         this.activeName = 'noise'
+      } else if (hasPermission('/liquidGasData/list')) {
+        this.activeName = 'liquidgas'
       }
     }
   }
diff --git a/src/views/dataManage/deviceData/listDigData.vue b/src/views/dataManage/deviceData/listDigData.vue
index 775af19..5308300 100644
--- a/src/views/dataManage/deviceData/listDigData.vue
+++ b/src/views/dataManage/deviceData/listDigData.vue
@@ -63,6 +63,7 @@
 import { getDigData, batchExportDigData } from '@/api/data'
 import DeptSelect from '../../../components/DeptSelect/index'
 import { parseUrl } from '@/utils/parseutils'
+import { getDayTime } from '@/utils/dateutils'
 
 export default {
   name: 'ListDigData',
@@ -165,6 +166,9 @@
       if (params && params.deviceType === '6' && params.devcode) {
         this.listQuery.keywords = params.devcode
       }
+      const defaultBeginTime = getDayTime(new Date().getTime() - 24 * 7 * 60 * 60 * 1000).Format('yyyy-MM-dd hh:mm:ss')
+      const defaultEndTime = new Date().Format('yyyy-MM-dd hh:mm:ss')
+      this.timeRange = [defaultBeginTime, defaultEndTime]
       this.fetchData()
     }
   },
diff --git a/src/views/dataManage/deviceData/listGasData.vue b/src/views/dataManage/deviceData/listGasData.vue
index 97cdfdb..e365ee9 100644
--- a/src/views/dataManage/deviceData/listGasData.vue
+++ b/src/views/dataManage/deviceData/listGasData.vue
@@ -63,6 +63,7 @@
 import { getGasData, batchExportGasData } from '@/api/data'
 import DeptSelect from '../../../components/DeptSelect/index'
 import { parseUrl } from '@/utils/parseutils'
+import { getDayTime } from '@/utils/dateutils'
 
 export default {
   name: 'ListGasData',
@@ -163,6 +164,9 @@
       if (params && params.deviceType === '4' && params.devcode) {
         this.listQuery.keywords = params.devcode
       }
+      const defaultBeginTime = getDayTime(new Date().getTime() - 24 * 7 * 60 * 60 * 1000).Format('yyyy-MM-dd hh:mm:ss')
+      const defaultEndTime = new Date().Format('yyyy-MM-dd hh:mm:ss')
+      this.timeRange = [defaultBeginTime, defaultEndTime]
       this.fetchData()
     }
   },
diff --git a/src/views/dataManage/deviceData/listHarmfulData.vue b/src/views/dataManage/deviceData/listHarmfulData.vue
index e6a795c..d2398cf 100644
--- a/src/views/dataManage/deviceData/listHarmfulData.vue
+++ b/src/views/dataManage/deviceData/listHarmfulData.vue
@@ -63,6 +63,7 @@
 import { getHarmfulData, batchExportHarmfulData } from '@/api/data'
 import DeptSelect from '../../../components/DeptSelect/index'
 import { parseUrl } from '@/utils/parseutils'
+import { getDayTime } from '@/utils/dateutils'
 
 export default {
   name: 'ListHarmfulData',
@@ -176,6 +177,9 @@
       if (params && params.deviceType === '3' && params.devcode) {
         this.listQuery.keywords = params.devcode
       }
+      const defaultBeginTime = getDayTime(new Date().getTime() - 24 * 7 * 60 * 60 * 1000).Format('yyyy-MM-dd hh:mm:ss')
+      const defaultEndTime = new Date().Format('yyyy-MM-dd hh:mm:ss')
+      this.timeRange = [defaultBeginTime, defaultEndTime]
       this.fetchData()
     }
   },
diff --git a/src/views/dataManage/deviceData/listLiquidData.vue b/src/views/dataManage/deviceData/listLiquidData.vue
index 709e3a8..dea0ba5 100644
--- a/src/views/dataManage/deviceData/listLiquidData.vue
+++ b/src/views/dataManage/deviceData/listLiquidData.vue
@@ -63,6 +63,7 @@
 import { getLiquidData, batchExportLiquidData } from '@/api/data'
 import DeptSelect from '../../../components/DeptSelect/index'
 import { parseUrl } from '@/utils/parseutils'
+import { getDayTime } from '@/utils/dateutils'
 
 export default {
   name: 'ListLiquidData',
@@ -158,6 +159,9 @@
       if (params && params.deviceType === '2' && params.devcode) {
         this.listQuery.keywords = params.devcode
       }
+      const defaultBeginTime = getDayTime(new Date().getTime() - 24 * 7 * 60 * 60 * 1000).Format('yyyy-MM-dd hh:mm:ss')
+      const defaultEndTime = new Date().Format('yyyy-MM-dd hh:mm:ss')
+      this.timeRange = [defaultBeginTime, defaultEndTime]
       this.fetchData()
     }
   },
diff --git a/src/views/dataManage/deviceData/listLiquidGasData.vue b/src/views/dataManage/deviceData/listLiquidGasData.vue
new file mode 100644
index 0000000..9ba38ed
--- /dev/null
+++ b/src/views/dataManage/deviceData/listLiquidGasData.vue
@@ -0,0 +1,413 @@
+<!--液位燃气一体化设备数列表-->
+<template>
+  <div class="app-container">
+    <!--筛选条件-->
+    <div class="search-div">
+      <el-form ref="selectForm" :inline="true" :model="listQuery" class="form-container">
+        <el-row>
+          <el-form-item class="selectForm-container-item" prop="keywords">
+            <el-input v-model.trim="listQuery.keywords" placeholder="井编号/设备编号" clearable/>
+          </el-form-item>
+          <el-form-item class="selectForm-container-item">
+            <dept-select v-model="listQuery.deptid" :need-top="deptShowTop" dept-type="03" placeholder="选择权属单位/使用单位"/>
+          </el-form-item>
+          <el-form-item class="selectForm-container-item">
+            <el-select v-model="listQuery.sensorType" placeholder="请选择传感器类型">
+              <el-option label="液位" value="liquid"/>
+              <el-option label="燃气" value="gas"/>
+            </el-select>
+          </el-form-item>
+          <el-form-item class="selectForm-container-item" prop="beginTime">
+            <el-date-picker
+              v-model="timeRange"
+              type="datetimerange"
+              range-separator="至"
+              value-format="yyyy-MM-dd HH:mm:ss"
+              start-placeholder="开始时间"
+              end-placeholder="结束时间"/>
+          </el-form-item>
+          <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
+        </el-row>
+      </el-form>
+    </div>
+    <!--查询结果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('/liquidGasData/export')" :disabled="list.length === 0" class="edit_btn" size="small" @click="batchExport">导出记录</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">
+            <span v-if="column.checkCell" :class="checkCell(scope.row.cell)">{{ scope.row[column.value] }}</span>
+            <span v-else-if="column.unitFilter">{{ scope.row[column.value]|unit }}</span>
+            <span v-else>{{ scope.row[column.value] }}</span>
+          </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>
+  </div>
+</template>
+
+<script>
+import selectTree from '@/components/SelectTree/singleSelect'
+import { getLiquidGasData, batchExportLiquidGasData } from '@/api/data'
+import DeptSelect from '../../../components/DeptSelect/index'
+import { parseUrl } from '@/utils/parseutils'
+import { getDayTime } from '@/utils/dateutils'
+
+export default {
+  name: 'ListLiquidGasData',
+  components: { DeptSelect, selectTree },
+  filters: {
+    // 燃气浓度单位换算：小于20时单位为%LEL，大于20后，先除以20，加%VOL
+    unit: function(value) {
+      if (value <= 20) {
+        return value + '%LEL'
+      } else {
+        return (value / 20.0).toFixed(2) + '%VOL'
+      }
+    }
+  },
+  data() {
+    return {
+      listQuery: {
+        keywords: '', // 关键字
+        deptid: '', // 部门id
+        sensorType: 'gas', // 传感器类型
+        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: 'data',
+          align: 'center',
+          unitFilter: true
+        },
+        {
+          text: '电量(%)',
+          value: 'cell',
+          width: 80,
+          align: 'center',
+          checkCell: true
+        },
+        {
+          text: '权属单位',
+          value: 'companyName',
+          align: 'center'
+        },
+        {
+          text: '使用单位',
+          value: 'deptName',
+          align: 'center'
+        },
+        {
+          text: '上传时间',
+          value: 'uptime',
+          width: 170,
+          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, // 是否显示编辑框
+      deptShowTop: false
+    }
+  },
+  watch: {
+    timeRange(val) {
+      if (val && val.length > 0) {
+        this.listQuery.beginTime = val[0]
+        this.listQuery.endTime = val[1]
+      } else {
+        this.listQuery.beginTime = ''
+        this.listQuery.endTime = ''
+      }
+    }
+  },
+  created() {
+    // 如果路径里带参数，解析devcode参数
+    if (window.location.href) {
+      const params = parseUrl(window.location.href)
+      if (params && params.deviceType === '10' && params.devcode) {
+        this.listQuery.keywords = params.devcode
+      }
+      const defaultBeginTime = getDayTime(new Date().getTime() - 24 * 7 * 60 * 60 * 1000).Format('yyyy-MM-dd hh:mm:ss')
+      const defaultEndTime = new Date().Format('yyyy-MM-dd hh:mm:ss')
+      this.timeRange = [defaultBeginTime, defaultEndTime]
+      this.fetchData()
+    }
+  },
+  activated() {
+    // 要是路由里有参数
+    if (this.$route.query && this.$route.query.devcode) {
+      this.listQuery.keywords = this.$route.query.devcode
+      const defaultBeginTime = getDayTime(new Date().getTime() - 24 * 7 * 60 * 60 * 1000).Format('yyyy-MM-dd hh:mm:ss')
+      const defaultEndTime = new Date().Format('yyyy-MM-dd hh:mm:ss')
+      this.timeRange = [defaultBeginTime, defaultEndTime]
+      this.fetchData(false)// 获取数据
+    } else {
+      // if (this.timeRange.length === 0) {
+      const defaultBeginTime = getDayTime(new Date().getTime() - 24 * 7 * 60 * 60 * 1000).Format('yyyy-MM-dd hh:mm:ss')
+      const defaultEndTime = new Date().Format('yyyy-MM-dd hh:mm:ss')
+      this.timeRange = [defaultBeginTime, defaultEndTime]
+      // }
+      this.fetchData()
+    }
+  },
+  methods: {
+    // 批量导出
+    batchExport() {
+      console.log('批量导出液位配置')
+      // 全屏加载动画
+      const loading = this.$loading({
+        lock: true,
+        text: '数据处理中,请稍后...',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
+      })
+      batchExportLiquidGasData(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
+        if (this.listQuery.sensorType === 'liquid') {
+          downloadElement.download = `燃气智能终端（一体化）数据-液位.xlsx` // 下载后文件名
+        } else {
+          downloadElement.download = `燃气智能终端（一体化）数据-燃气.xlsx` // 下载后文件名
+        }
+        document.body.appendChild(downloadElement)
+        downloadElement.click() // 点击下载
+        document.body.removeChild(downloadElement) // 下载完成移除元素
+        window.URL.revokeObjectURL(href) // 释放blob对象
+      }).catch((res) => {
+        loading.close()
+      })
+    },
+    // 查询数据
+    search() {
+      // 判断查询类型并更新columns
+      if (this.listQuery.sensorType === 'liquid') {
+        this.columns = [
+          {
+            text: '设备编号',
+            value: 'devcode',
+            align: 'center'
+          },
+          {
+            text: '井编号',
+            value: 'wellCode',
+            align: 'center'
+          },
+          {
+            text: '设备类型',
+            value: 'deviceTypeName',
+            align: 'center'
+          },
+          {
+            text: '液位值(m)',
+            value: 'data',
+            align: 'center'
+          },
+          {
+            text: '电量(%)',
+            value: 'cell',
+            width: 80,
+            align: 'center',
+            checkCell: true
+          },
+          {
+            text: '权属单位',
+            value: 'companyName',
+            align: 'center'
+          },
+          {
+            text: '使用单位',
+            value: 'deptName',
+            align: 'center'
+          },
+          {
+            text: '上传时间',
+            value: 'uptime',
+            width: 170,
+            align: 'center'
+          }
+        ]// 显示列
+      } else {
+        this.columns = [
+          {
+            text: '设备编号',
+            value: 'devcode',
+            align: 'center'
+          },
+          {
+            text: '井编号',
+            value: 'wellCode',
+            align: 'center'
+          },
+          {
+            text: '设备类型',
+            value: 'deviceTypeName',
+            align: 'center'
+          },
+          {
+            text: '燃气浓度',
+            value: 'data',
+            align: 'center',
+            unitFilter: true
+          },
+          {
+            text: '电量(%)',
+            value: 'cell',
+            width: 80,
+            align: 'center',
+            checkCell: true
+          },
+          {
+            text: '权属单位',
+            value: 'companyName',
+            align: 'center'
+          },
+          {
+            text: '使用单位',
+            value: 'deptName',
+            align: 'center'
+          },
+          {
+            text: '上传时间',
+            value: 'uptime',
+            width: 170,
+            align: 'center'
+          }
+        ]
+      }
+      this.list = []
+      this.fetchData(false)
+    },
+    // 获取液位配置数据
+    fetchData(isNowPage = true) {
+      this.listLoading = true
+      if (!isNowPage) { // 是否显示当前页，否则跳转第一页
+        this.listQuery.offset = 1
+      }
+      getLiquidGasData(this.listQuery).then(response => {
+        this.list = response.data.rows
+        this.total = parseInt(response.data.total)
+        this.listLoading = false
+      })
+    },
+    checkCell(value) {
+      var cell = parseFloat(value)
+      if (cell < 10) {
+        return 'warning-state'
+      }
+    },
+    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
+    }
+  }
+  .warning-state{
+    color:red
+  }
+</style>
diff --git a/src/views/dataManage/deviceData/listNoiseData.vue b/src/views/dataManage/deviceData/listNoiseData.vue
index fd909d9..e42b4cf 100644
--- a/src/views/dataManage/deviceData/listNoiseData.vue
+++ b/src/views/dataManage/deviceData/listNoiseData.vue
@@ -63,6 +63,7 @@
 import { getNoiseData, batchExportNoiseData } from '@/api/data'
 import DeptSelect from '../../../components/DeptSelect/index'
 import { parseUrl } from '@/utils/parseutils'
+import { getDayTime } from '@/utils/dateutils'
 
 export default {
   name: 'ListNoiseData',
@@ -165,6 +166,9 @@
       if (params && params.deviceType === '6' && params.devcode) {
         this.listQuery.keywords = params.devcode
       }
+      const defaultBeginTime = getDayTime(new Date().getTime() - 24 * 7 * 60 * 60 * 1000).Format('yyyy-MM-dd hh:mm:ss')
+      const defaultEndTime = new Date().Format('yyyy-MM-dd hh:mm:ss')
+      this.timeRange = [defaultBeginTime, defaultEndTime]
       this.fetchData()
     }
   },

diff --git a/src/api/data.js b/src/api/data.js
index afeee10..0353d91 100644
--- a/src/api/data.js
+++ b/src/api/data.js
@@ -66,6 +66,14 @@
     params
   })
 }
+// 液位燃气一体化设备数据查询
+export function getLiquidGasData(params) {
+  return request({
+    url: 'liquidGasData/list',
+    method: 'get',
+    params
+  })
+}
 
 // 批量导出井盖数据
 export function batchExportWellData(params) {
@@ -154,4 +162,23 @@
     responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
   })
 }
+// 批量导出液位燃气一体化设备数据
+export function batchExportLiquidGasData(params) {
+  return request({
+    url: '/liquidGasData/export',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 数据统计接口
+export function getStaticData(params) {
+  return request({
+    url: 'data/list',
+    method: 'get',
+    params
+  })
+}
 
diff --git a/src/api/liquidgasconfig.js b/src/api/liquidgasconfig.js
new file mode 100644
index 0000000..9d0fd6b
--- /dev/null
+++ b/src/api/liquidgasconfig.js
@@ -0,0 +1,42 @@
+/**
+ * 液位燃气一体化设备配置接口
+ */
+import request from '@/utils/request'
+// 燃气配置查询
+export function getLiquidGasConfigList(params) {
+  return request({
+    url: 'busConfig/liquidGasConfig/list',
+    method: 'get',
+    params
+  })
+}
+
+// 修改燃气配置
+export function editLiquidGasConfig(params) {
+  return request({
+    url: 'busConfig/liquidGasConfig/config',
+    method: 'post',
+    params
+  })
+}
+
+// 批量导入
+export function batchImportLiquidGasConfig(fileobj) {
+  const param = new FormData()
+  param.append('file', fileobj)
+  return request({
+    url: 'busConfig/gasLiquidConfig/batchImport',
+    method: 'post',
+    headers: { 'Content-Type': 'multipart/form-data' },
+    data: param
+  })
+}
+// 批量导出
+export function batchExportLiquidGasConfig(params) {
+  return request({
+    url: 'busConfig/liquidGasConfig/batchExport',
+    method: 'get',
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
diff --git a/src/views/dataManage/dataManage.vue b/src/views/dataManage/dataManage.vue
index a46b904..cdad03f 100644
--- a/src/views/dataManage/dataManage.vue
+++ b/src/views/dataManage/dataManage.vue
@@ -25,6 +25,9 @@
       <el-tab-pane v-if="hasPerm('/welllocadata/list')" label="井盖定位监测仪" name="wellloca">
         <list-well-loca-data ref="welllocadatacomp"/>
       </el-tab-pane>
+      <el-tab-pane v-if="hasPerm('/liquidGasData/list')" label="燃气智能终端(一体化)" name="liquidgas">
+        <list-liquid-gas-data ref="liquidgasdatacomp"/>
+      </el-tab-pane>
     </el-tabs>
   </div>
 </template>
@@ -37,13 +40,14 @@
 import ListHarmfulData from './deviceData/listHarmfulData'
 import ListTempData from './deviceData/listTempData'
 import ListWellLocaData from './deviceData/listWellLocaData'
+import ListLiquidGasData from './deviceData/listLiquidGasData'
 import { parseUrl } from '@/utils/parseutils'
 import { hasPermission } from '@/utils/permission'
 import ListNoiseData from './deviceData/listNoiseData'
 
 export default {
   name: 'DataManage',
-  components: { ListNoiseData, ListWellLocaData, ListTempData, ListHarmfulData, ListDigData, ListGasData, ListLiquidData, ListWellCoverData },
+  components: { ListNoiseData, ListWellLocaData, ListTempData, ListHarmfulData, ListDigData, ListGasData, ListLiquidData, ListWellCoverData, ListLiquidGasData },
   data() {
     return {
       activeName: 'wellcover'
@@ -86,6 +90,8 @@
         this.$refs.digdatacomp.fetchData()
       } else if (tab.name === 'wellloca') {
         this.$refs.welllocadatacomp.fetchData()
+      } else if (tab.name === 'liquidgas') {
+        this.$refs.liquidgasdatacomp.fetchData()
       }
     },
     changeTab(deviceType) {
@@ -105,6 +111,8 @@
         this.activeName = 'wellloca'
       } else if (deviceType === '8') {
         this.activeName = 'noise'
+      } else if (deviceType === '10') {
+        this.activeName = 'liquidgas'
       }
     },
     // 计算那个是当前第一个tab
@@ -125,6 +133,8 @@
         this.activeName = 'wellloca'
       } else if (hasPermission('/noisedata/list')) {
         this.activeName = 'noise'
+      } else if (hasPermission('/liquidGasData/list')) {
+        this.activeName = 'liquidgas'
       }
     }
   }
diff --git a/src/views/dataManage/deviceData/listDigData.vue b/src/views/dataManage/deviceData/listDigData.vue
index 775af19..5308300 100644
--- a/src/views/dataManage/deviceData/listDigData.vue
+++ b/src/views/dataManage/deviceData/listDigData.vue
@@ -63,6 +63,7 @@
 import { getDigData, batchExportDigData } from '@/api/data'
 import DeptSelect from '../../../components/DeptSelect/index'
 import { parseUrl } from '@/utils/parseutils'
+import { getDayTime } from '@/utils/dateutils'
 
 export default {
   name: 'ListDigData',
@@ -165,6 +166,9 @@
       if (params && params.deviceType === '6' && params.devcode) {
         this.listQuery.keywords = params.devcode
       }
+      const defaultBeginTime = getDayTime(new Date().getTime() - 24 * 7 * 60 * 60 * 1000).Format('yyyy-MM-dd hh:mm:ss')
+      const defaultEndTime = new Date().Format('yyyy-MM-dd hh:mm:ss')
+      this.timeRange = [defaultBeginTime, defaultEndTime]
       this.fetchData()
     }
   },
diff --git a/src/views/dataManage/deviceData/listGasData.vue b/src/views/dataManage/deviceData/listGasData.vue
index 97cdfdb..e365ee9 100644
--- a/src/views/dataManage/deviceData/listGasData.vue
+++ b/src/views/dataManage/deviceData/listGasData.vue
@@ -63,6 +63,7 @@
 import { getGasData, batchExportGasData } from '@/api/data'
 import DeptSelect from '../../../components/DeptSelect/index'
 import { parseUrl } from '@/utils/parseutils'
+import { getDayTime } from '@/utils/dateutils'
 
 export default {
   name: 'ListGasData',
@@ -163,6 +164,9 @@
       if (params && params.deviceType === '4' && params.devcode) {
         this.listQuery.keywords = params.devcode
       }
+      const defaultBeginTime = getDayTime(new Date().getTime() - 24 * 7 * 60 * 60 * 1000).Format('yyyy-MM-dd hh:mm:ss')
+      const defaultEndTime = new Date().Format('yyyy-MM-dd hh:mm:ss')
+      this.timeRange = [defaultBeginTime, defaultEndTime]
       this.fetchData()
     }
   },
diff --git a/src/views/dataManage/deviceData/listHarmfulData.vue b/src/views/dataManage/deviceData/listHarmfulData.vue
index e6a795c..d2398cf 100644
--- a/src/views/dataManage/deviceData/listHarmfulData.vue
+++ b/src/views/dataManage/deviceData/listHarmfulData.vue
@@ -63,6 +63,7 @@
 import { getHarmfulData, batchExportHarmfulData } from '@/api/data'
 import DeptSelect from '../../../components/DeptSelect/index'
 import { parseUrl } from '@/utils/parseutils'
+import { getDayTime } from '@/utils/dateutils'
 
 export default {
   name: 'ListHarmfulData',
@@ -176,6 +177,9 @@
       if (params && params.deviceType === '3' && params.devcode) {
         this.listQuery.keywords = params.devcode
       }
+      const defaultBeginTime = getDayTime(new Date().getTime() - 24 * 7 * 60 * 60 * 1000).Format('yyyy-MM-dd hh:mm:ss')
+      const defaultEndTime = new Date().Format('yyyy-MM-dd hh:mm:ss')
+      this.timeRange = [defaultBeginTime, defaultEndTime]
       this.fetchData()
     }
   },
diff --git a/src/views/dataManage/deviceData/listLiquidData.vue b/src/views/dataManage/deviceData/listLiquidData.vue
index 709e3a8..dea0ba5 100644
--- a/src/views/dataManage/deviceData/listLiquidData.vue
+++ b/src/views/dataManage/deviceData/listLiquidData.vue
@@ -63,6 +63,7 @@
 import { getLiquidData, batchExportLiquidData } from '@/api/data'
 import DeptSelect from '../../../components/DeptSelect/index'
 import { parseUrl } from '@/utils/parseutils'
+import { getDayTime } from '@/utils/dateutils'
 
 export default {
   name: 'ListLiquidData',
@@ -158,6 +159,9 @@
       if (params && params.deviceType === '2' && params.devcode) {
         this.listQuery.keywords = params.devcode
       }
+      const defaultBeginTime = getDayTime(new Date().getTime() - 24 * 7 * 60 * 60 * 1000).Format('yyyy-MM-dd hh:mm:ss')
+      const defaultEndTime = new Date().Format('yyyy-MM-dd hh:mm:ss')
+      this.timeRange = [defaultBeginTime, defaultEndTime]
       this.fetchData()
     }
   },
diff --git a/src/views/dataManage/deviceData/listLiquidGasData.vue b/src/views/dataManage/deviceData/listLiquidGasData.vue
new file mode 100644
index 0000000..9ba38ed
--- /dev/null
+++ b/src/views/dataManage/deviceData/listLiquidGasData.vue
@@ -0,0 +1,413 @@
+<!--液位燃气一体化设备数列表-->
+<template>
+  <div class="app-container">
+    <!--筛选条件-->
+    <div class="search-div">
+      <el-form ref="selectForm" :inline="true" :model="listQuery" class="form-container">
+        <el-row>
+          <el-form-item class="selectForm-container-item" prop="keywords">
+            <el-input v-model.trim="listQuery.keywords" placeholder="井编号/设备编号" clearable/>
+          </el-form-item>
+          <el-form-item class="selectForm-container-item">
+            <dept-select v-model="listQuery.deptid" :need-top="deptShowTop" dept-type="03" placeholder="选择权属单位/使用单位"/>
+          </el-form-item>
+          <el-form-item class="selectForm-container-item">
+            <el-select v-model="listQuery.sensorType" placeholder="请选择传感器类型">
+              <el-option label="液位" value="liquid"/>
+              <el-option label="燃气" value="gas"/>
+            </el-select>
+          </el-form-item>
+          <el-form-item class="selectForm-container-item" prop="beginTime">
+            <el-date-picker
+              v-model="timeRange"
+              type="datetimerange"
+              range-separator="至"
+              value-format="yyyy-MM-dd HH:mm:ss"
+              start-placeholder="开始时间"
+              end-placeholder="结束时间"/>
+          </el-form-item>
+          <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
+        </el-row>
+      </el-form>
+    </div>
+    <!--查询结果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('/liquidGasData/export')" :disabled="list.length === 0" class="edit_btn" size="small" @click="batchExport">导出记录</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">
+            <span v-if="column.checkCell" :class="checkCell(scope.row.cell)">{{ scope.row[column.value] }}</span>
+            <span v-else-if="column.unitFilter">{{ scope.row[column.value]|unit }}</span>
+            <span v-else>{{ scope.row[column.value] }}</span>
+          </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>
+  </div>
+</template>
+
+<script>
+import selectTree from '@/components/SelectTree/singleSelect'
+import { getLiquidGasData, batchExportLiquidGasData } from '@/api/data'
+import DeptSelect from '../../../components/DeptSelect/index'
+import { parseUrl } from '@/utils/parseutils'
+import { getDayTime } from '@/utils/dateutils'
+
+export default {
+  name: 'ListLiquidGasData',
+  components: { DeptSelect, selectTree },
+  filters: {
+    // 燃气浓度单位换算：小于20时单位为%LEL，大于20后，先除以20，加%VOL
+    unit: function(value) {
+      if (value <= 20) {
+        return value + '%LEL'
+      } else {
+        return (value / 20.0).toFixed(2) + '%VOL'
+      }
+    }
+  },
+  data() {
+    return {
+      listQuery: {
+        keywords: '', // 关键字
+        deptid: '', // 部门id
+        sensorType: 'gas', // 传感器类型
+        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: 'data',
+          align: 'center',
+          unitFilter: true
+        },
+        {
+          text: '电量(%)',
+          value: 'cell',
+          width: 80,
+          align: 'center',
+          checkCell: true
+        },
+        {
+          text: '权属单位',
+          value: 'companyName',
+          align: 'center'
+        },
+        {
+          text: '使用单位',
+          value: 'deptName',
+          align: 'center'
+        },
+        {
+          text: '上传时间',
+          value: 'uptime',
+          width: 170,
+          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, // 是否显示编辑框
+      deptShowTop: false
+    }
+  },
+  watch: {
+    timeRange(val) {
+      if (val && val.length > 0) {
+        this.listQuery.beginTime = val[0]
+        this.listQuery.endTime = val[1]
+      } else {
+        this.listQuery.beginTime = ''
+        this.listQuery.endTime = ''
+      }
+    }
+  },
+  created() {
+    // 如果路径里带参数，解析devcode参数
+    if (window.location.href) {
+      const params = parseUrl(window.location.href)
+      if (params && params.deviceType === '10' && params.devcode) {
+        this.listQuery.keywords = params.devcode
+      }
+      const defaultBeginTime = getDayTime(new Date().getTime() - 24 * 7 * 60 * 60 * 1000).Format('yyyy-MM-dd hh:mm:ss')
+      const defaultEndTime = new Date().Format('yyyy-MM-dd hh:mm:ss')
+      this.timeRange = [defaultBeginTime, defaultEndTime]
+      this.fetchData()
+    }
+  },
+  activated() {
+    // 要是路由里有参数
+    if (this.$route.query && this.$route.query.devcode) {
+      this.listQuery.keywords = this.$route.query.devcode
+      const defaultBeginTime = getDayTime(new Date().getTime() - 24 * 7 * 60 * 60 * 1000).Format('yyyy-MM-dd hh:mm:ss')
+      const defaultEndTime = new Date().Format('yyyy-MM-dd hh:mm:ss')
+      this.timeRange = [defaultBeginTime, defaultEndTime]
+      this.fetchData(false)// 获取数据
+    } else {
+      // if (this.timeRange.length === 0) {
+      const defaultBeginTime = getDayTime(new Date().getTime() - 24 * 7 * 60 * 60 * 1000).Format('yyyy-MM-dd hh:mm:ss')
+      const defaultEndTime = new Date().Format('yyyy-MM-dd hh:mm:ss')
+      this.timeRange = [defaultBeginTime, defaultEndTime]
+      // }
+      this.fetchData()
+    }
+  },
+  methods: {
+    // 批量导出
+    batchExport() {
+      console.log('批量导出液位配置')
+      // 全屏加载动画
+      const loading = this.$loading({
+        lock: true,
+        text: '数据处理中,请稍后...',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
+      })
+      batchExportLiquidGasData(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
+        if (this.listQuery.sensorType === 'liquid') {
+          downloadElement.download = `燃气智能终端（一体化）数据-液位.xlsx` // 下载后文件名
+        } else {
+          downloadElement.download = `燃气智能终端（一体化）数据-燃气.xlsx` // 下载后文件名
+        }
+        document.body.appendChild(downloadElement)
+        downloadElement.click() // 点击下载
+        document.body.removeChild(downloadElement) // 下载完成移除元素
+        window.URL.revokeObjectURL(href) // 释放blob对象
+      }).catch((res) => {
+        loading.close()
+      })
+    },
+    // 查询数据
+    search() {
+      // 判断查询类型并更新columns
+      if (this.listQuery.sensorType === 'liquid') {
+        this.columns = [
+          {
+            text: '设备编号',
+            value: 'devcode',
+            align: 'center'
+          },
+          {
+            text: '井编号',
+            value: 'wellCode',
+            align: 'center'
+          },
+          {
+            text: '设备类型',
+            value: 'deviceTypeName',
+            align: 'center'
+          },
+          {
+            text: '液位值(m)',
+            value: 'data',
+            align: 'center'
+          },
+          {
+            text: '电量(%)',
+            value: 'cell',
+            width: 80,
+            align: 'center',
+            checkCell: true
+          },
+          {
+            text: '权属单位',
+            value: 'companyName',
+            align: 'center'
+          },
+          {
+            text: '使用单位',
+            value: 'deptName',
+            align: 'center'
+          },
+          {
+            text: '上传时间',
+            value: 'uptime',
+            width: 170,
+            align: 'center'
+          }
+        ]// 显示列
+      } else {
+        this.columns = [
+          {
+            text: '设备编号',
+            value: 'devcode',
+            align: 'center'
+          },
+          {
+            text: '井编号',
+            value: 'wellCode',
+            align: 'center'
+          },
+          {
+            text: '设备类型',
+            value: 'deviceTypeName',
+            align: 'center'
+          },
+          {
+            text: '燃气浓度',
+            value: 'data',
+            align: 'center',
+            unitFilter: true
+          },
+          {
+            text: '电量(%)',
+            value: 'cell',
+            width: 80,
+            align: 'center',
+            checkCell: true
+          },
+          {
+            text: '权属单位',
+            value: 'companyName',
+            align: 'center'
+          },
+          {
+            text: '使用单位',
+            value: 'deptName',
+            align: 'center'
+          },
+          {
+            text: '上传时间',
+            value: 'uptime',
+            width: 170,
+            align: 'center'
+          }
+        ]
+      }
+      this.list = []
+      this.fetchData(false)
+    },
+    // 获取液位配置数据
+    fetchData(isNowPage = true) {
+      this.listLoading = true
+      if (!isNowPage) { // 是否显示当前页，否则跳转第一页
+        this.listQuery.offset = 1
+      }
+      getLiquidGasData(this.listQuery).then(response => {
+        this.list = response.data.rows
+        this.total = parseInt(response.data.total)
+        this.listLoading = false
+      })
+    },
+    checkCell(value) {
+      var cell = parseFloat(value)
+      if (cell < 10) {
+        return 'warning-state'
+      }
+    },
+    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
+    }
+  }
+  .warning-state{
+    color:red
+  }
+</style>
diff --git a/src/views/dataManage/deviceData/listNoiseData.vue b/src/views/dataManage/deviceData/listNoiseData.vue
index fd909d9..e42b4cf 100644
--- a/src/views/dataManage/deviceData/listNoiseData.vue
+++ b/src/views/dataManage/deviceData/listNoiseData.vue
@@ -63,6 +63,7 @@
 import { getNoiseData, batchExportNoiseData } from '@/api/data'
 import DeptSelect from '../../../components/DeptSelect/index'
 import { parseUrl } from '@/utils/parseutils'
+import { getDayTime } from '@/utils/dateutils'
 
 export default {
   name: 'ListNoiseData',
@@ -165,6 +166,9 @@
       if (params && params.deviceType === '6' && params.devcode) {
         this.listQuery.keywords = params.devcode
       }
+      const defaultBeginTime = getDayTime(new Date().getTime() - 24 * 7 * 60 * 60 * 1000).Format('yyyy-MM-dd hh:mm:ss')
+      const defaultEndTime = new Date().Format('yyyy-MM-dd hh:mm:ss')
+      this.timeRange = [defaultBeginTime, defaultEndTime]
       this.fetchData()
     }
   },
diff --git a/src/views/dataManage/deviceData/listTempData.vue b/src/views/dataManage/deviceData/listTempData.vue
index 2fead0e..8bbb92f 100644
--- a/src/views/dataManage/deviceData/listTempData.vue
+++ b/src/views/dataManage/deviceData/listTempData.vue
@@ -63,6 +63,7 @@
 import { getTempData, batchExportTempData } from '@/api/data'
 import DeptSelect from '../../../components/DeptSelect/index'
 import { parseUrl } from '@/utils/parseutils'
+import { getDayTime } from '@/utils/dateutils'
 
 export default {
   name: 'ListTempData',
@@ -162,6 +163,9 @@
       const params = parseUrl(window.location.href)
       if (params && params.deviceType === '5' && params.devcode) {
         this.listQuery.keywords = params.devcode
+        const defaultBeginTime = getDayTime(new Date().getTime() - 24 * 7 * 60 * 60 * 1000).Format('yyyy-MM-dd hh:mm:ss')
+        const defaultEndTime = new Date().Format('yyyy-MM-dd hh:mm:ss')
+        this.timeRange = [defaultBeginTime, defaultEndTime]
       }
       this.fetchData()
     }

diff --git a/src/api/data.js b/src/api/data.js
index afeee10..0353d91 100644
--- a/src/api/data.js
+++ b/src/api/data.js
@@ -66,6 +66,14 @@
     params
   })
 }
+// 液位燃气一体化设备数据查询
+export function getLiquidGasData(params) {
+  return request({
+    url: 'liquidGasData/list',
+    method: 'get',
+    params
+  })
+}
 
 // 批量导出井盖数据
 export function batchExportWellData(params) {
@@ -154,4 +162,23 @@
     responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
   })
 }
+// 批量导出液位燃气一体化设备数据
+export function batchExportLiquidGasData(params) {
+  return request({
+    url: '/liquidGasData/export',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 数据统计接口
+export function getStaticData(params) {
+  return request({
+    url: 'data/list',
+    method: 'get',
+    params
+  })
+}
 
diff --git a/src/api/liquidgasconfig.js b/src/api/liquidgasconfig.js
new file mode 100644
index 0000000..9d0fd6b
--- /dev/null
+++ b/src/api/liquidgasconfig.js
@@ -0,0 +1,42 @@
+/**
+ * 液位燃气一体化设备配置接口
+ */
+import request from '@/utils/request'
+// 燃气配置查询
+export function getLiquidGasConfigList(params) {
+  return request({
+    url: 'busConfig/liquidGasConfig/list',
+    method: 'get',
+    params
+  })
+}
+
+// 修改燃气配置
+export function editLiquidGasConfig(params) {
+  return request({
+    url: 'busConfig/liquidGasConfig/config',
+    method: 'post',
+    params
+  })
+}
+
+// 批量导入
+export function batchImportLiquidGasConfig(fileobj) {
+  const param = new FormData()
+  param.append('file', fileobj)
+  return request({
+    url: 'busConfig/gasLiquidConfig/batchImport',
+    method: 'post',
+    headers: { 'Content-Type': 'multipart/form-data' },
+    data: param
+  })
+}
+// 批量导出
+export function batchExportLiquidGasConfig(params) {
+  return request({
+    url: 'busConfig/liquidGasConfig/batchExport',
+    method: 'get',
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
diff --git a/src/views/dataManage/dataManage.vue b/src/views/dataManage/dataManage.vue
index a46b904..cdad03f 100644
--- a/src/views/dataManage/dataManage.vue
+++ b/src/views/dataManage/dataManage.vue
@@ -25,6 +25,9 @@
       <el-tab-pane v-if="hasPerm('/welllocadata/list')" label="井盖定位监测仪" name="wellloca">
         <list-well-loca-data ref="welllocadatacomp"/>
       </el-tab-pane>
+      <el-tab-pane v-if="hasPerm('/liquidGasData/list')" label="燃气智能终端(一体化)" name="liquidgas">
+        <list-liquid-gas-data ref="liquidgasdatacomp"/>
+      </el-tab-pane>
     </el-tabs>
   </div>
 </template>
@@ -37,13 +40,14 @@
 import ListHarmfulData from './deviceData/listHarmfulData'
 import ListTempData from './deviceData/listTempData'
 import ListWellLocaData from './deviceData/listWellLocaData'
+import ListLiquidGasData from './deviceData/listLiquidGasData'
 import { parseUrl } from '@/utils/parseutils'
 import { hasPermission } from '@/utils/permission'
 import ListNoiseData from './deviceData/listNoiseData'
 
 export default {
   name: 'DataManage',
-  components: { ListNoiseData, ListWellLocaData, ListTempData, ListHarmfulData, ListDigData, ListGasData, ListLiquidData, ListWellCoverData },
+  components: { ListNoiseData, ListWellLocaData, ListTempData, ListHarmfulData, ListDigData, ListGasData, ListLiquidData, ListWellCoverData, ListLiquidGasData },
   data() {
     return {
       activeName: 'wellcover'
@@ -86,6 +90,8 @@
         this.$refs.digdatacomp.fetchData()
       } else if (tab.name === 'wellloca') {
         this.$refs.welllocadatacomp.fetchData()
+      } else if (tab.name === 'liquidgas') {
+        this.$refs.liquidgasdatacomp.fetchData()
       }
     },
     changeTab(deviceType) {
@@ -105,6 +111,8 @@
         this.activeName = 'wellloca'
       } else if (deviceType === '8') {
         this.activeName = 'noise'
+      } else if (deviceType === '10') {
+        this.activeName = 'liquidgas'
       }
     },
     // 计算那个是当前第一个tab
@@ -125,6 +133,8 @@
         this.activeName = 'wellloca'
       } else if (hasPermission('/noisedata/list')) {
         this.activeName = 'noise'
+      } else if (hasPermission('/liquidGasData/list')) {
+        this.activeName = 'liquidgas'
       }
     }
   }
diff --git a/src/views/dataManage/deviceData/listDigData.vue b/src/views/dataManage/deviceData/listDigData.vue
index 775af19..5308300 100644
--- a/src/views/dataManage/deviceData/listDigData.vue
+++ b/src/views/dataManage/deviceData/listDigData.vue
@@ -63,6 +63,7 @@
 import { getDigData, batchExportDigData } from '@/api/data'
 import DeptSelect from '../../../components/DeptSelect/index'
 import { parseUrl } from '@/utils/parseutils'
+import { getDayTime } from '@/utils/dateutils'
 
 export default {
   name: 'ListDigData',
@@ -165,6 +166,9 @@
       if (params && params.deviceType === '6' && params.devcode) {
         this.listQuery.keywords = params.devcode
       }
+      const defaultBeginTime = getDayTime(new Date().getTime() - 24 * 7 * 60 * 60 * 1000).Format('yyyy-MM-dd hh:mm:ss')
+      const defaultEndTime = new Date().Format('yyyy-MM-dd hh:mm:ss')
+      this.timeRange = [defaultBeginTime, defaultEndTime]
       this.fetchData()
     }
   },
diff --git a/src/views/dataManage/deviceData/listGasData.vue b/src/views/dataManage/deviceData/listGasData.vue
index 97cdfdb..e365ee9 100644
--- a/src/views/dataManage/deviceData/listGasData.vue
+++ b/src/views/dataManage/deviceData/listGasData.vue
@@ -63,6 +63,7 @@
 import { getGasData, batchExportGasData } from '@/api/data'
 import DeptSelect from '../../../components/DeptSelect/index'
 import { parseUrl } from '@/utils/parseutils'
+import { getDayTime } from '@/utils/dateutils'
 
 export default {
   name: 'ListGasData',
@@ -163,6 +164,9 @@
       if (params && params.deviceType === '4' && params.devcode) {
         this.listQuery.keywords = params.devcode
       }
+      const defaultBeginTime = getDayTime(new Date().getTime() - 24 * 7 * 60 * 60 * 1000).Format('yyyy-MM-dd hh:mm:ss')
+      const defaultEndTime = new Date().Format('yyyy-MM-dd hh:mm:ss')
+      this.timeRange = [defaultBeginTime, defaultEndTime]
       this.fetchData()
     }
   },
diff --git a/src/views/dataManage/deviceData/listHarmfulData.vue b/src/views/dataManage/deviceData/listHarmfulData.vue
index e6a795c..d2398cf 100644
--- a/src/views/dataManage/deviceData/listHarmfulData.vue
+++ b/src/views/dataManage/deviceData/listHarmfulData.vue
@@ -63,6 +63,7 @@
 import { getHarmfulData, batchExportHarmfulData } from '@/api/data'
 import DeptSelect from '../../../components/DeptSelect/index'
 import { parseUrl } from '@/utils/parseutils'
+import { getDayTime } from '@/utils/dateutils'
 
 export default {
   name: 'ListHarmfulData',
@@ -176,6 +177,9 @@
       if (params && params.deviceType === '3' && params.devcode) {
         this.listQuery.keywords = params.devcode
       }
+      const defaultBeginTime = getDayTime(new Date().getTime() - 24 * 7 * 60 * 60 * 1000).Format('yyyy-MM-dd hh:mm:ss')
+      const defaultEndTime = new Date().Format('yyyy-MM-dd hh:mm:ss')
+      this.timeRange = [defaultBeginTime, defaultEndTime]
       this.fetchData()
     }
   },
diff --git a/src/views/dataManage/deviceData/listLiquidData.vue b/src/views/dataManage/deviceData/listLiquidData.vue
index 709e3a8..dea0ba5 100644
--- a/src/views/dataManage/deviceData/listLiquidData.vue
+++ b/src/views/dataManage/deviceData/listLiquidData.vue
@@ -63,6 +63,7 @@
 import { getLiquidData, batchExportLiquidData } from '@/api/data'
 import DeptSelect from '../../../components/DeptSelect/index'
 import { parseUrl } from '@/utils/parseutils'
+import { getDayTime } from '@/utils/dateutils'
 
 export default {
   name: 'ListLiquidData',
@@ -158,6 +159,9 @@
       if (params && params.deviceType === '2' && params.devcode) {
         this.listQuery.keywords = params.devcode
       }
+      const defaultBeginTime = getDayTime(new Date().getTime() - 24 * 7 * 60 * 60 * 1000).Format('yyyy-MM-dd hh:mm:ss')
+      const defaultEndTime = new Date().Format('yyyy-MM-dd hh:mm:ss')
+      this.timeRange = [defaultBeginTime, defaultEndTime]
       this.fetchData()
     }
   },
diff --git a/src/views/dataManage/deviceData/listLiquidGasData.vue b/src/views/dataManage/deviceData/listLiquidGasData.vue
new file mode 100644
index 0000000..9ba38ed
--- /dev/null
+++ b/src/views/dataManage/deviceData/listLiquidGasData.vue
@@ -0,0 +1,413 @@
+<!--液位燃气一体化设备数列表-->
+<template>
+  <div class="app-container">
+    <!--筛选条件-->
+    <div class="search-div">
+      <el-form ref="selectForm" :inline="true" :model="listQuery" class="form-container">
+        <el-row>
+          <el-form-item class="selectForm-container-item" prop="keywords">
+            <el-input v-model.trim="listQuery.keywords" placeholder="井编号/设备编号" clearable/>
+          </el-form-item>
+          <el-form-item class="selectForm-container-item">
+            <dept-select v-model="listQuery.deptid" :need-top="deptShowTop" dept-type="03" placeholder="选择权属单位/使用单位"/>
+          </el-form-item>
+          <el-form-item class="selectForm-container-item">
+            <el-select v-model="listQuery.sensorType" placeholder="请选择传感器类型">
+              <el-option label="液位" value="liquid"/>
+              <el-option label="燃气" value="gas"/>
+            </el-select>
+          </el-form-item>
+          <el-form-item class="selectForm-container-item" prop="beginTime">
+            <el-date-picker
+              v-model="timeRange"
+              type="datetimerange"
+              range-separator="至"
+              value-format="yyyy-MM-dd HH:mm:ss"
+              start-placeholder="开始时间"
+              end-placeholder="结束时间"/>
+          </el-form-item>
+          <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
+        </el-row>
+      </el-form>
+    </div>
+    <!--查询结果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('/liquidGasData/export')" :disabled="list.length === 0" class="edit_btn" size="small" @click="batchExport">导出记录</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">
+            <span v-if="column.checkCell" :class="checkCell(scope.row.cell)">{{ scope.row[column.value] }}</span>
+            <span v-else-if="column.unitFilter">{{ scope.row[column.value]|unit }}</span>
+            <span v-else>{{ scope.row[column.value] }}</span>
+          </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>
+  </div>
+</template>
+
+<script>
+import selectTree from '@/components/SelectTree/singleSelect'
+import { getLiquidGasData, batchExportLiquidGasData } from '@/api/data'
+import DeptSelect from '../../../components/DeptSelect/index'
+import { parseUrl } from '@/utils/parseutils'
+import { getDayTime } from '@/utils/dateutils'
+
+export default {
+  name: 'ListLiquidGasData',
+  components: { DeptSelect, selectTree },
+  filters: {
+    // 燃气浓度单位换算：小于20时单位为%LEL，大于20后，先除以20，加%VOL
+    unit: function(value) {
+      if (value <= 20) {
+        return value + '%LEL'
+      } else {
+        return (value / 20.0).toFixed(2) + '%VOL'
+      }
+    }
+  },
+  data() {
+    return {
+      listQuery: {
+        keywords: '', // 关键字
+        deptid: '', // 部门id
+        sensorType: 'gas', // 传感器类型
+        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: 'data',
+          align: 'center',
+          unitFilter: true
+        },
+        {
+          text: '电量(%)',
+          value: 'cell',
+          width: 80,
+          align: 'center',
+          checkCell: true
+        },
+        {
+          text: '权属单位',
+          value: 'companyName',
+          align: 'center'
+        },
+        {
+          text: '使用单位',
+          value: 'deptName',
+          align: 'center'
+        },
+        {
+          text: '上传时间',
+          value: 'uptime',
+          width: 170,
+          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, // 是否显示编辑框
+      deptShowTop: false
+    }
+  },
+  watch: {
+    timeRange(val) {
+      if (val && val.length > 0) {
+        this.listQuery.beginTime = val[0]
+        this.listQuery.endTime = val[1]
+      } else {
+        this.listQuery.beginTime = ''
+        this.listQuery.endTime = ''
+      }
+    }
+  },
+  created() {
+    // 如果路径里带参数，解析devcode参数
+    if (window.location.href) {
+      const params = parseUrl(window.location.href)
+      if (params && params.deviceType === '10' && params.devcode) {
+        this.listQuery.keywords = params.devcode
+      }
+      const defaultBeginTime = getDayTime(new Date().getTime() - 24 * 7 * 60 * 60 * 1000).Format('yyyy-MM-dd hh:mm:ss')
+      const defaultEndTime = new Date().Format('yyyy-MM-dd hh:mm:ss')
+      this.timeRange = [defaultBeginTime, defaultEndTime]
+      this.fetchData()
+    }
+  },
+  activated() {
+    // 要是路由里有参数
+    if (this.$route.query && this.$route.query.devcode) {
+      this.listQuery.keywords = this.$route.query.devcode
+      const defaultBeginTime = getDayTime(new Date().getTime() - 24 * 7 * 60 * 60 * 1000).Format('yyyy-MM-dd hh:mm:ss')
+      const defaultEndTime = new Date().Format('yyyy-MM-dd hh:mm:ss')
+      this.timeRange = [defaultBeginTime, defaultEndTime]
+      this.fetchData(false)// 获取数据
+    } else {
+      // if (this.timeRange.length === 0) {
+      const defaultBeginTime = getDayTime(new Date().getTime() - 24 * 7 * 60 * 60 * 1000).Format('yyyy-MM-dd hh:mm:ss')
+      const defaultEndTime = new Date().Format('yyyy-MM-dd hh:mm:ss')
+      this.timeRange = [defaultBeginTime, defaultEndTime]
+      // }
+      this.fetchData()
+    }
+  },
+  methods: {
+    // 批量导出
+    batchExport() {
+      console.log('批量导出液位配置')
+      // 全屏加载动画
+      const loading = this.$loading({
+        lock: true,
+        text: '数据处理中,请稍后...',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
+      })
+      batchExportLiquidGasData(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
+        if (this.listQuery.sensorType === 'liquid') {
+          downloadElement.download = `燃气智能终端（一体化）数据-液位.xlsx` // 下载后文件名
+        } else {
+          downloadElement.download = `燃气智能终端（一体化）数据-燃气.xlsx` // 下载后文件名
+        }
+        document.body.appendChild(downloadElement)
+        downloadElement.click() // 点击下载
+        document.body.removeChild(downloadElement) // 下载完成移除元素
+        window.URL.revokeObjectURL(href) // 释放blob对象
+      }).catch((res) => {
+        loading.close()
+      })
+    },
+    // 查询数据
+    search() {
+      // 判断查询类型并更新columns
+      if (this.listQuery.sensorType === 'liquid') {
+        this.columns = [
+          {
+            text: '设备编号',
+            value: 'devcode',
+            align: 'center'
+          },
+          {
+            text: '井编号',
+            value: 'wellCode',
+            align: 'center'
+          },
+          {
+            text: '设备类型',
+            value: 'deviceTypeName',
+            align: 'center'
+          },
+          {
+            text: '液位值(m)',
+            value: 'data',
+            align: 'center'
+          },
+          {
+            text: '电量(%)',
+            value: 'cell',
+            width: 80,
+            align: 'center',
+            checkCell: true
+          },
+          {
+            text: '权属单位',
+            value: 'companyName',
+            align: 'center'
+          },
+          {
+            text: '使用单位',
+            value: 'deptName',
+            align: 'center'
+          },
+          {
+            text: '上传时间',
+            value: 'uptime',
+            width: 170,
+            align: 'center'
+          }
+        ]// 显示列
+      } else {
+        this.columns = [
+          {
+            text: '设备编号',
+            value: 'devcode',
+            align: 'center'
+          },
+          {
+            text: '井编号',
+            value: 'wellCode',
+            align: 'center'
+          },
+          {
+            text: '设备类型',
+            value: 'deviceTypeName',
+            align: 'center'
+          },
+          {
+            text: '燃气浓度',
+            value: 'data',
+            align: 'center',
+            unitFilter: true
+          },
+          {
+            text: '电量(%)',
+            value: 'cell',
+            width: 80,
+            align: 'center',
+            checkCell: true
+          },
+          {
+            text: '权属单位',
+            value: 'companyName',
+            align: 'center'
+          },
+          {
+            text: '使用单位',
+            value: 'deptName',
+            align: 'center'
+          },
+          {
+            text: '上传时间',
+            value: 'uptime',
+            width: 170,
+            align: 'center'
+          }
+        ]
+      }
+      this.list = []
+      this.fetchData(false)
+    },
+    // 获取液位配置数据
+    fetchData(isNowPage = true) {
+      this.listLoading = true
+      if (!isNowPage) { // 是否显示当前页，否则跳转第一页
+        this.listQuery.offset = 1
+      }
+      getLiquidGasData(this.listQuery).then(response => {
+        this.list = response.data.rows
+        this.total = parseInt(response.data.total)
+        this.listLoading = false
+      })
+    },
+    checkCell(value) {
+      var cell = parseFloat(value)
+      if (cell < 10) {
+        return 'warning-state'
+      }
+    },
+    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
+    }
+  }
+  .warning-state{
+    color:red
+  }
+</style>
diff --git a/src/views/dataManage/deviceData/listNoiseData.vue b/src/views/dataManage/deviceData/listNoiseData.vue
index fd909d9..e42b4cf 100644
--- a/src/views/dataManage/deviceData/listNoiseData.vue
+++ b/src/views/dataManage/deviceData/listNoiseData.vue
@@ -63,6 +63,7 @@
 import { getNoiseData, batchExportNoiseData } from '@/api/data'
 import DeptSelect from '../../../components/DeptSelect/index'
 import { parseUrl } from '@/utils/parseutils'
+import { getDayTime } from '@/utils/dateutils'
 
 export default {
   name: 'ListNoiseData',
@@ -165,6 +166,9 @@
       if (params && params.deviceType === '6' && params.devcode) {
         this.listQuery.keywords = params.devcode
       }
+      const defaultBeginTime = getDayTime(new Date().getTime() - 24 * 7 * 60 * 60 * 1000).Format('yyyy-MM-dd hh:mm:ss')
+      const defaultEndTime = new Date().Format('yyyy-MM-dd hh:mm:ss')
+      this.timeRange = [defaultBeginTime, defaultEndTime]
       this.fetchData()
     }
   },
diff --git a/src/views/dataManage/deviceData/listTempData.vue b/src/views/dataManage/deviceData/listTempData.vue
index 2fead0e..8bbb92f 100644
--- a/src/views/dataManage/deviceData/listTempData.vue
+++ b/src/views/dataManage/deviceData/listTempData.vue
@@ -63,6 +63,7 @@
 import { getTempData, batchExportTempData } from '@/api/data'
 import DeptSelect from '../../../components/DeptSelect/index'
 import { parseUrl } from '@/utils/parseutils'
+import { getDayTime } from '@/utils/dateutils'
 
 export default {
   name: 'ListTempData',
@@ -162,6 +163,9 @@
       const params = parseUrl(window.location.href)
       if (params && params.deviceType === '5' && params.devcode) {
         this.listQuery.keywords = params.devcode
+        const defaultBeginTime = getDayTime(new Date().getTime() - 24 * 7 * 60 * 60 * 1000).Format('yyyy-MM-dd hh:mm:ss')
+        const defaultEndTime = new Date().Format('yyyy-MM-dd hh:mm:ss')
+        this.timeRange = [defaultBeginTime, defaultEndTime]
       }
       this.fetchData()
     }
diff --git a/src/views/dataManage/deviceData/listWellCoverData.vue b/src/views/dataManage/deviceData/listWellCoverData.vue
index 4ef378c..e286794 100644
--- a/src/views/dataManage/deviceData/listWellCoverData.vue
+++ b/src/views/dataManage/deviceData/listWellCoverData.vue
@@ -63,6 +63,7 @@
 import { getWellData, batchExportWellData } from '@/api/data'
 import DeptSelect from '../../../components/DeptSelect/index'
 import { parseUrl } from '@/utils/parseutils'
+import { getDayTime } from '@/utils/dateutils'
 
 export default {
   name: 'ListWellCoverData',
@@ -134,17 +135,6 @@
       deptShowTop: false
     }
   },
-  watch: {
-    timeRange(val) {
-      if (val && val.length > 0) {
-        this.listQuery.beginTime = val[0]
-        this.listQuery.endTime = val[1]
-      } else {
-        this.listQuery.beginTime = ''
-        this.listQuery.endTime = ''
-      }
-    }
-  },
   created() {
     // 如果路径里带参数，解析devcode参数
     if (window.location.href) {
@@ -152,6 +142,9 @@
       if (params && params.deviceType === '1' && params.devcode) {
         this.listQuery.keywords = params.devcode
       }
+      const defaultBeginTime = getDayTime(new Date().getTime() - 24 * 7 * 60 * 60 * 1000).Format('yyyy-MM-dd hh:mm:ss')
+      const defaultEndTime = new Date().Format('yyyy-MM-dd hh:mm:ss')
+      this.timeRange = [defaultBeginTime, defaultEndTime]
       this.fetchData()
     }
   },
@@ -202,6 +195,13 @@
       if (!isNowPage) { // 是否显示当前页，否则跳转第一页
         this.listQuery.offset = 1
       }
+      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 = ''
+      }
       getWellData(this.listQuery).then(response => {
         this.list = response.data.rows
         this.total = parseInt(response.data.total)

diff --git a/src/api/data.js b/src/api/data.js
index afeee10..0353d91 100644
--- a/src/api/data.js
+++ b/src/api/data.js
@@ -66,6 +66,14 @@
     params
   })
 }
+// 液位燃气一体化设备数据查询
+export function getLiquidGasData(params) {
+  return request({
+    url: 'liquidGasData/list',
+    method: 'get',
+    params
+  })
+}
 
 // 批量导出井盖数据
 export function batchExportWellData(params) {
@@ -154,4 +162,23 @@
     responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
   })
 }
+// 批量导出液位燃气一体化设备数据
+export function batchExportLiquidGasData(params) {
+  return request({
+    url: '/liquidGasData/export',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 数据统计接口
+export function getStaticData(params) {
+  return request({
+    url: 'data/list',
+    method: 'get',
+    params
+  })
+}
 
diff --git a/src/api/liquidgasconfig.js b/src/api/liquidgasconfig.js
new file mode 100644
index 0000000..9d0fd6b
--- /dev/null
+++ b/src/api/liquidgasconfig.js
@@ -0,0 +1,42 @@
+/**
+ * 液位燃气一体化设备配置接口
+ */
+import request from '@/utils/request'
+// 燃气配置查询
+export function getLiquidGasConfigList(params) {
+  return request({
+    url: 'busConfig/liquidGasConfig/list',
+    method: 'get',
+    params
+  })
+}
+
+// 修改燃气配置
+export function editLiquidGasConfig(params) {
+  return request({
+    url: 'busConfig/liquidGasConfig/config',
+    method: 'post',
+    params
+  })
+}
+
+// 批量导入
+export function batchImportLiquidGasConfig(fileobj) {
+  const param = new FormData()
+  param.append('file', fileobj)
+  return request({
+    url: 'busConfig/gasLiquidConfig/batchImport',
+    method: 'post',
+    headers: { 'Content-Type': 'multipart/form-data' },
+    data: param
+  })
+}
+// 批量导出
+export function batchExportLiquidGasConfig(params) {
+  return request({
+    url: 'busConfig/liquidGasConfig/batchExport',
+    method: 'get',
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
diff --git a/src/views/dataManage/dataManage.vue b/src/views/dataManage/dataManage.vue
index a46b904..cdad03f 100644
--- a/src/views/dataManage/dataManage.vue
+++ b/src/views/dataManage/dataManage.vue
@@ -25,6 +25,9 @@
       <el-tab-pane v-if="hasPerm('/welllocadata/list')" label="井盖定位监测仪" name="wellloca">
         <list-well-loca-data ref="welllocadatacomp"/>
       </el-tab-pane>
+      <el-tab-pane v-if="hasPerm('/liquidGasData/list')" label="燃气智能终端(一体化)" name="liquidgas">
+        <list-liquid-gas-data ref="liquidgasdatacomp"/>
+      </el-tab-pane>
     </el-tabs>
   </div>
 </template>
@@ -37,13 +40,14 @@
 import ListHarmfulData from './deviceData/listHarmfulData'
 import ListTempData from './deviceData/listTempData'
 import ListWellLocaData from './deviceData/listWellLocaData'
+import ListLiquidGasData from './deviceData/listLiquidGasData'
 import { parseUrl } from '@/utils/parseutils'
 import { hasPermission } from '@/utils/permission'
 import ListNoiseData from './deviceData/listNoiseData'
 
 export default {
   name: 'DataManage',
-  components: { ListNoiseData, ListWellLocaData, ListTempData, ListHarmfulData, ListDigData, ListGasData, ListLiquidData, ListWellCoverData },
+  components: { ListNoiseData, ListWellLocaData, ListTempData, ListHarmfulData, ListDigData, ListGasData, ListLiquidData, ListWellCoverData, ListLiquidGasData },
   data() {
     return {
       activeName: 'wellcover'
@@ -86,6 +90,8 @@
         this.$refs.digdatacomp.fetchData()
       } else if (tab.name === 'wellloca') {
         this.$refs.welllocadatacomp.fetchData()
+      } else if (tab.name === 'liquidgas') {
+        this.$refs.liquidgasdatacomp.fetchData()
       }
     },
     changeTab(deviceType) {
@@ -105,6 +111,8 @@
         this.activeName = 'wellloca'
       } else if (deviceType === '8') {
         this.activeName = 'noise'
+      } else if (deviceType === '10') {
+        this.activeName = 'liquidgas'
       }
     },
     // 计算那个是当前第一个tab
@@ -125,6 +133,8 @@
         this.activeName = 'wellloca'
       } else if (hasPermission('/noisedata/list')) {
         this.activeName = 'noise'
+      } else if (hasPermission('/liquidGasData/list')) {
+        this.activeName = 'liquidgas'
       }
     }
   }
diff --git a/src/views/dataManage/deviceData/listDigData.vue b/src/views/dataManage/deviceData/listDigData.vue
index 775af19..5308300 100644
--- a/src/views/dataManage/deviceData/listDigData.vue
+++ b/src/views/dataManage/deviceData/listDigData.vue
@@ -63,6 +63,7 @@
 import { getDigData, batchExportDigData } from '@/api/data'
 import DeptSelect from '../../../components/DeptSelect/index'
 import { parseUrl } from '@/utils/parseutils'
+import { getDayTime } from '@/utils/dateutils'
 
 export default {
   name: 'ListDigData',
@@ -165,6 +166,9 @@
       if (params && params.deviceType === '6' && params.devcode) {
         this.listQuery.keywords = params.devcode
       }
+      const defaultBeginTime = getDayTime(new Date().getTime() - 24 * 7 * 60 * 60 * 1000).Format('yyyy-MM-dd hh:mm:ss')
+      const defaultEndTime = new Date().Format('yyyy-MM-dd hh:mm:ss')
+      this.timeRange = [defaultBeginTime, defaultEndTime]
       this.fetchData()
     }
   },
diff --git a/src/views/dataManage/deviceData/listGasData.vue b/src/views/dataManage/deviceData/listGasData.vue
index 97cdfdb..e365ee9 100644
--- a/src/views/dataManage/deviceData/listGasData.vue
+++ b/src/views/dataManage/deviceData/listGasData.vue
@@ -63,6 +63,7 @@
 import { getGasData, batchExportGasData } from '@/api/data'
 import DeptSelect from '../../../components/DeptSelect/index'
 import { parseUrl } from '@/utils/parseutils'
+import { getDayTime } from '@/utils/dateutils'
 
 export default {
   name: 'ListGasData',
@@ -163,6 +164,9 @@
       if (params && params.deviceType === '4' && params.devcode) {
         this.listQuery.keywords = params.devcode
       }
+      const defaultBeginTime = getDayTime(new Date().getTime() - 24 * 7 * 60 * 60 * 1000).Format('yyyy-MM-dd hh:mm:ss')
+      const defaultEndTime = new Date().Format('yyyy-MM-dd hh:mm:ss')
+      this.timeRange = [defaultBeginTime, defaultEndTime]
       this.fetchData()
     }
   },
diff --git a/src/views/dataManage/deviceData/listHarmfulData.vue b/src/views/dataManage/deviceData/listHarmfulData.vue
index e6a795c..d2398cf 100644
--- a/src/views/dataManage/deviceData/listHarmfulData.vue
+++ b/src/views/dataManage/deviceData/listHarmfulData.vue
@@ -63,6 +63,7 @@
 import { getHarmfulData, batchExportHarmfulData } from '@/api/data'
 import DeptSelect from '../../../components/DeptSelect/index'
 import { parseUrl } from '@/utils/parseutils'
+import { getDayTime } from '@/utils/dateutils'
 
 export default {
   name: 'ListHarmfulData',
@@ -176,6 +177,9 @@
       if (params && params.deviceType === '3' && params.devcode) {
         this.listQuery.keywords = params.devcode
       }
+      const defaultBeginTime = getDayTime(new Date().getTime() - 24 * 7 * 60 * 60 * 1000).Format('yyyy-MM-dd hh:mm:ss')
+      const defaultEndTime = new Date().Format('yyyy-MM-dd hh:mm:ss')
+      this.timeRange = [defaultBeginTime, defaultEndTime]
       this.fetchData()
     }
   },
diff --git a/src/views/dataManage/deviceData/listLiquidData.vue b/src/views/dataManage/deviceData/listLiquidData.vue
index 709e3a8..dea0ba5 100644
--- a/src/views/dataManage/deviceData/listLiquidData.vue
+++ b/src/views/dataManage/deviceData/listLiquidData.vue
@@ -63,6 +63,7 @@
 import { getLiquidData, batchExportLiquidData } from '@/api/data'
 import DeptSelect from '../../../components/DeptSelect/index'
 import { parseUrl } from '@/utils/parseutils'
+import { getDayTime } from '@/utils/dateutils'
 
 export default {
   name: 'ListLiquidData',
@@ -158,6 +159,9 @@
       if (params && params.deviceType === '2' && params.devcode) {
         this.listQuery.keywords = params.devcode
       }
+      const defaultBeginTime = getDayTime(new Date().getTime() - 24 * 7 * 60 * 60 * 1000).Format('yyyy-MM-dd hh:mm:ss')
+      const defaultEndTime = new Date().Format('yyyy-MM-dd hh:mm:ss')
+      this.timeRange = [defaultBeginTime, defaultEndTime]
       this.fetchData()
     }
   },
diff --git a/src/views/dataManage/deviceData/listLiquidGasData.vue b/src/views/dataManage/deviceData/listLiquidGasData.vue
new file mode 100644
index 0000000..9ba38ed
--- /dev/null
+++ b/src/views/dataManage/deviceData/listLiquidGasData.vue
@@ -0,0 +1,413 @@
+<!--液位燃气一体化设备数列表-->
+<template>
+  <div class="app-container">
+    <!--筛选条件-->
+    <div class="search-div">
+      <el-form ref="selectForm" :inline="true" :model="listQuery" class="form-container">
+        <el-row>
+          <el-form-item class="selectForm-container-item" prop="keywords">
+            <el-input v-model.trim="listQuery.keywords" placeholder="井编号/设备编号" clearable/>
+          </el-form-item>
+          <el-form-item class="selectForm-container-item">
+            <dept-select v-model="listQuery.deptid" :need-top="deptShowTop" dept-type="03" placeholder="选择权属单位/使用单位"/>
+          </el-form-item>
+          <el-form-item class="selectForm-container-item">
+            <el-select v-model="listQuery.sensorType" placeholder="请选择传感器类型">
+              <el-option label="液位" value="liquid"/>
+              <el-option label="燃气" value="gas"/>
+            </el-select>
+          </el-form-item>
+          <el-form-item class="selectForm-container-item" prop="beginTime">
+            <el-date-picker
+              v-model="timeRange"
+              type="datetimerange"
+              range-separator="至"
+              value-format="yyyy-MM-dd HH:mm:ss"
+              start-placeholder="开始时间"
+              end-placeholder="结束时间"/>
+          </el-form-item>
+          <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
+        </el-row>
+      </el-form>
+    </div>
+    <!--查询结果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('/liquidGasData/export')" :disabled="list.length === 0" class="edit_btn" size="small" @click="batchExport">导出记录</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">
+            <span v-if="column.checkCell" :class="checkCell(scope.row.cell)">{{ scope.row[column.value] }}</span>
+            <span v-else-if="column.unitFilter">{{ scope.row[column.value]|unit }}</span>
+            <span v-else>{{ scope.row[column.value] }}</span>
+          </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>
+  </div>
+</template>
+
+<script>
+import selectTree from '@/components/SelectTree/singleSelect'
+import { getLiquidGasData, batchExportLiquidGasData } from '@/api/data'
+import DeptSelect from '../../../components/DeptSelect/index'
+import { parseUrl } from '@/utils/parseutils'
+import { getDayTime } from '@/utils/dateutils'
+
+export default {
+  name: 'ListLiquidGasData',
+  components: { DeptSelect, selectTree },
+  filters: {
+    // 燃气浓度单位换算：小于20时单位为%LEL，大于20后，先除以20，加%VOL
+    unit: function(value) {
+      if (value <= 20) {
+        return value + '%LEL'
+      } else {
+        return (value / 20.0).toFixed(2) + '%VOL'
+      }
+    }
+  },
+  data() {
+    return {
+      listQuery: {
+        keywords: '', // 关键字
+        deptid: '', // 部门id
+        sensorType: 'gas', // 传感器类型
+        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: 'data',
+          align: 'center',
+          unitFilter: true
+        },
+        {
+          text: '电量(%)',
+          value: 'cell',
+          width: 80,
+          align: 'center',
+          checkCell: true
+        },
+        {
+          text: '权属单位',
+          value: 'companyName',
+          align: 'center'
+        },
+        {
+          text: '使用单位',
+          value: 'deptName',
+          align: 'center'
+        },
+        {
+          text: '上传时间',
+          value: 'uptime',
+          width: 170,
+          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, // 是否显示编辑框
+      deptShowTop: false
+    }
+  },
+  watch: {
+    timeRange(val) {
+      if (val && val.length > 0) {
+        this.listQuery.beginTime = val[0]
+        this.listQuery.endTime = val[1]
+      } else {
+        this.listQuery.beginTime = ''
+        this.listQuery.endTime = ''
+      }
+    }
+  },
+  created() {
+    // 如果路径里带参数，解析devcode参数
+    if (window.location.href) {
+      const params = parseUrl(window.location.href)
+      if (params && params.deviceType === '10' && params.devcode) {
+        this.listQuery.keywords = params.devcode
+      }
+      const defaultBeginTime = getDayTime(new Date().getTime() - 24 * 7 * 60 * 60 * 1000).Format('yyyy-MM-dd hh:mm:ss')
+      const defaultEndTime = new Date().Format('yyyy-MM-dd hh:mm:ss')
+      this.timeRange = [defaultBeginTime, defaultEndTime]
+      this.fetchData()
+    }
+  },
+  activated() {
+    // 要是路由里有参数
+    if (this.$route.query && this.$route.query.devcode) {
+      this.listQuery.keywords = this.$route.query.devcode
+      const defaultBeginTime = getDayTime(new Date().getTime() - 24 * 7 * 60 * 60 * 1000).Format('yyyy-MM-dd hh:mm:ss')
+      const defaultEndTime = new Date().Format('yyyy-MM-dd hh:mm:ss')
+      this.timeRange = [defaultBeginTime, defaultEndTime]
+      this.fetchData(false)// 获取数据
+    } else {
+      // if (this.timeRange.length === 0) {
+      const defaultBeginTime = getDayTime(new Date().getTime() - 24 * 7 * 60 * 60 * 1000).Format('yyyy-MM-dd hh:mm:ss')
+      const defaultEndTime = new Date().Format('yyyy-MM-dd hh:mm:ss')
+      this.timeRange = [defaultBeginTime, defaultEndTime]
+      // }
+      this.fetchData()
+    }
+  },
+  methods: {
+    // 批量导出
+    batchExport() {
+      console.log('批量导出液位配置')
+      // 全屏加载动画
+      const loading = this.$loading({
+        lock: true,
+        text: '数据处理中,请稍后...',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
+      })
+      batchExportLiquidGasData(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
+        if (this.listQuery.sensorType === 'liquid') {
+          downloadElement.download = `燃气智能终端（一体化）数据-液位.xlsx` // 下载后文件名
+        } else {
+          downloadElement.download = `燃气智能终端（一体化）数据-燃气.xlsx` // 下载后文件名
+        }
+        document.body.appendChild(downloadElement)
+        downloadElement.click() // 点击下载
+        document.body.removeChild(downloadElement) // 下载完成移除元素
+        window.URL.revokeObjectURL(href) // 释放blob对象
+      }).catch((res) => {
+        loading.close()
+      })
+    },
+    // 查询数据
+    search() {
+      // 判断查询类型并更新columns
+      if (this.listQuery.sensorType === 'liquid') {
+        this.columns = [
+          {
+            text: '设备编号',
+            value: 'devcode',
+            align: 'center'
+          },
+          {
+            text: '井编号',
+            value: 'wellCode',
+            align: 'center'
+          },
+          {
+            text: '设备类型',
+            value: 'deviceTypeName',
+            align: 'center'
+          },
+          {
+            text: '液位值(m)',
+            value: 'data',
+            align: 'center'
+          },
+          {
+            text: '电量(%)',
+            value: 'cell',
+            width: 80,
+            align: 'center',
+            checkCell: true
+          },
+          {
+            text: '权属单位',
+            value: 'companyName',
+            align: 'center'
+          },
+          {
+            text: '使用单位',
+            value: 'deptName',
+            align: 'center'
+          },
+          {
+            text: '上传时间',
+            value: 'uptime',
+            width: 170,
+            align: 'center'
+          }
+        ]// 显示列
+      } else {
+        this.columns = [
+          {
+            text: '设备编号',
+            value: 'devcode',
+            align: 'center'
+          },
+          {
+            text: '井编号',
+            value: 'wellCode',
+            align: 'center'
+          },
+          {
+            text: '设备类型',
+            value: 'deviceTypeName',
+            align: 'center'
+          },
+          {
+            text: '燃气浓度',
+            value: 'data',
+            align: 'center',
+            unitFilter: true
+          },
+          {
+            text: '电量(%)',
+            value: 'cell',
+            width: 80,
+            align: 'center',
+            checkCell: true
+          },
+          {
+            text: '权属单位',
+            value: 'companyName',
+            align: 'center'
+          },
+          {
+            text: '使用单位',
+            value: 'deptName',
+            align: 'center'
+          },
+          {
+            text: '上传时间',
+            value: 'uptime',
+            width: 170,
+            align: 'center'
+          }
+        ]
+      }
+      this.list = []
+      this.fetchData(false)
+    },
+    // 获取液位配置数据
+    fetchData(isNowPage = true) {
+      this.listLoading = true
+      if (!isNowPage) { // 是否显示当前页，否则跳转第一页
+        this.listQuery.offset = 1
+      }
+      getLiquidGasData(this.listQuery).then(response => {
+        this.list = response.data.rows
+        this.total = parseInt(response.data.total)
+        this.listLoading = false
+      })
+    },
+    checkCell(value) {
+      var cell = parseFloat(value)
+      if (cell < 10) {
+        return 'warning-state'
+      }
+    },
+    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
+    }
+  }
+  .warning-state{
+    color:red
+  }
+</style>
diff --git a/src/views/dataManage/deviceData/listNoiseData.vue b/src/views/dataManage/deviceData/listNoiseData.vue
index fd909d9..e42b4cf 100644
--- a/src/views/dataManage/deviceData/listNoiseData.vue
+++ b/src/views/dataManage/deviceData/listNoiseData.vue
@@ -63,6 +63,7 @@
 import { getNoiseData, batchExportNoiseData } from '@/api/data'
 import DeptSelect from '../../../components/DeptSelect/index'
 import { parseUrl } from '@/utils/parseutils'
+import { getDayTime } from '@/utils/dateutils'
 
 export default {
   name: 'ListNoiseData',
@@ -165,6 +166,9 @@
       if (params && params.deviceType === '6' && params.devcode) {
         this.listQuery.keywords = params.devcode
       }
+      const defaultBeginTime = getDayTime(new Date().getTime() - 24 * 7 * 60 * 60 * 1000).Format('yyyy-MM-dd hh:mm:ss')
+      const defaultEndTime = new Date().Format('yyyy-MM-dd hh:mm:ss')
+      this.timeRange = [defaultBeginTime, defaultEndTime]
       this.fetchData()
     }
   },
diff --git a/src/views/dataManage/deviceData/listTempData.vue b/src/views/dataManage/deviceData/listTempData.vue
index 2fead0e..8bbb92f 100644
--- a/src/views/dataManage/deviceData/listTempData.vue
+++ b/src/views/dataManage/deviceData/listTempData.vue
@@ -63,6 +63,7 @@
 import { getTempData, batchExportTempData } from '@/api/data'
 import DeptSelect from '../../../components/DeptSelect/index'
 import { parseUrl } from '@/utils/parseutils'
+import { getDayTime } from '@/utils/dateutils'
 
 export default {
   name: 'ListTempData',
@@ -162,6 +163,9 @@
       const params = parseUrl(window.location.href)
       if (params && params.deviceType === '5' && params.devcode) {
         this.listQuery.keywords = params.devcode
+        const defaultBeginTime = getDayTime(new Date().getTime() - 24 * 7 * 60 * 60 * 1000).Format('yyyy-MM-dd hh:mm:ss')
+        const defaultEndTime = new Date().Format('yyyy-MM-dd hh:mm:ss')
+        this.timeRange = [defaultBeginTime, defaultEndTime]
       }
       this.fetchData()
     }
diff --git a/src/views/dataManage/deviceData/listWellCoverData.vue b/src/views/dataManage/deviceData/listWellCoverData.vue
index 4ef378c..e286794 100644
--- a/src/views/dataManage/deviceData/listWellCoverData.vue
+++ b/src/views/dataManage/deviceData/listWellCoverData.vue
@@ -63,6 +63,7 @@
 import { getWellData, batchExportWellData } from '@/api/data'
 import DeptSelect from '../../../components/DeptSelect/index'
 import { parseUrl } from '@/utils/parseutils'
+import { getDayTime } from '@/utils/dateutils'
 
 export default {
   name: 'ListWellCoverData',
@@ -134,17 +135,6 @@
       deptShowTop: false
     }
   },
-  watch: {
-    timeRange(val) {
-      if (val && val.length > 0) {
-        this.listQuery.beginTime = val[0]
-        this.listQuery.endTime = val[1]
-      } else {
-        this.listQuery.beginTime = ''
-        this.listQuery.endTime = ''
-      }
-    }
-  },
   created() {
     // 如果路径里带参数，解析devcode参数
     if (window.location.href) {
@@ -152,6 +142,9 @@
       if (params && params.deviceType === '1' && params.devcode) {
         this.listQuery.keywords = params.devcode
       }
+      const defaultBeginTime = getDayTime(new Date().getTime() - 24 * 7 * 60 * 60 * 1000).Format('yyyy-MM-dd hh:mm:ss')
+      const defaultEndTime = new Date().Format('yyyy-MM-dd hh:mm:ss')
+      this.timeRange = [defaultBeginTime, defaultEndTime]
       this.fetchData()
     }
   },
@@ -202,6 +195,13 @@
       if (!isNowPage) { // 是否显示当前页，否则跳转第一页
         this.listQuery.offset = 1
       }
+      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 = ''
+      }
       getWellData(this.listQuery).then(response => {
         this.list = response.data.rows
         this.total = parseInt(response.data.total)
diff --git a/src/views/dataManage/deviceData/listWellLocaData.vue b/src/views/dataManage/deviceData/listWellLocaData.vue
index 45cf40b..a4bdd6a 100644
--- a/src/views/dataManage/deviceData/listWellLocaData.vue
+++ b/src/views/dataManage/deviceData/listWellLocaData.vue
@@ -63,6 +63,7 @@
 import { getWellLocaData, batchExportWellLocaData } from '@/api/data'
 import DeptSelect from '../../../components/DeptSelect/index'
 import { parseUrl } from '@/utils/parseutils'
+import { getDayTime } from '@/utils/dateutils'
 
 export default {
   name: 'ListWellLocaData',
@@ -156,6 +157,9 @@
       if (params && params.deviceType === '7' && params.devcode) {
         this.listQuery.keywords = params.devcode
       }
+      const defaultBeginTime = getDayTime(new Date().getTime() - 24 * 7 * 60 * 60 * 1000).Format('yyyy-MM-dd hh:mm:ss')
+      const defaultEndTime = new Date().Format('yyyy-MM-dd hh:mm:ss')
+      this.timeRange = [defaultBeginTime, defaultEndTime]
       this.fetchData()
     }
   },

diff --git a/src/api/data.js b/src/api/data.js
index afeee10..0353d91 100644
--- a/src/api/data.js
+++ b/src/api/data.js
@@ -66,6 +66,14 @@
     params
   })
 }
+// 液位燃气一体化设备数据查询
+export function getLiquidGasData(params) {
+  return request({
+    url: 'liquidGasData/list',
+    method: 'get',
+    params
+  })
+}
 
 // 批量导出井盖数据
 export function batchExportWellData(params) {
@@ -154,4 +162,23 @@
     responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
   })
 }
+// 批量导出液位燃气一体化设备数据
+export function batchExportLiquidGasData(params) {
+  return request({
+    url: '/liquidGasData/export',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 数据统计接口
+export function getStaticData(params) {
+  return request({
+    url: 'data/list',
+    method: 'get',
+    params
+  })
+}
 
diff --git a/src/api/liquidgasconfig.js b/src/api/liquidgasconfig.js
new file mode 100644
index 0000000..9d0fd6b
--- /dev/null
+++ b/src/api/liquidgasconfig.js
@@ -0,0 +1,42 @@
+/**
+ * 液位燃气一体化设备配置接口
+ */
+import request from '@/utils/request'
+// 燃气配置查询
+export function getLiquidGasConfigList(params) {
+  return request({
+    url: 'busConfig/liquidGasConfig/list',
+    method: 'get',
+    params
+  })
+}
+
+// 修改燃气配置
+export function editLiquidGasConfig(params) {
+  return request({
+    url: 'busConfig/liquidGasConfig/config',
+    method: 'post',
+    params
+  })
+}
+
+// 批量导入
+export function batchImportLiquidGasConfig(fileobj) {
+  const param = new FormData()
+  param.append('file', fileobj)
+  return request({
+    url: 'busConfig/gasLiquidConfig/batchImport',
+    method: 'post',
+    headers: { 'Content-Type': 'multipart/form-data' },
+    data: param
+  })
+}
+// 批量导出
+export function batchExportLiquidGasConfig(params) {
+  return request({
+    url: 'busConfig/liquidGasConfig/batchExport',
+    method: 'get',
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
diff --git a/src/views/dataManage/dataManage.vue b/src/views/dataManage/dataManage.vue
index a46b904..cdad03f 100644
--- a/src/views/dataManage/dataManage.vue
+++ b/src/views/dataManage/dataManage.vue
@@ -25,6 +25,9 @@
       <el-tab-pane v-if="hasPerm('/welllocadata/list')" label="井盖定位监测仪" name="wellloca">
         <list-well-loca-data ref="welllocadatacomp"/>
       </el-tab-pane>
+      <el-tab-pane v-if="hasPerm('/liquidGasData/list')" label="燃气智能终端(一体化)" name="liquidgas">
+        <list-liquid-gas-data ref="liquidgasdatacomp"/>
+      </el-tab-pane>
     </el-tabs>
   </div>
 </template>
@@ -37,13 +40,14 @@
 import ListHarmfulData from './deviceData/listHarmfulData'
 import ListTempData from './deviceData/listTempData'
 import ListWellLocaData from './deviceData/listWellLocaData'
+import ListLiquidGasData from './deviceData/listLiquidGasData'
 import { parseUrl } from '@/utils/parseutils'
 import { hasPermission } from '@/utils/permission'
 import ListNoiseData from './deviceData/listNoiseData'
 
 export default {
   name: 'DataManage',
-  components: { ListNoiseData, ListWellLocaData, ListTempData, ListHarmfulData, ListDigData, ListGasData, ListLiquidData, ListWellCoverData },
+  components: { ListNoiseData, ListWellLocaData, ListTempData, ListHarmfulData, ListDigData, ListGasData, ListLiquidData, ListWellCoverData, ListLiquidGasData },
   data() {
     return {
       activeName: 'wellcover'
@@ -86,6 +90,8 @@
         this.$refs.digdatacomp.fetchData()
       } else if (tab.name === 'wellloca') {
         this.$refs.welllocadatacomp.fetchData()
+      } else if (tab.name === 'liquidgas') {
+        this.$refs.liquidgasdatacomp.fetchData()
       }
     },
     changeTab(deviceType) {
@@ -105,6 +111,8 @@
         this.activeName = 'wellloca'
       } else if (deviceType === '8') {
         this.activeName = 'noise'
+      } else if (deviceType === '10') {
+        this.activeName = 'liquidgas'
       }
     },
     // 计算那个是当前第一个tab
@@ -125,6 +133,8 @@
         this.activeName = 'wellloca'
       } else if (hasPermission('/noisedata/list')) {
         this.activeName = 'noise'
+      } else if (hasPermission('/liquidGasData/list')) {
+        this.activeName = 'liquidgas'
       }
     }
   }
diff --git a/src/views/dataManage/deviceData/listDigData.vue b/src/views/dataManage/deviceData/listDigData.vue
index 775af19..5308300 100644
--- a/src/views/dataManage/deviceData/listDigData.vue
+++ b/src/views/dataManage/deviceData/listDigData.vue
@@ -63,6 +63,7 @@
 import { getDigData, batchExportDigData } from '@/api/data'
 import DeptSelect from '../../../components/DeptSelect/index'
 import { parseUrl } from '@/utils/parseutils'
+import { getDayTime } from '@/utils/dateutils'
 
 export default {
   name: 'ListDigData',
@@ -165,6 +166,9 @@
       if (params && params.deviceType === '6' && params.devcode) {
         this.listQuery.keywords = params.devcode
       }
+      const defaultBeginTime = getDayTime(new Date().getTime() - 24 * 7 * 60 * 60 * 1000).Format('yyyy-MM-dd hh:mm:ss')
+      const defaultEndTime = new Date().Format('yyyy-MM-dd hh:mm:ss')
+      this.timeRange = [defaultBeginTime, defaultEndTime]
       this.fetchData()
     }
   },
diff --git a/src/views/dataManage/deviceData/listGasData.vue b/src/views/dataManage/deviceData/listGasData.vue
index 97cdfdb..e365ee9 100644
--- a/src/views/dataManage/deviceData/listGasData.vue
+++ b/src/views/dataManage/deviceData/listGasData.vue
@@ -63,6 +63,7 @@
 import { getGasData, batchExportGasData } from '@/api/data'
 import DeptSelect from '../../../components/DeptSelect/index'
 import { parseUrl } from '@/utils/parseutils'
+import { getDayTime } from '@/utils/dateutils'
 
 export default {
   name: 'ListGasData',
@@ -163,6 +164,9 @@
       if (params && params.deviceType === '4' && params.devcode) {
         this.listQuery.keywords = params.devcode
       }
+      const defaultBeginTime = getDayTime(new Date().getTime() - 24 * 7 * 60 * 60 * 1000).Format('yyyy-MM-dd hh:mm:ss')
+      const defaultEndTime = new Date().Format('yyyy-MM-dd hh:mm:ss')
+      this.timeRange = [defaultBeginTime, defaultEndTime]
       this.fetchData()
     }
   },
diff --git a/src/views/dataManage/deviceData/listHarmfulData.vue b/src/views/dataManage/deviceData/listHarmfulData.vue
index e6a795c..d2398cf 100644
--- a/src/views/dataManage/deviceData/listHarmfulData.vue
+++ b/src/views/dataManage/deviceData/listHarmfulData.vue
@@ -63,6 +63,7 @@
 import { getHarmfulData, batchExportHarmfulData } from '@/api/data'
 import DeptSelect from '../../../components/DeptSelect/index'
 import { parseUrl } from '@/utils/parseutils'
+import { getDayTime } from '@/utils/dateutils'
 
 export default {
   name: 'ListHarmfulData',
@@ -176,6 +177,9 @@
       if (params && params.deviceType === '3' && params.devcode) {
         this.listQuery.keywords = params.devcode
       }
+      const defaultBeginTime = getDayTime(new Date().getTime() - 24 * 7 * 60 * 60 * 1000).Format('yyyy-MM-dd hh:mm:ss')
+      const defaultEndTime = new Date().Format('yyyy-MM-dd hh:mm:ss')
+      this.timeRange = [defaultBeginTime, defaultEndTime]
       this.fetchData()
     }
   },
diff --git a/src/views/dataManage/deviceData/listLiquidData.vue b/src/views/dataManage/deviceData/listLiquidData.vue
index 709e3a8..dea0ba5 100644
--- a/src/views/dataManage/deviceData/listLiquidData.vue
+++ b/src/views/dataManage/deviceData/listLiquidData.vue
@@ -63,6 +63,7 @@
 import { getLiquidData, batchExportLiquidData } from '@/api/data'
 import DeptSelect from '../../../components/DeptSelect/index'
 import { parseUrl } from '@/utils/parseutils'
+import { getDayTime } from '@/utils/dateutils'
 
 export default {
   name: 'ListLiquidData',
@@ -158,6 +159,9 @@
       if (params && params.deviceType === '2' && params.devcode) {
         this.listQuery.keywords = params.devcode
       }
+      const defaultBeginTime = getDayTime(new Date().getTime() - 24 * 7 * 60 * 60 * 1000).Format('yyyy-MM-dd hh:mm:ss')
+      const defaultEndTime = new Date().Format('yyyy-MM-dd hh:mm:ss')
+      this.timeRange = [defaultBeginTime, defaultEndTime]
       this.fetchData()
     }
   },
diff --git a/src/views/dataManage/deviceData/listLiquidGasData.vue b/src/views/dataManage/deviceData/listLiquidGasData.vue
new file mode 100644
index 0000000..9ba38ed
--- /dev/null
+++ b/src/views/dataManage/deviceData/listLiquidGasData.vue
@@ -0,0 +1,413 @@
+<!--液位燃气一体化设备数列表-->
+<template>
+  <div class="app-container">
+    <!--筛选条件-->
+    <div class="search-div">
+      <el-form ref="selectForm" :inline="true" :model="listQuery" class="form-container">
+        <el-row>
+          <el-form-item class="selectForm-container-item" prop="keywords">
+            <el-input v-model.trim="listQuery.keywords" placeholder="井编号/设备编号" clearable/>
+          </el-form-item>
+          <el-form-item class="selectForm-container-item">
+            <dept-select v-model="listQuery.deptid" :need-top="deptShowTop" dept-type="03" placeholder="选择权属单位/使用单位"/>
+          </el-form-item>
+          <el-form-item class="selectForm-container-item">
+            <el-select v-model="listQuery.sensorType" placeholder="请选择传感器类型">
+              <el-option label="液位" value="liquid"/>
+              <el-option label="燃气" value="gas"/>
+            </el-select>
+          </el-form-item>
+          <el-form-item class="selectForm-container-item" prop="beginTime">
+            <el-date-picker
+              v-model="timeRange"
+              type="datetimerange"
+              range-separator="至"
+              value-format="yyyy-MM-dd HH:mm:ss"
+              start-placeholder="开始时间"
+              end-placeholder="结束时间"/>
+          </el-form-item>
+          <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
+        </el-row>
+      </el-form>
+    </div>
+    <!--查询结果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('/liquidGasData/export')" :disabled="list.length === 0" class="edit_btn" size="small" @click="batchExport">导出记录</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">
+            <span v-if="column.checkCell" :class="checkCell(scope.row.cell)">{{ scope.row[column.value] }}</span>
+            <span v-else-if="column.unitFilter">{{ scope.row[column.value]|unit }}</span>
+            <span v-else>{{ scope.row[column.value] }}</span>
+          </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>
+  </div>
+</template>
+
+<script>
+import selectTree from '@/components/SelectTree/singleSelect'
+import { getLiquidGasData, batchExportLiquidGasData } from '@/api/data'
+import DeptSelect from '../../../components/DeptSelect/index'
+import { parseUrl } from '@/utils/parseutils'
+import { getDayTime } from '@/utils/dateutils'
+
+export default {
+  name: 'ListLiquidGasData',
+  components: { DeptSelect, selectTree },
+  filters: {
+    // 燃气浓度单位换算：小于20时单位为%LEL，大于20后，先除以20，加%VOL
+    unit: function(value) {
+      if (value <= 20) {
+        return value + '%LEL'
+      } else {
+        return (value / 20.0).toFixed(2) + '%VOL'
+      }
+    }
+  },
+  data() {
+    return {
+      listQuery: {
+        keywords: '', // 关键字
+        deptid: '', // 部门id
+        sensorType: 'gas', // 传感器类型
+        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: 'data',
+          align: 'center',
+          unitFilter: true
+        },
+        {
+          text: '电量(%)',
+          value: 'cell',
+          width: 80,
+          align: 'center',
+          checkCell: true
+        },
+        {
+          text: '权属单位',
+          value: 'companyName',
+          align: 'center'
+        },
+        {
+          text: '使用单位',
+          value: 'deptName',
+          align: 'center'
+        },
+        {
+          text: '上传时间',
+          value: 'uptime',
+          width: 170,
+          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, // 是否显示编辑框
+      deptShowTop: false
+    }
+  },
+  watch: {
+    timeRange(val) {
+      if (val && val.length > 0) {
+        this.listQuery.beginTime = val[0]
+        this.listQuery.endTime = val[1]
+      } else {
+        this.listQuery.beginTime = ''
+        this.listQuery.endTime = ''
+      }
+    }
+  },
+  created() {
+    // 如果路径里带参数，解析devcode参数
+    if (window.location.href) {
+      const params = parseUrl(window.location.href)
+      if (params && params.deviceType === '10' && params.devcode) {
+        this.listQuery.keywords = params.devcode
+      }
+      const defaultBeginTime = getDayTime(new Date().getTime() - 24 * 7 * 60 * 60 * 1000).Format('yyyy-MM-dd hh:mm:ss')
+      const defaultEndTime = new Date().Format('yyyy-MM-dd hh:mm:ss')
+      this.timeRange = [defaultBeginTime, defaultEndTime]
+      this.fetchData()
+    }
+  },
+  activated() {
+    // 要是路由里有参数
+    if (this.$route.query && this.$route.query.devcode) {
+      this.listQuery.keywords = this.$route.query.devcode
+      const defaultBeginTime = getDayTime(new Date().getTime() - 24 * 7 * 60 * 60 * 1000).Format('yyyy-MM-dd hh:mm:ss')
+      const defaultEndTime = new Date().Format('yyyy-MM-dd hh:mm:ss')
+      this.timeRange = [defaultBeginTime, defaultEndTime]
+      this.fetchData(false)// 获取数据
+    } else {
+      // if (this.timeRange.length === 0) {
+      const defaultBeginTime = getDayTime(new Date().getTime() - 24 * 7 * 60 * 60 * 1000).Format('yyyy-MM-dd hh:mm:ss')
+      const defaultEndTime = new Date().Format('yyyy-MM-dd hh:mm:ss')
+      this.timeRange = [defaultBeginTime, defaultEndTime]
+      // }
+      this.fetchData()
+    }
+  },
+  methods: {
+    // 批量导出
+    batchExport() {
+      console.log('批量导出液位配置')
+      // 全屏加载动画
+      const loading = this.$loading({
+        lock: true,
+        text: '数据处理中,请稍后...',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
+      })
+      batchExportLiquidGasData(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
+        if (this.listQuery.sensorType === 'liquid') {
+          downloadElement.download = `燃气智能终端（一体化）数据-液位.xlsx` // 下载后文件名
+        } else {
+          downloadElement.download = `燃气智能终端（一体化）数据-燃气.xlsx` // 下载后文件名
+        }
+        document.body.appendChild(downloadElement)
+        downloadElement.click() // 点击下载
+        document.body.removeChild(downloadElement) // 下载完成移除元素
+        window.URL.revokeObjectURL(href) // 释放blob对象
+      }).catch((res) => {
+        loading.close()
+      })
+    },
+    // 查询数据
+    search() {
+      // 判断查询类型并更新columns
+      if (this.listQuery.sensorType === 'liquid') {
+        this.columns = [
+          {
+            text: '设备编号',
+            value: 'devcode',
+            align: 'center'
+          },
+          {
+            text: '井编号',
+            value: 'wellCode',
+            align: 'center'
+          },
+          {
+            text: '设备类型',
+            value: 'deviceTypeName',
+            align: 'center'
+          },
+          {
+            text: '液位值(m)',
+            value: 'data',
+            align: 'center'
+          },
+          {
+            text: '电量(%)',
+            value: 'cell',
+            width: 80,
+            align: 'center',
+            checkCell: true
+          },
+          {
+            text: '权属单位',
+            value: 'companyName',
+            align: 'center'
+          },
+          {
+            text: '使用单位',
+            value: 'deptName',
+            align: 'center'
+          },
+          {
+            text: '上传时间',
+            value: 'uptime',
+            width: 170,
+            align: 'center'
+          }
+        ]// 显示列
+      } else {
+        this.columns = [
+          {
+            text: '设备编号',
+            value: 'devcode',
+            align: 'center'
+          },
+          {
+            text: '井编号',
+            value: 'wellCode',
+            align: 'center'
+          },
+          {
+            text: '设备类型',
+            value: 'deviceTypeName',
+            align: 'center'
+          },
+          {
+            text: '燃气浓度',
+            value: 'data',
+            align: 'center',
+            unitFilter: true
+          },
+          {
+            text: '电量(%)',
+            value: 'cell',
+            width: 80,
+            align: 'center',
+            checkCell: true
+          },
+          {
+            text: '权属单位',
+            value: 'companyName',
+            align: 'center'
+          },
+          {
+            text: '使用单位',
+            value: 'deptName',
+            align: 'center'
+          },
+          {
+            text: '上传时间',
+            value: 'uptime',
+            width: 170,
+            align: 'center'
+          }
+        ]
+      }
+      this.list = []
+      this.fetchData(false)
+    },
+    // 获取液位配置数据
+    fetchData(isNowPage = true) {
+      this.listLoading = true
+      if (!isNowPage) { // 是否显示当前页，否则跳转第一页
+        this.listQuery.offset = 1
+      }
+      getLiquidGasData(this.listQuery).then(response => {
+        this.list = response.data.rows
+        this.total = parseInt(response.data.total)
+        this.listLoading = false
+      })
+    },
+    checkCell(value) {
+      var cell = parseFloat(value)
+      if (cell < 10) {
+        return 'warning-state'
+      }
+    },
+    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
+    }
+  }
+  .warning-state{
+    color:red
+  }
+</style>
diff --git a/src/views/dataManage/deviceData/listNoiseData.vue b/src/views/dataManage/deviceData/listNoiseData.vue
index fd909d9..e42b4cf 100644
--- a/src/views/dataManage/deviceData/listNoiseData.vue
+++ b/src/views/dataManage/deviceData/listNoiseData.vue
@@ -63,6 +63,7 @@
 import { getNoiseData, batchExportNoiseData } from '@/api/data'
 import DeptSelect from '../../../components/DeptSelect/index'
 import { parseUrl } from '@/utils/parseutils'
+import { getDayTime } from '@/utils/dateutils'
 
 export default {
   name: 'ListNoiseData',
@@ -165,6 +166,9 @@
       if (params && params.deviceType === '6' && params.devcode) {
         this.listQuery.keywords = params.devcode
       }
+      const defaultBeginTime = getDayTime(new Date().getTime() - 24 * 7 * 60 * 60 * 1000).Format('yyyy-MM-dd hh:mm:ss')
+      const defaultEndTime = new Date().Format('yyyy-MM-dd hh:mm:ss')
+      this.timeRange = [defaultBeginTime, defaultEndTime]
       this.fetchData()
     }
   },
diff --git a/src/views/dataManage/deviceData/listTempData.vue b/src/views/dataManage/deviceData/listTempData.vue
index 2fead0e..8bbb92f 100644
--- a/src/views/dataManage/deviceData/listTempData.vue
+++ b/src/views/dataManage/deviceData/listTempData.vue
@@ -63,6 +63,7 @@
 import { getTempData, batchExportTempData } from '@/api/data'
 import DeptSelect from '../../../components/DeptSelect/index'
 import { parseUrl } from '@/utils/parseutils'
+import { getDayTime } from '@/utils/dateutils'
 
 export default {
   name: 'ListTempData',
@@ -162,6 +163,9 @@
       const params = parseUrl(window.location.href)
       if (params && params.deviceType === '5' && params.devcode) {
         this.listQuery.keywords = params.devcode
+        const defaultBeginTime = getDayTime(new Date().getTime() - 24 * 7 * 60 * 60 * 1000).Format('yyyy-MM-dd hh:mm:ss')
+        const defaultEndTime = new Date().Format('yyyy-MM-dd hh:mm:ss')
+        this.timeRange = [defaultBeginTime, defaultEndTime]
       }
       this.fetchData()
     }
diff --git a/src/views/dataManage/deviceData/listWellCoverData.vue b/src/views/dataManage/deviceData/listWellCoverData.vue
index 4ef378c..e286794 100644
--- a/src/views/dataManage/deviceData/listWellCoverData.vue
+++ b/src/views/dataManage/deviceData/listWellCoverData.vue
@@ -63,6 +63,7 @@
 import { getWellData, batchExportWellData } from '@/api/data'
 import DeptSelect from '../../../components/DeptSelect/index'
 import { parseUrl } from '@/utils/parseutils'
+import { getDayTime } from '@/utils/dateutils'
 
 export default {
   name: 'ListWellCoverData',
@@ -134,17 +135,6 @@
       deptShowTop: false
     }
   },
-  watch: {
-    timeRange(val) {
-      if (val && val.length > 0) {
-        this.listQuery.beginTime = val[0]
-        this.listQuery.endTime = val[1]
-      } else {
-        this.listQuery.beginTime = ''
-        this.listQuery.endTime = ''
-      }
-    }
-  },
   created() {
     // 如果路径里带参数，解析devcode参数
     if (window.location.href) {
@@ -152,6 +142,9 @@
       if (params && params.deviceType === '1' && params.devcode) {
         this.listQuery.keywords = params.devcode
       }
+      const defaultBeginTime = getDayTime(new Date().getTime() - 24 * 7 * 60 * 60 * 1000).Format('yyyy-MM-dd hh:mm:ss')
+      const defaultEndTime = new Date().Format('yyyy-MM-dd hh:mm:ss')
+      this.timeRange = [defaultBeginTime, defaultEndTime]
       this.fetchData()
     }
   },
@@ -202,6 +195,13 @@
       if (!isNowPage) { // 是否显示当前页，否则跳转第一页
         this.listQuery.offset = 1
       }
+      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 = ''
+      }
       getWellData(this.listQuery).then(response => {
         this.list = response.data.rows
         this.total = parseInt(response.data.total)
diff --git a/src/views/dataManage/deviceData/listWellLocaData.vue b/src/views/dataManage/deviceData/listWellLocaData.vue
index 45cf40b..a4bdd6a 100644
--- a/src/views/dataManage/deviceData/listWellLocaData.vue
+++ b/src/views/dataManage/deviceData/listWellLocaData.vue
@@ -63,6 +63,7 @@
 import { getWellLocaData, batchExportWellLocaData } from '@/api/data'
 import DeptSelect from '../../../components/DeptSelect/index'
 import { parseUrl } from '@/utils/parseutils'
+import { getDayTime } from '@/utils/dateutils'
 
 export default {
   name: 'ListWellLocaData',
@@ -156,6 +157,9 @@
       if (params && params.deviceType === '7' && params.devcode) {
         this.listQuery.keywords = params.devcode
       }
+      const defaultBeginTime = getDayTime(new Date().getTime() - 24 * 7 * 60 * 60 * 1000).Format('yyyy-MM-dd hh:mm:ss')
+      const defaultEndTime = new Date().Format('yyyy-MM-dd hh:mm:ss')
+      this.timeRange = [defaultBeginTime, defaultEndTime]
       this.fetchData()
     }
   },
diff --git a/src/views/dataStatics/components/gasData.vue b/src/views/dataStatics/components/gasData.vue
index f570352..11d2ed5 100644
--- a/src/views/dataStatics/components/gasData.vue
+++ b/src/views/dataStatics/components/gasData.vue
@@ -1,56 +1,79 @@
 <template>
-  <ve-line ref="linechart" :title="title" :data="chartData" :settings="chartSettings"/>
+  <ve-line ref="linechart" :title="title" :data="chartData" :settings="chartSettings" :tooltip="options.tooltip"/>
 </template>
 
 <script>
-import { getGasData } from '@/api/data'
-import { compare } from '@/utils/compare'
-import 'v-charts/lib/style.css'
+  import { getStaticData } from '@/api/data'
+  import { compare } from '@/utils/compare'
+  import 'v-charts/lib/style.css'
 
-export default {
-  name: 'GasData',
-  data() {
-    this.title = {
-      text: '燃气监测曲线图'
-    }
-    this.chartSettings = {
-      labelMap: {
-        'strength': '燃气(%LEL)',
-        'uptime': '上报时间'
-      },
-      metrics: ['strength'],
-      dimension: ['uptime']
-    }
-    return {
-      listQuery: {
-        keywords: '', // 关键字
-        deptid: '', // 部门id
-        beginTime: '', // 开始时间
-        endTime: '', // 结束时间
-        offset: 1,
-        limit: 100000,
-        sort: '',
-        order: ''
-      },
-      chartData: {
-        columns: ['uptime', 'strength'],
-        rows: []
+  export default {
+    name: 'GasData',
+    data() {
+      this.title = {
+        text: '燃气监测曲线图'
+      }
+      this.chartSettings = {
+        // xAxisType: 'time',
+        labelMap: {
+          'strength': '燃气(%LEL)',
+          'strengthVOL': '燃气(%VOL)',
+          'uptime': '上报时间'
+        }, // 别名
+        metrics: ['strength'], // 指标
+        dimension: ['uptime']// 维度
+      }
+      return {
+        listQuery: {
+          wellCode: '', // 关键字
+          watchType: 'gas', // 监控数据
+          beginTime: '', // 开始时间
+          endTime: '', // 结束时间
+          offset: 1,
+          limit: 100000,
+          sort: '',
+          order: ''
+        },
+        options: {
+          tooltip: {
+            // formatter: '{b}<br/>{a} : {c0.split(\',\')[1]}<br/>燃气浓度(%VOL){c0.split(\',\')[1]}'
+            formatter: function(params) {
+              let res = params.name + '<br/>'
+              const value = parseFloat(params.data[1])
+              res += params.seriesName + ' : ' + value.toFixed(2)
+              if (value > 20) {
+                res += '<br/>燃气(%VOL)' + (value / 20.0).toFixed(2)
+              }
+              return res
+            }
+          }
+        },
+        chartData: {
+          columns: ['uptime', 'strength'],
+          rows: []
+        }
+      }
+    },
+    methods: {
+      fetchData(params) {
+        this.listQuery.wellCode = params.wellCode
+        this.listQuery.beginTime = params.beginTime
+        this.listQuery.endTime = params.endTime
+        getStaticData(this.listQuery).then(response => {
+          if (response.data.length === 0) {
+            this.$message.error('该井此段时间内无燃气数据，请修改监测指标或查询范围')
+          }
+          const data = response.data.map(item => {
+            return {
+              strength: item.strength,
+              strengthVOL: (item.strength / 20.0).toFixed(2),
+              uptime: item.uptime
+            }
+          })
+          this.chartData.rows = data.sort(compare('uptime'))
+          this.$refs['linechart'].echarts.resize()
+        })
       }
     }
-  },
-  methods: {
-    fetchData(params) {
-      this.listQuery.keywords = params.wellCode
-      this.listQuery.beginTime = params.beginTime
-      this.listQuery.endTime = params.endTime
-      getGasData(this.listQuery).then(response => {
-        if (response.data.rows.length === 0) {
-          this.$message.error('该井此段时间内无燃气数据，请修改监测指标或查询范围')
-        }
-        this.chartData.rows = response.data.rows.sort(compare('uptime'))
-        this.$refs['linechart'].echarts.resize()
-      })
-    }
   }
-}
 </script>

diff --git a/src/api/data.js b/src/api/data.js
index afeee10..0353d91 100644
--- a/src/api/data.js
+++ b/src/api/data.js
@@ -66,6 +66,14 @@
     params
   })
 }
+// 液位燃气一体化设备数据查询
+export function getLiquidGasData(params) {
+  return request({
+    url: 'liquidGasData/list',
+    method: 'get',
+    params
+  })
+}
 
 // 批量导出井盖数据
 export function batchExportWellData(params) {
@@ -154,4 +162,23 @@
     responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
   })
 }
+// 批量导出液位燃气一体化设备数据
+export function batchExportLiquidGasData(params) {
+  return request({
+    url: '/liquidGasData/export',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 数据统计接口
+export function getStaticData(params) {
+  return request({
+    url: 'data/list',
+    method: 'get',
+    params
+  })
+}
 
diff --git a/src/api/liquidgasconfig.js b/src/api/liquidgasconfig.js
new file mode 100644
index 0000000..9d0fd6b
--- /dev/null
+++ b/src/api/liquidgasconfig.js
@@ -0,0 +1,42 @@
+/**
+ * 液位燃气一体化设备配置接口
+ */
+import request from '@/utils/request'
+// 燃气配置查询
+export function getLiquidGasConfigList(params) {
+  return request({
+    url: 'busConfig/liquidGasConfig/list',
+    method: 'get',
+    params
+  })
+}
+
+// 修改燃气配置
+export function editLiquidGasConfig(params) {
+  return request({
+    url: 'busConfig/liquidGasConfig/config',
+    method: 'post',
+    params
+  })
+}
+
+// 批量导入
+export function batchImportLiquidGasConfig(fileobj) {
+  const param = new FormData()
+  param.append('file', fileobj)
+  return request({
+    url: 'busConfig/gasLiquidConfig/batchImport',
+    method: 'post',
+    headers: { 'Content-Type': 'multipart/form-data' },
+    data: param
+  })
+}
+// 批量导出
+export function batchExportLiquidGasConfig(params) {
+  return request({
+    url: 'busConfig/liquidGasConfig/batchExport',
+    method: 'get',
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
diff --git a/src/views/dataManage/dataManage.vue b/src/views/dataManage/dataManage.vue
index a46b904..cdad03f 100644
--- a/src/views/dataManage/dataManage.vue
+++ b/src/views/dataManage/dataManage.vue
@@ -25,6 +25,9 @@
       <el-tab-pane v-if="hasPerm('/welllocadata/list')" label="井盖定位监测仪" name="wellloca">
         <list-well-loca-data ref="welllocadatacomp"/>
       </el-tab-pane>
+      <el-tab-pane v-if="hasPerm('/liquidGasData/list')" label="燃气智能终端(一体化)" name="liquidgas">
+        <list-liquid-gas-data ref="liquidgasdatacomp"/>
+      </el-tab-pane>
     </el-tabs>
   </div>
 </template>
@@ -37,13 +40,14 @@
 import ListHarmfulData from './deviceData/listHarmfulData'
 import ListTempData from './deviceData/listTempData'
 import ListWellLocaData from './deviceData/listWellLocaData'
+import ListLiquidGasData from './deviceData/listLiquidGasData'
 import { parseUrl } from '@/utils/parseutils'
 import { hasPermission } from '@/utils/permission'
 import ListNoiseData from './deviceData/listNoiseData'
 
 export default {
   name: 'DataManage',
-  components: { ListNoiseData, ListWellLocaData, ListTempData, ListHarmfulData, ListDigData, ListGasData, ListLiquidData, ListWellCoverData },
+  components: { ListNoiseData, ListWellLocaData, ListTempData, ListHarmfulData, ListDigData, ListGasData, ListLiquidData, ListWellCoverData, ListLiquidGasData },
   data() {
     return {
       activeName: 'wellcover'
@@ -86,6 +90,8 @@
         this.$refs.digdatacomp.fetchData()
       } else if (tab.name === 'wellloca') {
         this.$refs.welllocadatacomp.fetchData()
+      } else if (tab.name === 'liquidgas') {
+        this.$refs.liquidgasdatacomp.fetchData()
       }
     },
     changeTab(deviceType) {
@@ -105,6 +111,8 @@
         this.activeName = 'wellloca'
       } else if (deviceType === '8') {
         this.activeName = 'noise'
+      } else if (deviceType === '10') {
+        this.activeName = 'liquidgas'
       }
     },
     // 计算那个是当前第一个tab
@@ -125,6 +133,8 @@
         this.activeName = 'wellloca'
       } else if (hasPermission('/noisedata/list')) {
         this.activeName = 'noise'
+      } else if (hasPermission('/liquidGasData/list')) {
+        this.activeName = 'liquidgas'
       }
     }
   }
diff --git a/src/views/dataManage/deviceData/listDigData.vue b/src/views/dataManage/deviceData/listDigData.vue
index 775af19..5308300 100644
--- a/src/views/dataManage/deviceData/listDigData.vue
+++ b/src/views/dataManage/deviceData/listDigData.vue
@@ -63,6 +63,7 @@
 import { getDigData, batchExportDigData } from '@/api/data'
 import DeptSelect from '../../../components/DeptSelect/index'
 import { parseUrl } from '@/utils/parseutils'
+import { getDayTime } from '@/utils/dateutils'
 
 export default {
   name: 'ListDigData',
@@ -165,6 +166,9 @@
       if (params && params.deviceType === '6' && params.devcode) {
         this.listQuery.keywords = params.devcode
       }
+      const defaultBeginTime = getDayTime(new Date().getTime() - 24 * 7 * 60 * 60 * 1000).Format('yyyy-MM-dd hh:mm:ss')
+      const defaultEndTime = new Date().Format('yyyy-MM-dd hh:mm:ss')
+      this.timeRange = [defaultBeginTime, defaultEndTime]
       this.fetchData()
     }
   },
diff --git a/src/views/dataManage/deviceData/listGasData.vue b/src/views/dataManage/deviceData/listGasData.vue
index 97cdfdb..e365ee9 100644
--- a/src/views/dataManage/deviceData/listGasData.vue
+++ b/src/views/dataManage/deviceData/listGasData.vue
@@ -63,6 +63,7 @@
 import { getGasData, batchExportGasData } from '@/api/data'
 import DeptSelect from '../../../components/DeptSelect/index'
 import { parseUrl } from '@/utils/parseutils'
+import { getDayTime } from '@/utils/dateutils'
 
 export default {
   name: 'ListGasData',
@@ -163,6 +164,9 @@
       if (params && params.deviceType === '4' && params.devcode) {
         this.listQuery.keywords = params.devcode
       }
+      const defaultBeginTime = getDayTime(new Date().getTime() - 24 * 7 * 60 * 60 * 1000).Format('yyyy-MM-dd hh:mm:ss')
+      const defaultEndTime = new Date().Format('yyyy-MM-dd hh:mm:ss')
+      this.timeRange = [defaultBeginTime, defaultEndTime]
       this.fetchData()
     }
   },
diff --git a/src/views/dataManage/deviceData/listHarmfulData.vue b/src/views/dataManage/deviceData/listHarmfulData.vue
index e6a795c..d2398cf 100644
--- a/src/views/dataManage/deviceData/listHarmfulData.vue
+++ b/src/views/dataManage/deviceData/listHarmfulData.vue
@@ -63,6 +63,7 @@
 import { getHarmfulData, batchExportHarmfulData } from '@/api/data'
 import DeptSelect from '../../../components/DeptSelect/index'
 import { parseUrl } from '@/utils/parseutils'
+import { getDayTime } from '@/utils/dateutils'
 
 export default {
   name: 'ListHarmfulData',
@@ -176,6 +177,9 @@
       if (params && params.deviceType === '3' && params.devcode) {
         this.listQuery.keywords = params.devcode
       }
+      const defaultBeginTime = getDayTime(new Date().getTime() - 24 * 7 * 60 * 60 * 1000).Format('yyyy-MM-dd hh:mm:ss')
+      const defaultEndTime = new Date().Format('yyyy-MM-dd hh:mm:ss')
+      this.timeRange = [defaultBeginTime, defaultEndTime]
       this.fetchData()
     }
   },
diff --git a/src/views/dataManage/deviceData/listLiquidData.vue b/src/views/dataManage/deviceData/listLiquidData.vue
index 709e3a8..dea0ba5 100644
--- a/src/views/dataManage/deviceData/listLiquidData.vue
+++ b/src/views/dataManage/deviceData/listLiquidData.vue
@@ -63,6 +63,7 @@
 import { getLiquidData, batchExportLiquidData } from '@/api/data'
 import DeptSelect from '../../../components/DeptSelect/index'
 import { parseUrl } from '@/utils/parseutils'
+import { getDayTime } from '@/utils/dateutils'
 
 export default {
   name: 'ListLiquidData',
@@ -158,6 +159,9 @@
       if (params && params.deviceType === '2' && params.devcode) {
         this.listQuery.keywords = params.devcode
       }
+      const defaultBeginTime = getDayTime(new Date().getTime() - 24 * 7 * 60 * 60 * 1000).Format('yyyy-MM-dd hh:mm:ss')
+      const defaultEndTime = new Date().Format('yyyy-MM-dd hh:mm:ss')
+      this.timeRange = [defaultBeginTime, defaultEndTime]
       this.fetchData()
     }
   },
diff --git a/src/views/dataManage/deviceData/listLiquidGasData.vue b/src/views/dataManage/deviceData/listLiquidGasData.vue
new file mode 100644
index 0000000..9ba38ed
--- /dev/null
+++ b/src/views/dataManage/deviceData/listLiquidGasData.vue
@@ -0,0 +1,413 @@
+<!--液位燃气一体化设备数列表-->
+<template>
+  <div class="app-container">
+    <!--筛选条件-->
+    <div class="search-div">
+      <el-form ref="selectForm" :inline="true" :model="listQuery" class="form-container">
+        <el-row>
+          <el-form-item class="selectForm-container-item" prop="keywords">
+            <el-input v-model.trim="listQuery.keywords" placeholder="井编号/设备编号" clearable/>
+          </el-form-item>
+          <el-form-item class="selectForm-container-item">
+            <dept-select v-model="listQuery.deptid" :need-top="deptShowTop" dept-type="03" placeholder="选择权属单位/使用单位"/>
+          </el-form-item>
+          <el-form-item class="selectForm-container-item">
+            <el-select v-model="listQuery.sensorType" placeholder="请选择传感器类型">
+              <el-option label="液位" value="liquid"/>
+              <el-option label="燃气" value="gas"/>
+            </el-select>
+          </el-form-item>
+          <el-form-item class="selectForm-container-item" prop="beginTime">
+            <el-date-picker
+              v-model="timeRange"
+              type="datetimerange"
+              range-separator="至"
+              value-format="yyyy-MM-dd HH:mm:ss"
+              start-placeholder="开始时间"
+              end-placeholder="结束时间"/>
+          </el-form-item>
+          <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
+        </el-row>
+      </el-form>
+    </div>
+    <!--查询结果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('/liquidGasData/export')" :disabled="list.length === 0" class="edit_btn" size="small" @click="batchExport">导出记录</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">
+            <span v-if="column.checkCell" :class="checkCell(scope.row.cell)">{{ scope.row[column.value] }}</span>
+            <span v-else-if="column.unitFilter">{{ scope.row[column.value]|unit }}</span>
+            <span v-else>{{ scope.row[column.value] }}</span>
+          </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>
+  </div>
+</template>
+
+<script>
+import selectTree from '@/components/SelectTree/singleSelect'
+import { getLiquidGasData, batchExportLiquidGasData } from '@/api/data'
+import DeptSelect from '../../../components/DeptSelect/index'
+import { parseUrl } from '@/utils/parseutils'
+import { getDayTime } from '@/utils/dateutils'
+
+export default {
+  name: 'ListLiquidGasData',
+  components: { DeptSelect, selectTree },
+  filters: {
+    // 燃气浓度单位换算：小于20时单位为%LEL，大于20后，先除以20，加%VOL
+    unit: function(value) {
+      if (value <= 20) {
+        return value + '%LEL'
+      } else {
+        return (value / 20.0).toFixed(2) + '%VOL'
+      }
+    }
+  },
+  data() {
+    return {
+      listQuery: {
+        keywords: '', // 关键字
+        deptid: '', // 部门id
+        sensorType: 'gas', // 传感器类型
+        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: 'data',
+          align: 'center',
+          unitFilter: true
+        },
+        {
+          text: '电量(%)',
+          value: 'cell',
+          width: 80,
+          align: 'center',
+          checkCell: true
+        },
+        {
+          text: '权属单位',
+          value: 'companyName',
+          align: 'center'
+        },
+        {
+          text: '使用单位',
+          value: 'deptName',
+          align: 'center'
+        },
+        {
+          text: '上传时间',
+          value: 'uptime',
+          width: 170,
+          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, // 是否显示编辑框
+      deptShowTop: false
+    }
+  },
+  watch: {
+    timeRange(val) {
+      if (val && val.length > 0) {
+        this.listQuery.beginTime = val[0]
+        this.listQuery.endTime = val[1]
+      } else {
+        this.listQuery.beginTime = ''
+        this.listQuery.endTime = ''
+      }
+    }
+  },
+  created() {
+    // 如果路径里带参数，解析devcode参数
+    if (window.location.href) {
+      const params = parseUrl(window.location.href)
+      if (params && params.deviceType === '10' && params.devcode) {
+        this.listQuery.keywords = params.devcode
+      }
+      const defaultBeginTime = getDayTime(new Date().getTime() - 24 * 7 * 60 * 60 * 1000).Format('yyyy-MM-dd hh:mm:ss')
+      const defaultEndTime = new Date().Format('yyyy-MM-dd hh:mm:ss')
+      this.timeRange = [defaultBeginTime, defaultEndTime]
+      this.fetchData()
+    }
+  },
+  activated() {
+    // 要是路由里有参数
+    if (this.$route.query && this.$route.query.devcode) {
+      this.listQuery.keywords = this.$route.query.devcode
+      const defaultBeginTime = getDayTime(new Date().getTime() - 24 * 7 * 60 * 60 * 1000).Format('yyyy-MM-dd hh:mm:ss')
+      const defaultEndTime = new Date().Format('yyyy-MM-dd hh:mm:ss')
+      this.timeRange = [defaultBeginTime, defaultEndTime]
+      this.fetchData(false)// 获取数据
+    } else {
+      // if (this.timeRange.length === 0) {
+      const defaultBeginTime = getDayTime(new Date().getTime() - 24 * 7 * 60 * 60 * 1000).Format('yyyy-MM-dd hh:mm:ss')
+      const defaultEndTime = new Date().Format('yyyy-MM-dd hh:mm:ss')
+      this.timeRange = [defaultBeginTime, defaultEndTime]
+      // }
+      this.fetchData()
+    }
+  },
+  methods: {
+    // 批量导出
+    batchExport() {
+      console.log('批量导出液位配置')
+      // 全屏加载动画
+      const loading = this.$loading({
+        lock: true,
+        text: '数据处理中,请稍后...',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
+      })
+      batchExportLiquidGasData(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
+        if (this.listQuery.sensorType === 'liquid') {
+          downloadElement.download = `燃气智能终端（一体化）数据-液位.xlsx` // 下载后文件名
+        } else {
+          downloadElement.download = `燃气智能终端（一体化）数据-燃气.xlsx` // 下载后文件名
+        }
+        document.body.appendChild(downloadElement)
+        downloadElement.click() // 点击下载
+        document.body.removeChild(downloadElement) // 下载完成移除元素
+        window.URL.revokeObjectURL(href) // 释放blob对象
+      }).catch((res) => {
+        loading.close()
+      })
+    },
+    // 查询数据
+    search() {
+      // 判断查询类型并更新columns
+      if (this.listQuery.sensorType === 'liquid') {
+        this.columns = [
+          {
+            text: '设备编号',
+            value: 'devcode',
+            align: 'center'
+          },
+          {
+            text: '井编号',
+            value: 'wellCode',
+            align: 'center'
+          },
+          {
+            text: '设备类型',
+            value: 'deviceTypeName',
+            align: 'center'
+          },
+          {
+            text: '液位值(m)',
+            value: 'data',
+            align: 'center'
+          },
+          {
+            text: '电量(%)',
+            value: 'cell',
+            width: 80,
+            align: 'center',
+            checkCell: true
+          },
+          {
+            text: '权属单位',
+            value: 'companyName',
+            align: 'center'
+          },
+          {
+            text: '使用单位',
+            value: 'deptName',
+            align: 'center'
+          },
+          {
+            text: '上传时间',
+            value: 'uptime',
+            width: 170,
+            align: 'center'
+          }
+        ]// 显示列
+      } else {
+        this.columns = [
+          {
+            text: '设备编号',
+            value: 'devcode',
+            align: 'center'
+          },
+          {
+            text: '井编号',
+            value: 'wellCode',
+            align: 'center'
+          },
+          {
+            text: '设备类型',
+            value: 'deviceTypeName',
+            align: 'center'
+          },
+          {
+            text: '燃气浓度',
+            value: 'data',
+            align: 'center',
+            unitFilter: true
+          },
+          {
+            text: '电量(%)',
+            value: 'cell',
+            width: 80,
+            align: 'center',
+            checkCell: true
+          },
+          {
+            text: '权属单位',
+            value: 'companyName',
+            align: 'center'
+          },
+          {
+            text: '使用单位',
+            value: 'deptName',
+            align: 'center'
+          },
+          {
+            text: '上传时间',
+            value: 'uptime',
+            width: 170,
+            align: 'center'
+          }
+        ]
+      }
+      this.list = []
+      this.fetchData(false)
+    },
+    // 获取液位配置数据
+    fetchData(isNowPage = true) {
+      this.listLoading = true
+      if (!isNowPage) { // 是否显示当前页，否则跳转第一页
+        this.listQuery.offset = 1
+      }
+      getLiquidGasData(this.listQuery).then(response => {
+        this.list = response.data.rows
+        this.total = parseInt(response.data.total)
+        this.listLoading = false
+      })
+    },
+    checkCell(value) {
+      var cell = parseFloat(value)
+      if (cell < 10) {
+        return 'warning-state'
+      }
+    },
+    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
+    }
+  }
+  .warning-state{
+    color:red
+  }
+</style>
diff --git a/src/views/dataManage/deviceData/listNoiseData.vue b/src/views/dataManage/deviceData/listNoiseData.vue
index fd909d9..e42b4cf 100644
--- a/src/views/dataManage/deviceData/listNoiseData.vue
+++ b/src/views/dataManage/deviceData/listNoiseData.vue
@@ -63,6 +63,7 @@
 import { getNoiseData, batchExportNoiseData } from '@/api/data'
 import DeptSelect from '../../../components/DeptSelect/index'
 import { parseUrl } from '@/utils/parseutils'
+import { getDayTime } from '@/utils/dateutils'
 
 export default {
   name: 'ListNoiseData',
@@ -165,6 +166,9 @@
       if (params && params.deviceType === '6' && params.devcode) {
         this.listQuery.keywords = params.devcode
       }
+      const defaultBeginTime = getDayTime(new Date().getTime() - 24 * 7 * 60 * 60 * 1000).Format('yyyy-MM-dd hh:mm:ss')
+      const defaultEndTime = new Date().Format('yyyy-MM-dd hh:mm:ss')
+      this.timeRange = [defaultBeginTime, defaultEndTime]
       this.fetchData()
     }
   },
diff --git a/src/views/dataManage/deviceData/listTempData.vue b/src/views/dataManage/deviceData/listTempData.vue
index 2fead0e..8bbb92f 100644
--- a/src/views/dataManage/deviceData/listTempData.vue
+++ b/src/views/dataManage/deviceData/listTempData.vue
@@ -63,6 +63,7 @@
 import { getTempData, batchExportTempData } from '@/api/data'
 import DeptSelect from '../../../components/DeptSelect/index'
 import { parseUrl } from '@/utils/parseutils'
+import { getDayTime } from '@/utils/dateutils'
 
 export default {
   name: 'ListTempData',
@@ -162,6 +163,9 @@
       const params = parseUrl(window.location.href)
       if (params && params.deviceType === '5' && params.devcode) {
         this.listQuery.keywords = params.devcode
+        const defaultBeginTime = getDayTime(new Date().getTime() - 24 * 7 * 60 * 60 * 1000).Format('yyyy-MM-dd hh:mm:ss')
+        const defaultEndTime = new Date().Format('yyyy-MM-dd hh:mm:ss')
+        this.timeRange = [defaultBeginTime, defaultEndTime]
       }
       this.fetchData()
     }
diff --git a/src/views/dataManage/deviceData/listWellCoverData.vue b/src/views/dataManage/deviceData/listWellCoverData.vue
index 4ef378c..e286794 100644
--- a/src/views/dataManage/deviceData/listWellCoverData.vue
+++ b/src/views/dataManage/deviceData/listWellCoverData.vue
@@ -63,6 +63,7 @@
 import { getWellData, batchExportWellData } from '@/api/data'
 import DeptSelect from '../../../components/DeptSelect/index'
 import { parseUrl } from '@/utils/parseutils'
+import { getDayTime } from '@/utils/dateutils'
 
 export default {
   name: 'ListWellCoverData',
@@ -134,17 +135,6 @@
       deptShowTop: false
     }
   },
-  watch: {
-    timeRange(val) {
-      if (val && val.length > 0) {
-        this.listQuery.beginTime = val[0]
-        this.listQuery.endTime = val[1]
-      } else {
-        this.listQuery.beginTime = ''
-        this.listQuery.endTime = ''
-      }
-    }
-  },
   created() {
     // 如果路径里带参数，解析devcode参数
     if (window.location.href) {
@@ -152,6 +142,9 @@
       if (params && params.deviceType === '1' && params.devcode) {
         this.listQuery.keywords = params.devcode
       }
+      const defaultBeginTime = getDayTime(new Date().getTime() - 24 * 7 * 60 * 60 * 1000).Format('yyyy-MM-dd hh:mm:ss')
+      const defaultEndTime = new Date().Format('yyyy-MM-dd hh:mm:ss')
+      this.timeRange = [defaultBeginTime, defaultEndTime]
       this.fetchData()
     }
   },
@@ -202,6 +195,13 @@
       if (!isNowPage) { // 是否显示当前页，否则跳转第一页
         this.listQuery.offset = 1
       }
+      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 = ''
+      }
       getWellData(this.listQuery).then(response => {
         this.list = response.data.rows
         this.total = parseInt(response.data.total)
diff --git a/src/views/dataManage/deviceData/listWellLocaData.vue b/src/views/dataManage/deviceData/listWellLocaData.vue
index 45cf40b..a4bdd6a 100644
--- a/src/views/dataManage/deviceData/listWellLocaData.vue
+++ b/src/views/dataManage/deviceData/listWellLocaData.vue
@@ -63,6 +63,7 @@
 import { getWellLocaData, batchExportWellLocaData } from '@/api/data'
 import DeptSelect from '../../../components/DeptSelect/index'
 import { parseUrl } from '@/utils/parseutils'
+import { getDayTime } from '@/utils/dateutils'
 
 export default {
   name: 'ListWellLocaData',
@@ -156,6 +157,9 @@
       if (params && params.deviceType === '7' && params.devcode) {
         this.listQuery.keywords = params.devcode
       }
+      const defaultBeginTime = getDayTime(new Date().getTime() - 24 * 7 * 60 * 60 * 1000).Format('yyyy-MM-dd hh:mm:ss')
+      const defaultEndTime = new Date().Format('yyyy-MM-dd hh:mm:ss')
+      this.timeRange = [defaultBeginTime, defaultEndTime]
       this.fetchData()
     }
   },
diff --git a/src/views/dataStatics/components/gasData.vue b/src/views/dataStatics/components/gasData.vue
index f570352..11d2ed5 100644
--- a/src/views/dataStatics/components/gasData.vue
+++ b/src/views/dataStatics/components/gasData.vue
@@ -1,56 +1,79 @@
 <template>
-  <ve-line ref="linechart" :title="title" :data="chartData" :settings="chartSettings"/>
+  <ve-line ref="linechart" :title="title" :data="chartData" :settings="chartSettings" :tooltip="options.tooltip"/>
 </template>
 
 <script>
-import { getGasData } from '@/api/data'
-import { compare } from '@/utils/compare'
-import 'v-charts/lib/style.css'
+  import { getStaticData } from '@/api/data'
+  import { compare } from '@/utils/compare'
+  import 'v-charts/lib/style.css'
 
-export default {
-  name: 'GasData',
-  data() {
-    this.title = {
-      text: '燃气监测曲线图'
-    }
-    this.chartSettings = {
-      labelMap: {
-        'strength': '燃气(%LEL)',
-        'uptime': '上报时间'
-      },
-      metrics: ['strength'],
-      dimension: ['uptime']
-    }
-    return {
-      listQuery: {
-        keywords: '', // 关键字
-        deptid: '', // 部门id
-        beginTime: '', // 开始时间
-        endTime: '', // 结束时间
-        offset: 1,
-        limit: 100000,
-        sort: '',
-        order: ''
-      },
-      chartData: {
-        columns: ['uptime', 'strength'],
-        rows: []
+  export default {
+    name: 'GasData',
+    data() {
+      this.title = {
+        text: '燃气监测曲线图'
+      }
+      this.chartSettings = {
+        // xAxisType: 'time',
+        labelMap: {
+          'strength': '燃气(%LEL)',
+          'strengthVOL': '燃气(%VOL)',
+          'uptime': '上报时间'
+        }, // 别名
+        metrics: ['strength'], // 指标
+        dimension: ['uptime']// 维度
+      }
+      return {
+        listQuery: {
+          wellCode: '', // 关键字
+          watchType: 'gas', // 监控数据
+          beginTime: '', // 开始时间
+          endTime: '', // 结束时间
+          offset: 1,
+          limit: 100000,
+          sort: '',
+          order: ''
+        },
+        options: {
+          tooltip: {
+            // formatter: '{b}<br/>{a} : {c0.split(\',\')[1]}<br/>燃气浓度(%VOL){c0.split(\',\')[1]}'
+            formatter: function(params) {
+              let res = params.name + '<br/>'
+              const value = parseFloat(params.data[1])
+              res += params.seriesName + ' : ' + value.toFixed(2)
+              if (value > 20) {
+                res += '<br/>燃气(%VOL)' + (value / 20.0).toFixed(2)
+              }
+              return res
+            }
+          }
+        },
+        chartData: {
+          columns: ['uptime', 'strength'],
+          rows: []
+        }
+      }
+    },
+    methods: {
+      fetchData(params) {
+        this.listQuery.wellCode = params.wellCode
+        this.listQuery.beginTime = params.beginTime
+        this.listQuery.endTime = params.endTime
+        getStaticData(this.listQuery).then(response => {
+          if (response.data.length === 0) {
+            this.$message.error('该井此段时间内无燃气数据，请修改监测指标或查询范围')
+          }
+          const data = response.data.map(item => {
+            return {
+              strength: item.strength,
+              strengthVOL: (item.strength / 20.0).toFixed(2),
+              uptime: item.uptime
+            }
+          })
+          this.chartData.rows = data.sort(compare('uptime'))
+          this.$refs['linechart'].echarts.resize()
+        })
       }
     }
-  },
-  methods: {
-    fetchData(params) {
-      this.listQuery.keywords = params.wellCode
-      this.listQuery.beginTime = params.beginTime
-      this.listQuery.endTime = params.endTime
-      getGasData(this.listQuery).then(response => {
-        if (response.data.rows.length === 0) {
-          this.$message.error('该井此段时间内无燃气数据，请修改监测指标或查询范围')
-        }
-        this.chartData.rows = response.data.rows.sort(compare('uptime'))
-        this.$refs['linechart'].echarts.resize()
-      })
-    }
   }
-}
 </script>
diff --git a/src/views/dataStatics/components/liquidData.vue b/src/views/dataStatics/components/liquidData.vue
index b74c17b..01893ab 100644
--- a/src/views/dataStatics/components/liquidData.vue
+++ b/src/views/dataStatics/components/liquidData.vue
@@ -3,53 +3,51 @@
 </template>
 
 <script>
-import { getLiquidData } from '@/api/data'
-import { compare } from '@/utils/compare'
+  import { getStaticData } from '@/api/data'
+  import { compare } from '@/utils/compare'
 
-export default {
-  name: 'LiquidData',
-  data() {
-    this.title = {
-      text: '液位数据曲线图'
-    }
-    this.chartSettings = {
-      labelMap: {
-        'liquiddata': '液位值(m)',
-        'uptime': '上报时间'
-      },
-      metrics: ['liquiddata'],
-      dimension: ['uptime']
-    }
-    return {
-      listQuery: {
-        keywords: '', // 关键字
-        deptid: '', // 部门id
-        beginTime: '', // 开始时间
-        endTime: '', // 结束时间
-        offset: 1,
-        limit: 100000,
-        sort: '',
-        order: ''
-      },
-      chartData: {
-        columns: ['uptime', 'liquiddata'],
-        rows: []
+  export default {
+    name: 'LiquidData',
+    data() {
+      this.title = {
+        text: '液位数据曲线图'
+      }
+      this.chartSettings = {
+        labelMap: {
+          'liquiddata': '液位值(m)',
+          'uptime': '上报时间'
+        },
+        metrics: ['liquiddata'],
+        dimension: ['uptime']
+      }
+      return {
+        listQuery: {
+          wellCode: '', // 关键字
+          watchType: 'liquid', // 数据类型
+          beginTime: '', // 开始时间
+          endTime: '', // 结束时间
+          sort: '',
+          order: ''
+        },
+        chartData: {
+          columns: ['uptime', 'liquiddata'],
+          rows: []
+        }
+      }
+    },
+    methods: {
+      fetchData(params) {
+        this.listQuery.wellCode = params.wellCode
+        this.listQuery.beginTime = params.beginTime
+        this.listQuery.endTime = params.endTime
+        getStaticData(this.listQuery).then(response => {
+          if (response.data.length === 0) {
+            this.$message.error('该井此段时间内无液位数据，请修改监测指标或查询范围')
+          }
+          this.chartData.rows = response.data.sort(compare('uptime'))
+          this.$refs['linechart'].echarts.resize()
+        })
       }
     }
-  },
-  methods: {
-    fetchData(params) {
-      this.listQuery.keywords = params.wellCode
-      this.listQuery.beginTime = params.beginTime
-      this.listQuery.endTime = params.endTime
-      getLiquidData(this.listQuery).then(response => {
-        if (response.data.rows.length === 0) {
-          this.$message.error('该井此段时间内无液位数据，请修改监测指标或查询范围')
-        }
-        this.chartData.rows = response.data.rows.sort(compare('uptime'))
-        this.$refs['linechart'].echarts.resize()
-      })
-    }
   }
-}
 </script>

diff --git a/src/api/data.js b/src/api/data.js
index afeee10..0353d91 100644
--- a/src/api/data.js
+++ b/src/api/data.js
@@ -66,6 +66,14 @@
     params
   })
 }
+// 液位燃气一体化设备数据查询
+export function getLiquidGasData(params) {
+  return request({
+    url: 'liquidGasData/list',
+    method: 'get',
+    params
+  })
+}
 
 // 批量导出井盖数据
 export function batchExportWellData(params) {
@@ -154,4 +162,23 @@
     responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
   })
 }
+// 批量导出液位燃气一体化设备数据
+export function batchExportLiquidGasData(params) {
+  return request({
+    url: '/liquidGasData/export',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 数据统计接口
+export function getStaticData(params) {
+  return request({
+    url: 'data/list',
+    method: 'get',
+    params
+  })
+}
 
diff --git a/src/api/liquidgasconfig.js b/src/api/liquidgasconfig.js
new file mode 100644
index 0000000..9d0fd6b
--- /dev/null
+++ b/src/api/liquidgasconfig.js
@@ -0,0 +1,42 @@
+/**
+ * 液位燃气一体化设备配置接口
+ */
+import request from '@/utils/request'
+// 燃气配置查询
+export function getLiquidGasConfigList(params) {
+  return request({
+    url: 'busConfig/liquidGasConfig/list',
+    method: 'get',
+    params
+  })
+}
+
+// 修改燃气配置
+export function editLiquidGasConfig(params) {
+  return request({
+    url: 'busConfig/liquidGasConfig/config',
+    method: 'post',
+    params
+  })
+}
+
+// 批量导入
+export function batchImportLiquidGasConfig(fileobj) {
+  const param = new FormData()
+  param.append('file', fileobj)
+  return request({
+    url: 'busConfig/gasLiquidConfig/batchImport',
+    method: 'post',
+    headers: { 'Content-Type': 'multipart/form-data' },
+    data: param
+  })
+}
+// 批量导出
+export function batchExportLiquidGasConfig(params) {
+  return request({
+    url: 'busConfig/liquidGasConfig/batchExport',
+    method: 'get',
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
diff --git a/src/views/dataManage/dataManage.vue b/src/views/dataManage/dataManage.vue
index a46b904..cdad03f 100644
--- a/src/views/dataManage/dataManage.vue
+++ b/src/views/dataManage/dataManage.vue
@@ -25,6 +25,9 @@
       <el-tab-pane v-if="hasPerm('/welllocadata/list')" label="井盖定位监测仪" name="wellloca">
         <list-well-loca-data ref="welllocadatacomp"/>
       </el-tab-pane>
+      <el-tab-pane v-if="hasPerm('/liquidGasData/list')" label="燃气智能终端(一体化)" name="liquidgas">
+        <list-liquid-gas-data ref="liquidgasdatacomp"/>
+      </el-tab-pane>
     </el-tabs>
   </div>
 </template>
@@ -37,13 +40,14 @@
 import ListHarmfulData from './deviceData/listHarmfulData'
 import ListTempData from './deviceData/listTempData'
 import ListWellLocaData from './deviceData/listWellLocaData'
+import ListLiquidGasData from './deviceData/listLiquidGasData'
 import { parseUrl } from '@/utils/parseutils'
 import { hasPermission } from '@/utils/permission'
 import ListNoiseData from './deviceData/listNoiseData'
 
 export default {
   name: 'DataManage',
-  components: { ListNoiseData, ListWellLocaData, ListTempData, ListHarmfulData, ListDigData, ListGasData, ListLiquidData, ListWellCoverData },
+  components: { ListNoiseData, ListWellLocaData, ListTempData, ListHarmfulData, ListDigData, ListGasData, ListLiquidData, ListWellCoverData, ListLiquidGasData },
   data() {
     return {
       activeName: 'wellcover'
@@ -86,6 +90,8 @@
         this.$refs.digdatacomp.fetchData()
       } else if (tab.name === 'wellloca') {
         this.$refs.welllocadatacomp.fetchData()
+      } else if (tab.name === 'liquidgas') {
+        this.$refs.liquidgasdatacomp.fetchData()
       }
     },
     changeTab(deviceType) {
@@ -105,6 +111,8 @@
         this.activeName = 'wellloca'
       } else if (deviceType === '8') {
         this.activeName = 'noise'
+      } else if (deviceType === '10') {
+        this.activeName = 'liquidgas'
       }
     },
     // 计算那个是当前第一个tab
@@ -125,6 +133,8 @@
         this.activeName = 'wellloca'
       } else if (hasPermission('/noisedata/list')) {
         this.activeName = 'noise'
+      } else if (hasPermission('/liquidGasData/list')) {
+        this.activeName = 'liquidgas'
       }
     }
   }
diff --git a/src/views/dataManage/deviceData/listDigData.vue b/src/views/dataManage/deviceData/listDigData.vue
index 775af19..5308300 100644
--- a/src/views/dataManage/deviceData/listDigData.vue
+++ b/src/views/dataManage/deviceData/listDigData.vue
@@ -63,6 +63,7 @@
 import { getDigData, batchExportDigData } from '@/api/data'
 import DeptSelect from '../../../components/DeptSelect/index'
 import { parseUrl } from '@/utils/parseutils'
+import { getDayTime } from '@/utils/dateutils'
 
 export default {
   name: 'ListDigData',
@@ -165,6 +166,9 @@
       if (params && params.deviceType === '6' && params.devcode) {
         this.listQuery.keywords = params.devcode
       }
+      const defaultBeginTime = getDayTime(new Date().getTime() - 24 * 7 * 60 * 60 * 1000).Format('yyyy-MM-dd hh:mm:ss')
+      const defaultEndTime = new Date().Format('yyyy-MM-dd hh:mm:ss')
+      this.timeRange = [defaultBeginTime, defaultEndTime]
       this.fetchData()
     }
   },
diff --git a/src/views/dataManage/deviceData/listGasData.vue b/src/views/dataManage/deviceData/listGasData.vue
index 97cdfdb..e365ee9 100644
--- a/src/views/dataManage/deviceData/listGasData.vue
+++ b/src/views/dataManage/deviceData/listGasData.vue
@@ -63,6 +63,7 @@
 import { getGasData, batchExportGasData } from '@/api/data'
 import DeptSelect from '../../../components/DeptSelect/index'
 import { parseUrl } from '@/utils/parseutils'
+import { getDayTime } from '@/utils/dateutils'
 
 export default {
   name: 'ListGasData',
@@ -163,6 +164,9 @@
       if (params && params.deviceType === '4' && params.devcode) {
         this.listQuery.keywords = params.devcode
       }
+      const defaultBeginTime = getDayTime(new Date().getTime() - 24 * 7 * 60 * 60 * 1000).Format('yyyy-MM-dd hh:mm:ss')
+      const defaultEndTime = new Date().Format('yyyy-MM-dd hh:mm:ss')
+      this.timeRange = [defaultBeginTime, defaultEndTime]
       this.fetchData()
     }
   },
diff --git a/src/views/dataManage/deviceData/listHarmfulData.vue b/src/views/dataManage/deviceData/listHarmfulData.vue
index e6a795c..d2398cf 100644
--- a/src/views/dataManage/deviceData/listHarmfulData.vue
+++ b/src/views/dataManage/deviceData/listHarmfulData.vue
@@ -63,6 +63,7 @@
 import { getHarmfulData, batchExportHarmfulData } from '@/api/data'
 import DeptSelect from '../../../components/DeptSelect/index'
 import { parseUrl } from '@/utils/parseutils'
+import { getDayTime } from '@/utils/dateutils'
 
 export default {
   name: 'ListHarmfulData',
@@ -176,6 +177,9 @@
       if (params && params.deviceType === '3' && params.devcode) {
         this.listQuery.keywords = params.devcode
       }
+      const defaultBeginTime = getDayTime(new Date().getTime() - 24 * 7 * 60 * 60 * 1000).Format('yyyy-MM-dd hh:mm:ss')
+      const defaultEndTime = new Date().Format('yyyy-MM-dd hh:mm:ss')
+      this.timeRange = [defaultBeginTime, defaultEndTime]
       this.fetchData()
     }
   },
diff --git a/src/views/dataManage/deviceData/listLiquidData.vue b/src/views/dataManage/deviceData/listLiquidData.vue
index 709e3a8..dea0ba5 100644
--- a/src/views/dataManage/deviceData/listLiquidData.vue
+++ b/src/views/dataManage/deviceData/listLiquidData.vue
@@ -63,6 +63,7 @@
 import { getLiquidData, batchExportLiquidData } from '@/api/data'
 import DeptSelect from '../../../components/DeptSelect/index'
 import { parseUrl } from '@/utils/parseutils'
+import { getDayTime } from '@/utils/dateutils'
 
 export default {
   name: 'ListLiquidData',
@@ -158,6 +159,9 @@
       if (params && params.deviceType === '2' && params.devcode) {
         this.listQuery.keywords = params.devcode
       }
+      const defaultBeginTime = getDayTime(new Date().getTime() - 24 * 7 * 60 * 60 * 1000).Format('yyyy-MM-dd hh:mm:ss')
+      const defaultEndTime = new Date().Format('yyyy-MM-dd hh:mm:ss')
+      this.timeRange = [defaultBeginTime, defaultEndTime]
       this.fetchData()
     }
   },
diff --git a/src/views/dataManage/deviceData/listLiquidGasData.vue b/src/views/dataManage/deviceData/listLiquidGasData.vue
new file mode 100644
index 0000000..9ba38ed
--- /dev/null
+++ b/src/views/dataManage/deviceData/listLiquidGasData.vue
@@ -0,0 +1,413 @@
+<!--液位燃气一体化设备数列表-->
+<template>
+  <div class="app-container">
+    <!--筛选条件-->
+    <div class="search-div">
+      <el-form ref="selectForm" :inline="true" :model="listQuery" class="form-container">
+        <el-row>
+          <el-form-item class="selectForm-container-item" prop="keywords">
+            <el-input v-model.trim="listQuery.keywords" placeholder="井编号/设备编号" clearable/>
+          </el-form-item>
+          <el-form-item class="selectForm-container-item">
+            <dept-select v-model="listQuery.deptid" :need-top="deptShowTop" dept-type="03" placeholder="选择权属单位/使用单位"/>
+          </el-form-item>
+          <el-form-item class="selectForm-container-item">
+            <el-select v-model="listQuery.sensorType" placeholder="请选择传感器类型">
+              <el-option label="液位" value="liquid"/>
+              <el-option label="燃气" value="gas"/>
+            </el-select>
+          </el-form-item>
+          <el-form-item class="selectForm-container-item" prop="beginTime">
+            <el-date-picker
+              v-model="timeRange"
+              type="datetimerange"
+              range-separator="至"
+              value-format="yyyy-MM-dd HH:mm:ss"
+              start-placeholder="开始时间"
+              end-placeholder="结束时间"/>
+          </el-form-item>
+          <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
+        </el-row>
+      </el-form>
+    </div>
+    <!--查询结果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('/liquidGasData/export')" :disabled="list.length === 0" class="edit_btn" size="small" @click="batchExport">导出记录</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">
+            <span v-if="column.checkCell" :class="checkCell(scope.row.cell)">{{ scope.row[column.value] }}</span>
+            <span v-else-if="column.unitFilter">{{ scope.row[column.value]|unit }}</span>
+            <span v-else>{{ scope.row[column.value] }}</span>
+          </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>
+  </div>
+</template>
+
+<script>
+import selectTree from '@/components/SelectTree/singleSelect'
+import { getLiquidGasData, batchExportLiquidGasData } from '@/api/data'
+import DeptSelect from '../../../components/DeptSelect/index'
+import { parseUrl } from '@/utils/parseutils'
+import { getDayTime } from '@/utils/dateutils'
+
+export default {
+  name: 'ListLiquidGasData',
+  components: { DeptSelect, selectTree },
+  filters: {
+    // 燃气浓度单位换算：小于20时单位为%LEL，大于20后，先除以20，加%VOL
+    unit: function(value) {
+      if (value <= 20) {
+        return value + '%LEL'
+      } else {
+        return (value / 20.0).toFixed(2) + '%VOL'
+      }
+    }
+  },
+  data() {
+    return {
+      listQuery: {
+        keywords: '', // 关键字
+        deptid: '', // 部门id
+        sensorType: 'gas', // 传感器类型
+        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: 'data',
+          align: 'center',
+          unitFilter: true
+        },
+        {
+          text: '电量(%)',
+          value: 'cell',
+          width: 80,
+          align: 'center',
+          checkCell: true
+        },
+        {
+          text: '权属单位',
+          value: 'companyName',
+          align: 'center'
+        },
+        {
+          text: '使用单位',
+          value: 'deptName',
+          align: 'center'
+        },
+        {
+          text: '上传时间',
+          value: 'uptime',
+          width: 170,
+          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, // 是否显示编辑框
+      deptShowTop: false
+    }
+  },
+  watch: {
+    timeRange(val) {
+      if (val && val.length > 0) {
+        this.listQuery.beginTime = val[0]
+        this.listQuery.endTime = val[1]
+      } else {
+        this.listQuery.beginTime = ''
+        this.listQuery.endTime = ''
+      }
+    }
+  },
+  created() {
+    // 如果路径里带参数，解析devcode参数
+    if (window.location.href) {
+      const params = parseUrl(window.location.href)
+      if (params && params.deviceType === '10' && params.devcode) {
+        this.listQuery.keywords = params.devcode
+      }
+      const defaultBeginTime = getDayTime(new Date().getTime() - 24 * 7 * 60 * 60 * 1000).Format('yyyy-MM-dd hh:mm:ss')
+      const defaultEndTime = new Date().Format('yyyy-MM-dd hh:mm:ss')
+      this.timeRange = [defaultBeginTime, defaultEndTime]
+      this.fetchData()
+    }
+  },
+  activated() {
+    // 要是路由里有参数
+    if (this.$route.query && this.$route.query.devcode) {
+      this.listQuery.keywords = this.$route.query.devcode
+      const defaultBeginTime = getDayTime(new Date().getTime() - 24 * 7 * 60 * 60 * 1000).Format('yyyy-MM-dd hh:mm:ss')
+      const defaultEndTime = new Date().Format('yyyy-MM-dd hh:mm:ss')
+      this.timeRange = [defaultBeginTime, defaultEndTime]
+      this.fetchData(false)// 获取数据
+    } else {
+      // if (this.timeRange.length === 0) {
+      const defaultBeginTime = getDayTime(new Date().getTime() - 24 * 7 * 60 * 60 * 1000).Format('yyyy-MM-dd hh:mm:ss')
+      const defaultEndTime = new Date().Format('yyyy-MM-dd hh:mm:ss')
+      this.timeRange = [defaultBeginTime, defaultEndTime]
+      // }
+      this.fetchData()
+    }
+  },
+  methods: {
+    // 批量导出
+    batchExport() {
+      console.log('批量导出液位配置')
+      // 全屏加载动画
+      const loading = this.$loading({
+        lock: true,
+        text: '数据处理中,请稍后...',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
+      })
+      batchExportLiquidGasData(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
+        if (this.listQuery.sensorType === 'liquid') {
+          downloadElement.download = `燃气智能终端（一体化）数据-液位.xlsx` // 下载后文件名
+        } else {
+          downloadElement.download = `燃气智能终端（一体化）数据-燃气.xlsx` // 下载后文件名
+        }
+        document.body.appendChild(downloadElement)
+        downloadElement.click() // 点击下载
+        document.body.removeChild(downloadElement) // 下载完成移除元素
+        window.URL.revokeObjectURL(href) // 释放blob对象
+      }).catch((res) => {
+        loading.close()
+      })
+    },
+    // 查询数据
+    search() {
+      // 判断查询类型并更新columns
+      if (this.listQuery.sensorType === 'liquid') {
+        this.columns = [
+          {
+            text: '设备编号',
+            value: 'devcode',
+            align: 'center'
+          },
+          {
+            text: '井编号',
+            value: 'wellCode',
+            align: 'center'
+          },
+          {
+            text: '设备类型',
+            value: 'deviceTypeName',
+            align: 'center'
+          },
+          {
+            text: '液位值(m)',
+            value: 'data',
+            align: 'center'
+          },
+          {
+            text: '电量(%)',
+            value: 'cell',
+            width: 80,
+            align: 'center',
+            checkCell: true
+          },
+          {
+            text: '权属单位',
+            value: 'companyName',
+            align: 'center'
+          },
+          {
+            text: '使用单位',
+            value: 'deptName',
+            align: 'center'
+          },
+          {
+            text: '上传时间',
+            value: 'uptime',
+            width: 170,
+            align: 'center'
+          }
+        ]// 显示列
+      } else {
+        this.columns = [
+          {
+            text: '设备编号',
+            value: 'devcode',
+            align: 'center'
+          },
+          {
+            text: '井编号',
+            value: 'wellCode',
+            align: 'center'
+          },
+          {
+            text: '设备类型',
+            value: 'deviceTypeName',
+            align: 'center'
+          },
+          {
+            text: '燃气浓度',
+            value: 'data',
+            align: 'center',
+            unitFilter: true
+          },
+          {
+            text: '电量(%)',
+            value: 'cell',
+            width: 80,
+            align: 'center',
+            checkCell: true
+          },
+          {
+            text: '权属单位',
+            value: 'companyName',
+            align: 'center'
+          },
+          {
+            text: '使用单位',
+            value: 'deptName',
+            align: 'center'
+          },
+          {
+            text: '上传时间',
+            value: 'uptime',
+            width: 170,
+            align: 'center'
+          }
+        ]
+      }
+      this.list = []
+      this.fetchData(false)
+    },
+    // 获取液位配置数据
+    fetchData(isNowPage = true) {
+      this.listLoading = true
+      if (!isNowPage) { // 是否显示当前页，否则跳转第一页
+        this.listQuery.offset = 1
+      }
+      getLiquidGasData(this.listQuery).then(response => {
+        this.list = response.data.rows
+        this.total = parseInt(response.data.total)
+        this.listLoading = false
+      })
+    },
+    checkCell(value) {
+      var cell = parseFloat(value)
+      if (cell < 10) {
+        return 'warning-state'
+      }
+    },
+    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
+    }
+  }
+  .warning-state{
+    color:red
+  }
+</style>
diff --git a/src/views/dataManage/deviceData/listNoiseData.vue b/src/views/dataManage/deviceData/listNoiseData.vue
index fd909d9..e42b4cf 100644
--- a/src/views/dataManage/deviceData/listNoiseData.vue
+++ b/src/views/dataManage/deviceData/listNoiseData.vue
@@ -63,6 +63,7 @@
 import { getNoiseData, batchExportNoiseData } from '@/api/data'
 import DeptSelect from '../../../components/DeptSelect/index'
 import { parseUrl } from '@/utils/parseutils'
+import { getDayTime } from '@/utils/dateutils'
 
 export default {
   name: 'ListNoiseData',
@@ -165,6 +166,9 @@
       if (params && params.deviceType === '6' && params.devcode) {
         this.listQuery.keywords = params.devcode
       }
+      const defaultBeginTime = getDayTime(new Date().getTime() - 24 * 7 * 60 * 60 * 1000).Format('yyyy-MM-dd hh:mm:ss')
+      const defaultEndTime = new Date().Format('yyyy-MM-dd hh:mm:ss')
+      this.timeRange = [defaultBeginTime, defaultEndTime]
       this.fetchData()
     }
   },
diff --git a/src/views/dataManage/deviceData/listTempData.vue b/src/views/dataManage/deviceData/listTempData.vue
index 2fead0e..8bbb92f 100644
--- a/src/views/dataManage/deviceData/listTempData.vue
+++ b/src/views/dataManage/deviceData/listTempData.vue
@@ -63,6 +63,7 @@
 import { getTempData, batchExportTempData } from '@/api/data'
 import DeptSelect from '../../../components/DeptSelect/index'
 import { parseUrl } from '@/utils/parseutils'
+import { getDayTime } from '@/utils/dateutils'
 
 export default {
   name: 'ListTempData',
@@ -162,6 +163,9 @@
       const params = parseUrl(window.location.href)
       if (params && params.deviceType === '5' && params.devcode) {
         this.listQuery.keywords = params.devcode
+        const defaultBeginTime = getDayTime(new Date().getTime() - 24 * 7 * 60 * 60 * 1000).Format('yyyy-MM-dd hh:mm:ss')
+        const defaultEndTime = new Date().Format('yyyy-MM-dd hh:mm:ss')
+        this.timeRange = [defaultBeginTime, defaultEndTime]
       }
       this.fetchData()
     }
diff --git a/src/views/dataManage/deviceData/listWellCoverData.vue b/src/views/dataManage/deviceData/listWellCoverData.vue
index 4ef378c..e286794 100644
--- a/src/views/dataManage/deviceData/listWellCoverData.vue
+++ b/src/views/dataManage/deviceData/listWellCoverData.vue
@@ -63,6 +63,7 @@
 import { getWellData, batchExportWellData } from '@/api/data'
 import DeptSelect from '../../../components/DeptSelect/index'
 import { parseUrl } from '@/utils/parseutils'
+import { getDayTime } from '@/utils/dateutils'
 
 export default {
   name: 'ListWellCoverData',
@@ -134,17 +135,6 @@
       deptShowTop: false
     }
   },
-  watch: {
-    timeRange(val) {
-      if (val && val.length > 0) {
-        this.listQuery.beginTime = val[0]
-        this.listQuery.endTime = val[1]
-      } else {
-        this.listQuery.beginTime = ''
-        this.listQuery.endTime = ''
-      }
-    }
-  },
   created() {
     // 如果路径里带参数，解析devcode参数
     if (window.location.href) {
@@ -152,6 +142,9 @@
       if (params && params.deviceType === '1' && params.devcode) {
         this.listQuery.keywords = params.devcode
       }
+      const defaultBeginTime = getDayTime(new Date().getTime() - 24 * 7 * 60 * 60 * 1000).Format('yyyy-MM-dd hh:mm:ss')
+      const defaultEndTime = new Date().Format('yyyy-MM-dd hh:mm:ss')
+      this.timeRange = [defaultBeginTime, defaultEndTime]
       this.fetchData()
     }
   },
@@ -202,6 +195,13 @@
       if (!isNowPage) { // 是否显示当前页，否则跳转第一页
         this.listQuery.offset = 1
       }
+      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 = ''
+      }
       getWellData(this.listQuery).then(response => {
         this.list = response.data.rows
         this.total = parseInt(response.data.total)
diff --git a/src/views/dataManage/deviceData/listWellLocaData.vue b/src/views/dataManage/deviceData/listWellLocaData.vue
index 45cf40b..a4bdd6a 100644
--- a/src/views/dataManage/deviceData/listWellLocaData.vue
+++ b/src/views/dataManage/deviceData/listWellLocaData.vue
@@ -63,6 +63,7 @@
 import { getWellLocaData, batchExportWellLocaData } from '@/api/data'
 import DeptSelect from '../../../components/DeptSelect/index'
 import { parseUrl } from '@/utils/parseutils'
+import { getDayTime } from '@/utils/dateutils'
 
 export default {
   name: 'ListWellLocaData',
@@ -156,6 +157,9 @@
       if (params && params.deviceType === '7' && params.devcode) {
         this.listQuery.keywords = params.devcode
       }
+      const defaultBeginTime = getDayTime(new Date().getTime() - 24 * 7 * 60 * 60 * 1000).Format('yyyy-MM-dd hh:mm:ss')
+      const defaultEndTime = new Date().Format('yyyy-MM-dd hh:mm:ss')
+      this.timeRange = [defaultBeginTime, defaultEndTime]
       this.fetchData()
     }
   },
diff --git a/src/views/dataStatics/components/gasData.vue b/src/views/dataStatics/components/gasData.vue
index f570352..11d2ed5 100644
--- a/src/views/dataStatics/components/gasData.vue
+++ b/src/views/dataStatics/components/gasData.vue
@@ -1,56 +1,79 @@
 <template>
-  <ve-line ref="linechart" :title="title" :data="chartData" :settings="chartSettings"/>
+  <ve-line ref="linechart" :title="title" :data="chartData" :settings="chartSettings" :tooltip="options.tooltip"/>
 </template>
 
 <script>
-import { getGasData } from '@/api/data'
-import { compare } from '@/utils/compare'
-import 'v-charts/lib/style.css'
+  import { getStaticData } from '@/api/data'
+  import { compare } from '@/utils/compare'
+  import 'v-charts/lib/style.css'
 
-export default {
-  name: 'GasData',
-  data() {
-    this.title = {
-      text: '燃气监测曲线图'
-    }
-    this.chartSettings = {
-      labelMap: {
-        'strength': '燃气(%LEL)',
-        'uptime': '上报时间'
-      },
-      metrics: ['strength'],
-      dimension: ['uptime']
-    }
-    return {
-      listQuery: {
-        keywords: '', // 关键字
-        deptid: '', // 部门id
-        beginTime: '', // 开始时间
-        endTime: '', // 结束时间
-        offset: 1,
-        limit: 100000,
-        sort: '',
-        order: ''
-      },
-      chartData: {
-        columns: ['uptime', 'strength'],
-        rows: []
+  export default {
+    name: 'GasData',
+    data() {
+      this.title = {
+        text: '燃气监测曲线图'
+      }
+      this.chartSettings = {
+        // xAxisType: 'time',
+        labelMap: {
+          'strength': '燃气(%LEL)',
+          'strengthVOL': '燃气(%VOL)',
+          'uptime': '上报时间'
+        }, // 别名
+        metrics: ['strength'], // 指标
+        dimension: ['uptime']// 维度
+      }
+      return {
+        listQuery: {
+          wellCode: '', // 关键字
+          watchType: 'gas', // 监控数据
+          beginTime: '', // 开始时间
+          endTime: '', // 结束时间
+          offset: 1,
+          limit: 100000,
+          sort: '',
+          order: ''
+        },
+        options: {
+          tooltip: {
+            // formatter: '{b}<br/>{a} : {c0.split(\',\')[1]}<br/>燃气浓度(%VOL){c0.split(\',\')[1]}'
+            formatter: function(params) {
+              let res = params.name + '<br/>'
+              const value = parseFloat(params.data[1])
+              res += params.seriesName + ' : ' + value.toFixed(2)
+              if (value > 20) {
+                res += '<br/>燃气(%VOL)' + (value / 20.0).toFixed(2)
+              }
+              return res
+            }
+          }
+        },
+        chartData: {
+          columns: ['uptime', 'strength'],
+          rows: []
+        }
+      }
+    },
+    methods: {
+      fetchData(params) {
+        this.listQuery.wellCode = params.wellCode
+        this.listQuery.beginTime = params.beginTime
+        this.listQuery.endTime = params.endTime
+        getStaticData(this.listQuery).then(response => {
+          if (response.data.length === 0) {
+            this.$message.error('该井此段时间内无燃气数据，请修改监测指标或查询范围')
+          }
+          const data = response.data.map(item => {
+            return {
+              strength: item.strength,
+              strengthVOL: (item.strength / 20.0).toFixed(2),
+              uptime: item.uptime
+            }
+          })
+          this.chartData.rows = data.sort(compare('uptime'))
+          this.$refs['linechart'].echarts.resize()
+        })
       }
     }
-  },
-  methods: {
-    fetchData(params) {
-      this.listQuery.keywords = params.wellCode
-      this.listQuery.beginTime = params.beginTime
-      this.listQuery.endTime = params.endTime
-      getGasData(this.listQuery).then(response => {
-        if (response.data.rows.length === 0) {
-          this.$message.error('该井此段时间内无燃气数据，请修改监测指标或查询范围')
-        }
-        this.chartData.rows = response.data.rows.sort(compare('uptime'))
-        this.$refs['linechart'].echarts.resize()
-      })
-    }
   }
-}
 </script>
diff --git a/src/views/dataStatics/components/liquidData.vue b/src/views/dataStatics/components/liquidData.vue
index b74c17b..01893ab 100644
--- a/src/views/dataStatics/components/liquidData.vue
+++ b/src/views/dataStatics/components/liquidData.vue
@@ -3,53 +3,51 @@
 </template>
 
 <script>
-import { getLiquidData } from '@/api/data'
-import { compare } from '@/utils/compare'
+  import { getStaticData } from '@/api/data'
+  import { compare } from '@/utils/compare'
 
-export default {
-  name: 'LiquidData',
-  data() {
-    this.title = {
-      text: '液位数据曲线图'
-    }
-    this.chartSettings = {
-      labelMap: {
-        'liquiddata': '液位值(m)',
-        'uptime': '上报时间'
-      },
-      metrics: ['liquiddata'],
-      dimension: ['uptime']
-    }
-    return {
-      listQuery: {
-        keywords: '', // 关键字
-        deptid: '', // 部门id
-        beginTime: '', // 开始时间
-        endTime: '', // 结束时间
-        offset: 1,
-        limit: 100000,
-        sort: '',
-        order: ''
-      },
-      chartData: {
-        columns: ['uptime', 'liquiddata'],
-        rows: []
+  export default {
+    name: 'LiquidData',
+    data() {
+      this.title = {
+        text: '液位数据曲线图'
+      }
+      this.chartSettings = {
+        labelMap: {
+          'liquiddata': '液位值(m)',
+          'uptime': '上报时间'
+        },
+        metrics: ['liquiddata'],
+        dimension: ['uptime']
+      }
+      return {
+        listQuery: {
+          wellCode: '', // 关键字
+          watchType: 'liquid', // 数据类型
+          beginTime: '', // 开始时间
+          endTime: '', // 结束时间
+          sort: '',
+          order: ''
+        },
+        chartData: {
+          columns: ['uptime', 'liquiddata'],
+          rows: []
+        }
+      }
+    },
+    methods: {
+      fetchData(params) {
+        this.listQuery.wellCode = params.wellCode
+        this.listQuery.beginTime = params.beginTime
+        this.listQuery.endTime = params.endTime
+        getStaticData(this.listQuery).then(response => {
+          if (response.data.length === 0) {
+            this.$message.error('该井此段时间内无液位数据，请修改监测指标或查询范围')
+          }
+          this.chartData.rows = response.data.sort(compare('uptime'))
+          this.$refs['linechart'].echarts.resize()
+        })
       }
     }
-  },
-  methods: {
-    fetchData(params) {
-      this.listQuery.keywords = params.wellCode
-      this.listQuery.beginTime = params.beginTime
-      this.listQuery.endTime = params.endTime
-      getLiquidData(this.listQuery).then(response => {
-        if (response.data.rows.length === 0) {
-          this.$message.error('该井此段时间内无液位数据，请修改监测指标或查询范围')
-        }
-        this.chartData.rows = response.data.rows.sort(compare('uptime'))
-        this.$refs['linechart'].echarts.resize()
-      })
-    }
   }
-}
 </script>
diff --git a/src/views/deviceConfig/components/editLiquidGasConfig.vue b/src/views/deviceConfig/components/editLiquidGasConfig.vue
new file mode 100644
index 0000000..622489e
--- /dev/null
+++ b/src/views/deviceConfig/components/editLiquidGasConfig.vue
@@ -0,0 +1,286 @@
+<!-- 燃气液位一体化设备配置-->
+<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 :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="重传次数" prop="retryTimes">
+            <el-input-number :min="1" :max="9" v-model="configForm.retryTimes" type="text" placeholder="必填"/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="采集间隔(分)" prop="collectInterval">
+            <el-input v-model.trim="configForm.collectInterval" type="text" placeholder="必填"/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="上传周期(分)" prop="uploadPeriod">
+            <el-input v-model.trim="configForm.uploadPeriod" type="text" placeholder="必填"/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="最大尝试次数">
+            <el-input-number :min="1" :max="100" v-model="configForm.attemptsMax" type="text" placeholder="必填"/>
+          </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-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 { editLiquidGasConfig } from '@/api/liquidgasconfig'
+import { getDeviceSimpleList } from '@/api/liquidconfig'
+import { validateFloatPlus } from '@/utils/validate'
+export default {
+  name: 'EditLiquidGasConfig',
+  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()
+      }
+    }
+    const validateCollectCycle = (rule, value, callback) => {
+      if (value !== '') {
+        if (validateFloatPlus(value, 5, 1440) === true) {
+          callback()
+        } else {
+          callback(new Error('请填写5到1440数值'))
+        }
+      } else {
+        callback(new Error('采集间隔不能为空'))
+      }
+    }
+    const validateUpPeriod = (rule, value, callback) => {
+      if (value !== '') {
+        if (validateFloatPlus(value, 0, 10080) === true) {
+          callback()
+        } else {
+          callback(new Error('请填写0到10080之间数值'))
+        }
+      } else {
+        callback(new Error('上传周期不能为空'))
+      }
+    }
+    return {
+      dialogFormVisible: false, // 对话框是否显示
+      dialogStatus: '', // 对话框类型：create,update
+      deviceForm: {
+        deviceName: '',
+        deviceTypeName: '',
+        deptName: '',
+        devcode: '',
+        deviceType: ''
+      }, // 设备基本信息
+      configForm: {
+        id: '', // config id
+        deviceId: '', // 设备id
+        collectInterval: '', // 报警阈值
+        uploadPeriod: '', // 安装高度
+        retryTimes: '3', // 重传次数
+        attemptsMax: '3', // 最大尝试次数
+        ip: '', // ip地址
+        port: '' // 端口号
+      },
+      textMap: {
+        update: '编辑',
+        create: '新增'
+      }, // 表头显示标题
+      devices: [], // 设备下拉选择列表
+      loading: false, // 加载动画是否显示
+      canEdit: true, // 是否允许点击保存按钮
+      rules: {
+        collectInterval: [{ required: true, trigger: ['blur', 'change'], validator: validateCollectCycle }],
+        uploadPeriod: [{ required: true, trigger: ['blur', 'change'], validator: validateUpPeriod }],
+        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
+          collectInterval: row.collectInterval, // 采集间隔
+          uploadPeriod: row.uploadPeriod, // 上传周期
+          retryTimes: row.retryTimes, // 重传次数
+          ip: row.ip, // ip地址
+          port: row.port, // 端口号
+          attemptsMax: row.attemptsMax // 最大尝试次数
+        }
+      }
+    },
+    // 重置表单
+    resetForm() {
+      this.deviceForm = {
+        deviceName: '',
+        deviceTypeName: '',
+        deptName: '',
+        devcode: ''
+      }
+      this.configForm = {
+        deviceId: '', // 设备id
+        collectInterval: '', // 采集间隔
+        uploadPeriod: '', // 上传周期
+        retryTimes: '3', // 重传次数
+        ip: '', // ip地址
+        port: '', // 端口号
+        attemptsMax: '3' // 最大尝试次数
+      }
+    },
+    // 保存数据
+    saveData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          this.canEdit = false
+          editLiquidGasConfig(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('10', '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/data.js b/src/api/data.js
index afeee10..0353d91 100644
--- a/src/api/data.js
+++ b/src/api/data.js
@@ -66,6 +66,14 @@
     params
   })
 }
+// 液位燃气一体化设备数据查询
+export function getLiquidGasData(params) {
+  return request({
+    url: 'liquidGasData/list',
+    method: 'get',
+    params
+  })
+}
 
 // 批量导出井盖数据
 export function batchExportWellData(params) {
@@ -154,4 +162,23 @@
     responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
   })
 }
+// 批量导出液位燃气一体化设备数据
+export function batchExportLiquidGasData(params) {
+  return request({
+    url: '/liquidGasData/export',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 数据统计接口
+export function getStaticData(params) {
+  return request({
+    url: 'data/list',
+    method: 'get',
+    params
+  })
+}
 
diff --git a/src/api/liquidgasconfig.js b/src/api/liquidgasconfig.js
new file mode 100644
index 0000000..9d0fd6b
--- /dev/null
+++ b/src/api/liquidgasconfig.js
@@ -0,0 +1,42 @@
+/**
+ * 液位燃气一体化设备配置接口
+ */
+import request from '@/utils/request'
+// 燃气配置查询
+export function getLiquidGasConfigList(params) {
+  return request({
+    url: 'busConfig/liquidGasConfig/list',
+    method: 'get',
+    params
+  })
+}
+
+// 修改燃气配置
+export function editLiquidGasConfig(params) {
+  return request({
+    url: 'busConfig/liquidGasConfig/config',
+    method: 'post',
+    params
+  })
+}
+
+// 批量导入
+export function batchImportLiquidGasConfig(fileobj) {
+  const param = new FormData()
+  param.append('file', fileobj)
+  return request({
+    url: 'busConfig/gasLiquidConfig/batchImport',
+    method: 'post',
+    headers: { 'Content-Type': 'multipart/form-data' },
+    data: param
+  })
+}
+// 批量导出
+export function batchExportLiquidGasConfig(params) {
+  return request({
+    url: 'busConfig/liquidGasConfig/batchExport',
+    method: 'get',
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
diff --git a/src/views/dataManage/dataManage.vue b/src/views/dataManage/dataManage.vue
index a46b904..cdad03f 100644
--- a/src/views/dataManage/dataManage.vue
+++ b/src/views/dataManage/dataManage.vue
@@ -25,6 +25,9 @@
       <el-tab-pane v-if="hasPerm('/welllocadata/list')" label="井盖定位监测仪" name="wellloca">
         <list-well-loca-data ref="welllocadatacomp"/>
       </el-tab-pane>
+      <el-tab-pane v-if="hasPerm('/liquidGasData/list')" label="燃气智能终端(一体化)" name="liquidgas">
+        <list-liquid-gas-data ref="liquidgasdatacomp"/>
+      </el-tab-pane>
     </el-tabs>
   </div>
 </template>
@@ -37,13 +40,14 @@
 import ListHarmfulData from './deviceData/listHarmfulData'
 import ListTempData from './deviceData/listTempData'
 import ListWellLocaData from './deviceData/listWellLocaData'
+import ListLiquidGasData from './deviceData/listLiquidGasData'
 import { parseUrl } from '@/utils/parseutils'
 import { hasPermission } from '@/utils/permission'
 import ListNoiseData from './deviceData/listNoiseData'
 
 export default {
   name: 'DataManage',
-  components: { ListNoiseData, ListWellLocaData, ListTempData, ListHarmfulData, ListDigData, ListGasData, ListLiquidData, ListWellCoverData },
+  components: { ListNoiseData, ListWellLocaData, ListTempData, ListHarmfulData, ListDigData, ListGasData, ListLiquidData, ListWellCoverData, ListLiquidGasData },
   data() {
     return {
       activeName: 'wellcover'
@@ -86,6 +90,8 @@
         this.$refs.digdatacomp.fetchData()
       } else if (tab.name === 'wellloca') {
         this.$refs.welllocadatacomp.fetchData()
+      } else if (tab.name === 'liquidgas') {
+        this.$refs.liquidgasdatacomp.fetchData()
       }
     },
     changeTab(deviceType) {
@@ -105,6 +111,8 @@
         this.activeName = 'wellloca'
       } else if (deviceType === '8') {
         this.activeName = 'noise'
+      } else if (deviceType === '10') {
+        this.activeName = 'liquidgas'
       }
     },
     // 计算那个是当前第一个tab
@@ -125,6 +133,8 @@
         this.activeName = 'wellloca'
       } else if (hasPermission('/noisedata/list')) {
         this.activeName = 'noise'
+      } else if (hasPermission('/liquidGasData/list')) {
+        this.activeName = 'liquidgas'
       }
     }
   }
diff --git a/src/views/dataManage/deviceData/listDigData.vue b/src/views/dataManage/deviceData/listDigData.vue
index 775af19..5308300 100644
--- a/src/views/dataManage/deviceData/listDigData.vue
+++ b/src/views/dataManage/deviceData/listDigData.vue
@@ -63,6 +63,7 @@
 import { getDigData, batchExportDigData } from '@/api/data'
 import DeptSelect from '../../../components/DeptSelect/index'
 import { parseUrl } from '@/utils/parseutils'
+import { getDayTime } from '@/utils/dateutils'
 
 export default {
   name: 'ListDigData',
@@ -165,6 +166,9 @@
       if (params && params.deviceType === '6' && params.devcode) {
         this.listQuery.keywords = params.devcode
       }
+      const defaultBeginTime = getDayTime(new Date().getTime() - 24 * 7 * 60 * 60 * 1000).Format('yyyy-MM-dd hh:mm:ss')
+      const defaultEndTime = new Date().Format('yyyy-MM-dd hh:mm:ss')
+      this.timeRange = [defaultBeginTime, defaultEndTime]
       this.fetchData()
     }
   },
diff --git a/src/views/dataManage/deviceData/listGasData.vue b/src/views/dataManage/deviceData/listGasData.vue
index 97cdfdb..e365ee9 100644
--- a/src/views/dataManage/deviceData/listGasData.vue
+++ b/src/views/dataManage/deviceData/listGasData.vue
@@ -63,6 +63,7 @@
 import { getGasData, batchExportGasData } from '@/api/data'
 import DeptSelect from '../../../components/DeptSelect/index'
 import { parseUrl } from '@/utils/parseutils'
+import { getDayTime } from '@/utils/dateutils'
 
 export default {
   name: 'ListGasData',
@@ -163,6 +164,9 @@
       if (params && params.deviceType === '4' && params.devcode) {
         this.listQuery.keywords = params.devcode
       }
+      const defaultBeginTime = getDayTime(new Date().getTime() - 24 * 7 * 60 * 60 * 1000).Format('yyyy-MM-dd hh:mm:ss')
+      const defaultEndTime = new Date().Format('yyyy-MM-dd hh:mm:ss')
+      this.timeRange = [defaultBeginTime, defaultEndTime]
       this.fetchData()
     }
   },
diff --git a/src/views/dataManage/deviceData/listHarmfulData.vue b/src/views/dataManage/deviceData/listHarmfulData.vue
index e6a795c..d2398cf 100644
--- a/src/views/dataManage/deviceData/listHarmfulData.vue
+++ b/src/views/dataManage/deviceData/listHarmfulData.vue
@@ -63,6 +63,7 @@
 import { getHarmfulData, batchExportHarmfulData } from '@/api/data'
 import DeptSelect from '../../../components/DeptSelect/index'
 import { parseUrl } from '@/utils/parseutils'
+import { getDayTime } from '@/utils/dateutils'
 
 export default {
   name: 'ListHarmfulData',
@@ -176,6 +177,9 @@
       if (params && params.deviceType === '3' && params.devcode) {
         this.listQuery.keywords = params.devcode
       }
+      const defaultBeginTime = getDayTime(new Date().getTime() - 24 * 7 * 60 * 60 * 1000).Format('yyyy-MM-dd hh:mm:ss')
+      const defaultEndTime = new Date().Format('yyyy-MM-dd hh:mm:ss')
+      this.timeRange = [defaultBeginTime, defaultEndTime]
       this.fetchData()
     }
   },
diff --git a/src/views/dataManage/deviceData/listLiquidData.vue b/src/views/dataManage/deviceData/listLiquidData.vue
index 709e3a8..dea0ba5 100644
--- a/src/views/dataManage/deviceData/listLiquidData.vue
+++ b/src/views/dataManage/deviceData/listLiquidData.vue
@@ -63,6 +63,7 @@
 import { getLiquidData, batchExportLiquidData } from '@/api/data'
 import DeptSelect from '../../../components/DeptSelect/index'
 import { parseUrl } from '@/utils/parseutils'
+import { getDayTime } from '@/utils/dateutils'
 
 export default {
   name: 'ListLiquidData',
@@ -158,6 +159,9 @@
       if (params && params.deviceType === '2' && params.devcode) {
         this.listQuery.keywords = params.devcode
       }
+      const defaultBeginTime = getDayTime(new Date().getTime() - 24 * 7 * 60 * 60 * 1000).Format('yyyy-MM-dd hh:mm:ss')
+      const defaultEndTime = new Date().Format('yyyy-MM-dd hh:mm:ss')
+      this.timeRange = [defaultBeginTime, defaultEndTime]
       this.fetchData()
     }
   },
diff --git a/src/views/dataManage/deviceData/listLiquidGasData.vue b/src/views/dataManage/deviceData/listLiquidGasData.vue
new file mode 100644
index 0000000..9ba38ed
--- /dev/null
+++ b/src/views/dataManage/deviceData/listLiquidGasData.vue
@@ -0,0 +1,413 @@
+<!--液位燃气一体化设备数列表-->
+<template>
+  <div class="app-container">
+    <!--筛选条件-->
+    <div class="search-div">
+      <el-form ref="selectForm" :inline="true" :model="listQuery" class="form-container">
+        <el-row>
+          <el-form-item class="selectForm-container-item" prop="keywords">
+            <el-input v-model.trim="listQuery.keywords" placeholder="井编号/设备编号" clearable/>
+          </el-form-item>
+          <el-form-item class="selectForm-container-item">
+            <dept-select v-model="listQuery.deptid" :need-top="deptShowTop" dept-type="03" placeholder="选择权属单位/使用单位"/>
+          </el-form-item>
+          <el-form-item class="selectForm-container-item">
+            <el-select v-model="listQuery.sensorType" placeholder="请选择传感器类型">
+              <el-option label="液位" value="liquid"/>
+              <el-option label="燃气" value="gas"/>
+            </el-select>
+          </el-form-item>
+          <el-form-item class="selectForm-container-item" prop="beginTime">
+            <el-date-picker
+              v-model="timeRange"
+              type="datetimerange"
+              range-separator="至"
+              value-format="yyyy-MM-dd HH:mm:ss"
+              start-placeholder="开始时间"
+              end-placeholder="结束时间"/>
+          </el-form-item>
+          <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
+        </el-row>
+      </el-form>
+    </div>
+    <!--查询结果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('/liquidGasData/export')" :disabled="list.length === 0" class="edit_btn" size="small" @click="batchExport">导出记录</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">
+            <span v-if="column.checkCell" :class="checkCell(scope.row.cell)">{{ scope.row[column.value] }}</span>
+            <span v-else-if="column.unitFilter">{{ scope.row[column.value]|unit }}</span>
+            <span v-else>{{ scope.row[column.value] }}</span>
+          </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>
+  </div>
+</template>
+
+<script>
+import selectTree from '@/components/SelectTree/singleSelect'
+import { getLiquidGasData, batchExportLiquidGasData } from '@/api/data'
+import DeptSelect from '../../../components/DeptSelect/index'
+import { parseUrl } from '@/utils/parseutils'
+import { getDayTime } from '@/utils/dateutils'
+
+export default {
+  name: 'ListLiquidGasData',
+  components: { DeptSelect, selectTree },
+  filters: {
+    // 燃气浓度单位换算：小于20时单位为%LEL，大于20后，先除以20，加%VOL
+    unit: function(value) {
+      if (value <= 20) {
+        return value + '%LEL'
+      } else {
+        return (value / 20.0).toFixed(2) + '%VOL'
+      }
+    }
+  },
+  data() {
+    return {
+      listQuery: {
+        keywords: '', // 关键字
+        deptid: '', // 部门id
+        sensorType: 'gas', // 传感器类型
+        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: 'data',
+          align: 'center',
+          unitFilter: true
+        },
+        {
+          text: '电量(%)',
+          value: 'cell',
+          width: 80,
+          align: 'center',
+          checkCell: true
+        },
+        {
+          text: '权属单位',
+          value: 'companyName',
+          align: 'center'
+        },
+        {
+          text: '使用单位',
+          value: 'deptName',
+          align: 'center'
+        },
+        {
+          text: '上传时间',
+          value: 'uptime',
+          width: 170,
+          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, // 是否显示编辑框
+      deptShowTop: false
+    }
+  },
+  watch: {
+    timeRange(val) {
+      if (val && val.length > 0) {
+        this.listQuery.beginTime = val[0]
+        this.listQuery.endTime = val[1]
+      } else {
+        this.listQuery.beginTime = ''
+        this.listQuery.endTime = ''
+      }
+    }
+  },
+  created() {
+    // 如果路径里带参数，解析devcode参数
+    if (window.location.href) {
+      const params = parseUrl(window.location.href)
+      if (params && params.deviceType === '10' && params.devcode) {
+        this.listQuery.keywords = params.devcode
+      }
+      const defaultBeginTime = getDayTime(new Date().getTime() - 24 * 7 * 60 * 60 * 1000).Format('yyyy-MM-dd hh:mm:ss')
+      const defaultEndTime = new Date().Format('yyyy-MM-dd hh:mm:ss')
+      this.timeRange = [defaultBeginTime, defaultEndTime]
+      this.fetchData()
+    }
+  },
+  activated() {
+    // 要是路由里有参数
+    if (this.$route.query && this.$route.query.devcode) {
+      this.listQuery.keywords = this.$route.query.devcode
+      const defaultBeginTime = getDayTime(new Date().getTime() - 24 * 7 * 60 * 60 * 1000).Format('yyyy-MM-dd hh:mm:ss')
+      const defaultEndTime = new Date().Format('yyyy-MM-dd hh:mm:ss')
+      this.timeRange = [defaultBeginTime, defaultEndTime]
+      this.fetchData(false)// 获取数据
+    } else {
+      // if (this.timeRange.length === 0) {
+      const defaultBeginTime = getDayTime(new Date().getTime() - 24 * 7 * 60 * 60 * 1000).Format('yyyy-MM-dd hh:mm:ss')
+      const defaultEndTime = new Date().Format('yyyy-MM-dd hh:mm:ss')
+      this.timeRange = [defaultBeginTime, defaultEndTime]
+      // }
+      this.fetchData()
+    }
+  },
+  methods: {
+    // 批量导出
+    batchExport() {
+      console.log('批量导出液位配置')
+      // 全屏加载动画
+      const loading = this.$loading({
+        lock: true,
+        text: '数据处理中,请稍后...',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
+      })
+      batchExportLiquidGasData(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
+        if (this.listQuery.sensorType === 'liquid') {
+          downloadElement.download = `燃气智能终端（一体化）数据-液位.xlsx` // 下载后文件名
+        } else {
+          downloadElement.download = `燃气智能终端（一体化）数据-燃气.xlsx` // 下载后文件名
+        }
+        document.body.appendChild(downloadElement)
+        downloadElement.click() // 点击下载
+        document.body.removeChild(downloadElement) // 下载完成移除元素
+        window.URL.revokeObjectURL(href) // 释放blob对象
+      }).catch((res) => {
+        loading.close()
+      })
+    },
+    // 查询数据
+    search() {
+      // 判断查询类型并更新columns
+      if (this.listQuery.sensorType === 'liquid') {
+        this.columns = [
+          {
+            text: '设备编号',
+            value: 'devcode',
+            align: 'center'
+          },
+          {
+            text: '井编号',
+            value: 'wellCode',
+            align: 'center'
+          },
+          {
+            text: '设备类型',
+            value: 'deviceTypeName',
+            align: 'center'
+          },
+          {
+            text: '液位值(m)',
+            value: 'data',
+            align: 'center'
+          },
+          {
+            text: '电量(%)',
+            value: 'cell',
+            width: 80,
+            align: 'center',
+            checkCell: true
+          },
+          {
+            text: '权属单位',
+            value: 'companyName',
+            align: 'center'
+          },
+          {
+            text: '使用单位',
+            value: 'deptName',
+            align: 'center'
+          },
+          {
+            text: '上传时间',
+            value: 'uptime',
+            width: 170,
+            align: 'center'
+          }
+        ]// 显示列
+      } else {
+        this.columns = [
+          {
+            text: '设备编号',
+            value: 'devcode',
+            align: 'center'
+          },
+          {
+            text: '井编号',
+            value: 'wellCode',
+            align: 'center'
+          },
+          {
+            text: '设备类型',
+            value: 'deviceTypeName',
+            align: 'center'
+          },
+          {
+            text: '燃气浓度',
+            value: 'data',
+            align: 'center',
+            unitFilter: true
+          },
+          {
+            text: '电量(%)',
+            value: 'cell',
+            width: 80,
+            align: 'center',
+            checkCell: true
+          },
+          {
+            text: '权属单位',
+            value: 'companyName',
+            align: 'center'
+          },
+          {
+            text: '使用单位',
+            value: 'deptName',
+            align: 'center'
+          },
+          {
+            text: '上传时间',
+            value: 'uptime',
+            width: 170,
+            align: 'center'
+          }
+        ]
+      }
+      this.list = []
+      this.fetchData(false)
+    },
+    // 获取液位配置数据
+    fetchData(isNowPage = true) {
+      this.listLoading = true
+      if (!isNowPage) { // 是否显示当前页，否则跳转第一页
+        this.listQuery.offset = 1
+      }
+      getLiquidGasData(this.listQuery).then(response => {
+        this.list = response.data.rows
+        this.total = parseInt(response.data.total)
+        this.listLoading = false
+      })
+    },
+    checkCell(value) {
+      var cell = parseFloat(value)
+      if (cell < 10) {
+        return 'warning-state'
+      }
+    },
+    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
+    }
+  }
+  .warning-state{
+    color:red
+  }
+</style>
diff --git a/src/views/dataManage/deviceData/listNoiseData.vue b/src/views/dataManage/deviceData/listNoiseData.vue
index fd909d9..e42b4cf 100644
--- a/src/views/dataManage/deviceData/listNoiseData.vue
+++ b/src/views/dataManage/deviceData/listNoiseData.vue
@@ -63,6 +63,7 @@
 import { getNoiseData, batchExportNoiseData } from '@/api/data'
 import DeptSelect from '../../../components/DeptSelect/index'
 import { parseUrl } from '@/utils/parseutils'
+import { getDayTime } from '@/utils/dateutils'
 
 export default {
   name: 'ListNoiseData',
@@ -165,6 +166,9 @@
       if (params && params.deviceType === '6' && params.devcode) {
         this.listQuery.keywords = params.devcode
       }
+      const defaultBeginTime = getDayTime(new Date().getTime() - 24 * 7 * 60 * 60 * 1000).Format('yyyy-MM-dd hh:mm:ss')
+      const defaultEndTime = new Date().Format('yyyy-MM-dd hh:mm:ss')
+      this.timeRange = [defaultBeginTime, defaultEndTime]
       this.fetchData()
     }
   },
diff --git a/src/views/dataManage/deviceData/listTempData.vue b/src/views/dataManage/deviceData/listTempData.vue
index 2fead0e..8bbb92f 100644
--- a/src/views/dataManage/deviceData/listTempData.vue
+++ b/src/views/dataManage/deviceData/listTempData.vue
@@ -63,6 +63,7 @@
 import { getTempData, batchExportTempData } from '@/api/data'
 import DeptSelect from '../../../components/DeptSelect/index'
 import { parseUrl } from '@/utils/parseutils'
+import { getDayTime } from '@/utils/dateutils'
 
 export default {
   name: 'ListTempData',
@@ -162,6 +163,9 @@
       const params = parseUrl(window.location.href)
       if (params && params.deviceType === '5' && params.devcode) {
         this.listQuery.keywords = params.devcode
+        const defaultBeginTime = getDayTime(new Date().getTime() - 24 * 7 * 60 * 60 * 1000).Format('yyyy-MM-dd hh:mm:ss')
+        const defaultEndTime = new Date().Format('yyyy-MM-dd hh:mm:ss')
+        this.timeRange = [defaultBeginTime, defaultEndTime]
       }
       this.fetchData()
     }
diff --git a/src/views/dataManage/deviceData/listWellCoverData.vue b/src/views/dataManage/deviceData/listWellCoverData.vue
index 4ef378c..e286794 100644
--- a/src/views/dataManage/deviceData/listWellCoverData.vue
+++ b/src/views/dataManage/deviceData/listWellCoverData.vue
@@ -63,6 +63,7 @@
 import { getWellData, batchExportWellData } from '@/api/data'
 import DeptSelect from '../../../components/DeptSelect/index'
 import { parseUrl } from '@/utils/parseutils'
+import { getDayTime } from '@/utils/dateutils'
 
 export default {
   name: 'ListWellCoverData',
@@ -134,17 +135,6 @@
       deptShowTop: false
     }
   },
-  watch: {
-    timeRange(val) {
-      if (val && val.length > 0) {
-        this.listQuery.beginTime = val[0]
-        this.listQuery.endTime = val[1]
-      } else {
-        this.listQuery.beginTime = ''
-        this.listQuery.endTime = ''
-      }
-    }
-  },
   created() {
     // 如果路径里带参数，解析devcode参数
     if (window.location.href) {
@@ -152,6 +142,9 @@
       if (params && params.deviceType === '1' && params.devcode) {
         this.listQuery.keywords = params.devcode
       }
+      const defaultBeginTime = getDayTime(new Date().getTime() - 24 * 7 * 60 * 60 * 1000).Format('yyyy-MM-dd hh:mm:ss')
+      const defaultEndTime = new Date().Format('yyyy-MM-dd hh:mm:ss')
+      this.timeRange = [defaultBeginTime, defaultEndTime]
       this.fetchData()
     }
   },
@@ -202,6 +195,13 @@
       if (!isNowPage) { // 是否显示当前页，否则跳转第一页
         this.listQuery.offset = 1
       }
+      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 = ''
+      }
       getWellData(this.listQuery).then(response => {
         this.list = response.data.rows
         this.total = parseInt(response.data.total)
diff --git a/src/views/dataManage/deviceData/listWellLocaData.vue b/src/views/dataManage/deviceData/listWellLocaData.vue
index 45cf40b..a4bdd6a 100644
--- a/src/views/dataManage/deviceData/listWellLocaData.vue
+++ b/src/views/dataManage/deviceData/listWellLocaData.vue
@@ -63,6 +63,7 @@
 import { getWellLocaData, batchExportWellLocaData } from '@/api/data'
 import DeptSelect from '../../../components/DeptSelect/index'
 import { parseUrl } from '@/utils/parseutils'
+import { getDayTime } from '@/utils/dateutils'
 
 export default {
   name: 'ListWellLocaData',
@@ -156,6 +157,9 @@
       if (params && params.deviceType === '7' && params.devcode) {
         this.listQuery.keywords = params.devcode
       }
+      const defaultBeginTime = getDayTime(new Date().getTime() - 24 * 7 * 60 * 60 * 1000).Format('yyyy-MM-dd hh:mm:ss')
+      const defaultEndTime = new Date().Format('yyyy-MM-dd hh:mm:ss')
+      this.timeRange = [defaultBeginTime, defaultEndTime]
       this.fetchData()
     }
   },
diff --git a/src/views/dataStatics/components/gasData.vue b/src/views/dataStatics/components/gasData.vue
index f570352..11d2ed5 100644
--- a/src/views/dataStatics/components/gasData.vue
+++ b/src/views/dataStatics/components/gasData.vue
@@ -1,56 +1,79 @@
 <template>
-  <ve-line ref="linechart" :title="title" :data="chartData" :settings="chartSettings"/>
+  <ve-line ref="linechart" :title="title" :data="chartData" :settings="chartSettings" :tooltip="options.tooltip"/>
 </template>
 
 <script>
-import { getGasData } from '@/api/data'
-import { compare } from '@/utils/compare'
-import 'v-charts/lib/style.css'
+  import { getStaticData } from '@/api/data'
+  import { compare } from '@/utils/compare'
+  import 'v-charts/lib/style.css'
 
-export default {
-  name: 'GasData',
-  data() {
-    this.title = {
-      text: '燃气监测曲线图'
-    }
-    this.chartSettings = {
-      labelMap: {
-        'strength': '燃气(%LEL)',
-        'uptime': '上报时间'
-      },
-      metrics: ['strength'],
-      dimension: ['uptime']
-    }
-    return {
-      listQuery: {
-        keywords: '', // 关键字
-        deptid: '', // 部门id
-        beginTime: '', // 开始时间
-        endTime: '', // 结束时间
-        offset: 1,
-        limit: 100000,
-        sort: '',
-        order: ''
-      },
-      chartData: {
-        columns: ['uptime', 'strength'],
-        rows: []
+  export default {
+    name: 'GasData',
+    data() {
+      this.title = {
+        text: '燃气监测曲线图'
+      }
+      this.chartSettings = {
+        // xAxisType: 'time',
+        labelMap: {
+          'strength': '燃气(%LEL)',
+          'strengthVOL': '燃气(%VOL)',
+          'uptime': '上报时间'
+        }, // 别名
+        metrics: ['strength'], // 指标
+        dimension: ['uptime']// 维度
+      }
+      return {
+        listQuery: {
+          wellCode: '', // 关键字
+          watchType: 'gas', // 监控数据
+          beginTime: '', // 开始时间
+          endTime: '', // 结束时间
+          offset: 1,
+          limit: 100000,
+          sort: '',
+          order: ''
+        },
+        options: {
+          tooltip: {
+            // formatter: '{b}<br/>{a} : {c0.split(\',\')[1]}<br/>燃气浓度(%VOL){c0.split(\',\')[1]}'
+            formatter: function(params) {
+              let res = params.name + '<br/>'
+              const value = parseFloat(params.data[1])
+              res += params.seriesName + ' : ' + value.toFixed(2)
+              if (value > 20) {
+                res += '<br/>燃气(%VOL)' + (value / 20.0).toFixed(2)
+              }
+              return res
+            }
+          }
+        },
+        chartData: {
+          columns: ['uptime', 'strength'],
+          rows: []
+        }
+      }
+    },
+    methods: {
+      fetchData(params) {
+        this.listQuery.wellCode = params.wellCode
+        this.listQuery.beginTime = params.beginTime
+        this.listQuery.endTime = params.endTime
+        getStaticData(this.listQuery).then(response => {
+          if (response.data.length === 0) {
+            this.$message.error('该井此段时间内无燃气数据，请修改监测指标或查询范围')
+          }
+          const data = response.data.map(item => {
+            return {
+              strength: item.strength,
+              strengthVOL: (item.strength / 20.0).toFixed(2),
+              uptime: item.uptime
+            }
+          })
+          this.chartData.rows = data.sort(compare('uptime'))
+          this.$refs['linechart'].echarts.resize()
+        })
       }
     }
-  },
-  methods: {
-    fetchData(params) {
-      this.listQuery.keywords = params.wellCode
-      this.listQuery.beginTime = params.beginTime
-      this.listQuery.endTime = params.endTime
-      getGasData(this.listQuery).then(response => {
-        if (response.data.rows.length === 0) {
-          this.$message.error('该井此段时间内无燃气数据，请修改监测指标或查询范围')
-        }
-        this.chartData.rows = response.data.rows.sort(compare('uptime'))
-        this.$refs['linechart'].echarts.resize()
-      })
-    }
   }
-}
 </script>
diff --git a/src/views/dataStatics/components/liquidData.vue b/src/views/dataStatics/components/liquidData.vue
index b74c17b..01893ab 100644
--- a/src/views/dataStatics/components/liquidData.vue
+++ b/src/views/dataStatics/components/liquidData.vue
@@ -3,53 +3,51 @@
 </template>
 
 <script>
-import { getLiquidData } from '@/api/data'
-import { compare } from '@/utils/compare'
+  import { getStaticData } from '@/api/data'
+  import { compare } from '@/utils/compare'
 
-export default {
-  name: 'LiquidData',
-  data() {
-    this.title = {
-      text: '液位数据曲线图'
-    }
-    this.chartSettings = {
-      labelMap: {
-        'liquiddata': '液位值(m)',
-        'uptime': '上报时间'
-      },
-      metrics: ['liquiddata'],
-      dimension: ['uptime']
-    }
-    return {
-      listQuery: {
-        keywords: '', // 关键字
-        deptid: '', // 部门id
-        beginTime: '', // 开始时间
-        endTime: '', // 结束时间
-        offset: 1,
-        limit: 100000,
-        sort: '',
-        order: ''
-      },
-      chartData: {
-        columns: ['uptime', 'liquiddata'],
-        rows: []
+  export default {
+    name: 'LiquidData',
+    data() {
+      this.title = {
+        text: '液位数据曲线图'
+      }
+      this.chartSettings = {
+        labelMap: {
+          'liquiddata': '液位值(m)',
+          'uptime': '上报时间'
+        },
+        metrics: ['liquiddata'],
+        dimension: ['uptime']
+      }
+      return {
+        listQuery: {
+          wellCode: '', // 关键字
+          watchType: 'liquid', // 数据类型
+          beginTime: '', // 开始时间
+          endTime: '', // 结束时间
+          sort: '',
+          order: ''
+        },
+        chartData: {
+          columns: ['uptime', 'liquiddata'],
+          rows: []
+        }
+      }
+    },
+    methods: {
+      fetchData(params) {
+        this.listQuery.wellCode = params.wellCode
+        this.listQuery.beginTime = params.beginTime
+        this.listQuery.endTime = params.endTime
+        getStaticData(this.listQuery).then(response => {
+          if (response.data.length === 0) {
+            this.$message.error('该井此段时间内无液位数据，请修改监测指标或查询范围')
+          }
+          this.chartData.rows = response.data.sort(compare('uptime'))
+          this.$refs['linechart'].echarts.resize()
+        })
       }
     }
-  },
-  methods: {
-    fetchData(params) {
-      this.listQuery.keywords = params.wellCode
-      this.listQuery.beginTime = params.beginTime
-      this.listQuery.endTime = params.endTime
-      getLiquidData(this.listQuery).then(response => {
-        if (response.data.rows.length === 0) {
-          this.$message.error('该井此段时间内无液位数据，请修改监测指标或查询范围')
-        }
-        this.chartData.rows = response.data.rows.sort(compare('uptime'))
-        this.$refs['linechart'].echarts.resize()
-      })
-    }
   }
-}
 </script>
diff --git a/src/views/deviceConfig/components/editLiquidGasConfig.vue b/src/views/deviceConfig/components/editLiquidGasConfig.vue
new file mode 100644
index 0000000..622489e
--- /dev/null
+++ b/src/views/deviceConfig/components/editLiquidGasConfig.vue
@@ -0,0 +1,286 @@
+<!-- 燃气液位一体化设备配置-->
+<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 :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="重传次数" prop="retryTimes">
+            <el-input-number :min="1" :max="9" v-model="configForm.retryTimes" type="text" placeholder="必填"/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="采集间隔(分)" prop="collectInterval">
+            <el-input v-model.trim="configForm.collectInterval" type="text" placeholder="必填"/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="上传周期(分)" prop="uploadPeriod">
+            <el-input v-model.trim="configForm.uploadPeriod" type="text" placeholder="必填"/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="最大尝试次数">
+            <el-input-number :min="1" :max="100" v-model="configForm.attemptsMax" type="text" placeholder="必填"/>
+          </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-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 { editLiquidGasConfig } from '@/api/liquidgasconfig'
+import { getDeviceSimpleList } from '@/api/liquidconfig'
+import { validateFloatPlus } from '@/utils/validate'
+export default {
+  name: 'EditLiquidGasConfig',
+  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()
+      }
+    }
+    const validateCollectCycle = (rule, value, callback) => {
+      if (value !== '') {
+        if (validateFloatPlus(value, 5, 1440) === true) {
+          callback()
+        } else {
+          callback(new Error('请填写5到1440数值'))
+        }
+      } else {
+        callback(new Error('采集间隔不能为空'))
+      }
+    }
+    const validateUpPeriod = (rule, value, callback) => {
+      if (value !== '') {
+        if (validateFloatPlus(value, 0, 10080) === true) {
+          callback()
+        } else {
+          callback(new Error('请填写0到10080之间数值'))
+        }
+      } else {
+        callback(new Error('上传周期不能为空'))
+      }
+    }
+    return {
+      dialogFormVisible: false, // 对话框是否显示
+      dialogStatus: '', // 对话框类型：create,update
+      deviceForm: {
+        deviceName: '',
+        deviceTypeName: '',
+        deptName: '',
+        devcode: '',
+        deviceType: ''
+      }, // 设备基本信息
+      configForm: {
+        id: '', // config id
+        deviceId: '', // 设备id
+        collectInterval: '', // 报警阈值
+        uploadPeriod: '', // 安装高度
+        retryTimes: '3', // 重传次数
+        attemptsMax: '3', // 最大尝试次数
+        ip: '', // ip地址
+        port: '' // 端口号
+      },
+      textMap: {
+        update: '编辑',
+        create: '新增'
+      }, // 表头显示标题
+      devices: [], // 设备下拉选择列表
+      loading: false, // 加载动画是否显示
+      canEdit: true, // 是否允许点击保存按钮
+      rules: {
+        collectInterval: [{ required: true, trigger: ['blur', 'change'], validator: validateCollectCycle }],
+        uploadPeriod: [{ required: true, trigger: ['blur', 'change'], validator: validateUpPeriod }],
+        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
+          collectInterval: row.collectInterval, // 采集间隔
+          uploadPeriod: row.uploadPeriod, // 上传周期
+          retryTimes: row.retryTimes, // 重传次数
+          ip: row.ip, // ip地址
+          port: row.port, // 端口号
+          attemptsMax: row.attemptsMax // 最大尝试次数
+        }
+      }
+    },
+    // 重置表单
+    resetForm() {
+      this.deviceForm = {
+        deviceName: '',
+        deviceTypeName: '',
+        deptName: '',
+        devcode: ''
+      }
+      this.configForm = {
+        deviceId: '', // 设备id
+        collectInterval: '', // 采集间隔
+        uploadPeriod: '', // 上传周期
+        retryTimes: '3', // 重传次数
+        ip: '', // ip地址
+        port: '', // 端口号
+        attemptsMax: '3' // 最大尝试次数
+      }
+    },
+    // 保存数据
+    saveData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          this.canEdit = false
+          editLiquidGasConfig(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('10', '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/listLiquidGasConfig.vue b/src/views/deviceConfig/components/listLiquidGasConfig.vue
new file mode 100644
index 0000000..f6a178d
--- /dev/null
+++ b/src/views/deviceConfig/components/listLiquidGasConfig.vue
@@ -0,0 +1,330 @@
+<template>
+  <div class="app-container">
+    <!--筛选条件-->
+    <div class="search-div">
+      <el-form ref="selectForm" :inline="true" :model="listQuery" class="form-container">
+        <el-row>
+          <el-form-item class="selectForm-container-item" prop="keywords">
+            <el-input v-model.trim="listQuery.keywords" placeholder="设备编号" clearable/>
+          </el-form-item>
+          <el-form-item class="selectForm-container-item">
+            <dept-select v-model="listQuery.deptid" :need-top="deptShowTop" dept-type="03" placeholder="选择权属单位/使用单位"/>
+          </el-form-item>
+          <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
+        </el-row>
+      </el-form>
+    </div>
+    <!--查询结果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/liquidGasConfig/batchExport')" class="edit_btn" size="small" @click="batchExport">导出记录</el-button>
+          <download-template :filename="filename"/>
+          <el-upload
+            v-if="hasPerm('/busConfig/liquidGasConfig/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/liquidGasConfig/batchImport')" slot="trigger" size="small">批量导入</el-button>
+          </el-upload>
+          <el-button v-if="hasPerm('/busConfig/liquidGasConfig/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 v-if="hasPerm('/busConfig/liquidGasConfig/config')" 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-liquid-gas-config v-show="editShow" ref="editconfig" @watchChild="fetchData"/>
+  </div>
+</template>
+
+<script>
+import { judgeTree, toTreeList } from '@/utils/structure'
+import selectTree from '@/components/SelectTree/singleSelect'
+import { getLiquidGasConfigList, batchImportLiquidGasConfig, batchExportLiquidGasConfig } from '@/api/liquidgasconfig'
+import { getDeptTreeList } from '@/api/dept'
+import EditGasConfig from './editGasConfig'
+import DownloadTemplate from '@/components/DownloadTemplate/index'
+import DeptSelect from '@/components/DeptSelect/index'
+import EditLiquidGasConfig from './editLiquidGasConfig'
+
+export default {
+  name: 'ListLiquidGasConfig',
+  components: { EditLiquidGasConfig, DeptSelect, DownloadTemplate, EditGasConfig, selectTree },
+  data() {
+    return {
+      listQuery: {
+        keywords: '',
+        offset: 1,
+        limit: 20,
+        sort: '',
+        order: ''
+      }, // 筛选条件
+      columns: [
+        {
+          text: '设备编号',
+          value: 'devcode',
+          align: 'center'
+        },
+        {
+          text: '重传次数',
+          value: 'retryTimes',
+          align: 'center'
+        },
+        {
+          text: '采集间隔(分)',
+          value: 'collectInterval',
+          align: 'center'
+        },
+        {
+          text: '上传周期',
+          value: 'uploadPeriod',
+          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: 'methane_config_template.xlsx',
+      deptShowTop: false,
+      fileList: []
+    }
+  },
+  created() {
+    this.fetchDeptTree()// 获取部门树
+    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)'
+      })
+      // 发起导入请求
+      batchImportLiquidGasConfig(_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)'
+      })
+      batchExportLiquidGasConfig(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
+      }
+      getLiquidGasConfigList(this.listQuery).then(response => {
+        this.list = response.data.rows
+        this.total = parseInt(response.data.total)
+        this.listLoading = false
+      })
+    },
+    // 加载组织机构树形下拉菜单
+    fetchDeptTree: function() {
+      getDeptTreeList().then(response => {
+        if (response.data.list) {
+          if (response.data.list.length > 1) {
+            console.log(this.$store.getters.deptId)
+            if (judgeTree(response.data.list)) {
+              this.deptTreeList = toTreeList(response.data.list)
+              this.showDeptTree = 1
+            } else {
+              this.deptTreeList = response.data.list
+              this.showDeptTree = 2
+            }
+            console.log(this.deptTreeList)
+          } else {
+            this.showDeptTree = 0
+          }
+        }
+      })
+    },
+    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/data.js b/src/api/data.js
index afeee10..0353d91 100644
--- a/src/api/data.js
+++ b/src/api/data.js
@@ -66,6 +66,14 @@
     params
   })
 }
+// 液位燃气一体化设备数据查询
+export function getLiquidGasData(params) {
+  return request({
+    url: 'liquidGasData/list',
+    method: 'get',
+    params
+  })
+}
 
 // 批量导出井盖数据
 export function batchExportWellData(params) {
@@ -154,4 +162,23 @@
     responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
   })
 }
+// 批量导出液位燃气一体化设备数据
+export function batchExportLiquidGasData(params) {
+  return request({
+    url: '/liquidGasData/export',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 数据统计接口
+export function getStaticData(params) {
+  return request({
+    url: 'data/list',
+    method: 'get',
+    params
+  })
+}
 
diff --git a/src/api/liquidgasconfig.js b/src/api/liquidgasconfig.js
new file mode 100644
index 0000000..9d0fd6b
--- /dev/null
+++ b/src/api/liquidgasconfig.js
@@ -0,0 +1,42 @@
+/**
+ * 液位燃气一体化设备配置接口
+ */
+import request from '@/utils/request'
+// 燃气配置查询
+export function getLiquidGasConfigList(params) {
+  return request({
+    url: 'busConfig/liquidGasConfig/list',
+    method: 'get',
+    params
+  })
+}
+
+// 修改燃气配置
+export function editLiquidGasConfig(params) {
+  return request({
+    url: 'busConfig/liquidGasConfig/config',
+    method: 'post',
+    params
+  })
+}
+
+// 批量导入
+export function batchImportLiquidGasConfig(fileobj) {
+  const param = new FormData()
+  param.append('file', fileobj)
+  return request({
+    url: 'busConfig/gasLiquidConfig/batchImport',
+    method: 'post',
+    headers: { 'Content-Type': 'multipart/form-data' },
+    data: param
+  })
+}
+// 批量导出
+export function batchExportLiquidGasConfig(params) {
+  return request({
+    url: 'busConfig/liquidGasConfig/batchExport',
+    method: 'get',
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
diff --git a/src/views/dataManage/dataManage.vue b/src/views/dataManage/dataManage.vue
index a46b904..cdad03f 100644
--- a/src/views/dataManage/dataManage.vue
+++ b/src/views/dataManage/dataManage.vue
@@ -25,6 +25,9 @@
       <el-tab-pane v-if="hasPerm('/welllocadata/list')" label="井盖定位监测仪" name="wellloca">
         <list-well-loca-data ref="welllocadatacomp"/>
       </el-tab-pane>
+      <el-tab-pane v-if="hasPerm('/liquidGasData/list')" label="燃气智能终端(一体化)" name="liquidgas">
+        <list-liquid-gas-data ref="liquidgasdatacomp"/>
+      </el-tab-pane>
     </el-tabs>
   </div>
 </template>
@@ -37,13 +40,14 @@
 import ListHarmfulData from './deviceData/listHarmfulData'
 import ListTempData from './deviceData/listTempData'
 import ListWellLocaData from './deviceData/listWellLocaData'
+import ListLiquidGasData from './deviceData/listLiquidGasData'
 import { parseUrl } from '@/utils/parseutils'
 import { hasPermission } from '@/utils/permission'
 import ListNoiseData from './deviceData/listNoiseData'
 
 export default {
   name: 'DataManage',
-  components: { ListNoiseData, ListWellLocaData, ListTempData, ListHarmfulData, ListDigData, ListGasData, ListLiquidData, ListWellCoverData },
+  components: { ListNoiseData, ListWellLocaData, ListTempData, ListHarmfulData, ListDigData, ListGasData, ListLiquidData, ListWellCoverData, ListLiquidGasData },
   data() {
     return {
       activeName: 'wellcover'
@@ -86,6 +90,8 @@
         this.$refs.digdatacomp.fetchData()
       } else if (tab.name === 'wellloca') {
         this.$refs.welllocadatacomp.fetchData()
+      } else if (tab.name === 'liquidgas') {
+        this.$refs.liquidgasdatacomp.fetchData()
       }
     },
     changeTab(deviceType) {
@@ -105,6 +111,8 @@
         this.activeName = 'wellloca'
       } else if (deviceType === '8') {
         this.activeName = 'noise'
+      } else if (deviceType === '10') {
+        this.activeName = 'liquidgas'
       }
     },
     // 计算那个是当前第一个tab
@@ -125,6 +133,8 @@
         this.activeName = 'wellloca'
       } else if (hasPermission('/noisedata/list')) {
         this.activeName = 'noise'
+      } else if (hasPermission('/liquidGasData/list')) {
+        this.activeName = 'liquidgas'
       }
     }
   }
diff --git a/src/views/dataManage/deviceData/listDigData.vue b/src/views/dataManage/deviceData/listDigData.vue
index 775af19..5308300 100644
--- a/src/views/dataManage/deviceData/listDigData.vue
+++ b/src/views/dataManage/deviceData/listDigData.vue
@@ -63,6 +63,7 @@
 import { getDigData, batchExportDigData } from '@/api/data'
 import DeptSelect from '../../../components/DeptSelect/index'
 import { parseUrl } from '@/utils/parseutils'
+import { getDayTime } from '@/utils/dateutils'
 
 export default {
   name: 'ListDigData',
@@ -165,6 +166,9 @@
       if (params && params.deviceType === '6' && params.devcode) {
         this.listQuery.keywords = params.devcode
       }
+      const defaultBeginTime = getDayTime(new Date().getTime() - 24 * 7 * 60 * 60 * 1000).Format('yyyy-MM-dd hh:mm:ss')
+      const defaultEndTime = new Date().Format('yyyy-MM-dd hh:mm:ss')
+      this.timeRange = [defaultBeginTime, defaultEndTime]
       this.fetchData()
     }
   },
diff --git a/src/views/dataManage/deviceData/listGasData.vue b/src/views/dataManage/deviceData/listGasData.vue
index 97cdfdb..e365ee9 100644
--- a/src/views/dataManage/deviceData/listGasData.vue
+++ b/src/views/dataManage/deviceData/listGasData.vue
@@ -63,6 +63,7 @@
 import { getGasData, batchExportGasData } from '@/api/data'
 import DeptSelect from '../../../components/DeptSelect/index'
 import { parseUrl } from '@/utils/parseutils'
+import { getDayTime } from '@/utils/dateutils'
 
 export default {
   name: 'ListGasData',
@@ -163,6 +164,9 @@
       if (params && params.deviceType === '4' && params.devcode) {
         this.listQuery.keywords = params.devcode
       }
+      const defaultBeginTime = getDayTime(new Date().getTime() - 24 * 7 * 60 * 60 * 1000).Format('yyyy-MM-dd hh:mm:ss')
+      const defaultEndTime = new Date().Format('yyyy-MM-dd hh:mm:ss')
+      this.timeRange = [defaultBeginTime, defaultEndTime]
       this.fetchData()
     }
   },
diff --git a/src/views/dataManage/deviceData/listHarmfulData.vue b/src/views/dataManage/deviceData/listHarmfulData.vue
index e6a795c..d2398cf 100644
--- a/src/views/dataManage/deviceData/listHarmfulData.vue
+++ b/src/views/dataManage/deviceData/listHarmfulData.vue
@@ -63,6 +63,7 @@
 import { getHarmfulData, batchExportHarmfulData } from '@/api/data'
 import DeptSelect from '../../../components/DeptSelect/index'
 import { parseUrl } from '@/utils/parseutils'
+import { getDayTime } from '@/utils/dateutils'
 
 export default {
   name: 'ListHarmfulData',
@@ -176,6 +177,9 @@
       if (params && params.deviceType === '3' && params.devcode) {
         this.listQuery.keywords = params.devcode
       }
+      const defaultBeginTime = getDayTime(new Date().getTime() - 24 * 7 * 60 * 60 * 1000).Format('yyyy-MM-dd hh:mm:ss')
+      const defaultEndTime = new Date().Format('yyyy-MM-dd hh:mm:ss')
+      this.timeRange = [defaultBeginTime, defaultEndTime]
       this.fetchData()
     }
   },
diff --git a/src/views/dataManage/deviceData/listLiquidData.vue b/src/views/dataManage/deviceData/listLiquidData.vue
index 709e3a8..dea0ba5 100644
--- a/src/views/dataManage/deviceData/listLiquidData.vue
+++ b/src/views/dataManage/deviceData/listLiquidData.vue
@@ -63,6 +63,7 @@
 import { getLiquidData, batchExportLiquidData } from '@/api/data'
 import DeptSelect from '../../../components/DeptSelect/index'
 import { parseUrl } from '@/utils/parseutils'
+import { getDayTime } from '@/utils/dateutils'
 
 export default {
   name: 'ListLiquidData',
@@ -158,6 +159,9 @@
       if (params && params.deviceType === '2' && params.devcode) {
         this.listQuery.keywords = params.devcode
       }
+      const defaultBeginTime = getDayTime(new Date().getTime() - 24 * 7 * 60 * 60 * 1000).Format('yyyy-MM-dd hh:mm:ss')
+      const defaultEndTime = new Date().Format('yyyy-MM-dd hh:mm:ss')
+      this.timeRange = [defaultBeginTime, defaultEndTime]
       this.fetchData()
     }
   },
diff --git a/src/views/dataManage/deviceData/listLiquidGasData.vue b/src/views/dataManage/deviceData/listLiquidGasData.vue
new file mode 100644
index 0000000..9ba38ed
--- /dev/null
+++ b/src/views/dataManage/deviceData/listLiquidGasData.vue
@@ -0,0 +1,413 @@
+<!--液位燃气一体化设备数列表-->
+<template>
+  <div class="app-container">
+    <!--筛选条件-->
+    <div class="search-div">
+      <el-form ref="selectForm" :inline="true" :model="listQuery" class="form-container">
+        <el-row>
+          <el-form-item class="selectForm-container-item" prop="keywords">
+            <el-input v-model.trim="listQuery.keywords" placeholder="井编号/设备编号" clearable/>
+          </el-form-item>
+          <el-form-item class="selectForm-container-item">
+            <dept-select v-model="listQuery.deptid" :need-top="deptShowTop" dept-type="03" placeholder="选择权属单位/使用单位"/>
+          </el-form-item>
+          <el-form-item class="selectForm-container-item">
+            <el-select v-model="listQuery.sensorType" placeholder="请选择传感器类型">
+              <el-option label="液位" value="liquid"/>
+              <el-option label="燃气" value="gas"/>
+            </el-select>
+          </el-form-item>
+          <el-form-item class="selectForm-container-item" prop="beginTime">
+            <el-date-picker
+              v-model="timeRange"
+              type="datetimerange"
+              range-separator="至"
+              value-format="yyyy-MM-dd HH:mm:ss"
+              start-placeholder="开始时间"
+              end-placeholder="结束时间"/>
+          </el-form-item>
+          <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
+        </el-row>
+      </el-form>
+    </div>
+    <!--查询结果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('/liquidGasData/export')" :disabled="list.length === 0" class="edit_btn" size="small" @click="batchExport">导出记录</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">
+            <span v-if="column.checkCell" :class="checkCell(scope.row.cell)">{{ scope.row[column.value] }}</span>
+            <span v-else-if="column.unitFilter">{{ scope.row[column.value]|unit }}</span>
+            <span v-else>{{ scope.row[column.value] }}</span>
+          </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>
+  </div>
+</template>
+
+<script>
+import selectTree from '@/components/SelectTree/singleSelect'
+import { getLiquidGasData, batchExportLiquidGasData } from '@/api/data'
+import DeptSelect from '../../../components/DeptSelect/index'
+import { parseUrl } from '@/utils/parseutils'
+import { getDayTime } from '@/utils/dateutils'
+
+export default {
+  name: 'ListLiquidGasData',
+  components: { DeptSelect, selectTree },
+  filters: {
+    // 燃气浓度单位换算：小于20时单位为%LEL，大于20后，先除以20，加%VOL
+    unit: function(value) {
+      if (value <= 20) {
+        return value + '%LEL'
+      } else {
+        return (value / 20.0).toFixed(2) + '%VOL'
+      }
+    }
+  },
+  data() {
+    return {
+      listQuery: {
+        keywords: '', // 关键字
+        deptid: '', // 部门id
+        sensorType: 'gas', // 传感器类型
+        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: 'data',
+          align: 'center',
+          unitFilter: true
+        },
+        {
+          text: '电量(%)',
+          value: 'cell',
+          width: 80,
+          align: 'center',
+          checkCell: true
+        },
+        {
+          text: '权属单位',
+          value: 'companyName',
+          align: 'center'
+        },
+        {
+          text: '使用单位',
+          value: 'deptName',
+          align: 'center'
+        },
+        {
+          text: '上传时间',
+          value: 'uptime',
+          width: 170,
+          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, // 是否显示编辑框
+      deptShowTop: false
+    }
+  },
+  watch: {
+    timeRange(val) {
+      if (val && val.length > 0) {
+        this.listQuery.beginTime = val[0]
+        this.listQuery.endTime = val[1]
+      } else {
+        this.listQuery.beginTime = ''
+        this.listQuery.endTime = ''
+      }
+    }
+  },
+  created() {
+    // 如果路径里带参数，解析devcode参数
+    if (window.location.href) {
+      const params = parseUrl(window.location.href)
+      if (params && params.deviceType === '10' && params.devcode) {
+        this.listQuery.keywords = params.devcode
+      }
+      const defaultBeginTime = getDayTime(new Date().getTime() - 24 * 7 * 60 * 60 * 1000).Format('yyyy-MM-dd hh:mm:ss')
+      const defaultEndTime = new Date().Format('yyyy-MM-dd hh:mm:ss')
+      this.timeRange = [defaultBeginTime, defaultEndTime]
+      this.fetchData()
+    }
+  },
+  activated() {
+    // 要是路由里有参数
+    if (this.$route.query && this.$route.query.devcode) {
+      this.listQuery.keywords = this.$route.query.devcode
+      const defaultBeginTime = getDayTime(new Date().getTime() - 24 * 7 * 60 * 60 * 1000).Format('yyyy-MM-dd hh:mm:ss')
+      const defaultEndTime = new Date().Format('yyyy-MM-dd hh:mm:ss')
+      this.timeRange = [defaultBeginTime, defaultEndTime]
+      this.fetchData(false)// 获取数据
+    } else {
+      // if (this.timeRange.length === 0) {
+      const defaultBeginTime = getDayTime(new Date().getTime() - 24 * 7 * 60 * 60 * 1000).Format('yyyy-MM-dd hh:mm:ss')
+      const defaultEndTime = new Date().Format('yyyy-MM-dd hh:mm:ss')
+      this.timeRange = [defaultBeginTime, defaultEndTime]
+      // }
+      this.fetchData()
+    }
+  },
+  methods: {
+    // 批量导出
+    batchExport() {
+      console.log('批量导出液位配置')
+      // 全屏加载动画
+      const loading = this.$loading({
+        lock: true,
+        text: '数据处理中,请稍后...',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
+      })
+      batchExportLiquidGasData(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
+        if (this.listQuery.sensorType === 'liquid') {
+          downloadElement.download = `燃气智能终端（一体化）数据-液位.xlsx` // 下载后文件名
+        } else {
+          downloadElement.download = `燃气智能终端（一体化）数据-燃气.xlsx` // 下载后文件名
+        }
+        document.body.appendChild(downloadElement)
+        downloadElement.click() // 点击下载
+        document.body.removeChild(downloadElement) // 下载完成移除元素
+        window.URL.revokeObjectURL(href) // 释放blob对象
+      }).catch((res) => {
+        loading.close()
+      })
+    },
+    // 查询数据
+    search() {
+      // 判断查询类型并更新columns
+      if (this.listQuery.sensorType === 'liquid') {
+        this.columns = [
+          {
+            text: '设备编号',
+            value: 'devcode',
+            align: 'center'
+          },
+          {
+            text: '井编号',
+            value: 'wellCode',
+            align: 'center'
+          },
+          {
+            text: '设备类型',
+            value: 'deviceTypeName',
+            align: 'center'
+          },
+          {
+            text: '液位值(m)',
+            value: 'data',
+            align: 'center'
+          },
+          {
+            text: '电量(%)',
+            value: 'cell',
+            width: 80,
+            align: 'center',
+            checkCell: true
+          },
+          {
+            text: '权属单位',
+            value: 'companyName',
+            align: 'center'
+          },
+          {
+            text: '使用单位',
+            value: 'deptName',
+            align: 'center'
+          },
+          {
+            text: '上传时间',
+            value: 'uptime',
+            width: 170,
+            align: 'center'
+          }
+        ]// 显示列
+      } else {
+        this.columns = [
+          {
+            text: '设备编号',
+            value: 'devcode',
+            align: 'center'
+          },
+          {
+            text: '井编号',
+            value: 'wellCode',
+            align: 'center'
+          },
+          {
+            text: '设备类型',
+            value: 'deviceTypeName',
+            align: 'center'
+          },
+          {
+            text: '燃气浓度',
+            value: 'data',
+            align: 'center',
+            unitFilter: true
+          },
+          {
+            text: '电量(%)',
+            value: 'cell',
+            width: 80,
+            align: 'center',
+            checkCell: true
+          },
+          {
+            text: '权属单位',
+            value: 'companyName',
+            align: 'center'
+          },
+          {
+            text: '使用单位',
+            value: 'deptName',
+            align: 'center'
+          },
+          {
+            text: '上传时间',
+            value: 'uptime',
+            width: 170,
+            align: 'center'
+          }
+        ]
+      }
+      this.list = []
+      this.fetchData(false)
+    },
+    // 获取液位配置数据
+    fetchData(isNowPage = true) {
+      this.listLoading = true
+      if (!isNowPage) { // 是否显示当前页，否则跳转第一页
+        this.listQuery.offset = 1
+      }
+      getLiquidGasData(this.listQuery).then(response => {
+        this.list = response.data.rows
+        this.total = parseInt(response.data.total)
+        this.listLoading = false
+      })
+    },
+    checkCell(value) {
+      var cell = parseFloat(value)
+      if (cell < 10) {
+        return 'warning-state'
+      }
+    },
+    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
+    }
+  }
+  .warning-state{
+    color:red
+  }
+</style>
diff --git a/src/views/dataManage/deviceData/listNoiseData.vue b/src/views/dataManage/deviceData/listNoiseData.vue
index fd909d9..e42b4cf 100644
--- a/src/views/dataManage/deviceData/listNoiseData.vue
+++ b/src/views/dataManage/deviceData/listNoiseData.vue
@@ -63,6 +63,7 @@
 import { getNoiseData, batchExportNoiseData } from '@/api/data'
 import DeptSelect from '../../../components/DeptSelect/index'
 import { parseUrl } from '@/utils/parseutils'
+import { getDayTime } from '@/utils/dateutils'
 
 export default {
   name: 'ListNoiseData',
@@ -165,6 +166,9 @@
       if (params && params.deviceType === '6' && params.devcode) {
         this.listQuery.keywords = params.devcode
       }
+      const defaultBeginTime = getDayTime(new Date().getTime() - 24 * 7 * 60 * 60 * 1000).Format('yyyy-MM-dd hh:mm:ss')
+      const defaultEndTime = new Date().Format('yyyy-MM-dd hh:mm:ss')
+      this.timeRange = [defaultBeginTime, defaultEndTime]
       this.fetchData()
     }
   },
diff --git a/src/views/dataManage/deviceData/listTempData.vue b/src/views/dataManage/deviceData/listTempData.vue
index 2fead0e..8bbb92f 100644
--- a/src/views/dataManage/deviceData/listTempData.vue
+++ b/src/views/dataManage/deviceData/listTempData.vue
@@ -63,6 +63,7 @@
 import { getTempData, batchExportTempData } from '@/api/data'
 import DeptSelect from '../../../components/DeptSelect/index'
 import { parseUrl } from '@/utils/parseutils'
+import { getDayTime } from '@/utils/dateutils'
 
 export default {
   name: 'ListTempData',
@@ -162,6 +163,9 @@
       const params = parseUrl(window.location.href)
       if (params && params.deviceType === '5' && params.devcode) {
         this.listQuery.keywords = params.devcode
+        const defaultBeginTime = getDayTime(new Date().getTime() - 24 * 7 * 60 * 60 * 1000).Format('yyyy-MM-dd hh:mm:ss')
+        const defaultEndTime = new Date().Format('yyyy-MM-dd hh:mm:ss')
+        this.timeRange = [defaultBeginTime, defaultEndTime]
       }
       this.fetchData()
     }
diff --git a/src/views/dataManage/deviceData/listWellCoverData.vue b/src/views/dataManage/deviceData/listWellCoverData.vue
index 4ef378c..e286794 100644
--- a/src/views/dataManage/deviceData/listWellCoverData.vue
+++ b/src/views/dataManage/deviceData/listWellCoverData.vue
@@ -63,6 +63,7 @@
 import { getWellData, batchExportWellData } from '@/api/data'
 import DeptSelect from '../../../components/DeptSelect/index'
 import { parseUrl } from '@/utils/parseutils'
+import { getDayTime } from '@/utils/dateutils'
 
 export default {
   name: 'ListWellCoverData',
@@ -134,17 +135,6 @@
       deptShowTop: false
     }
   },
-  watch: {
-    timeRange(val) {
-      if (val && val.length > 0) {
-        this.listQuery.beginTime = val[0]
-        this.listQuery.endTime = val[1]
-      } else {
-        this.listQuery.beginTime = ''
-        this.listQuery.endTime = ''
-      }
-    }
-  },
   created() {
     // 如果路径里带参数，解析devcode参数
     if (window.location.href) {
@@ -152,6 +142,9 @@
       if (params && params.deviceType === '1' && params.devcode) {
         this.listQuery.keywords = params.devcode
       }
+      const defaultBeginTime = getDayTime(new Date().getTime() - 24 * 7 * 60 * 60 * 1000).Format('yyyy-MM-dd hh:mm:ss')
+      const defaultEndTime = new Date().Format('yyyy-MM-dd hh:mm:ss')
+      this.timeRange = [defaultBeginTime, defaultEndTime]
       this.fetchData()
     }
   },
@@ -202,6 +195,13 @@
       if (!isNowPage) { // 是否显示当前页，否则跳转第一页
         this.listQuery.offset = 1
       }
+      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 = ''
+      }
       getWellData(this.listQuery).then(response => {
         this.list = response.data.rows
         this.total = parseInt(response.data.total)
diff --git a/src/views/dataManage/deviceData/listWellLocaData.vue b/src/views/dataManage/deviceData/listWellLocaData.vue
index 45cf40b..a4bdd6a 100644
--- a/src/views/dataManage/deviceData/listWellLocaData.vue
+++ b/src/views/dataManage/deviceData/listWellLocaData.vue
@@ -63,6 +63,7 @@
 import { getWellLocaData, batchExportWellLocaData } from '@/api/data'
 import DeptSelect from '../../../components/DeptSelect/index'
 import { parseUrl } from '@/utils/parseutils'
+import { getDayTime } from '@/utils/dateutils'
 
 export default {
   name: 'ListWellLocaData',
@@ -156,6 +157,9 @@
       if (params && params.deviceType === '7' && params.devcode) {
         this.listQuery.keywords = params.devcode
       }
+      const defaultBeginTime = getDayTime(new Date().getTime() - 24 * 7 * 60 * 60 * 1000).Format('yyyy-MM-dd hh:mm:ss')
+      const defaultEndTime = new Date().Format('yyyy-MM-dd hh:mm:ss')
+      this.timeRange = [defaultBeginTime, defaultEndTime]
       this.fetchData()
     }
   },
diff --git a/src/views/dataStatics/components/gasData.vue b/src/views/dataStatics/components/gasData.vue
index f570352..11d2ed5 100644
--- a/src/views/dataStatics/components/gasData.vue
+++ b/src/views/dataStatics/components/gasData.vue
@@ -1,56 +1,79 @@
 <template>
-  <ve-line ref="linechart" :title="title" :data="chartData" :settings="chartSettings"/>
+  <ve-line ref="linechart" :title="title" :data="chartData" :settings="chartSettings" :tooltip="options.tooltip"/>
 </template>
 
 <script>
-import { getGasData } from '@/api/data'
-import { compare } from '@/utils/compare'
-import 'v-charts/lib/style.css'
+  import { getStaticData } from '@/api/data'
+  import { compare } from '@/utils/compare'
+  import 'v-charts/lib/style.css'
 
-export default {
-  name: 'GasData',
-  data() {
-    this.title = {
-      text: '燃气监测曲线图'
-    }
-    this.chartSettings = {
-      labelMap: {
-        'strength': '燃气(%LEL)',
-        'uptime': '上报时间'
-      },
-      metrics: ['strength'],
-      dimension: ['uptime']
-    }
-    return {
-      listQuery: {
-        keywords: '', // 关键字
-        deptid: '', // 部门id
-        beginTime: '', // 开始时间
-        endTime: '', // 结束时间
-        offset: 1,
-        limit: 100000,
-        sort: '',
-        order: ''
-      },
-      chartData: {
-        columns: ['uptime', 'strength'],
-        rows: []
+  export default {
+    name: 'GasData',
+    data() {
+      this.title = {
+        text: '燃气监测曲线图'
+      }
+      this.chartSettings = {
+        // xAxisType: 'time',
+        labelMap: {
+          'strength': '燃气(%LEL)',
+          'strengthVOL': '燃气(%VOL)',
+          'uptime': '上报时间'
+        }, // 别名
+        metrics: ['strength'], // 指标
+        dimension: ['uptime']// 维度
+      }
+      return {
+        listQuery: {
+          wellCode: '', // 关键字
+          watchType: 'gas', // 监控数据
+          beginTime: '', // 开始时间
+          endTime: '', // 结束时间
+          offset: 1,
+          limit: 100000,
+          sort: '',
+          order: ''
+        },
+        options: {
+          tooltip: {
+            // formatter: '{b}<br/>{a} : {c0.split(\',\')[1]}<br/>燃气浓度(%VOL){c0.split(\',\')[1]}'
+            formatter: function(params) {
+              let res = params.name + '<br/>'
+              const value = parseFloat(params.data[1])
+              res += params.seriesName + ' : ' + value.toFixed(2)
+              if (value > 20) {
+                res += '<br/>燃气(%VOL)' + (value / 20.0).toFixed(2)
+              }
+              return res
+            }
+          }
+        },
+        chartData: {
+          columns: ['uptime', 'strength'],
+          rows: []
+        }
+      }
+    },
+    methods: {
+      fetchData(params) {
+        this.listQuery.wellCode = params.wellCode
+        this.listQuery.beginTime = params.beginTime
+        this.listQuery.endTime = params.endTime
+        getStaticData(this.listQuery).then(response => {
+          if (response.data.length === 0) {
+            this.$message.error('该井此段时间内无燃气数据，请修改监测指标或查询范围')
+          }
+          const data = response.data.map(item => {
+            return {
+              strength: item.strength,
+              strengthVOL: (item.strength / 20.0).toFixed(2),
+              uptime: item.uptime
+            }
+          })
+          this.chartData.rows = data.sort(compare('uptime'))
+          this.$refs['linechart'].echarts.resize()
+        })
       }
     }
-  },
-  methods: {
-    fetchData(params) {
-      this.listQuery.keywords = params.wellCode
-      this.listQuery.beginTime = params.beginTime
-      this.listQuery.endTime = params.endTime
-      getGasData(this.listQuery).then(response => {
-        if (response.data.rows.length === 0) {
-          this.$message.error('该井此段时间内无燃气数据，请修改监测指标或查询范围')
-        }
-        this.chartData.rows = response.data.rows.sort(compare('uptime'))
-        this.$refs['linechart'].echarts.resize()
-      })
-    }
   }
-}
 </script>
diff --git a/src/views/dataStatics/components/liquidData.vue b/src/views/dataStatics/components/liquidData.vue
index b74c17b..01893ab 100644
--- a/src/views/dataStatics/components/liquidData.vue
+++ b/src/views/dataStatics/components/liquidData.vue
@@ -3,53 +3,51 @@
 </template>
 
 <script>
-import { getLiquidData } from '@/api/data'
-import { compare } from '@/utils/compare'
+  import { getStaticData } from '@/api/data'
+  import { compare } from '@/utils/compare'
 
-export default {
-  name: 'LiquidData',
-  data() {
-    this.title = {
-      text: '液位数据曲线图'
-    }
-    this.chartSettings = {
-      labelMap: {
-        'liquiddata': '液位值(m)',
-        'uptime': '上报时间'
-      },
-      metrics: ['liquiddata'],
-      dimension: ['uptime']
-    }
-    return {
-      listQuery: {
-        keywords: '', // 关键字
-        deptid: '', // 部门id
-        beginTime: '', // 开始时间
-        endTime: '', // 结束时间
-        offset: 1,
-        limit: 100000,
-        sort: '',
-        order: ''
-      },
-      chartData: {
-        columns: ['uptime', 'liquiddata'],
-        rows: []
+  export default {
+    name: 'LiquidData',
+    data() {
+      this.title = {
+        text: '液位数据曲线图'
+      }
+      this.chartSettings = {
+        labelMap: {
+          'liquiddata': '液位值(m)',
+          'uptime': '上报时间'
+        },
+        metrics: ['liquiddata'],
+        dimension: ['uptime']
+      }
+      return {
+        listQuery: {
+          wellCode: '', // 关键字
+          watchType: 'liquid', // 数据类型
+          beginTime: '', // 开始时间
+          endTime: '', // 结束时间
+          sort: '',
+          order: ''
+        },
+        chartData: {
+          columns: ['uptime', 'liquiddata'],
+          rows: []
+        }
+      }
+    },
+    methods: {
+      fetchData(params) {
+        this.listQuery.wellCode = params.wellCode
+        this.listQuery.beginTime = params.beginTime
+        this.listQuery.endTime = params.endTime
+        getStaticData(this.listQuery).then(response => {
+          if (response.data.length === 0) {
+            this.$message.error('该井此段时间内无液位数据，请修改监测指标或查询范围')
+          }
+          this.chartData.rows = response.data.sort(compare('uptime'))
+          this.$refs['linechart'].echarts.resize()
+        })
       }
     }
-  },
-  methods: {
-    fetchData(params) {
-      this.listQuery.keywords = params.wellCode
-      this.listQuery.beginTime = params.beginTime
-      this.listQuery.endTime = params.endTime
-      getLiquidData(this.listQuery).then(response => {
-        if (response.data.rows.length === 0) {
-          this.$message.error('该井此段时间内无液位数据，请修改监测指标或查询范围')
-        }
-        this.chartData.rows = response.data.rows.sort(compare('uptime'))
-        this.$refs['linechart'].echarts.resize()
-      })
-    }
   }
-}
 </script>
diff --git a/src/views/deviceConfig/components/editLiquidGasConfig.vue b/src/views/deviceConfig/components/editLiquidGasConfig.vue
new file mode 100644
index 0000000..622489e
--- /dev/null
+++ b/src/views/deviceConfig/components/editLiquidGasConfig.vue
@@ -0,0 +1,286 @@
+<!-- 燃气液位一体化设备配置-->
+<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 :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="重传次数" prop="retryTimes">
+            <el-input-number :min="1" :max="9" v-model="configForm.retryTimes" type="text" placeholder="必填"/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="采集间隔(分)" prop="collectInterval">
+            <el-input v-model.trim="configForm.collectInterval" type="text" placeholder="必填"/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="上传周期(分)" prop="uploadPeriod">
+            <el-input v-model.trim="configForm.uploadPeriod" type="text" placeholder="必填"/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="最大尝试次数">
+            <el-input-number :min="1" :max="100" v-model="configForm.attemptsMax" type="text" placeholder="必填"/>
+          </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-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 { editLiquidGasConfig } from '@/api/liquidgasconfig'
+import { getDeviceSimpleList } from '@/api/liquidconfig'
+import { validateFloatPlus } from '@/utils/validate'
+export default {
+  name: 'EditLiquidGasConfig',
+  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()
+      }
+    }
+    const validateCollectCycle = (rule, value, callback) => {
+      if (value !== '') {
+        if (validateFloatPlus(value, 5, 1440) === true) {
+          callback()
+        } else {
+          callback(new Error('请填写5到1440数值'))
+        }
+      } else {
+        callback(new Error('采集间隔不能为空'))
+      }
+    }
+    const validateUpPeriod = (rule, value, callback) => {
+      if (value !== '') {
+        if (validateFloatPlus(value, 0, 10080) === true) {
+          callback()
+        } else {
+          callback(new Error('请填写0到10080之间数值'))
+        }
+      } else {
+        callback(new Error('上传周期不能为空'))
+      }
+    }
+    return {
+      dialogFormVisible: false, // 对话框是否显示
+      dialogStatus: '', // 对话框类型：create,update
+      deviceForm: {
+        deviceName: '',
+        deviceTypeName: '',
+        deptName: '',
+        devcode: '',
+        deviceType: ''
+      }, // 设备基本信息
+      configForm: {
+        id: '', // config id
+        deviceId: '', // 设备id
+        collectInterval: '', // 报警阈值
+        uploadPeriod: '', // 安装高度
+        retryTimes: '3', // 重传次数
+        attemptsMax: '3', // 最大尝试次数
+        ip: '', // ip地址
+        port: '' // 端口号
+      },
+      textMap: {
+        update: '编辑',
+        create: '新增'
+      }, // 表头显示标题
+      devices: [], // 设备下拉选择列表
+      loading: false, // 加载动画是否显示
+      canEdit: true, // 是否允许点击保存按钮
+      rules: {
+        collectInterval: [{ required: true, trigger: ['blur', 'change'], validator: validateCollectCycle }],
+        uploadPeriod: [{ required: true, trigger: ['blur', 'change'], validator: validateUpPeriod }],
+        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
+          collectInterval: row.collectInterval, // 采集间隔
+          uploadPeriod: row.uploadPeriod, // 上传周期
+          retryTimes: row.retryTimes, // 重传次数
+          ip: row.ip, // ip地址
+          port: row.port, // 端口号
+          attemptsMax: row.attemptsMax // 最大尝试次数
+        }
+      }
+    },
+    // 重置表单
+    resetForm() {
+      this.deviceForm = {
+        deviceName: '',
+        deviceTypeName: '',
+        deptName: '',
+        devcode: ''
+      }
+      this.configForm = {
+        deviceId: '', // 设备id
+        collectInterval: '', // 采集间隔
+        uploadPeriod: '', // 上传周期
+        retryTimes: '3', // 重传次数
+        ip: '', // ip地址
+        port: '', // 端口号
+        attemptsMax: '3' // 最大尝试次数
+      }
+    },
+    // 保存数据
+    saveData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          this.canEdit = false
+          editLiquidGasConfig(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('10', '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/listLiquidGasConfig.vue b/src/views/deviceConfig/components/listLiquidGasConfig.vue
new file mode 100644
index 0000000..f6a178d
--- /dev/null
+++ b/src/views/deviceConfig/components/listLiquidGasConfig.vue
@@ -0,0 +1,330 @@
+<template>
+  <div class="app-container">
+    <!--筛选条件-->
+    <div class="search-div">
+      <el-form ref="selectForm" :inline="true" :model="listQuery" class="form-container">
+        <el-row>
+          <el-form-item class="selectForm-container-item" prop="keywords">
+            <el-input v-model.trim="listQuery.keywords" placeholder="设备编号" clearable/>
+          </el-form-item>
+          <el-form-item class="selectForm-container-item">
+            <dept-select v-model="listQuery.deptid" :need-top="deptShowTop" dept-type="03" placeholder="选择权属单位/使用单位"/>
+          </el-form-item>
+          <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
+        </el-row>
+      </el-form>
+    </div>
+    <!--查询结果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/liquidGasConfig/batchExport')" class="edit_btn" size="small" @click="batchExport">导出记录</el-button>
+          <download-template :filename="filename"/>
+          <el-upload
+            v-if="hasPerm('/busConfig/liquidGasConfig/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/liquidGasConfig/batchImport')" slot="trigger" size="small">批量导入</el-button>
+          </el-upload>
+          <el-button v-if="hasPerm('/busConfig/liquidGasConfig/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 v-if="hasPerm('/busConfig/liquidGasConfig/config')" 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-liquid-gas-config v-show="editShow" ref="editconfig" @watchChild="fetchData"/>
+  </div>
+</template>
+
+<script>
+import { judgeTree, toTreeList } from '@/utils/structure'
+import selectTree from '@/components/SelectTree/singleSelect'
+import { getLiquidGasConfigList, batchImportLiquidGasConfig, batchExportLiquidGasConfig } from '@/api/liquidgasconfig'
+import { getDeptTreeList } from '@/api/dept'
+import EditGasConfig from './editGasConfig'
+import DownloadTemplate from '@/components/DownloadTemplate/index'
+import DeptSelect from '@/components/DeptSelect/index'
+import EditLiquidGasConfig from './editLiquidGasConfig'
+
+export default {
+  name: 'ListLiquidGasConfig',
+  components: { EditLiquidGasConfig, DeptSelect, DownloadTemplate, EditGasConfig, selectTree },
+  data() {
+    return {
+      listQuery: {
+        keywords: '',
+        offset: 1,
+        limit: 20,
+        sort: '',
+        order: ''
+      }, // 筛选条件
+      columns: [
+        {
+          text: '设备编号',
+          value: 'devcode',
+          align: 'center'
+        },
+        {
+          text: '重传次数',
+          value: 'retryTimes',
+          align: 'center'
+        },
+        {
+          text: '采集间隔(分)',
+          value: 'collectInterval',
+          align: 'center'
+        },
+        {
+          text: '上传周期',
+          value: 'uploadPeriod',
+          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: 'methane_config_template.xlsx',
+      deptShowTop: false,
+      fileList: []
+    }
+  },
+  created() {
+    this.fetchDeptTree()// 获取部门树
+    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)'
+      })
+      // 发起导入请求
+      batchImportLiquidGasConfig(_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)'
+      })
+      batchExportLiquidGasConfig(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
+      }
+      getLiquidGasConfigList(this.listQuery).then(response => {
+        this.list = response.data.rows
+        this.total = parseInt(response.data.total)
+        this.listLoading = false
+      })
+    },
+    // 加载组织机构树形下拉菜单
+    fetchDeptTree: function() {
+      getDeptTreeList().then(response => {
+        if (response.data.list) {
+          if (response.data.list.length > 1) {
+            console.log(this.$store.getters.deptId)
+            if (judgeTree(response.data.list)) {
+              this.deptTreeList = toTreeList(response.data.list)
+              this.showDeptTree = 1
+            } else {
+              this.deptTreeList = response.data.list
+              this.showDeptTree = 2
+            }
+            console.log(this.deptTreeList)
+          } else {
+            this.showDeptTree = 0
+          }
+        }
+      })
+    },
+    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 f521b1c..b91772c 100644
--- a/src/views/deviceConfig/deviceConfig.vue
+++ b/src/views/deviceConfig/deviceConfig.vue
@@ -16,9 +16,12 @@
       <el-tab-pane v-if="hasPerm('/busConfig/digConfig/list')" label="开挖监测仪" name="dig">
         <list-dig-config ref="digConfig"/>
       </el-tab-pane>
-      <el-tab-pane v-if="hasPerm('/busConfig/noiseConfig/list')" label="噪声监测仪" name="dig">
+      <el-tab-pane v-if="hasPerm('/busConfig/noiseConfig/list')" label="噪声监测仪" name="noise">
         <list-noise-config ref="noiseConfig"/>
       </el-tab-pane>
+      <el-tab-pane v-if="hasPerm('/busConfig/liquidGasConfig/list')" label="燃气智能监测终端(一体化)" name="liquidgas">
+        <list-liquid-gas-config ref="liquidGasConfig"/>
+      </el-tab-pane>
     </el-tabs>
   </div>
 </template>
@@ -30,10 +33,11 @@
 import ListTempConfig from './components/listTempConfig'
 import ListDigConfig from './components/listDigConfig'
 import ListNoiseConfig from './components/listNoiseConfig'
+import ListLiquidGasConfig from './components/listLiquidGasConfig'
 import { hasPermission } from '@/utils/permission'
 export default {
   name: 'DeviceConfig',
-  components: { ListNoiseConfig, ListDigConfig, ListTempConfig, ListHarmfulConfig, ListGasConfig, ListLiquidConfig },
+  components: { ListLiquidGasConfig, ListNoiseConfig, ListDigConfig, ListTempConfig, ListHarmfulConfig, ListGasConfig, ListLiquidConfig },
   data() {
     return {
       activeName: 'liquid'
@@ -56,6 +60,8 @@
         this.$refs.digConfig.fetchData()
       } else if (tab.name === 'noise') {
         this.$refs.noiseConfig.fetchData()
+      } else if (tab.name === 'liquidgas') {
+        this.$refs.liquidGasConfig.fetchData()
       }
     },
     // 计算那个是当前第一个tab
@@ -72,6 +78,8 @@
         this.activeName = 'dig'
       } else if (hasPermission('/busConfig/noiseConfig/list')) {
         this.activeName = 'noise'
+      } else if (hasPermission('/busConfig/liquidGasConfig/list')) {
+        this.activeName = 'liquidgas'
       }
     }
   }