diff --git a/src/api/data/data.js b/src/api/data/data.js
index 9d23a3e..d87e74a 100644
--- a/src/api/data/data.js
+++ b/src/api/data/data.js
@@ -366,3 +366,31 @@
     responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
   })
 }
+
+// 硫化氢数据查询，不分页
+export function getH2SDataSingle(params) {
+  return request({
+    url: 'h2s/list',
+    method: 'get',
+    params
+  })
+}
+
+// 硫化氢数据查询
+export function getH2SData(params) {
+  return request({
+    url: 'h2s/list-page',
+    method: 'get',
+    params
+  })
+}
+// 批量导出硫化氢数据
+export function batchExportH2SData(params) {
+  return request({
+    url: 'h2s/export',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}

diff --git a/src/api/data/data.js b/src/api/data/data.js
index 9d23a3e..d87e74a 100644
--- a/src/api/data/data.js
+++ b/src/api/data/data.js
@@ -366,3 +366,31 @@
     responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
   })
 }
+
+// 硫化氢数据查询，不分页
+export function getH2SDataSingle(params) {
+  return request({
+    url: 'h2s/list',
+    method: 'get',
+    params
+  })
+}
+
+// 硫化氢数据查询
+export function getH2SData(params) {
+  return request({
+    url: 'h2s/list-page',
+    method: 'get',
+    params
+  })
+}
+// 批量导出硫化氢数据
+export function batchExportH2SData(params) {
+  return request({
+    url: 'h2s/export',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
diff --git a/src/api/device/deviceTypeDetail.js b/src/api/device/deviceTypeDetail.js
index c3d1c6f..a45921d 100644
--- a/src/api/device/deviceTypeDetail.js
+++ b/src/api/device/deviceTypeDetail.js
@@ -91,3 +91,11 @@
     params
   })
 }
+// 硫化氢终端查询
+export function H2SdataList(params) {
+  return request({
+    url: 'H2Sdata/listSimple',
+    method: 'get',
+    params
+  })
+}

diff --git a/src/api/data/data.js b/src/api/data/data.js
index 9d23a3e..d87e74a 100644
--- a/src/api/data/data.js
+++ b/src/api/data/data.js
@@ -366,3 +366,31 @@
     responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
   })
 }
+
+// 硫化氢数据查询，不分页
+export function getH2SDataSingle(params) {
+  return request({
+    url: 'h2s/list',
+    method: 'get',
+    params
+  })
+}
+
+// 硫化氢数据查询
+export function getH2SData(params) {
+  return request({
+    url: 'h2s/list-page',
+    method: 'get',
+    params
+  })
+}
+// 批量导出硫化氢数据
+export function batchExportH2SData(params) {
+  return request({
+    url: 'h2s/export',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
diff --git a/src/api/device/deviceTypeDetail.js b/src/api/device/deviceTypeDetail.js
index c3d1c6f..a45921d 100644
--- a/src/api/device/deviceTypeDetail.js
+++ b/src/api/device/deviceTypeDetail.js
@@ -91,3 +91,11 @@
     params
   })
 }
+// 硫化氢终端查询
+export function H2SdataList(params) {
+  return request({
+    url: 'H2Sdata/listSimple',
+    method: 'get',
+    params
+  })
+}
diff --git a/src/views/dataManage/dataManage.vue b/src/views/dataManage/dataManage.vue
index 0564cdd..b6bceb8 100644
--- a/src/views/dataManage/dataManage.vue
+++ b/src/views/dataManage/dataManage.vue
@@ -22,11 +22,12 @@
 import ListGasdectorData from '@/views/dataManage/deviceData/listGasdectorData'
 import ListPantiltData from '@/views/dataManage/deviceData/listPantiltData'
 import ListHydrantData from '@/views/dataManage/deviceData/listHydrantData'
+import ListH2SData from '@/views/dataManage/deviceData/listH2SData'
 import { parseUrl } from '@/utils/parseutils'
 
 export default {
   name: 'DataManage',
-  components: { ListHydrantData, ListPantiltData, ListGasdectorData, ListTubeData, ListNoiseData, ListWellLocaData, ListTempData, ListHarmfulData, ListDigData, ListGasData, ListLiquidData, ListWellCoverData, ListLiquidGasData },
+  components: { ListH2SData, ListHydrantData, ListPantiltData, ListGasdectorData, ListTubeData, ListNoiseData, ListWellLocaData, ListTempData, ListHarmfulData, ListDigData, ListGasData, ListLiquidData, ListWellCoverData, ListLiquidGasData },
   data() {
     return {
       activeName: 'wellcover',
@@ -43,7 +44,8 @@
         { permission: '/tubedata/list-page', label: '管盯', name: 'tube', type: '12', comp: 'list-tube-data' },
         { permission: '/gasdector/list-page', label: '可燃气体智能监测终端', name: 'gasdector', type: '1', comp: 'list-gasdector-data' },
         { permission: '/pantilt/list-page', label: '激光甲烷遥测云台', name: 'pantilt', type: '1', comp: 'list-pantilt-data' },
-        { permission: '/hydrantdata/list-page', label: '消防栓防盗水监测仪', name: 'hydrant', type: '11', comp: 'list-hydrant-data' }
+        { permission: '/hydrantdata/list-page', label: '消防栓防盗水监测仪', name: 'hydrant', type: '11', comp: 'list-hydrant-data' },
+        { permission: '/h2s/list-page', label: '硫化氢浓度监测仪', name: 'H2S', type: '11', comp: 'list-H2S-data' }
       ] // 所有tab列表
     }
   },

diff --git a/src/api/data/data.js b/src/api/data/data.js
index 9d23a3e..d87e74a 100644
--- a/src/api/data/data.js
+++ b/src/api/data/data.js
@@ -366,3 +366,31 @@
     responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
   })
 }
+
+// 硫化氢数据查询，不分页
+export function getH2SDataSingle(params) {
+  return request({
+    url: 'h2s/list',
+    method: 'get',
+    params
+  })
+}
+
+// 硫化氢数据查询
+export function getH2SData(params) {
+  return request({
+    url: 'h2s/list-page',
+    method: 'get',
+    params
+  })
+}
+// 批量导出硫化氢数据
+export function batchExportH2SData(params) {
+  return request({
+    url: 'h2s/export',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
diff --git a/src/api/device/deviceTypeDetail.js b/src/api/device/deviceTypeDetail.js
index c3d1c6f..a45921d 100644
--- a/src/api/device/deviceTypeDetail.js
+++ b/src/api/device/deviceTypeDetail.js
@@ -91,3 +91,11 @@
     params
   })
 }
+// 硫化氢终端查询
+export function H2SdataList(params) {
+  return request({
+    url: 'H2Sdata/listSimple',
+    method: 'get',
+    params
+  })
+}
diff --git a/src/views/dataManage/dataManage.vue b/src/views/dataManage/dataManage.vue
index 0564cdd..b6bceb8 100644
--- a/src/views/dataManage/dataManage.vue
+++ b/src/views/dataManage/dataManage.vue
@@ -22,11 +22,12 @@
 import ListGasdectorData from '@/views/dataManage/deviceData/listGasdectorData'
 import ListPantiltData from '@/views/dataManage/deviceData/listPantiltData'
 import ListHydrantData from '@/views/dataManage/deviceData/listHydrantData'
+import ListH2SData from '@/views/dataManage/deviceData/listH2SData'
 import { parseUrl } from '@/utils/parseutils'
 
 export default {
   name: 'DataManage',
-  components: { ListHydrantData, ListPantiltData, ListGasdectorData, ListTubeData, ListNoiseData, ListWellLocaData, ListTempData, ListHarmfulData, ListDigData, ListGasData, ListLiquidData, ListWellCoverData, ListLiquidGasData },
+  components: { ListH2SData, ListHydrantData, ListPantiltData, ListGasdectorData, ListTubeData, ListNoiseData, ListWellLocaData, ListTempData, ListHarmfulData, ListDigData, ListGasData, ListLiquidData, ListWellCoverData, ListLiquidGasData },
   data() {
     return {
       activeName: 'wellcover',
@@ -43,7 +44,8 @@
         { permission: '/tubedata/list-page', label: '管盯', name: 'tube', type: '12', comp: 'list-tube-data' },
         { permission: '/gasdector/list-page', label: '可燃气体智能监测终端', name: 'gasdector', type: '1', comp: 'list-gasdector-data' },
         { permission: '/pantilt/list-page', label: '激光甲烷遥测云台', name: 'pantilt', type: '1', comp: 'list-pantilt-data' },
-        { permission: '/hydrantdata/list-page', label: '消防栓防盗水监测仪', name: 'hydrant', type: '11', comp: 'list-hydrant-data' }
+        { permission: '/hydrantdata/list-page', label: '消防栓防盗水监测仪', name: 'hydrant', type: '11', comp: 'list-hydrant-data' },
+        { permission: '/h2s/list-page', label: '硫化氢浓度监测仪', name: 'H2S', type: '11', comp: 'list-H2S-data' }
       ] // 所有tab列表
     }
   },
diff --git a/src/views/dataManage/deviceData/listH2SData.vue b/src/views/dataManage/deviceData/listH2SData.vue
new file mode 100644
index 0000000..b0d2e7e
--- /dev/null
+++ b/src/views/dataManage/deviceData/listH2SData.vue
@@ -0,0 +1,201 @@
+<template>
+  <app-container>
+    <!--筛选条件-->
+    <search-area size="small" @search="search">
+      <search-item>
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
+      </search-item>
+      <search-item>
+        <dept-select v-model="listQuery.deptid" size="small" :need-top="false" dept-type="03" placeholder="选择权属单位" />
+      </search-item>
+      <search-item>
+        <el-date-picker
+          v-model="timeRange"
+          size="small"
+          type="datetimerange"
+          range-separator="至"
+          value-format="yyyy-MM-dd HH:mm:ss"
+          start-placeholder="开始时间"
+          end-placeholder="结束时间"
+        />
+      </search-item>
+    </search-area>
+    <!--查询结果Table显示-->
+    <normal-table
+      ref="normalTable"
+      :data="list"
+      :total="total"
+      :query="listQuery"
+      :list-loading="listLoading"
+      :options="options"
+      size="small"
+      @change="changePage"
+    >
+      <template slot="btns">
+        <el-button v-if="hasPerm('/h2s/export')" size="small" @click="batchExport">
+          导出记录
+        </el-button>
+      </template>
+      <template slot="columns">
+        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
+          <template slot-scope="scope">
+            <span v-if="column.checkCell" :class="checkCell(scope.row.cell)">{{ scope.row[column.value] }}</span>
+            <span v-else>{{ scope.row[column.value] }}</span>
+          </template>
+        </el-table-column>
+      </template>
+    </normal-table>
+  </app-container>
+</template>
+
+<script>
+import { getH2SData, batchExportH2SData } from '@/api/data/data'
+import DeptSelect from '../../../components/DeptSelect/index'
+import { parseUrl } from '@/utils/parseutils'
+import { getSearchLastWeekTime } from '@/utils/dateutils'
+import { exportFile } from '@/utils/exportutils'
+
+export default {
+  name: 'ListH2SData',
+  components: { DeptSelect },
+  props: {
+    type: {
+      type: String,
+      required: true
+    }, // 设备类型
+    name: {
+      type: String,
+      default: ''
+    } // 设备名称
+  },
+  data() {
+    return {
+      listQuery: {
+        devcode:'', //设备编号
+        wellCode:'', //点位编号
+        beginTime: '', // 开始时间
+        endTime: '', // 结束时间
+        keywords: '', // 关键字
+        deptid: '', // 部门id
+        offset: 1,
+        limit: 20,
+        sort: '',
+        order: ''
+      }, // 筛选条件
+      timeRange: [], // 时间范围
+      columns: [
+        { text: '设备编号', value: 'devcode', align: 'center' },
+        { text: '闸井编号', value: 'wellCode', align: 'center' },
+        { text: '设备类型', value: 'deviceType', align: 'center' },
+        { text: 'H2S浓度(ppm)', value: 'strength', align: 'center' },
+        { text: '电量(%)', value: 'cell', width: 80, align: 'center', checkCell: true },
+        // { text: '状态描述', value: 'descn', align: 'center', checkState: true },
+        { text: '权属单位id', value: 'deptid', align: 'center' },
+        { text: '上传时间', value: 'uptime', width: 170, align: 'center' }
+      ], // 显示列
+      list: [], // 列表数据
+      total: 0, // 数据总数
+      options: {
+        needIndex: true, // 是否需要序号列
+        border: true // 是否需要上方边框
+      },
+      listLoading: true, // 加载动画
+      fullscreenLoading: false, // 全屏加载动画
+      editShow: false // 是否显示编辑框
+    }
+  },
+  mounted() {
+    // 如果路径里带参数，解析devcode参数
+    this.timeRange = getSearchLastWeekTime()
+    if (window.location.href) {
+      const params = parseUrl(window.location.href)
+      if (params && params.deviceType === this.type && params.devcode) {
+        this.listQuery.keywords = params.devcode
+        this.fetchData()
+      } else {
+        this.fetchData()
+      }
+    }
+  },
+  activated() {
+    // 要是路由里有参数
+    if (this.$route.query && this.$route.query.devcode) {
+      this.listQuery.keywords = this.$route.query.devcode
+      this.fetchData(false)// 获取数据
+    } else {
+      this.fetchData()
+    }
+  },
+  methods: {
+    // 批量导出
+    batchExport() {
+      // this.handleDateTime()
+      // 全屏加载动画
+      const loading = this.$loading({
+        lock: true,
+        text: '下载中,请稍后...',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
+      })
+      batchExportH2SData(this.listQuery).then(res => {
+        loading.close() // 关闭加载动画
+        let fileName = `${this.name}数据-${this.listQuery.beginTime}-${this.listQuery.endTime}.xlsx`
+        fileName = fileName.replace(/-|:| /g, '')
+        const blob = new Blob([res.data])
+        exportFile(blob, fileName)
+      }).catch((res) => {
+        loading.close()
+      })
+    },
+    // 查询数据
+    search() {
+      this.fetchData(false)
+    },
+    // 获取硫化氢数据
+    fetchData(isNowPage = true) {
+      this.listLoading = true
+      if (!isNowPage) { // 是否显示当前页，否则跳转第一页
+        this.listQuery.offset = 1
+      }
+      this.handleDateTime()
+      getH2SData(this.listQuery).then(response => {
+        this.list = response.data.rows
+        this.total = response.data.total
+        this.listLoading = false
+      })
+    },
+    // 处理时间
+    handleDateTime() {
+      if (this.timeRange && this.timeRange.length > 0) {
+        this.listQuery.beginTime = this.timeRange[0]
+        this.listQuery.endTime = this.timeRange[1]
+      } else {
+        this.listQuery.beginTime = ''
+        this.listQuery.endTime = ''
+      }
+    },
+    checkCell(value) {
+      var cell = parseFloat(value)
+      if (cell < 10) {
+        return 'warning-state'
+      }
+    },
+    // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+    changePage(val) {
+      if (val && val.size) {
+        this.listQuery.limit = val.size
+      }
+      if (val && val.page) {
+        this.listQuery.offset = val.page
+      }
+      this.fetchData()
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+.warning-state{
+  color:red
+}
+</style>

diff --git a/src/api/data/data.js b/src/api/data/data.js
index 9d23a3e..d87e74a 100644
--- a/src/api/data/data.js
+++ b/src/api/data/data.js
@@ -366,3 +366,31 @@
     responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
   })
 }
+
+// 硫化氢数据查询，不分页
+export function getH2SDataSingle(params) {
+  return request({
+    url: 'h2s/list',
+    method: 'get',
+    params
+  })
+}
+
+// 硫化氢数据查询
+export function getH2SData(params) {
+  return request({
+    url: 'h2s/list-page',
+    method: 'get',
+    params
+  })
+}
+// 批量导出硫化氢数据
+export function batchExportH2SData(params) {
+  return request({
+    url: 'h2s/export',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
diff --git a/src/api/device/deviceTypeDetail.js b/src/api/device/deviceTypeDetail.js
index c3d1c6f..a45921d 100644
--- a/src/api/device/deviceTypeDetail.js
+++ b/src/api/device/deviceTypeDetail.js
@@ -91,3 +91,11 @@
     params
   })
 }
+// 硫化氢终端查询
+export function H2SdataList(params) {
+  return request({
+    url: 'H2Sdata/listSimple',
+    method: 'get',
+    params
+  })
+}
diff --git a/src/views/dataManage/dataManage.vue b/src/views/dataManage/dataManage.vue
index 0564cdd..b6bceb8 100644
--- a/src/views/dataManage/dataManage.vue
+++ b/src/views/dataManage/dataManage.vue
@@ -22,11 +22,12 @@
 import ListGasdectorData from '@/views/dataManage/deviceData/listGasdectorData'
 import ListPantiltData from '@/views/dataManage/deviceData/listPantiltData'
 import ListHydrantData from '@/views/dataManage/deviceData/listHydrantData'
+import ListH2SData from '@/views/dataManage/deviceData/listH2SData'
 import { parseUrl } from '@/utils/parseutils'
 
 export default {
   name: 'DataManage',
-  components: { ListHydrantData, ListPantiltData, ListGasdectorData, ListTubeData, ListNoiseData, ListWellLocaData, ListTempData, ListHarmfulData, ListDigData, ListGasData, ListLiquidData, ListWellCoverData, ListLiquidGasData },
+  components: { ListH2SData, ListHydrantData, ListPantiltData, ListGasdectorData, ListTubeData, ListNoiseData, ListWellLocaData, ListTempData, ListHarmfulData, ListDigData, ListGasData, ListLiquidData, ListWellCoverData, ListLiquidGasData },
   data() {
     return {
       activeName: 'wellcover',
@@ -43,7 +44,8 @@
         { permission: '/tubedata/list-page', label: '管盯', name: 'tube', type: '12', comp: 'list-tube-data' },
         { permission: '/gasdector/list-page', label: '可燃气体智能监测终端', name: 'gasdector', type: '1', comp: 'list-gasdector-data' },
         { permission: '/pantilt/list-page', label: '激光甲烷遥测云台', name: 'pantilt', type: '1', comp: 'list-pantilt-data' },
-        { permission: '/hydrantdata/list-page', label: '消防栓防盗水监测仪', name: 'hydrant', type: '11', comp: 'list-hydrant-data' }
+        { permission: '/hydrantdata/list-page', label: '消防栓防盗水监测仪', name: 'hydrant', type: '11', comp: 'list-hydrant-data' },
+        { permission: '/h2s/list-page', label: '硫化氢浓度监测仪', name: 'H2S', type: '11', comp: 'list-H2S-data' }
       ] // 所有tab列表
     }
   },
diff --git a/src/views/dataManage/deviceData/listH2SData.vue b/src/views/dataManage/deviceData/listH2SData.vue
new file mode 100644
index 0000000..b0d2e7e
--- /dev/null
+++ b/src/views/dataManage/deviceData/listH2SData.vue
@@ -0,0 +1,201 @@
+<template>
+  <app-container>
+    <!--筛选条件-->
+    <search-area size="small" @search="search">
+      <search-item>
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
+      </search-item>
+      <search-item>
+        <dept-select v-model="listQuery.deptid" size="small" :need-top="false" dept-type="03" placeholder="选择权属单位" />
+      </search-item>
+      <search-item>
+        <el-date-picker
+          v-model="timeRange"
+          size="small"
+          type="datetimerange"
+          range-separator="至"
+          value-format="yyyy-MM-dd HH:mm:ss"
+          start-placeholder="开始时间"
+          end-placeholder="结束时间"
+        />
+      </search-item>
+    </search-area>
+    <!--查询结果Table显示-->
+    <normal-table
+      ref="normalTable"
+      :data="list"
+      :total="total"
+      :query="listQuery"
+      :list-loading="listLoading"
+      :options="options"
+      size="small"
+      @change="changePage"
+    >
+      <template slot="btns">
+        <el-button v-if="hasPerm('/h2s/export')" size="small" @click="batchExport">
+          导出记录
+        </el-button>
+      </template>
+      <template slot="columns">
+        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
+          <template slot-scope="scope">
+            <span v-if="column.checkCell" :class="checkCell(scope.row.cell)">{{ scope.row[column.value] }}</span>
+            <span v-else>{{ scope.row[column.value] }}</span>
+          </template>
+        </el-table-column>
+      </template>
+    </normal-table>
+  </app-container>
+</template>
+
+<script>
+import { getH2SData, batchExportH2SData } from '@/api/data/data'
+import DeptSelect from '../../../components/DeptSelect/index'
+import { parseUrl } from '@/utils/parseutils'
+import { getSearchLastWeekTime } from '@/utils/dateutils'
+import { exportFile } from '@/utils/exportutils'
+
+export default {
+  name: 'ListH2SData',
+  components: { DeptSelect },
+  props: {
+    type: {
+      type: String,
+      required: true
+    }, // 设备类型
+    name: {
+      type: String,
+      default: ''
+    } // 设备名称
+  },
+  data() {
+    return {
+      listQuery: {
+        devcode:'', //设备编号
+        wellCode:'', //点位编号
+        beginTime: '', // 开始时间
+        endTime: '', // 结束时间
+        keywords: '', // 关键字
+        deptid: '', // 部门id
+        offset: 1,
+        limit: 20,
+        sort: '',
+        order: ''
+      }, // 筛选条件
+      timeRange: [], // 时间范围
+      columns: [
+        { text: '设备编号', value: 'devcode', align: 'center' },
+        { text: '闸井编号', value: 'wellCode', align: 'center' },
+        { text: '设备类型', value: 'deviceType', align: 'center' },
+        { text: 'H2S浓度(ppm)', value: 'strength', align: 'center' },
+        { text: '电量(%)', value: 'cell', width: 80, align: 'center', checkCell: true },
+        // { text: '状态描述', value: 'descn', align: 'center', checkState: true },
+        { text: '权属单位id', value: 'deptid', align: 'center' },
+        { text: '上传时间', value: 'uptime', width: 170, align: 'center' }
+      ], // 显示列
+      list: [], // 列表数据
+      total: 0, // 数据总数
+      options: {
+        needIndex: true, // 是否需要序号列
+        border: true // 是否需要上方边框
+      },
+      listLoading: true, // 加载动画
+      fullscreenLoading: false, // 全屏加载动画
+      editShow: false // 是否显示编辑框
+    }
+  },
+  mounted() {
+    // 如果路径里带参数，解析devcode参数
+    this.timeRange = getSearchLastWeekTime()
+    if (window.location.href) {
+      const params = parseUrl(window.location.href)
+      if (params && params.deviceType === this.type && params.devcode) {
+        this.listQuery.keywords = params.devcode
+        this.fetchData()
+      } else {
+        this.fetchData()
+      }
+    }
+  },
+  activated() {
+    // 要是路由里有参数
+    if (this.$route.query && this.$route.query.devcode) {
+      this.listQuery.keywords = this.$route.query.devcode
+      this.fetchData(false)// 获取数据
+    } else {
+      this.fetchData()
+    }
+  },
+  methods: {
+    // 批量导出
+    batchExport() {
+      // this.handleDateTime()
+      // 全屏加载动画
+      const loading = this.$loading({
+        lock: true,
+        text: '下载中,请稍后...',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
+      })
+      batchExportH2SData(this.listQuery).then(res => {
+        loading.close() // 关闭加载动画
+        let fileName = `${this.name}数据-${this.listQuery.beginTime}-${this.listQuery.endTime}.xlsx`
+        fileName = fileName.replace(/-|:| /g, '')
+        const blob = new Blob([res.data])
+        exportFile(blob, fileName)
+      }).catch((res) => {
+        loading.close()
+      })
+    },
+    // 查询数据
+    search() {
+      this.fetchData(false)
+    },
+    // 获取硫化氢数据
+    fetchData(isNowPage = true) {
+      this.listLoading = true
+      if (!isNowPage) { // 是否显示当前页，否则跳转第一页
+        this.listQuery.offset = 1
+      }
+      this.handleDateTime()
+      getH2SData(this.listQuery).then(response => {
+        this.list = response.data.rows
+        this.total = response.data.total
+        this.listLoading = false
+      })
+    },
+    // 处理时间
+    handleDateTime() {
+      if (this.timeRange && this.timeRange.length > 0) {
+        this.listQuery.beginTime = this.timeRange[0]
+        this.listQuery.endTime = this.timeRange[1]
+      } else {
+        this.listQuery.beginTime = ''
+        this.listQuery.endTime = ''
+      }
+    },
+    checkCell(value) {
+      var cell = parseFloat(value)
+      if (cell < 10) {
+        return 'warning-state'
+      }
+    },
+    // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+    changePage(val) {
+      if (val && val.size) {
+        this.listQuery.limit = val.size
+      }
+      if (val && val.page) {
+        this.listQuery.offset = val.page
+      }
+      this.fetchData()
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+.warning-state{
+  color:red
+}
+</style>
diff --git a/src/views/dataManage/deviceData/listHarmfulData.vue b/src/views/dataManage/deviceData/listHarmfulData.vue
index c29cb2e..92702af 100644
--- a/src/views/dataManage/deviceData/listHarmfulData.vue
+++ b/src/views/dataManage/deviceData/listHarmfulData.vue
@@ -95,7 +95,7 @@
         { text: 'CH4浓度(%VOL)', value: 'CH4', align: 'center' },
         { text: 'H2S浓度(ppm)', value: 'H2S', align: 'center' },
         { text: 'O2浓度(ppm)', value: 'O2', align: 'center' },
-        { text: '液位开关', value: 'switch', align: 'center' },
+        { text: '液位开关', value: 'liquidSwitch', align: 'center' },
         // {
         //   text: '状态描述',
         //   value: 'descn',

diff --git a/src/api/data/data.js b/src/api/data/data.js
index 9d23a3e..d87e74a 100644
--- a/src/api/data/data.js
+++ b/src/api/data/data.js
@@ -366,3 +366,31 @@
     responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
   })
 }
+
+// 硫化氢数据查询，不分页
+export function getH2SDataSingle(params) {
+  return request({
+    url: 'h2s/list',
+    method: 'get',
+    params
+  })
+}
+
+// 硫化氢数据查询
+export function getH2SData(params) {
+  return request({
+    url: 'h2s/list-page',
+    method: 'get',
+    params
+  })
+}
+// 批量导出硫化氢数据
+export function batchExportH2SData(params) {
+  return request({
+    url: 'h2s/export',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
diff --git a/src/api/device/deviceTypeDetail.js b/src/api/device/deviceTypeDetail.js
index c3d1c6f..a45921d 100644
--- a/src/api/device/deviceTypeDetail.js
+++ b/src/api/device/deviceTypeDetail.js
@@ -91,3 +91,11 @@
     params
   })
 }
+// 硫化氢终端查询
+export function H2SdataList(params) {
+  return request({
+    url: 'H2Sdata/listSimple',
+    method: 'get',
+    params
+  })
+}
diff --git a/src/views/dataManage/dataManage.vue b/src/views/dataManage/dataManage.vue
index 0564cdd..b6bceb8 100644
--- a/src/views/dataManage/dataManage.vue
+++ b/src/views/dataManage/dataManage.vue
@@ -22,11 +22,12 @@
 import ListGasdectorData from '@/views/dataManage/deviceData/listGasdectorData'
 import ListPantiltData from '@/views/dataManage/deviceData/listPantiltData'
 import ListHydrantData from '@/views/dataManage/deviceData/listHydrantData'
+import ListH2SData from '@/views/dataManage/deviceData/listH2SData'
 import { parseUrl } from '@/utils/parseutils'
 
 export default {
   name: 'DataManage',
-  components: { ListHydrantData, ListPantiltData, ListGasdectorData, ListTubeData, ListNoiseData, ListWellLocaData, ListTempData, ListHarmfulData, ListDigData, ListGasData, ListLiquidData, ListWellCoverData, ListLiquidGasData },
+  components: { ListH2SData, ListHydrantData, ListPantiltData, ListGasdectorData, ListTubeData, ListNoiseData, ListWellLocaData, ListTempData, ListHarmfulData, ListDigData, ListGasData, ListLiquidData, ListWellCoverData, ListLiquidGasData },
   data() {
     return {
       activeName: 'wellcover',
@@ -43,7 +44,8 @@
         { permission: '/tubedata/list-page', label: '管盯', name: 'tube', type: '12', comp: 'list-tube-data' },
         { permission: '/gasdector/list-page', label: '可燃气体智能监测终端', name: 'gasdector', type: '1', comp: 'list-gasdector-data' },
         { permission: '/pantilt/list-page', label: '激光甲烷遥测云台', name: 'pantilt', type: '1', comp: 'list-pantilt-data' },
-        { permission: '/hydrantdata/list-page', label: '消防栓防盗水监测仪', name: 'hydrant', type: '11', comp: 'list-hydrant-data' }
+        { permission: '/hydrantdata/list-page', label: '消防栓防盗水监测仪', name: 'hydrant', type: '11', comp: 'list-hydrant-data' },
+        { permission: '/h2s/list-page', label: '硫化氢浓度监测仪', name: 'H2S', type: '11', comp: 'list-H2S-data' }
       ] // 所有tab列表
     }
   },
diff --git a/src/views/dataManage/deviceData/listH2SData.vue b/src/views/dataManage/deviceData/listH2SData.vue
new file mode 100644
index 0000000..b0d2e7e
--- /dev/null
+++ b/src/views/dataManage/deviceData/listH2SData.vue
@@ -0,0 +1,201 @@
+<template>
+  <app-container>
+    <!--筛选条件-->
+    <search-area size="small" @search="search">
+      <search-item>
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
+      </search-item>
+      <search-item>
+        <dept-select v-model="listQuery.deptid" size="small" :need-top="false" dept-type="03" placeholder="选择权属单位" />
+      </search-item>
+      <search-item>
+        <el-date-picker
+          v-model="timeRange"
+          size="small"
+          type="datetimerange"
+          range-separator="至"
+          value-format="yyyy-MM-dd HH:mm:ss"
+          start-placeholder="开始时间"
+          end-placeholder="结束时间"
+        />
+      </search-item>
+    </search-area>
+    <!--查询结果Table显示-->
+    <normal-table
+      ref="normalTable"
+      :data="list"
+      :total="total"
+      :query="listQuery"
+      :list-loading="listLoading"
+      :options="options"
+      size="small"
+      @change="changePage"
+    >
+      <template slot="btns">
+        <el-button v-if="hasPerm('/h2s/export')" size="small" @click="batchExport">
+          导出记录
+        </el-button>
+      </template>
+      <template slot="columns">
+        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
+          <template slot-scope="scope">
+            <span v-if="column.checkCell" :class="checkCell(scope.row.cell)">{{ scope.row[column.value] }}</span>
+            <span v-else>{{ scope.row[column.value] }}</span>
+          </template>
+        </el-table-column>
+      </template>
+    </normal-table>
+  </app-container>
+</template>
+
+<script>
+import { getH2SData, batchExportH2SData } from '@/api/data/data'
+import DeptSelect from '../../../components/DeptSelect/index'
+import { parseUrl } from '@/utils/parseutils'
+import { getSearchLastWeekTime } from '@/utils/dateutils'
+import { exportFile } from '@/utils/exportutils'
+
+export default {
+  name: 'ListH2SData',
+  components: { DeptSelect },
+  props: {
+    type: {
+      type: String,
+      required: true
+    }, // 设备类型
+    name: {
+      type: String,
+      default: ''
+    } // 设备名称
+  },
+  data() {
+    return {
+      listQuery: {
+        devcode:'', //设备编号
+        wellCode:'', //点位编号
+        beginTime: '', // 开始时间
+        endTime: '', // 结束时间
+        keywords: '', // 关键字
+        deptid: '', // 部门id
+        offset: 1,
+        limit: 20,
+        sort: '',
+        order: ''
+      }, // 筛选条件
+      timeRange: [], // 时间范围
+      columns: [
+        { text: '设备编号', value: 'devcode', align: 'center' },
+        { text: '闸井编号', value: 'wellCode', align: 'center' },
+        { text: '设备类型', value: 'deviceType', align: 'center' },
+        { text: 'H2S浓度(ppm)', value: 'strength', align: 'center' },
+        { text: '电量(%)', value: 'cell', width: 80, align: 'center', checkCell: true },
+        // { text: '状态描述', value: 'descn', align: 'center', checkState: true },
+        { text: '权属单位id', value: 'deptid', align: 'center' },
+        { text: '上传时间', value: 'uptime', width: 170, align: 'center' }
+      ], // 显示列
+      list: [], // 列表数据
+      total: 0, // 数据总数
+      options: {
+        needIndex: true, // 是否需要序号列
+        border: true // 是否需要上方边框
+      },
+      listLoading: true, // 加载动画
+      fullscreenLoading: false, // 全屏加载动画
+      editShow: false // 是否显示编辑框
+    }
+  },
+  mounted() {
+    // 如果路径里带参数，解析devcode参数
+    this.timeRange = getSearchLastWeekTime()
+    if (window.location.href) {
+      const params = parseUrl(window.location.href)
+      if (params && params.deviceType === this.type && params.devcode) {
+        this.listQuery.keywords = params.devcode
+        this.fetchData()
+      } else {
+        this.fetchData()
+      }
+    }
+  },
+  activated() {
+    // 要是路由里有参数
+    if (this.$route.query && this.$route.query.devcode) {
+      this.listQuery.keywords = this.$route.query.devcode
+      this.fetchData(false)// 获取数据
+    } else {
+      this.fetchData()
+    }
+  },
+  methods: {
+    // 批量导出
+    batchExport() {
+      // this.handleDateTime()
+      // 全屏加载动画
+      const loading = this.$loading({
+        lock: true,
+        text: '下载中,请稍后...',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
+      })
+      batchExportH2SData(this.listQuery).then(res => {
+        loading.close() // 关闭加载动画
+        let fileName = `${this.name}数据-${this.listQuery.beginTime}-${this.listQuery.endTime}.xlsx`
+        fileName = fileName.replace(/-|:| /g, '')
+        const blob = new Blob([res.data])
+        exportFile(blob, fileName)
+      }).catch((res) => {
+        loading.close()
+      })
+    },
+    // 查询数据
+    search() {
+      this.fetchData(false)
+    },
+    // 获取硫化氢数据
+    fetchData(isNowPage = true) {
+      this.listLoading = true
+      if (!isNowPage) { // 是否显示当前页，否则跳转第一页
+        this.listQuery.offset = 1
+      }
+      this.handleDateTime()
+      getH2SData(this.listQuery).then(response => {
+        this.list = response.data.rows
+        this.total = response.data.total
+        this.listLoading = false
+      })
+    },
+    // 处理时间
+    handleDateTime() {
+      if (this.timeRange && this.timeRange.length > 0) {
+        this.listQuery.beginTime = this.timeRange[0]
+        this.listQuery.endTime = this.timeRange[1]
+      } else {
+        this.listQuery.beginTime = ''
+        this.listQuery.endTime = ''
+      }
+    },
+    checkCell(value) {
+      var cell = parseFloat(value)
+      if (cell < 10) {
+        return 'warning-state'
+      }
+    },
+    // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+    changePage(val) {
+      if (val && val.size) {
+        this.listQuery.limit = val.size
+      }
+      if (val && val.page) {
+        this.listQuery.offset = val.page
+      }
+      this.fetchData()
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+.warning-state{
+  color:red
+}
+</style>
diff --git a/src/views/dataManage/deviceData/listHarmfulData.vue b/src/views/dataManage/deviceData/listHarmfulData.vue
index c29cb2e..92702af 100644
--- a/src/views/dataManage/deviceData/listHarmfulData.vue
+++ b/src/views/dataManage/deviceData/listHarmfulData.vue
@@ -95,7 +95,7 @@
         { text: 'CH4浓度(%VOL)', value: 'CH4', align: 'center' },
         { text: 'H2S浓度(ppm)', value: 'H2S', align: 'center' },
         { text: 'O2浓度(ppm)', value: 'O2', align: 'center' },
-        { text: '液位开关', value: 'switch', align: 'center' },
+        { text: '液位开关', value: 'liquidSwitch', align: 'center' },
         // {
         //   text: '状态描述',
         //   value: 'descn',
diff --git a/src/views/dataManage/deviceData/listHydrantData.vue b/src/views/dataManage/deviceData/listHydrantData.vue
index f968760..a69f185 100644
--- a/src/views/dataManage/deviceData/listHydrantData.vue
+++ b/src/views/dataManage/deviceData/listHydrantData.vue
@@ -111,6 +111,8 @@
       if (params && params.deviceType === this.type && params.devcode) {
         this.listQuery.keywords = params.devcode
         this.fetchData()
+      } else {
+        this.fetchData()
       }
     }
   },
@@ -130,7 +132,7 @@
       // 全屏加载动画
       const loading = this.$loading({
         lock: true,
-        text: '数据处理中,请稍后...',
+        text: '下载中,请稍后...',
         spinner: 'el-icon-loading',
         background: 'rgba(0, 0, 0, 0.7)'
       })

diff --git a/src/api/data/data.js b/src/api/data/data.js
index 9d23a3e..d87e74a 100644
--- a/src/api/data/data.js
+++ b/src/api/data/data.js
@@ -366,3 +366,31 @@
     responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
   })
 }
+
+// 硫化氢数据查询，不分页
+export function getH2SDataSingle(params) {
+  return request({
+    url: 'h2s/list',
+    method: 'get',
+    params
+  })
+}
+
+// 硫化氢数据查询
+export function getH2SData(params) {
+  return request({
+    url: 'h2s/list-page',
+    method: 'get',
+    params
+  })
+}
+// 批量导出硫化氢数据
+export function batchExportH2SData(params) {
+  return request({
+    url: 'h2s/export',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
diff --git a/src/api/device/deviceTypeDetail.js b/src/api/device/deviceTypeDetail.js
index c3d1c6f..a45921d 100644
--- a/src/api/device/deviceTypeDetail.js
+++ b/src/api/device/deviceTypeDetail.js
@@ -91,3 +91,11 @@
     params
   })
 }
+// 硫化氢终端查询
+export function H2SdataList(params) {
+  return request({
+    url: 'H2Sdata/listSimple',
+    method: 'get',
+    params
+  })
+}
diff --git a/src/views/dataManage/dataManage.vue b/src/views/dataManage/dataManage.vue
index 0564cdd..b6bceb8 100644
--- a/src/views/dataManage/dataManage.vue
+++ b/src/views/dataManage/dataManage.vue
@@ -22,11 +22,12 @@
 import ListGasdectorData from '@/views/dataManage/deviceData/listGasdectorData'
 import ListPantiltData from '@/views/dataManage/deviceData/listPantiltData'
 import ListHydrantData from '@/views/dataManage/deviceData/listHydrantData'
+import ListH2SData from '@/views/dataManage/deviceData/listH2SData'
 import { parseUrl } from '@/utils/parseutils'
 
 export default {
   name: 'DataManage',
-  components: { ListHydrantData, ListPantiltData, ListGasdectorData, ListTubeData, ListNoiseData, ListWellLocaData, ListTempData, ListHarmfulData, ListDigData, ListGasData, ListLiquidData, ListWellCoverData, ListLiquidGasData },
+  components: { ListH2SData, ListHydrantData, ListPantiltData, ListGasdectorData, ListTubeData, ListNoiseData, ListWellLocaData, ListTempData, ListHarmfulData, ListDigData, ListGasData, ListLiquidData, ListWellCoverData, ListLiquidGasData },
   data() {
     return {
       activeName: 'wellcover',
@@ -43,7 +44,8 @@
         { permission: '/tubedata/list-page', label: '管盯', name: 'tube', type: '12', comp: 'list-tube-data' },
         { permission: '/gasdector/list-page', label: '可燃气体智能监测终端', name: 'gasdector', type: '1', comp: 'list-gasdector-data' },
         { permission: '/pantilt/list-page', label: '激光甲烷遥测云台', name: 'pantilt', type: '1', comp: 'list-pantilt-data' },
-        { permission: '/hydrantdata/list-page', label: '消防栓防盗水监测仪', name: 'hydrant', type: '11', comp: 'list-hydrant-data' }
+        { permission: '/hydrantdata/list-page', label: '消防栓防盗水监测仪', name: 'hydrant', type: '11', comp: 'list-hydrant-data' },
+        { permission: '/h2s/list-page', label: '硫化氢浓度监测仪', name: 'H2S', type: '11', comp: 'list-H2S-data' }
       ] // 所有tab列表
     }
   },
diff --git a/src/views/dataManage/deviceData/listH2SData.vue b/src/views/dataManage/deviceData/listH2SData.vue
new file mode 100644
index 0000000..b0d2e7e
--- /dev/null
+++ b/src/views/dataManage/deviceData/listH2SData.vue
@@ -0,0 +1,201 @@
+<template>
+  <app-container>
+    <!--筛选条件-->
+    <search-area size="small" @search="search">
+      <search-item>
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
+      </search-item>
+      <search-item>
+        <dept-select v-model="listQuery.deptid" size="small" :need-top="false" dept-type="03" placeholder="选择权属单位" />
+      </search-item>
+      <search-item>
+        <el-date-picker
+          v-model="timeRange"
+          size="small"
+          type="datetimerange"
+          range-separator="至"
+          value-format="yyyy-MM-dd HH:mm:ss"
+          start-placeholder="开始时间"
+          end-placeholder="结束时间"
+        />
+      </search-item>
+    </search-area>
+    <!--查询结果Table显示-->
+    <normal-table
+      ref="normalTable"
+      :data="list"
+      :total="total"
+      :query="listQuery"
+      :list-loading="listLoading"
+      :options="options"
+      size="small"
+      @change="changePage"
+    >
+      <template slot="btns">
+        <el-button v-if="hasPerm('/h2s/export')" size="small" @click="batchExport">
+          导出记录
+        </el-button>
+      </template>
+      <template slot="columns">
+        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
+          <template slot-scope="scope">
+            <span v-if="column.checkCell" :class="checkCell(scope.row.cell)">{{ scope.row[column.value] }}</span>
+            <span v-else>{{ scope.row[column.value] }}</span>
+          </template>
+        </el-table-column>
+      </template>
+    </normal-table>
+  </app-container>
+</template>
+
+<script>
+import { getH2SData, batchExportH2SData } from '@/api/data/data'
+import DeptSelect from '../../../components/DeptSelect/index'
+import { parseUrl } from '@/utils/parseutils'
+import { getSearchLastWeekTime } from '@/utils/dateutils'
+import { exportFile } from '@/utils/exportutils'
+
+export default {
+  name: 'ListH2SData',
+  components: { DeptSelect },
+  props: {
+    type: {
+      type: String,
+      required: true
+    }, // 设备类型
+    name: {
+      type: String,
+      default: ''
+    } // 设备名称
+  },
+  data() {
+    return {
+      listQuery: {
+        devcode:'', //设备编号
+        wellCode:'', //点位编号
+        beginTime: '', // 开始时间
+        endTime: '', // 结束时间
+        keywords: '', // 关键字
+        deptid: '', // 部门id
+        offset: 1,
+        limit: 20,
+        sort: '',
+        order: ''
+      }, // 筛选条件
+      timeRange: [], // 时间范围
+      columns: [
+        { text: '设备编号', value: 'devcode', align: 'center' },
+        { text: '闸井编号', value: 'wellCode', align: 'center' },
+        { text: '设备类型', value: 'deviceType', align: 'center' },
+        { text: 'H2S浓度(ppm)', value: 'strength', align: 'center' },
+        { text: '电量(%)', value: 'cell', width: 80, align: 'center', checkCell: true },
+        // { text: '状态描述', value: 'descn', align: 'center', checkState: true },
+        { text: '权属单位id', value: 'deptid', align: 'center' },
+        { text: '上传时间', value: 'uptime', width: 170, align: 'center' }
+      ], // 显示列
+      list: [], // 列表数据
+      total: 0, // 数据总数
+      options: {
+        needIndex: true, // 是否需要序号列
+        border: true // 是否需要上方边框
+      },
+      listLoading: true, // 加载动画
+      fullscreenLoading: false, // 全屏加载动画
+      editShow: false // 是否显示编辑框
+    }
+  },
+  mounted() {
+    // 如果路径里带参数，解析devcode参数
+    this.timeRange = getSearchLastWeekTime()
+    if (window.location.href) {
+      const params = parseUrl(window.location.href)
+      if (params && params.deviceType === this.type && params.devcode) {
+        this.listQuery.keywords = params.devcode
+        this.fetchData()
+      } else {
+        this.fetchData()
+      }
+    }
+  },
+  activated() {
+    // 要是路由里有参数
+    if (this.$route.query && this.$route.query.devcode) {
+      this.listQuery.keywords = this.$route.query.devcode
+      this.fetchData(false)// 获取数据
+    } else {
+      this.fetchData()
+    }
+  },
+  methods: {
+    // 批量导出
+    batchExport() {
+      // this.handleDateTime()
+      // 全屏加载动画
+      const loading = this.$loading({
+        lock: true,
+        text: '下载中,请稍后...',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
+      })
+      batchExportH2SData(this.listQuery).then(res => {
+        loading.close() // 关闭加载动画
+        let fileName = `${this.name}数据-${this.listQuery.beginTime}-${this.listQuery.endTime}.xlsx`
+        fileName = fileName.replace(/-|:| /g, '')
+        const blob = new Blob([res.data])
+        exportFile(blob, fileName)
+      }).catch((res) => {
+        loading.close()
+      })
+    },
+    // 查询数据
+    search() {
+      this.fetchData(false)
+    },
+    // 获取硫化氢数据
+    fetchData(isNowPage = true) {
+      this.listLoading = true
+      if (!isNowPage) { // 是否显示当前页，否则跳转第一页
+        this.listQuery.offset = 1
+      }
+      this.handleDateTime()
+      getH2SData(this.listQuery).then(response => {
+        this.list = response.data.rows
+        this.total = response.data.total
+        this.listLoading = false
+      })
+    },
+    // 处理时间
+    handleDateTime() {
+      if (this.timeRange && this.timeRange.length > 0) {
+        this.listQuery.beginTime = this.timeRange[0]
+        this.listQuery.endTime = this.timeRange[1]
+      } else {
+        this.listQuery.beginTime = ''
+        this.listQuery.endTime = ''
+      }
+    },
+    checkCell(value) {
+      var cell = parseFloat(value)
+      if (cell < 10) {
+        return 'warning-state'
+      }
+    },
+    // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+    changePage(val) {
+      if (val && val.size) {
+        this.listQuery.limit = val.size
+      }
+      if (val && val.page) {
+        this.listQuery.offset = val.page
+      }
+      this.fetchData()
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+.warning-state{
+  color:red
+}
+</style>
diff --git a/src/views/dataManage/deviceData/listHarmfulData.vue b/src/views/dataManage/deviceData/listHarmfulData.vue
index c29cb2e..92702af 100644
--- a/src/views/dataManage/deviceData/listHarmfulData.vue
+++ b/src/views/dataManage/deviceData/listHarmfulData.vue
@@ -95,7 +95,7 @@
         { text: 'CH4浓度(%VOL)', value: 'CH4', align: 'center' },
         { text: 'H2S浓度(ppm)', value: 'H2S', align: 'center' },
         { text: 'O2浓度(ppm)', value: 'O2', align: 'center' },
-        { text: '液位开关', value: 'switch', align: 'center' },
+        { text: '液位开关', value: 'liquidSwitch', align: 'center' },
         // {
         //   text: '状态描述',
         //   value: 'descn',
diff --git a/src/views/dataManage/deviceData/listHydrantData.vue b/src/views/dataManage/deviceData/listHydrantData.vue
index f968760..a69f185 100644
--- a/src/views/dataManage/deviceData/listHydrantData.vue
+++ b/src/views/dataManage/deviceData/listHydrantData.vue
@@ -111,6 +111,8 @@
       if (params && params.deviceType === this.type && params.devcode) {
         this.listQuery.keywords = params.devcode
         this.fetchData()
+      } else {
+        this.fetchData()
       }
     }
   },
@@ -130,7 +132,7 @@
       // 全屏加载动画
       const loading = this.$loading({
         lock: true,
-        text: '数据处理中,请稍后...',
+        text: '下载中,请稍后...',
         spinner: 'el-icon-loading',
         background: 'rgba(0, 0, 0, 0.7)'
       })
diff --git a/src/views/deviceManage/components/listH2SData.vue b/src/views/deviceManage/components/listH2SData.vue
new file mode 100644
index 0000000..9f6fa24
--- /dev/null
+++ b/src/views/deviceManage/components/listH2SData.vue
@@ -0,0 +1,137 @@
+<template>
+  <el-row :gutter="10">
+    <el-col>
+      <el-date-picker
+        v-model="timeRange"
+        type="datetimerange"
+        range-separator="至"
+        size="small"
+        :picker-options="pickerOptions"
+        value-format="yyyy-MM-dd HH:mm:ss"
+        start-placeholder="开始时间"
+        end-placeholder="结束时间"
+        @change="fetchDeviceType"
+      />
+    </el-col>
+    <el-col :span="12">
+      <ve-line
+        :data="chartData"
+        :settings="chartSettings"
+      />
+    </el-col>
+    <el-col :span="12">
+      <normal-table
+        ref="normalTable"
+        :data="list"
+        :query="listQuery"
+        :columns="columns"
+        :list-loading="listLoading"
+        :options="options"
+        size="small"
+      />
+    </el-col>
+  </el-row>
+</template>
+
+<script>
+import { H2SdataList } from '@/api/device/deviceTypeDetail'
+export default {
+  name: 'ListH2SData',
+  data() {
+    return {
+      timeRange: '',
+      listQuery: {
+        devcode: '',
+        beginTime: '',
+        endTime: ''
+      },
+      pickerOptions: {
+        shortcuts: [{
+          text: '最近一周',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '最近一个月',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '最近三个月',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90)
+            picker.$emit('pick', [start, end])
+          }
+        }]
+      },
+      // 是否需要序号列
+      options: {
+        needIndex: false
+      },
+      columns: [
+        {
+          text: 'H2S浓度',
+          value: 'H2S',
+          align: 'center'
+        },
+        {
+          text: '上报时间',
+          value: 'uptime',
+          align: 'center'
+        }
+      ], // 显示列
+      list: [],
+      listLoading: false,
+      chartSettings: {
+        labelMap: {
+          'H2S': '硫化氢浓度',
+        },
+        metrics: [ 'H2S' ],
+        dimension: ['uptime']
+      },
+      chartData: {
+        columns: ['uptime', 'H2S' ],
+        rows: []
+      }
+    }
+  },
+  created() {
+    this.fetchDeviceType()
+  },
+  mounted() {
+    this.$refs.normalTable.initColumnsState(false)
+  },
+  methods: {
+    initData: function(row = null) {
+      this.listQuery.devcode = row.devcode
+    },
+    fetchDeviceType(val) {
+      this.listLoading = true
+      if (val !== undefined) {
+        this.listQuery.startTime = val[0]
+        this.listQuery.endTime = val[1]
+      }
+      H2SdataList(this.listQuery).then(response => {
+        this.list = response.data
+        this.chartData.rows = response.data
+        this.listLoading = false
+      })
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+.el-date-editor--datetimerange.el-input,
+.el-date-editor--datetimerange.el-input__inner{
+  width: 340px;
+}
+</style>