[完善]统计分析列表真实数据

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

@@ -32,7 +32,7 @@
             <tbody>
                 <tr *ngFor="let item of tabledataSource;let key = index">
                     <td>{{(PageNumber-1)*10+(key + 1)}}</td>
-                    <td>{{item.examineeName || '/'}}</td>
+                    <td>{{item.examineeRealName || '/'}}</td>
                     <td>{{item.organizationName}}</td>
                     <td class="ratebox">
                         <nz-rate [ngModel]="item.overallQualityRating" [nzDisabled]="true"></nz-rate>

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

@@ -87,7 +87,7 @@ export class ExamineeCapacityComponent implements OnInit {
   length;
   getAlltabledate() {
     let paramsdata: any = {
-      ExamineeName: this.name || "",
+      ExamineeRealName: this.name || "",
       OrganizationId: this.Profiles.organizationId,
       ContainsChildren: this.orIdChecked,
       PageNumber: this.PageNumber,

src/app/examiner/statistic-analysis/examStatistics/echarts/echarts.component.ts

@@ -8,18 +8,17 @@ declare var echarts: any;
   styleUrls: ["./echarts.component.scss"],
 })
 export class EchartsComponent implements OnInit {
-  constructor(public router: Router,private http: HttpClient,) {}
+  constructor(public router: Router, private http: HttpClient) {}
 
   ngOnInit(): void {
-    this.getProfiles()
+    this.getProfiles();
     // window.setTimeout(() => {
     //   this.initCharts();
     // }, 0);
-    
   }
 
   zhutu; //柱状图实例
-  echartsData
+  echartsData;
   zhiData = {
     name: [],
     number: [],
@@ -33,32 +32,38 @@ export class EchartsComponent implements OnInit {
       this.getExamStatisticalAnalyses();
     });
   }
-  organizationId
-  oldOrganizationId
-  queryMode=0
-  getExamStatisticalAnalyses(){
-    let params:any={
-      QueryMode:this.queryMode,
-      OrganizationId:this.organizationId?this.organizationId:this.Profiles.organizationId,
-      PageNumber:1,
-      PageSize:9999
-    }
-    this.http.get('/api/ExamStatisticalAnalyses/ExaminationStatistics',{params:params}).subscribe((res:any)=>{
-      console.log(res);
-      if(this.level==1){
-        this.oldOrganizationId=params.OrganizationId
-      }
-      this.echartsData=res
-      this.zhiData = {
-        name: [],
-        number: [],
-      };
-      this.echartsData.forEach(element => {
-        this.zhiData.name.push(element.organizationName)
-        this.zhiData.number.push(element.count)
+  organizationId;
+  oldOrganizationId;
+  queryMode = 0;
+  getExamStatisticalAnalyses() {
+    let params: any = {
+      QueryMode: this.queryMode,
+      OrganizationId: this.organizationId
+        ? this.organizationId
+        : this.Profiles.organizationId,
+      PageNumber: 1,
+      PageSize: 9999,
+    };
+    this.http
+      .get("/api/ExamStatisticalAnalyses/ExaminationStatistics", {
+        params: params,
+      })
+      .subscribe((res: any) => {
+        console.log(res);
+        if (this.level == 1) {
+          this.oldOrganizationId = params.OrganizationId;
+        }
+        this.echartsData = res;
+        this.zhiData = {
+          name: [],
+          number: [],
+        };
+        this.echartsData.forEach((element) => {
+          this.zhiData.name.push(element.organizationName);
+          this.zhiData.number.push(element.count);
+        });
+        this.initCharts();
       });
-      this.initCharts();
-    })
   }
 
   title = "考试频次(次)";
@@ -70,31 +75,31 @@ export class EchartsComponent implements OnInit {
       this.title = "考试频次(次)";
       this.examinationIndex = false;
       this.color = "#41CDFC";
-      this.queryMode=0
+      this.queryMode = 0;
     } else {
       this.title = "考试人数(个)";
       this.examinationIndex = true;
       this.color = "#FF8678";
-      this.queryMode=1
+      this.queryMode = 1;
     }
     let myChart = echarts.init(document.getElementById("zhidui"));
-    
+
     myChart.dispose();
-    this.getProfiles()
+    this.getProfiles();
   }
   //后退
   level = 0;
   back() {
-    if(this.level==1){
-      this.organizationId=this.Profiles.organizationId
-    }else if(this.level==2){
-      this.organizationId=this.oldOrganizationId
+    if (this.level == 1) {
+      this.organizationId = this.Profiles.organizationId;
+    } else if (this.level == 2) {
+      this.organizationId = this.oldOrganizationId;
     }
-    this.level=this.level-1
+    this.level = this.level - 1;
     let myChart = echarts.init(document.getElementById("zhidui"));
-    
+
     myChart.dispose();
-    this.getExamStatisticalAnalyses()
+    this.getExamStatisticalAnalyses();
   }
   initCharts() {
     var detailPlanEchart = echarts.init(document.getElementById("zhidui"));
@@ -115,7 +120,7 @@ export class EchartsComponent implements OnInit {
           fontSize: 12,
           lineHeight: 31,
           interval: 0,
-          rotate: this.zhiData.name.length<15?0:40,
+          rotate: this.zhiData.name.length < 15 ? 0 : 40,
         },
         axisLine: {
           show: false,
@@ -132,7 +137,6 @@ export class EchartsComponent implements OnInit {
         axisLabel: {
           fontSize: 18,
           lineHeight: 31,
-         
         },
         axisTick: {
           show: false,
@@ -192,16 +196,19 @@ export class EchartsComponent implements OnInit {
   clickFunc(e) {
     let myChart = echarts.init(document.getElementById("zhidui"));
     console.log(e);
-    this.echartsData.forEach(element=>{
-      if(element.organizationName==e.name&&element.level!=3){
-        this.organizationId=element.organizationId
-        this.level=this.level+1
+    this.echartsData.forEach((element) => {
+      if (element.organizationName == e.name && element.level != 3) {
+        this.organizationId = element.organizationId;
+        this.level = this.level + 1;
         myChart.dispose();
-        this.getExamStatisticalAnalyses()
-      }else if(element.organizationName==e.name&&element.level==3){
-        window.open("home/statistic-examination/station-examinee?organizationId="+element.organizationId);
+        this.getExamStatisticalAnalyses();
+      } else if (element.organizationName == e.name && element.level == 3) {
+        window.open(
+          "home/statistic-examination/station-examinee?organizationId=" +
+            element.organizationId
+        );
       }
-    })
+    });
     // if (e.name.indexOf("支队") != -1) {
     //   this.zhiData = this.daData;
     //   this.level = 1;

src/app/examiner/statistic-analysis/examStatistics/examinee-papers/examinee-papers.component.html

@@ -6,8 +6,12 @@
                 <input type="text" placeholder="请输入试卷名称" [(ngModel)]="name" />
             </div>
             <div class="queryField">
-                <label>考试时间:</label>
-                <input type="date" placeholder="请选择考试时间" [(ngModel)]="time" />
+                <label>考试开始时间:</label>
+                <input type="date" placeholder="请选择考试开始时间" [(ngModel)]="starttime" />
+            </div>
+            <div class="queryField">
+                <label>考试结束时间:</label>
+                <input type="date" placeholder="请选择考试结束时间" [(ngModel)]="endtime" />
             </div>
             <div class="queryField">
                 <button style="background-color: #07CDCF;" (click)="Submit()">查询</button>
@@ -21,22 +25,24 @@
                 <th style="width: 15%;">编号</th>
                 <th style="width: 15%;">试卷名称</th>
                 <th style="width: 25%;">考核机构</th>
-                <th style="width: 15%;">考试时间</th>
+                <th style="width: 15%;">考试结束时间</th>
                 <th style="width: 15%;">试卷得分</th>
                 <th style="width: 15%;">操作</th>
             </thead>
             <tbody>
                 <tr *ngFor="let item of tabledataSource;let key = index">
-                    <td>{{key + 1}}</td>
-                    <td>xxx试卷</td>
-                    <td>{{item.organizationsName}}</td>
+                    <td>{{(PageNumber-1)*10+(key + 1)}}</td>
+                    <td>{{item.examinationName}}</td>
+                    <td>
+                        <span style="margin: 0 2px;" *ngFor="let i of item.organizationNames">{{i}}</span>
+                    </td>
                     <td>
-                        {{item.startTime|date:'yyyy-MM-dd HH:mm'}}
+                        {{item.endTime|date:'yyyy-MM-dd HH:mm'}}
                     </td>
                     <td>
-                        85分
+                        {{item.score}}
                     <td>
-                        <span style="color: #07CDCF;cursor: pointer;" (click)="To()">详情</span>
+                        <span style="color: #07CDCF;cursor: pointer;" (click)="To(item)">详情</span>
                     </td>
                 </tr>
             </tbody>

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

@@ -1,7 +1,7 @@
 import { Component, OnInit } from "@angular/core";
 import { HttpClient } from "@angular/common/http";
 import { MatSnackBar } from "@angular/material/snack-bar";
-import { Router } from "@angular/router";
+import { ActivatedRoute, Router } from "@angular/router";
 import { TreeService } from "src/app/http-interceptors/tree.service";
 
 @Component({
@@ -12,17 +12,20 @@ import { TreeService } from "src/app/http-interceptors/tree.service";
 export class ExamineePapersComponent implements OnInit {
   constructor(
     private router: Router,
+    private route: ActivatedRoute,
     public http: HttpClient,
     public snackBar: MatSnackBar,
     private tree: TreeService
   ) {}
 
+  examineeId;
   ngOnInit(): void {
+    this.examineeId = this.route.snapshot.queryParams.examineeId;
     //获得登陆组织机构id
-    this.getProfiles().then((res) => {
-      //过滤得到正确的组织机构tree
-      this.getOrganizations();
-    });
+    // this.getProfiles().then((res) => {
+    //   //过滤得到正确的组织机构tree
+    //   this.getOrganizations();
+    // });
     this.getAlltabledate();
   }
   //获取登录账号的个人资料
@@ -80,20 +83,26 @@ export class ExamineePapersComponent implements OnInit {
   PageNumber = 1;
   PageSize = 10;
   name;
-  time;
+  starttime;
+  endtime;
   orId;
   orIdChecked;
   tabledataSource;
   length;
   getAlltabledate() {
+    console.log(5, this.starttime);
     let paramsdata: any = {
+      ExamineeId: this.examineeId,
+      ExaminationName: this.name || "",
+      EndTimeBegin: this.starttime ? this.starttime + " " + "0:0:0" : "",
+      EndTimeEnd: this.endtime ? this.endtime + " " + "23:59:59" : "",
       PageNumber: this.PageNumber,
       PageSize: this.PageSize,
-      OrganizationId: this.orId || "",
-      HasChildren: this.orIdChecked || "",
     };
     this.http
-      .get("/api/Papers", { params: paramsdata })
+      .get("/api/ExamStatisticalAnalyses/ExaminationStatistics/Examinations", {
+        params: paramsdata,
+      })
       .subscribe((data: any) => {
         this.tabledataSource = data.items;
         this.length = data.totalCount;
@@ -104,11 +113,19 @@ export class ExamineePapersComponent implements OnInit {
     this.PageNumber = e.pageIndex + 1;
     this.getAlltabledate();
   }
-  To(){
-    window.open(`/reviewFiles?examId=646425b55f40644e9e82f267&paperType=1`)
+  To(item) {
+    window.open(`/reviewFiles?examId=${item.examinationId}&paperType=1`);
   }
   //查询按钮
-  Submit() {}
+  Submit() {
+    this.getAlltabledate();
+  }
   //重置按钮
-  Reset() {}
+  Reset() {
+    this.name = "";
+    this.starttime = "";
+    this.endtime = "";
+    // this.orIdChecked = true;
+    this.getAlltabledate();
+  }
 }

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

@@ -10,8 +10,8 @@
                 <nz-tree-select [nzDropdownClassName]="'maxHeightTreeSelect'" style="width: 250px" [(ngModel)]="orId"
                     [nzNodes]="nodes" nzPlaceHolder="请选择">
                 </nz-tree-select>
-                <mat-checkbox color="primary" style="margin-left: 26px;" [(ngModel)]="orIdChecked">包含下级
-                </mat-checkbox>
+                <!-- <mat-checkbox color="primary" style="margin-left: 26px;" [(ngModel)]="orIdChecked">包含下级
+                </mat-checkbox> -->
             </div>
             <div class="queryField">
                 <button style="background-color: #07CDCF;" (click)="Submit()">查询</button>
@@ -31,16 +31,16 @@
             </thead>
             <tbody>
                 <tr *ngFor="let item of tabledataSource;let key = index">
-                    <td>{{key + 1}}</td>
-                    <td>张三</td>
-                    <td>广西总队</td>
+                    <td>{{(PageNumber-1)*10+(key + 1)}}</td>
+                    <td>{{item.examineeRealName}}</td>
+                    <td>{{item.organizationName}}</td>
                     <td>
-                        3次
+                        {{item.examinationTimes}}次
                     </td>
                     <td>
-                        85分
+                        {{item.averageScore}}分
                     <td>
-                        <span style="color: #07CDCF;cursor: pointer;" (click)="To()">详情</span>
+                        <span style="color: #07CDCF;cursor: pointer;" (click)="To(item)">详情</span>
                     </td>
                 </tr>
             </tbody>

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

@@ -1,7 +1,7 @@
 import { Component, OnInit } from "@angular/core";
 import { HttpClient } from "@angular/common/http";
 import { MatSnackBar } from "@angular/material/snack-bar";
-import { Router } from "@angular/router";
+import { ActivatedRoute, Router } from "@angular/router";
 import { TreeService } from "src/app/http-interceptors/tree.service";
 
 @Component({
@@ -12,17 +12,18 @@ import { TreeService } from "src/app/http-interceptors/tree.service";
 export class StationExamineeComponent implements OnInit {
   constructor(
     private router: Router,
+    private route: ActivatedRoute,
     public http: HttpClient,
     public snackBar: MatSnackBar,
     private tree: TreeService
   ) {}
-
   ngOnInit(): void {
+    this.orId = this.route.snapshot.queryParams.organizationId;
     //获得登陆组织机构id
-    this.getProfiles().then((res) => {
-      //过滤得到正确的组织机构tree
-      this.getOrganizations();
-    });
+    // this.getProfiles().then((res) => {
+    //过滤得到正确的组织机构tree
+    // });
+    this.getOrganizations();
     this.getAlltabledate();
   }
   //获取登录账号的个人资料
@@ -46,7 +47,9 @@ export class StationExamineeComponent implements OnInit {
     this.http.get("/api/Organizations").subscribe((data: any) => {
       this.allorganizations = data;
       this.treedata = this.tree.toTree(data);
-      this.getpresentOrganization();
+      // this.orId = this.organizationId;
+      this.nodes = this.treedata;
+      // this.getpresentOrganization();
     });
   }
   //得到当前单位所在组织机构的tree型数据
@@ -86,14 +89,17 @@ export class StationExamineeComponent implements OnInit {
   length;
   getAlltabledate() {
     let paramsdata: any = {
+      ExamineeRealName: this.name || "",
+      OrganizationId: this.orId || "",
       PageNumber: this.PageNumber,
       PageSize: this.PageSize,
-      OrganizationId: this.orId || "",
-      HasChildren: this.orIdChecked || "",
     };
     this.http
-      .get("/api/Papers", { params: paramsdata })
+      .get("/api/ExamStatisticalAnalyses/ExaminationStatistics/Examinees", {
+        params: paramsdata,
+      })
       .subscribe((data: any) => {
+        console.log("数据", data);
         this.tabledataSource = data.items;
         this.length = data.totalCount;
       });
@@ -103,11 +109,29 @@ export class StationExamineeComponent implements OnInit {
     this.PageNumber = e.pageIndex + 1;
     this.getAlltabledate();
   }
-  To() {
-    this.router.navigate(["/home/statistic-examination/examinee-papers"]); //登陆成功跳转页面
+  To(item) {
+    this.router.navigate(["/home/statistic-examination/examinee-papers"], {
+      queryParams: {
+        examineeId: item.examineeId,
+      },
+    }); //登陆成功跳转页面
   }
   //查询按钮
-  Submit() {}
+  Submit() {
+    if (!this.orId) {
+      this.snackBar.open("组织机构不能为空", "确定", {
+        verticalPosition: "top",
+        duration: 3000,
+      });
+      return;
+    }
+    this.getAlltabledate();
+  }
   //重置按钮
-  Reset() {}
+  Reset() {
+    this.name = "";
+    this.orId = this.route.snapshot.queryParams.organizationId;
+    // this.orIdChecked = true;
+    this.getAlltabledate();
+  }
 }