深基坑(实时数据):添加分页

src/assets/js/http.js

@@ -41,7 +41,7 @@ if (process.env.NODE_ENV == 'development') {
   // tag: 本地
   // axios.defaults.baseURL = 'http://192.168.34.174:6023/'  // 老大本地
   // axios.defaults.baseURL = 'http://192.168.34.125:6023/' //杨意本地 http/1.1
-  axios.defaults.baseURL = 'http://192.168.34.216:6023/' // 邱平毅本地
+  // axios.defaults.baseURL = 'http://192.168.34.216:6023/' // 邱平毅本地
   // axios.defaults.baseURL ='http://124.71.67.160:8088/' //中建四局线上
   // axios.defaults.baseURL = 'http://192.168.34.125:6023/' //杨意本地 http/1.1
   // axios.defaults.baseURL ='http://47.97.202.104:6023/' //金林湾线上
@@ -50,7 +50,7 @@ if (process.env.NODE_ENV == 'development') {
   // axios.defaults.baseURL = 'http://47.97.202.104:6023/';
   // axios.defaults.baseURL = 'http://139.9.66.234:8/';
   // axios.defaults.baseURL = 'http://120.196.217.6:7000/'; // 鹤洲
-  // axios.defaults.baseURL = 'http://182.90.224.237:7000/'; // 广西
+  axios.defaults.baseURL = 'http://182.90.224.237:7000/'; // 广西
   // axios.defaults.baseURL = 'http://120.196.217.6:7000/'  //鹤洲
 
   // axios.defaults.baseURL = 'http://117.156.17.59:9090/'; //

src/views/projectFront/deepFoundationPitManage/dataConfig.vue

@@ -651,7 +651,7 @@
             </el-table-column>
           </el-table>
           <el-pagination
-            class="pagerBox pagerBox2"
+            class="pager"
             @size-change="changeSize"
             @current-change="changeCurrent"
             :current-page="pagInfo2.pageNo"
@@ -1632,7 +1632,8 @@ export default {
         console.log(res);
         if (res.code == 200) {
           this.currentPointDetail = res.result.data.records;
-          this.pagInfo2.total = res.result.total;
+          console.log('分页信息',res)
+          this.pagInfo2.total = res.result.data.total;
         }
       });
     },
@@ -2598,7 +2599,7 @@ export default {
   }
 }
 .form-wrap {
-  height: 600px;
+  height: 620px;
 }
 .map-box {
   display: flex;

src/views/projectFront/deepFoundationPitManage/monitorData.vue

@@ -461,7 +461,7 @@
                     <!-- 数据列表 -->
                     {{$t('message.deepFoundConfig.tableList')}}
                   </div>
-                  <el-table class="tables" height="264" :data="tableData2">
+                  <el-table class="tables" height="330" :data="tableData2">
                     <!-- 测点编号 -->
                     <el-table-column
                       prop="measurePointNumber"
@@ -515,6 +515,17 @@
                     </el-table-column>
                   </el-table>
                 </div>
+                <el-pagination
+                  class="pager"
+                  @size-change="handleSizeChange1"
+                  @current-change="handleCurrentChange1"
+                  :current-page="pageNo1"
+                  :page-sizes="$store.state.PAGESIZRS"
+                  :page-size="pageSize1"
+                  layout="total, sizes, prev, pager, next"
+                  :total="total1"
+                  background
+                ></el-pagination>
               </div>
             </vue-scroll>
           </div>
@@ -608,6 +619,9 @@ export default {
       option6: {},
       chart7: Object,
       option7: {},
+      pageNo1: 1,
+      pageSize1: 10,
+      total1: 6,
       pageNo: 1,
       pageSize: 10,
       total: 6,
@@ -688,6 +702,7 @@ export default {
         console.log("有数据吗", res);
         if (res.code == 200 && res.result) {
           // console.log('下面的数据',res)
+          this.total1 = res.result.data.total
           this.tableData2 = res.result.data.records;
           this.echartData7 = {
             xAxis: [],
@@ -1358,6 +1373,16 @@ export default {
       // this.selectDeepExcavationMonitorTypeList()
       console.log(val);
     },
+    handleSizeChange1(val) {
+      this.pageSize1 = val;
+      this.selectDeepExcavationAllMeasurePointList()
+      console.log(val);
+    },
+    handleCurrentChange1(val) {
+      this.pageNo1 = val;
+      this.selectDeepExcavationAllMeasurePointList()
+      console.log(val);
+    },
     createdEchart5() {
       // console.log(this.$refs['echart5'])
       let chart5 = echarts.init(this.$refs["echart5"]);
@@ -1665,6 +1690,7 @@ export default {
       return timer;
     },
     showDetail(val) {
+      this.dateTime = []
       this.visibleDialog = true;
       //   console.log("当前点击行的值", val);
       this.relaId = val.id;
@@ -1785,6 +1811,7 @@ export default {
       }).then(res => {
         // console.log("有数据吗", res);
         if (res.code == 200 && res.result) {
+          this.total1 = res.result.data.total
           this.tableData2 = res.result.data.records;
           this.echartData7 = {
             xAxis: [],
@@ -2129,7 +2156,7 @@ export default {
   }
   .dialog-box {
     /deep/.el-dialog {
-      height: 826px;
+      height: 920px;
       box-sizing: border-box;
       margin-top: 0 !important;
       margin-bottom: 0;
@@ -2224,7 +2251,7 @@ export default {
       }
       .bottom {
         width: 100%;
-        height: 653px;
+        height: 750px;
         .bottom-wrap {
           height: 100%;
           width: 100%;
@@ -2311,4 +2338,16 @@ export default {
 /deep/.el-dialog__title {
   font-weight: bold;
 }
+.pager {
+  margin-top: 5px;
+  text-align: center;
+  .el-pager li.active {
+    background-color: @--bg-color-primary!important;
+  }
+  button:disabled,
+  .btn-next,
+  .btn-prev {
+    background-color: transparent !important;
+  }
+}
 </style>

src/views/projectFront/projectSummary/lotList.vue

@@ -3,7 +3,7 @@
     <div class="header-box">
       <div class="search-item">
         <div class="search-label">
-          <!-- 节点名称： -->
+          <!-- 标段名称： -->
           {{ $t("message.projectInfo.sectionName") + ":" }}
         </div>
         <el-input