diff --git a/src/components/Iscs/IscsBottomAlarm.vue b/src/components/Iscs/IscsBottomAlarm.vue
new file mode 100644
index 0000000..4257433
--- /dev/null
+++ b/src/components/Iscs/IscsBottomAlarm.vue
@@ -0,0 +1,3 @@
+
+ 状态栏
+
diff --git a/src/configs/iscsStyleConfig.ts b/src/configs/iscsStyleConfig.ts
index 1ea6482..34b1d67 100644
--- a/src/configs/iscsStyleConfig.ts
+++ b/src/configs/iscsStyleConfig.ts
@@ -1,118 +1,182 @@
import { IscsStyle } from 'src/api/DraftApi';
+export interface I_DA_SHI_ZHI_NENG {
+ menuName: string;
+ icon: string;
+ activeIcon: string;
+ sunMenu: {
+ sunMenuName: string;
+ displayForm: DisplayForm;
+ heightPercent?: number; //绘制占的百分比
+ }[];
+}
+
+export enum DisplayForm {
+ draw,
+ component,
+ drawAndComponent,
+}
+
//达实智能(福州一号线)
-const DA_SHI_ZHI_NENG = [
+const DA_SHI_ZHI_NENG: I_DA_SHI_ZHI_NENG[] = [
{
menuName: 'Plan',
icon: 'svguse:../iscsMenuIcon.svg#icon-Plan',
activeIcon: 'svguse:../iscsMenuIcon.svg#icon-Plan-active',
- sunMenu: [{ sunMenuName: '子目录' }],
+ sunMenu: [
+ { sunMenuName: '设备运行图', displayForm: DisplayForm.draw },
+ { sunMenuName: '站厅布局图', displayForm: DisplayForm.draw },
+ { sunMenuName: '站台布局图', displayForm: DisplayForm.draw },
+ { sunMenuName: '出入口布局图', displayForm: DisplayForm.draw },
+ ],
},
{
menuName: 'PSCADA',
icon: 'svguse:../iscsMenuIcon.svg#icon-PSCADA',
activeIcon: 'svguse:../iscsMenuIcon.svg#icon-PSCADA-active',
- sunMenu: [{ sunMenuName: '子目录' }],
+ sunMenu: [
+ { sunMenuName: '一次图', displayForm: DisplayForm.draw },
+ { sunMenuName: '自动化系统图', displayForm: DisplayForm.draw },
+ { sunMenuName: '定值召唤', displayForm: DisplayForm.draw },
+ { sunMenuName: '实时SOE', displayForm: DisplayForm.draw },
+ { sunMenuName: '历史SOE', displayForm: DisplayForm.draw },
+ { sunMenuName: '光字幕', displayForm: DisplayForm.draw },
+ { sunMenuName: '交流直屏', displayForm: DisplayForm.draw },
+ ],
},
{
menuName: 'BAS',
icon: 'svguse:../iscsMenuIcon.svg#icon-BAS',
activeIcon: 'svguse:../iscsMenuIcon.svg#icon-BAS-active',
- sunMenu: [{ sunMenuName: '子目录' }],
+ sunMenu: [
+ { sunMenuName: '大系统', displayForm: DisplayForm.draw },
+ { sunMenuName: '小系统', displayForm: DisplayForm.draw },
+ { sunMenuName: '隧道通风系统', displayForm: DisplayForm.draw },
+ { sunMenuName: '水系统', displayForm: DisplayForm.draw },
+ { sunMenuName: '给排水', displayForm: DisplayForm.draw },
+ { sunMenuName: '电扶梯', displayForm: DisplayForm.draw },
+ { sunMenuName: '照明系统', displayForm: DisplayForm.draw },
+ { sunMenuName: '传感器', displayForm: DisplayForm.draw },
+ { sunMenuName: '导向标识/广告', displayForm: DisplayForm.draw },
+ { sunMenuName: '人防门', displayForm: DisplayForm.draw },
+ { sunMenuName: 'BAS系统', displayForm: DisplayForm.draw },
+ { sunMenuName: '模式控制', displayForm: DisplayForm.draw },
+ { sunMenuName: '时间表', displayForm: DisplayForm.draw },
+ { sunMenuName: '操作场所切换', displayForm: DisplayForm.draw },
+ ],
},
{
menuName: 'FAS',
icon: 'svguse:../iscsMenuIcon.svg#icon-FAS',
activeIcon: 'svguse:../iscsMenuIcon.svg#icon-FAS-active',
sunMenu: [
- { sunMenuName: '设备分区图' },
- { sunMenuName: '火灾报警平面图' },
- { sunMenuName: 'FAS气灭系统图' },
+ { sunMenuName: '设备分区图', displayForm: DisplayForm.draw },
+ { sunMenuName: '火灾报警平面图', displayForm: DisplayForm.draw },
+ { sunMenuName: 'FAS气灭系统图', displayForm: DisplayForm.draw },
],
},
{
menuName: 'TFDS',
icon: 'svguse:../iscsMenuIcon.svg#icon-TFDS',
activeIcon: 'svguse:../iscsMenuIcon.svg#icon-TFDS-active',
- sunMenu: [{ sunMenuName: '子目录' }],
+ sunMenu: [
+ { sunMenuName: '感温光纤状态监视图', displayForm: DisplayForm.draw },
+ ],
},
{
menuName: 'AFC',
icon: 'svguse:../iscsMenuIcon.svg#icon-AFC',
activeIcon: 'svguse:../iscsMenuIcon.svg#icon-AFC-active',
- sunMenu: [{ sunMenuName: '屏蔽门' }],
+ sunMenu: [
+ { sunMenuName: '自动售检票系统监视图', displayForm: DisplayForm.draw },
+ ],
},
{
menuName: 'CCTV',
icon: 'svguse:../iscsMenuIcon.svg#icon-CCTV',
activeIcon: 'svguse:../iscsMenuIcon.svg#icon-CCTV-active',
- sunMenu: [{ sunMenuName: '监控布局图' }, { sunMenuName: 'CCTV设备布局图' }],
+ sunMenu: [
+ { sunMenuName: '监控布局图', displayForm: DisplayForm.draw },
+ { sunMenuName: 'CCTV设备布局图', displayForm: DisplayForm.draw },
+ ],
},
{
menuName: 'PIS',
icon: 'svguse:../iscsMenuIcon.svg#icon-PIS',
activeIcon: 'svguse:../iscsMenuIcon.svg#icon-PIS-active',
- sunMenu: [{ sunMenuName: '子目录' }],
+ sunMenu: [{ sunMenuName: 'PIS监控', displayForm: DisplayForm.draw }],
},
{
menuName: 'PA',
icon: 'svguse:../iscsMenuIcon.svg#icon-PA',
activeIcon: 'svguse:../iscsMenuIcon.svg#icon-PA-active',
- sunMenu: [{ sunMenuName: '子目录' }],
+ sunMenu: [{ sunMenuName: 'PA监控', displayForm: DisplayForm.draw }],
},
{
menuName: 'SIG/RAD',
icon: 'svguse:../iscsMenuIcon.svg#icon-SIG/RAD',
activeIcon: 'svguse:../iscsMenuIcon.svg#icon-SIG/RAD-active',
- sunMenu: [{ sunMenuName: '子目录' }],
+ sunMenu: [{ sunMenuName: '子目录', displayForm: DisplayForm.component }],
},
{
menuName: 'ACS',
icon: 'svguse:../iscsMenuIcon.svg#icon-ACS',
activeIcon: 'svguse:../iscsMenuIcon.svg#icon-ACS-active',
- sunMenu: [{ sunMenuName: '子目录' }],
+ sunMenu: [
+ { sunMenuName: '门禁总览图', displayForm: DisplayForm.draw },
+ { sunMenuName: '门禁监视布局图-站厅', displayForm: DisplayForm.draw },
+ { sunMenuName: '门禁监视布局图-站台', displayForm: DisplayForm.draw },
+ ],
},
{
menuName: 'PSD',
icon: 'svguse:../iscsMenuIcon.svg#icon-PSD',
activeIcon: 'svguse:../iscsMenuIcon.svg#icon-PSD-active',
- sunMenu: [{ sunMenuName: '子目录' }],
+ sunMenu: [{ sunMenuName: '屏蔽门系统图', displayForm: DisplayForm.draw }],
},
{
menuName: 'FG',
icon: 'svguse:../iscsMenuIcon.svg#icon-FG',
activeIcon: 'svguse:../iscsMenuIcon.svg#icon-FG-active',
- sunMenu: [{ sunMenuName: '子目录' }],
+ sunMenu: [
+ { sunMenuName: '防淹门状态监视图', displayForm: DisplayForm.draw },
+ ],
},
{
menuName: 'ALM',
icon: 'svguse:../iscsMenuIcon.svg#icon-ALM',
activeIcon: 'svguse:../iscsMenuIcon.svg#icon-ALM-active',
- sunMenu: [{ sunMenuName: '子目录' }],
+ sunMenu: [{ sunMenuName: '子目录', displayForm: DisplayForm.component }],
},
{
menuName: 'NMS',
icon: 'svguse:../iscsMenuIcon.svg#icon-NMS',
activeIcon: 'svguse:../iscsMenuIcon.svg#icon-NMS-active',
- sunMenu: [{ sunMenuName: '子目录' }],
+ sunMenu: [{ sunMenuName: '网络状态监视图', displayForm: DisplayForm.draw }],
},
{
menuName: 'OPS',
icon: 'svguse:../iscsMenuIcon.svg#icon-OPS',
activeIcon: 'svguse:../iscsMenuIcon.svg#icon-OPS-active',
- sunMenu: [{ sunMenuName: '子目录' }],
+ sunMenu: [{ sunMenuName: '子目录', displayForm: DisplayForm.component }],
},
{
menuName: '数据',
icon: 'svguse:../iscsMenuIcon.svg#icon-Data',
activeIcon: 'svguse:../iscsMenuIcon.svg#icon-Data-active',
- sunMenu: [{ sunMenuName: '子目录' }],
+ sunMenu: [{ sunMenuName: '子目录', displayForm: DisplayForm.component }],
},
{
menuName: '联动',
icon: 'svguse:../iscsMenuIcon.svg#icon-Linkage',
activeIcon: 'svguse:../iscsMenuIcon.svg#icon-Linkage-active',
- sunMenu: [{ sunMenuName: '子目录' }],
+ sunMenu: [
+ {
+ sunMenuName: '子目录',
+ displayForm: DisplayForm.drawAndComponent,
+ heightPercent: 50,
+ },
+ ],
},
];
diff --git a/src/graphics/line/LineDrawAssistant.ts b/src/graphics/line/LineDrawAssistant.ts
index 2fa48bb..e6384e9 100644
--- a/src/graphics/line/LineDrawAssistant.ts
+++ b/src/graphics/line/LineDrawAssistant.ts
@@ -110,6 +110,14 @@ export class LineDraw extends GraphicDrawAssistant {
}
}
+ onRightClick(): void {
+ if (this.points.length < 2) {
+ this.finish();
+ return;
+ }
+ this.createAndStore(true);
+ }
+
onEsc(): void {
if (this.points.length < 2) {
this.finish();
diff --git a/src/layouts/IscsDrawLayout.vue b/src/layouts/IscsDrawLayout.vue
index 0075626..ee90b38 100644
--- a/src/layouts/IscsDrawLayout.vue
+++ b/src/layouts/IscsDrawLayout.vue
@@ -8,6 +8,14 @@
{{ currentTime }}