Merge remote-tracking branch 'origin/release-sy-v1.0.0'

src/assets/styles/index.scss

@@ -152,21 +152,21 @@ aside {
   font-size: 14px;
   padding-bottom: 24px;
   overflow: auto;
-  // .slider-right-body{
-  //   width: 100%;
+  .slider-right-body{
+    width: 100%;
     // height: calc(100% - 74px);
-  //   margin-top: 24px;
-  //   padding: 16px;
-  //   padding-bottom: 60px; // 预留给分页器的
-  //   background-color: #fff;
+    margin-top: 24px;
+    padding: 16px;
+    padding-bottom: 60px; // 预留给分页器的
+    background-color: #fff;
     // overflow: auto;
-  // }
+  }
   .table-box{
     padding-bottom: 60px !important;
   }
   .bottom-btns{
     width: 100%;
-    position: absolute;
+    position: fixed;
     bottom: 0;
     left: 0;
     display: flex;

src/views/dike/runManage/enginerring/inspectionPlan/components/PlanDetail.vue

@@ -646,6 +646,7 @@ export default {
   padding: 16px;
   padding-bottom: 78px;
   border-radius: 6px;
+  background-color: #fff;
   .form-row-title {
     font-size: 16px;
     font-weight: bold;

src/views/sluice/runManage/maintenance/maintenanceManage/index.vue

@@ -84,7 +84,8 @@
         :page-sizes="pageData.pageSizes"
         layout="total, prev, pager, next, sizes, jumper"
         :total="pageData.total"
-        @size-change="getTableData()"
+        @current-change="(e) => handleCurrentPageChange(e)"
+        @size-change="(e) => handlePageSizeChange(e)"
       >
       </el-pagination>
     </div>
@@ -125,6 +126,14 @@ export default {
     this.getTableData();
   },
   methods: {
+    handleCurrentPageChange(page) {
+      this.pageData.pageNum = page;
+      this.getTableData();
+    },
+    handlePageSizeChange(pageSize) {
+      this.pageData.pageSize = pageSize;
+      this.getTableData();
+    },
     // 获取列表信息
     getTableData() {
       listJbxx({