edit
add
library_books
diff --git a/src/app/ui/collection-tools/collection-tools.component.ts b/src/app/ui/collection-tools/collection-tools.component.ts
index 3cf8178..d51b0c7 100644
--- a/src/app/ui/collection-tools/collection-tools.component.ts
+++ b/src/app/ui/collection-tools/collection-tools.component.ts
@@ -15,6 +15,7 @@ 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';
@@ -27,7 +28,7 @@ export class CollectionToolsComponent implements OnInit {
@ViewChild('canvas',{static: true}) canvas:WorkingAreaComponent; //父组件中获得子组件的引用
- constructor(private http:HttpClient,public dialog: MatDialog,public snackBar: MatSnackBar,private element: ElementRef,public canvasData: CanvasShareDataService) { }
+ constructor(private http:HttpClient,public dialog: MatDialog,public snackBar: MatSnackBar,private element: ElementRef,public canvasData: CanvasShareDataService,private router:Router,private route:ActivatedRoute) { }
@ViewChild('nzTreeComponent', { static: false }) nzTreeComponent!: NzTreeComponent;
// tree配置
private _transformer = (node, level: number) => {//要给渲染节点传那些属性参数
@@ -155,6 +156,9 @@ export class CollectionToolsComponent implements OnInit {
//基本信息编辑模式
baseInfo(){
if (!this.pattern) {
+ this.basicInfo = true
+ this.canvas.setNameVisible(this.basicInfo,1)
+
this.pattern = true
this.canvasData.gameMode = GameMode.BasicInformation
this.canvasData.selectPanelPoint = new DisposalNodeData();
@@ -168,6 +172,10 @@ export class CollectionToolsComponent implements OnInit {
//想定作业编辑模式
wantWork(){
if (this.pattern) {
+ //让基本信息图标显示
+ this.basicInfo = false
+ this.canvas.setNameVisible(this.basicInfo,0)
+
this.pattern = false
this.canvasData.gameMode = GameMode.Assignment
this.getAllLibrary('plan')
@@ -610,8 +618,30 @@ export class CollectionToolsComponent implements OnInit {
this.canvasData.isChange = true
}
+
+ isSixShow = true
+ isSixbtn = true //控制想定作业编辑按钮
+ isxxx = true //控制查看编辑模式的编辑模式按钮
+
ngOnInit(): void {
-
+
+ if(this.router.url.indexOf("keyUnit/viewunitinfoplan") == -1 && this.router.url.indexOf("keyUnit/viewunitinfo") != -1 || this.router.url.indexOf("keyUnit/editplaninfo")!= -1){
+ this.isSixbtn = false
+ }
+
+ if(!this.isSixbtn && sessionStorage.getItem("six") == "edit"){
+ this.isSixShow = true
+ }
+ if(!this.isSixbtn && sessionStorage.getItem("six") == "look"){
+ this.isEditPattern = false
+ this.isxxx = false
+ }
+
+ if (sessionStorage.getItem('editable') == "0") {
+ this.isEditPattern = false
+ this.isxxx = false
+ }
+
this.getAllLibrary() //获取素材库
this.getAllBuildings() //获取所有建筑
this.getAllFirePlan() //获取当前单位灾情
@@ -622,7 +652,7 @@ export class CollectionToolsComponent implements OnInit {
that.canvas.cancelPaint()
that.selectImageIndex = -1
event.preventDefault();
- };
+ };
})
this.canvasData.getMessage().subscribe((message: any)=>{
@@ -635,6 +665,7 @@ export class CollectionToolsComponent implements OnInit {
ngAfterViewInit(): void {
+
this.getSitePlan()
// 监听canvas组件选中素材事件
this.canvas.on("select",obj=>{
@@ -653,6 +684,7 @@ export class CollectionToolsComponent implements OnInit {
this.canvas.on("deleteIcon",obj=>{
this.renovateTreeData(false)
})
+
}
copyAssetData:any //存储用于复制的素材
diff --git a/src/app/ui/organization/organization.component.html b/src/app/ui/organization/organization.component.html
index b0f79ec..6f963b9 100644
--- a/src/app/ui/organization/organization.component.html
+++ b/src/app/ui/organization/organization.component.html
@@ -10,8 +10,10 @@
block
block
delete
+
+
block
block
delete
+
-
+
diff --git a/src/app/ui/ui.module.ts b/src/app/ui/ui.module.ts
index fee20f2..553200b 100644
--- a/src/app/ui/ui.module.ts
+++ b/src/app/ui/ui.module.ts
@@ -95,8 +95,11 @@ import { CollectionToolsComponent, CreateBuilding, EditBuilding, ViewDetails } f
import { WorkingAreaComponent } from '../working-area/working-area.component';
import {leftFunctionalDomainComponent,editPlaneFigureComponent,addDisposalNodeComponent,editDisposalNodeComponent} from './collection-tools/leftFunctionalDomain'
import { saveOneDialog, saveTwoDialog } from './collection-tools/save';
+import { CollectionToolsPlanComponent, CreateBuildingPlan, EditBuildingPlan, ViewDetailsPlan } from './collection-tools-plan/collection-tools.component';
+import { addDisposalNodeComponentPlan, editDisposalNodeComponentPlan, editPlaneFigureComponentPlan, leftFunctionalDomainComponentPlan } from './collection-tools-plan/leftFunctionalDomain';
+import { saveOneDialogPlan, saveTwoDialogPlan } from './collection-tools-plan/save';
@NgModule({
- declarations: [UiComponent, DateselectComponent, MenuComponent, CardComponent, ListComponent, GridComponent, StepperComponent, TabgroupComponent, ButtonComponent, BadgeComponent, ProgressComponent, SnackbarComponent,PersonaldataComponent, FooterComponent, UserdataComponent, ChangepasswordComponent, OrganizationComponent, UnittypeComponent, AuthorityComponent, RoleComponent, UsermanagementComponent,IsnoPipe,ConfirmpswDirective,DialogOverviewExampleDialog,CreateAuthority,CreateRole,TimePipe,CreateNewUser,EditNewUser,allRoles,EditRole,CreateOrganization,EditOrganization,seeInformation,EditUser,editorialUnit,FireProtectionElementsComponent,Establish,EditingFireControl,FireFightingTemplateComponent, NavmenusComponent,CreateMenus,EditMenus,NewFireFighting,EditFireClassification, MaterialBankComponent, UnitInformationComponent,AddMatLibrary,EditMatLibrary,attributeComponent,AddOriginalCopy,addAttributeComponent,editAttribute,EditOriginalCopy,SelectOriginalCopy,EditUnitInfo,AddUnitInfo,AddGroups,EditGroup, EnterpriseuserComponent,AddEnterpriserUser,addUnitAttributeComponent,editUnitAttribute,seeenterpriseuser,editenterpriseuser, FireFightingFacilitiesFormworkComponent,addFireFightingFacilitiesFormworkComponent,editFireFightingFacilitiesFormworkComponent,addBuiltInComponent,addBuiltInAttributeComponent,addOptionalComponent,addOptionalAttributeComponent,editBuiltInAttributeComponent,editOptionalAttributeComponent, CollectionToolsComponent,WorkingAreaComponent,CreateBuilding,EditBuilding,leftFunctionalDomainComponent,editPlaneFigureComponent,ViewDetails,saveOneDialog,saveTwoDialog,addDisposalNodeComponent,editDisposalNodeComponent],
+ declarations: [UiComponent, DateselectComponent, MenuComponent, CardComponent, ListComponent, GridComponent, StepperComponent, TabgroupComponent, ButtonComponent, BadgeComponent, ProgressComponent, SnackbarComponent,PersonaldataComponent, FooterComponent, UserdataComponent, ChangepasswordComponent, OrganizationComponent, UnittypeComponent, AuthorityComponent, RoleComponent, UsermanagementComponent,IsnoPipe,ConfirmpswDirective,DialogOverviewExampleDialog,CreateAuthority,CreateRole,TimePipe,CreateNewUser,EditNewUser,allRoles,EditRole,CreateOrganization,EditOrganization,seeInformation,EditUser,editorialUnit,FireProtectionElementsComponent,Establish,EditingFireControl,FireFightingTemplateComponent, NavmenusComponent,CreateMenus,EditMenus,NewFireFighting,EditFireClassification, MaterialBankComponent, UnitInformationComponent,AddMatLibrary,EditMatLibrary,attributeComponent,AddOriginalCopy,addAttributeComponent,editAttribute,EditOriginalCopy,SelectOriginalCopy,EditUnitInfo,AddUnitInfo,AddGroups,EditGroup, EnterpriseuserComponent,AddEnterpriserUser,addUnitAttributeComponent,editUnitAttribute,seeenterpriseuser,editenterpriseuser, FireFightingFacilitiesFormworkComponent,addFireFightingFacilitiesFormworkComponent,editFireFightingFacilitiesFormworkComponent,addBuiltInComponent,addBuiltInAttributeComponent,addOptionalComponent,addOptionalAttributeComponent,editBuiltInAttributeComponent,editOptionalAttributeComponent, CollectionToolsComponent,WorkingAreaComponent,CreateBuilding,EditBuilding,leftFunctionalDomainComponent,editPlaneFigureComponent,ViewDetails,saveOneDialog,saveTwoDialog,addDisposalNodeComponent,editDisposalNodeComponent,CollectionToolsPlanComponent,CreateBuildingPlan,EditBuildingPlan,ViewDetailsPlan,leftFunctionalDomainComponentPlan,editPlaneFigureComponentPlan,addDisposalNodeComponentPlan,editDisposalNodeComponentPlan,saveOneDialogPlan,saveTwoDialogPlan],
imports: [
CommonModule,
@@ -153,7 +156,8 @@ import { saveOneDialog, saveTwoDialog } from './collection-tools/save';
exports:[
FooterComponent,
- CollectionToolsComponent
+ CollectionToolsComponent,
+ CollectionToolsPlanComponent
]
})
export class UiModule { }
diff --git a/src/app/working-area/model/multipointIcon.ts b/src/app/working-area/model/multipointIcon.ts
index 50b1c34..d5467a7 100644
--- a/src/app/working-area/model/multipointIcon.ts
+++ b/src/app/working-area/model/multipointIcon.ts
@@ -56,6 +56,7 @@ export class MultipointIcon extends PIXI.Container {
icon.x = pointA.x;
icon.y = pointA.y;
icon.angle = angle;
+ icon.height = this.assetData.Thickness === 0 ? 32 : this.assetData.Thickness;
this.iconsTilingSprite.push(icon);
this.addChild(icon);
if (i === 0) {
@@ -234,8 +235,12 @@ export class MultipointIcon extends PIXI.Container {
this.text.visible = value;
}
}
- //
+ // 刷新数据
public refresh() {
+ console.log(this.assetData);
+ this.iconsTilingSprite.forEach(element => {
+ element.height = this.assetData.Thickness === 0 ? 32 : this.assetData.Thickness;
+ });
this.text.text = this.assetData.Name
+ '\r\n'
+ this.assetData.PropertyInfos.find(item => item.PropertyName === '名称/编号')?.PropertyValue;
diff --git a/src/app/working-area/model/singlePointIcon.ts b/src/app/working-area/model/singlePointIcon.ts
index f180e0d..f60c9bd 100644
--- a/src/app/working-area/model/singlePointIcon.ts
+++ b/src/app/working-area/model/singlePointIcon.ts
@@ -61,7 +61,6 @@ export class SinglePointIcon extends PIXI.Container {
this.image.interactive = true;
this.image
.on('mousedown', event => {
- console.log(this.workingArea.canvasData.selectPanelPoint);
event.stopPropagation();
this.workingArea.selection.selectOne(this);
if (this.assetData.CanConnection && this.parent === this.workingArea.backgroundImage) {
diff --git a/src/app/working-area/working-area.component.ts b/src/app/working-area/working-area.component.ts
index a6b89cd..6a68e12 100644
--- a/src/app/working-area/working-area.component.ts
+++ b/src/app/working-area/working-area.component.ts
@@ -155,15 +155,15 @@ export class WorkingAreaComponent extends EventEmitter implements OnInit, AfterV
if (event.keyCode === 46) {
this.selection.objects.forEach(item => {
// 删除 选中的数据
- if (item.assetData?.IsFromBuilding) {
- delete this.canvasData.originalcompanyBuildingData?.data[item.assetData.Id];
- } else {
- delete this.canvasData.originaleveryStoreyData?.data[item.assetData.Id];
- }
+ if (item.assetData?.IsFromBuilding) {
+ delete this.canvasData.originalcompanyBuildingData?.data[item.assetData.Id];
+ } else {
+ delete this.canvasData.originaleveryStoreyData?.data[item.assetData.Id];
+ }
// 删除选中的图标
- this.backgroundImage.removeChild(this.backgroundImage.getChildByName(item.assetData.Id));
+ this.backgroundImage.removeChild(this.backgroundImage.getChildByName(item.assetData.Id));
// 标记
- this.canvasData.isChange = true;
+ this.canvasData.isChange = true;
});
this.emit('deleteIcon');
}
@@ -339,7 +339,7 @@ export class WorkingAreaComponent extends EventEmitter implements OnInit, AfterV
this.canvasData.originaleveryStoreyData.data[obj.assetData.Id] = obj.assetData;
}
} else {
- console.log();
+ // console.log();
if (this.canvasData.selectPanelPoint.Data === undefined
|| this.canvasData.selectPanelPoint.Data === null) {
this.canvasData.selectPanelPoint.Data = new FloorNodeData();
@@ -426,8 +426,8 @@ export class WorkingAreaComponent extends EventEmitter implements OnInit, AfterV
const floorData = this.canvasData.originaleveryStoreyData.data;
- // const buildingData = this.canvasData.originalcompanyBuildingData.data;
- // const floor = this.canvasData.selectStorey;
+ const buildingData = this.canvasData.originalcompanyBuildingData.data;
+ const floor = this.canvasData.selectStorey;
// // key=>属性名 data[key]=>属性值
Object.keys(floorData).forEach((key) => {
@@ -443,21 +443,21 @@ export class WorkingAreaComponent extends EventEmitter implements OnInit, AfterV
break;
}
});
- // Object.keys(buildingData).forEach((key) => {
- // if (buildingData[key].FloorId === floor.id) {
- // switch (buildingData[key].InteractiveMode) {
- // case 0:
- // const singleIcon = new SinglePointIcon(buildingData[key], this);
- // break;
- // case 1:
- // const icon = new MultipointIcon(buildingData[key], this);
- // break;
- // case 2:
- // const polygonIcon = new PolygonIcon(buildingData[key], this);
- // break;
- // }
- // }
- // });
+ Object.keys(buildingData).forEach((key) => {
+ if (buildingData[key].FloorId === floor.id) {
+ switch (buildingData[key].InteractiveMode) {
+ case 0:
+ const singleIcon = new SinglePointIcon(buildingData[key], this);
+ break;
+ case 1:
+ const icon = new MultipointIcon(buildingData[key], this);
+ break;
+ case 2:
+ const polygonIcon = new PolygonIcon(buildingData[key], this);
+ break;
+ }
+ }
+ });
// 加载处置节点数据
const nodeData = this.canvasData.selectPanelPoint.Data;
@@ -1082,7 +1082,7 @@ export class WorkingAreaComponent extends EventEmitter implements OnInit, AfterV
if (newData.IsFromBuilding) {
this.canvasData.originalcompanyBuildingData.data[newData.Id] = newData;
} else {
- this.canvasData.originaleveryStoreyData.data[newData.Id] = newData;
+ this.canvasData.originaleveryStoreyData.data[newData.Id] = newData;
}
switch (item.InteractiveMode) {
case PaintMode.singlePointIcon: