diff --git a/src/app/pages/left-domain/left-domain.component.html b/src/app/pages/left-domain/left-domain.component.html index 9c4dca5..e822903 100644 --- a/src/app/pages/left-domain/left-domain.component.html +++ b/src/app/pages/left-domain/left-domain.component.html @@ -149,7 +149,7 @@ diff --git a/src/app/pages/left-domain/left-domain.component.ts b/src/app/pages/left-domain/left-domain.component.ts index 407baef..febcea8 100644 --- a/src/app/pages/left-domain/left-domain.component.ts +++ b/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) } } diff --git a/src/app/pages/pages.module.ts b/src/app/pages/pages.module.ts index bdeda40..8290dfe 100644 --- a/src/app/pages/pages.module.ts +++ b/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'; @@ -86,7 +87,8 @@ import { GetOutOfLineDetailsComponent } from './today-warning/get-out-of-line-de NzTableModule, NzCheckboxModule, NzTimePickerModule, - NzProgressModule + NzProgressModule, + NzPopconfirmModule ], entryComponents: [AddequipmentComponent, EditequipmentComponent,GetOutOfLineDetailsComponent], schemas: [CUSTOM_ELEMENTS_SCHEMA]