shaojiahao
/
examSystem-Anxin
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
Browse Source

[完善]完善考官创建考题逻辑

master
邵佳豪 4 years ago
parent
5e239857a4
commit
8ca9d1b50e
5 changed files with 132 additions and 65 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      src/app/ui/collection-tools-examinee/collection-tools.component.html
  2. 59
      src/app/ui/collection-tools-examinee/collection-tools.component.ts
  3. 120
      src/app/ui/collection-tools-read/collection-tools.component.ts
  4. 10
      src/app/ui/collection-tools/collection-tools.component.ts
  5. 2
      src/app/working-area/working-area.component.ts

4
src/app/ui/collection-tools-examinee/collection-tools.component.html
Unescape View File

@ -61,7 +61,7 @@
<p style="font-size: 15px;">考试题目</p> <p style="font-size: 15px;">考试题目</p>
<nz-tree *ngIf="questionstreeData.length != 0" nzExpandAll #nzTreeComponent [nzData]="questionstreeData" nzBlockNode [nzTreeTemplate]="nzTreeTemplate"></nz-tree> <nz-tree *ngIf="questionstreeData.length != 0" nzExpandAll #nzTreeComponent [nzData]="questionstreeData" nzBlockNode [nzTreeTemplate]="nzTreeTemplate"></nz-tree>
<ng-template #nzTreeTemplate let-node let-origin="origin"> <ng-template #nzTreeTemplate let-node let-origin="origin">
<div id="terrNodePublic"> <div id="terrNodePublic" (click)='selectanelPoint(node.origin,0)' [ngClass]="{'selectanelPoint': selectDisposalNode==node.origin.id}">
<label title="{{node.title}}" class="overflowText textNode">{{node.title}}</label> <label title="{{node.title}}" class="overflowText textNode">{{node.title}}</label>
</div> </div>
</ng-template> </ng-template>
@ -71,7 +71,7 @@
<p style="font-size: 15px;">考生答案</p> <p style="font-size: 15px;">考生答案</p>
<nz-tree #nzTreeComponent2 [nzData]="treeData" nzBlockNode [nzTreeTemplate]="nzTreeTemplate2" [nzExpandedKeys]="defaultExpandedKeys"></nz-tree> <nz-tree #nzTreeComponent2 [nzData]="treeData" nzBlockNode [nzTreeTemplate]="nzTreeTemplate2" [nzExpandedKeys]="defaultExpandedKeys"></nz-tree>
<ng-template #nzTreeTemplate2 let-node let-origin="origin"> <ng-template #nzTreeTemplate2 let-node let-origin="origin">
<div id="terrNodePublic" (click)='selectanelPoint(node.origin)' [ngClass]="{'selectanelPoint': selectDisposalNode==node.origin.id}"> <div id="terrNodePublic" (click)='selectanelPoint(node.origin,1)' [ngClass]="{'selectanelPoint': selectDisposalNode==node.origin.id}">
<label title="{{node.title}}" class="overflowText textNode">{{node.title}}</label> <label title="{{node.title}}" class="overflowText textNode">{{node.title}}</label>
</div> </div>
</ng-template> </ng-template>

59
src/app/ui/collection-tools-examinee/collection-tools.component.ts
Unescape View File

@ -883,12 +883,44 @@ export class CollectionToolsExamineeComponent implements OnInit {
let companyBuildingData = JSON.parse(JSON.stringify( this.canvasData.originalcompanyBuildingData || {} )) // 当前 单位/建筑 数据 let companyBuildingData = JSON.parse(JSON.stringify( this.canvasData.originalcompanyBuildingData || {} )) // 当前 单位/建筑 数据
let storeyData = JSON.parse(JSON.stringify( this.canvasData.originaleveryStoreyData || {} )) //当前 楼层 数据 let storeyData = JSON.parse(JSON.stringify( this.canvasData.originaleveryStoreyData || {} )) //当前 楼层 数据
// console.log('看看这是啥',this.Facilities) // console.log('看看这是啥',this.Facilities)
this.Facilities ? this.Facilities.forEach(item => {
item.key == this.selectingSitePlan.id ?
this.getAllAssetLibraries(item) :
this.canvas.loadExamineeData()
}) : this.canvas.loadExamineeData();this.allLibrary = this.originalallLibrary
// this.Facilities ? this.Facilities.forEach(item => {
// item.key == this.selectingSitePlan.id ?
// this.getAllAssetLibraries(item) :
// this.canvas.loadExamineeData()
// }) : this.canvas.loadExamineeData();this.allLibrary = this.originalallLibrary
//如果有需要标注的平面图
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.canvasData.hiddenBasicInfoFacilities = JSON.parse(JSON.stringify(arr))
console.log('这层有需要标注的基本信息素材',item)
let allFireElements = JSON.parse(JSON.stringify(this.allFireElements))
if(this.clickedNodeType == 0){
this.canvas.loadExaminerData()
this.clickedNodeType = null
}else{
this.canvas.loadExamineeData()
this.clickedNodeType = null
}
return true
} else{
if(key == this.Facilities.length - 1){
this.canvas.loadExaminerData()
return false
}
}
})
}else{
this.canvas.loadExamineeData()
}
for(let key in storeyData.data){ //筛选数据 for(let key in storeyData.data){ //筛选数据
storeyData.data[key].key = storeyData.data[key].Id 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 )
@ -1636,35 +1668,44 @@ export class CollectionToolsExamineeComponent implements OnInit {
} }
//点击 处置Tree节点 //点击 处置Tree节点
selectanelPoint (e) { clickedNodeType:any
selectanelPoint (e,type) {
this.clickedNodeType = type
if (!e.buildingAreaId && !e.sitePlanId) { //当前节点 不是 数据节点 时 if (!e.buildingAreaId && !e.sitePlanId) { //当前节点 不是 数据节点 时
let msg = this.canvasData.findDisposalNode(e.id) let msg = this.canvasData.findDisposalNode(e.id)
this.canvasData.selectPanelPointBaseData = msg 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) { //当前节点 是 数据节点 时 } else if (e.buildingAreaId || e.sitePlanId) { //当前节点 是 数据节点 时
let msg = this.canvasData.findDisposalNode(e.parentId) let msg = this.canvasData.findDisposalNode(e.parentId)
this.canvasData.selectPanelPointBaseData = msg this.canvasData.selectPanelPointBaseData = msg
this.selectDisposalNode = e.parentId //选中 节点 this.selectDisposalNode = e.parentId //选中 节点
this.Facilities ? this.sitePlanData.forEach(item => { this.Facilities ? this.sitePlanData.forEach(item => {
this.Facilities.forEach(i =>{ this.Facilities.forEach(i =>{
if(item.id == i.key){ if(item.id == i.key){
item.isLabel = true item.isLabel = true //标记当层需要标注基本信息素材
} }
}) })
}) : null }) : null
if (this.canvasData.selectPanelPoint.DisposalNodeId != e.id) { //选择节点 不是当前节点时 if (this.canvasData.selectPanelPoint.DisposalNodeId != e.id) { //选择节点 不是当前节点时
let api let api
api='/api/ExamDisposalNodeData' type == 0 ? api='/api/DisposalNodeData' : api='/api/ExamDisposalNodeData'
let params = {nodeId: e.id} let params = {nodeId: e.id}
let parameter = { //查询 节点 对应 建筑/楼层 index,id let parameter = { //查询 节点 对应 建筑/楼层 index,id
buildingIndex: e.sitePlanId? -1 : this.allBuildings.findIndex(item=>{ return item.id===e.buildingId }), //总平面图/建筑 index buildingIndex: e.sitePlanId? -1 : this.allBuildings.findIndex(item=>{ return item.id===e.buildingId }), //总平面图/建筑 index
storeyId: e.sitePlanId? e.sitePlanId : e.buildingAreaId, //楼层id storeyId: e.sitePlanId? e.sitePlanId : e.buildingAreaId, //楼层id
} }
this.http.get(api,{params:params}).subscribe(data=>{ this.http.get(api,{params:params}).subscribe(data=>{
this.canvasData.selectPanelPoint = this.canvasData.deserialize(JSON.stringify(data || new DisposalNodeData())) //选择 当前 节点 this.canvasData.selectPanelPoint = this.canvasData.deserialize(JSON.stringify(data || new DisposalNodeData())) //选择 当前 节点
this.canvasData.selectPanelPoint.Data = this.canvasData.deserialize(this.canvasData.selectPanelPoint.Data) this.canvasData.selectPanelPoint.Data = this.canvasData.deserialize(this.canvasData.selectPanelPoint.Data)
// console.log(456,this.canvasData.selectPanelPoint.Data)
this.seekPanelPoint(parameter) this.seekPanelPoint(parameter)
}) })
} //if } //if

120
src/app/ui/collection-tools-read/collection-tools.component.ts
Unescape View File

@ -197,7 +197,7 @@ export class CollectionToolsReadComponent implements OnInit {
this.getAllFirePlan() //获取当前单位灾情 this.getAllFirePlan() //获取当前单位灾情
await this.getPaperPlanData()//获得当前考题题目 await this.getPaperPlanData()//获得当前考题题目
this.getExaminationQuestions()
let that = this let that = this
window.setTimeout(()=>{ window.setTimeout(()=>{
document.getElementById("functionalDomainContent").oncontextmenu = function (event) { document.getElementById("functionalDomainContent").oncontextmenu = function (event) {
@ -398,7 +398,7 @@ export class CollectionToolsReadComponent implements OnInit {
//点击树节点的显示隐藏icon //点击树节点的显示隐藏icon
clickLookItem(node){ clickLookItem(node){
console.log(this.allFireElements) // console.log(this.allFireElements)
//子节点跟随父节点的islook变化 //子节点跟随父节点的islook变化
  if(node.origin.children && node.origin.children.length != 0){   if(node.origin.children && node.origin.children.length != 0){
node.origin.isLook = !node.origin.isLook node.origin.isLook = !node.origin.isLook
@ -416,23 +416,55 @@ export class CollectionToolsReadComponent implements OnInit {
//canvas上的素材显隐 //canvas上的素材显隐
let iconVisibleArr:any = [] let iconVisibleArr:any = []
if(node.origin.children && node.origin.children.length != 0){//如果是模板,则开始向下找 // if(node.origin.children && node.origin.children.length != 0){//如果是模板,则开始向下找
node.origin.children.forEach(item => { // node.origin.children.forEach(item => {
if(item.children && item.children.length != 0){//如果子节点依旧是模板,则继续开始向下找 // if(item.children && item.children.length != 0){//如果子节点依旧是模板,则继续开始向下找
// item.children.forEach(i => {
// if(i.isLook == false){
// iconVisibleArr.push(i.Id)
// }
// })
// }else{
// if(item.isLook == false){
// iconVisibleArr.push(item.Id)
// }
// }
// })
// }else{
// if(node.origin.isLook == false){
// iconVisibleArr.push(node.origin.Id)
// }
// }
console.log(this.renderData)
this.renderData.forEach(item =>{
if(item.Id && item.isLook == false){
iconVisibleArr.push(item.Id)
}else{
if(item.children && item.children.length != 0){
item.children.forEach(i => { item.children.forEach(i => {
iconVisibleArr.push(i.Id) if(i.Id && i.isLook == false){
iconVisibleArr.push(i.Id)
}else{
if(i.children && i.children.length != 0){
i.children.forEach(element => {
if(element.Id && element.isLook == false){
iconVisibleArr.push(element.Id)
}
})
}
}
}) })
}else{
iconVisibleArr.push(item.Id)
} }
}) }
}else{ })
iconVisibleArr.push(node.origin.Id)
}
console.log(iconVisibleArr) console.log(iconVisibleArr)
console.log(678,this.renderData) this.canvasData.originaleveryStoreyData = JSON.parse(JSON.stringify(this.originaleveryStoreyData))
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.hiddenBasicInfoFacilities = iconVisibleArr
this.canvas.loadExamineeData()
} }
@ -449,7 +481,7 @@ export class CollectionToolsReadComponent implements OnInit {
answerDivDrag:boolean = false//查看答案窗口的显隐 answerDivDrag:boolean = false//查看答案窗口的显隐
answertreeData:any answertreeData:any = []
lookAnswerDiv(){ lookAnswerDiv(){
this.answerDivDrag = !this.answerDivDrag this.answerDivDrag = !this.answerDivDrag
@ -525,7 +557,7 @@ export class CollectionToolsReadComponent implements OnInit {
arr.push(item.Id) arr.push(item.Id)
}) })
this.canvasData.hiddenBasicInfoFacilities = arr this.canvasData.hiddenBasicInfoFacilities = arr
this.canvas.loadExamineeData() // this.canvas.loadExamineeData()
} }
@ -539,6 +571,7 @@ export class CollectionToolsReadComponent implements OnInit {
renderData:any = []//当前层默认隐藏的基本信息考试题目 renderData:any = []//当前层默认隐藏的基本信息考试题目
hiddenBasicInfoFacilities:any
//封装 刷新 tree 数据 //封装 刷新 tree 数据
async renovateTreeData (isRefresh:boolean = true) { async renovateTreeData (isRefresh:boolean = true) {
this.allFireElements[this.allFireElements.length-1].children = [] this.allFireElements[this.allFireElements.length-1].children = []
@ -551,7 +584,9 @@ export class CollectionToolsReadComponent implements OnInit {
let beforeOneId = this.selectingSitePlan.id || '' //当前 选中 平面图 楼层/区域 id let beforeOneId = this.selectingSitePlan.id || '' //当前 选中 平面图 楼层/区域 id
let companyBuildingData = JSON.parse(JSON.stringify( this.canvasData.originalcompanyBuildingData || {} )) // 当前 单位/建筑 数据 let companyBuildingData = JSON.parse(JSON.stringify( this.canvasData.originalcompanyBuildingData || {} )) // 当前 单位/建筑 数据
let storeyData = JSON.parse(JSON.stringify( this.canvasData.originaleveryStoreyData || {} )) //当前 楼层 数据 let storeyData = JSON.parse(JSON.stringify( this.canvasData.originaleveryStoreyData || {} )) //当前 楼层 数据
console.log('this.Facilities',this.Facilities)
//如果有需要标注的平面图
if(this.Facilities){ if(this.Facilities){
this.Facilities.some((item,key)=>{ this.Facilities.some((item,key)=>{
if(item.key == this.selectingSitePlan.id){ if(item.key == this.selectingSitePlan.id){
@ -559,40 +594,32 @@ export class CollectionToolsReadComponent implements OnInit {
item.children.forEach(i => { item.children.forEach(i => {
arr.push(i.Id) arr.push(i.Id)
}) })
this.canvasData.hiddenBasicInfoFacilities = arr this.hiddenBasicInfoFacilities = arr
console.log('这层有',item) this.canvasData.hiddenBasicInfoFacilities = JSON.parse(JSON.stringify(arr))
console.log('这层有需要标注的基本信息素材',item)
let allFireElements = JSON.parse(JSON.stringify(this.allFireElements)) let allFireElements = JSON.parse(JSON.stringify(this.allFireElements))
this.renderData = [] this.renderData = []
setTimeout(() => { setTimeout(() => {
this.renderData = [...this.processingData(allFireElements,item.children)] this.renderData = [...this.processingData(allFireElements,item.children)]
}, 0); }, 0);
this.canvas.loadExamineeData() if(this.clickedNodeType == 0){
// this.canvas.createBackground(this.canvasData.selectStorey.imageUrl, this.canvasData.selectStorey.imageAngle); this.canvas.loadExaminerData()
// this.canvas.createFloorShape(this.canvasData.examOriginaleveryStoreyData.data); this.clickedNodeType = null
// this.canvas.processinghiddenData(); }else{
// this.canvas.createNodeShape(this.canvasData.selectPanelPoint.Data); this.canvas.loadExamineeData()
// this.canvas.setNameVisible(false, 0); this.clickedNodeType = null
// this.canvas.setNameVisible(false, 1); }
return true return true
} else{ } else{
console.log('这层没有tree') if(key == this.Facilities.length - 1){
this.renderData = [] this.renderData = []
this.canvas.loadExamineeData(false) this.canvas.loadExaminerData()
return false return false
}
} }
}) })
console.log("llllllll")
// if(this.clickedNodeType == 0){
// this.canvas.loadExamineeData(false)
// }else{
// this.canvas.loadExamineeData()
// }
}else{ }else{
this.canvas.loadExamineeData() this.canvas.loadExamineeData()
@ -605,7 +632,6 @@ export class CollectionToolsReadComponent implements OnInit {
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数据结构 this.handleTreeData(storeyData) //处理tree数据结构
} }
//处理数据 将消防要素模板与真实素材结合 //处理数据 将消防要素模板与真实素材结合
@ -795,11 +821,13 @@ export class CollectionToolsReadComponent implements OnInit {
} }
//获取 平面图 楼层数据 //获取 平面图 楼层数据
originaleveryStoreyData:any
getSitePlanStorey (e) { getSitePlanStorey (e) {
let params = {sitePlanId: e.id} let params = {sitePlanId: e.id}
this.http.get(`/api/SitePlanData`,{params}).subscribe((data:any)=>{ this.http.get(`/api/SitePlanData`,{params}).subscribe((data:any)=>{
console.log('预案平台楼层原始素材',data) console.log('预案平台楼层原始素材',data)
this.canvasData.originaleveryStoreyData = 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.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.version? null : this.canvasData.originaleveryStoreyData.version = "2.0"
this.canvasData.originaleveryStoreyData.sitePlanId? null : this.canvasData.originaleveryStoreyData.sitePlanId = e.id || null this.canvasData.originaleveryStoreyData.sitePlanId? null : this.canvasData.originaleveryStoreyData.sitePlanId = e.id || null
@ -826,8 +854,8 @@ export class CollectionToolsReadComponent implements OnInit {
getBuildingStorey (e) { getBuildingStorey (e) {
let params = {buildingAreaId: e.id} let params = {buildingAreaId: e.id}
this.http.get(`/api/BuildingAreaData`,{params}).subscribe((data:any)=>{ this.http.get(`/api/BuildingAreaData`,{params}).subscribe((data:any)=>{
this.originaleveryStoreyData = data
this.canvasData.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.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.version? null : this.canvasData.originaleveryStoreyData.version = "2.0"
this.canvasData.originaleveryStoreyData.buildingAreaId? null : this.canvasData.originaleveryStoreyData.buildingAreaId = e.id || null this.canvasData.originaleveryStoreyData.buildingAreaId? null : this.canvasData.originaleveryStoreyData.buildingAreaId = e.id || null
@ -947,6 +975,7 @@ export class CollectionToolsReadComponent implements OnInit {
params = {examDisasterId: this.allFirePlan[0].id || '',disposalNodeType:1,examinationId:this.route.snapshot.queryParams.examId} params = {examDisasterId: this.allFirePlan[0].id || '',disposalNodeType:1,examinationId:this.route.snapshot.queryParams.examId}
this.http.get(api,{params:params}).subscribe(data=>{ //处置节点 this.http.get(api,{params:params}).subscribe(data=>{ //处置节点
this.canvasData.allDisposalNode = data this.canvasData.allDisposalNode = data
this.getExaminationQuestions()
this.handleHybridTree(this.canvasData.allDisposalNode,'答案') this.handleHybridTree(this.canvasData.allDisposalNode,'答案')
}) })
} }
@ -1097,8 +1126,7 @@ export class CollectionToolsReadComponent implements OnInit {
this.canvasData.selectPanelPoint = this.canvasData.deserialize(JSON.stringify(data || new DisposalNodeData())) //选择 当前 节点 this.canvasData.selectPanelPoint = this.canvasData.deserialize(JSON.stringify(data || new DisposalNodeData())) //选择 当前 节点
this.canvasData.selectPanelPoint.Data = this.canvasData.deserialize(this.canvasData.selectPanelPoint.Data) this.canvasData.selectPanelPoint.Data = this.canvasData.deserialize(this.canvasData.selectPanelPoint.Data)
console.log(456,this.canvasData.selectPanelPoint.Data) // console.log(456,this.canvasData.selectPanelPoint.Data)
// this.canvasData.selectPanelPoint.Data.DefinedIncrement == null ? this.canvasData.selectPanelPoint.Data.DefinedIncrement = {} : null
this.seekPanelPoint(parameter) this.seekPanelPoint(parameter)
}) })
} //if } //if

10
src/app/ui/collection-tools/collection-tools.component.ts
Unescape View File

@ -1119,12 +1119,6 @@ export class CollectionToolsComponent implements OnInit {
let companyBuildingData = JSON.parse(JSON.stringify( this.canvasData.originalcompanyBuildingData || {} )) // 当前 单位/建筑 数据 let companyBuildingData = JSON.parse(JSON.stringify( this.canvasData.originalcompanyBuildingData || {} )) // 当前 单位/建筑 数据
let storeyData = JSON.parse(JSON.stringify( this.canvasData.originaleveryStoreyData || {} )) //当前 楼层 数据 let storeyData = JSON.parse(JSON.stringify( this.canvasData.originaleveryStoreyData || {} )) //当前 楼层 数据
// for(let key in companyBuildingData.data){
// if (companyBuildingData.data[key].FloorId === beforeOneId) { //处理 单位/建筑 数据是否归于当前楼层下
// storeyData.data[key] = companyBuildingData.data[key]
// }
// }
console.log(566,storeyData.data)
for(let key in storeyData.data){ //筛选数据 for(let key in storeyData.data){ //筛选数据
storeyData.data[key].key = storeyData.data[key].Id 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 )
@ -1134,7 +1128,9 @@ export class CollectionToolsComponent implements OnInit {
} }
} }
this.handleTreeData(storeyData) //处理tree数据结构 this.handleTreeData(storeyData) //处理tree数据结构
this.canvas.loadExamineeData(false) this.canvas.loadExaminerData()
// 隐藏基本信息图形
this.canvas.setNameVisible(false, 0);
} }

2
src/app/working-area/working-area.component.ts
Unescape View File

@ -1272,6 +1272,7 @@ export class WorkingAreaComponent extends EventEmitter implements OnInit, AfterV
* 加载考生数据 * 加载考生数据
*/ */
public loadExamineeData() { public loadExamineeData() {
console.log('加载考生')
// 创建背景图 // 创建背景图
this.createBackground(this.canvasData.selectStorey.imageUrl, this.canvasData.selectStorey.imageAngle); this.createBackground(this.canvasData.selectStorey.imageUrl, this.canvasData.selectStorey.imageAngle);
// 创建楼层图形 // 创建楼层图形
@ -1292,6 +1293,7 @@ export class WorkingAreaComponent extends EventEmitter implements OnInit, AfterV
* 加载考官数据 * 加载考官数据
*/ */
public loadExaminerData() { public loadExaminerData() {
console.log('加载考官')
// 创建背景图 // 创建背景图
this.createBackground(this.canvasData.selectStorey.imageUrl, this.canvasData.selectStorey.imageAngle); this.createBackground(this.canvasData.selectStorey.imageUrl, this.canvasData.selectStorey.imageAngle);
// 创建楼层图形 // 创建楼层图形

Write Preview
Loading…
Cancel
Save