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

src/app/pages/left-domain/left-domain.component.html

@@ -149,7 +149,7 @@
         </div>
         <ul>
           <li class="publicDisposal disposalContent" *ngFor="let items of item.nodes;let keys = index;">
-            <span (click)='selectNode(item,items)' [ngClass]="{'selectNode': selectNodeId == items.id && selectPlanId == item.id}">{{items.name}}</span>
+            <span nz-popconfirm nzPopconfirmTitle="切换节点后,没保存的信息将会丢失!" [nzCondition]="!editMode" (nzOnConfirm)="selectNode(item,items)" [ngClass]="{'selectNode': selectNodeId == items.id && selectPlanId == item.id}">{{items.name}}</span>
             <label *ngIf="editMode"><i nz-icon nzType="save" nzTheme="outline" (click)="saveDisposal(item.id,items.id)"></i><i nz-icon nzType="delete" nzTheme="outline" (click)="deleteDisposal(item,items)"></i></label>
           </li>
         </ul>

src/app/pages/left-domain/left-domain.component.ts

@@ -210,40 +210,19 @@ export class LeftDomainComponent implements OnInit {
   //选中 数据节点
   selectNode(item: MarkPlanData, e: MarkNodeData) {
     if (this.selectPlanId != item.id || this.selectNodeId != e.id) { //选中
-      if (!MarkWindow.instance.currentMarkNodeInfo) { //未选中节点
-        this.updateFatherData() //更新/初始化父组件 数据
-        this.selectPlanId = item.id
-        this.selectNodeId = e.id
-        MarkWindow.instance.selectMarkNode(item.id, e.id)
-        PlanComponent.instance.beforeEmergencyPlan = item
-        PlanComponent.instance.beforePlanNode = MarkWindow.instance.currentMarkNodeInfo.nodeData
-      } else { //已选中节点
-        let isTrue = true;
-        if (ModeManager.currentMode == ModeType.Edit) {
-          isTrue = confirm('切换节点后,没保存的信息将会丢失!')
-        }
-        if (isTrue) {
-          this.updateFatherData() //更新/初始化父组件 数据
-          this.selectPlanId = item.id
-          this.selectNodeId = e.id
-          MarkWindow.instance.selectMarkNode(item.id, e.id)
-          PlanComponent.instance.beforeEmergencyPlan = item
-          PlanComponent.instance.beforePlanNode = MarkWindow.instance.currentMarkNodeInfo.nodeData
-        }
-      }
+      this.updateFatherData() //更新/初始化父组件 数据
+      this.selectPlanId = item.id
+      this.selectNodeId = e.id
+      MarkWindow.instance.selectMarkNode(item.id, e.id)
+      PlanComponent.instance.beforeEmergencyPlan = item
+      PlanComponent.instance.beforePlanNode = MarkWindow.instance.currentMarkNodeInfo.nodeData
     } else if (this.selectPlanId === item.id && this.selectNodeId === e.id) { //取消选中
-      let isTrue = true;
-      if (ModeManager.currentMode == ModeType.Edit) {
-        isTrue = confirm('切换节点后,没保存的信息将会丢失!')
-      }
-      if (isTrue) {
-        PlanComponent.instance.beforeEmergencyPlan = new MarkPlanData(-99, "请选择节点")
-        PlanComponent.instance.beforePlanNode = new MarkNodeData(-99, "请选择节点")
-        this.updateFatherData() //更新/初始化父组件 数据
-        this.selectPlanId = null
-        this.selectNodeId = null
-        MarkWindow.instance.selectMarkNode(null, null)
-      }
+      PlanComponent.instance.beforeEmergencyPlan = new MarkPlanData(-99, "请选择节点")
+      PlanComponent.instance.beforePlanNode = new MarkNodeData(-99, "请选择节点")
+      this.updateFatherData() //更新/初始化父组件 数据
+      this.selectPlanId = null
+      this.selectNodeId = null
+      MarkWindow.instance.selectMarkNode(null, null)
     }
   }
 

src/app/pages/pages.module.ts

@@ -36,6 +36,7 @@ import { NzTableModule } from 'ng-zorro-antd/table';
 import { NzCheckboxModule } from 'ng-zorro-antd/checkbox';
 import { NzTimePickerModule } from 'ng-zorro-antd/time-picker';
 import { NzProgressModule } from 'ng-zorro-antd/progress';
+import { NzPopconfirmModule } from 'ng-zorro-antd/popconfirm';
 import { TodayWarningAdminComponent } from './today-warning-admin/today-warning-admin.component';
 import { CriminalRecordsAdminComponent } from './criminal-records-admin/criminal-records-admin.component';
 import { EquipmentInfoComponent } from './equipment-info/equipment-info.component';
@@ -88,7 +89,8 @@ import { NzNotificationModule } from 'ng-zorro-antd/notification';
     NzCheckboxModule,
     NzTimePickerModule,
     NzProgressModule,
-    NzNotificationModule
+    NzNotificationModule,
+    NzPopconfirmModule
   ],
   entryComponents: [AddequipmentComponent, EditequipmentComponent,GetOutOfLineDetailsComponent],
   schemas: [CUSTOM_ELEMENTS_SCHEMA]