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

diff --git a/src/api/digconfig.js b/src/api/digconfig.js
new file mode 100644
index 0000000..d885e08
--- /dev/null
+++ b/src/api/digconfig.js
@@ -0,0 +1,42 @@
+/**
+ * 开挖配置接口
+ */
+import request from '@/utils/request'
+// 开挖配置查询
+export function getDigConfigList(params) {
+  return request({
+    url: 'digConfig/list',
+    method: 'get',
+    params
+  })
+}
+
+// 修改开挖配置
+export function editDigConfig(params) {
+  return request({
+    url: 'digConfig/config',
+    method: 'post',
+    params
+  })
+}
+
+// 批量导入
+export function batchImportDigConfig(fileobj) {
+  const param = new FormData()
+  param.append('file', fileobj)
+  return request({
+    url: 'digConfig/batchImport',
+    method: 'post',
+    headers: { 'Content-Type': 'multipart/form-data' },
+    data: param
+  })
+}
+// 批量导出
+export function batchExportDigConfig(params) {
+  return request({
+    url: 'digConfig/batchExport',
+    method: 'get',
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
diff --git a/src/api/gasconfig.js b/src/api/gasconfig.js
new file mode 100644
index 0000000..93f1d09
--- /dev/null
+++ b/src/api/gasconfig.js
@@ -0,0 +1,42 @@
+/**
+ * 燃气配置接口
+ */
+import request from '@/utils/request'
+// 燃气配置查询
+export function getGasConfigList(params) {
+  return request({
+    url: 'gasConfig/list',
+    method: 'get',
+    params
+  })
+}
+
+// 修改燃气配置
+export function editGasConfig(params) {
+  return request({
+    url: 'gasConfig/config',
+    method: 'post',
+    params
+  })
+}
+
+// 批量导入
+export function batchImportGasConfig(fileobj) {
+  const param = new FormData()
+  param.append('file', fileobj)
+  return request({
+    url: 'gasConfig/batchImport',
+    method: 'post',
+    headers: { 'Content-Type': 'multipart/form-data' },
+    data: param
+  })
+}
+// 批量导出
+export function batchExportGasConfig(params) {
+  return request({
+    url: 'gasConfig/batchExport',
+    method: 'get',
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}

diff --git a/src/api/digconfig.js b/src/api/digconfig.js
new file mode 100644
index 0000000..d885e08
--- /dev/null
+++ b/src/api/digconfig.js
@@ -0,0 +1,42 @@
+/**
+ * 开挖配置接口
+ */
+import request from '@/utils/request'
+// 开挖配置查询
+export function getDigConfigList(params) {
+  return request({
+    url: 'digConfig/list',
+    method: 'get',
+    params
+  })
+}
+
+// 修改开挖配置
+export function editDigConfig(params) {
+  return request({
+    url: 'digConfig/config',
+    method: 'post',
+    params
+  })
+}
+
+// 批量导入
+export function batchImportDigConfig(fileobj) {
+  const param = new FormData()
+  param.append('file', fileobj)
+  return request({
+    url: 'digConfig/batchImport',
+    method: 'post',
+    headers: { 'Content-Type': 'multipart/form-data' },
+    data: param
+  })
+}
+// 批量导出
+export function batchExportDigConfig(params) {
+  return request({
+    url: 'digConfig/batchExport',
+    method: 'get',
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
diff --git a/src/api/gasconfig.js b/src/api/gasconfig.js
new file mode 100644
index 0000000..93f1d09
--- /dev/null
+++ b/src/api/gasconfig.js
@@ -0,0 +1,42 @@
+/**
+ * 燃气配置接口
+ */
+import request from '@/utils/request'
+// 燃气配置查询
+export function getGasConfigList(params) {
+  return request({
+    url: 'gasConfig/list',
+    method: 'get',
+    params
+  })
+}
+
+// 修改燃气配置
+export function editGasConfig(params) {
+  return request({
+    url: 'gasConfig/config',
+    method: 'post',
+    params
+  })
+}
+
+// 批量导入
+export function batchImportGasConfig(fileobj) {
+  const param = new FormData()
+  param.append('file', fileobj)
+  return request({
+    url: 'gasConfig/batchImport',
+    method: 'post',
+    headers: { 'Content-Type': 'multipart/form-data' },
+    data: param
+  })
+}
+// 批量导出
+export function batchExportGasConfig(params) {
+  return request({
+    url: 'gasConfig/batchExport',
+    method: 'get',
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
diff --git a/src/api/harmfulconfig.js b/src/api/harmfulconfig.js
new file mode 100644
index 0000000..29b6b6e
--- /dev/null
+++ b/src/api/harmfulconfig.js
@@ -0,0 +1,42 @@
+/**
+ * 有害气体配置接口
+ */
+import request from '@/utils/request'
+// 有害气体配置查询
+export function getHarmfulConfigList(params) {
+  return request({
+    url: 'harmfulConfig/list',
+    method: 'get',
+    params
+  })
+}
+
+// 修改有害气体配置
+export function editHarmfulConfig(params) {
+  return request({
+    url: 'harmfulConfig/config',
+    method: 'post',
+    params
+  })
+}
+
+// 批量导入
+export function batchImportHarmfulConfig(fileobj) {
+  const param = new FormData()
+  param.append('file', fileobj)
+  return request({
+    url: 'harmfulConfig/batchImport',
+    method: 'post',
+    headers: { 'Content-Type': 'multipart/form-data' },
+    data: param
+  })
+}
+// 批量导出
+export function batchExportHarmfulConfig(params) {
+  return request({
+    url: 'harmfulConfig/batchExport',
+    method: 'get',
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}

diff --git a/src/api/digconfig.js b/src/api/digconfig.js
new file mode 100644
index 0000000..d885e08
--- /dev/null
+++ b/src/api/digconfig.js
@@ -0,0 +1,42 @@
+/**
+ * 开挖配置接口
+ */
+import request from '@/utils/request'
+// 开挖配置查询
+export function getDigConfigList(params) {
+  return request({
+    url: 'digConfig/list',
+    method: 'get',
+    params
+  })
+}
+
+// 修改开挖配置
+export function editDigConfig(params) {
+  return request({
+    url: 'digConfig/config',
+    method: 'post',
+    params
+  })
+}
+
+// 批量导入
+export function batchImportDigConfig(fileobj) {
+  const param = new FormData()
+  param.append('file', fileobj)
+  return request({
+    url: 'digConfig/batchImport',
+    method: 'post',
+    headers: { 'Content-Type': 'multipart/form-data' },
+    data: param
+  })
+}
+// 批量导出
+export function batchExportDigConfig(params) {
+  return request({
+    url: 'digConfig/batchExport',
+    method: 'get',
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
diff --git a/src/api/gasconfig.js b/src/api/gasconfig.js
new file mode 100644
index 0000000..93f1d09
--- /dev/null
+++ b/src/api/gasconfig.js
@@ -0,0 +1,42 @@
+/**
+ * 燃气配置接口
+ */
+import request from '@/utils/request'
+// 燃气配置查询
+export function getGasConfigList(params) {
+  return request({
+    url: 'gasConfig/list',
+    method: 'get',
+    params
+  })
+}
+
+// 修改燃气配置
+export function editGasConfig(params) {
+  return request({
+    url: 'gasConfig/config',
+    method: 'post',
+    params
+  })
+}
+
+// 批量导入
+export function batchImportGasConfig(fileobj) {
+  const param = new FormData()
+  param.append('file', fileobj)
+  return request({
+    url: 'gasConfig/batchImport',
+    method: 'post',
+    headers: { 'Content-Type': 'multipart/form-data' },
+    data: param
+  })
+}
+// 批量导出
+export function batchExportGasConfig(params) {
+  return request({
+    url: 'gasConfig/batchExport',
+    method: 'get',
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
diff --git a/src/api/harmfulconfig.js b/src/api/harmfulconfig.js
new file mode 100644
index 0000000..29b6b6e
--- /dev/null
+++ b/src/api/harmfulconfig.js
@@ -0,0 +1,42 @@
+/**
+ * 有害气体配置接口
+ */
+import request from '@/utils/request'
+// 有害气体配置查询
+export function getHarmfulConfigList(params) {
+  return request({
+    url: 'harmfulConfig/list',
+    method: 'get',
+    params
+  })
+}
+
+// 修改有害气体配置
+export function editHarmfulConfig(params) {
+  return request({
+    url: 'harmfulConfig/config',
+    method: 'post',
+    params
+  })
+}
+
+// 批量导入
+export function batchImportHarmfulConfig(fileobj) {
+  const param = new FormData()
+  param.append('file', fileobj)
+  return request({
+    url: 'harmfulConfig/batchImport',
+    method: 'post',
+    headers: { 'Content-Type': 'multipart/form-data' },
+    data: param
+  })
+}
+// 批量导出
+export function batchExportHarmfulConfig(params) {
+  return request({
+    url: 'harmfulConfig/batchExport',
+    method: 'get',
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
diff --git a/src/api/tempconfig.js b/src/api/tempconfig.js
new file mode 100644
index 0000000..aa4ce86
--- /dev/null
+++ b/src/api/tempconfig.js
@@ -0,0 +1,42 @@
+/**
+ * 温湿度配置接口
+ */
+import request from '@/utils/request'
+// 温湿度配置查询
+export function getTempConfigList(params) {
+  return request({
+    url: 'tempConfig/list',
+    method: 'get',
+    params
+  })
+}
+
+// 修改温湿度配置
+export function editTempConfig(params) {
+  return request({
+    url: 'tempConfig/config',
+    method: 'post',
+    params
+  })
+}
+
+// 批量导入
+export function batchImportTempConfig(fileobj) {
+  const param = new FormData()
+  param.append('file', fileobj)
+  return request({
+    url: 'tempConfig/batchImport',
+    method: 'post',
+    headers: { 'Content-Type': 'multipart/form-data' },
+    data: param
+  })
+}
+// 批量导出
+export function batchExportTempConfig(params) {
+  return request({
+    url: 'tempConfig/batchExport',
+    method: 'get',
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}

diff --git a/src/api/digconfig.js b/src/api/digconfig.js
new file mode 100644
index 0000000..d885e08
--- /dev/null
+++ b/src/api/digconfig.js
@@ -0,0 +1,42 @@
+/**
+ * 开挖配置接口
+ */
+import request from '@/utils/request'
+// 开挖配置查询
+export function getDigConfigList(params) {
+  return request({
+    url: 'digConfig/list',
+    method: 'get',
+    params
+  })
+}
+
+// 修改开挖配置
+export function editDigConfig(params) {
+  return request({
+    url: 'digConfig/config',
+    method: 'post',
+    params
+  })
+}
+
+// 批量导入
+export function batchImportDigConfig(fileobj) {
+  const param = new FormData()
+  param.append('file', fileobj)
+  return request({
+    url: 'digConfig/batchImport',
+    method: 'post',
+    headers: { 'Content-Type': 'multipart/form-data' },
+    data: param
+  })
+}
+// 批量导出
+export function batchExportDigConfig(params) {
+  return request({
+    url: 'digConfig/batchExport',
+    method: 'get',
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
diff --git a/src/api/gasconfig.js b/src/api/gasconfig.js
new file mode 100644
index 0000000..93f1d09
--- /dev/null
+++ b/src/api/gasconfig.js
@@ -0,0 +1,42 @@
+/**
+ * 燃气配置接口
+ */
+import request from '@/utils/request'
+// 燃气配置查询
+export function getGasConfigList(params) {
+  return request({
+    url: 'gasConfig/list',
+    method: 'get',
+    params
+  })
+}
+
+// 修改燃气配置
+export function editGasConfig(params) {
+  return request({
+    url: 'gasConfig/config',
+    method: 'post',
+    params
+  })
+}
+
+// 批量导入
+export function batchImportGasConfig(fileobj) {
+  const param = new FormData()
+  param.append('file', fileobj)
+  return request({
+    url: 'gasConfig/batchImport',
+    method: 'post',
+    headers: { 'Content-Type': 'multipart/form-data' },
+    data: param
+  })
+}
+// 批量导出
+export function batchExportGasConfig(params) {
+  return request({
+    url: 'gasConfig/batchExport',
+    method: 'get',
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
diff --git a/src/api/harmfulconfig.js b/src/api/harmfulconfig.js
new file mode 100644
index 0000000..29b6b6e
--- /dev/null
+++ b/src/api/harmfulconfig.js
@@ -0,0 +1,42 @@
+/**
+ * 有害气体配置接口
+ */
+import request from '@/utils/request'
+// 有害气体配置查询
+export function getHarmfulConfigList(params) {
+  return request({
+    url: 'harmfulConfig/list',
+    method: 'get',
+    params
+  })
+}
+
+// 修改有害气体配置
+export function editHarmfulConfig(params) {
+  return request({
+    url: 'harmfulConfig/config',
+    method: 'post',
+    params
+  })
+}
+
+// 批量导入
+export function batchImportHarmfulConfig(fileobj) {
+  const param = new FormData()
+  param.append('file', fileobj)
+  return request({
+    url: 'harmfulConfig/batchImport',
+    method: 'post',
+    headers: { 'Content-Type': 'multipart/form-data' },
+    data: param
+  })
+}
+// 批量导出
+export function batchExportHarmfulConfig(params) {
+  return request({
+    url: 'harmfulConfig/batchExport',
+    method: 'get',
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
diff --git a/src/api/tempconfig.js b/src/api/tempconfig.js
new file mode 100644
index 0000000..aa4ce86
--- /dev/null
+++ b/src/api/tempconfig.js
@@ -0,0 +1,42 @@
+/**
+ * 温湿度配置接口
+ */
+import request from '@/utils/request'
+// 温湿度配置查询
+export function getTempConfigList(params) {
+  return request({
+    url: 'tempConfig/list',
+    method: 'get',
+    params
+  })
+}
+
+// 修改温湿度配置
+export function editTempConfig(params) {
+  return request({
+    url: 'tempConfig/config',
+    method: 'post',
+    params
+  })
+}
+
+// 批量导入
+export function batchImportTempConfig(fileobj) {
+  const param = new FormData()
+  param.append('file', fileobj)
+  return request({
+    url: 'tempConfig/batchImport',
+    method: 'post',
+    headers: { 'Content-Type': 'multipart/form-data' },
+    data: param
+  })
+}
+// 批量导出
+export function batchExportTempConfig(params) {
+  return request({
+    url: 'tempConfig/batchExport',
+    method: 'get',
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
diff --git a/src/views/deviceConfig/deviceConfig.vue b/src/views/deviceConfig/deviceConfig.vue
index 289cdbc..678c3a4 100644
--- a/src/views/deviceConfig/deviceConfig.vue
+++ b/src/views/deviceConfig/deviceConfig.vue
@@ -4,16 +4,31 @@
       <el-tab-pane v-if="hasPerm('/liquidConfig/list')" label="液位监测仪" name="liquid">
         <list-liquid-config/>
       </el-tab-pane>
-      <el-tab-pane v-if="hasPerm('/gasConfig/list')" label="燃气" name="gas">燃气配置</el-tab-pane>
+      <el-tab-pane label="燃气智能监测终端" name="gas">
+        <list-gas-config/>
+      </el-tab-pane>
+      <el-tab-pane label="有害气体监测仪" name="harmful">
+        <list-harmful-config/>
+      </el-tab-pane>
+      <el-tab-pane label="温湿度监测仪" name="temphumidity">
+        <list-temp-config/>
+      </el-tab-pane>
+      <el-tab-pane label="开挖监测仪" name="dig">
+        <list-dig-config/>
+      </el-tab-pane>
     </el-tabs>
   </div>
 </template>
 
 <script>
 import ListLiquidConfig from './liquidConfig/listLiquidConfig'
+import ListGasConfig from './liquidConfig/listGasConfig'
+import ListHarmfulConfig from './liquidConfig/listHarmfulConfig'
+import ListTempConfig from './liquidConfig/listTempConfig'
+import ListDigConfig from './liquidConfig/listDigConfig'
 export default {
   name: 'DeviceConfig',
-  components: { ListLiquidConfig },
+  components: { ListDigConfig, ListTempConfig, ListHarmfulConfig, ListGasConfig, ListLiquidConfig },
   data() {
     return {
       activeName: 'liquid'

diff --git a/src/api/digconfig.js b/src/api/digconfig.js
new file mode 100644
index 0000000..d885e08
--- /dev/null
+++ b/src/api/digconfig.js
@@ -0,0 +1,42 @@
+/**
+ * 开挖配置接口
+ */
+import request from '@/utils/request'
+// 开挖配置查询
+export function getDigConfigList(params) {
+  return request({
+    url: 'digConfig/list',
+    method: 'get',
+    params
+  })
+}
+
+// 修改开挖配置
+export function editDigConfig(params) {
+  return request({
+    url: 'digConfig/config',
+    method: 'post',
+    params
+  })
+}
+
+// 批量导入
+export function batchImportDigConfig(fileobj) {
+  const param = new FormData()
+  param.append('file', fileobj)
+  return request({
+    url: 'digConfig/batchImport',
+    method: 'post',
+    headers: { 'Content-Type': 'multipart/form-data' },
+    data: param
+  })
+}
+// 批量导出
+export function batchExportDigConfig(params) {
+  return request({
+    url: 'digConfig/batchExport',
+    method: 'get',
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
diff --git a/src/api/gasconfig.js b/src/api/gasconfig.js
new file mode 100644
index 0000000..93f1d09
--- /dev/null
+++ b/src/api/gasconfig.js
@@ -0,0 +1,42 @@
+/**
+ * 燃气配置接口
+ */
+import request from '@/utils/request'
+// 燃气配置查询
+export function getGasConfigList(params) {
+  return request({
+    url: 'gasConfig/list',
+    method: 'get',
+    params
+  })
+}
+
+// 修改燃气配置
+export function editGasConfig(params) {
+  return request({
+    url: 'gasConfig/config',
+    method: 'post',
+    params
+  })
+}
+
+// 批量导入
+export function batchImportGasConfig(fileobj) {
+  const param = new FormData()
+  param.append('file', fileobj)
+  return request({
+    url: 'gasConfig/batchImport',
+    method: 'post',
+    headers: { 'Content-Type': 'multipart/form-data' },
+    data: param
+  })
+}
+// 批量导出
+export function batchExportGasConfig(params) {
+  return request({
+    url: 'gasConfig/batchExport',
+    method: 'get',
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
diff --git a/src/api/harmfulconfig.js b/src/api/harmfulconfig.js
new file mode 100644
index 0000000..29b6b6e
--- /dev/null
+++ b/src/api/harmfulconfig.js
@@ -0,0 +1,42 @@
+/**
+ * 有害气体配置接口
+ */
+import request from '@/utils/request'
+// 有害气体配置查询
+export function getHarmfulConfigList(params) {
+  return request({
+    url: 'harmfulConfig/list',
+    method: 'get',
+    params
+  })
+}
+
+// 修改有害气体配置
+export function editHarmfulConfig(params) {
+  return request({
+    url: 'harmfulConfig/config',
+    method: 'post',
+    params
+  })
+}
+
+// 批量导入
+export function batchImportHarmfulConfig(fileobj) {
+  const param = new FormData()
+  param.append('file', fileobj)
+  return request({
+    url: 'harmfulConfig/batchImport',
+    method: 'post',
+    headers: { 'Content-Type': 'multipart/form-data' },
+    data: param
+  })
+}
+// 批量导出
+export function batchExportHarmfulConfig(params) {
+  return request({
+    url: 'harmfulConfig/batchExport',
+    method: 'get',
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
diff --git a/src/api/tempconfig.js b/src/api/tempconfig.js
new file mode 100644
index 0000000..aa4ce86
--- /dev/null
+++ b/src/api/tempconfig.js
@@ -0,0 +1,42 @@
+/**
+ * 温湿度配置接口
+ */
+import request from '@/utils/request'
+// 温湿度配置查询
+export function getTempConfigList(params) {
+  return request({
+    url: 'tempConfig/list',
+    method: 'get',
+    params
+  })
+}
+
+// 修改温湿度配置
+export function editTempConfig(params) {
+  return request({
+    url: 'tempConfig/config',
+    method: 'post',
+    params
+  })
+}
+
+// 批量导入
+export function batchImportTempConfig(fileobj) {
+  const param = new FormData()
+  param.append('file', fileobj)
+  return request({
+    url: 'tempConfig/batchImport',
+    method: 'post',
+    headers: { 'Content-Type': 'multipart/form-data' },
+    data: param
+  })
+}
+// 批量导出
+export function batchExportTempConfig(params) {
+  return request({
+    url: 'tempConfig/batchExport',
+    method: 'get',
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
diff --git a/src/views/deviceConfig/deviceConfig.vue b/src/views/deviceConfig/deviceConfig.vue
index 289cdbc..678c3a4 100644
--- a/src/views/deviceConfig/deviceConfig.vue
+++ b/src/views/deviceConfig/deviceConfig.vue
@@ -4,16 +4,31 @@
       <el-tab-pane v-if="hasPerm('/liquidConfig/list')" label="液位监测仪" name="liquid">
         <list-liquid-config/>
       </el-tab-pane>
-      <el-tab-pane v-if="hasPerm('/gasConfig/list')" label="燃气" name="gas">燃气配置</el-tab-pane>
+      <el-tab-pane label="燃气智能监测终端" name="gas">
+        <list-gas-config/>
+      </el-tab-pane>
+      <el-tab-pane label="有害气体监测仪" name="harmful">
+        <list-harmful-config/>
+      </el-tab-pane>
+      <el-tab-pane label="温湿度监测仪" name="temphumidity">
+        <list-temp-config/>
+      </el-tab-pane>
+      <el-tab-pane label="开挖监测仪" name="dig">
+        <list-dig-config/>
+      </el-tab-pane>
     </el-tabs>
   </div>
 </template>
 
 <script>
 import ListLiquidConfig from './liquidConfig/listLiquidConfig'
+import ListGasConfig from './liquidConfig/listGasConfig'
+import ListHarmfulConfig from './liquidConfig/listHarmfulConfig'
+import ListTempConfig from './liquidConfig/listTempConfig'
+import ListDigConfig from './liquidConfig/listDigConfig'
 export default {
   name: 'DeviceConfig',
-  components: { ListLiquidConfig },
+  components: { ListDigConfig, ListTempConfig, ListHarmfulConfig, ListGasConfig, ListLiquidConfig },
   data() {
     return {
       activeName: 'liquid'
diff --git a/src/views/deviceConfig/liquidConfig/editDigConfig.vue b/src/views/deviceConfig/liquidConfig/editDigConfig.vue
new file mode 100644
index 0000000..13195db
--- /dev/null
+++ b/src/views/deviceConfig/liquidConfig/editDigConfig.vue
@@ -0,0 +1,304 @@
+<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="100px">
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item v-if="dialogStatus=='create'" label="设备编号" prop="deviceId">
+            <el-select
+              v-model="configForm.deviceId"
+              :loading="loading"
+              :disabled="dialogStatus=='update'?true:false"
+              filterable
+              placeholder="请输入设备编号"
+            >
+              <el-option
+                v-for="item in devices"
+                :key="item.id"
+                :label="item.devcode"
+                :value="item.id"/>
+            </el-select>
+          </el-form-item>
+          <el-form-item v-if="dialogStatus=='update'" label="设备编号">
+            <el-input v-model="deviceForm.devcode" type="text" placeholder="未知" disabled/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item v-if="deviceForm.deviceName!=''" label="设备名称">
+            <el-input v-model="deviceForm.deviceName" type="text" placeholder="未知" disabled/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item v-if="deviceForm.deviceTypeName!=''" label="设备类型" prop="deviceType">
+            <el-input v-model="deviceForm.deviceTypeName" type="text" placeholder="未知" disabled/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item v-if="deviceForm.deptName!=''" label="权属单位" prop="deptName">
+            <el-input v-model="deviceForm.deptName" type="text" placeholder="未知" disabled/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="重传次数" prop="retryTimes">
+            <el-input-number :min="1" :max="10" v-model="configForm.retryTimes" type="text" placeholder="必填"/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="采集间隔" prop="collectCycle">
+            <el-input v-model.trim="configForm.collectCycle" type="text" placeholder="必填"/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="采集时间" prop="collectTime">
+            <!--<el-input v-model.trim="configForm.collectTime" type="text" placeholder="必填"/>-->
+            <el-time-picker
+              v-model="configForm.collectTime"
+              format="HH:mm"
+              placeholder="必选"/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="睡眠时间" prop="sleepTime">
+            <el-time-picker
+              v-model="configForm.sleepTime"
+              format="HH:mm"
+              placeholder="必选"/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="报警阈值" prop="threshold">
+            <el-input v-model.trim="configForm.threshold" type="text" placeholder="必填"/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="最大尝试次数">
+            <el-input-number :min="1" :max="10" v-model="configForm.attemptsMax" type="text" placeholder="必填"/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row v-if="showIp" :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="ip地址" prop="ip">
+            <el-input v-model.trim="configForm.ip" type="text" placeholder="非集中器设备必填"/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="端口号" prop="port">
+            <el-input v-model.trim="configForm.port" type="text" placeholder="非集中器设备必填"/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <div slot="footer" class="dialog-footer">
+      <el-button type="primary" @click="saveData">保存</el-button>
+      <el-button @click="cancel">取消</el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { editLiquidConfig, getDeviceSimpleList } from '@/api/liquidconfig'
+import { validateFloatPlus } from '@/utils/validate'
+export default {
+  name: 'EditDigConfig',
+  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, 0, 100) === true) {
+          callback()
+        } else {
+          callback(new Error('请填写0到100数值'))
+        }
+      } else {
+        callback(new Error('采集间隔不能为空'))
+      }
+    }
+    const validateThreshold = (rule, value, callback) => {
+      if (value !== '') {
+        if (validateFloatPlus(value, 0, 100) === true) {
+          callback()
+        } else {
+          callback(new Error('请填写0到100数值'))
+        }
+      } else {
+        callback(new Error('报警阈值不能为空'))
+      }
+    }
+    return {
+      dialogFormVisible: false, // 对话框是否显示
+      dialogStatus: '', // 对话框类型：create,update
+      deviceForm: {
+        deviceName: '',
+        deviceTypeName: '',
+        deptName: '',
+        devcode: '',
+        deviceType: ''
+      }, // 设备基本信息
+      configForm: {
+        id: '', // config id
+        deviceId: '', // 设备id
+        collectCycle: '', // 采集间隔
+        collectTime: '', // 采集时间
+        collectTimes: '', // 采集次数
+        retryTimes: '3', // 重传次数
+        ip: '', // ip地址
+        port: '', // 端口号
+        attemptsMax: '3' // 最大尝试次数
+      },
+      textMap: {
+        update: '编辑',
+        create: '新增'
+      }, // 表头显示标题
+      devices: [], // 设备下拉选择列表
+      loading: false, // 加载动画是否显示
+      rules: {
+        collectCycle: [{ required: true, trigger: ['blur', 'change'], validator: validateCollectCycle }],
+        threshold: [{ required: true, trigger: ['blur', 'change'], validator: validateThreshold }],
+        collectTime: [{ required: true, message: '采集时间不能为空', trigger: ['blur', 'change'] }],
+        deviceId: [{ required: true, message: '设备编号不能为空', trigger: ['blur', 'change'] }],
+        collectTimes: [{ 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
+      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
+          collectCycle: row.collectCycle, // 报警阈值
+          collectTime: row.collectTime, // 安装高度
+          retryTimes: row.retryTimes, // 重传次数
+          ip: row.ip, // ip地址
+          port: row.port, // 端口号
+          attemptsMax: row.attemptsMax // 最大尝试次数
+        }
+      }
+    },
+    // 重置表单
+    resetForm() {
+      this.deviceForm = {
+        deviceName: '',
+        deviceTypeName: '',
+        deptName: '',
+        devcode: ''
+      }
+      this.configForm = {
+        deviceId: '', // 设备id
+        collectCycle: '', // 报警阈值
+        collectTime: '', // 安装高度
+        retryTimes: '3', // 重传次数
+        ip: '', // ip地址
+        port: '', // 端口号
+        attemptsMax: '3' // 最大尝试次数
+      }
+    },
+    // 保存数据
+    saveData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          editLiquidConfig(this.configForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('配置成功')
+              this.$emit('watchChild')
+              this.dialogFormVisible = false
+            }
+          })
+        }
+      })
+    },
+    fetchDevice() {
+      this.loading = true
+      getDeviceSimpleList('4', '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%;
+  }
+  .el-date-editor{
+    width:100%
+  }
+</style>

diff --git a/src/api/digconfig.js b/src/api/digconfig.js
new file mode 100644
index 0000000..d885e08
--- /dev/null
+++ b/src/api/digconfig.js
@@ -0,0 +1,42 @@
+/**
+ * 开挖配置接口
+ */
+import request from '@/utils/request'
+// 开挖配置查询
+export function getDigConfigList(params) {
+  return request({
+    url: 'digConfig/list',
+    method: 'get',
+    params
+  })
+}
+
+// 修改开挖配置
+export function editDigConfig(params) {
+  return request({
+    url: 'digConfig/config',
+    method: 'post',
+    params
+  })
+}
+
+// 批量导入
+export function batchImportDigConfig(fileobj) {
+  const param = new FormData()
+  param.append('file', fileobj)
+  return request({
+    url: 'digConfig/batchImport',
+    method: 'post',
+    headers: { 'Content-Type': 'multipart/form-data' },
+    data: param
+  })
+}
+// 批量导出
+export function batchExportDigConfig(params) {
+  return request({
+    url: 'digConfig/batchExport',
+    method: 'get',
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
diff --git a/src/api/gasconfig.js b/src/api/gasconfig.js
new file mode 100644
index 0000000..93f1d09
--- /dev/null
+++ b/src/api/gasconfig.js
@@ -0,0 +1,42 @@
+/**
+ * 燃气配置接口
+ */
+import request from '@/utils/request'
+// 燃气配置查询
+export function getGasConfigList(params) {
+  return request({
+    url: 'gasConfig/list',
+    method: 'get',
+    params
+  })
+}
+
+// 修改燃气配置
+export function editGasConfig(params) {
+  return request({
+    url: 'gasConfig/config',
+    method: 'post',
+    params
+  })
+}
+
+// 批量导入
+export function batchImportGasConfig(fileobj) {
+  const param = new FormData()
+  param.append('file', fileobj)
+  return request({
+    url: 'gasConfig/batchImport',
+    method: 'post',
+    headers: { 'Content-Type': 'multipart/form-data' },
+    data: param
+  })
+}
+// 批量导出
+export function batchExportGasConfig(params) {
+  return request({
+    url: 'gasConfig/batchExport',
+    method: 'get',
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
diff --git a/src/api/harmfulconfig.js b/src/api/harmfulconfig.js
new file mode 100644
index 0000000..29b6b6e
--- /dev/null
+++ b/src/api/harmfulconfig.js
@@ -0,0 +1,42 @@
+/**
+ * 有害气体配置接口
+ */
+import request from '@/utils/request'
+// 有害气体配置查询
+export function getHarmfulConfigList(params) {
+  return request({
+    url: 'harmfulConfig/list',
+    method: 'get',
+    params
+  })
+}
+
+// 修改有害气体配置
+export function editHarmfulConfig(params) {
+  return request({
+    url: 'harmfulConfig/config',
+    method: 'post',
+    params
+  })
+}
+
+// 批量导入
+export function batchImportHarmfulConfig(fileobj) {
+  const param = new FormData()
+  param.append('file', fileobj)
+  return request({
+    url: 'harmfulConfig/batchImport',
+    method: 'post',
+    headers: { 'Content-Type': 'multipart/form-data' },
+    data: param
+  })
+}
+// 批量导出
+export function batchExportHarmfulConfig(params) {
+  return request({
+    url: 'harmfulConfig/batchExport',
+    method: 'get',
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
diff --git a/src/api/tempconfig.js b/src/api/tempconfig.js
new file mode 100644
index 0000000..aa4ce86
--- /dev/null
+++ b/src/api/tempconfig.js
@@ -0,0 +1,42 @@
+/**
+ * 温湿度配置接口
+ */
+import request from '@/utils/request'
+// 温湿度配置查询
+export function getTempConfigList(params) {
+  return request({
+    url: 'tempConfig/list',
+    method: 'get',
+    params
+  })
+}
+
+// 修改温湿度配置
+export function editTempConfig(params) {
+  return request({
+    url: 'tempConfig/config',
+    method: 'post',
+    params
+  })
+}
+
+// 批量导入
+export function batchImportTempConfig(fileobj) {
+  const param = new FormData()
+  param.append('file', fileobj)
+  return request({
+    url: 'tempConfig/batchImport',
+    method: 'post',
+    headers: { 'Content-Type': 'multipart/form-data' },
+    data: param
+  })
+}
+// 批量导出
+export function batchExportTempConfig(params) {
+  return request({
+    url: 'tempConfig/batchExport',
+    method: 'get',
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
diff --git a/src/views/deviceConfig/deviceConfig.vue b/src/views/deviceConfig/deviceConfig.vue
index 289cdbc..678c3a4 100644
--- a/src/views/deviceConfig/deviceConfig.vue
+++ b/src/views/deviceConfig/deviceConfig.vue
@@ -4,16 +4,31 @@
       <el-tab-pane v-if="hasPerm('/liquidConfig/list')" label="液位监测仪" name="liquid">
         <list-liquid-config/>
       </el-tab-pane>
-      <el-tab-pane v-if="hasPerm('/gasConfig/list')" label="燃气" name="gas">燃气配置</el-tab-pane>
+      <el-tab-pane label="燃气智能监测终端" name="gas">
+        <list-gas-config/>
+      </el-tab-pane>
+      <el-tab-pane label="有害气体监测仪" name="harmful">
+        <list-harmful-config/>
+      </el-tab-pane>
+      <el-tab-pane label="温湿度监测仪" name="temphumidity">
+        <list-temp-config/>
+      </el-tab-pane>
+      <el-tab-pane label="开挖监测仪" name="dig">
+        <list-dig-config/>
+      </el-tab-pane>
     </el-tabs>
   </div>
 </template>
 
 <script>
 import ListLiquidConfig from './liquidConfig/listLiquidConfig'
+import ListGasConfig from './liquidConfig/listGasConfig'
+import ListHarmfulConfig from './liquidConfig/listHarmfulConfig'
+import ListTempConfig from './liquidConfig/listTempConfig'
+import ListDigConfig from './liquidConfig/listDigConfig'
 export default {
   name: 'DeviceConfig',
-  components: { ListLiquidConfig },
+  components: { ListDigConfig, ListTempConfig, ListHarmfulConfig, ListGasConfig, ListLiquidConfig },
   data() {
     return {
       activeName: 'liquid'
diff --git a/src/views/deviceConfig/liquidConfig/editDigConfig.vue b/src/views/deviceConfig/liquidConfig/editDigConfig.vue
new file mode 100644
index 0000000..13195db
--- /dev/null
+++ b/src/views/deviceConfig/liquidConfig/editDigConfig.vue
@@ -0,0 +1,304 @@
+<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="100px">
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item v-if="dialogStatus=='create'" label="设备编号" prop="deviceId">
+            <el-select
+              v-model="configForm.deviceId"
+              :loading="loading"
+              :disabled="dialogStatus=='update'?true:false"
+              filterable
+              placeholder="请输入设备编号"
+            >
+              <el-option
+                v-for="item in devices"
+                :key="item.id"
+                :label="item.devcode"
+                :value="item.id"/>
+            </el-select>
+          </el-form-item>
+          <el-form-item v-if="dialogStatus=='update'" label="设备编号">
+            <el-input v-model="deviceForm.devcode" type="text" placeholder="未知" disabled/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item v-if="deviceForm.deviceName!=''" label="设备名称">
+            <el-input v-model="deviceForm.deviceName" type="text" placeholder="未知" disabled/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item v-if="deviceForm.deviceTypeName!=''" label="设备类型" prop="deviceType">
+            <el-input v-model="deviceForm.deviceTypeName" type="text" placeholder="未知" disabled/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item v-if="deviceForm.deptName!=''" label="权属单位" prop="deptName">
+            <el-input v-model="deviceForm.deptName" type="text" placeholder="未知" disabled/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="重传次数" prop="retryTimes">
+            <el-input-number :min="1" :max="10" v-model="configForm.retryTimes" type="text" placeholder="必填"/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="采集间隔" prop="collectCycle">
+            <el-input v-model.trim="configForm.collectCycle" type="text" placeholder="必填"/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="采集时间" prop="collectTime">
+            <!--<el-input v-model.trim="configForm.collectTime" type="text" placeholder="必填"/>-->
+            <el-time-picker
+              v-model="configForm.collectTime"
+              format="HH:mm"
+              placeholder="必选"/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="睡眠时间" prop="sleepTime">
+            <el-time-picker
+              v-model="configForm.sleepTime"
+              format="HH:mm"
+              placeholder="必选"/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="报警阈值" prop="threshold">
+            <el-input v-model.trim="configForm.threshold" type="text" placeholder="必填"/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="最大尝试次数">
+            <el-input-number :min="1" :max="10" v-model="configForm.attemptsMax" type="text" placeholder="必填"/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row v-if="showIp" :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="ip地址" prop="ip">
+            <el-input v-model.trim="configForm.ip" type="text" placeholder="非集中器设备必填"/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="端口号" prop="port">
+            <el-input v-model.trim="configForm.port" type="text" placeholder="非集中器设备必填"/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <div slot="footer" class="dialog-footer">
+      <el-button type="primary" @click="saveData">保存</el-button>
+      <el-button @click="cancel">取消</el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { editLiquidConfig, getDeviceSimpleList } from '@/api/liquidconfig'
+import { validateFloatPlus } from '@/utils/validate'
+export default {
+  name: 'EditDigConfig',
+  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, 0, 100) === true) {
+          callback()
+        } else {
+          callback(new Error('请填写0到100数值'))
+        }
+      } else {
+        callback(new Error('采集间隔不能为空'))
+      }
+    }
+    const validateThreshold = (rule, value, callback) => {
+      if (value !== '') {
+        if (validateFloatPlus(value, 0, 100) === true) {
+          callback()
+        } else {
+          callback(new Error('请填写0到100数值'))
+        }
+      } else {
+        callback(new Error('报警阈值不能为空'))
+      }
+    }
+    return {
+      dialogFormVisible: false, // 对话框是否显示
+      dialogStatus: '', // 对话框类型：create,update
+      deviceForm: {
+        deviceName: '',
+        deviceTypeName: '',
+        deptName: '',
+        devcode: '',
+        deviceType: ''
+      }, // 设备基本信息
+      configForm: {
+        id: '', // config id
+        deviceId: '', // 设备id
+        collectCycle: '', // 采集间隔
+        collectTime: '', // 采集时间
+        collectTimes: '', // 采集次数
+        retryTimes: '3', // 重传次数
+        ip: '', // ip地址
+        port: '', // 端口号
+        attemptsMax: '3' // 最大尝试次数
+      },
+      textMap: {
+        update: '编辑',
+        create: '新增'
+      }, // 表头显示标题
+      devices: [], // 设备下拉选择列表
+      loading: false, // 加载动画是否显示
+      rules: {
+        collectCycle: [{ required: true, trigger: ['blur', 'change'], validator: validateCollectCycle }],
+        threshold: [{ required: true, trigger: ['blur', 'change'], validator: validateThreshold }],
+        collectTime: [{ required: true, message: '采集时间不能为空', trigger: ['blur', 'change'] }],
+        deviceId: [{ required: true, message: '设备编号不能为空', trigger: ['blur', 'change'] }],
+        collectTimes: [{ 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
+      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
+          collectCycle: row.collectCycle, // 报警阈值
+          collectTime: row.collectTime, // 安装高度
+          retryTimes: row.retryTimes, // 重传次数
+          ip: row.ip, // ip地址
+          port: row.port, // 端口号
+          attemptsMax: row.attemptsMax // 最大尝试次数
+        }
+      }
+    },
+    // 重置表单
+    resetForm() {
+      this.deviceForm = {
+        deviceName: '',
+        deviceTypeName: '',
+        deptName: '',
+        devcode: ''
+      }
+      this.configForm = {
+        deviceId: '', // 设备id
+        collectCycle: '', // 报警阈值
+        collectTime: '', // 安装高度
+        retryTimes: '3', // 重传次数
+        ip: '', // ip地址
+        port: '', // 端口号
+        attemptsMax: '3' // 最大尝试次数
+      }
+    },
+    // 保存数据
+    saveData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          editLiquidConfig(this.configForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('配置成功')
+              this.$emit('watchChild')
+              this.dialogFormVisible = false
+            }
+          })
+        }
+      })
+    },
+    fetchDevice() {
+      this.loading = true
+      getDeviceSimpleList('4', '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%;
+  }
+  .el-date-editor{
+    width:100%
+  }
+</style>
diff --git a/src/views/deviceConfig/liquidConfig/editGasConfig.vue b/src/views/deviceConfig/liquidConfig/editGasConfig.vue
new file mode 100644
index 0000000..bc61d77
--- /dev/null
+++ b/src/views/deviceConfig/liquidConfig/editGasConfig.vue
@@ -0,0 +1,279 @@
+<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="100px">
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item v-if="dialogStatus=='create'" label="设备编号" prop="deviceId">
+            <el-select
+              v-model="configForm.deviceId"
+              :loading="loading"
+              :disabled="dialogStatus=='update'?true:false"
+              filterable
+              placeholder="请输入设备编号"
+            >
+              <el-option
+                v-for="item in devices"
+                :key="item.id"
+                :label="item.devcode"
+                :value="item.id"/>
+            </el-select>
+          </el-form-item>
+          <el-form-item v-if="dialogStatus=='update'" label="设备编号">
+            <el-input v-model="deviceForm.devcode" type="text" placeholder="未知" disabled/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item v-if="deviceForm.deviceName!=''" label="设备名称">
+            <el-input v-model="deviceForm.deviceName" type="text" placeholder="未知" disabled/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item v-if="deviceForm.deviceTypeName!=''" label="设备类型" prop="deviceType">
+            <el-input v-model="deviceForm.deviceTypeName" type="text" placeholder="未知" disabled/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item v-if="deviceForm.deptName!=''" label="权属单位" prop="deptName">
+            <el-input v-model="deviceForm.deptName" type="text" placeholder="未知" disabled/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="重传次数" prop="retryTimes">
+            <el-input-number :min="1" :max="10" v-model="configForm.retryTimes" type="text" placeholder="必填"/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="采集间隔" prop="collectCycle">
+            <el-input v-model.trim="configForm.collectCycle" type="text" placeholder="必填"/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="上传周期" prop="upPeriod">
+            <el-input v-model.trim="configForm.upPeriod" type="text" placeholder="必填"/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="最大尝试次数">
+            <el-input-number :min="1" :max="10" v-model="configForm.attemptsMax" type="text" placeholder="必填"/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row v-if="showIp" :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="ip地址" prop="ip">
+            <el-input v-model.trim="configForm.ip" type="text" placeholder="非集中器设备必填"/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="端口号" prop="port">
+            <el-input v-model.trim="configForm.port" type="text" placeholder="非集中器设备必填"/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <div slot="footer" class="dialog-footer">
+      <el-button type="primary" @click="saveData">保存</el-button>
+      <el-button @click="cancel">取消</el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { editLiquidConfig, getDeviceSimpleList } from '@/api/liquidconfig'
+import { validateFloatPlus } from '@/utils/validate'
+export default {
+  name: 'EditGasConfig',
+  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, 0, 100) === true) {
+          callback()
+        } else {
+          callback(new Error('请填写0到100数值'))
+        }
+      } else {
+        callback(new Error('采集时间不能为空'))
+      }
+    }
+    const validateUpPeriod = (rule, value, callback) => {
+      if (value !== '') {
+        if (validateFloatPlus(value, 0, 100) === true) {
+          callback()
+        } else {
+          callback(new Error('请填写0到100数值'))
+        }
+      } else {
+        callback(new Error('上传周期不能为空'))
+      }
+    }
+    return {
+      dialogFormVisible: false, // 对话框是否显示
+      dialogStatus: '', // 对话框类型：create,update
+      deviceForm: {
+        deviceName: '',
+        deviceTypeName: '',
+        deptName: '',
+        devcode: '',
+        deviceType: ''
+      }, // 设备基本信息
+      configForm: {
+        id: '', // config id
+        deviceId: '', // 设备id
+        collectCycle: '', // 报警阈值
+        upPeriod: '', // 安装高度
+        retryTimes: '3', // 重传次数
+        ip: '', // ip地址
+        port: '', // 端口号
+        attemptsMax: '3' // 最大尝试次数
+      },
+      textMap: {
+        update: '编辑',
+        create: '新增'
+      }, // 表头显示标题
+      devices: [], // 设备下拉选择列表
+      loading: false, // 加载动画是否显示
+      rules: {
+        collectCycle: [{ required: true, trigger: ['blur', 'change'], validator: validateCollectCycle }],
+        upPeriod: [{ 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
+      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
+          collectCycle: row.collectCycle, // 报警阈值
+          upPeriod: row.upPeriod, // 安装高度
+          retryTimes: row.retryTimes, // 重传次数
+          ip: row.ip, // ip地址
+          port: row.port, // 端口号
+          attemptsMax: row.attemptsMax // 最大尝试次数
+        }
+      }
+    },
+    // 重置表单
+    resetForm() {
+      this.deviceForm = {
+        deviceName: '',
+        deviceTypeName: '',
+        deptName: '',
+        devcode: ''
+      }
+      this.configForm = {
+        deviceId: '', // 设备id
+        collectCycle: '', // 报警阈值
+        upPeriod: '', // 安装高度
+        retryTimes: '3', // 重传次数
+        ip: '', // ip地址
+        port: '', // 端口号
+        attemptsMax: '3' // 最大尝试次数
+      }
+    },
+    // 保存数据
+    saveData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          editLiquidConfig(this.configForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('配置成功')
+              this.$emit('watchChild')
+              this.dialogFormVisible = false
+            }
+          })
+        }
+      })
+    },
+    fetchDevice() {
+      this.loading = true
+      getDeviceSimpleList('4', '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/digconfig.js b/src/api/digconfig.js
new file mode 100644
index 0000000..d885e08
--- /dev/null
+++ b/src/api/digconfig.js
@@ -0,0 +1,42 @@
+/**
+ * 开挖配置接口
+ */
+import request from '@/utils/request'
+// 开挖配置查询
+export function getDigConfigList(params) {
+  return request({
+    url: 'digConfig/list',
+    method: 'get',
+    params
+  })
+}
+
+// 修改开挖配置
+export function editDigConfig(params) {
+  return request({
+    url: 'digConfig/config',
+    method: 'post',
+    params
+  })
+}
+
+// 批量导入
+export function batchImportDigConfig(fileobj) {
+  const param = new FormData()
+  param.append('file', fileobj)
+  return request({
+    url: 'digConfig/batchImport',
+    method: 'post',
+    headers: { 'Content-Type': 'multipart/form-data' },
+    data: param
+  })
+}
+// 批量导出
+export function batchExportDigConfig(params) {
+  return request({
+    url: 'digConfig/batchExport',
+    method: 'get',
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
diff --git a/src/api/gasconfig.js b/src/api/gasconfig.js
new file mode 100644
index 0000000..93f1d09
--- /dev/null
+++ b/src/api/gasconfig.js
@@ -0,0 +1,42 @@
+/**
+ * 燃气配置接口
+ */
+import request from '@/utils/request'
+// 燃气配置查询
+export function getGasConfigList(params) {
+  return request({
+    url: 'gasConfig/list',
+    method: 'get',
+    params
+  })
+}
+
+// 修改燃气配置
+export function editGasConfig(params) {
+  return request({
+    url: 'gasConfig/config',
+    method: 'post',
+    params
+  })
+}
+
+// 批量导入
+export function batchImportGasConfig(fileobj) {
+  const param = new FormData()
+  param.append('file', fileobj)
+  return request({
+    url: 'gasConfig/batchImport',
+    method: 'post',
+    headers: { 'Content-Type': 'multipart/form-data' },
+    data: param
+  })
+}
+// 批量导出
+export function batchExportGasConfig(params) {
+  return request({
+    url: 'gasConfig/batchExport',
+    method: 'get',
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
diff --git a/src/api/harmfulconfig.js b/src/api/harmfulconfig.js
new file mode 100644
index 0000000..29b6b6e
--- /dev/null
+++ b/src/api/harmfulconfig.js
@@ -0,0 +1,42 @@
+/**
+ * 有害气体配置接口
+ */
+import request from '@/utils/request'
+// 有害气体配置查询
+export function getHarmfulConfigList(params) {
+  return request({
+    url: 'harmfulConfig/list',
+    method: 'get',
+    params
+  })
+}
+
+// 修改有害气体配置
+export function editHarmfulConfig(params) {
+  return request({
+    url: 'harmfulConfig/config',
+    method: 'post',
+    params
+  })
+}
+
+// 批量导入
+export function batchImportHarmfulConfig(fileobj) {
+  const param = new FormData()
+  param.append('file', fileobj)
+  return request({
+    url: 'harmfulConfig/batchImport',
+    method: 'post',
+    headers: { 'Content-Type': 'multipart/form-data' },
+    data: param
+  })
+}
+// 批量导出
+export function batchExportHarmfulConfig(params) {
+  return request({
+    url: 'harmfulConfig/batchExport',
+    method: 'get',
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
diff --git a/src/api/tempconfig.js b/src/api/tempconfig.js
new file mode 100644
index 0000000..aa4ce86
--- /dev/null
+++ b/src/api/tempconfig.js
@@ -0,0 +1,42 @@
+/**
+ * 温湿度配置接口
+ */
+import request from '@/utils/request'
+// 温湿度配置查询
+export function getTempConfigList(params) {
+  return request({
+    url: 'tempConfig/list',
+    method: 'get',
+    params
+  })
+}
+
+// 修改温湿度配置
+export function editTempConfig(params) {
+  return request({
+    url: 'tempConfig/config',
+    method: 'post',
+    params
+  })
+}
+
+// 批量导入
+export function batchImportTempConfig(fileobj) {
+  const param = new FormData()
+  param.append('file', fileobj)
+  return request({
+    url: 'tempConfig/batchImport',
+    method: 'post',
+    headers: { 'Content-Type': 'multipart/form-data' },
+    data: param
+  })
+}
+// 批量导出
+export function batchExportTempConfig(params) {
+  return request({
+    url: 'tempConfig/batchExport',
+    method: 'get',
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
diff --git a/src/views/deviceConfig/deviceConfig.vue b/src/views/deviceConfig/deviceConfig.vue
index 289cdbc..678c3a4 100644
--- a/src/views/deviceConfig/deviceConfig.vue
+++ b/src/views/deviceConfig/deviceConfig.vue
@@ -4,16 +4,31 @@
       <el-tab-pane v-if="hasPerm('/liquidConfig/list')" label="液位监测仪" name="liquid">
         <list-liquid-config/>
       </el-tab-pane>
-      <el-tab-pane v-if="hasPerm('/gasConfig/list')" label="燃气" name="gas">燃气配置</el-tab-pane>
+      <el-tab-pane label="燃气智能监测终端" name="gas">
+        <list-gas-config/>
+      </el-tab-pane>
+      <el-tab-pane label="有害气体监测仪" name="harmful">
+        <list-harmful-config/>
+      </el-tab-pane>
+      <el-tab-pane label="温湿度监测仪" name="temphumidity">
+        <list-temp-config/>
+      </el-tab-pane>
+      <el-tab-pane label="开挖监测仪" name="dig">
+        <list-dig-config/>
+      </el-tab-pane>
     </el-tabs>
   </div>
 </template>
 
 <script>
 import ListLiquidConfig from './liquidConfig/listLiquidConfig'
+import ListGasConfig from './liquidConfig/listGasConfig'
+import ListHarmfulConfig from './liquidConfig/listHarmfulConfig'
+import ListTempConfig from './liquidConfig/listTempConfig'
+import ListDigConfig from './liquidConfig/listDigConfig'
 export default {
   name: 'DeviceConfig',
-  components: { ListLiquidConfig },
+  components: { ListDigConfig, ListTempConfig, ListHarmfulConfig, ListGasConfig, ListLiquidConfig },
   data() {
     return {
       activeName: 'liquid'
diff --git a/src/views/deviceConfig/liquidConfig/editDigConfig.vue b/src/views/deviceConfig/liquidConfig/editDigConfig.vue
new file mode 100644
index 0000000..13195db
--- /dev/null
+++ b/src/views/deviceConfig/liquidConfig/editDigConfig.vue
@@ -0,0 +1,304 @@
+<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="100px">
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item v-if="dialogStatus=='create'" label="设备编号" prop="deviceId">
+            <el-select
+              v-model="configForm.deviceId"
+              :loading="loading"
+              :disabled="dialogStatus=='update'?true:false"
+              filterable
+              placeholder="请输入设备编号"
+            >
+              <el-option
+                v-for="item in devices"
+                :key="item.id"
+                :label="item.devcode"
+                :value="item.id"/>
+            </el-select>
+          </el-form-item>
+          <el-form-item v-if="dialogStatus=='update'" label="设备编号">
+            <el-input v-model="deviceForm.devcode" type="text" placeholder="未知" disabled/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item v-if="deviceForm.deviceName!=''" label="设备名称">
+            <el-input v-model="deviceForm.deviceName" type="text" placeholder="未知" disabled/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item v-if="deviceForm.deviceTypeName!=''" label="设备类型" prop="deviceType">
+            <el-input v-model="deviceForm.deviceTypeName" type="text" placeholder="未知" disabled/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item v-if="deviceForm.deptName!=''" label="权属单位" prop="deptName">
+            <el-input v-model="deviceForm.deptName" type="text" placeholder="未知" disabled/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="重传次数" prop="retryTimes">
+            <el-input-number :min="1" :max="10" v-model="configForm.retryTimes" type="text" placeholder="必填"/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="采集间隔" prop="collectCycle">
+            <el-input v-model.trim="configForm.collectCycle" type="text" placeholder="必填"/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="采集时间" prop="collectTime">
+            <!--<el-input v-model.trim="configForm.collectTime" type="text" placeholder="必填"/>-->
+            <el-time-picker
+              v-model="configForm.collectTime"
+              format="HH:mm"
+              placeholder="必选"/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="睡眠时间" prop="sleepTime">
+            <el-time-picker
+              v-model="configForm.sleepTime"
+              format="HH:mm"
+              placeholder="必选"/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="报警阈值" prop="threshold">
+            <el-input v-model.trim="configForm.threshold" type="text" placeholder="必填"/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="最大尝试次数">
+            <el-input-number :min="1" :max="10" v-model="configForm.attemptsMax" type="text" placeholder="必填"/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row v-if="showIp" :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="ip地址" prop="ip">
+            <el-input v-model.trim="configForm.ip" type="text" placeholder="非集中器设备必填"/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="端口号" prop="port">
+            <el-input v-model.trim="configForm.port" type="text" placeholder="非集中器设备必填"/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <div slot="footer" class="dialog-footer">
+      <el-button type="primary" @click="saveData">保存</el-button>
+      <el-button @click="cancel">取消</el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { editLiquidConfig, getDeviceSimpleList } from '@/api/liquidconfig'
+import { validateFloatPlus } from '@/utils/validate'
+export default {
+  name: 'EditDigConfig',
+  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, 0, 100) === true) {
+          callback()
+        } else {
+          callback(new Error('请填写0到100数值'))
+        }
+      } else {
+        callback(new Error('采集间隔不能为空'))
+      }
+    }
+    const validateThreshold = (rule, value, callback) => {
+      if (value !== '') {
+        if (validateFloatPlus(value, 0, 100) === true) {
+          callback()
+        } else {
+          callback(new Error('请填写0到100数值'))
+        }
+      } else {
+        callback(new Error('报警阈值不能为空'))
+      }
+    }
+    return {
+      dialogFormVisible: false, // 对话框是否显示
+      dialogStatus: '', // 对话框类型：create,update
+      deviceForm: {
+        deviceName: '',
+        deviceTypeName: '',
+        deptName: '',
+        devcode: '',
+        deviceType: ''
+      }, // 设备基本信息
+      configForm: {
+        id: '', // config id
+        deviceId: '', // 设备id
+        collectCycle: '', // 采集间隔
+        collectTime: '', // 采集时间
+        collectTimes: '', // 采集次数
+        retryTimes: '3', // 重传次数
+        ip: '', // ip地址
+        port: '', // 端口号
+        attemptsMax: '3' // 最大尝试次数
+      },
+      textMap: {
+        update: '编辑',
+        create: '新增'
+      }, // 表头显示标题
+      devices: [], // 设备下拉选择列表
+      loading: false, // 加载动画是否显示
+      rules: {
+        collectCycle: [{ required: true, trigger: ['blur', 'change'], validator: validateCollectCycle }],
+        threshold: [{ required: true, trigger: ['blur', 'change'], validator: validateThreshold }],
+        collectTime: [{ required: true, message: '采集时间不能为空', trigger: ['blur', 'change'] }],
+        deviceId: [{ required: true, message: '设备编号不能为空', trigger: ['blur', 'change'] }],
+        collectTimes: [{ 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
+      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
+          collectCycle: row.collectCycle, // 报警阈值
+          collectTime: row.collectTime, // 安装高度
+          retryTimes: row.retryTimes, // 重传次数
+          ip: row.ip, // ip地址
+          port: row.port, // 端口号
+          attemptsMax: row.attemptsMax // 最大尝试次数
+        }
+      }
+    },
+    // 重置表单
+    resetForm() {
+      this.deviceForm = {
+        deviceName: '',
+        deviceTypeName: '',
+        deptName: '',
+        devcode: ''
+      }
+      this.configForm = {
+        deviceId: '', // 设备id
+        collectCycle: '', // 报警阈值
+        collectTime: '', // 安装高度
+        retryTimes: '3', // 重传次数
+        ip: '', // ip地址
+        port: '', // 端口号
+        attemptsMax: '3' // 最大尝试次数
+      }
+    },
+    // 保存数据
+    saveData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          editLiquidConfig(this.configForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('配置成功')
+              this.$emit('watchChild')
+              this.dialogFormVisible = false
+            }
+          })
+        }
+      })
+    },
+    fetchDevice() {
+      this.loading = true
+      getDeviceSimpleList('4', '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%;
+  }
+  .el-date-editor{
+    width:100%
+  }
+</style>
diff --git a/src/views/deviceConfig/liquidConfig/editGasConfig.vue b/src/views/deviceConfig/liquidConfig/editGasConfig.vue
new file mode 100644
index 0000000..bc61d77
--- /dev/null
+++ b/src/views/deviceConfig/liquidConfig/editGasConfig.vue
@@ -0,0 +1,279 @@
+<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="100px">
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item v-if="dialogStatus=='create'" label="设备编号" prop="deviceId">
+            <el-select
+              v-model="configForm.deviceId"
+              :loading="loading"
+              :disabled="dialogStatus=='update'?true:false"
+              filterable
+              placeholder="请输入设备编号"
+            >
+              <el-option
+                v-for="item in devices"
+                :key="item.id"
+                :label="item.devcode"
+                :value="item.id"/>
+            </el-select>
+          </el-form-item>
+          <el-form-item v-if="dialogStatus=='update'" label="设备编号">
+            <el-input v-model="deviceForm.devcode" type="text" placeholder="未知" disabled/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item v-if="deviceForm.deviceName!=''" label="设备名称">
+            <el-input v-model="deviceForm.deviceName" type="text" placeholder="未知" disabled/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item v-if="deviceForm.deviceTypeName!=''" label="设备类型" prop="deviceType">
+            <el-input v-model="deviceForm.deviceTypeName" type="text" placeholder="未知" disabled/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item v-if="deviceForm.deptName!=''" label="权属单位" prop="deptName">
+            <el-input v-model="deviceForm.deptName" type="text" placeholder="未知" disabled/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="重传次数" prop="retryTimes">
+            <el-input-number :min="1" :max="10" v-model="configForm.retryTimes" type="text" placeholder="必填"/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="采集间隔" prop="collectCycle">
+            <el-input v-model.trim="configForm.collectCycle" type="text" placeholder="必填"/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="上传周期" prop="upPeriod">
+            <el-input v-model.trim="configForm.upPeriod" type="text" placeholder="必填"/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="最大尝试次数">
+            <el-input-number :min="1" :max="10" v-model="configForm.attemptsMax" type="text" placeholder="必填"/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row v-if="showIp" :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="ip地址" prop="ip">
+            <el-input v-model.trim="configForm.ip" type="text" placeholder="非集中器设备必填"/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="端口号" prop="port">
+            <el-input v-model.trim="configForm.port" type="text" placeholder="非集中器设备必填"/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <div slot="footer" class="dialog-footer">
+      <el-button type="primary" @click="saveData">保存</el-button>
+      <el-button @click="cancel">取消</el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { editLiquidConfig, getDeviceSimpleList } from '@/api/liquidconfig'
+import { validateFloatPlus } from '@/utils/validate'
+export default {
+  name: 'EditGasConfig',
+  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, 0, 100) === true) {
+          callback()
+        } else {
+          callback(new Error('请填写0到100数值'))
+        }
+      } else {
+        callback(new Error('采集时间不能为空'))
+      }
+    }
+    const validateUpPeriod = (rule, value, callback) => {
+      if (value !== '') {
+        if (validateFloatPlus(value, 0, 100) === true) {
+          callback()
+        } else {
+          callback(new Error('请填写0到100数值'))
+        }
+      } else {
+        callback(new Error('上传周期不能为空'))
+      }
+    }
+    return {
+      dialogFormVisible: false, // 对话框是否显示
+      dialogStatus: '', // 对话框类型：create,update
+      deviceForm: {
+        deviceName: '',
+        deviceTypeName: '',
+        deptName: '',
+        devcode: '',
+        deviceType: ''
+      }, // 设备基本信息
+      configForm: {
+        id: '', // config id
+        deviceId: '', // 设备id
+        collectCycle: '', // 报警阈值
+        upPeriod: '', // 安装高度
+        retryTimes: '3', // 重传次数
+        ip: '', // ip地址
+        port: '', // 端口号
+        attemptsMax: '3' // 最大尝试次数
+      },
+      textMap: {
+        update: '编辑',
+        create: '新增'
+      }, // 表头显示标题
+      devices: [], // 设备下拉选择列表
+      loading: false, // 加载动画是否显示
+      rules: {
+        collectCycle: [{ required: true, trigger: ['blur', 'change'], validator: validateCollectCycle }],
+        upPeriod: [{ 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
+      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
+          collectCycle: row.collectCycle, // 报警阈值
+          upPeriod: row.upPeriod, // 安装高度
+          retryTimes: row.retryTimes, // 重传次数
+          ip: row.ip, // ip地址
+          port: row.port, // 端口号
+          attemptsMax: row.attemptsMax // 最大尝试次数
+        }
+      }
+    },
+    // 重置表单
+    resetForm() {
+      this.deviceForm = {
+        deviceName: '',
+        deviceTypeName: '',
+        deptName: '',
+        devcode: ''
+      }
+      this.configForm = {
+        deviceId: '', // 设备id
+        collectCycle: '', // 报警阈值
+        upPeriod: '', // 安装高度
+        retryTimes: '3', // 重传次数
+        ip: '', // ip地址
+        port: '', // 端口号
+        attemptsMax: '3' // 最大尝试次数
+      }
+    },
+    // 保存数据
+    saveData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          editLiquidConfig(this.configForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('配置成功')
+              this.$emit('watchChild')
+              this.dialogFormVisible = false
+            }
+          })
+        }
+      })
+    },
+    fetchDevice() {
+      this.loading = true
+      getDeviceSimpleList('4', '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/liquidConfig/editHarmfulConfig.vue b/src/views/deviceConfig/liquidConfig/editHarmfulConfig.vue
new file mode 100644
index 0000000..0eff7a8
--- /dev/null
+++ b/src/views/deviceConfig/liquidConfig/editHarmfulConfig.vue
@@ -0,0 +1,262 @@
+<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="100px">
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item v-if="dialogStatus=='create'" label="设备编号" prop="deviceId">
+            <el-select
+              v-model="configForm.deviceId"
+              :loading="loading"
+              :disabled="dialogStatus=='update'?true:false"
+              filterable
+              placeholder="请输入设备编号"
+            >
+              <el-option
+                v-for="item in devices"
+                :key="item.id"
+                :label="item.devcode"
+                :value="item.id"/>
+            </el-select>
+          </el-form-item>
+          <el-form-item v-if="dialogStatus=='update'" label="设备编号">
+            <el-input v-model="deviceForm.devcode" type="text" placeholder="未知" disabled/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item v-if="deviceForm.deviceName!=''" label="设备名称">
+            <el-input v-model="deviceForm.deviceName" type="text" placeholder="未知" disabled/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item v-if="deviceForm.deviceTypeName!=''" label="设备类型" prop="deviceType">
+            <el-input v-model="deviceForm.deviceTypeName" type="text" placeholder="未知" disabled/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item v-if="deviceForm.deptName!=''" label="权属单位" prop="deptName">
+            <el-input v-model="deviceForm.deptName" type="text" placeholder="未知" disabled/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="重传次数" prop="retryTimes">
+            <el-input-number :min="1" :max="10" v-model="configForm.retryTimes" type="text" placeholder="必填"/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="采集间隔" prop="collectCycle">
+            <el-input v-model.trim="configForm.collectCycle" type="text" placeholder="必填"/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="最大尝试次数">
+            <el-input-number :min="1" :max="10" v-model="configForm.attemptsMax" type="text" placeholder="必填"/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row v-if="showIp" :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="ip地址" prop="ip">
+            <el-input v-model.trim="configForm.ip" type="text" placeholder="非集中器设备必填"/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="端口号" prop="port">
+            <el-input v-model.trim="configForm.port" type="text" placeholder="非集中器设备必填"/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <div slot="footer" class="dialog-footer">
+      <el-button type="primary" @click="saveData">保存</el-button>
+      <el-button @click="cancel">取消</el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { editLiquidConfig, getDeviceSimpleList } from '@/api/liquidconfig'
+import { validateFloatPlus } from '@/utils/validate'
+export default {
+  name: 'EditHarmfulConfig',
+  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, 0, 100) === true) {
+          callback()
+        } else {
+          callback(new Error('请填写0到100数值'))
+        }
+      } else {
+        callback(new Error('采集时间不能为空'))
+      }
+    }
+    return {
+      dialogFormVisible: false, // 对话框是否显示
+      dialogStatus: '', // 对话框类型：create,update
+      deviceForm: {
+        deviceName: '',
+        deviceTypeName: '',
+        deptName: '',
+        devcode: '',
+        deviceType: ''
+      }, // 设备基本信息
+      configForm: {
+        id: '', // config id
+        deviceId: '', // 设备id
+        collectCycle: '', // 报警阈值
+        upPeriod: '', // 安装高度
+        retryTimes: '3', // 重传次数
+        ip: '', // ip地址
+        port: '', // 端口号
+        attemptsMax: '3' // 最大尝试次数
+      },
+      textMap: {
+        update: '编辑',
+        create: '新增'
+      }, // 表头显示标题
+      devices: [], // 设备下拉选择列表
+      loading: false, // 加载动画是否显示
+      rules: {
+        collectCycle: [{ required: true, trigger: ['blur', 'change'], validator: validateCollectCycle }],
+        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
+      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
+          collectCycle: row.collectCycle, // 报警阈值
+          upPeriod: row.upPeriod, // 安装高度
+          retryTimes: row.retryTimes, // 重传次数
+          ip: row.ip, // ip地址
+          port: row.port, // 端口号
+          attemptsMax: row.attemptsMax // 最大尝试次数
+        }
+      }
+    },
+    // 重置表单
+    resetForm() {
+      this.deviceForm = {
+        deviceName: '',
+        deviceTypeName: '',
+        deptName: '',
+        devcode: ''
+      }
+      this.configForm = {
+        deviceId: '', // 设备id
+        collectCycle: '', // 报警阈值
+        upPeriod: '', // 安装高度
+        retryTimes: '3', // 重传次数
+        ip: '', // ip地址
+        port: '', // 端口号
+        attemptsMax: '3' // 最大尝试次数
+      }
+    },
+    // 保存数据
+    saveData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          editLiquidConfig(this.configForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('配置成功')
+              this.$emit('watchChild')
+              this.dialogFormVisible = false
+            }
+          })
+        }
+      })
+    },
+    fetchDevice() {
+      this.loading = true
+      getDeviceSimpleList('4', '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/digconfig.js b/src/api/digconfig.js
new file mode 100644
index 0000000..d885e08
--- /dev/null
+++ b/src/api/digconfig.js
@@ -0,0 +1,42 @@
+/**
+ * 开挖配置接口
+ */
+import request from '@/utils/request'
+// 开挖配置查询
+export function getDigConfigList(params) {
+  return request({
+    url: 'digConfig/list',
+    method: 'get',
+    params
+  })
+}
+
+// 修改开挖配置
+export function editDigConfig(params) {
+  return request({
+    url: 'digConfig/config',
+    method: 'post',
+    params
+  })
+}
+
+// 批量导入
+export function batchImportDigConfig(fileobj) {
+  const param = new FormData()
+  param.append('file', fileobj)
+  return request({
+    url: 'digConfig/batchImport',
+    method: 'post',
+    headers: { 'Content-Type': 'multipart/form-data' },
+    data: param
+  })
+}
+// 批量导出
+export function batchExportDigConfig(params) {
+  return request({
+    url: 'digConfig/batchExport',
+    method: 'get',
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
diff --git a/src/api/gasconfig.js b/src/api/gasconfig.js
new file mode 100644
index 0000000..93f1d09
--- /dev/null
+++ b/src/api/gasconfig.js
@@ -0,0 +1,42 @@
+/**
+ * 燃气配置接口
+ */
+import request from '@/utils/request'
+// 燃气配置查询
+export function getGasConfigList(params) {
+  return request({
+    url: 'gasConfig/list',
+    method: 'get',
+    params
+  })
+}
+
+// 修改燃气配置
+export function editGasConfig(params) {
+  return request({
+    url: 'gasConfig/config',
+    method: 'post',
+    params
+  })
+}
+
+// 批量导入
+export function batchImportGasConfig(fileobj) {
+  const param = new FormData()
+  param.append('file', fileobj)
+  return request({
+    url: 'gasConfig/batchImport',
+    method: 'post',
+    headers: { 'Content-Type': 'multipart/form-data' },
+    data: param
+  })
+}
+// 批量导出
+export function batchExportGasConfig(params) {
+  return request({
+    url: 'gasConfig/batchExport',
+    method: 'get',
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
diff --git a/src/api/harmfulconfig.js b/src/api/harmfulconfig.js
new file mode 100644
index 0000000..29b6b6e
--- /dev/null
+++ b/src/api/harmfulconfig.js
@@ -0,0 +1,42 @@
+/**
+ * 有害气体配置接口
+ */
+import request from '@/utils/request'
+// 有害气体配置查询
+export function getHarmfulConfigList(params) {
+  return request({
+    url: 'harmfulConfig/list',
+    method: 'get',
+    params
+  })
+}
+
+// 修改有害气体配置
+export function editHarmfulConfig(params) {
+  return request({
+    url: 'harmfulConfig/config',
+    method: 'post',
+    params
+  })
+}
+
+// 批量导入
+export function batchImportHarmfulConfig(fileobj) {
+  const param = new FormData()
+  param.append('file', fileobj)
+  return request({
+    url: 'harmfulConfig/batchImport',
+    method: 'post',
+    headers: { 'Content-Type': 'multipart/form-data' },
+    data: param
+  })
+}
+// 批量导出
+export function batchExportHarmfulConfig(params) {
+  return request({
+    url: 'harmfulConfig/batchExport',
+    method: 'get',
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
diff --git a/src/api/tempconfig.js b/src/api/tempconfig.js
new file mode 100644
index 0000000..aa4ce86
--- /dev/null
+++ b/src/api/tempconfig.js
@@ -0,0 +1,42 @@
+/**
+ * 温湿度配置接口
+ */
+import request from '@/utils/request'
+// 温湿度配置查询
+export function getTempConfigList(params) {
+  return request({
+    url: 'tempConfig/list',
+    method: 'get',
+    params
+  })
+}
+
+// 修改温湿度配置
+export function editTempConfig(params) {
+  return request({
+    url: 'tempConfig/config',
+    method: 'post',
+    params
+  })
+}
+
+// 批量导入
+export function batchImportTempConfig(fileobj) {
+  const param = new FormData()
+  param.append('file', fileobj)
+  return request({
+    url: 'tempConfig/batchImport',
+    method: 'post',
+    headers: { 'Content-Type': 'multipart/form-data' },
+    data: param
+  })
+}
+// 批量导出
+export function batchExportTempConfig(params) {
+  return request({
+    url: 'tempConfig/batchExport',
+    method: 'get',
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
diff --git a/src/views/deviceConfig/deviceConfig.vue b/src/views/deviceConfig/deviceConfig.vue
index 289cdbc..678c3a4 100644
--- a/src/views/deviceConfig/deviceConfig.vue
+++ b/src/views/deviceConfig/deviceConfig.vue
@@ -4,16 +4,31 @@
       <el-tab-pane v-if="hasPerm('/liquidConfig/list')" label="液位监测仪" name="liquid">
         <list-liquid-config/>
       </el-tab-pane>
-      <el-tab-pane v-if="hasPerm('/gasConfig/list')" label="燃气" name="gas">燃气配置</el-tab-pane>
+      <el-tab-pane label="燃气智能监测终端" name="gas">
+        <list-gas-config/>
+      </el-tab-pane>
+      <el-tab-pane label="有害气体监测仪" name="harmful">
+        <list-harmful-config/>
+      </el-tab-pane>
+      <el-tab-pane label="温湿度监测仪" name="temphumidity">
+        <list-temp-config/>
+      </el-tab-pane>
+      <el-tab-pane label="开挖监测仪" name="dig">
+        <list-dig-config/>
+      </el-tab-pane>
     </el-tabs>
   </div>
 </template>
 
 <script>
 import ListLiquidConfig from './liquidConfig/listLiquidConfig'
+import ListGasConfig from './liquidConfig/listGasConfig'
+import ListHarmfulConfig from './liquidConfig/listHarmfulConfig'
+import ListTempConfig from './liquidConfig/listTempConfig'
+import ListDigConfig from './liquidConfig/listDigConfig'
 export default {
   name: 'DeviceConfig',
-  components: { ListLiquidConfig },
+  components: { ListDigConfig, ListTempConfig, ListHarmfulConfig, ListGasConfig, ListLiquidConfig },
   data() {
     return {
       activeName: 'liquid'
diff --git a/src/views/deviceConfig/liquidConfig/editDigConfig.vue b/src/views/deviceConfig/liquidConfig/editDigConfig.vue
new file mode 100644
index 0000000..13195db
--- /dev/null
+++ b/src/views/deviceConfig/liquidConfig/editDigConfig.vue
@@ -0,0 +1,304 @@
+<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="100px">
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item v-if="dialogStatus=='create'" label="设备编号" prop="deviceId">
+            <el-select
+              v-model="configForm.deviceId"
+              :loading="loading"
+              :disabled="dialogStatus=='update'?true:false"
+              filterable
+              placeholder="请输入设备编号"
+            >
+              <el-option
+                v-for="item in devices"
+                :key="item.id"
+                :label="item.devcode"
+                :value="item.id"/>
+            </el-select>
+          </el-form-item>
+          <el-form-item v-if="dialogStatus=='update'" label="设备编号">
+            <el-input v-model="deviceForm.devcode" type="text" placeholder="未知" disabled/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item v-if="deviceForm.deviceName!=''" label="设备名称">
+            <el-input v-model="deviceForm.deviceName" type="text" placeholder="未知" disabled/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item v-if="deviceForm.deviceTypeName!=''" label="设备类型" prop="deviceType">
+            <el-input v-model="deviceForm.deviceTypeName" type="text" placeholder="未知" disabled/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item v-if="deviceForm.deptName!=''" label="权属单位" prop="deptName">
+            <el-input v-model="deviceForm.deptName" type="text" placeholder="未知" disabled/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="重传次数" prop="retryTimes">
+            <el-input-number :min="1" :max="10" v-model="configForm.retryTimes" type="text" placeholder="必填"/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="采集间隔" prop="collectCycle">
+            <el-input v-model.trim="configForm.collectCycle" type="text" placeholder="必填"/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="采集时间" prop="collectTime">
+            <!--<el-input v-model.trim="configForm.collectTime" type="text" placeholder="必填"/>-->
+            <el-time-picker
+              v-model="configForm.collectTime"
+              format="HH:mm"
+              placeholder="必选"/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="睡眠时间" prop="sleepTime">
+            <el-time-picker
+              v-model="configForm.sleepTime"
+              format="HH:mm"
+              placeholder="必选"/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="报警阈值" prop="threshold">
+            <el-input v-model.trim="configForm.threshold" type="text" placeholder="必填"/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="最大尝试次数">
+            <el-input-number :min="1" :max="10" v-model="configForm.attemptsMax" type="text" placeholder="必填"/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row v-if="showIp" :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="ip地址" prop="ip">
+            <el-input v-model.trim="configForm.ip" type="text" placeholder="非集中器设备必填"/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="端口号" prop="port">
+            <el-input v-model.trim="configForm.port" type="text" placeholder="非集中器设备必填"/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <div slot="footer" class="dialog-footer">
+      <el-button type="primary" @click="saveData">保存</el-button>
+      <el-button @click="cancel">取消</el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { editLiquidConfig, getDeviceSimpleList } from '@/api/liquidconfig'
+import { validateFloatPlus } from '@/utils/validate'
+export default {
+  name: 'EditDigConfig',
+  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, 0, 100) === true) {
+          callback()
+        } else {
+          callback(new Error('请填写0到100数值'))
+        }
+      } else {
+        callback(new Error('采集间隔不能为空'))
+      }
+    }
+    const validateThreshold = (rule, value, callback) => {
+      if (value !== '') {
+        if (validateFloatPlus(value, 0, 100) === true) {
+          callback()
+        } else {
+          callback(new Error('请填写0到100数值'))
+        }
+      } else {
+        callback(new Error('报警阈值不能为空'))
+      }
+    }
+    return {
+      dialogFormVisible: false, // 对话框是否显示
+      dialogStatus: '', // 对话框类型：create,update
+      deviceForm: {
+        deviceName: '',
+        deviceTypeName: '',
+        deptName: '',
+        devcode: '',
+        deviceType: ''
+      }, // 设备基本信息
+      configForm: {
+        id: '', // config id
+        deviceId: '', // 设备id
+        collectCycle: '', // 采集间隔
+        collectTime: '', // 采集时间
+        collectTimes: '', // 采集次数
+        retryTimes: '3', // 重传次数
+        ip: '', // ip地址
+        port: '', // 端口号
+        attemptsMax: '3' // 最大尝试次数
+      },
+      textMap: {
+        update: '编辑',
+        create: '新增'
+      }, // 表头显示标题
+      devices: [], // 设备下拉选择列表
+      loading: false, // 加载动画是否显示
+      rules: {
+        collectCycle: [{ required: true, trigger: ['blur', 'change'], validator: validateCollectCycle }],
+        threshold: [{ required: true, trigger: ['blur', 'change'], validator: validateThreshold }],
+        collectTime: [{ required: true, message: '采集时间不能为空', trigger: ['blur', 'change'] }],
+        deviceId: [{ required: true, message: '设备编号不能为空', trigger: ['blur', 'change'] }],
+        collectTimes: [{ 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
+      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
+          collectCycle: row.collectCycle, // 报警阈值
+          collectTime: row.collectTime, // 安装高度
+          retryTimes: row.retryTimes, // 重传次数
+          ip: row.ip, // ip地址
+          port: row.port, // 端口号
+          attemptsMax: row.attemptsMax // 最大尝试次数
+        }
+      }
+    },
+    // 重置表单
+    resetForm() {
+      this.deviceForm = {
+        deviceName: '',
+        deviceTypeName: '',
+        deptName: '',
+        devcode: ''
+      }
+      this.configForm = {
+        deviceId: '', // 设备id
+        collectCycle: '', // 报警阈值
+        collectTime: '', // 安装高度
+        retryTimes: '3', // 重传次数
+        ip: '', // ip地址
+        port: '', // 端口号
+        attemptsMax: '3' // 最大尝试次数
+      }
+    },
+    // 保存数据
+    saveData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          editLiquidConfig(this.configForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('配置成功')
+              this.$emit('watchChild')
+              this.dialogFormVisible = false
+            }
+          })
+        }
+      })
+    },
+    fetchDevice() {
+      this.loading = true
+      getDeviceSimpleList('4', '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%;
+  }
+  .el-date-editor{
+    width:100%
+  }
+</style>
diff --git a/src/views/deviceConfig/liquidConfig/editGasConfig.vue b/src/views/deviceConfig/liquidConfig/editGasConfig.vue
new file mode 100644
index 0000000..bc61d77
--- /dev/null
+++ b/src/views/deviceConfig/liquidConfig/editGasConfig.vue
@@ -0,0 +1,279 @@
+<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="100px">
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item v-if="dialogStatus=='create'" label="设备编号" prop="deviceId">
+            <el-select
+              v-model="configForm.deviceId"
+              :loading="loading"
+              :disabled="dialogStatus=='update'?true:false"
+              filterable
+              placeholder="请输入设备编号"
+            >
+              <el-option
+                v-for="item in devices"
+                :key="item.id"
+                :label="item.devcode"
+                :value="item.id"/>
+            </el-select>
+          </el-form-item>
+          <el-form-item v-if="dialogStatus=='update'" label="设备编号">
+            <el-input v-model="deviceForm.devcode" type="text" placeholder="未知" disabled/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item v-if="deviceForm.deviceName!=''" label="设备名称">
+            <el-input v-model="deviceForm.deviceName" type="text" placeholder="未知" disabled/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item v-if="deviceForm.deviceTypeName!=''" label="设备类型" prop="deviceType">
+            <el-input v-model="deviceForm.deviceTypeName" type="text" placeholder="未知" disabled/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item v-if="deviceForm.deptName!=''" label="权属单位" prop="deptName">
+            <el-input v-model="deviceForm.deptName" type="text" placeholder="未知" disabled/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="重传次数" prop="retryTimes">
+            <el-input-number :min="1" :max="10" v-model="configForm.retryTimes" type="text" placeholder="必填"/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="采集间隔" prop="collectCycle">
+            <el-input v-model.trim="configForm.collectCycle" type="text" placeholder="必填"/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="上传周期" prop="upPeriod">
+            <el-input v-model.trim="configForm.upPeriod" type="text" placeholder="必填"/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="最大尝试次数">
+            <el-input-number :min="1" :max="10" v-model="configForm.attemptsMax" type="text" placeholder="必填"/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row v-if="showIp" :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="ip地址" prop="ip">
+            <el-input v-model.trim="configForm.ip" type="text" placeholder="非集中器设备必填"/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="端口号" prop="port">
+            <el-input v-model.trim="configForm.port" type="text" placeholder="非集中器设备必填"/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <div slot="footer" class="dialog-footer">
+      <el-button type="primary" @click="saveData">保存</el-button>
+      <el-button @click="cancel">取消</el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { editLiquidConfig, getDeviceSimpleList } from '@/api/liquidconfig'
+import { validateFloatPlus } from '@/utils/validate'
+export default {
+  name: 'EditGasConfig',
+  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, 0, 100) === true) {
+          callback()
+        } else {
+          callback(new Error('请填写0到100数值'))
+        }
+      } else {
+        callback(new Error('采集时间不能为空'))
+      }
+    }
+    const validateUpPeriod = (rule, value, callback) => {
+      if (value !== '') {
+        if (validateFloatPlus(value, 0, 100) === true) {
+          callback()
+        } else {
+          callback(new Error('请填写0到100数值'))
+        }
+      } else {
+        callback(new Error('上传周期不能为空'))
+      }
+    }
+    return {
+      dialogFormVisible: false, // 对话框是否显示
+      dialogStatus: '', // 对话框类型：create,update
+      deviceForm: {
+        deviceName: '',
+        deviceTypeName: '',
+        deptName: '',
+        devcode: '',
+        deviceType: ''
+      }, // 设备基本信息
+      configForm: {
+        id: '', // config id
+        deviceId: '', // 设备id
+        collectCycle: '', // 报警阈值
+        upPeriod: '', // 安装高度
+        retryTimes: '3', // 重传次数
+        ip: '', // ip地址
+        port: '', // 端口号
+        attemptsMax: '3' // 最大尝试次数
+      },
+      textMap: {
+        update: '编辑',
+        create: '新增'
+      }, // 表头显示标题
+      devices: [], // 设备下拉选择列表
+      loading: false, // 加载动画是否显示
+      rules: {
+        collectCycle: [{ required: true, trigger: ['blur', 'change'], validator: validateCollectCycle }],
+        upPeriod: [{ 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
+      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
+          collectCycle: row.collectCycle, // 报警阈值
+          upPeriod: row.upPeriod, // 安装高度
+          retryTimes: row.retryTimes, // 重传次数
+          ip: row.ip, // ip地址
+          port: row.port, // 端口号
+          attemptsMax: row.attemptsMax // 最大尝试次数
+        }
+      }
+    },
+    // 重置表单
+    resetForm() {
+      this.deviceForm = {
+        deviceName: '',
+        deviceTypeName: '',
+        deptName: '',
+        devcode: ''
+      }
+      this.configForm = {
+        deviceId: '', // 设备id
+        collectCycle: '', // 报警阈值
+        upPeriod: '', // 安装高度
+        retryTimes: '3', // 重传次数
+        ip: '', // ip地址
+        port: '', // 端口号
+        attemptsMax: '3' // 最大尝试次数
+      }
+    },
+    // 保存数据
+    saveData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          editLiquidConfig(this.configForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('配置成功')
+              this.$emit('watchChild')
+              this.dialogFormVisible = false
+            }
+          })
+        }
+      })
+    },
+    fetchDevice() {
+      this.loading = true
+      getDeviceSimpleList('4', '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/liquidConfig/editHarmfulConfig.vue b/src/views/deviceConfig/liquidConfig/editHarmfulConfig.vue
new file mode 100644
index 0000000..0eff7a8
--- /dev/null
+++ b/src/views/deviceConfig/liquidConfig/editHarmfulConfig.vue
@@ -0,0 +1,262 @@
+<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="100px">
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item v-if="dialogStatus=='create'" label="设备编号" prop="deviceId">
+            <el-select
+              v-model="configForm.deviceId"
+              :loading="loading"
+              :disabled="dialogStatus=='update'?true:false"
+              filterable
+              placeholder="请输入设备编号"
+            >
+              <el-option
+                v-for="item in devices"
+                :key="item.id"
+                :label="item.devcode"
+                :value="item.id"/>
+            </el-select>
+          </el-form-item>
+          <el-form-item v-if="dialogStatus=='update'" label="设备编号">
+            <el-input v-model="deviceForm.devcode" type="text" placeholder="未知" disabled/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item v-if="deviceForm.deviceName!=''" label="设备名称">
+            <el-input v-model="deviceForm.deviceName" type="text" placeholder="未知" disabled/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item v-if="deviceForm.deviceTypeName!=''" label="设备类型" prop="deviceType">
+            <el-input v-model="deviceForm.deviceTypeName" type="text" placeholder="未知" disabled/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item v-if="deviceForm.deptName!=''" label="权属单位" prop="deptName">
+            <el-input v-model="deviceForm.deptName" type="text" placeholder="未知" disabled/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="重传次数" prop="retryTimes">
+            <el-input-number :min="1" :max="10" v-model="configForm.retryTimes" type="text" placeholder="必填"/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="采集间隔" prop="collectCycle">
+            <el-input v-model.trim="configForm.collectCycle" type="text" placeholder="必填"/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="最大尝试次数">
+            <el-input-number :min="1" :max="10" v-model="configForm.attemptsMax" type="text" placeholder="必填"/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row v-if="showIp" :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="ip地址" prop="ip">
+            <el-input v-model.trim="configForm.ip" type="text" placeholder="非集中器设备必填"/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="端口号" prop="port">
+            <el-input v-model.trim="configForm.port" type="text" placeholder="非集中器设备必填"/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <div slot="footer" class="dialog-footer">
+      <el-button type="primary" @click="saveData">保存</el-button>
+      <el-button @click="cancel">取消</el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { editLiquidConfig, getDeviceSimpleList } from '@/api/liquidconfig'
+import { validateFloatPlus } from '@/utils/validate'
+export default {
+  name: 'EditHarmfulConfig',
+  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, 0, 100) === true) {
+          callback()
+        } else {
+          callback(new Error('请填写0到100数值'))
+        }
+      } else {
+        callback(new Error('采集时间不能为空'))
+      }
+    }
+    return {
+      dialogFormVisible: false, // 对话框是否显示
+      dialogStatus: '', // 对话框类型：create,update
+      deviceForm: {
+        deviceName: '',
+        deviceTypeName: '',
+        deptName: '',
+        devcode: '',
+        deviceType: ''
+      }, // 设备基本信息
+      configForm: {
+        id: '', // config id
+        deviceId: '', // 设备id
+        collectCycle: '', // 报警阈值
+        upPeriod: '', // 安装高度
+        retryTimes: '3', // 重传次数
+        ip: '', // ip地址
+        port: '', // 端口号
+        attemptsMax: '3' // 最大尝试次数
+      },
+      textMap: {
+        update: '编辑',
+        create: '新增'
+      }, // 表头显示标题
+      devices: [], // 设备下拉选择列表
+      loading: false, // 加载动画是否显示
+      rules: {
+        collectCycle: [{ required: true, trigger: ['blur', 'change'], validator: validateCollectCycle }],
+        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
+      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
+          collectCycle: row.collectCycle, // 报警阈值
+          upPeriod: row.upPeriod, // 安装高度
+          retryTimes: row.retryTimes, // 重传次数
+          ip: row.ip, // ip地址
+          port: row.port, // 端口号
+          attemptsMax: row.attemptsMax // 最大尝试次数
+        }
+      }
+    },
+    // 重置表单
+    resetForm() {
+      this.deviceForm = {
+        deviceName: '',
+        deviceTypeName: '',
+        deptName: '',
+        devcode: ''
+      }
+      this.configForm = {
+        deviceId: '', // 设备id
+        collectCycle: '', // 报警阈值
+        upPeriod: '', // 安装高度
+        retryTimes: '3', // 重传次数
+        ip: '', // ip地址
+        port: '', // 端口号
+        attemptsMax: '3' // 最大尝试次数
+      }
+    },
+    // 保存数据
+    saveData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          editLiquidConfig(this.configForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('配置成功')
+              this.$emit('watchChild')
+              this.dialogFormVisible = false
+            }
+          })
+        }
+      })
+    },
+    fetchDevice() {
+      this.loading = true
+      getDeviceSimpleList('4', '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/liquidConfig/editTempConfig.vue b/src/views/deviceConfig/liquidConfig/editTempConfig.vue
new file mode 100644
index 0000000..76107d9
--- /dev/null
+++ b/src/views/deviceConfig/liquidConfig/editTempConfig.vue
@@ -0,0 +1,284 @@
+<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="100px">
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item v-if="dialogStatus=='create'" label="设备编号" prop="deviceId">
+            <el-select
+              v-model="configForm.deviceId"
+              :loading="loading"
+              :disabled="dialogStatus=='update'?true:false"
+              filterable
+              placeholder="请输入设备编号"
+            >
+              <el-option
+                v-for="item in devices"
+                :key="item.id"
+                :label="item.devcode"
+                :value="item.id"/>
+            </el-select>
+          </el-form-item>
+          <el-form-item v-if="dialogStatus=='update'" label="设备编号">
+            <el-input v-model="deviceForm.devcode" type="text" placeholder="未知" disabled/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item v-if="deviceForm.deviceName!=''" label="设备名称">
+            <el-input v-model="deviceForm.deviceName" type="text" placeholder="未知" disabled/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item v-if="deviceForm.deviceTypeName!=''" label="设备类型" prop="deviceType">
+            <el-input v-model="deviceForm.deviceTypeName" type="text" placeholder="未知" disabled/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item v-if="deviceForm.deptName!=''" label="权属单位" prop="deptName">
+            <el-input v-model="deviceForm.deptName" type="text" placeholder="未知" disabled/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="重传次数" prop="retryTimes">
+            <el-input-number :min="1" :max="10" v-model="configForm.retryTimes" type="text" placeholder="必填"/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="采集间隔" prop="collectCycle">
+            <el-input v-model.trim="configForm.collectCycle" type="text" placeholder="必填"/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="采集时间" prop="collectTime">
+            <!--<el-input v-model.trim="configForm.collectTime" type="text" placeholder="必填"/>-->
+            <el-time-picker
+              v-model="configForm.collectTime"
+              format="HH:mm"
+              placeholder="必选"/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="最大尝试次数">
+            <el-input-number :min="1" :max="10" v-model="configForm.attemptsMax" type="text" placeholder="必填"/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="采集次数" prop="collectTimes">
+            <el-input-number :min="1" :max="100" v-model="configForm.collectTimes" 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 type="primary" @click="saveData">保存</el-button>
+      <el-button @click="cancel">取消</el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { editLiquidConfig, getDeviceSimpleList } from '@/api/liquidconfig'
+import { validateFloatPlus } from '@/utils/validate'
+export default {
+  name: 'EditTempConfig',
+  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, 0, 100) === true) {
+          callback()
+        } else {
+          callback(new Error('请填写0到100数值'))
+        }
+      } else {
+        callback(new Error('采集间隔不能为空'))
+      }
+    }
+    return {
+      dialogFormVisible: false, // 对话框是否显示
+      dialogStatus: '', // 对话框类型：create,update
+      deviceForm: {
+        deviceName: '',
+        deviceTypeName: '',
+        deptName: '',
+        devcode: '',
+        deviceType: ''
+      }, // 设备基本信息
+      configForm: {
+        id: '', // config id
+        deviceId: '', // 设备id
+        collectCycle: '', // 采集间隔
+        collectTime: '', // 采集时间
+        collectTimes: '', // 采集次数
+        retryTimes: '3', // 重传次数
+        ip: '', // ip地址
+        port: '', // 端口号
+        attemptsMax: '3' // 最大尝试次数
+      },
+      textMap: {
+        update: '编辑',
+        create: '新增'
+      }, // 表头显示标题
+      devices: [], // 设备下拉选择列表
+      loading: false, // 加载动画是否显示
+      rules: {
+        collectCycle: [{ required: true, trigger: ['blur', 'change'], validator: validateCollectCycle }],
+        collectTime: [{ required: true, message: '采集时间不能为空', trigger: ['blur', 'change'] }],
+        deviceId: [{ required: true, message: '设备编号不能为空', trigger: ['blur', 'change'] }],
+        collectTimes: [{ 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
+      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
+          collectCycle: row.collectCycle, // 报警阈值
+          collectTime: row.collectTime, // 安装高度
+          retryTimes: row.retryTimes, // 重传次数
+          ip: row.ip, // ip地址
+          port: row.port, // 端口号
+          attemptsMax: row.attemptsMax // 最大尝试次数
+        }
+      }
+    },
+    // 重置表单
+    resetForm() {
+      this.deviceForm = {
+        deviceName: '',
+        deviceTypeName: '',
+        deptName: '',
+        devcode: ''
+      }
+      this.configForm = {
+        deviceId: '', // 设备id
+        collectCycle: '', // 报警阈值
+        collectTime: '', // 安装高度
+        retryTimes: '3', // 重传次数
+        ip: '', // ip地址
+        port: '', // 端口号
+        attemptsMax: '3' // 最大尝试次数
+      }
+    },
+    // 保存数据
+    saveData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          editLiquidConfig(this.configForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('配置成功')
+              this.$emit('watchChild')
+              this.dialogFormVisible = false
+            }
+          })
+        }
+      })
+    },
+    fetchDevice() {
+      this.loading = true
+      getDeviceSimpleList('4', '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%;
+  }
+  .el-date-editor{
+    width:100%
+  }
+</style>

diff --git a/src/api/digconfig.js b/src/api/digconfig.js
new file mode 100644
index 0000000..d885e08
--- /dev/null
+++ b/src/api/digconfig.js
@@ -0,0 +1,42 @@
+/**
+ * 开挖配置接口
+ */
+import request from '@/utils/request'
+// 开挖配置查询
+export function getDigConfigList(params) {
+  return request({
+    url: 'digConfig/list',
+    method: 'get',
+    params
+  })
+}
+
+// 修改开挖配置
+export function editDigConfig(params) {
+  return request({
+    url: 'digConfig/config',
+    method: 'post',
+    params
+  })
+}
+
+// 批量导入
+export function batchImportDigConfig(fileobj) {
+  const param = new FormData()
+  param.append('file', fileobj)
+  return request({
+    url: 'digConfig/batchImport',
+    method: 'post',
+    headers: { 'Content-Type': 'multipart/form-data' },
+    data: param
+  })
+}
+// 批量导出
+export function batchExportDigConfig(params) {
+  return request({
+    url: 'digConfig/batchExport',
+    method: 'get',
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
diff --git a/src/api/gasconfig.js b/src/api/gasconfig.js
new file mode 100644
index 0000000..93f1d09
--- /dev/null
+++ b/src/api/gasconfig.js
@@ -0,0 +1,42 @@
+/**
+ * 燃气配置接口
+ */
+import request from '@/utils/request'
+// 燃气配置查询
+export function getGasConfigList(params) {
+  return request({
+    url: 'gasConfig/list',
+    method: 'get',
+    params
+  })
+}
+
+// 修改燃气配置
+export function editGasConfig(params) {
+  return request({
+    url: 'gasConfig/config',
+    method: 'post',
+    params
+  })
+}
+
+// 批量导入
+export function batchImportGasConfig(fileobj) {
+  const param = new FormData()
+  param.append('file', fileobj)
+  return request({
+    url: 'gasConfig/batchImport',
+    method: 'post',
+    headers: { 'Content-Type': 'multipart/form-data' },
+    data: param
+  })
+}
+// 批量导出
+export function batchExportGasConfig(params) {
+  return request({
+    url: 'gasConfig/batchExport',
+    method: 'get',
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
diff --git a/src/api/harmfulconfig.js b/src/api/harmfulconfig.js
new file mode 100644
index 0000000..29b6b6e
--- /dev/null
+++ b/src/api/harmfulconfig.js
@@ -0,0 +1,42 @@
+/**
+ * 有害气体配置接口
+ */
+import request from '@/utils/request'
+// 有害气体配置查询
+export function getHarmfulConfigList(params) {
+  return request({
+    url: 'harmfulConfig/list',
+    method: 'get',
+    params
+  })
+}
+
+// 修改有害气体配置
+export function editHarmfulConfig(params) {
+  return request({
+    url: 'harmfulConfig/config',
+    method: 'post',
+    params
+  })
+}
+
+// 批量导入
+export function batchImportHarmfulConfig(fileobj) {
+  const param = new FormData()
+  param.append('file', fileobj)
+  return request({
+    url: 'harmfulConfig/batchImport',
+    method: 'post',
+    headers: { 'Content-Type': 'multipart/form-data' },
+    data: param
+  })
+}
+// 批量导出
+export function batchExportHarmfulConfig(params) {
+  return request({
+    url: 'harmfulConfig/batchExport',
+    method: 'get',
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
diff --git a/src/api/tempconfig.js b/src/api/tempconfig.js
new file mode 100644
index 0000000..aa4ce86
--- /dev/null
+++ b/src/api/tempconfig.js
@@ -0,0 +1,42 @@
+/**
+ * 温湿度配置接口
+ */
+import request from '@/utils/request'
+// 温湿度配置查询
+export function getTempConfigList(params) {
+  return request({
+    url: 'tempConfig/list',
+    method: 'get',
+    params
+  })
+}
+
+// 修改温湿度配置
+export function editTempConfig(params) {
+  return request({
+    url: 'tempConfig/config',
+    method: 'post',
+    params
+  })
+}
+
+// 批量导入
+export function batchImportTempConfig(fileobj) {
+  const param = new FormData()
+  param.append('file', fileobj)
+  return request({
+    url: 'tempConfig/batchImport',
+    method: 'post',
+    headers: { 'Content-Type': 'multipart/form-data' },
+    data: param
+  })
+}
+// 批量导出
+export function batchExportTempConfig(params) {
+  return request({
+    url: 'tempConfig/batchExport',
+    method: 'get',
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
diff --git a/src/views/deviceConfig/deviceConfig.vue b/src/views/deviceConfig/deviceConfig.vue
index 289cdbc..678c3a4 100644
--- a/src/views/deviceConfig/deviceConfig.vue
+++ b/src/views/deviceConfig/deviceConfig.vue
@@ -4,16 +4,31 @@
       <el-tab-pane v-if="hasPerm('/liquidConfig/list')" label="液位监测仪" name="liquid">
         <list-liquid-config/>
       </el-tab-pane>
-      <el-tab-pane v-if="hasPerm('/gasConfig/list')" label="燃气" name="gas">燃气配置</el-tab-pane>
+      <el-tab-pane label="燃气智能监测终端" name="gas">
+        <list-gas-config/>
+      </el-tab-pane>
+      <el-tab-pane label="有害气体监测仪" name="harmful">
+        <list-harmful-config/>
+      </el-tab-pane>
+      <el-tab-pane label="温湿度监测仪" name="temphumidity">
+        <list-temp-config/>
+      </el-tab-pane>
+      <el-tab-pane label="开挖监测仪" name="dig">
+        <list-dig-config/>
+      </el-tab-pane>
     </el-tabs>
   </div>
 </template>
 
 <script>
 import ListLiquidConfig from './liquidConfig/listLiquidConfig'
+import ListGasConfig from './liquidConfig/listGasConfig'
+import ListHarmfulConfig from './liquidConfig/listHarmfulConfig'
+import ListTempConfig from './liquidConfig/listTempConfig'
+import ListDigConfig from './liquidConfig/listDigConfig'
 export default {
   name: 'DeviceConfig',
-  components: { ListLiquidConfig },
+  components: { ListDigConfig, ListTempConfig, ListHarmfulConfig, ListGasConfig, ListLiquidConfig },
   data() {
     return {
       activeName: 'liquid'
diff --git a/src/views/deviceConfig/liquidConfig/editDigConfig.vue b/src/views/deviceConfig/liquidConfig/editDigConfig.vue
new file mode 100644
index 0000000..13195db
--- /dev/null
+++ b/src/views/deviceConfig/liquidConfig/editDigConfig.vue
@@ -0,0 +1,304 @@
+<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="100px">
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item v-if="dialogStatus=='create'" label="设备编号" prop="deviceId">
+            <el-select
+              v-model="configForm.deviceId"
+              :loading="loading"
+              :disabled="dialogStatus=='update'?true:false"
+              filterable
+              placeholder="请输入设备编号"
+            >
+              <el-option
+                v-for="item in devices"
+                :key="item.id"
+                :label="item.devcode"
+                :value="item.id"/>
+            </el-select>
+          </el-form-item>
+          <el-form-item v-if="dialogStatus=='update'" label="设备编号">
+            <el-input v-model="deviceForm.devcode" type="text" placeholder="未知" disabled/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item v-if="deviceForm.deviceName!=''" label="设备名称">
+            <el-input v-model="deviceForm.deviceName" type="text" placeholder="未知" disabled/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item v-if="deviceForm.deviceTypeName!=''" label="设备类型" prop="deviceType">
+            <el-input v-model="deviceForm.deviceTypeName" type="text" placeholder="未知" disabled/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item v-if="deviceForm.deptName!=''" label="权属单位" prop="deptName">
+            <el-input v-model="deviceForm.deptName" type="text" placeholder="未知" disabled/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="重传次数" prop="retryTimes">
+            <el-input-number :min="1" :max="10" v-model="configForm.retryTimes" type="text" placeholder="必填"/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="采集间隔" prop="collectCycle">
+            <el-input v-model.trim="configForm.collectCycle" type="text" placeholder="必填"/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="采集时间" prop="collectTime">
+            <!--<el-input v-model.trim="configForm.collectTime" type="text" placeholder="必填"/>-->
+            <el-time-picker
+              v-model="configForm.collectTime"
+              format="HH:mm"
+              placeholder="必选"/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="睡眠时间" prop="sleepTime">
+            <el-time-picker
+              v-model="configForm.sleepTime"
+              format="HH:mm"
+              placeholder="必选"/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="报警阈值" prop="threshold">
+            <el-input v-model.trim="configForm.threshold" type="text" placeholder="必填"/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="最大尝试次数">
+            <el-input-number :min="1" :max="10" v-model="configForm.attemptsMax" type="text" placeholder="必填"/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row v-if="showIp" :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="ip地址" prop="ip">
+            <el-input v-model.trim="configForm.ip" type="text" placeholder="非集中器设备必填"/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="端口号" prop="port">
+            <el-input v-model.trim="configForm.port" type="text" placeholder="非集中器设备必填"/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <div slot="footer" class="dialog-footer">
+      <el-button type="primary" @click="saveData">保存</el-button>
+      <el-button @click="cancel">取消</el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { editLiquidConfig, getDeviceSimpleList } from '@/api/liquidconfig'
+import { validateFloatPlus } from '@/utils/validate'
+export default {
+  name: 'EditDigConfig',
+  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, 0, 100) === true) {
+          callback()
+        } else {
+          callback(new Error('请填写0到100数值'))
+        }
+      } else {
+        callback(new Error('采集间隔不能为空'))
+      }
+    }
+    const validateThreshold = (rule, value, callback) => {
+      if (value !== '') {
+        if (validateFloatPlus(value, 0, 100) === true) {
+          callback()
+        } else {
+          callback(new Error('请填写0到100数值'))
+        }
+      } else {
+        callback(new Error('报警阈值不能为空'))
+      }
+    }
+    return {
+      dialogFormVisible: false, // 对话框是否显示
+      dialogStatus: '', // 对话框类型：create,update
+      deviceForm: {
+        deviceName: '',
+        deviceTypeName: '',
+        deptName: '',
+        devcode: '',
+        deviceType: ''
+      }, // 设备基本信息
+      configForm: {
+        id: '', // config id
+        deviceId: '', // 设备id
+        collectCycle: '', // 采集间隔
+        collectTime: '', // 采集时间
+        collectTimes: '', // 采集次数
+        retryTimes: '3', // 重传次数
+        ip: '', // ip地址
+        port: '', // 端口号
+        attemptsMax: '3' // 最大尝试次数
+      },
+      textMap: {
+        update: '编辑',
+        create: '新增'
+      }, // 表头显示标题
+      devices: [], // 设备下拉选择列表
+      loading: false, // 加载动画是否显示
+      rules: {
+        collectCycle: [{ required: true, trigger: ['blur', 'change'], validator: validateCollectCycle }],
+        threshold: [{ required: true, trigger: ['blur', 'change'], validator: validateThreshold }],
+        collectTime: [{ required: true, message: '采集时间不能为空', trigger: ['blur', 'change'] }],
+        deviceId: [{ required: true, message: '设备编号不能为空', trigger: ['blur', 'change'] }],
+        collectTimes: [{ 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
+      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
+          collectCycle: row.collectCycle, // 报警阈值
+          collectTime: row.collectTime, // 安装高度
+          retryTimes: row.retryTimes, // 重传次数
+          ip: row.ip, // ip地址
+          port: row.port, // 端口号
+          attemptsMax: row.attemptsMax // 最大尝试次数
+        }
+      }
+    },
+    // 重置表单
+    resetForm() {
+      this.deviceForm = {
+        deviceName: '',
+        deviceTypeName: '',
+        deptName: '',
+        devcode: ''
+      }
+      this.configForm = {
+        deviceId: '', // 设备id
+        collectCycle: '', // 报警阈值
+        collectTime: '', // 安装高度
+        retryTimes: '3', // 重传次数
+        ip: '', // ip地址
+        port: '', // 端口号
+        attemptsMax: '3' // 最大尝试次数
+      }
+    },
+    // 保存数据
+    saveData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          editLiquidConfig(this.configForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('配置成功')
+              this.$emit('watchChild')
+              this.dialogFormVisible = false
+            }
+          })
+        }
+      })
+    },
+    fetchDevice() {
+      this.loading = true
+      getDeviceSimpleList('4', '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%;
+  }
+  .el-date-editor{
+    width:100%
+  }
+</style>
diff --git a/src/views/deviceConfig/liquidConfig/editGasConfig.vue b/src/views/deviceConfig/liquidConfig/editGasConfig.vue
new file mode 100644
index 0000000..bc61d77
--- /dev/null
+++ b/src/views/deviceConfig/liquidConfig/editGasConfig.vue
@@ -0,0 +1,279 @@
+<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="100px">
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item v-if="dialogStatus=='create'" label="设备编号" prop="deviceId">
+            <el-select
+              v-model="configForm.deviceId"
+              :loading="loading"
+              :disabled="dialogStatus=='update'?true:false"
+              filterable
+              placeholder="请输入设备编号"
+            >
+              <el-option
+                v-for="item in devices"
+                :key="item.id"
+                :label="item.devcode"
+                :value="item.id"/>
+            </el-select>
+          </el-form-item>
+          <el-form-item v-if="dialogStatus=='update'" label="设备编号">
+            <el-input v-model="deviceForm.devcode" type="text" placeholder="未知" disabled/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item v-if="deviceForm.deviceName!=''" label="设备名称">
+            <el-input v-model="deviceForm.deviceName" type="text" placeholder="未知" disabled/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item v-if="deviceForm.deviceTypeName!=''" label="设备类型" prop="deviceType">
+            <el-input v-model="deviceForm.deviceTypeName" type="text" placeholder="未知" disabled/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item v-if="deviceForm.deptName!=''" label="权属单位" prop="deptName">
+            <el-input v-model="deviceForm.deptName" type="text" placeholder="未知" disabled/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="重传次数" prop="retryTimes">
+            <el-input-number :min="1" :max="10" v-model="configForm.retryTimes" type="text" placeholder="必填"/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="采集间隔" prop="collectCycle">
+            <el-input v-model.trim="configForm.collectCycle" type="text" placeholder="必填"/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="上传周期" prop="upPeriod">
+            <el-input v-model.trim="configForm.upPeriod" type="text" placeholder="必填"/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="最大尝试次数">
+            <el-input-number :min="1" :max="10" v-model="configForm.attemptsMax" type="text" placeholder="必填"/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row v-if="showIp" :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="ip地址" prop="ip">
+            <el-input v-model.trim="configForm.ip" type="text" placeholder="非集中器设备必填"/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="端口号" prop="port">
+            <el-input v-model.trim="configForm.port" type="text" placeholder="非集中器设备必填"/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <div slot="footer" class="dialog-footer">
+      <el-button type="primary" @click="saveData">保存</el-button>
+      <el-button @click="cancel">取消</el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { editLiquidConfig, getDeviceSimpleList } from '@/api/liquidconfig'
+import { validateFloatPlus } from '@/utils/validate'
+export default {
+  name: 'EditGasConfig',
+  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, 0, 100) === true) {
+          callback()
+        } else {
+          callback(new Error('请填写0到100数值'))
+        }
+      } else {
+        callback(new Error('采集时间不能为空'))
+      }
+    }
+    const validateUpPeriod = (rule, value, callback) => {
+      if (value !== '') {
+        if (validateFloatPlus(value, 0, 100) === true) {
+          callback()
+        } else {
+          callback(new Error('请填写0到100数值'))
+        }
+      } else {
+        callback(new Error('上传周期不能为空'))
+      }
+    }
+    return {
+      dialogFormVisible: false, // 对话框是否显示
+      dialogStatus: '', // 对话框类型：create,update
+      deviceForm: {
+        deviceName: '',
+        deviceTypeName: '',
+        deptName: '',
+        devcode: '',
+        deviceType: ''
+      }, // 设备基本信息
+      configForm: {
+        id: '', // config id
+        deviceId: '', // 设备id
+        collectCycle: '', // 报警阈值
+        upPeriod: '', // 安装高度
+        retryTimes: '3', // 重传次数
+        ip: '', // ip地址
+        port: '', // 端口号
+        attemptsMax: '3' // 最大尝试次数
+      },
+      textMap: {
+        update: '编辑',
+        create: '新增'
+      }, // 表头显示标题
+      devices: [], // 设备下拉选择列表
+      loading: false, // 加载动画是否显示
+      rules: {
+        collectCycle: [{ required: true, trigger: ['blur', 'change'], validator: validateCollectCycle }],
+        upPeriod: [{ 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
+      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
+          collectCycle: row.collectCycle, // 报警阈值
+          upPeriod: row.upPeriod, // 安装高度
+          retryTimes: row.retryTimes, // 重传次数
+          ip: row.ip, // ip地址
+          port: row.port, // 端口号
+          attemptsMax: row.attemptsMax // 最大尝试次数
+        }
+      }
+    },
+    // 重置表单
+    resetForm() {
+      this.deviceForm = {
+        deviceName: '',
+        deviceTypeName: '',
+        deptName: '',
+        devcode: ''
+      }
+      this.configForm = {
+        deviceId: '', // 设备id
+        collectCycle: '', // 报警阈值
+        upPeriod: '', // 安装高度
+        retryTimes: '3', // 重传次数
+        ip: '', // ip地址
+        port: '', // 端口号
+        attemptsMax: '3' // 最大尝试次数
+      }
+    },
+    // 保存数据
+    saveData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          editLiquidConfig(this.configForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('配置成功')
+              this.$emit('watchChild')
+              this.dialogFormVisible = false
+            }
+          })
+        }
+      })
+    },
+    fetchDevice() {
+      this.loading = true
+      getDeviceSimpleList('4', '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/liquidConfig/editHarmfulConfig.vue b/src/views/deviceConfig/liquidConfig/editHarmfulConfig.vue
new file mode 100644
index 0000000..0eff7a8
--- /dev/null
+++ b/src/views/deviceConfig/liquidConfig/editHarmfulConfig.vue
@@ -0,0 +1,262 @@
+<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="100px">
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item v-if="dialogStatus=='create'" label="设备编号" prop="deviceId">
+            <el-select
+              v-model="configForm.deviceId"
+              :loading="loading"
+              :disabled="dialogStatus=='update'?true:false"
+              filterable
+              placeholder="请输入设备编号"
+            >
+              <el-option
+                v-for="item in devices"
+                :key="item.id"
+                :label="item.devcode"
+                :value="item.id"/>
+            </el-select>
+          </el-form-item>
+          <el-form-item v-if="dialogStatus=='update'" label="设备编号">
+            <el-input v-model="deviceForm.devcode" type="text" placeholder="未知" disabled/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item v-if="deviceForm.deviceName!=''" label="设备名称">
+            <el-input v-model="deviceForm.deviceName" type="text" placeholder="未知" disabled/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item v-if="deviceForm.deviceTypeName!=''" label="设备类型" prop="deviceType">
+            <el-input v-model="deviceForm.deviceTypeName" type="text" placeholder="未知" disabled/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item v-if="deviceForm.deptName!=''" label="权属单位" prop="deptName">
+            <el-input v-model="deviceForm.deptName" type="text" placeholder="未知" disabled/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="重传次数" prop="retryTimes">
+            <el-input-number :min="1" :max="10" v-model="configForm.retryTimes" type="text" placeholder="必填"/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="采集间隔" prop="collectCycle">
+            <el-input v-model.trim="configForm.collectCycle" type="text" placeholder="必填"/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="最大尝试次数">
+            <el-input-number :min="1" :max="10" v-model="configForm.attemptsMax" type="text" placeholder="必填"/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row v-if="showIp" :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="ip地址" prop="ip">
+            <el-input v-model.trim="configForm.ip" type="text" placeholder="非集中器设备必填"/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="端口号" prop="port">
+            <el-input v-model.trim="configForm.port" type="text" placeholder="非集中器设备必填"/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <div slot="footer" class="dialog-footer">
+      <el-button type="primary" @click="saveData">保存</el-button>
+      <el-button @click="cancel">取消</el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { editLiquidConfig, getDeviceSimpleList } from '@/api/liquidconfig'
+import { validateFloatPlus } from '@/utils/validate'
+export default {
+  name: 'EditHarmfulConfig',
+  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, 0, 100) === true) {
+          callback()
+        } else {
+          callback(new Error('请填写0到100数值'))
+        }
+      } else {
+        callback(new Error('采集时间不能为空'))
+      }
+    }
+    return {
+      dialogFormVisible: false, // 对话框是否显示
+      dialogStatus: '', // 对话框类型：create,update
+      deviceForm: {
+        deviceName: '',
+        deviceTypeName: '',
+        deptName: '',
+        devcode: '',
+        deviceType: ''
+      }, // 设备基本信息
+      configForm: {
+        id: '', // config id
+        deviceId: '', // 设备id
+        collectCycle: '', // 报警阈值
+        upPeriod: '', // 安装高度
+        retryTimes: '3', // 重传次数
+        ip: '', // ip地址
+        port: '', // 端口号
+        attemptsMax: '3' // 最大尝试次数
+      },
+      textMap: {
+        update: '编辑',
+        create: '新增'
+      }, // 表头显示标题
+      devices: [], // 设备下拉选择列表
+      loading: false, // 加载动画是否显示
+      rules: {
+        collectCycle: [{ required: true, trigger: ['blur', 'change'], validator: validateCollectCycle }],
+        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
+      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
+          collectCycle: row.collectCycle, // 报警阈值
+          upPeriod: row.upPeriod, // 安装高度
+          retryTimes: row.retryTimes, // 重传次数
+          ip: row.ip, // ip地址
+          port: row.port, // 端口号
+          attemptsMax: row.attemptsMax // 最大尝试次数
+        }
+      }
+    },
+    // 重置表单
+    resetForm() {
+      this.deviceForm = {
+        deviceName: '',
+        deviceTypeName: '',
+        deptName: '',
+        devcode: ''
+      }
+      this.configForm = {
+        deviceId: '', // 设备id
+        collectCycle: '', // 报警阈值
+        upPeriod: '', // 安装高度
+        retryTimes: '3', // 重传次数
+        ip: '', // ip地址
+        port: '', // 端口号
+        attemptsMax: '3' // 最大尝试次数
+      }
+    },
+    // 保存数据
+    saveData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          editLiquidConfig(this.configForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('配置成功')
+              this.$emit('watchChild')
+              this.dialogFormVisible = false
+            }
+          })
+        }
+      })
+    },
+    fetchDevice() {
+      this.loading = true
+      getDeviceSimpleList('4', '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/liquidConfig/editTempConfig.vue b/src/views/deviceConfig/liquidConfig/editTempConfig.vue
new file mode 100644
index 0000000..76107d9
--- /dev/null
+++ b/src/views/deviceConfig/liquidConfig/editTempConfig.vue
@@ -0,0 +1,284 @@
+<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="100px">
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item v-if="dialogStatus=='create'" label="设备编号" prop="deviceId">
+            <el-select
+              v-model="configForm.deviceId"
+              :loading="loading"
+              :disabled="dialogStatus=='update'?true:false"
+              filterable
+              placeholder="请输入设备编号"
+            >
+              <el-option
+                v-for="item in devices"
+                :key="item.id"
+                :label="item.devcode"
+                :value="item.id"/>
+            </el-select>
+          </el-form-item>
+          <el-form-item v-if="dialogStatus=='update'" label="设备编号">
+            <el-input v-model="deviceForm.devcode" type="text" placeholder="未知" disabled/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item v-if="deviceForm.deviceName!=''" label="设备名称">
+            <el-input v-model="deviceForm.deviceName" type="text" placeholder="未知" disabled/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item v-if="deviceForm.deviceTypeName!=''" label="设备类型" prop="deviceType">
+            <el-input v-model="deviceForm.deviceTypeName" type="text" placeholder="未知" disabled/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item v-if="deviceForm.deptName!=''" label="权属单位" prop="deptName">
+            <el-input v-model="deviceForm.deptName" type="text" placeholder="未知" disabled/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="重传次数" prop="retryTimes">
+            <el-input-number :min="1" :max="10" v-model="configForm.retryTimes" type="text" placeholder="必填"/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="采集间隔" prop="collectCycle">
+            <el-input v-model.trim="configForm.collectCycle" type="text" placeholder="必填"/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="采集时间" prop="collectTime">
+            <!--<el-input v-model.trim="configForm.collectTime" type="text" placeholder="必填"/>-->
+            <el-time-picker
+              v-model="configForm.collectTime"
+              format="HH:mm"
+              placeholder="必选"/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="最大尝试次数">
+            <el-input-number :min="1" :max="10" v-model="configForm.attemptsMax" type="text" placeholder="必填"/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="采集次数" prop="collectTimes">
+            <el-input-number :min="1" :max="100" v-model="configForm.collectTimes" 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 type="primary" @click="saveData">保存</el-button>
+      <el-button @click="cancel">取消</el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { editLiquidConfig, getDeviceSimpleList } from '@/api/liquidconfig'
+import { validateFloatPlus } from '@/utils/validate'
+export default {
+  name: 'EditTempConfig',
+  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, 0, 100) === true) {
+          callback()
+        } else {
+          callback(new Error('请填写0到100数值'))
+        }
+      } else {
+        callback(new Error('采集间隔不能为空'))
+      }
+    }
+    return {
+      dialogFormVisible: false, // 对话框是否显示
+      dialogStatus: '', // 对话框类型：create,update
+      deviceForm: {
+        deviceName: '',
+        deviceTypeName: '',
+        deptName: '',
+        devcode: '',
+        deviceType: ''
+      }, // 设备基本信息
+      configForm: {
+        id: '', // config id
+        deviceId: '', // 设备id
+        collectCycle: '', // 采集间隔
+        collectTime: '', // 采集时间
+        collectTimes: '', // 采集次数
+        retryTimes: '3', // 重传次数
+        ip: '', // ip地址
+        port: '', // 端口号
+        attemptsMax: '3' // 最大尝试次数
+      },
+      textMap: {
+        update: '编辑',
+        create: '新增'
+      }, // 表头显示标题
+      devices: [], // 设备下拉选择列表
+      loading: false, // 加载动画是否显示
+      rules: {
+        collectCycle: [{ required: true, trigger: ['blur', 'change'], validator: validateCollectCycle }],
+        collectTime: [{ required: true, message: '采集时间不能为空', trigger: ['blur', 'change'] }],
+        deviceId: [{ required: true, message: '设备编号不能为空', trigger: ['blur', 'change'] }],
+        collectTimes: [{ 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
+      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
+          collectCycle: row.collectCycle, // 报警阈值
+          collectTime: row.collectTime, // 安装高度
+          retryTimes: row.retryTimes, // 重传次数
+          ip: row.ip, // ip地址
+          port: row.port, // 端口号
+          attemptsMax: row.attemptsMax // 最大尝试次数
+        }
+      }
+    },
+    // 重置表单
+    resetForm() {
+      this.deviceForm = {
+        deviceName: '',
+        deviceTypeName: '',
+        deptName: '',
+        devcode: ''
+      }
+      this.configForm = {
+        deviceId: '', // 设备id
+        collectCycle: '', // 报警阈值
+        collectTime: '', // 安装高度
+        retryTimes: '3', // 重传次数
+        ip: '', // ip地址
+        port: '', // 端口号
+        attemptsMax: '3' // 最大尝试次数
+      }
+    },
+    // 保存数据
+    saveData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          editLiquidConfig(this.configForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('配置成功')
+              this.$emit('watchChild')
+              this.dialogFormVisible = false
+            }
+          })
+        }
+      })
+    },
+    fetchDevice() {
+      this.loading = true
+      getDeviceSimpleList('4', '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%;
+  }
+  .el-date-editor{
+    width:100%
+  }
+</style>
diff --git a/src/views/deviceConfig/liquidConfig/listDigConfig.vue b/src/views/deviceConfig/liquidConfig/listDigConfig.vue
new file mode 100644
index 0000000..eed641b
--- /dev/null
+++ b/src/views/deviceConfig/liquidConfig/listDigConfig.vue
@@ -0,0 +1,347 @@
+<template>
+  <div class="app-container">
+    <!--筛选条件-->
+    <div class="search-div">
+      <el-form ref="selectForm" :inline="true" :model="listQuery" class="form-container">
+        <el-row>
+          <el-form-item class="selectForm-container-item" prop="keywords">
+            <el-input v-model.trim="listQuery.keywords" placeholder="设备编号" clearable/>
+          </el-form-item>
+          <el-form-item class="selectForm-container-item">
+            <dept-select v-model="listQuery.deptid" :need-top="deptShowTop" dept-type="03" placeholder="选择权属单位"/>
+          </el-form-item>
+          <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
+        </el-row>
+      </el-form>
+    </div>
+    <!--查询结果Table显示-->
+    <div>
+      <el-row class="table-title">
+        <el-col :span="6"><div class="title-header"><i class="el-icon-menu"/>数据列表</div></el-col>
+        <el-col :span="12" :offset="6" class="edit_btns">
+          <el-button v-if="hasPerm('/liquidConfig/batchExport')" class="edit_btn" size="small" @click="batchExport">导出记录</el-button>
+          <download-template :filename="filename"/>
+          <el-upload
+            v-if="hasPerm('/liquidConfig/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('/liquidConfig/batchImport')" slot="trigger" size="small">批量导入</el-button>
+          </el-upload>
+          <el-button v-if="hasPerm('/liquidConfig/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-dig-config v-show="editShow" ref="editconfig" @watchChild="fetchData"/>
+  </div>
+</template>
+
+<script>
+import { judgeTree, toTreeList } from '@/utils/structure'
+import selectTree from '@/components/SelectTree/singleSelect'
+import { getLiquidConfigList, batchImportLiquidConfig, batchExportLiquidConfig } from '@/api/liquidconfig'
+import { getDeptTreeList } from '@/api/dept'
+import EditGasConfig from './editGasConfig'
+import DownloadTemplate from '@/components/DownloadTemplate/index'
+import DeptSelect from '@/components/DeptSelect/index'
+import EditDigConfig from './editDigConfig'
+
+export default {
+  name: 'ListDigConfig',
+  components: { EditDigConfig, DeptSelect, DownloadTemplate, EditGasConfig, selectTree },
+  data() {
+    return {
+      listQuery: {
+        keywords: '',
+        offset: 1,
+        limit: 20,
+        sort: '',
+        order: ''
+      }, // 筛选条件
+      columns: [
+        {
+          text: '设备编号',
+          value: 'devcode',
+          align: 'center'
+        },
+        {
+          text: '重传次数',
+          value: 'retryTimes',
+          align: 'center'
+        },
+        {
+          text: '采集开始时间',
+          value: 'collectTime',
+          align: 'center'
+        },
+        {
+          text: '采集间隔',
+          value: 'collectCycle',
+          align: 'center'
+        },
+        {
+          text: '采集次数',
+          value: 'collectTimes',
+          align: 'center'
+        },
+        {
+          text: '休眠开始时间',
+          value: 'sleepTime',
+          align: 'center'
+        },
+        {
+          text: '报警阈值',
+          value: 'threshold',
+          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: 'config_template.xlsx',
+      deptShowTop: false,
+      fileList: []
+    }
+  },
+  created() {
+    this.fetchDeptTree()// 获取部门树
+    this.fetchData()// 获取数据
+  },
+  methods: {
+    // 打开详情对话框
+    checkSelection() {
+      if (this.multipleSelection.length === 0) {
+        return false
+      } else {
+        return true
+      }
+    },
+    // 新增设备
+    add() {
+      this.dialogFormVisible = true
+      this.editShow = true
+      this.$refs.editconfig.initDialog('create', this.dialogFormVisible)
+    },
+    // 编辑燃气配置信息
+    edit(row) {
+      this.dialogFormVisible = true
+      this.editShow = true
+      this.$refs.editconfig.initDialog('update', this.dialogFormVisible, row)
+    },
+    // 批量导入燃气配置
+    uploadFile(param) {
+      // 判断文件大小是否符合要求
+      const _file = param.file
+      const isLt5M = _file.size / 1024 / 1024 < 5
+      if (!isLt5M) {
+        this.$message.error('请上传5M以下的excel文件')
+        return false
+      }
+      // 全屏加载动画
+      const loading = this.$loading({
+        lock: true,
+        text: '导入中,请稍后...',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
+      })
+      // 发起导入请求
+      batchImportLiquidConfig(_file).then(res => {
+        loading.close() // 关闭加载动画
+        if (res.code === 200) {
+          this.$message.success('导入成功')
+          this.fetchData(false)
+        } else {
+          this.$message.error(res.message)
+        }
+      }).catch(error => {
+        loading.close() // 关闭加载动画
+        this.$message.error(error.message)
+      })
+      this.fileList = []
+    },
+    // 批量导出
+    batchExport() {
+      console.log('批量导出燃气配置')
+      // 全屏加载动画
+      const loading = this.$loading({
+        lock: true,
+        text: '数据处理中,请稍后...',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
+      })
+      batchExportLiquidConfig(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
+      }
+      getLiquidConfigList(this.listQuery).then(response => {
+        this.list = response.data.rows
+        this.total = parseInt(response.data.total)
+        this.listLoading = false
+      })
+    },
+    // 加载组织机构树形下拉菜单
+    fetchDeptTree: function() {
+      getDeptTreeList().then(response => {
+        if (response.data.list) {
+          if (response.data.list.length > 1) {
+            console.log(this.$store.getters.deptId)
+            if (judgeTree(response.data.list)) {
+              this.deptTreeList = toTreeList(response.data.list)
+              this.showDeptTree = 1
+            } else {
+              this.deptTreeList = response.data.list
+              this.showDeptTree = 2
+            }
+            console.log(this.deptTreeList)
+          } else {
+            this.showDeptTree = 0
+          }
+        }
+      })
+    },
+    indexMethod(index) {
+      return this.listQuery.limit * (this.listQuery.offset - 1) + index + 1
+    },
+    // 改变页容量
+    handleSizeChange(val) {
+      this.listQuery.limit = val
+      this.fetchData()
+    },
+    // 改变当前页
+    handleCurrentChange(val) {
+      this.listQuery.offset = val
+      this.fetchData()
+    },
+    // 多选触发方法
+    handleSelectionChange(val) {
+      this.multipleSelection = val
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .app-container{
+    padding: 10px;
+  }
+  $tableTitleHeight:46px;
+  .table{
+    margin-bottom: 20px;
+  }
+  .pagination-container{
+    margin-bottom: 50px;
+  }
+  .table-title{
+    background-color:rgba(243, 243, 243, 1);
+    height: $tableTitleHeight;
+    .title-header{
+      line-height:$tableTitleHeight;
+      color: #606266;
+      font-size: 15px;
+      i{
+        margin-left: 5px;
+        margin-right: 5px;
+      }
+    }
+  }
+  .edit_btns{
+    .edit_btn{
+      float:right;
+      margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2
+    }
+  }
+</style>

diff --git a/src/api/digconfig.js b/src/api/digconfig.js
new file mode 100644
index 0000000..d885e08
--- /dev/null
+++ b/src/api/digconfig.js
@@ -0,0 +1,42 @@
+/**
+ * 开挖配置接口
+ */
+import request from '@/utils/request'
+// 开挖配置查询
+export function getDigConfigList(params) {
+  return request({
+    url: 'digConfig/list',
+    method: 'get',
+    params
+  })
+}
+
+// 修改开挖配置
+export function editDigConfig(params) {
+  return request({
+    url: 'digConfig/config',
+    method: 'post',
+    params
+  })
+}
+
+// 批量导入
+export function batchImportDigConfig(fileobj) {
+  const param = new FormData()
+  param.append('file', fileobj)
+  return request({
+    url: 'digConfig/batchImport',
+    method: 'post',
+    headers: { 'Content-Type': 'multipart/form-data' },
+    data: param
+  })
+}
+// 批量导出
+export function batchExportDigConfig(params) {
+  return request({
+    url: 'digConfig/batchExport',
+    method: 'get',
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
diff --git a/src/api/gasconfig.js b/src/api/gasconfig.js
new file mode 100644
index 0000000..93f1d09
--- /dev/null
+++ b/src/api/gasconfig.js
@@ -0,0 +1,42 @@
+/**
+ * 燃气配置接口
+ */
+import request from '@/utils/request'
+// 燃气配置查询
+export function getGasConfigList(params) {
+  return request({
+    url: 'gasConfig/list',
+    method: 'get',
+    params
+  })
+}
+
+// 修改燃气配置
+export function editGasConfig(params) {
+  return request({
+    url: 'gasConfig/config',
+    method: 'post',
+    params
+  })
+}
+
+// 批量导入
+export function batchImportGasConfig(fileobj) {
+  const param = new FormData()
+  param.append('file', fileobj)
+  return request({
+    url: 'gasConfig/batchImport',
+    method: 'post',
+    headers: { 'Content-Type': 'multipart/form-data' },
+    data: param
+  })
+}
+// 批量导出
+export function batchExportGasConfig(params) {
+  return request({
+    url: 'gasConfig/batchExport',
+    method: 'get',
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
diff --git a/src/api/harmfulconfig.js b/src/api/harmfulconfig.js
new file mode 100644
index 0000000..29b6b6e
--- /dev/null
+++ b/src/api/harmfulconfig.js
@@ -0,0 +1,42 @@
+/**
+ * 有害气体配置接口
+ */
+import request from '@/utils/request'
+// 有害气体配置查询
+export function getHarmfulConfigList(params) {
+  return request({
+    url: 'harmfulConfig/list',
+    method: 'get',
+    params
+  })
+}
+
+// 修改有害气体配置
+export function editHarmfulConfig(params) {
+  return request({
+    url: 'harmfulConfig/config',
+    method: 'post',
+    params
+  })
+}
+
+// 批量导入
+export function batchImportHarmfulConfig(fileobj) {
+  const param = new FormData()
+  param.append('file', fileobj)
+  return request({
+    url: 'harmfulConfig/batchImport',
+    method: 'post',
+    headers: { 'Content-Type': 'multipart/form-data' },
+    data: param
+  })
+}
+// 批量导出
+export function batchExportHarmfulConfig(params) {
+  return request({
+    url: 'harmfulConfig/batchExport',
+    method: 'get',
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
diff --git a/src/api/tempconfig.js b/src/api/tempconfig.js
new file mode 100644
index 0000000..aa4ce86
--- /dev/null
+++ b/src/api/tempconfig.js
@@ -0,0 +1,42 @@
+/**
+ * 温湿度配置接口
+ */
+import request from '@/utils/request'
+// 温湿度配置查询
+export function getTempConfigList(params) {
+  return request({
+    url: 'tempConfig/list',
+    method: 'get',
+    params
+  })
+}
+
+// 修改温湿度配置
+export function editTempConfig(params) {
+  return request({
+    url: 'tempConfig/config',
+    method: 'post',
+    params
+  })
+}
+
+// 批量导入
+export function batchImportTempConfig(fileobj) {
+  const param = new FormData()
+  param.append('file', fileobj)
+  return request({
+    url: 'tempConfig/batchImport',
+    method: 'post',
+    headers: { 'Content-Type': 'multipart/form-data' },
+    data: param
+  })
+}
+// 批量导出
+export function batchExportTempConfig(params) {
+  return request({
+    url: 'tempConfig/batchExport',
+    method: 'get',
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
diff --git a/src/views/deviceConfig/deviceConfig.vue b/src/views/deviceConfig/deviceConfig.vue
index 289cdbc..678c3a4 100644
--- a/src/views/deviceConfig/deviceConfig.vue
+++ b/src/views/deviceConfig/deviceConfig.vue
@@ -4,16 +4,31 @@
       <el-tab-pane v-if="hasPerm('/liquidConfig/list')" label="液位监测仪" name="liquid">
         <list-liquid-config/>
       </el-tab-pane>
-      <el-tab-pane v-if="hasPerm('/gasConfig/list')" label="燃气" name="gas">燃气配置</el-tab-pane>
+      <el-tab-pane label="燃气智能监测终端" name="gas">
+        <list-gas-config/>
+      </el-tab-pane>
+      <el-tab-pane label="有害气体监测仪" name="harmful">
+        <list-harmful-config/>
+      </el-tab-pane>
+      <el-tab-pane label="温湿度监测仪" name="temphumidity">
+        <list-temp-config/>
+      </el-tab-pane>
+      <el-tab-pane label="开挖监测仪" name="dig">
+        <list-dig-config/>
+      </el-tab-pane>
     </el-tabs>
   </div>
 </template>
 
 <script>
 import ListLiquidConfig from './liquidConfig/listLiquidConfig'
+import ListGasConfig from './liquidConfig/listGasConfig'
+import ListHarmfulConfig from './liquidConfig/listHarmfulConfig'
+import ListTempConfig from './liquidConfig/listTempConfig'
+import ListDigConfig from './liquidConfig/listDigConfig'
 export default {
   name: 'DeviceConfig',
-  components: { ListLiquidConfig },
+  components: { ListDigConfig, ListTempConfig, ListHarmfulConfig, ListGasConfig, ListLiquidConfig },
   data() {
     return {
       activeName: 'liquid'
diff --git a/src/views/deviceConfig/liquidConfig/editDigConfig.vue b/src/views/deviceConfig/liquidConfig/editDigConfig.vue
new file mode 100644
index 0000000..13195db
--- /dev/null
+++ b/src/views/deviceConfig/liquidConfig/editDigConfig.vue
@@ -0,0 +1,304 @@
+<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="100px">
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item v-if="dialogStatus=='create'" label="设备编号" prop="deviceId">
+            <el-select
+              v-model="configForm.deviceId"
+              :loading="loading"
+              :disabled="dialogStatus=='update'?true:false"
+              filterable
+              placeholder="请输入设备编号"
+            >
+              <el-option
+                v-for="item in devices"
+                :key="item.id"
+                :label="item.devcode"
+                :value="item.id"/>
+            </el-select>
+          </el-form-item>
+          <el-form-item v-if="dialogStatus=='update'" label="设备编号">
+            <el-input v-model="deviceForm.devcode" type="text" placeholder="未知" disabled/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item v-if="deviceForm.deviceName!=''" label="设备名称">
+            <el-input v-model="deviceForm.deviceName" type="text" placeholder="未知" disabled/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item v-if="deviceForm.deviceTypeName!=''" label="设备类型" prop="deviceType">
+            <el-input v-model="deviceForm.deviceTypeName" type="text" placeholder="未知" disabled/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item v-if="deviceForm.deptName!=''" label="权属单位" prop="deptName">
+            <el-input v-model="deviceForm.deptName" type="text" placeholder="未知" disabled/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="重传次数" prop="retryTimes">
+            <el-input-number :min="1" :max="10" v-model="configForm.retryTimes" type="text" placeholder="必填"/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="采集间隔" prop="collectCycle">
+            <el-input v-model.trim="configForm.collectCycle" type="text" placeholder="必填"/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="采集时间" prop="collectTime">
+            <!--<el-input v-model.trim="configForm.collectTime" type="text" placeholder="必填"/>-->
+            <el-time-picker
+              v-model="configForm.collectTime"
+              format="HH:mm"
+              placeholder="必选"/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="睡眠时间" prop="sleepTime">
+            <el-time-picker
+              v-model="configForm.sleepTime"
+              format="HH:mm"
+              placeholder="必选"/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="报警阈值" prop="threshold">
+            <el-input v-model.trim="configForm.threshold" type="text" placeholder="必填"/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="最大尝试次数">
+            <el-input-number :min="1" :max="10" v-model="configForm.attemptsMax" type="text" placeholder="必填"/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row v-if="showIp" :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="ip地址" prop="ip">
+            <el-input v-model.trim="configForm.ip" type="text" placeholder="非集中器设备必填"/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="端口号" prop="port">
+            <el-input v-model.trim="configForm.port" type="text" placeholder="非集中器设备必填"/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <div slot="footer" class="dialog-footer">
+      <el-button type="primary" @click="saveData">保存</el-button>
+      <el-button @click="cancel">取消</el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { editLiquidConfig, getDeviceSimpleList } from '@/api/liquidconfig'
+import { validateFloatPlus } from '@/utils/validate'
+export default {
+  name: 'EditDigConfig',
+  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, 0, 100) === true) {
+          callback()
+        } else {
+          callback(new Error('请填写0到100数值'))
+        }
+      } else {
+        callback(new Error('采集间隔不能为空'))
+      }
+    }
+    const validateThreshold = (rule, value, callback) => {
+      if (value !== '') {
+        if (validateFloatPlus(value, 0, 100) === true) {
+          callback()
+        } else {
+          callback(new Error('请填写0到100数值'))
+        }
+      } else {
+        callback(new Error('报警阈值不能为空'))
+      }
+    }
+    return {
+      dialogFormVisible: false, // 对话框是否显示
+      dialogStatus: '', // 对话框类型：create,update
+      deviceForm: {
+        deviceName: '',
+        deviceTypeName: '',
+        deptName: '',
+        devcode: '',
+        deviceType: ''
+      }, // 设备基本信息
+      configForm: {
+        id: '', // config id
+        deviceId: '', // 设备id
+        collectCycle: '', // 采集间隔
+        collectTime: '', // 采集时间
+        collectTimes: '', // 采集次数
+        retryTimes: '3', // 重传次数
+        ip: '', // ip地址
+        port: '', // 端口号
+        attemptsMax: '3' // 最大尝试次数
+      },
+      textMap: {
+        update: '编辑',
+        create: '新增'
+      }, // 表头显示标题
+      devices: [], // 设备下拉选择列表
+      loading: false, // 加载动画是否显示
+      rules: {
+        collectCycle: [{ required: true, trigger: ['blur', 'change'], validator: validateCollectCycle }],
+        threshold: [{ required: true, trigger: ['blur', 'change'], validator: validateThreshold }],
+        collectTime: [{ required: true, message: '采集时间不能为空', trigger: ['blur', 'change'] }],
+        deviceId: [{ required: true, message: '设备编号不能为空', trigger: ['blur', 'change'] }],
+        collectTimes: [{ 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
+      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
+          collectCycle: row.collectCycle, // 报警阈值
+          collectTime: row.collectTime, // 安装高度
+          retryTimes: row.retryTimes, // 重传次数
+          ip: row.ip, // ip地址
+          port: row.port, // 端口号
+          attemptsMax: row.attemptsMax // 最大尝试次数
+        }
+      }
+    },
+    // 重置表单
+    resetForm() {
+      this.deviceForm = {
+        deviceName: '',
+        deviceTypeName: '',
+        deptName: '',
+        devcode: ''
+      }
+      this.configForm = {
+        deviceId: '', // 设备id
+        collectCycle: '', // 报警阈值
+        collectTime: '', // 安装高度
+        retryTimes: '3', // 重传次数
+        ip: '', // ip地址
+        port: '', // 端口号
+        attemptsMax: '3' // 最大尝试次数
+      }
+    },
+    // 保存数据
+    saveData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          editLiquidConfig(this.configForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('配置成功')
+              this.$emit('watchChild')
+              this.dialogFormVisible = false
+            }
+          })
+        }
+      })
+    },
+    fetchDevice() {
+      this.loading = true
+      getDeviceSimpleList('4', '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%;
+  }
+  .el-date-editor{
+    width:100%
+  }
+</style>
diff --git a/src/views/deviceConfig/liquidConfig/editGasConfig.vue b/src/views/deviceConfig/liquidConfig/editGasConfig.vue
new file mode 100644
index 0000000..bc61d77
--- /dev/null
+++ b/src/views/deviceConfig/liquidConfig/editGasConfig.vue
@@ -0,0 +1,279 @@
+<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="100px">
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item v-if="dialogStatus=='create'" label="设备编号" prop="deviceId">
+            <el-select
+              v-model="configForm.deviceId"
+              :loading="loading"
+              :disabled="dialogStatus=='update'?true:false"
+              filterable
+              placeholder="请输入设备编号"
+            >
+              <el-option
+                v-for="item in devices"
+                :key="item.id"
+                :label="item.devcode"
+                :value="item.id"/>
+            </el-select>
+          </el-form-item>
+          <el-form-item v-if="dialogStatus=='update'" label="设备编号">
+            <el-input v-model="deviceForm.devcode" type="text" placeholder="未知" disabled/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item v-if="deviceForm.deviceName!=''" label="设备名称">
+            <el-input v-model="deviceForm.deviceName" type="text" placeholder="未知" disabled/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item v-if="deviceForm.deviceTypeName!=''" label="设备类型" prop="deviceType">
+            <el-input v-model="deviceForm.deviceTypeName" type="text" placeholder="未知" disabled/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item v-if="deviceForm.deptName!=''" label="权属单位" prop="deptName">
+            <el-input v-model="deviceForm.deptName" type="text" placeholder="未知" disabled/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="重传次数" prop="retryTimes">
+            <el-input-number :min="1" :max="10" v-model="configForm.retryTimes" type="text" placeholder="必填"/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="采集间隔" prop="collectCycle">
+            <el-input v-model.trim="configForm.collectCycle" type="text" placeholder="必填"/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="上传周期" prop="upPeriod">
+            <el-input v-model.trim="configForm.upPeriod" type="text" placeholder="必填"/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="最大尝试次数">
+            <el-input-number :min="1" :max="10" v-model="configForm.attemptsMax" type="text" placeholder="必填"/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row v-if="showIp" :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="ip地址" prop="ip">
+            <el-input v-model.trim="configForm.ip" type="text" placeholder="非集中器设备必填"/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="端口号" prop="port">
+            <el-input v-model.trim="configForm.port" type="text" placeholder="非集中器设备必填"/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <div slot="footer" class="dialog-footer">
+      <el-button type="primary" @click="saveData">保存</el-button>
+      <el-button @click="cancel">取消</el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { editLiquidConfig, getDeviceSimpleList } from '@/api/liquidconfig'
+import { validateFloatPlus } from '@/utils/validate'
+export default {
+  name: 'EditGasConfig',
+  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, 0, 100) === true) {
+          callback()
+        } else {
+          callback(new Error('请填写0到100数值'))
+        }
+      } else {
+        callback(new Error('采集时间不能为空'))
+      }
+    }
+    const validateUpPeriod = (rule, value, callback) => {
+      if (value !== '') {
+        if (validateFloatPlus(value, 0, 100) === true) {
+          callback()
+        } else {
+          callback(new Error('请填写0到100数值'))
+        }
+      } else {
+        callback(new Error('上传周期不能为空'))
+      }
+    }
+    return {
+      dialogFormVisible: false, // 对话框是否显示
+      dialogStatus: '', // 对话框类型：create,update
+      deviceForm: {
+        deviceName: '',
+        deviceTypeName: '',
+        deptName: '',
+        devcode: '',
+        deviceType: ''
+      }, // 设备基本信息
+      configForm: {
+        id: '', // config id
+        deviceId: '', // 设备id
+        collectCycle: '', // 报警阈值
+        upPeriod: '', // 安装高度
+        retryTimes: '3', // 重传次数
+        ip: '', // ip地址
+        port: '', // 端口号
+        attemptsMax: '3' // 最大尝试次数
+      },
+      textMap: {
+        update: '编辑',
+        create: '新增'
+      }, // 表头显示标题
+      devices: [], // 设备下拉选择列表
+      loading: false, // 加载动画是否显示
+      rules: {
+        collectCycle: [{ required: true, trigger: ['blur', 'change'], validator: validateCollectCycle }],
+        upPeriod: [{ 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
+      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
+          collectCycle: row.collectCycle, // 报警阈值
+          upPeriod: row.upPeriod, // 安装高度
+          retryTimes: row.retryTimes, // 重传次数
+          ip: row.ip, // ip地址
+          port: row.port, // 端口号
+          attemptsMax: row.attemptsMax // 最大尝试次数
+        }
+      }
+    },
+    // 重置表单
+    resetForm() {
+      this.deviceForm = {
+        deviceName: '',
+        deviceTypeName: '',
+        deptName: '',
+        devcode: ''
+      }
+      this.configForm = {
+        deviceId: '', // 设备id
+        collectCycle: '', // 报警阈值
+        upPeriod: '', // 安装高度
+        retryTimes: '3', // 重传次数
+        ip: '', // ip地址
+        port: '', // 端口号
+        attemptsMax: '3' // 最大尝试次数
+      }
+    },
+    // 保存数据
+    saveData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          editLiquidConfig(this.configForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('配置成功')
+              this.$emit('watchChild')
+              this.dialogFormVisible = false
+            }
+          })
+        }
+      })
+    },
+    fetchDevice() {
+      this.loading = true
+      getDeviceSimpleList('4', '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/liquidConfig/editHarmfulConfig.vue b/src/views/deviceConfig/liquidConfig/editHarmfulConfig.vue
new file mode 100644
index 0000000..0eff7a8
--- /dev/null
+++ b/src/views/deviceConfig/liquidConfig/editHarmfulConfig.vue
@@ -0,0 +1,262 @@
+<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="100px">
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item v-if="dialogStatus=='create'" label="设备编号" prop="deviceId">
+            <el-select
+              v-model="configForm.deviceId"
+              :loading="loading"
+              :disabled="dialogStatus=='update'?true:false"
+              filterable
+              placeholder="请输入设备编号"
+            >
+              <el-option
+                v-for="item in devices"
+                :key="item.id"
+                :label="item.devcode"
+                :value="item.id"/>
+            </el-select>
+          </el-form-item>
+          <el-form-item v-if="dialogStatus=='update'" label="设备编号">
+            <el-input v-model="deviceForm.devcode" type="text" placeholder="未知" disabled/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item v-if="deviceForm.deviceName!=''" label="设备名称">
+            <el-input v-model="deviceForm.deviceName" type="text" placeholder="未知" disabled/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item v-if="deviceForm.deviceTypeName!=''" label="设备类型" prop="deviceType">
+            <el-input v-model="deviceForm.deviceTypeName" type="text" placeholder="未知" disabled/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item v-if="deviceForm.deptName!=''" label="权属单位" prop="deptName">
+            <el-input v-model="deviceForm.deptName" type="text" placeholder="未知" disabled/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="重传次数" prop="retryTimes">
+            <el-input-number :min="1" :max="10" v-model="configForm.retryTimes" type="text" placeholder="必填"/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="采集间隔" prop="collectCycle">
+            <el-input v-model.trim="configForm.collectCycle" type="text" placeholder="必填"/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="最大尝试次数">
+            <el-input-number :min="1" :max="10" v-model="configForm.attemptsMax" type="text" placeholder="必填"/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row v-if="showIp" :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="ip地址" prop="ip">
+            <el-input v-model.trim="configForm.ip" type="text" placeholder="非集中器设备必填"/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="端口号" prop="port">
+            <el-input v-model.trim="configForm.port" type="text" placeholder="非集中器设备必填"/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <div slot="footer" class="dialog-footer">
+      <el-button type="primary" @click="saveData">保存</el-button>
+      <el-button @click="cancel">取消</el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { editLiquidConfig, getDeviceSimpleList } from '@/api/liquidconfig'
+import { validateFloatPlus } from '@/utils/validate'
+export default {
+  name: 'EditHarmfulConfig',
+  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, 0, 100) === true) {
+          callback()
+        } else {
+          callback(new Error('请填写0到100数值'))
+        }
+      } else {
+        callback(new Error('采集时间不能为空'))
+      }
+    }
+    return {
+      dialogFormVisible: false, // 对话框是否显示
+      dialogStatus: '', // 对话框类型：create,update
+      deviceForm: {
+        deviceName: '',
+        deviceTypeName: '',
+        deptName: '',
+        devcode: '',
+        deviceType: ''
+      }, // 设备基本信息
+      configForm: {
+        id: '', // config id
+        deviceId: '', // 设备id
+        collectCycle: '', // 报警阈值
+        upPeriod: '', // 安装高度
+        retryTimes: '3', // 重传次数
+        ip: '', // ip地址
+        port: '', // 端口号
+        attemptsMax: '3' // 最大尝试次数
+      },
+      textMap: {
+        update: '编辑',
+        create: '新增'
+      }, // 表头显示标题
+      devices: [], // 设备下拉选择列表
+      loading: false, // 加载动画是否显示
+      rules: {
+        collectCycle: [{ required: true, trigger: ['blur', 'change'], validator: validateCollectCycle }],
+        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
+      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
+          collectCycle: row.collectCycle, // 报警阈值
+          upPeriod: row.upPeriod, // 安装高度
+          retryTimes: row.retryTimes, // 重传次数
+          ip: row.ip, // ip地址
+          port: row.port, // 端口号
+          attemptsMax: row.attemptsMax // 最大尝试次数
+        }
+      }
+    },
+    // 重置表单
+    resetForm() {
+      this.deviceForm = {
+        deviceName: '',
+        deviceTypeName: '',
+        deptName: '',
+        devcode: ''
+      }
+      this.configForm = {
+        deviceId: '', // 设备id
+        collectCycle: '', // 报警阈值
+        upPeriod: '', // 安装高度
+        retryTimes: '3', // 重传次数
+        ip: '', // ip地址
+        port: '', // 端口号
+        attemptsMax: '3' // 最大尝试次数
+      }
+    },
+    // 保存数据
+    saveData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          editLiquidConfig(this.configForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('配置成功')
+              this.$emit('watchChild')
+              this.dialogFormVisible = false
+            }
+          })
+        }
+      })
+    },
+    fetchDevice() {
+      this.loading = true
+      getDeviceSimpleList('4', '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/liquidConfig/editTempConfig.vue b/src/views/deviceConfig/liquidConfig/editTempConfig.vue
new file mode 100644
index 0000000..76107d9
--- /dev/null
+++ b/src/views/deviceConfig/liquidConfig/editTempConfig.vue
@@ -0,0 +1,284 @@
+<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="100px">
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item v-if="dialogStatus=='create'" label="设备编号" prop="deviceId">
+            <el-select
+              v-model="configForm.deviceId"
+              :loading="loading"
+              :disabled="dialogStatus=='update'?true:false"
+              filterable
+              placeholder="请输入设备编号"
+            >
+              <el-option
+                v-for="item in devices"
+                :key="item.id"
+                :label="item.devcode"
+                :value="item.id"/>
+            </el-select>
+          </el-form-item>
+          <el-form-item v-if="dialogStatus=='update'" label="设备编号">
+            <el-input v-model="deviceForm.devcode" type="text" placeholder="未知" disabled/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item v-if="deviceForm.deviceName!=''" label="设备名称">
+            <el-input v-model="deviceForm.deviceName" type="text" placeholder="未知" disabled/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item v-if="deviceForm.deviceTypeName!=''" label="设备类型" prop="deviceType">
+            <el-input v-model="deviceForm.deviceTypeName" type="text" placeholder="未知" disabled/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item v-if="deviceForm.deptName!=''" label="权属单位" prop="deptName">
+            <el-input v-model="deviceForm.deptName" type="text" placeholder="未知" disabled/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="重传次数" prop="retryTimes">
+            <el-input-number :min="1" :max="10" v-model="configForm.retryTimes" type="text" placeholder="必填"/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="采集间隔" prop="collectCycle">
+            <el-input v-model.trim="configForm.collectCycle" type="text" placeholder="必填"/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="采集时间" prop="collectTime">
+            <!--<el-input v-model.trim="configForm.collectTime" type="text" placeholder="必填"/>-->
+            <el-time-picker
+              v-model="configForm.collectTime"
+              format="HH:mm"
+              placeholder="必选"/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="最大尝试次数">
+            <el-input-number :min="1" :max="10" v-model="configForm.attemptsMax" type="text" placeholder="必填"/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="采集次数" prop="collectTimes">
+            <el-input-number :min="1" :max="100" v-model="configForm.collectTimes" 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 type="primary" @click="saveData">保存</el-button>
+      <el-button @click="cancel">取消</el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { editLiquidConfig, getDeviceSimpleList } from '@/api/liquidconfig'
+import { validateFloatPlus } from '@/utils/validate'
+export default {
+  name: 'EditTempConfig',
+  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, 0, 100) === true) {
+          callback()
+        } else {
+          callback(new Error('请填写0到100数值'))
+        }
+      } else {
+        callback(new Error('采集间隔不能为空'))
+      }
+    }
+    return {
+      dialogFormVisible: false, // 对话框是否显示
+      dialogStatus: '', // 对话框类型：create,update
+      deviceForm: {
+        deviceName: '',
+        deviceTypeName: '',
+        deptName: '',
+        devcode: '',
+        deviceType: ''
+      }, // 设备基本信息
+      configForm: {
+        id: '', // config id
+        deviceId: '', // 设备id
+        collectCycle: '', // 采集间隔
+        collectTime: '', // 采集时间
+        collectTimes: '', // 采集次数
+        retryTimes: '3', // 重传次数
+        ip: '', // ip地址
+        port: '', // 端口号
+        attemptsMax: '3' // 最大尝试次数
+      },
+      textMap: {
+        update: '编辑',
+        create: '新增'
+      }, // 表头显示标题
+      devices: [], // 设备下拉选择列表
+      loading: false, // 加载动画是否显示
+      rules: {
+        collectCycle: [{ required: true, trigger: ['blur', 'change'], validator: validateCollectCycle }],
+        collectTime: [{ required: true, message: '采集时间不能为空', trigger: ['blur', 'change'] }],
+        deviceId: [{ required: true, message: '设备编号不能为空', trigger: ['blur', 'change'] }],
+        collectTimes: [{ 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
+      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
+          collectCycle: row.collectCycle, // 报警阈值
+          collectTime: row.collectTime, // 安装高度
+          retryTimes: row.retryTimes, // 重传次数
+          ip: row.ip, // ip地址
+          port: row.port, // 端口号
+          attemptsMax: row.attemptsMax // 最大尝试次数
+        }
+      }
+    },
+    // 重置表单
+    resetForm() {
+      this.deviceForm = {
+        deviceName: '',
+        deviceTypeName: '',
+        deptName: '',
+        devcode: ''
+      }
+      this.configForm = {
+        deviceId: '', // 设备id
+        collectCycle: '', // 报警阈值
+        collectTime: '', // 安装高度
+        retryTimes: '3', // 重传次数
+        ip: '', // ip地址
+        port: '', // 端口号
+        attemptsMax: '3' // 最大尝试次数
+      }
+    },
+    // 保存数据
+    saveData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          editLiquidConfig(this.configForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('配置成功')
+              this.$emit('watchChild')
+              this.dialogFormVisible = false
+            }
+          })
+        }
+      })
+    },
+    fetchDevice() {
+      this.loading = true
+      getDeviceSimpleList('4', '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%;
+  }
+  .el-date-editor{
+    width:100%
+  }
+</style>
diff --git a/src/views/deviceConfig/liquidConfig/listDigConfig.vue b/src/views/deviceConfig/liquidConfig/listDigConfig.vue
new file mode 100644
index 0000000..eed641b
--- /dev/null
+++ b/src/views/deviceConfig/liquidConfig/listDigConfig.vue
@@ -0,0 +1,347 @@
+<template>
+  <div class="app-container">
+    <!--筛选条件-->
+    <div class="search-div">
+      <el-form ref="selectForm" :inline="true" :model="listQuery" class="form-container">
+        <el-row>
+          <el-form-item class="selectForm-container-item" prop="keywords">
+            <el-input v-model.trim="listQuery.keywords" placeholder="设备编号" clearable/>
+          </el-form-item>
+          <el-form-item class="selectForm-container-item">
+            <dept-select v-model="listQuery.deptid" :need-top="deptShowTop" dept-type="03" placeholder="选择权属单位"/>
+          </el-form-item>
+          <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
+        </el-row>
+      </el-form>
+    </div>
+    <!--查询结果Table显示-->
+    <div>
+      <el-row class="table-title">
+        <el-col :span="6"><div class="title-header"><i class="el-icon-menu"/>数据列表</div></el-col>
+        <el-col :span="12" :offset="6" class="edit_btns">
+          <el-button v-if="hasPerm('/liquidConfig/batchExport')" class="edit_btn" size="small" @click="batchExport">导出记录</el-button>
+          <download-template :filename="filename"/>
+          <el-upload
+            v-if="hasPerm('/liquidConfig/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('/liquidConfig/batchImport')" slot="trigger" size="small">批量导入</el-button>
+          </el-upload>
+          <el-button v-if="hasPerm('/liquidConfig/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-dig-config v-show="editShow" ref="editconfig" @watchChild="fetchData"/>
+  </div>
+</template>
+
+<script>
+import { judgeTree, toTreeList } from '@/utils/structure'
+import selectTree from '@/components/SelectTree/singleSelect'
+import { getLiquidConfigList, batchImportLiquidConfig, batchExportLiquidConfig } from '@/api/liquidconfig'
+import { getDeptTreeList } from '@/api/dept'
+import EditGasConfig from './editGasConfig'
+import DownloadTemplate from '@/components/DownloadTemplate/index'
+import DeptSelect from '@/components/DeptSelect/index'
+import EditDigConfig from './editDigConfig'
+
+export default {
+  name: 'ListDigConfig',
+  components: { EditDigConfig, DeptSelect, DownloadTemplate, EditGasConfig, selectTree },
+  data() {
+    return {
+      listQuery: {
+        keywords: '',
+        offset: 1,
+        limit: 20,
+        sort: '',
+        order: ''
+      }, // 筛选条件
+      columns: [
+        {
+          text: '设备编号',
+          value: 'devcode',
+          align: 'center'
+        },
+        {
+          text: '重传次数',
+          value: 'retryTimes',
+          align: 'center'
+        },
+        {
+          text: '采集开始时间',
+          value: 'collectTime',
+          align: 'center'
+        },
+        {
+          text: '采集间隔',
+          value: 'collectCycle',
+          align: 'center'
+        },
+        {
+          text: '采集次数',
+          value: 'collectTimes',
+          align: 'center'
+        },
+        {
+          text: '休眠开始时间',
+          value: 'sleepTime',
+          align: 'center'
+        },
+        {
+          text: '报警阈值',
+          value: 'threshold',
+          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: 'config_template.xlsx',
+      deptShowTop: false,
+      fileList: []
+    }
+  },
+  created() {
+    this.fetchDeptTree()// 获取部门树
+    this.fetchData()// 获取数据
+  },
+  methods: {
+    // 打开详情对话框
+    checkSelection() {
+      if (this.multipleSelection.length === 0) {
+        return false
+      } else {
+        return true
+      }
+    },
+    // 新增设备
+    add() {
+      this.dialogFormVisible = true
+      this.editShow = true
+      this.$refs.editconfig.initDialog('create', this.dialogFormVisible)
+    },
+    // 编辑燃气配置信息
+    edit(row) {
+      this.dialogFormVisible = true
+      this.editShow = true
+      this.$refs.editconfig.initDialog('update', this.dialogFormVisible, row)
+    },
+    // 批量导入燃气配置
+    uploadFile(param) {
+      // 判断文件大小是否符合要求
+      const _file = param.file
+      const isLt5M = _file.size / 1024 / 1024 < 5
+      if (!isLt5M) {
+        this.$message.error('请上传5M以下的excel文件')
+        return false
+      }
+      // 全屏加载动画
+      const loading = this.$loading({
+        lock: true,
+        text: '导入中,请稍后...',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
+      })
+      // 发起导入请求
+      batchImportLiquidConfig(_file).then(res => {
+        loading.close() // 关闭加载动画
+        if (res.code === 200) {
+          this.$message.success('导入成功')
+          this.fetchData(false)
+        } else {
+          this.$message.error(res.message)
+        }
+      }).catch(error => {
+        loading.close() // 关闭加载动画
+        this.$message.error(error.message)
+      })
+      this.fileList = []
+    },
+    // 批量导出
+    batchExport() {
+      console.log('批量导出燃气配置')
+      // 全屏加载动画
+      const loading = this.$loading({
+        lock: true,
+        text: '数据处理中,请稍后...',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
+      })
+      batchExportLiquidConfig(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
+      }
+      getLiquidConfigList(this.listQuery).then(response => {
+        this.list = response.data.rows
+        this.total = parseInt(response.data.total)
+        this.listLoading = false
+      })
+    },
+    // 加载组织机构树形下拉菜单
+    fetchDeptTree: function() {
+      getDeptTreeList().then(response => {
+        if (response.data.list) {
+          if (response.data.list.length > 1) {
+            console.log(this.$store.getters.deptId)
+            if (judgeTree(response.data.list)) {
+              this.deptTreeList = toTreeList(response.data.list)
+              this.showDeptTree = 1
+            } else {
+              this.deptTreeList = response.data.list
+              this.showDeptTree = 2
+            }
+            console.log(this.deptTreeList)
+          } else {
+            this.showDeptTree = 0
+          }
+        }
+      })
+    },
+    indexMethod(index) {
+      return this.listQuery.limit * (this.listQuery.offset - 1) + index + 1
+    },
+    // 改变页容量
+    handleSizeChange(val) {
+      this.listQuery.limit = val
+      this.fetchData()
+    },
+    // 改变当前页
+    handleCurrentChange(val) {
+      this.listQuery.offset = val
+      this.fetchData()
+    },
+    // 多选触发方法
+    handleSelectionChange(val) {
+      this.multipleSelection = val
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .app-container{
+    padding: 10px;
+  }
+  $tableTitleHeight:46px;
+  .table{
+    margin-bottom: 20px;
+  }
+  .pagination-container{
+    margin-bottom: 50px;
+  }
+  .table-title{
+    background-color:rgba(243, 243, 243, 1);
+    height: $tableTitleHeight;
+    .title-header{
+      line-height:$tableTitleHeight;
+      color: #606266;
+      font-size: 15px;
+      i{
+        margin-left: 5px;
+        margin-right: 5px;
+      }
+    }
+  }
+  .edit_btns{
+    .edit_btn{
+      float:right;
+      margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2
+    }
+  }
+</style>
diff --git a/src/views/deviceConfig/liquidConfig/listHarmfulConfig.vue b/src/views/deviceConfig/liquidConfig/listHarmfulConfig.vue
new file mode 100644
index 0000000..4020982
--- /dev/null
+++ b/src/views/deviceConfig/liquidConfig/listHarmfulConfig.vue
@@ -0,0 +1,326 @@
+<template>
+  <div class="app-container">
+    <!--筛选条件-->
+    <div class="search-div">
+      <el-form ref="selectForm" :inline="true" :model="listQuery" class="form-container">
+        <el-row>
+          <el-form-item class="selectForm-container-item" prop="keywords">
+            <el-input v-model.trim="listQuery.keywords" placeholder="设备编号" clearable/>
+          </el-form-item>
+          <el-form-item class="selectForm-container-item">
+            <dept-select v-model="listQuery.deptid" :need-top="deptShowTop" dept-type="03" placeholder="选择权属单位"/>
+          </el-form-item>
+          <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
+        </el-row>
+      </el-form>
+    </div>
+    <!--查询结果Table显示-->
+    <div>
+      <el-row class="table-title">
+        <el-col :span="6"><div class="title-header"><i class="el-icon-menu"/>数据列表</div></el-col>
+        <el-col :span="12" :offset="6" class="edit_btns">
+          <el-button v-if="hasPerm('/liquidConfig/batchExport')" class="edit_btn" size="small" @click="batchExport">导出记录</el-button>
+          <download-template :filename="filename"/>
+          <el-upload
+            v-if="hasPerm('/liquidConfig/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('/liquidConfig/batchImport')" slot="trigger" size="small">批量导入</el-button>
+          </el-upload>
+          <el-button v-if="hasPerm('/liquidConfig/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-harmful-config v-show="editShow" ref="editconfig" @watchChild="fetchData"/>
+  </div>
+</template>
+
+<script>
+import { judgeTree, toTreeList } from '@/utils/structure'
+import selectTree from '@/components/SelectTree/singleSelect'
+import { getLiquidConfigList, batchImportLiquidConfig, batchExportLiquidConfig } from '@/api/liquidconfig'
+import { getDeptTreeList } from '@/api/dept'
+import EditHarmfulConfig from './editHarmfulConfig'
+import DownloadTemplate from '@/components/DownloadTemplate/index'
+import DeptSelect from '@/components/DeptSelect/index'
+
+export default {
+  name: 'ListHarmfulConfig',
+  components: { DeptSelect, DownloadTemplate, EditHarmfulConfig, selectTree },
+  data() {
+    return {
+      listQuery: {
+        keywords: '',
+        offset: 1,
+        limit: 20,
+        sort: '',
+        order: ''
+      }, // 筛选条件
+      columns: [
+        {
+          text: '设备编号',
+          value: 'devcode',
+          align: 'center'
+        },
+        {
+          text: '重传次数',
+          value: 'retryTimes',
+          align: 'center'
+        },
+        {
+          text: '采集间隔',
+          value: 'collectCycle',
+          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: 'config_template.xlsx',
+      deptShowTop: false,
+      fileList: []
+    }
+  },
+  created() {
+    this.fetchDeptTree()// 获取部门树
+    this.fetchData()// 获取数据
+  },
+  methods: {
+    // 打开详情对话框
+    checkSelection() {
+      if (this.multipleSelection.length === 0) {
+        return false
+      } else {
+        return true
+      }
+    },
+    // 新增设备
+    add() {
+      this.dialogFormVisible = true
+      this.editShow = true
+      this.$refs.editconfig.initDialog('create', this.dialogFormVisible)
+    },
+    // 编辑燃气配置信息
+    edit(row) {
+      this.dialogFormVisible = true
+      this.editShow = true
+      this.$refs.editconfig.initDialog('update', this.dialogFormVisible, row)
+    },
+    // 批量导入燃气配置
+    uploadFile(param) {
+      // 判断文件大小是否符合要求
+      const _file = param.file
+      const isLt5M = _file.size / 1024 / 1024 < 5
+      if (!isLt5M) {
+        this.$message.error('请上传5M以下的excel文件')
+        return false
+      }
+      // 全屏加载动画
+      const loading = this.$loading({
+        lock: true,
+        text: '导入中,请稍后...',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
+      })
+      // 发起导入请求
+      batchImportLiquidConfig(_file).then(res => {
+        loading.close() // 关闭加载动画
+        if (res.code === 200) {
+          this.$message.success('导入成功')
+          this.fetchData(false)
+        } else {
+          this.$message.error(res.message)
+        }
+      }).catch(error => {
+        loading.close() // 关闭加载动画
+        this.$message.error(error.message)
+      })
+      this.fileList = []
+    },
+    // 批量导出
+    batchExport() {
+      console.log('批量导出燃气配置')
+      // 全屏加载动画
+      const loading = this.$loading({
+        lock: true,
+        text: '数据处理中,请稍后...',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
+      })
+      batchExportLiquidConfig(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
+      }
+      getLiquidConfigList(this.listQuery).then(response => {
+        this.list = response.data.rows
+        this.total = parseInt(response.data.total)
+        this.listLoading = false
+      })
+    },
+    // 加载组织机构树形下拉菜单
+    fetchDeptTree: function() {
+      getDeptTreeList().then(response => {
+        if (response.data.list) {
+          if (response.data.list.length > 1) {
+            console.log(this.$store.getters.deptId)
+            if (judgeTree(response.data.list)) {
+              this.deptTreeList = toTreeList(response.data.list)
+              this.showDeptTree = 1
+            } else {
+              this.deptTreeList = response.data.list
+              this.showDeptTree = 2
+            }
+            console.log(this.deptTreeList)
+          } else {
+            this.showDeptTree = 0
+          }
+        }
+      })
+    },
+    indexMethod(index) {
+      return this.listQuery.limit * (this.listQuery.offset - 1) + index + 1
+    },
+    // 改变页容量
+    handleSizeChange(val) {
+      this.listQuery.limit = val
+      this.fetchData()
+    },
+    // 改变当前页
+    handleCurrentChange(val) {
+      this.listQuery.offset = val
+      this.fetchData()
+    },
+    // 多选触发方法
+    handleSelectionChange(val) {
+      this.multipleSelection = val
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .app-container{
+    padding: 10px;
+  }
+  $tableTitleHeight:46px;
+  .table{
+    margin-bottom: 20px;
+  }
+  .pagination-container{
+    margin-bottom: 50px;
+  }
+  .table-title{
+    background-color:rgba(243, 243, 243, 1);
+    height: $tableTitleHeight;
+    .title-header{
+      line-height:$tableTitleHeight;
+      color: #606266;
+      font-size: 15px;
+      i{
+        margin-left: 5px;
+        margin-right: 5px;
+      }
+    }
+  }
+  .edit_btns{
+    .edit_btn{
+      float:right;
+      margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2
+    }
+  }
+</style>

diff --git a/src/api/digconfig.js b/src/api/digconfig.js
new file mode 100644
index 0000000..d885e08
--- /dev/null
+++ b/src/api/digconfig.js
@@ -0,0 +1,42 @@
+/**
+ * 开挖配置接口
+ */
+import request from '@/utils/request'
+// 开挖配置查询
+export function getDigConfigList(params) {
+  return request({
+    url: 'digConfig/list',
+    method: 'get',
+    params
+  })
+}
+
+// 修改开挖配置
+export function editDigConfig(params) {
+  return request({
+    url: 'digConfig/config',
+    method: 'post',
+    params
+  })
+}
+
+// 批量导入
+export function batchImportDigConfig(fileobj) {
+  const param = new FormData()
+  param.append('file', fileobj)
+  return request({
+    url: 'digConfig/batchImport',
+    method: 'post',
+    headers: { 'Content-Type': 'multipart/form-data' },
+    data: param
+  })
+}
+// 批量导出
+export function batchExportDigConfig(params) {
+  return request({
+    url: 'digConfig/batchExport',
+    method: 'get',
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
diff --git a/src/api/gasconfig.js b/src/api/gasconfig.js
new file mode 100644
index 0000000..93f1d09
--- /dev/null
+++ b/src/api/gasconfig.js
@@ -0,0 +1,42 @@
+/**
+ * 燃气配置接口
+ */
+import request from '@/utils/request'
+// 燃气配置查询
+export function getGasConfigList(params) {
+  return request({
+    url: 'gasConfig/list',
+    method: 'get',
+    params
+  })
+}
+
+// 修改燃气配置
+export function editGasConfig(params) {
+  return request({
+    url: 'gasConfig/config',
+    method: 'post',
+    params
+  })
+}
+
+// 批量导入
+export function batchImportGasConfig(fileobj) {
+  const param = new FormData()
+  param.append('file', fileobj)
+  return request({
+    url: 'gasConfig/batchImport',
+    method: 'post',
+    headers: { 'Content-Type': 'multipart/form-data' },
+    data: param
+  })
+}
+// 批量导出
+export function batchExportGasConfig(params) {
+  return request({
+    url: 'gasConfig/batchExport',
+    method: 'get',
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
diff --git a/src/api/harmfulconfig.js b/src/api/harmfulconfig.js
new file mode 100644
index 0000000..29b6b6e
--- /dev/null
+++ b/src/api/harmfulconfig.js
@@ -0,0 +1,42 @@
+/**
+ * 有害气体配置接口
+ */
+import request from '@/utils/request'
+// 有害气体配置查询
+export function getHarmfulConfigList(params) {
+  return request({
+    url: 'harmfulConfig/list',
+    method: 'get',
+    params
+  })
+}
+
+// 修改有害气体配置
+export function editHarmfulConfig(params) {
+  return request({
+    url: 'harmfulConfig/config',
+    method: 'post',
+    params
+  })
+}
+
+// 批量导入
+export function batchImportHarmfulConfig(fileobj) {
+  const param = new FormData()
+  param.append('file', fileobj)
+  return request({
+    url: 'harmfulConfig/batchImport',
+    method: 'post',
+    headers: { 'Content-Type': 'multipart/form-data' },
+    data: param
+  })
+}
+// 批量导出
+export function batchExportHarmfulConfig(params) {
+  return request({
+    url: 'harmfulConfig/batchExport',
+    method: 'get',
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
diff --git a/src/api/tempconfig.js b/src/api/tempconfig.js
new file mode 100644
index 0000000..aa4ce86
--- /dev/null
+++ b/src/api/tempconfig.js
@@ -0,0 +1,42 @@
+/**
+ * 温湿度配置接口
+ */
+import request from '@/utils/request'
+// 温湿度配置查询
+export function getTempConfigList(params) {
+  return request({
+    url: 'tempConfig/list',
+    method: 'get',
+    params
+  })
+}
+
+// 修改温湿度配置
+export function editTempConfig(params) {
+  return request({
+    url: 'tempConfig/config',
+    method: 'post',
+    params
+  })
+}
+
+// 批量导入
+export function batchImportTempConfig(fileobj) {
+  const param = new FormData()
+  param.append('file', fileobj)
+  return request({
+    url: 'tempConfig/batchImport',
+    method: 'post',
+    headers: { 'Content-Type': 'multipart/form-data' },
+    data: param
+  })
+}
+// 批量导出
+export function batchExportTempConfig(params) {
+  return request({
+    url: 'tempConfig/batchExport',
+    method: 'get',
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
diff --git a/src/views/deviceConfig/deviceConfig.vue b/src/views/deviceConfig/deviceConfig.vue
index 289cdbc..678c3a4 100644
--- a/src/views/deviceConfig/deviceConfig.vue
+++ b/src/views/deviceConfig/deviceConfig.vue
@@ -4,16 +4,31 @@
       <el-tab-pane v-if="hasPerm('/liquidConfig/list')" label="液位监测仪" name="liquid">
         <list-liquid-config/>
       </el-tab-pane>
-      <el-tab-pane v-if="hasPerm('/gasConfig/list')" label="燃气" name="gas">燃气配置</el-tab-pane>
+      <el-tab-pane label="燃气智能监测终端" name="gas">
+        <list-gas-config/>
+      </el-tab-pane>
+      <el-tab-pane label="有害气体监测仪" name="harmful">
+        <list-harmful-config/>
+      </el-tab-pane>
+      <el-tab-pane label="温湿度监测仪" name="temphumidity">
+        <list-temp-config/>
+      </el-tab-pane>
+      <el-tab-pane label="开挖监测仪" name="dig">
+        <list-dig-config/>
+      </el-tab-pane>
     </el-tabs>
   </div>
 </template>
 
 <script>
 import ListLiquidConfig from './liquidConfig/listLiquidConfig'
+import ListGasConfig from './liquidConfig/listGasConfig'
+import ListHarmfulConfig from './liquidConfig/listHarmfulConfig'
+import ListTempConfig from './liquidConfig/listTempConfig'
+import ListDigConfig from './liquidConfig/listDigConfig'
 export default {
   name: 'DeviceConfig',
-  components: { ListLiquidConfig },
+  components: { ListDigConfig, ListTempConfig, ListHarmfulConfig, ListGasConfig, ListLiquidConfig },
   data() {
     return {
       activeName: 'liquid'
diff --git a/src/views/deviceConfig/liquidConfig/editDigConfig.vue b/src/views/deviceConfig/liquidConfig/editDigConfig.vue
new file mode 100644
index 0000000..13195db
--- /dev/null
+++ b/src/views/deviceConfig/liquidConfig/editDigConfig.vue
@@ -0,0 +1,304 @@
+<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="100px">
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item v-if="dialogStatus=='create'" label="设备编号" prop="deviceId">
+            <el-select
+              v-model="configForm.deviceId"
+              :loading="loading"
+              :disabled="dialogStatus=='update'?true:false"
+              filterable
+              placeholder="请输入设备编号"
+            >
+              <el-option
+                v-for="item in devices"
+                :key="item.id"
+                :label="item.devcode"
+                :value="item.id"/>
+            </el-select>
+          </el-form-item>
+          <el-form-item v-if="dialogStatus=='update'" label="设备编号">
+            <el-input v-model="deviceForm.devcode" type="text" placeholder="未知" disabled/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item v-if="deviceForm.deviceName!=''" label="设备名称">
+            <el-input v-model="deviceForm.deviceName" type="text" placeholder="未知" disabled/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item v-if="deviceForm.deviceTypeName!=''" label="设备类型" prop="deviceType">
+            <el-input v-model="deviceForm.deviceTypeName" type="text" placeholder="未知" disabled/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item v-if="deviceForm.deptName!=''" label="权属单位" prop="deptName">
+            <el-input v-model="deviceForm.deptName" type="text" placeholder="未知" disabled/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="重传次数" prop="retryTimes">
+            <el-input-number :min="1" :max="10" v-model="configForm.retryTimes" type="text" placeholder="必填"/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="采集间隔" prop="collectCycle">
+            <el-input v-model.trim="configForm.collectCycle" type="text" placeholder="必填"/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="采集时间" prop="collectTime">
+            <!--<el-input v-model.trim="configForm.collectTime" type="text" placeholder="必填"/>-->
+            <el-time-picker
+              v-model="configForm.collectTime"
+              format="HH:mm"
+              placeholder="必选"/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="睡眠时间" prop="sleepTime">
+            <el-time-picker
+              v-model="configForm.sleepTime"
+              format="HH:mm"
+              placeholder="必选"/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="报警阈值" prop="threshold">
+            <el-input v-model.trim="configForm.threshold" type="text" placeholder="必填"/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="最大尝试次数">
+            <el-input-number :min="1" :max="10" v-model="configForm.attemptsMax" type="text" placeholder="必填"/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row v-if="showIp" :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="ip地址" prop="ip">
+            <el-input v-model.trim="configForm.ip" type="text" placeholder="非集中器设备必填"/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="端口号" prop="port">
+            <el-input v-model.trim="configForm.port" type="text" placeholder="非集中器设备必填"/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <div slot="footer" class="dialog-footer">
+      <el-button type="primary" @click="saveData">保存</el-button>
+      <el-button @click="cancel">取消</el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { editLiquidConfig, getDeviceSimpleList } from '@/api/liquidconfig'
+import { validateFloatPlus } from '@/utils/validate'
+export default {
+  name: 'EditDigConfig',
+  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, 0, 100) === true) {
+          callback()
+        } else {
+          callback(new Error('请填写0到100数值'))
+        }
+      } else {
+        callback(new Error('采集间隔不能为空'))
+      }
+    }
+    const validateThreshold = (rule, value, callback) => {
+      if (value !== '') {
+        if (validateFloatPlus(value, 0, 100) === true) {
+          callback()
+        } else {
+          callback(new Error('请填写0到100数值'))
+        }
+      } else {
+        callback(new Error('报警阈值不能为空'))
+      }
+    }
+    return {
+      dialogFormVisible: false, // 对话框是否显示
+      dialogStatus: '', // 对话框类型：create,update
+      deviceForm: {
+        deviceName: '',
+        deviceTypeName: '',
+        deptName: '',
+        devcode: '',
+        deviceType: ''
+      }, // 设备基本信息
+      configForm: {
+        id: '', // config id
+        deviceId: '', // 设备id
+        collectCycle: '', // 采集间隔
+        collectTime: '', // 采集时间
+        collectTimes: '', // 采集次数
+        retryTimes: '3', // 重传次数
+        ip: '', // ip地址
+        port: '', // 端口号
+        attemptsMax: '3' // 最大尝试次数
+      },
+      textMap: {
+        update: '编辑',
+        create: '新增'
+      }, // 表头显示标题
+      devices: [], // 设备下拉选择列表
+      loading: false, // 加载动画是否显示
+      rules: {
+        collectCycle: [{ required: true, trigger: ['blur', 'change'], validator: validateCollectCycle }],
+        threshold: [{ required: true, trigger: ['blur', 'change'], validator: validateThreshold }],
+        collectTime: [{ required: true, message: '采集时间不能为空', trigger: ['blur', 'change'] }],
+        deviceId: [{ required: true, message: '设备编号不能为空', trigger: ['blur', 'change'] }],
+        collectTimes: [{ 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
+      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
+          collectCycle: row.collectCycle, // 报警阈值
+          collectTime: row.collectTime, // 安装高度
+          retryTimes: row.retryTimes, // 重传次数
+          ip: row.ip, // ip地址
+          port: row.port, // 端口号
+          attemptsMax: row.attemptsMax // 最大尝试次数
+        }
+      }
+    },
+    // 重置表单
+    resetForm() {
+      this.deviceForm = {
+        deviceName: '',
+        deviceTypeName: '',
+        deptName: '',
+        devcode: ''
+      }
+      this.configForm = {
+        deviceId: '', // 设备id
+        collectCycle: '', // 报警阈值
+        collectTime: '', // 安装高度
+        retryTimes: '3', // 重传次数
+        ip: '', // ip地址
+        port: '', // 端口号
+        attemptsMax: '3' // 最大尝试次数
+      }
+    },
+    // 保存数据
+    saveData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          editLiquidConfig(this.configForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('配置成功')
+              this.$emit('watchChild')
+              this.dialogFormVisible = false
+            }
+          })
+        }
+      })
+    },
+    fetchDevice() {
+      this.loading = true
+      getDeviceSimpleList('4', '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%;
+  }
+  .el-date-editor{
+    width:100%
+  }
+</style>
diff --git a/src/views/deviceConfig/liquidConfig/editGasConfig.vue b/src/views/deviceConfig/liquidConfig/editGasConfig.vue
new file mode 100644
index 0000000..bc61d77
--- /dev/null
+++ b/src/views/deviceConfig/liquidConfig/editGasConfig.vue
@@ -0,0 +1,279 @@
+<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="100px">
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item v-if="dialogStatus=='create'" label="设备编号" prop="deviceId">
+            <el-select
+              v-model="configForm.deviceId"
+              :loading="loading"
+              :disabled="dialogStatus=='update'?true:false"
+              filterable
+              placeholder="请输入设备编号"
+            >
+              <el-option
+                v-for="item in devices"
+                :key="item.id"
+                :label="item.devcode"
+                :value="item.id"/>
+            </el-select>
+          </el-form-item>
+          <el-form-item v-if="dialogStatus=='update'" label="设备编号">
+            <el-input v-model="deviceForm.devcode" type="text" placeholder="未知" disabled/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item v-if="deviceForm.deviceName!=''" label="设备名称">
+            <el-input v-model="deviceForm.deviceName" type="text" placeholder="未知" disabled/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item v-if="deviceForm.deviceTypeName!=''" label="设备类型" prop="deviceType">
+            <el-input v-model="deviceForm.deviceTypeName" type="text" placeholder="未知" disabled/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item v-if="deviceForm.deptName!=''" label="权属单位" prop="deptName">
+            <el-input v-model="deviceForm.deptName" type="text" placeholder="未知" disabled/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="重传次数" prop="retryTimes">
+            <el-input-number :min="1" :max="10" v-model="configForm.retryTimes" type="text" placeholder="必填"/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="采集间隔" prop="collectCycle">
+            <el-input v-model.trim="configForm.collectCycle" type="text" placeholder="必填"/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="上传周期" prop="upPeriod">
+            <el-input v-model.trim="configForm.upPeriod" type="text" placeholder="必填"/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="最大尝试次数">
+            <el-input-number :min="1" :max="10" v-model="configForm.attemptsMax" type="text" placeholder="必填"/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row v-if="showIp" :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="ip地址" prop="ip">
+            <el-input v-model.trim="configForm.ip" type="text" placeholder="非集中器设备必填"/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="端口号" prop="port">
+            <el-input v-model.trim="configForm.port" type="text" placeholder="非集中器设备必填"/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <div slot="footer" class="dialog-footer">
+      <el-button type="primary" @click="saveData">保存</el-button>
+      <el-button @click="cancel">取消</el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { editLiquidConfig, getDeviceSimpleList } from '@/api/liquidconfig'
+import { validateFloatPlus } from '@/utils/validate'
+export default {
+  name: 'EditGasConfig',
+  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, 0, 100) === true) {
+          callback()
+        } else {
+          callback(new Error('请填写0到100数值'))
+        }
+      } else {
+        callback(new Error('采集时间不能为空'))
+      }
+    }
+    const validateUpPeriod = (rule, value, callback) => {
+      if (value !== '') {
+        if (validateFloatPlus(value, 0, 100) === true) {
+          callback()
+        } else {
+          callback(new Error('请填写0到100数值'))
+        }
+      } else {
+        callback(new Error('上传周期不能为空'))
+      }
+    }
+    return {
+      dialogFormVisible: false, // 对话框是否显示
+      dialogStatus: '', // 对话框类型：create,update
+      deviceForm: {
+        deviceName: '',
+        deviceTypeName: '',
+        deptName: '',
+        devcode: '',
+        deviceType: ''
+      }, // 设备基本信息
+      configForm: {
+        id: '', // config id
+        deviceId: '', // 设备id
+        collectCycle: '', // 报警阈值
+        upPeriod: '', // 安装高度
+        retryTimes: '3', // 重传次数
+        ip: '', // ip地址
+        port: '', // 端口号
+        attemptsMax: '3' // 最大尝试次数
+      },
+      textMap: {
+        update: '编辑',
+        create: '新增'
+      }, // 表头显示标题
+      devices: [], // 设备下拉选择列表
+      loading: false, // 加载动画是否显示
+      rules: {
+        collectCycle: [{ required: true, trigger: ['blur', 'change'], validator: validateCollectCycle }],
+        upPeriod: [{ 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
+      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
+          collectCycle: row.collectCycle, // 报警阈值
+          upPeriod: row.upPeriod, // 安装高度
+          retryTimes: row.retryTimes, // 重传次数
+          ip: row.ip, // ip地址
+          port: row.port, // 端口号
+          attemptsMax: row.attemptsMax // 最大尝试次数
+        }
+      }
+    },
+    // 重置表单
+    resetForm() {
+      this.deviceForm = {
+        deviceName: '',
+        deviceTypeName: '',
+        deptName: '',
+        devcode: ''
+      }
+      this.configForm = {
+        deviceId: '', // 设备id
+        collectCycle: '', // 报警阈值
+        upPeriod: '', // 安装高度
+        retryTimes: '3', // 重传次数
+        ip: '', // ip地址
+        port: '', // 端口号
+        attemptsMax: '3' // 最大尝试次数
+      }
+    },
+    // 保存数据
+    saveData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          editLiquidConfig(this.configForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('配置成功')
+              this.$emit('watchChild')
+              this.dialogFormVisible = false
+            }
+          })
+        }
+      })
+    },
+    fetchDevice() {
+      this.loading = true
+      getDeviceSimpleList('4', '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/liquidConfig/editHarmfulConfig.vue b/src/views/deviceConfig/liquidConfig/editHarmfulConfig.vue
new file mode 100644
index 0000000..0eff7a8
--- /dev/null
+++ b/src/views/deviceConfig/liquidConfig/editHarmfulConfig.vue
@@ -0,0 +1,262 @@
+<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="100px">
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item v-if="dialogStatus=='create'" label="设备编号" prop="deviceId">
+            <el-select
+              v-model="configForm.deviceId"
+              :loading="loading"
+              :disabled="dialogStatus=='update'?true:false"
+              filterable
+              placeholder="请输入设备编号"
+            >
+              <el-option
+                v-for="item in devices"
+                :key="item.id"
+                :label="item.devcode"
+                :value="item.id"/>
+            </el-select>
+          </el-form-item>
+          <el-form-item v-if="dialogStatus=='update'" label="设备编号">
+            <el-input v-model="deviceForm.devcode" type="text" placeholder="未知" disabled/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item v-if="deviceForm.deviceName!=''" label="设备名称">
+            <el-input v-model="deviceForm.deviceName" type="text" placeholder="未知" disabled/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item v-if="deviceForm.deviceTypeName!=''" label="设备类型" prop="deviceType">
+            <el-input v-model="deviceForm.deviceTypeName" type="text" placeholder="未知" disabled/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item v-if="deviceForm.deptName!=''" label="权属单位" prop="deptName">
+            <el-input v-model="deviceForm.deptName" type="text" placeholder="未知" disabled/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="重传次数" prop="retryTimes">
+            <el-input-number :min="1" :max="10" v-model="configForm.retryTimes" type="text" placeholder="必填"/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="采集间隔" prop="collectCycle">
+            <el-input v-model.trim="configForm.collectCycle" type="text" placeholder="必填"/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="最大尝试次数">
+            <el-input-number :min="1" :max="10" v-model="configForm.attemptsMax" type="text" placeholder="必填"/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row v-if="showIp" :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="ip地址" prop="ip">
+            <el-input v-model.trim="configForm.ip" type="text" placeholder="非集中器设备必填"/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="端口号" prop="port">
+            <el-input v-model.trim="configForm.port" type="text" placeholder="非集中器设备必填"/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <div slot="footer" class="dialog-footer">
+      <el-button type="primary" @click="saveData">保存</el-button>
+      <el-button @click="cancel">取消</el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { editLiquidConfig, getDeviceSimpleList } from '@/api/liquidconfig'
+import { validateFloatPlus } from '@/utils/validate'
+export default {
+  name: 'EditHarmfulConfig',
+  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, 0, 100) === true) {
+          callback()
+        } else {
+          callback(new Error('请填写0到100数值'))
+        }
+      } else {
+        callback(new Error('采集时间不能为空'))
+      }
+    }
+    return {
+      dialogFormVisible: false, // 对话框是否显示
+      dialogStatus: '', // 对话框类型：create,update
+      deviceForm: {
+        deviceName: '',
+        deviceTypeName: '',
+        deptName: '',
+        devcode: '',
+        deviceType: ''
+      }, // 设备基本信息
+      configForm: {
+        id: '', // config id
+        deviceId: '', // 设备id
+        collectCycle: '', // 报警阈值
+        upPeriod: '', // 安装高度
+        retryTimes: '3', // 重传次数
+        ip: '', // ip地址
+        port: '', // 端口号
+        attemptsMax: '3' // 最大尝试次数
+      },
+      textMap: {
+        update: '编辑',
+        create: '新增'
+      }, // 表头显示标题
+      devices: [], // 设备下拉选择列表
+      loading: false, // 加载动画是否显示
+      rules: {
+        collectCycle: [{ required: true, trigger: ['blur', 'change'], validator: validateCollectCycle }],
+        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
+      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
+          collectCycle: row.collectCycle, // 报警阈值
+          upPeriod: row.upPeriod, // 安装高度
+          retryTimes: row.retryTimes, // 重传次数
+          ip: row.ip, // ip地址
+          port: row.port, // 端口号
+          attemptsMax: row.attemptsMax // 最大尝试次数
+        }
+      }
+    },
+    // 重置表单
+    resetForm() {
+      this.deviceForm = {
+        deviceName: '',
+        deviceTypeName: '',
+        deptName: '',
+        devcode: ''
+      }
+      this.configForm = {
+        deviceId: '', // 设备id
+        collectCycle: '', // 报警阈值
+        upPeriod: '', // 安装高度
+        retryTimes: '3', // 重传次数
+        ip: '', // ip地址
+        port: '', // 端口号
+        attemptsMax: '3' // 最大尝试次数
+      }
+    },
+    // 保存数据
+    saveData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          editLiquidConfig(this.configForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('配置成功')
+              this.$emit('watchChild')
+              this.dialogFormVisible = false
+            }
+          })
+        }
+      })
+    },
+    fetchDevice() {
+      this.loading = true
+      getDeviceSimpleList('4', '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/liquidConfig/editTempConfig.vue b/src/views/deviceConfig/liquidConfig/editTempConfig.vue
new file mode 100644
index 0000000..76107d9
--- /dev/null
+++ b/src/views/deviceConfig/liquidConfig/editTempConfig.vue
@@ -0,0 +1,284 @@
+<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="100px">
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item v-if="dialogStatus=='create'" label="设备编号" prop="deviceId">
+            <el-select
+              v-model="configForm.deviceId"
+              :loading="loading"
+              :disabled="dialogStatus=='update'?true:false"
+              filterable
+              placeholder="请输入设备编号"
+            >
+              <el-option
+                v-for="item in devices"
+                :key="item.id"
+                :label="item.devcode"
+                :value="item.id"/>
+            </el-select>
+          </el-form-item>
+          <el-form-item v-if="dialogStatus=='update'" label="设备编号">
+            <el-input v-model="deviceForm.devcode" type="text" placeholder="未知" disabled/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item v-if="deviceForm.deviceName!=''" label="设备名称">
+            <el-input v-model="deviceForm.deviceName" type="text" placeholder="未知" disabled/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item v-if="deviceForm.deviceTypeName!=''" label="设备类型" prop="deviceType">
+            <el-input v-model="deviceForm.deviceTypeName" type="text" placeholder="未知" disabled/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item v-if="deviceForm.deptName!=''" label="权属单位" prop="deptName">
+            <el-input v-model="deviceForm.deptName" type="text" placeholder="未知" disabled/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="重传次数" prop="retryTimes">
+            <el-input-number :min="1" :max="10" v-model="configForm.retryTimes" type="text" placeholder="必填"/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="采集间隔" prop="collectCycle">
+            <el-input v-model.trim="configForm.collectCycle" type="text" placeholder="必填"/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="采集时间" prop="collectTime">
+            <!--<el-input v-model.trim="configForm.collectTime" type="text" placeholder="必填"/>-->
+            <el-time-picker
+              v-model="configForm.collectTime"
+              format="HH:mm"
+              placeholder="必选"/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="最大尝试次数">
+            <el-input-number :min="1" :max="10" v-model="configForm.attemptsMax" type="text" placeholder="必填"/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="采集次数" prop="collectTimes">
+            <el-input-number :min="1" :max="100" v-model="configForm.collectTimes" 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 type="primary" @click="saveData">保存</el-button>
+      <el-button @click="cancel">取消</el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { editLiquidConfig, getDeviceSimpleList } from '@/api/liquidconfig'
+import { validateFloatPlus } from '@/utils/validate'
+export default {
+  name: 'EditTempConfig',
+  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, 0, 100) === true) {
+          callback()
+        } else {
+          callback(new Error('请填写0到100数值'))
+        }
+      } else {
+        callback(new Error('采集间隔不能为空'))
+      }
+    }
+    return {
+      dialogFormVisible: false, // 对话框是否显示
+      dialogStatus: '', // 对话框类型：create,update
+      deviceForm: {
+        deviceName: '',
+        deviceTypeName: '',
+        deptName: '',
+        devcode: '',
+        deviceType: ''
+      }, // 设备基本信息
+      configForm: {
+        id: '', // config id
+        deviceId: '', // 设备id
+        collectCycle: '', // 采集间隔
+        collectTime: '', // 采集时间
+        collectTimes: '', // 采集次数
+        retryTimes: '3', // 重传次数
+        ip: '', // ip地址
+        port: '', // 端口号
+        attemptsMax: '3' // 最大尝试次数
+      },
+      textMap: {
+        update: '编辑',
+        create: '新增'
+      }, // 表头显示标题
+      devices: [], // 设备下拉选择列表
+      loading: false, // 加载动画是否显示
+      rules: {
+        collectCycle: [{ required: true, trigger: ['blur', 'change'], validator: validateCollectCycle }],
+        collectTime: [{ required: true, message: '采集时间不能为空', trigger: ['blur', 'change'] }],
+        deviceId: [{ required: true, message: '设备编号不能为空', trigger: ['blur', 'change'] }],
+        collectTimes: [{ 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
+      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
+          collectCycle: row.collectCycle, // 报警阈值
+          collectTime: row.collectTime, // 安装高度
+          retryTimes: row.retryTimes, // 重传次数
+          ip: row.ip, // ip地址
+          port: row.port, // 端口号
+          attemptsMax: row.attemptsMax // 最大尝试次数
+        }
+      }
+    },
+    // 重置表单
+    resetForm() {
+      this.deviceForm = {
+        deviceName: '',
+        deviceTypeName: '',
+        deptName: '',
+        devcode: ''
+      }
+      this.configForm = {
+        deviceId: '', // 设备id
+        collectCycle: '', // 报警阈值
+        collectTime: '', // 安装高度
+        retryTimes: '3', // 重传次数
+        ip: '', // ip地址
+        port: '', // 端口号
+        attemptsMax: '3' // 最大尝试次数
+      }
+    },
+    // 保存数据
+    saveData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          editLiquidConfig(this.configForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('配置成功')
+              this.$emit('watchChild')
+              this.dialogFormVisible = false
+            }
+          })
+        }
+      })
+    },
+    fetchDevice() {
+      this.loading = true
+      getDeviceSimpleList('4', '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%;
+  }
+  .el-date-editor{
+    width:100%
+  }
+</style>
diff --git a/src/views/deviceConfig/liquidConfig/listDigConfig.vue b/src/views/deviceConfig/liquidConfig/listDigConfig.vue
new file mode 100644
index 0000000..eed641b
--- /dev/null
+++ b/src/views/deviceConfig/liquidConfig/listDigConfig.vue
@@ -0,0 +1,347 @@
+<template>
+  <div class="app-container">
+    <!--筛选条件-->
+    <div class="search-div">
+      <el-form ref="selectForm" :inline="true" :model="listQuery" class="form-container">
+        <el-row>
+          <el-form-item class="selectForm-container-item" prop="keywords">
+            <el-input v-model.trim="listQuery.keywords" placeholder="设备编号" clearable/>
+          </el-form-item>
+          <el-form-item class="selectForm-container-item">
+            <dept-select v-model="listQuery.deptid" :need-top="deptShowTop" dept-type="03" placeholder="选择权属单位"/>
+          </el-form-item>
+          <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
+        </el-row>
+      </el-form>
+    </div>
+    <!--查询结果Table显示-->
+    <div>
+      <el-row class="table-title">
+        <el-col :span="6"><div class="title-header"><i class="el-icon-menu"/>数据列表</div></el-col>
+        <el-col :span="12" :offset="6" class="edit_btns">
+          <el-button v-if="hasPerm('/liquidConfig/batchExport')" class="edit_btn" size="small" @click="batchExport">导出记录</el-button>
+          <download-template :filename="filename"/>
+          <el-upload
+            v-if="hasPerm('/liquidConfig/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('/liquidConfig/batchImport')" slot="trigger" size="small">批量导入</el-button>
+          </el-upload>
+          <el-button v-if="hasPerm('/liquidConfig/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-dig-config v-show="editShow" ref="editconfig" @watchChild="fetchData"/>
+  </div>
+</template>
+
+<script>
+import { judgeTree, toTreeList } from '@/utils/structure'
+import selectTree from '@/components/SelectTree/singleSelect'
+import { getLiquidConfigList, batchImportLiquidConfig, batchExportLiquidConfig } from '@/api/liquidconfig'
+import { getDeptTreeList } from '@/api/dept'
+import EditGasConfig from './editGasConfig'
+import DownloadTemplate from '@/components/DownloadTemplate/index'
+import DeptSelect from '@/components/DeptSelect/index'
+import EditDigConfig from './editDigConfig'
+
+export default {
+  name: 'ListDigConfig',
+  components: { EditDigConfig, DeptSelect, DownloadTemplate, EditGasConfig, selectTree },
+  data() {
+    return {
+      listQuery: {
+        keywords: '',
+        offset: 1,
+        limit: 20,
+        sort: '',
+        order: ''
+      }, // 筛选条件
+      columns: [
+        {
+          text: '设备编号',
+          value: 'devcode',
+          align: 'center'
+        },
+        {
+          text: '重传次数',
+          value: 'retryTimes',
+          align: 'center'
+        },
+        {
+          text: '采集开始时间',
+          value: 'collectTime',
+          align: 'center'
+        },
+        {
+          text: '采集间隔',
+          value: 'collectCycle',
+          align: 'center'
+        },
+        {
+          text: '采集次数',
+          value: 'collectTimes',
+          align: 'center'
+        },
+        {
+          text: '休眠开始时间',
+          value: 'sleepTime',
+          align: 'center'
+        },
+        {
+          text: '报警阈值',
+          value: 'threshold',
+          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: 'config_template.xlsx',
+      deptShowTop: false,
+      fileList: []
+    }
+  },
+  created() {
+    this.fetchDeptTree()// 获取部门树
+    this.fetchData()// 获取数据
+  },
+  methods: {
+    // 打开详情对话框
+    checkSelection() {
+      if (this.multipleSelection.length === 0) {
+        return false
+      } else {
+        return true
+      }
+    },
+    // 新增设备
+    add() {
+      this.dialogFormVisible = true
+      this.editShow = true
+      this.$refs.editconfig.initDialog('create', this.dialogFormVisible)
+    },
+    // 编辑燃气配置信息
+    edit(row) {
+      this.dialogFormVisible = true
+      this.editShow = true
+      this.$refs.editconfig.initDialog('update', this.dialogFormVisible, row)
+    },
+    // 批量导入燃气配置
+    uploadFile(param) {
+      // 判断文件大小是否符合要求
+      const _file = param.file
+      const isLt5M = _file.size / 1024 / 1024 < 5
+      if (!isLt5M) {
+        this.$message.error('请上传5M以下的excel文件')
+        return false
+      }
+      // 全屏加载动画
+      const loading = this.$loading({
+        lock: true,
+        text: '导入中,请稍后...',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
+      })
+      // 发起导入请求
+      batchImportLiquidConfig(_file).then(res => {
+        loading.close() // 关闭加载动画
+        if (res.code === 200) {
+          this.$message.success('导入成功')
+          this.fetchData(false)
+        } else {
+          this.$message.error(res.message)
+        }
+      }).catch(error => {
+        loading.close() // 关闭加载动画
+        this.$message.error(error.message)
+      })
+      this.fileList = []
+    },
+    // 批量导出
+    batchExport() {
+      console.log('批量导出燃气配置')
+      // 全屏加载动画
+      const loading = this.$loading({
+        lock: true,
+        text: '数据处理中,请稍后...',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
+      })
+      batchExportLiquidConfig(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
+      }
+      getLiquidConfigList(this.listQuery).then(response => {
+        this.list = response.data.rows
+        this.total = parseInt(response.data.total)
+        this.listLoading = false
+      })
+    },
+    // 加载组织机构树形下拉菜单
+    fetchDeptTree: function() {
+      getDeptTreeList().then(response => {
+        if (response.data.list) {
+          if (response.data.list.length > 1) {
+            console.log(this.$store.getters.deptId)
+            if (judgeTree(response.data.list)) {
+              this.deptTreeList = toTreeList(response.data.list)
+              this.showDeptTree = 1
+            } else {
+              this.deptTreeList = response.data.list
+              this.showDeptTree = 2
+            }
+            console.log(this.deptTreeList)
+          } else {
+            this.showDeptTree = 0
+          }
+        }
+      })
+    },
+    indexMethod(index) {
+      return this.listQuery.limit * (this.listQuery.offset - 1) + index + 1
+    },
+    // 改变页容量
+    handleSizeChange(val) {
+      this.listQuery.limit = val
+      this.fetchData()
+    },
+    // 改变当前页
+    handleCurrentChange(val) {
+      this.listQuery.offset = val
+      this.fetchData()
+    },
+    // 多选触发方法
+    handleSelectionChange(val) {
+      this.multipleSelection = val
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .app-container{
+    padding: 10px;
+  }
+  $tableTitleHeight:46px;
+  .table{
+    margin-bottom: 20px;
+  }
+  .pagination-container{
+    margin-bottom: 50px;
+  }
+  .table-title{
+    background-color:rgba(243, 243, 243, 1);
+    height: $tableTitleHeight;
+    .title-header{
+      line-height:$tableTitleHeight;
+      color: #606266;
+      font-size: 15px;
+      i{
+        margin-left: 5px;
+        margin-right: 5px;
+      }
+    }
+  }
+  .edit_btns{
+    .edit_btn{
+      float:right;
+      margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2
+    }
+  }
+</style>
diff --git a/src/views/deviceConfig/liquidConfig/listHarmfulConfig.vue b/src/views/deviceConfig/liquidConfig/listHarmfulConfig.vue
new file mode 100644
index 0000000..4020982
--- /dev/null
+++ b/src/views/deviceConfig/liquidConfig/listHarmfulConfig.vue
@@ -0,0 +1,326 @@
+<template>
+  <div class="app-container">
+    <!--筛选条件-->
+    <div class="search-div">
+      <el-form ref="selectForm" :inline="true" :model="listQuery" class="form-container">
+        <el-row>
+          <el-form-item class="selectForm-container-item" prop="keywords">
+            <el-input v-model.trim="listQuery.keywords" placeholder="设备编号" clearable/>
+          </el-form-item>
+          <el-form-item class="selectForm-container-item">
+            <dept-select v-model="listQuery.deptid" :need-top="deptShowTop" dept-type="03" placeholder="选择权属单位"/>
+          </el-form-item>
+          <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
+        </el-row>
+      </el-form>
+    </div>
+    <!--查询结果Table显示-->
+    <div>
+      <el-row class="table-title">
+        <el-col :span="6"><div class="title-header"><i class="el-icon-menu"/>数据列表</div></el-col>
+        <el-col :span="12" :offset="6" class="edit_btns">
+          <el-button v-if="hasPerm('/liquidConfig/batchExport')" class="edit_btn" size="small" @click="batchExport">导出记录</el-button>
+          <download-template :filename="filename"/>
+          <el-upload
+            v-if="hasPerm('/liquidConfig/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('/liquidConfig/batchImport')" slot="trigger" size="small">批量导入</el-button>
+          </el-upload>
+          <el-button v-if="hasPerm('/liquidConfig/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-harmful-config v-show="editShow" ref="editconfig" @watchChild="fetchData"/>
+  </div>
+</template>
+
+<script>
+import { judgeTree, toTreeList } from '@/utils/structure'
+import selectTree from '@/components/SelectTree/singleSelect'
+import { getLiquidConfigList, batchImportLiquidConfig, batchExportLiquidConfig } from '@/api/liquidconfig'
+import { getDeptTreeList } from '@/api/dept'
+import EditHarmfulConfig from './editHarmfulConfig'
+import DownloadTemplate from '@/components/DownloadTemplate/index'
+import DeptSelect from '@/components/DeptSelect/index'
+
+export default {
+  name: 'ListHarmfulConfig',
+  components: { DeptSelect, DownloadTemplate, EditHarmfulConfig, selectTree },
+  data() {
+    return {
+      listQuery: {
+        keywords: '',
+        offset: 1,
+        limit: 20,
+        sort: '',
+        order: ''
+      }, // 筛选条件
+      columns: [
+        {
+          text: '设备编号',
+          value: 'devcode',
+          align: 'center'
+        },
+        {
+          text: '重传次数',
+          value: 'retryTimes',
+          align: 'center'
+        },
+        {
+          text: '采集间隔',
+          value: 'collectCycle',
+          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: 'config_template.xlsx',
+      deptShowTop: false,
+      fileList: []
+    }
+  },
+  created() {
+    this.fetchDeptTree()// 获取部门树
+    this.fetchData()// 获取数据
+  },
+  methods: {
+    // 打开详情对话框
+    checkSelection() {
+      if (this.multipleSelection.length === 0) {
+        return false
+      } else {
+        return true
+      }
+    },
+    // 新增设备
+    add() {
+      this.dialogFormVisible = true
+      this.editShow = true
+      this.$refs.editconfig.initDialog('create', this.dialogFormVisible)
+    },
+    // 编辑燃气配置信息
+    edit(row) {
+      this.dialogFormVisible = true
+      this.editShow = true
+      this.$refs.editconfig.initDialog('update', this.dialogFormVisible, row)
+    },
+    // 批量导入燃气配置
+    uploadFile(param) {
+      // 判断文件大小是否符合要求
+      const _file = param.file
+      const isLt5M = _file.size / 1024 / 1024 < 5
+      if (!isLt5M) {
+        this.$message.error('请上传5M以下的excel文件')
+        return false
+      }
+      // 全屏加载动画
+      const loading = this.$loading({
+        lock: true,
+        text: '导入中,请稍后...',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
+      })
+      // 发起导入请求
+      batchImportLiquidConfig(_file).then(res => {
+        loading.close() // 关闭加载动画
+        if (res.code === 200) {
+          this.$message.success('导入成功')
+          this.fetchData(false)
+        } else {
+          this.$message.error(res.message)
+        }
+      }).catch(error => {
+        loading.close() // 关闭加载动画
+        this.$message.error(error.message)
+      })
+      this.fileList = []
+    },
+    // 批量导出
+    batchExport() {
+      console.log('批量导出燃气配置')
+      // 全屏加载动画
+      const loading = this.$loading({
+        lock: true,
+        text: '数据处理中,请稍后...',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
+      })
+      batchExportLiquidConfig(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
+      }
+      getLiquidConfigList(this.listQuery).then(response => {
+        this.list = response.data.rows
+        this.total = parseInt(response.data.total)
+        this.listLoading = false
+      })
+    },
+    // 加载组织机构树形下拉菜单
+    fetchDeptTree: function() {
+      getDeptTreeList().then(response => {
+        if (response.data.list) {
+          if (response.data.list.length > 1) {
+            console.log(this.$store.getters.deptId)
+            if (judgeTree(response.data.list)) {
+              this.deptTreeList = toTreeList(response.data.list)
+              this.showDeptTree = 1
+            } else {
+              this.deptTreeList = response.data.list
+              this.showDeptTree = 2
+            }
+            console.log(this.deptTreeList)
+          } else {
+            this.showDeptTree = 0
+          }
+        }
+      })
+    },
+    indexMethod(index) {
+      return this.listQuery.limit * (this.listQuery.offset - 1) + index + 1
+    },
+    // 改变页容量
+    handleSizeChange(val) {
+      this.listQuery.limit = val
+      this.fetchData()
+    },
+    // 改变当前页
+    handleCurrentChange(val) {
+      this.listQuery.offset = val
+      this.fetchData()
+    },
+    // 多选触发方法
+    handleSelectionChange(val) {
+      this.multipleSelection = val
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .app-container{
+    padding: 10px;
+  }
+  $tableTitleHeight:46px;
+  .table{
+    margin-bottom: 20px;
+  }
+  .pagination-container{
+    margin-bottom: 50px;
+  }
+  .table-title{
+    background-color:rgba(243, 243, 243, 1);
+    height: $tableTitleHeight;
+    .title-header{
+      line-height:$tableTitleHeight;
+      color: #606266;
+      font-size: 15px;
+      i{
+        margin-left: 5px;
+        margin-right: 5px;
+      }
+    }
+  }
+  .edit_btns{
+    .edit_btn{
+      float:right;
+      margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2
+    }
+  }
+</style>
diff --git a/src/views/deviceConfig/liquidConfig/listTempConfig.vue b/src/views/deviceConfig/liquidConfig/listTempConfig.vue
new file mode 100644
index 0000000..27b4611
--- /dev/null
+++ b/src/views/deviceConfig/liquidConfig/listTempConfig.vue
@@ -0,0 +1,337 @@
+<template>
+  <div class="app-container">
+    <!--筛选条件-->
+    <div class="search-div">
+      <el-form ref="selectForm" :inline="true" :model="listQuery" class="form-container">
+        <el-row>
+          <el-form-item class="selectForm-container-item" prop="keywords">
+            <el-input v-model.trim="listQuery.keywords" placeholder="设备编号" clearable/>
+          </el-form-item>
+          <el-form-item class="selectForm-container-item">
+            <dept-select v-model="listQuery.deptid" :need-top="deptShowTop" dept-type="03" placeholder="选择权属单位"/>
+          </el-form-item>
+          <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
+        </el-row>
+      </el-form>
+    </div>
+    <!--查询结果Table显示-->
+    <div>
+      <el-row class="table-title">
+        <el-col :span="6"><div class="title-header"><i class="el-icon-menu"/>数据列表</div></el-col>
+        <el-col :span="12" :offset="6" class="edit_btns">
+          <el-button v-if="hasPerm('/liquidConfig/batchExport')" class="edit_btn" size="small" @click="batchExport">导出记录</el-button>
+          <download-template :filename="filename"/>
+          <el-upload
+            v-if="hasPerm('/liquidConfig/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('/liquidConfig/batchImport')" slot="trigger" size="small">批量导入</el-button>
+          </el-upload>
+          <el-button v-if="hasPerm('/liquidConfig/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-temp-config v-show="editShow" ref="editconfig" @watchChild="fetchData"/>
+  </div>
+</template>
+
+<script>
+import { judgeTree, toTreeList } from '@/utils/structure'
+import selectTree from '@/components/SelectTree/singleSelect'
+import { getLiquidConfigList, batchImportLiquidConfig, batchExportLiquidConfig } from '@/api/liquidconfig'
+import { getDeptTreeList } from '@/api/dept'
+import EditGasConfig from './editGasConfig'
+import DownloadTemplate from '@/components/DownloadTemplate/index'
+import DeptSelect from '@/components/DeptSelect/index'
+import EditTempConfig from './editTempConfig'
+
+export default {
+  name: 'ListTempConfig',
+  components: { EditTempConfig, DeptSelect, DownloadTemplate, EditGasConfig, selectTree },
+  data() {
+    return {
+      listQuery: {
+        keywords: '',
+        offset: 1,
+        limit: 20,
+        sort: '',
+        order: ''
+      }, // 筛选条件
+      columns: [
+        {
+          text: '设备编号',
+          value: 'devcode',
+          align: 'center'
+        },
+        {
+          text: '重传次数',
+          value: 'retryTimes',
+          align: 'center'
+        },
+        {
+          text: '采集时间',
+          value: 'collectTime',
+          align: 'center'
+        },
+        {
+          text: '采集间隔',
+          value: 'collectCycle',
+          align: 'center'
+        },
+        {
+          text: '采集次数',
+          value: 'collectTimes',
+          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: 'config_template.xlsx',
+      deptShowTop: false,
+      fileList: []
+    }
+  },
+  created() {
+    this.fetchDeptTree()// 获取部门树
+    this.fetchData()// 获取数据
+  },
+  methods: {
+    // 打开详情对话框
+    checkSelection() {
+      if (this.multipleSelection.length === 0) {
+        return false
+      } else {
+        return true
+      }
+    },
+    // 新增设备
+    add() {
+      this.dialogFormVisible = true
+      this.editShow = true
+      this.$refs.editconfig.initDialog('create', this.dialogFormVisible)
+    },
+    // 编辑燃气配置信息
+    edit(row) {
+      this.dialogFormVisible = true
+      this.editShow = true
+      this.$refs.editconfig.initDialog('update', this.dialogFormVisible, row)
+    },
+    // 批量导入燃气配置
+    uploadFile(param) {
+      // 判断文件大小是否符合要求
+      const _file = param.file
+      const isLt5M = _file.size / 1024 / 1024 < 5
+      if (!isLt5M) {
+        this.$message.error('请上传5M以下的excel文件')
+        return false
+      }
+      // 全屏加载动画
+      const loading = this.$loading({
+        lock: true,
+        text: '导入中,请稍后...',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
+      })
+      // 发起导入请求
+      batchImportLiquidConfig(_file).then(res => {
+        loading.close() // 关闭加载动画
+        if (res.code === 200) {
+          this.$message.success('导入成功')
+          this.fetchData(false)
+        } else {
+          this.$message.error(res.message)
+        }
+      }).catch(error => {
+        loading.close() // 关闭加载动画
+        this.$message.error(error.message)
+      })
+      this.fileList = []
+    },
+    // 批量导出
+    batchExport() {
+      console.log('批量导出燃气配置')
+      // 全屏加载动画
+      const loading = this.$loading({
+        lock: true,
+        text: '数据处理中,请稍后...',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
+      })
+      batchExportLiquidConfig(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
+      }
+      getLiquidConfigList(this.listQuery).then(response => {
+        this.list = response.data.rows
+        this.total = parseInt(response.data.total)
+        this.listLoading = false
+      })
+    },
+    // 加载组织机构树形下拉菜单
+    fetchDeptTree: function() {
+      getDeptTreeList().then(response => {
+        if (response.data.list) {
+          if (response.data.list.length > 1) {
+            console.log(this.$store.getters.deptId)
+            if (judgeTree(response.data.list)) {
+              this.deptTreeList = toTreeList(response.data.list)
+              this.showDeptTree = 1
+            } else {
+              this.deptTreeList = response.data.list
+              this.showDeptTree = 2
+            }
+            console.log(this.deptTreeList)
+          } else {
+            this.showDeptTree = 0
+          }
+        }
+      })
+    },
+    indexMethod(index) {
+      return this.listQuery.limit * (this.listQuery.offset - 1) + index + 1
+    },
+    // 改变页容量
+    handleSizeChange(val) {
+      this.listQuery.limit = val
+      this.fetchData()
+    },
+    // 改变当前页
+    handleCurrentChange(val) {
+      this.listQuery.offset = val
+      this.fetchData()
+    },
+    // 多选触发方法
+    handleSelectionChange(val) {
+      this.multipleSelection = val
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .app-container{
+    padding: 10px;
+  }
+  $tableTitleHeight:46px;
+  .table{
+    margin-bottom: 20px;
+  }
+  .pagination-container{
+    margin-bottom: 50px;
+  }
+  .table-title{
+    background-color:rgba(243, 243, 243, 1);
+    height: $tableTitleHeight;
+    .title-header{
+      line-height:$tableTitleHeight;
+      color: #606266;
+      font-size: 15px;
+      i{
+        margin-left: 5px;
+        margin-right: 5px;
+      }
+    }
+  }
+  .edit_btns{
+    .edit_btn{
+      float:right;
+      margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2
+    }
+  }
+</style>