diff --git a/src/app/canvas-share-data.service.ts b/src/app/canvas-share-data.service.ts index 8c42d46..ae0a38f 100644 --- a/src/app/canvas-share-data.service.ts +++ b/src/app/canvas-share-data.service.ts @@ -9,6 +9,9 @@ export class CanvasShareDataService { constructor() { } private _sendMessage: ReplaySubject = new ReplaySubject(1); + examDisposalNodesData//考生进入时获取当前试卷的处置节点 + examFacilityAssetsData//考生进入时获取当前试卷要考察的消防设施 + isChange = false; // 数据 是否改动 selectTemplateData: any; // 选择当前 模板数据 diff --git a/src/app/examiner/examiner.module.ts b/src/app/examiner/examiner.module.ts index 930a949..509884b 100644 --- a/src/app/examiner/examiner.module.ts +++ b/src/app/examiner/examiner.module.ts @@ -112,6 +112,7 @@ import { FinishDia }from './examiner-index/examiner-index.component' NzTreeModule, NzDatePickerModule, ], - providers: [ { provide: MatPaginatorIntl, useValue: myPaginator() } ] + providers: [ { provide: MatPaginatorIntl, useValue: myPaginator() } ], + exports:[PlanLevel] }) export class ExaminerModule { } diff --git a/src/app/student/examination-details/examination-details.component.html b/src/app/student/examination-details/examination-details.component.html index 55bb647..4070303 100644 --- a/src/app/student/examination-details/examination-details.component.html +++ b/src/app/student/examination-details/examination-details.component.html @@ -35,7 +35,35 @@ -
作战部署
+
+ +
+ + + + + + + + + + + + + + + + + + + +
预案名称添加人修改时间是否公开编制级别设置分数操作
{{item.title}}{{item.creatorName}}{{item.modifiedTime | date:'yyyy-MM-dd'}}{{item.isPublic ? '已公开' : '未公开'}}{{item.planLevel | planlevel}} + {{item.score}}分 + + 进入 +
+
+
diff --git a/src/app/student/examination-details/examination-details.component.scss b/src/app/student/examination-details/examination-details.component.scss index 3f050c4..451a3eb 100644 --- a/src/app/student/examination-details/examination-details.component.scss +++ b/src/app/student/examination-details/examination-details.component.scss @@ -1,3 +1,5 @@ +table,table tr th, table tr td { border-bottom: 1px solid #EEF1F5; } +table { text-align: center; border-collapse: collapse; padding:2px;} .content{ width: 100%; height: 100%; @@ -111,4 +113,30 @@ background-color: #F5FDFE; label { display: inline-block; } } +} +.planList{ + table{ + width: 100%; + tr{ + height: 42px; + font-size: 15px; + td{ + input{ + width: 62px; + height: 26px; + background: #F2F5F6; + border: none; + border-radius: 5px; + text-align: center; + } + span{ + margin: 0 5px; + cursor: pointer; + } + } + } + tr:nth-child(1){ + background: #F5FDFE; + } + } } \ No newline at end of file diff --git a/src/app/student/examination-details/examination-details.component.ts b/src/app/student/examination-details/examination-details.component.ts index dc7ab73..86ce508 100644 --- a/src/app/student/examination-details/examination-details.component.ts +++ b/src/app/student/examination-details/examination-details.component.ts @@ -3,6 +3,7 @@ import { Component, OnInit } from '@angular/core'; import { MatDialog } from '@angular/material/dialog'; import { MatSnackBar } from '@angular/material/snack-bar'; import { ActivatedRoute } from '@angular/router'; +import { CanvasShareDataService } from 'src/app/canvas-share-data.service'; @Component({ selector: 'app-examination-details', @@ -11,13 +12,13 @@ import { ActivatedRoute } from '@angular/router'; }) export class ExaminationDetailsComponent implements OnInit { - constructor(public http:HttpClient,public dialog: MatDialog,public snackBar: MatSnackBar,public route:ActivatedRoute) { } + constructor(public canvasData:CanvasShareDataService, public http:HttpClient,public dialog: MatDialog,public snackBar: MatSnackBar,public route:ActivatedRoute) { } async ngOnInit(): Promise { await this.getTestInfo() this.getUnitPlans()//将试卷的预案考题放进数据中 } - + paperId:any = this.route.snapshot.queryParams.paperId paperData:any //试卷信息 paperCompanyData:any = []; //考生具体考卷 selectPaper:any = {id:null}; //选择当前考卷 @@ -114,4 +115,16 @@ export class ExaminationDetailsComponent implements OnInit { console.log('交卷') } + //进入考试 + enterExam(item){ + console.log(item) + console.log(this.selectPaper) + sessionStorage.setItem('companyName',this.selectPaper.companyInfo.name) + sessionStorage.setItem('planId',item.planComponentId) + sessionStorage.setItem('buildingTypeId',this.selectPaper.companyInfo.buildingTypes[0].id) + sessionStorage.setItem('companyId',this.selectPaper.companyInfo.id) + let openType + item.examPlanType == 0 ? openType = 1 : openType = 2 + window.open(`/canvasToolExaminee?planName=${item.title}&paperplanId=${item.id}&openType=${openType}&paperId=${this.paperId}&examId=${this.route.snapshot.queryParams.examId}&planComponentId=${item.planComponentId}`) + } } diff --git a/src/app/student/student.module.ts b/src/app/student/student.module.ts index 83e1ef7..a817ae3 100644 --- a/src/app/student/student.module.ts +++ b/src/app/student/student.module.ts @@ -53,7 +53,8 @@ import { StudentRoutingModule } from './student-routing.module'; import { StudentIndexComponent } from './student-index/student-index.component'; import { StudentExamRecordComponent } from './student-exam-record/student-exam-record.component'; import { ExaminationDetailsComponent } from './examination-details/examination-details.component'; - +import { PlanLevel } from '../pipes/size.pipe'; +import { ExaminerModule } from '../examiner/examiner.module'; @NgModule({ declarations: [StudentIndexComponent, StudentExamRecordComponent, ExaminationDetailsComponent], @@ -107,6 +108,7 @@ import { ExaminationDetailsComponent } from './examination-details/examination-d NavigationModule, NzTreeModule, NzDatePickerModule, + ExaminerModule ], providers: [ { provide: MatPaginatorIntl, useValue: myPaginator() } ] }) diff --git a/src/app/ui/collection-tools-examinee/collection-tools.component.html b/src/app/ui/collection-tools-examinee/collection-tools.component.html index 60d854c..1ebe622 100644 --- a/src/app/ui/collection-tools-examinee/collection-tools.component.html +++ b/src/app/ui/collection-tools-examinee/collection-tools.component.html @@ -2,10 +2,14 @@
{{examMsg.conpanyName}}
-
+
+
+ 考试要点 : {{planData.mainPoint}} +
+
- +
@@ -43,31 +47,33 @@ keyboard_arrow_up keyboard_arrow_down -
- - - -
- - -
- +
+

考试题目

+ + +
+ +
+ +
+
+

考生答案

+ + +
+ +
+ +
-
+
keyboard_arrow_up keyboard_arrow_down @@ -225,7 +231,9 @@

{{item.PropertyName}}

{{imagesArr.length ? imagesArr.length : 0}} / {{item.PropertyValue}} -
添加
+
+ 添加 +
@@ -235,7 +243,7 @@
- + delete
diff --git a/src/app/ui/collection-tools-examinee/collection-tools.component.scss b/src/app/ui/collection-tools-examinee/collection-tools.component.scss index e97085a..0b13e68 100644 --- a/src/app/ui/collection-tools-examinee/collection-tools.component.scss +++ b/src/app/ui/collection-tools-examinee/collection-tools.component.scss @@ -38,11 +38,16 @@ .headerCenter { flex: 1; overflow: hidden; - input { - width: 99%; - height: 30px; - background-color: #e7f0f0; - border-radius: 5px; + .mainPointDiv{ + box-sizing: border-box; + padding-left: 8px; + cursor: default; + span{ + font-family: Source Han Sans CN; + color: #FF8678; + font-size: 15px; + } + } } .headerRight { diff --git a/src/app/ui/collection-tools-examinee/collection-tools.component.ts b/src/app/ui/collection-tools-examinee/collection-tools.component.ts index 3198a21..ee09fcf 100644 --- a/src/app/ui/collection-tools-examinee/collection-tools.component.ts +++ b/src/app/ui/collection-tools-examinee/collection-tools.component.ts @@ -18,7 +18,6 @@ import { ActivatedRoute, Router } from '@angular/router'; import { examinationQuestionsExaminee,uploadDisposalNodesExaminee,uploadQuestionsExaminee } from './examinationQuestions' - @Component({ selector: 'app-collection-tools', templateUrl: './collection-tools.component.html', @@ -29,7 +28,7 @@ export class CollectionToolsExamineeComponent implements OnInit { @ViewChild('canvas',{static: true}) canvas:WorkingAreaComponent; //父组件中获得子组件的引用 constructor(private http:HttpClient,public dialog: MatDialog,public snackBar: MatSnackBar,private element: ElementRef,public canvasData: CanvasShareDataService,private router:Router,private route:ActivatedRoute) { } - @ViewChild('nzTreeComponent', { static: false }) nzTreeComponent!: NzTreeComponent; + @ViewChild('nzTreeComponent2', { static: false }) nzTreeComponent!: NzTreeComponent; // tree配置 private _transformer = (node, level: number) => {//要给渲染节点传那些属性参数 return { @@ -151,191 +150,7 @@ export class CollectionToolsExamineeComponent implements OnInit { } pattern:boolean = false//默认为基本信息编辑 - //基本信息编辑模式 - baseInfo(){ - if (!this.pattern) { - this.basicInfo = true - this.canvas.setNameVisible(this.basicInfo,1) - - this.pattern = true - this.canvasData.gameMode = GameMode.BasicInformation - this.canvasData.selectPanelPoint = new DisposalNodeData(); - this.mateDeleteCustomize() - this.getAllLibrary() - this.checkedBuildingIndex = -1 - this.getSitePlan() //总平面图一层 - } - } - - //想定作业编辑模式 - wantWork(){ - if (this.pattern) { - //让基本信息图标显示 - this.basicInfo = false - this.canvas.setNameVisible(this.basicInfo,0) - - this.pattern = false - this.canvasData.gameMode = GameMode.Assignment - this.getAllLibrary('plan') - this.getDisposalNode() - } - } - - //ngzorro tree 拖拽 - nzEvent(event: NzFormatEmitEvent): void { - if(this.isDrag){ - let parentId - if(this.pos == 0){ - parentId = event.node.key - }else{ - if(event.node.level == 0){ - parentId = null - }else{ - parentId = event.node.origin.parentId - } - } - - - let orders = {} - let originalData = JSON.parse(JSON.stringify( this.canvasData.allDisposalNode || [] )) //tree原始数据 - let targetNodeData = []//拖动移入节点的数据，用于遍历求出放在该数组的第几位 - - //找到需要重新排序的数组 - if(this.pos == 0){ - originalData.forEach(item => { - if(item.parentId == event.node.key){ - targetNodeData.push(item) - } - }) - }else{ - if(event.node.origin.parentId){//如果拖动目标为非一级节点 - originalData.forEach(item => { - if(item.parentId == event.node.origin.parentId){ - targetNodeData.push(item) - } - }) - }else{//如果拖动目标为一级节点 - originalData.forEach(item => { - if(!item.parentId){ - targetNodeData.push(item) - } - }) - } - } - - - let idArr = [] - targetNodeData.forEach(i => { - idArr.push(i.id) - }) - console.log(6666666666666,event); - if(this.pos == 0 && event.node.origin.children.length == 1){ - console.log("移入,没有兄弟") - let key = event.dragNode.key - orders[key] = 0 - parentId = event.node.key - }else{ - console.log("移入,多个兄弟") - let array = [] - targetNodeData.forEach(item => { - if(item.id != event.dragNode.key){ //将拖动项先移除掉 - array.push(item) - } - }) - if(event.dragNode.isEnd[event.dragNode.isEnd.length - 1]){ //如果移入到最后一个 - console.log("最后") - array.push(event.dragNode.origin) - }else if(event.dragNode.isStart[event.dragNode.isStart.length - 1]){//如果移入到第一个 - console.log("第一") - array.unshift(event.dragNode.origin) - }else{//如果移入中间位置 - console.log("中间") - array.splice(event.node.origin.order, 0, event.dragNode.origin) - } - array.forEach((item,key) => { - orders[item.id] = key - }) - } - - let obj ={ - id : event.dragNode.origin.id, - parentId : parentId, - orders : orders - } - - this.http.put("/api/DisposalNodes/Sort",obj).subscribe(data => { - const config = new MatSnackBarConfig(); - config.verticalPosition = 'top'; - config.duration = 3000 - this.snackBar.open('排序成功','确定',config) - this.refurbishTreeData() - }) - } - } - - isDrag //是否可以拖动 - pos//放置位置 - beforeDrop = (arg: NzFormatBeforeDropEvent) => { - if(arg.dragNode.origin.isDataNode && arg.node.level === 0){//如果为数据节点则不允许拖到一级节点 - const config = new MatSnackBarConfig(); - config.verticalPosition = 'top'; - config.duration = 3000 - this.snackBar.open('数据节点不允许拖拽到一级节点','确定',config) - this.isDrag = false - return of(false); - }else if(!arg.dragNode.origin.isDataNode && arg.node.level === 2){ - const config = new MatSnackBarConfig(); - config.verticalPosition = 'top'; - config.duration = 3000 - this.snackBar.open('处置节点不允许拖拽到三级节点','确定',config) - this.isDrag = false - return of(false); - }else{ - this.isDrag = true - this.pos = arg.pos - return of(true) - } - } - //ngzorro tree 拖拽 - - //天气栏目 - weatherBtn = true - weatherBtnShow(){ - this.weatherBtn = !this.weatherBtn - } - weatherBtnHidden(){ - this.weatherBtn = !this.weatherBtn - } - - //底部切换按钮div - detailsAndattentBtn = true - //节点详情 - details(){ - this.detailsAndattentBtn = true - } - //注意事项 - attent(){ - this.detailsAndattentBtn = false - } - //消防要素div边框高度调节 - firecategoriesDivMouseDown(e){ - document.onmousemove = (ev) => { - let bodyHeight = document.body.clientHeight //网页宽度 - let maxHeight = this.element.nativeElement.querySelector('#rightDiv').clientHeight - 35 //最大宽度 - if(bodyHeight - ev.clientY >= maxHeight){ - this.element.nativeElement.querySelector('#firecategories').style.height = maxHeight+ 'px' - this.element.nativeElement.querySelector('#property').style.height = 35+ 'px' - }else{ - this.element.nativeElement.querySelector('#firecategories').style.height = (bodyHeight - ev.clientY) + 'px' ; - this.element.nativeElement.querySelector('#property').style.height = (this.element.nativeElement.querySelector('#rightDiv').clientHeight - this.element.nativeElement.querySelector('#firecategories').clientHeight) + 'px' - } - } - document.onmouseup = () => { - document.onmousemove = null; - document.onmouseup = null; - } - } //左侧div边框宽度调节 leftDivMouseDown(e){ @@ -354,22 +169,6 @@ export class CollectionToolsExamineeComponent implements OnInit { } } - //底部div高度调节 - bottomDivMouseDown(e){ - document.onmousemove = (ev) => { - let bodyHeight = document.body.clientHeight //网页高度 - let maxHeight = this.element.nativeElement.querySelector('#rightDiv').clientHeight //最大高度 - if(bodyHeight - ev.clientY >= maxHeight){ - this.element.nativeElement.querySelector('#bottomDiv').style.height = maxHeight + 'px' - }else{ - this.element.nativeElement.querySelector('#bottomDiv').style.height = (bodyHeight - ev.clientY) + 'px' ; - } - } - document.onmouseup = () => { - document.onmousemove = null; - document.onmouseup = null; - } - } //右侧div边框宽度调节 rightDivMouseDown(e){ @@ -625,15 +424,15 @@ export class CollectionToolsExamineeComponent implements OnInit { } ngOnInit(): void { - + this.getAllLibrary('plan') //获取素材库 this.getAllBuildings() //获取所有建筑 this.getAllFirePlan() //获取当前单位灾情 + this.getPaperPlanData()//获得当前考题题目 let that = this window.setTimeout(()=>{ document.getElementById("functionalDomainContent").oncontextmenu = function (event) { - // that.canvas.cancelPaint() that.selectImageIndex = -1 event.preventDefault(); }; @@ -646,9 +445,63 @@ export class CollectionToolsExamineeComponent implements OnInit { }) } + paperId:any = this.route.snapshot.queryParams.paperId + planData:any //当前考题题目 + Facilities:any //当前预案考题所有楼层要考的基本信息素材 + //获得单位预案设定 + getPaperPlanData(){ + let params = { + paperId : this.paperId + } + this.http.get(`/api/PaperPlans`,{params:params}).subscribe((data:any) => { + console.log(456,data) + data.forEach(item => { + item.id == this.route.snapshot.queryParams.paperplanId ? + this.planData = item : null + }) + + let questions = JSON.parse(this.planData.examDisposalNodesData) + this.handleHybridTree(questions,'题目') + this.Facilities = JSON.parse(this.planData.examFacilityAssetsData) + }) + } + + //获得所有素材库 + basicAssetLibraries:any = []//基本信息素材库 + getAllAssetLibraries(Facilitiesitem){ + this.basicAssetLibraries = [] + this.http.get('/api/AssetLibraries').subscribe(async(data:any) => { + console.log('素材库',data) + for (let index = 0; index < data.length; index++) { + const element = data[index]; + let params = { + libraryId:element.id, + assetIds : Facilitiesitem.basicAssetsId + } + await new Promise ((resolve,reject)=>{ + this.http.get('/api/Assets',{params:params}) + .subscribe((data:any) => { + console.log(index,data) + if(data && data.length != 0){ + element.images = data + this.basicAssetLibraries.push( + element + ) + } + resolve() + }) + }) + } + console.log(55555,this.basicAssetLibraries) + this.allLibrary = [...this.originalallLibrary,...this.basicAssetLibraries] + }) + + } - ngAfterViewInit(): void { + + ngAfterViewInit(): void { + this.getSitePlan() //获取总平面图/楼层 // 监听canvas组件选中素材事件 @@ -669,20 +522,11 @@ export class CollectionToolsExamineeComponent implements OnInit { this.renovateTreeData(false) }) + } copyAssetData:any //存储用于复制的素材 - //复制素材 - copyAsset(){ - this.canvas.copy() - } - //粘贴素材 - pasteAsset(){ - let companyId = sessionStorage.getItem("companyId") - let buildingId = this.beforeOneCheckedBuilding.id - let floorId = this.selectingSitePlan.id - this.canvas.paste(companyId,buildingId,floorId) - } + basicInfo:boolean = true //基本信息名称显隐 wantToWork:boolean = true //想定作业名称显隐 @@ -771,79 +615,17 @@ export class CollectionToolsExamineeComponent implements OnInit { //选择建筑 checkedBuilding(item,index){ if (this.checkedBuildingIndex!=index) { - - if (this.canvasData.isChange) { //true 数据被改动 - let isTrue = confirm('是否保存当前编辑数据') - if (isTrue) { //先保存数据 在切换 - let isSuccess = this.saveSite()//true的时候 先保存数据 - if (isSuccess != false) { - this.beforeOneCheckedBuilding = item - this.checkedBuildingIndex = index - if (index==-1) { //总平面图数据 - this.getSitePlan() - } else { //建筑楼层/区域数据 - this.getBuildingSitePlan(item) - } - } - } else { - this.beforeOneCheckedBuilding = item - this.checkedBuildingIndex = index - if (index==-1) { //总平面图数据 - this.getSitePlan() - } else { //建筑楼层/区域数据 - this.getBuildingSitePlan(item) - } - } - } else { //flase 数据未被改动 - this.beforeOneCheckedBuilding = item - this.checkedBuildingIndex = index - if (index==-1) { //总平面图数据 - this.getSitePlan() - } else { //建筑楼层/区域数据 - this.getBuildingSitePlan(item) - } - } //if - + this.beforeOneCheckedBuilding = item + this.checkedBuildingIndex = index + if (index==-1) { //总平面图数据 + this.getSitePlan() + } else { //建筑楼层/区域数据 + this.getBuildingSitePlan(item) + } } //if } - //删除建筑 - deleteBuilding(e,item){ - e.stopPropagation(); - if(confirm("是否删除该建筑") == true){ - let isHave = this.canvasData.allDisposalNode.find(items=>{ return items.buildingId === item.id }) - if (isHave == undefined) { - this.http.delete(`/api/Buildings/${item.id}`).subscribe(data=>{ - const config = new MatSnackBarConfig(); - config.verticalPosition = 'top'; - config.duration = 3000 - this.snackBar.open('删除成功','确定',config); - this.http.get("/api/Buildings",{ - params:{ - companyId :this.params.companyId - } - }).subscribe(data=>{ - this.allBuildings = data - this.beforeOneCheckedBuilding = {name:"总平面图"} - this.checkedBuildingIndex = -1 - this.getSitePlan() - }) - },err=>{ - const config = new MatSnackBarConfig(); - config.verticalPosition = 'top'; - config.duration = 3000 - this.snackBar.open('删除失败','确定',config); - this.getAllBuildings() - }) - } else { //建筑 含有数据节点时 - const config = new MatSnackBarConfig(); - config.verticalPosition = 'top'; - config.duration = 3000 - this.snackBar.open('含有数据节点的建筑不允许删除','确定',config); - } - } - } storeyData //将建筑素材和当前楼层素材合二为一 @@ -852,9 +634,8 @@ export class CollectionToolsExamineeComponent implements OnInit { //storeyData为当前楼层拥有的消防设施 this.storeyData = storeyData let data = JSON.parse(JSON.stringify(this.allFireElements)) //所有消防要素模板 - console.log(data) let treeData = [] //tree型 处理完成后的数据 - data.forEach(element => { + this.allFireElements.forEach(element => { element.key = element.id element.isTemplate = true //添加模板标识 element.isLook = true //添加是否可见标识 @@ -881,9 +662,9 @@ export class CollectionToolsExamineeComponent implements OnInit { } } } - data.forEach(item => { if (item.parentId == element.id) {element.children.push(item)} }); + this.allFireElements.forEach(item => { if (item.parentId == element.id) {element.children.push(item)} }); }); - data.forEach(element => { + this.allFireElements.forEach(element => { if (!element.parentId) { treeData.push(element) } }); @@ -913,8 +694,6 @@ export class CollectionToolsExamineeComponent implements OnInit {       return result;   } - - // console.log(filterEmpty(treeData)) this.dataSource.data = filterEmpty(treeData) this.treeControl.expandAll() @@ -953,7 +732,7 @@ export class CollectionToolsExamineeComponent implements OnInit { //点击树节点的显示隐藏icon clickLookItem(node){ - + //修改真实素材islook属性 for(let key in this.storeyData.data){ if(key == node.id){ @@ -976,8 +755,6 @@ export class CollectionToolsExamineeComponent implements OnInit { } }) } - - //子节点跟随父节点的islook变化   if(node.children && node.children.length != 0){       node.children.forEach(item=>{ @@ -1024,10 +801,7 @@ export class CollectionToolsExamineeComponent implements OnInit { }else{ iconVisibleArr.push(node.id) } - console.log(1,iconVisibleArr) - console.log(2,node.isLook) this.canvas.setIconVisible(iconVisibleArr,!node.isLook) - } //打开消防设施考题设定 @@ -1070,13 +844,12 @@ export class CollectionToolsExamineeComponent implements OnInit { let beforeOneId = this.selectingSitePlan.id || '' //当前 选中 平面图 楼层/区域 id let companyBuildingData = JSON.parse(JSON.stringify( this.canvasData.originalcompanyBuildingData || {} )) // 当前 单位/建筑 数据 let storeyData = JSON.parse(JSON.stringify( this.canvasData.originaleveryStoreyData || {} )) //当前 楼层 数据 - - // for(let key in companyBuildingData.data){ - // if (companyBuildingData.data[key].FloorId === beforeOneId) { //处理 单位/建筑 数据是否归于当前楼层下 - // storeyData.data[key] = companyBuildingData.data[key] - // } - // } console.log(566,storeyData.data) + this.Facilities.forEach(item => { + item.key == this.selectingSitePlan.id ? + this.getAllAssetLibraries(item) : + null + }) for(let key in storeyData.data){ //筛选数据 storeyData.data[key].key = storeyData.data[key].Id let noMatch = this.allFireElements.find( every=> every.id===storeyData.data[key].FireElementId ) @@ -1138,7 +911,7 @@ export class CollectionToolsExamineeComponent implements OnInit { this.selectingSitePlan = this.sitePlanData[0] || {} this.canvasData.selectStorey = this.sitePlanData[0] || {} //服务中 存一份数据 this.selectSitePlanIndex = 0 - + Promise.all([fireData,planData]).then((res)=>{ this.getSitePlanStorey(this.selectingSitePlan) //获取 平面图 楼层数据 }) @@ -1241,45 +1014,14 @@ export class CollectionToolsExamineeComponent implements OnInit { if (this.selectSitePlanIndex != index) { this.canvasData.selectPanelPoint = new DisposalNodeData(); - if (this.canvasData.isChange) { //true 数据被改动 - let isTrue = confirm('是否保存当前编辑数据') - if (isTrue) { //先保存数据 在切换 - let isSuccess = this.saveSite()//true的时候 先保存数据 - if (isSuccess != false) { - this.selectingSitePlan = item - this.selectSitePlanIndex = index - this.canvasData.selectStorey = item //服务中 存一份数据 - if (this.checkedBuildingIndex==-1) { //总平面图时 - this.getSitePlanStorey(item) //获取 平面图 楼层数据 - } else { //楼层/区域时 - this.getBuildingStorey(item) //获取 建筑 楼层数据 - } - } - } else { //不保存数据 直接切换 - this.selectingSitePlan = item - this.selectSitePlanIndex = index - this.canvasData.selectStorey = item //服务中 存一份数据 - if (this.checkedBuildingIndex==-1) { //总平面图时 - this.getSitePlanStorey(item) //获取 平面图 楼层数据 - this.getSitePlanCompanyData() - } else { //楼层/区域时 - this.getBuildingStorey(item) //获取 建筑 楼层数据 - let params = { buildingId: this.beforeOneCheckedBuilding.id } - this.getBuildingData(params) - } - } - - } else { //false 数据没被改动 - this.selectingSitePlan = item - this.selectSitePlanIndex = index - this.canvasData.selectStorey = item //服务中 存一份数据 - if (this.checkedBuildingIndex==-1) { //总平面图时 - this.getSitePlanStorey(item) //获取 平面图 楼层数据 - } else { //楼层/区域时 - this.getBuildingStorey(item) //获取 建筑 楼层数据 - } - } //if - + this.selectingSitePlan = item + this.selectSitePlanIndex = index + this.canvasData.selectStorey = item //服务中 存一份数据 + if (this.checkedBuildingIndex==-1) { //总平面图时 + this.getSitePlanStorey(item) //获取 平面图 楼层数据 + } else { //楼层/区域时 + this.getBuildingStorey(item) //获取 建筑 楼层数据 + } } } @@ -1542,6 +1284,7 @@ export class CollectionToolsExamineeComponent implements OnInit { } allLibrary:any = []; //所有素材库 + 素材 + originalallLibrary = []; //原始所有素材库 + 素材 备份 selectLibrary:any; //选中的素材库 selectImage:any; //选中的素材库图片 selectImageIndex:number; //选中的素材库图片index @@ -1552,8 +1295,10 @@ export class CollectionToolsExamineeComponent implements OnInit { data.forEach(element => { element.images = [] }); + this.originalallLibrary = data this.allLibrary = data this.selectImageIndex = -1 + console.log(654,this.allLibrary) // this.canvas.cancelPaint() }) } @@ -1579,7 +1324,7 @@ export class CollectionToolsExamineeComponent implements OnInit { //处置预案 - examType = this.route.snapshot.queryParams.openType // 预案类型 1=已存在/2=自定义 + examType = Number(this.route.snapshot.queryParams.openType) // 预案类型 1=已存在/2=自定义 allFirePlan:any = []; //所有灾情 selectDisposalNode:string = ''; //当前点击tree节点 css选中样式 @@ -1587,7 +1332,7 @@ export class CollectionToolsExamineeComponent implements OnInit { getAllFirePlan () { let api this.examType == 1? api='/api/Disasters' : api='/api/ExamDisasters' - let params = {componentId: sessionStorage.getItem('planId')} + let params = {componentId: this.route.snapshot.queryParams.planComponentId} this.http.get(api,{params:params}).subscribe((data:any)=>{ if (!data.length) { //该 单位没有灾情时 let msg = { @@ -1609,25 +1354,27 @@ export class CollectionToolsExamineeComponent implements OnInit { //获取所有处置节点 getDisposalNode () { let api - this.examType == 1? api='/api/DisposalNodes' : api='/api/ExamDisposalNodes' + console.log(4444,this.examType) + api='/api/ExamDisposalNodes' this.selectDisposalNode = '' let params - this.examType == 1? params = {disasterId: this.allFirePlan[0].id || ''} : params = {examDisasterId: this.allFirePlan[0].id || ''} + params = {examDisasterId: this.allFirePlan[0].id || '',disposalNodeType:1,examinationId:this.route.snapshot.queryParams.examId} this.http.get(api,{params:params}).subscribe(data=>{ //处置节点 this.canvasData.allDisposalNode = data - this.handleHybridTree() + this.handleHybridTree(this.canvasData.allDisposalNode,'答案') }) } treeData:any = []; //渲染tree处理完成数据 + questionstreeData:any = [];//渲染tree处理完成数据(题目) defaultExpandedKeys:any = []; //首次渲染 tree展开状态 //处理 节点 Tree数据 - handleHybridTree () { - this.defaultExpandedKeys = [] + handleHybridTree (disposalNodedata,type) { + // this.defaultExpandedKeys = [] let treeData = [] - let data = JSON.parse(JSON.stringify( this.canvasData.allDisposalNode || [] )) + let data = JSON.parse(JSON.stringify( disposalNodedata || [] )) data.forEach(element => { - this.defaultExpandedKeys.push(element.id) + // this.defaultExpandedKeys.push(element.id) element.title = element.name //name element.key = element.id //id element.children = [] //children @@ -1645,23 +1392,26 @@ export class CollectionToolsExamineeComponent implements OnInit { data.forEach(element=>{ !element.parentId? treeData.push(element) : null }) - this.treeData = [...treeData] - this.defaultExpandedKeys = [...this.defaultExpandedKeys] + type == '题目' ? this.questionstreeData = [...treeData] : this.treeData = [...treeData] + + // this.defaultExpandedKeys = [...this.defaultExpandedKeys] } //刷新 treeData 保存已展开节点 refurbishTreeData () { let api - this.examType == 1? api='/api/DisposalNodes' : api='/api/ExamDisposalNodes' + api='/api/ExamDisposalNodes' this.defaultExpandedKeys = [] let params - this.examType == 1? params = {disasterId: this.allFirePlan[0].id || ''} : params = {examDisasterId: this.allFirePlan[0].id || ''} + params = {examDisasterId: this.allFirePlan[0].id,disposalNodeType:1,examinationId:this.route.snapshot.queryParams.examId} this.http.get(api,{params:params}).subscribe(nodeData=>{ //处置节点 this.canvasData.allDisposalNode = nodeData let oldTreeData = this.nzTreeComponent.getExpandedNodeList() oldTreeData.forEach(item=>{ this.defaultExpandedKeys.push(item.key) }) + console.log(1,oldTreeData) + console.log(2,this.defaultExpandedKeys) let treeData = [] let data = JSON.parse(JSON.stringify( this.canvasData.allDisposalNode || [] )) data.forEach(element => { @@ -1812,6 +1562,7 @@ export class CollectionToolsExamineeComponent implements OnInit { //点击 处置Tree节点 selectanelPoint (e) { + console.log(12111,e) if (!e.buildingAreaId && !e.sitePlanId) { //当前节点 不是 数据节点 时 let msg = this.canvasData.findDisposalNode(e.id) this.canvasData.selectPanelPointBaseData = msg @@ -1824,7 +1575,7 @@ export class CollectionToolsExamineeComponent implements OnInit { if (this.canvasData.selectPanelPoint.DisposalNodeId != e.id) { //选择节点 不是当前节点时 let api - this.examType == 1? api='/api/DisposalNodeData' : api='/api/ExamDisposalNodeData' + api='/api/ExamDisposalNodeData' let params = {nodeId: e.id} let parameter = { //查询 节点 对应 建筑/楼层 index,id buildingIndex: e.sitePlanId? -1 : this.allBuildings.findIndex(item=>{ return item.id===e.buildingId }), //总平面图/建筑 index diff --git a/src/app/ui/collection-tools-examinee/save.ts b/src/app/ui/collection-tools-examinee/save.ts index 9c1e269..09d5ea2 100644 --- a/src/app/ui/collection-tools-examinee/save.ts +++ b/src/app/ui/collection-tools-examinee/save.ts @@ -3,6 +3,7 @@ import { HttpClient, HttpHeaders } from '@angular/common/http'; import { MatDialog, MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog'; import { MatSnackBar, MatSnackBarConfig } from '@angular/material/snack-bar'; import {CanvasShareDataService,DisposalNodeData} from '../../canvas-share-data.service' //引入服务 +import { ActivatedRoute } from '@angular/router'; // 保存想定作业第一个弹窗 @Component({ selector: 'dialog-overview-example-dialog', @@ -52,7 +53,8 @@ export class saveOneDialogExaminee { public dialogRef: MatDialogRef, public canvasData: CanvasShareDataService, public snackBar: MatSnackBar, - @Inject(MAT_DIALOG_DATA) public data) {} + @Inject(MAT_DIALOG_DATA) public data, + public route:ActivatedRoute) {} type = this.data.type allDisposalNode = this.data.allDisposalNode @@ -120,11 +122,13 @@ export class saveOneDialogExaminee { imageUrls: null, parentId: this.nodeItem ? this.nodeItem.id : null, examDisasterId: this.data.disasterId, - ExamPlanComponentId: sessionStorage.getItem('planId') || '', + ExamPlanComponentId: this.route.snapshot.queryParams.planComponentId || '', companyId: this.data.siteOrbuilding == -1 ? sessionStorage.getItem('companyId') : null, sitePlanId: this.data.siteOrbuilding==-1 ? this.selectedSiteData.id : null, buildingId: this.selectedBuildingData.id || null, - buildingAreaId: this.data.siteOrbuilding!=-1 ? this.selectedSiteData.id : null + buildingAreaId: this.data.siteOrbuilding!=-1 ? this.selectedSiteData.id : null, + examinationId:this.route.snapshot.queryParams.examId, + disposalNodeType:1 } if(type == 'old'){ let istrue = this.canvasData.findDisposalNode(this.nodeItem.id,name) @@ -181,7 +185,7 @@ export class saveOneDialogExaminee { data: JSON.stringify(this.canvasData.selectPanelPoint.Data) || null, version: this.canvasData.selectPanelPoint.Version || "2.0", ExamDisposalNodeId: data.id, - ExamPlanComponentId: sessionStorage.getItem("planId"), + ExamPlanComponentId: this.route.snapshot.queryParams.planComponentId, } this.http.post(`/api/ExamDisposalNodeData`,objData).subscribe(data => { const config = new MatSnackBarConfig(); @@ -240,11 +244,13 @@ export class saveOneDialogExaminee { imageUrls: null, parentId: this.nodeItem ? this.nodeItem.id : null, examDisasterId: this.data.disasterId, - ExamPlanComponentId: sessionStorage.getItem('planId') || '', + ExamPlanComponentId: this.route.snapshot.queryParams.planComponentId || '', companyId: null, sitePlanId: null, buildingId: null, - buildingAreaId: null + buildingAreaId: null, + examinationId:this.route.snapshot.queryParams.examId, + disposalNodeType:1 } dispositionNodeData.weather = this.canvasData.selectPanelPointBaseData.weather @@ -255,6 +261,7 @@ export class saveOneDialogExaminee { dispositionNodeData.notes = this.canvasData.selectPanelPointBaseData.notes //1.先创建一个处置节点 然后 .then 2.创建数据节点到刚创建的处置节点 3.然后拿着创建好的数据节点的id 将平面图data保存 new Promise((resolve,reject) => { + console.log(1,dispositionNodeData) this.http.post("/api/ExamDisposalNodes",dispositionNodeData).subscribe((data:any) => { resolve(data.id) }) @@ -269,15 +276,12 @@ export class saveOneDialogExaminee { }) }).then((data:any) => { // 保存平面图数据到当前节点 - // console.log(6666,data) - // let postdata =JSON.parse(JSON.stringify(this.canvasData.selectPanelPoint)) - // postdata.Data = JSON.stringify(postdata.Data) let objData = { id: null, data: JSON.stringify(this.canvasData.selectPanelPoint.Data) || null, version: this.canvasData.selectPanelPoint.Version || "2.0", ExamDisposalNodeId: data.id, - ExamPlanComponentId: sessionStorage.getItem("planId"), + ExamPlanComponentId: this.route.snapshot.queryParams.planComponentId, } this.http.post(`/api/ExamDisposalNodeData`,objData).subscribe(data => { diff --git a/src/app/ui/collection-tools/collection-tools.component.ts b/src/app/ui/collection-tools/collection-tools.component.ts index 47d6369..779de4d 100644 --- a/src/app/ui/collection-tools/collection-tools.component.ts +++ b/src/app/ui/collection-tools/collection-tools.component.ts @@ -901,9 +901,10 @@ export class CollectionToolsComponent implements OnInit { //storeyData为当前楼层拥有的消防设施 this.storeyData = storeyData let data = JSON.parse(JSON.stringify(this.allFireElements)) //所有消防要素模板 - console.log(data) + + console.log(889,this.storeyData) let treeData = [] //tree型 处理完成后的数据 - data.forEach(element => { + this.allFireElements.forEach(element => { element.key = element.id element.isTemplate = true //添加模板标识 element.isLook = true //添加是否可见标识 @@ -920,7 +921,7 @@ export class CollectionToolsComponent implements OnInit { //定义查看模式下能看到的元素 element.isLookPattern = true if(element.parentId){ - data.forEach(i => { + this.allFireElements.forEach(i => { if(i.id == element.parentId){ i.isLookPattern = true } @@ -930,9 +931,9 @@ export class CollectionToolsComponent implements OnInit { } } } - data.forEach(item => { if (item.parentId == element.id) {element.children.push(item)} }); + this.allFireElements.forEach(item => { if (item.parentId == element.id) {element.children.push(item)} }); }); - data.forEach(element => { + this.allFireElements.forEach(element => { if (!element.parentId) { treeData.push(element) } }); @@ -955,15 +956,13 @@ export class CollectionToolsComponent implements OnInit {           }       }   } -    +     function filterEmpty(listData) {       const result = [];       recursionFilterEmpty(listData, result);       return result;   } - - // console.log(filterEmpty(treeData)) this.dataSource.data = filterEmpty(treeData) this.treeControl.expandAll() @@ -1239,6 +1238,7 @@ export class CollectionToolsComponent implements OnInit { getSitePlanCompanyData () { return new Promise ((resolve,reject)=>{ this.http.get('/api/CompanyData',{params:this.params}).subscribe((data:any)=>{ + this.canvasData.originalcompanyBuildingData = data || {} // 单位原数据 this.canvasData.originalcompanyBuildingData.data? this.canvasData.originalcompanyBuildingData.data = JSON.parse(this.canvasData.originalcompanyBuildingData.data) : this.canvasData.originalcompanyBuildingData.data = {} this.canvasData.originalcompanyBuildingData.version? null : this.canvasData.originalcompanyBuildingData.version = "2.0" @@ -1252,6 +1252,7 @@ export class CollectionToolsComponent implements OnInit { getSitePlanStorey (e) { let params = {sitePlanId: e.id} this.http.get(`/api/SitePlanData`,{params}).subscribe((data:any)=>{ + console.log(12345,data) this.canvasData.originaleveryStoreyData = data || {} // 楼层原数据 this.canvasData.originaleveryStoreyData.data? this.canvasData.originaleveryStoreyData.data = JSON.parse(this.canvasData.originaleveryStoreyData.data) : this.canvasData.originaleveryStoreyData.data = {} this.canvasData.originaleveryStoreyData.version? null : this.canvasData.originaleveryStoreyData.version = "2.0" diff --git a/src/app/ui/collection-tools/examinationQuestions.html b/src/app/ui/collection-tools/examinationQuestions.html index 8bbd8fd..ec287f7 100644 --- a/src/app/ui/collection-tools/examinationQuestions.html +++ b/src/app/ui/collection-tools/examinationQuestions.html @@ -3,7 +3,7 @@
- +
diff --git a/src/app/ui/collection-tools/examinationQuestions.ts b/src/app/ui/collection-tools/examinationQuestions.ts index 8f22a0a..8f1f1dc 100644 --- a/src/app/ui/collection-tools/examinationQuestions.ts +++ b/src/app/ui/collection-tools/examinationQuestions.ts @@ -18,7 +18,7 @@ export class examinationQuestions { constructor(private http:HttpClient, public dialog: MatDialog, public snackBar: MatSnackBar, public dialogRef: MatDialogRef, @Inject(MAT_DIALOG_DATA) public data) {} - @ViewChild('nzTreeComponent', { static: false }) nzTreeComponent!: NzTreeComponent; + @ViewChild('nzTreeComponent3', { static: false }) nzTreeComponent!: NzTreeComponent; defaultCheckedKeys = []; //指定选中复选框的树节点 key值 defaultExpandedKeys = []; //展开指定的树节点 key值 @@ -68,6 +68,8 @@ export class examinationQuestions { let oldTreeData = this.nzTreeComponent.getCheckedNodeList() + + // console.log(oldTreeData) let alltreedata = JSON.parse(sessionStorage.getItem("tree型数据")) let keyArr = [] oldTreeData.forEach(element => { diff --git a/src/app/ui/collection-tools/save.ts b/src/app/ui/collection-tools/save.ts index 6f17074..7e001a4 100644 --- a/src/app/ui/collection-tools/save.ts +++ b/src/app/ui/collection-tools/save.ts @@ -124,7 +124,8 @@ export class saveOneDialog { companyId: this.data.siteOrbuilding == -1 ? sessionStorage.getItem('companyId') : null, sitePlanId: this.data.siteOrbuilding==-1 ? this.selectedSiteData.id : null, buildingId: this.selectedBuildingData.id || null, - buildingAreaId: this.data.siteOrbuilding!=-1 ? this.selectedSiteData.id : null + buildingAreaId: this.data.siteOrbuilding!=-1 ? this.selectedSiteData.id : null, + disposalNodeType:0 } if(type == 'old'){ let istrue = this.canvasData.findDisposalNode(this.nodeItem.id,name) @@ -244,7 +245,8 @@ export class saveOneDialog { companyId: null, sitePlanId: null, buildingId: null, - buildingAreaId: null + buildingAreaId: null, + disposalNodeType:0 } dispositionNodeData.weather = this.canvasData.selectPanelPointBaseData.weather