|
|
|
|
@ -4,9 +4,9 @@
|
|
|
|
|
* @Author: sueRimn |
|
|
|
|
* @Date: 2020-12-11 09:06:03 |
|
|
|
|
* @LastEditors: sueRimn |
|
|
|
|
* @LastEditTime: 2020-12-15 14:10:50 |
|
|
|
|
* @LastEditTime: 2020-12-21 10:44:17 |
|
|
|
|
*/ |
|
|
|
|
import { Component, OnInit, ViewChild, Inject } from '@angular/core'; |
|
|
|
|
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'; |
|
|
|
|
@ -15,7 +15,9 @@ 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({ |
|
|
|
|
@ -25,12 +27,16 @@ import { Router,ActivatedRoute } from '@angular/router';
|
|
|
|
|
}) |
|
|
|
|
export class ExaminerIndexComponent 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,private tree: TreeService) { } |
|
|
|
|
//displayedColumns: string[] = ['name', 'organization', 'startTime', 'overTime', 'testState', 'operation'];
|
|
|
|
|
|
|
|
|
|
ngOnInit(): void { |
|
|
|
|
this.getunitdata(); |
|
|
|
|
this.getOrganizations(); |
|
|
|
|
this.getUnittype(); |
|
|
|
|
this.getAlltabledate() |
|
|
|
|
this.getHelp() |
|
|
|
|
setInterval(()=>this.getAlltabledate(),60000) |
|
|
|
|
//this.getHelp()
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
displayedColumns: string[] = ['name','startTime','endTime', 'examzhong','scc']; |
|
|
|
|
@ -38,6 +44,7 @@ export class ExaminerIndexComponent implements OnInit {
|
|
|
|
|
accound |
|
|
|
|
helpName//消防救援对名称
|
|
|
|
|
optionId |
|
|
|
|
@ViewChild('son') son; |
|
|
|
|
//分页
|
|
|
|
|
@ViewChild(MatPaginator, {static: true})
|
|
|
|
|
pageEvent: PageEvent; |
|
|
|
|
@ -48,6 +55,85 @@ export class ExaminerIndexComponent implements OnInit {
|
|
|
|
|
PageNumber:any //第几页
|
|
|
|
|
startTime:[] |
|
|
|
|
endTime:[] |
|
|
|
|
allorganizations:any |
|
|
|
|
allunittype:any //获取所有的单位类型
|
|
|
|
|
jscheck:any //辖区中队包含下级
|
|
|
|
|
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; |
|
|
|
|
|
|
|
|
|
//得到当前单位信息
|
|
|
|
|
getunitdata(){ |
|
|
|
|
this.http.get("/api/ExamAccounts/Profiles").subscribe( |
|
|
|
|
(data:any)=>{ |
|
|
|
|
this.organizationName = data.organizationName |
|
|
|
|
} |
|
|
|
|
) |
|
|
|
|
} |
|
|
|
|
organizationName:any //当前单位组织机构名称
|
|
|
|
|
treedata:any //组织机构树型数据
|
|
|
|
|
newArr:any = [] |
|
|
|
|
newallorganizations:any //用于存储在原始数据基础上的每个机构增加children字段
|
|
|
|
|
newallorganizations2:any |
|
|
|
|
//得到当前单位所在组织机构的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.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.dataSource.data = [item] |
|
|
|
|
this.newallorganizations2 = [item] |
|
|
|
|
} |
|
|
|
|
}); |
|
|
|
|
}else{ |
|
|
|
|
this.newallorganizations2 = this.treedata |
|
|
|
|
this.dataSource.data = this.treedata |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
) |
|
|
|
|
|
|
|
|
|
} |
|
|
|
|
//获得所有组织机构
|
|
|
|
|
getOrganizations(){ |
|
|
|
|
this.http.get('/api/Organizations').subscribe( |
|
|
|
|
(data:any)=>{ |
|
|
|
|
this.allorganizations = data |
|
|
|
|
this.treedata = this.tree.toTree(data); |
|
|
|
|
this.getpresentOrganization(); |
|
|
|
|
} |
|
|
|
|
) |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
//获得所有单位类型
|
|
|
|
|
getUnittype(){ |
|
|
|
|
this.http.get('/api/BuildingTypes/Simple').subscribe( |
|
|
|
|
data=>{ |
|
|
|
|
this.allunittype = data |
|
|
|
|
} |
|
|
|
|
) |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
//获得查询支队信息
|
|
|
|
|
help(){ |
|
|
|
|
@ -73,6 +159,8 @@ export class ExaminerIndexComponent implements OnInit {
|
|
|
|
|
let paramsdata:any = { |
|
|
|
|
PageNumber: this.PageNumber || '1', |
|
|
|
|
PageSize: this.pageSizeOptions[0], |
|
|
|
|
OrganizationId: this.jsId || '', |
|
|
|
|
HasChildren:this.jscheck || '', |
|
|
|
|
Sort: null, |
|
|
|
|
SortType: null, |
|
|
|
|
} |
|
|
|
|
@ -108,7 +196,7 @@ export class ExaminerIndexComponent implements OnInit {
|
|
|
|
|
} |
|
|
|
|
//查询按钮
|
|
|
|
|
findClick(){ |
|
|
|
|
const config = new MatSnackBarConfig(); |
|
|
|
|
/* const config = new MatSnackBarConfig(); |
|
|
|
|
config.verticalPosition = 'top'; |
|
|
|
|
config.duration = 3000 |
|
|
|
|
if(this.accound==undefined){ |
|
|
|
|
@ -119,26 +207,165 @@ export class ExaminerIndexComponent implements OnInit {
|
|
|
|
|
console.log(data) |
|
|
|
|
}) |
|
|
|
|
} |
|
|
|
|
console.log(this.accound) |
|
|
|
|
console.log(this.accound) */ |
|
|
|
|
console.log(this.jscheck,this.jsId) |
|
|
|
|
this.PageNumber = 1 |
|
|
|
|
this.pageEvent.pageIndex = 0 |
|
|
|
|
this.getAlltabledate() |
|
|
|
|
} |
|
|
|
|
//重置按钮
|
|
|
|
|
Reset(){ |
|
|
|
|
this.accound=undefined |
|
|
|
|
//this.accound=undefined
|
|
|
|
|
this.jsId='' |
|
|
|
|
this.js='' |
|
|
|
|
this.jscheck='' |
|
|
|
|
} |
|
|
|
|
//删除一套考题
|
|
|
|
|
deleteExam(examid){ |
|
|
|
|
const config = new MatSnackBarConfig(); |
|
|
|
|
config.verticalPosition = 'top'; |
|
|
|
|
config.duration = 3000 |
|
|
|
|
this.http.delete(`/api/Papers/${examid}`).subscribe((data:any)=>{ |
|
|
|
|
let isTrue = confirm('您确定要删除吗') |
|
|
|
|
if(isTrue){ |
|
|
|
|
const config = new MatSnackBarConfig(); |
|
|
|
|
config.verticalPosition = 'top'; |
|
|
|
|
config.duration = 3000 |
|
|
|
|
this.http.delete(`/api/Papers/${examid}`).subscribe((data:any)=>{ |
|
|
|
|
this.snackBar.open('删除试卷成功','确定',config); |
|
|
|
|
this.getAlltabledate() |
|
|
|
|
}) |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
} |
|
|
|
|
//新增考题跳转
|
|
|
|
|
newExamination(){ |
|
|
|
|
this.router.navigate(['/home/createexam-index/examiner-new-one']) |
|
|
|
|
//this.router.navigate(['/home/createexam-index/examiner-new-one'])
|
|
|
|
|
const dialogRef = this.dialog.open(FinishDia, { |
|
|
|
|
width: '650px', |
|
|
|
|
//data: paperDataInfo
|
|
|
|
|
}); |
|
|
|
|
} |
|
|
|
|
//辖区中队div是否显示
|
|
|
|
|
isorganizationbox:boolean = false |
|
|
|
|
js:any //辖区中队输入框
|
|
|
|
|
jsId:any //辖区中队选择的id
|
|
|
|
|
stopclose(e){ |
|
|
|
|
e.stopPropagation(); |
|
|
|
|
} |
|
|
|
|
//点击辖区中队树，将选择的辖区中队添加到变量
|
|
|
|
|
add(node) { |
|
|
|
|
this.isorganizationbox = false |
|
|
|
|
this.js = node.name |
|
|
|
|
this.jsId = node.id |
|
|
|
|
} |
|
|
|
|
//关闭辖区中队隐藏框
|
|
|
|
|
closeorganizationbox() { |
|
|
|
|
this.isorganizationbox = false |
|
|
|
|
} |
|
|
|
|
//打开辖区中队隐藏框
|
|
|
|
|
openorganizationbox() { |
|
|
|
|
this.isorganizationbox = true |
|
|
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
//关闭出现的组织机构div
|
|
|
|
|
closediv(){ |
|
|
|
|
this.isorganizationbox = false |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
@Component({ |
|
|
|
|
selector: 'finish-dialog', |
|
|
|
|
templateUrl: 'finishDia.html', |
|
|
|
|
styleUrls: ['finishDia.scss'] |
|
|
|
|
}) |
|
|
|
|
export class FinishDia{ |
|
|
|
|
|
|
|
|
|
constructor(private router:Router,private http: HttpClient,public dialog: MatDialog,public snackBar: MatSnackBar,public dialogRef: MatDialogRef<FinishDia>,@Inject(MAT_DIALOG_DATA) public data: any) {} |
|
|
|
|
ngOnInit(): void { |
|
|
|
|
this.getProfiles() |
|
|
|
|
} |
|
|
|
|
//获取登录账号的个人资料
|
|
|
|
|
Profiles:any
|
|
|
|
|
getProfiles(){ |
|
|
|
|
this.http.get('/api/ExamAccounts/Profiles').subscribe(data => { |
|
|
|
|
console.log(data) |
|
|
|
|
this.Profiles = data |
|
|
|
|
}) |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
startTime:string//考试开始时间
|
|
|
|
|
endTime:string//考试结束时间
|
|
|
|
|
examName:string//考试名称
|
|
|
|
|
indexid:string//创建考试的id
|
|
|
|
|
tabledate |
|
|
|
|
|
|
|
|
|
//弹窗确定点击事件
|
|
|
|
|
onNoClick(): void { |
|
|
|
|
const config = new MatSnackBarConfig(); |
|
|
|
|
config.verticalPosition = 'top'; |
|
|
|
|
config.duration = 3000 |
|
|
|
|
if(this.startTime!=undefined&&this.endTime!=undefined&&this.examName!=undefined){ |
|
|
|
|
if(this.startTime>this.endTime){ |
|
|
|
|
this.snackBar.open('开始时间不能大于结束时间','确定',config); |
|
|
|
|
} |
|
|
|
|
else{ |
|
|
|
|
//截取字符串，得到日期部分"2009-12-02",用split把字符串分隔成数组
|
|
|
|
|
var begin1=this.startTime.substr(0,10).split("-"); |
|
|
|
|
var end1=this.endTime.substr(0,10).split("-"); |
|
|
|
|
//将拆分的数组重新组合，并实例成化新的日期对象
|
|
|
|
|
var date1=new Date(begin1[1] + - + begin1[2] + - + begin1[0]); |
|
|
|
|
var date2=new Date(end1[1] + - + end1[2] + - + end1[0]); |
|
|
|
|
//得到两个日期之间的差值m，以分钟为单位
|
|
|
|
|
var m=Number(Math.abs(Number(date2)-Number(date1))/1000/60); |
|
|
|
|
//小时数和分钟数相加得到总的分钟数
|
|
|
|
|
var min1=parseInt(this.startTime.substr(11,2))*60+parseInt(this.startTime.substr(14,2)); |
|
|
|
|
var min2=parseInt(this.endTime.substr(11,2))*60+parseInt(this.endTime.substr(14,2)); |
|
|
|
|
//两个分钟数相减得到时间部分的差值，以分钟为单位
|
|
|
|
|
var n=min2-min1; |
|
|
|
|
//将日期和时间两个部分计算出来的差值相加，即得到两个时间相减后的分钟数
|
|
|
|
|
var minutes=m+n; |
|
|
|
|
|
|
|
|
|
console.log(this.startTime,this.endTime) |
|
|
|
|
let params = { |
|
|
|
|
id: null, |
|
|
|
|
title: this.examName, |
|
|
|
|
duration: minutes, |
|
|
|
|
modifiedTime: new Date(), |
|
|
|
|
deleted: false, |
|
|
|
|
startTime: this.startTime, |
|
|
|
|
endTime: this.endTime, |
|
|
|
|
organizationId: this.Profiles.organizationId, |
|
|
|
|
creatorId: this.Profiles.id, |
|
|
|
|
paperDataInfo: null |
|
|
|
|
} |
|
|
|
|
console.log(params) |
|
|
|
|
this.http.post('/api/Papers',params).subscribe(data => { |
|
|
|
|
this.snackBar.open('创建成功','确定',config); |
|
|
|
|
this.dialogRef.close(); |
|
|
|
|
//sessionStorage.removeItem("checkedWork")
|
|
|
|
|
this.tabledate=data |
|
|
|
|
console.log(this.tabledate) |
|
|
|
|
sessionStorage.setItem("indexId",this.tabledate.id) |
|
|
|
|
this.router.navigate(['/home/createexam-index/examiner-new-one']) //跳转试卷列表页面
|
|
|
|
|
},err => { |
|
|
|
|
this.snackBar.open('创建失败','确定',config); |
|
|
|
|
}) |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
else{ |
|
|
|
|
if(this.startTime==undefined) |
|
|
|
|
this.snackBar.open('请输入开始时间','确定',config); |
|
|
|
|
else if(this.endTime==undefined) |
|
|
|
|
this.snackBar.open('请输入结束时间','确定',config); |
|
|
|
|
else if(this.examName==undefined) |
|
|
|
|
this.snackBar.open('请输入试卷名称','确定',config); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
close(){ |
|
|
|
|
this.dialogRef.close(); |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
|
