Merge branch 'master' of http://39.106.78.171:3000/shaojiahao/ShangHaiYuan-AnXin

src/app/data-collection/linkage-forces/linkage-forces.component.ts

@@ -474,6 +474,7 @@ export class LinkageForcesComponent implements OnInit {
         config.verticalPosition = 'top';
         config.duration = 3000
         this.snackBar.open('修改成功','确定',config);
+        this.PageNumber = 1 //当前第几页
         this.getAllFireForce()
       })
     }else{
@@ -484,6 +485,7 @@ export class LinkageForcesComponent implements OnInit {
         config.duration = 3000
         this.snackBar.open('保存成功','确定',config);
         this.LinkageForceDetailInfo = data
+        this.PageNumber = 1 //当前第几页
         this.getAllFireForce()
       })
     }

src/app/data-collection/water-collection/water-collection.component.ts

@@ -433,6 +433,7 @@ export class WaterCollectionComponent implements OnInit {
         config.duration = 3000
         this.snackBar.open('修改成功','确定',config);
         this.selectedLiIndex = 0
+        this.PageNumber = 1 //当前第几页
         this.getAllWaterData()
       })
     }else{
@@ -445,6 +446,7 @@ export class WaterCollectionComponent implements OnInit {
         this.snackBar.open('保存成功','确定',config);
         this.selectedLiIndex = 0
         this.waterData = data
+        this.PageNumber = 1 //当前第几页
         this.getAllWaterData()
       })
     }