+
+
+
+
+ 基本信息名称
+ visibility
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/app/ui/collection-tools-building/collection-tools.component.scss b/src/app/ui/collection-tools-building/collection-tools.component.scss
new file mode 100644
index 0000000..02c4e97
--- /dev/null
+++ b/src/app/ui/collection-tools-building/collection-tools.component.scss
@@ -0,0 +1,450 @@
+@import './panel.scss';
+.icongray{
+ color: #D9D0DC;
+}
+.content {
+ width: 100%;
+ height: 100%;
+ overflow: hidden;
+ box-sizing: border-box;
+ padding: 1px;
+ display: flex;
+ flex-direction: column;
+
+ .buildingbtnchecked{
+ background-color: #34A6FD;
+ color: white;
+ }
+}
+
+//header头部
+.header {
+ position: relative;
+ flex: 5%;
+ display: flex;
+ align-items:center;
+ min-height: 40px;
+ background-color: #fff;
+ .marginLeftRight {
+ margin: 0 8px;
+ font-size: 16px;
+ user-select: none;
+ cursor: pointer;
+ .mat-icon { vertical-align: middle; font-size: 24px; }
+ }
+ .copytobutn{
+ width: 60px;
+ min-width: 60px;
+ display: flex;
+ justify-content: center;
+ }
+ span{
+ height: 24px;
+ line-height: 24px;
+ }
+ .patternSwitch{
+ position: absolute;
+ right: 140px;
+ span{
+ font-size: 18px;
+ cursor: pointer;
+ margin: 0 3px;
+ display: inline-block;
+ border: 1px solid gray;
+ border-radius: 3px;
+ padding: 0 5px;
+ }
+ .selectedPattern{
+ background-color: #2196f3;
+ color: white;
+ }
+ }
+ .rightSave {
+ cursor: pointer;
+ position: absolute;
+ right: 60px;
+ label { vertical-align: middle; color: #279FFF; }
+ }
+}
+
+//头部操作栏
+.headerOperate {
+ img {
+ width: 24px;
+ height: 24px;
+ vertical-align: middle;
+ margin-left: 1px;
+ }
+ span{
+ font-size: 18px;
+ }
+ flex: 5%;
+ display: flex;
+ align-items:center;
+ min-height: 40px;
+ box-sizing: border-box;
+ margin: 3px 0;
+ background-color: white;
+ button{
+ border: 0.5px solid rgb(208, 211, 214);
+ margin: 0 2px;
+ }
+ .editdeletebtn{
+ display: none;
+ }
+ .bigeditdeletebtn:hover{
+ .editdeletebtn{
+ display: inline-block;
+ }
+ }
+}
+
+//功能区
+// icon统一样式
+.mat-icon {
+ cursor:pointer;
+ vertical-align: middle;
+}
+//左右两侧功能栏 统一样式
+.publicCss {
+ border-radius: 5px;
+ position: absolute;
+ height: 100%;
+ top: 0;
+}
+.functionalDomain {
+ flex: 90%;
+ overflow: hidden;
+ .functionalDomainContent {
+ position: relative;
+ width: 100%;
+ height: 100%;
+ }
+ .functionalDomainLeft {
+ background-color: #fff;
+ display: flex;
+ flex-direction: column;
+ margin-left: 0px;
+ transition: margin-left 0.5s;
+ min-width: 235px;
+ border: 1px solid #E6EAEE;
+ width: 235px;
+ left: 0;
+ z-index: 111;
+ .leftDragDiv{
+ position: absolute;
+ right: 0;
+ height: 100%;
+ width: 3px;
+ z-index: 1000;
+ cursor: e-resize;
+ }
+ }
+ .functionalDomainRight {
+ z-index: 1001;
+ margin-right: 0px;
+ transition: margin-right 0.5s;
+ border: 1px solid #464646;
+ width: 235px;
+ right: 0;
+
+ }
+ //右边导航栏显示隐藏
+ .togglePanel2 {
+ margin-right: -2000px;
+ transition: margin-right 1s;
+ }
+ //左侧导航栏显示隐藏
+ .togglePanel {
+ margin-left: -2000px;
+ transition: margin-left 1s;
+ }
+
+}
+
+//右边操作栏
+.title{
+ width: 100%;
+ height: 35px;
+ background-color: #464646;
+ div{
+ width: 50%;
+ height: 35px;
+ line-height: 35px;
+ background-color: #595959;
+ border-radius: 5px;
+ span{
+ color: white;
+ font-size: 14px;
+ font-weight: 400;
+ padding-left: 5px;
+ }
+ }
+}
+
+
+//右侧属性
+.property{
+ display: flex;
+ flex-flow: column;
+ .siteproperty{
+ height: 100%;
+ overflow-y: auto;
+ p{
+ color: #9c9fa5;
+ padding-left: 5px;
+ }
+ .siteproperty_size{
+ background-color: #e3e3e3;
+ width: 93%;
+ margin: 0 auto;
+ border-radius: 3px;
+ min-height: 21px;
+ }
+ .rightAttribute{
+ width: 12%;
+ height: 99.5%;
+ position: absolute;
+ top: 0;
+ right: 0;
+ bottom: 0;
+ border: 2px solid #464646;
+ }
+ }
+ .assetsproperty{
+ overflow-y: auto;
+ height: 100%;
+ p{
+ color: #9c9fa5;
+ margin:1px 0 3px 8px;
+ font-size: 14px;
+ }
+ span{
+ font-size: 15px;
+ }
+ input{
+ height: 18px;
+ }
+ .biginput{
+ display: block;
+ width: 88%;
+ margin: 0 auto;
+ }
+ .smallinput{
+ display: block;
+ width: 19%;
+ margin-left: 8px;
+ }
+ .textarea{
+ display: block;
+ width: 88%;
+ height: 50px;
+ margin: 0 auto;
+ }
+ .swiper-button-next{
+ right: 6px;
+ }
+ .swiper-button-prev{
+ left: 6px;
+ }
+ .swiper-container{
+ // --swiper-theme-color: #ff6600;/* 设置Swiper风格 */
+ // --swiper-navigation-color: #00ff33;/* 单独设置按钮颜色 */
+ --swiper-navigation-size:20px;/* 设置按钮大小 */
+ }
+ .hoverred:hover{
+ color: rgb(187, 28, 28);
+ }
+ .selectDiv{
+ height: 21px;
+ position: relative;
+ margin-bottom: 5px;
+ select{
+ width: 98px;
+ height: 22px;
+ vertical-align: middle;
+ position: absolute;
+ right: 10px;
+ top: 1px;
+ border: 1px solid rgb(208, 211, 214);
+ border-radius: 2px;
+ }
+ }
+ .colorBigDiv{
+ width: 88%;
+ margin-left: 8px;
+ .colorBigTemplateDiv{
+ span{
+ color: #9c9fa5;
+ font-size: 14px;
+ height: 26px;
+ line-height: 26px;
+ }
+ .colorTemplateDiv{
+ width: 65%;
+ height: 22px;
+ display: inline-block;
+ vertical-align: middle;
+ margin-left: 26px;
+ }
+ }
+
+ .colorDiv{
+ .colorLi{
+ width: 24px;
+ height: 24px;
+ list-style: none;
+ float: left;
+ border: 2px solid white;
+ }
+ .coloractive{
+ border: 2px solid black;
+ }
+ }
+ }
+
+ }
+}
+//右侧消防要素
+.firecategories{
+ background-color: #fff;
+ position: relative;
+ display: flex;
+ flex-flow: column;
+ .firecategoriesTree{
+ overflow-y: auto;
+ height: 100%;
+ mat-tree-node{
+ position: relative;
+ }
+ .isLookCss{
+ position: absolute;
+ right: 6px;
+ }
+ }
+}
+
+// 解决轮播图蓝框问题
+div:focus {
+ outline: none;
+}
+
+//没有图片时显示无图片背景图
+.noImgCss{
+ background: url(../../../assets/images/noImg.png) no-repeat center center;
+ background-size: 88% 100%;/*按比例缩放*/
+}
+.input{
+ width: 18px;
+ height: 18px;
+ vertical-align: middle;
+ margin-left: 9px;
+ margin-right: 3px;
+}
+
+
+// tree
+.mat-tree-node{
+ min-height: 0;
+ height: 32px;
+ line-height: 32px;
+ font-size: 13px;
+ cursor: pointer;
+}
+.treeNode:hover{
+ background-color: #ccebf8;
+}
+.isLookPattern{
+ display: none;
+}
+.treeText{
+ overflow: hidden;
+ white-space: nowrap;
+ text-overflow: ellipsis;
+ display: inline-block;
+ width: 65px;
+}
+
+.bigBox{
+ width: 700px;
+ height: 40px;
+ position: absolute;
+ overflow: hidden;
+ right: 0;
+}
+.weatherBox{
+ height: 40px;
+ width: 700px;
+ line-height: 40px;
+ position: absolute;
+ right: 0;
+ transition: right linear .5s;
+ .openbtn{
+ font-size: 45px;
+ height: 45px;
+ width: 40px;
+ }
+ .name{
+ font-size: 16px;
+ vertical-align: middle;
+ margin-left: 3px;
+ }
+ input{
+ width: 140px;
+ height: 22px;
+ margin-left: 3px;
+ }
+ select{
+ width: 96px;
+ height: 25px;
+ margin-left: 3px;
+ vertical-align: middle;
+ }
+}
+.open{
+ right: 0px;
+}
+.close{
+ right:-622px;
+}
+.bottomCss{
+ position: absolute;
+ left: 232px;
+ right: 0px;
+ bottom: 0;
+ height: 158px;
+ width: auto;
+ z-index: 100;
+ background-color: white;
+ border: 1px solid #464646;
+ .dragDiv{
+ width: 100%;
+ height: 3px;
+ position: absolute;
+ top: 0;
+ z-index: 1000;
+ cursor: n-resize;
+ }
+ .title{
+ height: 35px;
+ background-color: #464646;
+ div{
+ background-color: #464646;
+ float: left;
+ width: 80px;
+ color: white;
+ font-size: 13px;
+ padding-left: 5px;
+ cursor: pointer;
+ }
+ .detailsAndattentBtn{
+ background-color: #595959;
+ }
+ }
+ .body{
+ textarea{
+ width: 100%;
+ border-radius: 0px;
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/app/ui/collection-tools-building/collection-tools.component.spec.ts b/src/app/ui/collection-tools-building/collection-tools.component.spec.ts
new file mode 100644
index 0000000..acc7d5e
--- /dev/null
+++ b/src/app/ui/collection-tools-building/collection-tools.component.spec.ts
@@ -0,0 +1,25 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { CollectionToolsComponent } from './collection-tools.component';
+
+describe('CollectionToolsComponent', () => {
+ let component: CollectionToolsComponent;
+ let fixture: ComponentFixture
+
+
+
+
+
+
+
+
+
+
+
+
+
+ keyboard_arrow_up
+ keyboard_arrow_down
+
+
+
+
+
+
+
+
+ 
+ 
+ 
+ 
+
+
+
+ photo_size_select_actual
+
+
+
+ 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ keyboard_arrow_up
+ keyboard_arrow_down
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ![]()
+
+ {{items.name}}
+
+
+
+
+
+ keyboard_arrow_up
+ keyboard_arrow_down
+
+
+
+
+
+
+
+
+
+
+
+
+
+ edit
+ add
+ library_books
+ delete_forever
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 属性
+
+
+
+
+ 面积(平方米)
+{{canvasData.selectStorey.area}}
+ 详情
+
+ {{canvasData.selectStorey.details}}
+
+
+
+
+ {{assetName}}
+ +
+
+
+ 宽度(像素)
+ +高度(像素)
+ +角度
+
+
+
+
+
+
+ 厚度
+
+
+
+ 是否高亮
+
+
+ 选中高亮
+
+
+
+
+ 颜色
+
+
+
+
+
+
+ 透明度
+ -
+
+
+
+
+
+
+
+ {{item.PropertyName}}({{item.PhysicalUnit}})
+ +
+
+
+ {{item.PropertyName}}({{item.PhysicalUnit}})
+ +
+
+
+ {{item.PropertyName}}({{item.PhysicalUnit}})
+ +
+
+
+
+
+ {{item.PropertyName}}
+ {{imagesArr.length ? imagesArr.length : 0}} / {{item.PropertyValue}} + +添加
+
+
+
+ delete
+
+
+
+ ![]()
+
+
+
+
+
+
+
+
+ {{item.PropertyName}}
+ +
+
+
+ {{item.PropertyName}}
+ 是 + 否 +
+
+
+ {{item.PropertyName}}
+ +
+
+ {{item.PropertyName}}
+ +
+
+
+
+
+
+
+
+
+ 消防要素
+
+
+
+
+
+
+
+
+ {{node.name}}
+
+ ({{node.children.length}})
+ visibility
+
+
+
+
+
+
+ {{node.name}}
+
+ ({{node.children.length}})
+ visibility
+
+
+
+
+
+
+
+
+
+
+ 节点详情
+
+
+ 注意事项
+
+
+
+
+
+ 新增建筑
+
+
+
\ No newline at end of file
diff --git a/src/app/ui/collection-tools-building/editBuilding.html b/src/app/ui/collection-tools-building/editBuilding.html
new file mode 100644
index 0000000..433316d
--- /dev/null
+++ b/src/app/ui/collection-tools-building/editBuilding.html
@@ -0,0 +1,23 @@
+编辑建筑
+
+
+
\ No newline at end of file
diff --git a/src/app/ui/collection-tools-building/editDisposalNode.html b/src/app/ui/collection-tools-building/editDisposalNode.html
new file mode 100644
index 0000000..40b2270
--- /dev/null
+++ b/src/app/ui/collection-tools-building/editDisposalNode.html
@@ -0,0 +1,23 @@
+
+
\ No newline at end of file
diff --git a/src/app/ui/collection-tools-building/editPlaneFigure.html b/src/app/ui/collection-tools-building/editPlaneFigure.html
new file mode 100644
index 0000000..a0f8016
--- /dev/null
+++ b/src/app/ui/collection-tools-building/editPlaneFigure.html
@@ -0,0 +1,39 @@
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/app/ui/collection-tools-building/leftFunctionalDomain.ts b/src/app/ui/collection-tools-building/leftFunctionalDomain.ts
new file mode 100644
index 0000000..e60ca32
--- /dev/null
+++ b/src/app/ui/collection-tools-building/leftFunctionalDomain.ts
@@ -0,0 +1,180 @@
+import { Component, OnInit, Inject } from '@angular/core';
+import { HttpClient, HttpHeaders } from '@angular/common/http';
+import { MatDialog, MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog';
+import { MatSnackBar, MatSnackBarConfig } from '@angular/material/snack-bar';
+
+@Component({
+ selector: 'app-leftFunctionalDomain-building',
+ templateUrl: './addPlaneFigure.html',
+ styleUrls: ['./panel.scss']
+})
+export class leftFunctionalDomainBuildingComponent implements OnInit {
+
+ constructor(
+ private http:HttpClient,
+ public dialog: MatDialog,
+ public snackBar: MatSnackBar,
+ public dialogRef: MatDialogRef
+
+
+
+
+
+
+处置节点保存
+
+
+
+
\ No newline at end of file
diff --git a/src/app/ui/collection-tools-building/saveTwo.html b/src/app/ui/collection-tools-building/saveTwo.html
new file mode 100644
index 0000000..fec97ff
--- /dev/null
+++ b/src/app/ui/collection-tools-building/saveTwo.html
@@ -0,0 +1,53 @@
+
+
+新增节点
+
+
+
+
+
\ No newline at end of file
diff --git a/src/app/ui/collection-tools-building/viewdetails.html b/src/app/ui/collection-tools-building/viewdetails.html
new file mode 100644
index 0000000..76638c2
--- /dev/null
+++ b/src/app/ui/collection-tools-building/viewdetails.html
@@ -0,0 +1,24 @@
+保存到已有节点
+
+
+
+
+
\ No newline at end of file
diff --git a/src/app/ui/collection-tools-plan/addPlaneFigure.html b/src/app/ui/collection-tools-plan/addPlaneFigure.html
index 930bf81..605e5e5 100644
--- a/src/app/ui/collection-tools-plan/addPlaneFigure.html
+++ b/src/app/ui/collection-tools-plan/addPlaneFigure.html
@@ -12,6 +12,17 @@
+
+ clear
+
+
+
+
+
+
+
+
+ ![]()
+
+
+ 导入GIS地图
+
+
+
+
+ 上传本地图片
+
+
+
选择文件: {{file.name}}
+
-
+
-
- tv
- create
- description
+
+
+
-
-
-
-
-
-
-
-
-
-
- keyboard_arrow_right
- keyboard_arrow_left
- 天气
-
- 气温
-
-
-
- ℃
-
- 风力
-
- 风向
-
-
@@ -218,12 +150,8 @@
-
-
-
-
-
-
-
+
- 属性
-
-
+
- 属性
面积(平方米)
@@ -366,69 +294,11 @@
-
-
-
-
-
-
-
- 消防要素
-
-
-
-
-
-
-
-
- {{node.name}}
-
- ({{node.children.length}})
- visibility
-
-
-
-
-
-
- {{node.name}}
-
- ({{node.children.length}})
- visibility
-
-
-
+
-
-
diff --git a/src/app/ui/collection-tools-plan/collection-tools.component.scss b/src/app/ui/collection-tools-plan/collection-tools.component.scss
index 985cf7e..acae429 100644
--- a/src/app/ui/collection-tools-plan/collection-tools.component.scss
+++ b/src/app/ui/collection-tools-plan/collection-tools.component.scss
@@ -59,6 +59,12 @@
color: white;
}
}
+ .rightSave {
+ cursor: pointer;
+ position: absolute;
+ right: 60px;
+ label { vertical-align: middle; color: #279FFF; }
+ }
}
//头部操作栏
@@ -107,7 +113,7 @@
top: 0;
}
.functionalDomain {
- flex: 90%;
+ flex: 95%;
overflow: hidden;
.functionalDomainContent {
position: relative;
@@ -138,10 +144,9 @@
z-index: 1001;
margin-right: 0px;
transition: margin-right 0.5s;
- border: 1px solid #464646;
+ border: 1px solid #E6EAEE;
width: 235px;
right: 0;
-
}
//右边导航栏显示隐藏
.togglePanel2 {
@@ -153,27 +158,17 @@
margin-left: -2000px;
transition: margin-left 1s;
}
-
}
//右边操作栏
-.title{
- width: 100%;
- height: 35px;
- background-color: #464646;
- div{
- width: 50%;
- height: 35px;
- line-height: 35px;
- background-color: #595959;
- border-radius: 5px;
- span{
- color: white;
- font-size: 14px;
- font-weight: 400;
- padding-left: 5px;
- }
- }
+.rightTitle{
+ height: 35x;
+ line-height: 35px;
+ text-align: center;
+ border-top-left-radius: 10px;
+ border-top-right-radius: 10px;
+ background-color: #2196F3;
+ color: #fff;
}
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 b776406..17f69c5 100644
--- a/src/app/ui/collection-tools-plan/collection-tools.component.ts
+++ b/src/app/ui/collection-tools-plan/collection-tools.component.ts
@@ -607,7 +607,6 @@ export class CollectionToolsPlanComponent implements OnInit {
this.canvasData.isChange = true
}
-
isSixShow = true
isSixbtn = true //控制想定作业编辑按钮
isediticon = true //控制查看编辑模式的编辑模式小笔按钮
@@ -631,7 +630,6 @@ export class CollectionToolsPlanComponent implements OnInit {
this.canvasData.gameMode = GameMode.Assignment
} else {
this.getAllLibrary() //获取素材库
- this.getAllBuildings() //获取所有建筑
}
let that = this
@@ -645,7 +643,7 @@ export class CollectionToolsPlanComponent implements OnInit {
this.canvasData.getMessage().subscribe((message: any)=>{
if(message == "send a message"){
- this.refurbishTreeData()
+ // this.refurbishTreeData()
}
})
}
@@ -669,7 +667,7 @@ export class CollectionToolsPlanComponent implements OnInit {
//监听数据变化后
this.canvas.on('canvasDataChanged',()=>{
// 收到数据表示共享数据发生变化
- this.renovateTreeData(false)
+ // this.renovateTreeData(false)
});
}
@@ -684,7 +682,7 @@ export class CollectionToolsPlanComponent implements OnInit {
let buildingId = this.beforeOneCheckedBuilding.id
let floorId = this.selectingSitePlan.id
this.canvas.paste(companyId,buildingId,floorId)
- this.renovateTreeData(false)
+ // this.renovateTreeData(false)
}
basicInfo:boolean = true //基本信息名称显隐
@@ -1352,31 +1350,30 @@ export class CollectionToolsPlanComponent implements OnInit {
//封装 刷新 tree 数据
async renovateTreeData (isRefresh:boolean = true) {
- this.allFireElements[this.allFireElements.length-1].children = []
+ // this.allFireElements[this.allFireElements.length-1].children = []
isRefresh? await this.canvas.refresh() : null
this.canvas.setNameVisible(this.basicInfo,0)
this.canvas.setNameVisible(this.wantToWork,1)
isRefresh? this.canvasData.isChange = false : null //服务中 数据是否改动 改为false
isRefresh? this.isShowProperty = true : null
isRefresh? this.isShowAttribute = true : null
- !this.pattern? this.mateFireForce() : null //刷新 建筑楼层 火源/力量图标
- let beforeOneId = this.selectingSitePlan.id || '' //当前 选中 平面图 楼层/区域 id
- let companyBuildingData = JSON.parse(JSON.stringify( this.canvasData.originalcompanyBuildingData || {} )) // 当前 单位/建筑 数据
- let storeyData = JSON.parse(JSON.stringify( this.canvasData.originaleveryStoreyData || {} )) //当前 楼层 数据
+ // let beforeOneId = this.selectingSitePlan.id || '' //当前 选中 平面图 楼层/区域 id
+ // 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 storeyData.data){ //筛选数据 没有匹配全部放入到 其他 数组
- 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])
- }
- }
- this.handleTreeData(storeyData) //处理tree数据结构
+ // for(let key in companyBuildingData.data){
+ // if (companyBuildingData.data[key].FloorId === beforeOneId) { //处理 单位/建筑 数据是否归于当前楼层下
+ // storeyData.data[key] = companyBuildingData.data[key]
+ // }
+ // }
+ // for(let key in storeyData.data){ //筛选数据 没有匹配全部放入到 其他 数组
+ // 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])
+ // }
+ // }
+ // this.handleTreeData(storeyData) //处理tree数据结构
}
@@ -1423,7 +1420,7 @@ export class CollectionToolsPlanComponent implements OnInit {
//获取总平面图
getSitePlan () {
- let fireData = this.getFireElements(sessionStorage.getItem('buildingTypeId')) //获取单位下 消防要素
+ // let fireData = this.getFireElements(sessionStorage.getItem('buildingTypeId')) //获取单位下 消防要素
let planData = this.getSitePlanCompanyData() //获取 单位 数据
this.http.get('/api/SitePlans',{params:this.params}).subscribe(data=>{
this.sitePlanData = data
@@ -1431,7 +1428,7 @@ export class CollectionToolsPlanComponent implements OnInit {
this.canvasData.selectStorey = this.sitePlanData[0] || {} //服务中 存一份数据
this.selectSitePlanIndex = 0
- Promise.all([fireData,planData]).then((res)=>{
+ Promise.all([planData]).then((res)=>{
this.getSitePlanStorey(this.selectingSitePlan) //获取 平面图 楼层数据
})
@@ -1441,7 +1438,7 @@ export class CollectionToolsPlanComponent implements OnInit {
//获取建筑 楼层/区域
getBuildingSitePlan (item) {
let params = { buildingId: item.id }
- let fireData = this.getFireElements(item.buildingTypes[0].id || '') //获取建筑下 消防要素
+ // let fireData = this.getFireElements(item.buildingTypes[0].id || '') //获取建筑下 消防要素
let planData = this.getBuildingData(params) //获取 建筑 数据
this.http.get('/api/BuildingAreas',{params}).subscribe(data=>{
this.sitePlanData = data
@@ -1449,7 +1446,7 @@ export class CollectionToolsPlanComponent implements OnInit {
this.canvasData.selectStorey = this.sitePlanData[0] || {} //服务中 存一份数据
this.selectSitePlanIndex = 0
- Promise.all([fireData,planData]).then((res)=>{
+ Promise.all([planData]).then((res)=>{
this.getBuildingStorey(this.selectingSitePlan) //获取 建筑 楼层数据
})
diff --git a/src/app/ui/collection-tools-plan/leftFunctionalDomain.ts b/src/app/ui/collection-tools-plan/leftFunctionalDomain.ts
index 598e178..b010e94 100644
--- a/src/app/ui/collection-tools-plan/leftFunctionalDomain.ts
+++ b/src/app/ui/collection-tools-plan/leftFunctionalDomain.ts
@@ -23,36 +23,75 @@ export class leftFunctionalDomainComponentPlan implements OnInit {
params = {companyId: sessionStorage.getItem('companyId')}
checked:boolean = false;//是否为避难层
-
+ file:any = null; //上传的文件
+
+ //选择文件
+ selectFile (e) {
+ if (e.target.files.length) {
+ let maxSize = 5*1024*1024
+ if (e.target.files[0].size <= maxSize) {
+ this.file = e.target.files[0]
+ } else {
+ const config = new MatSnackBarConfig();
+ config.verticalPosition = 'top';
+ config.duration = 3000
+ this.snackBar.open('上传图片需小于5MB','确定',config);
+ }
+ }
+ }
+
+ //导入GIS
+ toGIS () {
+ const config = new MatSnackBarConfig();
+ config.verticalPosition = 'top';
+ config.duration = 3000
+ this.snackBar.open('功能开发测试中,即将上线','确定',config);
+ }
+
//提交表单创建平面图
onSubmit (e) {
- if (!this.data.isBuilding) { //总平面图 创建平面图
- let data = {
- companyId: sessionStorage.getItem('companyId'),
- name: e.name,
- order: this.data.order,
- area:e.area,
- details:e.details,
- enabled: true,
- modifiedTime: new Date(),
- }
- this.http.post('/api/SitePlans',data).subscribe(data=>{
- this.dialogRef.close('总平面图');
- })
- } else { //建筑 创建楼层/区域
- let data = {
- isRefugeStorey: e.isRefugeStorey,
- buildingId: this.data.Panel.id,
- name: e.name,
- order: this.data.order,
- area:e.area,
- details:e.details,
- enabled: true,
- modifiedTime: new Date(),
- }
- this.http.post('/api/BuildingAreas',data,{params:this.params}).subscribe(data=>{
- this.dialogRef.close('建筑');
- })
+ if (this.file) {
+ let formData = new FormData()
+ formData.append("file",this.file)
+ this.http.post(`/api/Objects/WebPlan2D/${sessionStorage.getItem('companyId')}`,formData).subscribe((data:any)=>{
+ let imgURL = '/api/Objects/WebPlan2D/' + data.objectName
+ console.log(imgURL)
+ if (!this.data.isBuilding) { //总平面图 创建平面图
+ let data = {
+ companyId: sessionStorage.getItem('companyId'),
+ name: e.name,
+ order: this.data.order,
+ area:e.area,
+ details:e.details,
+ enabled: true,
+ modifiedTime: new Date(),
+ imageUrl: imgURL,
+ }
+ this.http.post('/api/SitePlans',data).subscribe(data=>{
+ this.dialogRef.close('总平面图');
+ })
+ } else { //建筑 创建楼层/区域
+ let data = {
+ isRefugeStorey: e.isRefugeStorey,
+ buildingId: this.data.Panel.id,
+ name: e.name,
+ order: this.data.order,
+ area:e.area,
+ details:e.details,
+ enabled: true,
+ modifiedTime: new Date(),
+ imageUrl: imgURL,
+ }
+ this.http.post('/api/BuildingAreas',data,{params:this.params}).subscribe(data=>{
+ this.dialogRef.close('建筑');
+ })
+ }
+ }) //post
+ } else {
+ const config = new MatSnackBarConfig();
+ config.verticalPosition = 'top';
+ config.duration = 3000
+ this.snackBar.open('请上传图片','确定',config);
}
}
diff --git a/src/app/ui/collection-tools-plan/panel.scss b/src/app/ui/collection-tools-plan/panel.scss
index f0ae073..11200e8 100644
--- a/src/app/ui/collection-tools-plan/panel.scss
+++ b/src/app/ui/collection-tools-plan/panel.scss
@@ -268,9 +268,34 @@
.keyMargin {
width: 100%;
margin: 5px 0;
+ text-align: center;
.mat-form-field {
width: 100%;
}
+ //上传CAD弹窗 inputfile
+ .uploadBackGround {
+ width: 80%;
+ padding: 0 25px;
+ height: 30px;
+ line-height: 30px;
+ position: relative;
+ cursor: pointer;
+ color: #000;
+ font-size: 14px;
+ background: #fafafa;
+ border: 1px solid #ddd;
+ border-radius: 5px;
+ overflow: hidden;
+ display: inline-block;
+ }
+ .uploadBackGround input {
+ position: absolute;
+ width: 100%;
+ right: 0;
+ top: 0;
+ opacity: 0;
+ cursor: pointer
+ }
}
.submitBottom {
display: flex;
diff --git a/src/app/ui/collection-tools/collection-tools.component.html b/src/app/ui/collection-tools/collection-tools.component.html
index dfc085f..b6a073f 100644
--- a/src/app/ui/collection-tools/collection-tools.component.html
+++ b/src/app/ui/collection-tools/collection-tools.component.html
@@ -2,21 +2,21 @@
-
-
- 节点详情
-
-
- 注意事项
-
-
-
-
-
-
-
+
基本信息名称visibility
想定作业名称visibility
-
+
-
-
+
diff --git a/src/app/ui/collection-tools/collection-tools.component.scss b/src/app/ui/collection-tools/collection-tools.component.scss
index f01a7b7..9f00105 100644
--- a/src/app/ui/collection-tools/collection-tools.component.scss
+++ b/src/app/ui/collection-tools/collection-tools.component.scss
@@ -59,6 +59,12 @@
color: white;
}
}
+ .rightSave {
+ cursor: pointer;
+ position: absolute;
+ right: 60px;
+ label { vertical-align: middle; color: #279FFF; }
+ }
}
//头部操作栏
diff --git a/src/app/ui/collection-tools/collection-tools.component.ts b/src/app/ui/collection-tools/collection-tools.component.ts
index c9da111..e3ce60c 100644
--- a/src/app/ui/collection-tools/collection-tools.component.ts
+++ b/src/app/ui/collection-tools/collection-tools.component.ts
@@ -1025,12 +1025,7 @@ export class CollectionToolsComponent implements OnInit {
disasterId: this.allFirePlan[0].id || ''
}
});
-
- dialogRef.afterClosed().subscribe(result => {
- // console.log('The dialog was closed');
- });
- }
-
+ } //else
} else { //if
const config = new MatSnackBarConfig();
config.verticalPosition = 'top';
@@ -1276,7 +1271,6 @@ export class CollectionToolsComponent implements OnInit {
//点击数节点的显示隐藏icon
clickLookItem(node){
-
//修改真实素材islook属性
for(let key in this.storeyData.data){
if(key == node.id){
@@ -1563,7 +1557,7 @@ export class CollectionToolsComponent implements OnInit {
selectSitePlan (item,index) {
if (this.selectSitePlanIndex != index) {
this.canvasData.selectPanelPoint = new DisposalNodeData();
- if (this.canvasData.isChange) { //true 数据被改动
+ if (this.pattern && this.canvasData.isChange) { //true 数据被改动
let isTrue = confirm('是否保存当前编辑数据')
if (isTrue) { //先保存数据 在切换
let isSuccess = this.saveSite()//true的时候 先保存数据
@@ -2136,9 +2130,13 @@ export class CollectionToolsComponent implements OnInit {
let dialogRef = this.dialog.open(addBGCDisposalNodeComponent);
dialogRef.afterClosed().subscribe(data=>{
if (data) {
- this.canvasData.customizeDisposalNode = data
+ this.canvasData.customizeDisposalNode = data //自定义数据节点
let imgURL = window.URL.createObjectURL(data.file) //将图片生成 url地址
- console.log(imgURL,this.canvasData.customizeDisposalNode)
+ this.canvasData.selectPanelPointBaseData = {description: '', notes: '', weather: '', airTemperature: '', windDirection: '', windScale: ''} //更新 当前数据节点对应父级节点
+ this.selectDisposalNode = ''
+ this.canvasData.selectPanelPoint = new DisposalNodeData() //更新 当前数据节点
+ this.canvasData.selectPanelPoint.BackgroundImageUrl = imgURL
+ this.customizeNodes()
}
})
}
@@ -2235,16 +2233,46 @@ export class CollectionToolsComponent implements OnInit {
buildingIndex: e.sitePlanId? -1 : this.allBuildings.findIndex(item=>{ return item.id===e.buildingId }), //总平面图/建筑 index
storeyId: e.sitePlanId? e.sitePlanId : e.buildingAreaId, //楼层id
}
- this.http.get('/api/DisposalNodeData',{params:params}).subscribe(data=>{
+ this.http.get('/api/DisposalNodeData',{params:params}).subscribe((data:any)=>{
this.canvasData.selectPanelPoint = this.canvasData.deserialize(JSON.stringify(data || new DisposalNodeData())) //选择 当前 节点
this.canvasData.selectPanelPoint.Data = this.canvasData.deserialize(this.canvasData.selectPanelPoint.Data)
- this.seekPanelPoint(parameter)
+ data.backgroundImageUrl? this.customizeNodes() : this.seekPanelPoint(parameter)
})
} //if
} //else if
}
+ //自定义数据节点 时
+ async customizeNodes() {
+ await this.canvas.loadNoRelevantInformationDisposalPlan(this.canvasData.selectPanelPoint)
+ let other = {
+ children: [],
+ computed: true,
+ id: '',
+ name: '其他',
+ order: 999,
+ parentId: null,
+ tag: "INPUT",
+ isLookPattern : true
+ }
+ this.allFireElements = [other]
+ this.canvas.setNameVisible(this.basicInfo,0)
+ this.canvas.setNameVisible(this.wantToWork,1)
+ this.beforeOneCheckedBuildingIsShow = false
+
+ let selectPanelPoint = JSON.parse(JSON.stringify(this.canvasData.selectPanelPoint || {} )) //当前 节点 数据
+ if(selectPanelPoint.Data){
+ for(let key in selectPanelPoint.Data.Stock){ //筛选数据 没有匹配全部放入到 其他 数组
+ let noMatch = this.allFireElements.find( every=> every.id===selectPanelPoint.Data.Stock[key].FireElementId )
+ if (!noMatch) {
+ this.allFireElements[this.allFireElements.length-1].children.push(selectPanelPoint.Data.Stock[key])
+ }
+ }
+ }
+ this.handleTreeData({data:{}},selectPanelPoint) //处理tree数据结构
+ }
+
//查找 数据节点 对应 建筑/楼层
seekPanelPoint (paramsData) {
this.checkedBuildingIndex = paramsData.buildingIndex
diff --git a/src/app/ui/collection-tools/leftFunctionalDomain.ts b/src/app/ui/collection-tools/leftFunctionalDomain.ts
index 3deb432..9703cd8 100644
--- a/src/app/ui/collection-tools/leftFunctionalDomain.ts
+++ b/src/app/ui/collection-tools/leftFunctionalDomain.ts
@@ -144,7 +144,7 @@ export class addBGCDisposalNodeComponent implements OnInit {
file:any = null; //文件
//上传图片
selectFile (e) {
- if (e.target.files.length ) {
+ if (e.target.files.length) {
let maxSize = 5*1024*1024
if (e.target.files[0].size <= maxSize) {
this.file = e.target.files[0]
diff --git a/src/app/ui/collection-tools/save.ts b/src/app/ui/collection-tools/save.ts
index 1657b66..4be3e0b 100644
--- a/src/app/ui/collection-tools/save.ts
+++ b/src/app/ui/collection-tools/save.ts
@@ -92,7 +92,6 @@ export class saveOneDialog {
nodeItem
itemChildNum = 0 //点击处置节点子数据节点的数量
clickNode(item){
- // console.log(item)
this.nodeItem = item
this.allDisposalNodeChild.forEach(item => {
if(item.id == this.nodeItem.id){
@@ -105,8 +104,17 @@ export class saveOneDialog {
selectedSiteData = this.data.selectedSiteData
onSubmit(value,type){
this.maskLayerService.sendMessage(true)
-
- let name = this.selectedBuildingData.name + '-' + this.selectedSiteData.name
+ let name
+ if (this.canvasData.selectPanelPoint.BackgroundImageUrl) { //当前 为自定义处置节点
+ if (this.canvasData.selectPanelPoint.DisposalNodeId) { // 保存逻辑
+ let node = this.canvasData.findDisposalNode(this.canvasData.selectPanelPoint.DisposalNodeId,null)
+ node? name = node.name : null
+ } else { //新建逻辑
+ name = this.canvasData.customizeDisposalNode.name
+ }
+ } else {
+ name = this.selectedBuildingData.name + '-' + this.selectedSiteData.name
+ }
//如果保存到已有节点
var postdata = {
id: "",
@@ -138,8 +146,7 @@ export class saveOneDialog {
putdata.windDirection = Number(this.canvasData.selectPanelPointBaseData.windDirection)
putdata.description = this.canvasData.selectPanelPointBaseData.description
putdata.notes = this.canvasData.selectPanelPointBaseData.notes
-
-
+
if(istrue){//如果该处置节点下已有同名数据节点 则只修改 2个接口
new Promise((resolve,reject)=>{
this.http.put(`/api/DisposalNodes/${value.nodeId}`,putdata).subscribe(data => {
@@ -150,21 +157,30 @@ export class saveOneDialog {
// 保存平面图数据到当前节点
let postdata =JSON.parse(JSON.stringify(this.canvasData.selectPanelPoint))
postdata.Data = JSON.stringify(postdata.Data)
- this.http.post(`/api/DisposalNodeData`,postdata).subscribe(data => {
- this.maskLayerService.sendMessage(false)
- const config = new MatSnackBarConfig();
- config.verticalPosition = 'top';
- config.duration = 3000
- this.snackBar.open('保存成功','确定',config)
- },err=>{
- this.maskLayerService.sendMessage(false)
- const config = new MatSnackBarConfig();
- config.verticalPosition = 'top';
- config.duration = 3000
- this.snackBar.open('保存失败','确定',config)
- })
- this.dialogRef.close();
- this.canvasData.sendMessage('send a message');//发布一条消息
+ postdata.Version = "2.0"
+ postdata.DisposalNodeId ? null : postdata.DisposalNodeId = istrue.id
+ postdata.PlanComponentId ? null : postdata.PlanComponentId = sessionStorage.getItem("planId")
+ postdata.Id ? null : postdata.Id = ''
+ postdata.BackgroundImageUrl? null : postdata.BackgroundImageUrl = null
+ let imgURL = this.uploadBGC() //更新 背景图
+ imgURL.then(url=>{
+ url? postdata.BackgroundImageUrl = url.toString() : null
+ this.http.post(`/api/DisposalNodeData`,postdata).subscribe(data => {
+ this.maskLayerService.sendMessage(false)
+ const config = new MatSnackBarConfig();
+ config.verticalPosition = 'top';
+ config.duration = 3000
+ this.snackBar.open('保存成功','确定',config)
+ },err=>{
+ this.maskLayerService.sendMessage(false)
+ const config = new MatSnackBarConfig();
+ config.verticalPosition = 'top';
+ config.duration = 3000
+ this.snackBar.open('保存失败','确定',config)
+ })
+ this.dialogRef.close();
+ this.canvasData.sendMessage('send a message');//发布一条消息
+ }) //imgURL
})
}else{//需要3个接口
@@ -186,22 +202,27 @@ export class saveOneDialog {
version: this.canvasData.selectPanelPoint.Version || "2.0",
disposalNodeId: data.id,
planComponentId: sessionStorage.getItem("planId"),
+ backgroundImageUrl: this.canvasData.selectPanelPoint.BackgroundImageUrl,
}
- this.http.post(`/api/DisposalNodeData`,objData).subscribe(data => {
- this.maskLayerService.sendMessage(false)
- const config = new MatSnackBarConfig();
- config.verticalPosition = 'top';
- config.duration = 3000
- this.snackBar.open('保存成功','确定',config)
- },err=>{
- this.maskLayerService.sendMessage(false)
- const config = new MatSnackBarConfig();
- config.verticalPosition = 'top';
- config.duration = 3000
- this.snackBar.open('保存失败','确定',config)
- })
- this.dialogRef.close();
- this.canvasData.sendMessage('send a message');//发布一条消息
+ let imgURL = this.uploadBGC() //更新 背景图
+ imgURL.then(url=>{
+ url? objData.backgroundImageUrl = url.toString() : null
+ this.http.post(`/api/DisposalNodeData`,objData).subscribe(data => {
+ this.maskLayerService.sendMessage(false)
+ const config = new MatSnackBarConfig();
+ config.verticalPosition = 'top';
+ config.duration = 3000
+ this.snackBar.open('保存成功','确定',config)
+ },err=>{
+ this.maskLayerService.sendMessage(false)
+ const config = new MatSnackBarConfig();
+ config.verticalPosition = 'top';
+ config.duration = 3000
+ this.snackBar.open('保存失败','确定',config)
+ })
+ this.dialogRef.close();
+ this.canvasData.sendMessage('send a message');//发布一条消息
+ }) //imgURL
})
})
}
@@ -280,26 +301,48 @@ export class saveOneDialog {
version: this.canvasData.selectPanelPoint.Version || "2.0",
disposalNodeId: data.id,
planComponentId: sessionStorage.getItem("planId"),
+ backgroundImageUrl: this.canvasData.selectPanelPoint.BackgroundImageUrl,
}
-
- this.http.post(`/api/DisposalNodeData`,objData).subscribe(data => {
- this.maskLayerService.sendMessage(false)
- const config = new MatSnackBarConfig();
- config.verticalPosition = 'top';
- config.duration = 3000
- this.snackBar.open('保存成功','确定',config)
-
- },err=>{
- this.maskLayerService.sendMessage(false)
- const config = new MatSnackBarConfig();
- config.verticalPosition = 'top';
- config.duration = 3000
- this.snackBar.open('保存失败','确定',config)
- })
- this.dialogRef.close();
- this.canvasData.sendMessage("send a message")
+ let imgURL = this.uploadBGC() //更新 背景图
+ imgURL.then(url=>{
+ url? objData.backgroundImageUrl = url.toString() : null
+ this.http.post(`/api/DisposalNodeData`,objData).subscribe(data => {
+ this.maskLayerService.sendMessage(false)
+ const config = new MatSnackBarConfig();
+ config.verticalPosition = 'top';
+ config.duration = 3000
+ this.snackBar.open('保存成功','确定',config)
+
+ },err=>{
+ this.maskLayerService.sendMessage(false)
+ const config = new MatSnackBarConfig();
+ config.verticalPosition = 'top';
+ config.duration = 3000
+ this.snackBar.open('保存失败','确定',config)
+ })
+ this.dialogRef.close();
+ this.canvasData.sendMessage("send a message")
+ }) //imgURL
})
})
}
}
+
+ //封装方法 上传 自定义底图
+ uploadBGC () {
+ return new Promise((resolve,reject)=>{
+ if (this.canvasData.selectPanelPoint.BackgroundImageUrl && !this.canvasData.selectPanelPoint.DisposalNodeId) { //新建逻辑
+ if (this.canvasData.customizeDisposalNode) {
+ let formData = new FormData()
+ formData.append("file",this.canvasData.customizeDisposalNode.file)
+ this.http.post(`/api/Objects/WebPlan2D/${sessionStorage.getItem('companyId')}/DisposalNode`,formData).subscribe((data:any)=>{
+ resolve('/api/Objects/WebPlan2D/' + data.objectName)
+ })
+ }
+ } else {
+ resolve(null)
+ } //else
+ })
+ }
+
}
\ No newline at end of file
diff --git a/src/app/ui/ui.module.ts b/src/app/ui/ui.module.ts
index d1129ac..81265f8 100644
--- a/src/app/ui/ui.module.ts
+++ b/src/app/ui/ui.module.ts
@@ -96,8 +96,11 @@ 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';
+import {CollectionToolsBuildingComponent,CreateBuildingBuilding,EditBuildingBuilding,ViewDetailsBuilding} from './collection-tools-building/collection-tools.component'
+import {leftFunctionalDomainBuildingComponent,editPlaneFigureBuildingComponent,addDisposalNodeBuildingComponent,editDisposalNodeBuildingComponent} from './collection-tools-building/leftFunctionalDomain'
+import {saveOneDialogBuilding,saveTwoDialogBuilding} from './collection-tools-building/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,CollectionToolsPlanComponent,CreateBuildingPlan,EditBuildingPlan,ViewDetailsPlan,leftFunctionalDomainComponentPlan,editPlaneFigureComponentPlan,addDisposalNodeComponentPlan,editDisposalNodeComponentPlan,saveOneDialogPlan,saveTwoDialogPlan,addOffices,editOffices,addBGCDisposalNodeComponent],
+ 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,addOffices,editOffices,addBGCDisposalNodeComponent,CollectionToolsBuildingComponent,CreateBuildingBuilding,EditBuildingBuilding,ViewDetailsBuilding,leftFunctionalDomainBuildingComponent,editPlaneFigureBuildingComponent,addDisposalNodeBuildingComponent,editDisposalNodeBuildingComponent,saveOneDialogBuilding,saveTwoDialogBuilding],
imports: [
CommonModule,
@@ -155,6 +158,7 @@ import { saveOneDialogPlan, saveTwoDialogPlan } from './collection-tools-plan/sa
exports:[
FooterComponent,
CollectionToolsComponent,
+ CollectionToolsBuildingComponent,
CollectionToolsPlanComponent
]
})