diff --git a/src/views/dataManage/deviceData/gasFlowHistory.vue b/src/views/dataManage/deviceData/gasFlowHistory.vue
index dcb311a..62724d6 100644
--- a/src/views/dataManage/deviceData/gasFlowHistory.vue
+++ b/src/views/dataManage/deviceData/gasFlowHistory.vue
@@ -19,15 +19,13 @@
       <!-- <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>
+      <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 class="pagination-container">
         <el-pagination
@@ -103,7 +101,8 @@
         this.listQuery.endTime = ''
       }
       totalDataGasFlow(this.listQuery).then(response => {
-        this.data = response.data
+        this.data = response.data.rows
+        this.total = response.data.total
         this.loading1 = false
       })
     },
@@ -143,5 +142,8 @@
   .el-dialog__body {
     padding: 10px !important;
   }
+  .pagination-container{
+    height:50px;
+  }
 
 </style>

diff --git a/src/views/dataManage/deviceData/gasFlowHistory.vue b/src/views/dataManage/deviceData/gasFlowHistory.vue
index dcb311a..62724d6 100644
--- a/src/views/dataManage/deviceData/gasFlowHistory.vue
+++ b/src/views/dataManage/deviceData/gasFlowHistory.vue
@@ -19,15 +19,13 @@
       <!-- <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>
+      <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 class="pagination-container">
         <el-pagination
@@ -103,7 +101,8 @@
         this.listQuery.endTime = ''
       }
       totalDataGasFlow(this.listQuery).then(response => {
-        this.data = response.data
+        this.data = response.data.rows
+        this.total = response.data.total
         this.loading1 = false
       })
     },
@@ -143,5 +142,8 @@
   .el-dialog__body {
     padding: 10px !important;
   }
+  .pagination-container{
+    height:50px;
+  }
 
 </style>
diff --git a/src/views/dataManage/deviceData/listGasData.vue b/src/views/dataManage/deviceData/listGasData.vue
index ffb18c6..40b9a5e 100644
--- a/src/views/dataManage/deviceData/listGasData.vue
+++ b/src/views/dataManage/deviceData/listGasData.vue
@@ -5,10 +5,10 @@
       <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-input v-model.trim="listQuery.keywords" placeholder="井编号/设备编号" size="small" clearable/>
           </el-form-item>
           <el-form-item class="selectForm-container-item">
-            <dept-select v-model="listQuery.deptid" :need-top="deptShowTop" dept-type="03" placeholder="选择权属单位"/>
+            <dept-select v-model="listQuery.deptid" :need-top="deptShowTop" dept-type="03" size="small" placeholder="选择权属单位"/>
           </el-form-item>
           <el-form-item class="selectForm-container-item" prop="beginTime">
             <el-date-picker
@@ -16,6 +16,7 @@
               type="datetimerange"
               range-separator="至"
               value-format="yyyy-MM-dd HH:mm:ss"
+              size="small"
               start-placeholder="开始时间"
               end-placeholder="结束时间"/>
           </el-form-item>