[完善]中台筛选条件

src/app/pages/singlelogin/singlelogin.component.ts

@@ -31,11 +31,11 @@ export class SingleloginComponent implements OnInit {
     // this.setCookie(obj);
 
     let token = this.getCookie("SAG_USER_TOKEN");
-    token = token.replace(/%3D/g, "=");
     if (!token) {
-      alert("获取失败！");
+      alert("未获取到token！");
       return;
     } else {
+      token = token.replace(/%3D/g, "=");
       this.sinToken = token;
       await this.getCurrentUserInfo();
       await this.getAuthOrganInfos();
@@ -298,5 +298,4 @@ export class SingleloginComponent implements OnInit {
     }
     return menuList;
   }
-
 }

src/app/system-management/user-binding/user-binding.component.html

@@ -46,7 +46,9 @@
         <span><i nz-icon nzType="search"></i> {{listConfig.totalCount}}名用户</span>
       </div>
       <div class="righttop">
+        <label class="isBinding" nz-checkbox [(ngModel)]="listConfig.IsBindingLocal" (ngModelChange)="submitForm()">是否绑定本地用户</label>
         <form nz-form [formGroup]="validateForm" (ngSubmit)="submitForm()">
+
           <nz-form-item>
             <nz-form-control>
               <nz-input-group nzPrefixIcon="search">
@@ -63,7 +65,7 @@
         [nzPageSize]='16'>
         <thead>
           <tr>
-            <th></th>
+            <th [width]="'5%'"></th>
             <th>账号</th>
             <th>账号id</th>
             <th>绑定的本地用户id</th>

src/app/system-management/user-binding/user-binding.component.scss

@@ -1,172 +1,173 @@
 .userBox {
-    width: 100%;
-    height: 100%;
-    background: #FFFFFF;
+  width: 100%;
+  height: 100%;
+  background: #ffffff;
+  box-sizing: border-box;
+  padding: 20px;
+  overflow: hidden;
+  display: flex;
+  position: relative;
+
+  .treebox {
+    display: flex;
+    flex: 1;
+    overflow: auto;
+    flex-direction: column;
     box-sizing: border-box;
-    padding: 20px;
-    overflow: hidden;
+    padding: 10px 0;
+  }
+
+  .check {
+    width: 100%;
+    float: right;
+  }
+
+  .topbox2 {
+    width: 100%;
+    height: 36px;
     display: flex;
-    position: relative;
-  
-    .treebox {
-      display: flex;
-      flex: 1;
-      overflow: auto;
-      flex-direction: column;
-      box-sizing: border-box;
-      padding: 10px 0;
-    }
-  
-    .check {
-      width: 100%;
-      float: right;
-    }
-  
-    .topbox2 {
-      width: 100%;
+    align-items: center;
+    margin-top: 20px;
+
+    .lefttop {
       height: 36px;
-      display: flex;
-      align-items: center;
-      margin-top: 20px;
-  
-      .lefttop {
-        height: 36px;
-        line-height: 36px;
-        color: #000;
-        margin-right: 10px;
-        font-size: 15px;
-      }
-  
-      .righttop {
-        flex: 1;
-        height: 36px;
-        display: flex;
-  
-        nz-input-group {
-          height: 36px;
-        }
-      }
-    }
-  
-    .orbox {
-      width: 260px;
-      min-width: 250px;
-      overflow-y: auto;
+      line-height: 36px;
+      color: #000;
       margin-right: 10px;
-      display: flex;
-      flex-direction: column;
+      font-size: 15px;
     }
-  
-    .treeTitle {
-      width: 100%;
-      height: 55px;
-      line-height: 55px;
-      margin-top: 12px;
-      display: flex;
-      justify-content: space-between;
-      color: #000D21;
-      box-sizing: border-box;
-      padding: 0 10px;
-      background: rgba(145, 204, 255, 0.2);
-      border: 1px solid rgba(145, 204, 255, 0.2);
-  
-      span {
-        font-size: 14px;
-      }
-  
-      div {
-        flex: 1;
-        width: 100px;
-        margin-left: 55px;
-      }
-    }
-  
-    .nodebox {
+
+    .righttop {
+      flex: 1;
+      height: 36px;
       display: flex;
-      justify-content: space-between;
-    }
-  
-    tbody {
-      tr {
-        td:nth-child(1) {
-          text-align: right;
-        }
-      }
-  
-      .operation {
-        i {
-          cursor: pointer;
-          margin-right: 8px;
-        }
+
+      nz-input-group {
+        height: 36px;
       }
     }
   }
-  
-  .box {
-    flex: 1;
-    // overflow: auto;
-    padding-top: 20px;
+
+  .orbox {
+    width: 260px;
+    min-width: 250px;
     overflow-y: auto;
+    margin-right: 10px;
     display: flex;
     flex-direction: column;
-    height: 100%;
   }
-  
-  .topbox {
+
+  .treeTitle {
     width: 100%;
-    height: 36px;
+    height: 55px;
+    line-height: 55px;
+    margin-top: 12px;
     display: flex;
-    align-items: center;
     justify-content: space-between;
-    margin-bottom: 12px;
-  
-    .lefttop {
-      span:nth-child(1) {
-        color: #000D21;
-        margin-right: 16px;
-      }
-  
-      span:nth-child(2) {
-        color: rgba(36, 36, 36, 0.24);
-      }
+    color: #000d21;
+    box-sizing: border-box;
+    padding: 0 10px;
+    background: rgba(145, 204, 255, 0.2);
+    border: 1px solid rgba(145, 204, 255, 0.2);
+
+    span {
+      font-size: 14px;
     }
-  
-    .righttop {
-      display: flex;
-  
-      button {
-        margin-left: 16px;
+
+    div {
+      flex: 1;
+      width: 100px;
+      margin-left: 55px;
+    }
+  }
+
+  .nodebox {
+    display: flex;
+    justify-content: space-between;
+  }
+
+  tbody {
+    tr {
+      td:nth-child(1) {
+        text-align: right;
       }
-  
-      nz-input-group {
-        height: 32px;
+    }
+
+    .operation {
+      i {
+        cursor: pointer;
+        margin-right: 8px;
       }
     }
   }
-  
-  .tablebox {
-    flex: 1;
-    overflow-y: auto;
-    overflow: auto;
-  
+}
+
+.box {
+  flex: 1;
+  // overflow: auto;
+  padding-top: 20px;
+  overflow-y: auto;
+  display: flex;
+  flex-direction: column;
+  height: 100%;
+}
+
+.topbox {
+  width: 100%;
+  height: 36px;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  margin-bottom: 12px;
+
+  .lefttop {
+    span:nth-child(1) {
+      color: #000d21;
+      margin-right: 16px;
+    }
+
+    span:nth-child(2) {
+      color: rgba(36, 36, 36, 0.24);
+    }
   }
-  
-  .pagination {
-    margin: 15px 0;
+
+  .righttop {
     display: flex;
-    align-items: center;
-    justify-content: center;
-  }
-  
-  .ortype {
-    width: 36px;
-    height: 20px;
-    background: #2399FF;
-    opacity: 1;
-    border-radius: 2px;
-    font-size: 12px;
-    margin-right: 8px;
-    color: #fff;
-    text-align: center;
+    // align-items: center;
+    .isBinding{
+      margin-top: 6px;
+    }
+    button {
+      margin-left: 16px;
+    }
+
+    nz-input-group {
+      height: 32px;
+    }
   }
-  
+}
+
+.tablebox {
+  flex: 1;
+  overflow-y: auto;
+  overflow: auto;
+}
+
+.pagination {
+  margin: 15px 0;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+
+.ortype {
+  width: 36px;
+  height: 20px;
+  background: #2399ff;
+  opacity: 1;
+  border-radius: 2px;
+  font-size: 12px;
+  margin-right: 8px;
+  color: #fff;
+  text-align: center;
+}

src/app/system-management/user-binding/user-binding.component.ts

@@ -44,6 +44,7 @@ export class UserBindingComponent implements OnInit {
     IsContainsChildren: true,
     searchValue: "",
     OrganizationUnitId: "",
+    IsBindingLocal: true,
   };
   getAllUsers() {
     this.listConfig.loading = true;
@@ -54,7 +55,7 @@ export class UserBindingComponent implements OnInit {
       SkipCount: String(this.SkipCount),
       MaxResultCount: String(this.MaxResultCount),
       // OrganizationUnitId: this.OrganizationUnitId,
-      // IsBindingLocal: true,
+      IsBindingLocal: this.listConfig.IsBindingLocal,
       // IsActive:true,
       // IsContainsChildren: String(this.listConfig.IsContainsChildren),
     };
@@ -69,6 +70,7 @@ export class UserBindingComponent implements OnInit {
         this.listConfig.loading = false;
       });
   }
+
   SkipCount: number = 0; //0 16 32 48
   MaxResultCount: number = 16;
   pageChange($event) {