diff --git a/src/api/data.js b/src/api/data.js
index 7be32bb..66bb327 100644
--- a/src/api/data.js
+++ b/src/api/data.js
@@ -64,6 +64,33 @@
   })
 }
 
+// 水质监测仪数据查询
+export function getMeterData(params) {
+  return request({
+    url: 'meterdata/list',
+    method: 'get',
+    params
+  })
+}
+
+// 流量数据查询
+export function getFlowData(params) {
+  return request({
+    url: 'flowdata/list',
+    method: 'get',
+    params
+  })
+}
+
+// 雨量计数据查询
+export function getHyetoData(params) {
+  return request({
+    url: 'hyetodata/list',
+    method: 'get',
+    params
+  })
+}
+
 // 批量导出井盖数据
 export function batchExportWellData(params) {
   return request({
@@ -140,3 +167,34 @@
     responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
   })
 }
+
+export function batchExportMeterData(params) {
+  return request({
+    url: 'meterdata/export',
+    method: 'get',
+    timeout: 120000, // 120s，2分钟
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+export function batchExportFlowData(params) {
+  return request({
+    url: 'flowdata/export',
+    method: 'get',
+    timeout: 120000, // 120s，2分钟
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 雨量计数据导出
+export function batchExportHyetoData(params) {
+  return request({
+    url: 'hyetodata/export',
+    method: 'get',
+    timeout: 120000, // 120s，2分钟
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}

diff --git a/src/api/data.js b/src/api/data.js
index 7be32bb..66bb327 100644
--- a/src/api/data.js
+++ b/src/api/data.js
@@ -64,6 +64,33 @@
   })
 }
 
+// 水质监测仪数据查询
+export function getMeterData(params) {
+  return request({
+    url: 'meterdata/list',
+    method: 'get',
+    params
+  })
+}
+
+// 流量数据查询
+export function getFlowData(params) {
+  return request({
+    url: 'flowdata/list',
+    method: 'get',
+    params
+  })
+}
+
+// 雨量计数据查询
+export function getHyetoData(params) {
+  return request({
+    url: 'hyetodata/list',
+    method: 'get',
+    params
+  })
+}
+
 // 批量导出井盖数据
 export function batchExportWellData(params) {
   return request({
@@ -140,3 +167,34 @@
     responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
   })
 }
+
+export function batchExportMeterData(params) {
+  return request({
+    url: 'meterdata/export',
+    method: 'get',
+    timeout: 120000, // 120s，2分钟
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+export function batchExportFlowData(params) {
+  return request({
+    url: 'flowdata/export',
+    method: 'get',
+    timeout: 120000, // 120s，2分钟
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 雨量计数据导出
+export function batchExportHyetoData(params) {
+  return request({
+    url: 'hyetodata/export',
+    method: 'get',
+    timeout: 120000, // 120s，2分钟
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
diff --git a/src/views/dataManage/dataManage.vue b/src/views/dataManage/dataManage.vue
index 4c0f6b6..39a3d89 100644
--- a/src/views/dataManage/dataManage.vue
+++ b/src/views/dataManage/dataManage.vue
@@ -22,6 +22,15 @@
       <el-tab-pane v-if="hasPerm('/welllocadata/list')" label="井盖定位监测仪" name="wellloca">
         <list-well-loca-data ref="welllocadatacomp"/>
       </el-tab-pane>
+      <el-tab-pane v-if="hasPerm('/hyetodata/list')" label="雨量计" name="hyetometer">
+        <list-hyetometer-data ref="hyetometerdatacomp"/>
+      </el-tab-pane>
+      <el-tab-pane v-if="hasPerm('/flowdata/list')" label="流量计" name="flowmeter">
+        <list-flowmeter-data ref="flowmeterdatacomp"/>
+      </el-tab-pane>
+      <el-tab-pane v-if="hasPerm('/meterdata/list')" label="水质监测仪" name="meter">
+        <list-meter-data ref="meterdatacomp"/>
+      </el-tab-pane>
     </el-tabs>
   </div>
 </template>
@@ -34,9 +43,12 @@
 import ListHarmfulData from './deviceData/listHarmfulData'
 import ListTempData from './deviceData/listTempData'
 import ListWellLocaData from './deviceData/listWellLocaData'
+import ListHyetometerData from './deviceData/listHyetometerData'
+import ListFlowmeterData from './deviceData/listFlowmeterData'
+import ListMeterData from './deviceData/listMeterData'
 export default {
   name: 'DataManage',
-  components: { ListWellLocaData, ListTempData, ListHarmfulData, ListDigData, ListGasData, ListLiquidData, ListWellCoverData },
+  components: { ListMeterData, ListFlowmeterData, ListHyetometerData, ListWellLocaData, ListTempData, ListHarmfulData, ListDigData, ListGasData, ListLiquidData, ListWellCoverData },
   data() {
     return {
       activeName: 'wellcover'
@@ -66,6 +78,12 @@
             this.activeName = 'dig'
           } else if (value === '7') {
             this.activeName = 'wellloca'
+          } else if (value === '8') {
+            this.activeName = 'hyetometer'
+          } else if (value === '9') {
+            this.activeName = 'flowmeter'
+          } else if (value === '10') {
+            this.activeName = 'meter'
           }
         }
       }
@@ -85,6 +103,12 @@
         this.activeName = 'dig'
       } else if (this.$route.params.deviceType === '7') {
         this.activeName = 'wellloca'
+      } else if (this.$route.params.deviceType === '8') {
+        this.activeName = 'hyetometer'
+      } else if (this.$route.params.deviceType === '9') {
+        this.activeName = 'flowmeter'
+      } else if (this.$route.params.deviceType === '10') {
+        this.activeName = 'meter'
       }
     }
   },
@@ -104,6 +128,12 @@
         this.$refs.digdatacomp.fetchData()
       } else if (tab.name === 'wellloca') {
         this.$refs.welllocadatacomp.fetchData()
+      } else if (tab.name === 'hyetometer') {
+        this.$refs.hyetometerdatacomp.fetchData()
+      } else if (tab.name === 'flowmeter') {
+        this.$refs.flowmeterdatacomp.fetchData()
+      } else if (tab.name === 'meter') {
+        this.$refs.meterdatacomp.fetchData()
       }
     }
   }

diff --git a/src/api/data.js b/src/api/data.js
index 7be32bb..66bb327 100644
--- a/src/api/data.js
+++ b/src/api/data.js
@@ -64,6 +64,33 @@
   })
 }
 
+// 水质监测仪数据查询
+export function getMeterData(params) {
+  return request({
+    url: 'meterdata/list',
+    method: 'get',
+    params
+  })
+}
+
+// 流量数据查询
+export function getFlowData(params) {
+  return request({
+    url: 'flowdata/list',
+    method: 'get',
+    params
+  })
+}
+
+// 雨量计数据查询
+export function getHyetoData(params) {
+  return request({
+    url: 'hyetodata/list',
+    method: 'get',
+    params
+  })
+}
+
 // 批量导出井盖数据
 export function batchExportWellData(params) {
   return request({
@@ -140,3 +167,34 @@
     responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
   })
 }
+
+export function batchExportMeterData(params) {
+  return request({
+    url: 'meterdata/export',
+    method: 'get',
+    timeout: 120000, // 120s，2分钟
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+export function batchExportFlowData(params) {
+  return request({
+    url: 'flowdata/export',
+    method: 'get',
+    timeout: 120000, // 120s，2分钟
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 雨量计数据导出
+export function batchExportHyetoData(params) {
+  return request({
+    url: 'hyetodata/export',
+    method: 'get',
+    timeout: 120000, // 120s，2分钟
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
diff --git a/src/views/dataManage/dataManage.vue b/src/views/dataManage/dataManage.vue
index 4c0f6b6..39a3d89 100644
--- a/src/views/dataManage/dataManage.vue
+++ b/src/views/dataManage/dataManage.vue
@@ -22,6 +22,15 @@
       <el-tab-pane v-if="hasPerm('/welllocadata/list')" label="井盖定位监测仪" name="wellloca">
         <list-well-loca-data ref="welllocadatacomp"/>
       </el-tab-pane>
+      <el-tab-pane v-if="hasPerm('/hyetodata/list')" label="雨量计" name="hyetometer">
+        <list-hyetometer-data ref="hyetometerdatacomp"/>
+      </el-tab-pane>
+      <el-tab-pane v-if="hasPerm('/flowdata/list')" label="流量计" name="flowmeter">
+        <list-flowmeter-data ref="flowmeterdatacomp"/>
+      </el-tab-pane>
+      <el-tab-pane v-if="hasPerm('/meterdata/list')" label="水质监测仪" name="meter">
+        <list-meter-data ref="meterdatacomp"/>
+      </el-tab-pane>
     </el-tabs>
   </div>
 </template>
@@ -34,9 +43,12 @@
 import ListHarmfulData from './deviceData/listHarmfulData'
 import ListTempData from './deviceData/listTempData'
 import ListWellLocaData from './deviceData/listWellLocaData'
+import ListHyetometerData from './deviceData/listHyetometerData'
+import ListFlowmeterData from './deviceData/listFlowmeterData'
+import ListMeterData from './deviceData/listMeterData'
 export default {
   name: 'DataManage',
-  components: { ListWellLocaData, ListTempData, ListHarmfulData, ListDigData, ListGasData, ListLiquidData, ListWellCoverData },
+  components: { ListMeterData, ListFlowmeterData, ListHyetometerData, ListWellLocaData, ListTempData, ListHarmfulData, ListDigData, ListGasData, ListLiquidData, ListWellCoverData },
   data() {
     return {
       activeName: 'wellcover'
@@ -66,6 +78,12 @@
             this.activeName = 'dig'
           } else if (value === '7') {
             this.activeName = 'wellloca'
+          } else if (value === '8') {
+            this.activeName = 'hyetometer'
+          } else if (value === '9') {
+            this.activeName = 'flowmeter'
+          } else if (value === '10') {
+            this.activeName = 'meter'
           }
         }
       }
@@ -85,6 +103,12 @@
         this.activeName = 'dig'
       } else if (this.$route.params.deviceType === '7') {
         this.activeName = 'wellloca'
+      } else if (this.$route.params.deviceType === '8') {
+        this.activeName = 'hyetometer'
+      } else if (this.$route.params.deviceType === '9') {
+        this.activeName = 'flowmeter'
+      } else if (this.$route.params.deviceType === '10') {
+        this.activeName = 'meter'
       }
     }
   },
@@ -104,6 +128,12 @@
         this.$refs.digdatacomp.fetchData()
       } else if (tab.name === 'wellloca') {
         this.$refs.welllocadatacomp.fetchData()
+      } else if (tab.name === 'hyetometer') {
+        this.$refs.hyetometerdatacomp.fetchData()
+      } else if (tab.name === 'flowmeter') {
+        this.$refs.flowmeterdatacomp.fetchData()
+      } else if (tab.name === 'meter') {
+        this.$refs.meterdatacomp.fetchData()
       }
     }
   }
diff --git a/src/views/dataManage/deviceData/listDigData.vue b/src/views/dataManage/deviceData/listDigData.vue
index cc9fd31..cd8de5e 100644
--- a/src/views/dataManage/deviceData/listDigData.vue
+++ b/src/views/dataManage/deviceData/listDigData.vue
@@ -202,7 +202,7 @@
         const downloadElement = document.createElement('a')
         const href = window.URL.createObjectURL(blob) // 创建下载的链接
         downloadElement.href = href
-        downloadElement.download = `开挖监测仪数s据.xlsx` // 下载后文件名
+        downloadElement.download = `开挖监测仪数据.xlsx` // 下载后文件名
         document.body.appendChild(downloadElement)
         downloadElement.click() // 点击下载
         document.body.removeChild(downloadElement) // 下载完成移除元素

diff --git a/src/api/data.js b/src/api/data.js
index 7be32bb..66bb327 100644
--- a/src/api/data.js
+++ b/src/api/data.js
@@ -64,6 +64,33 @@
   })
 }
 
+// 水质监测仪数据查询
+export function getMeterData(params) {
+  return request({
+    url: 'meterdata/list',
+    method: 'get',
+    params
+  })
+}
+
+// 流量数据查询
+export function getFlowData(params) {
+  return request({
+    url: 'flowdata/list',
+    method: 'get',
+    params
+  })
+}
+
+// 雨量计数据查询
+export function getHyetoData(params) {
+  return request({
+    url: 'hyetodata/list',
+    method: 'get',
+    params
+  })
+}
+
 // 批量导出井盖数据
 export function batchExportWellData(params) {
   return request({
@@ -140,3 +167,34 @@
     responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
   })
 }
+
+export function batchExportMeterData(params) {
+  return request({
+    url: 'meterdata/export',
+    method: 'get',
+    timeout: 120000, // 120s，2分钟
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+export function batchExportFlowData(params) {
+  return request({
+    url: 'flowdata/export',
+    method: 'get',
+    timeout: 120000, // 120s，2分钟
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 雨量计数据导出
+export function batchExportHyetoData(params) {
+  return request({
+    url: 'hyetodata/export',
+    method: 'get',
+    timeout: 120000, // 120s，2分钟
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
diff --git a/src/views/dataManage/dataManage.vue b/src/views/dataManage/dataManage.vue
index 4c0f6b6..39a3d89 100644
--- a/src/views/dataManage/dataManage.vue
+++ b/src/views/dataManage/dataManage.vue
@@ -22,6 +22,15 @@
       <el-tab-pane v-if="hasPerm('/welllocadata/list')" label="井盖定位监测仪" name="wellloca">
         <list-well-loca-data ref="welllocadatacomp"/>
       </el-tab-pane>
+      <el-tab-pane v-if="hasPerm('/hyetodata/list')" label="雨量计" name="hyetometer">
+        <list-hyetometer-data ref="hyetometerdatacomp"/>
+      </el-tab-pane>
+      <el-tab-pane v-if="hasPerm('/flowdata/list')" label="流量计" name="flowmeter">
+        <list-flowmeter-data ref="flowmeterdatacomp"/>
+      </el-tab-pane>
+      <el-tab-pane v-if="hasPerm('/meterdata/list')" label="水质监测仪" name="meter">
+        <list-meter-data ref="meterdatacomp"/>
+      </el-tab-pane>
     </el-tabs>
   </div>
 </template>
@@ -34,9 +43,12 @@
 import ListHarmfulData from './deviceData/listHarmfulData'
 import ListTempData from './deviceData/listTempData'
 import ListWellLocaData from './deviceData/listWellLocaData'
+import ListHyetometerData from './deviceData/listHyetometerData'
+import ListFlowmeterData from './deviceData/listFlowmeterData'
+import ListMeterData from './deviceData/listMeterData'
 export default {
   name: 'DataManage',
-  components: { ListWellLocaData, ListTempData, ListHarmfulData, ListDigData, ListGasData, ListLiquidData, ListWellCoverData },
+  components: { ListMeterData, ListFlowmeterData, ListHyetometerData, ListWellLocaData, ListTempData, ListHarmfulData, ListDigData, ListGasData, ListLiquidData, ListWellCoverData },
   data() {
     return {
       activeName: 'wellcover'
@@ -66,6 +78,12 @@
             this.activeName = 'dig'
           } else if (value === '7') {
             this.activeName = 'wellloca'
+          } else if (value === '8') {
+            this.activeName = 'hyetometer'
+          } else if (value === '9') {
+            this.activeName = 'flowmeter'
+          } else if (value === '10') {
+            this.activeName = 'meter'
           }
         }
       }
@@ -85,6 +103,12 @@
         this.activeName = 'dig'
       } else if (this.$route.params.deviceType === '7') {
         this.activeName = 'wellloca'
+      } else if (this.$route.params.deviceType === '8') {
+        this.activeName = 'hyetometer'
+      } else if (this.$route.params.deviceType === '9') {
+        this.activeName = 'flowmeter'
+      } else if (this.$route.params.deviceType === '10') {
+        this.activeName = 'meter'
       }
     }
   },
@@ -104,6 +128,12 @@
         this.$refs.digdatacomp.fetchData()
       } else if (tab.name === 'wellloca') {
         this.$refs.welllocadatacomp.fetchData()
+      } else if (tab.name === 'hyetometer') {
+        this.$refs.hyetometerdatacomp.fetchData()
+      } else if (tab.name === 'flowmeter') {
+        this.$refs.flowmeterdatacomp.fetchData()
+      } else if (tab.name === 'meter') {
+        this.$refs.meterdatacomp.fetchData()
       }
     }
   }
diff --git a/src/views/dataManage/deviceData/listDigData.vue b/src/views/dataManage/deviceData/listDigData.vue
index cc9fd31..cd8de5e 100644
--- a/src/views/dataManage/deviceData/listDigData.vue
+++ b/src/views/dataManage/deviceData/listDigData.vue
@@ -202,7 +202,7 @@
         const downloadElement = document.createElement('a')
         const href = window.URL.createObjectURL(blob) // 创建下载的链接
         downloadElement.href = href
-        downloadElement.download = `开挖监测仪数s据.xlsx` // 下载后文件名
+        downloadElement.download = `开挖监测仪数据.xlsx` // 下载后文件名
         document.body.appendChild(downloadElement)
         downloadElement.click() // 点击下载
         document.body.removeChild(downloadElement) // 下载完成移除元素
diff --git a/src/views/dataManage/deviceData/listFlowmeterData.vue b/src/views/dataManage/deviceData/listFlowmeterData.vue
new file mode 100644
index 0000000..57a84a4
--- /dev/null
+++ b/src/views/dataManage/deviceData/listFlowmeterData.vue
@@ -0,0 +1,296 @@
+<!--流量计数据-->
+<template>
+  <div class="app-container">
+    <!--筛选条件-->
+    <div class="search-div">
+      <el-form ref="selectForm" :inline="true" :model="listQuery" class="form-container">
+        <el-row>
+          <el-form-item class="selectForm-container-item" prop="keywords">
+            <el-input v-model.trim="listQuery.keywords" placeholder="井编号/设备编号" clearable/>
+          </el-form-item>
+          <el-form-item class="selectForm-container-item">
+            <dept-select v-model="listQuery.deptid" :need-top="deptShowTop" dept-type="03" placeholder="选择权属单位"/>
+          </el-form-item>
+          <el-form-item class="selectForm-container-item" prop="beginTime">
+            <el-date-picker
+              v-model="timeRange"
+              type="datetimerange"
+              range-separator="至"
+              value-format="yyyy-MM-dd HH:mm:ss"
+              start-placeholder="开始时间"
+              end-placeholder="结束时间"/>
+          </el-form-item>
+          <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
+        </el-row>
+      </el-form>
+    </div>
+    <!--查询结果Table显示-->
+    <div>
+      <el-row class="table-title">
+        <el-col :span="6"><div class="title-header"><i class="el-icon-menu"/>数据列表</div></el-col>
+        <el-col :span="12" :offset="6" class="edit_btns">
+          <el-button v-if="hasPerm('/liquiddata/export')" class="edit_btn" size="small" @click="batchExport">导出记录</el-button>
+        </el-col>
+      </el-row>
+      <el-table v-loading="listLoading" :data="list" class="table" border @selection-change="handleSelectionChange">
+        <!--<el-table-column align="center" type="selection" width="55"/>-->
+        <el-table-column :index="indexMethod" align="center" type="index"/>
+        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
+          <template slot-scope="scope">
+            <span v-if="column.checkCell" :class="checkCell(scope.row.cell)">{{ scope.row[column.value] }}</span>
+            <span v-else>{{ scope.row[column.value] }}</span>
+          </template>
+        </el-table-column>
+      </el-table>
+    </div>
+    <!--分页-->
+    <div class="pagination-container">
+      <el-pagination
+        v-show="total>listQuery.limit"
+        :current-page="listQuery.offset"
+        :page-sizes="[20,30,50]"
+        :page-size="listQuery.limit"
+        :total="total"
+        align="center"
+        layout="total, sizes, prev, pager, next"
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"/>
+    </div>
+  </div>
+</template>
+
+<script>
+import selectTree from '@/components/SelectTree/singleSelect'
+import { getFlowData, batchExportFlowData } from '@/api/data'
+import DeptSelect from '../../../components/DeptSelect/index'
+
+export default {
+  name: 'ListFlowmeterData',
+  components: { DeptSelect, selectTree },
+  data() {
+    return {
+      listQuery: {
+        keywords: '', // 关键字
+        deptid: '', // 部门id
+        beginTime: '', // 开始时间
+        endTime: '', // 结束时间
+        offset: 1,
+        limit: 20,
+        sort: '',
+        order: ''
+      }, // 筛选条件
+      timeRange: [], // 时间范围
+      columns: [
+        {
+          text: '井编号',
+          value: 'wellCode',
+          align: 'center'
+        },
+        {
+          text: '设备编号',
+          value: 'devcode',
+          align: 'center'
+        },
+        // {
+        //   text: '设备类型',
+        //   value: 'deviceTypeName',
+        //   align: 'center'
+        // },
+        {
+          text: '水位',
+          value: 'waterLevel',
+          align: 'center'
+        },
+        {
+          text: '流速',
+          value: 'flowVelocity',
+          align: 'center'
+        },
+        {
+          text: '温度',
+          value: 'temperature',
+          align: 'center'
+        },
+        {
+          text: '瞬时流量',
+          value: 'instantFlow',
+          align: 'center'
+        },
+        {
+          text: '累计流量',
+          value: 'totalFlow',
+          align: 'center'
+        },
+        // {
+        //   text: '权属单位',
+        //   value: 'deptName',
+        //   align: 'center'
+        // },
+        {
+          text: '记录时间',
+          value: 'logtime',
+          width: 170,
+          align: 'center'
+        }
+      ], // 显示列
+      multipleSelection: [], // 多选选中项
+      list: [], // 列表数据
+      total: 0, // 数据总数
+      deviceTypeList: [], // 流量计类型列表
+      deptProps: {
+        parent: 'pid',
+        value: 'id',
+        label: 'name',
+        children: 'children'
+      }, // 权属单位树形下拉菜单
+      deptTreeList: null, // 组织树列表数据
+      showDeptTree: 0, // 是否显示权属单位下拉
+      showDeviceType: true, // 是否显示设备类型下拉
+      listLoading: true, // 加载动画
+      fullscreenLoading: false, // 全屏加载动画
+      editShow: false, // 是否显示编辑框
+      detailShow: false, // 是否显示编辑框
+      deptShowTop: false
+    }
+  },
+  watch: {
+    timeRange(val) {
+      if (val && val.length > 0) {
+        this.listQuery.beginTime = val[0]
+        this.listQuery.endTime = val[1]
+      } else {
+        this.listQuery.beginTime = ''
+        this.listQuery.endTime = ''
+      }
+    }
+  },
+  mounted() {
+    if (window.location.href) {
+      var query = window.location.href.split('?')
+      if (query.length > 1) {
+        var values = query[1].split('&')
+        for (var i = 0; i < values.length; i++) {
+          var pos = values[i].indexOf('=')
+          if (pos === -1) continue
+          var paramname = values[i].substring(0, pos)
+          var value = values[i].substring(pos + 1)
+          if (paramname === 'devcode') {
+            this.listQuery.keywords = value
+            this.fetchData()
+          } else {
+            this.fetchData()
+          }
+        }
+      } else {
+        if (this.$route.params && this.$route.params.deviceType === '2' && this.$route.params.devcode && this.$route.params.devcode !== '') {
+          this.listQuery.keywords = this.$route.params.devcode
+          this.fetchData(false)// 获取数据
+        } else {
+          this.fetchData()
+        }
+      }
+    }
+  },
+  methods: {
+    // 批量导出
+    batchExport() {
+      // 全屏加载动画
+      const loading = this.$loading({
+        lock: true,
+        text: '数据处理中,请稍后...',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
+      })
+      batchExportFlowData(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()
+      })
+    },
+    // 查询数据
+    search() {
+      this.fetchData(false)
+    },
+    // 获取流量计数据
+    fetchData(isNowPage = true) {
+      this.listLoading = true
+      if (!isNowPage) { // 是否显示当前页，否则跳转第一页
+        this.listQuery.offset = 1
+      }
+      getFlowData(this.listQuery).then(response => {
+        this.list = response.data.rows
+        this.total = parseInt(response.data.total)
+        this.listLoading = false
+      })
+    },
+    checkCell(value) {
+      var cell = parseFloat(value)
+      if (cell < 10) {
+        return 'warning-state'
+      }
+    },
+    indexMethod(index) {
+      return this.listQuery.limit * (this.listQuery.offset - 1) + index + 1
+    },
+    // 改变页容量
+    handleSizeChange(val) {
+      this.listQuery.limit = val
+      this.fetchData()
+    },
+    // 改变当前页
+    handleCurrentChange(val) {
+      this.listQuery.offset = val
+      this.fetchData()
+    },
+    // 多选触发方法
+    handleSelectionChange(val) {
+      this.multipleSelection = val
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .app-container{
+    padding: 10px;
+  }
+  $tableTitleHeight:46px;
+  .table{
+    margin-bottom: 20px;
+  }
+  .pagination-container{
+    margin-bottom: 50px;
+  }
+  .table-title{
+    background-color:rgba(243, 243, 243, 1);
+    height: $tableTitleHeight;
+    .title-header{
+      line-height:$tableTitleHeight;
+      color: #606266;
+      font-size: 15px;
+      i{
+        margin-left: 5px;
+        margin-right: 5px;
+      }
+    }
+  }
+  .edit_btns{
+    .edit_btn{
+      float:right;
+      margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2
+    }
+  }
+  .warning-state{
+    color:red
+  }
+</style>

diff --git a/src/api/data.js b/src/api/data.js
index 7be32bb..66bb327 100644
--- a/src/api/data.js
+++ b/src/api/data.js
@@ -64,6 +64,33 @@
   })
 }
 
+// 水质监测仪数据查询
+export function getMeterData(params) {
+  return request({
+    url: 'meterdata/list',
+    method: 'get',
+    params
+  })
+}
+
+// 流量数据查询
+export function getFlowData(params) {
+  return request({
+    url: 'flowdata/list',
+    method: 'get',
+    params
+  })
+}
+
+// 雨量计数据查询
+export function getHyetoData(params) {
+  return request({
+    url: 'hyetodata/list',
+    method: 'get',
+    params
+  })
+}
+
 // 批量导出井盖数据
 export function batchExportWellData(params) {
   return request({
@@ -140,3 +167,34 @@
     responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
   })
 }
+
+export function batchExportMeterData(params) {
+  return request({
+    url: 'meterdata/export',
+    method: 'get',
+    timeout: 120000, // 120s，2分钟
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+export function batchExportFlowData(params) {
+  return request({
+    url: 'flowdata/export',
+    method: 'get',
+    timeout: 120000, // 120s，2分钟
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 雨量计数据导出
+export function batchExportHyetoData(params) {
+  return request({
+    url: 'hyetodata/export',
+    method: 'get',
+    timeout: 120000, // 120s，2分钟
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
diff --git a/src/views/dataManage/dataManage.vue b/src/views/dataManage/dataManage.vue
index 4c0f6b6..39a3d89 100644
--- a/src/views/dataManage/dataManage.vue
+++ b/src/views/dataManage/dataManage.vue
@@ -22,6 +22,15 @@
       <el-tab-pane v-if="hasPerm('/welllocadata/list')" label="井盖定位监测仪" name="wellloca">
         <list-well-loca-data ref="welllocadatacomp"/>
       </el-tab-pane>
+      <el-tab-pane v-if="hasPerm('/hyetodata/list')" label="雨量计" name="hyetometer">
+        <list-hyetometer-data ref="hyetometerdatacomp"/>
+      </el-tab-pane>
+      <el-tab-pane v-if="hasPerm('/flowdata/list')" label="流量计" name="flowmeter">
+        <list-flowmeter-data ref="flowmeterdatacomp"/>
+      </el-tab-pane>
+      <el-tab-pane v-if="hasPerm('/meterdata/list')" label="水质监测仪" name="meter">
+        <list-meter-data ref="meterdatacomp"/>
+      </el-tab-pane>
     </el-tabs>
   </div>
 </template>
@@ -34,9 +43,12 @@
 import ListHarmfulData from './deviceData/listHarmfulData'
 import ListTempData from './deviceData/listTempData'
 import ListWellLocaData from './deviceData/listWellLocaData'
+import ListHyetometerData from './deviceData/listHyetometerData'
+import ListFlowmeterData from './deviceData/listFlowmeterData'
+import ListMeterData from './deviceData/listMeterData'
 export default {
   name: 'DataManage',
-  components: { ListWellLocaData, ListTempData, ListHarmfulData, ListDigData, ListGasData, ListLiquidData, ListWellCoverData },
+  components: { ListMeterData, ListFlowmeterData, ListHyetometerData, ListWellLocaData, ListTempData, ListHarmfulData, ListDigData, ListGasData, ListLiquidData, ListWellCoverData },
   data() {
     return {
       activeName: 'wellcover'
@@ -66,6 +78,12 @@
             this.activeName = 'dig'
           } else if (value === '7') {
             this.activeName = 'wellloca'
+          } else if (value === '8') {
+            this.activeName = 'hyetometer'
+          } else if (value === '9') {
+            this.activeName = 'flowmeter'
+          } else if (value === '10') {
+            this.activeName = 'meter'
           }
         }
       }
@@ -85,6 +103,12 @@
         this.activeName = 'dig'
       } else if (this.$route.params.deviceType === '7') {
         this.activeName = 'wellloca'
+      } else if (this.$route.params.deviceType === '8') {
+        this.activeName = 'hyetometer'
+      } else if (this.$route.params.deviceType === '9') {
+        this.activeName = 'flowmeter'
+      } else if (this.$route.params.deviceType === '10') {
+        this.activeName = 'meter'
       }
     }
   },
@@ -104,6 +128,12 @@
         this.$refs.digdatacomp.fetchData()
       } else if (tab.name === 'wellloca') {
         this.$refs.welllocadatacomp.fetchData()
+      } else if (tab.name === 'hyetometer') {
+        this.$refs.hyetometerdatacomp.fetchData()
+      } else if (tab.name === 'flowmeter') {
+        this.$refs.flowmeterdatacomp.fetchData()
+      } else if (tab.name === 'meter') {
+        this.$refs.meterdatacomp.fetchData()
       }
     }
   }
diff --git a/src/views/dataManage/deviceData/listDigData.vue b/src/views/dataManage/deviceData/listDigData.vue
index cc9fd31..cd8de5e 100644
--- a/src/views/dataManage/deviceData/listDigData.vue
+++ b/src/views/dataManage/deviceData/listDigData.vue
@@ -202,7 +202,7 @@
         const downloadElement = document.createElement('a')
         const href = window.URL.createObjectURL(blob) // 创建下载的链接
         downloadElement.href = href
-        downloadElement.download = `开挖监测仪数s据.xlsx` // 下载后文件名
+        downloadElement.download = `开挖监测仪数据.xlsx` // 下载后文件名
         document.body.appendChild(downloadElement)
         downloadElement.click() // 点击下载
         document.body.removeChild(downloadElement) // 下载完成移除元素
diff --git a/src/views/dataManage/deviceData/listFlowmeterData.vue b/src/views/dataManage/deviceData/listFlowmeterData.vue
new file mode 100644
index 0000000..57a84a4
--- /dev/null
+++ b/src/views/dataManage/deviceData/listFlowmeterData.vue
@@ -0,0 +1,296 @@
+<!--流量计数据-->
+<template>
+  <div class="app-container">
+    <!--筛选条件-->
+    <div class="search-div">
+      <el-form ref="selectForm" :inline="true" :model="listQuery" class="form-container">
+        <el-row>
+          <el-form-item class="selectForm-container-item" prop="keywords">
+            <el-input v-model.trim="listQuery.keywords" placeholder="井编号/设备编号" clearable/>
+          </el-form-item>
+          <el-form-item class="selectForm-container-item">
+            <dept-select v-model="listQuery.deptid" :need-top="deptShowTop" dept-type="03" placeholder="选择权属单位"/>
+          </el-form-item>
+          <el-form-item class="selectForm-container-item" prop="beginTime">
+            <el-date-picker
+              v-model="timeRange"
+              type="datetimerange"
+              range-separator="至"
+              value-format="yyyy-MM-dd HH:mm:ss"
+              start-placeholder="开始时间"
+              end-placeholder="结束时间"/>
+          </el-form-item>
+          <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
+        </el-row>
+      </el-form>
+    </div>
+    <!--查询结果Table显示-->
+    <div>
+      <el-row class="table-title">
+        <el-col :span="6"><div class="title-header"><i class="el-icon-menu"/>数据列表</div></el-col>
+        <el-col :span="12" :offset="6" class="edit_btns">
+          <el-button v-if="hasPerm('/liquiddata/export')" class="edit_btn" size="small" @click="batchExport">导出记录</el-button>
+        </el-col>
+      </el-row>
+      <el-table v-loading="listLoading" :data="list" class="table" border @selection-change="handleSelectionChange">
+        <!--<el-table-column align="center" type="selection" width="55"/>-->
+        <el-table-column :index="indexMethod" align="center" type="index"/>
+        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
+          <template slot-scope="scope">
+            <span v-if="column.checkCell" :class="checkCell(scope.row.cell)">{{ scope.row[column.value] }}</span>
+            <span v-else>{{ scope.row[column.value] }}</span>
+          </template>
+        </el-table-column>
+      </el-table>
+    </div>
+    <!--分页-->
+    <div class="pagination-container">
+      <el-pagination
+        v-show="total>listQuery.limit"
+        :current-page="listQuery.offset"
+        :page-sizes="[20,30,50]"
+        :page-size="listQuery.limit"
+        :total="total"
+        align="center"
+        layout="total, sizes, prev, pager, next"
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"/>
+    </div>
+  </div>
+</template>
+
+<script>
+import selectTree from '@/components/SelectTree/singleSelect'
+import { getFlowData, batchExportFlowData } from '@/api/data'
+import DeptSelect from '../../../components/DeptSelect/index'
+
+export default {
+  name: 'ListFlowmeterData',
+  components: { DeptSelect, selectTree },
+  data() {
+    return {
+      listQuery: {
+        keywords: '', // 关键字
+        deptid: '', // 部门id
+        beginTime: '', // 开始时间
+        endTime: '', // 结束时间
+        offset: 1,
+        limit: 20,
+        sort: '',
+        order: ''
+      }, // 筛选条件
+      timeRange: [], // 时间范围
+      columns: [
+        {
+          text: '井编号',
+          value: 'wellCode',
+          align: 'center'
+        },
+        {
+          text: '设备编号',
+          value: 'devcode',
+          align: 'center'
+        },
+        // {
+        //   text: '设备类型',
+        //   value: 'deviceTypeName',
+        //   align: 'center'
+        // },
+        {
+          text: '水位',
+          value: 'waterLevel',
+          align: 'center'
+        },
+        {
+          text: '流速',
+          value: 'flowVelocity',
+          align: 'center'
+        },
+        {
+          text: '温度',
+          value: 'temperature',
+          align: 'center'
+        },
+        {
+          text: '瞬时流量',
+          value: 'instantFlow',
+          align: 'center'
+        },
+        {
+          text: '累计流量',
+          value: 'totalFlow',
+          align: 'center'
+        },
+        // {
+        //   text: '权属单位',
+        //   value: 'deptName',
+        //   align: 'center'
+        // },
+        {
+          text: '记录时间',
+          value: 'logtime',
+          width: 170,
+          align: 'center'
+        }
+      ], // 显示列
+      multipleSelection: [], // 多选选中项
+      list: [], // 列表数据
+      total: 0, // 数据总数
+      deviceTypeList: [], // 流量计类型列表
+      deptProps: {
+        parent: 'pid',
+        value: 'id',
+        label: 'name',
+        children: 'children'
+      }, // 权属单位树形下拉菜单
+      deptTreeList: null, // 组织树列表数据
+      showDeptTree: 0, // 是否显示权属单位下拉
+      showDeviceType: true, // 是否显示设备类型下拉
+      listLoading: true, // 加载动画
+      fullscreenLoading: false, // 全屏加载动画
+      editShow: false, // 是否显示编辑框
+      detailShow: false, // 是否显示编辑框
+      deptShowTop: false
+    }
+  },
+  watch: {
+    timeRange(val) {
+      if (val && val.length > 0) {
+        this.listQuery.beginTime = val[0]
+        this.listQuery.endTime = val[1]
+      } else {
+        this.listQuery.beginTime = ''
+        this.listQuery.endTime = ''
+      }
+    }
+  },
+  mounted() {
+    if (window.location.href) {
+      var query = window.location.href.split('?')
+      if (query.length > 1) {
+        var values = query[1].split('&')
+        for (var i = 0; i < values.length; i++) {
+          var pos = values[i].indexOf('=')
+          if (pos === -1) continue
+          var paramname = values[i].substring(0, pos)
+          var value = values[i].substring(pos + 1)
+          if (paramname === 'devcode') {
+            this.listQuery.keywords = value
+            this.fetchData()
+          } else {
+            this.fetchData()
+          }
+        }
+      } else {
+        if (this.$route.params && this.$route.params.deviceType === '2' && this.$route.params.devcode && this.$route.params.devcode !== '') {
+          this.listQuery.keywords = this.$route.params.devcode
+          this.fetchData(false)// 获取数据
+        } else {
+          this.fetchData()
+        }
+      }
+    }
+  },
+  methods: {
+    // 批量导出
+    batchExport() {
+      // 全屏加载动画
+      const loading = this.$loading({
+        lock: true,
+        text: '数据处理中,请稍后...',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
+      })
+      batchExportFlowData(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()
+      })
+    },
+    // 查询数据
+    search() {
+      this.fetchData(false)
+    },
+    // 获取流量计数据
+    fetchData(isNowPage = true) {
+      this.listLoading = true
+      if (!isNowPage) { // 是否显示当前页，否则跳转第一页
+        this.listQuery.offset = 1
+      }
+      getFlowData(this.listQuery).then(response => {
+        this.list = response.data.rows
+        this.total = parseInt(response.data.total)
+        this.listLoading = false
+      })
+    },
+    checkCell(value) {
+      var cell = parseFloat(value)
+      if (cell < 10) {
+        return 'warning-state'
+      }
+    },
+    indexMethod(index) {
+      return this.listQuery.limit * (this.listQuery.offset - 1) + index + 1
+    },
+    // 改变页容量
+    handleSizeChange(val) {
+      this.listQuery.limit = val
+      this.fetchData()
+    },
+    // 改变当前页
+    handleCurrentChange(val) {
+      this.listQuery.offset = val
+      this.fetchData()
+    },
+    // 多选触发方法
+    handleSelectionChange(val) {
+      this.multipleSelection = val
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .app-container{
+    padding: 10px;
+  }
+  $tableTitleHeight:46px;
+  .table{
+    margin-bottom: 20px;
+  }
+  .pagination-container{
+    margin-bottom: 50px;
+  }
+  .table-title{
+    background-color:rgba(243, 243, 243, 1);
+    height: $tableTitleHeight;
+    .title-header{
+      line-height:$tableTitleHeight;
+      color: #606266;
+      font-size: 15px;
+      i{
+        margin-left: 5px;
+        margin-right: 5px;
+      }
+    }
+  }
+  .edit_btns{
+    .edit_btn{
+      float:right;
+      margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2
+    }
+  }
+  .warning-state{
+    color:red
+  }
+</style>
diff --git a/src/views/dataManage/deviceData/listGasData.vue b/src/views/dataManage/deviceData/listGasData.vue
index f77e0e8..cd05595 100644
--- a/src/views/dataManage/deviceData/listGasData.vue
+++ b/src/views/dataManage/deviceData/listGasData.vue
@@ -200,7 +200,7 @@
         const downloadElement = document.createElement('a')
         const href = window.URL.createObjectURL(blob) // 创建下载的链接
         downloadElement.href = href
-        downloadElement.download = `燃气监测仪数s据.xlsx` // 下载后文件名
+        downloadElement.download = `有害气体监测仪数据.xlsx` // 下载后文件名
         document.body.appendChild(downloadElement)
         downloadElement.click() // 点击下载
         document.body.removeChild(downloadElement) // 下载完成移除元素

diff --git a/src/api/data.js b/src/api/data.js
index 7be32bb..66bb327 100644
--- a/src/api/data.js
+++ b/src/api/data.js
@@ -64,6 +64,33 @@
   })
 }
 
+// 水质监测仪数据查询
+export function getMeterData(params) {
+  return request({
+    url: 'meterdata/list',
+    method: 'get',
+    params
+  })
+}
+
+// 流量数据查询
+export function getFlowData(params) {
+  return request({
+    url: 'flowdata/list',
+    method: 'get',
+    params
+  })
+}
+
+// 雨量计数据查询
+export function getHyetoData(params) {
+  return request({
+    url: 'hyetodata/list',
+    method: 'get',
+    params
+  })
+}
+
 // 批量导出井盖数据
 export function batchExportWellData(params) {
   return request({
@@ -140,3 +167,34 @@
     responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
   })
 }
+
+export function batchExportMeterData(params) {
+  return request({
+    url: 'meterdata/export',
+    method: 'get',
+    timeout: 120000, // 120s，2分钟
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+export function batchExportFlowData(params) {
+  return request({
+    url: 'flowdata/export',
+    method: 'get',
+    timeout: 120000, // 120s，2分钟
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 雨量计数据导出
+export function batchExportHyetoData(params) {
+  return request({
+    url: 'hyetodata/export',
+    method: 'get',
+    timeout: 120000, // 120s，2分钟
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
diff --git a/src/views/dataManage/dataManage.vue b/src/views/dataManage/dataManage.vue
index 4c0f6b6..39a3d89 100644
--- a/src/views/dataManage/dataManage.vue
+++ b/src/views/dataManage/dataManage.vue
@@ -22,6 +22,15 @@
       <el-tab-pane v-if="hasPerm('/welllocadata/list')" label="井盖定位监测仪" name="wellloca">
         <list-well-loca-data ref="welllocadatacomp"/>
       </el-tab-pane>
+      <el-tab-pane v-if="hasPerm('/hyetodata/list')" label="雨量计" name="hyetometer">
+        <list-hyetometer-data ref="hyetometerdatacomp"/>
+      </el-tab-pane>
+      <el-tab-pane v-if="hasPerm('/flowdata/list')" label="流量计" name="flowmeter">
+        <list-flowmeter-data ref="flowmeterdatacomp"/>
+      </el-tab-pane>
+      <el-tab-pane v-if="hasPerm('/meterdata/list')" label="水质监测仪" name="meter">
+        <list-meter-data ref="meterdatacomp"/>
+      </el-tab-pane>
     </el-tabs>
   </div>
 </template>
@@ -34,9 +43,12 @@
 import ListHarmfulData from './deviceData/listHarmfulData'
 import ListTempData from './deviceData/listTempData'
 import ListWellLocaData from './deviceData/listWellLocaData'
+import ListHyetometerData from './deviceData/listHyetometerData'
+import ListFlowmeterData from './deviceData/listFlowmeterData'
+import ListMeterData from './deviceData/listMeterData'
 export default {
   name: 'DataManage',
-  components: { ListWellLocaData, ListTempData, ListHarmfulData, ListDigData, ListGasData, ListLiquidData, ListWellCoverData },
+  components: { ListMeterData, ListFlowmeterData, ListHyetometerData, ListWellLocaData, ListTempData, ListHarmfulData, ListDigData, ListGasData, ListLiquidData, ListWellCoverData },
   data() {
     return {
       activeName: 'wellcover'
@@ -66,6 +78,12 @@
             this.activeName = 'dig'
           } else if (value === '7') {
             this.activeName = 'wellloca'
+          } else if (value === '8') {
+            this.activeName = 'hyetometer'
+          } else if (value === '9') {
+            this.activeName = 'flowmeter'
+          } else if (value === '10') {
+            this.activeName = 'meter'
           }
         }
       }
@@ -85,6 +103,12 @@
         this.activeName = 'dig'
       } else if (this.$route.params.deviceType === '7') {
         this.activeName = 'wellloca'
+      } else if (this.$route.params.deviceType === '8') {
+        this.activeName = 'hyetometer'
+      } else if (this.$route.params.deviceType === '9') {
+        this.activeName = 'flowmeter'
+      } else if (this.$route.params.deviceType === '10') {
+        this.activeName = 'meter'
       }
     }
   },
@@ -104,6 +128,12 @@
         this.$refs.digdatacomp.fetchData()
       } else if (tab.name === 'wellloca') {
         this.$refs.welllocadatacomp.fetchData()
+      } else if (tab.name === 'hyetometer') {
+        this.$refs.hyetometerdatacomp.fetchData()
+      } else if (tab.name === 'flowmeter') {
+        this.$refs.flowmeterdatacomp.fetchData()
+      } else if (tab.name === 'meter') {
+        this.$refs.meterdatacomp.fetchData()
       }
     }
   }
diff --git a/src/views/dataManage/deviceData/listDigData.vue b/src/views/dataManage/deviceData/listDigData.vue
index cc9fd31..cd8de5e 100644
--- a/src/views/dataManage/deviceData/listDigData.vue
+++ b/src/views/dataManage/deviceData/listDigData.vue
@@ -202,7 +202,7 @@
         const downloadElement = document.createElement('a')
         const href = window.URL.createObjectURL(blob) // 创建下载的链接
         downloadElement.href = href
-        downloadElement.download = `开挖监测仪数s据.xlsx` // 下载后文件名
+        downloadElement.download = `开挖监测仪数据.xlsx` // 下载后文件名
         document.body.appendChild(downloadElement)
         downloadElement.click() // 点击下载
         document.body.removeChild(downloadElement) // 下载完成移除元素
diff --git a/src/views/dataManage/deviceData/listFlowmeterData.vue b/src/views/dataManage/deviceData/listFlowmeterData.vue
new file mode 100644
index 0000000..57a84a4
--- /dev/null
+++ b/src/views/dataManage/deviceData/listFlowmeterData.vue
@@ -0,0 +1,296 @@
+<!--流量计数据-->
+<template>
+  <div class="app-container">
+    <!--筛选条件-->
+    <div class="search-div">
+      <el-form ref="selectForm" :inline="true" :model="listQuery" class="form-container">
+        <el-row>
+          <el-form-item class="selectForm-container-item" prop="keywords">
+            <el-input v-model.trim="listQuery.keywords" placeholder="井编号/设备编号" clearable/>
+          </el-form-item>
+          <el-form-item class="selectForm-container-item">
+            <dept-select v-model="listQuery.deptid" :need-top="deptShowTop" dept-type="03" placeholder="选择权属单位"/>
+          </el-form-item>
+          <el-form-item class="selectForm-container-item" prop="beginTime">
+            <el-date-picker
+              v-model="timeRange"
+              type="datetimerange"
+              range-separator="至"
+              value-format="yyyy-MM-dd HH:mm:ss"
+              start-placeholder="开始时间"
+              end-placeholder="结束时间"/>
+          </el-form-item>
+          <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
+        </el-row>
+      </el-form>
+    </div>
+    <!--查询结果Table显示-->
+    <div>
+      <el-row class="table-title">
+        <el-col :span="6"><div class="title-header"><i class="el-icon-menu"/>数据列表</div></el-col>
+        <el-col :span="12" :offset="6" class="edit_btns">
+          <el-button v-if="hasPerm('/liquiddata/export')" class="edit_btn" size="small" @click="batchExport">导出记录</el-button>
+        </el-col>
+      </el-row>
+      <el-table v-loading="listLoading" :data="list" class="table" border @selection-change="handleSelectionChange">
+        <!--<el-table-column align="center" type="selection" width="55"/>-->
+        <el-table-column :index="indexMethod" align="center" type="index"/>
+        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
+          <template slot-scope="scope">
+            <span v-if="column.checkCell" :class="checkCell(scope.row.cell)">{{ scope.row[column.value] }}</span>
+            <span v-else>{{ scope.row[column.value] }}</span>
+          </template>
+        </el-table-column>
+      </el-table>
+    </div>
+    <!--分页-->
+    <div class="pagination-container">
+      <el-pagination
+        v-show="total>listQuery.limit"
+        :current-page="listQuery.offset"
+        :page-sizes="[20,30,50]"
+        :page-size="listQuery.limit"
+        :total="total"
+        align="center"
+        layout="total, sizes, prev, pager, next"
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"/>
+    </div>
+  </div>
+</template>
+
+<script>
+import selectTree from '@/components/SelectTree/singleSelect'
+import { getFlowData, batchExportFlowData } from '@/api/data'
+import DeptSelect from '../../../components/DeptSelect/index'
+
+export default {
+  name: 'ListFlowmeterData',
+  components: { DeptSelect, selectTree },
+  data() {
+    return {
+      listQuery: {
+        keywords: '', // 关键字
+        deptid: '', // 部门id
+        beginTime: '', // 开始时间
+        endTime: '', // 结束时间
+        offset: 1,
+        limit: 20,
+        sort: '',
+        order: ''
+      }, // 筛选条件
+      timeRange: [], // 时间范围
+      columns: [
+        {
+          text: '井编号',
+          value: 'wellCode',
+          align: 'center'
+        },
+        {
+          text: '设备编号',
+          value: 'devcode',
+          align: 'center'
+        },
+        // {
+        //   text: '设备类型',
+        //   value: 'deviceTypeName',
+        //   align: 'center'
+        // },
+        {
+          text: '水位',
+          value: 'waterLevel',
+          align: 'center'
+        },
+        {
+          text: '流速',
+          value: 'flowVelocity',
+          align: 'center'
+        },
+        {
+          text: '温度',
+          value: 'temperature',
+          align: 'center'
+        },
+        {
+          text: '瞬时流量',
+          value: 'instantFlow',
+          align: 'center'
+        },
+        {
+          text: '累计流量',
+          value: 'totalFlow',
+          align: 'center'
+        },
+        // {
+        //   text: '权属单位',
+        //   value: 'deptName',
+        //   align: 'center'
+        // },
+        {
+          text: '记录时间',
+          value: 'logtime',
+          width: 170,
+          align: 'center'
+        }
+      ], // 显示列
+      multipleSelection: [], // 多选选中项
+      list: [], // 列表数据
+      total: 0, // 数据总数
+      deviceTypeList: [], // 流量计类型列表
+      deptProps: {
+        parent: 'pid',
+        value: 'id',
+        label: 'name',
+        children: 'children'
+      }, // 权属单位树形下拉菜单
+      deptTreeList: null, // 组织树列表数据
+      showDeptTree: 0, // 是否显示权属单位下拉
+      showDeviceType: true, // 是否显示设备类型下拉
+      listLoading: true, // 加载动画
+      fullscreenLoading: false, // 全屏加载动画
+      editShow: false, // 是否显示编辑框
+      detailShow: false, // 是否显示编辑框
+      deptShowTop: false
+    }
+  },
+  watch: {
+    timeRange(val) {
+      if (val && val.length > 0) {
+        this.listQuery.beginTime = val[0]
+        this.listQuery.endTime = val[1]
+      } else {
+        this.listQuery.beginTime = ''
+        this.listQuery.endTime = ''
+      }
+    }
+  },
+  mounted() {
+    if (window.location.href) {
+      var query = window.location.href.split('?')
+      if (query.length > 1) {
+        var values = query[1].split('&')
+        for (var i = 0; i < values.length; i++) {
+          var pos = values[i].indexOf('=')
+          if (pos === -1) continue
+          var paramname = values[i].substring(0, pos)
+          var value = values[i].substring(pos + 1)
+          if (paramname === 'devcode') {
+            this.listQuery.keywords = value
+            this.fetchData()
+          } else {
+            this.fetchData()
+          }
+        }
+      } else {
+        if (this.$route.params && this.$route.params.deviceType === '2' && this.$route.params.devcode && this.$route.params.devcode !== '') {
+          this.listQuery.keywords = this.$route.params.devcode
+          this.fetchData(false)// 获取数据
+        } else {
+          this.fetchData()
+        }
+      }
+    }
+  },
+  methods: {
+    // 批量导出
+    batchExport() {
+      // 全屏加载动画
+      const loading = this.$loading({
+        lock: true,
+        text: '数据处理中,请稍后...',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
+      })
+      batchExportFlowData(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()
+      })
+    },
+    // 查询数据
+    search() {
+      this.fetchData(false)
+    },
+    // 获取流量计数据
+    fetchData(isNowPage = true) {
+      this.listLoading = true
+      if (!isNowPage) { // 是否显示当前页，否则跳转第一页
+        this.listQuery.offset = 1
+      }
+      getFlowData(this.listQuery).then(response => {
+        this.list = response.data.rows
+        this.total = parseInt(response.data.total)
+        this.listLoading = false
+      })
+    },
+    checkCell(value) {
+      var cell = parseFloat(value)
+      if (cell < 10) {
+        return 'warning-state'
+      }
+    },
+    indexMethod(index) {
+      return this.listQuery.limit * (this.listQuery.offset - 1) + index + 1
+    },
+    // 改变页容量
+    handleSizeChange(val) {
+      this.listQuery.limit = val
+      this.fetchData()
+    },
+    // 改变当前页
+    handleCurrentChange(val) {
+      this.listQuery.offset = val
+      this.fetchData()
+    },
+    // 多选触发方法
+    handleSelectionChange(val) {
+      this.multipleSelection = val
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .app-container{
+    padding: 10px;
+  }
+  $tableTitleHeight:46px;
+  .table{
+    margin-bottom: 20px;
+  }
+  .pagination-container{
+    margin-bottom: 50px;
+  }
+  .table-title{
+    background-color:rgba(243, 243, 243, 1);
+    height: $tableTitleHeight;
+    .title-header{
+      line-height:$tableTitleHeight;
+      color: #606266;
+      font-size: 15px;
+      i{
+        margin-left: 5px;
+        margin-right: 5px;
+      }
+    }
+  }
+  .edit_btns{
+    .edit_btn{
+      float:right;
+      margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2
+    }
+  }
+  .warning-state{
+    color:red
+  }
+</style>
diff --git a/src/views/dataManage/deviceData/listGasData.vue b/src/views/dataManage/deviceData/listGasData.vue
index f77e0e8..cd05595 100644
--- a/src/views/dataManage/deviceData/listGasData.vue
+++ b/src/views/dataManage/deviceData/listGasData.vue
@@ -200,7 +200,7 @@
         const downloadElement = document.createElement('a')
         const href = window.URL.createObjectURL(blob) // 创建下载的链接
         downloadElement.href = href
-        downloadElement.download = `燃气监测仪数s据.xlsx` // 下载后文件名
+        downloadElement.download = `有害气体监测仪数据.xlsx` // 下载后文件名
         document.body.appendChild(downloadElement)
         downloadElement.click() // 点击下载
         document.body.removeChild(downloadElement) // 下载完成移除元素
diff --git a/src/views/dataManage/deviceData/listHyetometerData.vue b/src/views/dataManage/deviceData/listHyetometerData.vue
new file mode 100644
index 0000000..516a91a
--- /dev/null
+++ b/src/views/dataManage/deviceData/listHyetometerData.vue
@@ -0,0 +1,276 @@
+<!--雨量计数据-->
+<template>
+  <div class="app-container">
+    <!--筛选条件-->
+    <div class="search-div">
+      <el-form ref="selectForm" :inline="true" :model="listQuery" class="form-container">
+        <el-row>
+          <el-form-item class="selectForm-container-item" prop="keywords">
+            <el-input v-model.trim="listQuery.keywords" placeholder="设备编号" clearable/>
+          </el-form-item>
+          <el-form-item class="selectForm-container-item">
+            <dept-select v-model="listQuery.deptid" :need-top="deptShowTop" dept-type="03" placeholder="选择权属单位"/>
+          </el-form-item>
+          <el-form-item class="selectForm-container-item" prop="beginTime">
+            <el-date-picker
+              v-model="timeRange"
+              type="datetimerange"
+              range-separator="至"
+              value-format="yyyy-MM-dd HH:mm:ss"
+              start-placeholder="开始时间"
+              end-placeholder="结束时间"/>
+          </el-form-item>
+          <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
+        </el-row>
+      </el-form>
+    </div>
+    <!--查询结果Table显示-->
+    <div>
+      <el-row class="table-title">
+        <el-col :span="6"><div class="title-header"><i class="el-icon-menu"/>数据列表</div></el-col>
+        <el-col :span="12" :offset="6" class="edit_btns">
+          <el-button v-if="hasPerm('/liquiddata/export')" class="edit_btn" size="small" @click="batchExport">导出记录</el-button>
+        </el-col>
+      </el-row>
+      <el-table v-loading="listLoading" :data="list" class="table" border @selection-change="handleSelectionChange">
+        <!--<el-table-column align="center" type="selection" width="55"/>-->
+        <el-table-column :index="indexMethod" align="center" type="index"/>
+        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
+          <template slot-scope="scope">
+            <span v-if="column.checkCell" :class="checkCell(scope.row.cell)">{{ scope.row[column.value] }}</span>
+            <span v-else>{{ scope.row[column.value] }}</span>
+          </template>
+        </el-table-column>
+      </el-table>
+    </div>
+    <!--分页-->
+    <div class="pagination-container">
+      <el-pagination
+        v-show="total>listQuery.limit"
+        :current-page="listQuery.offset"
+        :page-sizes="[20,30,50]"
+        :page-size="listQuery.limit"
+        :total="total"
+        align="center"
+        layout="total, sizes, prev, pager, next"
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"/>
+    </div>
+  </div>
+</template>
+
+<script>
+import selectTree from '@/components/SelectTree/singleSelect'
+import { getHyetoData, batchExportHyetoData } from '@/api/data'
+import DeptSelect from '../../../components/DeptSelect/index'
+
+export default {
+  name: 'ListHyetometerData',
+  components: { DeptSelect, selectTree },
+  data() {
+    return {
+      listQuery: {
+        keywords: '', // 关键字
+        deptid: '', // 部门id
+        beginTime: '', // 开始时间
+        endTime: '', // 结束时间
+        offset: 1,
+        limit: 20,
+        sort: '',
+        order: ''
+      }, // 筛选条件
+      timeRange: [], // 时间范围
+      columns: [
+        {
+          text: '设备编号',
+          value: 'devcode',
+          align: 'center'
+        },
+        {
+          text: '设备类型',
+          value: 'deviceTypeName',
+          align: 'center'
+        },
+        {
+          text: '上一分钟实时雨量(mm)',
+          value: 'realTimeData',
+          align: 'center'
+        },
+        {
+          text: '日累计雨量(mm)',
+          value: 'cumulativeData',
+          align: 'center'
+        },
+        {
+          text: '权属单位',
+          value: 'deptName',
+          align: 'center'
+        },
+        {
+          text: '记录时间',
+          value: 'logtime',
+          width: 170,
+          align: 'center'
+        }
+      ], // 显示列
+      multipleSelection: [], // 多选选中项
+      list: [], // 列表数据
+      total: 0, // 数据总数
+      deviceTypeList: [], // 雨量计类型列表
+      deptProps: {
+        parent: 'pid',
+        value: 'id',
+        label: 'name',
+        children: 'children'
+      }, // 权属单位树形下拉菜单
+      deptTreeList: null, // 组织树列表数据
+      showDeptTree: 0, // 是否显示权属单位下拉
+      showDeviceType: true, // 是否显示设备类型下拉
+      listLoading: true, // 加载动画
+      fullscreenLoading: false, // 全屏加载动画
+      editShow: false, // 是否显示编辑框
+      detailShow: false, // 是否显示编辑框
+      deptShowTop: false
+    }
+  },
+  watch: {
+    timeRange(val) {
+      if (val && val.length > 0) {
+        this.listQuery.beginTime = val[0]
+        this.listQuery.endTime = val[1]
+      } else {
+        this.listQuery.beginTime = ''
+        this.listQuery.endTime = ''
+      }
+    }
+  },
+  mounted() {
+    if (window.location.href) {
+      var query = window.location.href.split('?')
+      if (query.length > 1) {
+        var values = query[1].split('&')
+        for (var i = 0; i < values.length; i++) {
+          var pos = values[i].indexOf('=')
+          if (pos === -1) continue
+          var paramname = values[i].substring(0, pos)
+          var value = values[i].substring(pos + 1)
+          if (paramname === 'devcode') {
+            this.listQuery.keywords = value
+            this.fetchData()
+          } else {
+            this.fetchData()
+          }
+        }
+      } else {
+        if (this.$route.params && this.$route.params.deviceType === '2' && this.$route.params.devcode && this.$route.params.devcode !== '') {
+          this.listQuery.keywords = this.$route.params.devcode
+          this.fetchData(false)// 获取数据
+        } else {
+          this.fetchData()
+        }
+      }
+    }
+  },
+  methods: {
+    // 批量导出
+    batchExport() {
+      // 全屏加载动画
+      const loading = this.$loading({
+        lock: true,
+        text: '数据处理中,请稍后...',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
+      })
+      batchExportHyetoData(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()
+      })
+    },
+    // 查询数据
+    search() {
+      this.fetchData(false)
+    },
+    // 获取雨量计数据
+    fetchData(isNowPage = true) {
+      this.listLoading = true
+      if (!isNowPage) { // 是否显示当前页，否则跳转第一页
+        this.listQuery.offset = 1
+      }
+      getHyetoData(this.listQuery).then(response => {
+        this.list = response.data.rows
+        this.total = parseInt(response.data.total)
+        this.listLoading = false
+      })
+    },
+    checkCell(value) {
+      var cell = parseFloat(value)
+      if (cell < 10) {
+        return 'warning-state'
+      }
+    },
+    indexMethod(index) {
+      return this.listQuery.limit * (this.listQuery.offset - 1) + index + 1
+    },
+    // 改变页容量
+    handleSizeChange(val) {
+      this.listQuery.limit = val
+      this.fetchData()
+    },
+    // 改变当前页
+    handleCurrentChange(val) {
+      this.listQuery.offset = val
+      this.fetchData()
+    },
+    // 多选触发方法
+    handleSelectionChange(val) {
+      this.multipleSelection = val
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .app-container{
+    padding: 10px;
+  }
+  $tableTitleHeight:46px;
+  .table{
+    margin-bottom: 20px;
+  }
+  .pagination-container{
+    margin-bottom: 50px;
+  }
+  .table-title{
+    background-color:rgba(243, 243, 243, 1);
+    height: $tableTitleHeight;
+    .title-header{
+      line-height:$tableTitleHeight;
+      color: #606266;
+      font-size: 15px;
+      i{
+        margin-left: 5px;
+        margin-right: 5px;
+      }
+    }
+  }
+  .edit_btns{
+    .edit_btn{
+      float:right;
+      margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2
+    }
+  }
+  .warning-state{
+    color:red
+  }
+</style>

diff --git a/src/api/data.js b/src/api/data.js
index 7be32bb..66bb327 100644
--- a/src/api/data.js
+++ b/src/api/data.js
@@ -64,6 +64,33 @@
   })
 }
 
+// 水质监测仪数据查询
+export function getMeterData(params) {
+  return request({
+    url: 'meterdata/list',
+    method: 'get',
+    params
+  })
+}
+
+// 流量数据查询
+export function getFlowData(params) {
+  return request({
+    url: 'flowdata/list',
+    method: 'get',
+    params
+  })
+}
+
+// 雨量计数据查询
+export function getHyetoData(params) {
+  return request({
+    url: 'hyetodata/list',
+    method: 'get',
+    params
+  })
+}
+
 // 批量导出井盖数据
 export function batchExportWellData(params) {
   return request({
@@ -140,3 +167,34 @@
     responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
   })
 }
+
+export function batchExportMeterData(params) {
+  return request({
+    url: 'meterdata/export',
+    method: 'get',
+    timeout: 120000, // 120s，2分钟
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+export function batchExportFlowData(params) {
+  return request({
+    url: 'flowdata/export',
+    method: 'get',
+    timeout: 120000, // 120s，2分钟
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 雨量计数据导出
+export function batchExportHyetoData(params) {
+  return request({
+    url: 'hyetodata/export',
+    method: 'get',
+    timeout: 120000, // 120s，2分钟
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
diff --git a/src/views/dataManage/dataManage.vue b/src/views/dataManage/dataManage.vue
index 4c0f6b6..39a3d89 100644
--- a/src/views/dataManage/dataManage.vue
+++ b/src/views/dataManage/dataManage.vue
@@ -22,6 +22,15 @@
       <el-tab-pane v-if="hasPerm('/welllocadata/list')" label="井盖定位监测仪" name="wellloca">
         <list-well-loca-data ref="welllocadatacomp"/>
       </el-tab-pane>
+      <el-tab-pane v-if="hasPerm('/hyetodata/list')" label="雨量计" name="hyetometer">
+        <list-hyetometer-data ref="hyetometerdatacomp"/>
+      </el-tab-pane>
+      <el-tab-pane v-if="hasPerm('/flowdata/list')" label="流量计" name="flowmeter">
+        <list-flowmeter-data ref="flowmeterdatacomp"/>
+      </el-tab-pane>
+      <el-tab-pane v-if="hasPerm('/meterdata/list')" label="水质监测仪" name="meter">
+        <list-meter-data ref="meterdatacomp"/>
+      </el-tab-pane>
     </el-tabs>
   </div>
 </template>
@@ -34,9 +43,12 @@
 import ListHarmfulData from './deviceData/listHarmfulData'
 import ListTempData from './deviceData/listTempData'
 import ListWellLocaData from './deviceData/listWellLocaData'
+import ListHyetometerData from './deviceData/listHyetometerData'
+import ListFlowmeterData from './deviceData/listFlowmeterData'
+import ListMeterData from './deviceData/listMeterData'
 export default {
   name: 'DataManage',
-  components: { ListWellLocaData, ListTempData, ListHarmfulData, ListDigData, ListGasData, ListLiquidData, ListWellCoverData },
+  components: { ListMeterData, ListFlowmeterData, ListHyetometerData, ListWellLocaData, ListTempData, ListHarmfulData, ListDigData, ListGasData, ListLiquidData, ListWellCoverData },
   data() {
     return {
       activeName: 'wellcover'
@@ -66,6 +78,12 @@
             this.activeName = 'dig'
           } else if (value === '7') {
             this.activeName = 'wellloca'
+          } else if (value === '8') {
+            this.activeName = 'hyetometer'
+          } else if (value === '9') {
+            this.activeName = 'flowmeter'
+          } else if (value === '10') {
+            this.activeName = 'meter'
           }
         }
       }
@@ -85,6 +103,12 @@
         this.activeName = 'dig'
       } else if (this.$route.params.deviceType === '7') {
         this.activeName = 'wellloca'
+      } else if (this.$route.params.deviceType === '8') {
+        this.activeName = 'hyetometer'
+      } else if (this.$route.params.deviceType === '9') {
+        this.activeName = 'flowmeter'
+      } else if (this.$route.params.deviceType === '10') {
+        this.activeName = 'meter'
       }
     }
   },
@@ -104,6 +128,12 @@
         this.$refs.digdatacomp.fetchData()
       } else if (tab.name === 'wellloca') {
         this.$refs.welllocadatacomp.fetchData()
+      } else if (tab.name === 'hyetometer') {
+        this.$refs.hyetometerdatacomp.fetchData()
+      } else if (tab.name === 'flowmeter') {
+        this.$refs.flowmeterdatacomp.fetchData()
+      } else if (tab.name === 'meter') {
+        this.$refs.meterdatacomp.fetchData()
       }
     }
   }
diff --git a/src/views/dataManage/deviceData/listDigData.vue b/src/views/dataManage/deviceData/listDigData.vue
index cc9fd31..cd8de5e 100644
--- a/src/views/dataManage/deviceData/listDigData.vue
+++ b/src/views/dataManage/deviceData/listDigData.vue
@@ -202,7 +202,7 @@
         const downloadElement = document.createElement('a')
         const href = window.URL.createObjectURL(blob) // 创建下载的链接
         downloadElement.href = href
-        downloadElement.download = `开挖监测仪数s据.xlsx` // 下载后文件名
+        downloadElement.download = `开挖监测仪数据.xlsx` // 下载后文件名
         document.body.appendChild(downloadElement)
         downloadElement.click() // 点击下载
         document.body.removeChild(downloadElement) // 下载完成移除元素
diff --git a/src/views/dataManage/deviceData/listFlowmeterData.vue b/src/views/dataManage/deviceData/listFlowmeterData.vue
new file mode 100644
index 0000000..57a84a4
--- /dev/null
+++ b/src/views/dataManage/deviceData/listFlowmeterData.vue
@@ -0,0 +1,296 @@
+<!--流量计数据-->
+<template>
+  <div class="app-container">
+    <!--筛选条件-->
+    <div class="search-div">
+      <el-form ref="selectForm" :inline="true" :model="listQuery" class="form-container">
+        <el-row>
+          <el-form-item class="selectForm-container-item" prop="keywords">
+            <el-input v-model.trim="listQuery.keywords" placeholder="井编号/设备编号" clearable/>
+          </el-form-item>
+          <el-form-item class="selectForm-container-item">
+            <dept-select v-model="listQuery.deptid" :need-top="deptShowTop" dept-type="03" placeholder="选择权属单位"/>
+          </el-form-item>
+          <el-form-item class="selectForm-container-item" prop="beginTime">
+            <el-date-picker
+              v-model="timeRange"
+              type="datetimerange"
+              range-separator="至"
+              value-format="yyyy-MM-dd HH:mm:ss"
+              start-placeholder="开始时间"
+              end-placeholder="结束时间"/>
+          </el-form-item>
+          <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
+        </el-row>
+      </el-form>
+    </div>
+    <!--查询结果Table显示-->
+    <div>
+      <el-row class="table-title">
+        <el-col :span="6"><div class="title-header"><i class="el-icon-menu"/>数据列表</div></el-col>
+        <el-col :span="12" :offset="6" class="edit_btns">
+          <el-button v-if="hasPerm('/liquiddata/export')" class="edit_btn" size="small" @click="batchExport">导出记录</el-button>
+        </el-col>
+      </el-row>
+      <el-table v-loading="listLoading" :data="list" class="table" border @selection-change="handleSelectionChange">
+        <!--<el-table-column align="center" type="selection" width="55"/>-->
+        <el-table-column :index="indexMethod" align="center" type="index"/>
+        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
+          <template slot-scope="scope">
+            <span v-if="column.checkCell" :class="checkCell(scope.row.cell)">{{ scope.row[column.value] }}</span>
+            <span v-else>{{ scope.row[column.value] }}</span>
+          </template>
+        </el-table-column>
+      </el-table>
+    </div>
+    <!--分页-->
+    <div class="pagination-container">
+      <el-pagination
+        v-show="total>listQuery.limit"
+        :current-page="listQuery.offset"
+        :page-sizes="[20,30,50]"
+        :page-size="listQuery.limit"
+        :total="total"
+        align="center"
+        layout="total, sizes, prev, pager, next"
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"/>
+    </div>
+  </div>
+</template>
+
+<script>
+import selectTree from '@/components/SelectTree/singleSelect'
+import { getFlowData, batchExportFlowData } from '@/api/data'
+import DeptSelect from '../../../components/DeptSelect/index'
+
+export default {
+  name: 'ListFlowmeterData',
+  components: { DeptSelect, selectTree },
+  data() {
+    return {
+      listQuery: {
+        keywords: '', // 关键字
+        deptid: '', // 部门id
+        beginTime: '', // 开始时间
+        endTime: '', // 结束时间
+        offset: 1,
+        limit: 20,
+        sort: '',
+        order: ''
+      }, // 筛选条件
+      timeRange: [], // 时间范围
+      columns: [
+        {
+          text: '井编号',
+          value: 'wellCode',
+          align: 'center'
+        },
+        {
+          text: '设备编号',
+          value: 'devcode',
+          align: 'center'
+        },
+        // {
+        //   text: '设备类型',
+        //   value: 'deviceTypeName',
+        //   align: 'center'
+        // },
+        {
+          text: '水位',
+          value: 'waterLevel',
+          align: 'center'
+        },
+        {
+          text: '流速',
+          value: 'flowVelocity',
+          align: 'center'
+        },
+        {
+          text: '温度',
+          value: 'temperature',
+          align: 'center'
+        },
+        {
+          text: '瞬时流量',
+          value: 'instantFlow',
+          align: 'center'
+        },
+        {
+          text: '累计流量',
+          value: 'totalFlow',
+          align: 'center'
+        },
+        // {
+        //   text: '权属单位',
+        //   value: 'deptName',
+        //   align: 'center'
+        // },
+        {
+          text: '记录时间',
+          value: 'logtime',
+          width: 170,
+          align: 'center'
+        }
+      ], // 显示列
+      multipleSelection: [], // 多选选中项
+      list: [], // 列表数据
+      total: 0, // 数据总数
+      deviceTypeList: [], // 流量计类型列表
+      deptProps: {
+        parent: 'pid',
+        value: 'id',
+        label: 'name',
+        children: 'children'
+      }, // 权属单位树形下拉菜单
+      deptTreeList: null, // 组织树列表数据
+      showDeptTree: 0, // 是否显示权属单位下拉
+      showDeviceType: true, // 是否显示设备类型下拉
+      listLoading: true, // 加载动画
+      fullscreenLoading: false, // 全屏加载动画
+      editShow: false, // 是否显示编辑框
+      detailShow: false, // 是否显示编辑框
+      deptShowTop: false
+    }
+  },
+  watch: {
+    timeRange(val) {
+      if (val && val.length > 0) {
+        this.listQuery.beginTime = val[0]
+        this.listQuery.endTime = val[1]
+      } else {
+        this.listQuery.beginTime = ''
+        this.listQuery.endTime = ''
+      }
+    }
+  },
+  mounted() {
+    if (window.location.href) {
+      var query = window.location.href.split('?')
+      if (query.length > 1) {
+        var values = query[1].split('&')
+        for (var i = 0; i < values.length; i++) {
+          var pos = values[i].indexOf('=')
+          if (pos === -1) continue
+          var paramname = values[i].substring(0, pos)
+          var value = values[i].substring(pos + 1)
+          if (paramname === 'devcode') {
+            this.listQuery.keywords = value
+            this.fetchData()
+          } else {
+            this.fetchData()
+          }
+        }
+      } else {
+        if (this.$route.params && this.$route.params.deviceType === '2' && this.$route.params.devcode && this.$route.params.devcode !== '') {
+          this.listQuery.keywords = this.$route.params.devcode
+          this.fetchData(false)// 获取数据
+        } else {
+          this.fetchData()
+        }
+      }
+    }
+  },
+  methods: {
+    // 批量导出
+    batchExport() {
+      // 全屏加载动画
+      const loading = this.$loading({
+        lock: true,
+        text: '数据处理中,请稍后...',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
+      })
+      batchExportFlowData(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()
+      })
+    },
+    // 查询数据
+    search() {
+      this.fetchData(false)
+    },
+    // 获取流量计数据
+    fetchData(isNowPage = true) {
+      this.listLoading = true
+      if (!isNowPage) { // 是否显示当前页，否则跳转第一页
+        this.listQuery.offset = 1
+      }
+      getFlowData(this.listQuery).then(response => {
+        this.list = response.data.rows
+        this.total = parseInt(response.data.total)
+        this.listLoading = false
+      })
+    },
+    checkCell(value) {
+      var cell = parseFloat(value)
+      if (cell < 10) {
+        return 'warning-state'
+      }
+    },
+    indexMethod(index) {
+      return this.listQuery.limit * (this.listQuery.offset - 1) + index + 1
+    },
+    // 改变页容量
+    handleSizeChange(val) {
+      this.listQuery.limit = val
+      this.fetchData()
+    },
+    // 改变当前页
+    handleCurrentChange(val) {
+      this.listQuery.offset = val
+      this.fetchData()
+    },
+    // 多选触发方法
+    handleSelectionChange(val) {
+      this.multipleSelection = val
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .app-container{
+    padding: 10px;
+  }
+  $tableTitleHeight:46px;
+  .table{
+    margin-bottom: 20px;
+  }
+  .pagination-container{
+    margin-bottom: 50px;
+  }
+  .table-title{
+    background-color:rgba(243, 243, 243, 1);
+    height: $tableTitleHeight;
+    .title-header{
+      line-height:$tableTitleHeight;
+      color: #606266;
+      font-size: 15px;
+      i{
+        margin-left: 5px;
+        margin-right: 5px;
+      }
+    }
+  }
+  .edit_btns{
+    .edit_btn{
+      float:right;
+      margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2
+    }
+  }
+  .warning-state{
+    color:red
+  }
+</style>
diff --git a/src/views/dataManage/deviceData/listGasData.vue b/src/views/dataManage/deviceData/listGasData.vue
index f77e0e8..cd05595 100644
--- a/src/views/dataManage/deviceData/listGasData.vue
+++ b/src/views/dataManage/deviceData/listGasData.vue
@@ -200,7 +200,7 @@
         const downloadElement = document.createElement('a')
         const href = window.URL.createObjectURL(blob) // 创建下载的链接
         downloadElement.href = href
-        downloadElement.download = `燃气监测仪数s据.xlsx` // 下载后文件名
+        downloadElement.download = `有害气体监测仪数据.xlsx` // 下载后文件名
         document.body.appendChild(downloadElement)
         downloadElement.click() // 点击下载
         document.body.removeChild(downloadElement) // 下载完成移除元素
diff --git a/src/views/dataManage/deviceData/listHyetometerData.vue b/src/views/dataManage/deviceData/listHyetometerData.vue
new file mode 100644
index 0000000..516a91a
--- /dev/null
+++ b/src/views/dataManage/deviceData/listHyetometerData.vue
@@ -0,0 +1,276 @@
+<!--雨量计数据-->
+<template>
+  <div class="app-container">
+    <!--筛选条件-->
+    <div class="search-div">
+      <el-form ref="selectForm" :inline="true" :model="listQuery" class="form-container">
+        <el-row>
+          <el-form-item class="selectForm-container-item" prop="keywords">
+            <el-input v-model.trim="listQuery.keywords" placeholder="设备编号" clearable/>
+          </el-form-item>
+          <el-form-item class="selectForm-container-item">
+            <dept-select v-model="listQuery.deptid" :need-top="deptShowTop" dept-type="03" placeholder="选择权属单位"/>
+          </el-form-item>
+          <el-form-item class="selectForm-container-item" prop="beginTime">
+            <el-date-picker
+              v-model="timeRange"
+              type="datetimerange"
+              range-separator="至"
+              value-format="yyyy-MM-dd HH:mm:ss"
+              start-placeholder="开始时间"
+              end-placeholder="结束时间"/>
+          </el-form-item>
+          <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
+        </el-row>
+      </el-form>
+    </div>
+    <!--查询结果Table显示-->
+    <div>
+      <el-row class="table-title">
+        <el-col :span="6"><div class="title-header"><i class="el-icon-menu"/>数据列表</div></el-col>
+        <el-col :span="12" :offset="6" class="edit_btns">
+          <el-button v-if="hasPerm('/liquiddata/export')" class="edit_btn" size="small" @click="batchExport">导出记录</el-button>
+        </el-col>
+      </el-row>
+      <el-table v-loading="listLoading" :data="list" class="table" border @selection-change="handleSelectionChange">
+        <!--<el-table-column align="center" type="selection" width="55"/>-->
+        <el-table-column :index="indexMethod" align="center" type="index"/>
+        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
+          <template slot-scope="scope">
+            <span v-if="column.checkCell" :class="checkCell(scope.row.cell)">{{ scope.row[column.value] }}</span>
+            <span v-else>{{ scope.row[column.value] }}</span>
+          </template>
+        </el-table-column>
+      </el-table>
+    </div>
+    <!--分页-->
+    <div class="pagination-container">
+      <el-pagination
+        v-show="total>listQuery.limit"
+        :current-page="listQuery.offset"
+        :page-sizes="[20,30,50]"
+        :page-size="listQuery.limit"
+        :total="total"
+        align="center"
+        layout="total, sizes, prev, pager, next"
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"/>
+    </div>
+  </div>
+</template>
+
+<script>
+import selectTree from '@/components/SelectTree/singleSelect'
+import { getHyetoData, batchExportHyetoData } from '@/api/data'
+import DeptSelect from '../../../components/DeptSelect/index'
+
+export default {
+  name: 'ListHyetometerData',
+  components: { DeptSelect, selectTree },
+  data() {
+    return {
+      listQuery: {
+        keywords: '', // 关键字
+        deptid: '', // 部门id
+        beginTime: '', // 开始时间
+        endTime: '', // 结束时间
+        offset: 1,
+        limit: 20,
+        sort: '',
+        order: ''
+      }, // 筛选条件
+      timeRange: [], // 时间范围
+      columns: [
+        {
+          text: '设备编号',
+          value: 'devcode',
+          align: 'center'
+        },
+        {
+          text: '设备类型',
+          value: 'deviceTypeName',
+          align: 'center'
+        },
+        {
+          text: '上一分钟实时雨量(mm)',
+          value: 'realTimeData',
+          align: 'center'
+        },
+        {
+          text: '日累计雨量(mm)',
+          value: 'cumulativeData',
+          align: 'center'
+        },
+        {
+          text: '权属单位',
+          value: 'deptName',
+          align: 'center'
+        },
+        {
+          text: '记录时间',
+          value: 'logtime',
+          width: 170,
+          align: 'center'
+        }
+      ], // 显示列
+      multipleSelection: [], // 多选选中项
+      list: [], // 列表数据
+      total: 0, // 数据总数
+      deviceTypeList: [], // 雨量计类型列表
+      deptProps: {
+        parent: 'pid',
+        value: 'id',
+        label: 'name',
+        children: 'children'
+      }, // 权属单位树形下拉菜单
+      deptTreeList: null, // 组织树列表数据
+      showDeptTree: 0, // 是否显示权属单位下拉
+      showDeviceType: true, // 是否显示设备类型下拉
+      listLoading: true, // 加载动画
+      fullscreenLoading: false, // 全屏加载动画
+      editShow: false, // 是否显示编辑框
+      detailShow: false, // 是否显示编辑框
+      deptShowTop: false
+    }
+  },
+  watch: {
+    timeRange(val) {
+      if (val && val.length > 0) {
+        this.listQuery.beginTime = val[0]
+        this.listQuery.endTime = val[1]
+      } else {
+        this.listQuery.beginTime = ''
+        this.listQuery.endTime = ''
+      }
+    }
+  },
+  mounted() {
+    if (window.location.href) {
+      var query = window.location.href.split('?')
+      if (query.length > 1) {
+        var values = query[1].split('&')
+        for (var i = 0; i < values.length; i++) {
+          var pos = values[i].indexOf('=')
+          if (pos === -1) continue
+          var paramname = values[i].substring(0, pos)
+          var value = values[i].substring(pos + 1)
+          if (paramname === 'devcode') {
+            this.listQuery.keywords = value
+            this.fetchData()
+          } else {
+            this.fetchData()
+          }
+        }
+      } else {
+        if (this.$route.params && this.$route.params.deviceType === '2' && this.$route.params.devcode && this.$route.params.devcode !== '') {
+          this.listQuery.keywords = this.$route.params.devcode
+          this.fetchData(false)// 获取数据
+        } else {
+          this.fetchData()
+        }
+      }
+    }
+  },
+  methods: {
+    // 批量导出
+    batchExport() {
+      // 全屏加载动画
+      const loading = this.$loading({
+        lock: true,
+        text: '数据处理中,请稍后...',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
+      })
+      batchExportHyetoData(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()
+      })
+    },
+    // 查询数据
+    search() {
+      this.fetchData(false)
+    },
+    // 获取雨量计数据
+    fetchData(isNowPage = true) {
+      this.listLoading = true
+      if (!isNowPage) { // 是否显示当前页，否则跳转第一页
+        this.listQuery.offset = 1
+      }
+      getHyetoData(this.listQuery).then(response => {
+        this.list = response.data.rows
+        this.total = parseInt(response.data.total)
+        this.listLoading = false
+      })
+    },
+    checkCell(value) {
+      var cell = parseFloat(value)
+      if (cell < 10) {
+        return 'warning-state'
+      }
+    },
+    indexMethod(index) {
+      return this.listQuery.limit * (this.listQuery.offset - 1) + index + 1
+    },
+    // 改变页容量
+    handleSizeChange(val) {
+      this.listQuery.limit = val
+      this.fetchData()
+    },
+    // 改变当前页
+    handleCurrentChange(val) {
+      this.listQuery.offset = val
+      this.fetchData()
+    },
+    // 多选触发方法
+    handleSelectionChange(val) {
+      this.multipleSelection = val
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .app-container{
+    padding: 10px;
+  }
+  $tableTitleHeight:46px;
+  .table{
+    margin-bottom: 20px;
+  }
+  .pagination-container{
+    margin-bottom: 50px;
+  }
+  .table-title{
+    background-color:rgba(243, 243, 243, 1);
+    height: $tableTitleHeight;
+    .title-header{
+      line-height:$tableTitleHeight;
+      color: #606266;
+      font-size: 15px;
+      i{
+        margin-left: 5px;
+        margin-right: 5px;
+      }
+    }
+  }
+  .edit_btns{
+    .edit_btn{
+      float:right;
+      margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2
+    }
+  }
+  .warning-state{
+    color:red
+  }
+</style>
diff --git a/src/views/dataManage/deviceData/listLiquidData.vue b/src/views/dataManage/deviceData/listLiquidData.vue
index c36e471..9bf5307 100644
--- a/src/views/dataManage/deviceData/listLiquidData.vue
+++ b/src/views/dataManage/deviceData/listLiquidData.vue
@@ -195,7 +195,7 @@
         const downloadElement = document.createElement('a')
         const href = window.URL.createObjectURL(blob) // 创建下载的链接
         downloadElement.href = href
-        downloadElement.download = `液位监测仪数s据.xlsx` // 下载后文件名
+        downloadElement.download = `液位监测仪数据.xlsx` // 下载后文件名
         document.body.appendChild(downloadElement)
         downloadElement.click() // 点击下载
         document.body.removeChild(downloadElement) // 下载完成移除元素

diff --git a/src/api/data.js b/src/api/data.js
index 7be32bb..66bb327 100644
--- a/src/api/data.js
+++ b/src/api/data.js
@@ -64,6 +64,33 @@
   })
 }
 
+// 水质监测仪数据查询
+export function getMeterData(params) {
+  return request({
+    url: 'meterdata/list',
+    method: 'get',
+    params
+  })
+}
+
+// 流量数据查询
+export function getFlowData(params) {
+  return request({
+    url: 'flowdata/list',
+    method: 'get',
+    params
+  })
+}
+
+// 雨量计数据查询
+export function getHyetoData(params) {
+  return request({
+    url: 'hyetodata/list',
+    method: 'get',
+    params
+  })
+}
+
 // 批量导出井盖数据
 export function batchExportWellData(params) {
   return request({
@@ -140,3 +167,34 @@
     responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
   })
 }
+
+export function batchExportMeterData(params) {
+  return request({
+    url: 'meterdata/export',
+    method: 'get',
+    timeout: 120000, // 120s，2分钟
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+export function batchExportFlowData(params) {
+  return request({
+    url: 'flowdata/export',
+    method: 'get',
+    timeout: 120000, // 120s，2分钟
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 雨量计数据导出
+export function batchExportHyetoData(params) {
+  return request({
+    url: 'hyetodata/export',
+    method: 'get',
+    timeout: 120000, // 120s，2分钟
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
diff --git a/src/views/dataManage/dataManage.vue b/src/views/dataManage/dataManage.vue
index 4c0f6b6..39a3d89 100644
--- a/src/views/dataManage/dataManage.vue
+++ b/src/views/dataManage/dataManage.vue
@@ -22,6 +22,15 @@
       <el-tab-pane v-if="hasPerm('/welllocadata/list')" label="井盖定位监测仪" name="wellloca">
         <list-well-loca-data ref="welllocadatacomp"/>
       </el-tab-pane>
+      <el-tab-pane v-if="hasPerm('/hyetodata/list')" label="雨量计" name="hyetometer">
+        <list-hyetometer-data ref="hyetometerdatacomp"/>
+      </el-tab-pane>
+      <el-tab-pane v-if="hasPerm('/flowdata/list')" label="流量计" name="flowmeter">
+        <list-flowmeter-data ref="flowmeterdatacomp"/>
+      </el-tab-pane>
+      <el-tab-pane v-if="hasPerm('/meterdata/list')" label="水质监测仪" name="meter">
+        <list-meter-data ref="meterdatacomp"/>
+      </el-tab-pane>
     </el-tabs>
   </div>
 </template>
@@ -34,9 +43,12 @@
 import ListHarmfulData from './deviceData/listHarmfulData'
 import ListTempData from './deviceData/listTempData'
 import ListWellLocaData from './deviceData/listWellLocaData'
+import ListHyetometerData from './deviceData/listHyetometerData'
+import ListFlowmeterData from './deviceData/listFlowmeterData'
+import ListMeterData from './deviceData/listMeterData'
 export default {
   name: 'DataManage',
-  components: { ListWellLocaData, ListTempData, ListHarmfulData, ListDigData, ListGasData, ListLiquidData, ListWellCoverData },
+  components: { ListMeterData, ListFlowmeterData, ListHyetometerData, ListWellLocaData, ListTempData, ListHarmfulData, ListDigData, ListGasData, ListLiquidData, ListWellCoverData },
   data() {
     return {
       activeName: 'wellcover'
@@ -66,6 +78,12 @@
             this.activeName = 'dig'
           } else if (value === '7') {
             this.activeName = 'wellloca'
+          } else if (value === '8') {
+            this.activeName = 'hyetometer'
+          } else if (value === '9') {
+            this.activeName = 'flowmeter'
+          } else if (value === '10') {
+            this.activeName = 'meter'
           }
         }
       }
@@ -85,6 +103,12 @@
         this.activeName = 'dig'
       } else if (this.$route.params.deviceType === '7') {
         this.activeName = 'wellloca'
+      } else if (this.$route.params.deviceType === '8') {
+        this.activeName = 'hyetometer'
+      } else if (this.$route.params.deviceType === '9') {
+        this.activeName = 'flowmeter'
+      } else if (this.$route.params.deviceType === '10') {
+        this.activeName = 'meter'
       }
     }
   },
@@ -104,6 +128,12 @@
         this.$refs.digdatacomp.fetchData()
       } else if (tab.name === 'wellloca') {
         this.$refs.welllocadatacomp.fetchData()
+      } else if (tab.name === 'hyetometer') {
+        this.$refs.hyetometerdatacomp.fetchData()
+      } else if (tab.name === 'flowmeter') {
+        this.$refs.flowmeterdatacomp.fetchData()
+      } else if (tab.name === 'meter') {
+        this.$refs.meterdatacomp.fetchData()
       }
     }
   }
diff --git a/src/views/dataManage/deviceData/listDigData.vue b/src/views/dataManage/deviceData/listDigData.vue
index cc9fd31..cd8de5e 100644
--- a/src/views/dataManage/deviceData/listDigData.vue
+++ b/src/views/dataManage/deviceData/listDigData.vue
@@ -202,7 +202,7 @@
         const downloadElement = document.createElement('a')
         const href = window.URL.createObjectURL(blob) // 创建下载的链接
         downloadElement.href = href
-        downloadElement.download = `开挖监测仪数s据.xlsx` // 下载后文件名
+        downloadElement.download = `开挖监测仪数据.xlsx` // 下载后文件名
         document.body.appendChild(downloadElement)
         downloadElement.click() // 点击下载
         document.body.removeChild(downloadElement) // 下载完成移除元素
diff --git a/src/views/dataManage/deviceData/listFlowmeterData.vue b/src/views/dataManage/deviceData/listFlowmeterData.vue
new file mode 100644
index 0000000..57a84a4
--- /dev/null
+++ b/src/views/dataManage/deviceData/listFlowmeterData.vue
@@ -0,0 +1,296 @@
+<!--流量计数据-->
+<template>
+  <div class="app-container">
+    <!--筛选条件-->
+    <div class="search-div">
+      <el-form ref="selectForm" :inline="true" :model="listQuery" class="form-container">
+        <el-row>
+          <el-form-item class="selectForm-container-item" prop="keywords">
+            <el-input v-model.trim="listQuery.keywords" placeholder="井编号/设备编号" clearable/>
+          </el-form-item>
+          <el-form-item class="selectForm-container-item">
+            <dept-select v-model="listQuery.deptid" :need-top="deptShowTop" dept-type="03" placeholder="选择权属单位"/>
+          </el-form-item>
+          <el-form-item class="selectForm-container-item" prop="beginTime">
+            <el-date-picker
+              v-model="timeRange"
+              type="datetimerange"
+              range-separator="至"
+              value-format="yyyy-MM-dd HH:mm:ss"
+              start-placeholder="开始时间"
+              end-placeholder="结束时间"/>
+          </el-form-item>
+          <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
+        </el-row>
+      </el-form>
+    </div>
+    <!--查询结果Table显示-->
+    <div>
+      <el-row class="table-title">
+        <el-col :span="6"><div class="title-header"><i class="el-icon-menu"/>数据列表</div></el-col>
+        <el-col :span="12" :offset="6" class="edit_btns">
+          <el-button v-if="hasPerm('/liquiddata/export')" class="edit_btn" size="small" @click="batchExport">导出记录</el-button>
+        </el-col>
+      </el-row>
+      <el-table v-loading="listLoading" :data="list" class="table" border @selection-change="handleSelectionChange">
+        <!--<el-table-column align="center" type="selection" width="55"/>-->
+        <el-table-column :index="indexMethod" align="center" type="index"/>
+        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
+          <template slot-scope="scope">
+            <span v-if="column.checkCell" :class="checkCell(scope.row.cell)">{{ scope.row[column.value] }}</span>
+            <span v-else>{{ scope.row[column.value] }}</span>
+          </template>
+        </el-table-column>
+      </el-table>
+    </div>
+    <!--分页-->
+    <div class="pagination-container">
+      <el-pagination
+        v-show="total>listQuery.limit"
+        :current-page="listQuery.offset"
+        :page-sizes="[20,30,50]"
+        :page-size="listQuery.limit"
+        :total="total"
+        align="center"
+        layout="total, sizes, prev, pager, next"
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"/>
+    </div>
+  </div>
+</template>
+
+<script>
+import selectTree from '@/components/SelectTree/singleSelect'
+import { getFlowData, batchExportFlowData } from '@/api/data'
+import DeptSelect from '../../../components/DeptSelect/index'
+
+export default {
+  name: 'ListFlowmeterData',
+  components: { DeptSelect, selectTree },
+  data() {
+    return {
+      listQuery: {
+        keywords: '', // 关键字
+        deptid: '', // 部门id
+        beginTime: '', // 开始时间
+        endTime: '', // 结束时间
+        offset: 1,
+        limit: 20,
+        sort: '',
+        order: ''
+      }, // 筛选条件
+      timeRange: [], // 时间范围
+      columns: [
+        {
+          text: '井编号',
+          value: 'wellCode',
+          align: 'center'
+        },
+        {
+          text: '设备编号',
+          value: 'devcode',
+          align: 'center'
+        },
+        // {
+        //   text: '设备类型',
+        //   value: 'deviceTypeName',
+        //   align: 'center'
+        // },
+        {
+          text: '水位',
+          value: 'waterLevel',
+          align: 'center'
+        },
+        {
+          text: '流速',
+          value: 'flowVelocity',
+          align: 'center'
+        },
+        {
+          text: '温度',
+          value: 'temperature',
+          align: 'center'
+        },
+        {
+          text: '瞬时流量',
+          value: 'instantFlow',
+          align: 'center'
+        },
+        {
+          text: '累计流量',
+          value: 'totalFlow',
+          align: 'center'
+        },
+        // {
+        //   text: '权属单位',
+        //   value: 'deptName',
+        //   align: 'center'
+        // },
+        {
+          text: '记录时间',
+          value: 'logtime',
+          width: 170,
+          align: 'center'
+        }
+      ], // 显示列
+      multipleSelection: [], // 多选选中项
+      list: [], // 列表数据
+      total: 0, // 数据总数
+      deviceTypeList: [], // 流量计类型列表
+      deptProps: {
+        parent: 'pid',
+        value: 'id',
+        label: 'name',
+        children: 'children'
+      }, // 权属单位树形下拉菜单
+      deptTreeList: null, // 组织树列表数据
+      showDeptTree: 0, // 是否显示权属单位下拉
+      showDeviceType: true, // 是否显示设备类型下拉
+      listLoading: true, // 加载动画
+      fullscreenLoading: false, // 全屏加载动画
+      editShow: false, // 是否显示编辑框
+      detailShow: false, // 是否显示编辑框
+      deptShowTop: false
+    }
+  },
+  watch: {
+    timeRange(val) {
+      if (val && val.length > 0) {
+        this.listQuery.beginTime = val[0]
+        this.listQuery.endTime = val[1]
+      } else {
+        this.listQuery.beginTime = ''
+        this.listQuery.endTime = ''
+      }
+    }
+  },
+  mounted() {
+    if (window.location.href) {
+      var query = window.location.href.split('?')
+      if (query.length > 1) {
+        var values = query[1].split('&')
+        for (var i = 0; i < values.length; i++) {
+          var pos = values[i].indexOf('=')
+          if (pos === -1) continue
+          var paramname = values[i].substring(0, pos)
+          var value = values[i].substring(pos + 1)
+          if (paramname === 'devcode') {
+            this.listQuery.keywords = value
+            this.fetchData()
+          } else {
+            this.fetchData()
+          }
+        }
+      } else {
+        if (this.$route.params && this.$route.params.deviceType === '2' && this.$route.params.devcode && this.$route.params.devcode !== '') {
+          this.listQuery.keywords = this.$route.params.devcode
+          this.fetchData(false)// 获取数据
+        } else {
+          this.fetchData()
+        }
+      }
+    }
+  },
+  methods: {
+    // 批量导出
+    batchExport() {
+      // 全屏加载动画
+      const loading = this.$loading({
+        lock: true,
+        text: '数据处理中,请稍后...',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
+      })
+      batchExportFlowData(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()
+      })
+    },
+    // 查询数据
+    search() {
+      this.fetchData(false)
+    },
+    // 获取流量计数据
+    fetchData(isNowPage = true) {
+      this.listLoading = true
+      if (!isNowPage) { // 是否显示当前页，否则跳转第一页
+        this.listQuery.offset = 1
+      }
+      getFlowData(this.listQuery).then(response => {
+        this.list = response.data.rows
+        this.total = parseInt(response.data.total)
+        this.listLoading = false
+      })
+    },
+    checkCell(value) {
+      var cell = parseFloat(value)
+      if (cell < 10) {
+        return 'warning-state'
+      }
+    },
+    indexMethod(index) {
+      return this.listQuery.limit * (this.listQuery.offset - 1) + index + 1
+    },
+    // 改变页容量
+    handleSizeChange(val) {
+      this.listQuery.limit = val
+      this.fetchData()
+    },
+    // 改变当前页
+    handleCurrentChange(val) {
+      this.listQuery.offset = val
+      this.fetchData()
+    },
+    // 多选触发方法
+    handleSelectionChange(val) {
+      this.multipleSelection = val
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .app-container{
+    padding: 10px;
+  }
+  $tableTitleHeight:46px;
+  .table{
+    margin-bottom: 20px;
+  }
+  .pagination-container{
+    margin-bottom: 50px;
+  }
+  .table-title{
+    background-color:rgba(243, 243, 243, 1);
+    height: $tableTitleHeight;
+    .title-header{
+      line-height:$tableTitleHeight;
+      color: #606266;
+      font-size: 15px;
+      i{
+        margin-left: 5px;
+        margin-right: 5px;
+      }
+    }
+  }
+  .edit_btns{
+    .edit_btn{
+      float:right;
+      margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2
+    }
+  }
+  .warning-state{
+    color:red
+  }
+</style>
diff --git a/src/views/dataManage/deviceData/listGasData.vue b/src/views/dataManage/deviceData/listGasData.vue
index f77e0e8..cd05595 100644
--- a/src/views/dataManage/deviceData/listGasData.vue
+++ b/src/views/dataManage/deviceData/listGasData.vue
@@ -200,7 +200,7 @@
         const downloadElement = document.createElement('a')
         const href = window.URL.createObjectURL(blob) // 创建下载的链接
         downloadElement.href = href
-        downloadElement.download = `燃气监测仪数s据.xlsx` // 下载后文件名
+        downloadElement.download = `有害气体监测仪数据.xlsx` // 下载后文件名
         document.body.appendChild(downloadElement)
         downloadElement.click() // 点击下载
         document.body.removeChild(downloadElement) // 下载完成移除元素
diff --git a/src/views/dataManage/deviceData/listHyetometerData.vue b/src/views/dataManage/deviceData/listHyetometerData.vue
new file mode 100644
index 0000000..516a91a
--- /dev/null
+++ b/src/views/dataManage/deviceData/listHyetometerData.vue
@@ -0,0 +1,276 @@
+<!--雨量计数据-->
+<template>
+  <div class="app-container">
+    <!--筛选条件-->
+    <div class="search-div">
+      <el-form ref="selectForm" :inline="true" :model="listQuery" class="form-container">
+        <el-row>
+          <el-form-item class="selectForm-container-item" prop="keywords">
+            <el-input v-model.trim="listQuery.keywords" placeholder="设备编号" clearable/>
+          </el-form-item>
+          <el-form-item class="selectForm-container-item">
+            <dept-select v-model="listQuery.deptid" :need-top="deptShowTop" dept-type="03" placeholder="选择权属单位"/>
+          </el-form-item>
+          <el-form-item class="selectForm-container-item" prop="beginTime">
+            <el-date-picker
+              v-model="timeRange"
+              type="datetimerange"
+              range-separator="至"
+              value-format="yyyy-MM-dd HH:mm:ss"
+              start-placeholder="开始时间"
+              end-placeholder="结束时间"/>
+          </el-form-item>
+          <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
+        </el-row>
+      </el-form>
+    </div>
+    <!--查询结果Table显示-->
+    <div>
+      <el-row class="table-title">
+        <el-col :span="6"><div class="title-header"><i class="el-icon-menu"/>数据列表</div></el-col>
+        <el-col :span="12" :offset="6" class="edit_btns">
+          <el-button v-if="hasPerm('/liquiddata/export')" class="edit_btn" size="small" @click="batchExport">导出记录</el-button>
+        </el-col>
+      </el-row>
+      <el-table v-loading="listLoading" :data="list" class="table" border @selection-change="handleSelectionChange">
+        <!--<el-table-column align="center" type="selection" width="55"/>-->
+        <el-table-column :index="indexMethod" align="center" type="index"/>
+        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
+          <template slot-scope="scope">
+            <span v-if="column.checkCell" :class="checkCell(scope.row.cell)">{{ scope.row[column.value] }}</span>
+            <span v-else>{{ scope.row[column.value] }}</span>
+          </template>
+        </el-table-column>
+      </el-table>
+    </div>
+    <!--分页-->
+    <div class="pagination-container">
+      <el-pagination
+        v-show="total>listQuery.limit"
+        :current-page="listQuery.offset"
+        :page-sizes="[20,30,50]"
+        :page-size="listQuery.limit"
+        :total="total"
+        align="center"
+        layout="total, sizes, prev, pager, next"
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"/>
+    </div>
+  </div>
+</template>
+
+<script>
+import selectTree from '@/components/SelectTree/singleSelect'
+import { getHyetoData, batchExportHyetoData } from '@/api/data'
+import DeptSelect from '../../../components/DeptSelect/index'
+
+export default {
+  name: 'ListHyetometerData',
+  components: { DeptSelect, selectTree },
+  data() {
+    return {
+      listQuery: {
+        keywords: '', // 关键字
+        deptid: '', // 部门id
+        beginTime: '', // 开始时间
+        endTime: '', // 结束时间
+        offset: 1,
+        limit: 20,
+        sort: '',
+        order: ''
+      }, // 筛选条件
+      timeRange: [], // 时间范围
+      columns: [
+        {
+          text: '设备编号',
+          value: 'devcode',
+          align: 'center'
+        },
+        {
+          text: '设备类型',
+          value: 'deviceTypeName',
+          align: 'center'
+        },
+        {
+          text: '上一分钟实时雨量(mm)',
+          value: 'realTimeData',
+          align: 'center'
+        },
+        {
+          text: '日累计雨量(mm)',
+          value: 'cumulativeData',
+          align: 'center'
+        },
+        {
+          text: '权属单位',
+          value: 'deptName',
+          align: 'center'
+        },
+        {
+          text: '记录时间',
+          value: 'logtime',
+          width: 170,
+          align: 'center'
+        }
+      ], // 显示列
+      multipleSelection: [], // 多选选中项
+      list: [], // 列表数据
+      total: 0, // 数据总数
+      deviceTypeList: [], // 雨量计类型列表
+      deptProps: {
+        parent: 'pid',
+        value: 'id',
+        label: 'name',
+        children: 'children'
+      }, // 权属单位树形下拉菜单
+      deptTreeList: null, // 组织树列表数据
+      showDeptTree: 0, // 是否显示权属单位下拉
+      showDeviceType: true, // 是否显示设备类型下拉
+      listLoading: true, // 加载动画
+      fullscreenLoading: false, // 全屏加载动画
+      editShow: false, // 是否显示编辑框
+      detailShow: false, // 是否显示编辑框
+      deptShowTop: false
+    }
+  },
+  watch: {
+    timeRange(val) {
+      if (val && val.length > 0) {
+        this.listQuery.beginTime = val[0]
+        this.listQuery.endTime = val[1]
+      } else {
+        this.listQuery.beginTime = ''
+        this.listQuery.endTime = ''
+      }
+    }
+  },
+  mounted() {
+    if (window.location.href) {
+      var query = window.location.href.split('?')
+      if (query.length > 1) {
+        var values = query[1].split('&')
+        for (var i = 0; i < values.length; i++) {
+          var pos = values[i].indexOf('=')
+          if (pos === -1) continue
+          var paramname = values[i].substring(0, pos)
+          var value = values[i].substring(pos + 1)
+          if (paramname === 'devcode') {
+            this.listQuery.keywords = value
+            this.fetchData()
+          } else {
+            this.fetchData()
+          }
+        }
+      } else {
+        if (this.$route.params && this.$route.params.deviceType === '2' && this.$route.params.devcode && this.$route.params.devcode !== '') {
+          this.listQuery.keywords = this.$route.params.devcode
+          this.fetchData(false)// 获取数据
+        } else {
+          this.fetchData()
+        }
+      }
+    }
+  },
+  methods: {
+    // 批量导出
+    batchExport() {
+      // 全屏加载动画
+      const loading = this.$loading({
+        lock: true,
+        text: '数据处理中,请稍后...',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
+      })
+      batchExportHyetoData(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()
+      })
+    },
+    // 查询数据
+    search() {
+      this.fetchData(false)
+    },
+    // 获取雨量计数据
+    fetchData(isNowPage = true) {
+      this.listLoading = true
+      if (!isNowPage) { // 是否显示当前页，否则跳转第一页
+        this.listQuery.offset = 1
+      }
+      getHyetoData(this.listQuery).then(response => {
+        this.list = response.data.rows
+        this.total = parseInt(response.data.total)
+        this.listLoading = false
+      })
+    },
+    checkCell(value) {
+      var cell = parseFloat(value)
+      if (cell < 10) {
+        return 'warning-state'
+      }
+    },
+    indexMethod(index) {
+      return this.listQuery.limit * (this.listQuery.offset - 1) + index + 1
+    },
+    // 改变页容量
+    handleSizeChange(val) {
+      this.listQuery.limit = val
+      this.fetchData()
+    },
+    // 改变当前页
+    handleCurrentChange(val) {
+      this.listQuery.offset = val
+      this.fetchData()
+    },
+    // 多选触发方法
+    handleSelectionChange(val) {
+      this.multipleSelection = val
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .app-container{
+    padding: 10px;
+  }
+  $tableTitleHeight:46px;
+  .table{
+    margin-bottom: 20px;
+  }
+  .pagination-container{
+    margin-bottom: 50px;
+  }
+  .table-title{
+    background-color:rgba(243, 243, 243, 1);
+    height: $tableTitleHeight;
+    .title-header{
+      line-height:$tableTitleHeight;
+      color: #606266;
+      font-size: 15px;
+      i{
+        margin-left: 5px;
+        margin-right: 5px;
+      }
+    }
+  }
+  .edit_btns{
+    .edit_btn{
+      float:right;
+      margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2
+    }
+  }
+  .warning-state{
+    color:red
+  }
+</style>
diff --git a/src/views/dataManage/deviceData/listLiquidData.vue b/src/views/dataManage/deviceData/listLiquidData.vue
index c36e471..9bf5307 100644
--- a/src/views/dataManage/deviceData/listLiquidData.vue
+++ b/src/views/dataManage/deviceData/listLiquidData.vue
@@ -195,7 +195,7 @@
         const downloadElement = document.createElement('a')
         const href = window.URL.createObjectURL(blob) // 创建下载的链接
         downloadElement.href = href
-        downloadElement.download = `液位监测仪数s据.xlsx` // 下载后文件名
+        downloadElement.download = `液位监测仪数据.xlsx` // 下载后文件名
         document.body.appendChild(downloadElement)
         downloadElement.click() // 点击下载
         document.body.removeChild(downloadElement) // 下载完成移除元素
diff --git a/src/views/dataManage/deviceData/listMeterData.vue b/src/views/dataManage/deviceData/listMeterData.vue
new file mode 100644
index 0000000..20967c4
--- /dev/null
+++ b/src/views/dataManage/deviceData/listMeterData.vue
@@ -0,0 +1,317 @@
+<!--水质数据-->
+<template>
+  <div class="app-container">
+    <!--筛选条件-->
+    <div class="search-div">
+      <el-form ref="selectForm" :inline="true" :model="listQuery" class="form-container">
+        <el-row>
+          <el-form-item class="selectForm-container-item" prop="keywords">
+            <el-input v-model.trim="listQuery.keywords" placeholder="井编号/设备编号" clearable/>
+          </el-form-item>
+          <el-form-item class="selectForm-container-item">
+            <dept-select v-model="listQuery.deptid" :need-top="deptShowTop" dept-type="03" placeholder="选择权属单位"/>
+          </el-form-item>
+          <el-form-item class="selectForm-container-item" prop="beginTime">
+            <el-date-picker
+              v-model="timeRange"
+              type="datetimerange"
+              range-separator="至"
+              value-format="yyyy-MM-dd HH:mm:ss"
+              start-placeholder="开始时间"
+              end-placeholder="结束时间"/>
+          </el-form-item>
+          <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
+        </el-row>
+      </el-form>
+    </div>
+    <!--查询结果Table显示-->
+    <div>
+      <el-row class="table-title">
+        <el-col :span="6"><div class="title-header"><i class="el-icon-menu"/>数据列表</div></el-col>
+        <el-col :span="12" :offset="6" class="edit_btns">
+          <el-button v-if="hasPerm('/liquiddata/export')" class="edit_btn" size="small" @click="batchExport">导出记录</el-button>
+        </el-col>
+      </el-row>
+      <el-table v-loading="listLoading" :data="list" class="table" border @selection-change="handleSelectionChange">
+        <!--<el-table-column align="center" type="selection" width="55"/>-->
+        <el-table-column :index="indexMethod" align="center" type="index"/>
+        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
+          <template slot-scope="scope">
+            <span v-if="column.checkCell" :class="checkCell(scope.row.cell)">{{ scope.row[column.value] }}</span>
+            <span v-else>{{ scope.row[column.value] }}</span>
+          </template>
+        </el-table-column>
+      </el-table>
+    </div>
+    <!--分页-->
+    <div class="pagination-container">
+      <el-pagination
+        v-show="total>listQuery.limit"
+        :current-page="listQuery.offset"
+        :page-sizes="[20,30,50]"
+        :page-size="listQuery.limit"
+        :total="total"
+        align="center"
+        layout="total, sizes, prev, pager, next"
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"/>
+    </div>
+  </div>
+</template>
+
+<script>
+import selectTree from '@/components/SelectTree/singleSelect'
+import { getMeterData, batchExportMeterData } from '@/api/data'
+import DeptSelect from '../../../components/DeptSelect/index'
+
+export default {
+  name: 'ListMeterData',
+  components: { DeptSelect, selectTree },
+  data() {
+    return {
+      listQuery: {
+        keywords: '', // 关键字
+        deptid: '', // 部门id
+        beginTime: '', // 开始时间
+        endTime: '', // 结束时间
+        offset: 1,
+        limit: 20,
+        sort: '',
+        order: ''
+      }, // 筛选条件
+      timeRange: [], // 时间范围
+      columns: [
+        {
+          text: '井编号',
+          value: 'wellCode',
+          align: 'center'
+        },
+        {
+          text: '设备编号',
+          value: 'devcode',
+          align: 'center'
+        },
+        {
+          text: '温度',
+          value: 'temp',
+          align: 'center'
+        },
+        {
+          text: 'PH',
+          value: 'ph',
+          align: 'center'
+        },
+        {
+          text: '电导率',
+          value: 'conductivity',
+          align: 'center'
+        },
+        {
+          text: '溶解氧',
+          value: 'do',
+          align: 'center'
+        },
+        {
+          text: '浊度',
+          value: 'turbidity',
+          align: 'center'
+        },
+        {
+          text: 'COD',
+          value: 'cod',
+          align: 'center'
+        },
+        {
+          text: '氨氮',
+          value: 'an',
+          align: 'center'
+        },
+        {
+          text: '总磷',
+          value: 'tp',
+          align: 'center'
+        },
+        {
+          text: '总氮',
+          value: 'tn',
+          align: 'center'
+        },
+        {
+          text: '状态描述',
+          value: 'descn',
+          align: 'center'
+        },
+        // {
+        //   text: '权属单位',
+        //   value: 'deptName',
+        //   align: 'center'
+        // },
+        {
+          text: '记录时间',
+          value: 'logtime',
+          width: 170,
+          align: 'center'
+        }
+      ], // 显示列
+      multipleSelection: [], // 多选选中项
+      list: [], // 列表数据
+      total: 0, // 数据总数
+      deviceTypeList: [], // 水质配置类型列表
+      deptProps: {
+        parent: 'pid',
+        value: 'id',
+        label: 'name',
+        children: 'children'
+      }, // 权属单位树形下拉菜单
+      deptTreeList: null, // 组织树列表数据
+      showDeptTree: 0, // 是否显示权属单位下拉
+      showDeviceType: true, // 是否显示设备类型下拉
+      listLoading: true, // 加载动画
+      fullscreenLoading: false, // 全屏加载动画
+      editShow: false, // 是否显示编辑框
+      detailShow: false, // 是否显示编辑框
+      deptShowTop: false
+    }
+  },
+  watch: {
+    timeRange(val) {
+      if (val && val.length > 0) {
+        this.listQuery.beginTime = val[0]
+        this.listQuery.endTime = val[1]
+      } else {
+        this.listQuery.beginTime = ''
+        this.listQuery.endTime = ''
+      }
+    }
+  },
+  mounted() {
+    if (window.location.href) {
+      var query = window.location.href.split('?')
+      if (query.length > 1) {
+        var values = query[1].split('&')
+        for (var i = 0; i < values.length; i++) {
+          var pos = values[i].indexOf('=')
+          if (pos === -1) continue
+          var paramname = values[i].substring(0, pos)
+          var value = values[i].substring(pos + 1)
+          if (paramname === 'devcode') {
+            this.listQuery.keywords = value
+            this.fetchData()
+          } else {
+            this.fetchData()
+          }
+        }
+      } else {
+        if (this.$route.params && this.$route.params.deviceType === '2' && this.$route.params.devcode && this.$route.params.devcode !== '') {
+          this.listQuery.keywords = this.$route.params.devcode
+          this.fetchData(false)// 获取数据
+        } else {
+          this.fetchData()
+        }
+      }
+    }
+  },
+  methods: {
+    // 批量导出
+    batchExport() {
+      console.log('批量导出水质配置')
+      // 全屏加载动画
+      const loading = this.$loading({
+        lock: true,
+        text: '数据处理中,请稍后...',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
+      })
+      batchExportMeterData(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()
+      })
+    },
+    // 查询数据
+    search() {
+      this.fetchData(false)
+    },
+    // 获取水质数据
+    fetchData(isNowPage = true) {
+      this.listLoading = true
+      if (!isNowPage) { // 是否显示当前页，否则跳转第一页
+        this.listQuery.offset = 1
+      }
+      getMeterData(this.listQuery).then(response => {
+        this.list = response.data.rows
+        this.total = parseInt(response.data.total)
+        this.listLoading = false
+      })
+    },
+    checkCell(value) {
+      var cell = parseFloat(value)
+      if (cell < 10) {
+        return 'warning-state'
+      }
+    },
+    indexMethod(index) {
+      return this.listQuery.limit * (this.listQuery.offset - 1) + index + 1
+    },
+    // 改变页容量
+    handleSizeChange(val) {
+      this.listQuery.limit = val
+      this.fetchData()
+    },
+    // 改变当前页
+    handleCurrentChange(val) {
+      this.listQuery.offset = val
+      this.fetchData()
+    },
+    // 多选触发方法
+    handleSelectionChange(val) {
+      this.multipleSelection = val
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .app-container{
+    padding: 10px;
+  }
+  $tableTitleHeight:46px;
+  .table{
+    margin-bottom: 20px;
+  }
+  .pagination-container{
+    margin-bottom: 50px;
+  }
+  .table-title{
+    background-color:rgba(243, 243, 243, 1);
+    height: $tableTitleHeight;
+    .title-header{
+      line-height:$tableTitleHeight;
+      color: #606266;
+      font-size: 15px;
+      i{
+        margin-left: 5px;
+        margin-right: 5px;
+      }
+    }
+  }
+  .edit_btns{
+    .edit_btn{
+      float:right;
+      margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2
+    }
+  }
+  .warning-state{
+    color:red
+  }
+</style>

diff --git a/src/api/data.js b/src/api/data.js
index 7be32bb..66bb327 100644
--- a/src/api/data.js
+++ b/src/api/data.js
@@ -64,6 +64,33 @@
   })
 }
 
+// 水质监测仪数据查询
+export function getMeterData(params) {
+  return request({
+    url: 'meterdata/list',
+    method: 'get',
+    params
+  })
+}
+
+// 流量数据查询
+export function getFlowData(params) {
+  return request({
+    url: 'flowdata/list',
+    method: 'get',
+    params
+  })
+}
+
+// 雨量计数据查询
+export function getHyetoData(params) {
+  return request({
+    url: 'hyetodata/list',
+    method: 'get',
+    params
+  })
+}
+
 // 批量导出井盖数据
 export function batchExportWellData(params) {
   return request({
@@ -140,3 +167,34 @@
     responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
   })
 }
+
+export function batchExportMeterData(params) {
+  return request({
+    url: 'meterdata/export',
+    method: 'get',
+    timeout: 120000, // 120s，2分钟
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+export function batchExportFlowData(params) {
+  return request({
+    url: 'flowdata/export',
+    method: 'get',
+    timeout: 120000, // 120s，2分钟
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 雨量计数据导出
+export function batchExportHyetoData(params) {
+  return request({
+    url: 'hyetodata/export',
+    method: 'get',
+    timeout: 120000, // 120s，2分钟
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
diff --git a/src/views/dataManage/dataManage.vue b/src/views/dataManage/dataManage.vue
index 4c0f6b6..39a3d89 100644
--- a/src/views/dataManage/dataManage.vue
+++ b/src/views/dataManage/dataManage.vue
@@ -22,6 +22,15 @@
       <el-tab-pane v-if="hasPerm('/welllocadata/list')" label="井盖定位监测仪" name="wellloca">
         <list-well-loca-data ref="welllocadatacomp"/>
       </el-tab-pane>
+      <el-tab-pane v-if="hasPerm('/hyetodata/list')" label="雨量计" name="hyetometer">
+        <list-hyetometer-data ref="hyetometerdatacomp"/>
+      </el-tab-pane>
+      <el-tab-pane v-if="hasPerm('/flowdata/list')" label="流量计" name="flowmeter">
+        <list-flowmeter-data ref="flowmeterdatacomp"/>
+      </el-tab-pane>
+      <el-tab-pane v-if="hasPerm('/meterdata/list')" label="水质监测仪" name="meter">
+        <list-meter-data ref="meterdatacomp"/>
+      </el-tab-pane>
     </el-tabs>
   </div>
 </template>
@@ -34,9 +43,12 @@
 import ListHarmfulData from './deviceData/listHarmfulData'
 import ListTempData from './deviceData/listTempData'
 import ListWellLocaData from './deviceData/listWellLocaData'
+import ListHyetometerData from './deviceData/listHyetometerData'
+import ListFlowmeterData from './deviceData/listFlowmeterData'
+import ListMeterData from './deviceData/listMeterData'
 export default {
   name: 'DataManage',
-  components: { ListWellLocaData, ListTempData, ListHarmfulData, ListDigData, ListGasData, ListLiquidData, ListWellCoverData },
+  components: { ListMeterData, ListFlowmeterData, ListHyetometerData, ListWellLocaData, ListTempData, ListHarmfulData, ListDigData, ListGasData, ListLiquidData, ListWellCoverData },
   data() {
     return {
       activeName: 'wellcover'
@@ -66,6 +78,12 @@
             this.activeName = 'dig'
           } else if (value === '7') {
             this.activeName = 'wellloca'
+          } else if (value === '8') {
+            this.activeName = 'hyetometer'
+          } else if (value === '9') {
+            this.activeName = 'flowmeter'
+          } else if (value === '10') {
+            this.activeName = 'meter'
           }
         }
       }
@@ -85,6 +103,12 @@
         this.activeName = 'dig'
       } else if (this.$route.params.deviceType === '7') {
         this.activeName = 'wellloca'
+      } else if (this.$route.params.deviceType === '8') {
+        this.activeName = 'hyetometer'
+      } else if (this.$route.params.deviceType === '9') {
+        this.activeName = 'flowmeter'
+      } else if (this.$route.params.deviceType === '10') {
+        this.activeName = 'meter'
       }
     }
   },
@@ -104,6 +128,12 @@
         this.$refs.digdatacomp.fetchData()
       } else if (tab.name === 'wellloca') {
         this.$refs.welllocadatacomp.fetchData()
+      } else if (tab.name === 'hyetometer') {
+        this.$refs.hyetometerdatacomp.fetchData()
+      } else if (tab.name === 'flowmeter') {
+        this.$refs.flowmeterdatacomp.fetchData()
+      } else if (tab.name === 'meter') {
+        this.$refs.meterdatacomp.fetchData()
       }
     }
   }
diff --git a/src/views/dataManage/deviceData/listDigData.vue b/src/views/dataManage/deviceData/listDigData.vue
index cc9fd31..cd8de5e 100644
--- a/src/views/dataManage/deviceData/listDigData.vue
+++ b/src/views/dataManage/deviceData/listDigData.vue
@@ -202,7 +202,7 @@
         const downloadElement = document.createElement('a')
         const href = window.URL.createObjectURL(blob) // 创建下载的链接
         downloadElement.href = href
-        downloadElement.download = `开挖监测仪数s据.xlsx` // 下载后文件名
+        downloadElement.download = `开挖监测仪数据.xlsx` // 下载后文件名
         document.body.appendChild(downloadElement)
         downloadElement.click() // 点击下载
         document.body.removeChild(downloadElement) // 下载完成移除元素
diff --git a/src/views/dataManage/deviceData/listFlowmeterData.vue b/src/views/dataManage/deviceData/listFlowmeterData.vue
new file mode 100644
index 0000000..57a84a4
--- /dev/null
+++ b/src/views/dataManage/deviceData/listFlowmeterData.vue
@@ -0,0 +1,296 @@
+<!--流量计数据-->
+<template>
+  <div class="app-container">
+    <!--筛选条件-->
+    <div class="search-div">
+      <el-form ref="selectForm" :inline="true" :model="listQuery" class="form-container">
+        <el-row>
+          <el-form-item class="selectForm-container-item" prop="keywords">
+            <el-input v-model.trim="listQuery.keywords" placeholder="井编号/设备编号" clearable/>
+          </el-form-item>
+          <el-form-item class="selectForm-container-item">
+            <dept-select v-model="listQuery.deptid" :need-top="deptShowTop" dept-type="03" placeholder="选择权属单位"/>
+          </el-form-item>
+          <el-form-item class="selectForm-container-item" prop="beginTime">
+            <el-date-picker
+              v-model="timeRange"
+              type="datetimerange"
+              range-separator="至"
+              value-format="yyyy-MM-dd HH:mm:ss"
+              start-placeholder="开始时间"
+              end-placeholder="结束时间"/>
+          </el-form-item>
+          <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
+        </el-row>
+      </el-form>
+    </div>
+    <!--查询结果Table显示-->
+    <div>
+      <el-row class="table-title">
+        <el-col :span="6"><div class="title-header"><i class="el-icon-menu"/>数据列表</div></el-col>
+        <el-col :span="12" :offset="6" class="edit_btns">
+          <el-button v-if="hasPerm('/liquiddata/export')" class="edit_btn" size="small" @click="batchExport">导出记录</el-button>
+        </el-col>
+      </el-row>
+      <el-table v-loading="listLoading" :data="list" class="table" border @selection-change="handleSelectionChange">
+        <!--<el-table-column align="center" type="selection" width="55"/>-->
+        <el-table-column :index="indexMethod" align="center" type="index"/>
+        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
+          <template slot-scope="scope">
+            <span v-if="column.checkCell" :class="checkCell(scope.row.cell)">{{ scope.row[column.value] }}</span>
+            <span v-else>{{ scope.row[column.value] }}</span>
+          </template>
+        </el-table-column>
+      </el-table>
+    </div>
+    <!--分页-->
+    <div class="pagination-container">
+      <el-pagination
+        v-show="total>listQuery.limit"
+        :current-page="listQuery.offset"
+        :page-sizes="[20,30,50]"
+        :page-size="listQuery.limit"
+        :total="total"
+        align="center"
+        layout="total, sizes, prev, pager, next"
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"/>
+    </div>
+  </div>
+</template>
+
+<script>
+import selectTree from '@/components/SelectTree/singleSelect'
+import { getFlowData, batchExportFlowData } from '@/api/data'
+import DeptSelect from '../../../components/DeptSelect/index'
+
+export default {
+  name: 'ListFlowmeterData',
+  components: { DeptSelect, selectTree },
+  data() {
+    return {
+      listQuery: {
+        keywords: '', // 关键字
+        deptid: '', // 部门id
+        beginTime: '', // 开始时间
+        endTime: '', // 结束时间
+        offset: 1,
+        limit: 20,
+        sort: '',
+        order: ''
+      }, // 筛选条件
+      timeRange: [], // 时间范围
+      columns: [
+        {
+          text: '井编号',
+          value: 'wellCode',
+          align: 'center'
+        },
+        {
+          text: '设备编号',
+          value: 'devcode',
+          align: 'center'
+        },
+        // {
+        //   text: '设备类型',
+        //   value: 'deviceTypeName',
+        //   align: 'center'
+        // },
+        {
+          text: '水位',
+          value: 'waterLevel',
+          align: 'center'
+        },
+        {
+          text: '流速',
+          value: 'flowVelocity',
+          align: 'center'
+        },
+        {
+          text: '温度',
+          value: 'temperature',
+          align: 'center'
+        },
+        {
+          text: '瞬时流量',
+          value: 'instantFlow',
+          align: 'center'
+        },
+        {
+          text: '累计流量',
+          value: 'totalFlow',
+          align: 'center'
+        },
+        // {
+        //   text: '权属单位',
+        //   value: 'deptName',
+        //   align: 'center'
+        // },
+        {
+          text: '记录时间',
+          value: 'logtime',
+          width: 170,
+          align: 'center'
+        }
+      ], // 显示列
+      multipleSelection: [], // 多选选中项
+      list: [], // 列表数据
+      total: 0, // 数据总数
+      deviceTypeList: [], // 流量计类型列表
+      deptProps: {
+        parent: 'pid',
+        value: 'id',
+        label: 'name',
+        children: 'children'
+      }, // 权属单位树形下拉菜单
+      deptTreeList: null, // 组织树列表数据
+      showDeptTree: 0, // 是否显示权属单位下拉
+      showDeviceType: true, // 是否显示设备类型下拉
+      listLoading: true, // 加载动画
+      fullscreenLoading: false, // 全屏加载动画
+      editShow: false, // 是否显示编辑框
+      detailShow: false, // 是否显示编辑框
+      deptShowTop: false
+    }
+  },
+  watch: {
+    timeRange(val) {
+      if (val && val.length > 0) {
+        this.listQuery.beginTime = val[0]
+        this.listQuery.endTime = val[1]
+      } else {
+        this.listQuery.beginTime = ''
+        this.listQuery.endTime = ''
+      }
+    }
+  },
+  mounted() {
+    if (window.location.href) {
+      var query = window.location.href.split('?')
+      if (query.length > 1) {
+        var values = query[1].split('&')
+        for (var i = 0; i < values.length; i++) {
+          var pos = values[i].indexOf('=')
+          if (pos === -1) continue
+          var paramname = values[i].substring(0, pos)
+          var value = values[i].substring(pos + 1)
+          if (paramname === 'devcode') {
+            this.listQuery.keywords = value
+            this.fetchData()
+          } else {
+            this.fetchData()
+          }
+        }
+      } else {
+        if (this.$route.params && this.$route.params.deviceType === '2' && this.$route.params.devcode && this.$route.params.devcode !== '') {
+          this.listQuery.keywords = this.$route.params.devcode
+          this.fetchData(false)// 获取数据
+        } else {
+          this.fetchData()
+        }
+      }
+    }
+  },
+  methods: {
+    // 批量导出
+    batchExport() {
+      // 全屏加载动画
+      const loading = this.$loading({
+        lock: true,
+        text: '数据处理中,请稍后...',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
+      })
+      batchExportFlowData(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()
+      })
+    },
+    // 查询数据
+    search() {
+      this.fetchData(false)
+    },
+    // 获取流量计数据
+    fetchData(isNowPage = true) {
+      this.listLoading = true
+      if (!isNowPage) { // 是否显示当前页，否则跳转第一页
+        this.listQuery.offset = 1
+      }
+      getFlowData(this.listQuery).then(response => {
+        this.list = response.data.rows
+        this.total = parseInt(response.data.total)
+        this.listLoading = false
+      })
+    },
+    checkCell(value) {
+      var cell = parseFloat(value)
+      if (cell < 10) {
+        return 'warning-state'
+      }
+    },
+    indexMethod(index) {
+      return this.listQuery.limit * (this.listQuery.offset - 1) + index + 1
+    },
+    // 改变页容量
+    handleSizeChange(val) {
+      this.listQuery.limit = val
+      this.fetchData()
+    },
+    // 改变当前页
+    handleCurrentChange(val) {
+      this.listQuery.offset = val
+      this.fetchData()
+    },
+    // 多选触发方法
+    handleSelectionChange(val) {
+      this.multipleSelection = val
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .app-container{
+    padding: 10px;
+  }
+  $tableTitleHeight:46px;
+  .table{
+    margin-bottom: 20px;
+  }
+  .pagination-container{
+    margin-bottom: 50px;
+  }
+  .table-title{
+    background-color:rgba(243, 243, 243, 1);
+    height: $tableTitleHeight;
+    .title-header{
+      line-height:$tableTitleHeight;
+      color: #606266;
+      font-size: 15px;
+      i{
+        margin-left: 5px;
+        margin-right: 5px;
+      }
+    }
+  }
+  .edit_btns{
+    .edit_btn{
+      float:right;
+      margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2
+    }
+  }
+  .warning-state{
+    color:red
+  }
+</style>
diff --git a/src/views/dataManage/deviceData/listGasData.vue b/src/views/dataManage/deviceData/listGasData.vue
index f77e0e8..cd05595 100644
--- a/src/views/dataManage/deviceData/listGasData.vue
+++ b/src/views/dataManage/deviceData/listGasData.vue
@@ -200,7 +200,7 @@
         const downloadElement = document.createElement('a')
         const href = window.URL.createObjectURL(blob) // 创建下载的链接
         downloadElement.href = href
-        downloadElement.download = `燃气监测仪数s据.xlsx` // 下载后文件名
+        downloadElement.download = `有害气体监测仪数据.xlsx` // 下载后文件名
         document.body.appendChild(downloadElement)
         downloadElement.click() // 点击下载
         document.body.removeChild(downloadElement) // 下载完成移除元素
diff --git a/src/views/dataManage/deviceData/listHyetometerData.vue b/src/views/dataManage/deviceData/listHyetometerData.vue
new file mode 100644
index 0000000..516a91a
--- /dev/null
+++ b/src/views/dataManage/deviceData/listHyetometerData.vue
@@ -0,0 +1,276 @@
+<!--雨量计数据-->
+<template>
+  <div class="app-container">
+    <!--筛选条件-->
+    <div class="search-div">
+      <el-form ref="selectForm" :inline="true" :model="listQuery" class="form-container">
+        <el-row>
+          <el-form-item class="selectForm-container-item" prop="keywords">
+            <el-input v-model.trim="listQuery.keywords" placeholder="设备编号" clearable/>
+          </el-form-item>
+          <el-form-item class="selectForm-container-item">
+            <dept-select v-model="listQuery.deptid" :need-top="deptShowTop" dept-type="03" placeholder="选择权属单位"/>
+          </el-form-item>
+          <el-form-item class="selectForm-container-item" prop="beginTime">
+            <el-date-picker
+              v-model="timeRange"
+              type="datetimerange"
+              range-separator="至"
+              value-format="yyyy-MM-dd HH:mm:ss"
+              start-placeholder="开始时间"
+              end-placeholder="结束时间"/>
+          </el-form-item>
+          <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
+        </el-row>
+      </el-form>
+    </div>
+    <!--查询结果Table显示-->
+    <div>
+      <el-row class="table-title">
+        <el-col :span="6"><div class="title-header"><i class="el-icon-menu"/>数据列表</div></el-col>
+        <el-col :span="12" :offset="6" class="edit_btns">
+          <el-button v-if="hasPerm('/liquiddata/export')" class="edit_btn" size="small" @click="batchExport">导出记录</el-button>
+        </el-col>
+      </el-row>
+      <el-table v-loading="listLoading" :data="list" class="table" border @selection-change="handleSelectionChange">
+        <!--<el-table-column align="center" type="selection" width="55"/>-->
+        <el-table-column :index="indexMethod" align="center" type="index"/>
+        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
+          <template slot-scope="scope">
+            <span v-if="column.checkCell" :class="checkCell(scope.row.cell)">{{ scope.row[column.value] }}</span>
+            <span v-else>{{ scope.row[column.value] }}</span>
+          </template>
+        </el-table-column>
+      </el-table>
+    </div>
+    <!--分页-->
+    <div class="pagination-container">
+      <el-pagination
+        v-show="total>listQuery.limit"
+        :current-page="listQuery.offset"
+        :page-sizes="[20,30,50]"
+        :page-size="listQuery.limit"
+        :total="total"
+        align="center"
+        layout="total, sizes, prev, pager, next"
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"/>
+    </div>
+  </div>
+</template>
+
+<script>
+import selectTree from '@/components/SelectTree/singleSelect'
+import { getHyetoData, batchExportHyetoData } from '@/api/data'
+import DeptSelect from '../../../components/DeptSelect/index'
+
+export default {
+  name: 'ListHyetometerData',
+  components: { DeptSelect, selectTree },
+  data() {
+    return {
+      listQuery: {
+        keywords: '', // 关键字
+        deptid: '', // 部门id
+        beginTime: '', // 开始时间
+        endTime: '', // 结束时间
+        offset: 1,
+        limit: 20,
+        sort: '',
+        order: ''
+      }, // 筛选条件
+      timeRange: [], // 时间范围
+      columns: [
+        {
+          text: '设备编号',
+          value: 'devcode',
+          align: 'center'
+        },
+        {
+          text: '设备类型',
+          value: 'deviceTypeName',
+          align: 'center'
+        },
+        {
+          text: '上一分钟实时雨量(mm)',
+          value: 'realTimeData',
+          align: 'center'
+        },
+        {
+          text: '日累计雨量(mm)',
+          value: 'cumulativeData',
+          align: 'center'
+        },
+        {
+          text: '权属单位',
+          value: 'deptName',
+          align: 'center'
+        },
+        {
+          text: '记录时间',
+          value: 'logtime',
+          width: 170,
+          align: 'center'
+        }
+      ], // 显示列
+      multipleSelection: [], // 多选选中项
+      list: [], // 列表数据
+      total: 0, // 数据总数
+      deviceTypeList: [], // 雨量计类型列表
+      deptProps: {
+        parent: 'pid',
+        value: 'id',
+        label: 'name',
+        children: 'children'
+      }, // 权属单位树形下拉菜单
+      deptTreeList: null, // 组织树列表数据
+      showDeptTree: 0, // 是否显示权属单位下拉
+      showDeviceType: true, // 是否显示设备类型下拉
+      listLoading: true, // 加载动画
+      fullscreenLoading: false, // 全屏加载动画
+      editShow: false, // 是否显示编辑框
+      detailShow: false, // 是否显示编辑框
+      deptShowTop: false
+    }
+  },
+  watch: {
+    timeRange(val) {
+      if (val && val.length > 0) {
+        this.listQuery.beginTime = val[0]
+        this.listQuery.endTime = val[1]
+      } else {
+        this.listQuery.beginTime = ''
+        this.listQuery.endTime = ''
+      }
+    }
+  },
+  mounted() {
+    if (window.location.href) {
+      var query = window.location.href.split('?')
+      if (query.length > 1) {
+        var values = query[1].split('&')
+        for (var i = 0; i < values.length; i++) {
+          var pos = values[i].indexOf('=')
+          if (pos === -1) continue
+          var paramname = values[i].substring(0, pos)
+          var value = values[i].substring(pos + 1)
+          if (paramname === 'devcode') {
+            this.listQuery.keywords = value
+            this.fetchData()
+          } else {
+            this.fetchData()
+          }
+        }
+      } else {
+        if (this.$route.params && this.$route.params.deviceType === '2' && this.$route.params.devcode && this.$route.params.devcode !== '') {
+          this.listQuery.keywords = this.$route.params.devcode
+          this.fetchData(false)// 获取数据
+        } else {
+          this.fetchData()
+        }
+      }
+    }
+  },
+  methods: {
+    // 批量导出
+    batchExport() {
+      // 全屏加载动画
+      const loading = this.$loading({
+        lock: true,
+        text: '数据处理中,请稍后...',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
+      })
+      batchExportHyetoData(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()
+      })
+    },
+    // 查询数据
+    search() {
+      this.fetchData(false)
+    },
+    // 获取雨量计数据
+    fetchData(isNowPage = true) {
+      this.listLoading = true
+      if (!isNowPage) { // 是否显示当前页，否则跳转第一页
+        this.listQuery.offset = 1
+      }
+      getHyetoData(this.listQuery).then(response => {
+        this.list = response.data.rows
+        this.total = parseInt(response.data.total)
+        this.listLoading = false
+      })
+    },
+    checkCell(value) {
+      var cell = parseFloat(value)
+      if (cell < 10) {
+        return 'warning-state'
+      }
+    },
+    indexMethod(index) {
+      return this.listQuery.limit * (this.listQuery.offset - 1) + index + 1
+    },
+    // 改变页容量
+    handleSizeChange(val) {
+      this.listQuery.limit = val
+      this.fetchData()
+    },
+    // 改变当前页
+    handleCurrentChange(val) {
+      this.listQuery.offset = val
+      this.fetchData()
+    },
+    // 多选触发方法
+    handleSelectionChange(val) {
+      this.multipleSelection = val
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .app-container{
+    padding: 10px;
+  }
+  $tableTitleHeight:46px;
+  .table{
+    margin-bottom: 20px;
+  }
+  .pagination-container{
+    margin-bottom: 50px;
+  }
+  .table-title{
+    background-color:rgba(243, 243, 243, 1);
+    height: $tableTitleHeight;
+    .title-header{
+      line-height:$tableTitleHeight;
+      color: #606266;
+      font-size: 15px;
+      i{
+        margin-left: 5px;
+        margin-right: 5px;
+      }
+    }
+  }
+  .edit_btns{
+    .edit_btn{
+      float:right;
+      margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2
+    }
+  }
+  .warning-state{
+    color:red
+  }
+</style>
diff --git a/src/views/dataManage/deviceData/listLiquidData.vue b/src/views/dataManage/deviceData/listLiquidData.vue
index c36e471..9bf5307 100644
--- a/src/views/dataManage/deviceData/listLiquidData.vue
+++ b/src/views/dataManage/deviceData/listLiquidData.vue
@@ -195,7 +195,7 @@
         const downloadElement = document.createElement('a')
         const href = window.URL.createObjectURL(blob) // 创建下载的链接
         downloadElement.href = href
-        downloadElement.download = `液位监测仪数s据.xlsx` // 下载后文件名
+        downloadElement.download = `液位监测仪数据.xlsx` // 下载后文件名
         document.body.appendChild(downloadElement)
         downloadElement.click() // 点击下载
         document.body.removeChild(downloadElement) // 下载完成移除元素
diff --git a/src/views/dataManage/deviceData/listMeterData.vue b/src/views/dataManage/deviceData/listMeterData.vue
new file mode 100644
index 0000000..20967c4
--- /dev/null
+++ b/src/views/dataManage/deviceData/listMeterData.vue
@@ -0,0 +1,317 @@
+<!--水质数据-->
+<template>
+  <div class="app-container">
+    <!--筛选条件-->
+    <div class="search-div">
+      <el-form ref="selectForm" :inline="true" :model="listQuery" class="form-container">
+        <el-row>
+          <el-form-item class="selectForm-container-item" prop="keywords">
+            <el-input v-model.trim="listQuery.keywords" placeholder="井编号/设备编号" clearable/>
+          </el-form-item>
+          <el-form-item class="selectForm-container-item">
+            <dept-select v-model="listQuery.deptid" :need-top="deptShowTop" dept-type="03" placeholder="选择权属单位"/>
+          </el-form-item>
+          <el-form-item class="selectForm-container-item" prop="beginTime">
+            <el-date-picker
+              v-model="timeRange"
+              type="datetimerange"
+              range-separator="至"
+              value-format="yyyy-MM-dd HH:mm:ss"
+              start-placeholder="开始时间"
+              end-placeholder="结束时间"/>
+          </el-form-item>
+          <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
+        </el-row>
+      </el-form>
+    </div>
+    <!--查询结果Table显示-->
+    <div>
+      <el-row class="table-title">
+        <el-col :span="6"><div class="title-header"><i class="el-icon-menu"/>数据列表</div></el-col>
+        <el-col :span="12" :offset="6" class="edit_btns">
+          <el-button v-if="hasPerm('/liquiddata/export')" class="edit_btn" size="small" @click="batchExport">导出记录</el-button>
+        </el-col>
+      </el-row>
+      <el-table v-loading="listLoading" :data="list" class="table" border @selection-change="handleSelectionChange">
+        <!--<el-table-column align="center" type="selection" width="55"/>-->
+        <el-table-column :index="indexMethod" align="center" type="index"/>
+        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
+          <template slot-scope="scope">
+            <span v-if="column.checkCell" :class="checkCell(scope.row.cell)">{{ scope.row[column.value] }}</span>
+            <span v-else>{{ scope.row[column.value] }}</span>
+          </template>
+        </el-table-column>
+      </el-table>
+    </div>
+    <!--分页-->
+    <div class="pagination-container">
+      <el-pagination
+        v-show="total>listQuery.limit"
+        :current-page="listQuery.offset"
+        :page-sizes="[20,30,50]"
+        :page-size="listQuery.limit"
+        :total="total"
+        align="center"
+        layout="total, sizes, prev, pager, next"
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"/>
+    </div>
+  </div>
+</template>
+
+<script>
+import selectTree from '@/components/SelectTree/singleSelect'
+import { getMeterData, batchExportMeterData } from '@/api/data'
+import DeptSelect from '../../../components/DeptSelect/index'
+
+export default {
+  name: 'ListMeterData',
+  components: { DeptSelect, selectTree },
+  data() {
+    return {
+      listQuery: {
+        keywords: '', // 关键字
+        deptid: '', // 部门id
+        beginTime: '', // 开始时间
+        endTime: '', // 结束时间
+        offset: 1,
+        limit: 20,
+        sort: '',
+        order: ''
+      }, // 筛选条件
+      timeRange: [], // 时间范围
+      columns: [
+        {
+          text: '井编号',
+          value: 'wellCode',
+          align: 'center'
+        },
+        {
+          text: '设备编号',
+          value: 'devcode',
+          align: 'center'
+        },
+        {
+          text: '温度',
+          value: 'temp',
+          align: 'center'
+        },
+        {
+          text: 'PH',
+          value: 'ph',
+          align: 'center'
+        },
+        {
+          text: '电导率',
+          value: 'conductivity',
+          align: 'center'
+        },
+        {
+          text: '溶解氧',
+          value: 'do',
+          align: 'center'
+        },
+        {
+          text: '浊度',
+          value: 'turbidity',
+          align: 'center'
+        },
+        {
+          text: 'COD',
+          value: 'cod',
+          align: 'center'
+        },
+        {
+          text: '氨氮',
+          value: 'an',
+          align: 'center'
+        },
+        {
+          text: '总磷',
+          value: 'tp',
+          align: 'center'
+        },
+        {
+          text: '总氮',
+          value: 'tn',
+          align: 'center'
+        },
+        {
+          text: '状态描述',
+          value: 'descn',
+          align: 'center'
+        },
+        // {
+        //   text: '权属单位',
+        //   value: 'deptName',
+        //   align: 'center'
+        // },
+        {
+          text: '记录时间',
+          value: 'logtime',
+          width: 170,
+          align: 'center'
+        }
+      ], // 显示列
+      multipleSelection: [], // 多选选中项
+      list: [], // 列表数据
+      total: 0, // 数据总数
+      deviceTypeList: [], // 水质配置类型列表
+      deptProps: {
+        parent: 'pid',
+        value: 'id',
+        label: 'name',
+        children: 'children'
+      }, // 权属单位树形下拉菜单
+      deptTreeList: null, // 组织树列表数据
+      showDeptTree: 0, // 是否显示权属单位下拉
+      showDeviceType: true, // 是否显示设备类型下拉
+      listLoading: true, // 加载动画
+      fullscreenLoading: false, // 全屏加载动画
+      editShow: false, // 是否显示编辑框
+      detailShow: false, // 是否显示编辑框
+      deptShowTop: false
+    }
+  },
+  watch: {
+    timeRange(val) {
+      if (val && val.length > 0) {
+        this.listQuery.beginTime = val[0]
+        this.listQuery.endTime = val[1]
+      } else {
+        this.listQuery.beginTime = ''
+        this.listQuery.endTime = ''
+      }
+    }
+  },
+  mounted() {
+    if (window.location.href) {
+      var query = window.location.href.split('?')
+      if (query.length > 1) {
+        var values = query[1].split('&')
+        for (var i = 0; i < values.length; i++) {
+          var pos = values[i].indexOf('=')
+          if (pos === -1) continue
+          var paramname = values[i].substring(0, pos)
+          var value = values[i].substring(pos + 1)
+          if (paramname === 'devcode') {
+            this.listQuery.keywords = value
+            this.fetchData()
+          } else {
+            this.fetchData()
+          }
+        }
+      } else {
+        if (this.$route.params && this.$route.params.deviceType === '2' && this.$route.params.devcode && this.$route.params.devcode !== '') {
+          this.listQuery.keywords = this.$route.params.devcode
+          this.fetchData(false)// 获取数据
+        } else {
+          this.fetchData()
+        }
+      }
+    }
+  },
+  methods: {
+    // 批量导出
+    batchExport() {
+      console.log('批量导出水质配置')
+      // 全屏加载动画
+      const loading = this.$loading({
+        lock: true,
+        text: '数据处理中,请稍后...',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
+      })
+      batchExportMeterData(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()
+      })
+    },
+    // 查询数据
+    search() {
+      this.fetchData(false)
+    },
+    // 获取水质数据
+    fetchData(isNowPage = true) {
+      this.listLoading = true
+      if (!isNowPage) { // 是否显示当前页，否则跳转第一页
+        this.listQuery.offset = 1
+      }
+      getMeterData(this.listQuery).then(response => {
+        this.list = response.data.rows
+        this.total = parseInt(response.data.total)
+        this.listLoading = false
+      })
+    },
+    checkCell(value) {
+      var cell = parseFloat(value)
+      if (cell < 10) {
+        return 'warning-state'
+      }
+    },
+    indexMethod(index) {
+      return this.listQuery.limit * (this.listQuery.offset - 1) + index + 1
+    },
+    // 改变页容量
+    handleSizeChange(val) {
+      this.listQuery.limit = val
+      this.fetchData()
+    },
+    // 改变当前页
+    handleCurrentChange(val) {
+      this.listQuery.offset = val
+      this.fetchData()
+    },
+    // 多选触发方法
+    handleSelectionChange(val) {
+      this.multipleSelection = val
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .app-container{
+    padding: 10px;
+  }
+  $tableTitleHeight:46px;
+  .table{
+    margin-bottom: 20px;
+  }
+  .pagination-container{
+    margin-bottom: 50px;
+  }
+  .table-title{
+    background-color:rgba(243, 243, 243, 1);
+    height: $tableTitleHeight;
+    .title-header{
+      line-height:$tableTitleHeight;
+      color: #606266;
+      font-size: 15px;
+      i{
+        margin-left: 5px;
+        margin-right: 5px;
+      }
+    }
+  }
+  .edit_btns{
+    .edit_btn{
+      float:right;
+      margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2
+    }
+  }
+  .warning-state{
+    color:red
+  }
+</style>
diff --git a/src/views/dataManage/deviceData/listTempData.vue b/src/views/dataManage/deviceData/listTempData.vue
index d6dd093..1707de6 100644
--- a/src/views/dataManage/deviceData/listTempData.vue
+++ b/src/views/dataManage/deviceData/listTempData.vue
@@ -200,7 +200,7 @@
         const downloadElement = document.createElement('a')
         const href = window.URL.createObjectURL(blob) // 创建下载的链接
         downloadElement.href = href
-        downloadElement.download = `温湿度监测仪数s据.xlsx` // 下载后文件名
+        downloadElement.download = `温湿度监测仪数据.xlsx` // 下载后文件名
         document.body.appendChild(downloadElement)
         downloadElement.click() // 点击下载
         document.body.removeChild(downloadElement) // 下载完成移除元素

diff --git a/src/api/data.js b/src/api/data.js
index 7be32bb..66bb327 100644
--- a/src/api/data.js
+++ b/src/api/data.js
@@ -64,6 +64,33 @@
   })
 }
 
+// 水质监测仪数据查询
+export function getMeterData(params) {
+  return request({
+    url: 'meterdata/list',
+    method: 'get',
+    params
+  })
+}
+
+// 流量数据查询
+export function getFlowData(params) {
+  return request({
+    url: 'flowdata/list',
+    method: 'get',
+    params
+  })
+}
+
+// 雨量计数据查询
+export function getHyetoData(params) {
+  return request({
+    url: 'hyetodata/list',
+    method: 'get',
+    params
+  })
+}
+
 // 批量导出井盖数据
 export function batchExportWellData(params) {
   return request({
@@ -140,3 +167,34 @@
     responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
   })
 }
+
+export function batchExportMeterData(params) {
+  return request({
+    url: 'meterdata/export',
+    method: 'get',
+    timeout: 120000, // 120s，2分钟
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+export function batchExportFlowData(params) {
+  return request({
+    url: 'flowdata/export',
+    method: 'get',
+    timeout: 120000, // 120s，2分钟
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 雨量计数据导出
+export function batchExportHyetoData(params) {
+  return request({
+    url: 'hyetodata/export',
+    method: 'get',
+    timeout: 120000, // 120s，2分钟
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
diff --git a/src/views/dataManage/dataManage.vue b/src/views/dataManage/dataManage.vue
index 4c0f6b6..39a3d89 100644
--- a/src/views/dataManage/dataManage.vue
+++ b/src/views/dataManage/dataManage.vue
@@ -22,6 +22,15 @@
       <el-tab-pane v-if="hasPerm('/welllocadata/list')" label="井盖定位监测仪" name="wellloca">
         <list-well-loca-data ref="welllocadatacomp"/>
       </el-tab-pane>
+      <el-tab-pane v-if="hasPerm('/hyetodata/list')" label="雨量计" name="hyetometer">
+        <list-hyetometer-data ref="hyetometerdatacomp"/>
+      </el-tab-pane>
+      <el-tab-pane v-if="hasPerm('/flowdata/list')" label="流量计" name="flowmeter">
+        <list-flowmeter-data ref="flowmeterdatacomp"/>
+      </el-tab-pane>
+      <el-tab-pane v-if="hasPerm('/meterdata/list')" label="水质监测仪" name="meter">
+        <list-meter-data ref="meterdatacomp"/>
+      </el-tab-pane>
     </el-tabs>
   </div>
 </template>
@@ -34,9 +43,12 @@
 import ListHarmfulData from './deviceData/listHarmfulData'
 import ListTempData from './deviceData/listTempData'
 import ListWellLocaData from './deviceData/listWellLocaData'
+import ListHyetometerData from './deviceData/listHyetometerData'
+import ListFlowmeterData from './deviceData/listFlowmeterData'
+import ListMeterData from './deviceData/listMeterData'
 export default {
   name: 'DataManage',
-  components: { ListWellLocaData, ListTempData, ListHarmfulData, ListDigData, ListGasData, ListLiquidData, ListWellCoverData },
+  components: { ListMeterData, ListFlowmeterData, ListHyetometerData, ListWellLocaData, ListTempData, ListHarmfulData, ListDigData, ListGasData, ListLiquidData, ListWellCoverData },
   data() {
     return {
       activeName: 'wellcover'
@@ -66,6 +78,12 @@
             this.activeName = 'dig'
           } else if (value === '7') {
             this.activeName = 'wellloca'
+          } else if (value === '8') {
+            this.activeName = 'hyetometer'
+          } else if (value === '9') {
+            this.activeName = 'flowmeter'
+          } else if (value === '10') {
+            this.activeName = 'meter'
           }
         }
       }
@@ -85,6 +103,12 @@
         this.activeName = 'dig'
       } else if (this.$route.params.deviceType === '7') {
         this.activeName = 'wellloca'
+      } else if (this.$route.params.deviceType === '8') {
+        this.activeName = 'hyetometer'
+      } else if (this.$route.params.deviceType === '9') {
+        this.activeName = 'flowmeter'
+      } else if (this.$route.params.deviceType === '10') {
+        this.activeName = 'meter'
       }
     }
   },
@@ -104,6 +128,12 @@
         this.$refs.digdatacomp.fetchData()
       } else if (tab.name === 'wellloca') {
         this.$refs.welllocadatacomp.fetchData()
+      } else if (tab.name === 'hyetometer') {
+        this.$refs.hyetometerdatacomp.fetchData()
+      } else if (tab.name === 'flowmeter') {
+        this.$refs.flowmeterdatacomp.fetchData()
+      } else if (tab.name === 'meter') {
+        this.$refs.meterdatacomp.fetchData()
       }
     }
   }
diff --git a/src/views/dataManage/deviceData/listDigData.vue b/src/views/dataManage/deviceData/listDigData.vue
index cc9fd31..cd8de5e 100644
--- a/src/views/dataManage/deviceData/listDigData.vue
+++ b/src/views/dataManage/deviceData/listDigData.vue
@@ -202,7 +202,7 @@
         const downloadElement = document.createElement('a')
         const href = window.URL.createObjectURL(blob) // 创建下载的链接
         downloadElement.href = href
-        downloadElement.download = `开挖监测仪数s据.xlsx` // 下载后文件名
+        downloadElement.download = `开挖监测仪数据.xlsx` // 下载后文件名
         document.body.appendChild(downloadElement)
         downloadElement.click() // 点击下载
         document.body.removeChild(downloadElement) // 下载完成移除元素
diff --git a/src/views/dataManage/deviceData/listFlowmeterData.vue b/src/views/dataManage/deviceData/listFlowmeterData.vue
new file mode 100644
index 0000000..57a84a4
--- /dev/null
+++ b/src/views/dataManage/deviceData/listFlowmeterData.vue
@@ -0,0 +1,296 @@
+<!--流量计数据-->
+<template>
+  <div class="app-container">
+    <!--筛选条件-->
+    <div class="search-div">
+      <el-form ref="selectForm" :inline="true" :model="listQuery" class="form-container">
+        <el-row>
+          <el-form-item class="selectForm-container-item" prop="keywords">
+            <el-input v-model.trim="listQuery.keywords" placeholder="井编号/设备编号" clearable/>
+          </el-form-item>
+          <el-form-item class="selectForm-container-item">
+            <dept-select v-model="listQuery.deptid" :need-top="deptShowTop" dept-type="03" placeholder="选择权属单位"/>
+          </el-form-item>
+          <el-form-item class="selectForm-container-item" prop="beginTime">
+            <el-date-picker
+              v-model="timeRange"
+              type="datetimerange"
+              range-separator="至"
+              value-format="yyyy-MM-dd HH:mm:ss"
+              start-placeholder="开始时间"
+              end-placeholder="结束时间"/>
+          </el-form-item>
+          <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
+        </el-row>
+      </el-form>
+    </div>
+    <!--查询结果Table显示-->
+    <div>
+      <el-row class="table-title">
+        <el-col :span="6"><div class="title-header"><i class="el-icon-menu"/>数据列表</div></el-col>
+        <el-col :span="12" :offset="6" class="edit_btns">
+          <el-button v-if="hasPerm('/liquiddata/export')" class="edit_btn" size="small" @click="batchExport">导出记录</el-button>
+        </el-col>
+      </el-row>
+      <el-table v-loading="listLoading" :data="list" class="table" border @selection-change="handleSelectionChange">
+        <!--<el-table-column align="center" type="selection" width="55"/>-->
+        <el-table-column :index="indexMethod" align="center" type="index"/>
+        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
+          <template slot-scope="scope">
+            <span v-if="column.checkCell" :class="checkCell(scope.row.cell)">{{ scope.row[column.value] }}</span>
+            <span v-else>{{ scope.row[column.value] }}</span>
+          </template>
+        </el-table-column>
+      </el-table>
+    </div>
+    <!--分页-->
+    <div class="pagination-container">
+      <el-pagination
+        v-show="total>listQuery.limit"
+        :current-page="listQuery.offset"
+        :page-sizes="[20,30,50]"
+        :page-size="listQuery.limit"
+        :total="total"
+        align="center"
+        layout="total, sizes, prev, pager, next"
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"/>
+    </div>
+  </div>
+</template>
+
+<script>
+import selectTree from '@/components/SelectTree/singleSelect'
+import { getFlowData, batchExportFlowData } from '@/api/data'
+import DeptSelect from '../../../components/DeptSelect/index'
+
+export default {
+  name: 'ListFlowmeterData',
+  components: { DeptSelect, selectTree },
+  data() {
+    return {
+      listQuery: {
+        keywords: '', // 关键字
+        deptid: '', // 部门id
+        beginTime: '', // 开始时间
+        endTime: '', // 结束时间
+        offset: 1,
+        limit: 20,
+        sort: '',
+        order: ''
+      }, // 筛选条件
+      timeRange: [], // 时间范围
+      columns: [
+        {
+          text: '井编号',
+          value: 'wellCode',
+          align: 'center'
+        },
+        {
+          text: '设备编号',
+          value: 'devcode',
+          align: 'center'
+        },
+        // {
+        //   text: '设备类型',
+        //   value: 'deviceTypeName',
+        //   align: 'center'
+        // },
+        {
+          text: '水位',
+          value: 'waterLevel',
+          align: 'center'
+        },
+        {
+          text: '流速',
+          value: 'flowVelocity',
+          align: 'center'
+        },
+        {
+          text: '温度',
+          value: 'temperature',
+          align: 'center'
+        },
+        {
+          text: '瞬时流量',
+          value: 'instantFlow',
+          align: 'center'
+        },
+        {
+          text: '累计流量',
+          value: 'totalFlow',
+          align: 'center'
+        },
+        // {
+        //   text: '权属单位',
+        //   value: 'deptName',
+        //   align: 'center'
+        // },
+        {
+          text: '记录时间',
+          value: 'logtime',
+          width: 170,
+          align: 'center'
+        }
+      ], // 显示列
+      multipleSelection: [], // 多选选中项
+      list: [], // 列表数据
+      total: 0, // 数据总数
+      deviceTypeList: [], // 流量计类型列表
+      deptProps: {
+        parent: 'pid',
+        value: 'id',
+        label: 'name',
+        children: 'children'
+      }, // 权属单位树形下拉菜单
+      deptTreeList: null, // 组织树列表数据
+      showDeptTree: 0, // 是否显示权属单位下拉
+      showDeviceType: true, // 是否显示设备类型下拉
+      listLoading: true, // 加载动画
+      fullscreenLoading: false, // 全屏加载动画
+      editShow: false, // 是否显示编辑框
+      detailShow: false, // 是否显示编辑框
+      deptShowTop: false
+    }
+  },
+  watch: {
+    timeRange(val) {
+      if (val && val.length > 0) {
+        this.listQuery.beginTime = val[0]
+        this.listQuery.endTime = val[1]
+      } else {
+        this.listQuery.beginTime = ''
+        this.listQuery.endTime = ''
+      }
+    }
+  },
+  mounted() {
+    if (window.location.href) {
+      var query = window.location.href.split('?')
+      if (query.length > 1) {
+        var values = query[1].split('&')
+        for (var i = 0; i < values.length; i++) {
+          var pos = values[i].indexOf('=')
+          if (pos === -1) continue
+          var paramname = values[i].substring(0, pos)
+          var value = values[i].substring(pos + 1)
+          if (paramname === 'devcode') {
+            this.listQuery.keywords = value
+            this.fetchData()
+          } else {
+            this.fetchData()
+          }
+        }
+      } else {
+        if (this.$route.params && this.$route.params.deviceType === '2' && this.$route.params.devcode && this.$route.params.devcode !== '') {
+          this.listQuery.keywords = this.$route.params.devcode
+          this.fetchData(false)// 获取数据
+        } else {
+          this.fetchData()
+        }
+      }
+    }
+  },
+  methods: {
+    // 批量导出
+    batchExport() {
+      // 全屏加载动画
+      const loading = this.$loading({
+        lock: true,
+        text: '数据处理中,请稍后...',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
+      })
+      batchExportFlowData(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()
+      })
+    },
+    // 查询数据
+    search() {
+      this.fetchData(false)
+    },
+    // 获取流量计数据
+    fetchData(isNowPage = true) {
+      this.listLoading = true
+      if (!isNowPage) { // 是否显示当前页，否则跳转第一页
+        this.listQuery.offset = 1
+      }
+      getFlowData(this.listQuery).then(response => {
+        this.list = response.data.rows
+        this.total = parseInt(response.data.total)
+        this.listLoading = false
+      })
+    },
+    checkCell(value) {
+      var cell = parseFloat(value)
+      if (cell < 10) {
+        return 'warning-state'
+      }
+    },
+    indexMethod(index) {
+      return this.listQuery.limit * (this.listQuery.offset - 1) + index + 1
+    },
+    // 改变页容量
+    handleSizeChange(val) {
+      this.listQuery.limit = val
+      this.fetchData()
+    },
+    // 改变当前页
+    handleCurrentChange(val) {
+      this.listQuery.offset = val
+      this.fetchData()
+    },
+    // 多选触发方法
+    handleSelectionChange(val) {
+      this.multipleSelection = val
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .app-container{
+    padding: 10px;
+  }
+  $tableTitleHeight:46px;
+  .table{
+    margin-bottom: 20px;
+  }
+  .pagination-container{
+    margin-bottom: 50px;
+  }
+  .table-title{
+    background-color:rgba(243, 243, 243, 1);
+    height: $tableTitleHeight;
+    .title-header{
+      line-height:$tableTitleHeight;
+      color: #606266;
+      font-size: 15px;
+      i{
+        margin-left: 5px;
+        margin-right: 5px;
+      }
+    }
+  }
+  .edit_btns{
+    .edit_btn{
+      float:right;
+      margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2
+    }
+  }
+  .warning-state{
+    color:red
+  }
+</style>
diff --git a/src/views/dataManage/deviceData/listGasData.vue b/src/views/dataManage/deviceData/listGasData.vue
index f77e0e8..cd05595 100644
--- a/src/views/dataManage/deviceData/listGasData.vue
+++ b/src/views/dataManage/deviceData/listGasData.vue
@@ -200,7 +200,7 @@
         const downloadElement = document.createElement('a')
         const href = window.URL.createObjectURL(blob) // 创建下载的链接
         downloadElement.href = href
-        downloadElement.download = `燃气监测仪数s据.xlsx` // 下载后文件名
+        downloadElement.download = `有害气体监测仪数据.xlsx` // 下载后文件名
         document.body.appendChild(downloadElement)
         downloadElement.click() // 点击下载
         document.body.removeChild(downloadElement) // 下载完成移除元素
diff --git a/src/views/dataManage/deviceData/listHyetometerData.vue b/src/views/dataManage/deviceData/listHyetometerData.vue
new file mode 100644
index 0000000..516a91a
--- /dev/null
+++ b/src/views/dataManage/deviceData/listHyetometerData.vue
@@ -0,0 +1,276 @@
+<!--雨量计数据-->
+<template>
+  <div class="app-container">
+    <!--筛选条件-->
+    <div class="search-div">
+      <el-form ref="selectForm" :inline="true" :model="listQuery" class="form-container">
+        <el-row>
+          <el-form-item class="selectForm-container-item" prop="keywords">
+            <el-input v-model.trim="listQuery.keywords" placeholder="设备编号" clearable/>
+          </el-form-item>
+          <el-form-item class="selectForm-container-item">
+            <dept-select v-model="listQuery.deptid" :need-top="deptShowTop" dept-type="03" placeholder="选择权属单位"/>
+          </el-form-item>
+          <el-form-item class="selectForm-container-item" prop="beginTime">
+            <el-date-picker
+              v-model="timeRange"
+              type="datetimerange"
+              range-separator="至"
+              value-format="yyyy-MM-dd HH:mm:ss"
+              start-placeholder="开始时间"
+              end-placeholder="结束时间"/>
+          </el-form-item>
+          <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
+        </el-row>
+      </el-form>
+    </div>
+    <!--查询结果Table显示-->
+    <div>
+      <el-row class="table-title">
+        <el-col :span="6"><div class="title-header"><i class="el-icon-menu"/>数据列表</div></el-col>
+        <el-col :span="12" :offset="6" class="edit_btns">
+          <el-button v-if="hasPerm('/liquiddata/export')" class="edit_btn" size="small" @click="batchExport">导出记录</el-button>
+        </el-col>
+      </el-row>
+      <el-table v-loading="listLoading" :data="list" class="table" border @selection-change="handleSelectionChange">
+        <!--<el-table-column align="center" type="selection" width="55"/>-->
+        <el-table-column :index="indexMethod" align="center" type="index"/>
+        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
+          <template slot-scope="scope">
+            <span v-if="column.checkCell" :class="checkCell(scope.row.cell)">{{ scope.row[column.value] }}</span>
+            <span v-else>{{ scope.row[column.value] }}</span>
+          </template>
+        </el-table-column>
+      </el-table>
+    </div>
+    <!--分页-->
+    <div class="pagination-container">
+      <el-pagination
+        v-show="total>listQuery.limit"
+        :current-page="listQuery.offset"
+        :page-sizes="[20,30,50]"
+        :page-size="listQuery.limit"
+        :total="total"
+        align="center"
+        layout="total, sizes, prev, pager, next"
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"/>
+    </div>
+  </div>
+</template>
+
+<script>
+import selectTree from '@/components/SelectTree/singleSelect'
+import { getHyetoData, batchExportHyetoData } from '@/api/data'
+import DeptSelect from '../../../components/DeptSelect/index'
+
+export default {
+  name: 'ListHyetometerData',
+  components: { DeptSelect, selectTree },
+  data() {
+    return {
+      listQuery: {
+        keywords: '', // 关键字
+        deptid: '', // 部门id
+        beginTime: '', // 开始时间
+        endTime: '', // 结束时间
+        offset: 1,
+        limit: 20,
+        sort: '',
+        order: ''
+      }, // 筛选条件
+      timeRange: [], // 时间范围
+      columns: [
+        {
+          text: '设备编号',
+          value: 'devcode',
+          align: 'center'
+        },
+        {
+          text: '设备类型',
+          value: 'deviceTypeName',
+          align: 'center'
+        },
+        {
+          text: '上一分钟实时雨量(mm)',
+          value: 'realTimeData',
+          align: 'center'
+        },
+        {
+          text: '日累计雨量(mm)',
+          value: 'cumulativeData',
+          align: 'center'
+        },
+        {
+          text: '权属单位',
+          value: 'deptName',
+          align: 'center'
+        },
+        {
+          text: '记录时间',
+          value: 'logtime',
+          width: 170,
+          align: 'center'
+        }
+      ], // 显示列
+      multipleSelection: [], // 多选选中项
+      list: [], // 列表数据
+      total: 0, // 数据总数
+      deviceTypeList: [], // 雨量计类型列表
+      deptProps: {
+        parent: 'pid',
+        value: 'id',
+        label: 'name',
+        children: 'children'
+      }, // 权属单位树形下拉菜单
+      deptTreeList: null, // 组织树列表数据
+      showDeptTree: 0, // 是否显示权属单位下拉
+      showDeviceType: true, // 是否显示设备类型下拉
+      listLoading: true, // 加载动画
+      fullscreenLoading: false, // 全屏加载动画
+      editShow: false, // 是否显示编辑框
+      detailShow: false, // 是否显示编辑框
+      deptShowTop: false
+    }
+  },
+  watch: {
+    timeRange(val) {
+      if (val && val.length > 0) {
+        this.listQuery.beginTime = val[0]
+        this.listQuery.endTime = val[1]
+      } else {
+        this.listQuery.beginTime = ''
+        this.listQuery.endTime = ''
+      }
+    }
+  },
+  mounted() {
+    if (window.location.href) {
+      var query = window.location.href.split('?')
+      if (query.length > 1) {
+        var values = query[1].split('&')
+        for (var i = 0; i < values.length; i++) {
+          var pos = values[i].indexOf('=')
+          if (pos === -1) continue
+          var paramname = values[i].substring(0, pos)
+          var value = values[i].substring(pos + 1)
+          if (paramname === 'devcode') {
+            this.listQuery.keywords = value
+            this.fetchData()
+          } else {
+            this.fetchData()
+          }
+        }
+      } else {
+        if (this.$route.params && this.$route.params.deviceType === '2' && this.$route.params.devcode && this.$route.params.devcode !== '') {
+          this.listQuery.keywords = this.$route.params.devcode
+          this.fetchData(false)// 获取数据
+        } else {
+          this.fetchData()
+        }
+      }
+    }
+  },
+  methods: {
+    // 批量导出
+    batchExport() {
+      // 全屏加载动画
+      const loading = this.$loading({
+        lock: true,
+        text: '数据处理中,请稍后...',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
+      })
+      batchExportHyetoData(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()
+      })
+    },
+    // 查询数据
+    search() {
+      this.fetchData(false)
+    },
+    // 获取雨量计数据
+    fetchData(isNowPage = true) {
+      this.listLoading = true
+      if (!isNowPage) { // 是否显示当前页，否则跳转第一页
+        this.listQuery.offset = 1
+      }
+      getHyetoData(this.listQuery).then(response => {
+        this.list = response.data.rows
+        this.total = parseInt(response.data.total)
+        this.listLoading = false
+      })
+    },
+    checkCell(value) {
+      var cell = parseFloat(value)
+      if (cell < 10) {
+        return 'warning-state'
+      }
+    },
+    indexMethod(index) {
+      return this.listQuery.limit * (this.listQuery.offset - 1) + index + 1
+    },
+    // 改变页容量
+    handleSizeChange(val) {
+      this.listQuery.limit = val
+      this.fetchData()
+    },
+    // 改变当前页
+    handleCurrentChange(val) {
+      this.listQuery.offset = val
+      this.fetchData()
+    },
+    // 多选触发方法
+    handleSelectionChange(val) {
+      this.multipleSelection = val
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .app-container{
+    padding: 10px;
+  }
+  $tableTitleHeight:46px;
+  .table{
+    margin-bottom: 20px;
+  }
+  .pagination-container{
+    margin-bottom: 50px;
+  }
+  .table-title{
+    background-color:rgba(243, 243, 243, 1);
+    height: $tableTitleHeight;
+    .title-header{
+      line-height:$tableTitleHeight;
+      color: #606266;
+      font-size: 15px;
+      i{
+        margin-left: 5px;
+        margin-right: 5px;
+      }
+    }
+  }
+  .edit_btns{
+    .edit_btn{
+      float:right;
+      margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2
+    }
+  }
+  .warning-state{
+    color:red
+  }
+</style>
diff --git a/src/views/dataManage/deviceData/listLiquidData.vue b/src/views/dataManage/deviceData/listLiquidData.vue
index c36e471..9bf5307 100644
--- a/src/views/dataManage/deviceData/listLiquidData.vue
+++ b/src/views/dataManage/deviceData/listLiquidData.vue
@@ -195,7 +195,7 @@
         const downloadElement = document.createElement('a')
         const href = window.URL.createObjectURL(blob) // 创建下载的链接
         downloadElement.href = href
-        downloadElement.download = `液位监测仪数s据.xlsx` // 下载后文件名
+        downloadElement.download = `液位监测仪数据.xlsx` // 下载后文件名
         document.body.appendChild(downloadElement)
         downloadElement.click() // 点击下载
         document.body.removeChild(downloadElement) // 下载完成移除元素
diff --git a/src/views/dataManage/deviceData/listMeterData.vue b/src/views/dataManage/deviceData/listMeterData.vue
new file mode 100644
index 0000000..20967c4
--- /dev/null
+++ b/src/views/dataManage/deviceData/listMeterData.vue
@@ -0,0 +1,317 @@
+<!--水质数据-->
+<template>
+  <div class="app-container">
+    <!--筛选条件-->
+    <div class="search-div">
+      <el-form ref="selectForm" :inline="true" :model="listQuery" class="form-container">
+        <el-row>
+          <el-form-item class="selectForm-container-item" prop="keywords">
+            <el-input v-model.trim="listQuery.keywords" placeholder="井编号/设备编号" clearable/>
+          </el-form-item>
+          <el-form-item class="selectForm-container-item">
+            <dept-select v-model="listQuery.deptid" :need-top="deptShowTop" dept-type="03" placeholder="选择权属单位"/>
+          </el-form-item>
+          <el-form-item class="selectForm-container-item" prop="beginTime">
+            <el-date-picker
+              v-model="timeRange"
+              type="datetimerange"
+              range-separator="至"
+              value-format="yyyy-MM-dd HH:mm:ss"
+              start-placeholder="开始时间"
+              end-placeholder="结束时间"/>
+          </el-form-item>
+          <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
+        </el-row>
+      </el-form>
+    </div>
+    <!--查询结果Table显示-->
+    <div>
+      <el-row class="table-title">
+        <el-col :span="6"><div class="title-header"><i class="el-icon-menu"/>数据列表</div></el-col>
+        <el-col :span="12" :offset="6" class="edit_btns">
+          <el-button v-if="hasPerm('/liquiddata/export')" class="edit_btn" size="small" @click="batchExport">导出记录</el-button>
+        </el-col>
+      </el-row>
+      <el-table v-loading="listLoading" :data="list" class="table" border @selection-change="handleSelectionChange">
+        <!--<el-table-column align="center" type="selection" width="55"/>-->
+        <el-table-column :index="indexMethod" align="center" type="index"/>
+        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
+          <template slot-scope="scope">
+            <span v-if="column.checkCell" :class="checkCell(scope.row.cell)">{{ scope.row[column.value] }}</span>
+            <span v-else>{{ scope.row[column.value] }}</span>
+          </template>
+        </el-table-column>
+      </el-table>
+    </div>
+    <!--分页-->
+    <div class="pagination-container">
+      <el-pagination
+        v-show="total>listQuery.limit"
+        :current-page="listQuery.offset"
+        :page-sizes="[20,30,50]"
+        :page-size="listQuery.limit"
+        :total="total"
+        align="center"
+        layout="total, sizes, prev, pager, next"
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"/>
+    </div>
+  </div>
+</template>
+
+<script>
+import selectTree from '@/components/SelectTree/singleSelect'
+import { getMeterData, batchExportMeterData } from '@/api/data'
+import DeptSelect from '../../../components/DeptSelect/index'
+
+export default {
+  name: 'ListMeterData',
+  components: { DeptSelect, selectTree },
+  data() {
+    return {
+      listQuery: {
+        keywords: '', // 关键字
+        deptid: '', // 部门id
+        beginTime: '', // 开始时间
+        endTime: '', // 结束时间
+        offset: 1,
+        limit: 20,
+        sort: '',
+        order: ''
+      }, // 筛选条件
+      timeRange: [], // 时间范围
+      columns: [
+        {
+          text: '井编号',
+          value: 'wellCode',
+          align: 'center'
+        },
+        {
+          text: '设备编号',
+          value: 'devcode',
+          align: 'center'
+        },
+        {
+          text: '温度',
+          value: 'temp',
+          align: 'center'
+        },
+        {
+          text: 'PH',
+          value: 'ph',
+          align: 'center'
+        },
+        {
+          text: '电导率',
+          value: 'conductivity',
+          align: 'center'
+        },
+        {
+          text: '溶解氧',
+          value: 'do',
+          align: 'center'
+        },
+        {
+          text: '浊度',
+          value: 'turbidity',
+          align: 'center'
+        },
+        {
+          text: 'COD',
+          value: 'cod',
+          align: 'center'
+        },
+        {
+          text: '氨氮',
+          value: 'an',
+          align: 'center'
+        },
+        {
+          text: '总磷',
+          value: 'tp',
+          align: 'center'
+        },
+        {
+          text: '总氮',
+          value: 'tn',
+          align: 'center'
+        },
+        {
+          text: '状态描述',
+          value: 'descn',
+          align: 'center'
+        },
+        // {
+        //   text: '权属单位',
+        //   value: 'deptName',
+        //   align: 'center'
+        // },
+        {
+          text: '记录时间',
+          value: 'logtime',
+          width: 170,
+          align: 'center'
+        }
+      ], // 显示列
+      multipleSelection: [], // 多选选中项
+      list: [], // 列表数据
+      total: 0, // 数据总数
+      deviceTypeList: [], // 水质配置类型列表
+      deptProps: {
+        parent: 'pid',
+        value: 'id',
+        label: 'name',
+        children: 'children'
+      }, // 权属单位树形下拉菜单
+      deptTreeList: null, // 组织树列表数据
+      showDeptTree: 0, // 是否显示权属单位下拉
+      showDeviceType: true, // 是否显示设备类型下拉
+      listLoading: true, // 加载动画
+      fullscreenLoading: false, // 全屏加载动画
+      editShow: false, // 是否显示编辑框
+      detailShow: false, // 是否显示编辑框
+      deptShowTop: false
+    }
+  },
+  watch: {
+    timeRange(val) {
+      if (val && val.length > 0) {
+        this.listQuery.beginTime = val[0]
+        this.listQuery.endTime = val[1]
+      } else {
+        this.listQuery.beginTime = ''
+        this.listQuery.endTime = ''
+      }
+    }
+  },
+  mounted() {
+    if (window.location.href) {
+      var query = window.location.href.split('?')
+      if (query.length > 1) {
+        var values = query[1].split('&')
+        for (var i = 0; i < values.length; i++) {
+          var pos = values[i].indexOf('=')
+          if (pos === -1) continue
+          var paramname = values[i].substring(0, pos)
+          var value = values[i].substring(pos + 1)
+          if (paramname === 'devcode') {
+            this.listQuery.keywords = value
+            this.fetchData()
+          } else {
+            this.fetchData()
+          }
+        }
+      } else {
+        if (this.$route.params && this.$route.params.deviceType === '2' && this.$route.params.devcode && this.$route.params.devcode !== '') {
+          this.listQuery.keywords = this.$route.params.devcode
+          this.fetchData(false)// 获取数据
+        } else {
+          this.fetchData()
+        }
+      }
+    }
+  },
+  methods: {
+    // 批量导出
+    batchExport() {
+      console.log('批量导出水质配置')
+      // 全屏加载动画
+      const loading = this.$loading({
+        lock: true,
+        text: '数据处理中,请稍后...',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
+      })
+      batchExportMeterData(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()
+      })
+    },
+    // 查询数据
+    search() {
+      this.fetchData(false)
+    },
+    // 获取水质数据
+    fetchData(isNowPage = true) {
+      this.listLoading = true
+      if (!isNowPage) { // 是否显示当前页，否则跳转第一页
+        this.listQuery.offset = 1
+      }
+      getMeterData(this.listQuery).then(response => {
+        this.list = response.data.rows
+        this.total = parseInt(response.data.total)
+        this.listLoading = false
+      })
+    },
+    checkCell(value) {
+      var cell = parseFloat(value)
+      if (cell < 10) {
+        return 'warning-state'
+      }
+    },
+    indexMethod(index) {
+      return this.listQuery.limit * (this.listQuery.offset - 1) + index + 1
+    },
+    // 改变页容量
+    handleSizeChange(val) {
+      this.listQuery.limit = val
+      this.fetchData()
+    },
+    // 改变当前页
+    handleCurrentChange(val) {
+      this.listQuery.offset = val
+      this.fetchData()
+    },
+    // 多选触发方法
+    handleSelectionChange(val) {
+      this.multipleSelection = val
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .app-container{
+    padding: 10px;
+  }
+  $tableTitleHeight:46px;
+  .table{
+    margin-bottom: 20px;
+  }
+  .pagination-container{
+    margin-bottom: 50px;
+  }
+  .table-title{
+    background-color:rgba(243, 243, 243, 1);
+    height: $tableTitleHeight;
+    .title-header{
+      line-height:$tableTitleHeight;
+      color: #606266;
+      font-size: 15px;
+      i{
+        margin-left: 5px;
+        margin-right: 5px;
+      }
+    }
+  }
+  .edit_btns{
+    .edit_btn{
+      float:right;
+      margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2
+    }
+  }
+  .warning-state{
+    color:red
+  }
+</style>
diff --git a/src/views/dataManage/deviceData/listTempData.vue b/src/views/dataManage/deviceData/listTempData.vue
index d6dd093..1707de6 100644
--- a/src/views/dataManage/deviceData/listTempData.vue
+++ b/src/views/dataManage/deviceData/listTempData.vue
@@ -200,7 +200,7 @@
         const downloadElement = document.createElement('a')
         const href = window.URL.createObjectURL(blob) // 创建下载的链接
         downloadElement.href = href
-        downloadElement.download = `温湿度监测仪数s据.xlsx` // 下载后文件名
+        downloadElement.download = `温湿度监测仪数据.xlsx` // 下载后文件名
         document.body.appendChild(downloadElement)
         downloadElement.click() // 点击下载
         document.body.removeChild(downloadElement) // 下载完成移除元素
diff --git a/src/views/dataManage/deviceData/listWellLocaData.vue b/src/views/dataManage/deviceData/listWellLocaData.vue
index 4bef89e..52e1fce 100644
--- a/src/views/dataManage/deviceData/listWellLocaData.vue
+++ b/src/views/dataManage/deviceData/listWellLocaData.vue
@@ -200,7 +200,7 @@
         const downloadElement = document.createElement('a')
         const href = window.URL.createObjectURL(blob) // 创建下载的链接
         downloadElement.href = href
-        downloadElement.download = `液位监测仪数s据.xlsx` // 下载后文件名
+        downloadElement.download = `井盖定位监测仪数据.xlsx` // 下载后文件名
         document.body.appendChild(downloadElement)
         downloadElement.click() // 点击下载
         document.body.removeChild(downloadElement) // 下载完成移除元素