[完善]增加管理员创建的页面

src/app/examiner/examiner-index/examiner-index.component.html

@@ -3,9 +3,9 @@
         <div class="queryBox">
             <div class="queryField ordiv">
                 <label style="margin-right: 10px;font-size: 15px;">消防救援站:</label>
-                <nz-tree-select [nzDropdownClassName]="'maxHeightTreeSelect'" style="width: 250px" [(ngModel)]="js"
+                <nz-tree-select [nzDropdownClassName]="'maxHeightTreeSelect'" style="width: 250px" [(ngModel)]="orId"
                     [nzNodes]="nodes" nzPlaceHolder="请选择" [nzExpandedIcon]="multiExpandedIconTpl"
-                    [nzExpandedKeys]="expandedKeys" (click)="zIndex()">
+                    [nzExpandedKeys]="expandedKeys">
                 </nz-tree-select>
                 <ng-template #multiExpandedIconTpl let-node let-origin="origin">
                     <ng-container *ngIf="node.children.length == 0; else elseTemplate">
@@ -21,7 +21,7 @@
 
                     </ng-template>
                 </ng-template>
-                <mat-checkbox color="primary" style="margin-left: 26px;" [(ngModel)]="jscheck" name="jscheck">包含下级
+                <mat-checkbox color="primary" style="margin-left: 26px;" [(ngModel)]="orIdcheck" name="jscheck">包含下级
                 </mat-checkbox>
             </div>
             <div class="queryField">

src/app/examiner/examiner-index/examiner-index.component.ts

@@ -48,20 +48,15 @@ export class ExaminerIndexComponent implements OnInit {
     private viewContainerRef: ViewContainerRef
   ) {}
 
+  //获取登录账号的个人资料
+  Profiles: any;
   ngOnInit(): void {
+    this.Profiles = JSON.parse(sessionStorage.getItem("creatorData"));
+    this.getOrganizations();
     this.getUnittype();
     this.getAlltabledate();
-    this.getProfiles();
-  }
-  //获取登录账号的个人资料
-  Profiles: any;
-  getProfiles() {
-    this.http.get("/api/ExamAccounts/Profiles").subscribe((data: any) => {
-      this.Profiles = data;
-      sessionStorage.setItem("creatorData", JSON.stringify(data));
-      this.getOrganizations();
-    });
   }
+
   displayedColumns: string[] = [
     "name",
     "startTime",
@@ -79,7 +74,7 @@ export class ExaminerIndexComponent implements OnInit {
   pageEvent: PageEvent;
   paginator: MatPaginator;
   length: any; //共多少条数据
-  pageSize: any; //每页条数
+  pageSize: any = 10; //每页条数
   pageSizeOptions: number[] = [10]; //设置每页条数
   PageNumber: any; //第几页
   startTime: [];
@@ -90,42 +85,27 @@ export class ExaminerIndexComponent implements OnInit {
 
   //获得所有组织机构
   getOrganizations() {
-    this.http.get("/api/Organizations").subscribe((data: any) => {
+    this.http
-      this.allorganizations = data;
+      .get("/api/Organizations", {
-      console.log("组织机构列表", this.allorganizations);
+        params: {
-      this.treedata = this.tree.toTree(data);
+          strict: "true",
-      this.getpresentOrganization();
+        },
-    });
+      })
+      .subscribe((data: any) => {
+        this.allorganizations = data;
+        this.allorganizations.forEach((element) => {
+          if (element.id === this.Profiles.organizationId) {
+            element.parentId = null;
+          }
+        });
+        this.nodes = [...this.tree.toTree(data)];
+        this.orId = this.Profiles.organizationId;
+      });
   }
   organizationName: any; //当前单位组织机构名称
-  treedata: any; //组织机构树型数据
   newallorganizations: any; //用于存储在原始数据基础上的每个机构增加children字段
   nodes: any = [];
   expandedKeys: any = []; //默认展开tree节点
-  //得到当前单位所在组织机构的tree型数据
-  getpresentOrganization() {
-    this.newallorganizations = this.allorganizations;
-    this.newallorganizations.forEach((item) => {
-      item.children = [];
-      this.newallorganizations.forEach((element) => {
-        if (element.parentId == item.id) {
-          item.children.push(element);
-        }
-      });
-    });
-    this.organizationName = this.Profiles.organizationName;
-    if (this.organizationName) {
-      this.newallorganizations.forEach((item) => {
-        if (item.name == this.organizationName) {
-          this.nodes = [item];
-          this.expandedKeys = [item.key];
-        }
-      });
-    } else {
-      this.nodes = this.tree.toTree(this.treedata);
-      this.expandedKeys = this.nodes[0].key;
-    }
-  }
 
   //编辑试卷
   editPaper(item) {
@@ -187,13 +167,16 @@ export class ExaminerIndexComponent implements OnInit {
     this.PageNumber = e.pageIndex + 1;
     this.getAlltabledate();
   }
+  orId;
+  orIdcheck = true;
+
   //获取表格信息
   getAlltabledate() {
     let paramsdata: any = {
+      OrganizationId: this.orId || "",
+      HasChildren: this.orIdcheck || "",
       PageNumber: this.PageNumber || "1",
       PageSize: this.pageSizeOptions[0],
-      OrganizationId: this.js || "",
-      HasChildren: this.jscheck || "",
       Sort: null,
       SortType: null,
     };
@@ -225,27 +208,12 @@ export class ExaminerIndexComponent implements OnInit {
       });
   }
 
-  //获取optionid
-  getoption() {
-    var selectIndex = document.getElementById("cars");
-    //console.log(selectIndex)
-    //var activeName_value =document.getElementById("usertype").options[selectIndex].id;
-  }
   //查询按钮
   findClick() {
     const config = new MatSnackBarConfig();
     config.verticalPosition = "top";
     config.duration = 3000;
-    console.log(this.js);
+    if (!this.orId) {
-    let paramsdata: any = {
-      PageNumber: this.PageNumber || "1",
-      PageSize: this.pageSizeOptions[0],
-      OrganizationId: this.js || "",
-      HasChildren: this.jscheck || "",
-      Sort: null,
-      SortType: null,
-    };
-    if (!this.js) {
       this.snackBar.open("请选择消防救援队", "确定", config);
     } else {
       this.PageNumber = 1;
@@ -255,8 +223,8 @@ export class ExaminerIndexComponent implements OnInit {
   }
   //重置按钮
   Reset() {
-    this.js = "";
+    this.orId = this.Profiles.organizationId;
-    this.jscheck = "";
+    this.orIdcheck = true;
     this.getAlltabledate();
   }
   //删除一套考题
@@ -274,14 +242,6 @@ export class ExaminerIndexComponent implements OnInit {
   }
   //新增考题跳转
   newExamination() {
-    // const dialogRef = this.dialog.open(FinishDia, {
-    //   width: '685px',
-    //   data: {
-    //     Profiles: this.Profiles,
-    //     treedata: this.treedata,
-    //   }
-    // });
-
     const modal: any = this.modal.create({
       nzTitle: "新增考题",
       nzContent: FinishDia,
@@ -290,20 +250,11 @@ export class ExaminerIndexComponent implements OnInit {
       nzFooter: null,
       nzComponentParams: {
         Profiles: this.Profiles,
-        treedata: this.treedata,
+        treedata: this.nodes,
       },
       nzOnOk: async () => {},
     });
-    const instance = modal.getContentComponent();
-    modal.afterOpen.subscribe(() => console.log("[afterOpen] emitted!"));
-    // Return a result when closed
-    modal.afterClose.subscribe((result) =>
-      console.log("[afterClose] The result is:", result)
-    );
   }
-
-  js: any; //辖区中队输入框
-  zIndex() {}
 }
 
 //创建试题弹窗
@@ -419,6 +370,6 @@ export class FinishDia {
   }
 
   close() {
-    this.dialog2.close()
+    this.dialog2.close();
   }
 }

src/app/examiner/examiner-new-one/examiner-new-one.component.ts

@@ -1,51 +1,65 @@
 /*
- * @Descripttion: 
+ * @Descripttion:
- * @version: 
+ * @version:
  * @Author: sueRimn
  * @Date: 2020-12-11 16:34:26
  * @LastEditors: sueRimn
  * @LastEditTime: 2021-02-23 17:13:27
  */
-import { Component, OnInit, ViewChild, Inject } from '@angular/core';
+import { Component, OnInit, ViewChild, Inject } from "@angular/core";
-import { HttpClient } from '@angular/common/http'
+import { HttpClient } from "@angular/common/http";
-import { MatTreeFlatDataSource, MatTreeFlattener } from '@angular/material/tree';
+import {
-import { MatPaginator } from '@angular/material/paginator';
+  MatTreeFlatDataSource,
-import { FlatTreeControl } from '@angular/cdk/tree';
+  MatTreeFlattener,
-import { FormControl } from '@angular/forms';
+} from "@angular/material/tree";
-import { Router, ActivatedRoute } from '@angular/router'
+import { MatPaginator } from "@angular/material/paginator";
-import { PageEvent } from '@angular/material/paginator';
+import { FlatTreeControl } from "@angular/cdk/tree";
-import { MatDialogRef, MatDialog, MAT_DIALOG_DATA } from '@angular/material/dialog';
+import { FormControl } from "@angular/forms";
-import { MatSnackBar, MatSnackBarConfig } from '@angular/material/snack-bar';
+import { Router, ActivatedRoute } from "@angular/router";
-import { TreeService } from '../../http-interceptors/tree.service'
+import { PageEvent } from "@angular/material/paginator";
-import { MatSort } from '@angular/material/sort';
+import {
-import { MatTableDataSource } from '@angular/material/table';
+  MatDialogRef,
+  MatDialog,
+  MAT_DIALOG_DATA,
+} from "@angular/material/dialog";
+import { MatSnackBar, MatSnackBarConfig } from "@angular/material/snack-bar";
+import { TreeService } from "../../http-interceptors/tree.service";
+import { MatSort } from "@angular/material/sort";
+import { MatTableDataSource } from "@angular/material/table";
 
 @Component({
-  selector: 'app-examiner-new-one',
+  selector: "app-examiner-new-one",
-  templateUrl: './examiner-new-one.component.html',
+  templateUrl: "./examiner-new-one.component.html",
-  styleUrls: ['./examiner-new-one.component.scss']
+  styleUrls: ["./examiner-new-one.component.scss"],
 })
 export class ExaminerNewOneComponent implements OnInit {
+  constructor(
+    private http: HttpClient,
+    private router: Router,
+    private route: ActivatedRoute,
+    private tree: TreeService,
+    public dialog: MatDialog,
+    public snackBar: MatSnackBar
+  ) {}
 
-  constructor(private http: HttpClient, private router: Router, private route: ActivatedRoute, private tree: TreeService, public dialog: MatDialog, public snackBar: MatSnackBar) { }
+  Profiles: any;
-
   ngOnInit(): void {
-
+    this.Profiles = JSON.parse(sessionStorage.getItem("creatorData"));
     this.getunitdata();
     this.getOrganizations();
     this.getUnittype();
     this.getAllKeyUnit();
   }
-  pattern: any = this.route.snapshot.queryParams.pattern || ''
+  pattern: any = this.route.snapshot.queryParams.pattern || "";
-  indexid = sessionStorage.getItem("paperId") //上个页面传过来的id
+  indexid = sessionStorage.getItem("paperId"); //上个页面传过来的id
 
-  removeClass = document.getElementsByClassName("mat-form-field-underline")
+  removeClass = document.getElementsByClassName("mat-form-field-underline");
 
   myControl = new FormControl();
 
   @ViewChild(MatSort) sort: MatSort;
 
-  allunittype: any //获取所有的单位类型
+  allunittype: any; //获取所有的单位类型
 
   //分页
   @ViewChild(MatPaginator, { static: true })
@@ -53,240 +67,250 @@ export class ExaminerNewOneComponent implements OnInit {
   paginator: MatPaginator;
   length: any; //共多少条数据
   pageSize: any; //每页条数
-  pageSizeOptions: number[] = [10] //设置每页条数
+  pageSizeOptions: number[] = [10]; //设置每页条数
-  PageNumber: any //第几页
+  PageNumber: any; //第几页
 
-  displayedColumns: string[] = ['checked', 'unitname', 'jurisdictionsquadron', 'unittype', 'scc'];
+  displayedColumns: string[] = [
-  tabledataSource: any
+    "checked",
-  allorganizations: any
+    "unitname",
+    "jurisdictionsquadron",
+    "unittype",
+    "scc",
+  ];
+  tabledataSource: any;
+  allorganizations: any;
   oldDataSource: any; //原始表格数据
 
   //分页事件
   chagePage(e) {
-    this.PageNumber = e.pageIndex + 1
+    this.PageNumber = e.pageIndex + 1;
     this.getAllKeyUnit();
   }
 
   submit() {
-    this.PageNumber = '1'
+    this.PageNumber = "1";
-    this.getAllKeyUnit()
+    this.getAllKeyUnit();
   }
 
   //获得所有重点单位
-  allKeyUnitInfo: any //所有的重点单位
+  allKeyUnitInfo: any; //所有的重点单位
   getAllKeyUnit() {
     let paramsdata: any = {
-      Name: this.companyName || '',
+      Name: this.companyName || "",
-      OrganizationId: this.js || '',
+      OrganizationId: this.js || "",
-      HasChildren: this.jscheck || '',
+      HasChildren: this.jscheck || "",
-      USCI: this.shehui || '',
+      USCI: this.shehui || "",
-      PageNumber: this.PageNumber || '1',
+      PageNumber: this.PageNumber || "1",
       PageSize: this.pageSizeOptions[0],
-    }
+    };
-    this.http.get("/api/Companies", { params: paramsdata }).subscribe((data: any) => {
+    this.http
-      this.length = data.totalCount
+      .get("/api/Companies", { params: paramsdata })
-      this.allKeyUnitInfo = data
+      .subscribe((data: any) => {
-      this.tabledataSource = new MatTableDataSource(data.items);
+        this.length = data.totalCount;
-      if (this.selectedunitArr.length != 0) {
+        this.allKeyUnitInfo = data;
-        for (var i = 0; i < this.tabledataSource.filteredData.length; i++) {
+        this.tabledataSource = new MatTableDataSource(data.items);
-          for (var j = 0; j < this.selectedunitArr.length; j++) {
+        if (this.selectedunitArr.length != 0) {
-            if (this.tabledataSource.filteredData[i].id == this.selectedunitArr[j].id) {
+          for (var i = 0; i < this.tabledataSource.filteredData.length; i++) {
-              this.tabledataSource.filteredData[i].checked = this.selectedunitArr[j].checked
+            for (var j = 0; j < this.selectedunitArr.length; j++) {
+              if (
+                this.tabledataSource.filteredData[i].id ==
+                this.selectedunitArr[j].id
+              ) {
+                this.tabledataSource.filteredData[i].checked =
+                  this.selectedunitArr[j].checked;
+              }
             }
           }
         }
-      }
+      });
-    })
   }
   //得到当前单位信息
   getunitdata() {
-    this.http.get("/api/ExamAccounts/Profiles").subscribe(
+    this.http.get("/api/ExamAccounts/Profiles").subscribe((data: any) => {
-      (data: any) => {
+      this.organizationName = data.organizationName;
-        this.organizationName = data.organizationName
+    });
-      }
-    )
   }
-  organizationName: any //当前单位组织机构名称
+  organizationName: any; //当前单位组织机构名称
-  treedata: any //组织机构树型数据
+  treedata: any; //组织机构树型数据
-  newArr: any = []
+  newArr: any = [];
-  newallorganizations: any //用于存储在原始数据基础上的每个机构增加children字段
+  newallorganizations: any; //用于存储在原始数据基础上的每个机构增加children字段
 
-  nodes: any = []
+  nodes: any = [];
-  expandedKeys: any = []//默认展开tree节点
+  expandedKeys: any = []; //默认展开tree节点
   //得到当前单位所在组织机构的tree型数据
   getpresentOrganization() {
-    this.newallorganizations = this.allorganizations
+    this.newallorganizations = this.allorganizations;
-    this.newallorganizations.forEach(item => {
+    this.newallorganizations.forEach((item) => {
-      item.children = []
+      item.children = [];
-      this.newallorganizations.forEach(element => {
+      this.newallorganizations.forEach((element) => {
         if (element.parentId == item.id) {
-          item.children.push(element)
+          item.children.push(element);
         }
       });
     });
-    this.http.get("/api/ExamAccounts/Profiles").subscribe(
+    this.http.get("/api/ExamAccounts/Profiles").subscribe((data: any) => {
-      (data: any) => {
+      this.organizationName = data.organizationName;
-        this.organizationName = data.organizationName
+      if (this.organizationName) {
-        if (this.organizationName) {
+        this.newallorganizations.forEach((item) => {
-          this.newallorganizations.forEach(item => {
+          if (item.name == this.organizationName) {
-            if (item.name == this.organizationName) {
+            this.expandedKeys = [item.key];
-              this.expandedKeys = [item.key]
+            this.nodes = [item];
-              this.nodes = [item]
+          }
-            }
+        });
-          });
+      } else {
-        } else {
+        this.expandedKeys = this.nodes[0].key;
-          this.expandedKeys = this.nodes[0].key
+        this.nodes = this.tree.toTree(this.treedata);
-          this.nodes = this.tree.toTree(this.treedata);
-        }
       }
-    )
+    });
-
   }
 
-
-
   //获得所有组织机构
   getOrganizations() {
-    this.http.get('/api/Organizations').subscribe(
+    this.http
-      (data: any) => {
+      .get("/api/Organizations", {
-        this.allorganizations = data
+        params: {
+          strict: "true",
+        },
+      })
+      .subscribe((data: any) => {
+        this.allorganizations = data;
+        this.allorganizations.forEach((element) => {
+          if (element.id === this.Profiles.organizationId) {
+            element.parentId = null;
+          }
+        });
         this.treedata = this.tree.toTree(data);
         this.getpresentOrganization();
-      }
+      });
-    )
   }
 
   //获得所有单位类型
   getUnittype() {
-    this.http.get('/api/BuildingTypes/Simple').subscribe(
+    this.http.get("/api/BuildingTypes/Simple").subscribe((data) => {
-      data => {
+      this.allunittype = data;
-        this.allunittype = data
+    });
-      }
-    )
   }
-  selectedunitArr: any = JSON.parse(sessionStorage.getItem(this.indexid)) || [] //选中单位的数组
+  selectedunitArr: any = JSON.parse(sessionStorage.getItem(this.indexid)) || []; //选中单位的数组
-  deleteByid = ""//根据id取消选中
+  deleteByid = ""; //根据id取消选中
   //勾选框事件
   checkChange(e, element) {
-    console.log(e, element)
+    console.log(e, element);
-    element.checked = e.checked
+    element.checked = e.checked;
     if (element.checked) {
-      this.selectedunitArr.push(element)
+      this.selectedunitArr.push(element);
-    }
+    } else {
-    else {
       for (var i = 0; i < this.selectedunitArr.length; i++) {
         if (this.selectedunitArr[i].id == element.id) {
-          this.selectedunitArr.splice(i, 1)
+          this.selectedunitArr.splice(i, 1);
         }
       }
     }
-    console.log(this.selectedunitArr)
+    console.log(this.selectedunitArr);
-
   }
   //删除某一个单位信息
   deleteWork(e) {
-    console.log(e.target.id)
+    console.log(e.target.id);
-    console.log(this.tabledataSource.data)
+    console.log(this.tabledataSource.data);
     for (var i = 0; i < this.selectedunitArr.length; i++) {
       if (this.selectedunitArr[i].id == e.target.id) {
-        this.selectedunitArr.splice(i, 1)
+        this.selectedunitArr.splice(i, 1);
       }
     }
     for (var i = 0; i < this.tabledataSource.data.length; i++) {
       if (this.tabledataSource.data[i].id == e.target.id) {
-        this.tabledataSource.data[i].checked = false
+        this.tabledataSource.data[i].checked = false;
       }
     }
   }
   //下一步事件
   nextClick() {
-    console.log(this.pattern)
+    console.log(this.pattern);
     const config = new MatSnackBarConfig();
-    config.verticalPosition = 'top';
+    config.verticalPosition = "top";
-    config.duration = 3000
+    config.duration = 3000;
     if (this.selectedunitArr.length == 0) {
-      this.snackBar.open('请选择单位', '确定', config);
+      this.snackBar.open("请选择单位", "确定", config);
-    }
+    } else {
-    else {
+      if (this.pattern == "edit") {
-      if (this.pattern == 'edit') {
+        this.router.navigateByUrl("/examiner/create-test-score?pattern=edit");
-        this.router.navigateByUrl("/examiner/create-test-score?pattern=edit")
       } else {
-        sessionStorage.setItem(this.indexid, JSON.stringify(this.selectedunitArr))
+        sessionStorage.setItem(
-        this.router.navigateByUrl("/examiner/create-test-score")
+          this.indexid,
+          JSON.stringify(this.selectedunitArr)
+        );
+        this.router.navigateByUrl("/examiner/create-test-score");
       }
-
     }
-
   }
   //编辑单位信息
   editunit() {
-    sessionStorage.setItem("six", "edit")
+    sessionStorage.setItem("six", "edit");
-    let selectedunitArr = []
+    let selectedunitArr = [];
-    let selectedunitobj = []
+    let selectedunitobj = [];
-    this.allKeyUnitInfo.items.forEach(item => {
+    this.allKeyUnitInfo.items.forEach((item) => {
       if (item.checked) {
-        selectedunitArr.push(item.id)
+        selectedunitArr.push(item.id);
-        selectedunitobj.push(item)
+        selectedunitobj.push(item);
       }
     });
 
     if (selectedunitArr.length == 0) {
       const config = new MatSnackBarConfig();
-      config.verticalPosition = 'top';
+      config.verticalPosition = "top";
-      config.duration = 3000
+      config.duration = 3000;
-      this.snackBar.open('请先选择要修改的单位', '确定', config);
+      this.snackBar.open("请先选择要修改的单位", "确定", config);
     }
     if (selectedunitArr.length != 1 && selectedunitArr.length != 0) {
       const config = new MatSnackBarConfig();
-      config.verticalPosition = 'top';
+      config.verticalPosition = "top";
-      config.duration = 3000
+      config.duration = 3000;
-      this.snackBar.open('只能选择一个单位修改', '确定', config);
+      this.snackBar.open("只能选择一个单位修改", "确定", config);
     }
-    if (selectedunitArr.length == 1) {  //带着id跳到修改页面
+    if (selectedunitArr.length == 1) {
+      //带着id跳到修改页面
       // console.log(778,selectedunitArr[0])
-      this.allKeyUnitInfo.items.forEach(item => {
+      this.allKeyUnitInfo.items.forEach((item) => {
         if (item.id == selectedunitArr[0]) {
-          let companyName = item.name
+          let companyName = item.name;
-          sessionStorage.setItem("companyName", companyName)
+          sessionStorage.setItem("companyName", companyName);
         }
       });
-      sessionStorage.setItem("editable", "1")
+      sessionStorage.setItem("editable", "1");
-      sessionStorage.setItem(selectedunitobj[0].id, JSON.stringify(selectedunitobj[0].companyIntegrityScore))
+      sessionStorage.setItem(
+        selectedunitobj[0].id,
+        JSON.stringify(selectedunitobj[0].companyIntegrityScore)
+      );
       window.open(`/keyUnit/editplaninfo?id=${selectedunitArr[0]}`);
     }
   }
 
-
   //重置
-  js: any //辖区中队输入框
+  js: any; //辖区中队输入框
-  companyName: any //单位名称
+  companyName: any; //单位名称
-  shehui: any //统一社会信用代码
+  shehui: any; //统一社会信用代码
-  unittype: any //单位类型
+  unittype: any; //单位类型
-  jscheck: any //辖区中队包含下级
+  jscheck: any; //辖区中队包含下级
-  OrganizationId //
+  OrganizationId; //
-  follow: any = '' //是否为关注单位
+  follow: any = ""; //是否为关注单位
-  integritySort: any //完整度排序
+  integritySort: any; //完整度排序
   reset() {
-    this.js = '' //辖区中队输入框
+    this.js = ""; //辖区中队输入框
-    this.jscheck = '' //辖区中队包含下级
+    this.jscheck = ""; //辖区中队包含下级
-    this.companyName = '' //单位名称
+    this.companyName = ""; //单位名称
-    this.shehui = '' //统一社会信用代码
+    this.shehui = ""; //统一社会信用代码
-    this.PageNumber = 1
+    this.PageNumber = 1;
-    this.pageEvent.pageIndex = 0
+    this.pageEvent.pageIndex = 0;
     this.getAllKeyUnit();
   }
 
   //提交查询表单
   onSubmit(value) {
-    this.PageNumber = 1
+    this.PageNumber = 1;
-    this.pageEvent.pageIndex = 0
+    this.pageEvent.pageIndex = 0;
     this.getAllKeyUnit();
   }
 
   stopclose(e) {
     e.stopPropagation();
   }
-
-
-
 }

src/app/examiner/mark-papers-index/mark-papers-index.component.html

@@ -10,12 +10,12 @@
     <div class="header">
         <div class="queryBox">
             <div class="queryField">
-                <label style="margin-right: 10px;font-size: 18px;">试卷名称：</label>
+                <label style="margin-right: 10px;font-size: 15px;">试卷名称：</label>
-                <input type="text" placeholder="请输入试卷名称"  style="font-size: 16px;" [(ngModel)]="markName"/>
+                <input type="text" placeholder="请输入试卷名称"  style="font-size: 15px;" [(ngModel)]="markName"/>
             </div>
             <div class="queryField">
-                <label style="margin-right: 10px;font-size: 18px;">考试日期：</label>
+                <label style="margin-right: 10px;font-size: 15px;">考试日期：</label>
-                <input type="date" placeholder="请输入考试日期"  style="font-size: 16px;" [(ngModel)]="markDate"/>
+                <input type="date" placeholder="请输入考试日期"  style="font-size: 15px;" [(ngModel)]="markDate"/>
             </div>
             <div class="queryField">
                 <button   style="background-color: #07CDCF;" (click)='findClick()'>查询</button>

src/app/examiner/mark-papers-index/mark-papers-index.component.scss

@@ -27,13 +27,13 @@ table {
       align-items:center;
       justify-content:left;
       .queryField {
-        margin: 0 25px;
+        margin: 0 20px;
         font-size: 14px;
         input {
           width: 320px;
-          height: 44px;
+          height: 32px;
-          line-height: 34px;
+          line-height:32px;
-          border-radius: 5px;
+          border-radius: 2px;
           padding-left: 5px;
           outline: none;
           border: 1px solid rgb(226, 211, 211);
@@ -41,14 +41,14 @@ table {
         button { 
           border: none;
           color: white;
-          padding: 10px 25px;
+          padding: 6px 18px;
           text-align: center;
           text-decoration: none;
           display: inline-block;
-          font-size: 16px;
+          font-size: 14px;
           margin: 4px 2px;
           cursor: pointer;
-          border-radius: 8px;
+          border-radius: 3px;
           outline:0 none !important;
          }
       }
@@ -65,7 +65,7 @@ table {
     table{
       td,th{
         height: 48px;
-        font-size: 16px;
+        font-size: 14px;
       }
       td{
         border-bottom: 1px solid #F2F5F6;

src/app/examiner/mark-papers-two/mark-papers-two.component.ts

@@ -1,85 +1,99 @@
 /*
- * @Descripttion: 
+ * @Descripttion:
- * @version: 
+ * @version:
  * @Author: sueRimn
  * @Date: 2020-12-14 17:21:02
  * @LastEditors: sueRimn
  * @LastEditTime: 2020-12-29 14:53:15
  */
-import { Component, OnInit, ViewChild, Inject } from '@angular/core';
+import { Component, OnInit, ViewChild, Inject } from "@angular/core";
-import {HttpClient} from '@angular/common/http'
+import { HttpClient } from "@angular/common/http";
-import { MatDialogRef, MatDialog, MAT_DIALOG_DATA } from '@angular/material/dialog';
+import {
-import { MatPaginator } from '@angular/material/paginator';
+  MatDialogRef,
-import { MatTableDataSource } from '@angular/material/table';
+  MatDialog,
-import { PageEvent } from '@angular/material/paginator';
+  MAT_DIALOG_DATA,
-import { MatSnackBar, MatSnackBarConfig } from '@angular/material/snack-bar';
+} from "@angular/material/dialog";
-import {FormControl} from '@angular/forms';
+import { MatPaginator } from "@angular/material/paginator";
-import { Router,ActivatedRoute } from '@angular/router';
+import { MatTableDataSource } from "@angular/material/table";
+import { PageEvent } from "@angular/material/paginator";
+import { MatSnackBar, MatSnackBarConfig } from "@angular/material/snack-bar";
+import { FormControl } from "@angular/forms";
+import { Router, ActivatedRoute } from "@angular/router";
 
 @Component({
-  selector: 'app-mark-papers-two',
+  selector: "app-mark-papers-two",
-  templateUrl: './mark-papers-two.component.html',
+  templateUrl: "./mark-papers-two.component.html",
-  styleUrls: ['./mark-papers-two.component.scss']
+  styleUrls: ["./mark-papers-two.component.scss"],
 })
 export class MarkPapersTwoComponent implements OnInit {
-
+  constructor(
-  constructor(private router: Router,private activatedRoute: ActivatedRoute,public http: HttpClient,public dialog: MatDialog,public snackBar: MatSnackBar) { }
+    private router: Router,
+    private activatedRoute: ActivatedRoute,
+    public http: HttpClient,
+    public dialog: MatDialog,
+    public snackBar: MatSnackBar
+  ) {}
 
   ngOnInit(): void {
-    this.activatedRoute.queryParams.subscribe(param=>{
+    this.activatedRoute.queryParams.subscribe((param) => {
-      this.headtext=param.level
+      this.headtext = param.level;
-      this.getid=param.id
+      this.getid = param.id;
-      this.getname=param.name
+      this.getname = param.name;
     });
-    this.getAlltabledate()
+    this.getAlltabledate();
 
     //监听 此HTML标签焦点事件
-    document.addEventListener('visibilitychange', ()=>{
+    document.addEventListener("visibilitychange", () => {
-      let isHidden = document.hidden
+      let isHidden = document.hidden;
       if (!isHidden) {
-        this.getAlltabledate()
+        this.getAlltabledate();
       }
-    })
+    });
   }
 
-  headtext
+  ngOnDestroy(): void {
-  getid//试卷id
+    document.removeEventListener("visibilitychange", () => {});
-  getname//考核中队
+  }
-  dataSource
+
+  headtext;
+  getid; //试卷id
+  getname; //考核中队
+  dataSource;
 
   //分页
-  @ViewChild(MatPaginator, {static: true}) 
+  @ViewChild(MatPaginator, { static: true })
   pageEvent: PageEvent;
   paginator: MatPaginator;
-  length:any; //共多少条数据
+  length: any; //共多少条数据
-  pageSize:any; //每页条数
+  pageSize: any; //每页条数
-  pageSizeOptions: number[] = [10] //设置每页条数
+  pageSizeOptions: number[] = [10]; //设置每页条数
-  PageNumber:any //第几页
+  PageNumber: any; //第几页
 
   //获取表格信息
-  getAlltabledate(){
+  getAlltabledate() {
-    let paramsdata:any = {
+    let paramsdata: any = {
-      PaperId:this.getid,
+      PaperId: this.getid,
-      PageNumber: this.PageNumber || '1',
+      PageNumber: this.PageNumber || "1",
-      PageSize:  this.pageSizeOptions[0],
+      PageSize: this.pageSizeOptions[0],
       Sort: null,
       SortType: null,
-    }
+    };
-    this.http.get("/api/Examinations",{params:paramsdata}).subscribe((data:any)=>{
+    this.http
-      this.dataSource=data.items
+      .get("/api/Examinations", { params: paramsdata })
-      this.length=data.totalCount
+      .subscribe((data: any) => {
-    })
+        this.dataSource = data.items;
+        this.length = data.totalCount;
+      });
   }
 
   //分页事件
-  chagePage(e){
+  chagePage(e) {
-    this.PageNumber = e.pageIndex+1
+    this.PageNumber = e.pageIndex + 1;
-    this.getAlltabledate()
+    this.getAlltabledate();
   }
 
   //阅卷
-  reviewFiles (e) {
+  reviewFiles(e) {
-    window.open(`/reviewFiles?examId=${e.id}&paperType=1`)
+    window.open(`/reviewFiles?examId=${e.id}&paperType=1`);
   }
-
 }

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

@@ -17,24 +17,11 @@ export class ExamineeCapacityComponent implements OnInit {
     private tree: TreeService
   ) {}
 
-  ngOnInit(): void {
-    //获得登陆组织机构id
-    this.getProfiles().then((res) => {
-      //过滤得到正确的组织机构tree
-      this.getOrganizations();
-      this.getAlltabledate();
-    });
-  }
-  //获取登录账号的个人资料
   Profiles: any;
-  getProfiles() {
+  ngOnInit(): void {
-    return new Promise((resolve) => {
+    this.Profiles = JSON.parse(sessionStorage.getItem("creatorData"));
-      this.http.get("/api/ExamAccounts/Profiles").subscribe((data: any) => {
+    this.getOrganizations();
-        this.Profiles = data;
+    this.getAlltabledate();
-        sessionStorage.setItem("creatorData", JSON.stringify(data));
-        resolve(data);
-      });
-    });
   }
 
   //获得所有组织机构
@@ -43,12 +30,23 @@ export class ExamineeCapacityComponent implements OnInit {
   nodes = [];
   expandedKeys = [];
   getOrganizations() {
-    this.http.get("/api/Organizations").subscribe((data: any) => {
+    this.http
-      this.allorganizations = data;
+      .get("/api/Organizations", {
-      this.treedata = this.tree.toTree(data);
+        params: {
-      this.orId = this.Profiles.organizationId;
+          strict: "true",
-      this.getpresentOrganization();
+        },
-    });
+      })
+      .subscribe((data: any) => {
+        this.allorganizations = data;
+        this.allorganizations.forEach((element) => {
+          if (element.id === this.Profiles.organizationId) {
+            element.parentId = null;
+          }
+        });
+        this.treedata = this.tree.toTree(data);
+        this.orId = this.Profiles.organizationId;
+        this.getpresentOrganization();
+      });
   }
   //得到当前单位所在组织机构的tree型数据
   organizationName;

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

@@ -16,6 +16,7 @@
             <div class="queryField">
                 <button style="background-color: #07CDCF;" (click)="Submit()">查询</button>
                 <button style="margin-left: 10px; background-color: #FF8678;" (click)="Reset()">重置</button>
+                <button style="margin-left: 10px; background-color: #07CDCF;" (click)="goback()">返回</button>
             </div>
         </div>
     </div>

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

@@ -32,7 +32,7 @@ table {
     justify-content: left;
 
     .queryField {
-      margin: 0 25px;
+      margin: 0 20px;
       font-size: 13px;
 
       label {
@@ -42,7 +42,7 @@ table {
 
       input {
         font-size: 13px;
-        width: 320px;
+        width:250px;
         height: 30px;
         line-height: 30px;
         border-radius: 3px;

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

@@ -19,26 +19,14 @@ export class ExamineePapersComponent implements OnInit {
   ) {}
 
   examineeId;
+  //获取登录账号的个人资料
+  Profiles: any;
   ngOnInit(): void {
+    this.Profiles = JSON.parse(sessionStorage.getItem("creatorData"));
     this.examineeId = this.route.snapshot.queryParams.examineeId;
-    //获得登陆组织机构id
+
-    // this.getProfiles().then((res) => {
-    //   //过滤得到正确的组织机构tree
-    //   this.getOrganizations();
-    // });
     this.getAlltabledate();
   }
-  //获取登录账号的个人资料
-  Profiles: any;
-  getProfiles() {
-    return new Promise((resolve) => {
-      this.http.get("/api/ExamAccounts/Profiles").subscribe((data: any) => {
-        this.Profiles = data;
-        sessionStorage.setItem("creatorData", JSON.stringify(data));
-        resolve(data);
-      });
-    });
-  }
 
   //获得所有组织机构
   allorganizations;
@@ -46,11 +34,22 @@ export class ExamineePapersComponent implements OnInit {
   nodes;
   expandedKeys = [];
   getOrganizations() {
-    this.http.get("/api/Organizations").subscribe((data: any) => {
+    this.http
-      this.allorganizations = data;
+      .get("/api/Organizations", {
-      this.treedata = this.tree.toTree(data);
+        params: {
-      this.getpresentOrganization();
+          strict: "true",
-    });
+        },
+      })
+      .subscribe((data: any) => {
+        this.allorganizations = data;
+        this.allorganizations.forEach((element) => {
+          if (element.id === this.Profiles.organizationId) {
+            element.parentId = null;
+          }
+        });
+        this.treedata = this.tree.toTree(data);
+        this.getpresentOrganization();
+      });
   }
   //得到当前单位所在组织机构的tree型数据
   organizationName;
@@ -125,7 +124,9 @@ export class ExamineePapersComponent implements OnInit {
     this.name = "";
     this.starttime = "";
     this.endtime = "";
-    // this.orIdChecked = true;
     this.getAlltabledate();
   }
+  goback() {
+    history.go(-1);
+  }
 }

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

@@ -17,12 +17,10 @@ export class StationExamineeComponent implements OnInit {
     public snackBar: MatSnackBar,
     private tree: TreeService
   ) {}
-  ngOnInit(): void {
+  loginUserInfo;
+  ngOnInit() {
+    this.loginUserInfo = JSON.parse(sessionStorage.getItem("creatorData"));
     this.orId = this.route.snapshot.queryParams.organizationId;
-    //获得登陆组织机构id
-    // this.getProfiles().then((res) => {
-    //过滤得到正确的组织机构tree
-    // });
     this.getOrganizations();
     this.getAlltabledate();
   }
@@ -44,39 +42,21 @@ export class StationExamineeComponent implements OnInit {
   nodes = [];
   expandedKeys = [];
   getOrganizations() {
-    this.http.get("/api/Organizations").subscribe((data: any) => {
+    this.http
-      this.allorganizations = data;
+      .get("/api/Organizations", {
-      this.treedata = this.tree.toTree(data);
+        params: {
-      // this.orId = this.organizationId;
+          strict: "true",
-      this.nodes = this.treedata;
+        },
-      // this.getpresentOrganization();
+      })
-    });
+      .subscribe((data: any) => {
-  }
+        this.allorganizations = data;
-  //得到当前单位所在组织机构的tree型数据
+        this.allorganizations.forEach((element) => {
-  organizationName;
+          if (element.id === this.loginUserInfo.organizationId) {
-  newallorganizations;
+            element.parentId = null;
-  getpresentOrganization() {
+          }
-    this.newallorganizations = this.allorganizations;
+        });
-    this.newallorganizations.forEach((item) => {
+        this.nodes = [...this.tree.toTree(data)];
-      item.children = [];
-      this.newallorganizations.forEach((element) => {
-        if (element.parentId == item.id) {
-          item.children.push(element);
-        }
-      });
-    });
-    this.organizationName = this.Profiles.organizationName;
-    if (this.organizationName) {
-      this.newallorganizations.forEach((item) => {
-        if (item.name == this.organizationName) {
-          this.nodes = [item];
-          this.expandedKeys = [item.key];
-        }
       });
-    } else {
-      this.nodes = this.tree.toTree(this.treedata);
-      this.expandedKeys = this.nodes[0].key;
-    }
   }
 
   //获取表格信息

src/app/http-interceptors/base-interceptor.ts

@@ -1,83 +1,92 @@
-import { Injectable } from '@angular/core';
+import { Injectable } from "@angular/core";
 import {
-  HttpClient, HttpEvent, HttpInterceptor, HttpHandler, HttpRequest,
+  HttpClient,
-  HttpErrorResponse
+  HttpEvent,
-} from '@angular/common/http';
+  HttpInterceptor,
-import { throwError } from 'rxjs'
+  HttpHandler,
-import { catchError, retry } from 'rxjs/operators';
+  HttpRequest,
-import { Router,ActivatedRoute } from '@angular/router'
+  HttpErrorResponse,
-import { CacheTokenService } from './cache-token.service'
+} from "@angular/common/http";
-import { IsLoginService } from '../is-login.service'
+import { throwError } from "rxjs";
-import { MatSnackBar, MatSnackBarConfig } from '@angular/material/snack-bar';
+import { catchError, retry } from "rxjs/operators";
+import { Router, ActivatedRoute } from "@angular/router";
+import { CacheTokenService } from "./cache-token.service";
+import { IsLoginService } from "../is-login.service";
+import { MatSnackBar, MatSnackBarConfig } from "@angular/material/snack-bar";
 
 //baseurl
 // const baseurl = 'http://39.106.78.171:8008';
 
 @Injectable()
 export class BaseInterceptor implements HttpInterceptor {
-
+  constructor(
-  constructor(private http:HttpClient,private router:Router,private route:ActivatedRoute,public token:CacheTokenService,public snackBar: MatSnackBar,public isLogin: IsLoginService) {}
+    private http: HttpClient,
+    private router: Router,
+    private route: ActivatedRoute,
+    public token: CacheTokenService,
+    public snackBar: MatSnackBar,
+    public isLogin: IsLoginService
+  ) {}
 
   intercept(req, next: HttpHandler) {
-
     let newReq = req.clone({
       url: req.hadBaseurl ? `${req.url}` : `${req.url}`,
     });
-    if(!req.cancelToken) {
+    if (!req.cancelToken) {
       /*获取token*/
-      let token = sessionStorage.getItem("token") || ''
+      let token = sessionStorage.getItem("token") || "";
       /*此处设置额外请求头，token令牌*/
-      newReq.headers =
+      newReq.headers = newReq.headers.set("Authorization", `Bearer ${token}`);
-      newReq.headers.set('Authorization', `Bearer ${token}`)
     }
 
     // 携带请求头发送下一次请求
-    return next.handle(newReq)
+    return next.handle(newReq).pipe(
-      .pipe(
+      //箭头函数,注意this指向
-        //箭头函数,注意this指向
+      catchError((err) => this.handleError(err))
-        catchError((err) => this.handleError(err))
+    );
-      )
   }
 
-  // 捕获错误  
+  // 捕获错误
   //401 token过期   403没权限!!!   400参数错误   404未找到   614刷新令牌过期!!!
 
   private handleError(error: HttpErrorResponse) {
     // 用户认证失败返回登录页
-    if (error.status === 401||error.status === 614) {
+    if (error.status === 401 || error.status === 614) {
-      sessionStorage.clear()
+      sessionStorage.clear();
-      localStorage.clear()
+      localStorage.clear();
-      this.router.navigate(['/login'])
+      this.router.navigate(["/login"]);
       const config = new MatSnackBarConfig();
-      config.verticalPosition = 'top';
+      config.verticalPosition = "top";
-      config.duration = 3000
+      config.duration = 3000;
-      this.snackBar.open('用户认证信息过期,请重新登录','确定',config);
+      this.snackBar.open("用户认证信息过期,请重新登录", "确定", config);
-    }
+    } else if (error.status === 403) {
-    if (error.status === 403) {
       const config = new MatSnackBarConfig();
-      config.verticalPosition = 'top';
+      config.verticalPosition = "top";
-      config.duration = 3000
+      config.duration = 3000;
-      this.snackBar.open('对不起,您无此权限','确定',config);
+      this.snackBar.open("对不起,您无此权限", "确定", config);
-    }
+    } else if (error.status === 400) {
-    if (error.status === 400) {
       const config = new MatSnackBarConfig();
-      config.verticalPosition = 'top';
+      config.verticalPosition = "top";
-      config.duration = 3000
+      config.duration = 3000;
-      this.snackBar.open('您输入的参数有误','确定',config);
+      this.snackBar.open("您输入的参数有误", "确定", config);
+    } else {
+      // console.log(error.error)
+      const config = new MatSnackBarConfig();
+      config.verticalPosition = "top";
+      config.duration = 3000;
+      this.snackBar.open(error.error, "确定", config);
     }
-
     if (error.error instanceof ErrorEvent) {
       // 发生客户端或网络错误。相应处理。
-      console.error('An error occurred:', error.error.message);
+      console.error("An error occurred:", error.error.message);
     } else {
       // 服务端返回http状态码
       // 服务端返回错误信息
       console.error(
-        `Backend returned code ${error.status}, ` +
+        `Backend returned code ${error.status}, ` + `body was: ${error.error}`
-        `body was: ${error.error}`);
+      );
     }
     // 返回带有面向用户的错误信息
-    return throwError(
+    return throwError(error.error);
-      error.error);
+  }
-  };
 }

src/app/navigation/navigation.component.html

@@ -45,6 +45,9 @@
         <li [routerLink]="['/home/examinee']" routerLinkActive="clickStyle">
           <label>考生管理</label>
         </li>
+        <li [routerLink]="['/home/admin']" routerLinkActive="clickStyle">
+          <label>管理员管理</label>
+        </li>
       </ul>
       <ul *ngIf="roleType == '2'">
         <li [routerLink]="['/home/student-index']" routerLinkActive="clickStyle">
@@ -53,6 +56,7 @@
         <li [routerLink]="['/home/student-exarecord']" routerLinkActive="clickStyle">
           <img src="../../assets/images/examrecord.png" style="background-color: #07CDCF;"> <label>考试记录</label>
         </li>
+
       </ul>
       <img style="width: 191px;height: 113px; position: absolute; bottom: 0;" src="../../assets/images/backbottom.png">
     </div>

src/app/navigation/navigation.component.ts

@@ -30,7 +30,6 @@ export class NavigationComponent implements OnInit {
 
   roleType = sessionStorage.getItem("roleType");
   ngOnInit() {
-    console.log(1, this.router);
     if (this.router.url.indexOf("createexam-index") !== -1) {
       this.selectedNav = "创建考试";
     }
@@ -41,7 +40,7 @@ export class NavigationComponent implements OnInit {
       this.selectedNav = "统计分析";
       if (this.router.url.indexOf("statistic-examination") !== -1) {
         this.selectedNav2 = "考试统计";
-      }else{
+      } else {
         this.selectedNav2 = "能力分析";
       }
     }

src/app/pages/lockscreen/lockscreen.component.ts

@@ -1,62 +1,69 @@
-import { Component, OnInit } from '@angular/core';
+import { Component, OnInit } from "@angular/core";
-import { Router,ActivatedRoute } from '@angular/router'
+import { Router, ActivatedRoute } from "@angular/router";
-import { MatSnackBarConfig, MatSnackBar } from '@angular/material/snack-bar';
+import { MatSnackBarConfig, MatSnackBar } from "@angular/material/snack-bar";
-import { HttpClient } from '@angular/common/http';
+import { HttpClient } from "@angular/common/http";
-import { IsLoginService } from '../../is-login.service'//引入服务
+import { IsLoginService } from "../../is-login.service"; //引入服务
-import {CacheTokenService} from '../../http-interceptors/cache-token.service'//引入服务
+import { CacheTokenService } from "../../http-interceptors/cache-token.service"; //引入服务
-
-
 
 @Component({
-  selector: 'app-lockscreen',
+  selector: "app-lockscreen",
-  templateUrl: './lockscreen.component.html',
+  templateUrl: "./lockscreen.component.html",
-  styleUrls: ['./lockscreen.component.scss']
+  styleUrls: ["./lockscreen.component.scss"],
 })
 export class LockscreenComponent implements OnInit {
+  constructor(
+    private http: HttpClient,
+    private router: Router,
+    private route: ActivatedRoute,
+    public token: CacheTokenService,
+    public snackBar: MatSnackBar,
+    private isLogin: IsLoginService
+  ) {}
 
-  constructor(private http:HttpClient,private router:Router,private route:ActivatedRoute,public token:CacheTokenService,public snackBar: MatSnackBar,private isLogin:IsLoginService) { }
+  ngOnInit() {}
-
-  ngOnInit() {
-
-  }
-
-  roleType:string = '1'; //登录角色
-  errmsg :string = ''; //错误信息
-
 
+  roleType: string = "1"; //登录角色
+  errmsg: string = ""; //错误信息
 
   //登录
-  onSubmit(e){
+  onSubmit(e) {
-    let params = { roleType: this.roleType }
+    let params = { roleType: this.roleType };
-    this.http.post('/api/ExamAccounts/SignIn',e,{params}).subscribe((data:any)=>{
+    this.http.post("/api/ExamAccounts/SignIn", e, { params }).subscribe(
-      sessionStorage.setItem("realName",data.realName);
+      (data: any) => {
-      sessionStorage.setItem("roleType",data.roleType);
+        sessionStorage.setItem("realName", data.realName);
-      sessionStorage.setItem("token",data.token);
+        sessionStorage.setItem("roleType", data.roleType);
-      sessionStorage.setItem("refreshToken",data.refreshToken);
+        sessionStorage.setItem("token", data.token);
-      sessionStorage.setItem("level",data.level);
+        sessionStorage.setItem("refreshToken", data.refreshToken);
-      this.token.startUp(); //登陆成功启动定时器刷新token
+        sessionStorage.setItem("level", data.level);
-      this.roleType == '1'? this.router.navigate(['/home/createexam-index']) : this.router.navigate(['/home/student-index'])
+        this.http.get("/api/ExamAccounts/Profiles").subscribe((v: any) => {
-    },(err) => {this.errmsg = err})
+          this.token.startUp(); //登陆成功启动定时器刷新token
+          this.roleType == "1"
+            ? this.router.navigate(["/home/createexam-index"])
+            : this.router.navigate(["/home/student-index"]);
+          sessionStorage.setItem("creatorData", JSON.stringify(v));
+        });
+      },
+      (err) => {
+        this.errmsg = err;
+      }
+    );
   }
 
   //切换登录角色
-  toggle (e) {
+  toggle(e) {
-    this.roleType = e
+    this.roleType = e;
   }
 
   //跳转管理员登录页面
-  toAdminLogin () {
+  toAdminLogin() {
-    this.router.navigate(['/adminLogin']) //跳转管理员登录页面
+    this.router.navigate(["/adminLogin"]); //跳转管理员登录页面
   }
 
   //忘记密码弹窗
-  forget () {
+  forget() {
     const config = new MatSnackBarConfig();
-    config.verticalPosition = 'top';
+    config.verticalPosition = "top";
-    config.duration = 3000
+    config.duration = 3000;
-    this.snackBar.open('请联系管理员重置密码','确定',config);
+    this.snackBar.open("请联系管理员重置密码", "确定", config);
   }
-
-
-
 }

src/app/pages/login/login.component.ts

@@ -34,8 +34,11 @@ export class LoginComponent implements OnInit {
         sessionStorage.setItem("token", data.token);
         sessionStorage.setItem("refreshToken", data.refreshToken);
         sessionStorage.setItem("level", data.level);
-        this.token.startUp(); //登陆成功启动定时器刷新token
+        this.http.get("/api/ExamAccounts/Profiles").subscribe((v: any) => {
-        this.router.navigate(["/home/teachear"]); //登陆成功跳转页面
+          this.token.startUp(); //登陆成功启动定时器刷新token
+          this.router.navigate(["/home/teachear"]); //登陆成功跳转页面
+          sessionStorage.setItem("creatorData", JSON.stringify(v));
+        });
       },
       (err) => {
         this.errmsg = err;

src/app/student/student-exam-record/student-exam-record.component.ts

@@ -1,72 +1,86 @@
 /*
- * @Descripttion: 
+ * @Descripttion:
- * @version: 
+ * @version:
  * @Author: sueRimn
  * @Date: 2020-12-20 16:26:44
  * @LastEditors: sueRimn
  * @LastEditTime: 2020-12-23 10:33:24
  */
-import { Component, OnInit, ViewChild, Inject,Input  } from '@angular/core';
+import { Component, OnInit, ViewChild, Inject, Input } from "@angular/core";
-import {HttpClient} from '@angular/common/http'
+import { HttpClient } from "@angular/common/http";
-import { MatDialogRef, MatDialog, MAT_DIALOG_DATA } from '@angular/material/dialog';
+import {
-import { MatPaginator } from '@angular/material/paginator';
+  MatDialogRef,
-import { MatTableDataSource } from '@angular/material/table';
+  MatDialog,
-import { PageEvent } from '@angular/material/paginator';
+  MAT_DIALOG_DATA,
-import { MatSnackBar, MatSnackBarConfig } from '@angular/material/snack-bar';
+} from "@angular/material/dialog";
-import {FormControl} from '@angular/forms';
+import { MatPaginator } from "@angular/material/paginator";
-import { Router,ActivatedRoute } from '@angular/router';
+import { MatTableDataSource } from "@angular/material/table";
-import { MatTreeFlatDataSource, MatTreeFlattener } from '@angular/material/tree';
+import { PageEvent } from "@angular/material/paginator";
-import { FlatTreeControl } from '@angular/cdk/tree';
+import { MatSnackBar, MatSnackBarConfig } from "@angular/material/snack-bar";
-import { TreeService } from '../../http-interceptors/tree.service'
+import { FormControl } from "@angular/forms";
+import { Router, ActivatedRoute } from "@angular/router";
+import {
+  MatTreeFlatDataSource,
+  MatTreeFlattener,
+} from "@angular/material/tree";
+import { FlatTreeControl } from "@angular/cdk/tree";
+import { TreeService } from "../../http-interceptors/tree.service";
 
 @Component({
-  selector: 'app-student-exam-record',
+  selector: "app-student-exam-record",
-  templateUrl: './student-exam-record.component.html',
+  templateUrl: "./student-exam-record.component.html",
-  styleUrls: ['./student-exam-record.component.scss']
+  styleUrls: ["./student-exam-record.component.scss"],
 })
 export class StudentExamRecordComponent implements OnInit {
-
+  constructor(
-  constructor(private router: Router,private activatedRoute: ActivatedRoute,public http: HttpClient,public dialog: MatDialog,public snackBar: MatSnackBar,private tree: TreeService) { }
+    private router: Router,
+    private activatedRoute: ActivatedRoute,
+    public http: HttpClient,
+    public dialog: MatDialog,
+    public snackBar: MatSnackBar,
+    private tree: TreeService
+  ) {}
 
   ngOnInit(): void {
-    this.getAlltabledate()
+    this.getAlltabledate();
   }
 
   //分页
-  @ViewChild(MatPaginator, {static: true}) 
+  @ViewChild(MatPaginator, { static: true })
   pageEvent: PageEvent;
   paginator: MatPaginator;
-  length:any; //共多少条数据
+  length: any; //共多少条数据
-  pageSize:any; //每页条数
+  pageSize: any; //每页条数
-  pageSizeOptions: number[] = [10] //设置每页条数
+  pageSizeOptions: number[] = [10]; //设置每页条数
-  PageNumber:any //第几页
+  PageNumber: any; //第几页
-  startTime:[]
+  startTime: [];
-  endTime:[]
+  endTime: [];
-  tabledataSource//表格数据
+  tabledataSource; //表格数据
 
   //分页事件
-  chagePage(e){
+  chagePage(e) {
-    this.PageNumber = e.pageIndex+1
+    this.PageNumber = e.pageIndex + 1;
-    this.getAlltabledate()
+    this.getAlltabledate();
   }
 
   //获取表格信息
-  getAlltabledate(){
+  getAlltabledate() {
-    let paramsdata:any = {
+    let paramsdata: any = {
-      PageNumber: this.PageNumber || '1',
+      PageNumber: this.PageNumber || "1",
-      PageSize:  this.pageSizeOptions[0],
+      PageSize: this.pageSizeOptions[0],
       Sort: null,
-      SortType: null
+      SortType: null,
-    }
+    };
-    this.http.get("/api/Examinations",{params:paramsdata}).subscribe((data:any)=>{
+    this.http
-      this.tabledataSource=data.items
+      .get("/api/Examinations", { params: paramsdata })
-      this.length=data.totalCount
+      .subscribe((data: any) => {
-    })
+        this.tabledataSource = data.items;
+        this.length = data.totalCount;
+      });
   }
 
   //查看试卷
-  seePaper (e) {
+  seePaper(e) {
-    window.open(`/reviewFiles?examId=${e.id}&paperType=2`)
+    window.open(`/reviewFiles?examId=${e.id}&paperType=2`);
   }
-
 }

src/app/student/student-index/student-index.component.ts

@@ -1,121 +1,136 @@
 /*
- * @Descripttion: 
+ * @Descripttion:
- * @version: 
+ * @version:
  * @Author: sueRimn
  * @Date: 2020-12-20 15:01:30
  * @LastEditors: sueRimn
  * @LastEditTime: 2020-12-24 10:49:54
  */
-import { Component, OnInit, ViewChild, Inject, Input } from '@angular/core';
+import { Component, OnInit, ViewChild, Inject, Input } from "@angular/core";
-import { HttpClient } from '@angular/common/http'
+import { HttpClient } from "@angular/common/http";
-import { MatDialogRef, MatDialog, MAT_DIALOG_DATA } from '@angular/material/dialog';
+import {
-import { MatPaginator } from '@angular/material/paginator';
+  MatDialogRef,
-import { MatTableDataSource } from '@angular/material/table';
+  MatDialog,
-import { PageEvent } from '@angular/material/paginator';
+  MAT_DIALOG_DATA,
-import { MatSnackBar, MatSnackBarConfig } from '@angular/material/snack-bar';
+} from "@angular/material/dialog";
-import { FormControl } from '@angular/forms';
+import { MatPaginator } from "@angular/material/paginator";
-import { Router, ActivatedRoute } from '@angular/router';
+import { MatTableDataSource } from "@angular/material/table";
-import { MatTreeFlatDataSource, MatTreeFlattener } from '@angular/material/tree';
+import { PageEvent } from "@angular/material/paginator";
-import { FlatTreeControl } from '@angular/cdk/tree';
+import { MatSnackBar, MatSnackBarConfig } from "@angular/material/snack-bar";
-import { TreeService } from '../../http-interceptors/tree.service'
+import { FormControl } from "@angular/forms";
+import { Router, ActivatedRoute } from "@angular/router";
+import {
+  MatTreeFlatDataSource,
+  MatTreeFlattener,
+} from "@angular/material/tree";
+import { FlatTreeControl } from "@angular/cdk/tree";
+import { TreeService } from "../../http-interceptors/tree.service";
 
 @Component({
-  selector: 'app-student-index',
+  selector: "app-student-index",
-  templateUrl: './student-index.component.html',
+  templateUrl: "./student-index.component.html",
-  styleUrls: ['./student-index.component.scss']
+  styleUrls: ["./student-index.component.scss"],
 })
 export class StudentIndexComponent implements OnInit {
-
+  constructor(
-  constructor(private router: Router, private activatedRoute: ActivatedRoute, public http: HttpClient, public dialog: MatDialog, public snackBar: MatSnackBar, private tree: TreeService) { }
+    private router: Router,
+    private activatedRoute: ActivatedRoute,
+    public http: HttpClient,
+    public dialog: MatDialog,
+    public snackBar: MatSnackBar,
+    private tree: TreeService
+  ) {}
 
   ngOnInit(): void {
-    this.getAlltabledate()
+    this.getAlltabledate();
-    this.tableInterval = setInterval(() => this.getAlltabledate(), 60000)
+    this.tableInterval = setInterval(() => this.getAlltabledate(), 60000);
     //this.gettime("2020-12-22T18:40:00+08:00","2020-12-22T18:39:00+08:00")
     //this.idtime=setInterval(()=>this.newjsq(),1000)
     //this.newjsq()
   }
   ngOnDestroy() {
-    clearInterval(this.idtime)
+    clearInterval(this.idtime);
-    clearInterval(this.tableInterval)
+    clearInterval(this.tableInterval);
   }
 
-  idtime
+  idtime;
-  tableInterval
+  tableInterval;
 
   //分页
   @ViewChild(MatPaginator, { static: true })
   pageEvent: PageEvent;
   paginator: MatPaginator;
   length: any; //共多少条数据
-  pageSize: any; //每页条数
+  pageSize: any = 10; //每页条数
-  pageSizeOptions: number[] = [10] //设置每页条数
+  pageSizeOptions: number[] = [10]; //设置每页条数
-  PageNumber: any //第几页
+  PageNumber: any; //第几页
-  startTime: []
+  startTime: [];
-  endTime: []
+  endTime: [];
-  tabledataSource//表格数据
+  tabledataSource; //表格数据
-  timecha
+  timecha;
 
   //分页事件
   chagePage(e) {
-    this.PageNumber = e.pageIndex + 1
+    this.PageNumber = e.pageIndex + 1;
-    this.getAlltabledate()
+    this.getAlltabledate();
   }
 
   //获取表格信息
   getAlltabledate() {
     let paramsdata: any = {
-      PageNumber: this.PageNumber || '1',
+      PageNumber: this.PageNumber || "1",
-      PageSize: this.pageSizeOptions[0],
+      PageSize: this.pageSize,
       Sort: null,
       SortType: null,
-      Status: 1
+      Status: 1,
-    }
+    };
-    this.http.get("/api/Papers", { params: paramsdata }).subscribe((data: any) => {
+    this.http
-      this.tabledataSource = data.items
+      .get("/api/Papers", { params: paramsdata })
-      this.length = data.totalCount
+      .subscribe((data: any) => {
-      //console.log(this.tabledataSource)
+        this.tabledataSource = data.items;
-    })
+        this.length = data.totalCount;
+        //console.log(this.tabledataSource)
+      });
   }
   //计时器
   jishi(startTime, endTime) {
     //startTime=new Date
-    var nowtime = new Date(startTime),  //获取开始时间
+    var nowtime = new Date(startTime), //获取开始时间
-      endtime = new Date(endTime);  //定义结束时间
+      endtime = new Date(endTime); //定义结束时间
-    var jieshu = nowtime.getTime()
+    var jieshu = nowtime.getTime();
-    setInterval(() => { jieshu-- })
+    setInterval(() => {
+      jieshu--;
+    });
     //console.log(endtime.getSeconds()-1)
-    var lefttime = jieshu - nowtime.getTime(),  //距离结束时间的毫秒数
+    var lefttime = jieshu - nowtime.getTime(), //距离结束时间的毫秒数
-      leftd = Math.floor(lefttime / (1000 * 60 * 60 * 24)),  //计算天数
+      leftd = Math.floor(lefttime / (1000 * 60 * 60 * 24)), //计算天数
-      lefth = Math.floor(lefttime / (1000 * 60 * 60)),  //计算小时数
+      lefth = Math.floor(lefttime / (1000 * 60 * 60)), //计算小时数
-      leftm = Math.floor(lefttime / (1000 * 60) % 60),  //计算分钟数
+      leftm = Math.floor((lefttime / (1000 * 60)) % 60), //计算分钟数
-      lefts = Math.floor(lefttime / 1000 % 60);  //计算秒数
+      lefts = Math.floor((lefttime / 1000) % 60); //计算秒数
-    this.timecha = lefth + ":" + leftm + ":" + lefts
+    this.timecha = lefth + ":" + leftm + ":" + lefts;
 
-    if (this.timecha == '0:0:0') {
+    if (this.timecha == "0:0:0") {
-      this.timecha = "已结束"
+      this.timecha = "已结束";
-      clearInterval(this.idtime)
+      clearInterval(this.idtime);
     }
-    console.log(this.timecha)
+    console.log(this.timecha);
   }
 
-
-
   timerID;
   //time_end=new Date("2020-12-22T18:40:00+08:00").getTime();//结束的时间
-  time_end
+  time_end;
   //time_now_server=new Date("2020-12-22T18:30:00+08:00").getTime();//开始的时间
-  time_now_server
+  time_now_server;
   time_now_client = new Date().getTime();
   //time_server_client=this.time_now_server-this.time_now_client;
-  time_server_client
+  time_server_client;
-  str_time = ""
+  str_time = "";
 
   gettime(endtime, stearttime) {
-    this.time_end = new Date(endtime).getTime()
+    this.time_end = new Date(endtime).getTime();
-    this.time_now_server = new Date(stearttime).getTime()
+    this.time_now_server = new Date(stearttime).getTime();
-    this.time_server_client = this.time_now_server - this.time_now_client
+    this.time_server_client = this.time_now_server - this.time_now_client;
-    this.idtime = setInterval(() => this.newtimer(), 1000)
+    this.idtime = setInterval(() => this.newtimer(), 1000);
   }
   //新计时器
   newtimer() {
@@ -125,25 +140,24 @@ export class StudentIndexComponent implements OnInit {
     time_now = time_now + this.time_server_client;
     time_distance = this.time_end - time_now;
     if (time_distance > 0) {
-      int_day = Math.floor(time_distance / 86400000)
+      int_day = Math.floor(time_distance / 86400000);
       time_distance -= int_day * 86400000;
-      int_hour = Math.floor(time_distance / 3600000)
+      int_hour = Math.floor(time_distance / 3600000);
       time_distance -= int_hour * 3600000;
-      int_minute = Math.floor(time_distance / 60000)
+      int_minute = Math.floor(time_distance / 60000);
       time_distance -= int_minute * 60000;
-      int_second = Math.floor(time_distance / 1000)
+      int_second = Math.floor(time_distance / 1000);
-      if (int_hour < 10)
+      if (int_hour < 10) int_hour = "0" + int_hour;
-        int_hour = "0" + int_hour;
+      if (int_minute < 10) int_minute = "0" + int_minute;
-      if (int_minute < 10)
+      if (int_second < 10) int_second = "0" + int_second;
-        int_minute = "0" + int_minute;
-      if (int_second < 10)
-        int_second = "0" + int_second;
       this.str_time = int_hour + ":" + int_minute + ":" + int_second;
-      if (this.str_time == "00:00:00") { this.str_time = "已结束" }
+      if (this.str_time == "00:00:00") {
+        this.str_time = "已结束";
+      }
       //console.log(this.str_time)
     } else {
       //timer=timer;
-      clearTimeout(this.timerID)
+      clearTimeout(this.timerID);
     }
   }
 
@@ -153,14 +167,17 @@ export class StudentIndexComponent implements OnInit {
     let body = {
       name: e.title,
       paperId: e.id,
-    }
+    };
-    this.http.post('/api/Examinations', body).subscribe((data: any) => {
+    this.http.post("/api/Examinations", body).subscribe(
-      window.open(`/examinationDetails?paperId=${e.id}&examId=${data.id}`)
+      (data: any) => {
-    }, err => {
+        window.open(`/examinationDetails?paperId=${e.id}&examId=${data.id}`);
-      const config = new MatSnackBarConfig();
+      },
-      config.verticalPosition = 'top';
+      (err) => {
-      config.duration = 3000
+        const config = new MatSnackBarConfig();
-      this.snackBar.open(err, '确定', config);
+        config.verticalPosition = "top";
-    })
+        config.duration = 3000;
+        this.snackBar.open(err, "确定", config);
+      }
+    );
   }
 }

src/app/ui/administrators/add-edit-admin/add-edit-admin.component.html

@@ -0,0 +1,46 @@
+<h2 mat-dialog-title>新增/编辑管理员</h2>
+
+<form (ngSubmit)="onSubmit(form.value)" #form="ngForm" class="example-container">
+
+    <div>
+        <mat-form-field>
+            <input matInput name="name" [(ngModel)]="name" required placeholder="登录账号" autocomplete="off">
+        </mat-form-field>
+    </div>
+
+    <div>
+        <mat-form-field>
+            <input matInput name="realName" [(ngModel)]="realName" required placeholder="用户姓名" autocomplete="off">
+        </mat-form-field>
+    </div>
+
+    <div style="margin-bottom: 10px;">
+        <p style="font-size: 14px;">消防救援站: <label style="margin-left: 10px;">{{organizationName}}</label></p>
+    </div>
+
+    <div class="treeDiv">
+        <mat-tree [dataSource]="dataSource" [treeControl]="treeControl">
+            <mat-tree-node *matTreeNodeDef="let node" matTreeNodePadding (click)='selectTree(node)'>
+                <button type="button" mat-icon-button disabled></button>
+                <li>{{node.name}}</li>
+            </mat-tree-node>
+            <mat-tree-node *matTreeNodeDef="let node;when: hasChild" matTreeNodePadding (click)='selectTree(node)'>
+                <button type="button" mat-icon-button matTreeNodeToggle [attr.aria-label]="'toggle ' + node.name">
+                    <mat-icon mat-icon class="mat-icon-rtl-mirror">{{treeControl.isExpanded(node) ? 'expand_more' :
+                        'chevron_right'}}</mat-icon>
+                </button>
+                <li>{{node.name}}</li>
+            </mat-tree-node>
+        </mat-tree>
+    </div>
+
+    <div mat-dialog-content *ngIf="errmsg">
+        <p style="font-size: 14px; color: red;">{{errmsg}}</p>
+    </div>
+
+    <div mat-dialog-actions>
+        <button mat-raised-button color="primary" type="submit" [disabled]="!form.form.valid">确定</button>
+        <button mat-raised-button mat-dialog-close>取消</button>
+    </div>
+
+</form>

src/app/ui/administrators/add-edit-admin/add-edit-admin.component.spec.ts

@@ -0,0 +1,25 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { AddEditAdminComponent } from './add-edit-admin.component';
+
+describe('AddEditAdminComponent', () => {
+  let component: AddEditAdminComponent;
+  let fixture: ComponentFixture<AddEditAdminComponent>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [ AddEditAdminComponent ]
+    })
+    .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(AddEditAdminComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});

src/app/ui/administrators/add-edit-admin/add-edit-admin.component.ts

@@ -0,0 +1,110 @@
+import { HttpClient } from "@angular/common/http";
+import { Component, OnInit, Inject } from "@angular/core";
+import { MAT_DIALOG_DATA, MatDialogRef } from "@angular/material/dialog";
+import { MatSnackBar, MatSnackBarConfig } from "@angular/material/snack-bar";
+import {
+  MatTreeFlatDataSource,
+  MatTreeFlattener,
+} from "@angular/material/tree";
+import { FlatTreeControl } from "@angular/cdk/tree";
+@Component({
+  selector: "app-add-edit-admin",
+  templateUrl: "./add-edit-admin.component.html",
+  styleUrls: ["./add-edit-admin.component.scss"],
+})
+export class AddEditAdminComponent implements OnInit {
+  constructor(
+    private http: HttpClient,
+    public dialogRef: MatDialogRef<AddEditAdminComponent>,
+    @Inject(MAT_DIALOG_DATA) public data,
+    public snackBar: MatSnackBar
+  ) {}
+
+  ngOnInit(): void {
+    this.dataSource.data = this.data.treeData;
+    if (this.data.userData) {
+      this.name = JSON.parse(JSON.stringify(this.data.userData.name));
+      this.realName = JSON.parse(JSON.stringify(this.data.userData.realName));
+      this.organizationId = JSON.parse(
+        JSON.stringify(this.data.userData.organizationId)
+      );
+      this.organizationName = JSON.parse(
+        JSON.stringify(this.data.userData.organizationName)
+      );
+    }
+  }
+
+  errmsg: string = null; //捕获错误信息
+
+  name: string = null;
+  realName: string = null;
+  organizationId: string = null;
+  organizationName: string = null;
+
+  private _transformer = (node, level: number) => {
+    //初始化tree
+    return {
+      expandable: !!node.children && node.children.length > 0,
+      name: node.name,
+      level: level,
+      id: node.id,
+      parentId: node.parentId,
+      children: node.children,
+    };
+  };
+  treeControl = new FlatTreeControl<any>(
+    (node) => node.level,
+    (node) => node.expandable
+  );
+  treeFlattener = new MatTreeFlattener(
+    this._transformer,
+    (node) => node.level,
+    (node) => node.expandable,
+    (node) => node.children
+  );
+  dataSource = new MatTreeFlatDataSource(this.treeControl, this.treeFlattener);
+  hasChild = (_: number, node: any) => node.expandable;
+
+  //选择tree节点
+  selectTree(e) {
+    this.organizationId = e.id;
+    this.organizationName = e.name;
+  }
+
+  //提交创建表单
+  onSubmit(e) {
+    if (this.organizationId && this.organizationName) {
+      if (this.data.userData) {
+        e.phone = this.data.userData.phone;
+        e.identityCard = this.data.userData.identityCard;
+        e.roleType = 0;
+        e.id = this.data.userData.id;
+        e.enabled = this.data.userData.enabled;
+        e.creationTime = new Date();
+        e.organizationId = this.organizationId;
+        e.organizationName = this.organizationName;
+        this.http
+          .put(`/api/ExamUsers/${this.data.userData.id}`, e)
+          .subscribe((data) => {
+            this.dialogRef.close("success");
+          });
+      } else {
+        e.phone = '13864512542';
+        e.identityCard = '370304199809261911';
+        e.roleType = 0;
+        e.enabled = true;
+        e.creationTime = new Date();
+        e.organizationId = this.organizationId;
+        e.organizationName = this.organizationName;
+        this.http.post(`/api/ExamUsers`, e).subscribe((data) => {
+          this.dialogRef.close("success");
+        });
+      }
+    } else {
+      const config = new MatSnackBarConfig();
+      config.verticalPosition = "top";
+      config.duration = 3000;
+      this.snackBar.open("请选择消防救援站", "确定", config);
+    }
+  }
+}

src/app/ui/administrators/administrators.component.html

@@ -0,0 +1,73 @@
+<div class="content">
+    <div class="header">
+        <form #form="ngForm">
+            <div class="queryBox">
+                <div class="queryField">
+                    <label style="margin-right: 10px;">用户账号:</label>
+                    <input type="text" [(ngModel)]="identityCard" name="identityCard" autocomplete="off"
+                        placeholder="请输入用户账号">
+                </div>
+                <div class="queryField">
+                    <label style="margin-right: 10px;">用户姓名:</label>
+                    <input type="text" [(ngModel)]="name" name="name" autocomplete="off" placeholder="请输入用户姓名">
+                </div>
+                <div class="queryField" style="position: relative;">
+                    <label style="margin-right: 10px;">消防救援站:</label>
+                    <nz-tree-select [nzDropdownClassName]="'maxHeightTreeSelect'" style="width: 180px" [nzNodes]="nodes"
+                        nzShowSearch nzPlaceHolder="请选择救援站" name="orTree" [(ngModel)]="organizationId"
+                        [nzAllowClear]="false">
+                    </nz-tree-select>
+                </div>
+                <div class="queryField">
+                    <button mat-raised-button (click)='getAllUsers()' style="background-color: #07CDCF;">查询</button>
+                    <button mat-raised-button (click)='empty()'
+                        style="margin-left: 10px; background-color: #FF8678;">重置</button>
+                </div>
+                <div class="queryField">
+                    <button mat-raised-button (click)='open()' style="background-color: #07CDCF;">新增管理员</button>
+                </div>
+            </div>
+        </form>
+    </div>
+
+    <table mat-table [dataSource]="dataSource">
+        <ng-container matColumnDef="identitycard">
+            <th mat-header-cell *matHeaderCellDef>用户帐号</th>
+            <td mat-cell *matCellDef="let element">{{element.name}}</td>
+        </ng-container>
+
+        <ng-container matColumnDef="name">
+            <th mat-header-cell *matHeaderCellDef>用户姓名</th>
+            <td mat-cell *matCellDef="let element">{{element.realName}}</td>
+        </ng-container>
+
+        <ng-container matColumnDef="post">
+            <th mat-header-cell *matHeaderCellDef>消防救援站</th>
+            <td mat-cell *matCellDef="let element">{{element.organizationName}}</td>
+        </ng-container>
+
+        <ng-container matColumnDef="time">
+            <th mat-header-cell *matHeaderCellDef>创建时间</th>
+            <td mat-cell *matCellDef="let element">{{element.creationTime | date:'yyyy-MM-dd'}}</td>
+        </ng-container>
+
+        <ng-container matColumnDef="operation">
+            <th mat-header-cell *matHeaderCellDef>操作</th>
+            <td mat-cell *matCellDef="let element">
+                <span class="operationSpan"><span class="spanbtn green" (click)="reset(element)">重置密码</span></span>
+                <span class="operationSpan"><span class="spanbtn green" (click)="edit(element)">编辑</span></span>
+                <span *ngIf="element.enabled" class="operationSpan"><span class="spanbtn red"
+                        (click)="noEnabled(element)">禁用</span></span>
+                <span *ngIf="!element.enabled" class="operationSpan"><span class="spanbtn gray"
+                        (click)="enabled(element)">启用</span></span>
+                <span class="operationSpan"><span class="spanbtn red" (click)="delete(element)">删除</span></span>
+            </td>
+        </ng-container>
+
+        <tr mat-header-row *matHeaderRowDef="displayedColumns"></tr>
+        <tr mat-row *matRowDef="let row; columns: displayedColumns;"></tr>
+    </table>
+    <mat-paginator [length]="length" [pageSize]="pageSize" (page)="chagePage($event)">
+    </mat-paginator>
+
+</div>

src/app/ui/administrators/administrators.component.scss

@@ -0,0 +1,115 @@
+table {
+  width: 100%;
+  text-align: center;
+
+  .cdk-header-cell {
+    text-align: center;
+  }
+}
+
+.content {
+  width: 100%;
+  height: 100%;
+  overflow: hidden;
+  background: #F2F5F6;
+}
+
+.header {
+  width: 100%;
+  padding: 10px;
+  margin-bottom: 10px;
+  box-sizing: border-box;
+
+  .queryBox {
+    box-sizing: border-box;
+    padding: 5px 15px;
+    display: flex;
+    flex-direction: row;
+    flex-wrap: wrap;
+    align-items: center;
+    justify-content: center;
+
+    .queryField {
+      margin: 0 25px;
+      font-size: 14px;
+
+      input {
+        width: 160px;
+        height: 30px;
+        line-height: 30px;
+        border-radius: 2px;
+        padding-left: 6px;
+        outline: none;
+        border: 1px solid rgb(226, 211, 211);
+      }
+
+      button {
+        color: #fff;
+      }
+    }
+  }
+
+  //queryBox
+}
+
+.operationSpan {
+  margin: 0 10px;
+
+  .spanbtn {
+    font-weight: 550;
+    cursor: pointer;
+  }
+
+  .green {
+    color: #04ced1;
+  }
+
+  .red {
+    color: #FF8678
+  }
+
+  .gray {
+    color: gray;
+  }
+}
+
+//tree
+.treeDiv {
+  max-height: 300px;
+  overflow-y: auto;
+
+  .mat-icon-button {
+    width: 20px;
+    height: 20px;
+    line-height: 20px;
+  }
+
+  li {
+    cursor: pointer;
+  }
+
+  .mat-tree-node:hover {
+    background-color: rgb(240, 236, 236);
+  }
+}
+
+.closeTree {
+  cursor: pointer;
+  position: absolute;
+  top: 40px;
+  right: -95px;
+  z-index: 100;
+}
+
+.searchTree {
+  .mat-tree-node button .mat-icon {
+    color: #000;
+  }
+
+  border: 1px solid rgb(207, 204, 204);
+  width: 350px;
+  max-height: 150px;
+  position: absolute;
+  top: 40px;
+  left: 0;
+}

src/app/ui/administrators/administrators.component.spec.ts

@@ -0,0 +1,25 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { AdministratorsComponent } from './administrators.component';
+
+describe('AdministratorsComponent', () => {
+  let component: AdministratorsComponent;
+  let fixture: ComponentFixture<AdministratorsComponent>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [ AdministratorsComponent ]
+    })
+    .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(AdministratorsComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});

src/app/ui/administrators/administrators.component.ts

@@ -0,0 +1,200 @@
+import { Component, OnInit, ViewChild, Inject } from "@angular/core";
+import { HttpClient } from "@angular/common/http";
+import {
+  MatDialogRef,
+  MatDialog,
+  MAT_DIALOG_DATA,
+} from "@angular/material/dialog";
+import { MatPaginator } from "@angular/material/paginator";
+import { MatTableDataSource } from "@angular/material/table";
+import { PageEvent } from "@angular/material/paginator";
+import { MatSnackBar, MatSnackBarConfig } from "@angular/material/snack-bar";
+import { FormControl } from "@angular/forms";
+import { FlatTreeControl } from "@angular/cdk/tree";
+import {
+  MatTreeFlatDataSource,
+  MatTreeFlattener,
+} from "@angular/material/tree";
+import { TreeService } from "src/app/http-interceptors/tree.service";
+import { AddEditAdminComponent } from "./add-edit-admin/add-edit-admin.component";
+
+@Component({
+  selector: "app-administrators",
+  templateUrl: "./administrators.component.html",
+  styleUrls: ["./administrators.component.scss"],
+})
+export class AdministratorsComponent implements OnInit {
+  constructor(
+    public http: HttpClient,
+    public dialog: MatDialog,
+    public snackBar: MatSnackBar,
+    public treeService: TreeService
+  ) {}
+
+  loginUserInfo;
+  ngOnInit() {
+    this.loginUserInfo = JSON.parse(sessionStorage.getItem("creatorData"));
+    this.getOrganizations();
+  }
+  name: any; //用户姓名
+  identityCard: any; //用户账号
+  organizationId;
+  allOrganizations: any; //所有组织机构
+  nodes = [];
+  //获取所有组织机构
+  getOrganizations() {
+    this.http
+      .get("/api/Organizations", {
+        params: {
+          strict: "true",
+        },
+      })
+      .subscribe((data: any) => {
+        this.allOrganizations = data;
+        this.allOrganizations.forEach((element) => {
+          if (element.id === this.loginUserInfo.organizationId) {
+            element.parentId = null;
+          }
+        });
+        this.nodes = [...this.treeService.toTree(this.allOrganizations)];
+        this.organizationId = this.loginUserInfo.organizationId;
+        this.getAllUsers();
+      });
+  }
+
+  displayedColumns: string[] = [
+    "identitycard",
+    "name",
+    "post",
+    "time",
+    "operation",
+  ];
+
+  dataSource: any; //所有企业用户表格数据
+  //更新当前页数据
+  pageNumber: number = 1; //第几页
+  pageSize: any = "10"; //每页条数
+  getAllUsers() {
+    let data = {
+      Name: this.identityCard || "",
+      RealName: this.name || "",
+      OrganizationId: this.organizationId || "",
+      RoleType: "0",
+      PageNumber: String(this.pageNumber),
+      PageSize: this.pageSize,
+    };
+    this.http.get("/api/ExamUsers", { params: data }).subscribe((data: any) => {
+      this.length = data.totalCount;
+      this.pageSize = data.pageSize;
+      this.dataSource = new MatTableDataSource<any>(data.items);
+    });
+  }
+  //分页
+  @ViewChild(MatPaginator, { static: true })
+  pageEvent: PageEvent;
+  paginator: MatPaginator;
+  length: any; //共多少条数据
+
+  //分页切换
+  chagePage(e) {
+    this.pageNumber = e.pageIndex + 1;
+    this.getAllUsers();
+  }
+
+  //清空搜索
+  empty() {
+    this.pageNumber = 1;
+    this.name = "";
+    this.identityCard = "";
+    this.organizationId = this.loginUserInfo.organizationId;
+    this.getAllUsers();
+  }
+
+  //创建教员
+  open() {
+    let data = { treeData: this.nodes, userData: null };
+    let dialogRef = this.dialog.open(AddEditAdminComponent, { data });
+    dialogRef.afterClosed().subscribe((data) => {
+      if (data) {
+        const config = new MatSnackBarConfig();
+        config.verticalPosition = "top";
+        config.duration = 3000;
+        this.snackBar.open("创建成功!", "确定", config);
+        this.getAllUsers();
+      }
+    });
+  }
+
+  //编辑企业用户
+  edit(e) {
+    let data = { treeData: this.nodes, userData: e };
+    let dialogRef = this.dialog.open(AddEditAdminComponent, { data });
+    dialogRef.afterClosed().subscribe((data) => {
+      if (data) {
+        const config = new MatSnackBarConfig();
+        config.verticalPosition = "top";
+        config.duration = 3000;
+        this.snackBar.open("修改成功!", "确定", config);
+        this.getAllUsers();
+      }
+    });
+  }
+
+  //重置密码
+  reset(e) {
+    this.http.put(`/api/ExamUsers/${e.id}/ResetPassword`, {}).subscribe(
+      (data) => {
+        const config = new MatSnackBarConfig();
+        config.verticalPosition = "top";
+        config.duration = 3000;
+        this.snackBar.open("重置密码成功!", "确定", config);
+      },
+      (err) => {
+        const config = new MatSnackBarConfig();
+        config.verticalPosition = "top";
+        config.duration = 3000;
+        this.snackBar.open("重置密码失败!", "确定", config);
+      }
+    );
+  }
+
+  //启用
+  enabled(e) {
+    e.date = new Date();
+    e.enabled = true;
+    this.http.put(`/api/ExamUsers/${e.id}`, e).subscribe((data) => {
+      const config = new MatSnackBarConfig();
+      config.verticalPosition = "top";
+      config.duration = 3000;
+      this.snackBar.open("启用成功!", "确定", config);
+      this.getAllUsers();
+    });
+  }
+
+  //禁用
+  noEnabled(e) {
+    e.date = new Date();
+    e.enabled = false;
+    this.http.put(`/api/ExamUsers/${e.id}`, e).subscribe((data) => {
+      const config = new MatSnackBarConfig();
+      config.verticalPosition = "top";
+      config.duration = 3000;
+      this.snackBar.open("禁用成功!", "确定", config);
+      this.getAllUsers();
+    });
+  }
+
+  //删除
+  delete(e) {
+    let isTrue = confirm("您确定要删除吗");
+    if (isTrue) {
+      this.http.delete(`/api/ExamUsers/${e.id}`).subscribe((data) => {
+        const config = new MatSnackBarConfig();
+        config.verticalPosition = "top";
+        config.duration = 3000;
+        this.snackBar.open("删除成功!", "确定", config);
+        this.getAllUsers();
+      });
+    }
+  }
+}

src/app/ui/collection-tools-read/collection-tools.component.html

@@ -19,7 +19,12 @@
         <mat-icon>open_in_browser</mat-icon>提交
       </button>
     </div>
+
     <div class="headerRight" *ngIf="paperType != 0" style="text-align: right; padding-right: 30px;">
+      <button style="border: 1px solid #07CDCF; border-radius: 5px; margin-right: 6px;" *ngIf="paperType == 1"
+        (click)="notes()">
+        <mat-icon>visibility</mat-icon>查看阅卷备注
+      </button>
       <button style="border: 1px solid #07CDCF; border-radius: 5px;" (click)='openFireExamination()'>
         <mat-icon>visibility</mat-icon>
         查看消防设施
@@ -36,7 +41,8 @@
       <!-- 天气 -->
       <div class="weatherBox">
         <span class="name">天气</span>
-        <input disabled class="weatherInput" [(ngModel)]="weatherData.weather" type="text" placeholder="最多输入10字节" maxlength="10">
+        <input disabled class="weatherInput" [(ngModel)]="weatherData.weather" type="text" placeholder="最多输入10字节"
+          maxlength="10">
         <span class="name">气温</span>
         <div style="display: inline-block;position: relative;">
           <input disabled [(ngModel)]="weatherData.airTemperature" style="width: 60px;" type="number" value="0"

src/app/ui/collection-tools-read/score.html

@@ -1,14 +1,19 @@
-<div style="width: 200px;" >
+<div class="box">
-    <div style="text-align: center;font-weight: 550;">请为此预案答卷评分</div>
+  <div style="text-align: center;font-weight: 550;">请为此预案答卷评分</div>
-    <div class="contant">
+  <div class="content">
-        <form class="example-form">
+    <form>
-            <mat-form-field class="example-full-width">
+      <div class="formItem">
-              <input name="score" matInput [placeholder]="score" type="number" (input)="inputNum()" [(ngModel)]="scoreNum">
+        <span>得分(最高分为{{data.score}}分):</span>
-            </mat-form-field>
+        <input name="score" type="number" [(ngModel)]="scoreNum">
-          </form>
+      </div>
-    </div>
+      <div class="formItem">
-    <div style="text-align: center;" class="btnbox">
+        <span>备注:</span>
-        <button mat-raised-button color="primary" style="border: none;" (click)="ok()">确定</button>
+        <textarea name="notes" [(ngModel)]="notes"></textarea>
-        <button mat-raised-button mat-dialog-close>取消</button>
+      </div>
-    </div>
+    </form>
-  </div>
+  </div>
+  <div style="text-align: center;" class="btnbox">
+    <button mat-raised-button color="primary" style="border: none;" (click)="ok()">确定</button>
+    <button mat-raised-button mat-dialog-close>取消</button>
+  </div>
+</div>

src/app/ui/collection-tools-read/score.scss

@@ -1,10 +1,35 @@
+.box{
+    width: 280px;
+    height: 280px;
+    display: flex;
+    flex-direction: column;
+}
+
+.content{
+    width: 100%;
+    flex: 1;
+    margin: 15px 0;
+
+    .formItem{
+        display: flex;
+        flex-direction: column;
+        margin: 5px 0;
+        span{
+            font-size: 14px;
+        }
+        input{
+            width: 100%;
+            height: 36px;
+        }
+        textarea{
+            width: 278px;
+            height: 90px;
+        }
+    }
+}
+
 .btnbox{
     button{
         margin: 0 5px;
     }
-}
-.contant{
-    height: 60px;
-    width: 100%;
-    margin: 15px 0;
 }

src/app/ui/enterpriseuser/enterpriseuser.component.html

@@ -2,7 +2,7 @@
   <div class="header">
     <form #form="ngForm">
       <div class="queryBox">
-  
+
         <div class="queryField">
           <label style="margin-right: 10px;">用户姓名:</label>
           <input type="text" [(ngModel)]="name" name="name" autocomplete="off" placeholder="请输入用户姓名">
@@ -13,31 +13,18 @@
         </div>
         <div class="queryField" style="position: relative;">
           <label style="margin-right: 10px;">消防救援站:</label>
-          <input type="text" [(ngModel)]="organizationName" name="organizationName" readonly autocomplete="off" placeholder="请选择消防救援站" (click)='showTree()'>
+          <nz-tree-select [nzDropdownClassName]="'maxHeightTreeSelect'" style="width: 180px" [nzNodes]="nodes"
-          <mat-icon class="closeTree" *ngIf="isShowTree" (click)='hideTree()'>highlight_off</mat-icon>
+            nzShowSearch nzPlaceHolder="请选择救援站" name="orTree" [(ngModel)]="organizationId" [nzAllowClear]="false">
-          <div class="treeDiv searchTree" *ngIf="isShowTree">
+          </nz-tree-select>
-            <mat-tree [dataSource]="dataSources" [treeControl]="treeControl">
-              <mat-tree-node *matTreeNodeDef="let node" matTreeNodePadding (click)='selectTree(node)'>
-                <button type="button" mat-icon-button disabled ></button>
-                <li>{{node.name}}</li>
-              </mat-tree-node>
-              <mat-tree-node *matTreeNodeDef="let node;when: hasChild" matTreeNodePadding (click)='selectTree(node)'>
-                <button type="button" mat-icon-button matTreeNodeToggle [attr.aria-label]="'toggle ' + node.name">
-                  <mat-icon mat-icon class="mat-icon-rtl-mirror">{{treeControl.isExpanded(node) ? 'expand_more' : 'chevron_right'}}</mat-icon>
-                </button>
-                <li>{{node.name}}</li>
-              </mat-tree-node>
-            </mat-tree>  
-          </div>
         </div>
         <div class="queryField">
-          <button mat-raised-button (click)='initData()' style="background-color: #07CDCF;">查询</button>
+          <button mat-raised-button (click)='getAllUsers()' style="background-color: #07CDCF;">查询</button>
           <button mat-raised-button (click)='empty()' style="margin-left: 10px; background-color: #FF8678;">重置</button>
         </div>
         <div class="queryField">
-          <button mat-raised-button (click)='open()' style="background-color: #07CDCF;">新增用户</button>
+          <button mat-raised-button (click)='open()' style="background-color: #07CDCF;">新增考生</button>
         </div>
-  
+
       </div>
     </form>
   </div>
@@ -48,12 +35,12 @@
       <th mat-header-cell *matHeaderCellDef>用户姓名</th>
       <td mat-cell *matCellDef="let element">{{element.realName}}</td>
     </ng-container>
-  
+
     <ng-container matColumnDef="identitycard">
       <th mat-header-cell *matHeaderCellDef>身份证号</th>
       <td mat-cell *matCellDef="let element">{{element.identityCard}}</td>
     </ng-container>
-  
+
     <ng-container matColumnDef="post">
       <th mat-header-cell *matHeaderCellDef>消防救援站</th>
       <td mat-cell *matCellDef="let element">{{element.organizationName}}</td>
@@ -63,30 +50,29 @@
       <th mat-header-cell *matHeaderCellDef>手机号</th>
       <td mat-cell *matCellDef="let element">{{element.phone}}</td>
     </ng-container>
-  
+
     <ng-container matColumnDef="time">
       <th mat-header-cell *matHeaderCellDef>创建时间</th>
       <td mat-cell *matCellDef="let element">{{element.creationTime | date:'yyyy-MM-dd'}}</td>
     </ng-container>
-  
+
     <ng-container matColumnDef="operation">
       <th mat-header-cell *matHeaderCellDef>操作</th>
       <td mat-cell *matCellDef="let element">
         <span class="operationSpan"><span class="spanbtn green" (click)="reset(element)">重置密码</span></span>
         <span class="operationSpan"><span class="spanbtn green" (click)="edit(element)">编辑</span></span>
-        <span *ngIf="element.enabled" class="operationSpan"><span class="spanbtn red" (click)="noEnabled(element)">禁用</span></span>
+        <span *ngIf="element.enabled" class="operationSpan"><span class="spanbtn red"
-        <span *ngIf="!element.enabled" class="operationSpan"><span class="spanbtn gray" (click)="enabled(element)">启用</span></span>
+            (click)="noEnabled(element)">禁用</span></span>
+        <span *ngIf="!element.enabled" class="operationSpan"><span class="spanbtn gray"
+            (click)="enabled(element)">启用</span></span>
         <span class="operationSpan"><span class="spanbtn red" (click)="delete(element)">删除</span></span>
       </td>
     </ng-container>
-  
+
     <tr mat-header-row *matHeaderRowDef="displayedColumns"></tr>
     <tr mat-row *matRowDef="let row; columns: displayedColumns;"></tr>
   </table>
-  <mat-paginator [length]="length"
+  <mat-paginator [length]="length" [pageSize]="pageSize" (page)="chagePage($event)">
-      [pageSize]="pageSize"
-      [pageSizeOptions]="pageSizeOptions"
-      (page)="chagePage($event)">
   </mat-paginator>
 
-</div>
+</div>

src/app/ui/enterpriseuser/enterpriseuser.component.scss

@@ -1,6 +1,7 @@
 table {
   width: 100%;
   text-align: center;
+
   .cdk-header-cell {
     text-align: center;
   }
@@ -12,58 +13,84 @@ table {
   overflow: hidden;
   background: #F2F5F6;
 }
+
 .header {
   width: 100%;
   padding: 10px;
   margin-bottom: 10px;
   box-sizing: border-box;
+
   .queryBox {
     box-sizing: border-box;
     padding: 5px 15px;
     display: flex;
     flex-direction: row;
     flex-wrap: wrap;
-    align-items:center;
+    align-items: center;
-    justify-content:center;
+    justify-content: center;
+
     .queryField {
       margin: 0 25px;
       font-size: 14px;
+
       input {
         width: 160px;
-        height: 34px;
+        height: 30px;
-        line-height: 34px;
+        line-height: 30px;
-        border-radius: 5px;
+        border-radius: 2px;
         padding-left: 5px;
         outline: none;
         border: 1px solid rgb(226, 211, 211);
       }
-      button { color: #fff; }
+
+      button {
+        color: #fff;
+      }
     }
-  } //queryBox
+  }
+
+  //queryBox
 }
 
-.operationSpan{
+.operationSpan {
   margin: 0 10px;
+
   .spanbtn {
     font-weight: 550;
     cursor: pointer;
   }
-  .green{ color: #04ced1; }
+
-  .red{ color: #FF8678 }
+  .green {
-  .gray{ color: gray; }
+    color: #04ced1;
+  }
+
+  .red {
+    color: #FF8678
+  }
+
+  .gray {
+    color: gray;
+  }
 }
 
 //tree
 .treeDiv {
-  max-height: 300px; 
+  max-height: 300px;
   overflow-y: auto;
+
   .mat-icon-button {
     width: 20px;
     height: 20px;
     line-height: 20px;
   }
-  li { cursor: pointer; }
+
-  .mat-tree-node:hover { background-color: rgb(240, 236, 236); }
+  li {
+    cursor: pointer;
+  }
+
+  .mat-tree-node:hover {
+    background-color: rgb(240, 236, 236);
+  }
 }
 
 .closeTree {
@@ -73,8 +100,12 @@ table {
   right: -95px;
   z-index: 100;
 }
+
 .searchTree {
-  .mat-tree-node button .mat-icon { color: #000; }
+  .mat-tree-node button .mat-icon {
+    color: #000;
+  }
+
   border: 1px solid rgb(207, 204, 204);
   width: 350px;
   max-height: 150px;

src/app/ui/enterpriseuser/enterpriseuser.component.ts

@@ -1,351 +1,324 @@
-import { Component, OnInit, ViewChild, Inject } from '@angular/core';
+import { Component, OnInit, ViewChild, Inject } from "@angular/core";
-import {HttpClient} from '@angular/common/http'
+import { HttpClient } from "@angular/common/http";
-import { MatDialogRef, MatDialog, MAT_DIALOG_DATA } from '@angular/material/dialog';
+import {
-import { MatPaginator } from '@angular/material/paginator';
+  MatDialogRef,
-import { MatTableDataSource } from '@angular/material/table';
+  MatDialog,
-import { PageEvent } from '@angular/material/paginator';
+  MAT_DIALOG_DATA,
-import { AddEnterpriserUser } from './addenterpriseuser.component'
+} from "@angular/material/dialog";
-import { MatSnackBar, MatSnackBarConfig } from '@angular/material/snack-bar';
+import { MatPaginator } from "@angular/material/paginator";
-import {FormControl} from '@angular/forms';
+import { MatTableDataSource } from "@angular/material/table";
-import { Router,ActivatedRoute } from '@angular/router'
+import { PageEvent } from "@angular/material/paginator";
-import { FlatTreeControl } from '@angular/cdk/tree';
+import { AddEnterpriserUser } from "./addenterpriseuser.component";
-import { MatTreeFlatDataSource, MatTreeFlattener } from '@angular/material/tree';
+import { MatSnackBar, MatSnackBarConfig } from "@angular/material/snack-bar";
+import { FormControl } from "@angular/forms";
+import { Router, ActivatedRoute } from "@angular/router";
+import { FlatTreeControl } from "@angular/cdk/tree";
+import {
+  MatTreeFlatDataSource,
+  MatTreeFlattener,
+} from "@angular/material/tree";
+import { TreeService } from "src/app/http-interceptors/tree.service";
 
 @Component({
-  selector: 'app-enterpriseuser',
+  selector: "app-enterpriseuser",
-  templateUrl: './enterpriseuser.component.html',
+  templateUrl: "./enterpriseuser.component.html",
-  styleUrls: ['./enterpriseuser.component.scss']
+  styleUrls: ["./enterpriseuser.component.scss"],
 })
 export class EnterpriseuserComponent implements OnInit {
-
+  constructor(
-  constructor(public http: HttpClient,public dialog: MatDialog,public snackBar: MatSnackBar,private router:Router,private route:ActivatedRoute) { }
+    public http: HttpClient,
-  
+    public dialog: MatDialog,
+    public snackBar: MatSnackBar,
+    public treeService: TreeService
+  ) {}
+
+  loginUserInfo;
   ngOnInit() {
-    this.initData()
+    this.loginUserInfo = JSON.parse(sessionStorage.getItem("creatorData"));
-    this.getOrganizations()
+    this.getOrganizations();
   }
 
-  allOrganizations:any; //所有组织机构
+  allOrganizations: any; //所有组织机构
-  treeData:any = []; //tree型 data
-  isShowTree:boolean = false; //树形结构是否展示
-  showTree () { this.isShowTree = true }
-  hideTree () { this.isShowTree = false }
 
   //获取所有组织机构
-  getOrganizations () {
+  nodes;
-    this.http.get('/api/Organizations').subscribe((data:any)=>{
+  organizationId;
-      this.allOrganizations = data
+  getOrganizations() {
-      data.forEach(element => {
+    this.http
-        element.children = []
+      .get("/api/Organizations", {
-        data.forEach(item => { item.parentId === element.id? element.children.push(item) : null });
+        params: {
-      });
+          strict: "true",
-      data.forEach(element => {
+        },
-        !element.parentId? this.treeData.push(element) : null
+      })
+      .subscribe((data: any) => {
+        this.allOrganizations = data;
+        this.allOrganizations.forEach((element) => {
+          if (element.id === this.loginUserInfo.organizationId) {
+            element.parentId = null;
+          }
+        });
+        this.nodes = [...this.treeService.toTree(this.allOrganizations)];
+        this.organizationId = this.loginUserInfo.organizationId;
+        this.getAllUsers();
       });
-      this.dataSources.data = this.treeData
-    }) //http
-  }
-
-  organizationId:string = null;
-  organizationName:string = null;
-
-  private _transformer = (node, level: number) => {   //初始化tree
-    return {
-      expandable: !!node.children && node.children.length > 0,
-      name: node.name,
-      level: level,
-      id: node.id,
-      parentId: node.parentId,
-      children: node.children
-    };
-  }
-  treeControl = new FlatTreeControl<any>(node => node.level, node => node.expandable);
-  treeFlattener = new MatTreeFlattener(this._transformer, node => node.level, node => node.expandable, node => node.children);
-  dataSources = new MatTreeFlatDataSource(this.treeControl, this.treeFlattener);
-  hasChild = (_: number, node: any) => node.expandable;
-
-  //选择tree节点
-  selectTree (e) {
-    this.organizationId = e.id
-    this.organizationName = e.name
-    this.isShowTree = false
   }
 
-  displayedColumns: string[] = [ 'name','identitycard', 'post', 'tel', 'time', 'operation',];
+  displayedColumns: string[] = [
-  dataSource:any;   //所有企业用户
+    "name",
+    "identitycard",
+    "post",
+    "tel",
+    "time",
+    "operation",
+  ];
+  dataSource: any; //所有企业用户
 
-  name:any //姓名
+  name: any; //姓名
-  identityCard:any //身份证
+  identityCard: any; //身份证
 
   //分页
-  @ViewChild(MatPaginator, {static: true}) 
+  @ViewChild(MatPaginator, { static: true })
   pageEvent: PageEvent;
   paginator: MatPaginator;
-  length:any; //共多少条数据
+  length: any; //共多少条数据
-  pageSize:any; //每页条数
+  pageSize: any = 10; //每页条数
-  pageSizeOptions: number[] = [10] //设置每页条数
+  pageNumber: number = 1; //第几页
-  pageNumber:number = 1; //第几页
 
   //分页切换
-  chagePage (e) {
+  chagePage(e) {
-    this.pageNumber = e.pageIndex+1
+    this.pageNumber = e.pageIndex + 1;
-    let data= {
+    this.getAllUsers();
-      RealName: this.name || '',
-      IdentityCard: this.identityCard || '',
-      OrganizationId: this.organizationId || '',
-      RoleType: '2',
-      PageNumber: String(this.pageNumber),
-    }
-    this.http.get('/api/ExamUsers',{params:data}).subscribe((data:any)=>{
-      this.length = data.totalCount
-      this.pageSize = data.pageSize
-      this.dataSource = new MatTableDataSource<any>(data.items)
-    })
-  }
-
-  //页面初始化 + 查询 + 重置
-  initData () {
-    let data= {
-      RealName: this.name || '',
-      IdentityCard: this.identityCard || '',
-      OrganizationId: this.organizationId || '',
-      RoleType: '2',
-    }
-    this.http.get('/api/ExamUsers',{params:data}).subscribe((data:any)=>{
-      this.length = data.totalCount
-      this.pageSize = data.pageSize
-      this.pageEvent.pageIndex = 0
-      this.dataSource = new MatTableDataSource<any>(data.items)
-    })
   }
 
   //更新当前页数据
-  getAllUsers () {
+  getAllUsers() {
-    let data= {
+    let data = {
-      RealName: this.name || '',
+      RealName: this.name || "",
-      IdentityCard: this.identityCard || '',
+      IdentityCard: this.identityCard || "",
-      OrganizationId: this.organizationId || '',
+      OrganizationId: this.organizationId || "",
-      RoleType: '2',
+      RoleType: "2",
       PageNumber: String(this.pageNumber),
-    }
+      pageSize: this.pageSize,
-    this.http.get('/api/ExamUsers',{params:data}).subscribe((data:any)=>{
+    };
-      this.length = data.totalCount
+    this.http.get("/api/ExamUsers", { params: data }).subscribe((data: any) => {
-      this.pageSize = data.pageSize
+      this.length = data.totalCount;
-      this.dataSource = new MatTableDataSource<any>(data.items)
+      this.pageSize = data.pageSize;
-    })
+      this.dataSource = new MatTableDataSource<any>(data.items);
+    });
   }
 
   //清空搜索
-  empty () {
+  empty() {
-    this.name = '',
+    this.name = "";
-    this.identityCard = '',
+    this.identityCard = "";
-    this.organizationId = '',
+    this.organizationId = this.loginUserInfo.organizationId;
-    this.organizationName = '',
+    this.getAllUsers();
-    this.initData()
   }
 
   //创建用户
-  open(){
+  open() {
-    let data = this.treeData
+    let data = this.nodes;
-    let dialogRef = this.dialog.open(AddEnterpriserUser,{data});
+    let dialogRef = this.dialog.open(AddEnterpriserUser, { data });
-    dialogRef.afterClosed().subscribe(data=>{
+    dialogRef.afterClosed().subscribe((data) => {
       if (data) {
         const config = new MatSnackBarConfig();
-        config.verticalPosition = 'top';
+        config.verticalPosition = "top";
-        config.duration = 3000
+        config.duration = 3000;
-        this.snackBar.open('创建成功!','确定',config);
+        this.snackBar.open("创建成功!", "确定", config);
-        this.getAllUsers()
+        this.getAllUsers();
       }
     });
   }
 
   //编辑企业用户
-  edit (e) {
+  edit(e) {
-    let data = {treeData: this.treeData, userData: e}
+    let data = { treeData: this.nodes, userData: e };
-    let dialogRef = this.dialog.open(editenterpriseuser,{data});
+    let dialogRef = this.dialog.open(editenterpriseuser, { data });
-    dialogRef.afterClosed().subscribe(data=>{
+    dialogRef.afterClosed().subscribe((data) => {
       if (data) {
         const config = new MatSnackBarConfig();
-        config.verticalPosition = 'top';
+        config.verticalPosition = "top";
-        config.duration = 3000
+        config.duration = 3000;
-        this.snackBar.open('修改成功!','确定',config);  
+        this.snackBar.open("修改成功!", "确定", config);
-        this.getAllUsers()
+        this.getAllUsers();
       }
     });
   }
 
   //重置密码
-  reset (e) {
+  reset(e) {
-    this.http.put(`/api/ExamUsers/${e.id}/ResetPassword`,{}).subscribe(data=>{
+    this.http.put(`/api/ExamUsers/${e.id}/ResetPassword`, {}).subscribe(
-      const config = new MatSnackBarConfig();
+      (data) => {
-      config.verticalPosition = 'top';
+        const config = new MatSnackBarConfig();
-      config.duration = 3000
+        config.verticalPosition = "top";
-      this.snackBar.open('重置密码成功!','确定',config);
+        config.duration = 3000;
-    },err=>{
+        this.snackBar.open("重置密码成功!", "确定", config);
-      const config = new MatSnackBarConfig();
+      },
-      config.verticalPosition = 'top';
+      (err) => {
-      config.duration = 3000
+        const config = new MatSnackBarConfig();
-      this.snackBar.open('重置密码失败!','确定',config);
+        config.verticalPosition = "top";
-    })
+        config.duration = 3000;
+        this.snackBar.open("重置密码失败!", "确定", config);
+      }
+    );
   }
 
   //启用
-  enabled (e) {
+  enabled(e) {
     let body = {
       creationTime: new Date(),
       enabled: true,
       id: e.id,
       identityCard: e.identityCard,
-      name : e.name,
+      name: e.name,
       organizationId: e.organizationId,
       organizationName: e.organizationName,
       phone: e.phone,
-      realName : e.realName,
+      realName: e.realName,
-      roleType : e.roleType,
+      roleType: e.roleType,
-    }
+    };
-    this.http.put(`/api/ExamUsers/${e.id}`,body).subscribe(data => {
+    this.http.put(`/api/ExamUsers/${e.id}`, body).subscribe((data) => {
       const config = new MatSnackBarConfig();
-      config.verticalPosition = 'top';
+      config.verticalPosition = "top";
       config.duration = 3000;
-      this.snackBar.open('启用成功!','确定',config);
+      this.snackBar.open("启用成功!", "确定", config);
       this.getAllUsers();
-    })
+    });
   }
 
   //禁用
-  noEnabled (e) {
+  noEnabled(e) {
     let body = {
       creationTime: new Date(),
       enabled: false,
       id: e.id,
       identityCard: e.identityCard,
-      name : e.name,
+      name: e.name,
       organizationId: e.organizationId,
       organizationName: e.organizationName,
       phone: e.phone,
-      realName : e.realName,
+      realName: e.realName,
-      roleType : e.roleType,
+      roleType: e.roleType,
-    }
+    };
-    this.http.put(`/api/ExamUsers/${e.id}`,body).subscribe(data => {
+    this.http.put(`/api/ExamUsers/${e.id}`, body).subscribe((data) => {
       const config = new MatSnackBarConfig();
-      config.verticalPosition = 'top';
+      config.verticalPosition = "top";
       config.duration = 3000;
-      this.snackBar.open('禁用成功!','确定',config);
+      this.snackBar.open("禁用成功!", "确定", config);
       this.getAllUsers();
-    })
+    });
   }
 
   //删除
-  delete (e) {
+  delete(e) {
-    let isTrue = confirm('您确定要删除吗')
+    let isTrue = confirm("您确定要删除吗");
     if (isTrue) {
-      this.http.delete(`/api/ExamUsers/${e.id}`).subscribe(data=>{
+      this.http.delete(`/api/ExamUsers/${e.id}`).subscribe((data) => {
         const config = new MatSnackBarConfig();
-        config.verticalPosition = 'top';
+        config.verticalPosition = "top";
-        config.duration = 3000
+        config.duration = 3000;
-        this.snackBar.open('删除成功!','确定',config);
+        this.snackBar.open("删除成功!", "确定", config);
-        this.getAllUsers()
+        this.getAllUsers();
-      })
+      });
     }
   }
-
-
-
 }
 
-
-
 //编辑企业用户
 @Component({
-  selector: 'app-editenterpriseuser',
+  selector: "app-editenterpriseuser",
-  templateUrl: './editenterpriseuser.html',
+  templateUrl: "./editenterpriseuser.html",
-  styleUrls: ['./enterpriseuser.component.scss']
+  styleUrls: ["./enterpriseuser.component.scss"],
 })
 export class editenterpriseuser {
-
+  constructor(
-  constructor(private http: HttpClient,public dialogRef: MatDialogRef<editenterpriseuser>,@Inject(MAT_DIALOG_DATA) public data,public snackBar: MatSnackBar,) {}
+    private http: HttpClient,
+    public dialogRef: MatDialogRef<editenterpriseuser>,
+    @Inject(MAT_DIALOG_DATA) public data,
+    public snackBar: MatSnackBar
+  ) {}
 
   ngOnInit(): void {
-    this.dataSource.data = this.data.treeData
+    this.dataSource.data = this.data.treeData;
-    this.realName = JSON.parse(JSON.stringify(this.data.userData.realName))
+    this.realName = JSON.parse(JSON.stringify(this.data.userData.realName));
-    this.identityCard = JSON.parse(JSON.stringify(this.data.userData.identityCard))
+    this.identityCard = JSON.parse(
-    this.phone = JSON.parse(JSON.stringify(this.data.userData.phone))
+      JSON.stringify(this.data.userData.identityCard)
-    this.organizationId = JSON.parse(JSON.stringify(this.data.userData.organizationId))
+    );
-    this.organizationName = JSON.parse(JSON.stringify(this.data.userData.organizationName))
+    this.phone = JSON.parse(JSON.stringify(this.data.userData.phone));
+    this.organizationId = JSON.parse(
+      JSON.stringify(this.data.userData.organizationId)
+    );
+    this.organizationName = JSON.parse(
+      JSON.stringify(this.data.userData.organizationName)
+    );
   }
 
-  errmsg:string = null; //捕获错误信息
+  errmsg: string = null; //捕获错误信息
 
-  realName:string = null;
+  realName: string = null;
-  identityCard:string = null;
+  identityCard: string = null;
-  phone:number = null;
+  phone: number = null;
-  organizationId:string = null;
+  organizationId: string = null;
-  organizationName:string = null;
+  organizationName: string = null;
 
-  private _transformer = (node, level: number) => {   //初始化tree
+  private _transformer = (node, level: number) => {
+    //初始化tree
     return {
       expandable: !!node.children && node.children.length > 0,
       name: node.name,
       level: level,
       id: node.id,
       parentId: node.parentId,
-      children: node.children
+      children: node.children,
     };
-  }
+  };
-  treeControl = new FlatTreeControl<any>(node => node.level, node => node.expandable);
+  treeControl = new FlatTreeControl<any>(
-  treeFlattener = new MatTreeFlattener(this._transformer, node => node.level, node => node.expandable, node => node.children);
+    (node) => node.level,
+    (node) => node.expandable
+  );
+  treeFlattener = new MatTreeFlattener(
+    this._transformer,
+    (node) => node.level,
+    (node) => node.expandable,
+    (node) => node.children
+  );
   dataSource = new MatTreeFlatDataSource(this.treeControl, this.treeFlattener);
   hasChild = (_: number, node: any) => node.expandable;
 
   //选择tree节点
-  selectTree (e) {
+  selectTree(e) {
-    this.organizationId = e.id
+    this.organizationId = e.id;
-    this.organizationName = e.name
+    this.organizationName = e.name;
   }
 
   //提交创建表单
-  onSubmit (e) {
+  onSubmit(e) {
-    console.log(666,e)
+    console.log(666, e);
     if (this.organizationId && this.organizationName) {
-      e.phone = String(e.phone)
+      e.phone = String(e.phone);
-      e.roleType = 2
+      e.roleType = 2;
       // e.name = this.data.userData.name
-      e.id = this.data.userData.id
+      e.id = this.data.userData.id;
-      e.enabled = this.data.userData.enabled
+      e.enabled = this.data.userData.enabled;
       // e.creationTime = new Date()
-      e.organizationId = this.organizationId
+      e.organizationId = this.organizationId;
-      e.organizationName = this.organizationName
+      e.organizationName = this.organizationName;
-      this.http.put(`/api/ExamUsers/${this.data.userData.id}`,e).subscribe(data => {
+      this.http.put(`/api/ExamUsers/${this.data.userData.id}`, e).subscribe(
-        this.dialogRef.close('success');
+        (data) => {
-      },err => {
+          this.dialogRef.close("success");
-        const config = new MatSnackBarConfig();
+        },
-        config.verticalPosition = 'top';
+        (err) => {
-        config.duration = 3000
+          const config = new MatSnackBarConfig();
-        this.snackBar.open(err,'确定',config);
+          config.verticalPosition = "top";
-      })
+          config.duration = 3000;
+          this.snackBar.open(err, "确定", config);
+        }
+      );
     } else {
       const config = new MatSnackBarConfig();
-      config.verticalPosition = 'top';
+      config.verticalPosition = "top";
-      config.duration = 3000
+      config.duration = 3000;
-      this.snackBar.open('请选择消防救援站','确定',config);  
+      this.snackBar.open("请选择消防救援站", "确定", config);
     }
   }
-
 }
-
-
-
-//查看企业用户
-@Component({
-  selector: 'app-seeenterpriseuser',
-  templateUrl: './seeenterpriseuser.html',
-  styleUrls: ['./enterpriseuser.component.scss']
-})
-export class seeenterpriseuser {
-
-  constructor(public http: HttpClient,public dialog: MatDialog,
-  @Inject(MAT_DIALOG_DATA) public data) { }
-  
-  ngOnInit() {}
-
-}

src/app/ui/teacherManagement/editenterpriseuser.html

@@ -10,29 +10,31 @@
 
   <div>
     <mat-form-field>
-      <input matInput id="realName" name="realName" [(ngModel)]="realName" required placeholder="用户姓名" autocomplete="off">
+      <input matInput id="realName" name="realName" [(ngModel)]="realName" required placeholder="用户姓名"
+        autocomplete="off">
     </mat-form-field>
   </div>
 
   <div style="margin-bottom: 10px;">
-    <p style="font-size: 14px;">消防救援站:   <label style="margin-left: 10px;">{{organizationName}}</label></p>
+    <p style="font-size: 14px;">消防救援站: <label style="margin-left: 10px;">{{organizationName}}</label></p>
   </div>
 
   <div class="treeDiv">
     <mat-tree [dataSource]="dataSource" [treeControl]="treeControl">
       <mat-tree-node *matTreeNodeDef="let node" matTreeNodePadding (click)='selectTree(node)'>
-        <button type="button" mat-icon-button disabled ></button>
+        <button type="button" mat-icon-button disabled></button>
         <li>{{node.name}}</li>
       </mat-tree-node>
       <mat-tree-node *matTreeNodeDef="let node;when: hasChild" matTreeNodePadding (click)='selectTree(node)'>
         <button type="button" mat-icon-button matTreeNodeToggle [attr.aria-label]="'toggle ' + node.name">
-          <mat-icon mat-icon class="mat-icon-rtl-mirror">{{treeControl.isExpanded(node) ? 'expand_more' : 'chevron_right'}}</mat-icon>
+          <mat-icon mat-icon class="mat-icon-rtl-mirror">{{treeControl.isExpanded(node) ? 'expand_more' :
+            'chevron_right'}}</mat-icon>
         </button>
         <li>{{node.name}}</li>
       </mat-tree-node>
-    </mat-tree>  
+    </mat-tree>
   </div>
-  
+
   <div mat-dialog-content *ngIf="errmsg">
     <p style="font-size: 14px; color: red;">{{errmsg}}</p>
   </div>

src/app/ui/teacherManagement/enterpriseuser.component.html

@@ -2,7 +2,6 @@
   <div class="header">
     <form #form="ngForm">
       <div class="queryBox">
-  
         <div class="queryField">
           <label style="margin-right: 10px;">用户账号:</label>
           <input type="text" [(ngModel)]="identityCard" name="identityCard" autocomplete="off" placeholder="请输入用户账号">
@@ -13,75 +12,59 @@
         </div>
         <div class="queryField" style="position: relative;">
           <label style="margin-right: 10px;">消防救援站:</label>
-          <input type="text" [(ngModel)]="organizationName" name="organizationName" readonly autocomplete="off" placeholder="请选择消防救援站" (click)='showTree()'>
+          <nz-tree-select [nzDropdownClassName]="'maxHeightTreeSelect'" style="width: 180px" [nzNodes]="nodes"
-          <mat-icon class="closeTree" *ngIf="isShowTree" (click)='hideTree()'>highlight_off</mat-icon>
+            nzShowSearch nzPlaceHolder="请选择救援站" name="orTree" [(ngModel)]="organizationId" [nzAllowClear]="false">
-          <div class="treeDiv searchTree" *ngIf="isShowTree">
+          </nz-tree-select>
-            <mat-tree [dataSource]="dataSources" [treeControl]="treeControl">
-              <mat-tree-node *matTreeNodeDef="let node" matTreeNodePadding (click)='selectTree(node)'>
-                <button type="button" mat-icon-button disabled ></button>
-                <li>{{node.name}}</li>
-              </mat-tree-node>
-              <mat-tree-node *matTreeNodeDef="let node;when: hasChild" matTreeNodePadding (click)='selectTree(node)'>
-                <button type="button" mat-icon-button matTreeNodeToggle [attr.aria-label]="'toggle ' + node.name">
-                  <mat-icon mat-icon class="mat-icon-rtl-mirror">{{treeControl.isExpanded(node) ? 'expand_more' : 'chevron_right'}}</mat-icon>
-                </button>
-                <li>{{node.name}}</li>
-              </mat-tree-node>
-            </mat-tree>  
-          </div>
         </div>
         <div class="queryField">
-          <button mat-raised-button (click)='initData()' style="background-color: #07CDCF;">查询</button>
+          <button mat-raised-button (click)='getAllUsers()' style="background-color: #07CDCF;">查询</button>
           <button mat-raised-button (click)='empty()' style="margin-left: 10px; background-color: #FF8678;">重置</button>
         </div>
         <div class="queryField">
-          <button mat-raised-button (click)='open()' style="background-color: #07CDCF;">新增用户</button>
+          <button mat-raised-button (click)='open()' style="background-color: #07CDCF;">新增考官</button>
         </div>
-  
       </div>
     </form>
   </div>
-  
+
   <table mat-table [dataSource]="dataSource">
-  
     <ng-container matColumnDef="identitycard">
       <th mat-header-cell *matHeaderCellDef>用户帐号</th>
       <td mat-cell *matCellDef="let element">{{element.name}}</td>
     </ng-container>
-  
+
     <ng-container matColumnDef="name">
       <th mat-header-cell *matHeaderCellDef>用户姓名</th>
       <td mat-cell *matCellDef="let element">{{element.realName}}</td>
     </ng-container>
-  
+
     <ng-container matColumnDef="post">
       <th mat-header-cell *matHeaderCellDef>消防救援站</th>
       <td mat-cell *matCellDef="let element">{{element.organizationName}}</td>
     </ng-container>
-  
+
     <ng-container matColumnDef="time">
       <th mat-header-cell *matHeaderCellDef>创建时间</th>
       <td mat-cell *matCellDef="let element">{{element.creationTime | date:'yyyy-MM-dd'}}</td>
     </ng-container>
-  
+
     <ng-container matColumnDef="operation">
       <th mat-header-cell *matHeaderCellDef>操作</th>
       <td mat-cell *matCellDef="let element">
         <span class="operationSpan"><span class="spanbtn green" (click)="reset(element)">重置密码</span></span>
         <span class="operationSpan"><span class="spanbtn green" (click)="edit(element)">编辑</span></span>
-        <span *ngIf="element.enabled" class="operationSpan"><span class="spanbtn red" (click)="noEnabled(element)">禁用</span></span>
+        <span *ngIf="element.enabled" class="operationSpan"><span class="spanbtn red"
-        <span *ngIf="!element.enabled" class="operationSpan"><span class="spanbtn gray" (click)="enabled(element)">启用</span></span>
+            (click)="noEnabled(element)">禁用</span></span>
+        <span *ngIf="!element.enabled" class="operationSpan"><span class="spanbtn gray"
+            (click)="enabled(element)">启用</span></span>
         <span class="operationSpan"><span class="spanbtn red" (click)="delete(element)">删除</span></span>
       </td>
     </ng-container>
-  
+
     <tr mat-header-row *matHeaderRowDef="displayedColumns"></tr>
     <tr mat-row *matRowDef="let row; columns: displayedColumns;"></tr>
   </table>
-  <mat-paginator [length]="length"
+  <mat-paginator [length]="length" [pageSize]="pageSize" (page)="chagePage($event)">
-      [pageSize]="pageSize"
-      [pageSizeOptions]="pageSizeOptions"
-      (page)="chagePage($event)">
   </mat-paginator>
 
-</div>
+</div>

src/app/ui/teacherManagement/enterpriseuser.component.scss

@@ -1,6 +1,7 @@
 table {
   width: 100%;
   text-align: center;
+
   .cdk-header-cell {
     text-align: center;
   }
@@ -12,58 +13,84 @@ table {
   overflow: hidden;
   background: #F2F5F6;
 }
+
 .header {
   width: 100%;
   padding: 10px;
   margin-bottom: 10px;
   box-sizing: border-box;
+
   .queryBox {
     box-sizing: border-box;
     padding: 5px 15px;
     display: flex;
     flex-direction: row;
     flex-wrap: wrap;
-    align-items:center;
+    align-items: center;
-    justify-content:center;
+    justify-content: center;
+
     .queryField {
       margin: 0 25px;
       font-size: 14px;
+
       input {
         width: 160px;
-        height: 34px;
+        height: 30px;
-        line-height: 34px;
+        line-height: 30px;
-        border-radius: 5px;
+        border-radius: 2px;
-        padding-left: 5px;
+        padding-left: 6px;
         outline: none;
         border: 1px solid rgb(226, 211, 211);
       }
-      button { color: #fff; }
+
+      button {
+        color: #fff;
+      }
     }
-  } //queryBox
+  }
+
+  //queryBox
 }
 
-.operationSpan{
+.operationSpan {
   margin: 0 10px;
+
   .spanbtn {
     font-weight: 550;
     cursor: pointer;
   }
-  .green{ color: #04ced1; }
+
-  .red{ color: #FF8678 }
+  .green {
-  .gray{ color: gray; }
+    color: #04ced1;
+  }
+
+  .red {
+    color: #FF8678
+  }
+
+  .gray {
+    color: gray;
+  }
 }
 
 //tree
 .treeDiv {
-  max-height: 300px; 
+  max-height: 300px;
   overflow-y: auto;
+
   .mat-icon-button {
     width: 20px;
     height: 20px;
     line-height: 20px;
   }
-  li { cursor: pointer; }
+
-  .mat-tree-node:hover { background-color: rgb(240, 236, 236); }
+  li {
+    cursor: pointer;
+  }
+
+  .mat-tree-node:hover {
+    background-color: rgb(240, 236, 236);
+  }
 }
 
 .closeTree {
@@ -73,8 +100,12 @@ table {
   right: -95px;
   z-index: 100;
 }
+
 .searchTree {
-  .mat-tree-node button .mat-icon { color: #000; }
+  .mat-tree-node button .mat-icon {
+    color: #000;
+  }
+
   border: 1px solid rgb(207, 204, 204);
   width: 350px;
   max-height: 150px;

src/app/ui/teacherManagement/enterpriseuser.component.ts

@@ -1,328 +1,294 @@
-import { Component, OnInit, ViewChild, Inject } from '@angular/core';
+import { Component, OnInit, ViewChild, Inject } from "@angular/core";
-import {HttpClient} from '@angular/common/http'
+import { HttpClient } from "@angular/common/http";
-import { MatDialogRef, MatDialog, MAT_DIALOG_DATA } from '@angular/material/dialog';
+import {
-import { MatPaginator } from '@angular/material/paginator';
+  MatDialogRef,
-import { MatTableDataSource } from '@angular/material/table';
+  MatDialog,
-import { PageEvent } from '@angular/material/paginator';
+  MAT_DIALOG_DATA,
-import { AddTeacher } from './addenterpriseuser.component'
+} from "@angular/material/dialog";
-import { MatSnackBar, MatSnackBarConfig } from '@angular/material/snack-bar';
+import { MatPaginator } from "@angular/material/paginator";
-import {FormControl} from '@angular/forms';
+import { MatTableDataSource } from "@angular/material/table";
-import { FlatTreeControl } from '@angular/cdk/tree';
+import { PageEvent } from "@angular/material/paginator";
-import { MatTreeFlatDataSource, MatTreeFlattener } from '@angular/material/tree';
+import { AddTeacher } from "./addenterpriseuser.component";
+import { MatSnackBar, MatSnackBarConfig } from "@angular/material/snack-bar";
+import { FormControl } from "@angular/forms";
+import { FlatTreeControl } from "@angular/cdk/tree";
+import {
+  MatTreeFlatDataSource,
+  MatTreeFlattener,
+} from "@angular/material/tree";
+import { TreeService } from "src/app/http-interceptors/tree.service";
 
 @Component({
-  selector: 'app-enterpriseuser',
+  selector: "app-enterpriseuser",
-  templateUrl: './enterpriseuser.component.html',
+  templateUrl: "./enterpriseuser.component.html",
-  styleUrls: ['./enterpriseuser.component.scss']
+  styleUrls: ["./enterpriseuser.component.scss"],
 })
 export class TeacherManagementComponent implements OnInit {
-
+  constructor(
-  constructor(public http: HttpClient,public dialog: MatDialog,public snackBar: MatSnackBar) { }
+    public http: HttpClient,
-  
+    public dialog: MatDialog,
+    public snackBar: MatSnackBar,
+    public treeService: TreeService
+  ) {}
+
+  loginUserInfo;
   ngOnInit() {
-    this.initData()
+    this.loginUserInfo = JSON.parse(sessionStorage.getItem("creatorData"));
-    this.getOrganizations()
+    this.getOrganizations();
   }
-
+  name: any; //用户姓名
-  allOrganizations:any; //所有组织机构
+  identityCard: any; //用户账号
-  treeData:any = []; //tree型 data
+  organizationId;
-  isShowTree:boolean = false; //树形结构是否展示
+  allOrganizations: any; //所有组织机构
-  showTree () { this.isShowTree = true }
+  nodes = [];
-  hideTree () { this.isShowTree = false }
-
   //获取所有组织机构
-  getOrganizations () {
+  getOrganizations() {
-    this.http.get('/api/Organizations').subscribe((data:any)=>{
+    this.http
-      this.allOrganizations = data
+      .get("/api/Organizations", {
-      data.forEach(element => {
+        params: {
-        element.children = []
+          strict: "true",
-        data.forEach(item => { item.parentId === element.id? element.children.push(item) : null });
+        },
-      });
+      })
-      data.forEach(element => {
+      .subscribe((data: any) => {
-        !element.parentId? this.treeData.push(element) : null
+        this.allOrganizations = data;
+        this.allOrganizations.forEach((element) => {
+          if (element.id === this.loginUserInfo.organizationId) {
+            element.parentId = null;
+          }
+        });
+        this.nodes = [...this.treeService.toTree(this.allOrganizations)];
+        this.organizationId = this.loginUserInfo.organizationId;
+        this.getAllUsers();
       });
-      this.dataSources.data = this.treeData
-    }) //http
   }
 
-  organizationId:string = null;
+  displayedColumns: string[] = [
-  organizationName:string = null;
+    "identitycard",
+    "name",
+    "post",
+    "time",
+    "operation",
+  ];
 
-  private _transformer = (node, level: number) => {   //初始化tree
+  dataSource: any; //所有企业用户表格数据
-    return {
+  //更新当前页数据
-      expandable: !!node.children && node.children.length > 0,
+  pageNumber: number = 1; //第几页
-      name: node.name,
+  pageSize: any = "10"; //每页条数
-      level: level,
+  getAllUsers() {
-      id: node.id,
+    let data = {
-      parentId: node.parentId,
+      Name: this.identityCard || "",
-      children: node.children
+      RealName: this.name || "",
+      OrganizationId: this.organizationId || "",
+      RoleType: "1",
+      PageNumber: String(this.pageNumber),
+      PageSize: this.pageSize,
     };
+    this.http.get("/api/ExamUsers", { params: data }).subscribe((data: any) => {
+      this.length = data.totalCount;
+      this.pageSize = data.pageSize;
+      this.dataSource = new MatTableDataSource<any>(data.items);
+    });
   }
-  treeControl = new FlatTreeControl<any>(node => node.level, node => node.expandable);
-  treeFlattener = new MatTreeFlattener(this._transformer, node => node.level, node => node.expandable, node => node.children);
-  dataSources = new MatTreeFlatDataSource(this.treeControl, this.treeFlattener);
-  hasChild = (_: number, node: any) => node.expandable;
-
-  //选择tree节点
-  selectTree (e) {
-    this.organizationId = e.id
-    this.organizationName = e.name
-    this.isShowTree = false
-  }
-
-  displayedColumns: string[] = ['identitycard', 'name', 'post', 'time', 'operation',];
-  dataSource:any;   //所有企业用户
-
-  name:any //用户姓名
-  identityCard:any //用户账号
-
   //分页
-  @ViewChild(MatPaginator, {static: true}) 
+  @ViewChild(MatPaginator, { static: true })
   pageEvent: PageEvent;
   paginator: MatPaginator;
-  length:any; //共多少条数据
+  length: any; //共多少条数据
-  pageSize:any; //每页条数
-  pageSizeOptions: number[] = [10] //设置每页条数
-  pageNumber:number = 1; //第几页
 
   //分页切换
-  chagePage (e) {
+  chagePage(e) {
-    this.pageNumber = e.pageIndex+1
+    this.pageNumber = e.pageIndex + 1;
-    let data= {
+    this.getAllUsers();
-      name: this.identityCard || '',
-      realName: this.name || '',
-      OrganizationId: this.organizationId || '',
-      RoleType: '1',
-      PageNumber: String(this.pageNumber),
-    }
-    this.http.get('/api/ExamUsers',{params:data}).subscribe((data:any)=>{
-      this.length = data.totalCount
-      this.pageSize = data.pageSize
-      this.dataSource = new MatTableDataSource<any>(data.items)
-    })
-  }
-
-  //页面初始化 + 查询 + 重置
-  initData () {
-    let data= {
-      name: this.identityCard || '',
-      realName: this.name || '',
-      OrganizationId: this.organizationId || '',
-      RoleType: '1',
-    }
-    this.http.get('/api/ExamUsers',{params:data}).subscribe((data:any)=>{
-      this.length = data.totalCount
-      this.pageSize = data.pageSize
-      this.pageEvent.pageIndex = 0
-      this.dataSource = new MatTableDataSource<any>(data.items)
-    })
-  }
-
-  //更新当前页数据
-  getAllUsers () {
-    let data= {
-      name: this.identityCard || '',
-      realName: this.name || '',
-      OrganizationId: this.organizationId || '',
-      RoleType: '1',
-      PageNumber: String(this.pageNumber),
-    }
-    this.http.get('/api/ExamUsers',{params:data}).subscribe((data:any)=>{
-      this.length = data.totalCount
-      this.pageSize = data.pageSize
-      this.dataSource = new MatTableDataSource<any>(data.items)
-    })
   }
 
   //清空搜索
-  empty () {
+  empty() {
-    this.name = '',
+    this.pageNumber = 1;
-    this.identityCard = '',
+    this.name = "";
-    this.organizationId = '',
+    this.identityCard = "";
-    this.organizationName = '',
+    this.organizationId = this.loginUserInfo.organizationId;
-    this.initData()
+    this.getAllUsers();
   }
 
   //创建教员
-  open(){
+  open() {
-    let data = this.treeData
+    let data = this.nodes;
-    let dialogRef = this.dialog.open(AddTeacher,{data});
+    let dialogRef = this.dialog.open(AddTeacher, { data });
-    dialogRef.afterClosed().subscribe(data=>{
+    dialogRef.afterClosed().subscribe((data) => {
       if (data) {
         const config = new MatSnackBarConfig();
-        config.verticalPosition = 'top';
+        config.verticalPosition = "top";
-        config.duration = 3000
+        config.duration = 3000;
-        this.snackBar.open('创建成功!','确定',config);
+        this.snackBar.open("创建成功!", "确定", config);
-        this.getAllUsers()
+        this.getAllUsers();
       }
     });
   }
 
   //编辑企业用户
-  edit (e) {
+  edit(e) {
-    let data = {treeData: this.treeData, userData: e}
+    let data = { treeData: this.nodes, userData: e };
-    let dialogRef = this.dialog.open(editTeacher,{data});
+    let dialogRef = this.dialog.open(editTeacher, { data });
-    dialogRef.afterClosed().subscribe(data=>{
+    dialogRef.afterClosed().subscribe((data) => {
       if (data) {
         const config = new MatSnackBarConfig();
-        config.verticalPosition = 'top';
+        config.verticalPosition = "top";
-        config.duration = 3000
+        config.duration = 3000;
-        this.snackBar.open('修改成功!','确定',config);  
+        this.snackBar.open("修改成功!", "确定", config);
-        this.getAllUsers()
+        this.getAllUsers();
       }
     });
   }
 
   //重置密码
-  reset (e) {
+  reset(e) {
-    this.http.put(`/api/ExamUsers/${e.id}/ResetPassword`,{}).subscribe(
+    this.http.put(`/api/ExamUsers/${e.id}/ResetPassword`, {}).subscribe(
-      data=>{
+      (data) => {
         const config = new MatSnackBarConfig();
-        config.verticalPosition = 'top';
+        config.verticalPosition = "top";
-        config.duration = 3000
+        config.duration = 3000;
-        this.snackBar.open('重置密码成功!','确定',config);
+        this.snackBar.open("重置密码成功!", "确定", config);
-      },err=>{
+      },
+      (err) => {
         const config = new MatSnackBarConfig();
-        config.verticalPosition = 'top';
+        config.verticalPosition = "top";
-        config.duration = 3000
+        config.duration = 3000;
-        this.snackBar.open('重置密码失败!','确定',config);
+        this.snackBar.open("重置密码失败!", "确定", config);
-      })
+      }
+    );
   }
 
   //启用
-  enabled (e) {
+  enabled(e) {
-    e.date = new Date()
+    e.date = new Date();
-    e.enabled = true
+    e.enabled = true;
-    this.http.put(`/api/ExamUsers/${e.id}`,e).subscribe(data => {
+    this.http.put(`/api/ExamUsers/${e.id}`, e).subscribe((data) => {
       const config = new MatSnackBarConfig();
-      config.verticalPosition = 'top';
+      config.verticalPosition = "top";
       config.duration = 3000;
-      this.snackBar.open('启用成功!','确定',config);
+      this.snackBar.open("启用成功!", "确定", config);
       this.getAllUsers();
-    })
+    });
   }
 
   //禁用
-  noEnabled (e) {
+  noEnabled(e) {
-    e.date = new Date()
+    e.date = new Date();
-    e.enabled = false
+    e.enabled = false;
-    this.http.put(`/api/ExamUsers/${e.id}`,e).subscribe(data => {
+    this.http.put(`/api/ExamUsers/${e.id}`, e).subscribe((data) => {
       const config = new MatSnackBarConfig();
-      config.verticalPosition = 'top';
+      config.verticalPosition = "top";
       config.duration = 3000;
-      this.snackBar.open('禁用成功!','确定',config);
+      this.snackBar.open("禁用成功!", "确定", config);
       this.getAllUsers();
-    })
+    });
   }
 
   //删除
-  delete (e) {
+  delete(e) {
-    let isTrue = confirm('您确定要删除吗')
+    let isTrue = confirm("您确定要删除吗");
     if (isTrue) {
-      this.http.delete(`/api/ExamUsers/${e.id}`).subscribe(data=>{
+      this.http.delete(`/api/ExamUsers/${e.id}`).subscribe((data) => {
         const config = new MatSnackBarConfig();
-        config.verticalPosition = 'top';
+        config.verticalPosition = "top";
-        config.duration = 3000
+        config.duration = 3000;
-        this.snackBar.open('删除成功!','确定',config);
+        this.snackBar.open("删除成功!", "确定", config);
-        this.getAllUsers()
+        this.getAllUsers();
-      })
+      });
     }
   }
-
-
-
 }
 
-
-
 //编辑企业用户
 @Component({
-  selector: 'app-editenterpriseuser',
+  selector: "app-editenterpriseuser",
-  templateUrl: './editenterpriseuser.html',
+  templateUrl: "./editenterpriseuser.html",
-  styleUrls: ['./enterpriseuser.component.scss']
+  styleUrls: ["./enterpriseuser.component.scss"],
 })
 export class editTeacher {
-
+  constructor(
-  constructor(private http: HttpClient,public dialogRef: MatDialogRef<editTeacher>,@Inject(MAT_DIALOG_DATA) public data,public snackBar: MatSnackBar,) {}
+    private http: HttpClient,
+    public dialogRef: MatDialogRef<editTeacher>,
+    @Inject(MAT_DIALOG_DATA) public data,
+    public snackBar: MatSnackBar
+  ) {}
 
   ngOnInit(): void {
-    this.dataSource.data = this.data.treeData
+    this.dataSource.data = this.data.treeData;
-    this.name = JSON.parse(JSON.stringify(this.data.userData.name))
+    this.name = JSON.parse(JSON.stringify(this.data.userData.name));
-    this.realName = JSON.parse(JSON.stringify(this.data.userData.realName))
+    this.realName = JSON.parse(JSON.stringify(this.data.userData.realName));
-    this.organizationId = JSON.parse(JSON.stringify(this.data.userData.organizationId))
+    this.organizationId = JSON.parse(
-    this.organizationName = JSON.parse(JSON.stringify(this.data.userData.organizationName))
+      JSON.stringify(this.data.userData.organizationId)
+    );
+    this.organizationName = JSON.parse(
+      JSON.stringify(this.data.userData.organizationName)
+    );
   }
 
-  errmsg:string = null; //捕获错误信息
+  errmsg: string = null; //捕获错误信息
 
-  name:string = null;
+  name: string = null;
-  realName:string = null;
+  realName: string = null;
-  organizationId:string = null;
+  organizationId: string = null;
-  organizationName:string = null;
+  organizationName: string = null;
 
-  private _transformer = (node, level: number) => {   //初始化tree
+  private _transformer = (node, level: number) => {
+    //初始化tree
     return {
       expandable: !!node.children && node.children.length > 0,
       name: node.name,
       level: level,
       id: node.id,
       parentId: node.parentId,
-      children: node.children
+      children: node.children,
     };
-  }
+  };
-  treeControl = new FlatTreeControl<any>(node => node.level, node => node.expandable);
+  treeControl = new FlatTreeControl<any>(
-  treeFlattener = new MatTreeFlattener(this._transformer, node => node.level, node => node.expandable, node => node.children);
+    (node) => node.level,
+    (node) => node.expandable
+  );
+  treeFlattener = new MatTreeFlattener(
+    this._transformer,
+    (node) => node.level,
+    (node) => node.expandable,
+    (node) => node.children
+  );
   dataSource = new MatTreeFlatDataSource(this.treeControl, this.treeFlattener);
   hasChild = (_: number, node: any) => node.expandable;
 
   //选择tree节点
-  selectTree (e) {
+  selectTree(e) {
-    this.organizationId = e.id
+    this.organizationId = e.id;
-    this.organizationName = e.name
+    this.organizationName = e.name;
   }
 
   //提交创建表单
-  onSubmit (e) {
+  onSubmit(e) {
     if (this.organizationId && this.organizationName) {
-      e.phone = this.data.userData.phone
+      e.phone = this.data.userData.phone;
-      e.identityCard = this.data.userData.identityCard
+      e.identityCard = this.data.userData.identityCard;
-      e.roleType = 1
+      e.roleType = 1;
-      e.id = this.data.userData.id
+      e.id = this.data.userData.id;
-      e.enabled = this.data.userData.enabled
+      e.enabled = this.data.userData.enabled;
-      e.creationTime = new Date()
+      e.creationTime = new Date();
-      e.organizationId = this.organizationId
+      e.organizationId = this.organizationId;
-      e.organizationName = this.organizationName
+      e.organizationName = this.organizationName;
-      this.http.put(`/api/ExamUsers/${this.data.userData.id}`,e).subscribe(data => {
+      this.http.put(`/api/ExamUsers/${this.data.userData.id}`, e).subscribe(
-        this.dialogRef.close('success');
+        (data) => {
-      },err => {
+          this.dialogRef.close("success");
-        const config = new MatSnackBarConfig();
+        },
-        config.verticalPosition = 'top';
+        (err) => {
-        config.duration = 3000
+          const config = new MatSnackBarConfig();
-        this.snackBar.open(err,'确定',config);
+          config.verticalPosition = "top";
-      })
+          config.duration = 3000;
+          this.snackBar.open(err, "确定", config);
+        }
+      );
     } else {
       const config = new MatSnackBarConfig();
-      config.verticalPosition = 'top';
+      config.verticalPosition = "top";
-      config.duration = 3000
+      config.duration = 3000;
-      this.snackBar.open('请选择消防救援站','确定',config);  
+      this.snackBar.open("请选择消防救援站", "确定", config);
     }
   }
-
 }
-
-
-
-//查看企业用户
-@Component({
-  selector: 'app-seeenterpriseuser',
-  templateUrl: './seeenterpriseuser.html',
-  styleUrls: ['./enterpriseuser.component.scss']
-})
-export class seeTeacher {
-
-  constructor(public http: HttpClient,public dialog: MatDialog,
-  @Inject(MAT_DIALOG_DATA) public data) { }
-  
-  ngOnInit() {}
-
-}

src/app/ui/ui-routing.module.ts

@@ -1,14 +1,15 @@
-import { Routes, RouterModule } from '@angular/router';
+import { Routes, RouterModule } from "@angular/router";
-import { NgModule } from '@angular/core';
+import { NgModule } from "@angular/core";
-import { TeacherManagementComponent } from './teacherManagement/enterpriseuser.component';
+import { TeacherManagementComponent } from "./teacherManagement/enterpriseuser.component";
-import { EnterpriseuserComponent } from './enterpriseuser/enterpriseuser.component';
+import { EnterpriseuserComponent } from "./enterpriseuser/enterpriseuser.component";
-
+import { AdministratorsComponent } from "./administrators/administrators.component";
 const routes: Routes = [
-  { path: 'teachear', component:TeacherManagementComponent }, //管理员  教员页面	
+  { path: "teachear", component: TeacherManagementComponent }, //管理员  教员页面
-  { path: 'examinee', component:EnterpriseuserComponent }, //管理员  考生页面
+  { path: "examinee", component: EnterpriseuserComponent }, //管理员  考生页面
-]
+  { path: "admin", component: AdministratorsComponent }, //管理员  考生页面
+];
 @NgModule({
-    imports: [RouterModule.forChild(routes)],
+  imports: [RouterModule.forChild(routes)],
-    exports: [RouterModule]
+  exports: [RouterModule],
 })
 export class UiRoutingModule {}

src/app/ui/ui.module.ts

@@ -1,74 +1,153 @@
-import { NgModule } from '@angular/core';
+import { NgModule } from "@angular/core";
-import { CommonModule } from '@angular/common';
+import { CommonModule } from "@angular/common";
-import { UiRoutingModule } from './ui-routing.module';
+import { UiRoutingModule } from "./ui-routing.module";
-import {A11yModule} from '@angular/cdk/a11y';
+import { A11yModule } from "@angular/cdk/a11y";
-import {DragDropModule} from '@angular/cdk/drag-drop';
+import { DragDropModule } from "@angular/cdk/drag-drop";
-import {PortalModule} from '@angular/cdk/portal';
+import { PortalModule } from "@angular/cdk/portal";
-import {ScrollingModule} from '@angular/cdk/scrolling';
+import { ScrollingModule } from "@angular/cdk/scrolling";
-import {CdkStepperModule} from '@angular/cdk/stepper';
+import { CdkStepperModule } from "@angular/cdk/stepper";
-import {CdkTableModule} from '@angular/cdk/table';
+import { CdkTableModule } from "@angular/cdk/table";
-import {CdkTreeModule} from '@angular/cdk/tree';
+import { CdkTreeModule } from "@angular/cdk/tree";
-import {MatAutocompleteModule} from '@angular/material/autocomplete';
+import { MatAutocompleteModule } from "@angular/material/autocomplete";
-import {MatBadgeModule} from '@angular/material/badge';
+import { MatBadgeModule } from "@angular/material/badge";
-import {MatBottomSheetModule} from '@angular/material/bottom-sheet';
+import { MatBottomSheetModule } from "@angular/material/bottom-sheet";
-import {MatButtonModule} from '@angular/material/button';
+import { MatButtonModule } from "@angular/material/button";
-import {MatButtonToggleModule} from '@angular/material/button-toggle';
+import { MatButtonToggleModule } from "@angular/material/button-toggle";
-import {MatCardModule} from '@angular/material/card';
+import { MatCardModule } from "@angular/material/card";
-import {MatCheckboxModule} from '@angular/material/checkbox';
+import { MatCheckboxModule } from "@angular/material/checkbox";
-import {MatChipsModule} from '@angular/material/chips';
+import { MatChipsModule } from "@angular/material/chips";
-import {MatStepperModule} from '@angular/material/stepper';
+import { MatStepperModule } from "@angular/material/stepper";
-import {MatDialogModule} from '@angular/material/dialog';
+import { MatDialogModule } from "@angular/material/dialog";
-import {MatDividerModule} from '@angular/material/divider';
+import { MatDividerModule } from "@angular/material/divider";
-import {MatExpansionModule} from '@angular/material/expansion';
+import { MatExpansionModule } from "@angular/material/expansion";
-import {MatGridListModule} from '@angular/material/grid-list';
+import { MatGridListModule } from "@angular/material/grid-list";
-import {MatIconModule} from '@angular/material/icon';
+import { MatIconModule } from "@angular/material/icon";
-import {MatInputModule} from '@angular/material/input';
+import { MatInputModule } from "@angular/material/input";
-import {MatListModule} from '@angular/material/list';
+import { MatListModule } from "@angular/material/list";
-import {MatMenuModule} from '@angular/material/menu';
+import { MatMenuModule } from "@angular/material/menu";
-import {MatNativeDateModule, MatRippleModule, MatOption} from '@angular/material/core';
+import {
-import {MatPaginatorModule} from '@angular/material/paginator';
+  MatNativeDateModule,
-import {MatProgressBarModule} from '@angular/material/progress-bar';
+  MatRippleModule,
-import {MatProgressSpinnerModule} from '@angular/material/progress-spinner';
+  MatOption,
-import {MatRadioModule} from '@angular/material/radio';
+} from "@angular/material/core";
-import {MatSelectModule} from '@angular/material/select';
+import { MatPaginatorModule } from "@angular/material/paginator";
-import {MatSidenavModule} from '@angular/material/sidenav';
+import { MatProgressBarModule } from "@angular/material/progress-bar";
-import {MatSliderModule} from '@angular/material/slider';
+import { MatProgressSpinnerModule } from "@angular/material/progress-spinner";
-import {MatSlideToggleModule} from '@angular/material/slide-toggle';
+import { MatRadioModule } from "@angular/material/radio";
-import {MatSnackBarModule} from '@angular/material/snack-bar';
+import { MatSelectModule } from "@angular/material/select";
-import {MatSortModule} from '@angular/material/sort';
+import { MatSidenavModule } from "@angular/material/sidenav";
-import {MatTableModule} from '@angular/material/table';
+import { MatSliderModule } from "@angular/material/slider";
-import {MatTabsModule} from '@angular/material/tabs';
+import { MatSlideToggleModule } from "@angular/material/slide-toggle";
-import {MatToolbarModule} from '@angular/material/toolbar';
+import { MatSnackBarModule } from "@angular/material/snack-bar";
-import {MatTooltipModule} from '@angular/material/tooltip';
+import { MatSortModule } from "@angular/material/sort";
-import {MatTreeModule} from '@angular/material/tree';
+import { MatTableModule } from "@angular/material/table";
-import { ReactiveFormsModule, FormsModule } from '@angular/forms';
+import { MatTabsModule } from "@angular/material/tabs";
-import { MatFormFieldModule } from '@angular/material/form-field';
+import { MatToolbarModule } from "@angular/material/toolbar";
-import { MatPaginatorIntl } from '@angular/material/paginator';
+import { MatTooltipModule } from "@angular/material/tooltip";
-import { ChangepasswordComponent } from './changepassword/changepassword.component';
+import { MatTreeModule } from "@angular/material/tree";
-import { testState} from '../pipes/size.pipe';
+import { ReactiveFormsModule, FormsModule } from "@angular/forms";
-import {ConfirmpswDirective} from './changepassword/equal-validator.directive';
+import { MatFormFieldModule } from "@angular/material/form-field";
-import { FileUploadModule } from 'ng2-file-upload'
+import { MatPaginatorIntl } from "@angular/material/paginator";
-import { ChangeuserdataComponent } from './changeuserdata/changeuserdata.component';
+import { ChangepasswordComponent } from "./changepassword/changepassword.component";
-import { IsLoginService } from '../is-login.service';
+import { testState } from "../pipes/size.pipe";
-import { myPaginator } from "./my-paginator"
+import { ConfirmpswDirective } from "./changepassword/equal-validator.directive";
-import { NzDatePickerModule } from 'ng-zorro-antd/date-picker';
+import { FileUploadModule } from "ng2-file-upload";
-import {CollectionToolsComponent,CreateBuilding,EditBuilding,ViewDetailss,} from './collection-tools/collection-tools.component'
+import { ChangeuserdataComponent } from "./changeuserdata/changeuserdata.component";
-import {leftFunctionalDomainComponent,editPlaneFigureComponent,addDisposalNodeComponent,editDisposalNodeComponent} from './collection-tools/leftFunctionalDomain'
+import { IsLoginService } from "../is-login.service";
-import {saveOneDialog,saveTwoDialog} from './collection-tools/save'
+import { myPaginator } from "./my-paginator";
-import {WorkingAreaComponent} from '../working-area/working-area.component'
+import { NzDatePickerModule } from "ng-zorro-antd/date-picker";
-import { NzTreeModule } from 'ng-zorro-antd/tree';
+import {
-import { examinationQuestions,uploadQuestions,uploadDisposalNodes } from './collection-tools/examinationQuestions'
+  CollectionToolsComponent,
-import {AddEnterpriserUser} from './enterpriseuser/addenterpriseuser.component'
+  CreateBuilding,
-import {EnterpriseuserComponent,editenterpriseuser,seeenterpriseuser} from './enterpriseuser/enterpriseuser.component'
+  EditBuilding,
-import {AddTeacher} from './teacherManagement/addenterpriseuser.component'
+  ViewDetailss,
-import {TeacherManagementComponent,editTeacher,seeTeacher} from './teacherManagement/enterpriseuser.component'
+} from "./collection-tools/collection-tools.component";
-import { CollectionToolsExamineeComponent } from './collection-tools-examinee/collection-tools.component';
+import {
-import { examinationQuestionsExaminee, uploadDisposalNodesExaminee, uploadQuestionsExaminee } from './collection-tools-examinee/examinationQuestions';
+  leftFunctionalDomainComponent,
-import { saveOneDialogExaminee, saveTwoDialogExaminee } from './collection-tools-examinee/save';
+  editPlaneFigureComponent,
-import { CollectionToolsReadComponent, Score } from './collection-tools-read/collection-tools.component';
+  addDisposalNodeComponent,
-import { examinationQuestionsRead, uploadDisposalNodesRead, uploadQuestionsRead } from './collection-tools-read/examinationQuestions';
+  editDisposalNodeComponent,
+} from "./collection-tools/leftFunctionalDomain";
+import { saveOneDialog, saveTwoDialog } from "./collection-tools/save";
+import { WorkingAreaComponent } from "../working-area/working-area.component";
+import { NzTreeModule } from "ng-zorro-antd/tree";
+import {
+  examinationQuestions,
+  uploadQuestions,
+  uploadDisposalNodes,
+} from "./collection-tools/examinationQuestions";
+import { AddEnterpriserUser } from "./enterpriseuser/addenterpriseuser.component";
+import {
+  EnterpriseuserComponent,
+  editenterpriseuser,
+} from "./enterpriseuser/enterpriseuser.component";
+import { AddTeacher } from "./teacherManagement/addenterpriseuser.component";
+import {
+  TeacherManagementComponent,
+  editTeacher,
+} from "./teacherManagement/enterpriseuser.component";
+import { CollectionToolsExamineeComponent } from "./collection-tools-examinee/collection-tools.component";
+import {
+  examinationQuestionsExaminee,
+  uploadDisposalNodesExaminee,
+  uploadQuestionsExaminee,
+} from "./collection-tools-examinee/examinationQuestions";
+import {
+  saveOneDialogExaminee,
+  saveTwoDialogExaminee,
+} from "./collection-tools-examinee/save";
+import {
+  CollectionToolsReadComponent,
+  Score,
+} from "./collection-tools-read/collection-tools.component";
+import {
+  examinationQuestionsRead,
+  uploadDisposalNodesRead,
+  uploadQuestionsRead,
+} from "./collection-tools-read/examinationQuestions";
+import { NzTreeSelectModule } from "ng-zorro-antd/tree-select";
+import { AdministratorsComponent } from "./administrators/administrators.component";
+import { AddEditAdminComponent } from "./administrators/add-edit-admin/add-edit-admin.component";
 @NgModule({
-  declarations: [ChangepasswordComponent,ConfirmpswDirective, ChangeuserdataComponent,testState,CollectionToolsComponent,CreateBuilding,EditBuilding,ViewDetailss,leftFunctionalDomainComponent,editPlaneFigureComponent,addDisposalNodeComponent,editDisposalNodeComponent,saveOneDialog,saveTwoDialog,WorkingAreaComponent,examinationQuestions,uploadQuestions,AddEnterpriserUser,EnterpriseuserComponent,editenterpriseuser,seeenterpriseuser,AddTeacher,TeacherManagementComponent,editTeacher,seeTeacher,uploadDisposalNodes,CollectionToolsExamineeComponent,examinationQuestionsExaminee,uploadQuestionsExaminee,uploadDisposalNodesExaminee,saveOneDialogExaminee,saveTwoDialogExaminee,CollectionToolsReadComponent,examinationQuestionsRead,uploadQuestionsRead,uploadDisposalNodesRead,Score],
+  declarations: [
+    ChangepasswordComponent,
+    ConfirmpswDirective,
+    ChangeuserdataComponent,
+    testState,
+    CollectionToolsComponent,
+    CreateBuilding,
+    EditBuilding,
+    ViewDetailss,
+    leftFunctionalDomainComponent,
+    editPlaneFigureComponent,
+    addDisposalNodeComponent,
+    editDisposalNodeComponent,
+    saveOneDialog,
+    saveTwoDialog,
+    WorkingAreaComponent,
+    examinationQuestions,
+    uploadQuestions,
+    AddEnterpriserUser,
+    EnterpriseuserComponent,
+    editenterpriseuser,
+    AddTeacher,
+    TeacherManagementComponent,
+    editTeacher,
+    uploadDisposalNodes,
+    CollectionToolsExamineeComponent,
+    examinationQuestionsExaminee,
+    uploadQuestionsExaminee,
+    uploadDisposalNodesExaminee,
+    saveOneDialogExaminee,
+    saveTwoDialogExaminee,
+    CollectionToolsReadComponent,
+    examinationQuestionsRead,
+    uploadQuestionsRead,
+    uploadDisposalNodesRead,
+    Score,
+    AdministratorsComponent,
+    AddEditAdminComponent,
+  ],
   imports: [
     NzDatePickerModule,
     CommonModule,
@@ -117,9 +196,9 @@ import { examinationQuestionsRead, uploadDisposalNodesRead, uploadQuestionsRead
     ReactiveFormsModule,
     FormsModule,
     FileUploadModule,
-    NzTreeModule
+    NzTreeModule,
+    NzTreeSelectModule,
   ],
-  providers: [ { provide: MatPaginatorIntl, useValue: myPaginator() } ]
+  providers: [{ provide: MatPaginatorIntl, useValue: myPaginator() }],
-
 })
-export class UiModule { }
+export class UiModule {}