Merge branch 'master' of http://git.fmode.cn:3000/bin/edu-textbook

projects/textbook/src/modules/nav-admin/page-user/page-user.component.ts

@@ -106,7 +106,13 @@ export class PageUserComponent implements OnInit {
   }
 
   ngOnInit(): void {
-    this.activeRoute.paramMap.subscribe(async (params) => {
+    this.activeRoute.queryParamMap.subscribe(async (queryParams) => {
+      console.log(queryParams)
+      let page = queryParams.get("page");
+      if(page){
+        this.pageIndex = Number(page);
+        this.updateUrlPageIndex(Number(page));
+      }
       this.getProfile();
       this.parents = await this.getDepart();
     });
@@ -178,8 +184,25 @@ export class PageUserComponent implements OnInit {
   pageIndexChange(e: any) {
     console.log(e);
     this.pageIndex = e;
+    this.updateUrlPageIndex(e);
     this.getProfile();
   }
+  /** 更新页码queryParams */
+  updateUrlPageIndex(page:number){
+    let search = window.location.search;
+    if(!search){
+      search = `?page=${page}`
+    }else{
+      let pagestr = window.location.search?.replaceAll("?","").split("&").find(item=>item.indexOf("page=")>-1);
+      if(pagestr){
+        search = search.replaceAll(pagestr,`page=${page}`)
+      }else{
+        search = search + `?page=${page}`
+      }
+    }
+    let newHref = window.location.origin + window.location.pathname + search;
+    window.history.replaceState(null, "", newHref);
+  }
   //筛选条件
   onChangeFilter(data: any, type:string){
     console.log(data);
@@ -293,7 +316,7 @@ export class PageUserComponent implements OnInit {
     });
   }
   goDateil(id: string) {
-    this.route.navigate(['/nav-admin/manage/user/edit', { id: id }]);
+    this.route.navigate(['/nav-admin/manage/user/edit', { id: id }],{queryParams:{page:this.pageIndex}});
   }
 
   /* 添加用户 */

projects/textbook/src/modules/nav-admin/user-edit/user-edit.component.html

@@ -1,7 +1,7 @@
 <nz-page-header>
   <nz-breadcrumb nz-page-header-breadcrumb>
     <nz-breadcrumb-item>用户管理</nz-breadcrumb-item>
-    <nz-breadcrumb-item>用户列表</nz-breadcrumb-item>
+    <nz-breadcrumb-item><a (click)="goUserList()">用户列表</a></nz-breadcrumb-item>
     <nz-breadcrumb-item><a>用户详情</a></nz-breadcrumb-item>
   </nz-breadcrumb>
   <nz-page-header-content>

projects/textbook/src/modules/nav-admin/user-edit/user-edit.component.ts

@@ -85,10 +85,16 @@ export class UserEditComponent implements OnInit {
     public tbookSer: textbookServer,
     private activeRoute: ActivatedRoute,
     private router: Router,
+    private route: ActivatedRoute,
     private message: NzMessageService,
     private nzImageService: NzImageService
   ) {}
 
+  goUserList(){
+    this.router.navigate(["/nav-admin/manage/user"],{
+      queryParams:{page:this.route.snapshot.queryParamMap.get("page")}
+    })
+  }
   ngOnInit() {
     this.activeRoute.paramMap.subscribe(async (params) => {
       let id = params.get('id');