From acf3109c0b72a0e66bf97731308adbee28635ff7 Mon Sep 17 00:00:00 2001
From: joylink_fanyuhong <18706759286@163.com>
Date: Tue, 20 Aug 2024 15:13:45 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0ats=E5=AE=A2=E6=88=B7?=
=?UTF-8?q?=E7=AB=AF=20=E5=8F=AA=E8=83=BD=E6=93=8D=E4=BD=9C=E7=89=B9?=
=?UTF-8?q?=E6=AE=8A=E6=93=8D=E4=BD=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../theme/beijing_01/menus/atsWorkMenu.vue | 373 ++++++++++++
.../theme/chengdu_01/menus/atsWorkMenu.vue | 435 ++++++++++++++
.../theme/chengdu_01/menus/menuSignal.vue | 24 +-
.../theme/chengdu_01/menus/menuSwitch.vue | 12 +-
.../theme/chengdu_03/menus/atsWorkMenu.vue | 346 +++++++++++
src/jmapNew/theme/factory.js | 3 +
.../theme/foshan_01/menus/atsWorkMenu.vue | 357 ++++++++++++
.../theme/foshan_01/menus/menuSection.vue | 6 +-
.../theme/foshan_01/menus/menuSignal.vue | 10 +-
.../foshan_01/menus/menuStationStand.vue | 4 +-
.../theme/fuzhou_01/menus/atsWorkMenu.vue | 352 +++++++++++
.../theme/fuzhou_01/menus/menuSection.vue | 16 +-
.../theme/fuzhou_01/menus/menuSignal.vue | 14 +-
.../fuzhou_01/menus/menuStationStand.vue | 8 +-
.../theme/fuzhou_01/menus/menuSwitch.vue | 22 +-
.../theme/haerbin_01/menus/atsWorkMenu.vue | 366 ++++++++++++
.../theme/nanjing_02/menus/atsWorkMenu.vue | 434 ++++++++++++++
.../theme/ningbo_01/menus/atsWorkMenu.vue | 435 ++++++++++++++
.../theme/ningbo_01/menus/menuSection.vue | 4 +-
.../theme/ningbo_01/menus/menuSignal.vue | 27 +-
.../ningbo_01/menus/menuStationControl.vue | 9 +-
.../ningbo_01/menus/menuStationStand.vue | 6 +-
.../theme/ningbo_03/menus/atsWorkMenu.vue | 435 ++++++++++++++
.../theme/ningbo_03/menus/menuLimit.vue | 3 +-
.../theme/ningbo_03/menus/menuSection.vue | 27 +-
.../theme/ningbo_03/menus/menuSignal.vue | 42 +-
.../ningbo_03/menus/menuStationStand.vue | 24 +-
.../theme/ningbo_03/menus/menuSwitch.vue | 24 +-
.../theme/race_01/menus/atsWorkMenu.vue | 360 ++++++++++++
.../theme/race_01/menus/menuSection.vue | 4 +-
.../theme/race_01/menus/menuSignal.vue | 14 +-
.../theme/race_01/menus/menuStation.vue | 2 +-
.../theme/race_01/menus/menuStationStand.vue | 2 +-
.../theme/race_01/menus/menuSwitch.vue | 6 +-
.../theme/xian_01/menus/atsWorkMenu.vue | 491 ++++++++++++++++
.../theme/xian_01/menus/menuSignal.vue | 21 +
.../theme/xian_01/menus/menuSwitch.vue | 24 +
.../theme/xian_02/menus/atsWorkMenu.vue | 550 ++++++++++++++++++
.../theme/xian_02/menus/menuSignal.vue | 27 +
.../theme/xian_02/menus/menuStation.vue | 11 +-
.../theme/xian_02/menus/menuSwitch.vue | 12 +-
.../newMap/display/terminals/atsWork.vue | 74 +++
src/views/newMap/display/terminals/index.vue | 5 +-
.../newMap/display/terminals/terminalMenu.vue | 3 +-
.../mapoperate/terminals/terminals.vue | 6 +
45 files changed, 5294 insertions(+), 136 deletions(-)
create mode 100644 src/jmapNew/theme/beijing_01/menus/atsWorkMenu.vue
create mode 100644 src/jmapNew/theme/chengdu_01/menus/atsWorkMenu.vue
create mode 100644 src/jmapNew/theme/chengdu_03/menus/atsWorkMenu.vue
create mode 100644 src/jmapNew/theme/foshan_01/menus/atsWorkMenu.vue
create mode 100644 src/jmapNew/theme/fuzhou_01/menus/atsWorkMenu.vue
create mode 100644 src/jmapNew/theme/haerbin_01/menus/atsWorkMenu.vue
create mode 100644 src/jmapNew/theme/nanjing_02/menus/atsWorkMenu.vue
create mode 100644 src/jmapNew/theme/ningbo_01/menus/atsWorkMenu.vue
create mode 100644 src/jmapNew/theme/ningbo_03/menus/atsWorkMenu.vue
create mode 100644 src/jmapNew/theme/race_01/menus/atsWorkMenu.vue
create mode 100644 src/jmapNew/theme/xian_01/menus/atsWorkMenu.vue
create mode 100644 src/jmapNew/theme/xian_02/menus/atsWorkMenu.vue
create mode 100644 src/views/newMap/display/terminals/atsWork.vue
diff --git a/src/jmapNew/theme/beijing_01/menus/atsWorkMenu.vue b/src/jmapNew/theme/beijing_01/menus/atsWorkMenu.vue
new file mode 100644
index 000000000..e982ff7cc
--- /dev/null
+++ b/src/jmapNew/theme/beijing_01/menus/atsWorkMenu.vue
@@ -0,0 +1,373 @@
+
+
+
+
+
+
+
diff --git a/src/jmapNew/theme/chengdu_01/menus/atsWorkMenu.vue b/src/jmapNew/theme/chengdu_01/menus/atsWorkMenu.vue
new file mode 100644
index 000000000..2468cae09
--- /dev/null
+++ b/src/jmapNew/theme/chengdu_01/menus/atsWorkMenu.vue
@@ -0,0 +1,435 @@
+
+
+
+
+
+
+
diff --git a/src/jmapNew/theme/chengdu_01/menus/menuSignal.vue b/src/jmapNew/theme/chengdu_01/menus/menuSignal.vue
index 1b6b4383c..afa33dac3 100644
--- a/src/jmapNew/theme/chengdu_01/menus/menuSignal.vue
+++ b/src/jmapNew/theme/chengdu_01/menus/menuSignal.vue
@@ -52,7 +52,8 @@ export default {
cmdType: CMD.Signal.CMD_SIGNAL_SET_ROUTE,
isDisabled: (signal, work) => {
return false;
- }
+ },
+ isShow: (signal, work) => work !== 'atsWork'
},
{
label: '取消进路',
@@ -60,7 +61,8 @@ export default {
cmdType: CMD.Signal.CMD_SIGNAL_CANCEL_ROUTE,
isDisabled: (signal, work) => {
return false;
- }
+ },
+ isShow: (signal, work) => work !== 'atsWork'
},
{
label: '开放自动进路',
@@ -68,7 +70,8 @@ export default {
cmdType: CMD.Signal.CMD_SIGNAL_SET_CI_AUTO,
isDisabled: (signal, work) => {
return false;
- }
+ },
+ isShow: (signal, work) => work !== 'atsWork'
},
{
label: '关闭自动进路',
@@ -76,7 +79,8 @@ export default {
cmdType: CMD.Signal.CMD_SIGNAL_CANCEL_CI_AUTO,
isDisabled: (signal, work) => {
return false;
- }
+ },
+ isShow: (signal, work) => work !== 'atsWork'
},
{
label: '终端信号封锁',
@@ -84,7 +88,8 @@ export default {
cmdType: CMD.Signal.CMD_SIGNAL_BLOCK,
isDisabled: (signal, work) => {
return signal.blockade !== 0;
- }
+ },
+ isShow: (signal, work) => work !== 'atsWork'
},
{
label: '终端信号解封',
@@ -92,7 +97,8 @@ export default {
cmdType: CMD.Signal.CMD_SIGNAL_UNBLOCK,
isDisabled: (signal, work) => {
return signal.blockade === 0;
- }
+ },
+ isShow: (signal, work) => work !== 'atsWork'
},
{
label: '引导信号',
@@ -100,7 +106,8 @@ export default {
cmdType: CMD.Signal.CMD_SIGNAL_ROUTE_GUIDE,
isDisabled: (signal, work) => {
return false;
- }
+ },
+ isShow: (signal, work) => work !== 'atsWork'
},
{
label: '设备标签',
@@ -113,7 +120,8 @@ export default {
cmdType: '',
show: false
}
- ]
+ ],
+ isShow: (signal, work) => work !== 'atsWork'
},
{
label: '模拟',
diff --git a/src/jmapNew/theme/chengdu_01/menus/menuSwitch.vue b/src/jmapNew/theme/chengdu_01/menus/menuSwitch.vue
index 17c9cf380..d91191754 100644
--- a/src/jmapNew/theme/chengdu_01/menus/menuSwitch.vue
+++ b/src/jmapNew/theme/chengdu_01/menus/menuSwitch.vue
@@ -66,7 +66,8 @@ export default {
} else {
return switchDevice.normalPosition === 1;
}
- }
+ },
+ isShow: (switchDevice, work) => work !== 'atsWork'
},
{
label: '道岔反位',
@@ -78,7 +79,8 @@ export default {
} else {
return switchDevice.reversePosition === 1;
}
- }
+ },
+ isShow: (switchDevice, work) => work !== 'atsWork'
},
{
label: '道岔单锁',
@@ -90,7 +92,8 @@ export default {
} else {
return switchDevice.singleLock !== 0;
}
- }
+ },
+ isShow: (switchDevice, work) => work !== 'atsWork'
},
{
label: '道岔单解',
@@ -102,7 +105,8 @@ export default {
} else {
return switchDevice.singleLock !== 1;
}
- }
+ },
+ isShow: (switchDevice, work) => work !== 'atsWork'
}
],
menuForce: [
diff --git a/src/jmapNew/theme/chengdu_03/menus/atsWorkMenu.vue b/src/jmapNew/theme/chengdu_03/menus/atsWorkMenu.vue
new file mode 100644
index 000000000..057f4fbf6
--- /dev/null
+++ b/src/jmapNew/theme/chengdu_03/menus/atsWorkMenu.vue
@@ -0,0 +1,346 @@
+
+
+
+
+
diff --git a/src/jmapNew/theme/factory.js b/src/jmapNew/theme/factory.js
index 68936a674..4f015ca25 100644
--- a/src/jmapNew/theme/factory.js
+++ b/src/jmapNew/theme/factory.js
@@ -121,6 +121,9 @@ class Theme {
loadDriverAtsWorkMenuComponent(code) {
return Object.assign({}, require(`./components/menus/driverAtsWorMenu`).default);
}
+ loadAtsWorkMenuComponent(code) {
+ return Object.assign({}, require(`./${this._mapMenu[code || this._code]}/menus/atsWorkMenu`).default);
+ }
loadCtcWorkMenuComponent(code) {
if (code == '16') {
return Object.assign({}, require(`./${this._mapMenu[code || this._code]}/menus/ctcWorkMenu`).default);
diff --git a/src/jmapNew/theme/foshan_01/menus/atsWorkMenu.vue b/src/jmapNew/theme/foshan_01/menus/atsWorkMenu.vue
new file mode 100644
index 000000000..5badf290b
--- /dev/null
+++ b/src/jmapNew/theme/foshan_01/menus/atsWorkMenu.vue
@@ -0,0 +1,357 @@
+
+
+
+
+
diff --git a/src/jmapNew/theme/foshan_01/menus/menuSection.vue b/src/jmapNew/theme/foshan_01/menus/menuSection.vue
index b42c1d169..03de823ba 100644
--- a/src/jmapNew/theme/foshan_01/menus/menuSection.vue
+++ b/src/jmapNew/theme/foshan_01/menus/menuSection.vue
@@ -65,21 +65,21 @@ export default {
handler: this.active,
cmdType: CMD.Section.CMD_SECTION_ACTIVE,
isDisabled: sectionDevice => sectionDevice.cutOff !== 1,
- isShow: (signal, work) => true
+ isShow: (signal, work) => work !== 'atsWork'
},
{
label: '区段切除',
handler: this.split,
cmdType: CMD.Section.CMD_SECTION_CUT_OFF,
isDisabled: sectionDevice => sectionDevice.cutOff === 1,
- isShow: (signal, work) => true
+ isShow: (signal, work) => work !== 'atsWork'
},
{
label: '设置临时限速',
handler: this.setSpeed,
cmdType: CMD.Section.CMD_SECTION_SET_LIMIT_SPEED,
isDisabled: (sectionDevice, work) => false,
- isShow: (signal, work) => true
+ isShow: (signal, work) => work !== 'atsWork'
},
{
diff --git a/src/jmapNew/theme/foshan_01/menus/menuSignal.vue b/src/jmapNew/theme/foshan_01/menus/menuSignal.vue
index f2c75cf24..365ca9139 100644
--- a/src/jmapNew/theme/foshan_01/menus/menuSignal.vue
+++ b/src/jmapNew/theme/foshan_01/menus/menuSignal.vue
@@ -68,7 +68,7 @@ export default {
handler: this.arrangementRoute,
cmdType:CMD.Signal.CMD_SIGNAL_SET_ROUTE,
isDisabled: (signal, work) => false,
- isShow: (signal, work) => true
+ isShow: (signal, work) => work !== 'atsWork'
},
{
label: '进路取消',
@@ -82,7 +82,7 @@ export default {
handler: this.reopenSignal,
isDisabled: (signal, work) => false,
cmdType: CMD.Signal.CMD_SIGNAL_REOPEN_SIGNAL,
- isShow: (signal, work) => true
+ isShow: (signal, work) => work !== 'atsWork'
},
{
label: '进路引导',
@@ -96,14 +96,14 @@ export default {
handler: this.humanControl,
cmdType: CMD.Signal.CMD_SIGNAL_CLOSE_AUTO_SETTING,
isDisabled: (signal, work) => false,
- isShow: (signal, work) => true
+ isShow: (signal, work) => work !== 'atsWork'
},
{
label: '进路交自动控',
handler: this.atsAutoControl,
cmdType: CMD.Signal.CMD_SIGNAL_OPEN_AUTO_SETTING,
isDisabled: (signal, work) => false,
- isShow: (signal, work) => true
+ isShow: (signal, work) => work !== 'atsWork'
},
{
label: '设置联锁自动进路',
@@ -138,7 +138,7 @@ export default {
handler: this.detail,
cmdType: CMD.Signal.CMD_SIGNAL_DETAIL,
isDisabled: (signal, work) => false,
- isShow: (signal, work) => true
+ isShow: (signal, work) => work !== 'atsWork'
}
// Local: [
// // {
diff --git a/src/jmapNew/theme/foshan_01/menus/menuStationStand.vue b/src/jmapNew/theme/foshan_01/menus/menuStationStand.vue
index 4153f8c6c..89ecd27ff 100644
--- a/src/jmapNew/theme/foshan_01/menus/menuStationStand.vue
+++ b/src/jmapNew/theme/foshan_01/menus/menuStationStand.vue
@@ -97,7 +97,7 @@ export default {
isDisabled: (stand, work) => {
return false;
},
- isShow: (stand, work) => { return true; }
+ isShow: (stand, work) => { return work !== 'atsWork'; }
},
{
label: '强制取消扣车',
@@ -153,7 +153,7 @@ export default {
handler: this.detail,
cmdType:CMD.Stand.CMD_STAND_VIEW_STATUS,
isDisabled: (stand, work) => false,
- isShow: (stand, work) => true
+ isShow: (stand, work) => work !== 'atsWork'
}
],
menuForce: [
diff --git a/src/jmapNew/theme/fuzhou_01/menus/atsWorkMenu.vue b/src/jmapNew/theme/fuzhou_01/menus/atsWorkMenu.vue
new file mode 100644
index 000000000..26369c9fc
--- /dev/null
+++ b/src/jmapNew/theme/fuzhou_01/menus/atsWorkMenu.vue
@@ -0,0 +1,352 @@
+
+
+
+
+
+
+
diff --git a/src/jmapNew/theme/fuzhou_01/menus/menuSection.vue b/src/jmapNew/theme/fuzhou_01/menus/menuSection.vue
index d34abda9a..3c8f292fb 100644
--- a/src/jmapNew/theme/fuzhou_01/menus/menuSection.vue
+++ b/src/jmapNew/theme/fuzhou_01/menus/menuSection.vue
@@ -63,28 +63,28 @@ export default {
handler: this.fault,
cmdType: CMD.Section.CMD_SECTION_FAULT_UNLOCK,
isDisabled: (section, work) => false,
- isShow: (section, work) => ['01', '02', '03'].includes(section.type)
+ isShow: (section, work) => ['01', '02', '03'].includes(section.type) && work !== 'atsWork'
},
{
label: this.$t('menu.menuSection.sectionResection'),
handler: this.split,
cmdType: CMD.Section.CMD_SECTION_CUT_OFF,
isDisabled: (section, work) => section.cutOff === 1,
- isShow: (section, work) => ['01', '02', '03'].includes(section.type)
+ isShow: (section, work) => ['01', '02', '03'].includes(section.type) && work !== 'atsWork'
},
{
label: this.$t('menu.menuSection.sectionActive'),
handler: this.active,
cmdType: CMD.Section.CMD_SECTION_ACTIVE,
isDisabled: (section, work) => section.cutOff !== 1,
- isShow: (section, work) => ['01', '02', '03'].includes(section.type)
+ isShow: (section, work) => ['01', '02', '03'].includes(section.type) && work !== 'atsWork'
},
{
label: '计轴预复位',
handler: this.axlePreReset,
cmdType: CMD.Section.CMD_SECTION_AXIS_PRE_RESET,
isDisabled: (section, work) => false,
- isShow: (section, work) => ['01', '02', '03'].includes(section.type)
+ isShow: (section, work) => ['01', '02', '03'].includes(section.type) && work !== 'atsWork'
},
{
label: this.$t('menu.menuSection.sectionBlockade'),
@@ -92,28 +92,28 @@ export default {
cmdType: CMD.Section.CMD_SECTION_BLOCK,
// isDisabled: section => section.blockade === 1,
isDisabled: (section, work) => section.blockade === 1,
- isShow: (section, work) => ['01', '02', '03'].includes(section.type)
+ isShow: (section, work) => ['01', '02', '03'].includes(section.type) && work !== 'atsWork'
},
{
label: this.$t('menu.menuSection.sectionUnblock'),
handler: this.unlock,
cmdType: CMD.Section.CMD_SECTION_UNBLOCK,
isDisabled: (section, work) => section.blockade !== 1,
- isShow: (section, work) => ['01', '02', '03'].includes(section.type)
+ isShow: (section, work) => ['01', '02', '03'].includes(section.type) && work !== 'atsWork'
},
{
label: '设置限速',
handler: this.setSpeed,
cmdType: CMD.Section.CMD_SECTION_SET_LIMIT_SPEED,
isDisabled: (section, work) => section.speedUpLimit > 0,
- isShow: (section, work) => section.type === '02'
+ isShow: (section, work) => section.type === '02' && work !== 'atsWork'
},
{
label: '取消限速',
handler: this.cancelSpeed,
cmdType: CMD.Section.CMD_SECTION_CANCEL_LIMIT_SPEED,
isDisabled: (section, work) => section.speedUpLimit <= 0,
- isShow: (section, work) => section.type === '02'
+ isShow: (section, work) => section.type === '02' && work !== 'atsWork'
}
],
menuForce: [
diff --git a/src/jmapNew/theme/fuzhou_01/menus/menuSignal.vue b/src/jmapNew/theme/fuzhou_01/menus/menuSignal.vue
index 72d279552..befa4600a 100644
--- a/src/jmapNew/theme/fuzhou_01/menus/menuSignal.vue
+++ b/src/jmapNew/theme/fuzhou_01/menus/menuSignal.vue
@@ -67,42 +67,42 @@ export default {
handler: this.arrangementRoute,
cmdType: CMD.Signal.CMD_SIGNAL_SET_ROUTE,
isDisabled: (signal, work) => false,
- isShow: (signal, work) => true
+ isShow: (signal, work) => work !== 'atsWork'
},
{
label: this.$t('menu.menuSignal.routeCancel'),
handler: this.cancelTrainRoute,
cmdType: CMD.Signal.CMD_SIGNAL_CANCEL_ROUTE,
isDisabled: (signal, work) => false,
- isShow: (signal, work) => true
+ isShow: (signal, work) => work !== 'atsWork'
},
{
label: this.$t('menu.menuSignal.signalBlock'),
handler: this.lock,
cmdType: CMD.Signal.CMD_SIGNAL_BLOCK,
isDisabled: (signal, work) => signal.blockade === 1,
- isShow: (signal, work) => true
+ isShow: (signal, work) => work !== 'atsWork'
},
{
label: this.$t('menu.menuSignal.signalDeblock'),
handler: this.unlock,
cmdType: CMD.Signal.CMD_SIGNAL_UNBLOCK,
isDisabled: (signal, work) => signal.blockade !== 1,
- isShow: (signal, work) => true
+ isShow: (signal, work) => work !== 'atsWork'
},
{
label: this.$t('menu.menuSignal.signalReopen'),
handler: this.reopenSignal,
cmdType: CMD.Signal.CMD_SIGNAL_REOPEN_SIGNAL,
isDisabled: (signal, work) => false,
- isShow: (signal, work) => true
+ isShow: (signal, work) => work !== 'atsWork'
},
{
label: this.$t('menu.menuSignal.signalOff'),
handler: this.signalClose,
cmdType: CMD.Signal.CMD_SIGNAL_CLOSE_SIGNAL,
isDisabled: (signal, work) => false,
- isShow: (signal, work) => true
+ isShow: (signal, work) => work !== 'atsWork'
},
{
label: '进路引导',
@@ -165,7 +165,7 @@ export default {
handler: this.detail,
cmdType: CMD.Signal.CMD_SIGNAL_DETAIL,
isDisabled: (signal, work) => false,
- isShow: (signal, work) => true
+ isShow: (signal, work) => work !== 'atsWork'
}
],
menuForce: [
diff --git a/src/jmapNew/theme/fuzhou_01/menus/menuStationStand.vue b/src/jmapNew/theme/fuzhou_01/menus/menuStationStand.vue
index d429ead2c..417ecb07b 100644
--- a/src/jmapNew/theme/fuzhou_01/menus/menuStationStand.vue
+++ b/src/jmapNew/theme/fuzhou_01/menus/menuStationStand.vue
@@ -95,21 +95,21 @@ export default {
handler: this.cancelDetainTrainForce,
cmdType:CMD.Stand.CMD_STAND_FORCE_CANCEL_HOLD_TRAIN,
isDisabled: (stand, work) => false,
- isShow: (stand, work) => true
+ isShow: (stand, work) => work !== 'atsWork'
},
{
label: this.$t('menu.menuStationStand.jumpStop'),
handler: this.setJumpStop,
cmdType:CMD.Stand.CMD_STAND_SET_JUMP_STOP,
isDisabled: (stand, work) => stand.allSkip !== 0,
- isShow: (stand, work) => true
+ isShow: (stand, work) => work !== 'atsWork'
},
{
label: this.$t('menu.menuStationStand.cancelJumpStop'),
handler: this.cancelJumpStop,
cmdType:CMD.Stand.CMD_STAND_CANCEL_JUMP_STOP,
isDisabled: (stand, work) => stand.allSkip !== 1 && stand.assignSkip !== 1,
- isShow: (stand, work) => true
+ isShow: (stand, work) => work !== 'atsWork'
},
{
label: this.$t('menu.menuStationStand.setStopTime'),
@@ -144,7 +144,7 @@ export default {
handler: this.detail,
cmdType:CMD.Stand.CMD_STAND_VIEW_STATUS,
isDisabled: (stand, work) => false,
- isShow: (stand, work) => true
+ isShow: (stand, work) => work !== 'atsWork'
}
],
menuForce: [
diff --git a/src/jmapNew/theme/fuzhou_01/menus/menuSwitch.vue b/src/jmapNew/theme/fuzhou_01/menus/menuSwitch.vue
index d58af0481..9017604b8 100644
--- a/src/jmapNew/theme/fuzhou_01/menus/menuSwitch.vue
+++ b/src/jmapNew/theme/fuzhou_01/menus/menuSwitch.vue
@@ -59,77 +59,77 @@ export default {
handler: this.lock,
cmdType: CMD.Switch.CMD_SWITCH_SINGLE_LOCK,
isDisabled: (switchDevice, work) => switchDevice.singleLock === 1,
- isShow: (switchDevice, work) => true
+ isShow: (switchDevice, work) => work !== 'atsWork'
},
{
label: '道岔单解',
handler: this.unlock,
cmdType: CMD.Switch.CMD_SWITCH_SINGLE_UNLOCK,
isDisabled: (switchDevice, work) => switchDevice.singleLock !== 1,
- isShow: (switchDevice, work) => true
+ isShow: (switchDevice, work) => work !== 'atsWork'
},
{
label: '道岔封锁',
handler: this.block,
cmdType: CMD.Switch.CMD_SWITCH_BLOCK,
isDisabled: (switchDevice, work) => switchDevice.blockade === 1,
- isShow: (switchDevice, work) => true
+ isShow: (switchDevice, work) => work !== 'atsWork'
},
{
label: '道岔解封',
handler: this.unblock,
cmdType: CMD.Switch.CMD_SWITCH_UNBLOCK,
isDisabled: (switchDevice, work) => switchDevice.blockade !== 1,
- isShow: (switchDevice, work) => true
+ isShow: (switchDevice, work) => work !== 'atsWork'
},
{
label: '道岔转动',
handler: this.switchTurnout,
cmdType: CMD.Switch.CMD_SWITCH_TURN,
isDisabled: (switchDevice, work) => false,
- isShow: (switchDevice, work) => true
+ isShow: (switchDevice, work) => work !== 'atsWork'
},
{
label: '故障解锁',
handler: this.fault,
cmdType: CMD.Switch.CMD_SWITCH_FAULT_UNLOCK,
isDisabled: (switchDevice, work) => false,
- isShow: (switchDevice, work) => true
+ isShow: (switchDevice, work) => work !== 'atsWork'
},
{
label: '计轴预复位',
handler: this.axlePreReset,
cmdType: CMD.Switch.CMD_SWITCH_AXLE_PRE_RESET,
isDisabled: (switchDevice, work) => false,
- isShow: (switchDevice, work) => true
+ isShow: (switchDevice, work) => work !== 'atsWork'
},
{
label: this.$t('menu.menuSwitch.sectionResection'),
handler: this.split,
cmdType: CMD.Switch.CMD_SWITCH_CUT_OFF,
isDisabled: (switchDevice, work) => false,
- isShow: (switchDevice, work) => true
+ isShow: (switchDevice, work) => work !== 'atsWork'
},
{
label: this.$t('menu.menuSwitch.sectionActive'),
handler: this.active,
cmdType: CMD.Switch.CMD_SWITCH_ACTIVE,
isDisabled: (switchDevice, work) => false,
- isShow: (switchDevice, work) => true
+ isShow: (switchDevice, work) => work !== 'atsWork'
},
{
label: '设置限速',
handler: this.setSpeed,
cmdType: CMD.Switch.CMD_SWITCH_SET_LIMIT_SPEED,
isDisabled: (switchDevice, work) => false,
- isShow: (switchDevice, work) => true
+ isShow: (switchDevice, work) => work !== 'atsWork'
},
{
label: '取消限速',
handler: this.cancelSpeed,
cmdType: CMD.Switch.CMD_SWITCH_CANCEL_LIMIT_SPEED,
isDisabled: (switchDevice, work) => false,
- isShow: (switchDevice, work) => true
+ isShow: (switchDevice, work) => work !== 'atsWork'
}
],
menuForce: [
diff --git a/src/jmapNew/theme/haerbin_01/menus/atsWorkMenu.vue b/src/jmapNew/theme/haerbin_01/menus/atsWorkMenu.vue
new file mode 100644
index 000000000..c5018b434
--- /dev/null
+++ b/src/jmapNew/theme/haerbin_01/menus/atsWorkMenu.vue
@@ -0,0 +1,366 @@
+
+
+
+
+
+
+
diff --git a/src/jmapNew/theme/nanjing_02/menus/atsWorkMenu.vue b/src/jmapNew/theme/nanjing_02/menus/atsWorkMenu.vue
new file mode 100644
index 000000000..25217064e
--- /dev/null
+++ b/src/jmapNew/theme/nanjing_02/menus/atsWorkMenu.vue
@@ -0,0 +1,434 @@
+
+
+
+
+
+
+
diff --git a/src/jmapNew/theme/ningbo_01/menus/atsWorkMenu.vue b/src/jmapNew/theme/ningbo_01/menus/atsWorkMenu.vue
new file mode 100644
index 000000000..647cafd4e
--- /dev/null
+++ b/src/jmapNew/theme/ningbo_01/menus/atsWorkMenu.vue
@@ -0,0 +1,435 @@
+
+
+
+
+
+
+
diff --git a/src/jmapNew/theme/ningbo_01/menus/menuSection.vue b/src/jmapNew/theme/ningbo_01/menus/menuSection.vue
index d5b85c5fd..30e31ed3d 100644
--- a/src/jmapNew/theme/ningbo_01/menus/menuSection.vue
+++ b/src/jmapNew/theme/ningbo_01/menus/menuSection.vue
@@ -100,7 +100,7 @@ export default {
isDisabled: (section, work) => {
return section.cutOff !== 1;
},
- isShow: (section, work) => ['01', '02'].includes(section.type)
+ isShow: (section, work) => ['01', '02'].includes(section.type) && work !== 'atsWork'
},
{
label: '区段跟踪切除',
@@ -109,7 +109,7 @@ export default {
isDisabled: (section, work) => {
return section.cutOff === 1;
},
- isShow: (section, work) => ['01', '02'].includes(section.type)
+ isShow: (section, work) => ['01', '02'].includes(section.type) && work !== 'atsWork'
},
{
label: '确认计轴有效',
diff --git a/src/jmapNew/theme/ningbo_01/menus/menuSignal.vue b/src/jmapNew/theme/ningbo_01/menus/menuSignal.vue
index 499358ca4..6b1674603 100644
--- a/src/jmapNew/theme/ningbo_01/menus/menuSignal.vue
+++ b/src/jmapNew/theme/ningbo_01/menus/menuSignal.vue
@@ -69,17 +69,20 @@ export default {
{
label: '排列进路',
handler: this.arrangementRoute,
- cmdType: CMD.Signal.CMD_SIGNAL_SET_ROUTE
+ cmdType: CMD.Signal.CMD_SIGNAL_SET_ROUTE,
+ isShow: (selected, work) => work !== 'atsWork'
},
{
label: '取消列车进路',
handler: this.cancelTrainRoute,
- cmdType: CMD.Signal.CMD_SIGNAL_CANCEL_ROUTE
+ cmdType: CMD.Signal.CMD_SIGNAL_CANCEL_ROUTE,
+ isShow: (selected, work) => work !== 'atsWork'
},
{
label: '人解列车进路', // 信号机引导取消
handler: this.humanTrainRoute,
- cmdType: CMD.Signal.CMD_SIGNAL_HUMAN_RELEASE_ROUTE
+ cmdType: CMD.Signal.CMD_SIGNAL_HUMAN_RELEASE_ROUTE,
+ isShow: (selected, work) => work !== 'atsWork'
},
{
type: 'separator',
@@ -91,7 +94,8 @@ export default {
isDisabled: (signal, work) => {
return signal.fleetMode === 1;
},
- cmdType: CMD.Signal.CMD_SIGNAL_SET_CI_AUTO
+ cmdType: CMD.Signal.CMD_SIGNAL_SET_CI_AUTO,
+ isShow: (selected, work) => work !== 'atsWork'
},
{
label: '取消自动通过进路',
@@ -99,7 +103,8 @@ export default {
isDisabled: (signal, work) => {
return signal.fleetMode !== 1;
},
- cmdType: CMD.Signal.CMD_SIGNAL_CANCEL_CI_AUTO
+ cmdType: CMD.Signal.CMD_SIGNAL_CANCEL_CI_AUTO,
+ isShow: (selected, work) => work !== 'atsWork'
},
{
type: 'separator',
@@ -108,7 +113,8 @@ export default {
{
label: '信号重开',
handler: this.reopenSignal,
- cmdType: CMD.Signal.CMD_SIGNAL_REOPEN_SIGNAL
+ cmdType: CMD.Signal.CMD_SIGNAL_REOPEN_SIGNAL,
+ isShow: (selected, work) => work !== 'atsWork'
},
{
label: '封锁',
@@ -141,17 +147,20 @@ export default {
{
label: '进路交人工控',
handler: this.humanControl,
- cmdType: CMD.Signal.CMD_SIGNAL_CLOSE_AUTO_SETTING
+ cmdType: CMD.Signal.CMD_SIGNAL_CLOSE_AUTO_SETTING,
+ isShow: (selected, work) => work !== 'atsWork'
},
{
label: '进路交自动控',
handler: this.atsAutoControl,
- cmdType: CMD.Signal.CMD_SIGNAL_OPEN_AUTO_SETTING
+ cmdType: CMD.Signal.CMD_SIGNAL_OPEN_AUTO_SETTING,
+ isShow: (selected, work) => work !== 'atsWork'
},
{
label: '查询进路控制状态',
handler: this.detail,
- cmdType: CMD.Signal.CMD_SIGNAL_DETAIL
+ cmdType: CMD.Signal.CMD_SIGNAL_DETAIL,
+ isShow: (selected, work) => work !== 'atsWork'
}
],
menuForce: [
diff --git a/src/jmapNew/theme/ningbo_01/menus/menuStationControl.vue b/src/jmapNew/theme/ningbo_01/menus/menuStationControl.vue
index 84017e412..1edd34da4 100644
--- a/src/jmapNew/theme/ningbo_01/menus/menuStationControl.vue
+++ b/src/jmapNew/theme/ningbo_01/menus/menuStationControl.vue
@@ -44,7 +44,8 @@ export default {
cmdType: CMD.ControlConvertMenu.CMD_CM_EMERGENCY_STATION_CONTROL,
isDisabled: (selected, work) => {
return selected.controlMode == 'Emergency';
- }
+ },
+ isShow: (selected, work) => work !== 'atsWork'
},
{
label: '请求站控',
@@ -52,7 +53,8 @@ export default {
cmdType: CMD.ControlConvertMenu.CMD_CM_APPLY_FOR_STATION_CONTROL,
isDisabled: (selected, work) => {
return selected.controlMode == 'Local';
- }
+ },
+ isShow: (selected, work) => work !== 'atsWork'
},
{
label: '请求遥控',
@@ -60,7 +62,8 @@ export default {
cmdType: CMD.ControlConvertMenu.CMD_CM_APPLY_FOR_CENTER_CONTROL,
isDisabled: (selected, work) => {
return selected.controlMode == 'Center';
- }
+ },
+ isShow: (selected, work) => work !== 'atsWork'
}
],
menuForce: [
diff --git a/src/jmapNew/theme/ningbo_01/menus/menuStationStand.vue b/src/jmapNew/theme/ningbo_01/menus/menuStationStand.vue
index 7a3a96b01..a217a3bcb 100644
--- a/src/jmapNew/theme/ningbo_01/menus/menuStationStand.vue
+++ b/src/jmapNew/theme/ningbo_01/menus/menuStationStand.vue
@@ -106,7 +106,8 @@ export default {
cmdType:CMD.Stand.CMD_STAND_EARLY_DEPART,
isDisabled: (stand, work) => {
return stand.trainParking !== 1;
- }
+ },
+ isShow: (selected, work) => work !== 'atsWork'
},
{
label: '设置跳停',
@@ -163,7 +164,8 @@ export default {
{
label: '站台详细信息',
handler: this.detail,
- cmdType:CMD.Stand.CMD_STAND_VIEW_STATUS
+ cmdType:CMD.Stand.CMD_STAND_VIEW_STATUS,
+ isShow: (selected, work) => work !== 'atsWork'
}
],
menuForce: [
diff --git a/src/jmapNew/theme/ningbo_03/menus/atsWorkMenu.vue b/src/jmapNew/theme/ningbo_03/menus/atsWorkMenu.vue
new file mode 100644
index 000000000..6d43274f3
--- /dev/null
+++ b/src/jmapNew/theme/ningbo_03/menus/atsWorkMenu.vue
@@ -0,0 +1,435 @@
+
+
+
+
+
+
+
+
diff --git a/src/jmapNew/theme/ningbo_03/menus/menuLimit.vue b/src/jmapNew/theme/ningbo_03/menus/menuLimit.vue
index 44bee1257..1b0089eab 100644
--- a/src/jmapNew/theme/ningbo_03/menus/menuLimit.vue
+++ b/src/jmapNew/theme/ningbo_03/menus/menuLimit.vue
@@ -42,7 +42,8 @@ export default {
{
label: '取消全线临时限速',
handler: this.cancelSpeed,
- cmdType: CMD.LimitControl.CMD_CANCEL_ALL_LIMIT_SPEED
+ cmdType: CMD.LimitControl.CMD_CANCEL_ALL_LIMIT_SPEED,
+ isShow: (selected, work) => work !== 'atsWork'
}
]
};
diff --git a/src/jmapNew/theme/ningbo_03/menus/menuSection.vue b/src/jmapNew/theme/ningbo_03/menus/menuSection.vue
index 8a2bd0c41..4155ca545 100644
--- a/src/jmapNew/theme/ningbo_03/menus/menuSection.vue
+++ b/src/jmapNew/theme/ningbo_03/menus/menuSection.vue
@@ -81,12 +81,14 @@ export default {
{
label: '初始化',
operate: OperationEvent.Command.commandNingBo3.line_section_open_init,
- handler: this.handlerInitOpen
+ handler: this.handlerInitOpen,
+ isShow: (selected, work) => work !== 'atsWork'
},
{
label: '确定/取消',
operate: OperationEvent.Command.commandNingBo3.line_section_open_sure,
- handler: this.handlerOpen
+ handler: this.handlerOpen,
+ isShow: (selected, work) => work !== 'atsWork'
}
]
},
@@ -96,12 +98,14 @@ export default {
{
label: '初始化',
operate: OperationEvent.Command.commandNingBo3.line_section_close_init,
- handler: this.handlerInitClose
+ handler: this.handlerInitClose,
+ isShow: (selected, work) => work !== 'atsWork'
},
{
label: '确定/取消',
operate: OperationEvent.Command.commandNingBo3.line_section_close_sure,
- handler: this.handlerClose
+ handler: this.handlerClose,
+ isShow: (selected, work) => work !== 'atsWork'
}
]
},
@@ -114,12 +118,14 @@ export default {
{
label: '初始化',
operate: OperationEvent.Command.commandNingBo3.line_section_setSpeed_init,
- handler: this.handlerInitSetLimit
+ handler: this.handlerInitSetLimit,
+ isShow: (selected, work) => work !== 'atsWork'
},
{
label: '确定/取消',
operate: OperationEvent.Command.commandNingBo3.line_section_setSpeed_sure,
- handler: this.handlerSetLimit
+ handler: this.handlerSetLimit,
+ isShow: (selected, work) => work !== 'atsWork'
}
]
},
@@ -129,12 +135,14 @@ export default {
{
label: '初始化',
operate: OperationEvent.Command.commandNingBo3.line_section_clearSpeed_init,
- handler: this.handlerInitCancelLimit
+ handler: this.handlerInitCancelLimit,
+ isShow: (selected, work) => work !== 'atsWork'
},
{
label: '确定/取消',
operate: OperationEvent.Command.commandNingBo3.line_section_clearSpeed_sure,
- handler: this.handlerCancelLimit
+ handler: this.handlerCancelLimit,
+ isShow: (selected, work) => work !== 'atsWork'
}
]
}
@@ -143,7 +151,8 @@ export default {
{
label: '显示',
operate: OperationEvent.Command.commandNingBo3.line_section_detail,
- handler: this.handlerDetail
+ handler: this.handlerDetail,
+ isShow: (selected, work) => work !== 'atsWork'
}
],
menuForce: [
diff --git a/src/jmapNew/theme/ningbo_03/menus/menuSignal.vue b/src/jmapNew/theme/ningbo_03/menus/menuSignal.vue
index 927da566c..b60977075 100644
--- a/src/jmapNew/theme/ningbo_03/menus/menuSignal.vue
+++ b/src/jmapNew/theme/ningbo_03/menus/menuSignal.vue
@@ -87,17 +87,20 @@ export default {
{
label: '初始化',
operate: OperationEvent.Signal.guide.initMenu,
- handler: this.handlerInitGuide
+ handler: this.handlerInitGuide,
+ isShow: (selected, work) => work !== 'atsWork'
},
{
label: '确定/取消',
operate: OperationEvent.Signal.guide.menu,
- handler: this.handlerGuide
+ handler: this.handlerGuide,
+ isShow: (selected, work) => work !== 'atsWork'
},
{
label: '清除',
operate: OperationEvent.Signal.cancelGuide.menu,
- handler: this.handlerCancelGuide
+ handler: this.handlerCancelGuide,
+ isShow: (selected, work) => work !== 'atsWork'
}
]
@@ -108,12 +111,14 @@ export default {
{
label: '初始化',
operate: OperationEvent.Signal.lock.initMenu,
- handler: this.handlerInitAllowLock
+ handler: this.handlerInitAllowLock,
+ isShow: (selected, work) => work !== 'atsWork'
},
{
label: '确定/取消',
operate: OperationEvent.Signal.lock.menu,
- handler: this.handlerAllowLock
+ handler: this.handlerAllowLock,
+ isShow: (selected, work) => work !== 'atsWork'
}
]
},
@@ -123,18 +128,21 @@ export default {
{
label: '命令',
operate: OperationEvent.Signal.arrangementRoute.menu,
- handler: this.handlerRouteCommand
+ handler: this.handlerRouteCommand,
+ isShow: (selected, work) => work !== 'atsWork'
},
{
label: '显示',
children: [
{
label: 'CBTC进路信息',
- handler: this.undeveloped
+ handler: this.undeveloped,
+ isShow: (selected, work) => work !== 'atsWork'
},
{
label: '后备进路信息',
- handler: this.undeveloped
+ handler: this.undeveloped,
+ isShow: (selected, work) => work !== 'atsWork'
}
]
}
@@ -144,7 +152,8 @@ export default {
label: '信号指示模式',
operate: OperationEvent.Signal.reopenSignal.menu,
handler: this.handlerSignalModel,
- cmdType: ''
+ cmdType: '',
+ isShow: (selected, work) => work !== 'atsWork'
},
{
label: '封锁',
@@ -152,12 +161,14 @@ export default {
{
label: '初始化',
operate: OperationEvent.Command.commandNingBo3.line_signal_block_init,
- handler: this.handlerInitBlock
+ handler: this.handlerInitBlock,
+ isShow: (selected, work) => work !== 'atsWork'
},
{
label: '确认/取消',
operate: OperationEvent.Command.commandNingBo3.line_signal_block_sure,
- handler: this.handlerBlock
+ handler: this.handlerBlock,
+ isShow: (selected, work) => work !== 'atsWork'
}
]
},
@@ -167,19 +178,22 @@ export default {
{
label: '初始化',
operate: OperationEvent.Command.commandNingBo3.line_signal_unblock_init,
- handler: this.handlerInitUnblock
+ handler: this.handlerInitUnblock,
+ isShow: (selected, work) => work !== 'atsWork'
},
{
label: '确认/取消',
operate: OperationEvent.Command.commandNingBo3.line_signal_unblock_sure,
- handler: this.handlerUnblock
+ handler: this.handlerUnblock,
+ isShow: (selected, work) => work !== 'atsWork'
}
]
},
{
label: '显示',
operate: OperationEvent.Command.commandNingBo3.line_signal_detail,
- handler: this.handlerDetail
+ handler: this.handlerDetail,
+ isShow: (selected, work) => work !== 'atsWork'
}
],
menuForce: [
diff --git a/src/jmapNew/theme/ningbo_03/menus/menuStationStand.vue b/src/jmapNew/theme/ningbo_03/menus/menuStationStand.vue
index 488b1bbd4..fcfa15ee5 100644
--- a/src/jmapNew/theme/ningbo_03/menus/menuStationStand.vue
+++ b/src/jmapNew/theme/ningbo_03/menus/menuStationStand.vue
@@ -60,32 +60,38 @@ export default {
{
label: '开放/关闭',
operate: OperationEvent.Command.commandNingBo3.line_stand_openOrClose,
- handler: this.handlerOpenOrClose
+ handler: this.handlerOpenOrClose,
+ isShow: (selected, work) => work !== 'atsWork'
},
{
label: '设置/取消扣车',
operate: OperationEvent.Command.commandNingBo3.line_stand_holdOrNot,
- handler: this.handlerDetain
+ handler: this.handlerDetain,
+ isShow: (selected, work) => work !== 'atsWork'
},
{
label: '设置站间列车数量',
operate: OperationEvent.Command.commandNingBo3.line_stand_trainNum,
- handler: this.undeveloped
+ handler: this.undeveloped,
+ isShow: (selected, work) => work !== 'atsWork'
},
{
label: '分配停站时间',
operate: OperationEvent.Command.commandNingBo3.line_stand_stopTime,
- handler: this.handlerAllocateTime
+ handler: this.handlerAllocateTime,
+ isShow: (selected, work) => work !== 'atsWork'
},
{
label: '授权转移',
operate: OperationEvent.Command.commandNingBo3.line_stand_transfer,
- handler: this.handlerStationTransfer
+ handler: this.handlerStationTransfer,
+ isShow: (selected, work) => work !== 'atsWork'
},
{
label: '显示',
operate: OperationEvent.Command.commandNingBo3.line_stand_detail,
- handler: this.handlerDetail
+ handler: this.handlerDetail,
+ isShow: (selected, work) => work !== 'atsWork'
}
],
menuForce: [
@@ -212,9 +218,3 @@ export default {
this.$alert('实现中......', '提示', {
confirmButtonText: '确定',
callback: action => {
- }
- });
- }
- }
-};
-
diff --git a/src/jmapNew/theme/ningbo_03/menus/menuSwitch.vue b/src/jmapNew/theme/ningbo_03/menus/menuSwitch.vue
index 6a80b1e78..562b848fc 100644
--- a/src/jmapNew/theme/ningbo_03/menus/menuSwitch.vue
+++ b/src/jmapNew/theme/ningbo_03/menus/menuSwitch.vue
@@ -72,7 +72,8 @@ export default {
{
label: '命令',
operate: OperationEvent.Command.commandNingBo3.line_switch_cmd,
- handler: this.handlerCommand
+ handler: this.handlerCommand,
+ isShow: (selected, work) => work !== 'atsWork'
},
{
@@ -81,12 +82,14 @@ export default {
{
label: '初始化',
operate: OperationEvent.Command.commandNingBo3.line_switch_block_init,
- handler: this.handlerInitBlock
+ handler: this.handlerInitBlock,
+ isShow: (selected, work) => work !== 'atsWork'
},
{
label: '确定/取消',
operate: OperationEvent.Command.commandNingBo3.line_switch_block_sure,
- handler: this.handlerBlock
+ handler: this.handlerBlock,
+ isShow: (selected, work) => work !== 'atsWork'
}
]
},
@@ -96,12 +99,14 @@ export default {
{
label: '初始化',
operate: OperationEvent.Command.commandNingBo3.line_switch_unblock_init,
- handler: this.handlerInitUnblock
+ handler: this.handlerInitUnblock,
+ isShow: (selected, work) => work !== 'atsWork'
},
{
label: '确定/取消',
operate: OperationEvent.Command.commandNingBo3.line_switch_unblock_sure,
- handler: this.handlerUnblock
+ handler: this.handlerUnblock,
+ isShow: (selected, work) => work !== 'atsWork'
}
]
},
@@ -111,20 +116,23 @@ export default {
{
label: '请求或授权/取消',
operate: OperationEvent.Command.commandNingBo3.line_switch_empower_init,
- handler: this.handlerActive
+ handler: this.handlerActive,
+ isShow: (selected, work) => work !== 'atsWork'
},
{
label: '显示',
disabled: true,
operate: OperationEvent.Command.commandNingBo3.line_switch_empower_sure,
- handler: this.undeveloped
+ handler: this.undeveloped,
+ isShow: (selected, work) => work !== 'atsWork'
}
]
},
{
label: '显示',
operate: OperationEvent.Command.commandNingBo3.line_switch_detail,
- handler: this.handlerDetail
+ handler: this.handlerDetail,
+ isShow: (selected, work) => work !== 'atsWork'
}
],
menuForce: [
diff --git a/src/jmapNew/theme/race_01/menus/atsWorkMenu.vue b/src/jmapNew/theme/race_01/menus/atsWorkMenu.vue
new file mode 100644
index 000000000..12b785ab3
--- /dev/null
+++ b/src/jmapNew/theme/race_01/menus/atsWorkMenu.vue
@@ -0,0 +1,360 @@
+
+
+
+
+
+
+
diff --git a/src/jmapNew/theme/race_01/menus/menuSection.vue b/src/jmapNew/theme/race_01/menus/menuSection.vue
index 7584678c2..3f4ee74cb 100644
--- a/src/jmapNew/theme/race_01/menus/menuSection.vue
+++ b/src/jmapNew/theme/race_01/menus/menuSection.vue
@@ -71,14 +71,14 @@ export default {
handler: this.active,
cmdType: CMD.Section.CMD_SECTION_ACTIVE,
isDisabled: (section, work) => false,
- isShow: (section, work) => ['01', '02', '03'].includes(section.type)
+ isShow: (section, work) => ['01', '02', '03'].includes(section.type) && work !== 'atsWork'
},
{
label: '区段跟踪切除',
handler: this.split,
cmdType: CMD.Section.CMD_SECTION_CUT_OFF,
isDisabled: (section, work) => false,
- isShow: (section, work) => ['01', '02', '03'].includes(section.type)
+ isShow: (section, work) => ['01', '02', '03'].includes(section.type) && work !== 'atsWork'
},
{
label: '区段封锁',
diff --git a/src/jmapNew/theme/race_01/menus/menuSignal.vue b/src/jmapNew/theme/race_01/menus/menuSignal.vue
index 49f4f084f..124cfca0d 100644
--- a/src/jmapNew/theme/race_01/menus/menuSignal.vue
+++ b/src/jmapNew/theme/race_01/menus/menuSignal.vue
@@ -64,7 +64,7 @@ export default {
handler: this.arrangementRoute,
cmdType: CMD.Signal.CMD_SIGNAL_SET_ROUTE,
isDisabled: (signal, work) => false,
- isShow: (signal, work) => true,
+ isShow: (signal, work) => work !== 'atsWork',
isAvailableInOtherControlMode: true
},
{
@@ -72,7 +72,7 @@ export default {
handler: this.cancelTrainRoute,
cmdType: CMD.Signal.CMD_SIGNAL_CANCEL_ROUTE,
isDisabled: (signal, work) => false,
- isShow: (signal, work) => true,
+ isShow: (signal, work) => work !== 'atsWork',
isAvailableInOtherControlMode: true
},
{
@@ -80,7 +80,7 @@ export default {
handler: this.reopenSignal,
cmdType: CMD.Signal.CMD_SIGNAL_REOPEN_SIGNAL,
isDisabled: (signal, work) => false,
- isShow: (signal, work) => true
+ isShow: (signal, work) => work !== 'atsWork'
},
{
label: '信号机引导办理',
@@ -94,7 +94,7 @@ export default {
handler: this.humanTrainRoute,
cmdType: CMD.Signal.CMD_SIGNAL_CANCEL_GUIDE,
isDisabled: (signal, work) => false,
- isShow: (signal, work) => true
+ isShow: (signal, work) => work !== 'atsWork'
},
{
label: '信号封锁',
@@ -129,7 +129,7 @@ export default {
handler: this.humanControl,
cmdType: CMD.Signal.CMD_SIGNAL_CLOSE_AUTO_SETTING,
isDisabled: (signal, work) => false,
- isShow: (signal, work) => true,
+ isShow: (signal, work) => work !== 'atsWork',
isAvailableInOtherControlMode: true
},
{
@@ -137,7 +137,7 @@ export default {
handler: this.atsAutoControl,
cmdType: CMD.Signal.CMD_SIGNAL_OPEN_AUTO_SETTING,
isDisabled: (signal, work) => false,
- isShow: (signal, work) => true,
+ isShow: (signal, work) => work !== 'atsWork',
isAvailableInOtherControlMode: true
},
{
@@ -159,7 +159,7 @@ export default {
handler: this.detail,
cmdType: CMD.Signal.CMD_SIGNAL_DETAIL,
isDisabled: (signal, work) => false,
- isShow: (signal, work) => true
+ isShow: (signal, work) => work !== 'atsWork'
}
],
menuForce: [
diff --git a/src/jmapNew/theme/race_01/menus/menuStation.vue b/src/jmapNew/theme/race_01/menus/menuStation.vue
index 8f7315b43..3e911b598 100644
--- a/src/jmapNew/theme/race_01/menus/menuStation.vue
+++ b/src/jmapNew/theme/race_01/menus/menuStation.vue
@@ -91,7 +91,7 @@ export default {
handler: this.execKeyOperationTest,
cmdType: CMD.Station.CMD_STATION_KEY_OPERATION_TEST,
isDisabled: (station, work) => false,
- isShow: (station, work) => true
+ isShow: (station, work) => work !== 'atsWork'
}
],
menuForce: [
diff --git a/src/jmapNew/theme/race_01/menus/menuStationStand.vue b/src/jmapNew/theme/race_01/menus/menuStationStand.vue
index a6127e742..202864cef 100644
--- a/src/jmapNew/theme/race_01/menus/menuStationStand.vue
+++ b/src/jmapNew/theme/race_01/menus/menuStationStand.vue
@@ -155,7 +155,7 @@ export default {
handler: this.detail,
cmdType: CMD.Stand.CMD_STAND_VIEW_STATUS,
isDisabled: (stand, work) => false,
- isShow: (stand, work) => true
+ isShow: (stand, work) => work !== 'atsWork'
}
],
menuForce: [
diff --git a/src/jmapNew/theme/race_01/menus/menuSwitch.vue b/src/jmapNew/theme/race_01/menus/menuSwitch.vue
index 78f61c656..be3072deb 100644
--- a/src/jmapNew/theme/race_01/menus/menuSwitch.vue
+++ b/src/jmapNew/theme/race_01/menus/menuSwitch.vue
@@ -61,14 +61,14 @@ export default {
handler: this.locate,
cmdType: CMD.Switch.CMD_SWITCH_NORMAL_POSITION,
isDisabled: (switchDevice, work) => switchDevice.normalPosition === 1,
- isShow: (switchDevice, work) => true
+ isShow: (switchDevice, work) => work !== 'atsWork'
},
{
label: '反操',
handler: this.reverse,
cmdType: CMD.Switch.CMD_SWITCH_REVERSE_POSITION,
isDisabled: (switchDevice, work) => switchDevice.reversePosition === 1,
- isShow: (switchDevice, work) => true
+ isShow: (switchDevice, work) => work !== 'atsWork'
},
{
label: '道岔单锁',
@@ -153,7 +153,7 @@ export default {
handler: this.undeveloped,
cmdType: CMD.Switch.CMD_SWITCH_SET_LIMIT_SPEED,
isDisabled: (switchDevice, work) => false,
- isShow: (switchDevice, work) => true
+ isShow: (switchDevice, work) => work !== 'atsWork'
}
],
menuForce: [
diff --git a/src/jmapNew/theme/xian_01/menus/atsWorkMenu.vue b/src/jmapNew/theme/xian_01/menus/atsWorkMenu.vue
new file mode 100644
index 000000000..a26f9ac0a
--- /dev/null
+++ b/src/jmapNew/theme/xian_01/menus/atsWorkMenu.vue
@@ -0,0 +1,491 @@
+
+
+
+
+
+
+
diff --git a/src/jmapNew/theme/xian_01/menus/menuSignal.vue b/src/jmapNew/theme/xian_01/menus/menuSignal.vue
index a74b0523e..e3b2251cf 100644
--- a/src/jmapNew/theme/xian_01/menus/menuSignal.vue
+++ b/src/jmapNew/theme/xian_01/menus/menuSignal.vue
@@ -68,6 +68,9 @@ export default {
cmdType: CMD.Signal.CMD_SIGNAL_SET_ROUTE,
isDisabled: (signal, work) => {
return false;
+ },
+ isShow: (signal, work) => {
+ return work !== 'atsWork';
}
},
{
@@ -76,6 +79,9 @@ export default {
cmdType: CMD.Signal.CMD_SIGNAL_CANCEL_ROUTE,
isDisabled: (signal, work) => {
return false;
+ },
+ isShow: (signal, work) => {
+ return work !== 'atsWork';
}
},
{
@@ -88,6 +94,9 @@ export default {
} else {
return signal.blockade === 1;
}
+ },
+ isShow: (signal, work) => {
+ return work !== 'atsWork';
}
},
{
@@ -100,6 +109,9 @@ export default {
} else {
return signal.blockade !== 1;
}
+ },
+ isShow: (signal, work) => {
+ return work !== 'atsWork';
}
},
{
@@ -108,6 +120,9 @@ export default {
cmdType: CMD.Signal.CMD_SIGNAL_CLOSE_SIGNAL,
isDisabled: (signal, work) => {
return false;
+ },
+ isShow: (signal, work) => {
+ return work !== 'atsWork';
}
},
{
@@ -116,6 +131,9 @@ export default {
cmdType: CMD.Signal.CMD_SIGNAL_REOPEN_SIGNAL,
isDisabled: (signal, work) => {
return false;
+ },
+ isShow: (signal, work) => {
+ return work !== 'atsWork';
}
},
{
@@ -124,6 +142,9 @@ export default {
cmdType: CMD.Signal.CMD_SIGNAL_ROUTE_GUIDE,
isDisabled: (signal, work) => {
return false;
+ },
+ isShow: (signal, work) => {
+ return work !== 'atsWork';
}
},
{
diff --git a/src/jmapNew/theme/xian_01/menus/menuSwitch.vue b/src/jmapNew/theme/xian_01/menus/menuSwitch.vue
index 3deb815ef..5a1941ec1 100644
--- a/src/jmapNew/theme/xian_01/menus/menuSwitch.vue
+++ b/src/jmapNew/theme/xian_01/menus/menuSwitch.vue
@@ -63,6 +63,9 @@ export default {
} else {
return switchDevice.singleLock === 1;
}
+ },
+ isShow: (switchDevice, work) => {
+ return work !== 'atsWork';
}
},
{
@@ -75,6 +78,9 @@ export default {
} else {
return switchDevice.singleLock !== 1;
}
+ },
+ isShow: (switchDevice, work) => {
+ return work !== 'atsWork';
}
},
{
@@ -87,6 +93,9 @@ export default {
} else {
return switchDevice.blockade === 1;
}
+ },
+ isShow: (switchDevice, work) => {
+ return work !== 'atsWork';
}
},
{
@@ -99,6 +108,9 @@ export default {
} else {
return switchDevice.blockade !== 1;
}
+ },
+ isShow: (switchDevice, work) => {
+ return work !== 'atsWork';
}
},
{
@@ -107,6 +119,9 @@ export default {
cmdType:CMD.Switch.CMD_SWITCH_TURN,
isDisabled: (switchDevice, work) => {
return false;
+ },
+ isShow: (switchDevice, work) => {
+ return work !== 'atsWork';
}
},
{
@@ -115,6 +130,9 @@ export default {
cmdType:CMD.Switch.CMD_SWITCH_FAULT_UNLOCK,
isDisabled: (switchDevice, work) => {
return false;
+ },
+ isShow: (switchDevice, work) => {
+ return work !== 'atsWork';
}
},
// {
@@ -156,6 +174,9 @@ export default {
cmdType:CMD.Switch.CMD_SWITCH_SET_LIMIT_SPEED,
isDisabled: (switchDevice, work) => {
return false;
+ },
+ isShow: (switchDevice, work) => {
+ return work !== 'atsWork';
}
},
{
@@ -164,6 +185,9 @@ export default {
cmdType:CMD.Switch.CMD_SWITCH_CANCEL_LIMIT_SPEED,
isDisabled: (switchDevice, work) => {
return false;
+ },
+ isShow: (switchDevice, work) => {
+ return work !== 'atsWork';
}
}
],
diff --git a/src/jmapNew/theme/xian_02/menus/atsWorkMenu.vue b/src/jmapNew/theme/xian_02/menus/atsWorkMenu.vue
new file mode 100644
index 000000000..d29224152
--- /dev/null
+++ b/src/jmapNew/theme/xian_02/menus/atsWorkMenu.vue
@@ -0,0 +1,550 @@
+
+
+
+
+
+
+
diff --git a/src/jmapNew/theme/xian_02/menus/menuSignal.vue b/src/jmapNew/theme/xian_02/menus/menuSignal.vue
index 659f4a5aa..b8c81cfb5 100644
--- a/src/jmapNew/theme/xian_02/menus/menuSignal.vue
+++ b/src/jmapNew/theme/xian_02/menus/menuSignal.vue
@@ -56,6 +56,9 @@ export default {
} else {
return signal.lock === 1;
}
+ },
+ isShow: (signal, work) => {
+ return work !== 'atsWork';
}
},
{
@@ -68,6 +71,9 @@ export default {
} else {
return signal.lock !== 1;
}
+ },
+ isShow: (signal, work) => {
+ return work !== 'atsWork';
}
},
{
@@ -80,6 +86,9 @@ export default {
} else {
return signal.fleetMode === 1;
}
+ },
+ isShow: (signal, work) => {
+ return work !== 'atsWork';
}
},
{
@@ -92,6 +101,9 @@ export default {
} else {
return signal.fleetMode !== 1;
}
+ },
+ isShow: (signal, work) => {
+ return work !== 'atsWork';
}
},
{
@@ -104,6 +116,9 @@ export default {
} else {
return signal.blockade === 1;
}
+ },
+ isShow: (signal, work) => {
+ return work !== 'atsWork';
}
},
{
@@ -116,6 +131,9 @@ export default {
} else {
return signal.blockade !== 1;
}
+ },
+ isShow: (signal, work) => {
+ return work !== 'atsWork';
}
},
{
@@ -124,6 +142,9 @@ export default {
cmdType: CMD.Signal.CMD_SIGNAL_ROUTE_GUIDE,
isDisabled: (signal, work) => {
return false;
+ },
+ isShow: (signal, work) => {
+ return work !== 'atsWork';
}
},
// 暂无功能,先disabled掉
@@ -131,6 +152,9 @@ export default {
label: '设备标签',
disabled: true,
isDisabled: (signal, work) => true,
+ isShow: (signal, work) => {
+ return work !== 'atsWork';
+ },
children: [
{
label: '创建设备标签',
@@ -160,6 +184,9 @@ export default {
cmdType: CMD.Signal.CMD_SIGNAL_DETAIL,
isDisabled: (signal, work) => {
return false;
+ },
+ isShow: (signal, work) => {
+ return work !== 'atsWork';
}
}
],
diff --git a/src/jmapNew/theme/xian_02/menus/menuStation.vue b/src/jmapNew/theme/xian_02/menus/menuStation.vue
index c11d256bc..c406e7c81 100644
--- a/src/jmapNew/theme/xian_02/menus/menuStation.vue
+++ b/src/jmapNew/theme/xian_02/menus/menuStation.vue
@@ -58,7 +58,10 @@ export default {
} else {
return station.controlMode === 'Center';
}
- }
+ },
+ isShow: (station, work) => {
+ return work !== 'atsWork';
+ }
},
{
// 暂无功能,先disabled
@@ -72,7 +75,7 @@ export default {
return station.apply2TheControlMode !== 'Local';
}
},
- isShow: (station, work) => true
+ isShow: (station, work) => work !== 'atsWork'
},
{
label: '取消',
@@ -86,7 +89,7 @@ export default {
}
},
isShow: (station, work) => {
- return true;
+ return work !== 'atsWork';
}
},
// /** 紧急站控 */
@@ -103,7 +106,7 @@ export default {
}
},
isShow: (station, work) => {
- return true;
+ return work !== 'atsWork';
}
}
]
diff --git a/src/jmapNew/theme/xian_02/menus/menuSwitch.vue b/src/jmapNew/theme/xian_02/menus/menuSwitch.vue
index 61ff8934e..180d82d55 100644
--- a/src/jmapNew/theme/xian_02/menus/menuSwitch.vue
+++ b/src/jmapNew/theme/xian_02/menus/menuSwitch.vue
@@ -66,7 +66,8 @@ export default {
} else {
return station.normalPosition === 1;
}
- }
+ },
+ isShow: (station, work) => work !== 'atsWork'
},
{
label: '道岔反位',
@@ -78,7 +79,8 @@ export default {
} else {
return station.reversePosition === 1;
}
- }
+ },
+ isShow: (station, work) => work !== 'atsWork'
},
{
label: '道岔单锁',
@@ -90,7 +92,8 @@ export default {
} else {
return station.singleLock === 1;
}
- }
+ },
+ isShow: (station, work) => work !== 'atsWork'
},
{
label: '道岔单解',
@@ -102,7 +105,8 @@ export default {
} else {
return station.singleLock !== 1;
}
- }
+ },
+ isShow: (station, work) => work !== 'atsWork'
},
{
// 暂无功能,先disabled掉
diff --git a/src/views/newMap/display/terminals/atsWork.vue b/src/views/newMap/display/terminals/atsWork.vue
new file mode 100644
index 000000000..72900af84
--- /dev/null
+++ b/src/views/newMap/display/terminals/atsWork.vue
@@ -0,0 +1,74 @@
+
+
+
+
+
+
+
+
diff --git a/src/views/newMap/display/terminals/index.vue b/src/views/newMap/display/terminals/index.vue
index 2bca89d88..65b521ff7 100644
--- a/src/views/newMap/display/terminals/index.vue
+++ b/src/views/newMap/display/terminals/index.vue
@@ -40,6 +40,7 @@
+
type === 'METRO'
+ },
+ {
+ name: 'ATS工作站',
+ code: 'atsWork',
+ isShow: () => type === 'METRO'
+
},
{
name: '司机ATS工作站',