+
-->
\ No newline at end of file
diff --git a/src/app/examiner/examiner-index/examiner-index.component.ts b/src/app/examiner/examiner-index/examiner-index.component.ts
index 8ba78a1..56b309a 100644
--- a/src/app/examiner/examiner-index/examiner-index.component.ts
+++ b/src/app/examiner/examiner-index/examiner-index.component.ts
@@ -4,7 +4,7 @@
* @Author: sueRimn
* @Date: 2020-12-11 09:06:03
* @LastEditors: sueRimn
- * @LastEditTime: 2020-12-20 10:31:09
+ * @LastEditTime: 2020-12-21 11:03:07
*/
import { Component, OnInit, ViewChild, Inject,Input } from '@angular/core';
import {HttpClient} from '@angular/common/http'
@@ -237,7 +237,11 @@ export class ExaminerIndexComponent implements OnInit {
}
//新增考题跳转
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
@@ -268,3 +272,100 @@ export class ExaminerIndexComponent implements OnInit {
}
}
+
+@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,@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("paperId",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();
+ }
+}
diff --git a/src/app/examiner/examiner-index/finishDia.html b/src/app/examiner/examiner-index/finishDia.html
new file mode 100644
index 0000000..7cd8b49
--- /dev/null
+++ b/src/app/examiner/examiner-index/finishDia.html
@@ -0,0 +1,32 @@
+
+
diff --git a/src/app/examiner/create-test-score/create-test-score.component.ts b/src/app/examiner/create-test-score/create-test-score.component.ts
index f3c270e..19d4368 100644
--- a/src/app/examiner/create-test-score/create-test-score.component.ts
+++ b/src/app/examiner/create-test-score/create-test-score.component.ts
@@ -60,7 +60,7 @@ export class CreateTestScoreComponent implements OnInit {
clickUnitName(key){
this.selectedUnitIndex = key
}
- unitId:any = JSON.parse(sessionStorage.getItem('checkedWork'))
+ unitId:any = JSON.parse(sessionStorage.getItem(sessionStorage.getItem('paper')))
//获取单位基本信息
async getUnitData(){
@@ -1080,11 +1080,19 @@ export class CreateTestScoreComponent implements OnInit {
paperDataInfo[key].functionalDivisionScore = item.funDivScore
paperDataInfo[key].facilityData = item.fireFacNodes ? JSON.stringify(item.fireFacNodes) : '[]'
paperDataInfo[key].facilityScore = item.fireFacScore
+ paperDataInfo[key].planList = item.planList
})
- // console.log(123456,paperDataInfo)
//判断是否存在总分填写后没有勾选 或者勾选了没有填写总分的情况
paperDataInfo.forEach(element => {
+ element.planList.forEach(item => {
+ if(!item.score || item.score == 0){
+ element.isPlanScore = false
+ }else{
+ element.isPlanScore = true
+ }
+ })
+
//判断存在总分填写后没有勾选题目
if( (element.basicInfoScore != 0 && JSON.parse(element.basicInfoData).length == 0) ||
(element.adjoinScore != 0 && JSON.parse(element.adjoinData).length == 0) ||
@@ -1109,14 +1117,26 @@ export class CreateTestScoreComponent implements OnInit {
config.duration = 3000
this.snackBar.open('存在勾选过题目,但未填写总分的分组','确定',config);
return
+ }else
+ //存在预案没有填写总分
+ if(!element.isPlanScore){
+ const config = new MatSnackBarConfig();
+ config.verticalPosition = 'top';
+ config.duration = 3000
+ this.snackBar.open('存在预案未填写总分的分组','确定',config);
+ return
}else{
- const dialogRef = this.dialog.open(FinishDialog, {
- width: '650px',
- data: paperDataInfo
- });
- dialogRef.afterClosed().subscribe(result => {
-
- });
+
+ if(window.confirm('你确定要创建该试卷吗？')){
+ console.log(555,this.unitId)
+
+ console.log(666,paperDataInfo)
+
+ }else{
+
+
+ }
+
}
@@ -1275,103 +1295,21 @@ export class FinishDialog{
constructor(private router:Router,private http: HttpClient,public dialog: MatDialog,public snackBar: MatSnackBar,public dialogRef: MatDialogRef,@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//考试名称
-
//弹窗确定点击事件
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: this.data
- }
- this.http.post('/api/Papers',params).subscribe(data => {
- this.snackBar.open('创建成功','确定',config);
- this.dialogRef.close();
- sessionStorage.removeItem("checkedWork")
- this.router.navigate(['/home/createexam-index']) //跳转试卷列表页面
- },err => {
- this.snackBar.open(err,'确定',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);
- }
-
- }
+ if(window.confirm('你确定要创建该试卷吗？')){
+ alert("确定");
+
+ }else{
+ alert("取消");
- //ngzerro组件
- timeDefaultValue = setHours(new Date(), 0);
- disabledDateTime: DisabledTimeFn = () => {
- var second=[]
- for(var i=1;i<60;i++){
- second.push(i)
}
- return {
- nzDisabledHours: () => [],
- nzDisabledMinutes: () => [],
- nzDisabledSeconds: () => second
- };
- };
-
- onChange(result: Date[]): void {
- console.log('onChange: ', result);
}
- getWeek(result: Date[]): void {
- console.log('week: ', result.map(getISOWeek));
- }
close(){
this.dialogRef.close();
}
diff --git a/src/app/examiner/create-test-score/finishDialog.html b/src/app/examiner/create-test-score/finishDialog.html
index b2a3cde..576f9a8 100644
--- a/src/app/examiner/create-test-score/finishDialog.html
+++ b/src/app/examiner/create-test-score/finishDialog.html
@@ -6,7 +6,7 @@
* @LastEditors: sueRimn
* @LastEditTime: 2020-12-14 14:08:52
-->
-
\ No newline at end of file
+
+
+
@@ -29,4 +28,4 @@
-
+
\ No newline at end of file
diff --git a/src/app/examiner/examiner-index/finishDia.scss b/src/app/examiner/examiner-index/finishDia.scss
new file mode 100644
index 0000000..93c9f42
--- /dev/null
+++ b/src/app/examiner/examiner-index/finishDia.scss
@@ -0,0 +1,44 @@
+.box{
+ display: flex;
+ flex-direction: column;
+ margin-left: 20px;
+ input{
+ width: 260px;
+ height: 40px;
+ line-height: 34px;
+ border-radius: 5px;
+ padding-left: 5px;
+ outline: none;
+ border: 1px solid rgb(226, 211, 211);
+ }
+ .diaone{
+ display: flex;
+ flex-direction: column;
+
+ button {
+ border: none;
+ color: white;
+ padding: 5px 25px;
+ text-align: center;
+ text-decoration: none;
+ display: inline-block;
+ font-size: 16px;
+ margin: 4px 2px;
+ cursor: pointer;
+ border-radius: 8px;
+ outline:0 none !important;
+ }
+ }
+ .diatwo{
+ margin-top: 20px;
+ display: flex;
+ flex-direction: row;
+ .endtime{
+ margin-left: 20px;
+ }
+ .datepicker{
+ height: 44px;
+ border-radius: 5px;
+ }
+ }
+}
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 4a1c835..7214caf 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
@@ -4,7 +4,7 @@
* @Author: sueRimn
* @Date: 2020-12-11 16:34:26
* @LastEditors: sueRimn
- * @LastEditTime: 2020-12-15 13:44:05
+ * @LastEditTime: 2020-12-21 11:03:29
*/
import { Component, OnInit, ViewChild, Inject } from '@angular/core';
import { HttpClient } from '@angular/common/http'
@@ -30,11 +30,13 @@ export class ExaminerNewOneComponent implements OnInit {
constructor(private http:HttpClient,private router:Router,private route:ActivatedRoute,private tree: TreeService,public dialog: MatDialog,public snackBar: MatSnackBar) { }
ngOnInit(): void {
+
this.getunitdata();
this.getOrganizations();
this.getUnittype();
this.getAllKeyUnit();
}
+ indexid=sessionStorage.getItem("paperId") //上个页面传过来的id
removeClass=document.getElementsByClassName("mat-form-field-underline")
private _transformer = (node, level: number) => { //初始化tree
@@ -305,7 +307,7 @@ export class ExaminerNewOneComponent implements OnInit {
}
)
}
- selectedunitArr:any =JSON.parse(sessionStorage.getItem("checkedWork"))||[] //选中单位的数组
+ selectedunitArr:any =JSON.parse(sessionStorage.getItem(this.indexid))||[] //选中单位的数组
deleteByid=""//根据id取消选中
//勾选框事件
checkChange(e,element){
@@ -354,7 +356,7 @@ export class ExaminerNewOneComponent implements OnInit {
this.snackBar.open('请选择单位','确定',config);
}
else{
- sessionStorage.setItem("checkedWork",JSON.stringify(this.selectedunitArr) )
+ sessionStorage.setItem(this.indexid,JSON.stringify(this.selectedunitArr) )
this.router.navigateByUrl("/examiner/create-test-score")
}
diff --git a/src/app/examiner/examiner.module.ts b/src/app/examiner/examiner.module.ts
index 8fab453..930a949 100644
--- a/src/app/examiner/examiner.module.ts
+++ b/src/app/examiner/examiner.module.ts
@@ -56,10 +56,11 @@ import { PlanLevel } from '../pipes/size.pipe';
import { MarkPapersIndexComponent } from './mark-papers-index/mark-papers-index.component';
import { MarkPapersTwoComponent } from './mark-papers-two/mark-papers-two.component';
import { StatisticAnalysisComponent } from './statistic-analysis/statistic-analysis.component';
+import { FinishDia }from './examiner-index/examiner-index.component'
@NgModule({
- declarations: [CreateTestScoreComponent,AddPlanDialog,AddPlanTwoDialog,LookTreeNodeDialog,ExaminerIndexComponent, ExaminerNewOneComponent,FinishDialog,PlanLevel,MarkPapersIndexComponent, MarkPapersTwoComponent, StatisticAnalysisComponent],
+ declarations: [CreateTestScoreComponent,AddPlanDialog,AddPlanTwoDialog,LookTreeNodeDialog,ExaminerIndexComponent, ExaminerNewOneComponent,FinishDialog,PlanLevel,MarkPapersIndexComponent, MarkPapersTwoComponent, StatisticAnalysisComponent,FinishDia],
imports: [
CommonModule,
examinerRoutingModule,
diff --git a/src/app/ui/collection-tools/collection-tools.component.ts b/src/app/ui/collection-tools/collection-tools.component.ts
index 4cc7633..352287a 100644
--- a/src/app/ui/collection-tools/collection-tools.component.ts
+++ b/src/app/ui/collection-tools/collection-tools.component.ts
@@ -1689,7 +1689,8 @@ export class CollectionToolsComponent implements OnInit {
let api
this.examType == 1? api='/api/DisposalNodes' : api='/api/ExamDisposalNodes'
this.selectDisposalNode = ''
- let params = {disasterId: this.allFirePlan[0].id || ''}
+ let params
+ this.examType == 1? params = {disasterId: this.allFirePlan[0].id || ''} : params = {examDisasterId: this.allFirePlan[0].id || ''}
this.http.get(api,{params:params}).subscribe(data=>{ //处置节点
this.canvasData.allDisposalNode = data
this.handleHybridTree()
@@ -1731,7 +1732,8 @@ export class CollectionToolsComponent implements OnInit {
let api
this.examType == 1? api='/api/DisposalNodes' : api='/api/ExamDisposalNodes'
this.defaultExpandedKeys = []
- let params = {disasterId: this.allFirePlan[0].id || ''}
+ let params
+ this.examType == 1? params = {disasterId: this.allFirePlan[0].id || ''} : params = {examDisasterId: this.allFirePlan[0].id || ''}
this.http.get(api,{params:params}).subscribe(nodeData=>{ //处置节点
this.canvasData.allDisposalNode = nodeData
let oldTreeData = this.nzTreeComponent.getExpandedNodeList()
diff --git a/src/app/ui/collection-tools/examinationQuestions.html b/src/app/ui/collection-tools/examinationQuestions.html
index dc0ce44..8bbd8fd 100644
--- a/src/app/ui/collection-tools/examinationQuestions.html
+++ b/src/app/ui/collection-tools/examinationQuestions.html
@@ -1,6 +1,6 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
消防设施考题设定
-
+
{
@@ -86,11 +85,20 @@ export class examinationQuestions {
isChecked? checkList.push(element) : null
}
//存储真实素材数据
-
+ let basicAssetsId = []
+ if(checkList && checkList.length != 0){
+ checkList.forEach(item => {
+ basicAssetsId.push(item.TemplateId)
+ })
+ }
+ basicAssetsId = Array.from(new Set(basicAssetsId))
+ console.log(123,this.data.buildFloorData)
let obj = {
name:this.data.buildFloorData.buildingData.name + '-' + this.data.buildFloorData.floorData.name,
key:this.data.buildFloorData.floorData.id,
- children:checkList
+ buildingId:this.data.buildFloorData.buildingData.id,
+ children:checkList,
+ basicAssetsId:basicAssetsId
}
let data = JSON.parse(sessionStorage.getItem("试卷id"))
diff --git a/src/app/ui/collection-tools/save.ts b/src/app/ui/collection-tools/save.ts
index 413870a..6f17074 100644
--- a/src/app/ui/collection-tools/save.ts
+++ b/src/app/ui/collection-tools/save.ts
@@ -119,8 +119,8 @@ export class saveOneDialog {
imageNames: null,
imageUrls: null,
parentId: this.nodeItem ? this.nodeItem.id : null,
- disasterId: this.data.disasterId,
- planComponentId: sessionStorage.getItem('planId') || '',
+ examDisasterId: this.data.disasterId,
+ ExamPlanComponentId: sessionStorage.getItem('planId') || '',
companyId: this.data.siteOrbuilding == -1 ? sessionStorage.getItem('companyId') : null,
sitePlanId: this.data.siteOrbuilding==-1 ? this.selectedSiteData.id : null,
buildingId: this.selectedBuildingData.id || null,
@@ -180,8 +180,8 @@ export class saveOneDialog {
id: "",
data: JSON.stringify(this.canvasData.selectPanelPoint.Data) || null,
version: this.canvasData.selectPanelPoint.Version || "2.0",
- disposalNodeId: data.id,
- planComponentId: sessionStorage.getItem("planId"),
+ ExamDisposalNodeId: data.id,
+ ExamPlanComponentId: sessionStorage.getItem("planId"),
}
this.http.post(`/api/ExamDisposalNodeData`,objData).subscribe(data => {
const config = new MatSnackBarConfig();
@@ -226,12 +226,12 @@ export class saveOneDialog {
}
}
dispositionNodeData = {
- id: "",
+ id: null,
name: value.name,
level: this.nodeItem && this.nodeItem.id != null ? this.nodeItem.level + 1 : 0,
order: order,
- description: "",
- notes: "",
+ description: null,
+ notes: null,
weather: null,
airTemperature: 0,
windDirection: 0,
@@ -239,8 +239,8 @@ export class saveOneDialog {
imageNames: null,
imageUrls: null,
parentId: this.nodeItem ? this.nodeItem.id : null,
- disasterId: this.data.disasterId,
- planComponentId: sessionStorage.getItem('planId') || '',
+ examDisasterId: this.data.disasterId,
+ ExamPlanComponentId: sessionStorage.getItem('planId') || '',
companyId: null,
sitePlanId: null,
buildingId: null,
@@ -273,11 +273,11 @@ export class saveOneDialog {
// let postdata =JSON.parse(JSON.stringify(this.canvasData.selectPanelPoint))
// postdata.Data = JSON.stringify(postdata.Data)
let objData = {
- id: "",
+ id: null,
data: JSON.stringify(this.canvasData.selectPanelPoint.Data) || null,
version: this.canvasData.selectPanelPoint.Version || "2.0",
- disposalNodeId: data.id,
- planComponentId: sessionStorage.getItem("planId"),
+ ExamDisposalNodeId: data.id,
+ ExamPlanComponentId: sessionStorage.getItem("planId"),
}
this.http.post(`/api/ExamDisposalNodeData`,objData).subscribe(data => {
diff --git a/src/assets/css/ngZorroTree.css b/src/assets/css/ngZorroTree.css
index 2386294..84a89b6 100644
--- a/src/assets/css/ngZorroTree.css
+++ b/src/assets/css/ngZorroTree.css
@@ -344,12 +344,8 @@
text-align: center;
cursor: pointer
}
-#createtestscore,#nodeTree .ant-tree .ant-tree-switcher {
- line-height: 22px;
-}
-#uploadfiretree .ant-tree .ant-tree-switcher {
- line-height: 20px;
-}
+
+
#disposalNodeTree .ant-tree-checkbox {
margin-top: 10px;
}
diff --git a/src/styles.scss b/src/styles.scss
index 16022e1..5f379de 100644
--- a/src/styles.scss
+++ b/src/styles.scss
@@ -117,3 +117,9 @@ table td.mat-footer-cell:last-of-type{
}
}
+
+#nodeTree,#basicinfodiv,#uploadfiretree{
+ .ant-tree .ant-tree-switcher {
+ line-height: 22px;
+ }
+}