From 6c5eceda043c8ea370e9fd6a1b5200c1fc236575 Mon Sep 17 00:00:00 2001 From: SHAOJIAHAO <55341701@qq.com> Date: Fri, 18 Dec 2020 15:07:31 +0800 Subject: [PATCH] =?UTF-8?q?[=E6=96=B0=E5=A2=9E]=E6=B6=88=E9=98=B2=E8=AE=BE?= =?UTF-8?q?=E6=96=BDtree=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../collection-tools.component.ts | 49 +++---- .../examinationQuestions.html | 5 +- .../collection-tools/examinationQuestions.ts | 136 ++++++++++++++---- .../ui/collection-tools/uploadQuestions.html | 47 +++--- src/assets/css/ngZorroTree.css | 4 +- 5 files changed, 153 insertions(+), 88 deletions(-) diff --git a/src/app/ui/collection-tools/collection-tools.component.ts b/src/app/ui/collection-tools/collection-tools.component.ts index 955b7af..5af8fff 100644 --- a/src/app/ui/collection-tools/collection-tools.component.ts +++ b/src/app/ui/collection-tools/collection-tools.component.ts @@ -1136,10 +1136,12 @@ export class CollectionToolsComponent implements OnInit { handleTreeData (storeyData) { //storeyData为当前楼层拥有的消防设施 this.storeyData = storeyData - let data = this.allFireElements //所有消防要素模板 + let data = JSON.parse(JSON.stringify(this.allFireElements)) //所有消防要素模板 + console.log(data) let treeData = [] //tree型 处理完成后的数据 data.forEach(element => { + element.key = element.id element.isTemplate = true //添加模板标识 element.isLook = true //添加是否可见标识 element.name != '其他' ? element.children = [] : null @@ -1314,37 +1316,17 @@ export class CollectionToolsComponent implements OnInit { } - //计算 可视区域内宽度, 是否缩放背景图 - backGroundScale () { - // let that = this - // let dad = this.element.nativeElement.querySelector('.functionalDomainContent').clientWidth - // let dadHeight = this.element.nativeElement.querySelector('.functionalDomainContent').clientHeight - // let left = this.element.nativeElement.querySelector('.functionalDomainLeft').clientWidth - // let right = this.element.nativeElement.querySelector('.functionalDomainRight').clientWidth - // let imgWidth = dad - left - right//可视区域内 宽度 - // let img = new Image() - // img.src = this.selectingSitePlan.imageUrl; - // img.onload = function(){ - // if (img.height > dadHeight && img.width > imgWidth) { - // let width = imgWidth/img.width - // let height = dadHeight/img.height - // that.canvas.setBackgroundScale((width>height? height : width)-0.005) - // return - // } else if (img.height > dadHeight) { - // that.canvas.setBackgroundScale((dadHeight/img.height)-0.005) - // return - // } else if (img.width > imgWidth) { - // that.canvas.setBackgroundScale((imgWidth/img.width)-0.005) - // return - // } - // }; - } //打开消防设施考题设定 openFireExamination () { + console.log(1,this.beforeOneCheckedBuilding) let treeData = JSON.parse( JSON.stringify(this.dataSource.data) ) - let data = { treeData: treeData } - let dialogRef = this.dialog.open(examinationQuestions,{data}); + let buildFloorData = { + buildingData:this.beforeOneCheckedBuilding, + floorData:this.selectingSitePlan + } + let data = { treeData: treeData,oldRealData:this.storeyData ,buildFloorData:buildFloorData} + // let dialogRef = this.dialog.open(examinationQuestions,{data}); } //上传考题 @@ -1369,12 +1351,13 @@ export class CollectionToolsComponent implements OnInit { let companyBuildingData = JSON.parse(JSON.stringify( this.canvasData.originalcompanyBuildingData || {} )) // 当前 单位/建筑 数据 let storeyData = JSON.parse(JSON.stringify( this.canvasData.originaleveryStoreyData || {} )) //当前 楼层 数据 - for(let key in companyBuildingData.data){ - if (companyBuildingData.data[key].FloorId === beforeOneId) { //处理 单位/建筑 数据是否归于当前楼层下 - storeyData.data[key] = companyBuildingData.data[key] - } - } + // for(let key in companyBuildingData.data){ + // if (companyBuildingData.data[key].FloorId === beforeOneId) { //处理 单位/建筑 数据是否归于当前楼层下 + // storeyData.data[key] = companyBuildingData.data[key] + // } + // } 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 ) if (!noMatch) { this.allFireElements[this.allFireElements.length-1].children.push(storeyData.data[key]) diff --git a/src/app/ui/collection-tools/examinationQuestions.html b/src/app/ui/collection-tools/examinationQuestions.html index 6435d88..dc0ce44 100644 --- a/src/app/ui/collection-tools/examinationQuestions.html +++ b/src/app/ui/collection-tools/examinationQuestions.html @@ -3,7 +3,8 @@
- +
diff --git a/src/app/ui/collection-tools/examinationQuestions.ts b/src/app/ui/collection-tools/examinationQuestions.ts index 76cf48e..e036c86 100644 --- a/src/app/ui/collection-tools/examinationQuestions.ts +++ b/src/app/ui/collection-tools/examinationQuestions.ts @@ -17,18 +17,111 @@ export class examinationQuestions { constructor(private http:HttpClient, public dialog: MatDialog, public snackBar: MatSnackBar, public dialogRef: MatDialogRef, @Inject(MAT_DIALOG_DATA) public data) {} + @ViewChild('nzTreeComponent', { static: false }) nzTreeComponent!: NzTreeComponent; + defaultCheckedKeys = []; //指定选中复选框的树节点 key值 defaultExpandedKeys = []; //展开指定的树节点 key值 defaultSelectedKeys = []; //指定选中的树节点 key值 + renderData:any ngOnInit(): void { - console.log(this.data.treeData) + this.renderData = this.data.treeData + if(JSON.parse(sessionStorage.getItem('tree型数据')) && JSON.parse(sessionStorage.getItem('tree型数据'))[this.data.buildFloorData.floorData.id]){ + console.log(123,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) } //提交 submit () { - console.log(this.data) + + let oldTreeData = this.nzTreeComponent.getCheckedNodeList() + + 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 obj = { + name:this.data.buildFloorData.buildingData.name + '-' + this.data.buildFloorData.floorData.name, + key:this.data.buildFloorData.floorData.id, + children:checkList + } + + let data = JSON.parse(sessionStorage.getItem("试卷id")) + + if(data && data.length != 0){ + let ind = null + data.forEach((item,index) => { + if(item.key == obj.key){ + ind = index + } + }) + if(ind){ + if(checkList.length != 0){ + data[ind].children = checkList + }else{ + data.splice(ind,1) + } + + }else{ + data.push(obj) + } + sessionStorage.setItem("试卷id",JSON.stringify(data)) + }else{ + data = [] + data[0] = obj + console.log(123,data) + sessionStorage.setItem("试卷id",JSON.stringify(data)) + } + + + } } @@ -42,30 +135,23 @@ export class uploadQuestions { constructor(private http:HttpClient, public dialog: MatDialog, public snackBar: MatSnackBar, public dialogRef: MatDialogRef, @Inject(MAT_DIALOG_DATA) public data) {} - // tree配置 - private _transformer = (node, level: number) => {//要给渲染节点传那些属性参数 - return { - expandable: !!node.children && node.children.length > 0, - 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 - }; - } - 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; - + + defaultCheckedKeys = []; //指定选中复选框的树节点 key值 + defaultExpandedKeys = []; //展开指定的树节点 key值 + defaultSelectedKeys = []; //指定选中的树节点 key值 + renderData:any ngOnInit(): void { - this.dataSource.data = this.data.treeData - this.treeControl.expandAll() + let data = JSON.parse(sessionStorage.getItem("试卷id")) + data.forEach(item => { + item.children.forEach(i => { + i.isLeaf = true + }) + }) + this.renderData = data + } + nzEvent($event){ + console.log($event) } - //上传 submit () { console.log(this.data.question) diff --git a/src/app/ui/collection-tools/uploadQuestions.html b/src/app/ui/collection-tools/uploadQuestions.html index 5f192fa..a8d57c7 100644 --- a/src/app/ui/collection-tools/uploadQuestions.html +++ b/src/app/ui/collection-tools/uploadQuestions.html @@ -1,37 +1,30 @@ -
+
上传
考试要点
考核消防设施
-
+
- - - - - - {{node.name}} - - ({{node.children.length}}) - - - - - - - {{node.name}} - - ({{node.children.length}}) - - - - + + + +
+ +
+
diff --git a/src/assets/css/ngZorroTree.css b/src/assets/css/ngZorroTree.css index 575ecdc..f4f627b 100644 --- a/src/assets/css/ngZorroTree.css +++ b/src/assets/css/ngZorroTree.css @@ -347,7 +347,9 @@ #createtestscore,#nodeTree .ant-tree .ant-tree-switcher { line-height: 22px; } - +#uploadfiretree .ant-tree .ant-tree-switcher { + line-height: 20px; +} .ant-tree .ant-tree-switcher .ant-select-tree-switcher-icon, .ant-tree .ant-tree-switcher .ant-tree-switcher-icon { font-size: 10px;