diff --git a/src/views/dataManage/deviceData/gasFlowHistory.vue b/src/views/dataManage/deviceData/gasFlowHistory.vue
index 6bbc40e..ec65c4d 100644
--- a/src/views/dataManage/deviceData/gasFlowHistory.vue
+++ b/src/views/dataManage/deviceData/gasFlowHistory.vue
@@ -28,6 +28,19 @@
           <el-table-column label="累计流量(m³)" prop="totalFlow" align="center"/>
         </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>
   </el-dialog>
 </template>
@@ -41,10 +54,13 @@
   name: 'GasFlowHistory',
   data() {
     return {
+      total: 0, // 数据总数
       loading1: true,
       timeRange: [],
       dialogFormVisible: false, // 对话框是否显示
       listQuery: {
+        offset: 1,
+        limit: 20,
         devCode: '',
         beginTime: '',
         endTime: ''
@@ -63,7 +79,21 @@
       this.timeRange = [beginTime, endTime]
       this.fetchData() // 传row
     },
-    fetchData() {
+    // 改变页容量
+    handleSizeChange(val) {
+      this.listQuery.limit = val
+      this.fetchData()
+    },
+    // 改变当前页
+    handleCurrentChange(val) {
+      this.listQuery.offset = val
+      this.fetchData()
+    },
+    fetchData(isNowPage = true) {
+      this.listLoading = true
+      if (!isNowPage) { // 是否显示当前页，否则跳转第一页
+        this.listQuery.offset = 1
+      }
       this.loading1 = true
       if (this.timeRange && this.timeRange.length === 2) {
         this.listQuery.beginTime = this.timeRange[0]

diff --git a/src/views/dataManage/deviceData/gasFlowHistory.vue b/src/views/dataManage/deviceData/gasFlowHistory.vue
index 6bbc40e..ec65c4d 100644
--- a/src/views/dataManage/deviceData/gasFlowHistory.vue
+++ b/src/views/dataManage/deviceData/gasFlowHistory.vue
@@ -28,6 +28,19 @@
           <el-table-column label="累计流量(m³)" prop="totalFlow" align="center"/>
         </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>
   </el-dialog>
 </template>
@@ -41,10 +54,13 @@
   name: 'GasFlowHistory',
   data() {
     return {
+      total: 0, // 数据总数
       loading1: true,
       timeRange: [],
       dialogFormVisible: false, // 对话框是否显示
       listQuery: {
+        offset: 1,
+        limit: 20,
         devCode: '',
         beginTime: '',
         endTime: ''
@@ -63,7 +79,21 @@
       this.timeRange = [beginTime, endTime]
       this.fetchData() // 传row
     },
-    fetchData() {
+    // 改变页容量
+    handleSizeChange(val) {
+      this.listQuery.limit = val
+      this.fetchData()
+    },
+    // 改变当前页
+    handleCurrentChange(val) {
+      this.listQuery.offset = val
+      this.fetchData()
+    },
+    fetchData(isNowPage = true) {
+      this.listLoading = true
+      if (!isNowPage) { // 是否显示当前页，否则跳转第一页
+        this.listQuery.offset = 1
+      }
       this.loading1 = true
       if (this.timeRange && this.timeRange.length === 2) {
         this.listQuery.beginTime = this.timeRange[0]
diff --git a/src/views/dataManage/deviceData/listWaterData.vue b/src/views/dataManage/deviceData/listWaterData.vue
index bf03fd1..2515720 100644
--- a/src/views/dataManage/deviceData/listWaterData.vue
+++ b/src/views/dataManage/deviceData/listWaterData.vue
@@ -176,6 +176,12 @@
           align: 'center'
         },
         {
+          text: '压力(pa)',
+          value: 'pressure',
+          width: 80,
+          align: 'center'
+        },
+        {
           text: '今日用水量（立方米）',
           value: 'dayCount',
           align: 'center',

diff --git a/src/views/dataManage/deviceData/gasFlowHistory.vue b/src/views/dataManage/deviceData/gasFlowHistory.vue
index 6bbc40e..ec65c4d 100644
--- a/src/views/dataManage/deviceData/gasFlowHistory.vue
+++ b/src/views/dataManage/deviceData/gasFlowHistory.vue
@@ -28,6 +28,19 @@
           <el-table-column label="累计流量(m³)" prop="totalFlow" align="center"/>
         </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>
   </el-dialog>
 </template>
@@ -41,10 +54,13 @@
   name: 'GasFlowHistory',
   data() {
     return {
+      total: 0, // 数据总数
       loading1: true,
       timeRange: [],
       dialogFormVisible: false, // 对话框是否显示
       listQuery: {
+        offset: 1,
+        limit: 20,
         devCode: '',
         beginTime: '',
         endTime: ''
@@ -63,7 +79,21 @@
       this.timeRange = [beginTime, endTime]
       this.fetchData() // 传row
     },
-    fetchData() {
+    // 改变页容量
+    handleSizeChange(val) {
+      this.listQuery.limit = val
+      this.fetchData()
+    },
+    // 改变当前页
+    handleCurrentChange(val) {
+      this.listQuery.offset = val
+      this.fetchData()
+    },
+    fetchData(isNowPage = true) {
+      this.listLoading = true
+      if (!isNowPage) { // 是否显示当前页，否则跳转第一页
+        this.listQuery.offset = 1
+      }
       this.loading1 = true
       if (this.timeRange && this.timeRange.length === 2) {
         this.listQuery.beginTime = this.timeRange[0]
diff --git a/src/views/dataManage/deviceData/listWaterData.vue b/src/views/dataManage/deviceData/listWaterData.vue
index bf03fd1..2515720 100644
--- a/src/views/dataManage/deviceData/listWaterData.vue
+++ b/src/views/dataManage/deviceData/listWaterData.vue
@@ -176,6 +176,12 @@
           align: 'center'
         },
         {
+          text: '压力(pa)',
+          value: 'pressure',
+          width: 80,
+          align: 'center'
+        },
+        {
           text: '今日用水量（立方米）',
           value: 'dayCount',
           align: 'center',
diff --git a/src/views/overview/overviewSimple.vue b/src/views/overview/overviewSimple.vue
index 2770b53..9a0df46 100644
--- a/src/views/overview/overviewSimple.vue
+++ b/src/views/overview/overviewSimple.vue
@@ -397,7 +397,7 @@
           window.map.addLayer(watch_icon_layer)
           for (let i = 0; i < response.data.length; i++) {
             watch_model_layer.addGraphic(new mars3d.graphic.ModelPrimitive({
-              position: [response.data[i].longitude, response.data[i].latitude, -0.5],
+              position: [response.data[i].longitude, response.data[i].latitude - 0.0000030, -0.5],
               style: {
                 url: '../static/model/sb.glb',
                 scale: 2,