[完善]能力分析

src/app/examiner/statistic-analysis/abilityAnalysis/examinee-capacity/examinee-capacity.component.html

@@ -31,18 +31,18 @@
             </thead>
             <tbody>
                 <tr *ngFor="let item of tabledataSource;let key = index">
-                    <td>{{key + 1}}</td>
-                    <td>李四</td>
-                    <td>xxx救援站</td>
+                    <td>{{(PageNumber-1)*10+(key + 1)}}</td>
+                    <td>{{item.examineeName || '/'}}</td>
+                    <td>{{item.organizationName}}</td>
                     <td class="ratebox">
-                        <nz-rate [ngModel]="2" [nzDisabled]="true"></nz-rate>
+                        <nz-rate [ngModel]="item.overallQualityRating" [nzDisabled]="true"></nz-rate>
                         <div class="mask"></div>
                     </td>
                     <td class="ratebox">
-                        <nz-rate [ngModel]="2" [nzDisabled]="true"></nz-rate>
+                        <nz-rate [ngModel]="item.combatCapabilityRating" [nzDisabled]="true"></nz-rate>
                         <div class="mask"></div>
                     <td class="ratebox">
-                        <nz-rate [ngModel]="2" [nzDisabled]="true"></nz-rate>
+                        <nz-rate [ngModel]="item.overallRating" [nzDisabled]="true"></nz-rate>
                         <div class="mask"></div>
                     </td>
                 </tr>

src/app/examiner/statistic-analysis/abilityAnalysis/examinee-capacity/examinee-capacity.component.ts

@@ -22,8 +22,8 @@ export class ExamineeCapacityComponent implements OnInit {
     this.getProfiles().then((res) => {
       //过滤得到正确的组织机构tree
       this.getOrganizations();
+      this.getAlltabledate();
     });
-    this.getAlltabledate();
   }
   //获取登录账号的个人资料
   Profiles: any;
@@ -40,12 +40,13 @@ export class ExamineeCapacityComponent implements OnInit {
   //获得所有组织机构
   allorganizations;
   treedata;
-  nodes;
+  nodes = [];
   expandedKeys = [];
   getOrganizations() {
     this.http.get("/api/Organizations").subscribe((data: any) => {
       this.allorganizations = data;
       this.treedata = this.tree.toTree(data);
+      this.orId = this.Profiles.organizationId;
       this.getpresentOrganization();
     });
   }
@@ -81,19 +82,23 @@ export class ExamineeCapacityComponent implements OnInit {
   PageSize = 10;
   name;
   orId;
-  orIdChecked;
+  orIdChecked = true;
   tabledataSource;
   length;
   getAlltabledate() {
     let paramsdata: any = {
+      ExamineeName: this.name || "",
+      OrganizationId: this.Profiles.organizationId,
+      ContainsChildren: this.orIdChecked,
       PageNumber: this.PageNumber,
       PageSize: this.PageSize,
-      OrganizationId: this.orId || "",
-      HasChildren: this.orIdChecked || "",
     };
     this.http
-      .get("/api/Papers", { params: paramsdata })
+      .get("/api/ExamStatisticalAnalyses/AbilityAnalysis", {
+        params: paramsdata,
+      })
       .subscribe((data: any) => {
+        console.log("数据", data);
         this.tabledataSource = data.items;
         this.length = data.totalCount;
       });
@@ -105,7 +110,21 @@ export class ExamineeCapacityComponent implements OnInit {
   }
 
   //查询按钮
-  Submit() {}
+  Submit() {
+    if (!this.orId) {
+      this.snackBar.open("组织机构不能为空", "确定", {
+        verticalPosition: "top",
+        duration: 3000,
+      });
+      return;
+    }
+    this.getAlltabledate();
+  }
   //重置按钮
-  Reset() {}
+  Reset() {
+    this.name = "";
+    this.orId = this.Profiles.organizationId;
+    this.orIdChecked = true;
+    this.getAlltabledate();
+  }
 }

src/app/examiner/statistic-analysis/examStatistics/station-examinee/station-examinee.component.ts

@@ -40,7 +40,7 @@ export class StationExamineeComponent implements OnInit {
   //获得所有组织机构
   allorganizations;
   treedata;
-  nodes;
+  nodes = [];
   expandedKeys = [];
   getOrganizations() {
     this.http.get("/api/Organizations").subscribe((data: any) => {