From ca71425742d5f34da6f5a982f024932dec459d3f Mon Sep 17 00:00:00 2001
From: cpf <1105965053@qq.com>
Date: Wed, 15 Dec 2021 09:49:25 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E4=B8=BB=E8=A7=92=E5=AD=97?=
=?UTF-8?q?=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/app/pages/plan/plan.component.html | 6 ++++++
src/app/pages/plan/plan.component.ts | 8 ++++++--
2 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/src/app/pages/plan/plan.component.html b/src/app/pages/plan/plan.component.html
index 2a060fa..7bfc1d1 100644
--- a/src/app/pages/plan/plan.component.html
+++ b/src/app/pages/plan/plan.component.html
@@ -257,6 +257,12 @@
+
+ 主角
+
+
+
+
diff --git a/src/app/pages/plan/plan.component.ts b/src/app/pages/plan/plan.component.ts
index 649fa7b..0434fb4 100644
--- a/src/app/pages/plan/plan.component.ts
+++ b/src/app/pages/plan/plan.component.ts
@@ -681,7 +681,7 @@ export class PlanComponent implements OnInit {
}
contingencyPlanTask: MarkData = null; //应急预案选中 设备
- taskDialog: taskDialog = new taskDialog("", "", ""); //设备任务 深拷贝数据
+ taskDialog: taskDialog = new taskDialog("", "", "", false); //设备任务 深拷贝数据
allTaskList: any[] = []; //所有任务 List
//选中应急预案 设备
@@ -696,6 +696,7 @@ export class PlanComponent implements OnInit {
this.taskDialog.institution = JSON.parse(JSON.stringify(markData.property.institution || ""))
this.taskDialog.description = JSON.parse(JSON.stringify(markData.property.description || ""))
this.taskDialog.task = JSON.parse(JSON.stringify(markData.property.task || ""))
+ this.taskDialog.isMainCharacter = JSON.parse(JSON.stringify(markData.property.isMainCharacter || false))
if (markData.property.taskType === MarkTask.Person) {
this.allTaskList = (new taskList()).character
} else if (markData.property.taskType === MarkTask.Car) {
@@ -711,6 +712,7 @@ export class PlanComponent implements OnInit {
this.contingencyPlanTask.property.institution = e.companyName
this.contingencyPlanTask.property.description = e.description
this.contingencyPlanTask.property.task = e.taskName
+ this.contingencyPlanTask.property.isMainCharacter = e.isMainCharacter
MarkWindow.instance.updateProperty()
this.contingencyPlanTask = null //关闭弹窗
}
@@ -876,10 +878,12 @@ export class taskDialog {
institution: string; //单位
task: string; //任务
description: string; //备注
- constructor(institution: string, task: string, description: string) {
+ isMainCharacter: boolean; //主要角色
+ constructor(institution: string, task: string, description: string, isMainCharacter: boolean) {
this.institution = institution
this.task = task
this.description = description
+ this.isMainCharacter = isMainCharacter
}
}
//设备任务list