diff --git a/src/api/data.js b/src/api/data.js
index 08d447c..9294c10 100644
--- a/src/api/data.js
+++ b/src/api/data.js
@@ -19,6 +19,50 @@
     params
   })
 }
+// 燃气数据查询
+export function getGasData(params) {
+  return request({
+    url: 'gasdata/list',
+    method: 'get',
+    params
+  })
+}
+
+// 开挖数据查询
+export function getDigData(params) {
+  return request({
+    url: 'digdata/list',
+    method: 'get',
+    params
+  })
+}
+
+// 有害气体数据查询
+export function getHarmfulData(params) {
+  return request({
+    url: 'harmfuldata/list',
+    method: 'get',
+    params
+  })
+}
+
+// 温湿度数据查询
+export function getTempData(params) {
+  return request({
+    url: 'tempdata/list',
+    method: 'get',
+    params
+  })
+}
+
+// 井盖定位监测仪数据查询
+export function getWellLocaData(params) {
+  return request({
+    url: 'welllocadata/list',
+    method: 'get',
+    params
+  })
+}
 
 // 批量导出井盖数据
 export function batchExportWellData(params) {
@@ -41,3 +85,58 @@
     responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
   })
 }
+
+// 批量导出燃气数据
+export function batchExportGasData(params) {
+  return request({
+    url: 'gasdata/export',
+    method: 'get',
+    timeout: 120000, // 120s，2分钟
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 批量导出开挖数据
+export function batchDigExportData(params) {
+  return request({
+    url: 'digdata/export',
+    method: 'get',
+    timeout: 120000, // 120s，2分钟
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 批量导出温湿度数据
+export function batchExportTempData(params) {
+  return request({
+    url: 'tempdata/export',
+    method: 'get',
+    timeout: 120000, // 120s，2分钟
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 批量导出有害气体数据
+export function batchExportHarmfulData(params) {
+  return request({
+    url: 'harmfuldata/export',
+    method: 'get',
+    timeout: 120000, // 120s，2分钟
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 批量导出井盖定位监测仪数据
+export function batchExportWellLocaData(params) {
+  return request({
+    url: 'welllocadata/export',
+    method: 'get',
+    timeout: 120000, // 120s，2分钟
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}

diff --git a/src/api/data.js b/src/api/data.js
index 08d447c..9294c10 100644
--- a/src/api/data.js
+++ b/src/api/data.js
@@ -19,6 +19,50 @@
     params
   })
 }
+// 燃气数据查询
+export function getGasData(params) {
+  return request({
+    url: 'gasdata/list',
+    method: 'get',
+    params
+  })
+}
+
+// 开挖数据查询
+export function getDigData(params) {
+  return request({
+    url: 'digdata/list',
+    method: 'get',
+    params
+  })
+}
+
+// 有害气体数据查询
+export function getHarmfulData(params) {
+  return request({
+    url: 'harmfuldata/list',
+    method: 'get',
+    params
+  })
+}
+
+// 温湿度数据查询
+export function getTempData(params) {
+  return request({
+    url: 'tempdata/list',
+    method: 'get',
+    params
+  })
+}
+
+// 井盖定位监测仪数据查询
+export function getWellLocaData(params) {
+  return request({
+    url: 'welllocadata/list',
+    method: 'get',
+    params
+  })
+}
 
 // 批量导出井盖数据
 export function batchExportWellData(params) {
@@ -41,3 +85,58 @@
     responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
   })
 }
+
+// 批量导出燃气数据
+export function batchExportGasData(params) {
+  return request({
+    url: 'gasdata/export',
+    method: 'get',
+    timeout: 120000, // 120s，2分钟
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 批量导出开挖数据
+export function batchDigExportData(params) {
+  return request({
+    url: 'digdata/export',
+    method: 'get',
+    timeout: 120000, // 120s，2分钟
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 批量导出温湿度数据
+export function batchExportTempData(params) {
+  return request({
+    url: 'tempdata/export',
+    method: 'get',
+    timeout: 120000, // 120s，2分钟
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 批量导出有害气体数据
+export function batchExportHarmfulData(params) {
+  return request({
+    url: 'harmfuldata/export',
+    method: 'get',
+    timeout: 120000, // 120s，2分钟
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 批量导出井盖定位监测仪数据
+export function batchExportWellLocaData(params) {
+  return request({
+    url: 'welllocadata/export',
+    method: 'get',
+    timeout: 120000, // 120s，2分钟
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
diff --git a/src/views/dataManage/dataManage.vue b/src/views/dataManage/dataManage.vue
index 9e2594b..89fdb92 100644
--- a/src/views/dataManage/dataManage.vue
+++ b/src/views/dataManage/dataManage.vue
@@ -7,7 +7,21 @@
       <el-tab-pane v-if="hasPerm('/liquiddata/list')" label="液位监测仪" name="liquid">
         <list-liquid-data ref="liquiddatacomp"/>
       </el-tab-pane>
-      <el-tab-pane v-if="hasPerm('/data/gas')" label="燃气智能终端" name="gas">燃气数据</el-tab-pane>
+      <el-tab-pane v-if="hasPerm('/data/gas')" label="燃气智能终端" name="gas">
+        <list-gas-data ref="gasdatacomp"/>
+      </el-tab-pane>
+      <el-tab-pane v-if="hasPerm('/data/dig')" label="开挖监测仪" name="dig">
+        <list-dig-config ref="digdatacomp"/>
+      </el-tab-pane>
+      <el-tab-pane v-if="hasPerm('/data/harmful')" label="有害气体监测仪" name="harmful">
+        <list-harmful-data ref="harmfuldatacomp"/>
+      </el-tab-pane>
+      <el-tab-pane v-if="hasPerm('/data/temp')" label="温湿度监测仪" name="temp">
+        <list-temp-data ref="tempdatacomp"/>
+      </el-tab-pane>
+      <el-tab-pane v-if="hasPerm('/data/temp')" label="井盖定位监测仪" name="wellloca">
+        <list-well-loca-data ref="welllocadatacomp"/>
+      </el-tab-pane>
     </el-tabs>
   </div>
 </template>
@@ -15,9 +29,14 @@
 <script>
 import ListLiquidData from './deviceData/listLiquidData'
 import ListWellCoverData from './deviceData/listWellCoverData'
+import ListGasData from './deviceData/listGasData'
+import ListDigConfig from '../deviceConfig/liquidConfig/listDigConfig'
+import ListHarmfulData from './deviceData/listHarmfulData'
+import ListTempData from './deviceData/listTempData'
+import ListWellLocaData from './deviceData/listWellLocaData'
 export default {
   name: 'DataManage',
-  components: { ListLiquidData, ListWellCoverData },
+  components: { ListWellLocaData, ListTempData, ListHarmfulData, ListDigConfig, ListGasData, ListLiquidData, ListWellCoverData },
   data() {
     return {
       activeName: 'wellcover'
@@ -37,6 +56,16 @@
             this.activeName = 'wellcover'
           } else if (value === '2') {
             this.activeName = 'liquid'
+          } else if (value === '3') {
+            this.activeName = 'harmful'
+          } else if (value === '4') {
+            this.activeName = 'gas'
+          } else if (value === '5') {
+            this.activeName = 'temp'
+          } else if (value === '6') {
+            this.activeName = 'dig'
+          } else if (value === '7') {
+            this.activeName = 'wellloca'
           }
         }
       }
@@ -46,6 +75,16 @@
         this.activeName = 'wellcover'
       } else if (this.$route.params.deviceType === '2') {
         this.activeName = 'liquid'
+      } else if (this.$route.params.deviceType === '3') {
+        this.activeName = 'harmful'
+      } else if (this.$route.params.deviceType === '4') {
+        this.activeName = 'gas'
+      } else if (this.$route.params.deviceType === '5') {
+        this.activeName = 'temp'
+      } else if (this.$route.params.deviceType === '6') {
+        this.activeName = 'dig'
+      } else if (this.$route.params.deviceType === '7') {
+        this.activeName = 'wellloca'
       }
     }
   },
@@ -55,6 +94,16 @@
         this.$refs.welldatacomp.fetchData()
       } else if (tab.name === 'liquid') {
         this.$refs.welldatacomp.fetchData()
+      } else if (tab.name === 'harmful') {
+        this.$refs.welldatacomp.fetchData()
+      } else if (tab.name === 'gas') {
+        this.$refs.welldatacomp.fetchData()
+      } else if (tab.name === 'temp') {
+        this.$refs.welldatacomp.fetchData()
+      } else if (tab.name === 'dig') {
+        this.$refs.welldatacomp.fetchData()
+      } else if (tab.name === 'wellloca') {
+        this.$refs.welldatacomp.fetchData()
       }
     }
   }

diff --git a/src/api/data.js b/src/api/data.js
index 08d447c..9294c10 100644
--- a/src/api/data.js
+++ b/src/api/data.js
@@ -19,6 +19,50 @@
     params
   })
 }
+// 燃气数据查询
+export function getGasData(params) {
+  return request({
+    url: 'gasdata/list',
+    method: 'get',
+    params
+  })
+}
+
+// 开挖数据查询
+export function getDigData(params) {
+  return request({
+    url: 'digdata/list',
+    method: 'get',
+    params
+  })
+}
+
+// 有害气体数据查询
+export function getHarmfulData(params) {
+  return request({
+    url: 'harmfuldata/list',
+    method: 'get',
+    params
+  })
+}
+
+// 温湿度数据查询
+export function getTempData(params) {
+  return request({
+    url: 'tempdata/list',
+    method: 'get',
+    params
+  })
+}
+
+// 井盖定位监测仪数据查询
+export function getWellLocaData(params) {
+  return request({
+    url: 'welllocadata/list',
+    method: 'get',
+    params
+  })
+}
 
 // 批量导出井盖数据
 export function batchExportWellData(params) {
@@ -41,3 +85,58 @@
     responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
   })
 }
+
+// 批量导出燃气数据
+export function batchExportGasData(params) {
+  return request({
+    url: 'gasdata/export',
+    method: 'get',
+    timeout: 120000, // 120s，2分钟
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 批量导出开挖数据
+export function batchDigExportData(params) {
+  return request({
+    url: 'digdata/export',
+    method: 'get',
+    timeout: 120000, // 120s，2分钟
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 批量导出温湿度数据
+export function batchExportTempData(params) {
+  return request({
+    url: 'tempdata/export',
+    method: 'get',
+    timeout: 120000, // 120s，2分钟
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 批量导出有害气体数据
+export function batchExportHarmfulData(params) {
+  return request({
+    url: 'harmfuldata/export',
+    method: 'get',
+    timeout: 120000, // 120s，2分钟
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 批量导出井盖定位监测仪数据
+export function batchExportWellLocaData(params) {
+  return request({
+    url: 'welllocadata/export',
+    method: 'get',
+    timeout: 120000, // 120s，2分钟
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
diff --git a/src/views/dataManage/dataManage.vue b/src/views/dataManage/dataManage.vue
index 9e2594b..89fdb92 100644
--- a/src/views/dataManage/dataManage.vue
+++ b/src/views/dataManage/dataManage.vue
@@ -7,7 +7,21 @@
       <el-tab-pane v-if="hasPerm('/liquiddata/list')" label="液位监测仪" name="liquid">
         <list-liquid-data ref="liquiddatacomp"/>
       </el-tab-pane>
-      <el-tab-pane v-if="hasPerm('/data/gas')" label="燃气智能终端" name="gas">燃气数据</el-tab-pane>
+      <el-tab-pane v-if="hasPerm('/data/gas')" label="燃气智能终端" name="gas">
+        <list-gas-data ref="gasdatacomp"/>
+      </el-tab-pane>
+      <el-tab-pane v-if="hasPerm('/data/dig')" label="开挖监测仪" name="dig">
+        <list-dig-config ref="digdatacomp"/>
+      </el-tab-pane>
+      <el-tab-pane v-if="hasPerm('/data/harmful')" label="有害气体监测仪" name="harmful">
+        <list-harmful-data ref="harmfuldatacomp"/>
+      </el-tab-pane>
+      <el-tab-pane v-if="hasPerm('/data/temp')" label="温湿度监测仪" name="temp">
+        <list-temp-data ref="tempdatacomp"/>
+      </el-tab-pane>
+      <el-tab-pane v-if="hasPerm('/data/temp')" label="井盖定位监测仪" name="wellloca">
+        <list-well-loca-data ref="welllocadatacomp"/>
+      </el-tab-pane>
     </el-tabs>
   </div>
 </template>
@@ -15,9 +29,14 @@
 <script>
 import ListLiquidData from './deviceData/listLiquidData'
 import ListWellCoverData from './deviceData/listWellCoverData'
+import ListGasData from './deviceData/listGasData'
+import ListDigConfig from '../deviceConfig/liquidConfig/listDigConfig'
+import ListHarmfulData from './deviceData/listHarmfulData'
+import ListTempData from './deviceData/listTempData'
+import ListWellLocaData from './deviceData/listWellLocaData'
 export default {
   name: 'DataManage',
-  components: { ListLiquidData, ListWellCoverData },
+  components: { ListWellLocaData, ListTempData, ListHarmfulData, ListDigConfig, ListGasData, ListLiquidData, ListWellCoverData },
   data() {
     return {
       activeName: 'wellcover'
@@ -37,6 +56,16 @@
             this.activeName = 'wellcover'
           } else if (value === '2') {
             this.activeName = 'liquid'
+          } else if (value === '3') {
+            this.activeName = 'harmful'
+          } else if (value === '4') {
+            this.activeName = 'gas'
+          } else if (value === '5') {
+            this.activeName = 'temp'
+          } else if (value === '6') {
+            this.activeName = 'dig'
+          } else if (value === '7') {
+            this.activeName = 'wellloca'
           }
         }
       }
@@ -46,6 +75,16 @@
         this.activeName = 'wellcover'
       } else if (this.$route.params.deviceType === '2') {
         this.activeName = 'liquid'
+      } else if (this.$route.params.deviceType === '3') {
+        this.activeName = 'harmful'
+      } else if (this.$route.params.deviceType === '4') {
+        this.activeName = 'gas'
+      } else if (this.$route.params.deviceType === '5') {
+        this.activeName = 'temp'
+      } else if (this.$route.params.deviceType === '6') {
+        this.activeName = 'dig'
+      } else if (this.$route.params.deviceType === '7') {
+        this.activeName = 'wellloca'
       }
     }
   },
@@ -55,6 +94,16 @@
         this.$refs.welldatacomp.fetchData()
       } else if (tab.name === 'liquid') {
         this.$refs.welldatacomp.fetchData()
+      } else if (tab.name === 'harmful') {
+        this.$refs.welldatacomp.fetchData()
+      } else if (tab.name === 'gas') {
+        this.$refs.welldatacomp.fetchData()
+      } else if (tab.name === 'temp') {
+        this.$refs.welldatacomp.fetchData()
+      } else if (tab.name === 'dig') {
+        this.$refs.welldatacomp.fetchData()
+      } else if (tab.name === 'wellloca') {
+        this.$refs.welldatacomp.fetchData()
       }
     }
   }
diff --git a/src/views/dataManage/deviceData/listDigData.vue b/src/views/dataManage/deviceData/listDigData.vue
new file mode 100644
index 0000000..9f81cf0
--- /dev/null
+++ b/src/views/dataManage/deviceData/listDigData.vue
@@ -0,0 +1,283 @@
+<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" 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('/liquiddata/export')" 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>{{ 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 { getLiquidData, batchExportLiquidData } from '@/api/data'
+import DeptSelect from '../../../components/DeptSelect/index'
+
+export default {
+  name: 'ListDigData',
+  components: { DeptSelect, selectTree },
+  data() {
+    return {
+      listQuery: {
+        keywords: '', // 关键字
+        deptid: '', // 部门id
+        beginTime: '', // 开始时间
+        endTime: '', // 结束时间
+        offset: 1,
+        limit: 20,
+        sort: '',
+        order: ''
+      }, // 筛选条件
+      timeRange: [], // 时间范围
+      columns: [
+        {
+          text: '设备编号',
+          value: 'devcode',
+          align: 'center'
+        },
+        {
+          text: '闸井编号',
+          value: 'wellCode',
+          align: 'center'
+        },
+        {
+          text: '设备类型',
+          value: 'deviceTypeName',
+          align: 'center'
+        },
+        {
+          text: '噪声值',
+          value: 'ddata',
+          align: 'center'
+        },
+        {
+          text: '状态描述',
+          value: 'descn',
+          width: 80,
+          align: 'center',
+          checkCell: true
+        },
+        {
+          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 = ''
+      }
+    }
+  },
+  mounted() {
+    if (window.location.href) {
+      var query = window.location.href.split('?')
+      if (query.length > 1) {
+        var values = query[1].split('&')
+        for (var i = 0; i < values.length; i++) {
+          var pos = values[i].indexOf('=')
+          if (pos === -1) continue
+          var paramname = values[i].substring(0, pos)
+          var value = values[i].substring(pos + 1)
+          if (paramname === 'devcode') {
+            this.listQuery.keywords = value
+            this.fetchData()
+          } else {
+            this.fetchData()
+          }
+        }
+      } else {
+        if (this.$route.params && this.$route.params.deviceType === '2' && this.$route.params.devcode && this.$route.params.devcode !== '') {
+          this.listQuery.keywords = this.$route.params.devcode
+          this.fetchData(false)// 获取数据
+        } else {
+          this.fetchData()
+        }
+      }
+    }
+  },
+  methods: {
+    // 批量导出
+    batchExport() {
+      console.log('批量导出开挖配置')
+      // 全屏加载动画
+      const loading = this.$loading({
+        lock: true,
+        text: '数据处理中,请稍后...',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
+      })
+      batchExportLiquidData(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 = `开挖监测仪数s据.xlsx` // 下载后文件名
+        document.body.appendChild(downloadElement)
+        downloadElement.click() // 点击下载
+        document.body.removeChild(downloadElement) // 下载完成移除元素
+        window.URL.revokeObjectURL(href) // 释放blob对象
+      }).catch((res) => {
+        loading.close()
+      })
+    },
+    // 查询数据
+    search() {
+      this.fetchData(false)
+    },
+    // 获取开挖配置数据
+    fetchData(isNowPage = true) {
+      this.listLoading = true
+      if (!isNowPage) { // 是否显示当前页，否则跳转第一页
+        this.listQuery.offset = 1
+      }
+      getLiquidData(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 08d447c..9294c10 100644
--- a/src/api/data.js
+++ b/src/api/data.js
@@ -19,6 +19,50 @@
     params
   })
 }
+// 燃气数据查询
+export function getGasData(params) {
+  return request({
+    url: 'gasdata/list',
+    method: 'get',
+    params
+  })
+}
+
+// 开挖数据查询
+export function getDigData(params) {
+  return request({
+    url: 'digdata/list',
+    method: 'get',
+    params
+  })
+}
+
+// 有害气体数据查询
+export function getHarmfulData(params) {
+  return request({
+    url: 'harmfuldata/list',
+    method: 'get',
+    params
+  })
+}
+
+// 温湿度数据查询
+export function getTempData(params) {
+  return request({
+    url: 'tempdata/list',
+    method: 'get',
+    params
+  })
+}
+
+// 井盖定位监测仪数据查询
+export function getWellLocaData(params) {
+  return request({
+    url: 'welllocadata/list',
+    method: 'get',
+    params
+  })
+}
 
 // 批量导出井盖数据
 export function batchExportWellData(params) {
@@ -41,3 +85,58 @@
     responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
   })
 }
+
+// 批量导出燃气数据
+export function batchExportGasData(params) {
+  return request({
+    url: 'gasdata/export',
+    method: 'get',
+    timeout: 120000, // 120s，2分钟
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 批量导出开挖数据
+export function batchDigExportData(params) {
+  return request({
+    url: 'digdata/export',
+    method: 'get',
+    timeout: 120000, // 120s，2分钟
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 批量导出温湿度数据
+export function batchExportTempData(params) {
+  return request({
+    url: 'tempdata/export',
+    method: 'get',
+    timeout: 120000, // 120s，2分钟
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 批量导出有害气体数据
+export function batchExportHarmfulData(params) {
+  return request({
+    url: 'harmfuldata/export',
+    method: 'get',
+    timeout: 120000, // 120s，2分钟
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 批量导出井盖定位监测仪数据
+export function batchExportWellLocaData(params) {
+  return request({
+    url: 'welllocadata/export',
+    method: 'get',
+    timeout: 120000, // 120s，2分钟
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
diff --git a/src/views/dataManage/dataManage.vue b/src/views/dataManage/dataManage.vue
index 9e2594b..89fdb92 100644
--- a/src/views/dataManage/dataManage.vue
+++ b/src/views/dataManage/dataManage.vue
@@ -7,7 +7,21 @@
       <el-tab-pane v-if="hasPerm('/liquiddata/list')" label="液位监测仪" name="liquid">
         <list-liquid-data ref="liquiddatacomp"/>
       </el-tab-pane>
-      <el-tab-pane v-if="hasPerm('/data/gas')" label="燃气智能终端" name="gas">燃气数据</el-tab-pane>
+      <el-tab-pane v-if="hasPerm('/data/gas')" label="燃气智能终端" name="gas">
+        <list-gas-data ref="gasdatacomp"/>
+      </el-tab-pane>
+      <el-tab-pane v-if="hasPerm('/data/dig')" label="开挖监测仪" name="dig">
+        <list-dig-config ref="digdatacomp"/>
+      </el-tab-pane>
+      <el-tab-pane v-if="hasPerm('/data/harmful')" label="有害气体监测仪" name="harmful">
+        <list-harmful-data ref="harmfuldatacomp"/>
+      </el-tab-pane>
+      <el-tab-pane v-if="hasPerm('/data/temp')" label="温湿度监测仪" name="temp">
+        <list-temp-data ref="tempdatacomp"/>
+      </el-tab-pane>
+      <el-tab-pane v-if="hasPerm('/data/temp')" label="井盖定位监测仪" name="wellloca">
+        <list-well-loca-data ref="welllocadatacomp"/>
+      </el-tab-pane>
     </el-tabs>
   </div>
 </template>
@@ -15,9 +29,14 @@
 <script>
 import ListLiquidData from './deviceData/listLiquidData'
 import ListWellCoverData from './deviceData/listWellCoverData'
+import ListGasData from './deviceData/listGasData'
+import ListDigConfig from '../deviceConfig/liquidConfig/listDigConfig'
+import ListHarmfulData from './deviceData/listHarmfulData'
+import ListTempData from './deviceData/listTempData'
+import ListWellLocaData from './deviceData/listWellLocaData'
 export default {
   name: 'DataManage',
-  components: { ListLiquidData, ListWellCoverData },
+  components: { ListWellLocaData, ListTempData, ListHarmfulData, ListDigConfig, ListGasData, ListLiquidData, ListWellCoverData },
   data() {
     return {
       activeName: 'wellcover'
@@ -37,6 +56,16 @@
             this.activeName = 'wellcover'
           } else if (value === '2') {
             this.activeName = 'liquid'
+          } else if (value === '3') {
+            this.activeName = 'harmful'
+          } else if (value === '4') {
+            this.activeName = 'gas'
+          } else if (value === '5') {
+            this.activeName = 'temp'
+          } else if (value === '6') {
+            this.activeName = 'dig'
+          } else if (value === '7') {
+            this.activeName = 'wellloca'
           }
         }
       }
@@ -46,6 +75,16 @@
         this.activeName = 'wellcover'
       } else if (this.$route.params.deviceType === '2') {
         this.activeName = 'liquid'
+      } else if (this.$route.params.deviceType === '3') {
+        this.activeName = 'harmful'
+      } else if (this.$route.params.deviceType === '4') {
+        this.activeName = 'gas'
+      } else if (this.$route.params.deviceType === '5') {
+        this.activeName = 'temp'
+      } else if (this.$route.params.deviceType === '6') {
+        this.activeName = 'dig'
+      } else if (this.$route.params.deviceType === '7') {
+        this.activeName = 'wellloca'
       }
     }
   },
@@ -55,6 +94,16 @@
         this.$refs.welldatacomp.fetchData()
       } else if (tab.name === 'liquid') {
         this.$refs.welldatacomp.fetchData()
+      } else if (tab.name === 'harmful') {
+        this.$refs.welldatacomp.fetchData()
+      } else if (tab.name === 'gas') {
+        this.$refs.welldatacomp.fetchData()
+      } else if (tab.name === 'temp') {
+        this.$refs.welldatacomp.fetchData()
+      } else if (tab.name === 'dig') {
+        this.$refs.welldatacomp.fetchData()
+      } else if (tab.name === 'wellloca') {
+        this.$refs.welldatacomp.fetchData()
       }
     }
   }
diff --git a/src/views/dataManage/deviceData/listDigData.vue b/src/views/dataManage/deviceData/listDigData.vue
new file mode 100644
index 0000000..9f81cf0
--- /dev/null
+++ b/src/views/dataManage/deviceData/listDigData.vue
@@ -0,0 +1,283 @@
+<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" 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('/liquiddata/export')" 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>{{ 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 { getLiquidData, batchExportLiquidData } from '@/api/data'
+import DeptSelect from '../../../components/DeptSelect/index'
+
+export default {
+  name: 'ListDigData',
+  components: { DeptSelect, selectTree },
+  data() {
+    return {
+      listQuery: {
+        keywords: '', // 关键字
+        deptid: '', // 部门id
+        beginTime: '', // 开始时间
+        endTime: '', // 结束时间
+        offset: 1,
+        limit: 20,
+        sort: '',
+        order: ''
+      }, // 筛选条件
+      timeRange: [], // 时间范围
+      columns: [
+        {
+          text: '设备编号',
+          value: 'devcode',
+          align: 'center'
+        },
+        {
+          text: '闸井编号',
+          value: 'wellCode',
+          align: 'center'
+        },
+        {
+          text: '设备类型',
+          value: 'deviceTypeName',
+          align: 'center'
+        },
+        {
+          text: '噪声值',
+          value: 'ddata',
+          align: 'center'
+        },
+        {
+          text: '状态描述',
+          value: 'descn',
+          width: 80,
+          align: 'center',
+          checkCell: true
+        },
+        {
+          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 = ''
+      }
+    }
+  },
+  mounted() {
+    if (window.location.href) {
+      var query = window.location.href.split('?')
+      if (query.length > 1) {
+        var values = query[1].split('&')
+        for (var i = 0; i < values.length; i++) {
+          var pos = values[i].indexOf('=')
+          if (pos === -1) continue
+          var paramname = values[i].substring(0, pos)
+          var value = values[i].substring(pos + 1)
+          if (paramname === 'devcode') {
+            this.listQuery.keywords = value
+            this.fetchData()
+          } else {
+            this.fetchData()
+          }
+        }
+      } else {
+        if (this.$route.params && this.$route.params.deviceType === '2' && this.$route.params.devcode && this.$route.params.devcode !== '') {
+          this.listQuery.keywords = this.$route.params.devcode
+          this.fetchData(false)// 获取数据
+        } else {
+          this.fetchData()
+        }
+      }
+    }
+  },
+  methods: {
+    // 批量导出
+    batchExport() {
+      console.log('批量导出开挖配置')
+      // 全屏加载动画
+      const loading = this.$loading({
+        lock: true,
+        text: '数据处理中,请稍后...',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
+      })
+      batchExportLiquidData(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 = `开挖监测仪数s据.xlsx` // 下载后文件名
+        document.body.appendChild(downloadElement)
+        downloadElement.click() // 点击下载
+        document.body.removeChild(downloadElement) // 下载完成移除元素
+        window.URL.revokeObjectURL(href) // 释放blob对象
+      }).catch((res) => {
+        loading.close()
+      })
+    },
+    // 查询数据
+    search() {
+      this.fetchData(false)
+    },
+    // 获取开挖配置数据
+    fetchData(isNowPage = true) {
+      this.listLoading = true
+      if (!isNowPage) { // 是否显示当前页，否则跳转第一页
+        this.listQuery.offset = 1
+      }
+      getLiquidData(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/listGasData.vue b/src/views/dataManage/deviceData/listGasData.vue
new file mode 100644
index 0000000..f431b88
--- /dev/null
+++ b/src/views/dataManage/deviceData/listGasData.vue
@@ -0,0 +1,288 @@
+<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" 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('/liquiddata/export')" 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>{{ 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 { getLiquidData, batchExportLiquidData } from '@/api/data'
+import DeptSelect from '../../../components/DeptSelect/index'
+
+export default {
+  name: 'ListGasData',
+  components: { DeptSelect, selectTree },
+  data() {
+    return {
+      listQuery: {
+        keywords: '', // 关键字
+        deptid: '', // 部门id
+        beginTime: '', // 开始时间
+        endTime: '', // 结束时间
+        offset: 1,
+        limit: 20,
+        sort: '',
+        order: ''
+      }, // 筛选条件
+      timeRange: [], // 时间范围
+      columns: [
+        {
+          text: '设备编号',
+          value: 'devcode',
+          align: 'center'
+        },
+        {
+          text: '闸井编号',
+          value: 'wellCode',
+          align: 'center'
+        },
+        {
+          text: '设备类型',
+          value: 'deviceTypeName',
+          align: 'center'
+        },
+        {
+          text: '燃气浓度(%LEL)',
+          value: 'strength',
+          align: 'center'
+        },
+        {
+          text: '电量(%)',
+          value: 'cell',
+          width: 80,
+          align: 'center',
+          checkCell: true
+        },
+        {
+          text: '状态描述',
+          value: 'descn',
+          align: 'center'
+        },
+        {
+          text: '权属单位',
+          value: 'deptName',
+          align: 'center'
+        },
+        {
+          text: '上传时间',
+          value: 'uptime',
+          width: 170,
+          align: 'center'
+        }
+      ], // 显示列
+      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 = ''
+      }
+    }
+  },
+  mounted() {
+    if (window.location.href) {
+      var query = window.location.href.split('?')
+      if (query.length > 1) {
+        var values = query[1].split('&')
+        for (var i = 0; i < values.length; i++) {
+          var pos = values[i].indexOf('=')
+          if (pos === -1) continue
+          var paramname = values[i].substring(0, pos)
+          var value = values[i].substring(pos + 1)
+          if (paramname === 'devcode') {
+            this.listQuery.keywords = value
+            this.fetchData()
+          } else {
+            this.fetchData()
+          }
+        }
+      } else {
+        if (this.$route.params && this.$route.params.deviceType === '2' && this.$route.params.devcode && this.$route.params.devcode !== '') {
+          this.listQuery.keywords = this.$route.params.devcode
+          this.fetchData(false)// 获取数据
+        } else {
+          this.fetchData()
+        }
+      }
+    }
+  },
+  methods: {
+    // 批量导出
+    batchExport() {
+      console.log('批量导出燃气配置')
+      // 全屏加载动画
+      const loading = this.$loading({
+        lock: true,
+        text: '数据处理中,请稍后...',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
+      })
+      batchExportLiquidData(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 = `燃气监测仪数s据.xlsx` // 下载后文件名
+        document.body.appendChild(downloadElement)
+        downloadElement.click() // 点击下载
+        document.body.removeChild(downloadElement) // 下载完成移除元素
+        window.URL.revokeObjectURL(href) // 释放blob对象
+      }).catch((res) => {
+        loading.close()
+      })
+    },
+    // 查询数据
+    search() {
+      this.fetchData(false)
+    },
+    // 获取燃气配置数据
+    fetchData(isNowPage = true) {
+      this.listLoading = true
+      if (!isNowPage) { // 是否显示当前页，否则跳转第一页
+        this.listQuery.offset = 1
+      }
+      getLiquidData(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 08d447c..9294c10 100644
--- a/src/api/data.js
+++ b/src/api/data.js
@@ -19,6 +19,50 @@
     params
   })
 }
+// 燃气数据查询
+export function getGasData(params) {
+  return request({
+    url: 'gasdata/list',
+    method: 'get',
+    params
+  })
+}
+
+// 开挖数据查询
+export function getDigData(params) {
+  return request({
+    url: 'digdata/list',
+    method: 'get',
+    params
+  })
+}
+
+// 有害气体数据查询
+export function getHarmfulData(params) {
+  return request({
+    url: 'harmfuldata/list',
+    method: 'get',
+    params
+  })
+}
+
+// 温湿度数据查询
+export function getTempData(params) {
+  return request({
+    url: 'tempdata/list',
+    method: 'get',
+    params
+  })
+}
+
+// 井盖定位监测仪数据查询
+export function getWellLocaData(params) {
+  return request({
+    url: 'welllocadata/list',
+    method: 'get',
+    params
+  })
+}
 
 // 批量导出井盖数据
 export function batchExportWellData(params) {
@@ -41,3 +85,58 @@
     responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
   })
 }
+
+// 批量导出燃气数据
+export function batchExportGasData(params) {
+  return request({
+    url: 'gasdata/export',
+    method: 'get',
+    timeout: 120000, // 120s，2分钟
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 批量导出开挖数据
+export function batchDigExportData(params) {
+  return request({
+    url: 'digdata/export',
+    method: 'get',
+    timeout: 120000, // 120s，2分钟
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 批量导出温湿度数据
+export function batchExportTempData(params) {
+  return request({
+    url: 'tempdata/export',
+    method: 'get',
+    timeout: 120000, // 120s，2分钟
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 批量导出有害气体数据
+export function batchExportHarmfulData(params) {
+  return request({
+    url: 'harmfuldata/export',
+    method: 'get',
+    timeout: 120000, // 120s，2分钟
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 批量导出井盖定位监测仪数据
+export function batchExportWellLocaData(params) {
+  return request({
+    url: 'welllocadata/export',
+    method: 'get',
+    timeout: 120000, // 120s，2分钟
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
diff --git a/src/views/dataManage/dataManage.vue b/src/views/dataManage/dataManage.vue
index 9e2594b..89fdb92 100644
--- a/src/views/dataManage/dataManage.vue
+++ b/src/views/dataManage/dataManage.vue
@@ -7,7 +7,21 @@
       <el-tab-pane v-if="hasPerm('/liquiddata/list')" label="液位监测仪" name="liquid">
         <list-liquid-data ref="liquiddatacomp"/>
       </el-tab-pane>
-      <el-tab-pane v-if="hasPerm('/data/gas')" label="燃气智能终端" name="gas">燃气数据</el-tab-pane>
+      <el-tab-pane v-if="hasPerm('/data/gas')" label="燃气智能终端" name="gas">
+        <list-gas-data ref="gasdatacomp"/>
+      </el-tab-pane>
+      <el-tab-pane v-if="hasPerm('/data/dig')" label="开挖监测仪" name="dig">
+        <list-dig-config ref="digdatacomp"/>
+      </el-tab-pane>
+      <el-tab-pane v-if="hasPerm('/data/harmful')" label="有害气体监测仪" name="harmful">
+        <list-harmful-data ref="harmfuldatacomp"/>
+      </el-tab-pane>
+      <el-tab-pane v-if="hasPerm('/data/temp')" label="温湿度监测仪" name="temp">
+        <list-temp-data ref="tempdatacomp"/>
+      </el-tab-pane>
+      <el-tab-pane v-if="hasPerm('/data/temp')" label="井盖定位监测仪" name="wellloca">
+        <list-well-loca-data ref="welllocadatacomp"/>
+      </el-tab-pane>
     </el-tabs>
   </div>
 </template>
@@ -15,9 +29,14 @@
 <script>
 import ListLiquidData from './deviceData/listLiquidData'
 import ListWellCoverData from './deviceData/listWellCoverData'
+import ListGasData from './deviceData/listGasData'
+import ListDigConfig from '../deviceConfig/liquidConfig/listDigConfig'
+import ListHarmfulData from './deviceData/listHarmfulData'
+import ListTempData from './deviceData/listTempData'
+import ListWellLocaData from './deviceData/listWellLocaData'
 export default {
   name: 'DataManage',
-  components: { ListLiquidData, ListWellCoverData },
+  components: { ListWellLocaData, ListTempData, ListHarmfulData, ListDigConfig, ListGasData, ListLiquidData, ListWellCoverData },
   data() {
     return {
       activeName: 'wellcover'
@@ -37,6 +56,16 @@
             this.activeName = 'wellcover'
           } else if (value === '2') {
             this.activeName = 'liquid'
+          } else if (value === '3') {
+            this.activeName = 'harmful'
+          } else if (value === '4') {
+            this.activeName = 'gas'
+          } else if (value === '5') {
+            this.activeName = 'temp'
+          } else if (value === '6') {
+            this.activeName = 'dig'
+          } else if (value === '7') {
+            this.activeName = 'wellloca'
           }
         }
       }
@@ -46,6 +75,16 @@
         this.activeName = 'wellcover'
       } else if (this.$route.params.deviceType === '2') {
         this.activeName = 'liquid'
+      } else if (this.$route.params.deviceType === '3') {
+        this.activeName = 'harmful'
+      } else if (this.$route.params.deviceType === '4') {
+        this.activeName = 'gas'
+      } else if (this.$route.params.deviceType === '5') {
+        this.activeName = 'temp'
+      } else if (this.$route.params.deviceType === '6') {
+        this.activeName = 'dig'
+      } else if (this.$route.params.deviceType === '7') {
+        this.activeName = 'wellloca'
       }
     }
   },
@@ -55,6 +94,16 @@
         this.$refs.welldatacomp.fetchData()
       } else if (tab.name === 'liquid') {
         this.$refs.welldatacomp.fetchData()
+      } else if (tab.name === 'harmful') {
+        this.$refs.welldatacomp.fetchData()
+      } else if (tab.name === 'gas') {
+        this.$refs.welldatacomp.fetchData()
+      } else if (tab.name === 'temp') {
+        this.$refs.welldatacomp.fetchData()
+      } else if (tab.name === 'dig') {
+        this.$refs.welldatacomp.fetchData()
+      } else if (tab.name === 'wellloca') {
+        this.$refs.welldatacomp.fetchData()
       }
     }
   }
diff --git a/src/views/dataManage/deviceData/listDigData.vue b/src/views/dataManage/deviceData/listDigData.vue
new file mode 100644
index 0000000..9f81cf0
--- /dev/null
+++ b/src/views/dataManage/deviceData/listDigData.vue
@@ -0,0 +1,283 @@
+<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" 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('/liquiddata/export')" 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>{{ 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 { getLiquidData, batchExportLiquidData } from '@/api/data'
+import DeptSelect from '../../../components/DeptSelect/index'
+
+export default {
+  name: 'ListDigData',
+  components: { DeptSelect, selectTree },
+  data() {
+    return {
+      listQuery: {
+        keywords: '', // 关键字
+        deptid: '', // 部门id
+        beginTime: '', // 开始时间
+        endTime: '', // 结束时间
+        offset: 1,
+        limit: 20,
+        sort: '',
+        order: ''
+      }, // 筛选条件
+      timeRange: [], // 时间范围
+      columns: [
+        {
+          text: '设备编号',
+          value: 'devcode',
+          align: 'center'
+        },
+        {
+          text: '闸井编号',
+          value: 'wellCode',
+          align: 'center'
+        },
+        {
+          text: '设备类型',
+          value: 'deviceTypeName',
+          align: 'center'
+        },
+        {
+          text: '噪声值',
+          value: 'ddata',
+          align: 'center'
+        },
+        {
+          text: '状态描述',
+          value: 'descn',
+          width: 80,
+          align: 'center',
+          checkCell: true
+        },
+        {
+          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 = ''
+      }
+    }
+  },
+  mounted() {
+    if (window.location.href) {
+      var query = window.location.href.split('?')
+      if (query.length > 1) {
+        var values = query[1].split('&')
+        for (var i = 0; i < values.length; i++) {
+          var pos = values[i].indexOf('=')
+          if (pos === -1) continue
+          var paramname = values[i].substring(0, pos)
+          var value = values[i].substring(pos + 1)
+          if (paramname === 'devcode') {
+            this.listQuery.keywords = value
+            this.fetchData()
+          } else {
+            this.fetchData()
+          }
+        }
+      } else {
+        if (this.$route.params && this.$route.params.deviceType === '2' && this.$route.params.devcode && this.$route.params.devcode !== '') {
+          this.listQuery.keywords = this.$route.params.devcode
+          this.fetchData(false)// 获取数据
+        } else {
+          this.fetchData()
+        }
+      }
+    }
+  },
+  methods: {
+    // 批量导出
+    batchExport() {
+      console.log('批量导出开挖配置')
+      // 全屏加载动画
+      const loading = this.$loading({
+        lock: true,
+        text: '数据处理中,请稍后...',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
+      })
+      batchExportLiquidData(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 = `开挖监测仪数s据.xlsx` // 下载后文件名
+        document.body.appendChild(downloadElement)
+        downloadElement.click() // 点击下载
+        document.body.removeChild(downloadElement) // 下载完成移除元素
+        window.URL.revokeObjectURL(href) // 释放blob对象
+      }).catch((res) => {
+        loading.close()
+      })
+    },
+    // 查询数据
+    search() {
+      this.fetchData(false)
+    },
+    // 获取开挖配置数据
+    fetchData(isNowPage = true) {
+      this.listLoading = true
+      if (!isNowPage) { // 是否显示当前页，否则跳转第一页
+        this.listQuery.offset = 1
+      }
+      getLiquidData(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/listGasData.vue b/src/views/dataManage/deviceData/listGasData.vue
new file mode 100644
index 0000000..f431b88
--- /dev/null
+++ b/src/views/dataManage/deviceData/listGasData.vue
@@ -0,0 +1,288 @@
+<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" 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('/liquiddata/export')" 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>{{ 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 { getLiquidData, batchExportLiquidData } from '@/api/data'
+import DeptSelect from '../../../components/DeptSelect/index'
+
+export default {
+  name: 'ListGasData',
+  components: { DeptSelect, selectTree },
+  data() {
+    return {
+      listQuery: {
+        keywords: '', // 关键字
+        deptid: '', // 部门id
+        beginTime: '', // 开始时间
+        endTime: '', // 结束时间
+        offset: 1,
+        limit: 20,
+        sort: '',
+        order: ''
+      }, // 筛选条件
+      timeRange: [], // 时间范围
+      columns: [
+        {
+          text: '设备编号',
+          value: 'devcode',
+          align: 'center'
+        },
+        {
+          text: '闸井编号',
+          value: 'wellCode',
+          align: 'center'
+        },
+        {
+          text: '设备类型',
+          value: 'deviceTypeName',
+          align: 'center'
+        },
+        {
+          text: '燃气浓度(%LEL)',
+          value: 'strength',
+          align: 'center'
+        },
+        {
+          text: '电量(%)',
+          value: 'cell',
+          width: 80,
+          align: 'center',
+          checkCell: true
+        },
+        {
+          text: '状态描述',
+          value: 'descn',
+          align: 'center'
+        },
+        {
+          text: '权属单位',
+          value: 'deptName',
+          align: 'center'
+        },
+        {
+          text: '上传时间',
+          value: 'uptime',
+          width: 170,
+          align: 'center'
+        }
+      ], // 显示列
+      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 = ''
+      }
+    }
+  },
+  mounted() {
+    if (window.location.href) {
+      var query = window.location.href.split('?')
+      if (query.length > 1) {
+        var values = query[1].split('&')
+        for (var i = 0; i < values.length; i++) {
+          var pos = values[i].indexOf('=')
+          if (pos === -1) continue
+          var paramname = values[i].substring(0, pos)
+          var value = values[i].substring(pos + 1)
+          if (paramname === 'devcode') {
+            this.listQuery.keywords = value
+            this.fetchData()
+          } else {
+            this.fetchData()
+          }
+        }
+      } else {
+        if (this.$route.params && this.$route.params.deviceType === '2' && this.$route.params.devcode && this.$route.params.devcode !== '') {
+          this.listQuery.keywords = this.$route.params.devcode
+          this.fetchData(false)// 获取数据
+        } else {
+          this.fetchData()
+        }
+      }
+    }
+  },
+  methods: {
+    // 批量导出
+    batchExport() {
+      console.log('批量导出燃气配置')
+      // 全屏加载动画
+      const loading = this.$loading({
+        lock: true,
+        text: '数据处理中,请稍后...',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
+      })
+      batchExportLiquidData(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 = `燃气监测仪数s据.xlsx` // 下载后文件名
+        document.body.appendChild(downloadElement)
+        downloadElement.click() // 点击下载
+        document.body.removeChild(downloadElement) // 下载完成移除元素
+        window.URL.revokeObjectURL(href) // 释放blob对象
+      }).catch((res) => {
+        loading.close()
+      })
+    },
+    // 查询数据
+    search() {
+      this.fetchData(false)
+    },
+    // 获取燃气配置数据
+    fetchData(isNowPage = true) {
+      this.listLoading = true
+      if (!isNowPage) { // 是否显示当前页，否则跳转第一页
+        this.listQuery.offset = 1
+      }
+      getLiquidData(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/listHarmfulData.vue b/src/views/dataManage/deviceData/listHarmfulData.vue
new file mode 100644
index 0000000..c010044
--- /dev/null
+++ b/src/views/dataManage/deviceData/listHarmfulData.vue
@@ -0,0 +1,301 @@
+<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" 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('/liquiddata/export')" 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>{{ 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 { getLiquidData, batchExportLiquidData } from '@/api/data'
+import DeptSelect from '../../../components/DeptSelect/index'
+
+export default {
+  name: 'ListHarmfulData',
+  components: { DeptSelect, selectTree },
+  data() {
+    return {
+      listQuery: {
+        keywords: '', // 关键字
+        deptid: '', // 部门id
+        beginTime: '', // 开始时间
+        endTime: '', // 结束时间
+        offset: 1,
+        limit: 20,
+        sort: '',
+        order: ''
+      }, // 筛选条件
+      timeRange: [], // 时间范围
+      columns: [
+        {
+          text: '设备编号',
+          value: 'devcode',
+          align: 'center'
+        },
+        {
+          text: '闸井编号',
+          value: 'wellCode',
+          align: 'center'
+        },
+        {
+          text: '设备类型',
+          value: 'deviceTypeName',
+          align: 'center'
+        },
+        {
+          text: 'CO浓度',
+          value: 'CO',
+          align: 'center'
+        },
+        {
+          text: 'CH4浓度',
+          value: 'CH4',
+          align: 'center'
+        },
+        {
+          text: 'H2S浓度',
+          value: 'H2S',
+          align: 'center'
+        },
+        {
+          text: 'O2浓度',
+          value: 'O2',
+          align: 'center'
+        },
+        {
+          text: '液位开关',
+          value: 'switch',
+          align: 'center'
+        },
+        {
+          text: '状态描述',
+          value: 'descn',
+          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 = ''
+      }
+    }
+  },
+  mounted() {
+    if (window.location.href) {
+      var query = window.location.href.split('?')
+      if (query.length > 1) {
+        var values = query[1].split('&')
+        for (var i = 0; i < values.length; i++) {
+          var pos = values[i].indexOf('=')
+          if (pos === -1) continue
+          var paramname = values[i].substring(0, pos)
+          var value = values[i].substring(pos + 1)
+          if (paramname === 'devcode') {
+            this.listQuery.keywords = value
+            this.fetchData()
+          } else {
+            this.fetchData()
+          }
+        }
+      } else {
+        if (this.$route.params && this.$route.params.deviceType === '2' && this.$route.params.devcode && this.$route.params.devcode !== '') {
+          this.listQuery.keywords = this.$route.params.devcode
+          this.fetchData(false)// 获取数据
+        } else {
+          this.fetchData()
+        }
+      }
+    }
+  },
+  methods: {
+    // 批量导出
+    batchExport() {
+      console.log('批量导出有害配置')
+      // 全屏加载动画
+      const loading = this.$loading({
+        lock: true,
+        text: '数据处理中,请稍后...',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
+      })
+      batchExportLiquidData(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 = `有害监测仪数s据.xlsx` // 下载后文件名
+        document.body.appendChild(downloadElement)
+        downloadElement.click() // 点击下载
+        document.body.removeChild(downloadElement) // 下载完成移除元素
+        window.URL.revokeObjectURL(href) // 释放blob对象
+      }).catch((res) => {
+        loading.close()
+      })
+    },
+    // 查询数据
+    search() {
+      this.fetchData(false)
+    },
+    // 获取有害配置数据
+    fetchData(isNowPage = true) {
+      this.listLoading = true
+      if (!isNowPage) { // 是否显示当前页，否则跳转第一页
+        this.listQuery.offset = 1
+      }
+      getLiquidData(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 08d447c..9294c10 100644
--- a/src/api/data.js
+++ b/src/api/data.js
@@ -19,6 +19,50 @@
     params
   })
 }
+// 燃气数据查询
+export function getGasData(params) {
+  return request({
+    url: 'gasdata/list',
+    method: 'get',
+    params
+  })
+}
+
+// 开挖数据查询
+export function getDigData(params) {
+  return request({
+    url: 'digdata/list',
+    method: 'get',
+    params
+  })
+}
+
+// 有害气体数据查询
+export function getHarmfulData(params) {
+  return request({
+    url: 'harmfuldata/list',
+    method: 'get',
+    params
+  })
+}
+
+// 温湿度数据查询
+export function getTempData(params) {
+  return request({
+    url: 'tempdata/list',
+    method: 'get',
+    params
+  })
+}
+
+// 井盖定位监测仪数据查询
+export function getWellLocaData(params) {
+  return request({
+    url: 'welllocadata/list',
+    method: 'get',
+    params
+  })
+}
 
 // 批量导出井盖数据
 export function batchExportWellData(params) {
@@ -41,3 +85,58 @@
     responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
   })
 }
+
+// 批量导出燃气数据
+export function batchExportGasData(params) {
+  return request({
+    url: 'gasdata/export',
+    method: 'get',
+    timeout: 120000, // 120s，2分钟
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 批量导出开挖数据
+export function batchDigExportData(params) {
+  return request({
+    url: 'digdata/export',
+    method: 'get',
+    timeout: 120000, // 120s，2分钟
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 批量导出温湿度数据
+export function batchExportTempData(params) {
+  return request({
+    url: 'tempdata/export',
+    method: 'get',
+    timeout: 120000, // 120s，2分钟
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 批量导出有害气体数据
+export function batchExportHarmfulData(params) {
+  return request({
+    url: 'harmfuldata/export',
+    method: 'get',
+    timeout: 120000, // 120s，2分钟
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 批量导出井盖定位监测仪数据
+export function batchExportWellLocaData(params) {
+  return request({
+    url: 'welllocadata/export',
+    method: 'get',
+    timeout: 120000, // 120s，2分钟
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
diff --git a/src/views/dataManage/dataManage.vue b/src/views/dataManage/dataManage.vue
index 9e2594b..89fdb92 100644
--- a/src/views/dataManage/dataManage.vue
+++ b/src/views/dataManage/dataManage.vue
@@ -7,7 +7,21 @@
       <el-tab-pane v-if="hasPerm('/liquiddata/list')" label="液位监测仪" name="liquid">
         <list-liquid-data ref="liquiddatacomp"/>
       </el-tab-pane>
-      <el-tab-pane v-if="hasPerm('/data/gas')" label="燃气智能终端" name="gas">燃气数据</el-tab-pane>
+      <el-tab-pane v-if="hasPerm('/data/gas')" label="燃气智能终端" name="gas">
+        <list-gas-data ref="gasdatacomp"/>
+      </el-tab-pane>
+      <el-tab-pane v-if="hasPerm('/data/dig')" label="开挖监测仪" name="dig">
+        <list-dig-config ref="digdatacomp"/>
+      </el-tab-pane>
+      <el-tab-pane v-if="hasPerm('/data/harmful')" label="有害气体监测仪" name="harmful">
+        <list-harmful-data ref="harmfuldatacomp"/>
+      </el-tab-pane>
+      <el-tab-pane v-if="hasPerm('/data/temp')" label="温湿度监测仪" name="temp">
+        <list-temp-data ref="tempdatacomp"/>
+      </el-tab-pane>
+      <el-tab-pane v-if="hasPerm('/data/temp')" label="井盖定位监测仪" name="wellloca">
+        <list-well-loca-data ref="welllocadatacomp"/>
+      </el-tab-pane>
     </el-tabs>
   </div>
 </template>
@@ -15,9 +29,14 @@
 <script>
 import ListLiquidData from './deviceData/listLiquidData'
 import ListWellCoverData from './deviceData/listWellCoverData'
+import ListGasData from './deviceData/listGasData'
+import ListDigConfig from '../deviceConfig/liquidConfig/listDigConfig'
+import ListHarmfulData from './deviceData/listHarmfulData'
+import ListTempData from './deviceData/listTempData'
+import ListWellLocaData from './deviceData/listWellLocaData'
 export default {
   name: 'DataManage',
-  components: { ListLiquidData, ListWellCoverData },
+  components: { ListWellLocaData, ListTempData, ListHarmfulData, ListDigConfig, ListGasData, ListLiquidData, ListWellCoverData },
   data() {
     return {
       activeName: 'wellcover'
@@ -37,6 +56,16 @@
             this.activeName = 'wellcover'
           } else if (value === '2') {
             this.activeName = 'liquid'
+          } else if (value === '3') {
+            this.activeName = 'harmful'
+          } else if (value === '4') {
+            this.activeName = 'gas'
+          } else if (value === '5') {
+            this.activeName = 'temp'
+          } else if (value === '6') {
+            this.activeName = 'dig'
+          } else if (value === '7') {
+            this.activeName = 'wellloca'
           }
         }
       }
@@ -46,6 +75,16 @@
         this.activeName = 'wellcover'
       } else if (this.$route.params.deviceType === '2') {
         this.activeName = 'liquid'
+      } else if (this.$route.params.deviceType === '3') {
+        this.activeName = 'harmful'
+      } else if (this.$route.params.deviceType === '4') {
+        this.activeName = 'gas'
+      } else if (this.$route.params.deviceType === '5') {
+        this.activeName = 'temp'
+      } else if (this.$route.params.deviceType === '6') {
+        this.activeName = 'dig'
+      } else if (this.$route.params.deviceType === '7') {
+        this.activeName = 'wellloca'
       }
     }
   },
@@ -55,6 +94,16 @@
         this.$refs.welldatacomp.fetchData()
       } else if (tab.name === 'liquid') {
         this.$refs.welldatacomp.fetchData()
+      } else if (tab.name === 'harmful') {
+        this.$refs.welldatacomp.fetchData()
+      } else if (tab.name === 'gas') {
+        this.$refs.welldatacomp.fetchData()
+      } else if (tab.name === 'temp') {
+        this.$refs.welldatacomp.fetchData()
+      } else if (tab.name === 'dig') {
+        this.$refs.welldatacomp.fetchData()
+      } else if (tab.name === 'wellloca') {
+        this.$refs.welldatacomp.fetchData()
       }
     }
   }
diff --git a/src/views/dataManage/deviceData/listDigData.vue b/src/views/dataManage/deviceData/listDigData.vue
new file mode 100644
index 0000000..9f81cf0
--- /dev/null
+++ b/src/views/dataManage/deviceData/listDigData.vue
@@ -0,0 +1,283 @@
+<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" 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('/liquiddata/export')" 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>{{ 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 { getLiquidData, batchExportLiquidData } from '@/api/data'
+import DeptSelect from '../../../components/DeptSelect/index'
+
+export default {
+  name: 'ListDigData',
+  components: { DeptSelect, selectTree },
+  data() {
+    return {
+      listQuery: {
+        keywords: '', // 关键字
+        deptid: '', // 部门id
+        beginTime: '', // 开始时间
+        endTime: '', // 结束时间
+        offset: 1,
+        limit: 20,
+        sort: '',
+        order: ''
+      }, // 筛选条件
+      timeRange: [], // 时间范围
+      columns: [
+        {
+          text: '设备编号',
+          value: 'devcode',
+          align: 'center'
+        },
+        {
+          text: '闸井编号',
+          value: 'wellCode',
+          align: 'center'
+        },
+        {
+          text: '设备类型',
+          value: 'deviceTypeName',
+          align: 'center'
+        },
+        {
+          text: '噪声值',
+          value: 'ddata',
+          align: 'center'
+        },
+        {
+          text: '状态描述',
+          value: 'descn',
+          width: 80,
+          align: 'center',
+          checkCell: true
+        },
+        {
+          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 = ''
+      }
+    }
+  },
+  mounted() {
+    if (window.location.href) {
+      var query = window.location.href.split('?')
+      if (query.length > 1) {
+        var values = query[1].split('&')
+        for (var i = 0; i < values.length; i++) {
+          var pos = values[i].indexOf('=')
+          if (pos === -1) continue
+          var paramname = values[i].substring(0, pos)
+          var value = values[i].substring(pos + 1)
+          if (paramname === 'devcode') {
+            this.listQuery.keywords = value
+            this.fetchData()
+          } else {
+            this.fetchData()
+          }
+        }
+      } else {
+        if (this.$route.params && this.$route.params.deviceType === '2' && this.$route.params.devcode && this.$route.params.devcode !== '') {
+          this.listQuery.keywords = this.$route.params.devcode
+          this.fetchData(false)// 获取数据
+        } else {
+          this.fetchData()
+        }
+      }
+    }
+  },
+  methods: {
+    // 批量导出
+    batchExport() {
+      console.log('批量导出开挖配置')
+      // 全屏加载动画
+      const loading = this.$loading({
+        lock: true,
+        text: '数据处理中,请稍后...',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
+      })
+      batchExportLiquidData(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 = `开挖监测仪数s据.xlsx` // 下载后文件名
+        document.body.appendChild(downloadElement)
+        downloadElement.click() // 点击下载
+        document.body.removeChild(downloadElement) // 下载完成移除元素
+        window.URL.revokeObjectURL(href) // 释放blob对象
+      }).catch((res) => {
+        loading.close()
+      })
+    },
+    // 查询数据
+    search() {
+      this.fetchData(false)
+    },
+    // 获取开挖配置数据
+    fetchData(isNowPage = true) {
+      this.listLoading = true
+      if (!isNowPage) { // 是否显示当前页，否则跳转第一页
+        this.listQuery.offset = 1
+      }
+      getLiquidData(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/listGasData.vue b/src/views/dataManage/deviceData/listGasData.vue
new file mode 100644
index 0000000..f431b88
--- /dev/null
+++ b/src/views/dataManage/deviceData/listGasData.vue
@@ -0,0 +1,288 @@
+<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" 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('/liquiddata/export')" 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>{{ 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 { getLiquidData, batchExportLiquidData } from '@/api/data'
+import DeptSelect from '../../../components/DeptSelect/index'
+
+export default {
+  name: 'ListGasData',
+  components: { DeptSelect, selectTree },
+  data() {
+    return {
+      listQuery: {
+        keywords: '', // 关键字
+        deptid: '', // 部门id
+        beginTime: '', // 开始时间
+        endTime: '', // 结束时间
+        offset: 1,
+        limit: 20,
+        sort: '',
+        order: ''
+      }, // 筛选条件
+      timeRange: [], // 时间范围
+      columns: [
+        {
+          text: '设备编号',
+          value: 'devcode',
+          align: 'center'
+        },
+        {
+          text: '闸井编号',
+          value: 'wellCode',
+          align: 'center'
+        },
+        {
+          text: '设备类型',
+          value: 'deviceTypeName',
+          align: 'center'
+        },
+        {
+          text: '燃气浓度(%LEL)',
+          value: 'strength',
+          align: 'center'
+        },
+        {
+          text: '电量(%)',
+          value: 'cell',
+          width: 80,
+          align: 'center',
+          checkCell: true
+        },
+        {
+          text: '状态描述',
+          value: 'descn',
+          align: 'center'
+        },
+        {
+          text: '权属单位',
+          value: 'deptName',
+          align: 'center'
+        },
+        {
+          text: '上传时间',
+          value: 'uptime',
+          width: 170,
+          align: 'center'
+        }
+      ], // 显示列
+      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 = ''
+      }
+    }
+  },
+  mounted() {
+    if (window.location.href) {
+      var query = window.location.href.split('?')
+      if (query.length > 1) {
+        var values = query[1].split('&')
+        for (var i = 0; i < values.length; i++) {
+          var pos = values[i].indexOf('=')
+          if (pos === -1) continue
+          var paramname = values[i].substring(0, pos)
+          var value = values[i].substring(pos + 1)
+          if (paramname === 'devcode') {
+            this.listQuery.keywords = value
+            this.fetchData()
+          } else {
+            this.fetchData()
+          }
+        }
+      } else {
+        if (this.$route.params && this.$route.params.deviceType === '2' && this.$route.params.devcode && this.$route.params.devcode !== '') {
+          this.listQuery.keywords = this.$route.params.devcode
+          this.fetchData(false)// 获取数据
+        } else {
+          this.fetchData()
+        }
+      }
+    }
+  },
+  methods: {
+    // 批量导出
+    batchExport() {
+      console.log('批量导出燃气配置')
+      // 全屏加载动画
+      const loading = this.$loading({
+        lock: true,
+        text: '数据处理中,请稍后...',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
+      })
+      batchExportLiquidData(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 = `燃气监测仪数s据.xlsx` // 下载后文件名
+        document.body.appendChild(downloadElement)
+        downloadElement.click() // 点击下载
+        document.body.removeChild(downloadElement) // 下载完成移除元素
+        window.URL.revokeObjectURL(href) // 释放blob对象
+      }).catch((res) => {
+        loading.close()
+      })
+    },
+    // 查询数据
+    search() {
+      this.fetchData(false)
+    },
+    // 获取燃气配置数据
+    fetchData(isNowPage = true) {
+      this.listLoading = true
+      if (!isNowPage) { // 是否显示当前页，否则跳转第一页
+        this.listQuery.offset = 1
+      }
+      getLiquidData(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/listHarmfulData.vue b/src/views/dataManage/deviceData/listHarmfulData.vue
new file mode 100644
index 0000000..c010044
--- /dev/null
+++ b/src/views/dataManage/deviceData/listHarmfulData.vue
@@ -0,0 +1,301 @@
+<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" 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('/liquiddata/export')" 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>{{ 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 { getLiquidData, batchExportLiquidData } from '@/api/data'
+import DeptSelect from '../../../components/DeptSelect/index'
+
+export default {
+  name: 'ListHarmfulData',
+  components: { DeptSelect, selectTree },
+  data() {
+    return {
+      listQuery: {
+        keywords: '', // 关键字
+        deptid: '', // 部门id
+        beginTime: '', // 开始时间
+        endTime: '', // 结束时间
+        offset: 1,
+        limit: 20,
+        sort: '',
+        order: ''
+      }, // 筛选条件
+      timeRange: [], // 时间范围
+      columns: [
+        {
+          text: '设备编号',
+          value: 'devcode',
+          align: 'center'
+        },
+        {
+          text: '闸井编号',
+          value: 'wellCode',
+          align: 'center'
+        },
+        {
+          text: '设备类型',
+          value: 'deviceTypeName',
+          align: 'center'
+        },
+        {
+          text: 'CO浓度',
+          value: 'CO',
+          align: 'center'
+        },
+        {
+          text: 'CH4浓度',
+          value: 'CH4',
+          align: 'center'
+        },
+        {
+          text: 'H2S浓度',
+          value: 'H2S',
+          align: 'center'
+        },
+        {
+          text: 'O2浓度',
+          value: 'O2',
+          align: 'center'
+        },
+        {
+          text: '液位开关',
+          value: 'switch',
+          align: 'center'
+        },
+        {
+          text: '状态描述',
+          value: 'descn',
+          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 = ''
+      }
+    }
+  },
+  mounted() {
+    if (window.location.href) {
+      var query = window.location.href.split('?')
+      if (query.length > 1) {
+        var values = query[1].split('&')
+        for (var i = 0; i < values.length; i++) {
+          var pos = values[i].indexOf('=')
+          if (pos === -1) continue
+          var paramname = values[i].substring(0, pos)
+          var value = values[i].substring(pos + 1)
+          if (paramname === 'devcode') {
+            this.listQuery.keywords = value
+            this.fetchData()
+          } else {
+            this.fetchData()
+          }
+        }
+      } else {
+        if (this.$route.params && this.$route.params.deviceType === '2' && this.$route.params.devcode && this.$route.params.devcode !== '') {
+          this.listQuery.keywords = this.$route.params.devcode
+          this.fetchData(false)// 获取数据
+        } else {
+          this.fetchData()
+        }
+      }
+    }
+  },
+  methods: {
+    // 批量导出
+    batchExport() {
+      console.log('批量导出有害配置')
+      // 全屏加载动画
+      const loading = this.$loading({
+        lock: true,
+        text: '数据处理中,请稍后...',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
+      })
+      batchExportLiquidData(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 = `有害监测仪数s据.xlsx` // 下载后文件名
+        document.body.appendChild(downloadElement)
+        downloadElement.click() // 点击下载
+        document.body.removeChild(downloadElement) // 下载完成移除元素
+        window.URL.revokeObjectURL(href) // 释放blob对象
+      }).catch((res) => {
+        loading.close()
+      })
+    },
+    // 查询数据
+    search() {
+      this.fetchData(false)
+    },
+    // 获取有害配置数据
+    fetchData(isNowPage = true) {
+      this.listLoading = true
+      if (!isNowPage) { // 是否显示当前页，否则跳转第一页
+        this.listQuery.offset = 1
+      }
+      getLiquidData(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/listTempData.vue b/src/views/dataManage/deviceData/listTempData.vue
new file mode 100644
index 0000000..9389050
--- /dev/null
+++ b/src/views/dataManage/deviceData/listTempData.vue
@@ -0,0 +1,288 @@
+<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" 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('/liquiddata/export')" 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>{{ 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 { getLiquidData, batchExportLiquidData } from '@/api/data'
+import DeptSelect from '../../../components/DeptSelect/index'
+
+export default {
+  name: 'ListTempData',
+  components: { DeptSelect, selectTree },
+  data() {
+    return {
+      listQuery: {
+        keywords: '', // 关键字
+        deptid: '', // 部门id
+        beginTime: '', // 开始时间
+        endTime: '', // 结束时间
+        offset: 1,
+        limit: 20,
+        sort: '',
+        order: ''
+      }, // 筛选条件
+      timeRange: [], // 时间范围
+      columns: [
+        {
+          text: '设备编号',
+          value: 'devcode',
+          align: 'center'
+        },
+        {
+          text: '闸井编号',
+          value: 'wellCode',
+          align: 'center'
+        },
+        {
+          text: '设备类型',
+          value: 'deviceTypeName',
+          align: 'center'
+        },
+        {
+          text: '温度',
+          value: 'temperature',
+          align: 'center'
+        },
+        {
+          text: '湿度',
+          value: 'humidity',
+          align: 'center'
+        },
+        {
+          text: '电量',
+          value: 'cell',
+          width: 80,
+          align: 'center',
+          checkCell: true
+        },
+        {
+          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 = ''
+      }
+    }
+  },
+  mounted() {
+    if (window.location.href) {
+      var query = window.location.href.split('?')
+      if (query.length > 1) {
+        var values = query[1].split('&')
+        for (var i = 0; i < values.length; i++) {
+          var pos = values[i].indexOf('=')
+          if (pos === -1) continue
+          var paramname = values[i].substring(0, pos)
+          var value = values[i].substring(pos + 1)
+          if (paramname === 'devcode') {
+            this.listQuery.keywords = value
+            this.fetchData()
+          } else {
+            this.fetchData()
+          }
+        }
+      } else {
+        if (this.$route.params && this.$route.params.deviceType === '2' && this.$route.params.devcode && this.$route.params.devcode !== '') {
+          this.listQuery.keywords = this.$route.params.devcode
+          this.fetchData(false)// 获取数据
+        } else {
+          this.fetchData()
+        }
+      }
+    }
+  },
+  methods: {
+    // 批量导出
+    batchExport() {
+      console.log('批量导出温湿度配置')
+      // 全屏加载动画
+      const loading = this.$loading({
+        lock: true,
+        text: '数据处理中,请稍后...',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
+      })
+      batchExportLiquidData(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 = `温湿度监测仪数s据.xlsx` // 下载后文件名
+        document.body.appendChild(downloadElement)
+        downloadElement.click() // 点击下载
+        document.body.removeChild(downloadElement) // 下载完成移除元素
+        window.URL.revokeObjectURL(href) // 释放blob对象
+      }).catch((res) => {
+        loading.close()
+      })
+    },
+    // 查询数据
+    search() {
+      this.fetchData(false)
+    },
+    // 获取温湿度配置数据
+    fetchData(isNowPage = true) {
+      this.listLoading = true
+      if (!isNowPage) { // 是否显示当前页，否则跳转第一页
+        this.listQuery.offset = 1
+      }
+      getLiquidData(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 08d447c..9294c10 100644
--- a/src/api/data.js
+++ b/src/api/data.js
@@ -19,6 +19,50 @@
     params
   })
 }
+// 燃气数据查询
+export function getGasData(params) {
+  return request({
+    url: 'gasdata/list',
+    method: 'get',
+    params
+  })
+}
+
+// 开挖数据查询
+export function getDigData(params) {
+  return request({
+    url: 'digdata/list',
+    method: 'get',
+    params
+  })
+}
+
+// 有害气体数据查询
+export function getHarmfulData(params) {
+  return request({
+    url: 'harmfuldata/list',
+    method: 'get',
+    params
+  })
+}
+
+// 温湿度数据查询
+export function getTempData(params) {
+  return request({
+    url: 'tempdata/list',
+    method: 'get',
+    params
+  })
+}
+
+// 井盖定位监测仪数据查询
+export function getWellLocaData(params) {
+  return request({
+    url: 'welllocadata/list',
+    method: 'get',
+    params
+  })
+}
 
 // 批量导出井盖数据
 export function batchExportWellData(params) {
@@ -41,3 +85,58 @@
     responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
   })
 }
+
+// 批量导出燃气数据
+export function batchExportGasData(params) {
+  return request({
+    url: 'gasdata/export',
+    method: 'get',
+    timeout: 120000, // 120s，2分钟
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 批量导出开挖数据
+export function batchDigExportData(params) {
+  return request({
+    url: 'digdata/export',
+    method: 'get',
+    timeout: 120000, // 120s，2分钟
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 批量导出温湿度数据
+export function batchExportTempData(params) {
+  return request({
+    url: 'tempdata/export',
+    method: 'get',
+    timeout: 120000, // 120s，2分钟
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 批量导出有害气体数据
+export function batchExportHarmfulData(params) {
+  return request({
+    url: 'harmfuldata/export',
+    method: 'get',
+    timeout: 120000, // 120s，2分钟
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 批量导出井盖定位监测仪数据
+export function batchExportWellLocaData(params) {
+  return request({
+    url: 'welllocadata/export',
+    method: 'get',
+    timeout: 120000, // 120s，2分钟
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
diff --git a/src/views/dataManage/dataManage.vue b/src/views/dataManage/dataManage.vue
index 9e2594b..89fdb92 100644
--- a/src/views/dataManage/dataManage.vue
+++ b/src/views/dataManage/dataManage.vue
@@ -7,7 +7,21 @@
       <el-tab-pane v-if="hasPerm('/liquiddata/list')" label="液位监测仪" name="liquid">
         <list-liquid-data ref="liquiddatacomp"/>
       </el-tab-pane>
-      <el-tab-pane v-if="hasPerm('/data/gas')" label="燃气智能终端" name="gas">燃气数据</el-tab-pane>
+      <el-tab-pane v-if="hasPerm('/data/gas')" label="燃气智能终端" name="gas">
+        <list-gas-data ref="gasdatacomp"/>
+      </el-tab-pane>
+      <el-tab-pane v-if="hasPerm('/data/dig')" label="开挖监测仪" name="dig">
+        <list-dig-config ref="digdatacomp"/>
+      </el-tab-pane>
+      <el-tab-pane v-if="hasPerm('/data/harmful')" label="有害气体监测仪" name="harmful">
+        <list-harmful-data ref="harmfuldatacomp"/>
+      </el-tab-pane>
+      <el-tab-pane v-if="hasPerm('/data/temp')" label="温湿度监测仪" name="temp">
+        <list-temp-data ref="tempdatacomp"/>
+      </el-tab-pane>
+      <el-tab-pane v-if="hasPerm('/data/temp')" label="井盖定位监测仪" name="wellloca">
+        <list-well-loca-data ref="welllocadatacomp"/>
+      </el-tab-pane>
     </el-tabs>
   </div>
 </template>
@@ -15,9 +29,14 @@
 <script>
 import ListLiquidData from './deviceData/listLiquidData'
 import ListWellCoverData from './deviceData/listWellCoverData'
+import ListGasData from './deviceData/listGasData'
+import ListDigConfig from '../deviceConfig/liquidConfig/listDigConfig'
+import ListHarmfulData from './deviceData/listHarmfulData'
+import ListTempData from './deviceData/listTempData'
+import ListWellLocaData from './deviceData/listWellLocaData'
 export default {
   name: 'DataManage',
-  components: { ListLiquidData, ListWellCoverData },
+  components: { ListWellLocaData, ListTempData, ListHarmfulData, ListDigConfig, ListGasData, ListLiquidData, ListWellCoverData },
   data() {
     return {
       activeName: 'wellcover'
@@ -37,6 +56,16 @@
             this.activeName = 'wellcover'
           } else if (value === '2') {
             this.activeName = 'liquid'
+          } else if (value === '3') {
+            this.activeName = 'harmful'
+          } else if (value === '4') {
+            this.activeName = 'gas'
+          } else if (value === '5') {
+            this.activeName = 'temp'
+          } else if (value === '6') {
+            this.activeName = 'dig'
+          } else if (value === '7') {
+            this.activeName = 'wellloca'
           }
         }
       }
@@ -46,6 +75,16 @@
         this.activeName = 'wellcover'
       } else if (this.$route.params.deviceType === '2') {
         this.activeName = 'liquid'
+      } else if (this.$route.params.deviceType === '3') {
+        this.activeName = 'harmful'
+      } else if (this.$route.params.deviceType === '4') {
+        this.activeName = 'gas'
+      } else if (this.$route.params.deviceType === '5') {
+        this.activeName = 'temp'
+      } else if (this.$route.params.deviceType === '6') {
+        this.activeName = 'dig'
+      } else if (this.$route.params.deviceType === '7') {
+        this.activeName = 'wellloca'
       }
     }
   },
@@ -55,6 +94,16 @@
         this.$refs.welldatacomp.fetchData()
       } else if (tab.name === 'liquid') {
         this.$refs.welldatacomp.fetchData()
+      } else if (tab.name === 'harmful') {
+        this.$refs.welldatacomp.fetchData()
+      } else if (tab.name === 'gas') {
+        this.$refs.welldatacomp.fetchData()
+      } else if (tab.name === 'temp') {
+        this.$refs.welldatacomp.fetchData()
+      } else if (tab.name === 'dig') {
+        this.$refs.welldatacomp.fetchData()
+      } else if (tab.name === 'wellloca') {
+        this.$refs.welldatacomp.fetchData()
       }
     }
   }
diff --git a/src/views/dataManage/deviceData/listDigData.vue b/src/views/dataManage/deviceData/listDigData.vue
new file mode 100644
index 0000000..9f81cf0
--- /dev/null
+++ b/src/views/dataManage/deviceData/listDigData.vue
@@ -0,0 +1,283 @@
+<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" 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('/liquiddata/export')" 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>{{ 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 { getLiquidData, batchExportLiquidData } from '@/api/data'
+import DeptSelect from '../../../components/DeptSelect/index'
+
+export default {
+  name: 'ListDigData',
+  components: { DeptSelect, selectTree },
+  data() {
+    return {
+      listQuery: {
+        keywords: '', // 关键字
+        deptid: '', // 部门id
+        beginTime: '', // 开始时间
+        endTime: '', // 结束时间
+        offset: 1,
+        limit: 20,
+        sort: '',
+        order: ''
+      }, // 筛选条件
+      timeRange: [], // 时间范围
+      columns: [
+        {
+          text: '设备编号',
+          value: 'devcode',
+          align: 'center'
+        },
+        {
+          text: '闸井编号',
+          value: 'wellCode',
+          align: 'center'
+        },
+        {
+          text: '设备类型',
+          value: 'deviceTypeName',
+          align: 'center'
+        },
+        {
+          text: '噪声值',
+          value: 'ddata',
+          align: 'center'
+        },
+        {
+          text: '状态描述',
+          value: 'descn',
+          width: 80,
+          align: 'center',
+          checkCell: true
+        },
+        {
+          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 = ''
+      }
+    }
+  },
+  mounted() {
+    if (window.location.href) {
+      var query = window.location.href.split('?')
+      if (query.length > 1) {
+        var values = query[1].split('&')
+        for (var i = 0; i < values.length; i++) {
+          var pos = values[i].indexOf('=')
+          if (pos === -1) continue
+          var paramname = values[i].substring(0, pos)
+          var value = values[i].substring(pos + 1)
+          if (paramname === 'devcode') {
+            this.listQuery.keywords = value
+            this.fetchData()
+          } else {
+            this.fetchData()
+          }
+        }
+      } else {
+        if (this.$route.params && this.$route.params.deviceType === '2' && this.$route.params.devcode && this.$route.params.devcode !== '') {
+          this.listQuery.keywords = this.$route.params.devcode
+          this.fetchData(false)// 获取数据
+        } else {
+          this.fetchData()
+        }
+      }
+    }
+  },
+  methods: {
+    // 批量导出
+    batchExport() {
+      console.log('批量导出开挖配置')
+      // 全屏加载动画
+      const loading = this.$loading({
+        lock: true,
+        text: '数据处理中,请稍后...',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
+      })
+      batchExportLiquidData(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 = `开挖监测仪数s据.xlsx` // 下载后文件名
+        document.body.appendChild(downloadElement)
+        downloadElement.click() // 点击下载
+        document.body.removeChild(downloadElement) // 下载完成移除元素
+        window.URL.revokeObjectURL(href) // 释放blob对象
+      }).catch((res) => {
+        loading.close()
+      })
+    },
+    // 查询数据
+    search() {
+      this.fetchData(false)
+    },
+    // 获取开挖配置数据
+    fetchData(isNowPage = true) {
+      this.listLoading = true
+      if (!isNowPage) { // 是否显示当前页，否则跳转第一页
+        this.listQuery.offset = 1
+      }
+      getLiquidData(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/listGasData.vue b/src/views/dataManage/deviceData/listGasData.vue
new file mode 100644
index 0000000..f431b88
--- /dev/null
+++ b/src/views/dataManage/deviceData/listGasData.vue
@@ -0,0 +1,288 @@
+<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" 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('/liquiddata/export')" 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>{{ 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 { getLiquidData, batchExportLiquidData } from '@/api/data'
+import DeptSelect from '../../../components/DeptSelect/index'
+
+export default {
+  name: 'ListGasData',
+  components: { DeptSelect, selectTree },
+  data() {
+    return {
+      listQuery: {
+        keywords: '', // 关键字
+        deptid: '', // 部门id
+        beginTime: '', // 开始时间
+        endTime: '', // 结束时间
+        offset: 1,
+        limit: 20,
+        sort: '',
+        order: ''
+      }, // 筛选条件
+      timeRange: [], // 时间范围
+      columns: [
+        {
+          text: '设备编号',
+          value: 'devcode',
+          align: 'center'
+        },
+        {
+          text: '闸井编号',
+          value: 'wellCode',
+          align: 'center'
+        },
+        {
+          text: '设备类型',
+          value: 'deviceTypeName',
+          align: 'center'
+        },
+        {
+          text: '燃气浓度(%LEL)',
+          value: 'strength',
+          align: 'center'
+        },
+        {
+          text: '电量(%)',
+          value: 'cell',
+          width: 80,
+          align: 'center',
+          checkCell: true
+        },
+        {
+          text: '状态描述',
+          value: 'descn',
+          align: 'center'
+        },
+        {
+          text: '权属单位',
+          value: 'deptName',
+          align: 'center'
+        },
+        {
+          text: '上传时间',
+          value: 'uptime',
+          width: 170,
+          align: 'center'
+        }
+      ], // 显示列
+      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 = ''
+      }
+    }
+  },
+  mounted() {
+    if (window.location.href) {
+      var query = window.location.href.split('?')
+      if (query.length > 1) {
+        var values = query[1].split('&')
+        for (var i = 0; i < values.length; i++) {
+          var pos = values[i].indexOf('=')
+          if (pos === -1) continue
+          var paramname = values[i].substring(0, pos)
+          var value = values[i].substring(pos + 1)
+          if (paramname === 'devcode') {
+            this.listQuery.keywords = value
+            this.fetchData()
+          } else {
+            this.fetchData()
+          }
+        }
+      } else {
+        if (this.$route.params && this.$route.params.deviceType === '2' && this.$route.params.devcode && this.$route.params.devcode !== '') {
+          this.listQuery.keywords = this.$route.params.devcode
+          this.fetchData(false)// 获取数据
+        } else {
+          this.fetchData()
+        }
+      }
+    }
+  },
+  methods: {
+    // 批量导出
+    batchExport() {
+      console.log('批量导出燃气配置')
+      // 全屏加载动画
+      const loading = this.$loading({
+        lock: true,
+        text: '数据处理中,请稍后...',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
+      })
+      batchExportLiquidData(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 = `燃气监测仪数s据.xlsx` // 下载后文件名
+        document.body.appendChild(downloadElement)
+        downloadElement.click() // 点击下载
+        document.body.removeChild(downloadElement) // 下载完成移除元素
+        window.URL.revokeObjectURL(href) // 释放blob对象
+      }).catch((res) => {
+        loading.close()
+      })
+    },
+    // 查询数据
+    search() {
+      this.fetchData(false)
+    },
+    // 获取燃气配置数据
+    fetchData(isNowPage = true) {
+      this.listLoading = true
+      if (!isNowPage) { // 是否显示当前页，否则跳转第一页
+        this.listQuery.offset = 1
+      }
+      getLiquidData(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/listHarmfulData.vue b/src/views/dataManage/deviceData/listHarmfulData.vue
new file mode 100644
index 0000000..c010044
--- /dev/null
+++ b/src/views/dataManage/deviceData/listHarmfulData.vue
@@ -0,0 +1,301 @@
+<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" 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('/liquiddata/export')" 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>{{ 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 { getLiquidData, batchExportLiquidData } from '@/api/data'
+import DeptSelect from '../../../components/DeptSelect/index'
+
+export default {
+  name: 'ListHarmfulData',
+  components: { DeptSelect, selectTree },
+  data() {
+    return {
+      listQuery: {
+        keywords: '', // 关键字
+        deptid: '', // 部门id
+        beginTime: '', // 开始时间
+        endTime: '', // 结束时间
+        offset: 1,
+        limit: 20,
+        sort: '',
+        order: ''
+      }, // 筛选条件
+      timeRange: [], // 时间范围
+      columns: [
+        {
+          text: '设备编号',
+          value: 'devcode',
+          align: 'center'
+        },
+        {
+          text: '闸井编号',
+          value: 'wellCode',
+          align: 'center'
+        },
+        {
+          text: '设备类型',
+          value: 'deviceTypeName',
+          align: 'center'
+        },
+        {
+          text: 'CO浓度',
+          value: 'CO',
+          align: 'center'
+        },
+        {
+          text: 'CH4浓度',
+          value: 'CH4',
+          align: 'center'
+        },
+        {
+          text: 'H2S浓度',
+          value: 'H2S',
+          align: 'center'
+        },
+        {
+          text: 'O2浓度',
+          value: 'O2',
+          align: 'center'
+        },
+        {
+          text: '液位开关',
+          value: 'switch',
+          align: 'center'
+        },
+        {
+          text: '状态描述',
+          value: 'descn',
+          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 = ''
+      }
+    }
+  },
+  mounted() {
+    if (window.location.href) {
+      var query = window.location.href.split('?')
+      if (query.length > 1) {
+        var values = query[1].split('&')
+        for (var i = 0; i < values.length; i++) {
+          var pos = values[i].indexOf('=')
+          if (pos === -1) continue
+          var paramname = values[i].substring(0, pos)
+          var value = values[i].substring(pos + 1)
+          if (paramname === 'devcode') {
+            this.listQuery.keywords = value
+            this.fetchData()
+          } else {
+            this.fetchData()
+          }
+        }
+      } else {
+        if (this.$route.params && this.$route.params.deviceType === '2' && this.$route.params.devcode && this.$route.params.devcode !== '') {
+          this.listQuery.keywords = this.$route.params.devcode
+          this.fetchData(false)// 获取数据
+        } else {
+          this.fetchData()
+        }
+      }
+    }
+  },
+  methods: {
+    // 批量导出
+    batchExport() {
+      console.log('批量导出有害配置')
+      // 全屏加载动画
+      const loading = this.$loading({
+        lock: true,
+        text: '数据处理中,请稍后...',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
+      })
+      batchExportLiquidData(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 = `有害监测仪数s据.xlsx` // 下载后文件名
+        document.body.appendChild(downloadElement)
+        downloadElement.click() // 点击下载
+        document.body.removeChild(downloadElement) // 下载完成移除元素
+        window.URL.revokeObjectURL(href) // 释放blob对象
+      }).catch((res) => {
+        loading.close()
+      })
+    },
+    // 查询数据
+    search() {
+      this.fetchData(false)
+    },
+    // 获取有害配置数据
+    fetchData(isNowPage = true) {
+      this.listLoading = true
+      if (!isNowPage) { // 是否显示当前页，否则跳转第一页
+        this.listQuery.offset = 1
+      }
+      getLiquidData(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/listTempData.vue b/src/views/dataManage/deviceData/listTempData.vue
new file mode 100644
index 0000000..9389050
--- /dev/null
+++ b/src/views/dataManage/deviceData/listTempData.vue
@@ -0,0 +1,288 @@
+<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" 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('/liquiddata/export')" 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>{{ 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 { getLiquidData, batchExportLiquidData } from '@/api/data'
+import DeptSelect from '../../../components/DeptSelect/index'
+
+export default {
+  name: 'ListTempData',
+  components: { DeptSelect, selectTree },
+  data() {
+    return {
+      listQuery: {
+        keywords: '', // 关键字
+        deptid: '', // 部门id
+        beginTime: '', // 开始时间
+        endTime: '', // 结束时间
+        offset: 1,
+        limit: 20,
+        sort: '',
+        order: ''
+      }, // 筛选条件
+      timeRange: [], // 时间范围
+      columns: [
+        {
+          text: '设备编号',
+          value: 'devcode',
+          align: 'center'
+        },
+        {
+          text: '闸井编号',
+          value: 'wellCode',
+          align: 'center'
+        },
+        {
+          text: '设备类型',
+          value: 'deviceTypeName',
+          align: 'center'
+        },
+        {
+          text: '温度',
+          value: 'temperature',
+          align: 'center'
+        },
+        {
+          text: '湿度',
+          value: 'humidity',
+          align: 'center'
+        },
+        {
+          text: '电量',
+          value: 'cell',
+          width: 80,
+          align: 'center',
+          checkCell: true
+        },
+        {
+          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 = ''
+      }
+    }
+  },
+  mounted() {
+    if (window.location.href) {
+      var query = window.location.href.split('?')
+      if (query.length > 1) {
+        var values = query[1].split('&')
+        for (var i = 0; i < values.length; i++) {
+          var pos = values[i].indexOf('=')
+          if (pos === -1) continue
+          var paramname = values[i].substring(0, pos)
+          var value = values[i].substring(pos + 1)
+          if (paramname === 'devcode') {
+            this.listQuery.keywords = value
+            this.fetchData()
+          } else {
+            this.fetchData()
+          }
+        }
+      } else {
+        if (this.$route.params && this.$route.params.deviceType === '2' && this.$route.params.devcode && this.$route.params.devcode !== '') {
+          this.listQuery.keywords = this.$route.params.devcode
+          this.fetchData(false)// 获取数据
+        } else {
+          this.fetchData()
+        }
+      }
+    }
+  },
+  methods: {
+    // 批量导出
+    batchExport() {
+      console.log('批量导出温湿度配置')
+      // 全屏加载动画
+      const loading = this.$loading({
+        lock: true,
+        text: '数据处理中,请稍后...',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
+      })
+      batchExportLiquidData(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 = `温湿度监测仪数s据.xlsx` // 下载后文件名
+        document.body.appendChild(downloadElement)
+        downloadElement.click() // 点击下载
+        document.body.removeChild(downloadElement) // 下载完成移除元素
+        window.URL.revokeObjectURL(href) // 释放blob对象
+      }).catch((res) => {
+        loading.close()
+      })
+    },
+    // 查询数据
+    search() {
+      this.fetchData(false)
+    },
+    // 获取温湿度配置数据
+    fetchData(isNowPage = true) {
+      this.listLoading = true
+      if (!isNowPage) { // 是否显示当前页，否则跳转第一页
+        this.listQuery.offset = 1
+      }
+      getLiquidData(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/listWellLocaData.vue b/src/views/dataManage/deviceData/listWellLocaData.vue
new file mode 100644
index 0000000..ed0eb4b
--- /dev/null
+++ b/src/views/dataManage/deviceData/listWellLocaData.vue
@@ -0,0 +1,288 @@
+<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" 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('/liquiddata/export')" 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>{{ 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 { getLiquidData, batchExportLiquidData } from '@/api/data'
+import DeptSelect from '../../../components/DeptSelect/index'
+
+export default {
+  name: 'ListWellLocaData',
+  components: { DeptSelect, selectTree },
+  data() {
+    return {
+      listQuery: {
+        keywords: '', // 关键字
+        deptid: '', // 部门id
+        beginTime: '', // 开始时间
+        endTime: '', // 结束时间
+        offset: 1,
+        limit: 20,
+        sort: '',
+        order: ''
+      }, // 筛选条件
+      timeRange: [], // 时间范围
+      columns: [
+        {
+          text: '设备编号',
+          value: 'devcode',
+          align: 'center'
+        },
+        {
+          text: '闸井编号',
+          value: 'wellCode',
+          align: 'center'
+        },
+        {
+          text: '设备类型',
+          value: 'deviceTypeName',
+          align: 'center'
+        },
+        {
+          text: '经度',
+          value: 'lng',
+          align: 'center'
+        },
+        {
+          text: '纬度',
+          value: 'lat',
+          align: 'center'
+        },
+        {
+          text: '电量(%)',
+          value: 'cell',
+          width: 80,
+          align: 'center',
+          checkCell: true
+        },
+        {
+          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 = ''
+      }
+    }
+  },
+  mounted() {
+    if (window.location.href) {
+      var query = window.location.href.split('?')
+      if (query.length > 1) {
+        var values = query[1].split('&')
+        for (var i = 0; i < values.length; i++) {
+          var pos = values[i].indexOf('=')
+          if (pos === -1) continue
+          var paramname = values[i].substring(0, pos)
+          var value = values[i].substring(pos + 1)
+          if (paramname === 'devcode') {
+            this.listQuery.keywords = value
+            this.fetchData()
+          } else {
+            this.fetchData()
+          }
+        }
+      } else {
+        if (this.$route.params && this.$route.params.deviceType === '2' && this.$route.params.devcode && this.$route.params.devcode !== '') {
+          this.listQuery.keywords = this.$route.params.devcode
+          this.fetchData(false)// 获取数据
+        } else {
+          this.fetchData()
+        }
+      }
+    }
+  },
+  methods: {
+    // 批量导出
+    batchExport() {
+      console.log('批量导出液位配置')
+      // 全屏加载动画
+      const loading = this.$loading({
+        lock: true,
+        text: '数据处理中,请稍后...',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
+      })
+      batchExportLiquidData(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 = `液位监测仪数s据.xlsx` // 下载后文件名
+        document.body.appendChild(downloadElement)
+        downloadElement.click() // 点击下载
+        document.body.removeChild(downloadElement) // 下载完成移除元素
+        window.URL.revokeObjectURL(href) // 释放blob对象
+      }).catch((res) => {
+        loading.close()
+      })
+    },
+    // 查询数据
+    search() {
+      this.fetchData(false)
+    },
+    // 获取液位配置数据
+    fetchData(isNowPage = true) {
+      this.listLoading = true
+      if (!isNowPage) { // 是否显示当前页，否则跳转第一页
+        this.listQuery.offset = 1
+      }
+      getLiquidData(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>