diff --git a/src/app/canvas-share-data.service.ts b/src/app/canvas-share-data.service.ts index fa70878..4540e24 100644 --- a/src/app/canvas-share-data.service.ts +++ b/src/app/canvas-share-data.service.ts @@ -38,7 +38,7 @@ export class CanvasShareDataService { /** * 游戏模式 */ - gameMode: GameMode = GameMode.Assignment; + gameMode: GameMode = GameMode.Examinee; facilityAssetsName = new Map([ [ '消防水池', '消防水池'], diff --git a/src/app/working-area/model/axImageShape.ts b/src/app/working-area/model/axImageShape.ts index 67466be..b59bd9d 100644 --- a/src/app/working-area/model/axImageShape.ts +++ b/src/app/working-area/model/axImageShape.ts @@ -407,6 +407,7 @@ export class AxImageShape extends AxShape { IsFromBuilding : this.workingArea.canvasData.selectTemplateData.isFromBuilding, GameMode: this.workingArea.canvasData.gameMode, LinkedObjects: new Array(this.assetData.Id), + Tag: this.workingArea.canvasData.selectTemplateData.tag }; this.workingArea.paintingShape = new AxArrowConnector(tempData, this.workingArea,false,true); this.assetData.Pipelines.push(this.workingArea.paintingShape.assetData.Id); diff --git a/src/app/working-area/working-area.component.ts b/src/app/working-area/working-area.component.ts index 7a4dbeb..3b313bd 100644 --- a/src/app/working-area/working-area.component.ts +++ b/src/app/working-area/working-area.component.ts @@ -401,8 +401,17 @@ export class WorkingAreaComponent extends EventEmitter implements OnInit, AfterV this.canvasData.selectPanelPoint.Data = new FloorNodeData(); } this.canvasData.selectPanelPoint.Data.Stock[obj.assetData.Id] = obj.assetData; - } else if (obj.assetData.GameMode === GameMode.Examinee) { // 考生考试 - // this.canvasData.examOriginaleveryStoreyData.data[obj.assetData.Id] = obj.assetData; + } else if (obj.assetData.GameMode === GameMode.Examinee) { // 考生考试 + console.log(obj.assetData.Tag) + if (obj.assetData.Tag === 1) { + this.canvasData.examOriginaleveryStoreyData.data[obj.assetData.Id] = obj.assetData; + } else { + if (this.canvasData.selectPanelPoint.Data === undefined + || this.canvasData.selectPanelPoint.Data === null) { + this.canvasData.selectPanelPoint.Data = new FloorNodeData(); + } + this.canvasData.selectPanelPoint.Data.Stock[obj.assetData.Id] = obj.assetData; + } } this.canvasData.isChange = true; }); @@ -718,7 +727,8 @@ export class WorkingAreaComponent extends EventEmitter implements OnInit, AfterV DrawMode : this.canvasData.selectTemplateData.drawMode, Thickness : this.canvasData.selectTemplateData.thickness, IsFromBuilding : this.canvasData.selectTemplateData.isFromBuilding, - GameMode : this.canvasData.gameMode + GameMode: this.canvasData.gameMode, + Tag: this.canvasData.selectTemplateData.tag }; const singleIcon = new AxImageShape(assetData, this); this.emit('createIcon', singleIcon); @@ -765,7 +775,8 @@ export class WorkingAreaComponent extends EventEmitter implements OnInit, AfterV DrawMode: this.canvasData.selectTemplateData.drawMode, Thickness: this.canvasData.selectTemplateData.thickness, IsFromBuilding: this.canvasData.selectTemplateData.isFromBuilding, - GameMode: this.canvasData.gameMode + GameMode: this.canvasData.gameMode, + Tag: this.canvasData.selectTemplateData.tag }; // const assetData1 = { // ImageUrl: this.canvasData.selectTemplateData.imageUrl, @@ -850,7 +861,8 @@ export class WorkingAreaComponent extends EventEmitter implements OnInit, AfterV DrawMode: this.canvasData.selectTemplateData.drawMode, Thickness: this.canvasData.selectTemplateData.thickness, IsFromBuilding: this.canvasData.selectTemplateData.isFromBuilding, - GameMode: this.canvasData.gameMode + GameMode: this.canvasData.gameMode, + Tag: this.canvasData.selectTemplateData.tag }; if (this.canvasData.selectTemplateData.name === '距离') { this.paintingShape = new AxArrowConnector(assetData2, this,true,true);