diff --git a/src/app/ui/collection-tools-building/collection-tools.component.ts b/src/app/ui/collection-tools-building/collection-tools.component.ts index a28b8bb..730f4ce 100644 --- a/src/app/ui/collection-tools-building/collection-tools.component.ts +++ b/src/app/ui/collection-tools-building/collection-tools.component.ts @@ -671,7 +671,6 @@ export class CollectionToolsBuildingComponent implements OnInit { } }, this) - if(this.router.url.indexOf("keyUnit/viewunitinfo") != -1){ //查看模式 this.isEditPattern = false this.isediticon = false @@ -810,17 +809,8 @@ export class CollectionToolsBuildingComponent implements OnInit { ngAfterViewInit(): void { //不是gis模块平面图 if(this.router.url.indexOf("gis") == -1) { - this.getAllBuildings(true) //获取所有建筑 + this.getAllBuildings(true) //获取所有建筑 } - // 监听canvas组件选中素材事件 - this.canvas.on("select",obj=>{ - //选中素材属性注入函数 - this.setAssetsProperty(obj.assetData) - }) - // 监听canvas组件取消选中素材事件 - this.canvas.on("deselect",obj=>{ - this.isShowProperty = false - }) //监听数据变化后 this.canvas.on('canvasDataChanged',()=>{ // 收到数据表示共享数据发生变化 diff --git a/src/app/ui/collection-tools-plan/collection-tools.component.ts b/src/app/ui/collection-tools-plan/collection-tools.component.ts index 03adbaf..e40b92d 100644 --- a/src/app/ui/collection-tools-plan/collection-tools.component.ts +++ b/src/app/ui/collection-tools-plan/collection-tools.component.ts @@ -812,17 +812,8 @@ export class CollectionToolsPlanComponent implements OnInit { ngAfterViewInit(): void { //不是gis模块平面图 if(this.router.url.indexOf("gis") == -1) { - this.getSitePlan() + this.getSitePlan() } - // // 监听canvas组件选中素材事件 - // this.canvas.on("select",obj=>{ - // //选中素材属性注入函数 - // this.setAssetsProperty(obj.assetData) - // }) - // 监听canvas组件取消选中素材事件 - this.canvas.on("deselect",obj=>{ - this.isShowProperty = false - }) //监听数据变化后 this.canvas.on('canvasDataChanged',()=>{ // 收到数据表示共享数据发生变化 diff --git a/src/app/ui/collection-tools/collection-tools.component.ts b/src/app/ui/collection-tools/collection-tools.component.ts index b453523..2220aee 100644 --- a/src/app/ui/collection-tools/collection-tools.component.ts +++ b/src/app/ui/collection-tools/collection-tools.component.ts @@ -633,6 +633,7 @@ export class CollectionToolsComponent implements OnInit { multipleAssetData:any//当前多选的素材 firstMultipleAssetData:any//当前多选的第一个素材 ngOnInit(): void { + let _this = this AxMessageSystem.addListener('selectionChanged', ()=>{ if(this.canvas.selection.size() == 1){//如果是单选 @@ -770,7 +771,6 @@ export class CollectionToolsComponent implements OnInit { multipleAssetInputChange(i,e){ e.stopPropagation() this.multipleAssetData.forEach(item=>{ - // console.log(item) item.assetData.PropertyInfos.forEach(element => { if(element.PropertyName == i.PropertyName){ element.PropertyValue = i.PropertyValue @@ -784,7 +784,6 @@ export class CollectionToolsComponent implements OnInit { multipleAssetRadioChange(i,value){ // e.stopPropagation() this.multipleAssetData.forEach(item=>{ - // console.log(item) item.assetData.PropertyInfos.forEach(element => { if(element.PropertyName == i.PropertyName){ element.PropertyValue = value @@ -798,7 +797,6 @@ export class CollectionToolsComponent implements OnInit { multipleSupplyArea(i,e){ e.stopPropagation() this.multipleAssetData.forEach(item=>{ - // console.log(item) item.assetData.PropertyInfos.forEach(element => { if(element.PropertyName == i.PropertyName){ element.PropertyValue = i.PropertyValue @@ -811,15 +809,6 @@ export class CollectionToolsComponent implements OnInit { ngAfterViewInit(): void { this.getSitePlan() - // 监听canvas组件选中素材事件 - this.canvas.on("select",obj=>{ - //选中素材属性注入函数 - this.setAssetsProperty(obj.assetData) - }) - // 监听canvas组件取消选中素材事件 - this.canvas.on("deselect",obj=>{ - this.isShowProperty = false - }) //监听数据变化后 this.canvas.on('canvasDataChanged',()=>{ // 收到数据表示共享数据发生变化