From 06c5736947d0efb1ca8984320120cf14b65a9276 Mon Sep 17 00:00:00 2001 From: SHAOJIAHAO <55341701@qq.com> Date: Sat, 29 May 2021 15:57:58 +0800 Subject: [PATCH] =?UTF-8?q?[=E6=96=B0=E5=A2=9E]=E9=BB=98=E8=AE=A4=E5=AF=86?= =?UTF-8?q?=E7=A0=81=E8=BF=9B=E5=85=A5=E5=90=8E=E6=8F=90=E7=A4=BA=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E5=AF=86=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/app/interface.ts | 3 +- src/app/pages/login/changePassword.html | 48 +++++++ src/app/pages/login/changePassword.scss | 15 +++ src/app/pages/login/login.component.ts | 65 ++++++++- src/app/pages/pages.module.ts | 8 +- .../changepassword.component.html | 22 ++- .../collection-tools.component.ts | 11 +- src/app/ui/ui.module.ts | 125 +++++++++--------- 8 files changed, 210 insertions(+), 87 deletions(-) create mode 100644 src/app/pages/login/changePassword.html create mode 100644 src/app/pages/login/changePassword.scss diff --git a/src/app/interface.ts b/src/app/interface.ts index 5b7d6e3..74abb85 100644 --- a/src/app/interface.ts +++ b/src/app/interface.ts @@ -11,7 +11,8 @@ export interface Data { refreshToken:string, expires: number, realName:string, - level:any + level:any, + isDefaultPassword:string } export interface windows { diff --git a/src/app/pages/login/changePassword.html b/src/app/pages/login/changePassword.html new file mode 100644 index 0000000..a02921a --- /dev/null +++ b/src/app/pages/login/changePassword.html @@ -0,0 +1,48 @@ +
+ 修改密码 +
+
+ +
+ + + + 新密码 + + + +
+
密码格式为8-20位,大小写字母+数字+特殊字符
+
+ + 确认新密码 + + + +
+
密码输入不一致！
+
+
+ {{errmsg}} +
+ +
+ + +
+ +
+
\ No newline at end of file diff --git a/src/app/pages/login/changePassword.scss b/src/app/pages/login/changePassword.scss new file mode 100644 index 0000000..1cc8052 --- /dev/null +++ b/src/app/pages/login/changePassword.scss @@ -0,0 +1,15 @@ +.passwordCard { + width: 300px; + height: 100%; +} +.mat-form-field { + display: block; + width: 300px; +} +.group-error-content { + font-size: 12px; + color: red; +} +.mat-dialog-content { + overflow: visible +} diff --git a/src/app/pages/login/login.component.ts b/src/app/pages/login/login.component.ts index e0e4405..160b076 100644 --- a/src/app/pages/login/login.component.ts +++ b/src/app/pages/login/login.component.ts @@ -3,7 +3,8 @@ import { HttpClient } from '@angular/common/http' import { Data } from '../../interface' import { Router,ActivatedRoute } from '@angular/router' import {CacheTokenService} from '../../http-interceptors/cache-token.service'//引入服务 -import { MatSnackBar } from '@angular/material/snack-bar'; +import { MatSnackBar,MatSnackBarConfig } from '@angular/material/snack-bar'; +import { MatDialog,MatDialogRef } from '@angular/material/dialog'; @Component({ selector: 'app-login', @@ -12,7 +13,7 @@ import { MatSnackBar } from '@angular/material/snack-bar'; }) export class LoginComponent implements OnInit { - constructor(private http:HttpClient,private router:Router,private route:ActivatedRoute,public token:CacheTokenService,public snackBar: MatSnackBar) { } + constructor(private http:HttpClient,private router:Router,private route:ActivatedRoute,public token:CacheTokenService,public snackBar: MatSnackBar, public dialog: MatDialog) { } ngOnInit() { this.automaticLogin() @@ -27,19 +28,25 @@ export class LoginComponent implements OnInit { sessionStorage.setItem("level",data.level); sessionStorage.setItem("token",data.token); sessionStorage.setItem("refreshToken",data.refreshToken); + sessionStorage.setItem("isDefaultPassword",data.isDefaultPassword);//是否需要修改默认密码 this.http.get('/api/Account/NavMenus').subscribe((data:any)=>{ - let isHave = data.find(item=>{ return item.url == "/statisticanalysis/home"}) let isHaveGis = data.find(item=>{ return item.url == "/gis"}) if (isHave) { this.router.navigate([`/statisticanalysis/home`]) + this.dialogChangePassword() + return } else if(isHaveGis){ this.router.navigate([`/gis`]) + this.dialogChangePassword() + return } else if(data.length != 0){ + this.router.navigate([`/keyUnit`]) + this.dialogChangePassword() + return data.forEach(item => { if(item.url){ - this.router.navigate([`/keyUnit`]) - return + } }); }else{ @@ -60,6 +67,17 @@ export class LoginComponent implements OnInit { ) } + + dialogChangePassword(){ + if(sessionStorage.getItem('isDefaultPassword') == 'true'){ + let dialogRef = this.dialog.open(ChangepasswordComponent2, + {width:'348px'}); + + dialogRef.afterClosed().subscribe((data)=>{ + sessionStorage.setItem('isDefaultPassword','false') + }); + } + } //7天免登录自动登录 automaticLogin () { let isNoLogin = localStorage.getItem("isnologin") @@ -90,3 +108,40 @@ export class LoginComponent implements OnInit { } + +@Component({ + selector: 'app-changepassword', + templateUrl: './changePassword.html', + styleUrls: ['./changepassword.scss'] +}) + +export class ChangepasswordComponent2 implements OnInit { + + constructor(private http:HttpClient,public snackBar: MatSnackBar, + public dialogRef: MatDialogRef) { } + + ngOnInit() { + } + errmsg :string = '' + + onSubmit(e){ + this.http.put( + '/api/Account/Password', + { + newPassword: e.newPassword, + password: 'SHya119!@' + } + ).subscribe(data=> { + this.dialogRef.close(data); + const config = new MatSnackBarConfig(); + config.verticalPosition = 'top'; + config.duration = 3000 + this.snackBar.open('密码修改成功','确定',config); + },(err) => + {this.errmsg = err} + ) + } + + + +} \ No newline at end of file diff --git a/src/app/pages/pages.module.ts b/src/app/pages/pages.module.ts index 9063210..aca91df 100644 --- a/src/app/pages/pages.module.ts +++ b/src/app/pages/pages.module.ts @@ -1,7 +1,7 @@ import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; import { PagesComponent } from './pages.component'; -import { LoginComponent } from './login/login.component'; +import { ChangepasswordComponent2, LoginComponent } from './login/login.component'; import { RegisterComponent } from './register/register.component'; import { PagesRoutingModule } from './pages-routing.module' @@ -52,8 +52,9 @@ import { RouterModule } from '@angular/router'; import { LockscreenComponent } from './lockscreen/lockscreen.component'; import { HomeComponent } from './home/home.component'; import { HomedetailComponent } from './homedetail/homedetail.component'; +import { UiModule } from '../ui/ui.module'; @NgModule({ - declarations: [PagesComponent, LoginComponent, RegisterComponent, LockscreenComponent, HomeComponent, HomedetailComponent], + declarations: [PagesComponent, LoginComponent, RegisterComponent, LockscreenComponent, HomeComponent, HomedetailComponent,ChangepasswordComponent2], imports: [ PagesRoutingModule, @@ -105,8 +106,9 @@ import { HomedetailComponent } from './homedetail/homedetail.component'; FormsModule, ReactiveFormsModule, - RouterModule + RouterModule, // PagesRoutingModule, + UiModule ] }) export class PagesModule { } diff --git a/src/app/ui/changepassword/changepassword.component.html b/src/app/ui/changepassword/changepassword.component.html index a2ebef3..1217de8 100644 --- a/src/app/ui/changepassword/changepassword.component.html +++ b/src/app/ui/changepassword/changepassword.component.html @@ -7,27 +7,24 @@ 原密码 - + 新密码 - +
-
密码格式8-20位,字母+数字
+
密码格式为8-20位,大小写字母+数字+特殊字符
确认新密码 - +
密码输入不一致！
@@ -37,8 +34,7 @@
- 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 f3eb3d3..7a2088c 100644 --- a/src/app/ui/collection-tools-plan/collection-tools.component.ts +++ b/src/app/ui/collection-tools-plan/collection-tools.component.ts @@ -86,7 +86,7 @@ export class CollectionToolsPlanComponent implements OnInit { gallery//viewerJs实例 //设置属性框 setAssetsProperty(obj) { - console.log(obj) + console.log('传进来的属性信息',obj) //初始化viewerJs实例 setTimeout(() => { obj.PropertyInfos.forEach(item => { @@ -2017,7 +2017,8 @@ export class CollectionToolsPlanComponent implements OnInit { this.clickId = e.target.id for (let index = 0; index < this.planData.length; index++) { const item = this.planData[index]; - if (item.id == e.target.id) { + if (item.Id == e.target.id) { + this.setAssetsProperty(item) return } @@ -2028,7 +2029,7 @@ export class CollectionToolsPlanComponent implements OnInit { this.clickId = e.target.id for (let index = 0; index < this.planData.length; index++) { const item = this.planData[index]; - if (item.id == e.target.id) { + if (item.Id == e.target.id) { //修改最终坐标数据 item.point = { x: e.lnglat.lng, y: e.lnglat.lat } return @@ -2040,6 +2041,10 @@ export class CollectionToolsPlanComponent implements OnInit { let itemData = JSON.parse(JSON.stringify(this.selectImage)) itemData.id = id itemData.point = { x: e.lnglat.lng, y: e.lnglat.lat } + console.log(987,this.canvasData.deserialize(JSON.stringify(itemData))) + // console.log('originalcompanyBuildingData',this.canvasData.originalcompanyBuildingData) + // console.log('originaleveryStoreyData',this.canvasData.originaleveryStoreyData) + itemData = this.canvasData.deserialize(JSON.stringify(itemData))//反序列化为大写 this.planData.push(itemData) //将marker点添加 this.planDataMarkers.push(startMarker) diff --git a/src/app/ui/ui.module.ts b/src/app/ui/ui.module.ts index 8a165ed..d1bbed9 100644 --- a/src/app/ui/ui.module.ts +++ b/src/app/ui/ui.module.ts @@ -2,47 +2,47 @@ import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; import { UiComponent } from './ui.component'; import { UiRoutingModule } from './ui-routing.module'; -import {A11yModule} from '@angular/cdk/a11y'; -import {DragDropModule} from '@angular/cdk/drag-drop'; -import {PortalModule} from '@angular/cdk/portal'; -import {ScrollingModule} from '@angular/cdk/scrolling'; -import {CdkStepperModule} from '@angular/cdk/stepper'; -import {CdkTableModule} from '@angular/cdk/table'; -import {CdkTreeModule} from '@angular/cdk/tree'; -import {MatAutocompleteModule} from '@angular/material/autocomplete'; -import {MatBadgeModule} from '@angular/material/badge'; -import {MatBottomSheetModule} from '@angular/material/bottom-sheet'; -import {MatButtonModule} from '@angular/material/button'; -import {MatButtonToggleModule} from '@angular/material/button-toggle'; -import {MatCardModule} from '@angular/material/card'; -import {MatCheckboxModule} from '@angular/material/checkbox'; -import {MatChipsModule} from '@angular/material/chips'; -import {MatStepperModule} from '@angular/material/stepper'; -import {MatDatepickerModule} from '@angular/material/datepicker'; -import {MatDialogModule} from '@angular/material/dialog'; -import {MatDividerModule} from '@angular/material/divider'; -import {MatExpansionModule} from '@angular/material/expansion'; -import {MatGridListModule} from '@angular/material/grid-list'; -import {MatIconModule} from '@angular/material/icon'; -import {MatInputModule} from '@angular/material/input'; -import {MatListModule} from '@angular/material/list'; -import {MatMenuModule} from '@angular/material/menu'; -import {MatNativeDateModule, MatRippleModule, MatOption} from '@angular/material/core'; -import {MatPaginatorModule} from '@angular/material/paginator'; -import {MatProgressBarModule} from '@angular/material/progress-bar'; -import {MatProgressSpinnerModule} from '@angular/material/progress-spinner'; -import {MatRadioModule} from '@angular/material/radio'; -import {MatSelectModule} from '@angular/material/select'; -import {MatSidenavModule} from '@angular/material/sidenav'; -import {MatSliderModule} from '@angular/material/slider'; -import {MatSlideToggleModule} from '@angular/material/slide-toggle'; -import {MatSnackBarModule} from '@angular/material/snack-bar'; -import {MatSortModule} from '@angular/material/sort'; -import {MatTableModule} from '@angular/material/table'; -import {MatTabsModule} from '@angular/material/tabs'; -import {MatToolbarModule} from '@angular/material/toolbar'; -import {MatTooltipModule} from '@angular/material/tooltip'; -import {MatTreeModule} from '@angular/material/tree'; +import { A11yModule } from '@angular/cdk/a11y'; +import { DragDropModule } from '@angular/cdk/drag-drop'; +import { PortalModule } from '@angular/cdk/portal'; +import { ScrollingModule } from '@angular/cdk/scrolling'; +import { CdkStepperModule } from '@angular/cdk/stepper'; +import { CdkTableModule } from '@angular/cdk/table'; +import { CdkTreeModule } from '@angular/cdk/tree'; +import { MatAutocompleteModule } from '@angular/material/autocomplete'; +import { MatBadgeModule } from '@angular/material/badge'; +import { MatBottomSheetModule } from '@angular/material/bottom-sheet'; +import { MatButtonModule } from '@angular/material/button'; +import { MatButtonToggleModule } from '@angular/material/button-toggle'; +import { MatCardModule } from '@angular/material/card'; +import { MatCheckboxModule } from '@angular/material/checkbox'; +import { MatChipsModule } from '@angular/material/chips'; +import { MatStepperModule } from '@angular/material/stepper'; +import { MatDatepickerModule } from '@angular/material/datepicker'; +import { MatDialogModule } from '@angular/material/dialog'; +import { MatDividerModule } from '@angular/material/divider'; +import { MatExpansionModule } from '@angular/material/expansion'; +import { MatGridListModule } from '@angular/material/grid-list'; +import { MatIconModule } from '@angular/material/icon'; +import { MatInputModule } from '@angular/material/input'; +import { MatListModule } from '@angular/material/list'; +import { MatMenuModule } from '@angular/material/menu'; +import { MatNativeDateModule, MatRippleModule, MatOption } from '@angular/material/core'; +import { MatPaginatorModule } from '@angular/material/paginator'; +import { MatProgressBarModule } from '@angular/material/progress-bar'; +import { MatProgressSpinnerModule } from '@angular/material/progress-spinner'; +import { MatRadioModule } from '@angular/material/radio'; +import { MatSelectModule } from '@angular/material/select'; +import { MatSidenavModule } from '@angular/material/sidenav'; +import { MatSliderModule } from '@angular/material/slider'; +import { MatSlideToggleModule } from '@angular/material/slide-toggle'; +import { MatSnackBarModule } from '@angular/material/snack-bar'; +import { MatSortModule } from '@angular/material/sort'; +import { MatTableModule } from '@angular/material/table'; +import { MatTabsModule } from '@angular/material/tabs'; +import { MatToolbarModule } from '@angular/material/toolbar'; +import { MatTooltipModule } from '@angular/material/tooltip'; +import { MatTreeModule } from '@angular/material/tree'; import { ReactiveFormsModule, FormsModule } from '@angular/forms'; import { MatFormFieldModule } from '@angular/material/form-field'; import { MatPaginatorIntl } from '@angular/material/paginator'; @@ -50,18 +50,18 @@ import { PaginatorModule } from './paginator/paginator.module'; import { UserdataComponent, EditUser } from './userdata/userdata.component'; import { ChangepasswordComponent } from './changepassword/changepassword.component'; import { OrganizationComponent, CreateOrganization, EditOrganization, addOffices, editOffices } from './organization/organization.component'; -import { UnittypeComponent,DialogOverviewExampleDialog,editorialUnit } from './unittype/unittype.component'; +import { UnittypeComponent, DialogOverviewExampleDialog, editorialUnit } from './unittype/unittype.component'; import { AuthorityComponent, CreateAuthority } from './authority/authority.component'; import { RoleComponent, CreateRole, EditRole } from './role/role.component'; -import { UsermanagementComponent,CreateNewUser,EditNewUser,allRoles,seeInformation } from './usermanagement/usermanagement.component'; +import { UsermanagementComponent, CreateNewUser, EditNewUser, allRoles, seeInformation } from './usermanagement/usermanagement.component'; import { IsnoPipe } from '../pipes/boolean.pipe'; -import {ConfirmpswDirective} from './changepassword/equal-validator.directive' +import { ConfirmpswDirective } from './changepassword/equal-validator.directive' import { TimePipe } from '../pipes/time.pipe'; import { NavmenusComponent, CreateMenus, EditMenus } from './navmenus/navmenus.component'; import { FireProtectionElementsComponent, Establish, EditingFireControl } from './fire-protection-elements/fire-protection-elements.component'; import { FireFightingTemplateComponent, NewFireFighting, EditFireClassification } from './fire-fighting-template/fire-fighting-template.component'; -import { MaterialBankComponent,attributeComponent,addAttributeComponent,editAttribute } from './material-bank/material-bank.component'; -import { UnitInformationComponent,addUnitAttributeComponent,editUnitAttribute } from './unit-information/unit-information.component'; +import { MaterialBankComponent, attributeComponent, addAttributeComponent, editAttribute } from './material-bank/material-bank.component'; +import { UnitInformationComponent, addUnitAttributeComponent, editUnitAttribute } from './unit-information/unit-information.component'; import { AddMatLibrary } from './material-bank/addmatlibrary.component'; import { EditMatLibrary } from './material-bank/editmatlibrary.component'; import { AddOriginalCopy } from './material-bank/addoriginalcopy.component'; @@ -73,17 +73,17 @@ import { EditUnitInfo } from './unit-information/editunitinfo.component'; import { AddUnitInfo } from './unit-information/addunitinfo.component'; import { AddGroups } from './unit-information/addgroups.component'; import { EditGroup } from './unit-information/editgroup.component'; -import { EnterpriseuserComponent,seeenterpriseuser,editenterpriseuser } from './enterpriseuser/enterpriseuser.component'; +import { EnterpriseuserComponent, seeenterpriseuser, editenterpriseuser } from './enterpriseuser/enterpriseuser.component'; import { AddEnterpriserUser } from './enterpriseuser/addenterpriseuser.component'; -import { FireFightingFacilitiesFormworkComponent,addFireFightingFacilitiesFormworkComponent,editFireFightingFacilitiesFormworkComponent,addBuiltInComponent,addBuiltInAttributeComponent,addOptionalComponent,addOptionalAttributeComponent,editBuiltInAttributeComponent,editOptionalAttributeComponent } from './fire-fighting-facilities-formwork/fire-fighting-facilities-formwork.component'; +import { FireFightingFacilitiesFormworkComponent, addFireFightingFacilitiesFormworkComponent, editFireFightingFacilitiesFormworkComponent, addBuiltInComponent, addBuiltInAttributeComponent, addOptionalComponent, addOptionalAttributeComponent, editBuiltInAttributeComponent, editOptionalAttributeComponent } from './fire-fighting-facilities-formwork/fire-fighting-facilities-formwork.component'; import { CollectionToolsComponent, CreateBuilding, EditBuilding, Organization } from './collection-tools/collection-tools.component'; import { WorkingAreaComponent } from '../working-area/working-area.component'; -import {leftFunctionalDomainComponent,editPlaneFigureComponent,addDisposalNodeComponent,editDisposalNodeComponent,addBGCDisposalNodeComponent} from './collection-tools/leftFunctionalDomain' +import { leftFunctionalDomainComponent, editPlaneFigureComponent, addDisposalNodeComponent, editDisposalNodeComponent, addBGCDisposalNodeComponent } from './collection-tools/leftFunctionalDomain' import { saveOneDialog, saveTwoDialog } from './collection-tools/save'; import { CollectionToolsPlanComponent, CreateBuildingPlan, EditBuildingPlan } from './collection-tools-plan/collection-tools.component'; import { editPlaneFigureComponentPlan, leftFunctionalDomainComponentPlan } from './collection-tools-plan/leftFunctionalDomain'; -import {CollectionToolsBuildingComponent,CreateBuildingBuilding,EditBuildingBuilding} from './collection-tools-building/collection-tools.component' -import {leftFunctionalDomainBuildingComponent,editPlaneFigureBuildingComponent} from './collection-tools-building/leftFunctionalDomain'; +import { CollectionToolsBuildingComponent, CreateBuildingBuilding, EditBuildingBuilding } from './collection-tools-building/collection-tools.component' +import { leftFunctionalDomainBuildingComponent, editPlaneFigureBuildingComponent } from './collection-tools-building/leftFunctionalDomain'; import { PlanTemplateComponent } from './plan-template/plan-template.component' import { addPlanname } from './plan-template/plan-template.component' import { upPlanname } from './plan-template/plan-template.component' @@ -93,15 +93,15 @@ import { addattinf } from './plan-template/plan-template.component' @NgModule({ declarations: [UiComponent, 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,saveOneDialog,saveTwoDialog,addDisposalNodeComponent,editDisposalNodeComponent,CollectionToolsPlanComponent, - CreateBuildingPlan,EditBuildingPlan,leftFunctionalDomainComponentPlan,editPlaneFigureComponentPlan,addOffices,editOffices,addBGCDisposalNodeComponent,CollectionToolsBuildingComponent,CreateBuildingBuilding, - EditBuildingBuilding,leftFunctionalDomainBuildingComponent,editPlaneFigureBuildingComponent,Organization, PlanTemplateComponent,addPlanname,upPlanname,addGroup,adddwsurvey,addattinf], + 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, saveOneDialog, saveTwoDialog, addDisposalNodeComponent, editDisposalNodeComponent, CollectionToolsPlanComponent, + CreateBuildingPlan, EditBuildingPlan, leftFunctionalDomainComponentPlan, editPlaneFigureComponentPlan, addOffices, editOffices, addBGCDisposalNodeComponent, CollectionToolsBuildingComponent, CreateBuildingBuilding, + EditBuildingBuilding, leftFunctionalDomainBuildingComponent, editPlaneFigureBuildingComponent, Organization, PlanTemplateComponent, addPlanname, upPlanname, addGroup, adddwsurvey, addattinf], imports: [ CommonModule, @@ -156,10 +156,11 @@ import { addattinf } from './plan-template/plan-template.component' ], - exports:[ + exports: [ CollectionToolsComponent, CollectionToolsBuildingComponent, - CollectionToolsPlanComponent + CollectionToolsPlanComponent, + ConfirmpswDirective ] }) export class UiModule { }