Browse Source

修改任务列表

dev
刘向辉 3 years ago
parent
commit
b65e1f320e
  1. 2
      src/app/babylon/controller/mode-manager.ts
  2. 12
      src/app/babylon/model/data/mark/mark-plan-data.ts
  3. 2
      src/app/babylon/view/mark-window/mark-window.ts
  4. 55
      src/app/pages/plan/plan.component.ts

2
src/app/babylon/controller/mode-manager.ts

@ -23,7 +23,7 @@ export class ModeManager {
/** /**
* *
*/ */
public static s_isMakeMode = true; public static s_isMakeMode = false;
/** /**
* *

12
src/app/babylon/model/data/mark/mark-plan-data.ts

@ -354,6 +354,7 @@ export class MarkNodeData {
/** /**
* *
* 3
*/ */
getShowTime() { getShowTime() {
let textNum = 0; let textNum = 0;
@ -361,9 +362,16 @@ export class MarkNodeData {
textNum = this.describe.length; textNum = this.describe.length;
} }
let timeScale = 1; let timeScale = 0.3;
return textNum * timeScale; let minTime = 3; //最短停留时间
let result = textNum * timeScale;
if (result < minTime) {
result = minTime;
}
return result;
} }
} }

2
src/app/babylon/view/mark-window/mark-window.ts

@ -9,6 +9,7 @@ import { Event_GetAllMarkPlanData } from "../../controller/event-manager/events/
import { Event_KeyboardInput } from "../../controller/event-manager/events/event-keyboard-input"; import { Event_KeyboardInput } from "../../controller/event-manager/events/event-keyboard-input";
import { Event_MarkInfoChange, MarkInfoChangeType } from "../../controller/event-manager/events/event-mark-info-change"; import { Event_MarkInfoChange, MarkInfoChangeType } from "../../controller/event-manager/events/event-mark-info-change";
import { InputController } from "../../controller/inputController"; import { InputController } from "../../controller/inputController";
import { ModeManager } from "../../controller/mode-manager";
import { SceneManager } from "../../controller/scene-manager"; import { SceneManager } from "../../controller/scene-manager";
import { BuildingStatus } from "../../controller/status/building-status"; import { BuildingStatus } from "../../controller/status/building-status";
import { IndoorStatus } from "../../controller/status/indoor-status"; import { IndoorStatus } from "../../controller/status/indoor-status";
@ -149,6 +150,7 @@ export class MarkWindow extends UIBase {
instance.onUpdateShow(); instance.onUpdateShow();
}) })
} }

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

@ -642,42 +642,33 @@ export class taskDialog {
//设备任务list //设备任务list
export class taskList { export class taskList {
character: any[] = [ character: any[] = [
{ taskName: "外部控火" }, { taskName: "加油" },
{ taskName: "内部控火" }, { taskName: "卸油" },
{ taskName: "外部侦察" }, { taskName: "按下紧急切断按钮" },
{ taskName: "内部侦察" }, { taskName: "呼喊示警" },
{ taskName: "外部观察" }, { taskName: "停止加油" },
{ taskName: "外部疏散救生" }, { taskName: "关闭泄油阀" },
{ taskName: "询问知情人" }, { taskName: "指挥疏通撤离" },
{ taskName: "占领消控室" }, { taskName: "向运营、QHSE报告" },
{ taskName: "水源引导" }, { taskName: "撤离" },
{ taskName: "断电气" }, { taskName: "119报警" },
{ taskName: "110报警" },
{ taskName: "120报警" },
{ taskName: "使用灭火毯" },
{ taskName: "使用灭火器" },
{ taskName: "灭火" }, { taskName: "灭火" },
{ taskName: "掩护" }, { taskName: "协助灭火" },
{ taskName: "警戒" }, { taskName: "确认安全" },
{ taskName: "破拆" }, { taskName: "保持冷静" },
{ taskName: "排烟" },
{ taskName: "照明" },
{ taskName: "通信" },
{ taskName: "待命" }, { taskName: "待命" },
]; ];
car: any[] = [ car: any[] = [
{ taskName: "内攻" }, { taskName: "加油" },
{ taskName: "出枪掩护" }, { taskName: "停止加油" },
{ taskName: "出枪冷却" }, { taskName: "灭火" },
{ taskName: "出枪灭火" }, { taskName: "逃逸" },
{ taskName: "供水" }, { taskName: "撤离" },
{ taskName: "供泡沫" }, { taskName: "损毁" },
{ taskName: "连接消火栓" },
{ taskName: "遥控水炮冷却" },
{ taskName: "遥控水炮灭火" },
{ taskName: "抢险救援" },
{ taskName: "救人" },
{ taskName: "指挥" },
{ taskName: "排烟" },
{ taskName: "提供器材" },
{ taskName: "照明" },
{ taskName: "供电" },
{ taskName: "待命" }, { taskName: "待命" },
] ]
firemonitor: any[] = [ firemonitor: any[] = [

Loading…
Cancel
Save