From 7b5f74c10cb762e821a9a153884de953aa08677d Mon Sep 17 00:00:00 2001 From: SHAOJIAHAO <55341701@qq.com> Date: Tue, 18 Jan 2022 15:23:30 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=AE=8C=E5=96=84]=E4=BB=A3=E7=A0=81=E6=A0=BC?= =?UTF-8?q?=E5=BC=8F=E7=BC=A9=E8=BF=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../collection-tools.component.ts | 976 +++++++++--------- .../ui/collection-tools/addDisposalNode.html | 2 +- .../ui/collection-tools/addPlaneFigure.html | 4 +- .../collection-tools.component.html | 32 +- .../collection-tools.component.scss | 247 +++-- src/app/ui/collection-tools/editBuilding.html | 5 +- .../ui/collection-tools/editDisposalNode.html | 2 +- .../ui/collection-tools/editPlaneFigure.html | 6 +- .../examinationQuestions.html | 27 +- .../collection-tools/examinationQuestions.ts | 507 ++++----- .../collection-tools/leftFunctionalDomain.ts | 66 +- src/app/ui/collection-tools/panel.scss | 86 +- src/app/ui/collection-tools/save.ts | 534 +++++----- src/app/ui/collection-tools/saveOne.html | 6 +- src/app/ui/collection-tools/saveTwo.html | 19 +- .../collection-tools/uploadDisposalNodes.html | 6 +- .../ui/collection-tools/uploadQuestions.html | 41 +- src/app/ui/collection-tools/viewdetails.html | 11 +- 18 files changed, 1349 insertions(+), 1228 deletions(-) diff --git a/src/app/ui/collection-tools-read/collection-tools.component.ts b/src/app/ui/collection-tools-read/collection-tools.component.ts index d318bde..c076536 100644 --- a/src/app/ui/collection-tools-read/collection-tools.component.ts +++ b/src/app/ui/collection-tools-read/collection-tools.component.ts @@ -1,20 +1,20 @@ -import { Component, OnInit, Inject, ViewChild,ElementRef,Renderer2, ViewContainerRef, ɵConsole } from '@angular/core'; +import { Component, OnInit, Inject, ViewChild, ElementRef, Renderer2, ViewContainerRef, ɵConsole } from '@angular/core'; 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 {MatTreeFlatDataSource, MatTreeFlattener} from '@angular/material/tree'; -import {FlatTreeControl} from '@angular/cdk/tree'; -import {WorkingAreaComponent} from '../../working-area/working-area.component' -import {CanvasShareDataService, DisposalNodeData} from '../../canvas-share-data.service' //引入服务 +import { MatTreeFlatDataSource, MatTreeFlattener } from '@angular/material/tree'; +import { FlatTreeControl } from '@angular/cdk/tree'; +import { WorkingAreaComponent } from '../../working-area/working-area.component' +import { CanvasShareDataService, DisposalNodeData } from '../../canvas-share-data.service' //引入服务 import Viewer from 'viewerjs'; import Swiper from 'swiper'; -import { NzFormatBeforeDropEvent, NzFormatEmitEvent,NzTreeComponent } from 'ng-zorro-antd/tree'; +import { NzFormatBeforeDropEvent, NzFormatEmitEvent, NzTreeComponent } from 'ng-zorro-antd/tree'; import { Observable, of } from 'rxjs'; import { delay } from 'rxjs/operators'; import { windows } from 'src/app/interface'; import { GameMode } from 'src/app/working-area/model/gameMode'; import { ActivatedRoute, Router } from '@angular/router'; -import { examinationQuestionsRead,uploadDisposalNodesRead,uploadQuestionsRead } from './examinationQuestions' +import { examinationQuestionsRead, uploadDisposalNodesRead, uploadQuestionsRead } from './examinationQuestions' import { AxMessageSystem } from 'src/app/working-area/model/axMessageSystem'; @Component({ @@ -24,9 +24,9 @@ import { AxMessageSystem } from 'src/app/working-area/model/axMessageSystem'; }) export class CollectionToolsReadComponent implements OnInit { - @ViewChild('canvas',{static: true}) canvas:WorkingAreaComponent; //父组件中获得子组件的引用 + @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) { } + constructor(private http: HttpClient, public dialog: MatDialog, public snackBar: MatSnackBar, private element: ElementRef, public canvasData: CanvasShareDataService, private router: Router, private route: ActivatedRoute) { } @ViewChild('nzTreeComponent2', { static: false }) nzTreeComponent!: NzTreeComponent; // tree配置 private _transformer = (node, level: number) => {//要给渲染节点传那些属性参数 @@ -35,38 +35,38 @@ export class CollectionToolsReadComponent implements OnInit { name: node.name || node.Name, level: level, id: node.id || node.Id, - children:node.children, - isTemplate:node.isTemplate, - isNewElement:node.isNewElement, - isLook:node.isLook, - isLookPattern:node.isLookPattern || null + children: node.children, + isTemplate: node.isTemplate, + isNewElement: node.isNewElement, + isLook: node.isLook, + isLookPattern: node.isLookPattern || null }; } 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; - colors = ['#076eec','#4dd0e1','#00ee76','#ffff00','#eeb422', - '#FF6A6A','#ff0000','#ff6eb4','#00bfff','#54ff9f', - '#009688','#836fff','#ff8c00','#ee00ee','#ffa07a', - '#00C500','#00ffff','#6495ed','#ffdAb9','#AA00FF'] + colors = ['#076eec', '#4dd0e1', '#00ee76', '#ffff00', '#eeb422', + '#FF6A6A', '#ff0000', '#ff6eb4', '#00bfff', '#54ff9f', + '#009688', '#836fff', '#ff8c00', '#ee00ee', '#ffa07a', + '#00C500', '#00ffff', '#6495ed', '#ffdAb9', '#AA00FF'] selected = "1" //图标大小选择框 - + allBuildings //该单位所有建筑 - beforeOneCheckedBuilding:any = {name:"总平面图"}; //当前点击选择的建筑 - beforeOneCheckedBuildingIsShow:boolean = false; //建筑是否显示 - togglebeforeOneCheckedBuilding () { this.beforeOneCheckedBuildingIsShow = !this.beforeOneCheckedBuildingIsShow } - checkedBuildingIndex:number = -1 //当前点击选择的建筑index - isEditPat:boolean = true //当前是否是编辑模式 - - assetName:String//素材名称 - assetWidth:number//素材宽度 - assetHeight:number//素材高度 - sliderValue:number = 0//角度滑竿的值 - sliderValueThickness:number = 0//厚度滑竿的值 - isHighLight:boolean = false//是否高亮选择框 + beforeOneCheckedBuilding: any = { name: "总平面图" }; //当前点击选择的建筑 + beforeOneCheckedBuildingIsShow: boolean = false; //建筑是否显示 + togglebeforeOneCheckedBuilding() { this.beforeOneCheckedBuildingIsShow = !this.beforeOneCheckedBuildingIsShow } + checkedBuildingIndex: number = -1 //当前点击选择的建筑index + isEditPat: boolean = true //当前是否是编辑模式 + + assetName: String//素材名称 + assetWidth: number//素材宽度 + assetHeight: number//素材高度 + sliderValue: number = 0//角度滑竿的值 + sliderValueThickness: number = 0//厚度滑竿的值 + isHighLight: boolean = false//是否高亮选择框 PropertyInfos = [] //去除图片链接真正用于循环的内容 imagesArrNum //素材属性图片数量上限 imagesArr = [] //属性中的图片链接集合 @@ -75,27 +75,27 @@ export class CollectionToolsReadComponent implements OnInit { //传入素材对象，设置右侧属性栏内容 canvasAssetObj //传入的素材属性对象 isImgNumCss = false //控制上传文件input显隐 - mySwiper:any //轮播图实例 + mySwiper: any //轮播图实例 gallery//viewerJs实例 - selectedcolor:any//选择素材的颜色代码 + selectedcolor: any//选择素材的颜色代码 //设置属性框 - setAssetsProperty(obj){ + setAssetsProperty(obj) { //初始化viewerJs实例 setTimeout(() => { obj.PropertyInfos.forEach(item => { - if(item.PropertyType == 4){ - this.gallery = new Viewer(document.getElementById('viewerjs'),{ + if (item.PropertyType == 4) { + this.gallery = new Viewer(document.getElementById('viewerjs'), { url: 'data-original' }); } }) }, 0); - + //从颜色中取出透明度 let color = obj.Color - let strh = color.substring(color.length -2,color.length) - let opacity = Math.round(parseInt(strh,16)/255 * 100) + let strh = color.substring(color.length - 2, color.length) + let opacity = Math.round(parseInt(strh, 16) / 255 * 100) this.isShowProperty = true this.isShowAttribute = false @@ -113,18 +113,18 @@ export class CollectionToolsReadComponent implements OnInit { this.PropertyInfos = obj.PropertyInfos this.sliderValueThickness = obj.Thickness this.PropertyInfos.forEach(item => { - if(item.PropertyType == 3){ //如果是图片链接类型 + if (item.PropertyType == 3) { //如果是图片链接类型 this.imagesArr.push(item) } - if(item.PropertyType == 4){//图片数值上线 + if (item.PropertyType == 4) {//图片数值上线 this.imagesArrNum = item.PropertyValue } }) //如果存在图片则加载轮播图 - if(this.imagesArr.length){ + if (this.imagesArr.length) { setTimeout(() => { - this.mySwiper = new Swiper('.swiper-container',{ + this.mySwiper = new Swiper('.swiper-container', { loop: false, // grabCursor: true, // 如果需要前进后退按钮 @@ -132,8 +132,8 @@ export class CollectionToolsReadComponent implements OnInit { nextEl: '.swiper-button-next', prevEl: '.swiper-button-prev', }, - on:{ - click: function(){ + on: { + click: function () { _this.clickedIndex = this.clickedIndex }, } @@ -141,24 +141,24 @@ export class CollectionToolsReadComponent implements OnInit { }, 0); } //判断此时图片数量是否达到上限 - if(this.imagesArr.length < this.imagesArrNum){//如果不超出 + if (this.imagesArr.length < this.imagesArrNum) {//如果不超出 this.isImgNumCss = true - }else{ + } else { this.isImgNumCss = false } } - pattern:boolean = false//默认为基本信息编辑 + pattern: boolean = false//默认为基本信息编辑 //左侧div边框宽度调节 - leftDivMouseDown(e){ + leftDivMouseDown(e) { document.onmousemove = (ev) => { let bodyWidth = document.body.clientWidth //网页宽度 let maxWidth = bodyWidth - 260 - this.element.nativeElement.querySelector('#rightDiv').clientWidth //最大宽度 - if(ev.clientX - 240 >= maxWidth){ + if (ev.clientX - 240 >= maxWidth) { this.element.nativeElement.querySelector('#leftDiv').style.width = maxWidth + 'px' - }else{ + } else { this.element.nativeElement.querySelector('#leftDiv').style.width = ev.clientX - 260 + 'px'; } } @@ -170,13 +170,13 @@ export class CollectionToolsReadComponent implements OnInit { //右侧div边框宽度调节 - rightDivMouseDown(e){ + rightDivMouseDown(e) { document.onmousemove = (ev) => { let bodyWidth = document.body.clientWidth //网页宽度 let maxWidth = bodyWidth - 240 - this.element.nativeElement.querySelector('#leftDiv').clientWidth //最大宽度 - if(bodyWidth - ev.clientX >= maxWidth){ + if (bodyWidth - ev.clientX >= maxWidth) { this.element.nativeElement.querySelector('#rightDiv').style.width = maxWidth + 'px' - }else{ + } else { this.element.nativeElement.querySelector('#rightDiv').style.width = bodyWidth - ev.clientX + 'px'; } } @@ -197,7 +197,7 @@ export class CollectionToolsReadComponent implements OnInit { this.getAllFirePlan() //获取当前单位灾情 await this.getPaperPlanData()//获得当前考题题目 - + let that = this AxMessageSystem.addListener('selectionChanged', () => { if (this.canvas.selection.size() == 1) {//如果是单选 @@ -211,124 +211,124 @@ export class CollectionToolsReadComponent implements OnInit { this.assetWidth = args1.Width this.assetHeight = args1.Height }, this) - window.setTimeout(()=>{ + window.setTimeout(() => { document.getElementById("functionalDomainContent").oncontextmenu = function (event) { event.preventDefault(); }; }) - this.canvasData.getMessage().subscribe((message: any)=>{ - if(message == "send a message"){ + this.canvasData.getMessage().subscribe((message: any) => { + if (message == "send a message") { this.refurbishTreeData() } }) } - paperType:any = this.route.snapshot.queryParams.paperType // 阅卷 / 查看试卷 - paperId:any = this.route.snapshot.queryParams.paperId - planData:any //当前考题题目 - Facilities:any //当前预案考题所有楼层要考的基本信息素材 + paperType: any = this.route.snapshot.queryParams.paperType // 阅卷 / 查看试卷 + paperId: any = this.route.snapshot.queryParams.paperId + planData: any //当前考题题目 + Facilities: any //当前预案考题所有楼层要考的基本信息素材 //获得单位预案设定 - async getPaperPlanData(){ + async getPaperPlanData() { let params = { - paperId : this.paperId + paperId: this.paperId } - await new Promise((resolve,reject)=>{ - this.http.get(`/api/PaperPlans`,{params:params}).subscribe((data:any) => { + await new Promise((resolve, reject) => { + this.http.get(`/api/PaperPlans`, { params: params }).subscribe((data: any) => { data.forEach(item => { - item.id == this.route.snapshot.queryParams.paperplanId ? - this.planData = item : null + item.id == this.route.snapshot.queryParams.paperplanId ? + this.planData = item : null }) - - let questions = JSON.parse(this.planData.examDisposalNodesData) - this.handleHybridTree(questions,'题目') + + let questions = JSON.parse(this.planData.examDisposalNodesData) + this.handleHybridTree(questions, '题目') this.Facilities = JSON.parse(this.planData.examFacilityAssetsData) - console.log('当前预案设定需要隐藏的基本信息图标',this.Facilities) + console.log('当前预案设定需要隐藏的基本信息图标', this.Facilities) resolve(1) }) }) } ngAfterViewInit(): void { - + this.getSitePlan() //获取总平面图/楼层 // 监听canvas组件选中素材事件 - this.canvas.on("select",obj=>{ + this.canvas.on("select", obj => { //选中素材属性注入函数 this.setAssetsProperty(obj.assetData) - + }) // 监听canvas组件取消选中素材事件 - this.canvas.on("deselect",obj=>{ + this.canvas.on("deselect", obj => { this.isShowProperty = false }) // 监听canvas组件新增素材事件 - this.canvas.on("createIcon",obj=>{ + this.canvas.on("createIcon", obj => { console.log(obj.assetData) }) // 监听canvas组件删除素材事件 - this.canvas.on("deleteIcon",obj=>{ + this.canvas.on("deleteIcon", obj => { }) - + } - score(){ - let data = {score:this.planData.score} - let dialogRef = this.dialog.open(Score,{data}); + score() { + let data = { score: this.planData.score } + let dialogRef = this.dialog.open(Score, { data }); } - submitScore(){ - if(!sessionStorage.getItem('scoreNum')){ + submitScore() { + if (!sessionStorage.getItem('scoreNum')) { const config = new MatSnackBarConfig(); config.verticalPosition = 'top'; config.duration = 3000 - this.snackBar.open('请先进行评分!','确定',config); - }else{ - if(window.confirm('你确定要提交此阅卷结果吗？')){ + this.snackBar.open('请先进行评分!', '确定', config); + } else { + if (window.confirm('你确定要提交此阅卷结果吗？')) { let params = { - paperPlanId : this.route.snapshot.queryParams.paperplanId, - examinationId : this.route.snapshot.queryParams.examId, - score : sessionStorage.getItem('scoreNum') + paperPlanId: this.route.snapshot.queryParams.paperplanId, + examinationId: this.route.snapshot.queryParams.examId, + score: sessionStorage.getItem('scoreNum') } - this.http.put('/api/ExaminationPlans/ModifyScore','',{params:params}).subscribe(data => { + this.http.put('/api/ExaminationPlans/ModifyScore', '', { params: params }).subscribe(data => { const config = new MatSnackBarConfig(); config.verticalPosition = 'top'; config.duration = 1000 - this.snackBar.open('提交成功，页面将于一秒后关闭!','确定',config); + this.snackBar.open('提交成功，页面将于一秒后关闭!', '确定', config); setTimeout(() => { window.close() }, 1000); }) return true; - }else{ + } else { return false; } } - + } //获得所有的建筑物 - getAllBuildings(){ - this.http.get("/api/Buildings",{ - params:{ - companyId : this.params.companyId + getAllBuildings() { + this.http.get("/api/Buildings", { + params: { + companyId: this.params.companyId } - }).subscribe(data=>{ + }).subscribe(data => { this.allBuildings = data }) } //选择建筑 - checkedBuilding(item,index){ - if (this.checkedBuildingIndex!=index) { + checkedBuilding(item, index) { + if (this.checkedBuildingIndex != index) { this.beforeOneCheckedBuilding = item this.checkedBuildingIndex = index - if (index==-1) { //总平面图数据 + if (index == -1) { //总平面图数据 this.getSitePlan() } else { //建筑楼层/区域数据 this.getBuildingSitePlan(item) @@ -341,7 +341,7 @@ export class CollectionToolsReadComponent implements OnInit { storeyData //将建筑素材和当前楼层素材合二为一 //处理 tree 数据结构 - handleTreeData (storeyData) { + handleTreeData(storeyData) { //storeyData为当前楼层拥有的消防设施 this.storeyData = storeyData let data = JSON.parse(JSON.stringify(this.allFireElements)) //所有消防要素模板 @@ -351,20 +351,20 @@ export class CollectionToolsReadComponent implements OnInit { element.isTemplate = true //添加模板标识 element.isLook = true //添加是否可见标识 element.name != '其他' ? element.children = [] : null - if(storeyData){ - for(let key in storeyData.data){ + if (storeyData) { + for (let key in storeyData.data) { storeyData.data[key].isLookPattern = true - if(element.id == storeyData.data[key].FireElementId){ + if (element.id == storeyData.data[key].FireElementId) { storeyData.data[key].isTemplate = false storeyData.data[key].isLook = true - + element.isNewElement = true //该节点children是否存在新添加的真实素材 标识 //定义查看模式下能看到的元素 element.isLookPattern = true - if(element.parentId){ + if (element.parentId) { data.forEach(i => { - if(i.id == element.parentId){ + if (i.id == element.parentId) { i.isLookPattern = true } }) @@ -373,94 +373,94 @@ export class CollectionToolsReadComponent implements OnInit { } } } - this.allFireElements.forEach(item => { if (item.parentId == element.id) {element.children.push(item)} }); + this.allFireElements.forEach(item => { if (item.parentId == element.id) { element.children.push(item) } }); }); this.allFireElements.forEach(element => { if (!element.parentId) { treeData.push(element) } }); - function recursionFilterEmpty(originalList, result) { -       for(let i = 0, length = originalList.length; i < length; i++) { -           const item = originalList[i]; -           if (item.PropertyInfos) { -               // 最内层 -               result.push(item); -           } else if (item.children && item.children.length) { -               const newChildren = []; -               // 递归调用，底层的真实数据会全部 push 进 newChildren 中 -               recursionFilterEmpty(item.children, newChildren); -               if (newChildren.length) { -                   // 替换原始数据 -                   item.children = newChildren; -                   // 子项有真实的数据，就保留这一项 -                   result.push(item); -               } // 如果没有这一项就会被删除 -           } -       } -   } -    -   function filterEmpty(listData) { -       const result = []; -       recursionFilterEmpty(listData, result); -       return result; -   } + function recursionFilterEmpty(originalList, result) { + for (let i = 0, length = originalList.length; i < length; i++) { + const item = originalList[i]; + if (item.PropertyInfos) { + // 最内层 + result.push(item); + } else if (item.children && item.children.length) { + const newChildren = []; + // 递归调用，底层的真实数据会全部 push 进 newChildren 中 + recursionFilterEmpty(item.children, newChildren); + if (newChildren.length) { + // 替换原始数据 + item.children = newChildren; + // 子项有真实的数据，就保留这一项 + result.push(item); + } // 如果没有这一项就会被删除 + } + } + } + + function filterEmpty(listData) { + const result = []; + recursionFilterEmpty(listData, result); + return result; + } this.dataSource.data = filterEmpty(treeData) this.treeControl.expandAll() - + } //点击树节点 - clickTreeNode(node){ + clickTreeNode(node) { - if(this.canvasData.originalcompanyBuildingData.data[node.id]){ + if (this.canvasData.originalcompanyBuildingData.data[node.id]) { this.setAssetsProperty(this.canvasData.originalcompanyBuildingData.data[node.id]) - }else if(this.canvasData.originaleveryStoreyData.data[node.id]){ + } else if (this.canvasData.originaleveryStoreyData.data[node.id]) { this.setAssetsProperty(this.canvasData.originaleveryStoreyData.data[node.id]) } // canvas上的素材高亮 - let iconHighLightArr:any = [] - if(node.isTemplate){//如果是模板,则开始向下找 + let iconHighLightArr: any = [] + if (node.isTemplate) {//如果是模板,则开始向下找 node.children.forEach(item => { - if(item.isTemplate){//如果子节点依旧是模板,则继续开始向下找 + if (item.isTemplate) {//如果子节点依旧是模板,则继续开始向下找 item.children.forEach(i => { iconHighLightArr.push(i.Id) }) - }else{ + } else { iconHighLightArr.push(item.Id) } }) - }else{ + } else { iconHighLightArr.push(node.id) } this.canvas.setHighlight(iconHighLightArr) } //点击树节点的显示隐藏icon - clickLookItem(node){ + clickLookItem(node) { //子节点跟随父节点的islook变化 - let iconVisibleArr:any = [] -   if(node.origin.children && node.origin.children.length != 0){ - node.origin.isLook = !node.origin.isLook -      node.origin.children.forEach(item=>{ -        item.isLook = node.origin.isLook  -        if(item.children && item.children.length != 0){ -          item.children.forEach(i=>{ -            i.isLook = node.origin.isLook  - if(i.children && i.children.length != 0){ - - }else{ + let iconVisibleArr: any = [] + if (node.origin.children && node.origin.children.length != 0) { + node.origin.isLook = !node.origin.isLook + node.origin.children.forEach(item => { + item.isLook = node.origin.isLook + if (item.children && item.children.length != 0) { + item.children.forEach(i => { + i.isLook = node.origin.isLook + if (i.children && i.children.length != 0) { + + } else { iconVisibleArr.push(i.Id) } -          }) -        }else{ + }) + } else { iconVisibleArr.push(item.Id) } -      }) -     }else{ -   node.origin.isLook = !node.origin.isLook + }) + } else { + node.origin.isLook = !node.origin.isLook iconVisibleArr.push(node.origin.Id) } console.log(iconVisibleArr) @@ -469,43 +469,41 @@ export class CollectionToolsReadComponent implements OnInit { } //打开消防设施考题设定 - openFireExamination () { + openFireExamination() { let buildFloorData = { - buildingData:this.beforeOneCheckedBuilding, - floorData:this.selectingSitePlan + buildingData: this.beforeOneCheckedBuilding, + floorData: this.selectingSitePlan } - let data = { oldRealData:this.storeyData ,buildFloorData:buildFloorData,Facilities:this.Facilities,allFireElements:this.allFireElements,paperType:this.paperType} - let dialogRef = this.dialog.open(examinationQuestionsRead,{data}); //examinationQuestionsExaminee + let data = { oldRealData: this.storeyData, buildFloorData: buildFloorData, Facilities: this.Facilities, allFireElements: this.allFireElements, paperType: this.paperType } + let dialogRef = this.dialog.open(examinationQuestionsRead, { data }); //examinationQuestionsExaminee } - answerDivDrag:boolean = false//查看答案窗口的显隐 - answertreeData:any = [] - lookAnswerDiv(){ + answerDivDrag: boolean = false//查看答案窗口的显隐 + answertreeData: any = [] + lookAnswerDiv() { this.answerDivDrag = !this.answerDivDrag - + let question = JSON.parse(this.planData.examDisposalNodesData) let questionDataArr = [] question.forEach(item => { item.sitePlanId ? questionDataArr.push(item) : null }); - + function array_diff(a, b) { - for(var i=0;i { @@ -519,38 +517,38 @@ export class CollectionToolsReadComponent implements OnInit { element.isLeaf = false element.isDataNode = false } - arr.forEach(item=>{ - item.parentId === element.id? element.children.push(item) : null + arr.forEach(item => { + item.parentId === element.id ? element.children.push(item) : null }) }); - arr.forEach(element=>{ - !element.parentId? treeData.push(element) : null + arr.forEach(element => { + !element.parentId ? treeData.push(element) : null }) - console.log(789,treeData) + console.log(789, treeData) this.answertreeData = treeData } //考官获得设置考题的所有处置节点 - allExaminationQuestions:any - getExaminationQuestions(){ + allExaminationQuestions: any + getExaminationQuestions() { let api - this.examType == 1? api='/api/DisposalNodes' : api='/api/ExamDisposalNodes' + this.examType == 1 ? api = '/api/DisposalNodes' : api = '/api/ExamDisposalNodes' this.defaultExpandedKeys = [] 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.examType == 1 ? params = { disasterId: this.allFirePlan[0].id || '' } : params = { examDisasterId: this.allFirePlan[0].id || '' } + this.http.get(api, { params: params }).subscribe(nodeData => { this.allExaminationQuestions = nodeData }) } - /** - * 获得所有素材库 - */ - basicAssetLibraries:any = []//基本信息素材库 - getAllAssetLibraries(Facilitiesitem){ - - console.log('具体到当前楼层需要隐藏的基本信息图标',Facilitiesitem.children) + /** + * 获得所有素材库 + */ + basicAssetLibraries: any = []//基本信息素材库 + getAllAssetLibraries(Facilitiesitem) { + + console.log('具体到当前楼层需要隐藏的基本信息图标', Facilitiesitem.children) let arr = [] Facilitiesitem.children.forEach(item => { arr.push(item.Id) @@ -558,161 +556,161 @@ export class CollectionToolsReadComponent implements OnInit { this.canvasData.hiddenBasicInfoFacilities = arr // this.canvas.loadExamineeData() - + } //上传考题 - openUploadQuestions () { + openUploadQuestions() { + + let data = { allFireElements: this.allFireElements, Facilities: this.Facilities } + let dialogRef = this.dialog.open(uploadQuestionsRead, { data }); - let data = {allFireElements:this.allFireElements,Facilities:this.Facilities} - let dialogRef = this.dialog.open(uploadQuestionsRead,{data}); - } - renderData:any = []//当前层默认隐藏的基本信息考试题目 - hiddenBasicInfoFacilities:any + renderData: any = []//当前层默认隐藏的基本信息考试题目 + hiddenBasicInfoFacilities: any //封装 刷新 tree 数据 - async renovateTreeData (isRefresh:boolean = true) { - this.allFireElements[this.allFireElements.length-1].children = [] + async renovateTreeData(isRefresh: boolean = true) { + this.allFireElements[this.allFireElements.length - 1].children = [] this.beforeOneCheckedBuildingIsShow = false - isRefresh? this.canvasData.isChange = false : null //服务中 数据是否改动 改为false - isRefresh? this.isShowProperty = true : null - isRefresh? this.isShowAttribute = true : null + isRefresh ? this.canvasData.isChange = false : null //服务中 数据是否改动 改为false + isRefresh ? this.isShowProperty = true : null + isRefresh ? this.isShowAttribute = true : null let beforeOneId = this.selectingSitePlan.id || '' //当前 选中 平面图 楼层/区域 id - let companyBuildingData = JSON.parse(JSON.stringify( this.canvasData.originalcompanyBuildingData || {} )) // 当前 单位/建筑 数据 - let storeyData = JSON.parse(JSON.stringify( this.canvasData.originaleveryStoreyData || {} )) //当前 楼层 数据 - console.log('this.Facilities',this.Facilities) + let companyBuildingData = JSON.parse(JSON.stringify(this.canvasData.originalcompanyBuildingData || {})) // 当前 单位/建筑 数据 + let storeyData = JSON.parse(JSON.stringify(this.canvasData.originaleveryStoreyData || {})) //当前 楼层 数据 + console.log('this.Facilities', this.Facilities) - for(let key in storeyData.data){ //筛选数据 + 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 ) + let noMatch = this.allFireElements.find(every => every.id === storeyData.data[key].FireElementId) //没有匹配全部放入到 其他 数组 if (!noMatch) { - this.allFireElements[this.allFireElements.length-1].children.push(storeyData.data[key]) + this.allFireElements[this.allFireElements.length - 1].children.push(storeyData.data[key]) } } this.handleTreeData(storeyData) //处理tree数据结构 } //处理数据 将消防要素模板与真实素材结合 - processingData(allFireElements,realData){ - allFireElements[allFireElements.length-1].children = [] - + processingData(allFireElements, realData) { + allFireElements[allFireElements.length - 1].children = [] + realData.forEach(item => { item.isLook = false item.isLeaf = true - let noMatch = allFireElements.find( every=> every.id === item.FireElementId) + let noMatch = allFireElements.find(every => every.id === item.FireElementId) if (!noMatch) { - allFireElements[allFireElements.length-1].children.push(item) + allFireElements[allFireElements.length - 1].children.push(item) } }) let treeData = [] //tree型 处理完成后的数据 allFireElements.forEach(element => { element.key = element.id element.name != '其他' ? element.children = [] : null - if(realData && realData.length != 0){ + if (realData && realData.length != 0) { realData.forEach(item => { - if(element.id == item.FireElementId){ + if (element.id == item.FireElementId) { element.children.push(item) } }) } - allFireElements.forEach(item => { if (item.parentId == element.id) {element.children.push(item)} }); + allFireElements.forEach(item => { if (item.parentId == element.id) { element.children.push(item) } }); }); allFireElements.forEach(element => { element.isLook = false if (!element.parentId) { element.isLook = false - treeData.push(element) + treeData.push(element) } }); - function recursionFilterEmpty(originalList, result) { -       for(let i = 0, length = originalList.length; i < length; i++) { -           const item = originalList[i]; -           if (item.PropertyInfos) { -               // 最内层 -               result.push(item); -           } else if (item.children && item.children.length) { -               const newChildren = []; -               // 递归调用，底层的真实数据会全部 push 进 newChildren 中 -               recursionFilterEmpty(item.children, newChildren); -               if (newChildren.length) { -                   // 替换原始数据 -                   item.children = newChildren; -                   // 子项有真实的数据，就保留这一项 -                   result.push(item); -               } // 如果没有这一项就会被删除 -           } -       } -   } -   function filterEmpty(listData) { -       const result = []; -       recursionFilterEmpty(listData, result); -       return result; -   } + function recursionFilterEmpty(originalList, result) { + for (let i = 0, length = originalList.length; i < length; i++) { + const item = originalList[i]; + if (item.PropertyInfos) { + // 最内层 + result.push(item); + } else if (item.children && item.children.length) { + const newChildren = []; + // 递归调用，底层的真实数据会全部 push 进 newChildren 中 + recursionFilterEmpty(item.children, newChildren); + if (newChildren.length) { + // 替换原始数据 + item.children = newChildren; + // 子项有真实的数据，就保留这一项 + result.push(item); + } // 如果没有这一项就会被删除 + } + } + } + function filterEmpty(listData) { + const result = []; + recursionFilterEmpty(listData, result); + return result; + } return filterEmpty(treeData) } - + //陈鹏飞↓↓↓ //陈鹏飞↓↓↓ //陈鹏飞↓↓↓ - params = {companyId: sessionStorage.getItem('companyId')} - allFireElements:any = []; //当前 单位/建筑 下的消防要素 + params = { companyId: sessionStorage.getItem('companyId') } + allFireElements: any = []; //当前 单位/建筑 下的消防要素 - isShowAttribute:boolean = true; //属性栏 是否显示 默认数据 - isShowProperty:boolean = false //属性栏 是否有东西 + isShowAttribute: boolean = true; //属性栏 是否显示 默认数据 + isShowProperty: boolean = false //属性栏 是否有东西 - toggleExpandPanel:boolean = false; //左侧可展开面板展开或关闭 - toggleExpandPanelRight:boolean = false; //右侧可展开面板展开或关闭 - togglePlane:boolean = true; //可展开面板平面图 显隐 - toggleMaterialBank:boolean = true; //可展开面板素材库 显隐 - toggleHandlePlans:boolean = true; //可展开面板处置预案 显隐 + toggleExpandPanel: boolean = false; //左侧可展开面板展开或关闭 + toggleExpandPanelRight: boolean = false; //右侧可展开面板展开或关闭 + togglePlane: boolean = true; //可展开面板平面图 显隐 + toggleMaterialBank: boolean = true; //可展开面板素材库 显隐 + toggleHandlePlans: boolean = true; //可展开面板处置预案 显隐 //可展开面板展开或关闭 - toggle () { + toggle() { this.toggleExpandPanel = !this.toggleExpandPanel } //可展开面板展开或关闭 - toggle2 () { + toggle2() { this.toggleExpandPanelRight = !this.toggleExpandPanelRight } //可展开面板 平面图 展开或关闭 - togglePlanarGraph () { + togglePlanarGraph() { this.togglePlane = !this.togglePlane } //可展开面板 素材库 展开或关闭 - toggleMaterial () { + toggleMaterial() { this.toggleMaterialBank = !this.toggleMaterialBank } //可展开面板 处置预案 展开或关闭 - toggleHandlePlan () { + toggleHandlePlan() { this.toggleHandlePlans = !this.toggleHandlePlans } - sitePlanData:any = []; //总平面图 楼层/区域 数据 - selectingSitePlan:any; //选中的 平面图 楼层/区域 - selectSitePlanIndex:number; //选中的 平面图 楼层/区域 index + sitePlanData: any = []; //总平面图 楼层/区域 数据 + selectingSitePlan: any; //选中的 平面图 楼层/区域 + selectSitePlanIndex: number; //选中的 平面图 楼层/区域 index //获取总平面图 - getSitePlan () { + getSitePlan() { let fireData = this.getFireElements(sessionStorage.getItem('buildingTypeId')) //获取单位下 消防要素 let planData = this.getSitePlanCompanyData() //获取 单位 数据 - this.http.get('/api/SitePlans',{params:this.params}).subscribe(data=>{ + this.http.get('/api/SitePlans', { params: this.params }).subscribe(data => { this.sitePlanData = data - console.log('建筑楼层数据',this.sitePlanData) + console.log('建筑楼层数据', this.sitePlanData) this.Facilities ? this.sitePlanData.forEach(item => { - this.Facilities.forEach(i =>{ - if(item.id == i.key){ - item.isLabel = true + this.Facilities.forEach(i => { + if (item.id == i.key) { + item.isLabel = true } }) }) : null this.selectingSitePlan = this.sitePlanData[0] || {} this.canvasData.selectStorey = this.sitePlanData[0] || {} //服务中 存一份数据 this.selectSitePlanIndex = 0 - - Promise.all([fireData,planData]).then((res)=>{ + + Promise.all([fireData, planData]).then((res) => { this.getSitePlanStorey(this.selectingSitePlan) //获取 平面图 楼层数据 }) @@ -720,17 +718,17 @@ export class CollectionToolsReadComponent implements OnInit { } //获取建筑 楼层/区域 - getBuildingSitePlan (item) { + getBuildingSitePlan(item) { let params = { buildingId: item.id } let fireData = this.getFireElements(item.buildingTypes[0].id || '') //获取建筑下 消防要素 let planData = this.getBuildingData(params) //获取 建筑 数据 - this.http.get('/api/BuildingAreas',{params}).subscribe(data=>{ + this.http.get('/api/BuildingAreas', { params }).subscribe(data => { this.sitePlanData = data - console.log('预案平台当前有哪些楼层',this.sitePlanData) + console.log('预案平台当前有哪些楼层', this.sitePlanData) this.Facilities ? this.sitePlanData.forEach(item => { - this.Facilities.forEach(i =>{ - if(item.id == i.key){ - item.isLabel = true + this.Facilities.forEach(i => { + if (item.id == i.key) { + item.isLabel = true } }) }) : null @@ -738,7 +736,7 @@ export class CollectionToolsReadComponent implements OnInit { this.canvasData.selectStorey = this.sitePlanData[0] || {} //服务中 存一份数据 this.selectSitePlanIndex = 0 - Promise.all([fireData,planData]).then((res)=>{ + Promise.all([fireData, planData]).then((res) => { this.getBuildingStorey(this.selectingSitePlan) //获取 建筑 楼层数据 }) @@ -746,10 +744,10 @@ export class CollectionToolsReadComponent implements OnInit { } //根据单位类型获得所有的消防要素 - getFireElements (e) { - let params = {ids:e} - return new Promise ((resolve,reject)=>{ - this.http.get('/api/Companies/FireElements',{params}).subscribe((data:any)=>{ + getFireElements(e) { + let params = { ids: e } + return new Promise((resolve, reject) => { + this.http.get('/api/Companies/FireElements', { params }).subscribe((data: any) => { this.allFireElements = data //所有消防要素 let other = { children: [], @@ -759,7 +757,7 @@ export class CollectionToolsReadComponent implements OnInit { order: 999, parentId: null, tag: "INPUT", - isLookPattern : true + isLookPattern: true } this.allFireElements.push(other) resolve('success') @@ -768,161 +766,161 @@ export class CollectionToolsReadComponent implements OnInit { } //获取 单位 数据 - getSitePlanCompanyData () { - return new Promise ((resolve,reject)=>{ - this.http.get('/api/CompanyData',{params:this.params}).subscribe((data:any)=>{ + 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" - this.canvasData.originalcompanyBuildingData.companyId? null : this.canvasData.originalcompanyBuildingData.companyId = sessionStorage.getItem('companyId') + 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" + this.canvasData.originalcompanyBuildingData.companyId ? null : this.canvasData.originalcompanyBuildingData.companyId = sessionStorage.getItem('companyId') resolve('success') }) }) } //获取 平面图 楼层数据 - originaleveryStoreyData:any - getSitePlanStorey (e) { - let params = {sitePlanId: e.id} - this.http.get(`/api/SitePlanData`,{params}).subscribe((data:any)=>{ - console.log('预案平台楼层原始素材',data) + originaleveryStoreyData: any + getSitePlanStorey(e) { + let params = { sitePlanId: e.id } + this.http.get(`/api/SitePlanData`, { params }).subscribe((data: any) => { + console.log('预案平台楼层原始素材', data) this.originaleveryStoreyData = data - this.canvasData.originaleveryStoreyData = JSON.parse(JSON.stringify(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" - this.canvasData.originaleveryStoreyData.sitePlanId? null : this.canvasData.originaleveryStoreyData.sitePlanId = e.id || null + this.canvasData.originaleveryStoreyData = JSON.parse(JSON.stringify(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" + this.canvasData.originaleveryStoreyData.sitePlanId ? null : this.canvasData.originaleveryStoreyData.sitePlanId = e.id || null let examParams = { - sitePlanId : e.id, - examinationId : this.route.snapshot.queryParams.examId, - planComponentId : this.route.snapshot.queryParams.planComponentId + sitePlanId: e.id, + examinationId: this.route.snapshot.queryParams.examId, + planComponentId: this.route.snapshot.queryParams.planComponentId } - this.http.get('/api/ExamSitePlanData',{params:examParams}).subscribe((data2:any)=>{ - console.log('考生新添加的基本信息素材数据',data2) + this.http.get('/api/ExamSitePlanData', { params: examParams }).subscribe((data2: any) => { + console.log('考生新添加的基本信息素材数据', data2) this.canvasData.examOriginaleveryStoreyData = data2 || {} // 楼层原数据 - this.canvasData.examOriginaleveryStoreyData.data? this.canvasData.examOriginaleveryStoreyData.data = JSON.parse(this.canvasData.examOriginaleveryStoreyData.data) : this.canvasData.examOriginaleveryStoreyData.data = {} - this.canvasData.examOriginaleveryStoreyData.version? null : this.canvasData.examOriginaleveryStoreyData.version = "2.0" - this.canvasData.examOriginaleveryStoreyData.buildingAreaId? null : this.canvasData.examOriginaleveryStoreyData.buildingAreaId = e.id || null + this.canvasData.examOriginaleveryStoreyData.data ? this.canvasData.examOriginaleveryStoreyData.data = JSON.parse(this.canvasData.examOriginaleveryStoreyData.data) : this.canvasData.examOriginaleveryStoreyData.data = {} + this.canvasData.examOriginaleveryStoreyData.version ? null : this.canvasData.examOriginaleveryStoreyData.version = "2.0" + this.canvasData.examOriginaleveryStoreyData.buildingAreaId ? null : this.canvasData.examOriginaleveryStoreyData.buildingAreaId = e.id || null this.renovateTreeData() - //如果有需要标注的平面图 - if(this.Facilities){ - this.Facilities.some((item,key)=>{ - if(item.key == this.selectingSitePlan.id){ + //如果有需要标注的平面图 + if (this.Facilities) { + this.Facilities.some((item, key) => { + if (item.key == this.selectingSitePlan.id) { let arr = [] item.children.forEach(i => { arr.push(i.Id) }) this.hiddenBasicInfoFacilities = arr - this.canvasData.hiddenBasicInfoFacilities = JSON.parse(JSON.stringify(arr)) - console.log('这层有需要标注的基本信息素材',item) + this.canvasData.hiddenBasicInfoFacilities = JSON.parse(JSON.stringify(arr)) + console.log('这层有需要标注的基本信息素材', item) let allFireElements = JSON.parse(JSON.stringify(this.allFireElements)) this.renderData = [] setTimeout(() => { - this.renderData = [...this.processingData(allFireElements,item.children)] + this.renderData = [...this.processingData(allFireElements, item.children)] }, 0); this.canvas.onExamineeClickFloor() this.clickedNodeType = null - return true - } else{ - if(key == this.Facilities.length - 1){ + return true + } else { + if (key == this.Facilities.length - 1) { this.renderData = [] this.canvas.onExamineeClickFloor() - return false + return false } } }) - }else{ + } else { this.canvas.onExamineeClickFloor() } }) - //如果有需要标注的平面图 - + //如果有需要标注的平面图 + }) } //获取 建筑 楼层数据 - getBuildingStorey (e) { - let params = {buildingAreaId: e.id} - this.http.get(`/api/BuildingAreaData`,{params}).subscribe((data:any)=>{ + getBuildingStorey(e) { + let params = { buildingAreaId: e.id } + this.http.get(`/api/BuildingAreaData`, { params }).subscribe((data: any) => { this.originaleveryStoreyData = data this.canvasData.originaleveryStoreyData = JSON.parse(JSON.stringify(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" - this.canvasData.originaleveryStoreyData.buildingAreaId? null : this.canvasData.originaleveryStoreyData.buildingAreaId = e.id || null + 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" + this.canvasData.originaleveryStoreyData.buildingAreaId ? null : this.canvasData.originaleveryStoreyData.buildingAreaId = e.id || null let examParams = { - buildingAreaId : e.id, - examinationId : this.route.snapshot.queryParams.examId, - planComponentId : this.route.snapshot.queryParams.planComponentId + buildingAreaId: e.id, + examinationId: this.route.snapshot.queryParams.examId, + planComponentId: this.route.snapshot.queryParams.planComponentId } - this.http.get('/api/ExamBuildingAreaData',{params:examParams}).subscribe((data:any)=>{ + this.http.get('/api/ExamBuildingAreaData', { params: examParams }).subscribe((data: any) => { this.canvasData.examOriginaleveryStoreyData = data || {} // 楼层原数据 - this.canvasData.examOriginaleveryStoreyData.data? this.canvasData.examOriginaleveryStoreyData.data = JSON.parse(this.canvasData.examOriginaleveryStoreyData.data) : this.canvasData.examOriginaleveryStoreyData.data = {} - this.canvasData.examOriginaleveryStoreyData.version? null : this.canvasData.examOriginaleveryStoreyData.version = "2.0" - this.canvasData.examOriginaleveryStoreyData.buildingAreaId? null : this.canvasData.examOriginaleveryStoreyData.buildingAreaId = e.id || null + this.canvasData.examOriginaleveryStoreyData.data ? this.canvasData.examOriginaleveryStoreyData.data = JSON.parse(this.canvasData.examOriginaleveryStoreyData.data) : this.canvasData.examOriginaleveryStoreyData.data = {} + this.canvasData.examOriginaleveryStoreyData.version ? null : this.canvasData.examOriginaleveryStoreyData.version = "2.0" + this.canvasData.examOriginaleveryStoreyData.buildingAreaId ? null : this.canvasData.examOriginaleveryStoreyData.buildingAreaId = e.id || null this.renovateTreeData() - //如果有需要标注的平面图 - if(this.Facilities){ - this.Facilities.some((item,key)=>{ - if(item.key == this.selectingSitePlan.id){ + //如果有需要标注的平面图 + if (this.Facilities) { + this.Facilities.some((item, key) => { + if (item.key == this.selectingSitePlan.id) { let arr = [] item.children.forEach(i => { arr.push(i.Id) }) this.hiddenBasicInfoFacilities = arr - this.canvasData.hiddenBasicInfoFacilities = JSON.parse(JSON.stringify(arr)) - console.log('这层有需要标注的基本信息素材',item) + this.canvasData.hiddenBasicInfoFacilities = JSON.parse(JSON.stringify(arr)) + console.log('这层有需要标注的基本信息素材', item) let allFireElements = JSON.parse(JSON.stringify(this.allFireElements)) this.renderData = [] setTimeout(() => { - this.renderData = [...this.processingData(allFireElements,item.children)] + this.renderData = [...this.processingData(allFireElements, item.children)] }, 0); this.canvas.onExamineeClickFloor() this.clickedNodeType = null - - return true - } else{ - if(key == this.Facilities.length - 1){ + + return true + } else { + if (key == this.Facilities.length - 1) { this.renderData = [] this.canvas.onExamineeClickFloor() - return false + return false } } }) - }else{ + } else { this.canvas.onExamineeClickFloor() } }) }) } //获取 建筑 数据 - getBuildingData (e) { - return new Promise ((resolve,reject)=>{ - this.http.get(`/api/BuildingData`,{params:e}).subscribe((data:any)=>{ + getBuildingData(e) { + return new Promise((resolve, reject) => { + this.http.get(`/api/BuildingData`, { params: e }).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" - this.canvasData.originalcompanyBuildingData.buildingId? null : this.canvasData.originalcompanyBuildingData.buildingId = e.buildingId + 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" + this.canvasData.originalcompanyBuildingData.buildingId ? null : this.canvasData.originalcompanyBuildingData.buildingId = e.buildingId resolve('success') }) }) } - + //点击选中 平面图 楼层/区域 时 - selectSitePlan (item,index) { - + selectSitePlan(item, index) { + if (this.selectSitePlanIndex != index) { this.clickedNodeType = 1 this.canvasData.selectPanelPoint = new DisposalNodeData(); this.selectingSitePlan = item this.selectSitePlanIndex = index this.canvasData.selectStorey = item //服务中 存一份数据 - if (this.checkedBuildingIndex==-1) { //总平面图时 + if (this.checkedBuildingIndex == -1) { //总平面图时 this.getSitePlanStorey(item) //获取 平面图 楼层数据 } else { //楼层/区域时 this.getBuildingStorey(item) //获取 建筑 楼层数据 @@ -933,15 +931,15 @@ export class CollectionToolsReadComponent implements OnInit { //删除当前 单位/建筑的 共享数据中 已删除data - deleteShareData (e,isCompany) { - this.sitePlanData.forEach((element,index) => { - if (element.id===e.id) { - this.sitePlanData.splice(index,1) + deleteShareData(e, isCompany) { + this.sitePlanData.forEach((element, index) => { + if (element.id === e.id) { + this.sitePlanData.splice(index, 1) return } }); let data = this.canvasData.originalcompanyBuildingData; - for(let key in data.data){ + for (let key in data.data) { if (data.data[key].FloorId === e.id) { //处理 单位/建筑 数据是否归于当前楼层下 delete data.data[key] } @@ -952,11 +950,11 @@ export class CollectionToolsReadComponent implements OnInit { this.canvasData.selectStorey = this.sitePlanData[0] || {} //服务中 存一份数据 this.selectSitePlanIndex = 0 this.canvasData.isChange = false - if (isCompany===-1) { - this.http.post("/api/CompanyData",newData).subscribe(data => {}) + if (isCompany === -1) { + this.http.post("/api/CompanyData", newData).subscribe(data => { }) this.getSitePlanStorey(this.selectingSitePlan) //获取 平面图 楼层数据 } else { - this.http.post("/api/BuildingData",newData,{params:this.params}).subscribe(data => {}) + this.http.post("/api/BuildingData", newData, { params: this.params }).subscribe(data => { }) this.getBuildingStorey(this.selectingSitePlan) //获取 建筑 楼层数据 } } @@ -965,22 +963,22 @@ export class CollectionToolsReadComponent implements OnInit { //处置预案 examType = Number(this.route.snapshot.queryParams.openType) // 预案类型 1=已存在/2=自定义 - allFirePlan:any = []; //所有灾情 - selectDisposalNode:string = ''; //当前点击tree节点 css选中样式 + allFirePlan: any = []; //所有灾情 + selectDisposalNode: string = ''; //当前点击tree节点 css选中样式 //获取所有灾情 - getAllFirePlan () { + getAllFirePlan() { let api - this.examType == 1? api='/api/Disasters' : api='/api/ExamDisasters' - let params = {componentId: this.route.snapshot.queryParams.planComponentId} - this.http.get(api,{params:params}).subscribe((data:any)=>{ + this.examType == 1 ? api = '/api/Disasters' : api = '/api/ExamDisasters' + let params = { componentId: this.route.snapshot.queryParams.planComponentId } + this.http.get(api, { params: params }).subscribe((data: any) => { if (!data.length) { //该 单位没有灾情时 let msg = { name: '灾情', modifiedTime: new Date(), examPlanComponentId: sessionStorage.getItem('planId') } - this.http.post('/api/ExamDisasters',msg).subscribe(data=>{ + this.http.post('/api/ExamDisasters', msg).subscribe(data => { this.allFirePlan.push(data) this.getDisposalNode() }) @@ -992,27 +990,27 @@ export class CollectionToolsReadComponent implements OnInit { } //获取所有处置节点 - getDisposalNode () { + getDisposalNode() { let api - api='/api/ExamDisposalNodes' + api = '/api/ExamDisposalNodes' this.selectDisposalNode = '' let params - params = {examDisasterId: this.allFirePlan[0].id || '',disposalNodeType:1,examinationId:this.route.snapshot.queryParams.examId} - this.http.get(api,{params:params}).subscribe(data=>{ //处置节点 + 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.getExaminationQuestions() - this.handleHybridTree(this.canvasData.allDisposalNode,'答案') + this.handleHybridTree(this.canvasData.allDisposalNode, '答案') }) } - treeData:any = []; //渲染tree处理完成数据 - questionstreeData:any = [];//渲染tree处理完成数据(题目) - defaultExpandedKeys:any = []; //首次渲染 tree展开状态 + treeData: any = []; //渲染tree处理完成数据 + questionstreeData: any = [];//渲染tree处理完成数据(题目) + defaultExpandedKeys: any = []; //首次渲染 tree展开状态 //处理 节点 Tree数据 - handleHybridTree (disposalNodedata,type) { + handleHybridTree(disposalNodedata, type) { // this.defaultExpandedKeys = [] let treeData = [] - let data = JSON.parse(JSON.stringify( disposalNodedata || [] )) + let data = JSON.parse(JSON.stringify(disposalNodedata || [])) data.forEach(element => { element.title = element.name //name @@ -1025,32 +1023,32 @@ export class CollectionToolsReadComponent implements OnInit { element.isLeaf = false element.isDataNode = false } - data.forEach(item=>{ - item.parentId === element.id? element.children.push(item) : null + data.forEach(item => { + item.parentId === element.id ? element.children.push(item) : null }) }); - data.forEach(element=>{ - !element.parentId? treeData.push(element) : null + data.forEach(element => { + !element.parentId ? treeData.push(element) : null }) type == '题目' ? this.questionstreeData = [...treeData] : this.treeData = [...treeData] - + } //刷新 treeData 保存已展开节点 - refurbishTreeData () { + refurbishTreeData() { let api - api='/api/ExamDisposalNodes' + api = '/api/ExamDisposalNodes' this.defaultExpandedKeys = [] let params - params = {examDisasterId: this.allFirePlan[0].id,disposalNodeType:1,examinationId:this.route.snapshot.queryParams.examId} - this.http.get(api,{params:params}).subscribe(nodeData=>{ //处置节点 + 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=>{ + oldTreeData.forEach(item => { this.defaultExpandedKeys.push(item.key) }) let treeData = [] - let data = JSON.parse(JSON.stringify( this.canvasData.allDisposalNode || [] )) + let data = JSON.parse(JSON.stringify(this.canvasData.allDisposalNode || [])) data.forEach(element => { element.title = element.name //name element.key = element.id //id @@ -1062,12 +1060,12 @@ export class CollectionToolsReadComponent implements OnInit { element.isLeaf = false element.isDataNode = false } - data.forEach(item=>{ - item.parentId === element.id? element.children.push(item) : null + data.forEach(item => { + item.parentId === element.id ? element.children.push(item) : null }) }); - data.forEach(element=>{ - !element.parentId? treeData.push(element) : null + data.forEach(element => { + !element.parentId ? treeData.push(element) : null }) this.treeData = [...treeData] this.defaultExpandedKeys = [...this.defaultExpandedKeys] @@ -1076,7 +1074,7 @@ export class CollectionToolsReadComponent implements OnInit { // 切换 基本信息时 刷新 删除 建筑楼层 自定义属性 - mateDeleteCustomize () { + mateDeleteCustomize() { this.defaultExpandedKeys = [] this.sitePlanData.forEach(element => { //楼层 delete element.fire @@ -1089,50 +1087,50 @@ export class CollectionToolsReadComponent implements OnInit { } //选择 考试节点 - countValue (e) { + countValue(e) { e.stopPropagation() if (this.canvasData.allDisposalNode.length) { - let data = {treeData: JSON.parse( JSON.stringify(this.treeData) ), oldTreeData: JSON.parse( JSON.stringify(this.canvasData.allDisposalNode) )} - let dialogRef = this.dialog.open(uploadDisposalNodesRead,{data}); - dialogRef.afterClosed().subscribe(data=>{ + let data = { treeData: JSON.parse(JSON.stringify(this.treeData)), oldTreeData: JSON.parse(JSON.stringify(this.canvasData.allDisposalNode)) } + let dialogRef = this.dialog.open(uploadDisposalNodesRead, { data }); + dialogRef.afterClosed().subscribe(data => { if (data) { - sessionStorage.setItem('examNodeList',JSON.stringify(data)) + sessionStorage.setItem('examNodeList', JSON.stringify(data)) const config = new MatSnackBarConfig(); config.verticalPosition = 'top'; config.duration = 3000 - this.snackBar.open('节点保存成功','确定',config); + this.snackBar.open('节点保存成功', '确定', config); } }) } else { const config = new MatSnackBarConfig(); config.verticalPosition = 'top'; config.duration = 3000 - this.snackBar.open('暂无处置节点','确定',config); + this.snackBar.open('暂无处置节点', '确定', config); } } - clickedNodeType:any = 1//点击节点的类型 如果是考官节点 则为0 考生为1 + clickedNodeType: any = 1//点击节点的类型 如果是考官节点 则为0 考生为1 //点击 处置Tree节点 - selectanelPoint (e,type) { + selectanelPoint(e, type) { this.clickedNodeType = type if (!e.buildingAreaId && !e.sitePlanId) { //当前节点 不是 数据节点 时 let msg = this.canvasData.findDisposalNode(e.id) this.canvasData.selectPanelPointBaseData = msg - this.selectDisposalNode == msg.id? this.selectDisposalNode = '' : this.selectDisposalNode = msg.id //选中 节点 + this.selectDisposalNode == msg.id ? this.selectDisposalNode = '' : this.selectDisposalNode = msg.id //选中 节点 } else if (e.buildingAreaId || e.sitePlanId) { //当前节点 是 数据节点 时 - + let msg = this.canvasData.findDisposalNode(e.parentId) - + this.canvasData.selectPanelPointBaseData = msg this.selectDisposalNode = e.parentId //选中 节点 this.Facilities ? this.sitePlanData.forEach(item => { - this.Facilities.forEach(i =>{ - if(item.id == i.key){ + this.Facilities.forEach(i => { + if (item.id == i.key) { item.isLabel = true //标记当层需要标注基本信息素材 } }) @@ -1141,21 +1139,21 @@ export class CollectionToolsReadComponent implements OnInit { if (this.canvasData.selectPanelPoint.DisposalNodeId != e.id) { //选择节点 不是当前节点时 let api //如果是已存在预案 - if( this.examType == 1){ - type == 0 ? api='/api/DisposalNodeData' : api='/api/ExamDisposalNodeData' - }else{ //如果是自定义预案 - api='/api/ExamDisposalNodeData' + if (this.examType == 1) { + type == 0 ? api = '/api/DisposalNodeData' : api = '/api/ExamDisposalNodeData' + } else { //如果是自定义预案 + api = '/api/ExamDisposalNodeData' } - - let params = {nodeId: e.id} + + let params = { nodeId: e.id } let parameter = { //查询 节点 对应 建筑/楼层 index,id - buildingIndex: e.sitePlanId? -1 : this.allBuildings.findIndex(item=>{ return item.id===e.buildingId }), //总平面图/建筑 index - storeyId: e.sitePlanId? e.sitePlanId : e.buildingAreaId, //楼层id + buildingIndex: e.sitePlanId ? -1 : this.allBuildings.findIndex(item => { return item.id === e.buildingId }), //总平面图/建筑 index + storeyId: e.sitePlanId ? e.sitePlanId : e.buildingAreaId, //楼层id } - this.http.get(api,{params:params}).subscribe(data=>{ + this.http.get(api, { params: params }).subscribe(data => { // console.log('xixixi',data) this.canvasData.selectPanelPoint = this.canvasData.deserialize(JSON.stringify(data || new DisposalNodeData())) //选择 当前 节点 - + this.canvasData.selectPanelPoint.Data = this.canvasData.deserialize(this.canvasData.selectPanelPoint.Data) // console.log(456,this.canvasData.selectPanelPoint.Data) this.seekPanelPoint(parameter) @@ -1166,50 +1164,50 @@ export class CollectionToolsReadComponent implements OnInit { } //查找 数据节点 对应 建筑/楼层 - seekPanelPoint (paramsData) { + seekPanelPoint(paramsData) { this.checkedBuildingIndex = paramsData.buildingIndex - if (paramsData.buildingIndex ==-1) { //总平面图时 - this.beforeOneCheckedBuilding={name:"总平面图"} + if (paramsData.buildingIndex == -1) { //总平面图时 + this.beforeOneCheckedBuilding = { name: "总平面图" } let fireData = this.getFireElements(sessionStorage.getItem('buildingTypeId')) //获取单位下 消防要素 let planData = this.getSitePlanCompanyData() //获取 单位 数据 - this.http.get('/api/SitePlans',{params:this.params}).subscribe(data=>{ + this.http.get('/api/SitePlans', { params: this.params }).subscribe(data => { this.sitePlanData = data - let index = this.sitePlanData.findIndex(item=>{ return item.id===paramsData.storeyId }) + let index = this.sitePlanData.findIndex(item => { return item.id === paramsData.storeyId }) this.selectingSitePlan = this.sitePlanData[index] || {} this.canvasData.selectStorey = this.sitePlanData[index] || {} //服务中 存一份数据 this.selectSitePlanIndex = index - + this.Facilities ? this.sitePlanData.forEach(item => { - this.Facilities.forEach(i =>{ - if(item.id == i.key){ - item.isLabel = true + this.Facilities.forEach(i => { + if (item.id == i.key) { + item.isLabel = true } }) }) : null - Promise.all([fireData,planData]).then((res)=>{ + Promise.all([fireData, planData]).then((res) => { this.getSitePlanStorey(this.selectingSitePlan) //获取 平面图 楼层数据 }) }) //get - + } else { //建筑时 - this.beforeOneCheckedBuilding=this.allBuildings[paramsData.buildingIndex] + this.beforeOneCheckedBuilding = this.allBuildings[paramsData.buildingIndex] let params = { buildingId: this.beforeOneCheckedBuilding.id } let fireData = this.getFireElements(this.beforeOneCheckedBuilding.buildingTypes[0].id || '') //获取建筑下 消防要素 let planData = this.getBuildingData(params) //获取 建筑 数据 - this.http.get('/api/BuildingAreas',{params}).subscribe(data=>{ + this.http.get('/api/BuildingAreas', { params }).subscribe(data => { this.sitePlanData = data - let index = this.sitePlanData.findIndex(item=>{ return item.id===paramsData.storeyId }) + let index = this.sitePlanData.findIndex(item => { return item.id === paramsData.storeyId }) this.selectingSitePlan = this.sitePlanData[index] || {} this.canvasData.selectStorey = this.sitePlanData[index] || {} //服务中 存一份数据 this.selectSitePlanIndex = index this.Facilities ? this.sitePlanData.forEach(item => { - this.Facilities.forEach(i =>{ - if(item.id == i.key){ - item.isLabel = true + this.Facilities.forEach(i => { + if (item.id == i.key) { + item.isLabel = true } }) - }) : null - Promise.all([fireData,planData]).then((res)=>{ + }) : null + Promise.all([fireData, planData]).then((res) => { this.getBuildingStorey(this.selectingSitePlan) //获取 建筑 楼层数据 }) }) //get @@ -1231,50 +1229,50 @@ export class CollectionToolsReadComponent implements OnInit { }) export class Score { - constructor(private http:HttpClient, public dialog: MatDialog, public snackBar: MatSnackBar, public dialogRef: MatDialogRef, - @Inject(MAT_DIALOG_DATA) public data) {} + constructor(private http: HttpClient, public dialog: MatDialog, public snackBar: MatSnackBar, public dialogRef: MatDialogRef, + @Inject(MAT_DIALOG_DATA) public data) { } - score:any - scoreNum:any = sessionStorage.getItem('scoreNum') || '' - ngOnInit(): void { - console.log(this.data) - this.score = '请输入分数 ( 此试题满分为' + this.data.score + '分 ) ' - } + score: any + scoreNum: any = sessionStorage.getItem('scoreNum') || '' + ngOnInit(): void { + console.log(this.data) + this.score = '请输入分数 ( 此试题满分为' + this.data.score + '分 ) ' + } - isSave:boolean = false - inputNum(){ - if(this.scoreNum > this.data.score){ - // this.scoreNum = this.data.score - const config = new MatSnackBarConfig(); - config.verticalPosition = 'top'; - config.duration = 3000 - this.snackBar.open('超出最大分值!','确定',config); - } - if(this.scoreNum < 0){ - // this.scoreNum = 0 - const config = new MatSnackBarConfig(); - config.verticalPosition = 'top'; - config.duration = 3000 - this.snackBar.open('分数不能为负数!','确定',config); - } + isSave: boolean = false + inputNum() { + if (this.scoreNum > this.data.score) { + // this.scoreNum = this.data.score + const config = new MatSnackBarConfig(); + config.verticalPosition = 'top'; + config.duration = 3000 + this.snackBar.open('超出最大分值!', '确定', config); } - ok(){ - if(this.scoreNum > this.data.score){ - const config = new MatSnackBarConfig(); - config.verticalPosition = 'top'; - config.duration = 3000 - this.snackBar.open('超出最大分值!','确定',config); - } - if(this.scoreNum < 0){ - // this.scoreNum = 0 - const config = new MatSnackBarConfig(); - config.verticalPosition = 'top'; - config.duration = 3000 - this.snackBar.open('分数不能为负数!','确定',config); - } - if(this.scoreNum >= 0 && this.scoreNum <= this.data.score){ - sessionStorage.setItem('scoreNum',this.scoreNum) - this.dialogRef.close() - } + if (this.scoreNum < 0) { + // this.scoreNum = 0 + const config = new MatSnackBarConfig(); + config.verticalPosition = 'top'; + config.duration = 3000 + this.snackBar.open('分数不能为负数!', '确定', config); } + } + ok() { + if (this.scoreNum > this.data.score) { + const config = new MatSnackBarConfig(); + config.verticalPosition = 'top'; + config.duration = 3000 + this.snackBar.open('超出最大分值!', '确定', config); + } + if (this.scoreNum < 0) { + // this.scoreNum = 0 + const config = new MatSnackBarConfig(); + config.verticalPosition = 'top'; + config.duration = 3000 + this.snackBar.open('分数不能为负数!', '确定', config); + } + if (this.scoreNum >= 0 && this.scoreNum <= this.data.score) { + sessionStorage.setItem('scoreNum', this.scoreNum) + this.dialogRef.close() + } + } } \ No newline at end of file diff --git a/src/app/ui/collection-tools/addDisposalNode.html b/src/app/ui/collection-tools/addDisposalNode.html index 27654e8..739c1c2 100644 --- a/src/app/ui/collection-tools/addDisposalNode.html +++ b/src/app/ui/collection-tools/addDisposalNode.html @@ -14,7 +14,7 @@
diff --git a/src/app/ui/collection-tools/addPlaneFigure.html b/src/app/ui/collection-tools/addPlaneFigure.html index 930bf81..8e1dea7 100644 --- a/src/app/ui/collection-tools/addPlaneFigure.html +++ b/src/app/ui/collection-tools/addPlaneFigure.html @@ -13,7 +13,7 @@
- 是否为避难层 + 是否为避难层
@@ -28,7 +28,7 @@
diff --git a/src/app/ui/collection-tools/collection-tools.component.html b/src/app/ui/collection-tools/collection-tools.component.html index 7e994aa..752035c 100644 --- a/src/app/ui/collection-tools/collection-tools.component.html +++ b/src/app/ui/collection-tools/collection-tools.component.html @@ -164,8 +164,7 @@
-
+
info属性
@@ -258,8 +257,7 @@

{{item.PropertyName}}({{item.PhysicalUnit}})

+ (input)="assetInputChange(item,$event)" [disabled]="canvasAssetObj.GameMode == 0 && !pattern">
@@ -267,11 +265,10 @@

{{item.PropertyName}}

{{imagesArr.length ? imagesArr.length : 0}} / {{item.PropertyValue}} - -
添加
@@ -287,7 +284,8 @@
- + delete
@@ -296,8 +294,7 @@

{{item.PropertyName}}

- @@ -311,18 +308,15 @@

{{item.PropertyName}}

- 是 - 否 + 是 + 否

{{item.PropertyName}}

- diff --git a/src/app/ui/collection-tools/collection-tools.component.scss b/src/app/ui/collection-tools/collection-tools.component.scss index 1aebf0f..5778a5d 100644 --- a/src/app/ui/collection-tools/collection-tools.component.scss +++ b/src/app/ui/collection-tools/collection-tools.component.scss @@ -1,7 +1,10 @@ @import './panel.scss'; + ::-webkit-scrollbar { - display: none; /* Chrome Safari */ + display: none; + /* Chrome Safari */ } + .content { width: 100%; height: 100%; @@ -10,7 +13,8 @@ padding: 3px; display: flex; flex-direction: column; - .buildingbtnchecked{ + + .buildingbtnchecked { background-color: #07CDCF; color: white; } @@ -23,9 +27,10 @@ height: 46px; min-height: 46px; display: flex; - align-items:center; + align-items: center; background-color: #fff; box-shadow: inset 0px -3px 5px 0px rgb(165, 163, 163); + .headerTitle { width: 235px; overflow: hidden; @@ -35,9 +40,11 @@ font-size: 20px; font-weight: 550; } + .headerCenter { flex: 1; overflow: hidden; + input { width: 99%; height: 30px; @@ -45,19 +52,22 @@ border-radius: 5px; } } + .headerRight { width: 350px; overflow: hidden; box-sizing: border-box; padding-left: 10px; + button { font-size: 14px; - color: #07CDCF; + color: #07CDCF; background-color: #fff; border: none; outline: none; - cursor:pointer; + cursor: pointer; } + .mat-icon { font-size: 22px; vertical-align: middle; @@ -69,14 +79,16 @@ //头部操作栏 .headerOperate { img { - width: 24px; + width: 24px; height: 24px; vertical-align: middle; margin-left: 1px; } - span{ + + span { font-size: 18px; } + flex: 5%; display: flex; align-items:center; @@ -84,15 +96,18 @@ box-sizing: border-box; margin: 3px 0; background-color: white; - button{ + + button { border: 0.5px solid rgb(208, 211, 214); margin: 0 2px; } - .editdeletebtn{ + + .editdeletebtn { display: none; } - .bigeditdeletebtn:hover{ - .editdeletebtn{ + + .bigeditdeletebtn:hover { + .editdeletebtn { display: inline-block; } } @@ -101,9 +116,10 @@ //功能区 // icon统一样式 .mat-icon { - cursor:pointer; + cursor: pointer; vertical-align: middle; } + //左右两侧功能栏 统一样式 .publicCss { border-radius: 5px; @@ -111,14 +127,17 @@ height: 100%; top: 0; } + .functionalDomain { flex: 1; overflow: hidden; + .functionalDomainContent { position: relative; width: 100%; height: 100%; } + .centerBuildingDiv { position: absolute; max-width: 400px; @@ -127,6 +146,7 @@ z-index: 150; display: flex; } + .functionalDomainLeft { background-color: #fff; display: flex; @@ -138,7 +158,8 @@ width: 235px; left: 0; z-index: 111; - .leftDragDiv{ + + .leftDragDiv { position: absolute; right: 0; height: 100%; @@ -147,20 +168,23 @@ cursor: e-resize; } } + .functionalDomainRight { z-index: 111; margin-right: 0px; - transition: margin-right 0.5s; + transition: margin-right 0.5s; border: 1px solid #cacdd1; width: 235px; min-width: 235px; right: 0; } - //右边导航栏显示隐藏 + + //右边导航栏显示隐藏 .togglePanel2 { margin-right: -2000px; - transition: margin-right 1s; + transition: margin-right 1s; } + //左侧导航栏显示隐藏 .togglePanel { margin-left: -2000px; @@ -177,19 +201,26 @@ border-radius: 5px; box-sizing: border-box; padding: 5px 0; + .centerTotalHeader { height: 30px; line-height: 30px; box-sizing: border-box; padding: 0 5px; font-size: 14px; - .above:hover {cursor: move;;} + + .above:hover { + cursor: move; + ; + } + .above { font-size: 24px; color: rgb(175, 164, 164); margin: 0 10px 0 10px; } } + .everyTotal { width: 100%; height: 30px; @@ -197,43 +228,60 @@ box-sizing: border-box; padding: 0 5px; margin: 3px 0; - cursor:pointer; + cursor: pointer; font-size: 16px; } } + //中间建筑/楼层 //右边操作栏 -.titleS{ +.titleS { width: 100%; height: 35px; line-height: 35px; padding-left: 5px; box-sizing: border-box; color: #07CDCF; - .mat-icon {vertical-align: middle; margin-right: 5px; font-size: 22px;} + + .mat-icon { + vertical-align: middle; + margin-right: 5px; + font-size: 22px; + } +} + +input { + border: none; + outline: none; + background-color: #d6dddf; + box-sizing: border-box; + padding-left: 5px; } -input { border: none; outline: none; background-color: #d6dddf; box-sizing: border-box; padding-left: 5px; } //右侧属性 -.property{ +.property { display: flex; flex-flow: column; - .siteproperty{ + + .siteproperty { height: 100%; overflow-y: auto; - p{ + + p { color: #9c9fa5; padding-left: 5px; } - .siteproperty_size{ + + .siteproperty_size { background-color: #F2F5F6; width: 93%; margin: 0 auto; border-radius: 3px; min-height: 21px; } - .rightAttribute{ + + .rightAttribute { width: 12%; height: 99.5%; position: absolute; @@ -243,56 +291,70 @@ input { border: none; outline: none; background-color: #d6dddf; box-sizing: bord border: 2px solid #464646; } } - .assetsproperty{ + + .assetsproperty { overflow-y: auto; height: 100%; - p{ + + p { color: #9c9fa5; - margin:1px 0 3px 8px; + margin: 1px 0 3px 8px; font-size: 14px; } - span{ + + span { font-size: 15px; } - input{ + + input { height: 24px; border-radius: 3px; } - .biginput{ + + .biginput { display: block; width: 88%; margin: 0 auto; } - .smallinput{ + + .smallinput { display: block; width: 19%; margin-left: 14px; } - .textarea{ + + .textarea { display: block; width: 88%; height: 50px; margin: 0 auto; } - .swiper-button-next{ + + .swiper-button-next { right: 6px; } - .swiper-button-prev{ + + .swiper-button-prev { left: 6px; } - .swiper-container{ + + .swiper-container { // --swiper-theme-color: #ff6600;/* 设置Swiper风格 */ // --swiper-navigation-color: #00ff33;/* 单独设置按钮颜色 */ - --swiper-navigation-size:20px;/* 设置按钮大小 */ + --swiper-navigation-size: 20px; + /* 设置按钮大小 */ } - .hoverred:hover{ + + .hoverred:hover { color: rgb(187, 28, 28); } - .selectDiv{ + + .selectDiv { height: 21px; position: relative; margin-bottom: 5px; - select{ + + select { width: 98px; height: 22px; vertical-align: middle; @@ -303,17 +365,20 @@ input { border: none; outline: none; background-color: #d6dddf; box-sizing: bord border-radius: 2px; } } - .colorBigDiv{ + + .colorBigDiv { width: 88%; margin-left: 8px; - .colorBigTemplateDiv{ - span{ + + .colorBigTemplateDiv { + span { color: #9c9fa5; font-size: 14px; height: 26px; line-height: 26px; } - .colorTemplateDiv{ + + .colorTemplateDiv { width: 65%; height: 22px; display: inline-block; @@ -321,29 +386,32 @@ input { border: none; outline: none; background-color: #d6dddf; box-sizing: bord margin-left: 26px; } } - - .colorDiv{ - .colorLi{ + + .colorDiv { + .colorLi { width: 24px; height: 24px; list-style: none; float: left; border: 2px solid white; } - .coloractive{ + + .coloractive { border: 2px solid black; } } } - + } } + //右侧消防要素 -.firecategories{ +.firecategories { position: relative; display: flex; flex-flow: column; - .firecategoriesTree{ + + .firecategoriesTree { overflow-y: auto; height: 100%; } @@ -353,12 +421,15 @@ input { border: none; outline: none; background-color: #d6dddf; box-sizing: bord div:focus { outline: none; } + //没有图片时显示无图片背景图 -.noImgCss{ +.noImgCss { background: url(../../../assets/images/noImg.png) no-repeat center center; - background-size: 88% 100%;/*按比例缩放*/ + background-size: 88% 100%; + /*按比例缩放*/ } -.input{ + +.input { width: 18px; height: 18px; vertical-align: middle; @@ -367,27 +438,32 @@ div:focus { } // tree -.isLookCss{ +.isLookCss { margin-left: auto; color: #07CDCF; - .icongray{ + + .icongray { color: #D9D0DC; } } -.mat-tree-node{ + +.mat-tree-node { padding-right: 3px; min-height: 30px; height: 30px; font-size: 12px; cursor: pointer; } -.treeNode:hover{ + +.treeNode:hover { background-color: #ccebf8; } -.isLookPattern{ + +.isLookPattern { display: none; } -.treeText{ + +.treeText { overflow: hidden; white-space: nowrap; text-overflow: ellipsis; @@ -395,49 +471,57 @@ div:focus { width: 65px; } -.bigBox{ +.bigBox { width: 700px; height: 40px; position: absolute; overflow: hidden; right: 0; } -.weatherBox{ + +.weatherBox { height: 40px; width: 700px; line-height: 40px; position: absolute; right: 0; transition: right linear .5s; - .openbtn{ + + .openbtn { font-size: 45px; height: 45px; width: 40px; } - .name{ + + .name { font-size: 16px; vertical-align: middle; margin-left: 3px; } - input{ + + input { width: 140px; height: 22px; margin-left: 3px; } - select{ + + select { width: 96px; height: 25px; margin-left: 3px; vertical-align: middle; } } -.open{ + +.open { right: 0px; } -.close{ - right:-622px; + +.close { + right: -622px; } -.bottomCss{ + +.bottomCss { position: absolute; left: 232px; right: 0px; @@ -447,7 +531,8 @@ div:focus { z-index: 111; background-color: white; border: 1px solid #464646; - .dragDiv{ + + .dragDiv { width: 100%; height: 3px; position: absolute; @@ -455,10 +540,12 @@ div:focus { z-index: 111; cursor: n-resize; } - .title{ + + .title { height: 35px; background-color: #464646; - div{ + + div { background-color: #464646; float: left; width: 80px; @@ -467,14 +554,16 @@ div:focus { padding-left: 5px; cursor: pointer; } - .detailsAndattentBtn{ + + .detailsAndattentBtn { background-color: #595959; } } - .body{ - textarea{ + + .body { + textarea { width: 100%; border-radius: 0px; - } + } } -} \ No newline at end of file +} diff --git a/src/app/ui/collection-tools/editBuilding.html b/src/app/ui/collection-tools/editBuilding.html index 433316d..1a06e9e 100644 --- a/src/app/ui/collection-tools/editBuilding.html +++ b/src/app/ui/collection-tools/editBuilding.html @@ -3,7 +3,8 @@
- +
@@ -14,7 +15,7 @@ -
+
diff --git a/src/app/ui/collection-tools/editDisposalNode.html b/src/app/ui/collection-tools/editDisposalNode.html index 40b2270..89f5e83 100644 --- a/src/app/ui/collection-tools/editDisposalNode.html +++ b/src/app/ui/collection-tools/editDisposalNode.html @@ -13,7 +13,7 @@
diff --git a/src/app/ui/collection-tools/editPlaneFigure.html b/src/app/ui/collection-tools/editPlaneFigure.html index a0f8016..d289d6d 100644 --- a/src/app/ui/collection-tools/editPlaneFigure.html +++ b/src/app/ui/collection-tools/editPlaneFigure.html @@ -1,5 +1,5 @@
- +
@@ -14,7 +14,7 @@
- 是否为避难层 + 是否为避难层
@@ -29,7 +29,7 @@
diff --git a/src/app/ui/collection-tools/examinationQuestions.html b/src/app/ui/collection-tools/examinationQuestions.html index ec287f7..f1cf1ca 100644 --- a/src/app/ui/collection-tools/examinationQuestions.html +++ b/src/app/ui/collection-tools/examinationQuestions.html @@ -1,30 +1,21 @@ -
+
消防设施考题设定
- + -
- -
+
+ +
- +
\ No newline at end of file diff --git a/src/app/ui/collection-tools/examinationQuestions.ts b/src/app/ui/collection-tools/examinationQuestions.ts index bedf5f0..4d8f45b 100644 --- a/src/app/ui/collection-tools/examinationQuestions.ts +++ b/src/app/ui/collection-tools/examinationQuestions.ts @@ -2,10 +2,10 @@ import { Component, OnInit, Inject, ViewChild } from '@angular/core'; 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 { CanvasShareDataService, DisposalNodeData } from '../../canvas-share-data.service' //引入服务 import { FlatTreeControl } from '@angular/cdk/tree'; import { MatTreeFlatDataSource, MatTreeFlattener } from '@angular/material/tree'; -import { NzFormatBeforeDropEvent, NzFormatEmitEvent,NzTreeComponent } from 'ng-zorro-antd/tree'; +import { NzFormatBeforeDropEvent, NzFormatEmitEvent, NzTreeComponent } from 'ng-zorro-antd/tree'; import { ActivatedRoute } from '@angular/router'; @Component({ @@ -15,137 +15,138 @@ import { ActivatedRoute } from '@angular/router'; }) export class examinationQuestions { - constructor(private http:HttpClient, public dialog: MatDialog, public snackBar: MatSnackBar, public dialogRef: MatDialogRef, - @Inject(MAT_DIALOG_DATA) public data) {} + constructor(private http: HttpClient, public dialog: MatDialog, public snackBar: MatSnackBar, public dialogRef: MatDialogRef, + @Inject(MAT_DIALOG_DATA) public data) { } - @ViewChild('nzTreeComponent3', { static: false }) nzTreeComponent!: NzTreeComponent; + @ViewChild('nzTreeComponent3', { static: false }) nzTreeComponent!: NzTreeComponent; - defaultCheckedKeys = []; //指定选中复选框的树节点 key值 - defaultExpandedKeys = []; //展开指定的树节点 key值 - defaultSelectedKeys = []; //指定选中的树节点 key值 - renderData:any - ngOnInit(): void { - this.renderData = this.data.treeData - if(JSON.parse(sessionStorage.getItem('tree型数据')) && JSON.parse(sessionStorage.getItem('tree型数据'))[this.data.buildFloorData.floorData.id]){ - this.defaultCheckedKeys = JSON.parse(sessionStorage.getItem('tree型数据'))[this.data.buildFloorData.floorData.id] - } - this.data.treeData.forEach(element => { - if(element.isTemplate){ - element.isLeaf = false - }else{ - element.isLeaf = true - } - if(element.children && element.children.length != 0){ - element.children.forEach(ele => { - if(ele.isTemplate){ - ele.isLeaf = false - }else{ - ele.isLeaf = true - } - if(ele.children && ele.children.length != 0){ - ele.children.forEach(item => { - if(item.isTemplate){ - item.isLeaf = false - }else{ - item.isLeaf = true - } - - }); - }}) - } - }) + defaultCheckedKeys = []; //指定选中复选框的树节点 key值 + defaultExpandedKeys = []; //展开指定的树节点 key值 + defaultSelectedKeys = []; //指定选中的树节点 key值 + renderData: any + ngOnInit(): void { + this.renderData = this.data.treeData + if (JSON.parse(sessionStorage.getItem('tree型数据')) && JSON.parse(sessionStorage.getItem('tree型数据'))[this.data.buildFloorData.floorData.id]) { + this.defaultCheckedKeys = JSON.parse(sessionStorage.getItem('tree型数据'))[this.data.buildFloorData.floorData.id] } + this.data.treeData.forEach(element => { + if (element.isTemplate) { + element.isLeaf = false + } else { + element.isLeaf = true + } + if (element.children && element.children.length != 0) { + element.children.forEach(ele => { + if (ele.isTemplate) { + ele.isLeaf = false + } else { + ele.isLeaf = true + } + if (ele.children && ele.children.length != 0) { + ele.children.forEach(item => { + if (item.isTemplate) { + item.isLeaf = false + } else { + item.isLeaf = true + } + + }); + } + }) + } + }) + } - nzEvent($event){ - console.log($event) - } + nzEvent($event) { + console.log($event) + } - //提交 - submit () { + //提交 + submit() { - let oldTreeData = this.nzTreeComponent.getCheckedNodeList() + let oldTreeData = this.nzTreeComponent.getCheckedNodeList() - // console.log(oldTreeData) - let alltreedata = JSON.parse(sessionStorage.getItem("tree型数据")) - let keyArr = [] - oldTreeData.forEach(element => { - keyArr.push(element.origin.key) - }) - if(alltreedata){ - //如果已经保存过当前楼层则替换 - alltreedata[this.data.buildFloorData.floorData.id] = keyArr - sessionStorage.setItem('tree型数据',JSON.stringify(alltreedata)) - }else{ - alltreedata = {} - alltreedata[this.data.buildFloorData.floorData.id] = keyArr - sessionStorage.setItem('tree型数据',JSON.stringify(alltreedata)) - } - + // console.log(oldTreeData) + let alltreedata = JSON.parse(sessionStorage.getItem("tree型数据")) + let keyArr = [] + oldTreeData.forEach(element => { + keyArr.push(element.origin.key) + }) + if (alltreedata) { + //如果已经保存过当前楼层则替换 + alltreedata[this.data.buildFloorData.floorData.id] = keyArr + sessionStorage.setItem('tree型数据', JSON.stringify(alltreedata)) + } else { + alltreedata = {} + alltreedata[this.data.buildFloorData.floorData.id] = keyArr + sessionStorage.setItem('tree型数据', JSON.stringify(alltreedata)) + } - let checkList = [] //只存真实素材 - for (const key in this.data.oldRealData.data) { - let element = this.data.oldRealData.data[key] - let isChecked = (this.nzTreeComponent.getTreeNodeByKey(key)).isChecked - 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, - buildingId:this.data.buildFloorData.buildingData.id, - children:checkList, - basicAssetsId:basicAssetsId - } - let data = JSON.parse(sessionStorage.getItem("消防设施"+sessionStorage.getItem('paperId'))) + let checkList = [] //只存真实素材 + for (const key in this.data.oldRealData.data) { + let element = this.data.oldRealData.data[key] + let isChecked = (this.nzTreeComponent.getTreeNodeByKey(key)).isChecked + 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, + buildingId: this.data.buildFloorData.buildingData.id, + children: checkList, + basicAssetsId: basicAssetsId + } + + let data = JSON.parse(sessionStorage.getItem("消防设施" + sessionStorage.getItem('paperId'))) - if(data && data.length != 0){ - console.log(1) - let ind = null - data.forEach((item,index) => { - if(item.key == obj.key){ - ind = index + 1 - } - }) - if(ind){ - if(checkList.length != 0){ - data[ind - 1].children = checkList - }else{ - data.splice(ind - 1,1) - } - - }else{ - data.push(obj) + if (data && data.length != 0) { + console.log(1) + let ind = null + data.forEach((item, index) => { + if (item.key == obj.key) { + ind = index + 1 + } + }) + if (ind) { + if (checkList.length != 0) { + data[ind - 1].children = checkList + } else { + data.splice(ind - 1, 1) } - sessionStorage.setItem("消防设施"+sessionStorage.getItem('paperId'),JSON.stringify(data)) - }else{ - console.log(2) - data = [] - data[0] = obj - sessionStorage.setItem("消防设施"+sessionStorage.getItem('paperId'),JSON.stringify(data)) + } else { + data.push(obj) } - + sessionStorage.setItem("消防设施" + sessionStorage.getItem('paperId'), JSON.stringify(data)) - const config = new MatSnackBarConfig(); - config.verticalPosition = 'top'; - config.duration = 3000 - this.snackBar.open('当层消防设施考题设置完成','确定',config); - this.dialogRef.close() + } else { + console.log(2) + data = [] + data[0] = obj + sessionStorage.setItem("消防设施" + sessionStorage.getItem('paperId'), JSON.stringify(data)) } + + const config = new MatSnackBarConfig(); + config.verticalPosition = 'top'; + config.duration = 3000 + this.snackBar.open('当层消防设施考题设置完成', '确定', config); + this.dialogRef.close() + } + } @@ -157,150 +158,150 @@ export class examinationQuestions { }) export class uploadQuestions { - constructor(private http:HttpClient, public dialog: MatDialog, public snackBar: MatSnackBar, public dialogRef: MatDialogRef, - @Inject(MAT_DIALOG_DATA) public data,private route:ActivatedRoute) {} - - defaultCheckedKeys = []; //指定选中复选框的树节点 key值 - defaultExpandedKeys = []; //展开指定的树节点 key值 - defaultSelectedKeys = []; //指定选中的树节点 key值 - renderData:any - - ngOnInit(): void { - let data = JSON.parse(sessionStorage.getItem("消防设施"+sessionStorage.getItem('paperId'))) - data ? data.forEach(item => { - let realData = item.children - let allFireElements = JSON.parse(JSON.stringify(this.data.allFireElements)) - item.children = this.processingData(allFireElements,realData) - }) :null - this.renderData = data - this.getProfiles() - this.nodeInit() - } + constructor(private http: HttpClient, public dialog: MatDialog, public snackBar: MatSnackBar, public dialogRef: MatDialogRef, + @Inject(MAT_DIALOG_DATA) public data, private route: ActivatedRoute) { } - //处理数据 将消防要素模板与真实素材结合 - processingData(allFireElements,realData){ - allFireElements[allFireElements.length-1].children = [] - realData.forEach(item => { - item.isLeaf = true - let noMatch = allFireElements.find( every=> every.id === item.FireElementId ) - if (!noMatch) { - allFireElements[allFireElements.length-1].children.push(item) - } - }) - let treeData = [] //tree型 处理完成后的数据 - allFireElements.forEach(element => { - element.key = element.id - element.name != '其他' ? element.children = [] : null - if(realData){ - realData.forEach(item => { - if(element.id == item.FireElementId){ - element.children.push(item) - } - }) + defaultCheckedKeys = []; //指定选中复选框的树节点 key值 + defaultExpandedKeys = []; //展开指定的树节点 key值 + defaultSelectedKeys = []; //指定选中的树节点 key值 + renderData: any + + ngOnInit(): void { + let data = JSON.parse(sessionStorage.getItem("消防设施" + sessionStorage.getItem('paperId'))) + data ? data.forEach(item => { + let realData = item.children + let allFireElements = JSON.parse(JSON.stringify(this.data.allFireElements)) + item.children = this.processingData(allFireElements, realData) + }) : null + this.renderData = data + this.getProfiles() + this.nodeInit() + } + + //处理数据 将消防要素模板与真实素材结合 + processingData(allFireElements, realData) { + allFireElements[allFireElements.length - 1].children = [] + realData.forEach(item => { + item.isLeaf = true + let noMatch = allFireElements.find(every => every.id === item.FireElementId) + if (!noMatch) { + allFireElements[allFireElements.length - 1].children.push(item) + } + }) + let treeData = [] //tree型 处理完成后的数据 + allFireElements.forEach(element => { + element.key = element.id + element.name != '其他' ? element.children = [] : null + if (realData) { + realData.forEach(item => { + if (element.id == item.FireElementId) { + element.children.push(item) + } + }) + } + allFireElements.forEach(item => { if (item.parentId == element.id) { element.children.push(item) } }); + }); + allFireElements.forEach(element => { + if (!element.parentId) { treeData.push(element) } + }); + function recursionFilterEmpty(originalList, result) { + for (let i = 0, length = originalList.length; i < length; i++) { + const item = originalList[i]; + if (item.PropertyInfos) { + // 最内层 + result.push(item); + } else if (item.children && item.children.length) { + const newChildren = []; + // 递归调用，底层的真实数据会全部 push 进 newChildren 中 + recursionFilterEmpty(item.children, newChildren); + if (newChildren.length) { + // 替换原始数据 + item.children = newChildren; + // 子项有真实的数据，就保留这一项 + result.push(item); + } // 如果没有这一项就会被删除 } - allFireElements.forEach(item => { if (item.parentId == element.id) {element.children.push(item)} }); - }); - allFireElements.forEach(element => { - if (!element.parentId) { treeData.push(element) } - }); - function recursionFilterEmpty(originalList, result) { -       for(let i = 0, length = originalList.length; i < length; i++) { -           const item = originalList[i]; -           if (item.PropertyInfos) { -               // 最内层 -               result.push(item); -           } else if (item.children && item.children.length) { -               const newChildren = []; -               // 递归调用，底层的真实数据会全部 push 进 newChildren 中 -               recursionFilterEmpty(item.children, newChildren); -               if (newChildren.length) { -                   // 替换原始数据 -                   item.children = newChildren; -                   // 子项有真实的数据，就保留这一项 -                   result.push(item); -               } // 如果没有这一项就会被删除 -           } -       } -   } -   function filterEmpty(listData) { -       const result = []; -       recursionFilterEmpty(listData, result); -       return result; -   } - return filterEmpty(treeData) + } } + function filterEmpty(listData) { + const result = []; + recursionFilterEmpty(listData, result); + return result; + } + return filterEmpty(treeData) + } - //获取登录账号的个人资料 - Profiles:any - getProfiles(){ - this.http.get('/api/ExamAccounts/Profiles').subscribe(data => { - this.Profiles = data - }) - } + //获取登录账号的个人资料 + Profiles: any + getProfiles() { + this.http.get('/api/ExamAccounts/Profiles').subscribe(data => { + this.Profiles = data + }) + } - nodeTreeData:any = []; //处置节点tree - //节点初始化 - nodeInit () { - let treeData = [] - this.data.node.forEach(element => { - element.title = element.name //name - element.key = element.id //id - element.children = [] //children - if (element.sitePlanId || element.buildingAreaId) { //是数据节点 - element.isLeaf = true - element.isDataNode = true - } else { //不是数据节点 - element.isLeaf = false - element.isDataNode = false - } - this.data.node.forEach(item=>{ - item.parentId === element.id? element.children.push(item) : null - }) - }); - this.data.node.forEach(element=>{ - !element.parentId? treeData.push(element) : null + nodeTreeData: any = []; //处置节点tree + //节点初始化 + nodeInit() { + let treeData = [] + this.data.node.forEach(element => { + element.title = element.name //name + element.key = element.id //id + element.children = [] //children + if (element.sitePlanId || element.buildingAreaId) { //是数据节点 + element.isLeaf = true + element.isDataNode = true + } else { //不是数据节点 + element.isLeaf = false + element.isDataNode = false + } + this.data.node.forEach(item => { + item.parentId === element.id ? element.children.push(item) : null }) - this.nodeTreeData = [...treeData] - } + }); + this.data.node.forEach(element => { + !element.parentId ? treeData.push(element) : null + }) + this.nodeTreeData = [...treeData] + } - nzEvent($event){ - console.log($event) + nzEvent($event) { + console.log($event) + } + //上传 + submit() { + console.log(this.data.question) + let body: any = { + id: this.route.snapshot.queryParams.paperplanId, + paperId: sessionStorage.getItem('paperId'), + planComponentId: sessionStorage.getItem('planId'), + examPlanType: this.route.snapshot.queryParams.openType == 1 ? 0 : 1, + creatorId: this.Profiles.id, + modifiedTime: new Date(), + isPublic: true, + title: this.route.snapshot.queryParams.planName, + mainPoint: this.data.question.keynote, + score: 0, + examFacilityAssetsData: sessionStorage.getItem('消防设施' + sessionStorage.getItem('paperId')) ? sessionStorage.getItem('消防设施' + sessionStorage.getItem('paperId')) : null, + examDisposalNodesData: sessionStorage.getItem('examNodeList') ? sessionStorage.getItem('examNodeList') : null, + companyId: sessionStorage.getItem('companyId') } - //上传 - submit () { - console.log(this.data.question) - let body:any = { - id: this.route.snapshot.queryParams.paperplanId, - paperId: sessionStorage.getItem('paperId'), - planComponentId: sessionStorage.getItem('planId'), - examPlanType: this.route.snapshot.queryParams.openType == 1 ? 0 : 1, - creatorId: this.Profiles.id, - modifiedTime: new Date(), - isPublic: true, - title: this.route.snapshot.queryParams.planName, - mainPoint: this.data.question.keynote, - score: 0, - examFacilityAssetsData: sessionStorage.getItem('消防设施' + sessionStorage.getItem('paperId')) ? sessionStorage.getItem('消防设施' + sessionStorage.getItem('paperId')) : null, - examDisposalNodesData: sessionStorage.getItem('examNodeList') ? sessionStorage.getItem('examNodeList') : null, - companyId:sessionStorage.getItem('companyId') - } - this.http.put(`/api/PaperPlans/${this.route.snapshot.queryParams.paperplanId}`,body).subscribe(data => { - - const config = new MatSnackBarConfig(); - config.verticalPosition = 'top'; - config.duration = 3000 - this.snackBar.open('设置完成,页面将于一秒后关闭','确定',config); - setTimeout(() => { - window.close() - }, 1000); - - }) + this.http.put(`/api/PaperPlans/${this.route.snapshot.queryParams.paperplanId}`, body).subscribe(data => { - - } + const config = new MatSnackBarConfig(); + config.verticalPosition = 'top'; + config.duration = 3000 + this.snackBar.open('设置完成,页面将于一秒后关闭', '确定', config); + setTimeout(() => { + window.close() + }, 1000); + + }) + + + } } @@ -314,26 +315,26 @@ export class uploadQuestions { }) export class uploadDisposalNodes { - constructor(private http:HttpClient, public dialog: MatDialog, public snackBar: MatSnackBar, public dialogRef: MatDialogRef, - @Inject(MAT_DIALOG_DATA) public data) {} + 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; - + ngOnInit(): void { this.treeData = [...this.data.treeData] } - treeData:any = []; //tree + treeData: any = []; //tree //提交 保存考试节点 - submit () { + submit() { let checkList = [] this.data.oldTreeData.forEach(element => { let isChecked = (this.nzTreeComponent.getTreeNodeByKey(element.id)).isChecked - isChecked? checkList.push(element) : null + isChecked ? checkList.push(element) : null }); let galfList = this.nzTreeComponent.getHalfCheckedNodeList() this.data.oldTreeData.forEach(element => { galfList.forEach(elements => { - element.id == elements.origin.id? checkList.push(element) : null + element.id == elements.origin.id ? checkList.push(element) : null }); }); if (checkList.length) { @@ -342,7 +343,7 @@ export class uploadDisposalNodes { const config = new MatSnackBarConfig(); config.verticalPosition = 'top'; config.duration = 3000 - this.snackBar.open('请选择节点','确定',config); + this.snackBar.open('请选择节点', '确定', config); } } diff --git a/src/app/ui/collection-tools/leftFunctionalDomain.ts b/src/app/ui/collection-tools/leftFunctionalDomain.ts index 519653d..2a039d0 100644 --- a/src/app/ui/collection-tools/leftFunctionalDomain.ts +++ b/src/app/ui/collection-tools/leftFunctionalDomain.ts @@ -11,7 +11,7 @@ import { MatSnackBar, MatSnackBarConfig } from '@angular/material/snack-bar'; export class leftFunctionalDomainComponent implements OnInit { constructor( - private http:HttpClient, + private http: HttpClient, public dialog: MatDialog, public snackBar: MatSnackBar, public dialogRef: MatDialogRef, @@ -21,22 +21,22 @@ export class leftFunctionalDomainComponent implements OnInit { } - params = {companyId: sessionStorage.getItem('companyId')} - checked:boolean = false;//是否为避难层 - + params = { companyId: sessionStorage.getItem('companyId') } + checked: boolean = false;//是否为避难层 + //提交表单创建平面图 - onSubmit (e) { + onSubmit(e) { if (!this.data.isBuilding) { //总平面图 创建平面图 let data = { companyId: sessionStorage.getItem('companyId'), name: e.name, order: this.data.order, - area:e.area, - details:e.details, + area: e.area, + details: e.details, enabled: true, modifiedTime: new Date(), } - this.http.post('/api/SitePlans',data).subscribe(data=>{ + this.http.post('/api/SitePlans', data).subscribe(data => { this.dialogRef.close('总平面图'); }) } else { //建筑 创建楼层/区域 @@ -45,12 +45,12 @@ export class leftFunctionalDomainComponent implements OnInit { buildingId: this.data.Panel.id, name: e.name, order: this.data.order, - area:e.area, - details:e.details, + area: e.area, + details: e.details, enabled: true, modifiedTime: new Date(), } - this.http.post('/api/BuildingAreas',data,{params:this.params}).subscribe(data=>{ + this.http.post('/api/BuildingAreas', data, { params: this.params }).subscribe(data => { this.dialogRef.close('建筑'); }) } @@ -68,7 +68,7 @@ export class leftFunctionalDomainComponent implements OnInit { }) export class editPlaneFigureComponent implements OnInit { - constructor(private http:HttpClient,public dialog: MatDialog,public snackBar: MatSnackBar,public dialogRef: MatDialogRef,@Inject(MAT_DIALOG_DATA) public data) { } + constructor(private http: HttpClient, public dialog: MatDialog, public snackBar: MatSnackBar, public dialogRef: MatDialogRef, @Inject(MAT_DIALOG_DATA) public data) { } ngOnInit(): void { this.name = this.data.buildingData.name || '' @@ -77,14 +77,14 @@ export class editPlaneFigureComponent implements OnInit { this.details = this.data.buildingData.details || '' } - params = {companyId: sessionStorage.getItem('companyId')} - name:any; //name - checked:boolean = false;//是否为避难层 - area:number; //面积 - details:string; //详情 + params = { companyId: sessionStorage.getItem('companyId') } + name: any; //name + checked: boolean = false;//是否为避难层 + area: number; //面积 + details: string; //详情 //提交表单修改平面图 - onSubmit (e) { + onSubmit(e) { if (!this.data.isBuilding) { //总平面图 修改平面图 let data = { companyId: sessionStorage.getItem('companyId'), @@ -94,12 +94,12 @@ export class editPlaneFigureComponent implements OnInit { imageUrl: this.data.buildingData.imageUrl, imageAngle: this.data.buildingData.imageAngle, order: this.data.buildingData.order, - area:e.area, - details:e.details, + area: e.area, + details: e.details, enabled: this.data.buildingData.enabled, modifiedTime: new Date(), } - this.http.put(`/api/SitePlans/${this.data.buildingData.id}`,data).subscribe(data=>{ + this.http.put(`/api/SitePlans/${this.data.buildingData.id}`, data).subscribe(data => { this.dialogRef.close('总平面图'); }) } else { //建筑 修改楼层/区域 @@ -112,12 +112,12 @@ export class editPlaneFigureComponent implements OnInit { imageUrl: this.data.buildingData.imageUrl, imageAngle: this.data.buildingData.imageAngle, order: this.data.buildingData.order, - area:e.area, - details:e.details, + area: e.area, + details: e.details, enabled: this.data.buildingData.enabled, modifiedTime: new Date(), } - this.http.put(`/api/BuildingAreas/${this.data.buildingData.id}`,data,{params:this.params}).subscribe(data=>{ + this.http.put(`/api/BuildingAreas/${this.data.buildingData.id}`, data, { params: this.params }).subscribe(data => { this.dialogRef.close('建筑'); }) } @@ -137,15 +137,15 @@ export class editPlaneFigureComponent implements OnInit { }) export class addDisposalNodeComponent implements OnInit { - constructor(private http:HttpClient,public dialog: MatDialog,public snackBar: MatSnackBar,public dialogRef: MatDialogRef,@Inject(MAT_DIALOG_DATA) public data) { } + constructor(private http: HttpClient, public dialog: MatDialog, public snackBar: MatSnackBar, public dialogRef: MatDialogRef, @Inject(MAT_DIALOG_DATA) public data) { } ngOnInit(): void { } //提交表单 - onSubmit (e) { + onSubmit(e) { this.data.name = e.name - this.http.post('/api/DisposalNodes',this.data).subscribe(data=>{ + this.http.post('/api/DisposalNodes', this.data).subscribe(data => { this.dialogRef.close('success'); }) } @@ -162,17 +162,17 @@ export class addDisposalNodeComponent implements OnInit { }) export class editDisposalNodeComponent implements OnInit { - constructor(private http:HttpClient,public dialog: MatDialog,public snackBar: MatSnackBar,public dialogRef: MatDialogRef,@Inject(MAT_DIALOG_DATA) public data) { } + constructor(private http: HttpClient, public dialog: MatDialog, public snackBar: MatSnackBar, public dialogRef: MatDialogRef, @Inject(MAT_DIALOG_DATA) public data) { } ngOnInit(): void { - this.nodeName = JSON.parse(JSON.stringify( this.data.name || '' )) + this.nodeName = JSON.parse(JSON.stringify(this.data.name || '')) } - nodeName:string; - + nodeName: string; + //提交表单 - onSubmit (e) { + onSubmit(e) { this.data.name = e.name - this.http.put(`/api/DisposalNodes/${this.data.id}`,this.data).subscribe(data=>{ + this.http.put(`/api/DisposalNodes/${this.data.id}`, this.data).subscribe(data => { this.dialogRef.close(e.name); }) } diff --git a/src/app/ui/collection-tools/panel.scss b/src/app/ui/collection-tools/panel.scss index 245e998..4675afe 100644 --- a/src/app/ui/collection-tools/panel.scss +++ b/src/app/ui/collection-tools/panel.scss @@ -5,7 +5,7 @@ //平面图 素材库 公共样式 头部 -.planarGraphHeader{ +.planarGraphHeader { height: 35px; min-height: 35px; cursor: pointer; @@ -20,6 +20,7 @@ color: #fff; background: #07CDCF; } + //平面图头部字体图标样式 .hover { width: 18px; @@ -27,11 +28,19 @@ margin-left: 90px; border: 1px solid #999; border-radius: 3px; - .mat-icon {font-size: 18px; color: #999;} + + .mat-icon { + font-size: 18px; + color: #999; + } } -.hover:hover { + +.hover:hover { background-color: #4DA5FA; - .mat-icon {color: #fff;} + + .mat-icon { + color: #fff; + } } //平面图 @@ -42,6 +51,7 @@ line-height: 35px; box-sizing: border-box; padding: 0 10px 0 25px; + .mat-icon { font-size: 20px; } @@ -58,11 +68,13 @@ text-align: center; position: relative; overflow: hidden; - img{ - width: 20px; + + img { + width: 20px; height: 20px; } } + //替换底图 inputfile .a-upload { display: block; @@ -74,6 +86,7 @@ text-align: center; position: relative; overflow: hidden; + input { position: absolute; width: 20px; @@ -83,11 +96,13 @@ opacity: 0; } } + .a-upload:hover { .mat-icon { color: #fff; } } + //上传底图 inputfile #a-uploadImg { display: block; @@ -100,6 +115,7 @@ border-radius: 5px; border: 1px solid #999; z-index: 999; + input { position: absolute; width: 300px; @@ -108,11 +124,13 @@ top: 0; opacity: 0; } + img { width: 100%; height: auto; } } + #a-uploadImg:hover { border: 5px solid skyblue; } @@ -123,8 +141,9 @@ display: block; } } + //右边操作栏 -#rightOperate{ +#rightOperate { width: 50px; height: 100px; position: absolute; @@ -135,16 +154,20 @@ background-color: #F0F4F7; // #F0F4F7 cdced1 display: none; + .functionButton { height: 25%; line-height: 25px; } + .bigFunctionIcon { font-size: 24px; } + .functionIcon { color: #999; } + .functionIcon:hover { color: #4DA5FA; } @@ -165,29 +188,37 @@ .scenarioAssignment { overflow-y: auto; } + .selectEditMode { flex: 1; display: flex; flex-direction: column; overflow: hidden; } -.materialBankDIV{ + +.materialBankDIV { flex: 1; overflow-x: hidden; overflow-y: auto; } + // 基本信息/想定作业 切换 //处置预案 #terrNodePublic { height: 35px; line-height: 35px; display: flex; - .textNode {flex: 1;} + + .textNode { + flex: 1; + } } + //字体图标 .planIconDiv { display: inline-block; - .mat-icon{ + + .mat-icon { font-size: 20px; width: 20px; height: 20px; @@ -201,21 +232,29 @@ .mat-expansion-panel-header { height: 40px !important; } + //素材库溢出隐藏 #materialBank { margin: 1px 0; } + //素材库图片flex -.mat-expansion-panel-header {background-color: #d6f4f5;} -#panelLibrary .text{ +.mat-expansion-panel-header { + background-color: #d6f4f5; +} + +#panelLibrary .text { box-sizing: border-box; margin-left: 10px; } + .panelLibraryFlex { display: flex; flex-direction: row; flex-wrap: wrap; - justify-content: space-between; /* 水平居中 */ + justify-content: space-between; + + /* 水平居中 */ .imgBox { width: 70px; height: 100px; @@ -223,15 +262,17 @@ text-align: center; border-radius: 3px; margin: 5px 0; + img { width: 70px; height: auto; max-height: 70px; - cursor:pointer; + cursor: pointer; } + p { font-size: 12px; - cursor:pointer; + cursor: pointer; } } } @@ -239,24 +280,28 @@ //文本溢出 .overflowText { overflow: hidden; - text-overflow:ellipsis; + text-overflow: ellipsis; white-space: nowrap; } + // 楼层/区域 是避难层时 .isRefugeStorey { color: #FF8678; background-color: #fff; } + //选中平面图时 .selectSitePlan { color: #fff; background-color: #07CDCF; } + //选中素材库图片时 .selectImg { color: #fff; background-color: #4DA5FA; } + //选中 处置节点时 .selectanelPoint { background-color: #F4C235; @@ -268,24 +313,29 @@ .keyMargin { width: 100%; margin: 5px 0; + .mat-form-field { width: 100%; } } + .submitBottom { display: flex; flex-direction: row; flex-wrap: wrap; - justify-content: space-between; /* 水平居中 */ + justify-content: space-between; + /* 水平居中 */ } + .functionalDomainContent { width: 300px; height: 100%; + textarea { border-radius: 5px; border: 1px solid #999; width: 100%; height: 120px; - resize:none; + resize: none; } } diff --git a/src/app/ui/collection-tools/save.ts b/src/app/ui/collection-tools/save.ts index 5befea8..3c6110f 100644 --- a/src/app/ui/collection-tools/save.ts +++ b/src/app/ui/collection-tools/save.ts @@ -2,303 +2,305 @@ import { Component, OnInit, Inject } from '@angular/core'; 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 { CanvasShareDataService, DisposalNodeData } from '../../canvas-share-data.service' //引入服务 // 保存想定作业第一个弹窗 @Component({ - selector: 'dialog-overview-example-dialog', - templateUrl: 'saveOne.html', - styleUrls: ['./collection-tools.component.scss'] + selector: 'dialog-overview-example-dialog', + templateUrl: 'saveOne.html', + styleUrls: ['./collection-tools.component.scss'] }) export class saveOneDialog { - constructor( - private http:HttpClient, - public dialog: MatDialog, - public snackBar: MatSnackBar, - public dialogRef: MatDialogRef, - @Inject(MAT_DIALOG_DATA) public data) {} + constructor( + private http: HttpClient, + public dialog: MatDialog, + public snackBar: MatSnackBar, + public dialogRef: MatDialogRef, + @Inject(MAT_DIALOG_DATA) public data) { } - onNoClick(): void { - this.dialogRef.close() - } - allDisposalNode = this.data.allDisposalNode + onNoClick(): void { + this.dialogRef.close() + } + allDisposalNode = this.data.allDisposalNode - saveType(type){ - this.dialogRef.close() - const dialogRef = this.dialog.open(saveTwoDialog, { - data: {type: type, - allDisposalNode: this.data.allDisposalNode, - selectedBuildingData:this.data.selectedBuildingData, - selectedSiteData:this.data.selectedSiteData, - siteOrbuilding:this.data.siteOrbuilding, - disasterId:this.data.disasterId} - }); - dialogRef.afterClosed().subscribe(result => { - }); - } + saveType(type) { + this.dialogRef.close() + const dialogRef = this.dialog.open(saveTwoDialog, { + data: { + type: type, + allDisposalNode: this.data.allDisposalNode, + selectedBuildingData: this.data.selectedBuildingData, + selectedSiteData: this.data.selectedSiteData, + siteOrbuilding: this.data.siteOrbuilding, + disasterId: this.data.disasterId + } + }); + dialogRef.afterClosed().subscribe(result => { + }); + } } - // 保存想定作业第二个弹窗 +// 保存想定作业第二个弹窗 @Component({ - selector: 'dialog-overview-example-dialog', - templateUrl: 'saveTwo.html', - styleUrls: ['./collection-tools.component.scss'] + selector: 'dialog-overview-example-dialog', + templateUrl: 'saveTwo.html', + styleUrls: ['./collection-tools.component.scss'] }) - export class saveTwoDialog { - - constructor( - private http:HttpClient, - public dialogRef: MatDialogRef, - public canvasData: CanvasShareDataService, - public snackBar: MatSnackBar, - @Inject(MAT_DIALOG_DATA) public data) {} - - type = this.data.type - allDisposalNode = this.data.allDisposalNode - allPlanDisposalNode = [] - allRootDisposalNode = [{name:"根节点",id:null}] - allDisposalNodeChild = [] - ngOnInit(): void { - //所有非数据节点 - this.allDisposalNode.forEach(item => { - if(!item.sitePlanId && !item.buildingAreaId){ - this.allPlanDisposalNode.push(item) - } - }) +export class saveTwoDialog { - //所有一级节点 - this.allDisposalNode.forEach(item => { - if(!item.parentId){ - this.allRootDisposalNode.push(item) + constructor( + private http: HttpClient, + public dialogRef: MatDialogRef, + public canvasData: CanvasShareDataService, + public snackBar: MatSnackBar, + @Inject(MAT_DIALOG_DATA) public data) { } + + type = this.data.type + allDisposalNode = this.data.allDisposalNode + allPlanDisposalNode = [] + allRootDisposalNode = [{ name: "根节点", id: null }] + allDisposalNodeChild = [] + ngOnInit(): void { + //所有非数据节点 + this.allDisposalNode.forEach(item => { + if (!item.sitePlanId && !item.buildingAreaId) { + this.allPlanDisposalNode.push(item) + } + }) + + //所有一级节点 + this.allDisposalNode.forEach(item => { + if (!item.parentId) { + this.allRootDisposalNode.push(item) + } + }) + this.allDisposalNodeChild = JSON.parse(JSON.stringify(this.allDisposalNode)) + this.allDisposalNodeChild.forEach(item => { + item.children = [] + this.allDisposalNodeChild.forEach(i => { + if (i.parentId == item.id) { + item.children.push(i) } }) - this.allDisposalNodeChild = JSON.parse(JSON.stringify(this.allDisposalNode)) - this.allDisposalNodeChild.forEach(item => { - item.children = [] - this.allDisposalNodeChild.forEach(i => { - if(i.parentId == item.id){ - item.children.push(i) - } - }) - }) + }) + } + onNoClick(): void { + this.dialogRef.close(); + } + nodeItem + itemChildNum = 0 //点击处置节点子数据节点的数量 + clickNode(item) { + console.log(item) + this.nodeItem = item + this.allDisposalNodeChild.forEach(item => { + if (item.id == this.nodeItem.id) { + this.itemChildNum = item.children.length + } + }) + } + + selectedBuildingData = this.data.selectedBuildingData + selectedSiteData = this.data.selectedSiteData + onSubmit(value, type) { + // console.log(type) + let name = this.selectedBuildingData.name + '-' + this.selectedSiteData.name + //如果保存到已有节点 + var postdata = { + id: "", + name: name, + level: 0, + order: this.itemChildNum, + description: "", + notes: "", + weather: null, + airTemperature: null, + windDirection: null, + windScale: null, + imageNames: null, + imageUrls: null, + parentId: this.nodeItem ? this.nodeItem.id : null, + 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, + buildingAreaId: this.data.siteOrbuilding != -1 ? this.selectedSiteData.id : null, + disposalNodeType: 0 } - onNoClick(): void { - this.dialogRef.close(); - } - nodeItem - itemChildNum = 0 //点击处置节点子数据节点的数量 - clickNode(item){ - console.log(item) - this.nodeItem = item - this.allDisposalNodeChild.forEach(item => { - if(item.id == this.nodeItem.id){ - this.itemChildNum = item.children.length + if (type == 'old') { + let istrue = this.canvasData.findDisposalNode(this.nodeItem.id, name) + let putdata = this.nodeItem + putdata.weather = this.canvasData.selectPanelPointBaseData.weather + putdata.airTemperature = Number(this.canvasData.selectPanelPointBaseData.airTemperature) + putdata.windScale = Number(this.canvasData.selectPanelPointBaseData.windScale) + putdata.windDirection = Number(this.canvasData.selectPanelPointBaseData.windDirection) + putdata.description = this.canvasData.selectPanelPointBaseData.description + putdata.notes = this.canvasData.selectPanelPointBaseData.notes + + + if (istrue) {//如果该处置节点下已有同名数据节点 则只修改 2个接口 + new Promise((resolve, reject) => { + // this.http.put(`/api/DisposalNodes/${value.nodeId}`,putdata).subscribe(data => { + resolve("更新处置节点成功,将天气 节点详情等信息保存到点击的节点") + // }) + }).then((values) => { + this.canvasData.sendMessage('send a message');//发布一条消息 + // 保存平面图数据到当前节点 + let postdata = JSON.parse(JSON.stringify(this.canvasData.selectPanelPoint)) + postdata.Data = JSON.stringify(postdata.Data) + this.http.post(`/api/ExamDisposalNodeData`, postdata).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) + }) + this.dialogRef.close(); + this.canvasData.sendMessage('send a message');//发布一条消息 + }) + + } else {//需要3个接口 + new Promise((resolve, reject) => { + // this.http.put(`/api/DisposalNodes/${value.nodeId}`,putdata).subscribe(data => { + resolve("更新处置节点成功,将天气 节点详情等信息保存到点击的节点") + // }) + }).then((values) => { + console.log(values) + postdata.level = putdata.level + 1 + new Promise((resolve, reject) => { + this.http.post(`/api/ExamDisposalNodes`, postdata).subscribe(data => { + resolve(data) + }) + }).then((data: any) => { + console.log(7788, data) + let objData = { + id: "", + data: JSON.stringify(this.canvasData.selectPanelPoint.Data) || null, + version: this.canvasData.selectPanelPoint.Version || "2.0", + ExamDisposalNodeId: data.id, + ExamPlanComponentId: sessionStorage.getItem("planId"), + } + this.http.post(`/api/ExamDisposalNodeData`, objData).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) + }) + this.dialogRef.close(); + this.canvasData.sendMessage('send a message');//发布一条消息 + }) + }) + } + + } else {//如果保存到新建节点 + let dispositionNodeData //处置节点data + let order + let oneLevelNum = [] + //将order赋值为所有一级节点最后一个+1 + this.allDisposalNode.forEach(item => { + if (!item.parentId) { + oneLevelNum.push(item) } }) - } + if (oneLevelNum.length == 0) { + order = 0 + } else { + order = oneLevelNum[oneLevelNum.length - 1].order + 1 + } - selectedBuildingData = this.data.selectedBuildingData - selectedSiteData = this.data.selectedSiteData - onSubmit(value,type){ - // console.log(type) - let name = this.selectedBuildingData.name + '-' + this.selectedSiteData.name - //如果保存到已有节点 - var postdata = { - id: "", - name: name, - level: 0, - order: this.itemChildNum, - description: "", - notes: "", + if (this.nodeItem) {//如果点击了下拉选择框 + if (this.nodeItem.id != null) { + this.allDisposalNodeChild.forEach(item => { + if (item.id == this.nodeItem.id) { + order = item.children.length + } + }) + } + } + dispositionNodeData = { + id: null, + name: value.name, + level: this.nodeItem && this.nodeItem.id != null ? this.nodeItem.level + 1 : 0, + order: order, + description: null, + notes: null, weather: null, - airTemperature: null, - windDirection: null, - windScale: null, + airTemperature: 0, + windDirection: 0, + windScale: 0, imageNames: null, imageUrls: null, - parentId: this.nodeItem ? this.nodeItem.id : null, + parentId: this.nodeItem ? this.nodeItem.id : null, 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, - buildingAreaId: this.data.siteOrbuilding!=-1 ? this.selectedSiteData.id : null, - disposalNodeType:0 + companyId: null, + sitePlanId: null, + buildingId: null, + buildingAreaId: null, + disposalNodeType: 0 } - if(type == 'old'){ - let istrue = this.canvasData.findDisposalNode(this.nodeItem.id,name) - let putdata = this.nodeItem - putdata.weather = this.canvasData.selectPanelPointBaseData.weather - putdata.airTemperature = Number(this.canvasData.selectPanelPointBaseData.airTemperature) - putdata.windScale = Number(this.canvasData.selectPanelPointBaseData.windScale) - putdata.windDirection = Number(this.canvasData.selectPanelPointBaseData.windDirection) - putdata.description = this.canvasData.selectPanelPointBaseData.description - putdata.notes = this.canvasData.selectPanelPointBaseData.notes - - - if(istrue){//如果该处置节点下已有同名数据节点 则只修改 2个接口 - new Promise((resolve,reject)=>{ - // this.http.put(`/api/DisposalNodes/${value.nodeId}`,putdata).subscribe(data => { - resolve("更新处置节点成功,将天气 节点详情等信息保存到点击的节点") - // }) - }).then((values)=>{ - this.canvasData.sendMessage('send a message');//发布一条消息 - // 保存平面图数据到当前节点 - let postdata =JSON.parse(JSON.stringify(this.canvasData.selectPanelPoint)) - postdata.Data = JSON.stringify(postdata.Data) - this.http.post(`/api/ExamDisposalNodeData`,postdata).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) - }) - this.dialogRef.close(); - this.canvasData.sendMessage('send a message');//发布一条消息 - }) - - }else{//需要3个接口 - new Promise((resolve,reject)=>{ - // this.http.put(`/api/DisposalNodes/${value.nodeId}`,putdata).subscribe(data => { - resolve("更新处置节点成功,将天气 节点详情等信息保存到点击的节点") - // }) - }).then((values)=>{ - console.log(values) - postdata.level = putdata.level + 1 - new Promise((resolve,reject) => { - this.http.post(`/api/ExamDisposalNodes`,postdata).subscribe(data => { - resolve(data) - }) - }).then((data:any)=>{ - console.log(7788,data) - let objData = { - id: "", - data: JSON.stringify(this.canvasData.selectPanelPoint.Data) || null, - version: this.canvasData.selectPanelPoint.Version || "2.0", - ExamDisposalNodeId: data.id, - ExamPlanComponentId: sessionStorage.getItem("planId"), - } - this.http.post(`/api/ExamDisposalNodeData`,objData).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) - }) - this.dialogRef.close(); - this.canvasData.sendMessage('send a message');//发布一条消息 - }) - }) - } - }else{//如果保存到新建节点 - let dispositionNodeData //处置节点data - let order - let oneLevelNum = [] - //将order赋值为所有一级节点最后一个+1 - this.allDisposalNode.forEach(item => { - if(!item.parentId){ - oneLevelNum.push(item) - } + dispositionNodeData.weather = this.canvasData.selectPanelPointBaseData.weather + dispositionNodeData.airTemperature = Number(this.canvasData.selectPanelPointBaseData.airTemperature) + dispositionNodeData.windScale = Number(this.canvasData.selectPanelPointBaseData.windScale) + dispositionNodeData.windDirection = Number(this.canvasData.selectPanelPointBaseData.windDirection) + dispositionNodeData.description = this.canvasData.selectPanelPointBaseData.description + dispositionNodeData.notes = this.canvasData.selectPanelPointBaseData.notes + //1.先创建一个处置节点 然后 .then 2.创建数据节点到刚创建的处置节点 3.然后拿着创建好的数据节点的id 将平面图data保存 + new Promise((resolve, reject) => { + this.http.post("/api/ExamDisposalNodes", dispositionNodeData).subscribe((data: any) => { + resolve(data.id) }) - if(oneLevelNum.length == 0){ - order = 0 - }else{ - order = oneLevelNum[oneLevelNum.length - 1].order + 1 - } - - if(this.nodeItem){//如果点击了下拉选择框 - if(this.nodeItem.id != null){ - this.allDisposalNodeChild.forEach(item => { - if(item.id == this.nodeItem.id){ - order = item.children.length - } - }) + }).then((id) => { + let dataNodeData + console.log("qnm", id) + new Promise((resolve, reject) => { + postdata.parentId = id + postdata.level = dispositionNodeData.level + 1 + this.http.post("/api/ExamDisposalNodes", postdata).subscribe((data: any) => { + resolve(data) + }) + }).then((data: any) => { + // 保存平面图数据到当前节点 + // console.log(6666,data) + // let postdata =JSON.parse(JSON.stringify(this.canvasData.selectPanelPoint)) + // postdata.Data = JSON.stringify(postdata.Data) + console.log('处置素材', this.canvasData.selectPanelPoint.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"), } - } - dispositionNodeData = { - id: null, - name: value.name, - level: this.nodeItem && this.nodeItem.id != null ? this.nodeItem.level + 1 : 0, - order: order, - description: null, - notes: null, - weather: null, - airTemperature: 0, - windDirection: 0, - windScale: 0, - imageNames: null, - imageUrls: null, - parentId: this.nodeItem ? this.nodeItem.id : null, - examDisasterId: this.data.disasterId, - ExamPlanComponentId: sessionStorage.getItem('planId') || '', - companyId: null, - sitePlanId: null, - buildingId: null, - buildingAreaId: null, - disposalNodeType:0 - } - dispositionNodeData.weather = this.canvasData.selectPanelPointBaseData.weather - dispositionNodeData.airTemperature = Number(this.canvasData.selectPanelPointBaseData.airTemperature) - dispositionNodeData.windScale = Number(this.canvasData.selectPanelPointBaseData.windScale) - dispositionNodeData.windDirection = Number(this.canvasData.selectPanelPointBaseData.windDirection) - dispositionNodeData.description = this.canvasData.selectPanelPointBaseData.description - dispositionNodeData.notes = this.canvasData.selectPanelPointBaseData.notes - //1.先创建一个处置节点 然后 .then 2.创建数据节点到刚创建的处置节点 3.然后拿着创建好的数据节点的id 将平面图data保存 - new Promise((resolve,reject) => { - this.http.post("/api/ExamDisposalNodes",dispositionNodeData).subscribe((data:any) => { - resolve(data.id) - }) - }).then((id) => { - let dataNodeData - console.log("qnm",id) - new Promise((resolve,reject) => { - postdata.parentId = id - postdata.level = dispositionNodeData.level + 1 - this.http.post("/api/ExamDisposalNodes",postdata).subscribe((data:any) => { - resolve(data) - }) - }).then((data:any) => { - // 保存平面图数据到当前节点 - // console.log(6666,data) - // let postdata =JSON.parse(JSON.stringify(this.canvasData.selectPanelPoint)) - // postdata.Data = JSON.stringify(postdata.Data) - console.log('处置素材',this.canvasData.selectPanelPoint.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"), - } - - this.http.post(`/api/ExamDisposalNodeData`,objData).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) - }) - this.dialogRef.close(); - this.canvasData.sendMessage("send a message") + this.http.post(`/api/ExamDisposalNodeData`, objData).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) }) + this.dialogRef.close(); + this.canvasData.sendMessage("send a message") }) - } + }) } + } } \ No newline at end of file diff --git a/src/app/ui/collection-tools/saveOne.html b/src/app/ui/collection-tools/saveOne.html index 9017f65..c0e235b 100644 --- a/src/app/ui/collection-tools/saveOne.html +++ b/src/app/ui/collection-tools/saveOne.html @@ -1,5 +1,7 @@
处置节点保存
- - + +
\ No newline at end of file diff --git a/src/app/ui/collection-tools/saveTwo.html b/src/app/ui/collection-tools/saveTwo.html index fec97ff..27a962b 100644 --- a/src/app/ui/collection-tools/saveTwo.html +++ b/src/app/ui/collection-tools/saveTwo.html @@ -5,22 +5,21 @@
- +
- + {{item.name}} -
+
- @@ -35,15 +34,15 @@
- + {{item.name}} -
+
- diff --git a/src/app/ui/collection-tools/uploadDisposalNodes.html b/src/app/ui/collection-tools/uploadDisposalNodes.html index f20c4e1..5b2939a 100644 --- a/src/app/ui/collection-tools/uploadDisposalNodes.html +++ b/src/app/ui/collection-tools/uploadDisposalNodes.html @@ -1,5 +1,6 @@
-
+
@@ -8,7 +9,8 @@
- +
\ No newline at end of file diff --git a/src/app/ui/collection-tools/uploadQuestions.html b/src/app/ui/collection-tools/uploadQuestions.html index a891755..b31fd19 100644 --- a/src/app/ui/collection-tools/uploadQuestions.html +++ b/src/app/ui/collection-tools/uploadQuestions.html @@ -2,50 +2,39 @@
上传
考试要点
- +
考核消防设施
- + -
- -
+
+ +
考核处置节点
- + -
- -
+
+ +
- +
\ No newline at end of file diff --git a/src/app/ui/collection-tools/viewdetails.html b/src/app/ui/collection-tools/viewdetails.html index 76638c2..b38774d 100644 --- a/src/app/ui/collection-tools/viewdetails.html +++ b/src/app/ui/collection-tools/viewdetails.html @@ -1,8 +1,11 @@
-
- clear +
+ + clear +
- +
- +
\ No newline at end of file