shaojiahao
/
ShangHaiYuan-AnXin
2
0
Fork 0
Code Issues 11 Pull Requests Projects Releases Wiki Activity
Browse Source

[新增]默认密码进入后提示修改密码

zhuzhou
邵佳豪 4 years ago
parent
272ca75a94
commit
06c5736947
8 changed files with 210 additions and 87 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 3
      src/app/interface.ts
  2. 48
      src/app/pages/login/changePassword.html
  3. 15
      src/app/pages/login/changePassword.scss
  4. 65
      src/app/pages/login/login.component.ts
  5. 8
      src/app/pages/pages.module.ts
  6. 22
      src/app/ui/changepassword/changepassword.component.html
  7. 11
      src/app/ui/collection-tools-plan/collection-tools.component.ts
  8. 125
      src/app/ui/ui.module.ts

3
src/app/interface.ts
Unescape View File

@ -11,7 +11,8 @@ export interface Data {
refreshToken:string, refreshToken:string,
expires: number, expires: number,
realName:string, realName:string,
level:any level:any,
isDefaultPassword:string
} }
export interface windows { export interface windows {

48
src/app/pages/login/changePassword.html
Unescape View File

@ -0,0 +1,48 @@
<div mat-dialog-title>
修改密码
</div>
<div class="passwordCard" mat-dialog-content>
<form (ngSubmit)="onSubmit(form.value)" #form="ngForm" class="example-container">
<!-- <span class="cardLeft">原密码</span>
<mat-form-field>
<input matInput id="password" name="password"
required type="password"
ngModel #password="ngModel" placeholder="请输入原密码">
</mat-form-field> -->
<span class="cardLeft">新密码</span>
<mat-form-field>
<input matInput id="newPassword" name="newPassword" type="password"
required pattern="^(?=.*[A-Z])(?=.*[a-z])(?=.*[0-9])(?=.+[\!\@\#\$\%\^\&\*\(\)\-\=\\\`\_\+\|\~\[\]\{\}\;\'\:\,\.\/\<\>\?])[A-Za-z0-9\!\@\#\$\%\^\&\*\(\)\-\=\\\`\_\+\|\~\[\]\{\}\;\'\:\,\.\/\<\>\?]{8,32}$"
ngModel #newPassword="ngModel" placeholder="请输入新密码">
</mat-form-field>
<div *ngIf="newPassword.invalid && (newPassword.dirty || newPassword.touched)">
<div class="group-error-content">密码格式为8-20位,大小写字母+数字+特殊字符</div>
</div>
<span class="cardLeft">确认新密码</span>
<mat-form-field>
<input matInput id="newsPassword" name="newsPassword" type="password"
required
ngModel #newsPassword="ngModel" placeholder="请确认新密码"
[appConfirmpsw] = "newPassword.value">
</mat-form-field>
<div *ngIf="newsPassword.touched&&newsPassword.invalid">
<div class="group-error-content">密码输入不一致！</div>
</div>
<div *ngIf="errmsg" class="group-error-content">
{{errmsg}}
</div>
<div mat-dialog-actions class="btnbox">
<button mat-raised-button color="primary" type="submit"
[disabled]="!form.form.valid">
确定
</button>
<button mat-raised-button color="primary" mat-dialog-close>取消</button>
</div>
</form>
</div>

15
src/app/pages/login/changePassword.scss
Unescape View File

@ -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
}

65
src/app/pages/login/login.component.ts
Unescape View File

@ -3,7 +3,8 @@ import { HttpClient } from '@angular/common/http'
import { Data } from '../../interface' import { Data } from '../../interface'
import { Router,ActivatedRoute } from '@angular/router' import { Router,ActivatedRoute } from '@angular/router'
import {CacheTokenService} from '../../http-interceptors/cache-token.service'//引入服务 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({ @Component({
selector: 'app-login', selector: 'app-login',
@ -12,7 +13,7 @@ import { MatSnackBar } from '@angular/material/snack-bar';
}) })
export class LoginComponent implements OnInit { 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() { ngOnInit() {
this.automaticLogin() this.automaticLogin()
@ -27,19 +28,25 @@ export class LoginComponent implements OnInit {
sessionStorage.setItem("level",data.level); sessionStorage.setItem("level",data.level);
sessionStorage.setItem("token",data.token); sessionStorage.setItem("token",data.token);
sessionStorage.setItem("refreshToken",data.refreshToken); sessionStorage.setItem("refreshToken",data.refreshToken);
sessionStorage.setItem("isDefaultPassword",data.isDefaultPassword);//是否需要修改默认密码
this.http.get('/api/Account/NavMenus').subscribe((data:any)=>{ this.http.get('/api/Account/NavMenus').subscribe((data:any)=>{
let isHave = data.find(item=>{ return item.url == "/statisticanalysis/home"}) let isHave = data.find(item=>{ return item.url == "/statisticanalysis/home"})
let isHaveGis = data.find(item=>{ return item.url == "/gis"}) let isHaveGis = data.find(item=>{ return item.url == "/gis"})
if (isHave) { if (isHave) {
this.router.navigate([`/statisticanalysis/home`]) this.router.navigate([`/statisticanalysis/home`])
this.dialogChangePassword()
return
} else if(isHaveGis){ } else if(isHaveGis){
this.router.navigate([`/gis`]) this.router.navigate([`/gis`])
this.dialogChangePassword()
return
} else if(data.length != 0){ } else if(data.length != 0){
this.router.navigate([`/keyUnit`])
this.dialogChangePassword()
return
data.forEach(item => { data.forEach(item => {
if(item.url){ if(item.url){
this.router.navigate([`/keyUnit`])
return
} }
}); });
}else{ }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天免登录自动登录 //7天免登录自动登录
automaticLogin () { automaticLogin () {
let isNoLogin = localStorage.getItem("isnologin") 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<ChangepasswordComponent2>) { }
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}
)
}
}

8
src/app/pages/pages.module.ts
Unescape View File

@ -1,7 +1,7 @@
import { NgModule } from '@angular/core'; import { NgModule } from '@angular/core';
import { CommonModule } from '@angular/common'; import { CommonModule } from '@angular/common';
import { PagesComponent } from './pages.component'; 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 { RegisterComponent } from './register/register.component';
import { PagesRoutingModule } from './pages-routing.module' import { PagesRoutingModule } from './pages-routing.module'
@ -52,8 +52,9 @@ import { RouterModule } from '@angular/router';
import { LockscreenComponent } from './lockscreen/lockscreen.component'; import { LockscreenComponent } from './lockscreen/lockscreen.component';
import { HomeComponent } from './home/home.component'; import { HomeComponent } from './home/home.component';
import { HomedetailComponent } from './homedetail/homedetail.component'; import { HomedetailComponent } from './homedetail/homedetail.component';
import { UiModule } from '../ui/ui.module';
@NgModule({ @NgModule({
declarations: [PagesComponent, LoginComponent, RegisterComponent, LockscreenComponent, HomeComponent, HomedetailComponent], declarations: [PagesComponent, LoginComponent, RegisterComponent, LockscreenComponent, HomeComponent, HomedetailComponent,ChangepasswordComponent2],
imports: [ imports: [
PagesRoutingModule, PagesRoutingModule,
@ -105,8 +106,9 @@ import { HomedetailComponent } from './homedetail/homedetail.component';
FormsModule, FormsModule,
ReactiveFormsModule, ReactiveFormsModule,
RouterModule RouterModule,
// PagesRoutingModule, // PagesRoutingModule,
UiModule
] ]
}) })
export class PagesModule { } export class PagesModule { }

22
src/app/ui/changepassword/changepassword.component.html
Unescape View File

@ -7,27 +7,24 @@
<span class="cardLeft">原密码</span> <span class="cardLeft">原密码</span>
<mat-form-field> <mat-form-field>
<input matInput id="password" name="password" <input matInput id="password" name="password" required type="password" ngModel #password="ngModel"
required type="password" placeholder="请输入原密码">
ngModel #password="ngModel" placeholder="请输入原密码">
</mat-form-field> </mat-form-field>
<span class="cardLeft">新密码</span> <span class="cardLeft">新密码</span>
<mat-form-field> <mat-form-field>
<input matInput id="newPassword" name="newPassword" type="password" <input matInput id="newPassword" name="newPassword" type="password" required
required pattern="^(?=.*[a-zA-Z])(?=.*[0-9])[A-Za-z0-9]{8,20}$" pattern="^(?=.*[A-Z])(?=.*[a-z])(?=.*[0-9])(?=.+[\!\@\#\$\%\^\&\*\(\)\-\=\\\`\_\+\|\~\[\]\{\}\;\'\:\,\.\/\<\>\?])[A-Za-z0-9\!\@\#\$\%\^\&\*\(\)\-\=\\\`\_\+\|\~\[\]\{\}\;\'\:\,\.\/\<\>\?]{8,32}$"
ngModel #newPassword="ngModel" placeholder="请输入新密码"> ngModel #newPassword="ngModel" placeholder="请输入新密码">
</mat-form-field> </mat-form-field>
<div *ngIf="newPassword.invalid && (newPassword.dirty || newPassword.touched)"> <div *ngIf="newPassword.invalid && (newPassword.dirty || newPassword.touched)">
<div class="group-error-content">密码格式8-20位,字母+数字</div> <div class="group-error-content">密码格式为8-20位,大小写字母+数字+特殊字符</div>
</div> </div>
<span class="cardLeft">确认新密码</span> <span class="cardLeft">确认新密码</span>
<mat-form-field> <mat-form-field>
<input matInput id="newsPassword" name="newsPassword" type="password" <input matInput id="newsPassword" name="newsPassword" type="password" required ngModel
required #newsPassword="ngModel" placeholder="请确认新密码" [appConfirmpsw]="newPassword.value">
ngModel #newsPassword="ngModel" placeholder="请确认新密码"
[appConfirmpsw] = "newPassword.value">
</mat-form-field> </mat-form-field>
<div *ngIf="newsPassword.touched&&newsPassword.invalid"> <div *ngIf="newsPassword.touched&&newsPassword.invalid">
<div class="group-error-content">密码输入不一致！</div> <div class="group-error-content">密码输入不一致！</div>
@ -37,8 +34,7 @@
</div> </div>
<div mat-dialog-actions class="btnbox"> <div mat-dialog-actions class="btnbox">
<button mat-raised-button color="primary" type="submit" <button mat-raised-button color="primary" type="submit" [disabled]="!form.form.valid">
[disabled]="!form.form.valid">
确定 确定
</button> </button>
<button mat-raised-button color="primary" mat-dialog-close>取消</button> <button mat-raised-button color="primary" mat-dialog-close>取消</button>

11
src/app/ui/collection-tools-plan/collection-tools.component.ts
Unescape View File

@ -86,7 +86,7 @@ export class CollectionToolsPlanComponent implements OnInit {
gallery//viewerJs实例 gallery//viewerJs实例
//设置属性框 //设置属性框
setAssetsProperty(obj) { setAssetsProperty(obj) {
console.log(obj) console.log('传进来的属性信息',obj)
//初始化viewerJs实例 //初始化viewerJs实例
setTimeout(() => { setTimeout(() => {
obj.PropertyInfos.forEach(item => { obj.PropertyInfos.forEach(item => {
@ -2017,7 +2017,8 @@ export class CollectionToolsPlanComponent implements OnInit {
this.clickId = e.target.id this.clickId = e.target.id
for (let index = 0; index < this.planData.length; index++) { for (let index = 0; index < this.planData.length; index++) {
const item = this.planData[index]; const item = this.planData[index];
if (item.id == e.target.id) { if (item.Id == e.target.id) {
this.setAssetsProperty(item) this.setAssetsProperty(item)
return return
} }
@ -2028,7 +2029,7 @@ export class CollectionToolsPlanComponent implements OnInit {
this.clickId = e.target.id this.clickId = e.target.id
for (let index = 0; index < this.planData.length; index++) { for (let index = 0; index < this.planData.length; index++) {
const item = this.planData[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 } item.point = { x: e.lnglat.lng, y: e.lnglat.lat }
return return
@ -2040,6 +2041,10 @@ export class CollectionToolsPlanComponent implements OnInit {
let itemData = JSON.parse(JSON.stringify(this.selectImage)) let itemData = JSON.parse(JSON.stringify(this.selectImage))
itemData.id = id itemData.id = id
itemData.point = { x: e.lnglat.lng, y: e.lnglat.lat } 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) this.planData.push(itemData)
//将marker点添加 //将marker点添加
this.planDataMarkers.push(startMarker) this.planDataMarkers.push(startMarker)

125
src/app/ui/ui.module.ts
Unescape View File

@ -2,47 +2,47 @@ import { NgModule } from '@angular/core';
import { CommonModule } from '@angular/common'; import { CommonModule } from '@angular/common';
import { UiComponent } from './ui.component'; import { UiComponent } from './ui.component';
import { UiRoutingModule } from './ui-routing.module'; import { UiRoutingModule } from './ui-routing.module';
import {A11yModule} from '@angular/cdk/a11y'; import { A11yModule } from '@angular/cdk/a11y';
import {DragDropModule} from '@angular/cdk/drag-drop'; import { DragDropModule } from '@angular/cdk/drag-drop';
import {PortalModule} from '@angular/cdk/portal'; import { PortalModule } from '@angular/cdk/portal';
import {ScrollingModule} from '@angular/cdk/scrolling'; import { ScrollingModule } from '@angular/cdk/scrolling';
import {CdkStepperModule} from '@angular/cdk/stepper'; import { CdkStepperModule } from '@angular/cdk/stepper';
import {CdkTableModule} from '@angular/cdk/table'; import { CdkTableModule } from '@angular/cdk/table';
import {CdkTreeModule} from '@angular/cdk/tree'; import { CdkTreeModule } from '@angular/cdk/tree';
import {MatAutocompleteModule} from '@angular/material/autocomplete'; import { MatAutocompleteModule } from '@angular/material/autocomplete';
import {MatBadgeModule} from '@angular/material/badge'; import { MatBadgeModule } from '@angular/material/badge';
import {MatBottomSheetModule} from '@angular/material/bottom-sheet'; import { MatBottomSheetModule } from '@angular/material/bottom-sheet';
import {MatButtonModule} from '@angular/material/button'; import { MatButtonModule } from '@angular/material/button';
import {MatButtonToggleModule} from '@angular/material/button-toggle'; import { MatButtonToggleModule } from '@angular/material/button-toggle';
import {MatCardModule} from '@angular/material/card'; import { MatCardModule } from '@angular/material/card';
import {MatCheckboxModule} from '@angular/material/checkbox'; import { MatCheckboxModule } from '@angular/material/checkbox';
import {MatChipsModule} from '@angular/material/chips'; import { MatChipsModule } from '@angular/material/chips';
import {MatStepperModule} from '@angular/material/stepper'; import { MatStepperModule } from '@angular/material/stepper';
import {MatDatepickerModule} from '@angular/material/datepicker'; import { MatDatepickerModule } from '@angular/material/datepicker';
import {MatDialogModule} from '@angular/material/dialog'; import { MatDialogModule } from '@angular/material/dialog';
import {MatDividerModule} from '@angular/material/divider'; import { MatDividerModule } from '@angular/material/divider';
import {MatExpansionModule} from '@angular/material/expansion'; import { MatExpansionModule } from '@angular/material/expansion';
import {MatGridListModule} from '@angular/material/grid-list'; import { MatGridListModule } from '@angular/material/grid-list';
import {MatIconModule} from '@angular/material/icon'; import { MatIconModule } from '@angular/material/icon';
import {MatInputModule} from '@angular/material/input'; import { MatInputModule } from '@angular/material/input';
import {MatListModule} from '@angular/material/list'; import { MatListModule } from '@angular/material/list';
import {MatMenuModule} from '@angular/material/menu'; import { MatMenuModule } from '@angular/material/menu';
import {MatNativeDateModule, MatRippleModule, MatOption} from '@angular/material/core'; import { MatNativeDateModule, MatRippleModule, MatOption } from '@angular/material/core';
import {MatPaginatorModule} from '@angular/material/paginator'; import { MatPaginatorModule } from '@angular/material/paginator';
import {MatProgressBarModule} from '@angular/material/progress-bar'; import { MatProgressBarModule } from '@angular/material/progress-bar';
import {MatProgressSpinnerModule} from '@angular/material/progress-spinner'; import { MatProgressSpinnerModule } from '@angular/material/progress-spinner';
import {MatRadioModule} from '@angular/material/radio'; import { MatRadioModule } from '@angular/material/radio';
import {MatSelectModule} from '@angular/material/select'; import { MatSelectModule } from '@angular/material/select';
import {MatSidenavModule} from '@angular/material/sidenav'; import { MatSidenavModule } from '@angular/material/sidenav';
import {MatSliderModule} from '@angular/material/slider'; import { MatSliderModule } from '@angular/material/slider';
import {MatSlideToggleModule} from '@angular/material/slide-toggle'; import { MatSlideToggleModule } from '@angular/material/slide-toggle';
import {MatSnackBarModule} from '@angular/material/snack-bar'; import { MatSnackBarModule } from '@angular/material/snack-bar';
import {MatSortModule} from '@angular/material/sort'; import { MatSortModule } from '@angular/material/sort';
import {MatTableModule} from '@angular/material/table'; import { MatTableModule } from '@angular/material/table';
import {MatTabsModule} from '@angular/material/tabs'; import { MatTabsModule } from '@angular/material/tabs';
import {MatToolbarModule} from '@angular/material/toolbar'; import { MatToolbarModule } from '@angular/material/toolbar';
import {MatTooltipModule} from '@angular/material/tooltip'; import { MatTooltipModule } from '@angular/material/tooltip';
import {MatTreeModule} from '@angular/material/tree'; import { MatTreeModule } from '@angular/material/tree';
import { ReactiveFormsModule, FormsModule } from '@angular/forms'; import { ReactiveFormsModule, FormsModule } from '@angular/forms';
import { MatFormFieldModule } from '@angular/material/form-field'; import { MatFormFieldModule } from '@angular/material/form-field';
import { MatPaginatorIntl } from '@angular/material/paginator'; import { MatPaginatorIntl } from '@angular/material/paginator';
@ -50,18 +50,18 @@ import { PaginatorModule } from './paginator/paginator.module';
import { UserdataComponent, EditUser } from './userdata/userdata.component'; import { UserdataComponent, EditUser } from './userdata/userdata.component';
import { ChangepasswordComponent } from './changepassword/changepassword.component'; import { ChangepasswordComponent } from './changepassword/changepassword.component';
import { OrganizationComponent, CreateOrganization, EditOrganization, addOffices, editOffices } from './organization/organization.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 { AuthorityComponent, CreateAuthority } from './authority/authority.component';
import { RoleComponent, CreateRole, EditRole } from './role/role.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 { 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 { TimePipe } from '../pipes/time.pipe';
import { NavmenusComponent, CreateMenus, EditMenus } from './navmenus/navmenus.component'; import { NavmenusComponent, CreateMenus, EditMenus } from './navmenus/navmenus.component';
import { FireProtectionElementsComponent, Establish, EditingFireControl } from './fire-protection-elements/fire-protection-elements.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 { FireFightingTemplateComponent, NewFireFighting, EditFireClassification } from './fire-fighting-template/fire-fighting-template.component';
import { MaterialBankComponent,attributeComponent,addAttributeComponent,editAttribute } from './material-bank/material-bank.component'; import { MaterialBankComponent, attributeComponent, addAttributeComponent, editAttribute } from './material-bank/material-bank.component';
import { UnitInformationComponent,addUnitAttributeComponent,editUnitAttribute } from './unit-information/unit-information.component'; import { UnitInformationComponent, addUnitAttributeComponent, editUnitAttribute } from './unit-information/unit-information.component';
import { AddMatLibrary } from './material-bank/addmatlibrary.component'; import { AddMatLibrary } from './material-bank/addmatlibrary.component';
import { EditMatLibrary } from './material-bank/editmatlibrary.component'; import { EditMatLibrary } from './material-bank/editmatlibrary.component';
import { AddOriginalCopy } from './material-bank/addoriginalcopy.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 { AddUnitInfo } from './unit-information/addunitinfo.component';
import { AddGroups } from './unit-information/addgroups.component'; import { AddGroups } from './unit-information/addgroups.component';
import { EditGroup } from './unit-information/editgroup.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 { 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 { CollectionToolsComponent, CreateBuilding, EditBuilding, Organization } from './collection-tools/collection-tools.component';
import { WorkingAreaComponent } from '../working-area/working-area.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 { saveOneDialog, saveTwoDialog } from './collection-tools/save';
import { CollectionToolsPlanComponent, CreateBuildingPlan, EditBuildingPlan } from './collection-tools-plan/collection-tools.component'; import { CollectionToolsPlanComponent, CreateBuildingPlan, EditBuildingPlan } from './collection-tools-plan/collection-tools.component';
import { editPlaneFigureComponentPlan, leftFunctionalDomainComponentPlan } from './collection-tools-plan/leftFunctionalDomain'; import { editPlaneFigureComponentPlan, leftFunctionalDomainComponentPlan } from './collection-tools-plan/leftFunctionalDomain';
import {CollectionToolsBuildingComponent,CreateBuildingBuilding,EditBuildingBuilding} from './collection-tools-building/collection-tools.component' import { CollectionToolsBuildingComponent, CreateBuildingBuilding, EditBuildingBuilding } from './collection-tools-building/collection-tools.component'
import {leftFunctionalDomainBuildingComponent,editPlaneFigureBuildingComponent} from './collection-tools-building/leftFunctionalDomain'; import { leftFunctionalDomainBuildingComponent, editPlaneFigureBuildingComponent } from './collection-tools-building/leftFunctionalDomain';
import { PlanTemplateComponent } from './plan-template/plan-template.component' import { PlanTemplateComponent } from './plan-template/plan-template.component'
import { addPlanname } from './plan-template/plan-template.component' import { addPlanname } from './plan-template/plan-template.component'
import { upPlanname } 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({ @NgModule({
declarations: [UiComponent, UserdataComponent, ChangepasswordComponent, OrganizationComponent, UnittypeComponent, AuthorityComponent, RoleComponent, UsermanagementComponent, declarations: [UiComponent, UserdataComponent, ChangepasswordComponent, OrganizationComponent, UnittypeComponent, AuthorityComponent, RoleComponent, UsermanagementComponent,
IsnoPipe,ConfirmpswDirective,DialogOverviewExampleDialog,CreateAuthority,CreateRole,TimePipe,CreateNewUser,EditNewUser,allRoles,EditRole,CreateOrganization,EditOrganization, IsnoPipe, ConfirmpswDirective, DialogOverviewExampleDialog, CreateAuthority, CreateRole, TimePipe, CreateNewUser, EditNewUser, allRoles, EditRole, CreateOrganization, EditOrganization,
seeInformation,EditUser,editorialUnit,FireProtectionElementsComponent,Establish,EditingFireControl,FireFightingTemplateComponent, NavmenusComponent,CreateMenus,EditMenus, seeInformation, EditUser, editorialUnit, FireProtectionElementsComponent, Establish, EditingFireControl, FireFightingTemplateComponent, NavmenusComponent, CreateMenus, EditMenus,
NewFireFighting,EditFireClassification, MaterialBankComponent, UnitInformationComponent,AddMatLibrary,EditMatLibrary,attributeComponent,AddOriginalCopy,addAttributeComponent, NewFireFighting, EditFireClassification, MaterialBankComponent, UnitInformationComponent, AddMatLibrary, EditMatLibrary, attributeComponent, AddOriginalCopy, addAttributeComponent,
editAttribute,EditOriginalCopy,SelectOriginalCopy,EditUnitInfo,AddUnitInfo,AddGroups,EditGroup, EnterpriseuserComponent,AddEnterpriserUser,addUnitAttributeComponent,editUnitAttribute, editAttribute, EditOriginalCopy, SelectOriginalCopy, EditUnitInfo, AddUnitInfo, AddGroups, EditGroup, EnterpriseuserComponent, AddEnterpriserUser, addUnitAttributeComponent, editUnitAttribute,
seeenterpriseuser,editenterpriseuser, FireFightingFacilitiesFormworkComponent,addFireFightingFacilitiesFormworkComponent,editFireFightingFacilitiesFormworkComponent,addBuiltInComponent, seeenterpriseuser, editenterpriseuser, FireFightingFacilitiesFormworkComponent, addFireFightingFacilitiesFormworkComponent, editFireFightingFacilitiesFormworkComponent, addBuiltInComponent,
addBuiltInAttributeComponent,addOptionalComponent,addOptionalAttributeComponent,editBuiltInAttributeComponent,editOptionalAttributeComponent, CollectionToolsComponent,WorkingAreaComponent, addBuiltInAttributeComponent, addOptionalComponent, addOptionalAttributeComponent, editBuiltInAttributeComponent, editOptionalAttributeComponent, CollectionToolsComponent, WorkingAreaComponent,
CreateBuilding,EditBuilding,leftFunctionalDomainComponent,editPlaneFigureComponent,saveOneDialog,saveTwoDialog,addDisposalNodeComponent,editDisposalNodeComponent,CollectionToolsPlanComponent, CreateBuilding, EditBuilding, leftFunctionalDomainComponent, editPlaneFigureComponent, saveOneDialog, saveTwoDialog, addDisposalNodeComponent, editDisposalNodeComponent, CollectionToolsPlanComponent,
CreateBuildingPlan,EditBuildingPlan,leftFunctionalDomainComponentPlan,editPlaneFigureComponentPlan,addOffices,editOffices,addBGCDisposalNodeComponent,CollectionToolsBuildingComponent,CreateBuildingBuilding, CreateBuildingPlan, EditBuildingPlan, leftFunctionalDomainComponentPlan, editPlaneFigureComponentPlan, addOffices, editOffices, addBGCDisposalNodeComponent, CollectionToolsBuildingComponent, CreateBuildingBuilding,
EditBuildingBuilding,leftFunctionalDomainBuildingComponent,editPlaneFigureBuildingComponent,Organization, PlanTemplateComponent,addPlanname,upPlanname,addGroup,adddwsurvey,addattinf], EditBuildingBuilding, leftFunctionalDomainBuildingComponent, editPlaneFigureBuildingComponent, Organization, PlanTemplateComponent, addPlanname, upPlanname, addGroup, adddwsurvey, addattinf],
imports: [ imports: [
CommonModule, CommonModule,
@ -156,10 +156,11 @@ import { addattinf } from './plan-template/plan-template.component'
], ],
exports:[ exports: [
CollectionToolsComponent, CollectionToolsComponent,
CollectionToolsBuildingComponent, CollectionToolsBuildingComponent,
CollectionToolsPlanComponent CollectionToolsPlanComponent,
ConfirmpswDirective
] ]
}) })
export class UiModule { } export class UiModule { }

Write Preview
Loading…
Cancel
Save