diff --git a/src/api/device.js b/src/api/device.js
index 00804fe..edcc1a4 100644
--- a/src/api/device.js
+++ b/src/api/device.js
@@ -100,4 +100,11 @@
     params
   })
 }
+export function totalDataGasFlow(params) {
+  return request({
+    url: 'gasflow/listByDevice',
+    method: 'post',
+    params
+  })
+}
 

diff --git a/src/api/device.js b/src/api/device.js
index 00804fe..edcc1a4 100644
--- a/src/api/device.js
+++ b/src/api/device.js
@@ -100,4 +100,11 @@
     params
   })
 }
+export function totalDataGasFlow(params) {
+  return request({
+    url: 'gasflow/listByDevice',
+    method: 'post',
+    params
+  })
+}
 
diff --git a/src/views/dataManage/deviceData/gasFlowHistory.vue b/src/views/dataManage/deviceData/gasFlowHistory.vue
new file mode 100644
index 0000000..6bbc40e
--- /dev/null
+++ b/src/views/dataManage/deviceData/gasFlowHistory.vue
@@ -0,0 +1,117 @@
+<template>
+  <el-dialog
+    :visible.sync="dialogFormVisible"
+    :title="listQuery.devCode+'历史数据'"
+    width="60%"
+    append-to-body
+    class="lineDialog"
+  >
+    <div style="margin-bottom: 10px">
+      <el-date-picker
+        v-model="timeRange"
+        type="datetimerange"
+        range-separator="至"
+        value-format="yyyy-MM-dd HH:mm:ss"
+        start-placeholder="开始时间"
+        end-placeholder="结束时间"
+        size="small"/>
+      <el-button class="filter-item" type="primary" icon="el-icon-search" size="small" @click="fetchData">搜索</el-button>
+      <!-- <el-button class="filter-item" type="primary" size="small" @click="exportData">导出</el-button> -->
+    </div>
+    <div v-loading="loading1">
+      <div>
+        <el-table :data="data" size="mini" height="380px" >
+          <el-table-column label="上报时间" prop="logtime" align="center"/>
+          <el-table-column label="瞬时流速(Nm/s)" prop="instantVelocity" align="center"/>
+          <el-table-column label="瞬时流量(m³/h)" prop="instantFlow" align="center"/>
+          <el-table-column label="介质温度(℃)" prop="ambocetorTemperture" align="center"/>
+          <el-table-column label="累计流量(m³)" prop="totalFlow" align="center"/>
+        </el-table>
+      </div>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { getDayTime } from '@/utils/dateutils'
+import { totalDataGasFlow } from '@/api/device'
+import { batchExportWaterHistory } from '@/api/data'
+
+export default {
+  name: 'GasFlowHistory',
+  data() {
+    return {
+      loading1: true,
+      timeRange: [],
+      dialogFormVisible: false, // 对话框是否显示
+      listQuery: {
+        devCode: '',
+        beginTime: '',
+        endTime: ''
+      },
+      data: []
+
+    }
+  },
+  methods: {
+    initDialog: function(dialogFormVisible, row = null) {
+      console.log(row, '========row=====')
+      this.listQuery.devCode = row.devcode
+      this.dialogFormVisible = dialogFormVisible
+      const beginTime = getDayTime(new Date().getTime() - 24 * 7 * 60 * 60 * 1000).Format('yyyy-MM-dd hh:mm:ss')
+      const endTime = new Date().Format('yyyy-MM-dd hh:mm:ss')
+      this.timeRange = [beginTime, endTime]
+      this.fetchData() // 传row
+    },
+    fetchData() {
+      this.loading1 = true
+      if (this.timeRange && this.timeRange.length === 2) {
+        this.listQuery.beginTime = this.timeRange[0]
+        this.listQuery.endTime = this.timeRange[1]
+      } else {
+        this.listQuery.beginTime = ''
+        this.listQuery.endTime = ''
+      }
+      totalDataGasFlow(this.listQuery).then(response => {
+        this.data = response.data
+        this.loading1 = false
+      })
+    },
+    // 批量导出
+    exportData() {
+      console.log('批量导出液位配置')
+      // 全屏加载动画
+      const loading = this.$loading({
+        lock: true,
+        text: '数据处理中,请稍后...',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
+      })
+      batchExportWaterHistory(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 = `${this.listQuery.devCode}远传水表历史数据.xlsx` // 下载后文件名
+        document.body.appendChild(downloadElement)
+        downloadElement.click() // 点击下载
+        document.body.removeChild(downloadElement) // 下载完成移除元素
+        window.URL.revokeObjectURL(href) // 释放blob对象
+      }).catch((res) => {
+        loading.close()
+      })
+    }
+  }
+}
+</script>
+<style>
+  .el-dialog__header {
+    padding: 10px !important;
+  }
+  .el-dialog__body {
+    padding: 10px !important;
+  }
+
+</style>

diff --git a/src/api/device.js b/src/api/device.js
index 00804fe..edcc1a4 100644
--- a/src/api/device.js
+++ b/src/api/device.js
@@ -100,4 +100,11 @@
     params
   })
 }
+export function totalDataGasFlow(params) {
+  return request({
+    url: 'gasflow/listByDevice',
+    method: 'post',
+    params
+  })
+}
 
diff --git a/src/views/dataManage/deviceData/gasFlowHistory.vue b/src/views/dataManage/deviceData/gasFlowHistory.vue
new file mode 100644
index 0000000..6bbc40e
--- /dev/null
+++ b/src/views/dataManage/deviceData/gasFlowHistory.vue
@@ -0,0 +1,117 @@
+<template>
+  <el-dialog
+    :visible.sync="dialogFormVisible"
+    :title="listQuery.devCode+'历史数据'"
+    width="60%"
+    append-to-body
+    class="lineDialog"
+  >
+    <div style="margin-bottom: 10px">
+      <el-date-picker
+        v-model="timeRange"
+        type="datetimerange"
+        range-separator="至"
+        value-format="yyyy-MM-dd HH:mm:ss"
+        start-placeholder="开始时间"
+        end-placeholder="结束时间"
+        size="small"/>
+      <el-button class="filter-item" type="primary" icon="el-icon-search" size="small" @click="fetchData">搜索</el-button>
+      <!-- <el-button class="filter-item" type="primary" size="small" @click="exportData">导出</el-button> -->
+    </div>
+    <div v-loading="loading1">
+      <div>
+        <el-table :data="data" size="mini" height="380px" >
+          <el-table-column label="上报时间" prop="logtime" align="center"/>
+          <el-table-column label="瞬时流速(Nm/s)" prop="instantVelocity" align="center"/>
+          <el-table-column label="瞬时流量(m³/h)" prop="instantFlow" align="center"/>
+          <el-table-column label="介质温度(℃)" prop="ambocetorTemperture" align="center"/>
+          <el-table-column label="累计流量(m³)" prop="totalFlow" align="center"/>
+        </el-table>
+      </div>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { getDayTime } from '@/utils/dateutils'
+import { totalDataGasFlow } from '@/api/device'
+import { batchExportWaterHistory } from '@/api/data'
+
+export default {
+  name: 'GasFlowHistory',
+  data() {
+    return {
+      loading1: true,
+      timeRange: [],
+      dialogFormVisible: false, // 对话框是否显示
+      listQuery: {
+        devCode: '',
+        beginTime: '',
+        endTime: ''
+      },
+      data: []
+
+    }
+  },
+  methods: {
+    initDialog: function(dialogFormVisible, row = null) {
+      console.log(row, '========row=====')
+      this.listQuery.devCode = row.devcode
+      this.dialogFormVisible = dialogFormVisible
+      const beginTime = getDayTime(new Date().getTime() - 24 * 7 * 60 * 60 * 1000).Format('yyyy-MM-dd hh:mm:ss')
+      const endTime = new Date().Format('yyyy-MM-dd hh:mm:ss')
+      this.timeRange = [beginTime, endTime]
+      this.fetchData() // 传row
+    },
+    fetchData() {
+      this.loading1 = true
+      if (this.timeRange && this.timeRange.length === 2) {
+        this.listQuery.beginTime = this.timeRange[0]
+        this.listQuery.endTime = this.timeRange[1]
+      } else {
+        this.listQuery.beginTime = ''
+        this.listQuery.endTime = ''
+      }
+      totalDataGasFlow(this.listQuery).then(response => {
+        this.data = response.data
+        this.loading1 = false
+      })
+    },
+    // 批量导出
+    exportData() {
+      console.log('批量导出液位配置')
+      // 全屏加载动画
+      const loading = this.$loading({
+        lock: true,
+        text: '数据处理中,请稍后...',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
+      })
+      batchExportWaterHistory(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 = `${this.listQuery.devCode}远传水表历史数据.xlsx` // 下载后文件名
+        document.body.appendChild(downloadElement)
+        downloadElement.click() // 点击下载
+        document.body.removeChild(downloadElement) // 下载完成移除元素
+        window.URL.revokeObjectURL(href) // 释放blob对象
+      }).catch((res) => {
+        loading.close()
+      })
+    }
+  }
+}
+</script>
+<style>
+  .el-dialog__header {
+    padding: 10px !important;
+  }
+  .el-dialog__body {
+    padding: 10px !important;
+  }
+
+</style>
diff --git a/src/views/dataManage/deviceData/listCorrodeData.vue b/src/views/dataManage/deviceData/listCorrodeData.vue
index 13fdc18..3cdb1f1 100644
--- a/src/views/dataManage/deviceData/listCorrodeData.vue
+++ b/src/views/dataManage/deviceData/listCorrodeData.vue
@@ -115,11 +115,6 @@
           text: '采集时间',
           value: 'uptime',
           align: 'center'
-        },
-        {
-          text: '上传时间',
-          value: 'logtime',
-          align: 'center'
         }
       ], // 显示列
       multipleSelection: [], // 多选选中项

diff --git a/src/api/device.js b/src/api/device.js
index 00804fe..edcc1a4 100644
--- a/src/api/device.js
+++ b/src/api/device.js
@@ -100,4 +100,11 @@
     params
   })
 }
+export function totalDataGasFlow(params) {
+  return request({
+    url: 'gasflow/listByDevice',
+    method: 'post',
+    params
+  })
+}
 
diff --git a/src/views/dataManage/deviceData/gasFlowHistory.vue b/src/views/dataManage/deviceData/gasFlowHistory.vue
new file mode 100644
index 0000000..6bbc40e
--- /dev/null
+++ b/src/views/dataManage/deviceData/gasFlowHistory.vue
@@ -0,0 +1,117 @@
+<template>
+  <el-dialog
+    :visible.sync="dialogFormVisible"
+    :title="listQuery.devCode+'历史数据'"
+    width="60%"
+    append-to-body
+    class="lineDialog"
+  >
+    <div style="margin-bottom: 10px">
+      <el-date-picker
+        v-model="timeRange"
+        type="datetimerange"
+        range-separator="至"
+        value-format="yyyy-MM-dd HH:mm:ss"
+        start-placeholder="开始时间"
+        end-placeholder="结束时间"
+        size="small"/>
+      <el-button class="filter-item" type="primary" icon="el-icon-search" size="small" @click="fetchData">搜索</el-button>
+      <!-- <el-button class="filter-item" type="primary" size="small" @click="exportData">导出</el-button> -->
+    </div>
+    <div v-loading="loading1">
+      <div>
+        <el-table :data="data" size="mini" height="380px" >
+          <el-table-column label="上报时间" prop="logtime" align="center"/>
+          <el-table-column label="瞬时流速(Nm/s)" prop="instantVelocity" align="center"/>
+          <el-table-column label="瞬时流量(m³/h)" prop="instantFlow" align="center"/>
+          <el-table-column label="介质温度(℃)" prop="ambocetorTemperture" align="center"/>
+          <el-table-column label="累计流量(m³)" prop="totalFlow" align="center"/>
+        </el-table>
+      </div>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { getDayTime } from '@/utils/dateutils'
+import { totalDataGasFlow } from '@/api/device'
+import { batchExportWaterHistory } from '@/api/data'
+
+export default {
+  name: 'GasFlowHistory',
+  data() {
+    return {
+      loading1: true,
+      timeRange: [],
+      dialogFormVisible: false, // 对话框是否显示
+      listQuery: {
+        devCode: '',
+        beginTime: '',
+        endTime: ''
+      },
+      data: []
+
+    }
+  },
+  methods: {
+    initDialog: function(dialogFormVisible, row = null) {
+      console.log(row, '========row=====')
+      this.listQuery.devCode = row.devcode
+      this.dialogFormVisible = dialogFormVisible
+      const beginTime = getDayTime(new Date().getTime() - 24 * 7 * 60 * 60 * 1000).Format('yyyy-MM-dd hh:mm:ss')
+      const endTime = new Date().Format('yyyy-MM-dd hh:mm:ss')
+      this.timeRange = [beginTime, endTime]
+      this.fetchData() // 传row
+    },
+    fetchData() {
+      this.loading1 = true
+      if (this.timeRange && this.timeRange.length === 2) {
+        this.listQuery.beginTime = this.timeRange[0]
+        this.listQuery.endTime = this.timeRange[1]
+      } else {
+        this.listQuery.beginTime = ''
+        this.listQuery.endTime = ''
+      }
+      totalDataGasFlow(this.listQuery).then(response => {
+        this.data = response.data
+        this.loading1 = false
+      })
+    },
+    // 批量导出
+    exportData() {
+      console.log('批量导出液位配置')
+      // 全屏加载动画
+      const loading = this.$loading({
+        lock: true,
+        text: '数据处理中,请稍后...',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
+      })
+      batchExportWaterHistory(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 = `${this.listQuery.devCode}远传水表历史数据.xlsx` // 下载后文件名
+        document.body.appendChild(downloadElement)
+        downloadElement.click() // 点击下载
+        document.body.removeChild(downloadElement) // 下载完成移除元素
+        window.URL.revokeObjectURL(href) // 释放blob对象
+      }).catch((res) => {
+        loading.close()
+      })
+    }
+  }
+}
+</script>
+<style>
+  .el-dialog__header {
+    padding: 10px !important;
+  }
+  .el-dialog__body {
+    padding: 10px !important;
+  }
+
+</style>
diff --git a/src/views/dataManage/deviceData/listCorrodeData.vue b/src/views/dataManage/deviceData/listCorrodeData.vue
index 13fdc18..3cdb1f1 100644
--- a/src/views/dataManage/deviceData/listCorrodeData.vue
+++ b/src/views/dataManage/deviceData/listCorrodeData.vue
@@ -115,11 +115,6 @@
           text: '采集时间',
           value: 'uptime',
           align: 'center'
-        },
-        {
-          text: '上传时间',
-          value: 'logtime',
-          align: 'center'
         }
       ], // 显示列
       multipleSelection: [], // 多选选中项
diff --git a/src/views/dataManage/deviceData/listGasflowData.vue b/src/views/dataManage/deviceData/listGasflowData.vue
index 9911132..7c7350f 100644
--- a/src/views/dataManage/deviceData/listGasflowData.vue
+++ b/src/views/dataManage/deviceData/listGasflowData.vue
@@ -34,15 +34,33 @@
           <el-button v-if="hasPerm('/noisedata/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
+        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-if="column.checkCell" :class="checkCell(scope.row.cell)">{{
+              scope.row[column.value]
+            }}</span>
+            <span v-else-if="column.text === '设备位置'">{{
+              scope.row["areaFullName"] +'/' + scope.row[column.value]
+            }}</span>
             <span v-else>{{ scope.row[column.value] }}</span>
           </template>
         </el-table-column>
+        <el-table-column label="操作" align="center" width="140">
+          <template slot-scope="scope">
+            <el-button type="text" @click="openData(scope.row)">
+              历史数据
+            </el-button>
+          </template>
+        </el-table-column>
       </el-table>
     </div>
     <!--分页-->
@@ -58,6 +76,7 @@
         @size-change="handleSizeChange"
         @current-change="handleCurrentChange"/>
     </div>
+    <gas-flow-history ref="waterHistory"/>
   </div>
 </template>
 
@@ -66,10 +85,11 @@
 import { getGasflowData, batchExportGasflowData } from '@/api/data'
 import DeptSelect from '../../../components/DeptSelect/index'
 import { parseUrl } from '@/utils/parseutils'
+import gasFlowHistory from './gasFlowHistory'
 
 export default {
   name: 'ListGasflowData',
-  components: { DeptSelect, AreaSelectTree },
+  components: { DeptSelect, AreaSelectTree, gasFlowHistory },
   data() {
     return {
       listQuery: {
@@ -102,37 +122,22 @@
         },
 
         {
-          text: '地址',
+          text: '设备位置',
           value: 'position',
           align: 'center'
         },
         {
-          text: '瞬时流量',
-          value: 'instantFlow',
-          align: 'center'
-        },
-        {
-          text: '瞬时流速',
-          value: 'instantVelocity',
-          align: 'center'
-        },
-        {
-          text: '介质温度',
-          value: 'ambocetorTemperture',
-          align: 'center'
-        },
-        {
-          text: '今日用气量',
+          text: '今日用气量（立方米）',
           value: 'dayCount',
           align: 'center'
         },
         {
-          text: '本月用气量',
+          text: '本月用气量（立方米）',
           value: 'monthCount',
           align: 'center'
         },
         {
-          text: '总用气量',
+          text: '总用气量（立方米）',
           value: 'totalCount',
           align: 'center'
         },
@@ -221,6 +226,9 @@
     search() {
       this.fetchData(false)
     },
+    openData(row) {
+      this.$refs.waterHistory.initDialog(true, row)
+    },
     // 获取开挖配置数据
     fetchData(isNowPage = true) {
       this.listLoading = true

diff --git a/src/api/device.js b/src/api/device.js
index 00804fe..edcc1a4 100644
--- a/src/api/device.js
+++ b/src/api/device.js
@@ -100,4 +100,11 @@
     params
   })
 }
+export function totalDataGasFlow(params) {
+  return request({
+    url: 'gasflow/listByDevice',
+    method: 'post',
+    params
+  })
+}
 
diff --git a/src/views/dataManage/deviceData/gasFlowHistory.vue b/src/views/dataManage/deviceData/gasFlowHistory.vue
new file mode 100644
index 0000000..6bbc40e
--- /dev/null
+++ b/src/views/dataManage/deviceData/gasFlowHistory.vue
@@ -0,0 +1,117 @@
+<template>
+  <el-dialog
+    :visible.sync="dialogFormVisible"
+    :title="listQuery.devCode+'历史数据'"
+    width="60%"
+    append-to-body
+    class="lineDialog"
+  >
+    <div style="margin-bottom: 10px">
+      <el-date-picker
+        v-model="timeRange"
+        type="datetimerange"
+        range-separator="至"
+        value-format="yyyy-MM-dd HH:mm:ss"
+        start-placeholder="开始时间"
+        end-placeholder="结束时间"
+        size="small"/>
+      <el-button class="filter-item" type="primary" icon="el-icon-search" size="small" @click="fetchData">搜索</el-button>
+      <!-- <el-button class="filter-item" type="primary" size="small" @click="exportData">导出</el-button> -->
+    </div>
+    <div v-loading="loading1">
+      <div>
+        <el-table :data="data" size="mini" height="380px" >
+          <el-table-column label="上报时间" prop="logtime" align="center"/>
+          <el-table-column label="瞬时流速(Nm/s)" prop="instantVelocity" align="center"/>
+          <el-table-column label="瞬时流量(m³/h)" prop="instantFlow" align="center"/>
+          <el-table-column label="介质温度(℃)" prop="ambocetorTemperture" align="center"/>
+          <el-table-column label="累计流量(m³)" prop="totalFlow" align="center"/>
+        </el-table>
+      </div>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { getDayTime } from '@/utils/dateutils'
+import { totalDataGasFlow } from '@/api/device'
+import { batchExportWaterHistory } from '@/api/data'
+
+export default {
+  name: 'GasFlowHistory',
+  data() {
+    return {
+      loading1: true,
+      timeRange: [],
+      dialogFormVisible: false, // 对话框是否显示
+      listQuery: {
+        devCode: '',
+        beginTime: '',
+        endTime: ''
+      },
+      data: []
+
+    }
+  },
+  methods: {
+    initDialog: function(dialogFormVisible, row = null) {
+      console.log(row, '========row=====')
+      this.listQuery.devCode = row.devcode
+      this.dialogFormVisible = dialogFormVisible
+      const beginTime = getDayTime(new Date().getTime() - 24 * 7 * 60 * 60 * 1000).Format('yyyy-MM-dd hh:mm:ss')
+      const endTime = new Date().Format('yyyy-MM-dd hh:mm:ss')
+      this.timeRange = [beginTime, endTime]
+      this.fetchData() // 传row
+    },
+    fetchData() {
+      this.loading1 = true
+      if (this.timeRange && this.timeRange.length === 2) {
+        this.listQuery.beginTime = this.timeRange[0]
+        this.listQuery.endTime = this.timeRange[1]
+      } else {
+        this.listQuery.beginTime = ''
+        this.listQuery.endTime = ''
+      }
+      totalDataGasFlow(this.listQuery).then(response => {
+        this.data = response.data
+        this.loading1 = false
+      })
+    },
+    // 批量导出
+    exportData() {
+      console.log('批量导出液位配置')
+      // 全屏加载动画
+      const loading = this.$loading({
+        lock: true,
+        text: '数据处理中,请稍后...',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
+      })
+      batchExportWaterHistory(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 = `${this.listQuery.devCode}远传水表历史数据.xlsx` // 下载后文件名
+        document.body.appendChild(downloadElement)
+        downloadElement.click() // 点击下载
+        document.body.removeChild(downloadElement) // 下载完成移除元素
+        window.URL.revokeObjectURL(href) // 释放blob对象
+      }).catch((res) => {
+        loading.close()
+      })
+    }
+  }
+}
+</script>
+<style>
+  .el-dialog__header {
+    padding: 10px !important;
+  }
+  .el-dialog__body {
+    padding: 10px !important;
+  }
+
+</style>
diff --git a/src/views/dataManage/deviceData/listCorrodeData.vue b/src/views/dataManage/deviceData/listCorrodeData.vue
index 13fdc18..3cdb1f1 100644
--- a/src/views/dataManage/deviceData/listCorrodeData.vue
+++ b/src/views/dataManage/deviceData/listCorrodeData.vue
@@ -115,11 +115,6 @@
           text: '采集时间',
           value: 'uptime',
           align: 'center'
-        },
-        {
-          text: '上传时间',
-          value: 'logtime',
-          align: 'center'
         }
       ], // 显示列
       multipleSelection: [], // 多选选中项
diff --git a/src/views/dataManage/deviceData/listGasflowData.vue b/src/views/dataManage/deviceData/listGasflowData.vue
index 9911132..7c7350f 100644
--- a/src/views/dataManage/deviceData/listGasflowData.vue
+++ b/src/views/dataManage/deviceData/listGasflowData.vue
@@ -34,15 +34,33 @@
           <el-button v-if="hasPerm('/noisedata/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
+        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-if="column.checkCell" :class="checkCell(scope.row.cell)">{{
+              scope.row[column.value]
+            }}</span>
+            <span v-else-if="column.text === '设备位置'">{{
+              scope.row["areaFullName"] +'/' + scope.row[column.value]
+            }}</span>
             <span v-else>{{ scope.row[column.value] }}</span>
           </template>
         </el-table-column>
+        <el-table-column label="操作" align="center" width="140">
+          <template slot-scope="scope">
+            <el-button type="text" @click="openData(scope.row)">
+              历史数据
+            </el-button>
+          </template>
+        </el-table-column>
       </el-table>
     </div>
     <!--分页-->
@@ -58,6 +76,7 @@
         @size-change="handleSizeChange"
         @current-change="handleCurrentChange"/>
     </div>
+    <gas-flow-history ref="waterHistory"/>
   </div>
 </template>
 
@@ -66,10 +85,11 @@
 import { getGasflowData, batchExportGasflowData } from '@/api/data'
 import DeptSelect from '../../../components/DeptSelect/index'
 import { parseUrl } from '@/utils/parseutils'
+import gasFlowHistory from './gasFlowHistory'
 
 export default {
   name: 'ListGasflowData',
-  components: { DeptSelect, AreaSelectTree },
+  components: { DeptSelect, AreaSelectTree, gasFlowHistory },
   data() {
     return {
       listQuery: {
@@ -102,37 +122,22 @@
         },
 
         {
-          text: '地址',
+          text: '设备位置',
           value: 'position',
           align: 'center'
         },
         {
-          text: '瞬时流量',
-          value: 'instantFlow',
-          align: 'center'
-        },
-        {
-          text: '瞬时流速',
-          value: 'instantVelocity',
-          align: 'center'
-        },
-        {
-          text: '介质温度',
-          value: 'ambocetorTemperture',
-          align: 'center'
-        },
-        {
-          text: '今日用气量',
+          text: '今日用气量（立方米）',
           value: 'dayCount',
           align: 'center'
         },
         {
-          text: '本月用气量',
+          text: '本月用气量（立方米）',
           value: 'monthCount',
           align: 'center'
         },
         {
-          text: '总用气量',
+          text: '总用气量（立方米）',
           value: 'totalCount',
           align: 'center'
         },
@@ -221,6 +226,9 @@
     search() {
       this.fetchData(false)
     },
+    openData(row) {
+      this.$refs.waterHistory.initDialog(true, row)
+    },
     // 获取开挖配置数据
     fetchData(isNowPage = true) {
       this.listLoading = true
diff --git a/src/views/gasOverview/gasOverviewSimple.vue b/src/views/gasOverview/gasOverviewSimple.vue
index 22eb8dc..31440bc 100644
--- a/src/views/gasOverview/gasOverviewSimple.vue
+++ b/src/views/gasOverview/gasOverviewSimple.vue
@@ -658,6 +658,7 @@
     qtModel() {
       const params = '15'
       getMapping(params, this.listQuery.keywords).then(response => {
+        console.log(response)
         // 过滤掉该单位不支持的设备(通过部门id)
         const deptIds = this.$store.getters.deptId
         const responses = []