diff --git a/src/app/pages/criminal-records-admin/criminal-records-admin.component.html b/src/app/pages/criminal-records-admin/criminal-records-admin.component.html index 7b360b4..6fcb830 100644 --- a/src/app/pages/criminal-records-admin/criminal-records-admin.component.html +++ b/src/app/pages/criminal-records-admin/criminal-records-admin.component.html @@ -31,8 +31,18 @@ + [(ngModel)]="defaultOrId" formControlName="organization" [nzNodes]="nodes" nzPlaceHolder="请选择所属机构" + [nzExpandedIcon]="multiExpandedIconTpl"> + + + + + + + + diff --git a/src/app/pages/left-domain/left-domain.component.ts b/src/app/pages/left-domain/left-domain.component.ts index a6bbadc..33e512a 100644 --- a/src/app/pages/left-domain/left-domain.component.ts +++ b/src/app/pages/left-domain/left-domain.component.ts @@ -371,8 +371,8 @@ export class LeftDomainComponent implements OnInit { } else if (this.selectPlanId === item.id && this.selectNodeId === e.id) { //取消选中 this.selectPlanId = null this.selectNodeId = null - PlanComponent.instance.beforeEmergencyPlan = new MarkPlanData(-99, "请选择节点") - PlanComponent.instance.beforePlanNode = new MarkNodeData(-99, "请选择节点") + PlanComponent.instance.beforeEmergencyPlan = new MarkPlanData(-99, "请选择应急预案") + PlanComponent.instance.beforePlanNode = new MarkNodeData(-99, "请选择应急预案") this.updateFatherData(index) //更新/初始化父组件 数据 MarkWindow.instance.selectMarkNode(null, null) } diff --git a/src/app/pages/oil-unloading-process-list/oil-unloading-process-list.component.html b/src/app/pages/oil-unloading-process-list/oil-unloading-process-list.component.html index 9cd92f0..c0ef09c 100644 --- a/src/app/pages/oil-unloading-process-list/oil-unloading-process-list.component.html +++ b/src/app/pages/oil-unloading-process-list/oil-unloading-process-list.component.html @@ -61,8 +61,17 @@ + nzPlaceHolder="请选择所属机构" [nzExpandedIcon]="multiExpandedIconTpl"> + + + + + + + + diff --git a/src/app/pages/plan/plan.component.ts b/src/app/pages/plan/plan.component.ts index 84d816d..3b47b46 100644 --- a/src/app/pages/plan/plan.component.ts +++ b/src/app/pages/plan/plan.component.ts @@ -497,8 +497,8 @@ export class PlanComponent implements OnInit { } allMarkPlanData: AllMarkPlanData; //处置预案节点 数据 - beforeEmergencyPlan: MarkPlanData = new MarkPlanData(-99, "请选择节点"); //当前选择 应急预案 - beforePlanNode: MarkNodeData = new MarkNodeData(-99, "请选择节点"); //当前选择 预案节点 + beforeEmergencyPlan: MarkPlanData = new MarkPlanData(-99, "请选择应急预案"); //当前选择 应急预案 + beforePlanNode: MarkNodeData = new MarkNodeData(-99, "请选择应急预案"); //当前选择 预案节点 nzCurrent: number = -1; //当前选择 预案节点Index isSuspend: boolean = false; //是否暂停 自动切换节点 progressList: number[] = []; //进度条 条/值 @@ -506,8 +506,8 @@ export class PlanComponent implements OnInit { //初始化 应急预案模块 initializePlan() { - this.beforeEmergencyPlan = new MarkPlanData(-99, "请选择节点") - this.beforePlanNode = new MarkNodeData(-99, "请选择节点") + this.beforeEmergencyPlan = new MarkPlanData(-99, "请选择应急预案") + this.beforePlanNode = new MarkNodeData(-99, "请选择应急预案") this.isSuspend = false //初始化暂停状态 this.progressList = [] window.clearTimeout(this.updateTimer) //清除定时器 diff --git a/src/app/pages/today-warning-admin/today-warning-admin.component.html b/src/app/pages/today-warning-admin/today-warning-admin.component.html index 797d4d3..2ef8a00 100644 --- a/src/app/pages/today-warning-admin/today-warning-admin.component.html +++ b/src/app/pages/today-warning-admin/today-warning-admin.component.html @@ -23,8 +23,16 @@ + formControlName="organization" [nzNodes]="nodes" nzPlaceHolder="请选择所属机构" [nzExpandedIcon]="multiExpandedIconTpl"> + + + + + + + + diff --git a/src/app/system-management/user/adduser/adduser.component.html b/src/app/system-management/user/adduser/adduser.component.html index 081dd41..f5b7bd9 100644 --- a/src/app/system-management/user/adduser/adduser.component.html +++ b/src/app/system-management/user/adduser/adduser.component.html @@ -16,15 +16,25 @@ - - + + + + + + + + + - + + @@ -36,4 +46,4 @@ - + \ No newline at end of file diff --git a/src/app/system-management/user/edituser/edituser.component.html b/src/app/system-management/user/edituser/edituser.component.html index 1b2ecab..e4c332d 100644 --- a/src/app/system-management/user/edituser/edituser.component.html +++ b/src/app/system-management/user/edituser/edituser.component.html @@ -16,15 +16,26 @@ - - + + + + + + + + + - + + @@ -36,4 +47,4 @@ - + \ No newline at end of file