+
+
+
+ | 用户帐号 | +{{element.name}} | +用户姓名 | +{{element.realName}} | +消防救援站 | +{{element.organizationName}} | +创建时间 | +{{element.creationTime | date:'yyyy-MM-dd'}} | +操作 | ++ 重置密码 + 编辑 + 禁用 + 启用 + 删除 + | +
|---|
-
+ [nzExpandedKeys]="expandedKeys">
@@ -21,7 +21,7 @@
- 包含下级
+ 包含下级
diff --git a/src/app/examiner/examiner-index/examiner-index.component.ts b/src/app/examiner/examiner-index/examiner-index.component.ts
index 4e9520b..3b29f2b 100644
--- a/src/app/examiner/examiner-index/examiner-index.component.ts
+++ b/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.allorganizations = data;
- console.log("组织机构列表", this.allorganizations);
- this.treedata = this.tree.toTree(data);
- this.getpresentOrganization();
- });
+ this.http
+ .get("/api/Organizations", {
+ params: {
+ strict: "true",
+ },
+ })
+ .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);
- let paramsdata: any = {
- PageNumber: this.PageNumber || "1",
- PageSize: this.pageSizeOptions[0],
- OrganizationId: this.js || "",
- HasChildren: this.jscheck || "",
- Sort: null,
- SortType: null,
- };
- if (!this.js) {
+ if (!this.orId) {
this.snackBar.open("请选择消防救援队", "确定", config);
} else {
this.PageNumber = 1;
@@ -255,8 +223,8 @@ export class ExaminerIndexComponent implements OnInit {
}
//重置按钮
Reset() {
- this.js = "";
- this.jscheck = "";
+ this.orId = this.Profiles.organizationId;
+ 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();
}
}
diff --git a/src/app/examiner/examiner-new-one/examiner-new-one.component.ts b/src/app/examiner/examiner-new-one/examiner-new-one.component.ts
index da84e65..3e99ab2 100644
--- a/src/app/examiner/examiner-new-one/examiner-new-one.component.ts
+++ b/src/app/examiner/examiner-new-one/examiner-new-one.component.ts
@@ -1,51 +1,65 @@
/*
- * @Descripttion:
- * @version:
+ * @Descripttion:
+ * @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 { HttpClient } from '@angular/common/http'
-import { MatTreeFlatDataSource, MatTreeFlattener } from '@angular/material/tree';
-import { MatPaginator } from '@angular/material/paginator';
-import { FlatTreeControl } from '@angular/cdk/tree';
-import { FormControl } from '@angular/forms';
-import { Router, ActivatedRoute } from '@angular/router'
-import { PageEvent } from '@angular/material/paginator';
-import { 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';
+import { Component, OnInit, ViewChild, Inject } from "@angular/core";
+import { HttpClient } from "@angular/common/http";
+import {
+ MatTreeFlatDataSource,
+ MatTreeFlattener,
+} from "@angular/material/tree";
+import { MatPaginator } from "@angular/material/paginator";
+import { FlatTreeControl } from "@angular/cdk/tree";
+import { FormControl } from "@angular/forms";
+import { Router, ActivatedRoute } from "@angular/router";
+import { PageEvent } from "@angular/material/paginator";
+import {
+ 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',
- templateUrl: './examiner-new-one.component.html',
- styleUrls: ['./examiner-new-one.component.scss']
+ selector: "app-examiner-new-one",
+ templateUrl: "./examiner-new-one.component.html",
+ 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 || ''
- indexid = sessionStorage.getItem("paperId") //上个页面传过来的id
+ pattern: any = this.route.snapshot.queryParams.pattern || "";
+ 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] //设置每页条数
- PageNumber: any //第几页
+ pageSizeOptions: number[] = [10]; //设置每页条数
+ PageNumber: any; //第几页
- displayedColumns: string[] = ['checked', 'unitname', 'jurisdictionsquadron', 'unittype', 'scc'];
- tabledataSource: any
- allorganizations: any
+ displayedColumns: string[] = [
+ "checked",
+ "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.getAllKeyUnit()
+ this.PageNumber = "1";
+ this.getAllKeyUnit();
}
//获得所有重点单位
- allKeyUnitInfo: any //所有的重点单位
+ allKeyUnitInfo: any; //所有的重点单位
getAllKeyUnit() {
let paramsdata: any = {
- Name: this.companyName || '',
- OrganizationId: this.js || '',
- HasChildren: this.jscheck || '',
- USCI: this.shehui || '',
- PageNumber: this.PageNumber || '1',
+ Name: this.companyName || "",
+ OrganizationId: this.js || "",
+ HasChildren: this.jscheck || "",
+ USCI: this.shehui || "",
+ PageNumber: this.PageNumber || "1",
PageSize: this.pageSizeOptions[0],
- }
- this.http.get("/api/Companies", { params: paramsdata }).subscribe((data: any) => {
- this.length = data.totalCount
- this.allKeyUnitInfo = data
- this.tabledataSource = new MatTableDataSource(data.items);
- if (this.selectedunitArr.length != 0) {
- for (var i = 0; i < this.tabledataSource.filteredData.length; i++) {
- 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
+ };
+ this.http
+ .get("/api/Companies", { params: paramsdata })
+ .subscribe((data: any) => {
+ this.length = data.totalCount;
+ this.allKeyUnitInfo = data;
+ this.tabledataSource = new MatTableDataSource(data.items);
+ if (this.selectedunitArr.length != 0) {
+ for (var i = 0; i < this.tabledataSource.filteredData.length; i++) {
+ 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(
- (data: any) => {
- this.organizationName = data.organizationName
- }
- )
+ this.http.get("/api/ExamAccounts/Profiles").subscribe((data: any) => {
+ this.organizationName = data.organizationName;
+ });
}
- organizationName: any //当前单位组织机构名称
- treedata: any //组织机构树型数据
- newArr: any = []
- newallorganizations: any //用于存储在原始数据基础上的每个机构增加children字段
+ organizationName: any; //当前单位组织机构名称
+ treedata: any; //组织机构树型数据
+ newArr: any = [];
+ newallorganizations: any; //用于存储在原始数据基础上的每个机构增加children字段
- nodes: any = []
- expandedKeys: any = []//默认展开tree节点
+ nodes: any = [];
+ expandedKeys: any = []; //默认展开tree节点
//得到当前单位所在组织机构的tree型数据
getpresentOrganization() {
- this.newallorganizations = this.allorganizations
- this.newallorganizations.forEach(item => {
- item.children = []
- this.newallorganizations.forEach(element => {
+ this.newallorganizations = this.allorganizations;
+ this.newallorganizations.forEach((item) => {
+ item.children = [];
+ this.newallorganizations.forEach((element) => {
if (element.parentId == item.id) {
- item.children.push(element)
+ item.children.push(element);
}
});
});
- this.http.get("/api/ExamAccounts/Profiles").subscribe(
- (data: any) => {
- this.organizationName = data.organizationName
- if (this.organizationName) {
- this.newallorganizations.forEach(item => {
- if (item.name == this.organizationName) {
- this.expandedKeys = [item.key]
- this.nodes = [item]
- }
- });
- } else {
- this.expandedKeys = this.nodes[0].key
- this.nodes = this.tree.toTree(this.treedata);
- }
+ this.http.get("/api/ExamAccounts/Profiles").subscribe((data: any) => {
+ this.organizationName = data.organizationName;
+ if (this.organizationName) {
+ this.newallorganizations.forEach((item) => {
+ if (item.name == this.organizationName) {
+ this.expandedKeys = [item.key];
+ this.nodes = [item];
+ }
+ });
+ } else {
+ this.expandedKeys = this.nodes[0].key;
+ this.nodes = this.tree.toTree(this.treedata);
}
- )
-
+ });
}
-
-
//获得所有组织机构
getOrganizations() {
- this.http.get('/api/Organizations').subscribe(
- (data: any) => {
- this.allorganizations = data
+ this.http
+ .get("/api/Organizations", {
+ 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(
- data => {
- this.allunittype = data
- }
- )
+ this.http.get("/api/BuildingTypes/Simple").subscribe((data) => {
+ this.allunittype = data;
+ });
}
- selectedunitArr: any = JSON.parse(sessionStorage.getItem(this.indexid)) || [] //选中单位的数组
- deleteByid = ""//根据id取消选中
+ selectedunitArr: any = JSON.parse(sessionStorage.getItem(this.indexid)) || []; //选中单位的数组
+ deleteByid = ""; //根据id取消选中
//勾选框事件
checkChange(e, element) {
- console.log(e, element)
- element.checked = e.checked
+ console.log(e, element);
+ element.checked = e.checked;
if (element.checked) {
- this.selectedunitArr.push(element)
- }
- else {
+ this.selectedunitArr.push(element);
+ } 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(this.tabledataSource.data)
+ console.log(e.target.id);
+ 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.duration = 3000
+ config.verticalPosition = "top";
+ config.duration = 3000;
if (this.selectedunitArr.length == 0) {
- this.snackBar.open('请选择单位', '确定', config);
- }
- else {
- if (this.pattern == 'edit') {
- this.router.navigateByUrl("/examiner/create-test-score?pattern=edit")
+ this.snackBar.open("请选择单位", "确定", config);
+ } else {
+ if (this.pattern == "edit") {
+ this.router.navigateByUrl("/examiner/create-test-score?pattern=edit");
} else {
- sessionStorage.setItem(this.indexid, JSON.stringify(this.selectedunitArr))
- this.router.navigateByUrl("/examiner/create-test-score")
+ sessionStorage.setItem(
+ this.indexid,
+ JSON.stringify(this.selectedunitArr)
+ );
+ this.router.navigateByUrl("/examiner/create-test-score");
}
-
}
-
}
//编辑单位信息
editunit() {
- sessionStorage.setItem("six", "edit")
- let selectedunitArr = []
- let selectedunitobj = []
- this.allKeyUnitInfo.items.forEach(item => {
+ sessionStorage.setItem("six", "edit");
+ let selectedunitArr = [];
+ let selectedunitobj = [];
+ this.allKeyUnitInfo.items.forEach((item) => {
if (item.checked) {
- selectedunitArr.push(item.id)
- selectedunitobj.push(item)
+ selectedunitArr.push(item.id);
+ selectedunitobj.push(item);
}
});
if (selectedunitArr.length == 0) {
const config = new MatSnackBarConfig();
- config.verticalPosition = 'top';
- config.duration = 3000
- this.snackBar.open('请先选择要修改的单位', '确定', config);
+ config.verticalPosition = "top";
+ config.duration = 3000;
+ this.snackBar.open("请先选择要修改的单位", "确定", config);
}
if (selectedunitArr.length != 1 && selectedunitArr.length != 0) {
const config = new MatSnackBarConfig();
- config.verticalPosition = 'top';
- config.duration = 3000
- this.snackBar.open('只能选择一个单位修改', '确定', config);
+ config.verticalPosition = "top";
+ config.duration = 3000;
+ 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
- sessionStorage.setItem("companyName", companyName)
+ let companyName = item.name;
+ sessionStorage.setItem("companyName", companyName);
}
});
- sessionStorage.setItem("editable", "1")
- sessionStorage.setItem(selectedunitobj[0].id, JSON.stringify(selectedunitobj[0].companyIntegrityScore))
+ sessionStorage.setItem("editable", "1");
+ sessionStorage.setItem(
+ selectedunitobj[0].id,
+ JSON.stringify(selectedunitobj[0].companyIntegrityScore)
+ );
window.open(`/keyUnit/editplaninfo?id=${selectedunitArr[0]}`);
}
}
-
//重置
- js: any //辖区中队输入框
- companyName: any //单位名称
- shehui: any //统一社会信用代码
- unittype: any //单位类型
- jscheck: any //辖区中队包含下级
- OrganizationId //
- follow: any = '' //是否为关注单位
- integritySort: any //完整度排序
+ js: any; //辖区中队输入框
+ companyName: any; //单位名称
+ shehui: any; //统一社会信用代码
+ unittype: any; //单位类型
+ jscheck: any; //辖区中队包含下级
+ OrganizationId; //
+ follow: any = ""; //是否为关注单位
+ integritySort: any; //完整度排序
reset() {
- this.js = '' //辖区中队输入框
- this.jscheck = '' //辖区中队包含下级
- this.companyName = '' //单位名称
- this.shehui = '' //统一社会信用代码
- this.PageNumber = 1
- this.pageEvent.pageIndex = 0
+ this.js = ""; //辖区中队输入框
+ this.jscheck = ""; //辖区中队包含下级
+ this.companyName = ""; //单位名称
+ this.shehui = ""; //统一社会信用代码
+ this.PageNumber = 1;
+ this.pageEvent.pageIndex = 0;
this.getAllKeyUnit();
}
//提交查询表单
onSubmit(value) {
- this.PageNumber = 1
- this.pageEvent.pageIndex = 0
+ this.PageNumber = 1;
+ this.pageEvent.pageIndex = 0;
this.getAllKeyUnit();
}
stopclose(e) {
e.stopPropagation();
}
-
-
-
}
diff --git a/src/app/examiner/mark-papers-index/mark-papers-index.component.html b/src/app/examiner/mark-papers-index/mark-papers-index.component.html
index a8afb70..6fd5428 100644
--- a/src/app/examiner/mark-papers-index/mark-papers-index.component.html
+++ b/src/app/examiner/mark-papers-index/mark-papers-index.component.html
@@ -10,12 +10,12 @@
diff --git a/src/app/examiner/statistic-analysis/examStatistics/examinee-papers/examinee-papers.component.scss b/src/app/examiner/statistic-analysis/examStatistics/examinee-papers/examinee-papers.component.scss
index 6abe71d..0831fab 100644
--- a/src/app/examiner/statistic-analysis/examStatistics/examinee-papers/examinee-papers.component.scss
+++ b/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;
diff --git a/src/app/examiner/statistic-analysis/examStatistics/examinee-papers/examinee-papers.component.ts b/src/app/examiner/statistic-analysis/examStatistics/examinee-papers/examinee-papers.component.ts
index 183624f..797b7dd 100644
--- a/src/app/examiner/statistic-analysis/examStatistics/examinee-papers/examinee-papers.component.ts
+++ b/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.allorganizations = data;
- this.treedata = this.tree.toTree(data);
- this.getpresentOrganization();
- });
+ this.http
+ .get("/api/Organizations", {
+ 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();
+ });
}
//得到当前单位所在组织机构的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);
+ }
}
diff --git a/src/app/examiner/statistic-analysis/examStatistics/station-examinee/station-examinee.component.ts b/src/app/examiner/statistic-analysis/examStatistics/station-examinee/station-examinee.component.ts
index 8d8c564..ef26108 100644
--- a/src/app/examiner/statistic-analysis/examStatistics/station-examinee/station-examinee.component.ts
+++ b/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.allorganizations = data;
- this.treedata = this.tree.toTree(data);
- // this.orId = this.organizationId;
- this.nodes = this.treedata;
- // this.getpresentOrganization();
- });
- }
- //得到当前单位所在组织机构的tree型数据
- organizationName;
- newallorganizations;
- 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];
- }
+ 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.tree.toTree(data)];
});
- } else {
- this.nodes = this.tree.toTree(this.treedata);
- this.expandedKeys = this.nodes[0].key;
- }
}
//获取表格信息
diff --git a/src/app/http-interceptors/base-interceptor.ts b/src/app/http-interceptors/base-interceptor.ts
index 4cabcd7..b7c43cf 100644
--- a/src/app/http-interceptors/base-interceptor.ts
+++ b/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,
- HttpErrorResponse
-} from '@angular/common/http';
-import { throwError } from 'rxjs'
-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';
+ HttpClient,
+ HttpEvent,
+ HttpInterceptor,
+ HttpHandler,
+ HttpRequest,
+ HttpErrorResponse,
+} from "@angular/common/http";
+import { throwError } from "rxjs";
+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(private http:HttpClient,private router:Router,private route:ActivatedRoute,public token:CacheTokenService,public snackBar: MatSnackBar,public isLogin: IsLoginService) {}
+ constructor(
+ 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.set('Authorization', `Bearer ${token}`)
+ newReq.headers = newReq.headers.set("Authorization", `Bearer ${token}`);
}
// 携带请求头发送下一次请求
- return next.handle(newReq)
- .pipe(
- //箭头函数,注意this指向
- catchError((err) => this.handleError(err))
- )
+ return next.handle(newReq).pipe(
+ //箭头函数,注意this指向
+ catchError((err) => this.handleError(err))
+ );
}
- // 捕获错误
+ // 捕获错误
//401 token过期 403没权限!!! 400参数错误 404未找到 614刷新令牌过期!!!
private handleError(error: HttpErrorResponse) {
// 用户认证失败返回登录页
- if (error.status === 401||error.status === 614) {
- sessionStorage.clear()
- localStorage.clear()
- this.router.navigate(['/login'])
+ if (error.status === 401 || error.status === 614) {
+ sessionStorage.clear();
+ localStorage.clear();
+ this.router.navigate(["/login"]);
const config = new MatSnackBarConfig();
- config.verticalPosition = 'top';
- config.duration = 3000
- this.snackBar.open('用户认证信息过期,请重新登录','确定',config);
- }
- if (error.status === 403) {
+ config.verticalPosition = "top";
+ config.duration = 3000;
+ this.snackBar.open("用户认证信息过期,请重新登录", "确定", config);
+ } else if (error.status === 403) {
const config = new MatSnackBarConfig();
- config.verticalPosition = 'top';
- config.duration = 3000
- this.snackBar.open('对不起,您无此权限','确定',config);
- }
- if (error.status === 400) {
+ config.verticalPosition = "top";
+ config.duration = 3000;
+ this.snackBar.open("对不起,您无此权限", "确定", config);
+ } else if (error.status === 400) {
const config = new MatSnackBarConfig();
- config.verticalPosition = 'top';
- config.duration = 3000
- this.snackBar.open('您输入的参数有误','确定',config);
+ config.verticalPosition = "top";
+ config.duration = 3000;
+ 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}, ` +
- `body was: ${error.error}`);
+ `Backend returned code ${error.status}, ` + `body was: ${error.error}`
+ );
}
// 返回带有面向用户的错误信息
- return throwError(
- error.error);
- };
+ return throwError(error.error);
+ }
}
diff --git a/src/app/navigation/navigation.component.html b/src/app/navigation/navigation.component.html
index ea7ed8c..ada1b8b 100644
--- a/src/app/navigation/navigation.component.html
+++ b/src/app/navigation/navigation.component.html
@@ -45,6 +45,9 @@
+
+
+
diff --git a/src/app/navigation/navigation.component.ts b/src/app/navigation/navigation.component.ts
index d6a04db..0cda585 100644
--- a/src/app/navigation/navigation.component.ts
+++ b/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 = "能力分析";
}
}
diff --git a/src/app/pages/lockscreen/lockscreen.component.ts b/src/app/pages/lockscreen/lockscreen.component.ts
index a045f33..2575af1 100644
--- a/src/app/pages/lockscreen/lockscreen.component.ts
+++ b/src/app/pages/lockscreen/lockscreen.component.ts
@@ -1,62 +1,69 @@
-import { Component, OnInit } from '@angular/core';
-import { Router,ActivatedRoute } from '@angular/router'
-import { MatSnackBarConfig, MatSnackBar } from '@angular/material/snack-bar';
-import { HttpClient } from '@angular/common/http';
-import { IsLoginService } from '../../is-login.service'//引入服务
-import {CacheTokenService} from '../../http-interceptors/cache-token.service'//引入服务
-
-
+import { Component, OnInit } from "@angular/core";
+import { Router, ActivatedRoute } from "@angular/router";
+import { MatSnackBarConfig, MatSnackBar } from "@angular/material/snack-bar";
+import { HttpClient } from "@angular/common/http";
+import { IsLoginService } from "../../is-login.service"; //引入服务
+import { CacheTokenService } from "../../http-interceptors/cache-token.service"; //引入服务
@Component({
- selector: 'app-lockscreen',
- templateUrl: './lockscreen.component.html',
- styleUrls: ['./lockscreen.component.scss']
+ selector: "app-lockscreen",
+ templateUrl: "./lockscreen.component.html",
+ 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() {
-
- }
-
- roleType:string = '1'; //登录角色
- errmsg :string = ''; //错误信息
-
+ ngOnInit() {}
+ roleType: string = "1"; //登录角色
+ errmsg: string = ""; //错误信息
//登录
- onSubmit(e){
- let params = { roleType: this.roleType }
- this.http.post('/api/ExamAccounts/SignIn',e,{params}).subscribe((data:any)=>{
- sessionStorage.setItem("realName",data.realName);
- sessionStorage.setItem("roleType",data.roleType);
- sessionStorage.setItem("token",data.token);
- sessionStorage.setItem("refreshToken",data.refreshToken);
- sessionStorage.setItem("level",data.level);
- this.token.startUp(); //登陆成功启动定时器刷新token
- this.roleType == '1'? this.router.navigate(['/home/createexam-index']) : this.router.navigate(['/home/student-index'])
- },(err) => {this.errmsg = err})
+ onSubmit(e) {
+ let params = { roleType: this.roleType };
+ this.http.post("/api/ExamAccounts/SignIn", e, { params }).subscribe(
+ (data: any) => {
+ sessionStorage.setItem("realName", data.realName);
+ sessionStorage.setItem("roleType", data.roleType);
+ sessionStorage.setItem("token", data.token);
+ sessionStorage.setItem("refreshToken", data.refreshToken);
+ sessionStorage.setItem("level", data.level);
+ this.http.get("/api/ExamAccounts/Profiles").subscribe((v: any) => {
+ 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) {
- this.roleType = e
+ toggle(e) {
+ this.roleType = e;
}
//跳转管理员登录页面
- toAdminLogin () {
- this.router.navigate(['/adminLogin']) //跳转管理员登录页面
+ toAdminLogin() {
+ this.router.navigate(["/adminLogin"]); //跳转管理员登录页面
}
//忘记密码弹窗
- forget () {
+ forget() {
const config = new MatSnackBarConfig();
- config.verticalPosition = 'top';
- config.duration = 3000
- this.snackBar.open('请联系管理员重置密码','确定',config);
+ config.verticalPosition = "top";
+ config.duration = 3000;
+ this.snackBar.open("请联系管理员重置密码", "确定", config);
}
-
-
-
}
diff --git a/src/app/pages/login/login.component.ts b/src/app/pages/login/login.component.ts
index 8503f69..06a0a79 100644
--- a/src/app/pages/login/login.component.ts
+++ b/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.router.navigate(["/home/teachear"]); //登陆成功跳转页面
+ this.http.get("/api/ExamAccounts/Profiles").subscribe((v: any) => {
+ this.token.startUp(); //登陆成功启动定时器刷新token
+ this.router.navigate(["/home/teachear"]); //登陆成功跳转页面
+ sessionStorage.setItem("creatorData", JSON.stringify(v));
+ });
},
(err) => {
this.errmsg = err;
diff --git a/src/app/student/student-exam-record/student-exam-record.component.ts b/src/app/student/student-exam-record/student-exam-record.component.ts
index da982fe..ee54ebd 100644
--- a/src/app/student/student-exam-record/student-exam-record.component.ts
+++ b/src/app/student/student-exam-record/student-exam-record.component.ts
@@ -1,72 +1,86 @@
/*
- * @Descripttion:
- * @version:
+ * @Descripttion:
+ * @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 {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 { 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'
+import { Component, OnInit, ViewChild, Inject, Input } 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 { 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',
- templateUrl: './student-exam-record.component.html',
- styleUrls: ['./student-exam-record.component.scss']
+ selector: "app-student-exam-record",
+ templateUrl: "./student-exam-record.component.html",
+ styleUrls: ["./student-exam-record.component.scss"],
})
export class StudentExamRecordComponent implements OnInit {
-
- constructor(private router: Router,private activatedRoute: ActivatedRoute,public http: HttpClient,public dialog: MatDialog,public snackBar: MatSnackBar,private tree: TreeService) { }
+ constructor(
+ 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; //共多少条数据
- pageSize:any; //每页条数
- pageSizeOptions: number[] = [10] //设置每页条数
- PageNumber:any //第几页
- startTime:[]
- endTime:[]
- tabledataSource//表格数据
+ length: any; //共多少条数据
+ pageSize: any; //每页条数
+ pageSizeOptions: number[] = [10]; //设置每页条数
+ PageNumber: any; //第几页
+ startTime: [];
+ endTime: [];
+ tabledataSource; //表格数据
//分页事件
- chagePage(e){
- this.PageNumber = e.pageIndex+1
- this.getAlltabledate()
+ chagePage(e) {
+ this.PageNumber = e.pageIndex + 1;
+ this.getAlltabledate();
}
//获取表格信息
- getAlltabledate(){
- let paramsdata:any = {
- PageNumber: this.PageNumber || '1',
- PageSize: this.pageSizeOptions[0],
+ getAlltabledate() {
+ let paramsdata: any = {
+ PageNumber: this.PageNumber || "1",
+ PageSize: this.pageSizeOptions[0],
Sort: null,
- SortType: null
- }
- this.http.get("/api/Examinations",{params:paramsdata}).subscribe((data:any)=>{
- this.tabledataSource=data.items
- this.length=data.totalCount
- })
+ SortType: null,
+ };
+ this.http
+ .get("/api/Examinations", { params: paramsdata })
+ .subscribe((data: any) => {
+ this.tabledataSource = data.items;
+ this.length = data.totalCount;
+ });
}
//查看试卷
- seePaper (e) {
- window.open(`/reviewFiles?examId=${e.id}&paperType=2`)
+ seePaper(e) {
+ window.open(`/reviewFiles?examId=${e.id}&paperType=2`);
}
-
}
diff --git a/src/app/student/student-index/student-index.component.ts b/src/app/student/student-index/student-index.component.ts
index 7a7c85c..ad779fe 100644
--- a/src/app/student/student-index/student-index.component.ts
+++ b/src/app/student/student-index/student-index.component.ts
@@ -1,121 +1,136 @@
/*
- * @Descripttion:
- * @version:
+ * @Descripttion:
+ * @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 { 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 { 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'
+import { Component, OnInit, ViewChild, Inject, Input } 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 { 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',
- templateUrl: './student-index.component.html',
- styleUrls: ['./student-index.component.scss']
+ selector: "app-student-index",
+ templateUrl: "./student-index.component.html",
+ styleUrls: ["./student-index.component.scss"],
})
export class StudentIndexComponent implements OnInit {
-
- constructor(private router: Router, private activatedRoute: ActivatedRoute, public http: HttpClient, public dialog: MatDialog, public snackBar: MatSnackBar, private tree: TreeService) { }
+ constructor(
+ private router: Router,
+ private activatedRoute: ActivatedRoute,
+ public http: HttpClient,
+ public dialog: MatDialog,
+ public snackBar: MatSnackBar,
+ private tree: TreeService
+ ) {}
ngOnInit(): void {
- this.getAlltabledate()
- this.tableInterval = setInterval(() => this.getAlltabledate(), 60000)
+ this.getAlltabledate();
+ 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.tableInterval)
+ clearInterval(this.idtime);
+ clearInterval(this.tableInterval);
}
- idtime
- tableInterval
+ idtime;
+ tableInterval;
//分页
@ViewChild(MatPaginator, { static: true })
pageEvent: PageEvent;
paginator: MatPaginator;
length: any; //共多少条数据
- pageSize: any; //每页条数
- pageSizeOptions: number[] = [10] //设置每页条数
- PageNumber: any //第几页
- startTime: []
- endTime: []
- tabledataSource//表格数据
- timecha
+ pageSize: any = 10; //每页条数
+ pageSizeOptions: number[] = [10]; //设置每页条数
+ PageNumber: any; //第几页
+ startTime: [];
+ endTime: [];
+ tabledataSource; //表格数据
+ timecha;
//分页事件
chagePage(e) {
- this.PageNumber = e.pageIndex + 1
- this.getAlltabledate()
+ this.PageNumber = e.pageIndex + 1;
+ this.getAlltabledate();
}
//获取表格信息
getAlltabledate() {
let paramsdata: any = {
- PageNumber: this.PageNumber || '1',
- PageSize: this.pageSizeOptions[0],
+ PageNumber: this.PageNumber || "1",
+ PageSize: this.pageSize,
Sort: null,
SortType: null,
- Status: 1
- }
- this.http.get("/api/Papers", { params: paramsdata }).subscribe((data: any) => {
- this.tabledataSource = data.items
- this.length = data.totalCount
- //console.log(this.tabledataSource)
- })
+ Status: 1,
+ };
+ this.http
+ .get("/api/Papers", { params: paramsdata })
+ .subscribe((data: any) => {
+ this.tabledataSource = data.items;
+ this.length = data.totalCount;
+ //console.log(this.tabledataSource)
+ });
}
//计时器
jishi(startTime, endTime) {
//startTime=new Date
- var nowtime = new Date(startTime), //获取开始时间
- endtime = new Date(endTime); //定义结束时间
- var jieshu = nowtime.getTime()
- setInterval(() => { jieshu-- })
+ var nowtime = new Date(startTime), //获取开始时间
+ endtime = new Date(endTime); //定义结束时间
+ var jieshu = nowtime.getTime();
+ setInterval(() => {
+ jieshu--;
+ });
//console.log(endtime.getSeconds()-1)
- var lefttime = jieshu - nowtime.getTime(), //距离结束时间的毫秒数
- leftd = Math.floor(lefttime / (1000 * 60 * 60 * 24)), //计算天数
- lefth = Math.floor(lefttime / (1000 * 60 * 60)), //计算小时数
- leftm = Math.floor(lefttime / (1000 * 60) % 60), //计算分钟数
- lefts = Math.floor(lefttime / 1000 % 60); //计算秒数
- this.timecha = lefth + ":" + leftm + ":" + lefts
+ var lefttime = jieshu - nowtime.getTime(), //距离结束时间的毫秒数
+ leftd = Math.floor(lefttime / (1000 * 60 * 60 * 24)), //计算天数
+ lefth = Math.floor(lefttime / (1000 * 60 * 60)), //计算小时数
+ leftm = Math.floor((lefttime / (1000 * 60)) % 60), //计算分钟数
+ lefts = Math.floor((lefttime / 1000) % 60); //计算秒数
+ this.timecha = lefth + ":" + leftm + ":" + lefts;
- if (this.timecha == '0:0:0') {
- this.timecha = "已结束"
- clearInterval(this.idtime)
+ if (this.timecha == "0:0:0") {
+ this.timecha = "已结束";
+ 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
- str_time = ""
+ time_server_client;
+ str_time = "";
gettime(endtime, stearttime) {
- this.time_end = new Date(endtime).getTime()
- this.time_now_server = new Date(stearttime).getTime()
- this.time_server_client = this.time_now_server - this.time_now_client
- this.idtime = setInterval(() => this.newtimer(), 1000)
+ this.time_end = new Date(endtime).getTime();
+ this.time_now_server = new Date(stearttime).getTime();
+ this.time_server_client = this.time_now_server - this.time_now_client;
+ 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)
- if (int_hour < 10)
- int_hour = "0" + int_hour;
- if (int_minute < 10)
- int_minute = "0" + int_minute;
- if (int_second < 10)
- int_second = "0" + int_second;
+ int_second = Math.floor(time_distance / 1000);
+ if (int_hour < 10) int_hour = "0" + int_hour;
+ if (int_minute < 10) 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) => {
- window.open(`/examinationDetails?paperId=${e.id}&examId=${data.id}`)
- }, err => {
- const config = new MatSnackBarConfig();
- config.verticalPosition = 'top';
- config.duration = 3000
- this.snackBar.open(err, '确定', config);
- })
+ };
+ this.http.post("/api/Examinations", body).subscribe(
+ (data: any) => {
+ window.open(`/examinationDetails?paperId=${e.id}&examId=${data.id}`);
+ },
+ (err) => {
+ const config = new MatSnackBarConfig();
+ config.verticalPosition = "top";
+ config.duration = 3000;
+ this.snackBar.open(err, "确定", config);
+ }
+ );
}
}
diff --git a/src/app/ui/administrators/add-edit-admin/add-edit-admin.component.html b/src/app/ui/administrators/add-edit-admin/add-edit-admin.component.html
new file mode 100644
index 0000000..1c9420b
--- /dev/null
+++ b/src/app/ui/administrators/add-edit-admin/add-edit-admin.component.html
@@ -0,0 +1,46 @@
+;
+
+ beforeEach(async(() => {
+ TestBed.configureTestingModule({
+ declarations: [ AddEditAdminComponent ]
+ })
+ .compileComponents();
+ }));
+
+ beforeEach(() => {
+ fixture = TestBed.createComponent(AddEditAdminComponent);
+ component = fixture.componentInstance;
+ fixture.detectChanges();
+ });
+
+ it('should create', () => {
+ expect(component).toBeTruthy();
+ });
+});
diff --git a/src/app/ui/administrators/add-edit-admin/add-edit-admin.component.ts b/src/app/ui/administrators/add-edit-admin/add-edit-admin.component.ts
new file mode 100644
index 0000000..a13f8c6
--- /dev/null
+++ b/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,
+ @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(
+ (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);
+ }
+ }
+}
diff --git a/src/app/ui/administrators/administrators.component.html b/src/app/ui/administrators/administrators.component.html
new file mode 100644
index 0000000..d3570b5
--- /dev/null
+++ b/src/app/ui/administrators/administrators.component.html
@@ -0,0 +1,73 @@
+;
+
+ beforeEach(async(() => {
+ TestBed.configureTestingModule({
+ declarations: [ AdministratorsComponent ]
+ })
+ .compileComponents();
+ }));
+
+ beforeEach(() => {
+ fixture = TestBed.createComponent(AdministratorsComponent);
+ component = fixture.componentInstance;
+ fixture.detectChanges();
+ });
+
+ it('should create', () => {
+ expect(component).toBeTruthy();
+ });
+});
diff --git a/src/app/ui/administrators/administrators.component.ts b/src/app/ui/administrators/administrators.component.ts
new file mode 100644
index 0000000..2db3064
--- /dev/null
+++ b/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(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();
+ });
+ }
+ }
+}
diff --git a/src/app/ui/collection-tools-read/collection-tools.component.html b/src/app/ui/collection-tools-read/collection-tools.component.html
index 2432d1d..b9968ab 100644
--- a/src/app/ui/collection-tools-read/collection-tools.component.html
+++ b/src/app/ui/collection-tools-read/collection-tools.component.html
@@ -19,7 +19,12 @@
open_in_browser 提交
+
-
-
+
+
-
-
+
+
diff --git a/src/app/examiner/mark-papers-index/mark-papers-index.component.scss b/src/app/examiner/mark-papers-index/mark-papers-index.component.scss
index 4a42ddb..85edffd 100644
--- a/src/app/examiner/mark-papers-index/mark-papers-index.component.scss
+++ b/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;
- line-height: 34px;
- border-radius: 5px;
+ height: 32px;
+ line-height:32px;
+ 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;
diff --git a/src/app/examiner/mark-papers-two/mark-papers-two.component.ts b/src/app/examiner/mark-papers-two/mark-papers-two.component.ts
index 08dd207..65c3fd5 100644
--- a/src/app/examiner/mark-papers-two/mark-papers-two.component.ts
+++ b/src/app/examiner/mark-papers-two/mark-papers-two.component.ts
@@ -1,85 +1,99 @@
/*
- * @Descripttion:
- * @version:
+ * @Descripttion:
+ * @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 {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 { Router,ActivatedRoute } from '@angular/router';
+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 { Router, ActivatedRoute } from "@angular/router";
@Component({
- selector: 'app-mark-papers-two',
- templateUrl: './mark-papers-two.component.html',
- styleUrls: ['./mark-papers-two.component.scss']
+ selector: "app-mark-papers-two",
+ templateUrl: "./mark-papers-two.component.html",
+ styleUrls: ["./mark-papers-two.component.scss"],
})
export class MarkPapersTwoComponent implements OnInit {
-
- constructor(private router: Router,private activatedRoute: ActivatedRoute,public http: HttpClient,public dialog: MatDialog,public snackBar: MatSnackBar) { }
+ constructor(
+ private router: Router,
+ private activatedRoute: ActivatedRoute,
+ public http: HttpClient,
+ public dialog: MatDialog,
+ public snackBar: MatSnackBar
+ ) {}
ngOnInit(): void {
- this.activatedRoute.queryParams.subscribe(param=>{
- this.headtext=param.level
- this.getid=param.id
- this.getname=param.name
+ this.activatedRoute.queryParams.subscribe((param) => {
+ this.headtext = param.level;
+ this.getid = param.id;
+ this.getname = param.name;
});
- this.getAlltabledate()
+ this.getAlltabledate();
//监听 此HTML标签焦点事件
- document.addEventListener('visibilitychange', ()=>{
- let isHidden = document.hidden
+ document.addEventListener("visibilitychange", () => {
+ let isHidden = document.hidden;
if (!isHidden) {
- this.getAlltabledate()
+ this.getAlltabledate();
}
- })
+ });
}
- headtext
- getid//试卷id
- getname//考核中队
- dataSource
+ ngOnDestroy(): void {
+ document.removeEventListener("visibilitychange", () => {});
+ }
+
+ headtext;
+ getid; //试卷id
+ getname; //考核中队
+ dataSource;
//分页
- @ViewChild(MatPaginator, {static: true})
+ @ViewChild(MatPaginator, { static: true })
pageEvent: PageEvent;
paginator: MatPaginator;
- length:any; //共多少条数据
- pageSize:any; //每页条数
- pageSizeOptions: number[] = [10] //设置每页条数
- PageNumber:any //第几页
+ length: any; //共多少条数据
+ pageSize: any; //每页条数
+ pageSizeOptions: number[] = [10]; //设置每页条数
+ PageNumber: any; //第几页
//获取表格信息
- getAlltabledate(){
- let paramsdata:any = {
- PaperId:this.getid,
- PageNumber: this.PageNumber || '1',
- PageSize: this.pageSizeOptions[0],
+ getAlltabledate() {
+ let paramsdata: any = {
+ PaperId: this.getid,
+ PageNumber: this.PageNumber || "1",
+ PageSize: this.pageSizeOptions[0],
Sort: null,
SortType: null,
- }
- this.http.get("/api/Examinations",{params:paramsdata}).subscribe((data:any)=>{
- this.dataSource=data.items
- this.length=data.totalCount
- })
+ };
+ this.http
+ .get("/api/Examinations", { params: paramsdata })
+ .subscribe((data: any) => {
+ this.dataSource = data.items;
+ this.length = data.totalCount;
+ });
}
//分页事件
- chagePage(e){
- this.PageNumber = e.pageIndex+1
- this.getAlltabledate()
+ chagePage(e) {
+ this.PageNumber = e.pageIndex + 1;
+ this.getAlltabledate();
}
//阅卷
- reviewFiles (e) {
- window.open(`/reviewFiles?examId=${e.id}&paperType=1`)
+ reviewFiles(e) {
+ window.open(`/reviewFiles?examId=${e.id}&paperType=1`);
}
-
}
diff --git a/src/app/examiner/statistic-analysis/abilityAnalysis/examinee-capacity/examinee-capacity.component.ts b/src/app/examiner/statistic-analysis/abilityAnalysis/examinee-capacity/examinee-capacity.component.ts
index b286324..b49f370 100644
--- a/src/app/examiner/statistic-analysis/abilityAnalysis/examinee-capacity/examinee-capacity.component.ts
+++ b/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() {
- return new Promise((resolve) => {
- this.http.get("/api/ExamAccounts/Profiles").subscribe((data: any) => {
- this.Profiles = data;
- sessionStorage.setItem("creatorData", JSON.stringify(data));
- resolve(data);
- });
- });
+ ngOnInit(): void {
+ this.Profiles = JSON.parse(sessionStorage.getItem("creatorData"));
+ this.getOrganizations();
+ this.getAlltabledate();
}
//获得所有组织机构
@@ -43,12 +30,23 @@ export class ExamineeCapacityComponent implements OnInit {
nodes = [];
expandedKeys = [];
getOrganizations() {
- this.http.get("/api/Organizations").subscribe((data: any) => {
- this.allorganizations = data;
- this.treedata = this.tree.toTree(data);
- this.orId = this.Profiles.organizationId;
- this.getpresentOrganization();
- });
+ this.http
+ .get("/api/Organizations", {
+ 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.orId = this.Profiles.organizationId;
+ this.getpresentOrganization();
+ });
}
//得到当前单位所在组织机构的tree型数据
organizationName;
diff --git a/src/app/examiner/statistic-analysis/examStatistics/examinee-papers/examinee-papers.component.html b/src/app/examiner/statistic-analysis/examStatistics/examinee-papers/examinee-papers.component.html
index 7ae61f5..afe6a00 100644
--- a/src/app/examiner/statistic-analysis/examStatistics/examinee-papers/examinee-papers.component.html
+++ b/src/app/examiner/statistic-analysis/examStatistics/examinee-papers/examinee-papers.component.html
@@ -16,6 +16,7 @@
+
- @@ -53,6 +56,7 @@
-
+
新增/编辑管理员
+ + \ No newline at end of file diff --git a/src/app/ui/enterpriseuser/seeenterpriseuser.html b/src/app/ui/administrators/add-edit-admin/add-edit-admin.component.scss similarity index 100% rename from src/app/ui/enterpriseuser/seeenterpriseuser.html rename to src/app/ui/administrators/add-edit-admin/add-edit-admin.component.scss diff --git a/src/app/ui/administrators/add-edit-admin/add-edit-admin.component.spec.ts b/src/app/ui/administrators/add-edit-admin/add-edit-admin.component.spec.ts new file mode 100644 index 0000000..ee25604 --- /dev/null +++ b/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
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/app/ui/administrators/administrators.component.scss b/src/app/ui/administrators/administrators.component.scss
new file mode 100644
index 0000000..06e39b3
--- /dev/null
+++ b/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;
+}
diff --git a/src/app/ui/administrators/administrators.component.spec.ts b/src/app/ui/administrators/administrators.component.spec.ts
new file mode 100644
index 0000000..523aef3
--- /dev/null
+++ b/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
+
+