diff --git a/src/api/config/h2sconfig.js b/src/api/config/h2sconfig.js
new file mode 100644
index 0000000..f441692
--- /dev/null
+++ b/src/api/config/h2sconfig.js
@@ -0,0 +1,42 @@
+/**
+ * 硫化氢配置接口
+ */
+import request from '@/utils/request'
+// 硫化氢配置查询
+export function getH2sConfigList(params) {
+  return request({
+    url: 'busConfig/H2sConfig/list',
+    method: 'get',
+    params
+  })
+}
+
+// 修改硫化氢配置
+export function editH2sConfig(params) {
+  return request({
+    url: 'busConfig/H2sConfig/config',
+    method: 'post',
+    params
+  })
+}
+
+// 批量导入
+export function batchImportH2sConfig(fileobj) {
+  const param = new FormData()
+  param.append('file', fileobj)
+  return request({
+    url: 'busConfig/H2sConfig/batchImport',
+    method: 'post',
+    headers: { 'Content-Type': 'multipart/form-data' },
+    data: param
+  })
+}
+// 批量导出
+export function batchExportH2sConfig(params) {
+  return request({
+    url: 'busConfig/H2sConfig/batchExport',
+    method: 'get',
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}

diff --git a/src/api/config/h2sconfig.js b/src/api/config/h2sconfig.js
new file mode 100644
index 0000000..f441692
--- /dev/null
+++ b/src/api/config/h2sconfig.js
@@ -0,0 +1,42 @@
+/**
+ * 硫化氢配置接口
+ */
+import request from '@/utils/request'
+// 硫化氢配置查询
+export function getH2sConfigList(params) {
+  return request({
+    url: 'busConfig/H2sConfig/list',
+    method: 'get',
+    params
+  })
+}
+
+// 修改硫化氢配置
+export function editH2sConfig(params) {
+  return request({
+    url: 'busConfig/H2sConfig/config',
+    method: 'post',
+    params
+  })
+}
+
+// 批量导入
+export function batchImportH2sConfig(fileobj) {
+  const param = new FormData()
+  param.append('file', fileobj)
+  return request({
+    url: 'busConfig/H2sConfig/batchImport',
+    method: 'post',
+    headers: { 'Content-Type': 'multipart/form-data' },
+    data: param
+  })
+}
+// 批量导出
+export function batchExportH2sConfig(params) {
+  return request({
+    url: 'busConfig/H2sConfig/batchExport',
+    method: 'get',
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
diff --git a/src/components/Amap/utils/convert-helper.js b/src/components/Amap/utils/convert-helper.js
index ab7a8d2..6b61377 100644
--- a/src/components/Amap/utils/convert-helper.js
+++ b/src/components/Amap/utils/convert-helper.js
@@ -76,7 +76,6 @@
     AMapLoader.load({
       key: store.getters.amapKey // 秘钥
     }).then((AMap) => {
-      // debugger
       AMap.convertFrom(coordinate, 'gps', (status, result) => {
         if (result.info === 'ok') {
           const lnglats = result.locations[0]

diff --git a/src/api/config/h2sconfig.js b/src/api/config/h2sconfig.js
new file mode 100644
index 0000000..f441692
--- /dev/null
+++ b/src/api/config/h2sconfig.js
@@ -0,0 +1,42 @@
+/**
+ * 硫化氢配置接口
+ */
+import request from '@/utils/request'
+// 硫化氢配置查询
+export function getH2sConfigList(params) {
+  return request({
+    url: 'busConfig/H2sConfig/list',
+    method: 'get',
+    params
+  })
+}
+
+// 修改硫化氢配置
+export function editH2sConfig(params) {
+  return request({
+    url: 'busConfig/H2sConfig/config',
+    method: 'post',
+    params
+  })
+}
+
+// 批量导入
+export function batchImportH2sConfig(fileobj) {
+  const param = new FormData()
+  param.append('file', fileobj)
+  return request({
+    url: 'busConfig/H2sConfig/batchImport',
+    method: 'post',
+    headers: { 'Content-Type': 'multipart/form-data' },
+    data: param
+  })
+}
+// 批量导出
+export function batchExportH2sConfig(params) {
+  return request({
+    url: 'busConfig/H2sConfig/batchExport',
+    method: 'get',
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
diff --git a/src/components/Amap/utils/convert-helper.js b/src/components/Amap/utils/convert-helper.js
index ab7a8d2..6b61377 100644
--- a/src/components/Amap/utils/convert-helper.js
+++ b/src/components/Amap/utils/convert-helper.js
@@ -76,7 +76,6 @@
     AMapLoader.load({
       key: store.getters.amapKey // 秘钥
     }).then((AMap) => {
-      // debugger
       AMap.convertFrom(coordinate, 'gps', (status, result) => {
         if (result.info === 'ok') {
           const lnglats = result.locations[0]
diff --git a/src/permission.js b/src/permission.js
index 0f332ec..52f5108 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -33,7 +33,6 @@
     const oldUser = getUser()
     const username = to.query.username
     const password = to.query.pwd
-    // debugger
     if (loginByUsername && username && password && !oldUser) { // 登陆后跳转
       const loginForm = {
         username: username,

diff --git a/src/api/config/h2sconfig.js b/src/api/config/h2sconfig.js
new file mode 100644
index 0000000..f441692
--- /dev/null
+++ b/src/api/config/h2sconfig.js
@@ -0,0 +1,42 @@
+/**
+ * 硫化氢配置接口
+ */
+import request from '@/utils/request'
+// 硫化氢配置查询
+export function getH2sConfigList(params) {
+  return request({
+    url: 'busConfig/H2sConfig/list',
+    method: 'get',
+    params
+  })
+}
+
+// 修改硫化氢配置
+export function editH2sConfig(params) {
+  return request({
+    url: 'busConfig/H2sConfig/config',
+    method: 'post',
+    params
+  })
+}
+
+// 批量导入
+export function batchImportH2sConfig(fileobj) {
+  const param = new FormData()
+  param.append('file', fileobj)
+  return request({
+    url: 'busConfig/H2sConfig/batchImport',
+    method: 'post',
+    headers: { 'Content-Type': 'multipart/form-data' },
+    data: param
+  })
+}
+// 批量导出
+export function batchExportH2sConfig(params) {
+  return request({
+    url: 'busConfig/H2sConfig/batchExport',
+    method: 'get',
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
diff --git a/src/components/Amap/utils/convert-helper.js b/src/components/Amap/utils/convert-helper.js
index ab7a8d2..6b61377 100644
--- a/src/components/Amap/utils/convert-helper.js
+++ b/src/components/Amap/utils/convert-helper.js
@@ -76,7 +76,6 @@
     AMapLoader.load({
       key: store.getters.amapKey // 秘钥
     }).then((AMap) => {
-      // debugger
       AMap.convertFrom(coordinate, 'gps', (status, result) => {
         if (result.info === 'ok') {
           const lnglats = result.locations[0]
diff --git a/src/permission.js b/src/permission.js
index 0f332ec..52f5108 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -33,7 +33,6 @@
     const oldUser = getUser()
     const username = to.query.username
     const password = to.query.pwd
-    // debugger
     if (loginByUsername && username && password && !oldUser) { // 登陆后跳转
       const loginForm = {
         username: username,
diff --git a/src/views/dataView/components/panelGroup.vue b/src/views/dataView/components/panelGroup.vue
index 7cae96f..49ee723 100644
--- a/src/views/dataView/components/panelGroup.vue
+++ b/src/views/dataView/components/panelGroup.vue
@@ -120,7 +120,6 @@
       const endTime = new Date().Format('yyyy-MM-dd hh:mm:ss')
       const params = { beginTime, endTime }
       dataCount(params).then(response => {
-        debugger
         this.dataGroup[2].context = response.data.total
       })
     }

diff --git a/src/api/config/h2sconfig.js b/src/api/config/h2sconfig.js
new file mode 100644
index 0000000..f441692
--- /dev/null
+++ b/src/api/config/h2sconfig.js
@@ -0,0 +1,42 @@
+/**
+ * 硫化氢配置接口
+ */
+import request from '@/utils/request'
+// 硫化氢配置查询
+export function getH2sConfigList(params) {
+  return request({
+    url: 'busConfig/H2sConfig/list',
+    method: 'get',
+    params
+  })
+}
+
+// 修改硫化氢配置
+export function editH2sConfig(params) {
+  return request({
+    url: 'busConfig/H2sConfig/config',
+    method: 'post',
+    params
+  })
+}
+
+// 批量导入
+export function batchImportH2sConfig(fileobj) {
+  const param = new FormData()
+  param.append('file', fileobj)
+  return request({
+    url: 'busConfig/H2sConfig/batchImport',
+    method: 'post',
+    headers: { 'Content-Type': 'multipart/form-data' },
+    data: param
+  })
+}
+// 批量导出
+export function batchExportH2sConfig(params) {
+  return request({
+    url: 'busConfig/H2sConfig/batchExport',
+    method: 'get',
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
diff --git a/src/components/Amap/utils/convert-helper.js b/src/components/Amap/utils/convert-helper.js
index ab7a8d2..6b61377 100644
--- a/src/components/Amap/utils/convert-helper.js
+++ b/src/components/Amap/utils/convert-helper.js
@@ -76,7 +76,6 @@
     AMapLoader.load({
       key: store.getters.amapKey // 秘钥
     }).then((AMap) => {
-      // debugger
       AMap.convertFrom(coordinate, 'gps', (status, result) => {
         if (result.info === 'ok') {
           const lnglats = result.locations[0]
diff --git a/src/permission.js b/src/permission.js
index 0f332ec..52f5108 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -33,7 +33,6 @@
     const oldUser = getUser()
     const username = to.query.username
     const password = to.query.pwd
-    // debugger
     if (loginByUsername && username && password && !oldUser) { // 登陆后跳转
       const loginForm = {
         username: username,
diff --git a/src/views/dataView/components/panelGroup.vue b/src/views/dataView/components/panelGroup.vue
index 7cae96f..49ee723 100644
--- a/src/views/dataView/components/panelGroup.vue
+++ b/src/views/dataView/components/panelGroup.vue
@@ -120,7 +120,6 @@
       const endTime = new Date().Format('yyyy-MM-dd hh:mm:ss')
       const params = { beginTime, endTime }
       dataCount(params).then(response => {
-        debugger
         this.dataGroup[2].context = response.data.total
       })
     }
diff --git a/src/views/deviceConfig/components/editGasConfig.vue b/src/views/deviceConfig/components/editGasConfig.vue
index 07659cf..0f33004 100644
--- a/src/views/deviceConfig/components/editGasConfig.vue
+++ b/src/views/deviceConfig/components/editGasConfig.vue
@@ -155,8 +155,8 @@
       configForm: {
         id: '', // config id
         deviceId: '', // 设备id
-        collectInterval: '', // 报警阈值
-        uploadPeriod: '', // 安装高度
+        collectInterval: '', // 采集间隔
+        uploadPeriod: '', // 上传周期
         retryTimes: '3', // 重传次数
         attemptsMax: '3', // 最大尝试次数
         ip: '', // ip地址

diff --git a/src/api/config/h2sconfig.js b/src/api/config/h2sconfig.js
new file mode 100644
index 0000000..f441692
--- /dev/null
+++ b/src/api/config/h2sconfig.js
@@ -0,0 +1,42 @@
+/**
+ * 硫化氢配置接口
+ */
+import request from '@/utils/request'
+// 硫化氢配置查询
+export function getH2sConfigList(params) {
+  return request({
+    url: 'busConfig/H2sConfig/list',
+    method: 'get',
+    params
+  })
+}
+
+// 修改硫化氢配置
+export function editH2sConfig(params) {
+  return request({
+    url: 'busConfig/H2sConfig/config',
+    method: 'post',
+    params
+  })
+}
+
+// 批量导入
+export function batchImportH2sConfig(fileobj) {
+  const param = new FormData()
+  param.append('file', fileobj)
+  return request({
+    url: 'busConfig/H2sConfig/batchImport',
+    method: 'post',
+    headers: { 'Content-Type': 'multipart/form-data' },
+    data: param
+  })
+}
+// 批量导出
+export function batchExportH2sConfig(params) {
+  return request({
+    url: 'busConfig/H2sConfig/batchExport',
+    method: 'get',
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
diff --git a/src/components/Amap/utils/convert-helper.js b/src/components/Amap/utils/convert-helper.js
index ab7a8d2..6b61377 100644
--- a/src/components/Amap/utils/convert-helper.js
+++ b/src/components/Amap/utils/convert-helper.js
@@ -76,7 +76,6 @@
     AMapLoader.load({
       key: store.getters.amapKey // 秘钥
     }).then((AMap) => {
-      // debugger
       AMap.convertFrom(coordinate, 'gps', (status, result) => {
         if (result.info === 'ok') {
           const lnglats = result.locations[0]
diff --git a/src/permission.js b/src/permission.js
index 0f332ec..52f5108 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -33,7 +33,6 @@
     const oldUser = getUser()
     const username = to.query.username
     const password = to.query.pwd
-    // debugger
     if (loginByUsername && username && password && !oldUser) { // 登陆后跳转
       const loginForm = {
         username: username,
diff --git a/src/views/dataView/components/panelGroup.vue b/src/views/dataView/components/panelGroup.vue
index 7cae96f..49ee723 100644
--- a/src/views/dataView/components/panelGroup.vue
+++ b/src/views/dataView/components/panelGroup.vue
@@ -120,7 +120,6 @@
       const endTime = new Date().Format('yyyy-MM-dd hh:mm:ss')
       const params = { beginTime, endTime }
       dataCount(params).then(response => {
-        debugger
         this.dataGroup[2].context = response.data.total
       })
     }
diff --git a/src/views/deviceConfig/components/editGasConfig.vue b/src/views/deviceConfig/components/editGasConfig.vue
index 07659cf..0f33004 100644
--- a/src/views/deviceConfig/components/editGasConfig.vue
+++ b/src/views/deviceConfig/components/editGasConfig.vue
@@ -155,8 +155,8 @@
       configForm: {
         id: '', // config id
         deviceId: '', // 设备id
-        collectInterval: '', // 报警阈值
-        uploadPeriod: '', // 安装高度
+        collectInterval: '', // 采集间隔
+        uploadPeriod: '', // 上传周期
         retryTimes: '3', // 重传次数
         attemptsMax: '3', // 最大尝试次数
         ip: '', // ip地址
diff --git a/src/views/deviceConfig/components/editH2sConfig.vue b/src/views/deviceConfig/components/editH2sConfig.vue
new file mode 100644
index 0000000..8902fdd
--- /dev/null
+++ b/src/views/deviceConfig/components/editH2sConfig.vue
@@ -0,0 +1,291 @@
+<template>
+  <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" append-to-body>
+    <el-form ref="dataForm" :rules="rules" :model="configForm" label-well-code="right" label-width="110px">
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item v-if="dialogStatus=='create'" label="设备编号" prop="deviceId">
+            <el-select
+              v-model="configForm.deviceId"
+              :loading="loading"
+              :disabled="dialogStatus=='update'?true:false"
+              filterable
+              placeholder="请输入设备编号"
+            >
+              <el-option
+                v-for="item in devices"
+                :key="item.id"
+                :label="item.devcode"
+                :value="item.id"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item v-if="dialogStatus=='update'" label="设备编号">
+            <el-input v-model="deviceForm.devcode" type="text" placeholder="未知" disabled />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item v-if="deviceForm.deviceName!=''" label="设备名称">
+            <el-input v-model="deviceForm.deviceName" type="text" placeholder="未知" disabled />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item v-if="deviceForm.deviceTypeName!=''" label="设备类型" prop="deviceType">
+            <el-input v-model="deviceForm.deviceTypeName" type="text" placeholder="未知" disabled />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item v-if="deviceForm.deptName!=''" label="权属单位" prop="deptName">
+            <el-input v-model="deviceForm.deptName" type="text" placeholder="未知" disabled />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="重传次数" prop="retryTimes">
+            <el-input-number v-model="configForm.retryTimes" :min="1" :max="9" type="text" placeholder="必填" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="采集间隔(分)" prop="collectInterval">
+            <el-input v-model.trim="configForm.collectInterval" type="text" placeholder="必填" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="上传周期(分)" prop="uploadPeriod">
+            <el-input v-model.trim="configForm.uploadPeriod" type="text" placeholder="必填" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="最大尝试次数">
+            <el-input-number v-model="configForm.attemptsMax" :min="1" :max="100" type="text" placeholder="必填" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row v-if="showIp" :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="ip地址" prop="ip">
+            <el-input v-model.trim="configForm.ip" type="text" placeholder="非必填" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="端口号" prop="port">
+            <el-input v-model.trim="configForm.port" type="text" placeholder="非必填" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <div slot="footer" class="dialog-footer">
+      <el-button :disabled="!canEdit" type="primary" @click="saveData">
+        保存
+      </el-button>
+      <el-button @click="cancel">
+        取消
+      </el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { editH2sConfig } from '@/api/config/h2sconfig'
+import { getDeviceSimpleList } from '@/api/config/liquidconfig'
+import { validateFloatPlus } from '@/utils/validate'
+export default {
+  name: 'EditH2sConfig',
+  data() {
+    const validateIp = (rule, value, callback) => {
+      if (value !== '') {
+        if ((/((25[0-5]|2[0-4]\d|((1\d{2})|([1-9]?\d)))\.){3}(25[0-5]|2[0-4]\d|((1\d{2})|([1-9]?\d)))/).test(value) === false) {
+          callback(new Error('请填写正确的ip地址'))
+        } else {
+          callback()
+        }
+      } else {
+        // callback(new Error('ip地址不能为空'))
+        callback()
+      }
+    }
+    const validatePort = (rule, value, callback) => {
+      if (value !== '') {
+        if ((/[1-9]$|(^[1-9][0-9]$)|(^[1-9][0-9][0-9]$)|(^[1-9][0-9][0-9][0-9]$)|(^[1-6][0-5][0-5][0-3][0-5]$)/).test(value) === false) {
+          callback(new Error('请填写正确的端口号'))
+        } else {
+          callback()
+        }
+      } else {
+        // callback(new Error('端口号不能为空'))
+        callback()
+      }
+    }
+    const validateCollectCycle = (rule, value, callback) => {
+      if (value !== '') {
+        if (validateFloatPlus(value, 5, 1440) === true) {
+          callback()
+        } else {
+          callback(new Error('请填写5到1440数值'))
+        }
+      } else {
+        callback(new Error('采集间隔不能为空'))
+      }
+    }
+    const validateUpPeriod = (rule, value, callback) => {
+      if (value !== '') {
+        if (validateFloatPlus(value, 0, 10080) === true) {
+          callback()
+        } else {
+          callback(new Error('请填写0到10080之间数值'))
+        }
+      } else {
+        callback(new Error('上传周期不能为空'))
+      }
+    }
+    return {
+      dialogFormVisible: false, // 对话框是否显示
+      dialogStatus: '', // 对话框类型：create,update
+      deviceForm: {
+        deviceName: '',
+        deviceTypeName: '',
+        deptName: '',
+        devcode: '',
+        deviceType: ''
+      }, // 设备基本信息
+      configForm: {
+        id: '', // config id
+        deviceId: '', // 设备id
+        collectInterval: '', // 采集间隔
+        uploadPeriod: '', // 上传周期
+        retryTimes: '3', // 重传次数
+        attemptsMax: '3', // 最大尝试次数
+        ip: '', // ip地址
+        port: '' // 端口号
+      },
+      textMap: {
+        update: '编辑',
+        create: '新增'
+      }, // 表头显示标题
+      devices: [], // 设备下拉选择列表
+      loading: false, // 加载动画是否显示
+      canEdit: true, // 是否允许点击保存按钮
+      rules: {
+        collectInterval: [{ required: true, trigger: ['blur', 'change'], validator: validateCollectCycle }],
+        uploadPeriod: [{ required: true, trigger: ['blur', 'change'], validator: validateUpPeriod }],
+        deviceId: [{ required: true, message: '设备编号不能为空', trigger: ['blur', 'change'] }],
+        ip: [{ trigger: ['blur', 'change'], validator: validateIp }],
+        port: [{ trigger: ['blur', 'change'], validator: validatePort }]
+      } // 前端校验规则
+    }
+  },
+  computed: {
+    watchDeviceId() { // 监控权属单位变化
+      return this.configForm.deviceId
+    },
+    showIp() { // 是否显示ip配置
+      return true
+    }
+  },
+  watch: {
+    watchDeviceId(newValue, oldValue) {
+      for (const device of this.devices) {
+        if (device.id === newValue) {
+          this.deviceForm.deviceTypeName = device.deviceTypeName
+          this.deviceForm.deptName = device.deptName
+          this.deviceForm.deviceName = device.deviceName
+          return
+        }
+      }
+    }
+  },
+  methods: {
+    // 初始化对话框
+    initDialog: function(dialogStatus, dialogFormVisible, row = null) {
+      this.dialogStatus = dialogStatus
+      this.dialogFormVisible = dialogFormVisible
+      this.canEdit = true
+      if (dialogStatus === 'create') { // 如果是新增，清除验证
+        this.resetForm()
+        this.fetchDevice()
+        this.$nextTick(() => {
+          this.$refs['dataForm'].clearValidate()
+        })
+      } else if (dialogStatus === 'update') { // 如果是修改，将row中数据填写到输入框中
+        this.deviceForm = {
+          deviceName: row.deviceName,
+          devcode: row.devcode,
+          deptName: row.deptName,
+          deviceType: row.deviceType,
+          deviceTypeName: row.deviceTypeName
+        }
+        this.configForm = {
+          id: row.id,
+          deviceId: row.deviceId, // 设备id
+          collectInterval: row.collectInterval, // 采集间隔
+          uploadPeriod: row.uploadPeriod, // 上传周期
+          retryTimes: row.retryTimes, // 重传次数
+          ip: row.ip, // ip地址
+          port: row.port, // 端口号
+          attemptsMax: row.attemptsMax // 最大尝试次数
+        }
+      }
+    },
+    // 重置表单
+    resetForm() {
+      this.deviceForm = {
+        deviceName: '',
+        deviceTypeName: '',
+        deptName: '',
+        devcode: ''
+      }
+      this.configForm = {
+        deviceId: '', // 设备id
+        collectInterval: '', // 采集间隔
+        uploadPeriod: '', // 上传周期
+        retryTimes: '3', // 重传次数
+        ip: '', // ip地址
+        port: '', // 端口号
+        attemptsMax: '3' // 最大尝试次数
+      }
+    },
+    // 保存数据
+    saveData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          this.canEdit = false
+          editH2sConfig(this.configForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('配置成功')
+              this.$emit('watchChild')
+              this.dialogFormVisible = false
+            }
+            this.canEdit = false
+          }).catch(_ => {
+            this.canEdit = true
+          })
+        }
+      })
+    },
+    fetchDevice() {
+      this.loading = true
+      getDeviceSimpleList('14', '0').then(response => {
+        this.loading = false
+        this.devices = response.data
+      })
+    },
+    cancel: function() {
+      this.dialogFormVisible = false
+      this.$emit('watchChild')
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .el-select{
+    width: 100%;
+  }
+  .el-input-number{
+    width: 100%;
+  }
+</style>

diff --git a/src/api/config/h2sconfig.js b/src/api/config/h2sconfig.js
new file mode 100644
index 0000000..f441692
--- /dev/null
+++ b/src/api/config/h2sconfig.js
@@ -0,0 +1,42 @@
+/**
+ * 硫化氢配置接口
+ */
+import request from '@/utils/request'
+// 硫化氢配置查询
+export function getH2sConfigList(params) {
+  return request({
+    url: 'busConfig/H2sConfig/list',
+    method: 'get',
+    params
+  })
+}
+
+// 修改硫化氢配置
+export function editH2sConfig(params) {
+  return request({
+    url: 'busConfig/H2sConfig/config',
+    method: 'post',
+    params
+  })
+}
+
+// 批量导入
+export function batchImportH2sConfig(fileobj) {
+  const param = new FormData()
+  param.append('file', fileobj)
+  return request({
+    url: 'busConfig/H2sConfig/batchImport',
+    method: 'post',
+    headers: { 'Content-Type': 'multipart/form-data' },
+    data: param
+  })
+}
+// 批量导出
+export function batchExportH2sConfig(params) {
+  return request({
+    url: 'busConfig/H2sConfig/batchExport',
+    method: 'get',
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
diff --git a/src/components/Amap/utils/convert-helper.js b/src/components/Amap/utils/convert-helper.js
index ab7a8d2..6b61377 100644
--- a/src/components/Amap/utils/convert-helper.js
+++ b/src/components/Amap/utils/convert-helper.js
@@ -76,7 +76,6 @@
     AMapLoader.load({
       key: store.getters.amapKey // 秘钥
     }).then((AMap) => {
-      // debugger
       AMap.convertFrom(coordinate, 'gps', (status, result) => {
         if (result.info === 'ok') {
           const lnglats = result.locations[0]
diff --git a/src/permission.js b/src/permission.js
index 0f332ec..52f5108 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -33,7 +33,6 @@
     const oldUser = getUser()
     const username = to.query.username
     const password = to.query.pwd
-    // debugger
     if (loginByUsername && username && password && !oldUser) { // 登陆后跳转
       const loginForm = {
         username: username,
diff --git a/src/views/dataView/components/panelGroup.vue b/src/views/dataView/components/panelGroup.vue
index 7cae96f..49ee723 100644
--- a/src/views/dataView/components/panelGroup.vue
+++ b/src/views/dataView/components/panelGroup.vue
@@ -120,7 +120,6 @@
       const endTime = new Date().Format('yyyy-MM-dd hh:mm:ss')
       const params = { beginTime, endTime }
       dataCount(params).then(response => {
-        debugger
         this.dataGroup[2].context = response.data.total
       })
     }
diff --git a/src/views/deviceConfig/components/editGasConfig.vue b/src/views/deviceConfig/components/editGasConfig.vue
index 07659cf..0f33004 100644
--- a/src/views/deviceConfig/components/editGasConfig.vue
+++ b/src/views/deviceConfig/components/editGasConfig.vue
@@ -155,8 +155,8 @@
       configForm: {
         id: '', // config id
         deviceId: '', // 设备id
-        collectInterval: '', // 报警阈值
-        uploadPeriod: '', // 安装高度
+        collectInterval: '', // 采集间隔
+        uploadPeriod: '', // 上传周期
         retryTimes: '3', // 重传次数
         attemptsMax: '3', // 最大尝试次数
         ip: '', // ip地址
diff --git a/src/views/deviceConfig/components/editH2sConfig.vue b/src/views/deviceConfig/components/editH2sConfig.vue
new file mode 100644
index 0000000..8902fdd
--- /dev/null
+++ b/src/views/deviceConfig/components/editH2sConfig.vue
@@ -0,0 +1,291 @@
+<template>
+  <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" append-to-body>
+    <el-form ref="dataForm" :rules="rules" :model="configForm" label-well-code="right" label-width="110px">
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item v-if="dialogStatus=='create'" label="设备编号" prop="deviceId">
+            <el-select
+              v-model="configForm.deviceId"
+              :loading="loading"
+              :disabled="dialogStatus=='update'?true:false"
+              filterable
+              placeholder="请输入设备编号"
+            >
+              <el-option
+                v-for="item in devices"
+                :key="item.id"
+                :label="item.devcode"
+                :value="item.id"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item v-if="dialogStatus=='update'" label="设备编号">
+            <el-input v-model="deviceForm.devcode" type="text" placeholder="未知" disabled />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item v-if="deviceForm.deviceName!=''" label="设备名称">
+            <el-input v-model="deviceForm.deviceName" type="text" placeholder="未知" disabled />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item v-if="deviceForm.deviceTypeName!=''" label="设备类型" prop="deviceType">
+            <el-input v-model="deviceForm.deviceTypeName" type="text" placeholder="未知" disabled />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item v-if="deviceForm.deptName!=''" label="权属单位" prop="deptName">
+            <el-input v-model="deviceForm.deptName" type="text" placeholder="未知" disabled />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="重传次数" prop="retryTimes">
+            <el-input-number v-model="configForm.retryTimes" :min="1" :max="9" type="text" placeholder="必填" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="采集间隔(分)" prop="collectInterval">
+            <el-input v-model.trim="configForm.collectInterval" type="text" placeholder="必填" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="上传周期(分)" prop="uploadPeriod">
+            <el-input v-model.trim="configForm.uploadPeriod" type="text" placeholder="必填" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="最大尝试次数">
+            <el-input-number v-model="configForm.attemptsMax" :min="1" :max="100" type="text" placeholder="必填" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row v-if="showIp" :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="ip地址" prop="ip">
+            <el-input v-model.trim="configForm.ip" type="text" placeholder="非必填" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="端口号" prop="port">
+            <el-input v-model.trim="configForm.port" type="text" placeholder="非必填" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <div slot="footer" class="dialog-footer">
+      <el-button :disabled="!canEdit" type="primary" @click="saveData">
+        保存
+      </el-button>
+      <el-button @click="cancel">
+        取消
+      </el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { editH2sConfig } from '@/api/config/h2sconfig'
+import { getDeviceSimpleList } from '@/api/config/liquidconfig'
+import { validateFloatPlus } from '@/utils/validate'
+export default {
+  name: 'EditH2sConfig',
+  data() {
+    const validateIp = (rule, value, callback) => {
+      if (value !== '') {
+        if ((/((25[0-5]|2[0-4]\d|((1\d{2})|([1-9]?\d)))\.){3}(25[0-5]|2[0-4]\d|((1\d{2})|([1-9]?\d)))/).test(value) === false) {
+          callback(new Error('请填写正确的ip地址'))
+        } else {
+          callback()
+        }
+      } else {
+        // callback(new Error('ip地址不能为空'))
+        callback()
+      }
+    }
+    const validatePort = (rule, value, callback) => {
+      if (value !== '') {
+        if ((/[1-9]$|(^[1-9][0-9]$)|(^[1-9][0-9][0-9]$)|(^[1-9][0-9][0-9][0-9]$)|(^[1-6][0-5][0-5][0-3][0-5]$)/).test(value) === false) {
+          callback(new Error('请填写正确的端口号'))
+        } else {
+          callback()
+        }
+      } else {
+        // callback(new Error('端口号不能为空'))
+        callback()
+      }
+    }
+    const validateCollectCycle = (rule, value, callback) => {
+      if (value !== '') {
+        if (validateFloatPlus(value, 5, 1440) === true) {
+          callback()
+        } else {
+          callback(new Error('请填写5到1440数值'))
+        }
+      } else {
+        callback(new Error('采集间隔不能为空'))
+      }
+    }
+    const validateUpPeriod = (rule, value, callback) => {
+      if (value !== '') {
+        if (validateFloatPlus(value, 0, 10080) === true) {
+          callback()
+        } else {
+          callback(new Error('请填写0到10080之间数值'))
+        }
+      } else {
+        callback(new Error('上传周期不能为空'))
+      }
+    }
+    return {
+      dialogFormVisible: false, // 对话框是否显示
+      dialogStatus: '', // 对话框类型：create,update
+      deviceForm: {
+        deviceName: '',
+        deviceTypeName: '',
+        deptName: '',
+        devcode: '',
+        deviceType: ''
+      }, // 设备基本信息
+      configForm: {
+        id: '', // config id
+        deviceId: '', // 设备id
+        collectInterval: '', // 采集间隔
+        uploadPeriod: '', // 上传周期
+        retryTimes: '3', // 重传次数
+        attemptsMax: '3', // 最大尝试次数
+        ip: '', // ip地址
+        port: '' // 端口号
+      },
+      textMap: {
+        update: '编辑',
+        create: '新增'
+      }, // 表头显示标题
+      devices: [], // 设备下拉选择列表
+      loading: false, // 加载动画是否显示
+      canEdit: true, // 是否允许点击保存按钮
+      rules: {
+        collectInterval: [{ required: true, trigger: ['blur', 'change'], validator: validateCollectCycle }],
+        uploadPeriod: [{ required: true, trigger: ['blur', 'change'], validator: validateUpPeriod }],
+        deviceId: [{ required: true, message: '设备编号不能为空', trigger: ['blur', 'change'] }],
+        ip: [{ trigger: ['blur', 'change'], validator: validateIp }],
+        port: [{ trigger: ['blur', 'change'], validator: validatePort }]
+      } // 前端校验规则
+    }
+  },
+  computed: {
+    watchDeviceId() { // 监控权属单位变化
+      return this.configForm.deviceId
+    },
+    showIp() { // 是否显示ip配置
+      return true
+    }
+  },
+  watch: {
+    watchDeviceId(newValue, oldValue) {
+      for (const device of this.devices) {
+        if (device.id === newValue) {
+          this.deviceForm.deviceTypeName = device.deviceTypeName
+          this.deviceForm.deptName = device.deptName
+          this.deviceForm.deviceName = device.deviceName
+          return
+        }
+      }
+    }
+  },
+  methods: {
+    // 初始化对话框
+    initDialog: function(dialogStatus, dialogFormVisible, row = null) {
+      this.dialogStatus = dialogStatus
+      this.dialogFormVisible = dialogFormVisible
+      this.canEdit = true
+      if (dialogStatus === 'create') { // 如果是新增，清除验证
+        this.resetForm()
+        this.fetchDevice()
+        this.$nextTick(() => {
+          this.$refs['dataForm'].clearValidate()
+        })
+      } else if (dialogStatus === 'update') { // 如果是修改，将row中数据填写到输入框中
+        this.deviceForm = {
+          deviceName: row.deviceName,
+          devcode: row.devcode,
+          deptName: row.deptName,
+          deviceType: row.deviceType,
+          deviceTypeName: row.deviceTypeName
+        }
+        this.configForm = {
+          id: row.id,
+          deviceId: row.deviceId, // 设备id
+          collectInterval: row.collectInterval, // 采集间隔
+          uploadPeriod: row.uploadPeriod, // 上传周期
+          retryTimes: row.retryTimes, // 重传次数
+          ip: row.ip, // ip地址
+          port: row.port, // 端口号
+          attemptsMax: row.attemptsMax // 最大尝试次数
+        }
+      }
+    },
+    // 重置表单
+    resetForm() {
+      this.deviceForm = {
+        deviceName: '',
+        deviceTypeName: '',
+        deptName: '',
+        devcode: ''
+      }
+      this.configForm = {
+        deviceId: '', // 设备id
+        collectInterval: '', // 采集间隔
+        uploadPeriod: '', // 上传周期
+        retryTimes: '3', // 重传次数
+        ip: '', // ip地址
+        port: '', // 端口号
+        attemptsMax: '3' // 最大尝试次数
+      }
+    },
+    // 保存数据
+    saveData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          this.canEdit = false
+          editH2sConfig(this.configForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('配置成功')
+              this.$emit('watchChild')
+              this.dialogFormVisible = false
+            }
+            this.canEdit = false
+          }).catch(_ => {
+            this.canEdit = true
+          })
+        }
+      })
+    },
+    fetchDevice() {
+      this.loading = true
+      getDeviceSimpleList('14', '0').then(response => {
+        this.loading = false
+        this.devices = response.data
+      })
+    },
+    cancel: function() {
+      this.dialogFormVisible = false
+      this.$emit('watchChild')
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .el-select{
+    width: 100%;
+  }
+  .el-input-number{
+    width: 100%;
+  }
+</style>
diff --git a/src/views/deviceConfig/components/editLiquidConfig.vue b/src/views/deviceConfig/components/editLiquidConfig.vue
index 6be88e3..19557de 100644
--- a/src/views/deviceConfig/components/editLiquidConfig.vue
+++ b/src/views/deviceConfig/components/editLiquidConfig.vue
@@ -188,7 +188,6 @@
   watch: {
     watchDeviceId(newValue, oldValue) {
       for (const device of this.devices) {
-        debugger
         if (device.id === newValue) {
           this.deviceForm.deviceTypeName = device.deviceTypeName
           this.deviceForm.deptName = device.deptName

diff --git a/src/api/config/h2sconfig.js b/src/api/config/h2sconfig.js
new file mode 100644
index 0000000..f441692
--- /dev/null
+++ b/src/api/config/h2sconfig.js
@@ -0,0 +1,42 @@
+/**
+ * 硫化氢配置接口
+ */
+import request from '@/utils/request'
+// 硫化氢配置查询
+export function getH2sConfigList(params) {
+  return request({
+    url: 'busConfig/H2sConfig/list',
+    method: 'get',
+    params
+  })
+}
+
+// 修改硫化氢配置
+export function editH2sConfig(params) {
+  return request({
+    url: 'busConfig/H2sConfig/config',
+    method: 'post',
+    params
+  })
+}
+
+// 批量导入
+export function batchImportH2sConfig(fileobj) {
+  const param = new FormData()
+  param.append('file', fileobj)
+  return request({
+    url: 'busConfig/H2sConfig/batchImport',
+    method: 'post',
+    headers: { 'Content-Type': 'multipart/form-data' },
+    data: param
+  })
+}
+// 批量导出
+export function batchExportH2sConfig(params) {
+  return request({
+    url: 'busConfig/H2sConfig/batchExport',
+    method: 'get',
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
diff --git a/src/components/Amap/utils/convert-helper.js b/src/components/Amap/utils/convert-helper.js
index ab7a8d2..6b61377 100644
--- a/src/components/Amap/utils/convert-helper.js
+++ b/src/components/Amap/utils/convert-helper.js
@@ -76,7 +76,6 @@
     AMapLoader.load({
       key: store.getters.amapKey // 秘钥
     }).then((AMap) => {
-      // debugger
       AMap.convertFrom(coordinate, 'gps', (status, result) => {
         if (result.info === 'ok') {
           const lnglats = result.locations[0]
diff --git a/src/permission.js b/src/permission.js
index 0f332ec..52f5108 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -33,7 +33,6 @@
     const oldUser = getUser()
     const username = to.query.username
     const password = to.query.pwd
-    // debugger
     if (loginByUsername && username && password && !oldUser) { // 登陆后跳转
       const loginForm = {
         username: username,
diff --git a/src/views/dataView/components/panelGroup.vue b/src/views/dataView/components/panelGroup.vue
index 7cae96f..49ee723 100644
--- a/src/views/dataView/components/panelGroup.vue
+++ b/src/views/dataView/components/panelGroup.vue
@@ -120,7 +120,6 @@
       const endTime = new Date().Format('yyyy-MM-dd hh:mm:ss')
       const params = { beginTime, endTime }
       dataCount(params).then(response => {
-        debugger
         this.dataGroup[2].context = response.data.total
       })
     }
diff --git a/src/views/deviceConfig/components/editGasConfig.vue b/src/views/deviceConfig/components/editGasConfig.vue
index 07659cf..0f33004 100644
--- a/src/views/deviceConfig/components/editGasConfig.vue
+++ b/src/views/deviceConfig/components/editGasConfig.vue
@@ -155,8 +155,8 @@
       configForm: {
         id: '', // config id
         deviceId: '', // 设备id
-        collectInterval: '', // 报警阈值
-        uploadPeriod: '', // 安装高度
+        collectInterval: '', // 采集间隔
+        uploadPeriod: '', // 上传周期
         retryTimes: '3', // 重传次数
         attemptsMax: '3', // 最大尝试次数
         ip: '', // ip地址
diff --git a/src/views/deviceConfig/components/editH2sConfig.vue b/src/views/deviceConfig/components/editH2sConfig.vue
new file mode 100644
index 0000000..8902fdd
--- /dev/null
+++ b/src/views/deviceConfig/components/editH2sConfig.vue
@@ -0,0 +1,291 @@
+<template>
+  <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" append-to-body>
+    <el-form ref="dataForm" :rules="rules" :model="configForm" label-well-code="right" label-width="110px">
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item v-if="dialogStatus=='create'" label="设备编号" prop="deviceId">
+            <el-select
+              v-model="configForm.deviceId"
+              :loading="loading"
+              :disabled="dialogStatus=='update'?true:false"
+              filterable
+              placeholder="请输入设备编号"
+            >
+              <el-option
+                v-for="item in devices"
+                :key="item.id"
+                :label="item.devcode"
+                :value="item.id"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item v-if="dialogStatus=='update'" label="设备编号">
+            <el-input v-model="deviceForm.devcode" type="text" placeholder="未知" disabled />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item v-if="deviceForm.deviceName!=''" label="设备名称">
+            <el-input v-model="deviceForm.deviceName" type="text" placeholder="未知" disabled />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item v-if="deviceForm.deviceTypeName!=''" label="设备类型" prop="deviceType">
+            <el-input v-model="deviceForm.deviceTypeName" type="text" placeholder="未知" disabled />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item v-if="deviceForm.deptName!=''" label="权属单位" prop="deptName">
+            <el-input v-model="deviceForm.deptName" type="text" placeholder="未知" disabled />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="重传次数" prop="retryTimes">
+            <el-input-number v-model="configForm.retryTimes" :min="1" :max="9" type="text" placeholder="必填" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="采集间隔(分)" prop="collectInterval">
+            <el-input v-model.trim="configForm.collectInterval" type="text" placeholder="必填" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="上传周期(分)" prop="uploadPeriod">
+            <el-input v-model.trim="configForm.uploadPeriod" type="text" placeholder="必填" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="最大尝试次数">
+            <el-input-number v-model="configForm.attemptsMax" :min="1" :max="100" type="text" placeholder="必填" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row v-if="showIp" :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="ip地址" prop="ip">
+            <el-input v-model.trim="configForm.ip" type="text" placeholder="非必填" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="端口号" prop="port">
+            <el-input v-model.trim="configForm.port" type="text" placeholder="非必填" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <div slot="footer" class="dialog-footer">
+      <el-button :disabled="!canEdit" type="primary" @click="saveData">
+        保存
+      </el-button>
+      <el-button @click="cancel">
+        取消
+      </el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { editH2sConfig } from '@/api/config/h2sconfig'
+import { getDeviceSimpleList } from '@/api/config/liquidconfig'
+import { validateFloatPlus } from '@/utils/validate'
+export default {
+  name: 'EditH2sConfig',
+  data() {
+    const validateIp = (rule, value, callback) => {
+      if (value !== '') {
+        if ((/((25[0-5]|2[0-4]\d|((1\d{2})|([1-9]?\d)))\.){3}(25[0-5]|2[0-4]\d|((1\d{2})|([1-9]?\d)))/).test(value) === false) {
+          callback(new Error('请填写正确的ip地址'))
+        } else {
+          callback()
+        }
+      } else {
+        // callback(new Error('ip地址不能为空'))
+        callback()
+      }
+    }
+    const validatePort = (rule, value, callback) => {
+      if (value !== '') {
+        if ((/[1-9]$|(^[1-9][0-9]$)|(^[1-9][0-9][0-9]$)|(^[1-9][0-9][0-9][0-9]$)|(^[1-6][0-5][0-5][0-3][0-5]$)/).test(value) === false) {
+          callback(new Error('请填写正确的端口号'))
+        } else {
+          callback()
+        }
+      } else {
+        // callback(new Error('端口号不能为空'))
+        callback()
+      }
+    }
+    const validateCollectCycle = (rule, value, callback) => {
+      if (value !== '') {
+        if (validateFloatPlus(value, 5, 1440) === true) {
+          callback()
+        } else {
+          callback(new Error('请填写5到1440数值'))
+        }
+      } else {
+        callback(new Error('采集间隔不能为空'))
+      }
+    }
+    const validateUpPeriod = (rule, value, callback) => {
+      if (value !== '') {
+        if (validateFloatPlus(value, 0, 10080) === true) {
+          callback()
+        } else {
+          callback(new Error('请填写0到10080之间数值'))
+        }
+      } else {
+        callback(new Error('上传周期不能为空'))
+      }
+    }
+    return {
+      dialogFormVisible: false, // 对话框是否显示
+      dialogStatus: '', // 对话框类型：create,update
+      deviceForm: {
+        deviceName: '',
+        deviceTypeName: '',
+        deptName: '',
+        devcode: '',
+        deviceType: ''
+      }, // 设备基本信息
+      configForm: {
+        id: '', // config id
+        deviceId: '', // 设备id
+        collectInterval: '', // 采集间隔
+        uploadPeriod: '', // 上传周期
+        retryTimes: '3', // 重传次数
+        attemptsMax: '3', // 最大尝试次数
+        ip: '', // ip地址
+        port: '' // 端口号
+      },
+      textMap: {
+        update: '编辑',
+        create: '新增'
+      }, // 表头显示标题
+      devices: [], // 设备下拉选择列表
+      loading: false, // 加载动画是否显示
+      canEdit: true, // 是否允许点击保存按钮
+      rules: {
+        collectInterval: [{ required: true, trigger: ['blur', 'change'], validator: validateCollectCycle }],
+        uploadPeriod: [{ required: true, trigger: ['blur', 'change'], validator: validateUpPeriod }],
+        deviceId: [{ required: true, message: '设备编号不能为空', trigger: ['blur', 'change'] }],
+        ip: [{ trigger: ['blur', 'change'], validator: validateIp }],
+        port: [{ trigger: ['blur', 'change'], validator: validatePort }]
+      } // 前端校验规则
+    }
+  },
+  computed: {
+    watchDeviceId() { // 监控权属单位变化
+      return this.configForm.deviceId
+    },
+    showIp() { // 是否显示ip配置
+      return true
+    }
+  },
+  watch: {
+    watchDeviceId(newValue, oldValue) {
+      for (const device of this.devices) {
+        if (device.id === newValue) {
+          this.deviceForm.deviceTypeName = device.deviceTypeName
+          this.deviceForm.deptName = device.deptName
+          this.deviceForm.deviceName = device.deviceName
+          return
+        }
+      }
+    }
+  },
+  methods: {
+    // 初始化对话框
+    initDialog: function(dialogStatus, dialogFormVisible, row = null) {
+      this.dialogStatus = dialogStatus
+      this.dialogFormVisible = dialogFormVisible
+      this.canEdit = true
+      if (dialogStatus === 'create') { // 如果是新增，清除验证
+        this.resetForm()
+        this.fetchDevice()
+        this.$nextTick(() => {
+          this.$refs['dataForm'].clearValidate()
+        })
+      } else if (dialogStatus === 'update') { // 如果是修改，将row中数据填写到输入框中
+        this.deviceForm = {
+          deviceName: row.deviceName,
+          devcode: row.devcode,
+          deptName: row.deptName,
+          deviceType: row.deviceType,
+          deviceTypeName: row.deviceTypeName
+        }
+        this.configForm = {
+          id: row.id,
+          deviceId: row.deviceId, // 设备id
+          collectInterval: row.collectInterval, // 采集间隔
+          uploadPeriod: row.uploadPeriod, // 上传周期
+          retryTimes: row.retryTimes, // 重传次数
+          ip: row.ip, // ip地址
+          port: row.port, // 端口号
+          attemptsMax: row.attemptsMax // 最大尝试次数
+        }
+      }
+    },
+    // 重置表单
+    resetForm() {
+      this.deviceForm = {
+        deviceName: '',
+        deviceTypeName: '',
+        deptName: '',
+        devcode: ''
+      }
+      this.configForm = {
+        deviceId: '', // 设备id
+        collectInterval: '', // 采集间隔
+        uploadPeriod: '', // 上传周期
+        retryTimes: '3', // 重传次数
+        ip: '', // ip地址
+        port: '', // 端口号
+        attemptsMax: '3' // 最大尝试次数
+      }
+    },
+    // 保存数据
+    saveData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          this.canEdit = false
+          editH2sConfig(this.configForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('配置成功')
+              this.$emit('watchChild')
+              this.dialogFormVisible = false
+            }
+            this.canEdit = false
+          }).catch(_ => {
+            this.canEdit = true
+          })
+        }
+      })
+    },
+    fetchDevice() {
+      this.loading = true
+      getDeviceSimpleList('14', '0').then(response => {
+        this.loading = false
+        this.devices = response.data
+      })
+    },
+    cancel: function() {
+      this.dialogFormVisible = false
+      this.$emit('watchChild')
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .el-select{
+    width: 100%;
+  }
+  .el-input-number{
+    width: 100%;
+  }
+</style>
diff --git a/src/views/deviceConfig/components/editLiquidConfig.vue b/src/views/deviceConfig/components/editLiquidConfig.vue
index 6be88e3..19557de 100644
--- a/src/views/deviceConfig/components/editLiquidConfig.vue
+++ b/src/views/deviceConfig/components/editLiquidConfig.vue
@@ -188,7 +188,6 @@
   watch: {
     watchDeviceId(newValue, oldValue) {
       for (const device of this.devices) {
-        debugger
         if (device.id === newValue) {
           this.deviceForm.deviceTypeName = device.deviceTypeName
           this.deviceForm.deptName = device.deptName
diff --git a/src/views/deviceConfig/components/editTubeConfig.vue b/src/views/deviceConfig/components/editTubeConfig.vue
index 171991a..468014e 100644
--- a/src/views/deviceConfig/components/editTubeConfig.vue
+++ b/src/views/deviceConfig/components/editTubeConfig.vue
@@ -155,8 +155,8 @@
       configForm: {
         id: '', // config id
         deviceId: '', // 设备id
-        collectInterval: '', // 报警阈值
-        uploadPeriod: '', // 安装高度
+        collectInterval: '', // 采集间隔
+        uploadPeriod: '', // 上传周期
         retryTimes: '3', // 重传次数
         attemptsMax: '3', // 最大尝试次数
         ip: '', // ip地址

diff --git a/src/api/config/h2sconfig.js b/src/api/config/h2sconfig.js
new file mode 100644
index 0000000..f441692
--- /dev/null
+++ b/src/api/config/h2sconfig.js
@@ -0,0 +1,42 @@
+/**
+ * 硫化氢配置接口
+ */
+import request from '@/utils/request'
+// 硫化氢配置查询
+export function getH2sConfigList(params) {
+  return request({
+    url: 'busConfig/H2sConfig/list',
+    method: 'get',
+    params
+  })
+}
+
+// 修改硫化氢配置
+export function editH2sConfig(params) {
+  return request({
+    url: 'busConfig/H2sConfig/config',
+    method: 'post',
+    params
+  })
+}
+
+// 批量导入
+export function batchImportH2sConfig(fileobj) {
+  const param = new FormData()
+  param.append('file', fileobj)
+  return request({
+    url: 'busConfig/H2sConfig/batchImport',
+    method: 'post',
+    headers: { 'Content-Type': 'multipart/form-data' },
+    data: param
+  })
+}
+// 批量导出
+export function batchExportH2sConfig(params) {
+  return request({
+    url: 'busConfig/H2sConfig/batchExport',
+    method: 'get',
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
diff --git a/src/components/Amap/utils/convert-helper.js b/src/components/Amap/utils/convert-helper.js
index ab7a8d2..6b61377 100644
--- a/src/components/Amap/utils/convert-helper.js
+++ b/src/components/Amap/utils/convert-helper.js
@@ -76,7 +76,6 @@
     AMapLoader.load({
       key: store.getters.amapKey // 秘钥
     }).then((AMap) => {
-      // debugger
       AMap.convertFrom(coordinate, 'gps', (status, result) => {
         if (result.info === 'ok') {
           const lnglats = result.locations[0]
diff --git a/src/permission.js b/src/permission.js
index 0f332ec..52f5108 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -33,7 +33,6 @@
     const oldUser = getUser()
     const username = to.query.username
     const password = to.query.pwd
-    // debugger
     if (loginByUsername && username && password && !oldUser) { // 登陆后跳转
       const loginForm = {
         username: username,
diff --git a/src/views/dataView/components/panelGroup.vue b/src/views/dataView/components/panelGroup.vue
index 7cae96f..49ee723 100644
--- a/src/views/dataView/components/panelGroup.vue
+++ b/src/views/dataView/components/panelGroup.vue
@@ -120,7 +120,6 @@
       const endTime = new Date().Format('yyyy-MM-dd hh:mm:ss')
       const params = { beginTime, endTime }
       dataCount(params).then(response => {
-        debugger
         this.dataGroup[2].context = response.data.total
       })
     }
diff --git a/src/views/deviceConfig/components/editGasConfig.vue b/src/views/deviceConfig/components/editGasConfig.vue
index 07659cf..0f33004 100644
--- a/src/views/deviceConfig/components/editGasConfig.vue
+++ b/src/views/deviceConfig/components/editGasConfig.vue
@@ -155,8 +155,8 @@
       configForm: {
         id: '', // config id
         deviceId: '', // 设备id
-        collectInterval: '', // 报警阈值
-        uploadPeriod: '', // 安装高度
+        collectInterval: '', // 采集间隔
+        uploadPeriod: '', // 上传周期
         retryTimes: '3', // 重传次数
         attemptsMax: '3', // 最大尝试次数
         ip: '', // ip地址
diff --git a/src/views/deviceConfig/components/editH2sConfig.vue b/src/views/deviceConfig/components/editH2sConfig.vue
new file mode 100644
index 0000000..8902fdd
--- /dev/null
+++ b/src/views/deviceConfig/components/editH2sConfig.vue
@@ -0,0 +1,291 @@
+<template>
+  <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" append-to-body>
+    <el-form ref="dataForm" :rules="rules" :model="configForm" label-well-code="right" label-width="110px">
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item v-if="dialogStatus=='create'" label="设备编号" prop="deviceId">
+            <el-select
+              v-model="configForm.deviceId"
+              :loading="loading"
+              :disabled="dialogStatus=='update'?true:false"
+              filterable
+              placeholder="请输入设备编号"
+            >
+              <el-option
+                v-for="item in devices"
+                :key="item.id"
+                :label="item.devcode"
+                :value="item.id"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item v-if="dialogStatus=='update'" label="设备编号">
+            <el-input v-model="deviceForm.devcode" type="text" placeholder="未知" disabled />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item v-if="deviceForm.deviceName!=''" label="设备名称">
+            <el-input v-model="deviceForm.deviceName" type="text" placeholder="未知" disabled />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item v-if="deviceForm.deviceTypeName!=''" label="设备类型" prop="deviceType">
+            <el-input v-model="deviceForm.deviceTypeName" type="text" placeholder="未知" disabled />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item v-if="deviceForm.deptName!=''" label="权属单位" prop="deptName">
+            <el-input v-model="deviceForm.deptName" type="text" placeholder="未知" disabled />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="重传次数" prop="retryTimes">
+            <el-input-number v-model="configForm.retryTimes" :min="1" :max="9" type="text" placeholder="必填" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="采集间隔(分)" prop="collectInterval">
+            <el-input v-model.trim="configForm.collectInterval" type="text" placeholder="必填" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="上传周期(分)" prop="uploadPeriod">
+            <el-input v-model.trim="configForm.uploadPeriod" type="text" placeholder="必填" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="最大尝试次数">
+            <el-input-number v-model="configForm.attemptsMax" :min="1" :max="100" type="text" placeholder="必填" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row v-if="showIp" :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="ip地址" prop="ip">
+            <el-input v-model.trim="configForm.ip" type="text" placeholder="非必填" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="端口号" prop="port">
+            <el-input v-model.trim="configForm.port" type="text" placeholder="非必填" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <div slot="footer" class="dialog-footer">
+      <el-button :disabled="!canEdit" type="primary" @click="saveData">
+        保存
+      </el-button>
+      <el-button @click="cancel">
+        取消
+      </el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { editH2sConfig } from '@/api/config/h2sconfig'
+import { getDeviceSimpleList } from '@/api/config/liquidconfig'
+import { validateFloatPlus } from '@/utils/validate'
+export default {
+  name: 'EditH2sConfig',
+  data() {
+    const validateIp = (rule, value, callback) => {
+      if (value !== '') {
+        if ((/((25[0-5]|2[0-4]\d|((1\d{2})|([1-9]?\d)))\.){3}(25[0-5]|2[0-4]\d|((1\d{2})|([1-9]?\d)))/).test(value) === false) {
+          callback(new Error('请填写正确的ip地址'))
+        } else {
+          callback()
+        }
+      } else {
+        // callback(new Error('ip地址不能为空'))
+        callback()
+      }
+    }
+    const validatePort = (rule, value, callback) => {
+      if (value !== '') {
+        if ((/[1-9]$|(^[1-9][0-9]$)|(^[1-9][0-9][0-9]$)|(^[1-9][0-9][0-9][0-9]$)|(^[1-6][0-5][0-5][0-3][0-5]$)/).test(value) === false) {
+          callback(new Error('请填写正确的端口号'))
+        } else {
+          callback()
+        }
+      } else {
+        // callback(new Error('端口号不能为空'))
+        callback()
+      }
+    }
+    const validateCollectCycle = (rule, value, callback) => {
+      if (value !== '') {
+        if (validateFloatPlus(value, 5, 1440) === true) {
+          callback()
+        } else {
+          callback(new Error('请填写5到1440数值'))
+        }
+      } else {
+        callback(new Error('采集间隔不能为空'))
+      }
+    }
+    const validateUpPeriod = (rule, value, callback) => {
+      if (value !== '') {
+        if (validateFloatPlus(value, 0, 10080) === true) {
+          callback()
+        } else {
+          callback(new Error('请填写0到10080之间数值'))
+        }
+      } else {
+        callback(new Error('上传周期不能为空'))
+      }
+    }
+    return {
+      dialogFormVisible: false, // 对话框是否显示
+      dialogStatus: '', // 对话框类型：create,update
+      deviceForm: {
+        deviceName: '',
+        deviceTypeName: '',
+        deptName: '',
+        devcode: '',
+        deviceType: ''
+      }, // 设备基本信息
+      configForm: {
+        id: '', // config id
+        deviceId: '', // 设备id
+        collectInterval: '', // 采集间隔
+        uploadPeriod: '', // 上传周期
+        retryTimes: '3', // 重传次数
+        attemptsMax: '3', // 最大尝试次数
+        ip: '', // ip地址
+        port: '' // 端口号
+      },
+      textMap: {
+        update: '编辑',
+        create: '新增'
+      }, // 表头显示标题
+      devices: [], // 设备下拉选择列表
+      loading: false, // 加载动画是否显示
+      canEdit: true, // 是否允许点击保存按钮
+      rules: {
+        collectInterval: [{ required: true, trigger: ['blur', 'change'], validator: validateCollectCycle }],
+        uploadPeriod: [{ required: true, trigger: ['blur', 'change'], validator: validateUpPeriod }],
+        deviceId: [{ required: true, message: '设备编号不能为空', trigger: ['blur', 'change'] }],
+        ip: [{ trigger: ['blur', 'change'], validator: validateIp }],
+        port: [{ trigger: ['blur', 'change'], validator: validatePort }]
+      } // 前端校验规则
+    }
+  },
+  computed: {
+    watchDeviceId() { // 监控权属单位变化
+      return this.configForm.deviceId
+    },
+    showIp() { // 是否显示ip配置
+      return true
+    }
+  },
+  watch: {
+    watchDeviceId(newValue, oldValue) {
+      for (const device of this.devices) {
+        if (device.id === newValue) {
+          this.deviceForm.deviceTypeName = device.deviceTypeName
+          this.deviceForm.deptName = device.deptName
+          this.deviceForm.deviceName = device.deviceName
+          return
+        }
+      }
+    }
+  },
+  methods: {
+    // 初始化对话框
+    initDialog: function(dialogStatus, dialogFormVisible, row = null) {
+      this.dialogStatus = dialogStatus
+      this.dialogFormVisible = dialogFormVisible
+      this.canEdit = true
+      if (dialogStatus === 'create') { // 如果是新增，清除验证
+        this.resetForm()
+        this.fetchDevice()
+        this.$nextTick(() => {
+          this.$refs['dataForm'].clearValidate()
+        })
+      } else if (dialogStatus === 'update') { // 如果是修改，将row中数据填写到输入框中
+        this.deviceForm = {
+          deviceName: row.deviceName,
+          devcode: row.devcode,
+          deptName: row.deptName,
+          deviceType: row.deviceType,
+          deviceTypeName: row.deviceTypeName
+        }
+        this.configForm = {
+          id: row.id,
+          deviceId: row.deviceId, // 设备id
+          collectInterval: row.collectInterval, // 采集间隔
+          uploadPeriod: row.uploadPeriod, // 上传周期
+          retryTimes: row.retryTimes, // 重传次数
+          ip: row.ip, // ip地址
+          port: row.port, // 端口号
+          attemptsMax: row.attemptsMax // 最大尝试次数
+        }
+      }
+    },
+    // 重置表单
+    resetForm() {
+      this.deviceForm = {
+        deviceName: '',
+        deviceTypeName: '',
+        deptName: '',
+        devcode: ''
+      }
+      this.configForm = {
+        deviceId: '', // 设备id
+        collectInterval: '', // 采集间隔
+        uploadPeriod: '', // 上传周期
+        retryTimes: '3', // 重传次数
+        ip: '', // ip地址
+        port: '', // 端口号
+        attemptsMax: '3' // 最大尝试次数
+      }
+    },
+    // 保存数据
+    saveData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          this.canEdit = false
+          editH2sConfig(this.configForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('配置成功')
+              this.$emit('watchChild')
+              this.dialogFormVisible = false
+            }
+            this.canEdit = false
+          }).catch(_ => {
+            this.canEdit = true
+          })
+        }
+      })
+    },
+    fetchDevice() {
+      this.loading = true
+      getDeviceSimpleList('14', '0').then(response => {
+        this.loading = false
+        this.devices = response.data
+      })
+    },
+    cancel: function() {
+      this.dialogFormVisible = false
+      this.$emit('watchChild')
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .el-select{
+    width: 100%;
+  }
+  .el-input-number{
+    width: 100%;
+  }
+</style>
diff --git a/src/views/deviceConfig/components/editLiquidConfig.vue b/src/views/deviceConfig/components/editLiquidConfig.vue
index 6be88e3..19557de 100644
--- a/src/views/deviceConfig/components/editLiquidConfig.vue
+++ b/src/views/deviceConfig/components/editLiquidConfig.vue
@@ -188,7 +188,6 @@
   watch: {
     watchDeviceId(newValue, oldValue) {
       for (const device of this.devices) {
-        debugger
         if (device.id === newValue) {
           this.deviceForm.deviceTypeName = device.deviceTypeName
           this.deviceForm.deptName = device.deptName
diff --git a/src/views/deviceConfig/components/editTubeConfig.vue b/src/views/deviceConfig/components/editTubeConfig.vue
index 171991a..468014e 100644
--- a/src/views/deviceConfig/components/editTubeConfig.vue
+++ b/src/views/deviceConfig/components/editTubeConfig.vue
@@ -155,8 +155,8 @@
       configForm: {
         id: '', // config id
         deviceId: '', // 设备id
-        collectInterval: '', // 报警阈值
-        uploadPeriod: '', // 安装高度
+        collectInterval: '', // 采集间隔
+        uploadPeriod: '', // 上传周期
         retryTimes: '3', // 重传次数
         attemptsMax: '3', // 最大尝试次数
         ip: '', // ip地址
diff --git a/src/views/deviceConfig/components/listH2sConfig.vue b/src/views/deviceConfig/components/listH2sConfig.vue
new file mode 100644
index 0000000..3555e1e
--- /dev/null
+++ b/src/views/deviceConfig/components/listH2sConfig.vue
@@ -0,0 +1,310 @@
+<template>
+  <app-container>
+    <search-area size="small" @search="search">
+      <search-item>
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="设备编号" clearable />
+      </search-item>
+      <search-item>
+        <dept-select
+          v-model="listQuery.deptid"
+          :need-top="deptShowTop"
+          dept-type="03"
+          placeholder="选择权属单位"
+        />
+      </search-item>
+    </search-area>
+    <!--查询结果Table显示-->
+    <div>
+      <el-row class="table-title">
+        <el-col :span="6">
+          <div class="title-header">
+            <i class="el-icon-menu" />数据列表
+          </div>
+        </el-col>
+        <el-col :span="12" :offset="6" class="edit_btns">
+          <el-button v-if="hasPerm('/busConfig/H2sConfig/batchExport')" class="edit_btn" size="small" @click="batchExport">
+            导出记录
+          </el-button>
+          <download-template :filename="filename" />
+          <el-upload
+            v-if="hasPerm('/busConfig/H2sConfig/batchImport')"
+            :limit="1"
+            :show-file-list="false"
+            :http-request="uploadFile"
+            :file-list="fileList"
+            action="string"
+            accept=".xls,.xlsx"
+            class="edit_btn"
+          >
+            <el-button v-if="hasPerm('/busConfig/H2sConfig/batchImport')" slot="trigger" size="small">
+              批量导入
+            </el-button>
+          </el-upload>
+          <el-button v-if="hasPerm('/busConfig/H2sConfig/config')" class="edit_btn" size="small" @click="add">
+            新增
+          </el-button>
+        </el-col>
+      </el-row>
+      <el-table v-loading="listLoading" :data="list" class="table" border @selection-change="handleSelectionChange">
+        <!--<el-table-column align="center" type="selection" width="55"/>-->
+        <el-table-column :index="indexMethod" align="center" type="index" />
+        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
+          <template slot-scope="scope">
+            {{ scope.row[column.value] }}
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" align="center" width="60">
+          <template slot-scope="scope">
+            <el-button type="text" @click="edit(scope.row)">
+              编辑
+            </el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+    </div>
+    <!--分页-->
+    <div class="pagination-container">
+      <el-pagination
+        v-show="total>listQuery.limit"
+        :current-page="listQuery.offset"
+        :page-sizes="[20,30,50]"
+        :page-size="listQuery.limit"
+        :total="total"
+        align="center"
+        layout="total, sizes, prev, pager, next"
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"
+      />
+    </div>
+    <edit-h2s-config v-show="editShow" ref="editconfig" @watchChild="fetchData" />
+  </app-container>
+</template>
+
+<script>
+import { getH2sConfigList, batchImportH2sConfig, batchExportH2sConfig } from '@/api/config/h2sconfig'
+import EditH2sConfig from './editH2sConfig'
+import DownloadTemplate from '@/components/DownloadTemplate/index'
+import DeptSelect from '@/components/DeptSelect/index'
+
+export default {
+  name: 'ListH2sConfig',
+  components: { DeptSelect, DownloadTemplate, EditH2sConfig },
+  data() {
+    return {
+      listQuery: {
+        keywords: '',
+        offset: 1,
+        limit: 20,
+        sort: '',
+        order: ''
+      }, // 筛选条件
+      columns: [
+        {
+          text: '设备编号',
+          value: 'devcode',
+          align: 'center'
+        },
+        {
+          text: '重传次数',
+          value: 'retryTimes',
+          align: 'center'
+        },
+        {
+          text: '采集间隔(分)',
+          value: 'collectInterval',
+          align: 'center'
+        },
+        {
+          text: '上传周期',
+          value: 'uploadPeriod',
+          align: 'center'
+        },
+        {
+          text: 'IP地址',
+          value: 'ip',
+          align: 'center'
+        },
+        {
+          text: '端口',
+          value: 'port',
+          align: 'center'
+        },
+        {
+          text: '最大尝试次数',
+          value: 'attemptsMax',
+          align: 'center'
+        },
+        {
+          text: '已尝试次数',
+          value: 'attemptsCurrent',
+          align: 'center'
+        },
+        {
+          text: '下发状态',
+          value: 'statusName',
+          width: 80,
+          align: 'center'
+        }
+      ], // 显示列
+      multipleSelection: [], // 多选选中项
+      list: [], // 列表数据
+      total: 0, // 数据总数
+      deviceTypeList: [], // 硫化氢配置类型列表
+      deptProps: {
+        parent: 'pid',
+        value: 'id',
+        label: 'name',
+        children: 'children'
+      }, // 权属单位树形下拉菜单
+      deptTreeList: null, // 组织树列表数据
+      showDeptTree: 0, // 是否显示权属单位下拉
+      showDeviceType: true, // 是否显示设备类型下拉
+      listLoading: true, // 加载动画
+      fullscreenLoading: false, // 全屏加载动画
+      editShow: false, // 是否显示编辑框
+      detailShow: false, // 是否显示编辑框
+      filename: 'methane_config_template.xlsx',
+      deptShowTop: false,
+      fileList: []
+    }
+  },
+  created() {
+    this.fetchData()// 获取数据
+  },
+  methods: {
+    // 新增设备
+    add() {
+      this.dialogFormVisible = true
+      this.editShow = true
+      this.$refs.editconfig.initDialog('create', this.dialogFormVisible)
+    },
+    // 编辑硫化氢配置信息
+    edit(row) {
+      this.dialogFormVisible = true
+      this.editShow = true
+      this.$refs.editconfig.initDialog('update', this.dialogFormVisible, row)
+    },
+    // 批量导入硫化氢配置
+    uploadFile(param) {
+      // 判断文件大小是否符合要求
+      const _file = param.file
+      const isLt5M = _file.size / 1024 / 1024 < 5
+      if (!isLt5M) {
+        this.$message.error('请上传5M以下的excel文件')
+        return false
+      }
+      // 全屏加载动画
+      const loading = this.$loading({
+        lock: true,
+        text: '导入中,请稍后...',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
+      })
+      // 发起导入请求
+      batchImportH2sConfig(_file).then(res => {
+        loading.close() // 关闭加载动画
+        if (res.code === 200) {
+          this.$message.success('导入成功')
+          this.fetchData(false)
+        } else {
+          this.$message.error(res.message)
+        }
+      }).catch(() => {
+        loading.close() // 关闭加载动画
+      })
+      this.fileList = []
+    },
+    // 批量导出
+    batchExport() {
+      // 全屏加载动画
+      const loading = this.$loading({
+        lock: true,
+        text: '数据处理中,请稍后...',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
+      })
+      batchExportH2sConfig(this.listQuery).then(res => {
+        loading.close() // 关闭加载动画
+        console.log('download===', res)
+        const blob = new Blob([res.data])
+        const downloadElement = document.createElement('a')
+        const href = window.URL.createObjectURL(blob) // 创建下载的链接
+        downloadElement.href = href
+        downloadElement.download = `硫化氢配置列表.xlsx` // 下载后文件名
+        document.body.appendChild(downloadElement)
+        downloadElement.click() // 点击下载
+        document.body.removeChild(downloadElement) // 下载完成移除元素
+        window.URL.revokeObjectURL(href) // 释放blob对象
+      }).catch((res) => {
+        loading.close()
+        this.$message.error(res.message)
+      })
+    },
+    // 查询数据
+    search() {
+      this.fetchData(false)
+    },
+    // 获取硫化氢配置数据
+    fetchData(isNowPage = true) {
+      this.listLoading = true
+      if (!isNowPage) { // 是否显示当前页，否则跳转第一页
+        this.listQuery.offset = 1
+      }
+      getH2sConfigList(this.listQuery).then(response => {
+        this.list = response.data.rows
+        this.total = parseInt(response.data.total)
+        this.listLoading = false
+      })
+    },
+    indexMethod(index) {
+      return this.listQuery.limit * (this.listQuery.offset - 1) + index + 1
+    },
+    // 改变页容量
+    handleSizeChange(val) {
+      this.listQuery.limit = val
+      this.fetchData()
+    },
+    // 改变当前页
+    handleCurrentChange(val) {
+      this.listQuery.offset = val
+      this.fetchData()
+    },
+    // 多选触发方法
+    handleSelectionChange(val) {
+      this.multipleSelection = val
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .app-container{
+    padding: 10px;
+  }
+  $tableTitleHeight:46px;
+  .table{
+    margin-bottom: 20px;
+  }
+  .pagination-container{
+    margin-bottom: 50px;
+  }
+  .table-title{
+    background-color:rgba(243, 243, 243, 1);
+    height: $tableTitleHeight;
+    .title-header{
+      line-height:$tableTitleHeight;
+      color: #606266;
+      font-size: 15px;
+      i{
+        margin-left: 5px;
+        margin-right: 5px;
+      }
+    }
+  }
+  .edit_btns{
+    .edit_btn{
+      float:right;
+      margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2
+    }
+  }
+</style>

diff --git a/src/api/config/h2sconfig.js b/src/api/config/h2sconfig.js
new file mode 100644
index 0000000..f441692
--- /dev/null
+++ b/src/api/config/h2sconfig.js
@@ -0,0 +1,42 @@
+/**
+ * 硫化氢配置接口
+ */
+import request from '@/utils/request'
+// 硫化氢配置查询
+export function getH2sConfigList(params) {
+  return request({
+    url: 'busConfig/H2sConfig/list',
+    method: 'get',
+    params
+  })
+}
+
+// 修改硫化氢配置
+export function editH2sConfig(params) {
+  return request({
+    url: 'busConfig/H2sConfig/config',
+    method: 'post',
+    params
+  })
+}
+
+// 批量导入
+export function batchImportH2sConfig(fileobj) {
+  const param = new FormData()
+  param.append('file', fileobj)
+  return request({
+    url: 'busConfig/H2sConfig/batchImport',
+    method: 'post',
+    headers: { 'Content-Type': 'multipart/form-data' },
+    data: param
+  })
+}
+// 批量导出
+export function batchExportH2sConfig(params) {
+  return request({
+    url: 'busConfig/H2sConfig/batchExport',
+    method: 'get',
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
diff --git a/src/components/Amap/utils/convert-helper.js b/src/components/Amap/utils/convert-helper.js
index ab7a8d2..6b61377 100644
--- a/src/components/Amap/utils/convert-helper.js
+++ b/src/components/Amap/utils/convert-helper.js
@@ -76,7 +76,6 @@
     AMapLoader.load({
       key: store.getters.amapKey // 秘钥
     }).then((AMap) => {
-      // debugger
       AMap.convertFrom(coordinate, 'gps', (status, result) => {
         if (result.info === 'ok') {
           const lnglats = result.locations[0]
diff --git a/src/permission.js b/src/permission.js
index 0f332ec..52f5108 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -33,7 +33,6 @@
     const oldUser = getUser()
     const username = to.query.username
     const password = to.query.pwd
-    // debugger
     if (loginByUsername && username && password && !oldUser) { // 登陆后跳转
       const loginForm = {
         username: username,
diff --git a/src/views/dataView/components/panelGroup.vue b/src/views/dataView/components/panelGroup.vue
index 7cae96f..49ee723 100644
--- a/src/views/dataView/components/panelGroup.vue
+++ b/src/views/dataView/components/panelGroup.vue
@@ -120,7 +120,6 @@
       const endTime = new Date().Format('yyyy-MM-dd hh:mm:ss')
       const params = { beginTime, endTime }
       dataCount(params).then(response => {
-        debugger
         this.dataGroup[2].context = response.data.total
       })
     }
diff --git a/src/views/deviceConfig/components/editGasConfig.vue b/src/views/deviceConfig/components/editGasConfig.vue
index 07659cf..0f33004 100644
--- a/src/views/deviceConfig/components/editGasConfig.vue
+++ b/src/views/deviceConfig/components/editGasConfig.vue
@@ -155,8 +155,8 @@
       configForm: {
         id: '', // config id
         deviceId: '', // 设备id
-        collectInterval: '', // 报警阈值
-        uploadPeriod: '', // 安装高度
+        collectInterval: '', // 采集间隔
+        uploadPeriod: '', // 上传周期
         retryTimes: '3', // 重传次数
         attemptsMax: '3', // 最大尝试次数
         ip: '', // ip地址
diff --git a/src/views/deviceConfig/components/editH2sConfig.vue b/src/views/deviceConfig/components/editH2sConfig.vue
new file mode 100644
index 0000000..8902fdd
--- /dev/null
+++ b/src/views/deviceConfig/components/editH2sConfig.vue
@@ -0,0 +1,291 @@
+<template>
+  <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" append-to-body>
+    <el-form ref="dataForm" :rules="rules" :model="configForm" label-well-code="right" label-width="110px">
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item v-if="dialogStatus=='create'" label="设备编号" prop="deviceId">
+            <el-select
+              v-model="configForm.deviceId"
+              :loading="loading"
+              :disabled="dialogStatus=='update'?true:false"
+              filterable
+              placeholder="请输入设备编号"
+            >
+              <el-option
+                v-for="item in devices"
+                :key="item.id"
+                :label="item.devcode"
+                :value="item.id"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item v-if="dialogStatus=='update'" label="设备编号">
+            <el-input v-model="deviceForm.devcode" type="text" placeholder="未知" disabled />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item v-if="deviceForm.deviceName!=''" label="设备名称">
+            <el-input v-model="deviceForm.deviceName" type="text" placeholder="未知" disabled />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item v-if="deviceForm.deviceTypeName!=''" label="设备类型" prop="deviceType">
+            <el-input v-model="deviceForm.deviceTypeName" type="text" placeholder="未知" disabled />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item v-if="deviceForm.deptName!=''" label="权属单位" prop="deptName">
+            <el-input v-model="deviceForm.deptName" type="text" placeholder="未知" disabled />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="重传次数" prop="retryTimes">
+            <el-input-number v-model="configForm.retryTimes" :min="1" :max="9" type="text" placeholder="必填" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="采集间隔(分)" prop="collectInterval">
+            <el-input v-model.trim="configForm.collectInterval" type="text" placeholder="必填" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="上传周期(分)" prop="uploadPeriod">
+            <el-input v-model.trim="configForm.uploadPeriod" type="text" placeholder="必填" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="最大尝试次数">
+            <el-input-number v-model="configForm.attemptsMax" :min="1" :max="100" type="text" placeholder="必填" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row v-if="showIp" :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="ip地址" prop="ip">
+            <el-input v-model.trim="configForm.ip" type="text" placeholder="非必填" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="端口号" prop="port">
+            <el-input v-model.trim="configForm.port" type="text" placeholder="非必填" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <div slot="footer" class="dialog-footer">
+      <el-button :disabled="!canEdit" type="primary" @click="saveData">
+        保存
+      </el-button>
+      <el-button @click="cancel">
+        取消
+      </el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { editH2sConfig } from '@/api/config/h2sconfig'
+import { getDeviceSimpleList } from '@/api/config/liquidconfig'
+import { validateFloatPlus } from '@/utils/validate'
+export default {
+  name: 'EditH2sConfig',
+  data() {
+    const validateIp = (rule, value, callback) => {
+      if (value !== '') {
+        if ((/((25[0-5]|2[0-4]\d|((1\d{2})|([1-9]?\d)))\.){3}(25[0-5]|2[0-4]\d|((1\d{2})|([1-9]?\d)))/).test(value) === false) {
+          callback(new Error('请填写正确的ip地址'))
+        } else {
+          callback()
+        }
+      } else {
+        // callback(new Error('ip地址不能为空'))
+        callback()
+      }
+    }
+    const validatePort = (rule, value, callback) => {
+      if (value !== '') {
+        if ((/[1-9]$|(^[1-9][0-9]$)|(^[1-9][0-9][0-9]$)|(^[1-9][0-9][0-9][0-9]$)|(^[1-6][0-5][0-5][0-3][0-5]$)/).test(value) === false) {
+          callback(new Error('请填写正确的端口号'))
+        } else {
+          callback()
+        }
+      } else {
+        // callback(new Error('端口号不能为空'))
+        callback()
+      }
+    }
+    const validateCollectCycle = (rule, value, callback) => {
+      if (value !== '') {
+        if (validateFloatPlus(value, 5, 1440) === true) {
+          callback()
+        } else {
+          callback(new Error('请填写5到1440数值'))
+        }
+      } else {
+        callback(new Error('采集间隔不能为空'))
+      }
+    }
+    const validateUpPeriod = (rule, value, callback) => {
+      if (value !== '') {
+        if (validateFloatPlus(value, 0, 10080) === true) {
+          callback()
+        } else {
+          callback(new Error('请填写0到10080之间数值'))
+        }
+      } else {
+        callback(new Error('上传周期不能为空'))
+      }
+    }
+    return {
+      dialogFormVisible: false, // 对话框是否显示
+      dialogStatus: '', // 对话框类型：create,update
+      deviceForm: {
+        deviceName: '',
+        deviceTypeName: '',
+        deptName: '',
+        devcode: '',
+        deviceType: ''
+      }, // 设备基本信息
+      configForm: {
+        id: '', // config id
+        deviceId: '', // 设备id
+        collectInterval: '', // 采集间隔
+        uploadPeriod: '', // 上传周期
+        retryTimes: '3', // 重传次数
+        attemptsMax: '3', // 最大尝试次数
+        ip: '', // ip地址
+        port: '' // 端口号
+      },
+      textMap: {
+        update: '编辑',
+        create: '新增'
+      }, // 表头显示标题
+      devices: [], // 设备下拉选择列表
+      loading: false, // 加载动画是否显示
+      canEdit: true, // 是否允许点击保存按钮
+      rules: {
+        collectInterval: [{ required: true, trigger: ['blur', 'change'], validator: validateCollectCycle }],
+        uploadPeriod: [{ required: true, trigger: ['blur', 'change'], validator: validateUpPeriod }],
+        deviceId: [{ required: true, message: '设备编号不能为空', trigger: ['blur', 'change'] }],
+        ip: [{ trigger: ['blur', 'change'], validator: validateIp }],
+        port: [{ trigger: ['blur', 'change'], validator: validatePort }]
+      } // 前端校验规则
+    }
+  },
+  computed: {
+    watchDeviceId() { // 监控权属单位变化
+      return this.configForm.deviceId
+    },
+    showIp() { // 是否显示ip配置
+      return true
+    }
+  },
+  watch: {
+    watchDeviceId(newValue, oldValue) {
+      for (const device of this.devices) {
+        if (device.id === newValue) {
+          this.deviceForm.deviceTypeName = device.deviceTypeName
+          this.deviceForm.deptName = device.deptName
+          this.deviceForm.deviceName = device.deviceName
+          return
+        }
+      }
+    }
+  },
+  methods: {
+    // 初始化对话框
+    initDialog: function(dialogStatus, dialogFormVisible, row = null) {
+      this.dialogStatus = dialogStatus
+      this.dialogFormVisible = dialogFormVisible
+      this.canEdit = true
+      if (dialogStatus === 'create') { // 如果是新增，清除验证
+        this.resetForm()
+        this.fetchDevice()
+        this.$nextTick(() => {
+          this.$refs['dataForm'].clearValidate()
+        })
+      } else if (dialogStatus === 'update') { // 如果是修改，将row中数据填写到输入框中
+        this.deviceForm = {
+          deviceName: row.deviceName,
+          devcode: row.devcode,
+          deptName: row.deptName,
+          deviceType: row.deviceType,
+          deviceTypeName: row.deviceTypeName
+        }
+        this.configForm = {
+          id: row.id,
+          deviceId: row.deviceId, // 设备id
+          collectInterval: row.collectInterval, // 采集间隔
+          uploadPeriod: row.uploadPeriod, // 上传周期
+          retryTimes: row.retryTimes, // 重传次数
+          ip: row.ip, // ip地址
+          port: row.port, // 端口号
+          attemptsMax: row.attemptsMax // 最大尝试次数
+        }
+      }
+    },
+    // 重置表单
+    resetForm() {
+      this.deviceForm = {
+        deviceName: '',
+        deviceTypeName: '',
+        deptName: '',
+        devcode: ''
+      }
+      this.configForm = {
+        deviceId: '', // 设备id
+        collectInterval: '', // 采集间隔
+        uploadPeriod: '', // 上传周期
+        retryTimes: '3', // 重传次数
+        ip: '', // ip地址
+        port: '', // 端口号
+        attemptsMax: '3' // 最大尝试次数
+      }
+    },
+    // 保存数据
+    saveData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          this.canEdit = false
+          editH2sConfig(this.configForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('配置成功')
+              this.$emit('watchChild')
+              this.dialogFormVisible = false
+            }
+            this.canEdit = false
+          }).catch(_ => {
+            this.canEdit = true
+          })
+        }
+      })
+    },
+    fetchDevice() {
+      this.loading = true
+      getDeviceSimpleList('14', '0').then(response => {
+        this.loading = false
+        this.devices = response.data
+      })
+    },
+    cancel: function() {
+      this.dialogFormVisible = false
+      this.$emit('watchChild')
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .el-select{
+    width: 100%;
+  }
+  .el-input-number{
+    width: 100%;
+  }
+</style>
diff --git a/src/views/deviceConfig/components/editLiquidConfig.vue b/src/views/deviceConfig/components/editLiquidConfig.vue
index 6be88e3..19557de 100644
--- a/src/views/deviceConfig/components/editLiquidConfig.vue
+++ b/src/views/deviceConfig/components/editLiquidConfig.vue
@@ -188,7 +188,6 @@
   watch: {
     watchDeviceId(newValue, oldValue) {
       for (const device of this.devices) {
-        debugger
         if (device.id === newValue) {
           this.deviceForm.deviceTypeName = device.deviceTypeName
           this.deviceForm.deptName = device.deptName
diff --git a/src/views/deviceConfig/components/editTubeConfig.vue b/src/views/deviceConfig/components/editTubeConfig.vue
index 171991a..468014e 100644
--- a/src/views/deviceConfig/components/editTubeConfig.vue
+++ b/src/views/deviceConfig/components/editTubeConfig.vue
@@ -155,8 +155,8 @@
       configForm: {
         id: '', // config id
         deviceId: '', // 设备id
-        collectInterval: '', // 报警阈值
-        uploadPeriod: '', // 安装高度
+        collectInterval: '', // 采集间隔
+        uploadPeriod: '', // 上传周期
         retryTimes: '3', // 重传次数
         attemptsMax: '3', // 最大尝试次数
         ip: '', // ip地址
diff --git a/src/views/deviceConfig/components/listH2sConfig.vue b/src/views/deviceConfig/components/listH2sConfig.vue
new file mode 100644
index 0000000..3555e1e
--- /dev/null
+++ b/src/views/deviceConfig/components/listH2sConfig.vue
@@ -0,0 +1,310 @@
+<template>
+  <app-container>
+    <search-area size="small" @search="search">
+      <search-item>
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="设备编号" clearable />
+      </search-item>
+      <search-item>
+        <dept-select
+          v-model="listQuery.deptid"
+          :need-top="deptShowTop"
+          dept-type="03"
+          placeholder="选择权属单位"
+        />
+      </search-item>
+    </search-area>
+    <!--查询结果Table显示-->
+    <div>
+      <el-row class="table-title">
+        <el-col :span="6">
+          <div class="title-header">
+            <i class="el-icon-menu" />数据列表
+          </div>
+        </el-col>
+        <el-col :span="12" :offset="6" class="edit_btns">
+          <el-button v-if="hasPerm('/busConfig/H2sConfig/batchExport')" class="edit_btn" size="small" @click="batchExport">
+            导出记录
+          </el-button>
+          <download-template :filename="filename" />
+          <el-upload
+            v-if="hasPerm('/busConfig/H2sConfig/batchImport')"
+            :limit="1"
+            :show-file-list="false"
+            :http-request="uploadFile"
+            :file-list="fileList"
+            action="string"
+            accept=".xls,.xlsx"
+            class="edit_btn"
+          >
+            <el-button v-if="hasPerm('/busConfig/H2sConfig/batchImport')" slot="trigger" size="small">
+              批量导入
+            </el-button>
+          </el-upload>
+          <el-button v-if="hasPerm('/busConfig/H2sConfig/config')" class="edit_btn" size="small" @click="add">
+            新增
+          </el-button>
+        </el-col>
+      </el-row>
+      <el-table v-loading="listLoading" :data="list" class="table" border @selection-change="handleSelectionChange">
+        <!--<el-table-column align="center" type="selection" width="55"/>-->
+        <el-table-column :index="indexMethod" align="center" type="index" />
+        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
+          <template slot-scope="scope">
+            {{ scope.row[column.value] }}
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" align="center" width="60">
+          <template slot-scope="scope">
+            <el-button type="text" @click="edit(scope.row)">
+              编辑
+            </el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+    </div>
+    <!--分页-->
+    <div class="pagination-container">
+      <el-pagination
+        v-show="total>listQuery.limit"
+        :current-page="listQuery.offset"
+        :page-sizes="[20,30,50]"
+        :page-size="listQuery.limit"
+        :total="total"
+        align="center"
+        layout="total, sizes, prev, pager, next"
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"
+      />
+    </div>
+    <edit-h2s-config v-show="editShow" ref="editconfig" @watchChild="fetchData" />
+  </app-container>
+</template>
+
+<script>
+import { getH2sConfigList, batchImportH2sConfig, batchExportH2sConfig } from '@/api/config/h2sconfig'
+import EditH2sConfig from './editH2sConfig'
+import DownloadTemplate from '@/components/DownloadTemplate/index'
+import DeptSelect from '@/components/DeptSelect/index'
+
+export default {
+  name: 'ListH2sConfig',
+  components: { DeptSelect, DownloadTemplate, EditH2sConfig },
+  data() {
+    return {
+      listQuery: {
+        keywords: '',
+        offset: 1,
+        limit: 20,
+        sort: '',
+        order: ''
+      }, // 筛选条件
+      columns: [
+        {
+          text: '设备编号',
+          value: 'devcode',
+          align: 'center'
+        },
+        {
+          text: '重传次数',
+          value: 'retryTimes',
+          align: 'center'
+        },
+        {
+          text: '采集间隔(分)',
+          value: 'collectInterval',
+          align: 'center'
+        },
+        {
+          text: '上传周期',
+          value: 'uploadPeriod',
+          align: 'center'
+        },
+        {
+          text: 'IP地址',
+          value: 'ip',
+          align: 'center'
+        },
+        {
+          text: '端口',
+          value: 'port',
+          align: 'center'
+        },
+        {
+          text: '最大尝试次数',
+          value: 'attemptsMax',
+          align: 'center'
+        },
+        {
+          text: '已尝试次数',
+          value: 'attemptsCurrent',
+          align: 'center'
+        },
+        {
+          text: '下发状态',
+          value: 'statusName',
+          width: 80,
+          align: 'center'
+        }
+      ], // 显示列
+      multipleSelection: [], // 多选选中项
+      list: [], // 列表数据
+      total: 0, // 数据总数
+      deviceTypeList: [], // 硫化氢配置类型列表
+      deptProps: {
+        parent: 'pid',
+        value: 'id',
+        label: 'name',
+        children: 'children'
+      }, // 权属单位树形下拉菜单
+      deptTreeList: null, // 组织树列表数据
+      showDeptTree: 0, // 是否显示权属单位下拉
+      showDeviceType: true, // 是否显示设备类型下拉
+      listLoading: true, // 加载动画
+      fullscreenLoading: false, // 全屏加载动画
+      editShow: false, // 是否显示编辑框
+      detailShow: false, // 是否显示编辑框
+      filename: 'methane_config_template.xlsx',
+      deptShowTop: false,
+      fileList: []
+    }
+  },
+  created() {
+    this.fetchData()// 获取数据
+  },
+  methods: {
+    // 新增设备
+    add() {
+      this.dialogFormVisible = true
+      this.editShow = true
+      this.$refs.editconfig.initDialog('create', this.dialogFormVisible)
+    },
+    // 编辑硫化氢配置信息
+    edit(row) {
+      this.dialogFormVisible = true
+      this.editShow = true
+      this.$refs.editconfig.initDialog('update', this.dialogFormVisible, row)
+    },
+    // 批量导入硫化氢配置
+    uploadFile(param) {
+      // 判断文件大小是否符合要求
+      const _file = param.file
+      const isLt5M = _file.size / 1024 / 1024 < 5
+      if (!isLt5M) {
+        this.$message.error('请上传5M以下的excel文件')
+        return false
+      }
+      // 全屏加载动画
+      const loading = this.$loading({
+        lock: true,
+        text: '导入中,请稍后...',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
+      })
+      // 发起导入请求
+      batchImportH2sConfig(_file).then(res => {
+        loading.close() // 关闭加载动画
+        if (res.code === 200) {
+          this.$message.success('导入成功')
+          this.fetchData(false)
+        } else {
+          this.$message.error(res.message)
+        }
+      }).catch(() => {
+        loading.close() // 关闭加载动画
+      })
+      this.fileList = []
+    },
+    // 批量导出
+    batchExport() {
+      // 全屏加载动画
+      const loading = this.$loading({
+        lock: true,
+        text: '数据处理中,请稍后...',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
+      })
+      batchExportH2sConfig(this.listQuery).then(res => {
+        loading.close() // 关闭加载动画
+        console.log('download===', res)
+        const blob = new Blob([res.data])
+        const downloadElement = document.createElement('a')
+        const href = window.URL.createObjectURL(blob) // 创建下载的链接
+        downloadElement.href = href
+        downloadElement.download = `硫化氢配置列表.xlsx` // 下载后文件名
+        document.body.appendChild(downloadElement)
+        downloadElement.click() // 点击下载
+        document.body.removeChild(downloadElement) // 下载完成移除元素
+        window.URL.revokeObjectURL(href) // 释放blob对象
+      }).catch((res) => {
+        loading.close()
+        this.$message.error(res.message)
+      })
+    },
+    // 查询数据
+    search() {
+      this.fetchData(false)
+    },
+    // 获取硫化氢配置数据
+    fetchData(isNowPage = true) {
+      this.listLoading = true
+      if (!isNowPage) { // 是否显示当前页，否则跳转第一页
+        this.listQuery.offset = 1
+      }
+      getH2sConfigList(this.listQuery).then(response => {
+        this.list = response.data.rows
+        this.total = parseInt(response.data.total)
+        this.listLoading = false
+      })
+    },
+    indexMethod(index) {
+      return this.listQuery.limit * (this.listQuery.offset - 1) + index + 1
+    },
+    // 改变页容量
+    handleSizeChange(val) {
+      this.listQuery.limit = val
+      this.fetchData()
+    },
+    // 改变当前页
+    handleCurrentChange(val) {
+      this.listQuery.offset = val
+      this.fetchData()
+    },
+    // 多选触发方法
+    handleSelectionChange(val) {
+      this.multipleSelection = val
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .app-container{
+    padding: 10px;
+  }
+  $tableTitleHeight:46px;
+  .table{
+    margin-bottom: 20px;
+  }
+  .pagination-container{
+    margin-bottom: 50px;
+  }
+  .table-title{
+    background-color:rgba(243, 243, 243, 1);
+    height: $tableTitleHeight;
+    .title-header{
+      line-height:$tableTitleHeight;
+      color: #606266;
+      font-size: 15px;
+      i{
+        margin-left: 5px;
+        margin-right: 5px;
+      }
+    }
+  }
+  .edit_btns{
+    .edit_btn{
+      float:right;
+      margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2
+    }
+  }
+</style>
diff --git a/src/views/deviceConfig/components/listTubeConfig.vue b/src/views/deviceConfig/components/listTubeConfig.vue
index 6a054f8..9f27e0e 100644
--- a/src/views/deviceConfig/components/listTubeConfig.vue
+++ b/src/views/deviceConfig/components/listTubeConfig.vue
@@ -77,9 +77,7 @@
 </template>
 
 <script>
-import { judgeTree, toTreeList } from '@/utils/structure'
 import { getTubeConfigList, batchImportTubeConfig, batchExportTubeConfig } from '@/api/config/tubeconfig'
-import { getDeptTreeList } from '@/api/system/dept'
 import EditTubeConfig from './editTubeConfig'
 import DownloadTemplate from '@/components/DownloadTemplate/index'
 import DeptSelect from '@/components/DeptSelect/index'
@@ -167,7 +165,6 @@
     }
   },
   created() {
-    this.fetchDeptTree()// 获取部门树
     this.fetchData()// 获取数据
   },
   methods: {
@@ -263,26 +260,6 @@
         this.listLoading = false
       })
     },
-    // 加载组织机构树形下拉菜单
-    fetchDeptTree: function() {
-      getDeptTreeList().then(response => {
-        if (response.data.list) {
-          if (response.data.list.length > 1) {
-            console.log(this.$store.getters.deptId)
-            if (judgeTree(response.data.list)) {
-              this.deptTreeList = toTreeList(response.data.list)
-              this.showDeptTree = 1
-            } else {
-              this.deptTreeList = response.data.list
-              this.showDeptTree = 2
-            }
-            console.log(this.deptTreeList)
-          } else {
-            this.showDeptTree = 0
-          }
-        }
-      })
-    },
     indexMethod(index) {
       return this.listQuery.limit * (this.listQuery.offset - 1) + index + 1
     },

diff --git a/src/api/config/h2sconfig.js b/src/api/config/h2sconfig.js
new file mode 100644
index 0000000..f441692
--- /dev/null
+++ b/src/api/config/h2sconfig.js
@@ -0,0 +1,42 @@
+/**
+ * 硫化氢配置接口
+ */
+import request from '@/utils/request'
+// 硫化氢配置查询
+export function getH2sConfigList(params) {
+  return request({
+    url: 'busConfig/H2sConfig/list',
+    method: 'get',
+    params
+  })
+}
+
+// 修改硫化氢配置
+export function editH2sConfig(params) {
+  return request({
+    url: 'busConfig/H2sConfig/config',
+    method: 'post',
+    params
+  })
+}
+
+// 批量导入
+export function batchImportH2sConfig(fileobj) {
+  const param = new FormData()
+  param.append('file', fileobj)
+  return request({
+    url: 'busConfig/H2sConfig/batchImport',
+    method: 'post',
+    headers: { 'Content-Type': 'multipart/form-data' },
+    data: param
+  })
+}
+// 批量导出
+export function batchExportH2sConfig(params) {
+  return request({
+    url: 'busConfig/H2sConfig/batchExport',
+    method: 'get',
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
diff --git a/src/components/Amap/utils/convert-helper.js b/src/components/Amap/utils/convert-helper.js
index ab7a8d2..6b61377 100644
--- a/src/components/Amap/utils/convert-helper.js
+++ b/src/components/Amap/utils/convert-helper.js
@@ -76,7 +76,6 @@
     AMapLoader.load({
       key: store.getters.amapKey // 秘钥
     }).then((AMap) => {
-      // debugger
       AMap.convertFrom(coordinate, 'gps', (status, result) => {
         if (result.info === 'ok') {
           const lnglats = result.locations[0]
diff --git a/src/permission.js b/src/permission.js
index 0f332ec..52f5108 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -33,7 +33,6 @@
     const oldUser = getUser()
     const username = to.query.username
     const password = to.query.pwd
-    // debugger
     if (loginByUsername && username && password && !oldUser) { // 登陆后跳转
       const loginForm = {
         username: username,
diff --git a/src/views/dataView/components/panelGroup.vue b/src/views/dataView/components/panelGroup.vue
index 7cae96f..49ee723 100644
--- a/src/views/dataView/components/panelGroup.vue
+++ b/src/views/dataView/components/panelGroup.vue
@@ -120,7 +120,6 @@
       const endTime = new Date().Format('yyyy-MM-dd hh:mm:ss')
       const params = { beginTime, endTime }
       dataCount(params).then(response => {
-        debugger
         this.dataGroup[2].context = response.data.total
       })
     }
diff --git a/src/views/deviceConfig/components/editGasConfig.vue b/src/views/deviceConfig/components/editGasConfig.vue
index 07659cf..0f33004 100644
--- a/src/views/deviceConfig/components/editGasConfig.vue
+++ b/src/views/deviceConfig/components/editGasConfig.vue
@@ -155,8 +155,8 @@
       configForm: {
         id: '', // config id
         deviceId: '', // 设备id
-        collectInterval: '', // 报警阈值
-        uploadPeriod: '', // 安装高度
+        collectInterval: '', // 采集间隔
+        uploadPeriod: '', // 上传周期
         retryTimes: '3', // 重传次数
         attemptsMax: '3', // 最大尝试次数
         ip: '', // ip地址
diff --git a/src/views/deviceConfig/components/editH2sConfig.vue b/src/views/deviceConfig/components/editH2sConfig.vue
new file mode 100644
index 0000000..8902fdd
--- /dev/null
+++ b/src/views/deviceConfig/components/editH2sConfig.vue
@@ -0,0 +1,291 @@
+<template>
+  <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" append-to-body>
+    <el-form ref="dataForm" :rules="rules" :model="configForm" label-well-code="right" label-width="110px">
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item v-if="dialogStatus=='create'" label="设备编号" prop="deviceId">
+            <el-select
+              v-model="configForm.deviceId"
+              :loading="loading"
+              :disabled="dialogStatus=='update'?true:false"
+              filterable
+              placeholder="请输入设备编号"
+            >
+              <el-option
+                v-for="item in devices"
+                :key="item.id"
+                :label="item.devcode"
+                :value="item.id"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item v-if="dialogStatus=='update'" label="设备编号">
+            <el-input v-model="deviceForm.devcode" type="text" placeholder="未知" disabled />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item v-if="deviceForm.deviceName!=''" label="设备名称">
+            <el-input v-model="deviceForm.deviceName" type="text" placeholder="未知" disabled />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item v-if="deviceForm.deviceTypeName!=''" label="设备类型" prop="deviceType">
+            <el-input v-model="deviceForm.deviceTypeName" type="text" placeholder="未知" disabled />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item v-if="deviceForm.deptName!=''" label="权属单位" prop="deptName">
+            <el-input v-model="deviceForm.deptName" type="text" placeholder="未知" disabled />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="重传次数" prop="retryTimes">
+            <el-input-number v-model="configForm.retryTimes" :min="1" :max="9" type="text" placeholder="必填" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="采集间隔(分)" prop="collectInterval">
+            <el-input v-model.trim="configForm.collectInterval" type="text" placeholder="必填" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="上传周期(分)" prop="uploadPeriod">
+            <el-input v-model.trim="configForm.uploadPeriod" type="text" placeholder="必填" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="最大尝试次数">
+            <el-input-number v-model="configForm.attemptsMax" :min="1" :max="100" type="text" placeholder="必填" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row v-if="showIp" :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="ip地址" prop="ip">
+            <el-input v-model.trim="configForm.ip" type="text" placeholder="非必填" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="端口号" prop="port">
+            <el-input v-model.trim="configForm.port" type="text" placeholder="非必填" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <div slot="footer" class="dialog-footer">
+      <el-button :disabled="!canEdit" type="primary" @click="saveData">
+        保存
+      </el-button>
+      <el-button @click="cancel">
+        取消
+      </el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { editH2sConfig } from '@/api/config/h2sconfig'
+import { getDeviceSimpleList } from '@/api/config/liquidconfig'
+import { validateFloatPlus } from '@/utils/validate'
+export default {
+  name: 'EditH2sConfig',
+  data() {
+    const validateIp = (rule, value, callback) => {
+      if (value !== '') {
+        if ((/((25[0-5]|2[0-4]\d|((1\d{2})|([1-9]?\d)))\.){3}(25[0-5]|2[0-4]\d|((1\d{2})|([1-9]?\d)))/).test(value) === false) {
+          callback(new Error('请填写正确的ip地址'))
+        } else {
+          callback()
+        }
+      } else {
+        // callback(new Error('ip地址不能为空'))
+        callback()
+      }
+    }
+    const validatePort = (rule, value, callback) => {
+      if (value !== '') {
+        if ((/[1-9]$|(^[1-9][0-9]$)|(^[1-9][0-9][0-9]$)|(^[1-9][0-9][0-9][0-9]$)|(^[1-6][0-5][0-5][0-3][0-5]$)/).test(value) === false) {
+          callback(new Error('请填写正确的端口号'))
+        } else {
+          callback()
+        }
+      } else {
+        // callback(new Error('端口号不能为空'))
+        callback()
+      }
+    }
+    const validateCollectCycle = (rule, value, callback) => {
+      if (value !== '') {
+        if (validateFloatPlus(value, 5, 1440) === true) {
+          callback()
+        } else {
+          callback(new Error('请填写5到1440数值'))
+        }
+      } else {
+        callback(new Error('采集间隔不能为空'))
+      }
+    }
+    const validateUpPeriod = (rule, value, callback) => {
+      if (value !== '') {
+        if (validateFloatPlus(value, 0, 10080) === true) {
+          callback()
+        } else {
+          callback(new Error('请填写0到10080之间数值'))
+        }
+      } else {
+        callback(new Error('上传周期不能为空'))
+      }
+    }
+    return {
+      dialogFormVisible: false, // 对话框是否显示
+      dialogStatus: '', // 对话框类型：create,update
+      deviceForm: {
+        deviceName: '',
+        deviceTypeName: '',
+        deptName: '',
+        devcode: '',
+        deviceType: ''
+      }, // 设备基本信息
+      configForm: {
+        id: '', // config id
+        deviceId: '', // 设备id
+        collectInterval: '', // 采集间隔
+        uploadPeriod: '', // 上传周期
+        retryTimes: '3', // 重传次数
+        attemptsMax: '3', // 最大尝试次数
+        ip: '', // ip地址
+        port: '' // 端口号
+      },
+      textMap: {
+        update: '编辑',
+        create: '新增'
+      }, // 表头显示标题
+      devices: [], // 设备下拉选择列表
+      loading: false, // 加载动画是否显示
+      canEdit: true, // 是否允许点击保存按钮
+      rules: {
+        collectInterval: [{ required: true, trigger: ['blur', 'change'], validator: validateCollectCycle }],
+        uploadPeriod: [{ required: true, trigger: ['blur', 'change'], validator: validateUpPeriod }],
+        deviceId: [{ required: true, message: '设备编号不能为空', trigger: ['blur', 'change'] }],
+        ip: [{ trigger: ['blur', 'change'], validator: validateIp }],
+        port: [{ trigger: ['blur', 'change'], validator: validatePort }]
+      } // 前端校验规则
+    }
+  },
+  computed: {
+    watchDeviceId() { // 监控权属单位变化
+      return this.configForm.deviceId
+    },
+    showIp() { // 是否显示ip配置
+      return true
+    }
+  },
+  watch: {
+    watchDeviceId(newValue, oldValue) {
+      for (const device of this.devices) {
+        if (device.id === newValue) {
+          this.deviceForm.deviceTypeName = device.deviceTypeName
+          this.deviceForm.deptName = device.deptName
+          this.deviceForm.deviceName = device.deviceName
+          return
+        }
+      }
+    }
+  },
+  methods: {
+    // 初始化对话框
+    initDialog: function(dialogStatus, dialogFormVisible, row = null) {
+      this.dialogStatus = dialogStatus
+      this.dialogFormVisible = dialogFormVisible
+      this.canEdit = true
+      if (dialogStatus === 'create') { // 如果是新增，清除验证
+        this.resetForm()
+        this.fetchDevice()
+        this.$nextTick(() => {
+          this.$refs['dataForm'].clearValidate()
+        })
+      } else if (dialogStatus === 'update') { // 如果是修改，将row中数据填写到输入框中
+        this.deviceForm = {
+          deviceName: row.deviceName,
+          devcode: row.devcode,
+          deptName: row.deptName,
+          deviceType: row.deviceType,
+          deviceTypeName: row.deviceTypeName
+        }
+        this.configForm = {
+          id: row.id,
+          deviceId: row.deviceId, // 设备id
+          collectInterval: row.collectInterval, // 采集间隔
+          uploadPeriod: row.uploadPeriod, // 上传周期
+          retryTimes: row.retryTimes, // 重传次数
+          ip: row.ip, // ip地址
+          port: row.port, // 端口号
+          attemptsMax: row.attemptsMax // 最大尝试次数
+        }
+      }
+    },
+    // 重置表单
+    resetForm() {
+      this.deviceForm = {
+        deviceName: '',
+        deviceTypeName: '',
+        deptName: '',
+        devcode: ''
+      }
+      this.configForm = {
+        deviceId: '', // 设备id
+        collectInterval: '', // 采集间隔
+        uploadPeriod: '', // 上传周期
+        retryTimes: '3', // 重传次数
+        ip: '', // ip地址
+        port: '', // 端口号
+        attemptsMax: '3' // 最大尝试次数
+      }
+    },
+    // 保存数据
+    saveData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          this.canEdit = false
+          editH2sConfig(this.configForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('配置成功')
+              this.$emit('watchChild')
+              this.dialogFormVisible = false
+            }
+            this.canEdit = false
+          }).catch(_ => {
+            this.canEdit = true
+          })
+        }
+      })
+    },
+    fetchDevice() {
+      this.loading = true
+      getDeviceSimpleList('14', '0').then(response => {
+        this.loading = false
+        this.devices = response.data
+      })
+    },
+    cancel: function() {
+      this.dialogFormVisible = false
+      this.$emit('watchChild')
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .el-select{
+    width: 100%;
+  }
+  .el-input-number{
+    width: 100%;
+  }
+</style>
diff --git a/src/views/deviceConfig/components/editLiquidConfig.vue b/src/views/deviceConfig/components/editLiquidConfig.vue
index 6be88e3..19557de 100644
--- a/src/views/deviceConfig/components/editLiquidConfig.vue
+++ b/src/views/deviceConfig/components/editLiquidConfig.vue
@@ -188,7 +188,6 @@
   watch: {
     watchDeviceId(newValue, oldValue) {
       for (const device of this.devices) {
-        debugger
         if (device.id === newValue) {
           this.deviceForm.deviceTypeName = device.deviceTypeName
           this.deviceForm.deptName = device.deptName
diff --git a/src/views/deviceConfig/components/editTubeConfig.vue b/src/views/deviceConfig/components/editTubeConfig.vue
index 171991a..468014e 100644
--- a/src/views/deviceConfig/components/editTubeConfig.vue
+++ b/src/views/deviceConfig/components/editTubeConfig.vue
@@ -155,8 +155,8 @@
       configForm: {
         id: '', // config id
         deviceId: '', // 设备id
-        collectInterval: '', // 报警阈值
-        uploadPeriod: '', // 安装高度
+        collectInterval: '', // 采集间隔
+        uploadPeriod: '', // 上传周期
         retryTimes: '3', // 重传次数
         attemptsMax: '3', // 最大尝试次数
         ip: '', // ip地址
diff --git a/src/views/deviceConfig/components/listH2sConfig.vue b/src/views/deviceConfig/components/listH2sConfig.vue
new file mode 100644
index 0000000..3555e1e
--- /dev/null
+++ b/src/views/deviceConfig/components/listH2sConfig.vue
@@ -0,0 +1,310 @@
+<template>
+  <app-container>
+    <search-area size="small" @search="search">
+      <search-item>
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="设备编号" clearable />
+      </search-item>
+      <search-item>
+        <dept-select
+          v-model="listQuery.deptid"
+          :need-top="deptShowTop"
+          dept-type="03"
+          placeholder="选择权属单位"
+        />
+      </search-item>
+    </search-area>
+    <!--查询结果Table显示-->
+    <div>
+      <el-row class="table-title">
+        <el-col :span="6">
+          <div class="title-header">
+            <i class="el-icon-menu" />数据列表
+          </div>
+        </el-col>
+        <el-col :span="12" :offset="6" class="edit_btns">
+          <el-button v-if="hasPerm('/busConfig/H2sConfig/batchExport')" class="edit_btn" size="small" @click="batchExport">
+            导出记录
+          </el-button>
+          <download-template :filename="filename" />
+          <el-upload
+            v-if="hasPerm('/busConfig/H2sConfig/batchImport')"
+            :limit="1"
+            :show-file-list="false"
+            :http-request="uploadFile"
+            :file-list="fileList"
+            action="string"
+            accept=".xls,.xlsx"
+            class="edit_btn"
+          >
+            <el-button v-if="hasPerm('/busConfig/H2sConfig/batchImport')" slot="trigger" size="small">
+              批量导入
+            </el-button>
+          </el-upload>
+          <el-button v-if="hasPerm('/busConfig/H2sConfig/config')" class="edit_btn" size="small" @click="add">
+            新增
+          </el-button>
+        </el-col>
+      </el-row>
+      <el-table v-loading="listLoading" :data="list" class="table" border @selection-change="handleSelectionChange">
+        <!--<el-table-column align="center" type="selection" width="55"/>-->
+        <el-table-column :index="indexMethod" align="center" type="index" />
+        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
+          <template slot-scope="scope">
+            {{ scope.row[column.value] }}
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" align="center" width="60">
+          <template slot-scope="scope">
+            <el-button type="text" @click="edit(scope.row)">
+              编辑
+            </el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+    </div>
+    <!--分页-->
+    <div class="pagination-container">
+      <el-pagination
+        v-show="total>listQuery.limit"
+        :current-page="listQuery.offset"
+        :page-sizes="[20,30,50]"
+        :page-size="listQuery.limit"
+        :total="total"
+        align="center"
+        layout="total, sizes, prev, pager, next"
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"
+      />
+    </div>
+    <edit-h2s-config v-show="editShow" ref="editconfig" @watchChild="fetchData" />
+  </app-container>
+</template>
+
+<script>
+import { getH2sConfigList, batchImportH2sConfig, batchExportH2sConfig } from '@/api/config/h2sconfig'
+import EditH2sConfig from './editH2sConfig'
+import DownloadTemplate from '@/components/DownloadTemplate/index'
+import DeptSelect from '@/components/DeptSelect/index'
+
+export default {
+  name: 'ListH2sConfig',
+  components: { DeptSelect, DownloadTemplate, EditH2sConfig },
+  data() {
+    return {
+      listQuery: {
+        keywords: '',
+        offset: 1,
+        limit: 20,
+        sort: '',
+        order: ''
+      }, // 筛选条件
+      columns: [
+        {
+          text: '设备编号',
+          value: 'devcode',
+          align: 'center'
+        },
+        {
+          text: '重传次数',
+          value: 'retryTimes',
+          align: 'center'
+        },
+        {
+          text: '采集间隔(分)',
+          value: 'collectInterval',
+          align: 'center'
+        },
+        {
+          text: '上传周期',
+          value: 'uploadPeriod',
+          align: 'center'
+        },
+        {
+          text: 'IP地址',
+          value: 'ip',
+          align: 'center'
+        },
+        {
+          text: '端口',
+          value: 'port',
+          align: 'center'
+        },
+        {
+          text: '最大尝试次数',
+          value: 'attemptsMax',
+          align: 'center'
+        },
+        {
+          text: '已尝试次数',
+          value: 'attemptsCurrent',
+          align: 'center'
+        },
+        {
+          text: '下发状态',
+          value: 'statusName',
+          width: 80,
+          align: 'center'
+        }
+      ], // 显示列
+      multipleSelection: [], // 多选选中项
+      list: [], // 列表数据
+      total: 0, // 数据总数
+      deviceTypeList: [], // 硫化氢配置类型列表
+      deptProps: {
+        parent: 'pid',
+        value: 'id',
+        label: 'name',
+        children: 'children'
+      }, // 权属单位树形下拉菜单
+      deptTreeList: null, // 组织树列表数据
+      showDeptTree: 0, // 是否显示权属单位下拉
+      showDeviceType: true, // 是否显示设备类型下拉
+      listLoading: true, // 加载动画
+      fullscreenLoading: false, // 全屏加载动画
+      editShow: false, // 是否显示编辑框
+      detailShow: false, // 是否显示编辑框
+      filename: 'methane_config_template.xlsx',
+      deptShowTop: false,
+      fileList: []
+    }
+  },
+  created() {
+    this.fetchData()// 获取数据
+  },
+  methods: {
+    // 新增设备
+    add() {
+      this.dialogFormVisible = true
+      this.editShow = true
+      this.$refs.editconfig.initDialog('create', this.dialogFormVisible)
+    },
+    // 编辑硫化氢配置信息
+    edit(row) {
+      this.dialogFormVisible = true
+      this.editShow = true
+      this.$refs.editconfig.initDialog('update', this.dialogFormVisible, row)
+    },
+    // 批量导入硫化氢配置
+    uploadFile(param) {
+      // 判断文件大小是否符合要求
+      const _file = param.file
+      const isLt5M = _file.size / 1024 / 1024 < 5
+      if (!isLt5M) {
+        this.$message.error('请上传5M以下的excel文件')
+        return false
+      }
+      // 全屏加载动画
+      const loading = this.$loading({
+        lock: true,
+        text: '导入中,请稍后...',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
+      })
+      // 发起导入请求
+      batchImportH2sConfig(_file).then(res => {
+        loading.close() // 关闭加载动画
+        if (res.code === 200) {
+          this.$message.success('导入成功')
+          this.fetchData(false)
+        } else {
+          this.$message.error(res.message)
+        }
+      }).catch(() => {
+        loading.close() // 关闭加载动画
+      })
+      this.fileList = []
+    },
+    // 批量导出
+    batchExport() {
+      // 全屏加载动画
+      const loading = this.$loading({
+        lock: true,
+        text: '数据处理中,请稍后...',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
+      })
+      batchExportH2sConfig(this.listQuery).then(res => {
+        loading.close() // 关闭加载动画
+        console.log('download===', res)
+        const blob = new Blob([res.data])
+        const downloadElement = document.createElement('a')
+        const href = window.URL.createObjectURL(blob) // 创建下载的链接
+        downloadElement.href = href
+        downloadElement.download = `硫化氢配置列表.xlsx` // 下载后文件名
+        document.body.appendChild(downloadElement)
+        downloadElement.click() // 点击下载
+        document.body.removeChild(downloadElement) // 下载完成移除元素
+        window.URL.revokeObjectURL(href) // 释放blob对象
+      }).catch((res) => {
+        loading.close()
+        this.$message.error(res.message)
+      })
+    },
+    // 查询数据
+    search() {
+      this.fetchData(false)
+    },
+    // 获取硫化氢配置数据
+    fetchData(isNowPage = true) {
+      this.listLoading = true
+      if (!isNowPage) { // 是否显示当前页，否则跳转第一页
+        this.listQuery.offset = 1
+      }
+      getH2sConfigList(this.listQuery).then(response => {
+        this.list = response.data.rows
+        this.total = parseInt(response.data.total)
+        this.listLoading = false
+      })
+    },
+    indexMethod(index) {
+      return this.listQuery.limit * (this.listQuery.offset - 1) + index + 1
+    },
+    // 改变页容量
+    handleSizeChange(val) {
+      this.listQuery.limit = val
+      this.fetchData()
+    },
+    // 改变当前页
+    handleCurrentChange(val) {
+      this.listQuery.offset = val
+      this.fetchData()
+    },
+    // 多选触发方法
+    handleSelectionChange(val) {
+      this.multipleSelection = val
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .app-container{
+    padding: 10px;
+  }
+  $tableTitleHeight:46px;
+  .table{
+    margin-bottom: 20px;
+  }
+  .pagination-container{
+    margin-bottom: 50px;
+  }
+  .table-title{
+    background-color:rgba(243, 243, 243, 1);
+    height: $tableTitleHeight;
+    .title-header{
+      line-height:$tableTitleHeight;
+      color: #606266;
+      font-size: 15px;
+      i{
+        margin-left: 5px;
+        margin-right: 5px;
+      }
+    }
+  }
+  .edit_btns{
+    .edit_btn{
+      float:right;
+      margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2
+    }
+  }
+</style>
diff --git a/src/views/deviceConfig/components/listTubeConfig.vue b/src/views/deviceConfig/components/listTubeConfig.vue
index 6a054f8..9f27e0e 100644
--- a/src/views/deviceConfig/components/listTubeConfig.vue
+++ b/src/views/deviceConfig/components/listTubeConfig.vue
@@ -77,9 +77,7 @@
 </template>
 
 <script>
-import { judgeTree, toTreeList } from '@/utils/structure'
 import { getTubeConfigList, batchImportTubeConfig, batchExportTubeConfig } from '@/api/config/tubeconfig'
-import { getDeptTreeList } from '@/api/system/dept'
 import EditTubeConfig from './editTubeConfig'
 import DownloadTemplate from '@/components/DownloadTemplate/index'
 import DeptSelect from '@/components/DeptSelect/index'
@@ -167,7 +165,6 @@
     }
   },
   created() {
-    this.fetchDeptTree()// 获取部门树
     this.fetchData()// 获取数据
   },
   methods: {
@@ -263,26 +260,6 @@
         this.listLoading = false
       })
     },
-    // 加载组织机构树形下拉菜单
-    fetchDeptTree: function() {
-      getDeptTreeList().then(response => {
-        if (response.data.list) {
-          if (response.data.list.length > 1) {
-            console.log(this.$store.getters.deptId)
-            if (judgeTree(response.data.list)) {
-              this.deptTreeList = toTreeList(response.data.list)
-              this.showDeptTree = 1
-            } else {
-              this.deptTreeList = response.data.list
-              this.showDeptTree = 2
-            }
-            console.log(this.deptTreeList)
-          } else {
-            this.showDeptTree = 0
-          }
-        }
-      })
-    },
     indexMethod(index) {
       return this.listQuery.limit * (this.listQuery.offset - 1) + index + 1
     },
diff --git a/src/views/deviceConfig/deviceConfig.vue b/src/views/deviceConfig/deviceConfig.vue
index 736c506..5e31573 100644
--- a/src/views/deviceConfig/deviceConfig.vue
+++ b/src/views/deviceConfig/deviceConfig.vue
@@ -2,34 +2,38 @@
   <div class="container">
     <el-tabs v-model="activeName" type="card" @tab-click="handleClick">
       <el-tab-pane v-if="hasPerm('/busConfig/liquidConfig/list')" label="液位监测仪" name="liquid">
-        <list-liquid-config ref="liquidConfig"/>
+        <list-liquid-config ref="liquidConfig" />
       </el-tab-pane>
       <el-tab-pane v-if="hasPerm('/busConfig/gasConfig/list')" label="燃气智能监测终端" name="gas">
-        <list-gas-config ref="gasConfig"/>
+        <list-gas-config ref="gasConfig" />
       </el-tab-pane>
       <el-tab-pane v-if="hasPerm('/busConfig/harmfulConfig/list')" label="有害气体监测仪" name="harmful">
-        <list-harmful-config ref="harmfulConfig"/>
+        <list-harmful-config ref="harmfulConfig" />
       </el-tab-pane>
       <el-tab-pane v-if="hasPerm('/busConfig/tempConfig/list')" label="温湿度监测仪" name="temphumidity">
-        <list-temp-config ref="tempConfig"/>
+        <list-temp-config ref="tempConfig" />
       </el-tab-pane>
       <el-tab-pane v-if="hasPerm('/busConfig/digConfig/list')" label="开挖监测仪" name="dig">
-        <list-dig-config ref="digConfig"/>
+        <list-dig-config ref="digConfig" />
       </el-tab-pane>
       <el-tab-pane v-if="hasPerm('/busConfig/noiseConfig/list')" label="噪声监测仪" name="noise">
-        <list-noise-config ref="noiseConfig"/>
+        <list-noise-config ref="noiseConfig" />
       </el-tab-pane>
       <el-tab-pane v-if="hasPerm('/busConfig/liquidGasConfig/list')" label="燃气智能监测终端(一体化)" name="liquidgas">
-        <list-liquid-gas-config ref="liquidGasConfig"/>
+        <list-liquid-gas-config ref="liquidGasConfig" />
       </el-tab-pane>
       <el-tab-pane v-if="hasPerm('/busConfig/tubeConfig/list')" label="管盯" name="tube">
-        <list-tube-config ref="tubeConfig"/>
+        <list-tube-config ref="tubeConfig" />
+      </el-tab-pane>
+      <el-tab-pane v-if="hasPerm('/busConfig/H2sConfig/list')" label="硫化氢检测终端" name="h2s">
+        <list-h2s-config ref="h2sConfig" />
       </el-tab-pane>
     </el-tabs>
   </div>
 </template>
 
 <script>
+import { hasPermission } from '@/utils/permission'
 import ListLiquidConfig from './components/listLiquidConfig'
 import ListGasConfig from './components/listGasConfig'
 import ListHarmfulConfig from './components/listHarmfulConfig'
@@ -37,11 +41,11 @@
 import ListDigConfig from './components/listDigConfig'
 import ListNoiseConfig from './components/listNoiseConfig'
 import ListLiquidGasConfig from './components/listLiquidGasConfig'
-import { hasPermission } from '@/utils/permission'
 import ListTubeConfig from './components/listTubeConfig'
+import ListH2sConfig from './components/listH2sConfig'
 export default {
   name: 'DeviceConfig',
-  components: { ListTubeConfig, ListLiquidGasConfig, ListNoiseConfig, ListDigConfig, ListTempConfig, ListHarmfulConfig, ListGasConfig, ListLiquidConfig },
+  components: { ListH2sConfig, ListTubeConfig, ListLiquidGasConfig, ListNoiseConfig, ListDigConfig, ListTempConfig, ListHarmfulConfig, ListGasConfig, ListLiquidConfig },
   data() {
     return {
       activeName: 'liquid'
@@ -68,6 +72,8 @@
         this.$refs.liquidGasConfig.fetchData()
       } else if (tab.name === 'tube') {
         this.$refs.tubeConfig.fetchData()
+      } else if (tab.name === 'tube') {
+        this.$refs.h2sConfig.fetchData()
       }
     },
     // 计算那个是当前第一个tab
@@ -88,6 +94,8 @@
         this.activeName = 'liquidgas'
       } else if (hasPermission('/busConfig/tubeConfig/list')) {
         this.activeName = 'tube'
+      } else if (hasPermission('/busConfig/h2sConfig/list')) {
+        this.activeName = 'h2s'
       }
     }
   }
@@ -95,7 +103,5 @@
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-  .container{
-    padding: 5px;
-  }
+
 </style>

diff --git a/src/api/config/h2sconfig.js b/src/api/config/h2sconfig.js
new file mode 100644
index 0000000..f441692
--- /dev/null
+++ b/src/api/config/h2sconfig.js
@@ -0,0 +1,42 @@
+/**
+ * 硫化氢配置接口
+ */
+import request from '@/utils/request'
+// 硫化氢配置查询
+export function getH2sConfigList(params) {
+  return request({
+    url: 'busConfig/H2sConfig/list',
+    method: 'get',
+    params
+  })
+}
+
+// 修改硫化氢配置
+export function editH2sConfig(params) {
+  return request({
+    url: 'busConfig/H2sConfig/config',
+    method: 'post',
+    params
+  })
+}
+
+// 批量导入
+export function batchImportH2sConfig(fileobj) {
+  const param = new FormData()
+  param.append('file', fileobj)
+  return request({
+    url: 'busConfig/H2sConfig/batchImport',
+    method: 'post',
+    headers: { 'Content-Type': 'multipart/form-data' },
+    data: param
+  })
+}
+// 批量导出
+export function batchExportH2sConfig(params) {
+  return request({
+    url: 'busConfig/H2sConfig/batchExport',
+    method: 'get',
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
diff --git a/src/components/Amap/utils/convert-helper.js b/src/components/Amap/utils/convert-helper.js
index ab7a8d2..6b61377 100644
--- a/src/components/Amap/utils/convert-helper.js
+++ b/src/components/Amap/utils/convert-helper.js
@@ -76,7 +76,6 @@
     AMapLoader.load({
       key: store.getters.amapKey // 秘钥
     }).then((AMap) => {
-      // debugger
       AMap.convertFrom(coordinate, 'gps', (status, result) => {
         if (result.info === 'ok') {
           const lnglats = result.locations[0]
diff --git a/src/permission.js b/src/permission.js
index 0f332ec..52f5108 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -33,7 +33,6 @@
     const oldUser = getUser()
     const username = to.query.username
     const password = to.query.pwd
-    // debugger
     if (loginByUsername && username && password && !oldUser) { // 登陆后跳转
       const loginForm = {
         username: username,
diff --git a/src/views/dataView/components/panelGroup.vue b/src/views/dataView/components/panelGroup.vue
index 7cae96f..49ee723 100644
--- a/src/views/dataView/components/panelGroup.vue
+++ b/src/views/dataView/components/panelGroup.vue
@@ -120,7 +120,6 @@
       const endTime = new Date().Format('yyyy-MM-dd hh:mm:ss')
       const params = { beginTime, endTime }
       dataCount(params).then(response => {
-        debugger
         this.dataGroup[2].context = response.data.total
       })
     }
diff --git a/src/views/deviceConfig/components/editGasConfig.vue b/src/views/deviceConfig/components/editGasConfig.vue
index 07659cf..0f33004 100644
--- a/src/views/deviceConfig/components/editGasConfig.vue
+++ b/src/views/deviceConfig/components/editGasConfig.vue
@@ -155,8 +155,8 @@
       configForm: {
         id: '', // config id
         deviceId: '', // 设备id
-        collectInterval: '', // 报警阈值
-        uploadPeriod: '', // 安装高度
+        collectInterval: '', // 采集间隔
+        uploadPeriod: '', // 上传周期
         retryTimes: '3', // 重传次数
         attemptsMax: '3', // 最大尝试次数
         ip: '', // ip地址
diff --git a/src/views/deviceConfig/components/editH2sConfig.vue b/src/views/deviceConfig/components/editH2sConfig.vue
new file mode 100644
index 0000000..8902fdd
--- /dev/null
+++ b/src/views/deviceConfig/components/editH2sConfig.vue
@@ -0,0 +1,291 @@
+<template>
+  <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" append-to-body>
+    <el-form ref="dataForm" :rules="rules" :model="configForm" label-well-code="right" label-width="110px">
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item v-if="dialogStatus=='create'" label="设备编号" prop="deviceId">
+            <el-select
+              v-model="configForm.deviceId"
+              :loading="loading"
+              :disabled="dialogStatus=='update'?true:false"
+              filterable
+              placeholder="请输入设备编号"
+            >
+              <el-option
+                v-for="item in devices"
+                :key="item.id"
+                :label="item.devcode"
+                :value="item.id"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item v-if="dialogStatus=='update'" label="设备编号">
+            <el-input v-model="deviceForm.devcode" type="text" placeholder="未知" disabled />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item v-if="deviceForm.deviceName!=''" label="设备名称">
+            <el-input v-model="deviceForm.deviceName" type="text" placeholder="未知" disabled />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item v-if="deviceForm.deviceTypeName!=''" label="设备类型" prop="deviceType">
+            <el-input v-model="deviceForm.deviceTypeName" type="text" placeholder="未知" disabled />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item v-if="deviceForm.deptName!=''" label="权属单位" prop="deptName">
+            <el-input v-model="deviceForm.deptName" type="text" placeholder="未知" disabled />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="重传次数" prop="retryTimes">
+            <el-input-number v-model="configForm.retryTimes" :min="1" :max="9" type="text" placeholder="必填" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="采集间隔(分)" prop="collectInterval">
+            <el-input v-model.trim="configForm.collectInterval" type="text" placeholder="必填" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="上传周期(分)" prop="uploadPeriod">
+            <el-input v-model.trim="configForm.uploadPeriod" type="text" placeholder="必填" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="最大尝试次数">
+            <el-input-number v-model="configForm.attemptsMax" :min="1" :max="100" type="text" placeholder="必填" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row v-if="showIp" :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="ip地址" prop="ip">
+            <el-input v-model.trim="configForm.ip" type="text" placeholder="非必填" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="端口号" prop="port">
+            <el-input v-model.trim="configForm.port" type="text" placeholder="非必填" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <div slot="footer" class="dialog-footer">
+      <el-button :disabled="!canEdit" type="primary" @click="saveData">
+        保存
+      </el-button>
+      <el-button @click="cancel">
+        取消
+      </el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { editH2sConfig } from '@/api/config/h2sconfig'
+import { getDeviceSimpleList } from '@/api/config/liquidconfig'
+import { validateFloatPlus } from '@/utils/validate'
+export default {
+  name: 'EditH2sConfig',
+  data() {
+    const validateIp = (rule, value, callback) => {
+      if (value !== '') {
+        if ((/((25[0-5]|2[0-4]\d|((1\d{2})|([1-9]?\d)))\.){3}(25[0-5]|2[0-4]\d|((1\d{2})|([1-9]?\d)))/).test(value) === false) {
+          callback(new Error('请填写正确的ip地址'))
+        } else {
+          callback()
+        }
+      } else {
+        // callback(new Error('ip地址不能为空'))
+        callback()
+      }
+    }
+    const validatePort = (rule, value, callback) => {
+      if (value !== '') {
+        if ((/[1-9]$|(^[1-9][0-9]$)|(^[1-9][0-9][0-9]$)|(^[1-9][0-9][0-9][0-9]$)|(^[1-6][0-5][0-5][0-3][0-5]$)/).test(value) === false) {
+          callback(new Error('请填写正确的端口号'))
+        } else {
+          callback()
+        }
+      } else {
+        // callback(new Error('端口号不能为空'))
+        callback()
+      }
+    }
+    const validateCollectCycle = (rule, value, callback) => {
+      if (value !== '') {
+        if (validateFloatPlus(value, 5, 1440) === true) {
+          callback()
+        } else {
+          callback(new Error('请填写5到1440数值'))
+        }
+      } else {
+        callback(new Error('采集间隔不能为空'))
+      }
+    }
+    const validateUpPeriod = (rule, value, callback) => {
+      if (value !== '') {
+        if (validateFloatPlus(value, 0, 10080) === true) {
+          callback()
+        } else {
+          callback(new Error('请填写0到10080之间数值'))
+        }
+      } else {
+        callback(new Error('上传周期不能为空'))
+      }
+    }
+    return {
+      dialogFormVisible: false, // 对话框是否显示
+      dialogStatus: '', // 对话框类型：create,update
+      deviceForm: {
+        deviceName: '',
+        deviceTypeName: '',
+        deptName: '',
+        devcode: '',
+        deviceType: ''
+      }, // 设备基本信息
+      configForm: {
+        id: '', // config id
+        deviceId: '', // 设备id
+        collectInterval: '', // 采集间隔
+        uploadPeriod: '', // 上传周期
+        retryTimes: '3', // 重传次数
+        attemptsMax: '3', // 最大尝试次数
+        ip: '', // ip地址
+        port: '' // 端口号
+      },
+      textMap: {
+        update: '编辑',
+        create: '新增'
+      }, // 表头显示标题
+      devices: [], // 设备下拉选择列表
+      loading: false, // 加载动画是否显示
+      canEdit: true, // 是否允许点击保存按钮
+      rules: {
+        collectInterval: [{ required: true, trigger: ['blur', 'change'], validator: validateCollectCycle }],
+        uploadPeriod: [{ required: true, trigger: ['blur', 'change'], validator: validateUpPeriod }],
+        deviceId: [{ required: true, message: '设备编号不能为空', trigger: ['blur', 'change'] }],
+        ip: [{ trigger: ['blur', 'change'], validator: validateIp }],
+        port: [{ trigger: ['blur', 'change'], validator: validatePort }]
+      } // 前端校验规则
+    }
+  },
+  computed: {
+    watchDeviceId() { // 监控权属单位变化
+      return this.configForm.deviceId
+    },
+    showIp() { // 是否显示ip配置
+      return true
+    }
+  },
+  watch: {
+    watchDeviceId(newValue, oldValue) {
+      for (const device of this.devices) {
+        if (device.id === newValue) {
+          this.deviceForm.deviceTypeName = device.deviceTypeName
+          this.deviceForm.deptName = device.deptName
+          this.deviceForm.deviceName = device.deviceName
+          return
+        }
+      }
+    }
+  },
+  methods: {
+    // 初始化对话框
+    initDialog: function(dialogStatus, dialogFormVisible, row = null) {
+      this.dialogStatus = dialogStatus
+      this.dialogFormVisible = dialogFormVisible
+      this.canEdit = true
+      if (dialogStatus === 'create') { // 如果是新增，清除验证
+        this.resetForm()
+        this.fetchDevice()
+        this.$nextTick(() => {
+          this.$refs['dataForm'].clearValidate()
+        })
+      } else if (dialogStatus === 'update') { // 如果是修改，将row中数据填写到输入框中
+        this.deviceForm = {
+          deviceName: row.deviceName,
+          devcode: row.devcode,
+          deptName: row.deptName,
+          deviceType: row.deviceType,
+          deviceTypeName: row.deviceTypeName
+        }
+        this.configForm = {
+          id: row.id,
+          deviceId: row.deviceId, // 设备id
+          collectInterval: row.collectInterval, // 采集间隔
+          uploadPeriod: row.uploadPeriod, // 上传周期
+          retryTimes: row.retryTimes, // 重传次数
+          ip: row.ip, // ip地址
+          port: row.port, // 端口号
+          attemptsMax: row.attemptsMax // 最大尝试次数
+        }
+      }
+    },
+    // 重置表单
+    resetForm() {
+      this.deviceForm = {
+        deviceName: '',
+        deviceTypeName: '',
+        deptName: '',
+        devcode: ''
+      }
+      this.configForm = {
+        deviceId: '', // 设备id
+        collectInterval: '', // 采集间隔
+        uploadPeriod: '', // 上传周期
+        retryTimes: '3', // 重传次数
+        ip: '', // ip地址
+        port: '', // 端口号
+        attemptsMax: '3' // 最大尝试次数
+      }
+    },
+    // 保存数据
+    saveData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          this.canEdit = false
+          editH2sConfig(this.configForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('配置成功')
+              this.$emit('watchChild')
+              this.dialogFormVisible = false
+            }
+            this.canEdit = false
+          }).catch(_ => {
+            this.canEdit = true
+          })
+        }
+      })
+    },
+    fetchDevice() {
+      this.loading = true
+      getDeviceSimpleList('14', '0').then(response => {
+        this.loading = false
+        this.devices = response.data
+      })
+    },
+    cancel: function() {
+      this.dialogFormVisible = false
+      this.$emit('watchChild')
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .el-select{
+    width: 100%;
+  }
+  .el-input-number{
+    width: 100%;
+  }
+</style>
diff --git a/src/views/deviceConfig/components/editLiquidConfig.vue b/src/views/deviceConfig/components/editLiquidConfig.vue
index 6be88e3..19557de 100644
--- a/src/views/deviceConfig/components/editLiquidConfig.vue
+++ b/src/views/deviceConfig/components/editLiquidConfig.vue
@@ -188,7 +188,6 @@
   watch: {
     watchDeviceId(newValue, oldValue) {
       for (const device of this.devices) {
-        debugger
         if (device.id === newValue) {
           this.deviceForm.deviceTypeName = device.deviceTypeName
           this.deviceForm.deptName = device.deptName
diff --git a/src/views/deviceConfig/components/editTubeConfig.vue b/src/views/deviceConfig/components/editTubeConfig.vue
index 171991a..468014e 100644
--- a/src/views/deviceConfig/components/editTubeConfig.vue
+++ b/src/views/deviceConfig/components/editTubeConfig.vue
@@ -155,8 +155,8 @@
       configForm: {
         id: '', // config id
         deviceId: '', // 设备id
-        collectInterval: '', // 报警阈值
-        uploadPeriod: '', // 安装高度
+        collectInterval: '', // 采集间隔
+        uploadPeriod: '', // 上传周期
         retryTimes: '3', // 重传次数
         attemptsMax: '3', // 最大尝试次数
         ip: '', // ip地址
diff --git a/src/views/deviceConfig/components/listH2sConfig.vue b/src/views/deviceConfig/components/listH2sConfig.vue
new file mode 100644
index 0000000..3555e1e
--- /dev/null
+++ b/src/views/deviceConfig/components/listH2sConfig.vue
@@ -0,0 +1,310 @@
+<template>
+  <app-container>
+    <search-area size="small" @search="search">
+      <search-item>
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="设备编号" clearable />
+      </search-item>
+      <search-item>
+        <dept-select
+          v-model="listQuery.deptid"
+          :need-top="deptShowTop"
+          dept-type="03"
+          placeholder="选择权属单位"
+        />
+      </search-item>
+    </search-area>
+    <!--查询结果Table显示-->
+    <div>
+      <el-row class="table-title">
+        <el-col :span="6">
+          <div class="title-header">
+            <i class="el-icon-menu" />数据列表
+          </div>
+        </el-col>
+        <el-col :span="12" :offset="6" class="edit_btns">
+          <el-button v-if="hasPerm('/busConfig/H2sConfig/batchExport')" class="edit_btn" size="small" @click="batchExport">
+            导出记录
+          </el-button>
+          <download-template :filename="filename" />
+          <el-upload
+            v-if="hasPerm('/busConfig/H2sConfig/batchImport')"
+            :limit="1"
+            :show-file-list="false"
+            :http-request="uploadFile"
+            :file-list="fileList"
+            action="string"
+            accept=".xls,.xlsx"
+            class="edit_btn"
+          >
+            <el-button v-if="hasPerm('/busConfig/H2sConfig/batchImport')" slot="trigger" size="small">
+              批量导入
+            </el-button>
+          </el-upload>
+          <el-button v-if="hasPerm('/busConfig/H2sConfig/config')" class="edit_btn" size="small" @click="add">
+            新增
+          </el-button>
+        </el-col>
+      </el-row>
+      <el-table v-loading="listLoading" :data="list" class="table" border @selection-change="handleSelectionChange">
+        <!--<el-table-column align="center" type="selection" width="55"/>-->
+        <el-table-column :index="indexMethod" align="center" type="index" />
+        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
+          <template slot-scope="scope">
+            {{ scope.row[column.value] }}
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" align="center" width="60">
+          <template slot-scope="scope">
+            <el-button type="text" @click="edit(scope.row)">
+              编辑
+            </el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+    </div>
+    <!--分页-->
+    <div class="pagination-container">
+      <el-pagination
+        v-show="total>listQuery.limit"
+        :current-page="listQuery.offset"
+        :page-sizes="[20,30,50]"
+        :page-size="listQuery.limit"
+        :total="total"
+        align="center"
+        layout="total, sizes, prev, pager, next"
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"
+      />
+    </div>
+    <edit-h2s-config v-show="editShow" ref="editconfig" @watchChild="fetchData" />
+  </app-container>
+</template>
+
+<script>
+import { getH2sConfigList, batchImportH2sConfig, batchExportH2sConfig } from '@/api/config/h2sconfig'
+import EditH2sConfig from './editH2sConfig'
+import DownloadTemplate from '@/components/DownloadTemplate/index'
+import DeptSelect from '@/components/DeptSelect/index'
+
+export default {
+  name: 'ListH2sConfig',
+  components: { DeptSelect, DownloadTemplate, EditH2sConfig },
+  data() {
+    return {
+      listQuery: {
+        keywords: '',
+        offset: 1,
+        limit: 20,
+        sort: '',
+        order: ''
+      }, // 筛选条件
+      columns: [
+        {
+          text: '设备编号',
+          value: 'devcode',
+          align: 'center'
+        },
+        {
+          text: '重传次数',
+          value: 'retryTimes',
+          align: 'center'
+        },
+        {
+          text: '采集间隔(分)',
+          value: 'collectInterval',
+          align: 'center'
+        },
+        {
+          text: '上传周期',
+          value: 'uploadPeriod',
+          align: 'center'
+        },
+        {
+          text: 'IP地址',
+          value: 'ip',
+          align: 'center'
+        },
+        {
+          text: '端口',
+          value: 'port',
+          align: 'center'
+        },
+        {
+          text: '最大尝试次数',
+          value: 'attemptsMax',
+          align: 'center'
+        },
+        {
+          text: '已尝试次数',
+          value: 'attemptsCurrent',
+          align: 'center'
+        },
+        {
+          text: '下发状态',
+          value: 'statusName',
+          width: 80,
+          align: 'center'
+        }
+      ], // 显示列
+      multipleSelection: [], // 多选选中项
+      list: [], // 列表数据
+      total: 0, // 数据总数
+      deviceTypeList: [], // 硫化氢配置类型列表
+      deptProps: {
+        parent: 'pid',
+        value: 'id',
+        label: 'name',
+        children: 'children'
+      }, // 权属单位树形下拉菜单
+      deptTreeList: null, // 组织树列表数据
+      showDeptTree: 0, // 是否显示权属单位下拉
+      showDeviceType: true, // 是否显示设备类型下拉
+      listLoading: true, // 加载动画
+      fullscreenLoading: false, // 全屏加载动画
+      editShow: false, // 是否显示编辑框
+      detailShow: false, // 是否显示编辑框
+      filename: 'methane_config_template.xlsx',
+      deptShowTop: false,
+      fileList: []
+    }
+  },
+  created() {
+    this.fetchData()// 获取数据
+  },
+  methods: {
+    // 新增设备
+    add() {
+      this.dialogFormVisible = true
+      this.editShow = true
+      this.$refs.editconfig.initDialog('create', this.dialogFormVisible)
+    },
+    // 编辑硫化氢配置信息
+    edit(row) {
+      this.dialogFormVisible = true
+      this.editShow = true
+      this.$refs.editconfig.initDialog('update', this.dialogFormVisible, row)
+    },
+    // 批量导入硫化氢配置
+    uploadFile(param) {
+      // 判断文件大小是否符合要求
+      const _file = param.file
+      const isLt5M = _file.size / 1024 / 1024 < 5
+      if (!isLt5M) {
+        this.$message.error('请上传5M以下的excel文件')
+        return false
+      }
+      // 全屏加载动画
+      const loading = this.$loading({
+        lock: true,
+        text: '导入中,请稍后...',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
+      })
+      // 发起导入请求
+      batchImportH2sConfig(_file).then(res => {
+        loading.close() // 关闭加载动画
+        if (res.code === 200) {
+          this.$message.success('导入成功')
+          this.fetchData(false)
+        } else {
+          this.$message.error(res.message)
+        }
+      }).catch(() => {
+        loading.close() // 关闭加载动画
+      })
+      this.fileList = []
+    },
+    // 批量导出
+    batchExport() {
+      // 全屏加载动画
+      const loading = this.$loading({
+        lock: true,
+        text: '数据处理中,请稍后...',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
+      })
+      batchExportH2sConfig(this.listQuery).then(res => {
+        loading.close() // 关闭加载动画
+        console.log('download===', res)
+        const blob = new Blob([res.data])
+        const downloadElement = document.createElement('a')
+        const href = window.URL.createObjectURL(blob) // 创建下载的链接
+        downloadElement.href = href
+        downloadElement.download = `硫化氢配置列表.xlsx` // 下载后文件名
+        document.body.appendChild(downloadElement)
+        downloadElement.click() // 点击下载
+        document.body.removeChild(downloadElement) // 下载完成移除元素
+        window.URL.revokeObjectURL(href) // 释放blob对象
+      }).catch((res) => {
+        loading.close()
+        this.$message.error(res.message)
+      })
+    },
+    // 查询数据
+    search() {
+      this.fetchData(false)
+    },
+    // 获取硫化氢配置数据
+    fetchData(isNowPage = true) {
+      this.listLoading = true
+      if (!isNowPage) { // 是否显示当前页，否则跳转第一页
+        this.listQuery.offset = 1
+      }
+      getH2sConfigList(this.listQuery).then(response => {
+        this.list = response.data.rows
+        this.total = parseInt(response.data.total)
+        this.listLoading = false
+      })
+    },
+    indexMethod(index) {
+      return this.listQuery.limit * (this.listQuery.offset - 1) + index + 1
+    },
+    // 改变页容量
+    handleSizeChange(val) {
+      this.listQuery.limit = val
+      this.fetchData()
+    },
+    // 改变当前页
+    handleCurrentChange(val) {
+      this.listQuery.offset = val
+      this.fetchData()
+    },
+    // 多选触发方法
+    handleSelectionChange(val) {
+      this.multipleSelection = val
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .app-container{
+    padding: 10px;
+  }
+  $tableTitleHeight:46px;
+  .table{
+    margin-bottom: 20px;
+  }
+  .pagination-container{
+    margin-bottom: 50px;
+  }
+  .table-title{
+    background-color:rgba(243, 243, 243, 1);
+    height: $tableTitleHeight;
+    .title-header{
+      line-height:$tableTitleHeight;
+      color: #606266;
+      font-size: 15px;
+      i{
+        margin-left: 5px;
+        margin-right: 5px;
+      }
+    }
+  }
+  .edit_btns{
+    .edit_btn{
+      float:right;
+      margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2
+    }
+  }
+</style>
diff --git a/src/views/deviceConfig/components/listTubeConfig.vue b/src/views/deviceConfig/components/listTubeConfig.vue
index 6a054f8..9f27e0e 100644
--- a/src/views/deviceConfig/components/listTubeConfig.vue
+++ b/src/views/deviceConfig/components/listTubeConfig.vue
@@ -77,9 +77,7 @@
 </template>
 
 <script>
-import { judgeTree, toTreeList } from '@/utils/structure'
 import { getTubeConfigList, batchImportTubeConfig, batchExportTubeConfig } from '@/api/config/tubeconfig'
-import { getDeptTreeList } from '@/api/system/dept'
 import EditTubeConfig from './editTubeConfig'
 import DownloadTemplate from '@/components/DownloadTemplate/index'
 import DeptSelect from '@/components/DeptSelect/index'
@@ -167,7 +165,6 @@
     }
   },
   created() {
-    this.fetchDeptTree()// 获取部门树
     this.fetchData()// 获取数据
   },
   methods: {
@@ -263,26 +260,6 @@
         this.listLoading = false
       })
     },
-    // 加载组织机构树形下拉菜单
-    fetchDeptTree: function() {
-      getDeptTreeList().then(response => {
-        if (response.data.list) {
-          if (response.data.list.length > 1) {
-            console.log(this.$store.getters.deptId)
-            if (judgeTree(response.data.list)) {
-              this.deptTreeList = toTreeList(response.data.list)
-              this.showDeptTree = 1
-            } else {
-              this.deptTreeList = response.data.list
-              this.showDeptTree = 2
-            }
-            console.log(this.deptTreeList)
-          } else {
-            this.showDeptTree = 0
-          }
-        }
-      })
-    },
     indexMethod(index) {
       return this.listQuery.limit * (this.listQuery.offset - 1) + index + 1
     },
diff --git a/src/views/deviceConfig/deviceConfig.vue b/src/views/deviceConfig/deviceConfig.vue
index 736c506..5e31573 100644
--- a/src/views/deviceConfig/deviceConfig.vue
+++ b/src/views/deviceConfig/deviceConfig.vue
@@ -2,34 +2,38 @@
   <div class="container">
     <el-tabs v-model="activeName" type="card" @tab-click="handleClick">
       <el-tab-pane v-if="hasPerm('/busConfig/liquidConfig/list')" label="液位监测仪" name="liquid">
-        <list-liquid-config ref="liquidConfig"/>
+        <list-liquid-config ref="liquidConfig" />
       </el-tab-pane>
       <el-tab-pane v-if="hasPerm('/busConfig/gasConfig/list')" label="燃气智能监测终端" name="gas">
-        <list-gas-config ref="gasConfig"/>
+        <list-gas-config ref="gasConfig" />
       </el-tab-pane>
       <el-tab-pane v-if="hasPerm('/busConfig/harmfulConfig/list')" label="有害气体监测仪" name="harmful">
-        <list-harmful-config ref="harmfulConfig"/>
+        <list-harmful-config ref="harmfulConfig" />
       </el-tab-pane>
       <el-tab-pane v-if="hasPerm('/busConfig/tempConfig/list')" label="温湿度监测仪" name="temphumidity">
-        <list-temp-config ref="tempConfig"/>
+        <list-temp-config ref="tempConfig" />
       </el-tab-pane>
       <el-tab-pane v-if="hasPerm('/busConfig/digConfig/list')" label="开挖监测仪" name="dig">
-        <list-dig-config ref="digConfig"/>
+        <list-dig-config ref="digConfig" />
       </el-tab-pane>
       <el-tab-pane v-if="hasPerm('/busConfig/noiseConfig/list')" label="噪声监测仪" name="noise">
-        <list-noise-config ref="noiseConfig"/>
+        <list-noise-config ref="noiseConfig" />
       </el-tab-pane>
       <el-tab-pane v-if="hasPerm('/busConfig/liquidGasConfig/list')" label="燃气智能监测终端(一体化)" name="liquidgas">
-        <list-liquid-gas-config ref="liquidGasConfig"/>
+        <list-liquid-gas-config ref="liquidGasConfig" />
       </el-tab-pane>
       <el-tab-pane v-if="hasPerm('/busConfig/tubeConfig/list')" label="管盯" name="tube">
-        <list-tube-config ref="tubeConfig"/>
+        <list-tube-config ref="tubeConfig" />
+      </el-tab-pane>
+      <el-tab-pane v-if="hasPerm('/busConfig/H2sConfig/list')" label="硫化氢检测终端" name="h2s">
+        <list-h2s-config ref="h2sConfig" />
       </el-tab-pane>
     </el-tabs>
   </div>
 </template>
 
 <script>
+import { hasPermission } from '@/utils/permission'
 import ListLiquidConfig from './components/listLiquidConfig'
 import ListGasConfig from './components/listGasConfig'
 import ListHarmfulConfig from './components/listHarmfulConfig'
@@ -37,11 +41,11 @@
 import ListDigConfig from './components/listDigConfig'
 import ListNoiseConfig from './components/listNoiseConfig'
 import ListLiquidGasConfig from './components/listLiquidGasConfig'
-import { hasPermission } from '@/utils/permission'
 import ListTubeConfig from './components/listTubeConfig'
+import ListH2sConfig from './components/listH2sConfig'
 export default {
   name: 'DeviceConfig',
-  components: { ListTubeConfig, ListLiquidGasConfig, ListNoiseConfig, ListDigConfig, ListTempConfig, ListHarmfulConfig, ListGasConfig, ListLiquidConfig },
+  components: { ListH2sConfig, ListTubeConfig, ListLiquidGasConfig, ListNoiseConfig, ListDigConfig, ListTempConfig, ListHarmfulConfig, ListGasConfig, ListLiquidConfig },
   data() {
     return {
       activeName: 'liquid'
@@ -68,6 +72,8 @@
         this.$refs.liquidGasConfig.fetchData()
       } else if (tab.name === 'tube') {
         this.$refs.tubeConfig.fetchData()
+      } else if (tab.name === 'tube') {
+        this.$refs.h2sConfig.fetchData()
       }
     },
     // 计算那个是当前第一个tab
@@ -88,6 +94,8 @@
         this.activeName = 'liquidgas'
       } else if (hasPermission('/busConfig/tubeConfig/list')) {
         this.activeName = 'tube'
+      } else if (hasPermission('/busConfig/h2sConfig/list')) {
+        this.activeName = 'h2s'
       }
     }
   }
@@ -95,7 +103,5 @@
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-  .container{
-    padding: 5px;
-  }
+
 </style>
diff --git a/src/views/deviceManage/deviceModel/deviceModel.vue b/src/views/deviceManage/deviceModel/deviceModel.vue
index a9f66ee..816c190 100644
--- a/src/views/deviceManage/deviceModel/deviceModel.vue
+++ b/src/views/deviceManage/deviceModel/deviceModel.vue
@@ -26,17 +26,17 @@
     <!--查询结果Table显示-->
     <normal-table ref="table" :data="list" :total="total" :query="listQuery" :columns="columns" :list-loading="listLoading" :pagination="true" :options="tableOptions" size="small" @change="changePage">
       <template slot="btns">
-        <el-button class="edit_btn" size="small" @click="add">
+        <el-button v-if="hasPerm('/deviceModels/add')" class="edit_btn" size="small" @click="add">
           新增
         </el-button>
       </template>
       <template slot="columns">
         <el-table-column label="操作" align="center" width="160">
           <template v-slot="scope">
-            <el-button type="text" size="mini" @click="edit(scope.row)">
+            <el-button v-if="hasPerm('/deviceModels/update')" type="text" size="mini" @click="edit(scope.row)">
               编辑
             </el-button>
-            <el-button type="text" size="mini" @click="del(scope.row)">
+            <el-button v-if="hasPerm('/deviceModels/delete')" type="text" size="mini" @click="del(scope.row)">
               删除
             </el-button>
           </template>

diff --git a/src/api/config/h2sconfig.js b/src/api/config/h2sconfig.js
new file mode 100644
index 0000000..f441692
--- /dev/null
+++ b/src/api/config/h2sconfig.js
@@ -0,0 +1,42 @@
+/**
+ * 硫化氢配置接口
+ */
+import request from '@/utils/request'
+// 硫化氢配置查询
+export function getH2sConfigList(params) {
+  return request({
+    url: 'busConfig/H2sConfig/list',
+    method: 'get',
+    params
+  })
+}
+
+// 修改硫化氢配置
+export function editH2sConfig(params) {
+  return request({
+    url: 'busConfig/H2sConfig/config',
+    method: 'post',
+    params
+  })
+}
+
+// 批量导入
+export function batchImportH2sConfig(fileobj) {
+  const param = new FormData()
+  param.append('file', fileobj)
+  return request({
+    url: 'busConfig/H2sConfig/batchImport',
+    method: 'post',
+    headers: { 'Content-Type': 'multipart/form-data' },
+    data: param
+  })
+}
+// 批量导出
+export function batchExportH2sConfig(params) {
+  return request({
+    url: 'busConfig/H2sConfig/batchExport',
+    method: 'get',
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
diff --git a/src/components/Amap/utils/convert-helper.js b/src/components/Amap/utils/convert-helper.js
index ab7a8d2..6b61377 100644
--- a/src/components/Amap/utils/convert-helper.js
+++ b/src/components/Amap/utils/convert-helper.js
@@ -76,7 +76,6 @@
     AMapLoader.load({
       key: store.getters.amapKey // 秘钥
     }).then((AMap) => {
-      // debugger
       AMap.convertFrom(coordinate, 'gps', (status, result) => {
         if (result.info === 'ok') {
           const lnglats = result.locations[0]
diff --git a/src/permission.js b/src/permission.js
index 0f332ec..52f5108 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -33,7 +33,6 @@
     const oldUser = getUser()
     const username = to.query.username
     const password = to.query.pwd
-    // debugger
     if (loginByUsername && username && password && !oldUser) { // 登陆后跳转
       const loginForm = {
         username: username,
diff --git a/src/views/dataView/components/panelGroup.vue b/src/views/dataView/components/panelGroup.vue
index 7cae96f..49ee723 100644
--- a/src/views/dataView/components/panelGroup.vue
+++ b/src/views/dataView/components/panelGroup.vue
@@ -120,7 +120,6 @@
       const endTime = new Date().Format('yyyy-MM-dd hh:mm:ss')
       const params = { beginTime, endTime }
       dataCount(params).then(response => {
-        debugger
         this.dataGroup[2].context = response.data.total
       })
     }
diff --git a/src/views/deviceConfig/components/editGasConfig.vue b/src/views/deviceConfig/components/editGasConfig.vue
index 07659cf..0f33004 100644
--- a/src/views/deviceConfig/components/editGasConfig.vue
+++ b/src/views/deviceConfig/components/editGasConfig.vue
@@ -155,8 +155,8 @@
       configForm: {
         id: '', // config id
         deviceId: '', // 设备id
-        collectInterval: '', // 报警阈值
-        uploadPeriod: '', // 安装高度
+        collectInterval: '', // 采集间隔
+        uploadPeriod: '', // 上传周期
         retryTimes: '3', // 重传次数
         attemptsMax: '3', // 最大尝试次数
         ip: '', // ip地址
diff --git a/src/views/deviceConfig/components/editH2sConfig.vue b/src/views/deviceConfig/components/editH2sConfig.vue
new file mode 100644
index 0000000..8902fdd
--- /dev/null
+++ b/src/views/deviceConfig/components/editH2sConfig.vue
@@ -0,0 +1,291 @@
+<template>
+  <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" append-to-body>
+    <el-form ref="dataForm" :rules="rules" :model="configForm" label-well-code="right" label-width="110px">
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item v-if="dialogStatus=='create'" label="设备编号" prop="deviceId">
+            <el-select
+              v-model="configForm.deviceId"
+              :loading="loading"
+              :disabled="dialogStatus=='update'?true:false"
+              filterable
+              placeholder="请输入设备编号"
+            >
+              <el-option
+                v-for="item in devices"
+                :key="item.id"
+                :label="item.devcode"
+                :value="item.id"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item v-if="dialogStatus=='update'" label="设备编号">
+            <el-input v-model="deviceForm.devcode" type="text" placeholder="未知" disabled />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item v-if="deviceForm.deviceName!=''" label="设备名称">
+            <el-input v-model="deviceForm.deviceName" type="text" placeholder="未知" disabled />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item v-if="deviceForm.deviceTypeName!=''" label="设备类型" prop="deviceType">
+            <el-input v-model="deviceForm.deviceTypeName" type="text" placeholder="未知" disabled />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item v-if="deviceForm.deptName!=''" label="权属单位" prop="deptName">
+            <el-input v-model="deviceForm.deptName" type="text" placeholder="未知" disabled />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="重传次数" prop="retryTimes">
+            <el-input-number v-model="configForm.retryTimes" :min="1" :max="9" type="text" placeholder="必填" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="采集间隔(分)" prop="collectInterval">
+            <el-input v-model.trim="configForm.collectInterval" type="text" placeholder="必填" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="上传周期(分)" prop="uploadPeriod">
+            <el-input v-model.trim="configForm.uploadPeriod" type="text" placeholder="必填" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="最大尝试次数">
+            <el-input-number v-model="configForm.attemptsMax" :min="1" :max="100" type="text" placeholder="必填" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row v-if="showIp" :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="ip地址" prop="ip">
+            <el-input v-model.trim="configForm.ip" type="text" placeholder="非必填" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="端口号" prop="port">
+            <el-input v-model.trim="configForm.port" type="text" placeholder="非必填" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <div slot="footer" class="dialog-footer">
+      <el-button :disabled="!canEdit" type="primary" @click="saveData">
+        保存
+      </el-button>
+      <el-button @click="cancel">
+        取消
+      </el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { editH2sConfig } from '@/api/config/h2sconfig'
+import { getDeviceSimpleList } from '@/api/config/liquidconfig'
+import { validateFloatPlus } from '@/utils/validate'
+export default {
+  name: 'EditH2sConfig',
+  data() {
+    const validateIp = (rule, value, callback) => {
+      if (value !== '') {
+        if ((/((25[0-5]|2[0-4]\d|((1\d{2})|([1-9]?\d)))\.){3}(25[0-5]|2[0-4]\d|((1\d{2})|([1-9]?\d)))/).test(value) === false) {
+          callback(new Error('请填写正确的ip地址'))
+        } else {
+          callback()
+        }
+      } else {
+        // callback(new Error('ip地址不能为空'))
+        callback()
+      }
+    }
+    const validatePort = (rule, value, callback) => {
+      if (value !== '') {
+        if ((/[1-9]$|(^[1-9][0-9]$)|(^[1-9][0-9][0-9]$)|(^[1-9][0-9][0-9][0-9]$)|(^[1-6][0-5][0-5][0-3][0-5]$)/).test(value) === false) {
+          callback(new Error('请填写正确的端口号'))
+        } else {
+          callback()
+        }
+      } else {
+        // callback(new Error('端口号不能为空'))
+        callback()
+      }
+    }
+    const validateCollectCycle = (rule, value, callback) => {
+      if (value !== '') {
+        if (validateFloatPlus(value, 5, 1440) === true) {
+          callback()
+        } else {
+          callback(new Error('请填写5到1440数值'))
+        }
+      } else {
+        callback(new Error('采集间隔不能为空'))
+      }
+    }
+    const validateUpPeriod = (rule, value, callback) => {
+      if (value !== '') {
+        if (validateFloatPlus(value, 0, 10080) === true) {
+          callback()
+        } else {
+          callback(new Error('请填写0到10080之间数值'))
+        }
+      } else {
+        callback(new Error('上传周期不能为空'))
+      }
+    }
+    return {
+      dialogFormVisible: false, // 对话框是否显示
+      dialogStatus: '', // 对话框类型：create,update
+      deviceForm: {
+        deviceName: '',
+        deviceTypeName: '',
+        deptName: '',
+        devcode: '',
+        deviceType: ''
+      }, // 设备基本信息
+      configForm: {
+        id: '', // config id
+        deviceId: '', // 设备id
+        collectInterval: '', // 采集间隔
+        uploadPeriod: '', // 上传周期
+        retryTimes: '3', // 重传次数
+        attemptsMax: '3', // 最大尝试次数
+        ip: '', // ip地址
+        port: '' // 端口号
+      },
+      textMap: {
+        update: '编辑',
+        create: '新增'
+      }, // 表头显示标题
+      devices: [], // 设备下拉选择列表
+      loading: false, // 加载动画是否显示
+      canEdit: true, // 是否允许点击保存按钮
+      rules: {
+        collectInterval: [{ required: true, trigger: ['blur', 'change'], validator: validateCollectCycle }],
+        uploadPeriod: [{ required: true, trigger: ['blur', 'change'], validator: validateUpPeriod }],
+        deviceId: [{ required: true, message: '设备编号不能为空', trigger: ['blur', 'change'] }],
+        ip: [{ trigger: ['blur', 'change'], validator: validateIp }],
+        port: [{ trigger: ['blur', 'change'], validator: validatePort }]
+      } // 前端校验规则
+    }
+  },
+  computed: {
+    watchDeviceId() { // 监控权属单位变化
+      return this.configForm.deviceId
+    },
+    showIp() { // 是否显示ip配置
+      return true
+    }
+  },
+  watch: {
+    watchDeviceId(newValue, oldValue) {
+      for (const device of this.devices) {
+        if (device.id === newValue) {
+          this.deviceForm.deviceTypeName = device.deviceTypeName
+          this.deviceForm.deptName = device.deptName
+          this.deviceForm.deviceName = device.deviceName
+          return
+        }
+      }
+    }
+  },
+  methods: {
+    // 初始化对话框
+    initDialog: function(dialogStatus, dialogFormVisible, row = null) {
+      this.dialogStatus = dialogStatus
+      this.dialogFormVisible = dialogFormVisible
+      this.canEdit = true
+      if (dialogStatus === 'create') { // 如果是新增，清除验证
+        this.resetForm()
+        this.fetchDevice()
+        this.$nextTick(() => {
+          this.$refs['dataForm'].clearValidate()
+        })
+      } else if (dialogStatus === 'update') { // 如果是修改，将row中数据填写到输入框中
+        this.deviceForm = {
+          deviceName: row.deviceName,
+          devcode: row.devcode,
+          deptName: row.deptName,
+          deviceType: row.deviceType,
+          deviceTypeName: row.deviceTypeName
+        }
+        this.configForm = {
+          id: row.id,
+          deviceId: row.deviceId, // 设备id
+          collectInterval: row.collectInterval, // 采集间隔
+          uploadPeriod: row.uploadPeriod, // 上传周期
+          retryTimes: row.retryTimes, // 重传次数
+          ip: row.ip, // ip地址
+          port: row.port, // 端口号
+          attemptsMax: row.attemptsMax // 最大尝试次数
+        }
+      }
+    },
+    // 重置表单
+    resetForm() {
+      this.deviceForm = {
+        deviceName: '',
+        deviceTypeName: '',
+        deptName: '',
+        devcode: ''
+      }
+      this.configForm = {
+        deviceId: '', // 设备id
+        collectInterval: '', // 采集间隔
+        uploadPeriod: '', // 上传周期
+        retryTimes: '3', // 重传次数
+        ip: '', // ip地址
+        port: '', // 端口号
+        attemptsMax: '3' // 最大尝试次数
+      }
+    },
+    // 保存数据
+    saveData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          this.canEdit = false
+          editH2sConfig(this.configForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('配置成功')
+              this.$emit('watchChild')
+              this.dialogFormVisible = false
+            }
+            this.canEdit = false
+          }).catch(_ => {
+            this.canEdit = true
+          })
+        }
+      })
+    },
+    fetchDevice() {
+      this.loading = true
+      getDeviceSimpleList('14', '0').then(response => {
+        this.loading = false
+        this.devices = response.data
+      })
+    },
+    cancel: function() {
+      this.dialogFormVisible = false
+      this.$emit('watchChild')
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .el-select{
+    width: 100%;
+  }
+  .el-input-number{
+    width: 100%;
+  }
+</style>
diff --git a/src/views/deviceConfig/components/editLiquidConfig.vue b/src/views/deviceConfig/components/editLiquidConfig.vue
index 6be88e3..19557de 100644
--- a/src/views/deviceConfig/components/editLiquidConfig.vue
+++ b/src/views/deviceConfig/components/editLiquidConfig.vue
@@ -188,7 +188,6 @@
   watch: {
     watchDeviceId(newValue, oldValue) {
       for (const device of this.devices) {
-        debugger
         if (device.id === newValue) {
           this.deviceForm.deviceTypeName = device.deviceTypeName
           this.deviceForm.deptName = device.deptName
diff --git a/src/views/deviceConfig/components/editTubeConfig.vue b/src/views/deviceConfig/components/editTubeConfig.vue
index 171991a..468014e 100644
--- a/src/views/deviceConfig/components/editTubeConfig.vue
+++ b/src/views/deviceConfig/components/editTubeConfig.vue
@@ -155,8 +155,8 @@
       configForm: {
         id: '', // config id
         deviceId: '', // 设备id
-        collectInterval: '', // 报警阈值
-        uploadPeriod: '', // 安装高度
+        collectInterval: '', // 采集间隔
+        uploadPeriod: '', // 上传周期
         retryTimes: '3', // 重传次数
         attemptsMax: '3', // 最大尝试次数
         ip: '', // ip地址
diff --git a/src/views/deviceConfig/components/listH2sConfig.vue b/src/views/deviceConfig/components/listH2sConfig.vue
new file mode 100644
index 0000000..3555e1e
--- /dev/null
+++ b/src/views/deviceConfig/components/listH2sConfig.vue
@@ -0,0 +1,310 @@
+<template>
+  <app-container>
+    <search-area size="small" @search="search">
+      <search-item>
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="设备编号" clearable />
+      </search-item>
+      <search-item>
+        <dept-select
+          v-model="listQuery.deptid"
+          :need-top="deptShowTop"
+          dept-type="03"
+          placeholder="选择权属单位"
+        />
+      </search-item>
+    </search-area>
+    <!--查询结果Table显示-->
+    <div>
+      <el-row class="table-title">
+        <el-col :span="6">
+          <div class="title-header">
+            <i class="el-icon-menu" />数据列表
+          </div>
+        </el-col>
+        <el-col :span="12" :offset="6" class="edit_btns">
+          <el-button v-if="hasPerm('/busConfig/H2sConfig/batchExport')" class="edit_btn" size="small" @click="batchExport">
+            导出记录
+          </el-button>
+          <download-template :filename="filename" />
+          <el-upload
+            v-if="hasPerm('/busConfig/H2sConfig/batchImport')"
+            :limit="1"
+            :show-file-list="false"
+            :http-request="uploadFile"
+            :file-list="fileList"
+            action="string"
+            accept=".xls,.xlsx"
+            class="edit_btn"
+          >
+            <el-button v-if="hasPerm('/busConfig/H2sConfig/batchImport')" slot="trigger" size="small">
+              批量导入
+            </el-button>
+          </el-upload>
+          <el-button v-if="hasPerm('/busConfig/H2sConfig/config')" class="edit_btn" size="small" @click="add">
+            新增
+          </el-button>
+        </el-col>
+      </el-row>
+      <el-table v-loading="listLoading" :data="list" class="table" border @selection-change="handleSelectionChange">
+        <!--<el-table-column align="center" type="selection" width="55"/>-->
+        <el-table-column :index="indexMethod" align="center" type="index" />
+        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
+          <template slot-scope="scope">
+            {{ scope.row[column.value] }}
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" align="center" width="60">
+          <template slot-scope="scope">
+            <el-button type="text" @click="edit(scope.row)">
+              编辑
+            </el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+    </div>
+    <!--分页-->
+    <div class="pagination-container">
+      <el-pagination
+        v-show="total>listQuery.limit"
+        :current-page="listQuery.offset"
+        :page-sizes="[20,30,50]"
+        :page-size="listQuery.limit"
+        :total="total"
+        align="center"
+        layout="total, sizes, prev, pager, next"
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"
+      />
+    </div>
+    <edit-h2s-config v-show="editShow" ref="editconfig" @watchChild="fetchData" />
+  </app-container>
+</template>
+
+<script>
+import { getH2sConfigList, batchImportH2sConfig, batchExportH2sConfig } from '@/api/config/h2sconfig'
+import EditH2sConfig from './editH2sConfig'
+import DownloadTemplate from '@/components/DownloadTemplate/index'
+import DeptSelect from '@/components/DeptSelect/index'
+
+export default {
+  name: 'ListH2sConfig',
+  components: { DeptSelect, DownloadTemplate, EditH2sConfig },
+  data() {
+    return {
+      listQuery: {
+        keywords: '',
+        offset: 1,
+        limit: 20,
+        sort: '',
+        order: ''
+      }, // 筛选条件
+      columns: [
+        {
+          text: '设备编号',
+          value: 'devcode',
+          align: 'center'
+        },
+        {
+          text: '重传次数',
+          value: 'retryTimes',
+          align: 'center'
+        },
+        {
+          text: '采集间隔(分)',
+          value: 'collectInterval',
+          align: 'center'
+        },
+        {
+          text: '上传周期',
+          value: 'uploadPeriod',
+          align: 'center'
+        },
+        {
+          text: 'IP地址',
+          value: 'ip',
+          align: 'center'
+        },
+        {
+          text: '端口',
+          value: 'port',
+          align: 'center'
+        },
+        {
+          text: '最大尝试次数',
+          value: 'attemptsMax',
+          align: 'center'
+        },
+        {
+          text: '已尝试次数',
+          value: 'attemptsCurrent',
+          align: 'center'
+        },
+        {
+          text: '下发状态',
+          value: 'statusName',
+          width: 80,
+          align: 'center'
+        }
+      ], // 显示列
+      multipleSelection: [], // 多选选中项
+      list: [], // 列表数据
+      total: 0, // 数据总数
+      deviceTypeList: [], // 硫化氢配置类型列表
+      deptProps: {
+        parent: 'pid',
+        value: 'id',
+        label: 'name',
+        children: 'children'
+      }, // 权属单位树形下拉菜单
+      deptTreeList: null, // 组织树列表数据
+      showDeptTree: 0, // 是否显示权属单位下拉
+      showDeviceType: true, // 是否显示设备类型下拉
+      listLoading: true, // 加载动画
+      fullscreenLoading: false, // 全屏加载动画
+      editShow: false, // 是否显示编辑框
+      detailShow: false, // 是否显示编辑框
+      filename: 'methane_config_template.xlsx',
+      deptShowTop: false,
+      fileList: []
+    }
+  },
+  created() {
+    this.fetchData()// 获取数据
+  },
+  methods: {
+    // 新增设备
+    add() {
+      this.dialogFormVisible = true
+      this.editShow = true
+      this.$refs.editconfig.initDialog('create', this.dialogFormVisible)
+    },
+    // 编辑硫化氢配置信息
+    edit(row) {
+      this.dialogFormVisible = true
+      this.editShow = true
+      this.$refs.editconfig.initDialog('update', this.dialogFormVisible, row)
+    },
+    // 批量导入硫化氢配置
+    uploadFile(param) {
+      // 判断文件大小是否符合要求
+      const _file = param.file
+      const isLt5M = _file.size / 1024 / 1024 < 5
+      if (!isLt5M) {
+        this.$message.error('请上传5M以下的excel文件')
+        return false
+      }
+      // 全屏加载动画
+      const loading = this.$loading({
+        lock: true,
+        text: '导入中,请稍后...',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
+      })
+      // 发起导入请求
+      batchImportH2sConfig(_file).then(res => {
+        loading.close() // 关闭加载动画
+        if (res.code === 200) {
+          this.$message.success('导入成功')
+          this.fetchData(false)
+        } else {
+          this.$message.error(res.message)
+        }
+      }).catch(() => {
+        loading.close() // 关闭加载动画
+      })
+      this.fileList = []
+    },
+    // 批量导出
+    batchExport() {
+      // 全屏加载动画
+      const loading = this.$loading({
+        lock: true,
+        text: '数据处理中,请稍后...',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
+      })
+      batchExportH2sConfig(this.listQuery).then(res => {
+        loading.close() // 关闭加载动画
+        console.log('download===', res)
+        const blob = new Blob([res.data])
+        const downloadElement = document.createElement('a')
+        const href = window.URL.createObjectURL(blob) // 创建下载的链接
+        downloadElement.href = href
+        downloadElement.download = `硫化氢配置列表.xlsx` // 下载后文件名
+        document.body.appendChild(downloadElement)
+        downloadElement.click() // 点击下载
+        document.body.removeChild(downloadElement) // 下载完成移除元素
+        window.URL.revokeObjectURL(href) // 释放blob对象
+      }).catch((res) => {
+        loading.close()
+        this.$message.error(res.message)
+      })
+    },
+    // 查询数据
+    search() {
+      this.fetchData(false)
+    },
+    // 获取硫化氢配置数据
+    fetchData(isNowPage = true) {
+      this.listLoading = true
+      if (!isNowPage) { // 是否显示当前页，否则跳转第一页
+        this.listQuery.offset = 1
+      }
+      getH2sConfigList(this.listQuery).then(response => {
+        this.list = response.data.rows
+        this.total = parseInt(response.data.total)
+        this.listLoading = false
+      })
+    },
+    indexMethod(index) {
+      return this.listQuery.limit * (this.listQuery.offset - 1) + index + 1
+    },
+    // 改变页容量
+    handleSizeChange(val) {
+      this.listQuery.limit = val
+      this.fetchData()
+    },
+    // 改变当前页
+    handleCurrentChange(val) {
+      this.listQuery.offset = val
+      this.fetchData()
+    },
+    // 多选触发方法
+    handleSelectionChange(val) {
+      this.multipleSelection = val
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .app-container{
+    padding: 10px;
+  }
+  $tableTitleHeight:46px;
+  .table{
+    margin-bottom: 20px;
+  }
+  .pagination-container{
+    margin-bottom: 50px;
+  }
+  .table-title{
+    background-color:rgba(243, 243, 243, 1);
+    height: $tableTitleHeight;
+    .title-header{
+      line-height:$tableTitleHeight;
+      color: #606266;
+      font-size: 15px;
+      i{
+        margin-left: 5px;
+        margin-right: 5px;
+      }
+    }
+  }
+  .edit_btns{
+    .edit_btn{
+      float:right;
+      margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2
+    }
+  }
+</style>
diff --git a/src/views/deviceConfig/components/listTubeConfig.vue b/src/views/deviceConfig/components/listTubeConfig.vue
index 6a054f8..9f27e0e 100644
--- a/src/views/deviceConfig/components/listTubeConfig.vue
+++ b/src/views/deviceConfig/components/listTubeConfig.vue
@@ -77,9 +77,7 @@
 </template>
 
 <script>
-import { judgeTree, toTreeList } from '@/utils/structure'
 import { getTubeConfigList, batchImportTubeConfig, batchExportTubeConfig } from '@/api/config/tubeconfig'
-import { getDeptTreeList } from '@/api/system/dept'
 import EditTubeConfig from './editTubeConfig'
 import DownloadTemplate from '@/components/DownloadTemplate/index'
 import DeptSelect from '@/components/DeptSelect/index'
@@ -167,7 +165,6 @@
     }
   },
   created() {
-    this.fetchDeptTree()// 获取部门树
     this.fetchData()// 获取数据
   },
   methods: {
@@ -263,26 +260,6 @@
         this.listLoading = false
       })
     },
-    // 加载组织机构树形下拉菜单
-    fetchDeptTree: function() {
-      getDeptTreeList().then(response => {
-        if (response.data.list) {
-          if (response.data.list.length > 1) {
-            console.log(this.$store.getters.deptId)
-            if (judgeTree(response.data.list)) {
-              this.deptTreeList = toTreeList(response.data.list)
-              this.showDeptTree = 1
-            } else {
-              this.deptTreeList = response.data.list
-              this.showDeptTree = 2
-            }
-            console.log(this.deptTreeList)
-          } else {
-            this.showDeptTree = 0
-          }
-        }
-      })
-    },
     indexMethod(index) {
       return this.listQuery.limit * (this.listQuery.offset - 1) + index + 1
     },
diff --git a/src/views/deviceConfig/deviceConfig.vue b/src/views/deviceConfig/deviceConfig.vue
index 736c506..5e31573 100644
--- a/src/views/deviceConfig/deviceConfig.vue
+++ b/src/views/deviceConfig/deviceConfig.vue
@@ -2,34 +2,38 @@
   <div class="container">
     <el-tabs v-model="activeName" type="card" @tab-click="handleClick">
       <el-tab-pane v-if="hasPerm('/busConfig/liquidConfig/list')" label="液位监测仪" name="liquid">
-        <list-liquid-config ref="liquidConfig"/>
+        <list-liquid-config ref="liquidConfig" />
       </el-tab-pane>
       <el-tab-pane v-if="hasPerm('/busConfig/gasConfig/list')" label="燃气智能监测终端" name="gas">
-        <list-gas-config ref="gasConfig"/>
+        <list-gas-config ref="gasConfig" />
       </el-tab-pane>
       <el-tab-pane v-if="hasPerm('/busConfig/harmfulConfig/list')" label="有害气体监测仪" name="harmful">
-        <list-harmful-config ref="harmfulConfig"/>
+        <list-harmful-config ref="harmfulConfig" />
       </el-tab-pane>
       <el-tab-pane v-if="hasPerm('/busConfig/tempConfig/list')" label="温湿度监测仪" name="temphumidity">
-        <list-temp-config ref="tempConfig"/>
+        <list-temp-config ref="tempConfig" />
       </el-tab-pane>
       <el-tab-pane v-if="hasPerm('/busConfig/digConfig/list')" label="开挖监测仪" name="dig">
-        <list-dig-config ref="digConfig"/>
+        <list-dig-config ref="digConfig" />
       </el-tab-pane>
       <el-tab-pane v-if="hasPerm('/busConfig/noiseConfig/list')" label="噪声监测仪" name="noise">
-        <list-noise-config ref="noiseConfig"/>
+        <list-noise-config ref="noiseConfig" />
       </el-tab-pane>
       <el-tab-pane v-if="hasPerm('/busConfig/liquidGasConfig/list')" label="燃气智能监测终端(一体化)" name="liquidgas">
-        <list-liquid-gas-config ref="liquidGasConfig"/>
+        <list-liquid-gas-config ref="liquidGasConfig" />
       </el-tab-pane>
       <el-tab-pane v-if="hasPerm('/busConfig/tubeConfig/list')" label="管盯" name="tube">
-        <list-tube-config ref="tubeConfig"/>
+        <list-tube-config ref="tubeConfig" />
+      </el-tab-pane>
+      <el-tab-pane v-if="hasPerm('/busConfig/H2sConfig/list')" label="硫化氢检测终端" name="h2s">
+        <list-h2s-config ref="h2sConfig" />
       </el-tab-pane>
     </el-tabs>
   </div>
 </template>
 
 <script>
+import { hasPermission } from '@/utils/permission'
 import ListLiquidConfig from './components/listLiquidConfig'
 import ListGasConfig from './components/listGasConfig'
 import ListHarmfulConfig from './components/listHarmfulConfig'
@@ -37,11 +41,11 @@
 import ListDigConfig from './components/listDigConfig'
 import ListNoiseConfig from './components/listNoiseConfig'
 import ListLiquidGasConfig from './components/listLiquidGasConfig'
-import { hasPermission } from '@/utils/permission'
 import ListTubeConfig from './components/listTubeConfig'
+import ListH2sConfig from './components/listH2sConfig'
 export default {
   name: 'DeviceConfig',
-  components: { ListTubeConfig, ListLiquidGasConfig, ListNoiseConfig, ListDigConfig, ListTempConfig, ListHarmfulConfig, ListGasConfig, ListLiquidConfig },
+  components: { ListH2sConfig, ListTubeConfig, ListLiquidGasConfig, ListNoiseConfig, ListDigConfig, ListTempConfig, ListHarmfulConfig, ListGasConfig, ListLiquidConfig },
   data() {
     return {
       activeName: 'liquid'
@@ -68,6 +72,8 @@
         this.$refs.liquidGasConfig.fetchData()
       } else if (tab.name === 'tube') {
         this.$refs.tubeConfig.fetchData()
+      } else if (tab.name === 'tube') {
+        this.$refs.h2sConfig.fetchData()
       }
     },
     // 计算那个是当前第一个tab
@@ -88,6 +94,8 @@
         this.activeName = 'liquidgas'
       } else if (hasPermission('/busConfig/tubeConfig/list')) {
         this.activeName = 'tube'
+      } else if (hasPermission('/busConfig/h2sConfig/list')) {
+        this.activeName = 'h2s'
       }
     }
   }
@@ -95,7 +103,5 @@
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-  .container{
-    padding: 5px;
-  }
+
 </style>
diff --git a/src/views/deviceManage/deviceModel/deviceModel.vue b/src/views/deviceManage/deviceModel/deviceModel.vue
index a9f66ee..816c190 100644
--- a/src/views/deviceManage/deviceModel/deviceModel.vue
+++ b/src/views/deviceManage/deviceModel/deviceModel.vue
@@ -26,17 +26,17 @@
     <!--查询结果Table显示-->
     <normal-table ref="table" :data="list" :total="total" :query="listQuery" :columns="columns" :list-loading="listLoading" :pagination="true" :options="tableOptions" size="small" @change="changePage">
       <template slot="btns">
-        <el-button class="edit_btn" size="small" @click="add">
+        <el-button v-if="hasPerm('/deviceModels/add')" class="edit_btn" size="small" @click="add">
           新增
         </el-button>
       </template>
       <template slot="columns">
         <el-table-column label="操作" align="center" width="160">
           <template v-slot="scope">
-            <el-button type="text" size="mini" @click="edit(scope.row)">
+            <el-button v-if="hasPerm('/deviceModels/update')" type="text" size="mini" @click="edit(scope.row)">
               编辑
             </el-button>
-            <el-button type="text" size="mini" @click="del(scope.row)">
+            <el-button v-if="hasPerm('/deviceModels/delete')" type="text" size="mini" @click="del(scope.row)">
               删除
             </el-button>
           </template>
diff --git a/src/views/deviceManage/listDevice.vue b/src/views/deviceManage/listDevice.vue
index 94cbe3f..30fed22 100644
--- a/src/views/deviceManage/listDevice.vue
+++ b/src/views/deviceManage/listDevice.vue
@@ -76,13 +76,13 @@
         </el-table-column>
         <el-table-column label="操作" align="center" width="160">
           <template slot-scope="scope">
-            <el-button type="text" @click="datalist(scope.row)">
+            <el-button type="text" size="small" @click="datalist(scope.row)">
               历史数据
             </el-button>
-            <el-button v-if="hasPerm('/device/update')" type="text" @click="edit(scope.row)">
+            <el-button v-if="hasPerm('/device/update')" type="text" size="small" @click="edit(scope.row)">
               编辑
             </el-button>
-            <el-button type="text" @click="detail(scope.row)">
+            <el-button type="text" size="small" @click="detail(scope.row)">
               详情
             </el-button>
           </template>

diff --git a/src/api/config/h2sconfig.js b/src/api/config/h2sconfig.js
new file mode 100644
index 0000000..f441692
--- /dev/null
+++ b/src/api/config/h2sconfig.js
@@ -0,0 +1,42 @@
+/**
+ * 硫化氢配置接口
+ */
+import request from '@/utils/request'
+// 硫化氢配置查询
+export function getH2sConfigList(params) {
+  return request({
+    url: 'busConfig/H2sConfig/list',
+    method: 'get',
+    params
+  })
+}
+
+// 修改硫化氢配置
+export function editH2sConfig(params) {
+  return request({
+    url: 'busConfig/H2sConfig/config',
+    method: 'post',
+    params
+  })
+}
+
+// 批量导入
+export function batchImportH2sConfig(fileobj) {
+  const param = new FormData()
+  param.append('file', fileobj)
+  return request({
+    url: 'busConfig/H2sConfig/batchImport',
+    method: 'post',
+    headers: { 'Content-Type': 'multipart/form-data' },
+    data: param
+  })
+}
+// 批量导出
+export function batchExportH2sConfig(params) {
+  return request({
+    url: 'busConfig/H2sConfig/batchExport',
+    method: 'get',
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
diff --git a/src/components/Amap/utils/convert-helper.js b/src/components/Amap/utils/convert-helper.js
index ab7a8d2..6b61377 100644
--- a/src/components/Amap/utils/convert-helper.js
+++ b/src/components/Amap/utils/convert-helper.js
@@ -76,7 +76,6 @@
     AMapLoader.load({
       key: store.getters.amapKey // 秘钥
     }).then((AMap) => {
-      // debugger
       AMap.convertFrom(coordinate, 'gps', (status, result) => {
         if (result.info === 'ok') {
           const lnglats = result.locations[0]
diff --git a/src/permission.js b/src/permission.js
index 0f332ec..52f5108 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -33,7 +33,6 @@
     const oldUser = getUser()
     const username = to.query.username
     const password = to.query.pwd
-    // debugger
     if (loginByUsername && username && password && !oldUser) { // 登陆后跳转
       const loginForm = {
         username: username,
diff --git a/src/views/dataView/components/panelGroup.vue b/src/views/dataView/components/panelGroup.vue
index 7cae96f..49ee723 100644
--- a/src/views/dataView/components/panelGroup.vue
+++ b/src/views/dataView/components/panelGroup.vue
@@ -120,7 +120,6 @@
       const endTime = new Date().Format('yyyy-MM-dd hh:mm:ss')
       const params = { beginTime, endTime }
       dataCount(params).then(response => {
-        debugger
         this.dataGroup[2].context = response.data.total
       })
     }
diff --git a/src/views/deviceConfig/components/editGasConfig.vue b/src/views/deviceConfig/components/editGasConfig.vue
index 07659cf..0f33004 100644
--- a/src/views/deviceConfig/components/editGasConfig.vue
+++ b/src/views/deviceConfig/components/editGasConfig.vue
@@ -155,8 +155,8 @@
       configForm: {
         id: '', // config id
         deviceId: '', // 设备id
-        collectInterval: '', // 报警阈值
-        uploadPeriod: '', // 安装高度
+        collectInterval: '', // 采集间隔
+        uploadPeriod: '', // 上传周期
         retryTimes: '3', // 重传次数
         attemptsMax: '3', // 最大尝试次数
         ip: '', // ip地址
diff --git a/src/views/deviceConfig/components/editH2sConfig.vue b/src/views/deviceConfig/components/editH2sConfig.vue
new file mode 100644
index 0000000..8902fdd
--- /dev/null
+++ b/src/views/deviceConfig/components/editH2sConfig.vue
@@ -0,0 +1,291 @@
+<template>
+  <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" append-to-body>
+    <el-form ref="dataForm" :rules="rules" :model="configForm" label-well-code="right" label-width="110px">
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item v-if="dialogStatus=='create'" label="设备编号" prop="deviceId">
+            <el-select
+              v-model="configForm.deviceId"
+              :loading="loading"
+              :disabled="dialogStatus=='update'?true:false"
+              filterable
+              placeholder="请输入设备编号"
+            >
+              <el-option
+                v-for="item in devices"
+                :key="item.id"
+                :label="item.devcode"
+                :value="item.id"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item v-if="dialogStatus=='update'" label="设备编号">
+            <el-input v-model="deviceForm.devcode" type="text" placeholder="未知" disabled />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item v-if="deviceForm.deviceName!=''" label="设备名称">
+            <el-input v-model="deviceForm.deviceName" type="text" placeholder="未知" disabled />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item v-if="deviceForm.deviceTypeName!=''" label="设备类型" prop="deviceType">
+            <el-input v-model="deviceForm.deviceTypeName" type="text" placeholder="未知" disabled />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item v-if="deviceForm.deptName!=''" label="权属单位" prop="deptName">
+            <el-input v-model="deviceForm.deptName" type="text" placeholder="未知" disabled />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="重传次数" prop="retryTimes">
+            <el-input-number v-model="configForm.retryTimes" :min="1" :max="9" type="text" placeholder="必填" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="采集间隔(分)" prop="collectInterval">
+            <el-input v-model.trim="configForm.collectInterval" type="text" placeholder="必填" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="上传周期(分)" prop="uploadPeriod">
+            <el-input v-model.trim="configForm.uploadPeriod" type="text" placeholder="必填" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="最大尝试次数">
+            <el-input-number v-model="configForm.attemptsMax" :min="1" :max="100" type="text" placeholder="必填" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row v-if="showIp" :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="ip地址" prop="ip">
+            <el-input v-model.trim="configForm.ip" type="text" placeholder="非必填" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="端口号" prop="port">
+            <el-input v-model.trim="configForm.port" type="text" placeholder="非必填" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <div slot="footer" class="dialog-footer">
+      <el-button :disabled="!canEdit" type="primary" @click="saveData">
+        保存
+      </el-button>
+      <el-button @click="cancel">
+        取消
+      </el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { editH2sConfig } from '@/api/config/h2sconfig'
+import { getDeviceSimpleList } from '@/api/config/liquidconfig'
+import { validateFloatPlus } from '@/utils/validate'
+export default {
+  name: 'EditH2sConfig',
+  data() {
+    const validateIp = (rule, value, callback) => {
+      if (value !== '') {
+        if ((/((25[0-5]|2[0-4]\d|((1\d{2})|([1-9]?\d)))\.){3}(25[0-5]|2[0-4]\d|((1\d{2})|([1-9]?\d)))/).test(value) === false) {
+          callback(new Error('请填写正确的ip地址'))
+        } else {
+          callback()
+        }
+      } else {
+        // callback(new Error('ip地址不能为空'))
+        callback()
+      }
+    }
+    const validatePort = (rule, value, callback) => {
+      if (value !== '') {
+        if ((/[1-9]$|(^[1-9][0-9]$)|(^[1-9][0-9][0-9]$)|(^[1-9][0-9][0-9][0-9]$)|(^[1-6][0-5][0-5][0-3][0-5]$)/).test(value) === false) {
+          callback(new Error('请填写正确的端口号'))
+        } else {
+          callback()
+        }
+      } else {
+        // callback(new Error('端口号不能为空'))
+        callback()
+      }
+    }
+    const validateCollectCycle = (rule, value, callback) => {
+      if (value !== '') {
+        if (validateFloatPlus(value, 5, 1440) === true) {
+          callback()
+        } else {
+          callback(new Error('请填写5到1440数值'))
+        }
+      } else {
+        callback(new Error('采集间隔不能为空'))
+      }
+    }
+    const validateUpPeriod = (rule, value, callback) => {
+      if (value !== '') {
+        if (validateFloatPlus(value, 0, 10080) === true) {
+          callback()
+        } else {
+          callback(new Error('请填写0到10080之间数值'))
+        }
+      } else {
+        callback(new Error('上传周期不能为空'))
+      }
+    }
+    return {
+      dialogFormVisible: false, // 对话框是否显示
+      dialogStatus: '', // 对话框类型：create,update
+      deviceForm: {
+        deviceName: '',
+        deviceTypeName: '',
+        deptName: '',
+        devcode: '',
+        deviceType: ''
+      }, // 设备基本信息
+      configForm: {
+        id: '', // config id
+        deviceId: '', // 设备id
+        collectInterval: '', // 采集间隔
+        uploadPeriod: '', // 上传周期
+        retryTimes: '3', // 重传次数
+        attemptsMax: '3', // 最大尝试次数
+        ip: '', // ip地址
+        port: '' // 端口号
+      },
+      textMap: {
+        update: '编辑',
+        create: '新增'
+      }, // 表头显示标题
+      devices: [], // 设备下拉选择列表
+      loading: false, // 加载动画是否显示
+      canEdit: true, // 是否允许点击保存按钮
+      rules: {
+        collectInterval: [{ required: true, trigger: ['blur', 'change'], validator: validateCollectCycle }],
+        uploadPeriod: [{ required: true, trigger: ['blur', 'change'], validator: validateUpPeriod }],
+        deviceId: [{ required: true, message: '设备编号不能为空', trigger: ['blur', 'change'] }],
+        ip: [{ trigger: ['blur', 'change'], validator: validateIp }],
+        port: [{ trigger: ['blur', 'change'], validator: validatePort }]
+      } // 前端校验规则
+    }
+  },
+  computed: {
+    watchDeviceId() { // 监控权属单位变化
+      return this.configForm.deviceId
+    },
+    showIp() { // 是否显示ip配置
+      return true
+    }
+  },
+  watch: {
+    watchDeviceId(newValue, oldValue) {
+      for (const device of this.devices) {
+        if (device.id === newValue) {
+          this.deviceForm.deviceTypeName = device.deviceTypeName
+          this.deviceForm.deptName = device.deptName
+          this.deviceForm.deviceName = device.deviceName
+          return
+        }
+      }
+    }
+  },
+  methods: {
+    // 初始化对话框
+    initDialog: function(dialogStatus, dialogFormVisible, row = null) {
+      this.dialogStatus = dialogStatus
+      this.dialogFormVisible = dialogFormVisible
+      this.canEdit = true
+      if (dialogStatus === 'create') { // 如果是新增，清除验证
+        this.resetForm()
+        this.fetchDevice()
+        this.$nextTick(() => {
+          this.$refs['dataForm'].clearValidate()
+        })
+      } else if (dialogStatus === 'update') { // 如果是修改，将row中数据填写到输入框中
+        this.deviceForm = {
+          deviceName: row.deviceName,
+          devcode: row.devcode,
+          deptName: row.deptName,
+          deviceType: row.deviceType,
+          deviceTypeName: row.deviceTypeName
+        }
+        this.configForm = {
+          id: row.id,
+          deviceId: row.deviceId, // 设备id
+          collectInterval: row.collectInterval, // 采集间隔
+          uploadPeriod: row.uploadPeriod, // 上传周期
+          retryTimes: row.retryTimes, // 重传次数
+          ip: row.ip, // ip地址
+          port: row.port, // 端口号
+          attemptsMax: row.attemptsMax // 最大尝试次数
+        }
+      }
+    },
+    // 重置表单
+    resetForm() {
+      this.deviceForm = {
+        deviceName: '',
+        deviceTypeName: '',
+        deptName: '',
+        devcode: ''
+      }
+      this.configForm = {
+        deviceId: '', // 设备id
+        collectInterval: '', // 采集间隔
+        uploadPeriod: '', // 上传周期
+        retryTimes: '3', // 重传次数
+        ip: '', // ip地址
+        port: '', // 端口号
+        attemptsMax: '3' // 最大尝试次数
+      }
+    },
+    // 保存数据
+    saveData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          this.canEdit = false
+          editH2sConfig(this.configForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('配置成功')
+              this.$emit('watchChild')
+              this.dialogFormVisible = false
+            }
+            this.canEdit = false
+          }).catch(_ => {
+            this.canEdit = true
+          })
+        }
+      })
+    },
+    fetchDevice() {
+      this.loading = true
+      getDeviceSimpleList('14', '0').then(response => {
+        this.loading = false
+        this.devices = response.data
+      })
+    },
+    cancel: function() {
+      this.dialogFormVisible = false
+      this.$emit('watchChild')
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .el-select{
+    width: 100%;
+  }
+  .el-input-number{
+    width: 100%;
+  }
+</style>
diff --git a/src/views/deviceConfig/components/editLiquidConfig.vue b/src/views/deviceConfig/components/editLiquidConfig.vue
index 6be88e3..19557de 100644
--- a/src/views/deviceConfig/components/editLiquidConfig.vue
+++ b/src/views/deviceConfig/components/editLiquidConfig.vue
@@ -188,7 +188,6 @@
   watch: {
     watchDeviceId(newValue, oldValue) {
       for (const device of this.devices) {
-        debugger
         if (device.id === newValue) {
           this.deviceForm.deviceTypeName = device.deviceTypeName
           this.deviceForm.deptName = device.deptName
diff --git a/src/views/deviceConfig/components/editTubeConfig.vue b/src/views/deviceConfig/components/editTubeConfig.vue
index 171991a..468014e 100644
--- a/src/views/deviceConfig/components/editTubeConfig.vue
+++ b/src/views/deviceConfig/components/editTubeConfig.vue
@@ -155,8 +155,8 @@
       configForm: {
         id: '', // config id
         deviceId: '', // 设备id
-        collectInterval: '', // 报警阈值
-        uploadPeriod: '', // 安装高度
+        collectInterval: '', // 采集间隔
+        uploadPeriod: '', // 上传周期
         retryTimes: '3', // 重传次数
         attemptsMax: '3', // 最大尝试次数
         ip: '', // ip地址
diff --git a/src/views/deviceConfig/components/listH2sConfig.vue b/src/views/deviceConfig/components/listH2sConfig.vue
new file mode 100644
index 0000000..3555e1e
--- /dev/null
+++ b/src/views/deviceConfig/components/listH2sConfig.vue
@@ -0,0 +1,310 @@
+<template>
+  <app-container>
+    <search-area size="small" @search="search">
+      <search-item>
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="设备编号" clearable />
+      </search-item>
+      <search-item>
+        <dept-select
+          v-model="listQuery.deptid"
+          :need-top="deptShowTop"
+          dept-type="03"
+          placeholder="选择权属单位"
+        />
+      </search-item>
+    </search-area>
+    <!--查询结果Table显示-->
+    <div>
+      <el-row class="table-title">
+        <el-col :span="6">
+          <div class="title-header">
+            <i class="el-icon-menu" />数据列表
+          </div>
+        </el-col>
+        <el-col :span="12" :offset="6" class="edit_btns">
+          <el-button v-if="hasPerm('/busConfig/H2sConfig/batchExport')" class="edit_btn" size="small" @click="batchExport">
+            导出记录
+          </el-button>
+          <download-template :filename="filename" />
+          <el-upload
+            v-if="hasPerm('/busConfig/H2sConfig/batchImport')"
+            :limit="1"
+            :show-file-list="false"
+            :http-request="uploadFile"
+            :file-list="fileList"
+            action="string"
+            accept=".xls,.xlsx"
+            class="edit_btn"
+          >
+            <el-button v-if="hasPerm('/busConfig/H2sConfig/batchImport')" slot="trigger" size="small">
+              批量导入
+            </el-button>
+          </el-upload>
+          <el-button v-if="hasPerm('/busConfig/H2sConfig/config')" class="edit_btn" size="small" @click="add">
+            新增
+          </el-button>
+        </el-col>
+      </el-row>
+      <el-table v-loading="listLoading" :data="list" class="table" border @selection-change="handleSelectionChange">
+        <!--<el-table-column align="center" type="selection" width="55"/>-->
+        <el-table-column :index="indexMethod" align="center" type="index" />
+        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
+          <template slot-scope="scope">
+            {{ scope.row[column.value] }}
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" align="center" width="60">
+          <template slot-scope="scope">
+            <el-button type="text" @click="edit(scope.row)">
+              编辑
+            </el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+    </div>
+    <!--分页-->
+    <div class="pagination-container">
+      <el-pagination
+        v-show="total>listQuery.limit"
+        :current-page="listQuery.offset"
+        :page-sizes="[20,30,50]"
+        :page-size="listQuery.limit"
+        :total="total"
+        align="center"
+        layout="total, sizes, prev, pager, next"
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"
+      />
+    </div>
+    <edit-h2s-config v-show="editShow" ref="editconfig" @watchChild="fetchData" />
+  </app-container>
+</template>
+
+<script>
+import { getH2sConfigList, batchImportH2sConfig, batchExportH2sConfig } from '@/api/config/h2sconfig'
+import EditH2sConfig from './editH2sConfig'
+import DownloadTemplate from '@/components/DownloadTemplate/index'
+import DeptSelect from '@/components/DeptSelect/index'
+
+export default {
+  name: 'ListH2sConfig',
+  components: { DeptSelect, DownloadTemplate, EditH2sConfig },
+  data() {
+    return {
+      listQuery: {
+        keywords: '',
+        offset: 1,
+        limit: 20,
+        sort: '',
+        order: ''
+      }, // 筛选条件
+      columns: [
+        {
+          text: '设备编号',
+          value: 'devcode',
+          align: 'center'
+        },
+        {
+          text: '重传次数',
+          value: 'retryTimes',
+          align: 'center'
+        },
+        {
+          text: '采集间隔(分)',
+          value: 'collectInterval',
+          align: 'center'
+        },
+        {
+          text: '上传周期',
+          value: 'uploadPeriod',
+          align: 'center'
+        },
+        {
+          text: 'IP地址',
+          value: 'ip',
+          align: 'center'
+        },
+        {
+          text: '端口',
+          value: 'port',
+          align: 'center'
+        },
+        {
+          text: '最大尝试次数',
+          value: 'attemptsMax',
+          align: 'center'
+        },
+        {
+          text: '已尝试次数',
+          value: 'attemptsCurrent',
+          align: 'center'
+        },
+        {
+          text: '下发状态',
+          value: 'statusName',
+          width: 80,
+          align: 'center'
+        }
+      ], // 显示列
+      multipleSelection: [], // 多选选中项
+      list: [], // 列表数据
+      total: 0, // 数据总数
+      deviceTypeList: [], // 硫化氢配置类型列表
+      deptProps: {
+        parent: 'pid',
+        value: 'id',
+        label: 'name',
+        children: 'children'
+      }, // 权属单位树形下拉菜单
+      deptTreeList: null, // 组织树列表数据
+      showDeptTree: 0, // 是否显示权属单位下拉
+      showDeviceType: true, // 是否显示设备类型下拉
+      listLoading: true, // 加载动画
+      fullscreenLoading: false, // 全屏加载动画
+      editShow: false, // 是否显示编辑框
+      detailShow: false, // 是否显示编辑框
+      filename: 'methane_config_template.xlsx',
+      deptShowTop: false,
+      fileList: []
+    }
+  },
+  created() {
+    this.fetchData()// 获取数据
+  },
+  methods: {
+    // 新增设备
+    add() {
+      this.dialogFormVisible = true
+      this.editShow = true
+      this.$refs.editconfig.initDialog('create', this.dialogFormVisible)
+    },
+    // 编辑硫化氢配置信息
+    edit(row) {
+      this.dialogFormVisible = true
+      this.editShow = true
+      this.$refs.editconfig.initDialog('update', this.dialogFormVisible, row)
+    },
+    // 批量导入硫化氢配置
+    uploadFile(param) {
+      // 判断文件大小是否符合要求
+      const _file = param.file
+      const isLt5M = _file.size / 1024 / 1024 < 5
+      if (!isLt5M) {
+        this.$message.error('请上传5M以下的excel文件')
+        return false
+      }
+      // 全屏加载动画
+      const loading = this.$loading({
+        lock: true,
+        text: '导入中,请稍后...',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
+      })
+      // 发起导入请求
+      batchImportH2sConfig(_file).then(res => {
+        loading.close() // 关闭加载动画
+        if (res.code === 200) {
+          this.$message.success('导入成功')
+          this.fetchData(false)
+        } else {
+          this.$message.error(res.message)
+        }
+      }).catch(() => {
+        loading.close() // 关闭加载动画
+      })
+      this.fileList = []
+    },
+    // 批量导出
+    batchExport() {
+      // 全屏加载动画
+      const loading = this.$loading({
+        lock: true,
+        text: '数据处理中,请稍后...',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
+      })
+      batchExportH2sConfig(this.listQuery).then(res => {
+        loading.close() // 关闭加载动画
+        console.log('download===', res)
+        const blob = new Blob([res.data])
+        const downloadElement = document.createElement('a')
+        const href = window.URL.createObjectURL(blob) // 创建下载的链接
+        downloadElement.href = href
+        downloadElement.download = `硫化氢配置列表.xlsx` // 下载后文件名
+        document.body.appendChild(downloadElement)
+        downloadElement.click() // 点击下载
+        document.body.removeChild(downloadElement) // 下载完成移除元素
+        window.URL.revokeObjectURL(href) // 释放blob对象
+      }).catch((res) => {
+        loading.close()
+        this.$message.error(res.message)
+      })
+    },
+    // 查询数据
+    search() {
+      this.fetchData(false)
+    },
+    // 获取硫化氢配置数据
+    fetchData(isNowPage = true) {
+      this.listLoading = true
+      if (!isNowPage) { // 是否显示当前页，否则跳转第一页
+        this.listQuery.offset = 1
+      }
+      getH2sConfigList(this.listQuery).then(response => {
+        this.list = response.data.rows
+        this.total = parseInt(response.data.total)
+        this.listLoading = false
+      })
+    },
+    indexMethod(index) {
+      return this.listQuery.limit * (this.listQuery.offset - 1) + index + 1
+    },
+    // 改变页容量
+    handleSizeChange(val) {
+      this.listQuery.limit = val
+      this.fetchData()
+    },
+    // 改变当前页
+    handleCurrentChange(val) {
+      this.listQuery.offset = val
+      this.fetchData()
+    },
+    // 多选触发方法
+    handleSelectionChange(val) {
+      this.multipleSelection = val
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .app-container{
+    padding: 10px;
+  }
+  $tableTitleHeight:46px;
+  .table{
+    margin-bottom: 20px;
+  }
+  .pagination-container{
+    margin-bottom: 50px;
+  }
+  .table-title{
+    background-color:rgba(243, 243, 243, 1);
+    height: $tableTitleHeight;
+    .title-header{
+      line-height:$tableTitleHeight;
+      color: #606266;
+      font-size: 15px;
+      i{
+        margin-left: 5px;
+        margin-right: 5px;
+      }
+    }
+  }
+  .edit_btns{
+    .edit_btn{
+      float:right;
+      margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2
+    }
+  }
+</style>
diff --git a/src/views/deviceConfig/components/listTubeConfig.vue b/src/views/deviceConfig/components/listTubeConfig.vue
index 6a054f8..9f27e0e 100644
--- a/src/views/deviceConfig/components/listTubeConfig.vue
+++ b/src/views/deviceConfig/components/listTubeConfig.vue
@@ -77,9 +77,7 @@
 </template>
 
 <script>
-import { judgeTree, toTreeList } from '@/utils/structure'
 import { getTubeConfigList, batchImportTubeConfig, batchExportTubeConfig } from '@/api/config/tubeconfig'
-import { getDeptTreeList } from '@/api/system/dept'
 import EditTubeConfig from './editTubeConfig'
 import DownloadTemplate from '@/components/DownloadTemplate/index'
 import DeptSelect from '@/components/DeptSelect/index'
@@ -167,7 +165,6 @@
     }
   },
   created() {
-    this.fetchDeptTree()// 获取部门树
     this.fetchData()// 获取数据
   },
   methods: {
@@ -263,26 +260,6 @@
         this.listLoading = false
       })
     },
-    // 加载组织机构树形下拉菜单
-    fetchDeptTree: function() {
-      getDeptTreeList().then(response => {
-        if (response.data.list) {
-          if (response.data.list.length > 1) {
-            console.log(this.$store.getters.deptId)
-            if (judgeTree(response.data.list)) {
-              this.deptTreeList = toTreeList(response.data.list)
-              this.showDeptTree = 1
-            } else {
-              this.deptTreeList = response.data.list
-              this.showDeptTree = 2
-            }
-            console.log(this.deptTreeList)
-          } else {
-            this.showDeptTree = 0
-          }
-        }
-      })
-    },
     indexMethod(index) {
       return this.listQuery.limit * (this.listQuery.offset - 1) + index + 1
     },
diff --git a/src/views/deviceConfig/deviceConfig.vue b/src/views/deviceConfig/deviceConfig.vue
index 736c506..5e31573 100644
--- a/src/views/deviceConfig/deviceConfig.vue
+++ b/src/views/deviceConfig/deviceConfig.vue
@@ -2,34 +2,38 @@
   <div class="container">
     <el-tabs v-model="activeName" type="card" @tab-click="handleClick">
       <el-tab-pane v-if="hasPerm('/busConfig/liquidConfig/list')" label="液位监测仪" name="liquid">
-        <list-liquid-config ref="liquidConfig"/>
+        <list-liquid-config ref="liquidConfig" />
       </el-tab-pane>
       <el-tab-pane v-if="hasPerm('/busConfig/gasConfig/list')" label="燃气智能监测终端" name="gas">
-        <list-gas-config ref="gasConfig"/>
+        <list-gas-config ref="gasConfig" />
       </el-tab-pane>
       <el-tab-pane v-if="hasPerm('/busConfig/harmfulConfig/list')" label="有害气体监测仪" name="harmful">
-        <list-harmful-config ref="harmfulConfig"/>
+        <list-harmful-config ref="harmfulConfig" />
       </el-tab-pane>
       <el-tab-pane v-if="hasPerm('/busConfig/tempConfig/list')" label="温湿度监测仪" name="temphumidity">
-        <list-temp-config ref="tempConfig"/>
+        <list-temp-config ref="tempConfig" />
       </el-tab-pane>
       <el-tab-pane v-if="hasPerm('/busConfig/digConfig/list')" label="开挖监测仪" name="dig">
-        <list-dig-config ref="digConfig"/>
+        <list-dig-config ref="digConfig" />
       </el-tab-pane>
       <el-tab-pane v-if="hasPerm('/busConfig/noiseConfig/list')" label="噪声监测仪" name="noise">
-        <list-noise-config ref="noiseConfig"/>
+        <list-noise-config ref="noiseConfig" />
       </el-tab-pane>
       <el-tab-pane v-if="hasPerm('/busConfig/liquidGasConfig/list')" label="燃气智能监测终端(一体化)" name="liquidgas">
-        <list-liquid-gas-config ref="liquidGasConfig"/>
+        <list-liquid-gas-config ref="liquidGasConfig" />
       </el-tab-pane>
       <el-tab-pane v-if="hasPerm('/busConfig/tubeConfig/list')" label="管盯" name="tube">
-        <list-tube-config ref="tubeConfig"/>
+        <list-tube-config ref="tubeConfig" />
+      </el-tab-pane>
+      <el-tab-pane v-if="hasPerm('/busConfig/H2sConfig/list')" label="硫化氢检测终端" name="h2s">
+        <list-h2s-config ref="h2sConfig" />
       </el-tab-pane>
     </el-tabs>
   </div>
 </template>
 
 <script>
+import { hasPermission } from '@/utils/permission'
 import ListLiquidConfig from './components/listLiquidConfig'
 import ListGasConfig from './components/listGasConfig'
 import ListHarmfulConfig from './components/listHarmfulConfig'
@@ -37,11 +41,11 @@
 import ListDigConfig from './components/listDigConfig'
 import ListNoiseConfig from './components/listNoiseConfig'
 import ListLiquidGasConfig from './components/listLiquidGasConfig'
-import { hasPermission } from '@/utils/permission'
 import ListTubeConfig from './components/listTubeConfig'
+import ListH2sConfig from './components/listH2sConfig'
 export default {
   name: 'DeviceConfig',
-  components: { ListTubeConfig, ListLiquidGasConfig, ListNoiseConfig, ListDigConfig, ListTempConfig, ListHarmfulConfig, ListGasConfig, ListLiquidConfig },
+  components: { ListH2sConfig, ListTubeConfig, ListLiquidGasConfig, ListNoiseConfig, ListDigConfig, ListTempConfig, ListHarmfulConfig, ListGasConfig, ListLiquidConfig },
   data() {
     return {
       activeName: 'liquid'
@@ -68,6 +72,8 @@
         this.$refs.liquidGasConfig.fetchData()
       } else if (tab.name === 'tube') {
         this.$refs.tubeConfig.fetchData()
+      } else if (tab.name === 'tube') {
+        this.$refs.h2sConfig.fetchData()
       }
     },
     // 计算那个是当前第一个tab
@@ -88,6 +94,8 @@
         this.activeName = 'liquidgas'
       } else if (hasPermission('/busConfig/tubeConfig/list')) {
         this.activeName = 'tube'
+      } else if (hasPermission('/busConfig/h2sConfig/list')) {
+        this.activeName = 'h2s'
       }
     }
   }
@@ -95,7 +103,5 @@
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-  .container{
-    padding: 5px;
-  }
+
 </style>
diff --git a/src/views/deviceManage/deviceModel/deviceModel.vue b/src/views/deviceManage/deviceModel/deviceModel.vue
index a9f66ee..816c190 100644
--- a/src/views/deviceManage/deviceModel/deviceModel.vue
+++ b/src/views/deviceManage/deviceModel/deviceModel.vue
@@ -26,17 +26,17 @@
     <!--查询结果Table显示-->
     <normal-table ref="table" :data="list" :total="total" :query="listQuery" :columns="columns" :list-loading="listLoading" :pagination="true" :options="tableOptions" size="small" @change="changePage">
       <template slot="btns">
-        <el-button class="edit_btn" size="small" @click="add">
+        <el-button v-if="hasPerm('/deviceModels/add')" class="edit_btn" size="small" @click="add">
           新增
         </el-button>
       </template>
       <template slot="columns">
         <el-table-column label="操作" align="center" width="160">
           <template v-slot="scope">
-            <el-button type="text" size="mini" @click="edit(scope.row)">
+            <el-button v-if="hasPerm('/deviceModels/update')" type="text" size="mini" @click="edit(scope.row)">
               编辑
             </el-button>
-            <el-button type="text" size="mini" @click="del(scope.row)">
+            <el-button v-if="hasPerm('/deviceModels/delete')" type="text" size="mini" @click="del(scope.row)">
               删除
             </el-button>
           </template>
diff --git a/src/views/deviceManage/listDevice.vue b/src/views/deviceManage/listDevice.vue
index 94cbe3f..30fed22 100644
--- a/src/views/deviceManage/listDevice.vue
+++ b/src/views/deviceManage/listDevice.vue
@@ -76,13 +76,13 @@
         </el-table-column>
         <el-table-column label="操作" align="center" width="160">
           <template slot-scope="scope">
-            <el-button type="text" @click="datalist(scope.row)">
+            <el-button type="text" size="small" @click="datalist(scope.row)">
               历史数据
             </el-button>
-            <el-button v-if="hasPerm('/device/update')" type="text" @click="edit(scope.row)">
+            <el-button v-if="hasPerm('/device/update')" type="text" size="small" @click="edit(scope.row)">
               编辑
             </el-button>
-            <el-button type="text" @click="detail(scope.row)">
+            <el-button type="text" size="small" @click="detail(scope.row)">
               详情
             </el-button>
           </template>
diff --git a/src/views/system/dept/editDept.vue b/src/views/system/dept/editDept.vue
index 203d542..aebe0a7 100644
--- a/src/views/system/dept/editDept.vue
+++ b/src/views/system/dept/editDept.vue
@@ -16,7 +16,7 @@
       <el-row :gutter="20">
         <el-col :span="12">
           <el-form-item label="父组织" prop="pid">
-            <dept-select ref="deptSelect" v-model="deptForm.pid" :dept-show="true" placeholder="请选择父组织" />
+            <dept-select ref="deptSelect" v-model="deptForm.pid" :dept-show="true" placeholder="请选择父组织" size="normal" />
           </el-form-item>
         </el-col>
         <el-col :span="12">

diff --git a/src/api/config/h2sconfig.js b/src/api/config/h2sconfig.js
new file mode 100644
index 0000000..f441692
--- /dev/null
+++ b/src/api/config/h2sconfig.js
@@ -0,0 +1,42 @@
+/**
+ * 硫化氢配置接口
+ */
+import request from '@/utils/request'
+// 硫化氢配置查询
+export function getH2sConfigList(params) {
+  return request({
+    url: 'busConfig/H2sConfig/list',
+    method: 'get',
+    params
+  })
+}
+
+// 修改硫化氢配置
+export function editH2sConfig(params) {
+  return request({
+    url: 'busConfig/H2sConfig/config',
+    method: 'post',
+    params
+  })
+}
+
+// 批量导入
+export function batchImportH2sConfig(fileobj) {
+  const param = new FormData()
+  param.append('file', fileobj)
+  return request({
+    url: 'busConfig/H2sConfig/batchImport',
+    method: 'post',
+    headers: { 'Content-Type': 'multipart/form-data' },
+    data: param
+  })
+}
+// 批量导出
+export function batchExportH2sConfig(params) {
+  return request({
+    url: 'busConfig/H2sConfig/batchExport',
+    method: 'get',
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
diff --git a/src/components/Amap/utils/convert-helper.js b/src/components/Amap/utils/convert-helper.js
index ab7a8d2..6b61377 100644
--- a/src/components/Amap/utils/convert-helper.js
+++ b/src/components/Amap/utils/convert-helper.js
@@ -76,7 +76,6 @@
     AMapLoader.load({
       key: store.getters.amapKey // 秘钥
     }).then((AMap) => {
-      // debugger
       AMap.convertFrom(coordinate, 'gps', (status, result) => {
         if (result.info === 'ok') {
           const lnglats = result.locations[0]
diff --git a/src/permission.js b/src/permission.js
index 0f332ec..52f5108 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -33,7 +33,6 @@
     const oldUser = getUser()
     const username = to.query.username
     const password = to.query.pwd
-    // debugger
     if (loginByUsername && username && password && !oldUser) { // 登陆后跳转
       const loginForm = {
         username: username,
diff --git a/src/views/dataView/components/panelGroup.vue b/src/views/dataView/components/panelGroup.vue
index 7cae96f..49ee723 100644
--- a/src/views/dataView/components/panelGroup.vue
+++ b/src/views/dataView/components/panelGroup.vue
@@ -120,7 +120,6 @@
       const endTime = new Date().Format('yyyy-MM-dd hh:mm:ss')
       const params = { beginTime, endTime }
       dataCount(params).then(response => {
-        debugger
         this.dataGroup[2].context = response.data.total
       })
     }
diff --git a/src/views/deviceConfig/components/editGasConfig.vue b/src/views/deviceConfig/components/editGasConfig.vue
index 07659cf..0f33004 100644
--- a/src/views/deviceConfig/components/editGasConfig.vue
+++ b/src/views/deviceConfig/components/editGasConfig.vue
@@ -155,8 +155,8 @@
       configForm: {
         id: '', // config id
         deviceId: '', // 设备id
-        collectInterval: '', // 报警阈值
-        uploadPeriod: '', // 安装高度
+        collectInterval: '', // 采集间隔
+        uploadPeriod: '', // 上传周期
         retryTimes: '3', // 重传次数
         attemptsMax: '3', // 最大尝试次数
         ip: '', // ip地址
diff --git a/src/views/deviceConfig/components/editH2sConfig.vue b/src/views/deviceConfig/components/editH2sConfig.vue
new file mode 100644
index 0000000..8902fdd
--- /dev/null
+++ b/src/views/deviceConfig/components/editH2sConfig.vue
@@ -0,0 +1,291 @@
+<template>
+  <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" append-to-body>
+    <el-form ref="dataForm" :rules="rules" :model="configForm" label-well-code="right" label-width="110px">
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item v-if="dialogStatus=='create'" label="设备编号" prop="deviceId">
+            <el-select
+              v-model="configForm.deviceId"
+              :loading="loading"
+              :disabled="dialogStatus=='update'?true:false"
+              filterable
+              placeholder="请输入设备编号"
+            >
+              <el-option
+                v-for="item in devices"
+                :key="item.id"
+                :label="item.devcode"
+                :value="item.id"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item v-if="dialogStatus=='update'" label="设备编号">
+            <el-input v-model="deviceForm.devcode" type="text" placeholder="未知" disabled />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item v-if="deviceForm.deviceName!=''" label="设备名称">
+            <el-input v-model="deviceForm.deviceName" type="text" placeholder="未知" disabled />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item v-if="deviceForm.deviceTypeName!=''" label="设备类型" prop="deviceType">
+            <el-input v-model="deviceForm.deviceTypeName" type="text" placeholder="未知" disabled />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item v-if="deviceForm.deptName!=''" label="权属单位" prop="deptName">
+            <el-input v-model="deviceForm.deptName" type="text" placeholder="未知" disabled />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="重传次数" prop="retryTimes">
+            <el-input-number v-model="configForm.retryTimes" :min="1" :max="9" type="text" placeholder="必填" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="采集间隔(分)" prop="collectInterval">
+            <el-input v-model.trim="configForm.collectInterval" type="text" placeholder="必填" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="上传周期(分)" prop="uploadPeriod">
+            <el-input v-model.trim="configForm.uploadPeriod" type="text" placeholder="必填" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="最大尝试次数">
+            <el-input-number v-model="configForm.attemptsMax" :min="1" :max="100" type="text" placeholder="必填" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row v-if="showIp" :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="ip地址" prop="ip">
+            <el-input v-model.trim="configForm.ip" type="text" placeholder="非必填" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="端口号" prop="port">
+            <el-input v-model.trim="configForm.port" type="text" placeholder="非必填" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <div slot="footer" class="dialog-footer">
+      <el-button :disabled="!canEdit" type="primary" @click="saveData">
+        保存
+      </el-button>
+      <el-button @click="cancel">
+        取消
+      </el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { editH2sConfig } from '@/api/config/h2sconfig'
+import { getDeviceSimpleList } from '@/api/config/liquidconfig'
+import { validateFloatPlus } from '@/utils/validate'
+export default {
+  name: 'EditH2sConfig',
+  data() {
+    const validateIp = (rule, value, callback) => {
+      if (value !== '') {
+        if ((/((25[0-5]|2[0-4]\d|((1\d{2})|([1-9]?\d)))\.){3}(25[0-5]|2[0-4]\d|((1\d{2})|([1-9]?\d)))/).test(value) === false) {
+          callback(new Error('请填写正确的ip地址'))
+        } else {
+          callback()
+        }
+      } else {
+        // callback(new Error('ip地址不能为空'))
+        callback()
+      }
+    }
+    const validatePort = (rule, value, callback) => {
+      if (value !== '') {
+        if ((/[1-9]$|(^[1-9][0-9]$)|(^[1-9][0-9][0-9]$)|(^[1-9][0-9][0-9][0-9]$)|(^[1-6][0-5][0-5][0-3][0-5]$)/).test(value) === false) {
+          callback(new Error('请填写正确的端口号'))
+        } else {
+          callback()
+        }
+      } else {
+        // callback(new Error('端口号不能为空'))
+        callback()
+      }
+    }
+    const validateCollectCycle = (rule, value, callback) => {
+      if (value !== '') {
+        if (validateFloatPlus(value, 5, 1440) === true) {
+          callback()
+        } else {
+          callback(new Error('请填写5到1440数值'))
+        }
+      } else {
+        callback(new Error('采集间隔不能为空'))
+      }
+    }
+    const validateUpPeriod = (rule, value, callback) => {
+      if (value !== '') {
+        if (validateFloatPlus(value, 0, 10080) === true) {
+          callback()
+        } else {
+          callback(new Error('请填写0到10080之间数值'))
+        }
+      } else {
+        callback(new Error('上传周期不能为空'))
+      }
+    }
+    return {
+      dialogFormVisible: false, // 对话框是否显示
+      dialogStatus: '', // 对话框类型：create,update
+      deviceForm: {
+        deviceName: '',
+        deviceTypeName: '',
+        deptName: '',
+        devcode: '',
+        deviceType: ''
+      }, // 设备基本信息
+      configForm: {
+        id: '', // config id
+        deviceId: '', // 设备id
+        collectInterval: '', // 采集间隔
+        uploadPeriod: '', // 上传周期
+        retryTimes: '3', // 重传次数
+        attemptsMax: '3', // 最大尝试次数
+        ip: '', // ip地址
+        port: '' // 端口号
+      },
+      textMap: {
+        update: '编辑',
+        create: '新增'
+      }, // 表头显示标题
+      devices: [], // 设备下拉选择列表
+      loading: false, // 加载动画是否显示
+      canEdit: true, // 是否允许点击保存按钮
+      rules: {
+        collectInterval: [{ required: true, trigger: ['blur', 'change'], validator: validateCollectCycle }],
+        uploadPeriod: [{ required: true, trigger: ['blur', 'change'], validator: validateUpPeriod }],
+        deviceId: [{ required: true, message: '设备编号不能为空', trigger: ['blur', 'change'] }],
+        ip: [{ trigger: ['blur', 'change'], validator: validateIp }],
+        port: [{ trigger: ['blur', 'change'], validator: validatePort }]
+      } // 前端校验规则
+    }
+  },
+  computed: {
+    watchDeviceId() { // 监控权属单位变化
+      return this.configForm.deviceId
+    },
+    showIp() { // 是否显示ip配置
+      return true
+    }
+  },
+  watch: {
+    watchDeviceId(newValue, oldValue) {
+      for (const device of this.devices) {
+        if (device.id === newValue) {
+          this.deviceForm.deviceTypeName = device.deviceTypeName
+          this.deviceForm.deptName = device.deptName
+          this.deviceForm.deviceName = device.deviceName
+          return
+        }
+      }
+    }
+  },
+  methods: {
+    // 初始化对话框
+    initDialog: function(dialogStatus, dialogFormVisible, row = null) {
+      this.dialogStatus = dialogStatus
+      this.dialogFormVisible = dialogFormVisible
+      this.canEdit = true
+      if (dialogStatus === 'create') { // 如果是新增，清除验证
+        this.resetForm()
+        this.fetchDevice()
+        this.$nextTick(() => {
+          this.$refs['dataForm'].clearValidate()
+        })
+      } else if (dialogStatus === 'update') { // 如果是修改，将row中数据填写到输入框中
+        this.deviceForm = {
+          deviceName: row.deviceName,
+          devcode: row.devcode,
+          deptName: row.deptName,
+          deviceType: row.deviceType,
+          deviceTypeName: row.deviceTypeName
+        }
+        this.configForm = {
+          id: row.id,
+          deviceId: row.deviceId, // 设备id
+          collectInterval: row.collectInterval, // 采集间隔
+          uploadPeriod: row.uploadPeriod, // 上传周期
+          retryTimes: row.retryTimes, // 重传次数
+          ip: row.ip, // ip地址
+          port: row.port, // 端口号
+          attemptsMax: row.attemptsMax // 最大尝试次数
+        }
+      }
+    },
+    // 重置表单
+    resetForm() {
+      this.deviceForm = {
+        deviceName: '',
+        deviceTypeName: '',
+        deptName: '',
+        devcode: ''
+      }
+      this.configForm = {
+        deviceId: '', // 设备id
+        collectInterval: '', // 采集间隔
+        uploadPeriod: '', // 上传周期
+        retryTimes: '3', // 重传次数
+        ip: '', // ip地址
+        port: '', // 端口号
+        attemptsMax: '3' // 最大尝试次数
+      }
+    },
+    // 保存数据
+    saveData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          this.canEdit = false
+          editH2sConfig(this.configForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('配置成功')
+              this.$emit('watchChild')
+              this.dialogFormVisible = false
+            }
+            this.canEdit = false
+          }).catch(_ => {
+            this.canEdit = true
+          })
+        }
+      })
+    },
+    fetchDevice() {
+      this.loading = true
+      getDeviceSimpleList('14', '0').then(response => {
+        this.loading = false
+        this.devices = response.data
+      })
+    },
+    cancel: function() {
+      this.dialogFormVisible = false
+      this.$emit('watchChild')
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .el-select{
+    width: 100%;
+  }
+  .el-input-number{
+    width: 100%;
+  }
+</style>
diff --git a/src/views/deviceConfig/components/editLiquidConfig.vue b/src/views/deviceConfig/components/editLiquidConfig.vue
index 6be88e3..19557de 100644
--- a/src/views/deviceConfig/components/editLiquidConfig.vue
+++ b/src/views/deviceConfig/components/editLiquidConfig.vue
@@ -188,7 +188,6 @@
   watch: {
     watchDeviceId(newValue, oldValue) {
       for (const device of this.devices) {
-        debugger
         if (device.id === newValue) {
           this.deviceForm.deviceTypeName = device.deviceTypeName
           this.deviceForm.deptName = device.deptName
diff --git a/src/views/deviceConfig/components/editTubeConfig.vue b/src/views/deviceConfig/components/editTubeConfig.vue
index 171991a..468014e 100644
--- a/src/views/deviceConfig/components/editTubeConfig.vue
+++ b/src/views/deviceConfig/components/editTubeConfig.vue
@@ -155,8 +155,8 @@
       configForm: {
         id: '', // config id
         deviceId: '', // 设备id
-        collectInterval: '', // 报警阈值
-        uploadPeriod: '', // 安装高度
+        collectInterval: '', // 采集间隔
+        uploadPeriod: '', // 上传周期
         retryTimes: '3', // 重传次数
         attemptsMax: '3', // 最大尝试次数
         ip: '', // ip地址
diff --git a/src/views/deviceConfig/components/listH2sConfig.vue b/src/views/deviceConfig/components/listH2sConfig.vue
new file mode 100644
index 0000000..3555e1e
--- /dev/null
+++ b/src/views/deviceConfig/components/listH2sConfig.vue
@@ -0,0 +1,310 @@
+<template>
+  <app-container>
+    <search-area size="small" @search="search">
+      <search-item>
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="设备编号" clearable />
+      </search-item>
+      <search-item>
+        <dept-select
+          v-model="listQuery.deptid"
+          :need-top="deptShowTop"
+          dept-type="03"
+          placeholder="选择权属单位"
+        />
+      </search-item>
+    </search-area>
+    <!--查询结果Table显示-->
+    <div>
+      <el-row class="table-title">
+        <el-col :span="6">
+          <div class="title-header">
+            <i class="el-icon-menu" />数据列表
+          </div>
+        </el-col>
+        <el-col :span="12" :offset="6" class="edit_btns">
+          <el-button v-if="hasPerm('/busConfig/H2sConfig/batchExport')" class="edit_btn" size="small" @click="batchExport">
+            导出记录
+          </el-button>
+          <download-template :filename="filename" />
+          <el-upload
+            v-if="hasPerm('/busConfig/H2sConfig/batchImport')"
+            :limit="1"
+            :show-file-list="false"
+            :http-request="uploadFile"
+            :file-list="fileList"
+            action="string"
+            accept=".xls,.xlsx"
+            class="edit_btn"
+          >
+            <el-button v-if="hasPerm('/busConfig/H2sConfig/batchImport')" slot="trigger" size="small">
+              批量导入
+            </el-button>
+          </el-upload>
+          <el-button v-if="hasPerm('/busConfig/H2sConfig/config')" class="edit_btn" size="small" @click="add">
+            新增
+          </el-button>
+        </el-col>
+      </el-row>
+      <el-table v-loading="listLoading" :data="list" class="table" border @selection-change="handleSelectionChange">
+        <!--<el-table-column align="center" type="selection" width="55"/>-->
+        <el-table-column :index="indexMethod" align="center" type="index" />
+        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
+          <template slot-scope="scope">
+            {{ scope.row[column.value] }}
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" align="center" width="60">
+          <template slot-scope="scope">
+            <el-button type="text" @click="edit(scope.row)">
+              编辑
+            </el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+    </div>
+    <!--分页-->
+    <div class="pagination-container">
+      <el-pagination
+        v-show="total>listQuery.limit"
+        :current-page="listQuery.offset"
+        :page-sizes="[20,30,50]"
+        :page-size="listQuery.limit"
+        :total="total"
+        align="center"
+        layout="total, sizes, prev, pager, next"
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"
+      />
+    </div>
+    <edit-h2s-config v-show="editShow" ref="editconfig" @watchChild="fetchData" />
+  </app-container>
+</template>
+
+<script>
+import { getH2sConfigList, batchImportH2sConfig, batchExportH2sConfig } from '@/api/config/h2sconfig'
+import EditH2sConfig from './editH2sConfig'
+import DownloadTemplate from '@/components/DownloadTemplate/index'
+import DeptSelect from '@/components/DeptSelect/index'
+
+export default {
+  name: 'ListH2sConfig',
+  components: { DeptSelect, DownloadTemplate, EditH2sConfig },
+  data() {
+    return {
+      listQuery: {
+        keywords: '',
+        offset: 1,
+        limit: 20,
+        sort: '',
+        order: ''
+      }, // 筛选条件
+      columns: [
+        {
+          text: '设备编号',
+          value: 'devcode',
+          align: 'center'
+        },
+        {
+          text: '重传次数',
+          value: 'retryTimes',
+          align: 'center'
+        },
+        {
+          text: '采集间隔(分)',
+          value: 'collectInterval',
+          align: 'center'
+        },
+        {
+          text: '上传周期',
+          value: 'uploadPeriod',
+          align: 'center'
+        },
+        {
+          text: 'IP地址',
+          value: 'ip',
+          align: 'center'
+        },
+        {
+          text: '端口',
+          value: 'port',
+          align: 'center'
+        },
+        {
+          text: '最大尝试次数',
+          value: 'attemptsMax',
+          align: 'center'
+        },
+        {
+          text: '已尝试次数',
+          value: 'attemptsCurrent',
+          align: 'center'
+        },
+        {
+          text: '下发状态',
+          value: 'statusName',
+          width: 80,
+          align: 'center'
+        }
+      ], // 显示列
+      multipleSelection: [], // 多选选中项
+      list: [], // 列表数据
+      total: 0, // 数据总数
+      deviceTypeList: [], // 硫化氢配置类型列表
+      deptProps: {
+        parent: 'pid',
+        value: 'id',
+        label: 'name',
+        children: 'children'
+      }, // 权属单位树形下拉菜单
+      deptTreeList: null, // 组织树列表数据
+      showDeptTree: 0, // 是否显示权属单位下拉
+      showDeviceType: true, // 是否显示设备类型下拉
+      listLoading: true, // 加载动画
+      fullscreenLoading: false, // 全屏加载动画
+      editShow: false, // 是否显示编辑框
+      detailShow: false, // 是否显示编辑框
+      filename: 'methane_config_template.xlsx',
+      deptShowTop: false,
+      fileList: []
+    }
+  },
+  created() {
+    this.fetchData()// 获取数据
+  },
+  methods: {
+    // 新增设备
+    add() {
+      this.dialogFormVisible = true
+      this.editShow = true
+      this.$refs.editconfig.initDialog('create', this.dialogFormVisible)
+    },
+    // 编辑硫化氢配置信息
+    edit(row) {
+      this.dialogFormVisible = true
+      this.editShow = true
+      this.$refs.editconfig.initDialog('update', this.dialogFormVisible, row)
+    },
+    // 批量导入硫化氢配置
+    uploadFile(param) {
+      // 判断文件大小是否符合要求
+      const _file = param.file
+      const isLt5M = _file.size / 1024 / 1024 < 5
+      if (!isLt5M) {
+        this.$message.error('请上传5M以下的excel文件')
+        return false
+      }
+      // 全屏加载动画
+      const loading = this.$loading({
+        lock: true,
+        text: '导入中,请稍后...',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
+      })
+      // 发起导入请求
+      batchImportH2sConfig(_file).then(res => {
+        loading.close() // 关闭加载动画
+        if (res.code === 200) {
+          this.$message.success('导入成功')
+          this.fetchData(false)
+        } else {
+          this.$message.error(res.message)
+        }
+      }).catch(() => {
+        loading.close() // 关闭加载动画
+      })
+      this.fileList = []
+    },
+    // 批量导出
+    batchExport() {
+      // 全屏加载动画
+      const loading = this.$loading({
+        lock: true,
+        text: '数据处理中,请稍后...',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
+      })
+      batchExportH2sConfig(this.listQuery).then(res => {
+        loading.close() // 关闭加载动画
+        console.log('download===', res)
+        const blob = new Blob([res.data])
+        const downloadElement = document.createElement('a')
+        const href = window.URL.createObjectURL(blob) // 创建下载的链接
+        downloadElement.href = href
+        downloadElement.download = `硫化氢配置列表.xlsx` // 下载后文件名
+        document.body.appendChild(downloadElement)
+        downloadElement.click() // 点击下载
+        document.body.removeChild(downloadElement) // 下载完成移除元素
+        window.URL.revokeObjectURL(href) // 释放blob对象
+      }).catch((res) => {
+        loading.close()
+        this.$message.error(res.message)
+      })
+    },
+    // 查询数据
+    search() {
+      this.fetchData(false)
+    },
+    // 获取硫化氢配置数据
+    fetchData(isNowPage = true) {
+      this.listLoading = true
+      if (!isNowPage) { // 是否显示当前页，否则跳转第一页
+        this.listQuery.offset = 1
+      }
+      getH2sConfigList(this.listQuery).then(response => {
+        this.list = response.data.rows
+        this.total = parseInt(response.data.total)
+        this.listLoading = false
+      })
+    },
+    indexMethod(index) {
+      return this.listQuery.limit * (this.listQuery.offset - 1) + index + 1
+    },
+    // 改变页容量
+    handleSizeChange(val) {
+      this.listQuery.limit = val
+      this.fetchData()
+    },
+    // 改变当前页
+    handleCurrentChange(val) {
+      this.listQuery.offset = val
+      this.fetchData()
+    },
+    // 多选触发方法
+    handleSelectionChange(val) {
+      this.multipleSelection = val
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .app-container{
+    padding: 10px;
+  }
+  $tableTitleHeight:46px;
+  .table{
+    margin-bottom: 20px;
+  }
+  .pagination-container{
+    margin-bottom: 50px;
+  }
+  .table-title{
+    background-color:rgba(243, 243, 243, 1);
+    height: $tableTitleHeight;
+    .title-header{
+      line-height:$tableTitleHeight;
+      color: #606266;
+      font-size: 15px;
+      i{
+        margin-left: 5px;
+        margin-right: 5px;
+      }
+    }
+  }
+  .edit_btns{
+    .edit_btn{
+      float:right;
+      margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2
+    }
+  }
+</style>
diff --git a/src/views/deviceConfig/components/listTubeConfig.vue b/src/views/deviceConfig/components/listTubeConfig.vue
index 6a054f8..9f27e0e 100644
--- a/src/views/deviceConfig/components/listTubeConfig.vue
+++ b/src/views/deviceConfig/components/listTubeConfig.vue
@@ -77,9 +77,7 @@
 </template>
 
 <script>
-import { judgeTree, toTreeList } from '@/utils/structure'
 import { getTubeConfigList, batchImportTubeConfig, batchExportTubeConfig } from '@/api/config/tubeconfig'
-import { getDeptTreeList } from '@/api/system/dept'
 import EditTubeConfig from './editTubeConfig'
 import DownloadTemplate from '@/components/DownloadTemplate/index'
 import DeptSelect from '@/components/DeptSelect/index'
@@ -167,7 +165,6 @@
     }
   },
   created() {
-    this.fetchDeptTree()// 获取部门树
     this.fetchData()// 获取数据
   },
   methods: {
@@ -263,26 +260,6 @@
         this.listLoading = false
       })
     },
-    // 加载组织机构树形下拉菜单
-    fetchDeptTree: function() {
-      getDeptTreeList().then(response => {
-        if (response.data.list) {
-          if (response.data.list.length > 1) {
-            console.log(this.$store.getters.deptId)
-            if (judgeTree(response.data.list)) {
-              this.deptTreeList = toTreeList(response.data.list)
-              this.showDeptTree = 1
-            } else {
-              this.deptTreeList = response.data.list
-              this.showDeptTree = 2
-            }
-            console.log(this.deptTreeList)
-          } else {
-            this.showDeptTree = 0
-          }
-        }
-      })
-    },
     indexMethod(index) {
       return this.listQuery.limit * (this.listQuery.offset - 1) + index + 1
     },
diff --git a/src/views/deviceConfig/deviceConfig.vue b/src/views/deviceConfig/deviceConfig.vue
index 736c506..5e31573 100644
--- a/src/views/deviceConfig/deviceConfig.vue
+++ b/src/views/deviceConfig/deviceConfig.vue
@@ -2,34 +2,38 @@
   <div class="container">
     <el-tabs v-model="activeName" type="card" @tab-click="handleClick">
       <el-tab-pane v-if="hasPerm('/busConfig/liquidConfig/list')" label="液位监测仪" name="liquid">
-        <list-liquid-config ref="liquidConfig"/>
+        <list-liquid-config ref="liquidConfig" />
       </el-tab-pane>
       <el-tab-pane v-if="hasPerm('/busConfig/gasConfig/list')" label="燃气智能监测终端" name="gas">
-        <list-gas-config ref="gasConfig"/>
+        <list-gas-config ref="gasConfig" />
       </el-tab-pane>
       <el-tab-pane v-if="hasPerm('/busConfig/harmfulConfig/list')" label="有害气体监测仪" name="harmful">
-        <list-harmful-config ref="harmfulConfig"/>
+        <list-harmful-config ref="harmfulConfig" />
       </el-tab-pane>
       <el-tab-pane v-if="hasPerm('/busConfig/tempConfig/list')" label="温湿度监测仪" name="temphumidity">
-        <list-temp-config ref="tempConfig"/>
+        <list-temp-config ref="tempConfig" />
       </el-tab-pane>
       <el-tab-pane v-if="hasPerm('/busConfig/digConfig/list')" label="开挖监测仪" name="dig">
-        <list-dig-config ref="digConfig"/>
+        <list-dig-config ref="digConfig" />
       </el-tab-pane>
       <el-tab-pane v-if="hasPerm('/busConfig/noiseConfig/list')" label="噪声监测仪" name="noise">
-        <list-noise-config ref="noiseConfig"/>
+        <list-noise-config ref="noiseConfig" />
       </el-tab-pane>
       <el-tab-pane v-if="hasPerm('/busConfig/liquidGasConfig/list')" label="燃气智能监测终端(一体化)" name="liquidgas">
-        <list-liquid-gas-config ref="liquidGasConfig"/>
+        <list-liquid-gas-config ref="liquidGasConfig" />
       </el-tab-pane>
       <el-tab-pane v-if="hasPerm('/busConfig/tubeConfig/list')" label="管盯" name="tube">
-        <list-tube-config ref="tubeConfig"/>
+        <list-tube-config ref="tubeConfig" />
+      </el-tab-pane>
+      <el-tab-pane v-if="hasPerm('/busConfig/H2sConfig/list')" label="硫化氢检测终端" name="h2s">
+        <list-h2s-config ref="h2sConfig" />
       </el-tab-pane>
     </el-tabs>
   </div>
 </template>
 
 <script>
+import { hasPermission } from '@/utils/permission'
 import ListLiquidConfig from './components/listLiquidConfig'
 import ListGasConfig from './components/listGasConfig'
 import ListHarmfulConfig from './components/listHarmfulConfig'
@@ -37,11 +41,11 @@
 import ListDigConfig from './components/listDigConfig'
 import ListNoiseConfig from './components/listNoiseConfig'
 import ListLiquidGasConfig from './components/listLiquidGasConfig'
-import { hasPermission } from '@/utils/permission'
 import ListTubeConfig from './components/listTubeConfig'
+import ListH2sConfig from './components/listH2sConfig'
 export default {
   name: 'DeviceConfig',
-  components: { ListTubeConfig, ListLiquidGasConfig, ListNoiseConfig, ListDigConfig, ListTempConfig, ListHarmfulConfig, ListGasConfig, ListLiquidConfig },
+  components: { ListH2sConfig, ListTubeConfig, ListLiquidGasConfig, ListNoiseConfig, ListDigConfig, ListTempConfig, ListHarmfulConfig, ListGasConfig, ListLiquidConfig },
   data() {
     return {
       activeName: 'liquid'
@@ -68,6 +72,8 @@
         this.$refs.liquidGasConfig.fetchData()
       } else if (tab.name === 'tube') {
         this.$refs.tubeConfig.fetchData()
+      } else if (tab.name === 'tube') {
+        this.$refs.h2sConfig.fetchData()
       }
     },
     // 计算那个是当前第一个tab
@@ -88,6 +94,8 @@
         this.activeName = 'liquidgas'
       } else if (hasPermission('/busConfig/tubeConfig/list')) {
         this.activeName = 'tube'
+      } else if (hasPermission('/busConfig/h2sConfig/list')) {
+        this.activeName = 'h2s'
       }
     }
   }
@@ -95,7 +103,5 @@
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-  .container{
-    padding: 5px;
-  }
+
 </style>
diff --git a/src/views/deviceManage/deviceModel/deviceModel.vue b/src/views/deviceManage/deviceModel/deviceModel.vue
index a9f66ee..816c190 100644
--- a/src/views/deviceManage/deviceModel/deviceModel.vue
+++ b/src/views/deviceManage/deviceModel/deviceModel.vue
@@ -26,17 +26,17 @@
     <!--查询结果Table显示-->
     <normal-table ref="table" :data="list" :total="total" :query="listQuery" :columns="columns" :list-loading="listLoading" :pagination="true" :options="tableOptions" size="small" @change="changePage">
       <template slot="btns">
-        <el-button class="edit_btn" size="small" @click="add">
+        <el-button v-if="hasPerm('/deviceModels/add')" class="edit_btn" size="small" @click="add">
           新增
         </el-button>
       </template>
       <template slot="columns">
         <el-table-column label="操作" align="center" width="160">
           <template v-slot="scope">
-            <el-button type="text" size="mini" @click="edit(scope.row)">
+            <el-button v-if="hasPerm('/deviceModels/update')" type="text" size="mini" @click="edit(scope.row)">
               编辑
             </el-button>
-            <el-button type="text" size="mini" @click="del(scope.row)">
+            <el-button v-if="hasPerm('/deviceModels/delete')" type="text" size="mini" @click="del(scope.row)">
               删除
             </el-button>
           </template>
diff --git a/src/views/deviceManage/listDevice.vue b/src/views/deviceManage/listDevice.vue
index 94cbe3f..30fed22 100644
--- a/src/views/deviceManage/listDevice.vue
+++ b/src/views/deviceManage/listDevice.vue
@@ -76,13 +76,13 @@
         </el-table-column>
         <el-table-column label="操作" align="center" width="160">
           <template slot-scope="scope">
-            <el-button type="text" @click="datalist(scope.row)">
+            <el-button type="text" size="small" @click="datalist(scope.row)">
               历史数据
             </el-button>
-            <el-button v-if="hasPerm('/device/update')" type="text" @click="edit(scope.row)">
+            <el-button v-if="hasPerm('/device/update')" type="text" size="small" @click="edit(scope.row)">
               编辑
             </el-button>
-            <el-button type="text" @click="detail(scope.row)">
+            <el-button type="text" size="small" @click="detail(scope.row)">
               详情
             </el-button>
           </template>
diff --git a/src/views/system/dept/editDept.vue b/src/views/system/dept/editDept.vue
index 203d542..aebe0a7 100644
--- a/src/views/system/dept/editDept.vue
+++ b/src/views/system/dept/editDept.vue
@@ -16,7 +16,7 @@
       <el-row :gutter="20">
         <el-col :span="12">
           <el-form-item label="父组织" prop="pid">
-            <dept-select ref="deptSelect" v-model="deptForm.pid" :dept-show="true" placeholder="请选择父组织" />
+            <dept-select ref="deptSelect" v-model="deptForm.pid" :dept-show="true" placeholder="请选择父组织" size="normal" />
           </el-form-item>
         </el-col>
         <el-col :span="12">
diff --git a/src/views/system/tenant/components/relateDept.vue b/src/views/system/tenant/components/relateDept.vue
index 83e044d..0d9208a 100644
--- a/src/views/system/tenant/components/relateDept.vue
+++ b/src/views/system/tenant/components/relateDept.vue
@@ -74,7 +74,6 @@
     saveData() {
       this.$refs['dataForm'].validate((valid) => {
         if (valid) {
-          debugger
           relatedDept(this.dataForm).then(res => {
             if (res.code === 200) {
               this.$message.success('绑定成功')

diff --git a/src/api/config/h2sconfig.js b/src/api/config/h2sconfig.js
new file mode 100644
index 0000000..f441692
--- /dev/null
+++ b/src/api/config/h2sconfig.js
@@ -0,0 +1,42 @@
+/**
+ * 硫化氢配置接口
+ */
+import request from '@/utils/request'
+// 硫化氢配置查询
+export function getH2sConfigList(params) {
+  return request({
+    url: 'busConfig/H2sConfig/list',
+    method: 'get',
+    params
+  })
+}
+
+// 修改硫化氢配置
+export function editH2sConfig(params) {
+  return request({
+    url: 'busConfig/H2sConfig/config',
+    method: 'post',
+    params
+  })
+}
+
+// 批量导入
+export function batchImportH2sConfig(fileobj) {
+  const param = new FormData()
+  param.append('file', fileobj)
+  return request({
+    url: 'busConfig/H2sConfig/batchImport',
+    method: 'post',
+    headers: { 'Content-Type': 'multipart/form-data' },
+    data: param
+  })
+}
+// 批量导出
+export function batchExportH2sConfig(params) {
+  return request({
+    url: 'busConfig/H2sConfig/batchExport',
+    method: 'get',
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
diff --git a/src/components/Amap/utils/convert-helper.js b/src/components/Amap/utils/convert-helper.js
index ab7a8d2..6b61377 100644
--- a/src/components/Amap/utils/convert-helper.js
+++ b/src/components/Amap/utils/convert-helper.js
@@ -76,7 +76,6 @@
     AMapLoader.load({
       key: store.getters.amapKey // 秘钥
     }).then((AMap) => {
-      // debugger
       AMap.convertFrom(coordinate, 'gps', (status, result) => {
         if (result.info === 'ok') {
           const lnglats = result.locations[0]
diff --git a/src/permission.js b/src/permission.js
index 0f332ec..52f5108 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -33,7 +33,6 @@
     const oldUser = getUser()
     const username = to.query.username
     const password = to.query.pwd
-    // debugger
     if (loginByUsername && username && password && !oldUser) { // 登陆后跳转
       const loginForm = {
         username: username,
diff --git a/src/views/dataView/components/panelGroup.vue b/src/views/dataView/components/panelGroup.vue
index 7cae96f..49ee723 100644
--- a/src/views/dataView/components/panelGroup.vue
+++ b/src/views/dataView/components/panelGroup.vue
@@ -120,7 +120,6 @@
       const endTime = new Date().Format('yyyy-MM-dd hh:mm:ss')
       const params = { beginTime, endTime }
       dataCount(params).then(response => {
-        debugger
         this.dataGroup[2].context = response.data.total
       })
     }
diff --git a/src/views/deviceConfig/components/editGasConfig.vue b/src/views/deviceConfig/components/editGasConfig.vue
index 07659cf..0f33004 100644
--- a/src/views/deviceConfig/components/editGasConfig.vue
+++ b/src/views/deviceConfig/components/editGasConfig.vue
@@ -155,8 +155,8 @@
       configForm: {
         id: '', // config id
         deviceId: '', // 设备id
-        collectInterval: '', // 报警阈值
-        uploadPeriod: '', // 安装高度
+        collectInterval: '', // 采集间隔
+        uploadPeriod: '', // 上传周期
         retryTimes: '3', // 重传次数
         attemptsMax: '3', // 最大尝试次数
         ip: '', // ip地址
diff --git a/src/views/deviceConfig/components/editH2sConfig.vue b/src/views/deviceConfig/components/editH2sConfig.vue
new file mode 100644
index 0000000..8902fdd
--- /dev/null
+++ b/src/views/deviceConfig/components/editH2sConfig.vue
@@ -0,0 +1,291 @@
+<template>
+  <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" append-to-body>
+    <el-form ref="dataForm" :rules="rules" :model="configForm" label-well-code="right" label-width="110px">
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item v-if="dialogStatus=='create'" label="设备编号" prop="deviceId">
+            <el-select
+              v-model="configForm.deviceId"
+              :loading="loading"
+              :disabled="dialogStatus=='update'?true:false"
+              filterable
+              placeholder="请输入设备编号"
+            >
+              <el-option
+                v-for="item in devices"
+                :key="item.id"
+                :label="item.devcode"
+                :value="item.id"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item v-if="dialogStatus=='update'" label="设备编号">
+            <el-input v-model="deviceForm.devcode" type="text" placeholder="未知" disabled />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item v-if="deviceForm.deviceName!=''" label="设备名称">
+            <el-input v-model="deviceForm.deviceName" type="text" placeholder="未知" disabled />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item v-if="deviceForm.deviceTypeName!=''" label="设备类型" prop="deviceType">
+            <el-input v-model="deviceForm.deviceTypeName" type="text" placeholder="未知" disabled />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item v-if="deviceForm.deptName!=''" label="权属单位" prop="deptName">
+            <el-input v-model="deviceForm.deptName" type="text" placeholder="未知" disabled />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="重传次数" prop="retryTimes">
+            <el-input-number v-model="configForm.retryTimes" :min="1" :max="9" type="text" placeholder="必填" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="采集间隔(分)" prop="collectInterval">
+            <el-input v-model.trim="configForm.collectInterval" type="text" placeholder="必填" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="上传周期(分)" prop="uploadPeriod">
+            <el-input v-model.trim="configForm.uploadPeriod" type="text" placeholder="必填" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="最大尝试次数">
+            <el-input-number v-model="configForm.attemptsMax" :min="1" :max="100" type="text" placeholder="必填" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row v-if="showIp" :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="ip地址" prop="ip">
+            <el-input v-model.trim="configForm.ip" type="text" placeholder="非必填" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="端口号" prop="port">
+            <el-input v-model.trim="configForm.port" type="text" placeholder="非必填" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <div slot="footer" class="dialog-footer">
+      <el-button :disabled="!canEdit" type="primary" @click="saveData">
+        保存
+      </el-button>
+      <el-button @click="cancel">
+        取消
+      </el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { editH2sConfig } from '@/api/config/h2sconfig'
+import { getDeviceSimpleList } from '@/api/config/liquidconfig'
+import { validateFloatPlus } from '@/utils/validate'
+export default {
+  name: 'EditH2sConfig',
+  data() {
+    const validateIp = (rule, value, callback) => {
+      if (value !== '') {
+        if ((/((25[0-5]|2[0-4]\d|((1\d{2})|([1-9]?\d)))\.){3}(25[0-5]|2[0-4]\d|((1\d{2})|([1-9]?\d)))/).test(value) === false) {
+          callback(new Error('请填写正确的ip地址'))
+        } else {
+          callback()
+        }
+      } else {
+        // callback(new Error('ip地址不能为空'))
+        callback()
+      }
+    }
+    const validatePort = (rule, value, callback) => {
+      if (value !== '') {
+        if ((/[1-9]$|(^[1-9][0-9]$)|(^[1-9][0-9][0-9]$)|(^[1-9][0-9][0-9][0-9]$)|(^[1-6][0-5][0-5][0-3][0-5]$)/).test(value) === false) {
+          callback(new Error('请填写正确的端口号'))
+        } else {
+          callback()
+        }
+      } else {
+        // callback(new Error('端口号不能为空'))
+        callback()
+      }
+    }
+    const validateCollectCycle = (rule, value, callback) => {
+      if (value !== '') {
+        if (validateFloatPlus(value, 5, 1440) === true) {
+          callback()
+        } else {
+          callback(new Error('请填写5到1440数值'))
+        }
+      } else {
+        callback(new Error('采集间隔不能为空'))
+      }
+    }
+    const validateUpPeriod = (rule, value, callback) => {
+      if (value !== '') {
+        if (validateFloatPlus(value, 0, 10080) === true) {
+          callback()
+        } else {
+          callback(new Error('请填写0到10080之间数值'))
+        }
+      } else {
+        callback(new Error('上传周期不能为空'))
+      }
+    }
+    return {
+      dialogFormVisible: false, // 对话框是否显示
+      dialogStatus: '', // 对话框类型：create,update
+      deviceForm: {
+        deviceName: '',
+        deviceTypeName: '',
+        deptName: '',
+        devcode: '',
+        deviceType: ''
+      }, // 设备基本信息
+      configForm: {
+        id: '', // config id
+        deviceId: '', // 设备id
+        collectInterval: '', // 采集间隔
+        uploadPeriod: '', // 上传周期
+        retryTimes: '3', // 重传次数
+        attemptsMax: '3', // 最大尝试次数
+        ip: '', // ip地址
+        port: '' // 端口号
+      },
+      textMap: {
+        update: '编辑',
+        create: '新增'
+      }, // 表头显示标题
+      devices: [], // 设备下拉选择列表
+      loading: false, // 加载动画是否显示
+      canEdit: true, // 是否允许点击保存按钮
+      rules: {
+        collectInterval: [{ required: true, trigger: ['blur', 'change'], validator: validateCollectCycle }],
+        uploadPeriod: [{ required: true, trigger: ['blur', 'change'], validator: validateUpPeriod }],
+        deviceId: [{ required: true, message: '设备编号不能为空', trigger: ['blur', 'change'] }],
+        ip: [{ trigger: ['blur', 'change'], validator: validateIp }],
+        port: [{ trigger: ['blur', 'change'], validator: validatePort }]
+      } // 前端校验规则
+    }
+  },
+  computed: {
+    watchDeviceId() { // 监控权属单位变化
+      return this.configForm.deviceId
+    },
+    showIp() { // 是否显示ip配置
+      return true
+    }
+  },
+  watch: {
+    watchDeviceId(newValue, oldValue) {
+      for (const device of this.devices) {
+        if (device.id === newValue) {
+          this.deviceForm.deviceTypeName = device.deviceTypeName
+          this.deviceForm.deptName = device.deptName
+          this.deviceForm.deviceName = device.deviceName
+          return
+        }
+      }
+    }
+  },
+  methods: {
+    // 初始化对话框
+    initDialog: function(dialogStatus, dialogFormVisible, row = null) {
+      this.dialogStatus = dialogStatus
+      this.dialogFormVisible = dialogFormVisible
+      this.canEdit = true
+      if (dialogStatus === 'create') { // 如果是新增，清除验证
+        this.resetForm()
+        this.fetchDevice()
+        this.$nextTick(() => {
+          this.$refs['dataForm'].clearValidate()
+        })
+      } else if (dialogStatus === 'update') { // 如果是修改，将row中数据填写到输入框中
+        this.deviceForm = {
+          deviceName: row.deviceName,
+          devcode: row.devcode,
+          deptName: row.deptName,
+          deviceType: row.deviceType,
+          deviceTypeName: row.deviceTypeName
+        }
+        this.configForm = {
+          id: row.id,
+          deviceId: row.deviceId, // 设备id
+          collectInterval: row.collectInterval, // 采集间隔
+          uploadPeriod: row.uploadPeriod, // 上传周期
+          retryTimes: row.retryTimes, // 重传次数
+          ip: row.ip, // ip地址
+          port: row.port, // 端口号
+          attemptsMax: row.attemptsMax // 最大尝试次数
+        }
+      }
+    },
+    // 重置表单
+    resetForm() {
+      this.deviceForm = {
+        deviceName: '',
+        deviceTypeName: '',
+        deptName: '',
+        devcode: ''
+      }
+      this.configForm = {
+        deviceId: '', // 设备id
+        collectInterval: '', // 采集间隔
+        uploadPeriod: '', // 上传周期
+        retryTimes: '3', // 重传次数
+        ip: '', // ip地址
+        port: '', // 端口号
+        attemptsMax: '3' // 最大尝试次数
+      }
+    },
+    // 保存数据
+    saveData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          this.canEdit = false
+          editH2sConfig(this.configForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('配置成功')
+              this.$emit('watchChild')
+              this.dialogFormVisible = false
+            }
+            this.canEdit = false
+          }).catch(_ => {
+            this.canEdit = true
+          })
+        }
+      })
+    },
+    fetchDevice() {
+      this.loading = true
+      getDeviceSimpleList('14', '0').then(response => {
+        this.loading = false
+        this.devices = response.data
+      })
+    },
+    cancel: function() {
+      this.dialogFormVisible = false
+      this.$emit('watchChild')
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .el-select{
+    width: 100%;
+  }
+  .el-input-number{
+    width: 100%;
+  }
+</style>
diff --git a/src/views/deviceConfig/components/editLiquidConfig.vue b/src/views/deviceConfig/components/editLiquidConfig.vue
index 6be88e3..19557de 100644
--- a/src/views/deviceConfig/components/editLiquidConfig.vue
+++ b/src/views/deviceConfig/components/editLiquidConfig.vue
@@ -188,7 +188,6 @@
   watch: {
     watchDeviceId(newValue, oldValue) {
       for (const device of this.devices) {
-        debugger
         if (device.id === newValue) {
           this.deviceForm.deviceTypeName = device.deviceTypeName
           this.deviceForm.deptName = device.deptName
diff --git a/src/views/deviceConfig/components/editTubeConfig.vue b/src/views/deviceConfig/components/editTubeConfig.vue
index 171991a..468014e 100644
--- a/src/views/deviceConfig/components/editTubeConfig.vue
+++ b/src/views/deviceConfig/components/editTubeConfig.vue
@@ -155,8 +155,8 @@
       configForm: {
         id: '', // config id
         deviceId: '', // 设备id
-        collectInterval: '', // 报警阈值
-        uploadPeriod: '', // 安装高度
+        collectInterval: '', // 采集间隔
+        uploadPeriod: '', // 上传周期
         retryTimes: '3', // 重传次数
         attemptsMax: '3', // 最大尝试次数
         ip: '', // ip地址
diff --git a/src/views/deviceConfig/components/listH2sConfig.vue b/src/views/deviceConfig/components/listH2sConfig.vue
new file mode 100644
index 0000000..3555e1e
--- /dev/null
+++ b/src/views/deviceConfig/components/listH2sConfig.vue
@@ -0,0 +1,310 @@
+<template>
+  <app-container>
+    <search-area size="small" @search="search">
+      <search-item>
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="设备编号" clearable />
+      </search-item>
+      <search-item>
+        <dept-select
+          v-model="listQuery.deptid"
+          :need-top="deptShowTop"
+          dept-type="03"
+          placeholder="选择权属单位"
+        />
+      </search-item>
+    </search-area>
+    <!--查询结果Table显示-->
+    <div>
+      <el-row class="table-title">
+        <el-col :span="6">
+          <div class="title-header">
+            <i class="el-icon-menu" />数据列表
+          </div>
+        </el-col>
+        <el-col :span="12" :offset="6" class="edit_btns">
+          <el-button v-if="hasPerm('/busConfig/H2sConfig/batchExport')" class="edit_btn" size="small" @click="batchExport">
+            导出记录
+          </el-button>
+          <download-template :filename="filename" />
+          <el-upload
+            v-if="hasPerm('/busConfig/H2sConfig/batchImport')"
+            :limit="1"
+            :show-file-list="false"
+            :http-request="uploadFile"
+            :file-list="fileList"
+            action="string"
+            accept=".xls,.xlsx"
+            class="edit_btn"
+          >
+            <el-button v-if="hasPerm('/busConfig/H2sConfig/batchImport')" slot="trigger" size="small">
+              批量导入
+            </el-button>
+          </el-upload>
+          <el-button v-if="hasPerm('/busConfig/H2sConfig/config')" class="edit_btn" size="small" @click="add">
+            新增
+          </el-button>
+        </el-col>
+      </el-row>
+      <el-table v-loading="listLoading" :data="list" class="table" border @selection-change="handleSelectionChange">
+        <!--<el-table-column align="center" type="selection" width="55"/>-->
+        <el-table-column :index="indexMethod" align="center" type="index" />
+        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
+          <template slot-scope="scope">
+            {{ scope.row[column.value] }}
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" align="center" width="60">
+          <template slot-scope="scope">
+            <el-button type="text" @click="edit(scope.row)">
+              编辑
+            </el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+    </div>
+    <!--分页-->
+    <div class="pagination-container">
+      <el-pagination
+        v-show="total>listQuery.limit"
+        :current-page="listQuery.offset"
+        :page-sizes="[20,30,50]"
+        :page-size="listQuery.limit"
+        :total="total"
+        align="center"
+        layout="total, sizes, prev, pager, next"
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"
+      />
+    </div>
+    <edit-h2s-config v-show="editShow" ref="editconfig" @watchChild="fetchData" />
+  </app-container>
+</template>
+
+<script>
+import { getH2sConfigList, batchImportH2sConfig, batchExportH2sConfig } from '@/api/config/h2sconfig'
+import EditH2sConfig from './editH2sConfig'
+import DownloadTemplate from '@/components/DownloadTemplate/index'
+import DeptSelect from '@/components/DeptSelect/index'
+
+export default {
+  name: 'ListH2sConfig',
+  components: { DeptSelect, DownloadTemplate, EditH2sConfig },
+  data() {
+    return {
+      listQuery: {
+        keywords: '',
+        offset: 1,
+        limit: 20,
+        sort: '',
+        order: ''
+      }, // 筛选条件
+      columns: [
+        {
+          text: '设备编号',
+          value: 'devcode',
+          align: 'center'
+        },
+        {
+          text: '重传次数',
+          value: 'retryTimes',
+          align: 'center'
+        },
+        {
+          text: '采集间隔(分)',
+          value: 'collectInterval',
+          align: 'center'
+        },
+        {
+          text: '上传周期',
+          value: 'uploadPeriod',
+          align: 'center'
+        },
+        {
+          text: 'IP地址',
+          value: 'ip',
+          align: 'center'
+        },
+        {
+          text: '端口',
+          value: 'port',
+          align: 'center'
+        },
+        {
+          text: '最大尝试次数',
+          value: 'attemptsMax',
+          align: 'center'
+        },
+        {
+          text: '已尝试次数',
+          value: 'attemptsCurrent',
+          align: 'center'
+        },
+        {
+          text: '下发状态',
+          value: 'statusName',
+          width: 80,
+          align: 'center'
+        }
+      ], // 显示列
+      multipleSelection: [], // 多选选中项
+      list: [], // 列表数据
+      total: 0, // 数据总数
+      deviceTypeList: [], // 硫化氢配置类型列表
+      deptProps: {
+        parent: 'pid',
+        value: 'id',
+        label: 'name',
+        children: 'children'
+      }, // 权属单位树形下拉菜单
+      deptTreeList: null, // 组织树列表数据
+      showDeptTree: 0, // 是否显示权属单位下拉
+      showDeviceType: true, // 是否显示设备类型下拉
+      listLoading: true, // 加载动画
+      fullscreenLoading: false, // 全屏加载动画
+      editShow: false, // 是否显示编辑框
+      detailShow: false, // 是否显示编辑框
+      filename: 'methane_config_template.xlsx',
+      deptShowTop: false,
+      fileList: []
+    }
+  },
+  created() {
+    this.fetchData()// 获取数据
+  },
+  methods: {
+    // 新增设备
+    add() {
+      this.dialogFormVisible = true
+      this.editShow = true
+      this.$refs.editconfig.initDialog('create', this.dialogFormVisible)
+    },
+    // 编辑硫化氢配置信息
+    edit(row) {
+      this.dialogFormVisible = true
+      this.editShow = true
+      this.$refs.editconfig.initDialog('update', this.dialogFormVisible, row)
+    },
+    // 批量导入硫化氢配置
+    uploadFile(param) {
+      // 判断文件大小是否符合要求
+      const _file = param.file
+      const isLt5M = _file.size / 1024 / 1024 < 5
+      if (!isLt5M) {
+        this.$message.error('请上传5M以下的excel文件')
+        return false
+      }
+      // 全屏加载动画
+      const loading = this.$loading({
+        lock: true,
+        text: '导入中,请稍后...',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
+      })
+      // 发起导入请求
+      batchImportH2sConfig(_file).then(res => {
+        loading.close() // 关闭加载动画
+        if (res.code === 200) {
+          this.$message.success('导入成功')
+          this.fetchData(false)
+        } else {
+          this.$message.error(res.message)
+        }
+      }).catch(() => {
+        loading.close() // 关闭加载动画
+      })
+      this.fileList = []
+    },
+    // 批量导出
+    batchExport() {
+      // 全屏加载动画
+      const loading = this.$loading({
+        lock: true,
+        text: '数据处理中,请稍后...',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
+      })
+      batchExportH2sConfig(this.listQuery).then(res => {
+        loading.close() // 关闭加载动画
+        console.log('download===', res)
+        const blob = new Blob([res.data])
+        const downloadElement = document.createElement('a')
+        const href = window.URL.createObjectURL(blob) // 创建下载的链接
+        downloadElement.href = href
+        downloadElement.download = `硫化氢配置列表.xlsx` // 下载后文件名
+        document.body.appendChild(downloadElement)
+        downloadElement.click() // 点击下载
+        document.body.removeChild(downloadElement) // 下载完成移除元素
+        window.URL.revokeObjectURL(href) // 释放blob对象
+      }).catch((res) => {
+        loading.close()
+        this.$message.error(res.message)
+      })
+    },
+    // 查询数据
+    search() {
+      this.fetchData(false)
+    },
+    // 获取硫化氢配置数据
+    fetchData(isNowPage = true) {
+      this.listLoading = true
+      if (!isNowPage) { // 是否显示当前页，否则跳转第一页
+        this.listQuery.offset = 1
+      }
+      getH2sConfigList(this.listQuery).then(response => {
+        this.list = response.data.rows
+        this.total = parseInt(response.data.total)
+        this.listLoading = false
+      })
+    },
+    indexMethod(index) {
+      return this.listQuery.limit * (this.listQuery.offset - 1) + index + 1
+    },
+    // 改变页容量
+    handleSizeChange(val) {
+      this.listQuery.limit = val
+      this.fetchData()
+    },
+    // 改变当前页
+    handleCurrentChange(val) {
+      this.listQuery.offset = val
+      this.fetchData()
+    },
+    // 多选触发方法
+    handleSelectionChange(val) {
+      this.multipleSelection = val
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .app-container{
+    padding: 10px;
+  }
+  $tableTitleHeight:46px;
+  .table{
+    margin-bottom: 20px;
+  }
+  .pagination-container{
+    margin-bottom: 50px;
+  }
+  .table-title{
+    background-color:rgba(243, 243, 243, 1);
+    height: $tableTitleHeight;
+    .title-header{
+      line-height:$tableTitleHeight;
+      color: #606266;
+      font-size: 15px;
+      i{
+        margin-left: 5px;
+        margin-right: 5px;
+      }
+    }
+  }
+  .edit_btns{
+    .edit_btn{
+      float:right;
+      margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2
+    }
+  }
+</style>
diff --git a/src/views/deviceConfig/components/listTubeConfig.vue b/src/views/deviceConfig/components/listTubeConfig.vue
index 6a054f8..9f27e0e 100644
--- a/src/views/deviceConfig/components/listTubeConfig.vue
+++ b/src/views/deviceConfig/components/listTubeConfig.vue
@@ -77,9 +77,7 @@
 </template>
 
 <script>
-import { judgeTree, toTreeList } from '@/utils/structure'
 import { getTubeConfigList, batchImportTubeConfig, batchExportTubeConfig } from '@/api/config/tubeconfig'
-import { getDeptTreeList } from '@/api/system/dept'
 import EditTubeConfig from './editTubeConfig'
 import DownloadTemplate from '@/components/DownloadTemplate/index'
 import DeptSelect from '@/components/DeptSelect/index'
@@ -167,7 +165,6 @@
     }
   },
   created() {
-    this.fetchDeptTree()// 获取部门树
     this.fetchData()// 获取数据
   },
   methods: {
@@ -263,26 +260,6 @@
         this.listLoading = false
       })
     },
-    // 加载组织机构树形下拉菜单
-    fetchDeptTree: function() {
-      getDeptTreeList().then(response => {
-        if (response.data.list) {
-          if (response.data.list.length > 1) {
-            console.log(this.$store.getters.deptId)
-            if (judgeTree(response.data.list)) {
-              this.deptTreeList = toTreeList(response.data.list)
-              this.showDeptTree = 1
-            } else {
-              this.deptTreeList = response.data.list
-              this.showDeptTree = 2
-            }
-            console.log(this.deptTreeList)
-          } else {
-            this.showDeptTree = 0
-          }
-        }
-      })
-    },
     indexMethod(index) {
       return this.listQuery.limit * (this.listQuery.offset - 1) + index + 1
     },
diff --git a/src/views/deviceConfig/deviceConfig.vue b/src/views/deviceConfig/deviceConfig.vue
index 736c506..5e31573 100644
--- a/src/views/deviceConfig/deviceConfig.vue
+++ b/src/views/deviceConfig/deviceConfig.vue
@@ -2,34 +2,38 @@
   <div class="container">
     <el-tabs v-model="activeName" type="card" @tab-click="handleClick">
       <el-tab-pane v-if="hasPerm('/busConfig/liquidConfig/list')" label="液位监测仪" name="liquid">
-        <list-liquid-config ref="liquidConfig"/>
+        <list-liquid-config ref="liquidConfig" />
       </el-tab-pane>
       <el-tab-pane v-if="hasPerm('/busConfig/gasConfig/list')" label="燃气智能监测终端" name="gas">
-        <list-gas-config ref="gasConfig"/>
+        <list-gas-config ref="gasConfig" />
       </el-tab-pane>
       <el-tab-pane v-if="hasPerm('/busConfig/harmfulConfig/list')" label="有害气体监测仪" name="harmful">
-        <list-harmful-config ref="harmfulConfig"/>
+        <list-harmful-config ref="harmfulConfig" />
       </el-tab-pane>
       <el-tab-pane v-if="hasPerm('/busConfig/tempConfig/list')" label="温湿度监测仪" name="temphumidity">
-        <list-temp-config ref="tempConfig"/>
+        <list-temp-config ref="tempConfig" />
       </el-tab-pane>
       <el-tab-pane v-if="hasPerm('/busConfig/digConfig/list')" label="开挖监测仪" name="dig">
-        <list-dig-config ref="digConfig"/>
+        <list-dig-config ref="digConfig" />
       </el-tab-pane>
       <el-tab-pane v-if="hasPerm('/busConfig/noiseConfig/list')" label="噪声监测仪" name="noise">
-        <list-noise-config ref="noiseConfig"/>
+        <list-noise-config ref="noiseConfig" />
       </el-tab-pane>
       <el-tab-pane v-if="hasPerm('/busConfig/liquidGasConfig/list')" label="燃气智能监测终端(一体化)" name="liquidgas">
-        <list-liquid-gas-config ref="liquidGasConfig"/>
+        <list-liquid-gas-config ref="liquidGasConfig" />
       </el-tab-pane>
       <el-tab-pane v-if="hasPerm('/busConfig/tubeConfig/list')" label="管盯" name="tube">
-        <list-tube-config ref="tubeConfig"/>
+        <list-tube-config ref="tubeConfig" />
+      </el-tab-pane>
+      <el-tab-pane v-if="hasPerm('/busConfig/H2sConfig/list')" label="硫化氢检测终端" name="h2s">
+        <list-h2s-config ref="h2sConfig" />
       </el-tab-pane>
     </el-tabs>
   </div>
 </template>
 
 <script>
+import { hasPermission } from '@/utils/permission'
 import ListLiquidConfig from './components/listLiquidConfig'
 import ListGasConfig from './components/listGasConfig'
 import ListHarmfulConfig from './components/listHarmfulConfig'
@@ -37,11 +41,11 @@
 import ListDigConfig from './components/listDigConfig'
 import ListNoiseConfig from './components/listNoiseConfig'
 import ListLiquidGasConfig from './components/listLiquidGasConfig'
-import { hasPermission } from '@/utils/permission'
 import ListTubeConfig from './components/listTubeConfig'
+import ListH2sConfig from './components/listH2sConfig'
 export default {
   name: 'DeviceConfig',
-  components: { ListTubeConfig, ListLiquidGasConfig, ListNoiseConfig, ListDigConfig, ListTempConfig, ListHarmfulConfig, ListGasConfig, ListLiquidConfig },
+  components: { ListH2sConfig, ListTubeConfig, ListLiquidGasConfig, ListNoiseConfig, ListDigConfig, ListTempConfig, ListHarmfulConfig, ListGasConfig, ListLiquidConfig },
   data() {
     return {
       activeName: 'liquid'
@@ -68,6 +72,8 @@
         this.$refs.liquidGasConfig.fetchData()
       } else if (tab.name === 'tube') {
         this.$refs.tubeConfig.fetchData()
+      } else if (tab.name === 'tube') {
+        this.$refs.h2sConfig.fetchData()
       }
     },
     // 计算那个是当前第一个tab
@@ -88,6 +94,8 @@
         this.activeName = 'liquidgas'
       } else if (hasPermission('/busConfig/tubeConfig/list')) {
         this.activeName = 'tube'
+      } else if (hasPermission('/busConfig/h2sConfig/list')) {
+        this.activeName = 'h2s'
       }
     }
   }
@@ -95,7 +103,5 @@
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-  .container{
-    padding: 5px;
-  }
+
 </style>
diff --git a/src/views/deviceManage/deviceModel/deviceModel.vue b/src/views/deviceManage/deviceModel/deviceModel.vue
index a9f66ee..816c190 100644
--- a/src/views/deviceManage/deviceModel/deviceModel.vue
+++ b/src/views/deviceManage/deviceModel/deviceModel.vue
@@ -26,17 +26,17 @@
     <!--查询结果Table显示-->
     <normal-table ref="table" :data="list" :total="total" :query="listQuery" :columns="columns" :list-loading="listLoading" :pagination="true" :options="tableOptions" size="small" @change="changePage">
       <template slot="btns">
-        <el-button class="edit_btn" size="small" @click="add">
+        <el-button v-if="hasPerm('/deviceModels/add')" class="edit_btn" size="small" @click="add">
           新增
         </el-button>
       </template>
       <template slot="columns">
         <el-table-column label="操作" align="center" width="160">
           <template v-slot="scope">
-            <el-button type="text" size="mini" @click="edit(scope.row)">
+            <el-button v-if="hasPerm('/deviceModels/update')" type="text" size="mini" @click="edit(scope.row)">
               编辑
             </el-button>
-            <el-button type="text" size="mini" @click="del(scope.row)">
+            <el-button v-if="hasPerm('/deviceModels/delete')" type="text" size="mini" @click="del(scope.row)">
               删除
             </el-button>
           </template>
diff --git a/src/views/deviceManage/listDevice.vue b/src/views/deviceManage/listDevice.vue
index 94cbe3f..30fed22 100644
--- a/src/views/deviceManage/listDevice.vue
+++ b/src/views/deviceManage/listDevice.vue
@@ -76,13 +76,13 @@
         </el-table-column>
         <el-table-column label="操作" align="center" width="160">
           <template slot-scope="scope">
-            <el-button type="text" @click="datalist(scope.row)">
+            <el-button type="text" size="small" @click="datalist(scope.row)">
               历史数据
             </el-button>
-            <el-button v-if="hasPerm('/device/update')" type="text" @click="edit(scope.row)">
+            <el-button v-if="hasPerm('/device/update')" type="text" size="small" @click="edit(scope.row)">
               编辑
             </el-button>
-            <el-button type="text" @click="detail(scope.row)">
+            <el-button type="text" size="small" @click="detail(scope.row)">
               详情
             </el-button>
           </template>
diff --git a/src/views/system/dept/editDept.vue b/src/views/system/dept/editDept.vue
index 203d542..aebe0a7 100644
--- a/src/views/system/dept/editDept.vue
+++ b/src/views/system/dept/editDept.vue
@@ -16,7 +16,7 @@
       <el-row :gutter="20">
         <el-col :span="12">
           <el-form-item label="父组织" prop="pid">
-            <dept-select ref="deptSelect" v-model="deptForm.pid" :dept-show="true" placeholder="请选择父组织" />
+            <dept-select ref="deptSelect" v-model="deptForm.pid" :dept-show="true" placeholder="请选择父组织" size="normal" />
           </el-form-item>
         </el-col>
         <el-col :span="12">
diff --git a/src/views/system/tenant/components/relateDept.vue b/src/views/system/tenant/components/relateDept.vue
index 83e044d..0d9208a 100644
--- a/src/views/system/tenant/components/relateDept.vue
+++ b/src/views/system/tenant/components/relateDept.vue
@@ -74,7 +74,6 @@
     saveData() {
       this.$refs['dataForm'].validate((valid) => {
         if (valid) {
-          debugger
           relatedDept(this.dataForm).then(res => {
             if (res.code === 200) {
               this.$message.success('绑定成功')
diff --git a/src/views/wellManage/addWell.vue b/src/views/wellManage/addWell.vue
index dbe9e84..b16b63e 100644
--- a/src/views/wellManage/addWell.vue
+++ b/src/views/wellManage/addWell.vue
@@ -83,7 +83,7 @@
         </el-col>
       </el-row>
       <el-row :gutter="1">
-        <el-form-item label="所在区域" required>
+        <el-form-item label="所在区域">
           <el-col :span="5">
             <el-form-item prop="qu">
               <el-select v-model="wellForm.qu" :disabled="showArea" placeholder="请选择所在区/县" clearable>
@@ -116,6 +116,13 @@
           </el-col>
         </el-form-item>
       </el-row>
+      <el-row :gutter="1">
+        <el-col :span="15">
+          <el-form-item label="所在道路" prop="road">
+            <el-input v-model.trim="wellForm.road" type="text" placeholder="非必填，建议填写，不填影响统计结果" />
+          </el-form-item>
+        </el-col>
+      </el-row>
       <el-row :gutter="20">
         <el-col :span="15">
           <el-form-item label="详细地址" prop="position">
@@ -220,8 +227,9 @@
         latGaode: '', // 高德纬度
         photos: '', // 照片路径
         notes: '', // 备注,
-        qu: '',
+        qu: '', // 区
         area: '', // 街道
+        road: '', // 道路
         responsibleDept: '' // 维护人员部门
       }, // 表单
       deptProps: {
@@ -250,9 +258,9 @@
         coordinateX: [{ required: true, trigger: ['blur', 'change'], validator: validateLat }],
         coordinateY: [{ required: true, trigger: ['blur', 'change'], validator: validateLng }],
         deptid: [{ required: true, message: '组织机构必选', trigger: 'change' }],
-        wellType: [{ required: true, message: '点位类型必选', trigger: 'change' }],
-        qu: [{ required: true, message: '所在区/县必选', trigger: 'change' }],
-        area: [{ required: true, message: '所在街道/镇必选', trigger: 'change' }]
+        wellType: [{ required: true, message: '点位类型必选', trigger: 'change' }]
+        // qu: [{ required: true, message: '所在区/县必选', trigger: 'change' }],
+        // area: [{ required: true, message: '所在街道/镇必选', trigger: 'change' }]
       },
       uploadPath: this.baseConfig.baseUrl + '/imageUpload', // 图片上传路径
       dialogImageUrl: '',
@@ -337,8 +345,9 @@
         convertLnglat([this.wellForm.coordinateX, this.wellForm.coordinateY]).then(lnglat => {
           // 2.逆地址解析
           reverseLnglat(lnglat).then(res => {
-            this.wellForm.position = res.formattedAddress
-            this.wellForm.qu = res.addressComponent.adcode
+            this.wellForm.position = res.formattedAddress // 完整地址
+            this.wellForm.qu = res.addressComponent.adcode // 区编码
+            this.wellForm.road = res.addressComponent.street // 道路
           })
         })
       }

diff --git a/src/api/config/h2sconfig.js b/src/api/config/h2sconfig.js
new file mode 100644
index 0000000..f441692
--- /dev/null
+++ b/src/api/config/h2sconfig.js
@@ -0,0 +1,42 @@
+/**
+ * 硫化氢配置接口
+ */
+import request from '@/utils/request'
+// 硫化氢配置查询
+export function getH2sConfigList(params) {
+  return request({
+    url: 'busConfig/H2sConfig/list',
+    method: 'get',
+    params
+  })
+}
+
+// 修改硫化氢配置
+export function editH2sConfig(params) {
+  return request({
+    url: 'busConfig/H2sConfig/config',
+    method: 'post',
+    params
+  })
+}
+
+// 批量导入
+export function batchImportH2sConfig(fileobj) {
+  const param = new FormData()
+  param.append('file', fileobj)
+  return request({
+    url: 'busConfig/H2sConfig/batchImport',
+    method: 'post',
+    headers: { 'Content-Type': 'multipart/form-data' },
+    data: param
+  })
+}
+// 批量导出
+export function batchExportH2sConfig(params) {
+  return request({
+    url: 'busConfig/H2sConfig/batchExport',
+    method: 'get',
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
diff --git a/src/components/Amap/utils/convert-helper.js b/src/components/Amap/utils/convert-helper.js
index ab7a8d2..6b61377 100644
--- a/src/components/Amap/utils/convert-helper.js
+++ b/src/components/Amap/utils/convert-helper.js
@@ -76,7 +76,6 @@
     AMapLoader.load({
       key: store.getters.amapKey // 秘钥
     }).then((AMap) => {
-      // debugger
       AMap.convertFrom(coordinate, 'gps', (status, result) => {
         if (result.info === 'ok') {
           const lnglats = result.locations[0]
diff --git a/src/permission.js b/src/permission.js
index 0f332ec..52f5108 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -33,7 +33,6 @@
     const oldUser = getUser()
     const username = to.query.username
     const password = to.query.pwd
-    // debugger
     if (loginByUsername && username && password && !oldUser) { // 登陆后跳转
       const loginForm = {
         username: username,
diff --git a/src/views/dataView/components/panelGroup.vue b/src/views/dataView/components/panelGroup.vue
index 7cae96f..49ee723 100644
--- a/src/views/dataView/components/panelGroup.vue
+++ b/src/views/dataView/components/panelGroup.vue
@@ -120,7 +120,6 @@
       const endTime = new Date().Format('yyyy-MM-dd hh:mm:ss')
       const params = { beginTime, endTime }
       dataCount(params).then(response => {
-        debugger
         this.dataGroup[2].context = response.data.total
       })
     }
diff --git a/src/views/deviceConfig/components/editGasConfig.vue b/src/views/deviceConfig/components/editGasConfig.vue
index 07659cf..0f33004 100644
--- a/src/views/deviceConfig/components/editGasConfig.vue
+++ b/src/views/deviceConfig/components/editGasConfig.vue
@@ -155,8 +155,8 @@
       configForm: {
         id: '', // config id
         deviceId: '', // 设备id
-        collectInterval: '', // 报警阈值
-        uploadPeriod: '', // 安装高度
+        collectInterval: '', // 采集间隔
+        uploadPeriod: '', // 上传周期
         retryTimes: '3', // 重传次数
         attemptsMax: '3', // 最大尝试次数
         ip: '', // ip地址
diff --git a/src/views/deviceConfig/components/editH2sConfig.vue b/src/views/deviceConfig/components/editH2sConfig.vue
new file mode 100644
index 0000000..8902fdd
--- /dev/null
+++ b/src/views/deviceConfig/components/editH2sConfig.vue
@@ -0,0 +1,291 @@
+<template>
+  <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" append-to-body>
+    <el-form ref="dataForm" :rules="rules" :model="configForm" label-well-code="right" label-width="110px">
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item v-if="dialogStatus=='create'" label="设备编号" prop="deviceId">
+            <el-select
+              v-model="configForm.deviceId"
+              :loading="loading"
+              :disabled="dialogStatus=='update'?true:false"
+              filterable
+              placeholder="请输入设备编号"
+            >
+              <el-option
+                v-for="item in devices"
+                :key="item.id"
+                :label="item.devcode"
+                :value="item.id"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item v-if="dialogStatus=='update'" label="设备编号">
+            <el-input v-model="deviceForm.devcode" type="text" placeholder="未知" disabled />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item v-if="deviceForm.deviceName!=''" label="设备名称">
+            <el-input v-model="deviceForm.deviceName" type="text" placeholder="未知" disabled />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item v-if="deviceForm.deviceTypeName!=''" label="设备类型" prop="deviceType">
+            <el-input v-model="deviceForm.deviceTypeName" type="text" placeholder="未知" disabled />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item v-if="deviceForm.deptName!=''" label="权属单位" prop="deptName">
+            <el-input v-model="deviceForm.deptName" type="text" placeholder="未知" disabled />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="重传次数" prop="retryTimes">
+            <el-input-number v-model="configForm.retryTimes" :min="1" :max="9" type="text" placeholder="必填" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="采集间隔(分)" prop="collectInterval">
+            <el-input v-model.trim="configForm.collectInterval" type="text" placeholder="必填" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="上传周期(分)" prop="uploadPeriod">
+            <el-input v-model.trim="configForm.uploadPeriod" type="text" placeholder="必填" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="最大尝试次数">
+            <el-input-number v-model="configForm.attemptsMax" :min="1" :max="100" type="text" placeholder="必填" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row v-if="showIp" :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="ip地址" prop="ip">
+            <el-input v-model.trim="configForm.ip" type="text" placeholder="非必填" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="端口号" prop="port">
+            <el-input v-model.trim="configForm.port" type="text" placeholder="非必填" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <div slot="footer" class="dialog-footer">
+      <el-button :disabled="!canEdit" type="primary" @click="saveData">
+        保存
+      </el-button>
+      <el-button @click="cancel">
+        取消
+      </el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { editH2sConfig } from '@/api/config/h2sconfig'
+import { getDeviceSimpleList } from '@/api/config/liquidconfig'
+import { validateFloatPlus } from '@/utils/validate'
+export default {
+  name: 'EditH2sConfig',
+  data() {
+    const validateIp = (rule, value, callback) => {
+      if (value !== '') {
+        if ((/((25[0-5]|2[0-4]\d|((1\d{2})|([1-9]?\d)))\.){3}(25[0-5]|2[0-4]\d|((1\d{2})|([1-9]?\d)))/).test(value) === false) {
+          callback(new Error('请填写正确的ip地址'))
+        } else {
+          callback()
+        }
+      } else {
+        // callback(new Error('ip地址不能为空'))
+        callback()
+      }
+    }
+    const validatePort = (rule, value, callback) => {
+      if (value !== '') {
+        if ((/[1-9]$|(^[1-9][0-9]$)|(^[1-9][0-9][0-9]$)|(^[1-9][0-9][0-9][0-9]$)|(^[1-6][0-5][0-5][0-3][0-5]$)/).test(value) === false) {
+          callback(new Error('请填写正确的端口号'))
+        } else {
+          callback()
+        }
+      } else {
+        // callback(new Error('端口号不能为空'))
+        callback()
+      }
+    }
+    const validateCollectCycle = (rule, value, callback) => {
+      if (value !== '') {
+        if (validateFloatPlus(value, 5, 1440) === true) {
+          callback()
+        } else {
+          callback(new Error('请填写5到1440数值'))
+        }
+      } else {
+        callback(new Error('采集间隔不能为空'))
+      }
+    }
+    const validateUpPeriod = (rule, value, callback) => {
+      if (value !== '') {
+        if (validateFloatPlus(value, 0, 10080) === true) {
+          callback()
+        } else {
+          callback(new Error('请填写0到10080之间数值'))
+        }
+      } else {
+        callback(new Error('上传周期不能为空'))
+      }
+    }
+    return {
+      dialogFormVisible: false, // 对话框是否显示
+      dialogStatus: '', // 对话框类型：create,update
+      deviceForm: {
+        deviceName: '',
+        deviceTypeName: '',
+        deptName: '',
+        devcode: '',
+        deviceType: ''
+      }, // 设备基本信息
+      configForm: {
+        id: '', // config id
+        deviceId: '', // 设备id
+        collectInterval: '', // 采集间隔
+        uploadPeriod: '', // 上传周期
+        retryTimes: '3', // 重传次数
+        attemptsMax: '3', // 最大尝试次数
+        ip: '', // ip地址
+        port: '' // 端口号
+      },
+      textMap: {
+        update: '编辑',
+        create: '新增'
+      }, // 表头显示标题
+      devices: [], // 设备下拉选择列表
+      loading: false, // 加载动画是否显示
+      canEdit: true, // 是否允许点击保存按钮
+      rules: {
+        collectInterval: [{ required: true, trigger: ['blur', 'change'], validator: validateCollectCycle }],
+        uploadPeriod: [{ required: true, trigger: ['blur', 'change'], validator: validateUpPeriod }],
+        deviceId: [{ required: true, message: '设备编号不能为空', trigger: ['blur', 'change'] }],
+        ip: [{ trigger: ['blur', 'change'], validator: validateIp }],
+        port: [{ trigger: ['blur', 'change'], validator: validatePort }]
+      } // 前端校验规则
+    }
+  },
+  computed: {
+    watchDeviceId() { // 监控权属单位变化
+      return this.configForm.deviceId
+    },
+    showIp() { // 是否显示ip配置
+      return true
+    }
+  },
+  watch: {
+    watchDeviceId(newValue, oldValue) {
+      for (const device of this.devices) {
+        if (device.id === newValue) {
+          this.deviceForm.deviceTypeName = device.deviceTypeName
+          this.deviceForm.deptName = device.deptName
+          this.deviceForm.deviceName = device.deviceName
+          return
+        }
+      }
+    }
+  },
+  methods: {
+    // 初始化对话框
+    initDialog: function(dialogStatus, dialogFormVisible, row = null) {
+      this.dialogStatus = dialogStatus
+      this.dialogFormVisible = dialogFormVisible
+      this.canEdit = true
+      if (dialogStatus === 'create') { // 如果是新增，清除验证
+        this.resetForm()
+        this.fetchDevice()
+        this.$nextTick(() => {
+          this.$refs['dataForm'].clearValidate()
+        })
+      } else if (dialogStatus === 'update') { // 如果是修改，将row中数据填写到输入框中
+        this.deviceForm = {
+          deviceName: row.deviceName,
+          devcode: row.devcode,
+          deptName: row.deptName,
+          deviceType: row.deviceType,
+          deviceTypeName: row.deviceTypeName
+        }
+        this.configForm = {
+          id: row.id,
+          deviceId: row.deviceId, // 设备id
+          collectInterval: row.collectInterval, // 采集间隔
+          uploadPeriod: row.uploadPeriod, // 上传周期
+          retryTimes: row.retryTimes, // 重传次数
+          ip: row.ip, // ip地址
+          port: row.port, // 端口号
+          attemptsMax: row.attemptsMax // 最大尝试次数
+        }
+      }
+    },
+    // 重置表单
+    resetForm() {
+      this.deviceForm = {
+        deviceName: '',
+        deviceTypeName: '',
+        deptName: '',
+        devcode: ''
+      }
+      this.configForm = {
+        deviceId: '', // 设备id
+        collectInterval: '', // 采集间隔
+        uploadPeriod: '', // 上传周期
+        retryTimes: '3', // 重传次数
+        ip: '', // ip地址
+        port: '', // 端口号
+        attemptsMax: '3' // 最大尝试次数
+      }
+    },
+    // 保存数据
+    saveData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          this.canEdit = false
+          editH2sConfig(this.configForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('配置成功')
+              this.$emit('watchChild')
+              this.dialogFormVisible = false
+            }
+            this.canEdit = false
+          }).catch(_ => {
+            this.canEdit = true
+          })
+        }
+      })
+    },
+    fetchDevice() {
+      this.loading = true
+      getDeviceSimpleList('14', '0').then(response => {
+        this.loading = false
+        this.devices = response.data
+      })
+    },
+    cancel: function() {
+      this.dialogFormVisible = false
+      this.$emit('watchChild')
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .el-select{
+    width: 100%;
+  }
+  .el-input-number{
+    width: 100%;
+  }
+</style>
diff --git a/src/views/deviceConfig/components/editLiquidConfig.vue b/src/views/deviceConfig/components/editLiquidConfig.vue
index 6be88e3..19557de 100644
--- a/src/views/deviceConfig/components/editLiquidConfig.vue
+++ b/src/views/deviceConfig/components/editLiquidConfig.vue
@@ -188,7 +188,6 @@
   watch: {
     watchDeviceId(newValue, oldValue) {
       for (const device of this.devices) {
-        debugger
         if (device.id === newValue) {
           this.deviceForm.deviceTypeName = device.deviceTypeName
           this.deviceForm.deptName = device.deptName
diff --git a/src/views/deviceConfig/components/editTubeConfig.vue b/src/views/deviceConfig/components/editTubeConfig.vue
index 171991a..468014e 100644
--- a/src/views/deviceConfig/components/editTubeConfig.vue
+++ b/src/views/deviceConfig/components/editTubeConfig.vue
@@ -155,8 +155,8 @@
       configForm: {
         id: '', // config id
         deviceId: '', // 设备id
-        collectInterval: '', // 报警阈值
-        uploadPeriod: '', // 安装高度
+        collectInterval: '', // 采集间隔
+        uploadPeriod: '', // 上传周期
         retryTimes: '3', // 重传次数
         attemptsMax: '3', // 最大尝试次数
         ip: '', // ip地址
diff --git a/src/views/deviceConfig/components/listH2sConfig.vue b/src/views/deviceConfig/components/listH2sConfig.vue
new file mode 100644
index 0000000..3555e1e
--- /dev/null
+++ b/src/views/deviceConfig/components/listH2sConfig.vue
@@ -0,0 +1,310 @@
+<template>
+  <app-container>
+    <search-area size="small" @search="search">
+      <search-item>
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="设备编号" clearable />
+      </search-item>
+      <search-item>
+        <dept-select
+          v-model="listQuery.deptid"
+          :need-top="deptShowTop"
+          dept-type="03"
+          placeholder="选择权属单位"
+        />
+      </search-item>
+    </search-area>
+    <!--查询结果Table显示-->
+    <div>
+      <el-row class="table-title">
+        <el-col :span="6">
+          <div class="title-header">
+            <i class="el-icon-menu" />数据列表
+          </div>
+        </el-col>
+        <el-col :span="12" :offset="6" class="edit_btns">
+          <el-button v-if="hasPerm('/busConfig/H2sConfig/batchExport')" class="edit_btn" size="small" @click="batchExport">
+            导出记录
+          </el-button>
+          <download-template :filename="filename" />
+          <el-upload
+            v-if="hasPerm('/busConfig/H2sConfig/batchImport')"
+            :limit="1"
+            :show-file-list="false"
+            :http-request="uploadFile"
+            :file-list="fileList"
+            action="string"
+            accept=".xls,.xlsx"
+            class="edit_btn"
+          >
+            <el-button v-if="hasPerm('/busConfig/H2sConfig/batchImport')" slot="trigger" size="small">
+              批量导入
+            </el-button>
+          </el-upload>
+          <el-button v-if="hasPerm('/busConfig/H2sConfig/config')" class="edit_btn" size="small" @click="add">
+            新增
+          </el-button>
+        </el-col>
+      </el-row>
+      <el-table v-loading="listLoading" :data="list" class="table" border @selection-change="handleSelectionChange">
+        <!--<el-table-column align="center" type="selection" width="55"/>-->
+        <el-table-column :index="indexMethod" align="center" type="index" />
+        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
+          <template slot-scope="scope">
+            {{ scope.row[column.value] }}
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" align="center" width="60">
+          <template slot-scope="scope">
+            <el-button type="text" @click="edit(scope.row)">
+              编辑
+            </el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+    </div>
+    <!--分页-->
+    <div class="pagination-container">
+      <el-pagination
+        v-show="total>listQuery.limit"
+        :current-page="listQuery.offset"
+        :page-sizes="[20,30,50]"
+        :page-size="listQuery.limit"
+        :total="total"
+        align="center"
+        layout="total, sizes, prev, pager, next"
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"
+      />
+    </div>
+    <edit-h2s-config v-show="editShow" ref="editconfig" @watchChild="fetchData" />
+  </app-container>
+</template>
+
+<script>
+import { getH2sConfigList, batchImportH2sConfig, batchExportH2sConfig } from '@/api/config/h2sconfig'
+import EditH2sConfig from './editH2sConfig'
+import DownloadTemplate from '@/components/DownloadTemplate/index'
+import DeptSelect from '@/components/DeptSelect/index'
+
+export default {
+  name: 'ListH2sConfig',
+  components: { DeptSelect, DownloadTemplate, EditH2sConfig },
+  data() {
+    return {
+      listQuery: {
+        keywords: '',
+        offset: 1,
+        limit: 20,
+        sort: '',
+        order: ''
+      }, // 筛选条件
+      columns: [
+        {
+          text: '设备编号',
+          value: 'devcode',
+          align: 'center'
+        },
+        {
+          text: '重传次数',
+          value: 'retryTimes',
+          align: 'center'
+        },
+        {
+          text: '采集间隔(分)',
+          value: 'collectInterval',
+          align: 'center'
+        },
+        {
+          text: '上传周期',
+          value: 'uploadPeriod',
+          align: 'center'
+        },
+        {
+          text: 'IP地址',
+          value: 'ip',
+          align: 'center'
+        },
+        {
+          text: '端口',
+          value: 'port',
+          align: 'center'
+        },
+        {
+          text: '最大尝试次数',
+          value: 'attemptsMax',
+          align: 'center'
+        },
+        {
+          text: '已尝试次数',
+          value: 'attemptsCurrent',
+          align: 'center'
+        },
+        {
+          text: '下发状态',
+          value: 'statusName',
+          width: 80,
+          align: 'center'
+        }
+      ], // 显示列
+      multipleSelection: [], // 多选选中项
+      list: [], // 列表数据
+      total: 0, // 数据总数
+      deviceTypeList: [], // 硫化氢配置类型列表
+      deptProps: {
+        parent: 'pid',
+        value: 'id',
+        label: 'name',
+        children: 'children'
+      }, // 权属单位树形下拉菜单
+      deptTreeList: null, // 组织树列表数据
+      showDeptTree: 0, // 是否显示权属单位下拉
+      showDeviceType: true, // 是否显示设备类型下拉
+      listLoading: true, // 加载动画
+      fullscreenLoading: false, // 全屏加载动画
+      editShow: false, // 是否显示编辑框
+      detailShow: false, // 是否显示编辑框
+      filename: 'methane_config_template.xlsx',
+      deptShowTop: false,
+      fileList: []
+    }
+  },
+  created() {
+    this.fetchData()// 获取数据
+  },
+  methods: {
+    // 新增设备
+    add() {
+      this.dialogFormVisible = true
+      this.editShow = true
+      this.$refs.editconfig.initDialog('create', this.dialogFormVisible)
+    },
+    // 编辑硫化氢配置信息
+    edit(row) {
+      this.dialogFormVisible = true
+      this.editShow = true
+      this.$refs.editconfig.initDialog('update', this.dialogFormVisible, row)
+    },
+    // 批量导入硫化氢配置
+    uploadFile(param) {
+      // 判断文件大小是否符合要求
+      const _file = param.file
+      const isLt5M = _file.size / 1024 / 1024 < 5
+      if (!isLt5M) {
+        this.$message.error('请上传5M以下的excel文件')
+        return false
+      }
+      // 全屏加载动画
+      const loading = this.$loading({
+        lock: true,
+        text: '导入中,请稍后...',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
+      })
+      // 发起导入请求
+      batchImportH2sConfig(_file).then(res => {
+        loading.close() // 关闭加载动画
+        if (res.code === 200) {
+          this.$message.success('导入成功')
+          this.fetchData(false)
+        } else {
+          this.$message.error(res.message)
+        }
+      }).catch(() => {
+        loading.close() // 关闭加载动画
+      })
+      this.fileList = []
+    },
+    // 批量导出
+    batchExport() {
+      // 全屏加载动画
+      const loading = this.$loading({
+        lock: true,
+        text: '数据处理中,请稍后...',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
+      })
+      batchExportH2sConfig(this.listQuery).then(res => {
+        loading.close() // 关闭加载动画
+        console.log('download===', res)
+        const blob = new Blob([res.data])
+        const downloadElement = document.createElement('a')
+        const href = window.URL.createObjectURL(blob) // 创建下载的链接
+        downloadElement.href = href
+        downloadElement.download = `硫化氢配置列表.xlsx` // 下载后文件名
+        document.body.appendChild(downloadElement)
+        downloadElement.click() // 点击下载
+        document.body.removeChild(downloadElement) // 下载完成移除元素
+        window.URL.revokeObjectURL(href) // 释放blob对象
+      }).catch((res) => {
+        loading.close()
+        this.$message.error(res.message)
+      })
+    },
+    // 查询数据
+    search() {
+      this.fetchData(false)
+    },
+    // 获取硫化氢配置数据
+    fetchData(isNowPage = true) {
+      this.listLoading = true
+      if (!isNowPage) { // 是否显示当前页，否则跳转第一页
+        this.listQuery.offset = 1
+      }
+      getH2sConfigList(this.listQuery).then(response => {
+        this.list = response.data.rows
+        this.total = parseInt(response.data.total)
+        this.listLoading = false
+      })
+    },
+    indexMethod(index) {
+      return this.listQuery.limit * (this.listQuery.offset - 1) + index + 1
+    },
+    // 改变页容量
+    handleSizeChange(val) {
+      this.listQuery.limit = val
+      this.fetchData()
+    },
+    // 改变当前页
+    handleCurrentChange(val) {
+      this.listQuery.offset = val
+      this.fetchData()
+    },
+    // 多选触发方法
+    handleSelectionChange(val) {
+      this.multipleSelection = val
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .app-container{
+    padding: 10px;
+  }
+  $tableTitleHeight:46px;
+  .table{
+    margin-bottom: 20px;
+  }
+  .pagination-container{
+    margin-bottom: 50px;
+  }
+  .table-title{
+    background-color:rgba(243, 243, 243, 1);
+    height: $tableTitleHeight;
+    .title-header{
+      line-height:$tableTitleHeight;
+      color: #606266;
+      font-size: 15px;
+      i{
+        margin-left: 5px;
+        margin-right: 5px;
+      }
+    }
+  }
+  .edit_btns{
+    .edit_btn{
+      float:right;
+      margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2
+    }
+  }
+</style>
diff --git a/src/views/deviceConfig/components/listTubeConfig.vue b/src/views/deviceConfig/components/listTubeConfig.vue
index 6a054f8..9f27e0e 100644
--- a/src/views/deviceConfig/components/listTubeConfig.vue
+++ b/src/views/deviceConfig/components/listTubeConfig.vue
@@ -77,9 +77,7 @@
 </template>
 
 <script>
-import { judgeTree, toTreeList } from '@/utils/structure'
 import { getTubeConfigList, batchImportTubeConfig, batchExportTubeConfig } from '@/api/config/tubeconfig'
-import { getDeptTreeList } from '@/api/system/dept'
 import EditTubeConfig from './editTubeConfig'
 import DownloadTemplate from '@/components/DownloadTemplate/index'
 import DeptSelect from '@/components/DeptSelect/index'
@@ -167,7 +165,6 @@
     }
   },
   created() {
-    this.fetchDeptTree()// 获取部门树
     this.fetchData()// 获取数据
   },
   methods: {
@@ -263,26 +260,6 @@
         this.listLoading = false
       })
     },
-    // 加载组织机构树形下拉菜单
-    fetchDeptTree: function() {
-      getDeptTreeList().then(response => {
-        if (response.data.list) {
-          if (response.data.list.length > 1) {
-            console.log(this.$store.getters.deptId)
-            if (judgeTree(response.data.list)) {
-              this.deptTreeList = toTreeList(response.data.list)
-              this.showDeptTree = 1
-            } else {
-              this.deptTreeList = response.data.list
-              this.showDeptTree = 2
-            }
-            console.log(this.deptTreeList)
-          } else {
-            this.showDeptTree = 0
-          }
-        }
-      })
-    },
     indexMethod(index) {
       return this.listQuery.limit * (this.listQuery.offset - 1) + index + 1
     },
diff --git a/src/views/deviceConfig/deviceConfig.vue b/src/views/deviceConfig/deviceConfig.vue
index 736c506..5e31573 100644
--- a/src/views/deviceConfig/deviceConfig.vue
+++ b/src/views/deviceConfig/deviceConfig.vue
@@ -2,34 +2,38 @@
   <div class="container">
     <el-tabs v-model="activeName" type="card" @tab-click="handleClick">
       <el-tab-pane v-if="hasPerm('/busConfig/liquidConfig/list')" label="液位监测仪" name="liquid">
-        <list-liquid-config ref="liquidConfig"/>
+        <list-liquid-config ref="liquidConfig" />
       </el-tab-pane>
       <el-tab-pane v-if="hasPerm('/busConfig/gasConfig/list')" label="燃气智能监测终端" name="gas">
-        <list-gas-config ref="gasConfig"/>
+        <list-gas-config ref="gasConfig" />
       </el-tab-pane>
       <el-tab-pane v-if="hasPerm('/busConfig/harmfulConfig/list')" label="有害气体监测仪" name="harmful">
-        <list-harmful-config ref="harmfulConfig"/>
+        <list-harmful-config ref="harmfulConfig" />
       </el-tab-pane>
       <el-tab-pane v-if="hasPerm('/busConfig/tempConfig/list')" label="温湿度监测仪" name="temphumidity">
-        <list-temp-config ref="tempConfig"/>
+        <list-temp-config ref="tempConfig" />
       </el-tab-pane>
       <el-tab-pane v-if="hasPerm('/busConfig/digConfig/list')" label="开挖监测仪" name="dig">
-        <list-dig-config ref="digConfig"/>
+        <list-dig-config ref="digConfig" />
       </el-tab-pane>
       <el-tab-pane v-if="hasPerm('/busConfig/noiseConfig/list')" label="噪声监测仪" name="noise">
-        <list-noise-config ref="noiseConfig"/>
+        <list-noise-config ref="noiseConfig" />
       </el-tab-pane>
       <el-tab-pane v-if="hasPerm('/busConfig/liquidGasConfig/list')" label="燃气智能监测终端(一体化)" name="liquidgas">
-        <list-liquid-gas-config ref="liquidGasConfig"/>
+        <list-liquid-gas-config ref="liquidGasConfig" />
       </el-tab-pane>
       <el-tab-pane v-if="hasPerm('/busConfig/tubeConfig/list')" label="管盯" name="tube">
-        <list-tube-config ref="tubeConfig"/>
+        <list-tube-config ref="tubeConfig" />
+      </el-tab-pane>
+      <el-tab-pane v-if="hasPerm('/busConfig/H2sConfig/list')" label="硫化氢检测终端" name="h2s">
+        <list-h2s-config ref="h2sConfig" />
       </el-tab-pane>
     </el-tabs>
   </div>
 </template>
 
 <script>
+import { hasPermission } from '@/utils/permission'
 import ListLiquidConfig from './components/listLiquidConfig'
 import ListGasConfig from './components/listGasConfig'
 import ListHarmfulConfig from './components/listHarmfulConfig'
@@ -37,11 +41,11 @@
 import ListDigConfig from './components/listDigConfig'
 import ListNoiseConfig from './components/listNoiseConfig'
 import ListLiquidGasConfig from './components/listLiquidGasConfig'
-import { hasPermission } from '@/utils/permission'
 import ListTubeConfig from './components/listTubeConfig'
+import ListH2sConfig from './components/listH2sConfig'
 export default {
   name: 'DeviceConfig',
-  components: { ListTubeConfig, ListLiquidGasConfig, ListNoiseConfig, ListDigConfig, ListTempConfig, ListHarmfulConfig, ListGasConfig, ListLiquidConfig },
+  components: { ListH2sConfig, ListTubeConfig, ListLiquidGasConfig, ListNoiseConfig, ListDigConfig, ListTempConfig, ListHarmfulConfig, ListGasConfig, ListLiquidConfig },
   data() {
     return {
       activeName: 'liquid'
@@ -68,6 +72,8 @@
         this.$refs.liquidGasConfig.fetchData()
       } else if (tab.name === 'tube') {
         this.$refs.tubeConfig.fetchData()
+      } else if (tab.name === 'tube') {
+        this.$refs.h2sConfig.fetchData()
       }
     },
     // 计算那个是当前第一个tab
@@ -88,6 +94,8 @@
         this.activeName = 'liquidgas'
       } else if (hasPermission('/busConfig/tubeConfig/list')) {
         this.activeName = 'tube'
+      } else if (hasPermission('/busConfig/h2sConfig/list')) {
+        this.activeName = 'h2s'
       }
     }
   }
@@ -95,7 +103,5 @@
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-  .container{
-    padding: 5px;
-  }
+
 </style>
diff --git a/src/views/deviceManage/deviceModel/deviceModel.vue b/src/views/deviceManage/deviceModel/deviceModel.vue
index a9f66ee..816c190 100644
--- a/src/views/deviceManage/deviceModel/deviceModel.vue
+++ b/src/views/deviceManage/deviceModel/deviceModel.vue
@@ -26,17 +26,17 @@
     <!--查询结果Table显示-->
     <normal-table ref="table" :data="list" :total="total" :query="listQuery" :columns="columns" :list-loading="listLoading" :pagination="true" :options="tableOptions" size="small" @change="changePage">
       <template slot="btns">
-        <el-button class="edit_btn" size="small" @click="add">
+        <el-button v-if="hasPerm('/deviceModels/add')" class="edit_btn" size="small" @click="add">
           新增
         </el-button>
       </template>
       <template slot="columns">
         <el-table-column label="操作" align="center" width="160">
           <template v-slot="scope">
-            <el-button type="text" size="mini" @click="edit(scope.row)">
+            <el-button v-if="hasPerm('/deviceModels/update')" type="text" size="mini" @click="edit(scope.row)">
               编辑
             </el-button>
-            <el-button type="text" size="mini" @click="del(scope.row)">
+            <el-button v-if="hasPerm('/deviceModels/delete')" type="text" size="mini" @click="del(scope.row)">
               删除
             </el-button>
           </template>
diff --git a/src/views/deviceManage/listDevice.vue b/src/views/deviceManage/listDevice.vue
index 94cbe3f..30fed22 100644
--- a/src/views/deviceManage/listDevice.vue
+++ b/src/views/deviceManage/listDevice.vue
@@ -76,13 +76,13 @@
         </el-table-column>
         <el-table-column label="操作" align="center" width="160">
           <template slot-scope="scope">
-            <el-button type="text" @click="datalist(scope.row)">
+            <el-button type="text" size="small" @click="datalist(scope.row)">
               历史数据
             </el-button>
-            <el-button v-if="hasPerm('/device/update')" type="text" @click="edit(scope.row)">
+            <el-button v-if="hasPerm('/device/update')" type="text" size="small" @click="edit(scope.row)">
               编辑
             </el-button>
-            <el-button type="text" @click="detail(scope.row)">
+            <el-button type="text" size="small" @click="detail(scope.row)">
               详情
             </el-button>
           </template>
diff --git a/src/views/system/dept/editDept.vue b/src/views/system/dept/editDept.vue
index 203d542..aebe0a7 100644
--- a/src/views/system/dept/editDept.vue
+++ b/src/views/system/dept/editDept.vue
@@ -16,7 +16,7 @@
       <el-row :gutter="20">
         <el-col :span="12">
           <el-form-item label="父组织" prop="pid">
-            <dept-select ref="deptSelect" v-model="deptForm.pid" :dept-show="true" placeholder="请选择父组织" />
+            <dept-select ref="deptSelect" v-model="deptForm.pid" :dept-show="true" placeholder="请选择父组织" size="normal" />
           </el-form-item>
         </el-col>
         <el-col :span="12">
diff --git a/src/views/system/tenant/components/relateDept.vue b/src/views/system/tenant/components/relateDept.vue
index 83e044d..0d9208a 100644
--- a/src/views/system/tenant/components/relateDept.vue
+++ b/src/views/system/tenant/components/relateDept.vue
@@ -74,7 +74,6 @@
     saveData() {
       this.$refs['dataForm'].validate((valid) => {
         if (valid) {
-          debugger
           relatedDept(this.dataForm).then(res => {
             if (res.code === 200) {
               this.$message.success('绑定成功')
diff --git a/src/views/wellManage/addWell.vue b/src/views/wellManage/addWell.vue
index dbe9e84..b16b63e 100644
--- a/src/views/wellManage/addWell.vue
+++ b/src/views/wellManage/addWell.vue
@@ -83,7 +83,7 @@
         </el-col>
       </el-row>
       <el-row :gutter="1">
-        <el-form-item label="所在区域" required>
+        <el-form-item label="所在区域">
           <el-col :span="5">
             <el-form-item prop="qu">
               <el-select v-model="wellForm.qu" :disabled="showArea" placeholder="请选择所在区/县" clearable>
@@ -116,6 +116,13 @@
           </el-col>
         </el-form-item>
       </el-row>
+      <el-row :gutter="1">
+        <el-col :span="15">
+          <el-form-item label="所在道路" prop="road">
+            <el-input v-model.trim="wellForm.road" type="text" placeholder="非必填，建议填写，不填影响统计结果" />
+          </el-form-item>
+        </el-col>
+      </el-row>
       <el-row :gutter="20">
         <el-col :span="15">
           <el-form-item label="详细地址" prop="position">
@@ -220,8 +227,9 @@
         latGaode: '', // 高德纬度
         photos: '', // 照片路径
         notes: '', // 备注,
-        qu: '',
+        qu: '', // 区
         area: '', // 街道
+        road: '', // 道路
         responsibleDept: '' // 维护人员部门
       }, // 表单
       deptProps: {
@@ -250,9 +258,9 @@
         coordinateX: [{ required: true, trigger: ['blur', 'change'], validator: validateLat }],
         coordinateY: [{ required: true, trigger: ['blur', 'change'], validator: validateLng }],
         deptid: [{ required: true, message: '组织机构必选', trigger: 'change' }],
-        wellType: [{ required: true, message: '点位类型必选', trigger: 'change' }],
-        qu: [{ required: true, message: '所在区/县必选', trigger: 'change' }],
-        area: [{ required: true, message: '所在街道/镇必选', trigger: 'change' }]
+        wellType: [{ required: true, message: '点位类型必选', trigger: 'change' }]
+        // qu: [{ required: true, message: '所在区/县必选', trigger: 'change' }],
+        // area: [{ required: true, message: '所在街道/镇必选', trigger: 'change' }]
       },
       uploadPath: this.baseConfig.baseUrl + '/imageUpload', // 图片上传路径
       dialogImageUrl: '',
@@ -337,8 +345,9 @@
         convertLnglat([this.wellForm.coordinateX, this.wellForm.coordinateY]).then(lnglat => {
           // 2.逆地址解析
           reverseLnglat(lnglat).then(res => {
-            this.wellForm.position = res.formattedAddress
-            this.wellForm.qu = res.addressComponent.adcode
+            this.wellForm.position = res.formattedAddress // 完整地址
+            this.wellForm.qu = res.addressComponent.adcode // 区编码
+            this.wellForm.road = res.addressComponent.street // 道路
           })
         })
       }
diff --git a/src/views/wellManage/detailWell.vue b/src/views/wellManage/detailWell.vue
index 1eaa10a..0511c15 100644
--- a/src/views/wellManage/detailWell.vue
+++ b/src/views/wellManage/detailWell.vue
@@ -80,6 +80,7 @@
         { type: 'areaName', label: '所在区域', value: 'areaName', placeholder: '未知', span: 2 },
         { type: 'text', label: '经度', value: 'coordinateX', placeholder: '未知' },
         { type: 'text', label: '纬度', value: 'coordinateY', placeholder: '未知' },
+        { type: 'text', label: '所在道路', value: 'road', placeholder: '未知', span: 5 },
         { type: 'text', label: '详细地址', value: 'position', placeholder: '未知', span: 5 },
         { type: 'images', label: '路标图片', value: 'imageList', placeholder: '无', span: 5 }
       ], // 表单配置项
@@ -102,6 +103,7 @@
         quName: '',
         area: '', // 街道
         areaName: '',
+        road: '',
         responsibleDept: '', // 维护人员部门
         responsibleDeptName: '' // 维护人员部门名称
       }, // 表单
@@ -156,6 +158,7 @@
         notes: row.notes, // 备注,
         qu: row.qu,
         area: row.area, // 街道
+        road: row.road,
         responsibleDept: row.responsibleDept, // 维护人员部门
         responsibleDeptName: row.responsibleDeptName // 维护人员部门
       }

diff --git a/src/api/config/h2sconfig.js b/src/api/config/h2sconfig.js
new file mode 100644
index 0000000..f441692
--- /dev/null
+++ b/src/api/config/h2sconfig.js
@@ -0,0 +1,42 @@
+/**
+ * 硫化氢配置接口
+ */
+import request from '@/utils/request'
+// 硫化氢配置查询
+export function getH2sConfigList(params) {
+  return request({
+    url: 'busConfig/H2sConfig/list',
+    method: 'get',
+    params
+  })
+}
+
+// 修改硫化氢配置
+export function editH2sConfig(params) {
+  return request({
+    url: 'busConfig/H2sConfig/config',
+    method: 'post',
+    params
+  })
+}
+
+// 批量导入
+export function batchImportH2sConfig(fileobj) {
+  const param = new FormData()
+  param.append('file', fileobj)
+  return request({
+    url: 'busConfig/H2sConfig/batchImport',
+    method: 'post',
+    headers: { 'Content-Type': 'multipart/form-data' },
+    data: param
+  })
+}
+// 批量导出
+export function batchExportH2sConfig(params) {
+  return request({
+    url: 'busConfig/H2sConfig/batchExport',
+    method: 'get',
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
diff --git a/src/components/Amap/utils/convert-helper.js b/src/components/Amap/utils/convert-helper.js
index ab7a8d2..6b61377 100644
--- a/src/components/Amap/utils/convert-helper.js
+++ b/src/components/Amap/utils/convert-helper.js
@@ -76,7 +76,6 @@
     AMapLoader.load({
       key: store.getters.amapKey // 秘钥
     }).then((AMap) => {
-      // debugger
       AMap.convertFrom(coordinate, 'gps', (status, result) => {
         if (result.info === 'ok') {
           const lnglats = result.locations[0]
diff --git a/src/permission.js b/src/permission.js
index 0f332ec..52f5108 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -33,7 +33,6 @@
     const oldUser = getUser()
     const username = to.query.username
     const password = to.query.pwd
-    // debugger
     if (loginByUsername && username && password && !oldUser) { // 登陆后跳转
       const loginForm = {
         username: username,
diff --git a/src/views/dataView/components/panelGroup.vue b/src/views/dataView/components/panelGroup.vue
index 7cae96f..49ee723 100644
--- a/src/views/dataView/components/panelGroup.vue
+++ b/src/views/dataView/components/panelGroup.vue
@@ -120,7 +120,6 @@
       const endTime = new Date().Format('yyyy-MM-dd hh:mm:ss')
       const params = { beginTime, endTime }
       dataCount(params).then(response => {
-        debugger
         this.dataGroup[2].context = response.data.total
       })
     }
diff --git a/src/views/deviceConfig/components/editGasConfig.vue b/src/views/deviceConfig/components/editGasConfig.vue
index 07659cf..0f33004 100644
--- a/src/views/deviceConfig/components/editGasConfig.vue
+++ b/src/views/deviceConfig/components/editGasConfig.vue
@@ -155,8 +155,8 @@
       configForm: {
         id: '', // config id
         deviceId: '', // 设备id
-        collectInterval: '', // 报警阈值
-        uploadPeriod: '', // 安装高度
+        collectInterval: '', // 采集间隔
+        uploadPeriod: '', // 上传周期
         retryTimes: '3', // 重传次数
         attemptsMax: '3', // 最大尝试次数
         ip: '', // ip地址
diff --git a/src/views/deviceConfig/components/editH2sConfig.vue b/src/views/deviceConfig/components/editH2sConfig.vue
new file mode 100644
index 0000000..8902fdd
--- /dev/null
+++ b/src/views/deviceConfig/components/editH2sConfig.vue
@@ -0,0 +1,291 @@
+<template>
+  <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" append-to-body>
+    <el-form ref="dataForm" :rules="rules" :model="configForm" label-well-code="right" label-width="110px">
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item v-if="dialogStatus=='create'" label="设备编号" prop="deviceId">
+            <el-select
+              v-model="configForm.deviceId"
+              :loading="loading"
+              :disabled="dialogStatus=='update'?true:false"
+              filterable
+              placeholder="请输入设备编号"
+            >
+              <el-option
+                v-for="item in devices"
+                :key="item.id"
+                :label="item.devcode"
+                :value="item.id"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item v-if="dialogStatus=='update'" label="设备编号">
+            <el-input v-model="deviceForm.devcode" type="text" placeholder="未知" disabled />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item v-if="deviceForm.deviceName!=''" label="设备名称">
+            <el-input v-model="deviceForm.deviceName" type="text" placeholder="未知" disabled />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item v-if="deviceForm.deviceTypeName!=''" label="设备类型" prop="deviceType">
+            <el-input v-model="deviceForm.deviceTypeName" type="text" placeholder="未知" disabled />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item v-if="deviceForm.deptName!=''" label="权属单位" prop="deptName">
+            <el-input v-model="deviceForm.deptName" type="text" placeholder="未知" disabled />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="重传次数" prop="retryTimes">
+            <el-input-number v-model="configForm.retryTimes" :min="1" :max="9" type="text" placeholder="必填" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="采集间隔(分)" prop="collectInterval">
+            <el-input v-model.trim="configForm.collectInterval" type="text" placeholder="必填" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="上传周期(分)" prop="uploadPeriod">
+            <el-input v-model.trim="configForm.uploadPeriod" type="text" placeholder="必填" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="最大尝试次数">
+            <el-input-number v-model="configForm.attemptsMax" :min="1" :max="100" type="text" placeholder="必填" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row v-if="showIp" :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="ip地址" prop="ip">
+            <el-input v-model.trim="configForm.ip" type="text" placeholder="非必填" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="端口号" prop="port">
+            <el-input v-model.trim="configForm.port" type="text" placeholder="非必填" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <div slot="footer" class="dialog-footer">
+      <el-button :disabled="!canEdit" type="primary" @click="saveData">
+        保存
+      </el-button>
+      <el-button @click="cancel">
+        取消
+      </el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { editH2sConfig } from '@/api/config/h2sconfig'
+import { getDeviceSimpleList } from '@/api/config/liquidconfig'
+import { validateFloatPlus } from '@/utils/validate'
+export default {
+  name: 'EditH2sConfig',
+  data() {
+    const validateIp = (rule, value, callback) => {
+      if (value !== '') {
+        if ((/((25[0-5]|2[0-4]\d|((1\d{2})|([1-9]?\d)))\.){3}(25[0-5]|2[0-4]\d|((1\d{2})|([1-9]?\d)))/).test(value) === false) {
+          callback(new Error('请填写正确的ip地址'))
+        } else {
+          callback()
+        }
+      } else {
+        // callback(new Error('ip地址不能为空'))
+        callback()
+      }
+    }
+    const validatePort = (rule, value, callback) => {
+      if (value !== '') {
+        if ((/[1-9]$|(^[1-9][0-9]$)|(^[1-9][0-9][0-9]$)|(^[1-9][0-9][0-9][0-9]$)|(^[1-6][0-5][0-5][0-3][0-5]$)/).test(value) === false) {
+          callback(new Error('请填写正确的端口号'))
+        } else {
+          callback()
+        }
+      } else {
+        // callback(new Error('端口号不能为空'))
+        callback()
+      }
+    }
+    const validateCollectCycle = (rule, value, callback) => {
+      if (value !== '') {
+        if (validateFloatPlus(value, 5, 1440) === true) {
+          callback()
+        } else {
+          callback(new Error('请填写5到1440数值'))
+        }
+      } else {
+        callback(new Error('采集间隔不能为空'))
+      }
+    }
+    const validateUpPeriod = (rule, value, callback) => {
+      if (value !== '') {
+        if (validateFloatPlus(value, 0, 10080) === true) {
+          callback()
+        } else {
+          callback(new Error('请填写0到10080之间数值'))
+        }
+      } else {
+        callback(new Error('上传周期不能为空'))
+      }
+    }
+    return {
+      dialogFormVisible: false, // 对话框是否显示
+      dialogStatus: '', // 对话框类型：create,update
+      deviceForm: {
+        deviceName: '',
+        deviceTypeName: '',
+        deptName: '',
+        devcode: '',
+        deviceType: ''
+      }, // 设备基本信息
+      configForm: {
+        id: '', // config id
+        deviceId: '', // 设备id
+        collectInterval: '', // 采集间隔
+        uploadPeriod: '', // 上传周期
+        retryTimes: '3', // 重传次数
+        attemptsMax: '3', // 最大尝试次数
+        ip: '', // ip地址
+        port: '' // 端口号
+      },
+      textMap: {
+        update: '编辑',
+        create: '新增'
+      }, // 表头显示标题
+      devices: [], // 设备下拉选择列表
+      loading: false, // 加载动画是否显示
+      canEdit: true, // 是否允许点击保存按钮
+      rules: {
+        collectInterval: [{ required: true, trigger: ['blur', 'change'], validator: validateCollectCycle }],
+        uploadPeriod: [{ required: true, trigger: ['blur', 'change'], validator: validateUpPeriod }],
+        deviceId: [{ required: true, message: '设备编号不能为空', trigger: ['blur', 'change'] }],
+        ip: [{ trigger: ['blur', 'change'], validator: validateIp }],
+        port: [{ trigger: ['blur', 'change'], validator: validatePort }]
+      } // 前端校验规则
+    }
+  },
+  computed: {
+    watchDeviceId() { // 监控权属单位变化
+      return this.configForm.deviceId
+    },
+    showIp() { // 是否显示ip配置
+      return true
+    }
+  },
+  watch: {
+    watchDeviceId(newValue, oldValue) {
+      for (const device of this.devices) {
+        if (device.id === newValue) {
+          this.deviceForm.deviceTypeName = device.deviceTypeName
+          this.deviceForm.deptName = device.deptName
+          this.deviceForm.deviceName = device.deviceName
+          return
+        }
+      }
+    }
+  },
+  methods: {
+    // 初始化对话框
+    initDialog: function(dialogStatus, dialogFormVisible, row = null) {
+      this.dialogStatus = dialogStatus
+      this.dialogFormVisible = dialogFormVisible
+      this.canEdit = true
+      if (dialogStatus === 'create') { // 如果是新增，清除验证
+        this.resetForm()
+        this.fetchDevice()
+        this.$nextTick(() => {
+          this.$refs['dataForm'].clearValidate()
+        })
+      } else if (dialogStatus === 'update') { // 如果是修改，将row中数据填写到输入框中
+        this.deviceForm = {
+          deviceName: row.deviceName,
+          devcode: row.devcode,
+          deptName: row.deptName,
+          deviceType: row.deviceType,
+          deviceTypeName: row.deviceTypeName
+        }
+        this.configForm = {
+          id: row.id,
+          deviceId: row.deviceId, // 设备id
+          collectInterval: row.collectInterval, // 采集间隔
+          uploadPeriod: row.uploadPeriod, // 上传周期
+          retryTimes: row.retryTimes, // 重传次数
+          ip: row.ip, // ip地址
+          port: row.port, // 端口号
+          attemptsMax: row.attemptsMax // 最大尝试次数
+        }
+      }
+    },
+    // 重置表单
+    resetForm() {
+      this.deviceForm = {
+        deviceName: '',
+        deviceTypeName: '',
+        deptName: '',
+        devcode: ''
+      }
+      this.configForm = {
+        deviceId: '', // 设备id
+        collectInterval: '', // 采集间隔
+        uploadPeriod: '', // 上传周期
+        retryTimes: '3', // 重传次数
+        ip: '', // ip地址
+        port: '', // 端口号
+        attemptsMax: '3' // 最大尝试次数
+      }
+    },
+    // 保存数据
+    saveData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          this.canEdit = false
+          editH2sConfig(this.configForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('配置成功')
+              this.$emit('watchChild')
+              this.dialogFormVisible = false
+            }
+            this.canEdit = false
+          }).catch(_ => {
+            this.canEdit = true
+          })
+        }
+      })
+    },
+    fetchDevice() {
+      this.loading = true
+      getDeviceSimpleList('14', '0').then(response => {
+        this.loading = false
+        this.devices = response.data
+      })
+    },
+    cancel: function() {
+      this.dialogFormVisible = false
+      this.$emit('watchChild')
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .el-select{
+    width: 100%;
+  }
+  .el-input-number{
+    width: 100%;
+  }
+</style>
diff --git a/src/views/deviceConfig/components/editLiquidConfig.vue b/src/views/deviceConfig/components/editLiquidConfig.vue
index 6be88e3..19557de 100644
--- a/src/views/deviceConfig/components/editLiquidConfig.vue
+++ b/src/views/deviceConfig/components/editLiquidConfig.vue
@@ -188,7 +188,6 @@
   watch: {
     watchDeviceId(newValue, oldValue) {
       for (const device of this.devices) {
-        debugger
         if (device.id === newValue) {
           this.deviceForm.deviceTypeName = device.deviceTypeName
           this.deviceForm.deptName = device.deptName
diff --git a/src/views/deviceConfig/components/editTubeConfig.vue b/src/views/deviceConfig/components/editTubeConfig.vue
index 171991a..468014e 100644
--- a/src/views/deviceConfig/components/editTubeConfig.vue
+++ b/src/views/deviceConfig/components/editTubeConfig.vue
@@ -155,8 +155,8 @@
       configForm: {
         id: '', // config id
         deviceId: '', // 设备id
-        collectInterval: '', // 报警阈值
-        uploadPeriod: '', // 安装高度
+        collectInterval: '', // 采集间隔
+        uploadPeriod: '', // 上传周期
         retryTimes: '3', // 重传次数
         attemptsMax: '3', // 最大尝试次数
         ip: '', // ip地址
diff --git a/src/views/deviceConfig/components/listH2sConfig.vue b/src/views/deviceConfig/components/listH2sConfig.vue
new file mode 100644
index 0000000..3555e1e
--- /dev/null
+++ b/src/views/deviceConfig/components/listH2sConfig.vue
@@ -0,0 +1,310 @@
+<template>
+  <app-container>
+    <search-area size="small" @search="search">
+      <search-item>
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="设备编号" clearable />
+      </search-item>
+      <search-item>
+        <dept-select
+          v-model="listQuery.deptid"
+          :need-top="deptShowTop"
+          dept-type="03"
+          placeholder="选择权属单位"
+        />
+      </search-item>
+    </search-area>
+    <!--查询结果Table显示-->
+    <div>
+      <el-row class="table-title">
+        <el-col :span="6">
+          <div class="title-header">
+            <i class="el-icon-menu" />数据列表
+          </div>
+        </el-col>
+        <el-col :span="12" :offset="6" class="edit_btns">
+          <el-button v-if="hasPerm('/busConfig/H2sConfig/batchExport')" class="edit_btn" size="small" @click="batchExport">
+            导出记录
+          </el-button>
+          <download-template :filename="filename" />
+          <el-upload
+            v-if="hasPerm('/busConfig/H2sConfig/batchImport')"
+            :limit="1"
+            :show-file-list="false"
+            :http-request="uploadFile"
+            :file-list="fileList"
+            action="string"
+            accept=".xls,.xlsx"
+            class="edit_btn"
+          >
+            <el-button v-if="hasPerm('/busConfig/H2sConfig/batchImport')" slot="trigger" size="small">
+              批量导入
+            </el-button>
+          </el-upload>
+          <el-button v-if="hasPerm('/busConfig/H2sConfig/config')" class="edit_btn" size="small" @click="add">
+            新增
+          </el-button>
+        </el-col>
+      </el-row>
+      <el-table v-loading="listLoading" :data="list" class="table" border @selection-change="handleSelectionChange">
+        <!--<el-table-column align="center" type="selection" width="55"/>-->
+        <el-table-column :index="indexMethod" align="center" type="index" />
+        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
+          <template slot-scope="scope">
+            {{ scope.row[column.value] }}
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" align="center" width="60">
+          <template slot-scope="scope">
+            <el-button type="text" @click="edit(scope.row)">
+              编辑
+            </el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+    </div>
+    <!--分页-->
+    <div class="pagination-container">
+      <el-pagination
+        v-show="total>listQuery.limit"
+        :current-page="listQuery.offset"
+        :page-sizes="[20,30,50]"
+        :page-size="listQuery.limit"
+        :total="total"
+        align="center"
+        layout="total, sizes, prev, pager, next"
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"
+      />
+    </div>
+    <edit-h2s-config v-show="editShow" ref="editconfig" @watchChild="fetchData" />
+  </app-container>
+</template>
+
+<script>
+import { getH2sConfigList, batchImportH2sConfig, batchExportH2sConfig } from '@/api/config/h2sconfig'
+import EditH2sConfig from './editH2sConfig'
+import DownloadTemplate from '@/components/DownloadTemplate/index'
+import DeptSelect from '@/components/DeptSelect/index'
+
+export default {
+  name: 'ListH2sConfig',
+  components: { DeptSelect, DownloadTemplate, EditH2sConfig },
+  data() {
+    return {
+      listQuery: {
+        keywords: '',
+        offset: 1,
+        limit: 20,
+        sort: '',
+        order: ''
+      }, // 筛选条件
+      columns: [
+        {
+          text: '设备编号',
+          value: 'devcode',
+          align: 'center'
+        },
+        {
+          text: '重传次数',
+          value: 'retryTimes',
+          align: 'center'
+        },
+        {
+          text: '采集间隔(分)',
+          value: 'collectInterval',
+          align: 'center'
+        },
+        {
+          text: '上传周期',
+          value: 'uploadPeriod',
+          align: 'center'
+        },
+        {
+          text: 'IP地址',
+          value: 'ip',
+          align: 'center'
+        },
+        {
+          text: '端口',
+          value: 'port',
+          align: 'center'
+        },
+        {
+          text: '最大尝试次数',
+          value: 'attemptsMax',
+          align: 'center'
+        },
+        {
+          text: '已尝试次数',
+          value: 'attemptsCurrent',
+          align: 'center'
+        },
+        {
+          text: '下发状态',
+          value: 'statusName',
+          width: 80,
+          align: 'center'
+        }
+      ], // 显示列
+      multipleSelection: [], // 多选选中项
+      list: [], // 列表数据
+      total: 0, // 数据总数
+      deviceTypeList: [], // 硫化氢配置类型列表
+      deptProps: {
+        parent: 'pid',
+        value: 'id',
+        label: 'name',
+        children: 'children'
+      }, // 权属单位树形下拉菜单
+      deptTreeList: null, // 组织树列表数据
+      showDeptTree: 0, // 是否显示权属单位下拉
+      showDeviceType: true, // 是否显示设备类型下拉
+      listLoading: true, // 加载动画
+      fullscreenLoading: false, // 全屏加载动画
+      editShow: false, // 是否显示编辑框
+      detailShow: false, // 是否显示编辑框
+      filename: 'methane_config_template.xlsx',
+      deptShowTop: false,
+      fileList: []
+    }
+  },
+  created() {
+    this.fetchData()// 获取数据
+  },
+  methods: {
+    // 新增设备
+    add() {
+      this.dialogFormVisible = true
+      this.editShow = true
+      this.$refs.editconfig.initDialog('create', this.dialogFormVisible)
+    },
+    // 编辑硫化氢配置信息
+    edit(row) {
+      this.dialogFormVisible = true
+      this.editShow = true
+      this.$refs.editconfig.initDialog('update', this.dialogFormVisible, row)
+    },
+    // 批量导入硫化氢配置
+    uploadFile(param) {
+      // 判断文件大小是否符合要求
+      const _file = param.file
+      const isLt5M = _file.size / 1024 / 1024 < 5
+      if (!isLt5M) {
+        this.$message.error('请上传5M以下的excel文件')
+        return false
+      }
+      // 全屏加载动画
+      const loading = this.$loading({
+        lock: true,
+        text: '导入中,请稍后...',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
+      })
+      // 发起导入请求
+      batchImportH2sConfig(_file).then(res => {
+        loading.close() // 关闭加载动画
+        if (res.code === 200) {
+          this.$message.success('导入成功')
+          this.fetchData(false)
+        } else {
+          this.$message.error(res.message)
+        }
+      }).catch(() => {
+        loading.close() // 关闭加载动画
+      })
+      this.fileList = []
+    },
+    // 批量导出
+    batchExport() {
+      // 全屏加载动画
+      const loading = this.$loading({
+        lock: true,
+        text: '数据处理中,请稍后...',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
+      })
+      batchExportH2sConfig(this.listQuery).then(res => {
+        loading.close() // 关闭加载动画
+        console.log('download===', res)
+        const blob = new Blob([res.data])
+        const downloadElement = document.createElement('a')
+        const href = window.URL.createObjectURL(blob) // 创建下载的链接
+        downloadElement.href = href
+        downloadElement.download = `硫化氢配置列表.xlsx` // 下载后文件名
+        document.body.appendChild(downloadElement)
+        downloadElement.click() // 点击下载
+        document.body.removeChild(downloadElement) // 下载完成移除元素
+        window.URL.revokeObjectURL(href) // 释放blob对象
+      }).catch((res) => {
+        loading.close()
+        this.$message.error(res.message)
+      })
+    },
+    // 查询数据
+    search() {
+      this.fetchData(false)
+    },
+    // 获取硫化氢配置数据
+    fetchData(isNowPage = true) {
+      this.listLoading = true
+      if (!isNowPage) { // 是否显示当前页，否则跳转第一页
+        this.listQuery.offset = 1
+      }
+      getH2sConfigList(this.listQuery).then(response => {
+        this.list = response.data.rows
+        this.total = parseInt(response.data.total)
+        this.listLoading = false
+      })
+    },
+    indexMethod(index) {
+      return this.listQuery.limit * (this.listQuery.offset - 1) + index + 1
+    },
+    // 改变页容量
+    handleSizeChange(val) {
+      this.listQuery.limit = val
+      this.fetchData()
+    },
+    // 改变当前页
+    handleCurrentChange(val) {
+      this.listQuery.offset = val
+      this.fetchData()
+    },
+    // 多选触发方法
+    handleSelectionChange(val) {
+      this.multipleSelection = val
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .app-container{
+    padding: 10px;
+  }
+  $tableTitleHeight:46px;
+  .table{
+    margin-bottom: 20px;
+  }
+  .pagination-container{
+    margin-bottom: 50px;
+  }
+  .table-title{
+    background-color:rgba(243, 243, 243, 1);
+    height: $tableTitleHeight;
+    .title-header{
+      line-height:$tableTitleHeight;
+      color: #606266;
+      font-size: 15px;
+      i{
+        margin-left: 5px;
+        margin-right: 5px;
+      }
+    }
+  }
+  .edit_btns{
+    .edit_btn{
+      float:right;
+      margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2
+    }
+  }
+</style>
diff --git a/src/views/deviceConfig/components/listTubeConfig.vue b/src/views/deviceConfig/components/listTubeConfig.vue
index 6a054f8..9f27e0e 100644
--- a/src/views/deviceConfig/components/listTubeConfig.vue
+++ b/src/views/deviceConfig/components/listTubeConfig.vue
@@ -77,9 +77,7 @@
 </template>
 
 <script>
-import { judgeTree, toTreeList } from '@/utils/structure'
 import { getTubeConfigList, batchImportTubeConfig, batchExportTubeConfig } from '@/api/config/tubeconfig'
-import { getDeptTreeList } from '@/api/system/dept'
 import EditTubeConfig from './editTubeConfig'
 import DownloadTemplate from '@/components/DownloadTemplate/index'
 import DeptSelect from '@/components/DeptSelect/index'
@@ -167,7 +165,6 @@
     }
   },
   created() {
-    this.fetchDeptTree()// 获取部门树
     this.fetchData()// 获取数据
   },
   methods: {
@@ -263,26 +260,6 @@
         this.listLoading = false
       })
     },
-    // 加载组织机构树形下拉菜单
-    fetchDeptTree: function() {
-      getDeptTreeList().then(response => {
-        if (response.data.list) {
-          if (response.data.list.length > 1) {
-            console.log(this.$store.getters.deptId)
-            if (judgeTree(response.data.list)) {
-              this.deptTreeList = toTreeList(response.data.list)
-              this.showDeptTree = 1
-            } else {
-              this.deptTreeList = response.data.list
-              this.showDeptTree = 2
-            }
-            console.log(this.deptTreeList)
-          } else {
-            this.showDeptTree = 0
-          }
-        }
-      })
-    },
     indexMethod(index) {
       return this.listQuery.limit * (this.listQuery.offset - 1) + index + 1
     },
diff --git a/src/views/deviceConfig/deviceConfig.vue b/src/views/deviceConfig/deviceConfig.vue
index 736c506..5e31573 100644
--- a/src/views/deviceConfig/deviceConfig.vue
+++ b/src/views/deviceConfig/deviceConfig.vue
@@ -2,34 +2,38 @@
   <div class="container">
     <el-tabs v-model="activeName" type="card" @tab-click="handleClick">
       <el-tab-pane v-if="hasPerm('/busConfig/liquidConfig/list')" label="液位监测仪" name="liquid">
-        <list-liquid-config ref="liquidConfig"/>
+        <list-liquid-config ref="liquidConfig" />
       </el-tab-pane>
       <el-tab-pane v-if="hasPerm('/busConfig/gasConfig/list')" label="燃气智能监测终端" name="gas">
-        <list-gas-config ref="gasConfig"/>
+        <list-gas-config ref="gasConfig" />
       </el-tab-pane>
       <el-tab-pane v-if="hasPerm('/busConfig/harmfulConfig/list')" label="有害气体监测仪" name="harmful">
-        <list-harmful-config ref="harmfulConfig"/>
+        <list-harmful-config ref="harmfulConfig" />
       </el-tab-pane>
       <el-tab-pane v-if="hasPerm('/busConfig/tempConfig/list')" label="温湿度监测仪" name="temphumidity">
-        <list-temp-config ref="tempConfig"/>
+        <list-temp-config ref="tempConfig" />
       </el-tab-pane>
       <el-tab-pane v-if="hasPerm('/busConfig/digConfig/list')" label="开挖监测仪" name="dig">
-        <list-dig-config ref="digConfig"/>
+        <list-dig-config ref="digConfig" />
       </el-tab-pane>
       <el-tab-pane v-if="hasPerm('/busConfig/noiseConfig/list')" label="噪声监测仪" name="noise">
-        <list-noise-config ref="noiseConfig"/>
+        <list-noise-config ref="noiseConfig" />
       </el-tab-pane>
       <el-tab-pane v-if="hasPerm('/busConfig/liquidGasConfig/list')" label="燃气智能监测终端(一体化)" name="liquidgas">
-        <list-liquid-gas-config ref="liquidGasConfig"/>
+        <list-liquid-gas-config ref="liquidGasConfig" />
       </el-tab-pane>
       <el-tab-pane v-if="hasPerm('/busConfig/tubeConfig/list')" label="管盯" name="tube">
-        <list-tube-config ref="tubeConfig"/>
+        <list-tube-config ref="tubeConfig" />
+      </el-tab-pane>
+      <el-tab-pane v-if="hasPerm('/busConfig/H2sConfig/list')" label="硫化氢检测终端" name="h2s">
+        <list-h2s-config ref="h2sConfig" />
       </el-tab-pane>
     </el-tabs>
   </div>
 </template>
 
 <script>
+import { hasPermission } from '@/utils/permission'
 import ListLiquidConfig from './components/listLiquidConfig'
 import ListGasConfig from './components/listGasConfig'
 import ListHarmfulConfig from './components/listHarmfulConfig'
@@ -37,11 +41,11 @@
 import ListDigConfig from './components/listDigConfig'
 import ListNoiseConfig from './components/listNoiseConfig'
 import ListLiquidGasConfig from './components/listLiquidGasConfig'
-import { hasPermission } from '@/utils/permission'
 import ListTubeConfig from './components/listTubeConfig'
+import ListH2sConfig from './components/listH2sConfig'
 export default {
   name: 'DeviceConfig',
-  components: { ListTubeConfig, ListLiquidGasConfig, ListNoiseConfig, ListDigConfig, ListTempConfig, ListHarmfulConfig, ListGasConfig, ListLiquidConfig },
+  components: { ListH2sConfig, ListTubeConfig, ListLiquidGasConfig, ListNoiseConfig, ListDigConfig, ListTempConfig, ListHarmfulConfig, ListGasConfig, ListLiquidConfig },
   data() {
     return {
       activeName: 'liquid'
@@ -68,6 +72,8 @@
         this.$refs.liquidGasConfig.fetchData()
       } else if (tab.name === 'tube') {
         this.$refs.tubeConfig.fetchData()
+      } else if (tab.name === 'tube') {
+        this.$refs.h2sConfig.fetchData()
       }
     },
     // 计算那个是当前第一个tab
@@ -88,6 +94,8 @@
         this.activeName = 'liquidgas'
       } else if (hasPermission('/busConfig/tubeConfig/list')) {
         this.activeName = 'tube'
+      } else if (hasPermission('/busConfig/h2sConfig/list')) {
+        this.activeName = 'h2s'
       }
     }
   }
@@ -95,7 +103,5 @@
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-  .container{
-    padding: 5px;
-  }
+
 </style>
diff --git a/src/views/deviceManage/deviceModel/deviceModel.vue b/src/views/deviceManage/deviceModel/deviceModel.vue
index a9f66ee..816c190 100644
--- a/src/views/deviceManage/deviceModel/deviceModel.vue
+++ b/src/views/deviceManage/deviceModel/deviceModel.vue
@@ -26,17 +26,17 @@
     <!--查询结果Table显示-->
     <normal-table ref="table" :data="list" :total="total" :query="listQuery" :columns="columns" :list-loading="listLoading" :pagination="true" :options="tableOptions" size="small" @change="changePage">
       <template slot="btns">
-        <el-button class="edit_btn" size="small" @click="add">
+        <el-button v-if="hasPerm('/deviceModels/add')" class="edit_btn" size="small" @click="add">
           新增
         </el-button>
       </template>
       <template slot="columns">
         <el-table-column label="操作" align="center" width="160">
           <template v-slot="scope">
-            <el-button type="text" size="mini" @click="edit(scope.row)">
+            <el-button v-if="hasPerm('/deviceModels/update')" type="text" size="mini" @click="edit(scope.row)">
               编辑
             </el-button>
-            <el-button type="text" size="mini" @click="del(scope.row)">
+            <el-button v-if="hasPerm('/deviceModels/delete')" type="text" size="mini" @click="del(scope.row)">
               删除
             </el-button>
           </template>
diff --git a/src/views/deviceManage/listDevice.vue b/src/views/deviceManage/listDevice.vue
index 94cbe3f..30fed22 100644
--- a/src/views/deviceManage/listDevice.vue
+++ b/src/views/deviceManage/listDevice.vue
@@ -76,13 +76,13 @@
         </el-table-column>
         <el-table-column label="操作" align="center" width="160">
           <template slot-scope="scope">
-            <el-button type="text" @click="datalist(scope.row)">
+            <el-button type="text" size="small" @click="datalist(scope.row)">
               历史数据
             </el-button>
-            <el-button v-if="hasPerm('/device/update')" type="text" @click="edit(scope.row)">
+            <el-button v-if="hasPerm('/device/update')" type="text" size="small" @click="edit(scope.row)">
               编辑
             </el-button>
-            <el-button type="text" @click="detail(scope.row)">
+            <el-button type="text" size="small" @click="detail(scope.row)">
               详情
             </el-button>
           </template>
diff --git a/src/views/system/dept/editDept.vue b/src/views/system/dept/editDept.vue
index 203d542..aebe0a7 100644
--- a/src/views/system/dept/editDept.vue
+++ b/src/views/system/dept/editDept.vue
@@ -16,7 +16,7 @@
       <el-row :gutter="20">
         <el-col :span="12">
           <el-form-item label="父组织" prop="pid">
-            <dept-select ref="deptSelect" v-model="deptForm.pid" :dept-show="true" placeholder="请选择父组织" />
+            <dept-select ref="deptSelect" v-model="deptForm.pid" :dept-show="true" placeholder="请选择父组织" size="normal" />
           </el-form-item>
         </el-col>
         <el-col :span="12">
diff --git a/src/views/system/tenant/components/relateDept.vue b/src/views/system/tenant/components/relateDept.vue
index 83e044d..0d9208a 100644
--- a/src/views/system/tenant/components/relateDept.vue
+++ b/src/views/system/tenant/components/relateDept.vue
@@ -74,7 +74,6 @@
     saveData() {
       this.$refs['dataForm'].validate((valid) => {
         if (valid) {
-          debugger
           relatedDept(this.dataForm).then(res => {
             if (res.code === 200) {
               this.$message.success('绑定成功')
diff --git a/src/views/wellManage/addWell.vue b/src/views/wellManage/addWell.vue
index dbe9e84..b16b63e 100644
--- a/src/views/wellManage/addWell.vue
+++ b/src/views/wellManage/addWell.vue
@@ -83,7 +83,7 @@
         </el-col>
       </el-row>
       <el-row :gutter="1">
-        <el-form-item label="所在区域" required>
+        <el-form-item label="所在区域">
           <el-col :span="5">
             <el-form-item prop="qu">
               <el-select v-model="wellForm.qu" :disabled="showArea" placeholder="请选择所在区/县" clearable>
@@ -116,6 +116,13 @@
           </el-col>
         </el-form-item>
       </el-row>
+      <el-row :gutter="1">
+        <el-col :span="15">
+          <el-form-item label="所在道路" prop="road">
+            <el-input v-model.trim="wellForm.road" type="text" placeholder="非必填，建议填写，不填影响统计结果" />
+          </el-form-item>
+        </el-col>
+      </el-row>
       <el-row :gutter="20">
         <el-col :span="15">
           <el-form-item label="详细地址" prop="position">
@@ -220,8 +227,9 @@
         latGaode: '', // 高德纬度
         photos: '', // 照片路径
         notes: '', // 备注,
-        qu: '',
+        qu: '', // 区
         area: '', // 街道
+        road: '', // 道路
         responsibleDept: '' // 维护人员部门
       }, // 表单
       deptProps: {
@@ -250,9 +258,9 @@
         coordinateX: [{ required: true, trigger: ['blur', 'change'], validator: validateLat }],
         coordinateY: [{ required: true, trigger: ['blur', 'change'], validator: validateLng }],
         deptid: [{ required: true, message: '组织机构必选', trigger: 'change' }],
-        wellType: [{ required: true, message: '点位类型必选', trigger: 'change' }],
-        qu: [{ required: true, message: '所在区/县必选', trigger: 'change' }],
-        area: [{ required: true, message: '所在街道/镇必选', trigger: 'change' }]
+        wellType: [{ required: true, message: '点位类型必选', trigger: 'change' }]
+        // qu: [{ required: true, message: '所在区/县必选', trigger: 'change' }],
+        // area: [{ required: true, message: '所在街道/镇必选', trigger: 'change' }]
       },
       uploadPath: this.baseConfig.baseUrl + '/imageUpload', // 图片上传路径
       dialogImageUrl: '',
@@ -337,8 +345,9 @@
         convertLnglat([this.wellForm.coordinateX, this.wellForm.coordinateY]).then(lnglat => {
           // 2.逆地址解析
           reverseLnglat(lnglat).then(res => {
-            this.wellForm.position = res.formattedAddress
-            this.wellForm.qu = res.addressComponent.adcode
+            this.wellForm.position = res.formattedAddress // 完整地址
+            this.wellForm.qu = res.addressComponent.adcode // 区编码
+            this.wellForm.road = res.addressComponent.street // 道路
           })
         })
       }
diff --git a/src/views/wellManage/detailWell.vue b/src/views/wellManage/detailWell.vue
index 1eaa10a..0511c15 100644
--- a/src/views/wellManage/detailWell.vue
+++ b/src/views/wellManage/detailWell.vue
@@ -80,6 +80,7 @@
         { type: 'areaName', label: '所在区域', value: 'areaName', placeholder: '未知', span: 2 },
         { type: 'text', label: '经度', value: 'coordinateX', placeholder: '未知' },
         { type: 'text', label: '纬度', value: 'coordinateY', placeholder: '未知' },
+        { type: 'text', label: '所在道路', value: 'road', placeholder: '未知', span: 5 },
         { type: 'text', label: '详细地址', value: 'position', placeholder: '未知', span: 5 },
         { type: 'images', label: '路标图片', value: 'imageList', placeholder: '无', span: 5 }
       ], // 表单配置项
@@ -102,6 +103,7 @@
         quName: '',
         area: '', // 街道
         areaName: '',
+        road: '',
         responsibleDept: '', // 维护人员部门
         responsibleDeptName: '' // 维护人员部门名称
       }, // 表单
@@ -156,6 +158,7 @@
         notes: row.notes, // 备注,
         qu: row.qu,
         area: row.area, // 街道
+        road: row.road,
         responsibleDept: row.responsibleDept, // 维护人员部门
         responsibleDeptName: row.responsibleDeptName // 维护人员部门
       }
diff --git a/src/views/wellManage/editWell.vue b/src/views/wellManage/editWell.vue
index e1312a5..9833884 100644
--- a/src/views/wellManage/editWell.vue
+++ b/src/views/wellManage/editWell.vue
@@ -98,7 +98,7 @@
             <el-col :span="1" class="line">
               区/县
             </el-col>
-            <el-col :span="5">
+            <el-col :span="10">
               <el-form-item prop="area">
                 <el-select v-model="wellForm.area" :disabled="showResponseDept" placeholder="请选择所在街道/镇" clearable>
                   <el-option
@@ -117,6 +117,13 @@
         </el-row>
         <el-row>
           <el-col :span="21">
+            <el-form-item label="所在道路" prop="road">
+              <el-input v-model.trim="wellForm.road" type="text" placeholder="非必填，建议填写，不填影响统计结果" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="21">
             <el-form-item label="详细地址" prop="position">
               <el-input v-model.trim="wellForm.position" type="text" placeholder="必填">
                 <el-button slot="append" size="small" icon="el-icon-refresh" @click="generateAddress">
@@ -235,6 +242,7 @@
         notes: '', // 备注,
         qu: '',
         area: '', // 街道
+        road: '', // 道路
         responsibleDept: '', // 维护人员部门
         responsibleDeptName: '' // 维护人员部门
       }, // 表单
@@ -262,9 +270,9 @@
         coordinateX: [{ required: true, trigger: ['blur', 'change'], validator: validateLat }],
         coordinateY: [{ required: true, trigger: ['blur', 'change'], validator: validateLng }],
         deptid: [{ required: true, message: '权属单位必选', trigger: 'change' }],
-        wellType: [{ required: true, message: '点位类型必选', trigger: 'change' }],
-        qu: [{ required: true, message: '所在区/县必选', trigger: 'change' }],
-        area: [{ required: true, message: '所在街道/镇必选', trigger: 'change' }]
+        wellType: [{ required: true, message: '点位类型必选', trigger: 'change' }]
+        // qu: [{ required: true, message: '所在区/县必选', trigger: 'change' }],
+        // area: [{ required: true, message: '所在街道/镇必选', trigger: 'change' }]
       },
       deptShowTop: false, // 权属单位下拉是否显示顶级
       dialogImageUrl: '',
@@ -337,6 +345,7 @@
           reverseLnglat(lnglat).then(res => {
             this.wellForm.position = res.formattedAddress
             this.wellForm.qu = res.addressComponent.adcode
+            this.wellForm.road = res.addressComponent.street // 道路
           })
         })
       }

diff --git a/src/api/config/h2sconfig.js b/src/api/config/h2sconfig.js
new file mode 100644
index 0000000..f441692
--- /dev/null
+++ b/src/api/config/h2sconfig.js
@@ -0,0 +1,42 @@
+/**
+ * 硫化氢配置接口
+ */
+import request from '@/utils/request'
+// 硫化氢配置查询
+export function getH2sConfigList(params) {
+  return request({
+    url: 'busConfig/H2sConfig/list',
+    method: 'get',
+    params
+  })
+}
+
+// 修改硫化氢配置
+export function editH2sConfig(params) {
+  return request({
+    url: 'busConfig/H2sConfig/config',
+    method: 'post',
+    params
+  })
+}
+
+// 批量导入
+export function batchImportH2sConfig(fileobj) {
+  const param = new FormData()
+  param.append('file', fileobj)
+  return request({
+    url: 'busConfig/H2sConfig/batchImport',
+    method: 'post',
+    headers: { 'Content-Type': 'multipart/form-data' },
+    data: param
+  })
+}
+// 批量导出
+export function batchExportH2sConfig(params) {
+  return request({
+    url: 'busConfig/H2sConfig/batchExport',
+    method: 'get',
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
diff --git a/src/components/Amap/utils/convert-helper.js b/src/components/Amap/utils/convert-helper.js
index ab7a8d2..6b61377 100644
--- a/src/components/Amap/utils/convert-helper.js
+++ b/src/components/Amap/utils/convert-helper.js
@@ -76,7 +76,6 @@
     AMapLoader.load({
       key: store.getters.amapKey // 秘钥
     }).then((AMap) => {
-      // debugger
       AMap.convertFrom(coordinate, 'gps', (status, result) => {
         if (result.info === 'ok') {
           const lnglats = result.locations[0]
diff --git a/src/permission.js b/src/permission.js
index 0f332ec..52f5108 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -33,7 +33,6 @@
     const oldUser = getUser()
     const username = to.query.username
     const password = to.query.pwd
-    // debugger
     if (loginByUsername && username && password && !oldUser) { // 登陆后跳转
       const loginForm = {
         username: username,
diff --git a/src/views/dataView/components/panelGroup.vue b/src/views/dataView/components/panelGroup.vue
index 7cae96f..49ee723 100644
--- a/src/views/dataView/components/panelGroup.vue
+++ b/src/views/dataView/components/panelGroup.vue
@@ -120,7 +120,6 @@
       const endTime = new Date().Format('yyyy-MM-dd hh:mm:ss')
       const params = { beginTime, endTime }
       dataCount(params).then(response => {
-        debugger
         this.dataGroup[2].context = response.data.total
       })
     }
diff --git a/src/views/deviceConfig/components/editGasConfig.vue b/src/views/deviceConfig/components/editGasConfig.vue
index 07659cf..0f33004 100644
--- a/src/views/deviceConfig/components/editGasConfig.vue
+++ b/src/views/deviceConfig/components/editGasConfig.vue
@@ -155,8 +155,8 @@
       configForm: {
         id: '', // config id
         deviceId: '', // 设备id
-        collectInterval: '', // 报警阈值
-        uploadPeriod: '', // 安装高度
+        collectInterval: '', // 采集间隔
+        uploadPeriod: '', // 上传周期
         retryTimes: '3', // 重传次数
         attemptsMax: '3', // 最大尝试次数
         ip: '', // ip地址
diff --git a/src/views/deviceConfig/components/editH2sConfig.vue b/src/views/deviceConfig/components/editH2sConfig.vue
new file mode 100644
index 0000000..8902fdd
--- /dev/null
+++ b/src/views/deviceConfig/components/editH2sConfig.vue
@@ -0,0 +1,291 @@
+<template>
+  <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" append-to-body>
+    <el-form ref="dataForm" :rules="rules" :model="configForm" label-well-code="right" label-width="110px">
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item v-if="dialogStatus=='create'" label="设备编号" prop="deviceId">
+            <el-select
+              v-model="configForm.deviceId"
+              :loading="loading"
+              :disabled="dialogStatus=='update'?true:false"
+              filterable
+              placeholder="请输入设备编号"
+            >
+              <el-option
+                v-for="item in devices"
+                :key="item.id"
+                :label="item.devcode"
+                :value="item.id"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item v-if="dialogStatus=='update'" label="设备编号">
+            <el-input v-model="deviceForm.devcode" type="text" placeholder="未知" disabled />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item v-if="deviceForm.deviceName!=''" label="设备名称">
+            <el-input v-model="deviceForm.deviceName" type="text" placeholder="未知" disabled />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item v-if="deviceForm.deviceTypeName!=''" label="设备类型" prop="deviceType">
+            <el-input v-model="deviceForm.deviceTypeName" type="text" placeholder="未知" disabled />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item v-if="deviceForm.deptName!=''" label="权属单位" prop="deptName">
+            <el-input v-model="deviceForm.deptName" type="text" placeholder="未知" disabled />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="重传次数" prop="retryTimes">
+            <el-input-number v-model="configForm.retryTimes" :min="1" :max="9" type="text" placeholder="必填" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="采集间隔(分)" prop="collectInterval">
+            <el-input v-model.trim="configForm.collectInterval" type="text" placeholder="必填" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="上传周期(分)" prop="uploadPeriod">
+            <el-input v-model.trim="configForm.uploadPeriod" type="text" placeholder="必填" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="最大尝试次数">
+            <el-input-number v-model="configForm.attemptsMax" :min="1" :max="100" type="text" placeholder="必填" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row v-if="showIp" :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="ip地址" prop="ip">
+            <el-input v-model.trim="configForm.ip" type="text" placeholder="非必填" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="端口号" prop="port">
+            <el-input v-model.trim="configForm.port" type="text" placeholder="非必填" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <div slot="footer" class="dialog-footer">
+      <el-button :disabled="!canEdit" type="primary" @click="saveData">
+        保存
+      </el-button>
+      <el-button @click="cancel">
+        取消
+      </el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { editH2sConfig } from '@/api/config/h2sconfig'
+import { getDeviceSimpleList } from '@/api/config/liquidconfig'
+import { validateFloatPlus } from '@/utils/validate'
+export default {
+  name: 'EditH2sConfig',
+  data() {
+    const validateIp = (rule, value, callback) => {
+      if (value !== '') {
+        if ((/((25[0-5]|2[0-4]\d|((1\d{2})|([1-9]?\d)))\.){3}(25[0-5]|2[0-4]\d|((1\d{2})|([1-9]?\d)))/).test(value) === false) {
+          callback(new Error('请填写正确的ip地址'))
+        } else {
+          callback()
+        }
+      } else {
+        // callback(new Error('ip地址不能为空'))
+        callback()
+      }
+    }
+    const validatePort = (rule, value, callback) => {
+      if (value !== '') {
+        if ((/[1-9]$|(^[1-9][0-9]$)|(^[1-9][0-9][0-9]$)|(^[1-9][0-9][0-9][0-9]$)|(^[1-6][0-5][0-5][0-3][0-5]$)/).test(value) === false) {
+          callback(new Error('请填写正确的端口号'))
+        } else {
+          callback()
+        }
+      } else {
+        // callback(new Error('端口号不能为空'))
+        callback()
+      }
+    }
+    const validateCollectCycle = (rule, value, callback) => {
+      if (value !== '') {
+        if (validateFloatPlus(value, 5, 1440) === true) {
+          callback()
+        } else {
+          callback(new Error('请填写5到1440数值'))
+        }
+      } else {
+        callback(new Error('采集间隔不能为空'))
+      }
+    }
+    const validateUpPeriod = (rule, value, callback) => {
+      if (value !== '') {
+        if (validateFloatPlus(value, 0, 10080) === true) {
+          callback()
+        } else {
+          callback(new Error('请填写0到10080之间数值'))
+        }
+      } else {
+        callback(new Error('上传周期不能为空'))
+      }
+    }
+    return {
+      dialogFormVisible: false, // 对话框是否显示
+      dialogStatus: '', // 对话框类型：create,update
+      deviceForm: {
+        deviceName: '',
+        deviceTypeName: '',
+        deptName: '',
+        devcode: '',
+        deviceType: ''
+      }, // 设备基本信息
+      configForm: {
+        id: '', // config id
+        deviceId: '', // 设备id
+        collectInterval: '', // 采集间隔
+        uploadPeriod: '', // 上传周期
+        retryTimes: '3', // 重传次数
+        attemptsMax: '3', // 最大尝试次数
+        ip: '', // ip地址
+        port: '' // 端口号
+      },
+      textMap: {
+        update: '编辑',
+        create: '新增'
+      }, // 表头显示标题
+      devices: [], // 设备下拉选择列表
+      loading: false, // 加载动画是否显示
+      canEdit: true, // 是否允许点击保存按钮
+      rules: {
+        collectInterval: [{ required: true, trigger: ['blur', 'change'], validator: validateCollectCycle }],
+        uploadPeriod: [{ required: true, trigger: ['blur', 'change'], validator: validateUpPeriod }],
+        deviceId: [{ required: true, message: '设备编号不能为空', trigger: ['blur', 'change'] }],
+        ip: [{ trigger: ['blur', 'change'], validator: validateIp }],
+        port: [{ trigger: ['blur', 'change'], validator: validatePort }]
+      } // 前端校验规则
+    }
+  },
+  computed: {
+    watchDeviceId() { // 监控权属单位变化
+      return this.configForm.deviceId
+    },
+    showIp() { // 是否显示ip配置
+      return true
+    }
+  },
+  watch: {
+    watchDeviceId(newValue, oldValue) {
+      for (const device of this.devices) {
+        if (device.id === newValue) {
+          this.deviceForm.deviceTypeName = device.deviceTypeName
+          this.deviceForm.deptName = device.deptName
+          this.deviceForm.deviceName = device.deviceName
+          return
+        }
+      }
+    }
+  },
+  methods: {
+    // 初始化对话框
+    initDialog: function(dialogStatus, dialogFormVisible, row = null) {
+      this.dialogStatus = dialogStatus
+      this.dialogFormVisible = dialogFormVisible
+      this.canEdit = true
+      if (dialogStatus === 'create') { // 如果是新增，清除验证
+        this.resetForm()
+        this.fetchDevice()
+        this.$nextTick(() => {
+          this.$refs['dataForm'].clearValidate()
+        })
+      } else if (dialogStatus === 'update') { // 如果是修改，将row中数据填写到输入框中
+        this.deviceForm = {
+          deviceName: row.deviceName,
+          devcode: row.devcode,
+          deptName: row.deptName,
+          deviceType: row.deviceType,
+          deviceTypeName: row.deviceTypeName
+        }
+        this.configForm = {
+          id: row.id,
+          deviceId: row.deviceId, // 设备id
+          collectInterval: row.collectInterval, // 采集间隔
+          uploadPeriod: row.uploadPeriod, // 上传周期
+          retryTimes: row.retryTimes, // 重传次数
+          ip: row.ip, // ip地址
+          port: row.port, // 端口号
+          attemptsMax: row.attemptsMax // 最大尝试次数
+        }
+      }
+    },
+    // 重置表单
+    resetForm() {
+      this.deviceForm = {
+        deviceName: '',
+        deviceTypeName: '',
+        deptName: '',
+        devcode: ''
+      }
+      this.configForm = {
+        deviceId: '', // 设备id
+        collectInterval: '', // 采集间隔
+        uploadPeriod: '', // 上传周期
+        retryTimes: '3', // 重传次数
+        ip: '', // ip地址
+        port: '', // 端口号
+        attemptsMax: '3' // 最大尝试次数
+      }
+    },
+    // 保存数据
+    saveData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          this.canEdit = false
+          editH2sConfig(this.configForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('配置成功')
+              this.$emit('watchChild')
+              this.dialogFormVisible = false
+            }
+            this.canEdit = false
+          }).catch(_ => {
+            this.canEdit = true
+          })
+        }
+      })
+    },
+    fetchDevice() {
+      this.loading = true
+      getDeviceSimpleList('14', '0').then(response => {
+        this.loading = false
+        this.devices = response.data
+      })
+    },
+    cancel: function() {
+      this.dialogFormVisible = false
+      this.$emit('watchChild')
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .el-select{
+    width: 100%;
+  }
+  .el-input-number{
+    width: 100%;
+  }
+</style>
diff --git a/src/views/deviceConfig/components/editLiquidConfig.vue b/src/views/deviceConfig/components/editLiquidConfig.vue
index 6be88e3..19557de 100644
--- a/src/views/deviceConfig/components/editLiquidConfig.vue
+++ b/src/views/deviceConfig/components/editLiquidConfig.vue
@@ -188,7 +188,6 @@
   watch: {
     watchDeviceId(newValue, oldValue) {
       for (const device of this.devices) {
-        debugger
         if (device.id === newValue) {
           this.deviceForm.deviceTypeName = device.deviceTypeName
           this.deviceForm.deptName = device.deptName
diff --git a/src/views/deviceConfig/components/editTubeConfig.vue b/src/views/deviceConfig/components/editTubeConfig.vue
index 171991a..468014e 100644
--- a/src/views/deviceConfig/components/editTubeConfig.vue
+++ b/src/views/deviceConfig/components/editTubeConfig.vue
@@ -155,8 +155,8 @@
       configForm: {
         id: '', // config id
         deviceId: '', // 设备id
-        collectInterval: '', // 报警阈值
-        uploadPeriod: '', // 安装高度
+        collectInterval: '', // 采集间隔
+        uploadPeriod: '', // 上传周期
         retryTimes: '3', // 重传次数
         attemptsMax: '3', // 最大尝试次数
         ip: '', // ip地址
diff --git a/src/views/deviceConfig/components/listH2sConfig.vue b/src/views/deviceConfig/components/listH2sConfig.vue
new file mode 100644
index 0000000..3555e1e
--- /dev/null
+++ b/src/views/deviceConfig/components/listH2sConfig.vue
@@ -0,0 +1,310 @@
+<template>
+  <app-container>
+    <search-area size="small" @search="search">
+      <search-item>
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="设备编号" clearable />
+      </search-item>
+      <search-item>
+        <dept-select
+          v-model="listQuery.deptid"
+          :need-top="deptShowTop"
+          dept-type="03"
+          placeholder="选择权属单位"
+        />
+      </search-item>
+    </search-area>
+    <!--查询结果Table显示-->
+    <div>
+      <el-row class="table-title">
+        <el-col :span="6">
+          <div class="title-header">
+            <i class="el-icon-menu" />数据列表
+          </div>
+        </el-col>
+        <el-col :span="12" :offset="6" class="edit_btns">
+          <el-button v-if="hasPerm('/busConfig/H2sConfig/batchExport')" class="edit_btn" size="small" @click="batchExport">
+            导出记录
+          </el-button>
+          <download-template :filename="filename" />
+          <el-upload
+            v-if="hasPerm('/busConfig/H2sConfig/batchImport')"
+            :limit="1"
+            :show-file-list="false"
+            :http-request="uploadFile"
+            :file-list="fileList"
+            action="string"
+            accept=".xls,.xlsx"
+            class="edit_btn"
+          >
+            <el-button v-if="hasPerm('/busConfig/H2sConfig/batchImport')" slot="trigger" size="small">
+              批量导入
+            </el-button>
+          </el-upload>
+          <el-button v-if="hasPerm('/busConfig/H2sConfig/config')" class="edit_btn" size="small" @click="add">
+            新增
+          </el-button>
+        </el-col>
+      </el-row>
+      <el-table v-loading="listLoading" :data="list" class="table" border @selection-change="handleSelectionChange">
+        <!--<el-table-column align="center" type="selection" width="55"/>-->
+        <el-table-column :index="indexMethod" align="center" type="index" />
+        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
+          <template slot-scope="scope">
+            {{ scope.row[column.value] }}
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" align="center" width="60">
+          <template slot-scope="scope">
+            <el-button type="text" @click="edit(scope.row)">
+              编辑
+            </el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+    </div>
+    <!--分页-->
+    <div class="pagination-container">
+      <el-pagination
+        v-show="total>listQuery.limit"
+        :current-page="listQuery.offset"
+        :page-sizes="[20,30,50]"
+        :page-size="listQuery.limit"
+        :total="total"
+        align="center"
+        layout="total, sizes, prev, pager, next"
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"
+      />
+    </div>
+    <edit-h2s-config v-show="editShow" ref="editconfig" @watchChild="fetchData" />
+  </app-container>
+</template>
+
+<script>
+import { getH2sConfigList, batchImportH2sConfig, batchExportH2sConfig } from '@/api/config/h2sconfig'
+import EditH2sConfig from './editH2sConfig'
+import DownloadTemplate from '@/components/DownloadTemplate/index'
+import DeptSelect from '@/components/DeptSelect/index'
+
+export default {
+  name: 'ListH2sConfig',
+  components: { DeptSelect, DownloadTemplate, EditH2sConfig },
+  data() {
+    return {
+      listQuery: {
+        keywords: '',
+        offset: 1,
+        limit: 20,
+        sort: '',
+        order: ''
+      }, // 筛选条件
+      columns: [
+        {
+          text: '设备编号',
+          value: 'devcode',
+          align: 'center'
+        },
+        {
+          text: '重传次数',
+          value: 'retryTimes',
+          align: 'center'
+        },
+        {
+          text: '采集间隔(分)',
+          value: 'collectInterval',
+          align: 'center'
+        },
+        {
+          text: '上传周期',
+          value: 'uploadPeriod',
+          align: 'center'
+        },
+        {
+          text: 'IP地址',
+          value: 'ip',
+          align: 'center'
+        },
+        {
+          text: '端口',
+          value: 'port',
+          align: 'center'
+        },
+        {
+          text: '最大尝试次数',
+          value: 'attemptsMax',
+          align: 'center'
+        },
+        {
+          text: '已尝试次数',
+          value: 'attemptsCurrent',
+          align: 'center'
+        },
+        {
+          text: '下发状态',
+          value: 'statusName',
+          width: 80,
+          align: 'center'
+        }
+      ], // 显示列
+      multipleSelection: [], // 多选选中项
+      list: [], // 列表数据
+      total: 0, // 数据总数
+      deviceTypeList: [], // 硫化氢配置类型列表
+      deptProps: {
+        parent: 'pid',
+        value: 'id',
+        label: 'name',
+        children: 'children'
+      }, // 权属单位树形下拉菜单
+      deptTreeList: null, // 组织树列表数据
+      showDeptTree: 0, // 是否显示权属单位下拉
+      showDeviceType: true, // 是否显示设备类型下拉
+      listLoading: true, // 加载动画
+      fullscreenLoading: false, // 全屏加载动画
+      editShow: false, // 是否显示编辑框
+      detailShow: false, // 是否显示编辑框
+      filename: 'methane_config_template.xlsx',
+      deptShowTop: false,
+      fileList: []
+    }
+  },
+  created() {
+    this.fetchData()// 获取数据
+  },
+  methods: {
+    // 新增设备
+    add() {
+      this.dialogFormVisible = true
+      this.editShow = true
+      this.$refs.editconfig.initDialog('create', this.dialogFormVisible)
+    },
+    // 编辑硫化氢配置信息
+    edit(row) {
+      this.dialogFormVisible = true
+      this.editShow = true
+      this.$refs.editconfig.initDialog('update', this.dialogFormVisible, row)
+    },
+    // 批量导入硫化氢配置
+    uploadFile(param) {
+      // 判断文件大小是否符合要求
+      const _file = param.file
+      const isLt5M = _file.size / 1024 / 1024 < 5
+      if (!isLt5M) {
+        this.$message.error('请上传5M以下的excel文件')
+        return false
+      }
+      // 全屏加载动画
+      const loading = this.$loading({
+        lock: true,
+        text: '导入中,请稍后...',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
+      })
+      // 发起导入请求
+      batchImportH2sConfig(_file).then(res => {
+        loading.close() // 关闭加载动画
+        if (res.code === 200) {
+          this.$message.success('导入成功')
+          this.fetchData(false)
+        } else {
+          this.$message.error(res.message)
+        }
+      }).catch(() => {
+        loading.close() // 关闭加载动画
+      })
+      this.fileList = []
+    },
+    // 批量导出
+    batchExport() {
+      // 全屏加载动画
+      const loading = this.$loading({
+        lock: true,
+        text: '数据处理中,请稍后...',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
+      })
+      batchExportH2sConfig(this.listQuery).then(res => {
+        loading.close() // 关闭加载动画
+        console.log('download===', res)
+        const blob = new Blob([res.data])
+        const downloadElement = document.createElement('a')
+        const href = window.URL.createObjectURL(blob) // 创建下载的链接
+        downloadElement.href = href
+        downloadElement.download = `硫化氢配置列表.xlsx` // 下载后文件名
+        document.body.appendChild(downloadElement)
+        downloadElement.click() // 点击下载
+        document.body.removeChild(downloadElement) // 下载完成移除元素
+        window.URL.revokeObjectURL(href) // 释放blob对象
+      }).catch((res) => {
+        loading.close()
+        this.$message.error(res.message)
+      })
+    },
+    // 查询数据
+    search() {
+      this.fetchData(false)
+    },
+    // 获取硫化氢配置数据
+    fetchData(isNowPage = true) {
+      this.listLoading = true
+      if (!isNowPage) { // 是否显示当前页，否则跳转第一页
+        this.listQuery.offset = 1
+      }
+      getH2sConfigList(this.listQuery).then(response => {
+        this.list = response.data.rows
+        this.total = parseInt(response.data.total)
+        this.listLoading = false
+      })
+    },
+    indexMethod(index) {
+      return this.listQuery.limit * (this.listQuery.offset - 1) + index + 1
+    },
+    // 改变页容量
+    handleSizeChange(val) {
+      this.listQuery.limit = val
+      this.fetchData()
+    },
+    // 改变当前页
+    handleCurrentChange(val) {
+      this.listQuery.offset = val
+      this.fetchData()
+    },
+    // 多选触发方法
+    handleSelectionChange(val) {
+      this.multipleSelection = val
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .app-container{
+    padding: 10px;
+  }
+  $tableTitleHeight:46px;
+  .table{
+    margin-bottom: 20px;
+  }
+  .pagination-container{
+    margin-bottom: 50px;
+  }
+  .table-title{
+    background-color:rgba(243, 243, 243, 1);
+    height: $tableTitleHeight;
+    .title-header{
+      line-height:$tableTitleHeight;
+      color: #606266;
+      font-size: 15px;
+      i{
+        margin-left: 5px;
+        margin-right: 5px;
+      }
+    }
+  }
+  .edit_btns{
+    .edit_btn{
+      float:right;
+      margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2
+    }
+  }
+</style>
diff --git a/src/views/deviceConfig/components/listTubeConfig.vue b/src/views/deviceConfig/components/listTubeConfig.vue
index 6a054f8..9f27e0e 100644
--- a/src/views/deviceConfig/components/listTubeConfig.vue
+++ b/src/views/deviceConfig/components/listTubeConfig.vue
@@ -77,9 +77,7 @@
 </template>
 
 <script>
-import { judgeTree, toTreeList } from '@/utils/structure'
 import { getTubeConfigList, batchImportTubeConfig, batchExportTubeConfig } from '@/api/config/tubeconfig'
-import { getDeptTreeList } from '@/api/system/dept'
 import EditTubeConfig from './editTubeConfig'
 import DownloadTemplate from '@/components/DownloadTemplate/index'
 import DeptSelect from '@/components/DeptSelect/index'
@@ -167,7 +165,6 @@
     }
   },
   created() {
-    this.fetchDeptTree()// 获取部门树
     this.fetchData()// 获取数据
   },
   methods: {
@@ -263,26 +260,6 @@
         this.listLoading = false
       })
     },
-    // 加载组织机构树形下拉菜单
-    fetchDeptTree: function() {
-      getDeptTreeList().then(response => {
-        if (response.data.list) {
-          if (response.data.list.length > 1) {
-            console.log(this.$store.getters.deptId)
-            if (judgeTree(response.data.list)) {
-              this.deptTreeList = toTreeList(response.data.list)
-              this.showDeptTree = 1
-            } else {
-              this.deptTreeList = response.data.list
-              this.showDeptTree = 2
-            }
-            console.log(this.deptTreeList)
-          } else {
-            this.showDeptTree = 0
-          }
-        }
-      })
-    },
     indexMethod(index) {
       return this.listQuery.limit * (this.listQuery.offset - 1) + index + 1
     },
diff --git a/src/views/deviceConfig/deviceConfig.vue b/src/views/deviceConfig/deviceConfig.vue
index 736c506..5e31573 100644
--- a/src/views/deviceConfig/deviceConfig.vue
+++ b/src/views/deviceConfig/deviceConfig.vue
@@ -2,34 +2,38 @@
   <div class="container">
     <el-tabs v-model="activeName" type="card" @tab-click="handleClick">
       <el-tab-pane v-if="hasPerm('/busConfig/liquidConfig/list')" label="液位监测仪" name="liquid">
-        <list-liquid-config ref="liquidConfig"/>
+        <list-liquid-config ref="liquidConfig" />
       </el-tab-pane>
       <el-tab-pane v-if="hasPerm('/busConfig/gasConfig/list')" label="燃气智能监测终端" name="gas">
-        <list-gas-config ref="gasConfig"/>
+        <list-gas-config ref="gasConfig" />
       </el-tab-pane>
       <el-tab-pane v-if="hasPerm('/busConfig/harmfulConfig/list')" label="有害气体监测仪" name="harmful">
-        <list-harmful-config ref="harmfulConfig"/>
+        <list-harmful-config ref="harmfulConfig" />
       </el-tab-pane>
       <el-tab-pane v-if="hasPerm('/busConfig/tempConfig/list')" label="温湿度监测仪" name="temphumidity">
-        <list-temp-config ref="tempConfig"/>
+        <list-temp-config ref="tempConfig" />
       </el-tab-pane>
       <el-tab-pane v-if="hasPerm('/busConfig/digConfig/list')" label="开挖监测仪" name="dig">
-        <list-dig-config ref="digConfig"/>
+        <list-dig-config ref="digConfig" />
       </el-tab-pane>
       <el-tab-pane v-if="hasPerm('/busConfig/noiseConfig/list')" label="噪声监测仪" name="noise">
-        <list-noise-config ref="noiseConfig"/>
+        <list-noise-config ref="noiseConfig" />
       </el-tab-pane>
       <el-tab-pane v-if="hasPerm('/busConfig/liquidGasConfig/list')" label="燃气智能监测终端(一体化)" name="liquidgas">
-        <list-liquid-gas-config ref="liquidGasConfig"/>
+        <list-liquid-gas-config ref="liquidGasConfig" />
       </el-tab-pane>
       <el-tab-pane v-if="hasPerm('/busConfig/tubeConfig/list')" label="管盯" name="tube">
-        <list-tube-config ref="tubeConfig"/>
+        <list-tube-config ref="tubeConfig" />
+      </el-tab-pane>
+      <el-tab-pane v-if="hasPerm('/busConfig/H2sConfig/list')" label="硫化氢检测终端" name="h2s">
+        <list-h2s-config ref="h2sConfig" />
       </el-tab-pane>
     </el-tabs>
   </div>
 </template>
 
 <script>
+import { hasPermission } from '@/utils/permission'
 import ListLiquidConfig from './components/listLiquidConfig'
 import ListGasConfig from './components/listGasConfig'
 import ListHarmfulConfig from './components/listHarmfulConfig'
@@ -37,11 +41,11 @@
 import ListDigConfig from './components/listDigConfig'
 import ListNoiseConfig from './components/listNoiseConfig'
 import ListLiquidGasConfig from './components/listLiquidGasConfig'
-import { hasPermission } from '@/utils/permission'
 import ListTubeConfig from './components/listTubeConfig'
+import ListH2sConfig from './components/listH2sConfig'
 export default {
   name: 'DeviceConfig',
-  components: { ListTubeConfig, ListLiquidGasConfig, ListNoiseConfig, ListDigConfig, ListTempConfig, ListHarmfulConfig, ListGasConfig, ListLiquidConfig },
+  components: { ListH2sConfig, ListTubeConfig, ListLiquidGasConfig, ListNoiseConfig, ListDigConfig, ListTempConfig, ListHarmfulConfig, ListGasConfig, ListLiquidConfig },
   data() {
     return {
       activeName: 'liquid'
@@ -68,6 +72,8 @@
         this.$refs.liquidGasConfig.fetchData()
       } else if (tab.name === 'tube') {
         this.$refs.tubeConfig.fetchData()
+      } else if (tab.name === 'tube') {
+        this.$refs.h2sConfig.fetchData()
       }
     },
     // 计算那个是当前第一个tab
@@ -88,6 +94,8 @@
         this.activeName = 'liquidgas'
       } else if (hasPermission('/busConfig/tubeConfig/list')) {
         this.activeName = 'tube'
+      } else if (hasPermission('/busConfig/h2sConfig/list')) {
+        this.activeName = 'h2s'
       }
     }
   }
@@ -95,7 +103,5 @@
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-  .container{
-    padding: 5px;
-  }
+
 </style>
diff --git a/src/views/deviceManage/deviceModel/deviceModel.vue b/src/views/deviceManage/deviceModel/deviceModel.vue
index a9f66ee..816c190 100644
--- a/src/views/deviceManage/deviceModel/deviceModel.vue
+++ b/src/views/deviceManage/deviceModel/deviceModel.vue
@@ -26,17 +26,17 @@
     <!--查询结果Table显示-->
     <normal-table ref="table" :data="list" :total="total" :query="listQuery" :columns="columns" :list-loading="listLoading" :pagination="true" :options="tableOptions" size="small" @change="changePage">
       <template slot="btns">
-        <el-button class="edit_btn" size="small" @click="add">
+        <el-button v-if="hasPerm('/deviceModels/add')" class="edit_btn" size="small" @click="add">
           新增
         </el-button>
       </template>
       <template slot="columns">
         <el-table-column label="操作" align="center" width="160">
           <template v-slot="scope">
-            <el-button type="text" size="mini" @click="edit(scope.row)">
+            <el-button v-if="hasPerm('/deviceModels/update')" type="text" size="mini" @click="edit(scope.row)">
               编辑
             </el-button>
-            <el-button type="text" size="mini" @click="del(scope.row)">
+            <el-button v-if="hasPerm('/deviceModels/delete')" type="text" size="mini" @click="del(scope.row)">
               删除
             </el-button>
           </template>
diff --git a/src/views/deviceManage/listDevice.vue b/src/views/deviceManage/listDevice.vue
index 94cbe3f..30fed22 100644
--- a/src/views/deviceManage/listDevice.vue
+++ b/src/views/deviceManage/listDevice.vue
@@ -76,13 +76,13 @@
         </el-table-column>
         <el-table-column label="操作" align="center" width="160">
           <template slot-scope="scope">
-            <el-button type="text" @click="datalist(scope.row)">
+            <el-button type="text" size="small" @click="datalist(scope.row)">
               历史数据
             </el-button>
-            <el-button v-if="hasPerm('/device/update')" type="text" @click="edit(scope.row)">
+            <el-button v-if="hasPerm('/device/update')" type="text" size="small" @click="edit(scope.row)">
               编辑
             </el-button>
-            <el-button type="text" @click="detail(scope.row)">
+            <el-button type="text" size="small" @click="detail(scope.row)">
               详情
             </el-button>
           </template>
diff --git a/src/views/system/dept/editDept.vue b/src/views/system/dept/editDept.vue
index 203d542..aebe0a7 100644
--- a/src/views/system/dept/editDept.vue
+++ b/src/views/system/dept/editDept.vue
@@ -16,7 +16,7 @@
       <el-row :gutter="20">
         <el-col :span="12">
           <el-form-item label="父组织" prop="pid">
-            <dept-select ref="deptSelect" v-model="deptForm.pid" :dept-show="true" placeholder="请选择父组织" />
+            <dept-select ref="deptSelect" v-model="deptForm.pid" :dept-show="true" placeholder="请选择父组织" size="normal" />
           </el-form-item>
         </el-col>
         <el-col :span="12">
diff --git a/src/views/system/tenant/components/relateDept.vue b/src/views/system/tenant/components/relateDept.vue
index 83e044d..0d9208a 100644
--- a/src/views/system/tenant/components/relateDept.vue
+++ b/src/views/system/tenant/components/relateDept.vue
@@ -74,7 +74,6 @@
     saveData() {
       this.$refs['dataForm'].validate((valid) => {
         if (valid) {
-          debugger
           relatedDept(this.dataForm).then(res => {
             if (res.code === 200) {
               this.$message.success('绑定成功')
diff --git a/src/views/wellManage/addWell.vue b/src/views/wellManage/addWell.vue
index dbe9e84..b16b63e 100644
--- a/src/views/wellManage/addWell.vue
+++ b/src/views/wellManage/addWell.vue
@@ -83,7 +83,7 @@
         </el-col>
       </el-row>
       <el-row :gutter="1">
-        <el-form-item label="所在区域" required>
+        <el-form-item label="所在区域">
           <el-col :span="5">
             <el-form-item prop="qu">
               <el-select v-model="wellForm.qu" :disabled="showArea" placeholder="请选择所在区/县" clearable>
@@ -116,6 +116,13 @@
           </el-col>
         </el-form-item>
       </el-row>
+      <el-row :gutter="1">
+        <el-col :span="15">
+          <el-form-item label="所在道路" prop="road">
+            <el-input v-model.trim="wellForm.road" type="text" placeholder="非必填，建议填写，不填影响统计结果" />
+          </el-form-item>
+        </el-col>
+      </el-row>
       <el-row :gutter="20">
         <el-col :span="15">
           <el-form-item label="详细地址" prop="position">
@@ -220,8 +227,9 @@
         latGaode: '', // 高德纬度
         photos: '', // 照片路径
         notes: '', // 备注,
-        qu: '',
+        qu: '', // 区
         area: '', // 街道
+        road: '', // 道路
         responsibleDept: '' // 维护人员部门
       }, // 表单
       deptProps: {
@@ -250,9 +258,9 @@
         coordinateX: [{ required: true, trigger: ['blur', 'change'], validator: validateLat }],
         coordinateY: [{ required: true, trigger: ['blur', 'change'], validator: validateLng }],
         deptid: [{ required: true, message: '组织机构必选', trigger: 'change' }],
-        wellType: [{ required: true, message: '点位类型必选', trigger: 'change' }],
-        qu: [{ required: true, message: '所在区/县必选', trigger: 'change' }],
-        area: [{ required: true, message: '所在街道/镇必选', trigger: 'change' }]
+        wellType: [{ required: true, message: '点位类型必选', trigger: 'change' }]
+        // qu: [{ required: true, message: '所在区/县必选', trigger: 'change' }],
+        // area: [{ required: true, message: '所在街道/镇必选', trigger: 'change' }]
       },
       uploadPath: this.baseConfig.baseUrl + '/imageUpload', // 图片上传路径
       dialogImageUrl: '',
@@ -337,8 +345,9 @@
         convertLnglat([this.wellForm.coordinateX, this.wellForm.coordinateY]).then(lnglat => {
           // 2.逆地址解析
           reverseLnglat(lnglat).then(res => {
-            this.wellForm.position = res.formattedAddress
-            this.wellForm.qu = res.addressComponent.adcode
+            this.wellForm.position = res.formattedAddress // 完整地址
+            this.wellForm.qu = res.addressComponent.adcode // 区编码
+            this.wellForm.road = res.addressComponent.street // 道路
           })
         })
       }
diff --git a/src/views/wellManage/detailWell.vue b/src/views/wellManage/detailWell.vue
index 1eaa10a..0511c15 100644
--- a/src/views/wellManage/detailWell.vue
+++ b/src/views/wellManage/detailWell.vue
@@ -80,6 +80,7 @@
         { type: 'areaName', label: '所在区域', value: 'areaName', placeholder: '未知', span: 2 },
         { type: 'text', label: '经度', value: 'coordinateX', placeholder: '未知' },
         { type: 'text', label: '纬度', value: 'coordinateY', placeholder: '未知' },
+        { type: 'text', label: '所在道路', value: 'road', placeholder: '未知', span: 5 },
         { type: 'text', label: '详细地址', value: 'position', placeholder: '未知', span: 5 },
         { type: 'images', label: '路标图片', value: 'imageList', placeholder: '无', span: 5 }
       ], // 表单配置项
@@ -102,6 +103,7 @@
         quName: '',
         area: '', // 街道
         areaName: '',
+        road: '',
         responsibleDept: '', // 维护人员部门
         responsibleDeptName: '' // 维护人员部门名称
       }, // 表单
@@ -156,6 +158,7 @@
         notes: row.notes, // 备注,
         qu: row.qu,
         area: row.area, // 街道
+        road: row.road,
         responsibleDept: row.responsibleDept, // 维护人员部门
         responsibleDeptName: row.responsibleDeptName // 维护人员部门
       }
diff --git a/src/views/wellManage/editWell.vue b/src/views/wellManage/editWell.vue
index e1312a5..9833884 100644
--- a/src/views/wellManage/editWell.vue
+++ b/src/views/wellManage/editWell.vue
@@ -98,7 +98,7 @@
             <el-col :span="1" class="line">
               区/县
             </el-col>
-            <el-col :span="5">
+            <el-col :span="10">
               <el-form-item prop="area">
                 <el-select v-model="wellForm.area" :disabled="showResponseDept" placeholder="请选择所在街道/镇" clearable>
                   <el-option
@@ -117,6 +117,13 @@
         </el-row>
         <el-row>
           <el-col :span="21">
+            <el-form-item label="所在道路" prop="road">
+              <el-input v-model.trim="wellForm.road" type="text" placeholder="非必填，建议填写，不填影响统计结果" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="21">
             <el-form-item label="详细地址" prop="position">
               <el-input v-model.trim="wellForm.position" type="text" placeholder="必填">
                 <el-button slot="append" size="small" icon="el-icon-refresh" @click="generateAddress">
@@ -235,6 +242,7 @@
         notes: '', // 备注,
         qu: '',
         area: '', // 街道
+        road: '', // 道路
         responsibleDept: '', // 维护人员部门
         responsibleDeptName: '' // 维护人员部门
       }, // 表单
@@ -262,9 +270,9 @@
         coordinateX: [{ required: true, trigger: ['blur', 'change'], validator: validateLat }],
         coordinateY: [{ required: true, trigger: ['blur', 'change'], validator: validateLng }],
         deptid: [{ required: true, message: '权属单位必选', trigger: 'change' }],
-        wellType: [{ required: true, message: '点位类型必选', trigger: 'change' }],
-        qu: [{ required: true, message: '所在区/县必选', trigger: 'change' }],
-        area: [{ required: true, message: '所在街道/镇必选', trigger: 'change' }]
+        wellType: [{ required: true, message: '点位类型必选', trigger: 'change' }]
+        // qu: [{ required: true, message: '所在区/县必选', trigger: 'change' }],
+        // area: [{ required: true, message: '所在街道/镇必选', trigger: 'change' }]
       },
       deptShowTop: false, // 权属单位下拉是否显示顶级
       dialogImageUrl: '',
@@ -337,6 +345,7 @@
           reverseLnglat(lnglat).then(res => {
             this.wellForm.position = res.formattedAddress
             this.wellForm.qu = res.addressComponent.adcode
+            this.wellForm.road = res.addressComponent.street // 道路
           })
         })
       }
diff --git a/src/views/wellManage/infoWell.vue b/src/views/wellManage/infoWell.vue
index 7e2209e..52c967f 100644
--- a/src/views/wellManage/infoWell.vue
+++ b/src/views/wellManage/infoWell.vue
@@ -80,6 +80,7 @@
         notes: '', // 备注,
         qu: '',
         area: '', // 街道
+        road: '',
         responsibleDept: '' // 维护人员部门
       }, // 表单
       formConfig: [
@@ -93,6 +94,7 @@
         { type: 'areaName', label: '所在区域', value: 'areaName', placeholder: '未知', span: 2 },
         { type: 'text', label: '经度', value: 'coordinateX', placeholder: '未知' },
         { type: 'text', label: '纬度', value: 'coordinateY', placeholder: '未知' },
+        { type: 'text', label: '所在道路', value: 'road', placeholder: '未知', span: 5 },
         { type: 'text', label: '详细地址', value: 'position', placeholder: '未知', span: 5 },
         { type: 'images', label: '路标图片', value: 'imageList', placeholder: '无', span: 5 }
       ], // 表单配置项
@@ -146,6 +148,7 @@
           deep: row.deep, // 井深，
           bfztName: row.bfztName, // 布防状态
           position: row.position, // 位置描述
+          road: row.road,
           photos: row.photos, // 照片路径
           notes: row.notes, // 备注,
           coordinateX: row.coordinateX,