Merge branch 'master' of http://39.106.78.171:3000/shaojiahao/Sinopec-Anxin

src/app/pages/criminal-records-admin/criminal-records-admin.component.html

@@ -31,8 +31,18 @@
         <nz-form-item class="searchParams searchParamsLong">
           <nz-form-control>
             <nz-tree-select [nzAllowClear]="false" [nzDropdownClassName]="'maxHeightTreeSelect'" nzShowSearch
-              [(ngModel)]="defaultOrId" formControlName="organization" [nzNodes]="nodes" nzPlaceHolder="请选择所属机构">
+              [(ngModel)]="defaultOrId" formControlName="organization" [nzNodes]="nodes" nzPlaceHolder="请选择所属机构"
+              [nzExpandedIcon]="multiExpandedIconTpl">
             </nz-tree-select>
+            <ng-template #multiExpandedIconTpl let-node let-origin="origin">
+              <ng-container *ngIf="node.children.length == 0; else elseTemplate">
+
+              </ng-container>
+              <ng-template #elseTemplate>
+                <i nz-icon [nzType]="node.isExpanded ? 'caret-down' : 'caret-right'"
+                  class="ant-tree-switcher-line-icon"></i>
+              </ng-template>
+            </ng-template>
           </nz-form-control>
         </nz-form-item>
 

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.beforeEmergencyPlan = new MarkPlanData(-99, "请选择应急预案")
-      PlanComponent.instance.beforePlanNode = new MarkNodeData(-99, "请选择节点")
+      PlanComponent.instance.beforePlanNode = new MarkNodeData(-99, "请选择应急预案")
       this.updateFatherData(index) //更新/初始化父组件 数据
       MarkWindow.instance.selectMarkNode(null, null)
     }

src/app/pages/oil-unloading-process-list/oil-unloading-process-list.component.html

@@ -61,8 +61,17 @@
                     <nz-form-control>
                         <nz-tree-select [nzAllowClear]="false" [nzDropdownClassName]="'maxHeightTreeSelect'"
                             nzShowSearch [(ngModel)]="defaultOrId" formControlName="organization" [nzNodes]="nodes"
-                            nzPlaceHolder="请选择所属机构">
+                            nzPlaceHolder="请选择所属机构" [nzExpandedIcon]="multiExpandedIconTpl">
                         </nz-tree-select>
+                        <ng-template #multiExpandedIconTpl let-node let-origin="origin">
+                            <ng-container *ngIf="node.children.length == 0; else elseTemplate">
+
+                            </ng-container>
+                            <ng-template #elseTemplate>
+                                <i nz-icon [nzType]="node.isExpanded ? 'caret-down' : 'caret-right'"
+                                    class="ant-tree-switcher-line-icon"></i>
+                            </ng-template>
+                        </ng-template>
                     </nz-form-control>
                 </nz-form-item>
 

src/app/pages/plan/plan.component.ts

@@ -497,8 +497,8 @@ export class PlanComponent implements OnInit {
   }
 
   allMarkPlanData: AllMarkPlanData; //处置预案节点 数据
-  beforeEmergencyPlan: MarkPlanData = new MarkPlanData(-99, "请选择节点"); //当前选择 应急预案
+  beforeEmergencyPlan: MarkPlanData = new MarkPlanData(-99, "请选择应急预案"); //当前选择 应急预案
-  beforePlanNode: MarkNodeData = new MarkNodeData(-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.beforeEmergencyPlan = new MarkPlanData(-99, "请选择应急预案")
-    this.beforePlanNode = new MarkNodeData(-99, "请选择节点")
+    this.beforePlanNode = new MarkNodeData(-99, "请选择应急预案")
     this.isSuspend = false //初始化暂停状态
     this.progressList = []
     window.clearTimeout(this.updateTimer) //清除定时器

src/app/pages/today-warning-admin/today-warning-admin.component.html

@@ -23,8 +23,16 @@
       <nz-form-item class="searchParams searchParamsLong">
         <nz-form-control>
           <nz-tree-select [nzAllowClear]="false" [nzDropdownClassName]="'maxHeightTreeSelect'" nzShowSearch [(ngModel)]="defaultOrId"
-            formControlName="organization" [nzNodes]="nodes" nzPlaceHolder="请选择所属机构">
+            formControlName="organization" [nzNodes]="nodes" nzPlaceHolder="请选择所属机构" [nzExpandedIcon]="multiExpandedIconTpl">
           </nz-tree-select>
+          <ng-template #multiExpandedIconTpl let-node let-origin="origin">
+            <ng-container *ngIf="node.children.length == 0; else elseTemplate">
+        
+            </ng-container>
+            <ng-template #elseTemplate>
+              <i nz-icon [nzType]="node.isExpanded ? 'caret-down' : 'caret-right'" class="ant-tree-switcher-line-icon"></i>
+            </ng-template>
+          </ng-template>
         </nz-form-control>
       </nz-form-item>
 

src/app/system-management/user/adduser/adduser.component.html

@@ -16,15 +16,25 @@
     </nz-form-item>
     <nz-form-item>
       <nz-form-control>
-        <nz-tree-select [nzDropdownClassName]="'maxHeightTreeSelect'" formControlName="organization" [nzNodes]="nodes" nzPlaceHolder="请选择所属机构">
+        <nz-tree-select [nzDropdownClassName]="'maxHeightTreeSelect'" formControlName="organization" [nzNodes]="nodes"
-          
+          nzPlaceHolder="请选择所属机构" [nzExpandedIcon]="multiExpandedIconTpl">
         </nz-tree-select>
+        <ng-template #multiExpandedIconTpl let-node let-origin="origin">
+          <ng-container *ngIf="node.children.length == 0; else elseTemplate">
+
+          </ng-container>
+          <ng-template #elseTemplate>
+            <i nz-icon [nzType]="node.isExpanded ? 'caret-down' : 'caret-right'"
+              class="ant-tree-switcher-line-icon"></i>
+          </ng-template>
+        </ng-template>
       </nz-form-control>
     </nz-form-item>
     <nz-form-item>
       <nz-form-control>
         <nz-select formControlName="role" nzPlaceHolder="请选择角色" nzMode="multiple">
-          <nz-option *ngFor="let item of listOfData" [nzValue]="item.normalizedName" [nzLabel]="item.displayName"></nz-option>
+          <nz-option *ngFor="let item of listOfData" [nzValue]="item.normalizedName" [nzLabel]="item.displayName">
+          </nz-option>
         </nz-select>
       </nz-form-control>
     </nz-form-item>
@@ -36,4 +46,4 @@
       </nz-form-control>
     </nz-form-item>
   </form>
-</div>
+</div>

src/app/system-management/user/edituser/edituser.component.html

@@ -16,15 +16,26 @@
     </nz-form-item>
     <nz-form-item>
       <nz-form-control>
-        <nz-tree-select [nzDropdownClassName]="'maxHeightTreeSelect'" [(ngModel)]="data.organizationUnitId" formControlName="organization" [nzNodes]="nodes" nzPlaceHolder="请选择所属机构">
+        <nz-tree-select [nzDropdownClassName]="'maxHeightTreeSelect'" [(ngModel)]="data.organizationUnitId"
-
+          formControlName="organization" [nzNodes]="nodes" nzPlaceHolder="请选择所属机构"
+          [nzExpandedIcon]="multiExpandedIconTpl">
         </nz-tree-select>
+        <ng-template #multiExpandedIconTpl let-node let-origin="origin">
+          <ng-container *ngIf="node.children.length == 0; else elseTemplate">
+
+          </ng-container>
+          <ng-template #elseTemplate>
+            <i nz-icon [nzType]="node.isExpanded ? 'caret-down' : 'caret-right'"
+              class="ant-tree-switcher-line-icon"></i>
+          </ng-template>
+        </ng-template>
       </nz-form-control>
     </nz-form-item>
     <nz-form-item>
       <nz-form-control>
         <nz-select [(ngModel)]="data.roleNames" formControlName="role" nzPlaceHolder="请选择角色" nzMode="multiple">
-          <nz-option *ngFor="let item of listOfData" [nzValue]="item.normalizedName" [nzLabel]="item.displayName"></nz-option>
+          <nz-option *ngFor="let item of listOfData" [nzValue]="item.normalizedName" [nzLabel]="item.displayName">
+          </nz-option>
         </nz-select>
       </nz-form-control>
     </nz-form-item>
@@ -36,4 +47,4 @@
       </nz-form-control>
     </nz-form-item>
   </form>
-</div>
+</div>