From 4b67f81cf0787773fc823b4c49fea12d7cf7f21c Mon Sep 17 00:00:00 2001 From: fan <18706759286@163.com> Date: Tue, 9 Jun 2020 14:39:32 +0800 Subject: [PATCH 1/4] =?UTF-8?q?iscs=20=E5=B0=8F=E7=B3=BB=E7=BB=9F=E6=A8=A1?= =?UTF-8?q?=E5=BC=8F=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/utils/baseUrl.js | 4 +- .../iscs/iscsSystem/config/bas/controlBAS.vue | 636 +----------------- .../bas/controlChild/bigSystemTable.vue | 221 ++++++ .../config/bas/controlChild/modeType.vue | 154 +++++ .../bas/controlChild/smallSystem1Table.vue | 320 +++++++++ .../bas/controlChild/smallSystem2Table.vue | 315 +++++++++ .../config/bas/controlChild/ventilation.vue | 286 ++++++++ .../config/bas/controlChild/ventilation1.vue | 308 +++++++++ .../config/bas/controlChild/ventilation2.vue | 249 +++++++ 9 files changed, 1884 insertions(+), 609 deletions(-) create mode 100644 src/views/iscs/iscsSystem/config/bas/controlChild/bigSystemTable.vue create mode 100644 src/views/iscs/iscsSystem/config/bas/controlChild/modeType.vue create mode 100644 src/views/iscs/iscsSystem/config/bas/controlChild/smallSystem1Table.vue create mode 100644 src/views/iscs/iscsSystem/config/bas/controlChild/smallSystem2Table.vue create mode 100644 src/views/iscs/iscsSystem/config/bas/controlChild/ventilation.vue create mode 100644 src/views/iscs/iscsSystem/config/bas/controlChild/ventilation1.vue create mode 100644 src/views/iscs/iscsSystem/config/bas/controlChild/ventilation2.vue diff --git a/src/utils/baseUrl.js b/src/utils/baseUrl.js index 778caeb7b..836771751 100644 --- a/src/utils/baseUrl.js +++ b/src/utils/baseUrl.js @@ -2,11 +2,11 @@ export function getBaseUrl() { let BASE_API; if (process.env.NODE_ENV === 'development') { // BASE_API = 'https://joylink.club/jlcloud'; - BASE_API = 'https://test.joylink.club/jlcloud'; + // BASE_API = 'https://test.joylink.club/jlcloud'; // BASE_API = 'http://192.168.3.5:9000'; // 袁琪 // BASE_API = 'http://192.168.3.6:9000'; // 旭强 // BASE_API = 'http://192.168.3.41:9000'; // 张赛 - // BASE_API = 'http://192.168.3.82:9000'; // 杜康 + BASE_API = 'http://192.168.3.82:9000'; // 杜康 // BASE_API = 'http://b29z135112.zicp.vip'; // BASE_API = 'http://2925963m2a.zicp.vip'; // 杜康 // BASE_API = 'http://2i38984j47.qicp.vip'; // 张赛 diff --git a/src/views/iscs/iscsSystem/config/bas/controlBAS.vue b/src/views/iscs/iscsSystem/config/bas/controlBAS.vue index f52cde379..aaf69e419 100644 --- a/src/views/iscs/iscsSystem/config/bas/controlBAS.vue +++ b/src/views/iscs/iscsSystem/config/bas/controlBAS.vue @@ -2,247 +2,12 @@
{{ $route.query.stationName + modeName }}
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + +
至大系统模式表
@@ -254,153 +19,30 @@
至隧道通风系模式表3
至照明模式表
- -
-
-
模式类别
-
-
{{ modeModel.stationName }}
-
{{ modeModel.controlName }}
-
-
-
-
启动模式号
-
-
{{ modeModel.modeCode }}
-
-
-
-
- 取 消 - 执 行 -
- +
+ + diff --git a/src/views/iscs/iscsSystem/config/bas/controlChild/modeType.vue b/src/views/iscs/iscsSystem/config/bas/controlChild/modeType.vue new file mode 100644 index 000000000..91729a325 --- /dev/null +++ b/src/views/iscs/iscsSystem/config/bas/controlChild/modeType.vue @@ -0,0 +1,154 @@ + + + + + diff --git a/src/views/iscs/iscsSystem/config/bas/controlChild/smallSystem1Table.vue b/src/views/iscs/iscsSystem/config/bas/controlChild/smallSystem1Table.vue new file mode 100644 index 000000000..df5505292 --- /dev/null +++ b/src/views/iscs/iscsSystem/config/bas/controlChild/smallSystem1Table.vue @@ -0,0 +1,320 @@ + + + + + diff --git a/src/views/iscs/iscsSystem/config/bas/controlChild/smallSystem2Table.vue b/src/views/iscs/iscsSystem/config/bas/controlChild/smallSystem2Table.vue new file mode 100644 index 000000000..fb00c691e --- /dev/null +++ b/src/views/iscs/iscsSystem/config/bas/controlChild/smallSystem2Table.vue @@ -0,0 +1,315 @@ + + + + + diff --git a/src/views/iscs/iscsSystem/config/bas/controlChild/ventilation.vue b/src/views/iscs/iscsSystem/config/bas/controlChild/ventilation.vue new file mode 100644 index 000000000..ced4bc887 --- /dev/null +++ b/src/views/iscs/iscsSystem/config/bas/controlChild/ventilation.vue @@ -0,0 +1,286 @@ + + + + + diff --git a/src/views/iscs/iscsSystem/config/bas/controlChild/ventilation1.vue b/src/views/iscs/iscsSystem/config/bas/controlChild/ventilation1.vue new file mode 100644 index 000000000..d9064ed2b --- /dev/null +++ b/src/views/iscs/iscsSystem/config/bas/controlChild/ventilation1.vue @@ -0,0 +1,308 @@ + + + + + diff --git a/src/views/iscs/iscsSystem/config/bas/controlChild/ventilation2.vue b/src/views/iscs/iscsSystem/config/bas/controlChild/ventilation2.vue new file mode 100644 index 000000000..2e18ddab2 --- /dev/null +++ b/src/views/iscs/iscsSystem/config/bas/controlChild/ventilation2.vue @@ -0,0 +1,249 @@ + + + + + From fa8c31b2d4875f0b5ac5d8eb32078d095153afba Mon Sep 17 00:00:00 2001 From: fan <18706759286@163.com> Date: Tue, 9 Jun 2020 18:31:21 +0800 Subject: [PATCH 2/4] =?UTF-8?q?iscs=20=E7=85=A7=E6=98=8E=E7=B3=BB=E7=BB=9F?= =?UTF-8?q?=E6=A8=A1=E5=BC=8F=E8=A1=A8&=E6=97=B6=E9=97=B4=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/utils/baseUrl.js | 4 +- .../iscs/iscsSystem/config/bas/controlBAS.vue | 11 +- .../bas/controlChild/lightingSystem.vue | 281 +++++++++++++++++ .../config/bas/controlChild/ventilation2.vue | 27 +- .../config/bas/controlChild/ventilation3.vue | 296 ++++++++++++++++++ .../iscs/iscsSystem/config/bas/schedules.vue | 123 ++++++++ .../iscs/iscsSystem/config/deviceControl.vue | 4 +- src/views/iscs/iscsSystem/config/index.vue | 9 +- 8 files changed, 739 insertions(+), 16 deletions(-) create mode 100644 src/views/iscs/iscsSystem/config/bas/controlChild/lightingSystem.vue create mode 100644 src/views/iscs/iscsSystem/config/bas/controlChild/ventilation3.vue create mode 100644 src/views/iscs/iscsSystem/config/bas/schedules.vue diff --git a/src/utils/baseUrl.js b/src/utils/baseUrl.js index 836771751..778caeb7b 100644 --- a/src/utils/baseUrl.js +++ b/src/utils/baseUrl.js @@ -2,11 +2,11 @@ export function getBaseUrl() { let BASE_API; if (process.env.NODE_ENV === 'development') { // BASE_API = 'https://joylink.club/jlcloud'; - // BASE_API = 'https://test.joylink.club/jlcloud'; + BASE_API = 'https://test.joylink.club/jlcloud'; // BASE_API = 'http://192.168.3.5:9000'; // 袁琪 // BASE_API = 'http://192.168.3.6:9000'; // 旭强 // BASE_API = 'http://192.168.3.41:9000'; // 张赛 - BASE_API = 'http://192.168.3.82:9000'; // 杜康 + // BASE_API = 'http://192.168.3.82:9000'; // 杜康 // BASE_API = 'http://b29z135112.zicp.vip'; // BASE_API = 'http://2925963m2a.zicp.vip'; // 杜康 // BASE_API = 'http://2i38984j47.qicp.vip'; // 张赛 diff --git a/src/views/iscs/iscsSystem/config/bas/controlBAS.vue b/src/views/iscs/iscsSystem/config/bas/controlBAS.vue index aaf69e419..0596b3f66 100644 --- a/src/views/iscs/iscsSystem/config/bas/controlBAS.vue +++ b/src/views/iscs/iscsSystem/config/bas/controlBAS.vue @@ -8,6 +8,8 @@ + +
至大系统模式表
@@ -30,6 +32,8 @@ import ModeType from './controlChild/modeType'; import Ventilation from './controlChild/ventilation'; import Ventilation1 from './controlChild/ventilation1'; import Ventilation2 from './controlChild/ventilation2'; +import Ventilation3 from './controlChild/ventilation3'; +import LightingSystem from './controlChild/lightingSystem'; export default { components: { BigSystemTable, @@ -38,7 +42,9 @@ export default { SmallSystem2Table, Ventilation, Ventilation1, - Ventilation2 + Ventilation2, + Ventilation3, + LightingSystem }, data() { return { @@ -55,6 +61,9 @@ export default { case 'smallSystem1': name = '小系统模式表(一)'; break; + case 'smallSystem2': + name = '小系统模式表(二)'; + break; case 'ventilation': name = '隧道通风系模式表'; break; diff --git a/src/views/iscs/iscsSystem/config/bas/controlChild/lightingSystem.vue b/src/views/iscs/iscsSystem/config/bas/controlChild/lightingSystem.vue new file mode 100644 index 000000000..1e9b916f5 --- /dev/null +++ b/src/views/iscs/iscsSystem/config/bas/controlChild/lightingSystem.vue @@ -0,0 +1,281 @@ + + + + + diff --git a/src/views/iscs/iscsSystem/config/bas/controlChild/ventilation2.vue b/src/views/iscs/iscsSystem/config/bas/controlChild/ventilation2.vue index 2e18ddab2..e23b91093 100644 --- a/src/views/iscs/iscsSystem/config/bas/controlChild/ventilation2.vue +++ b/src/views/iscs/iscsSystem/config/bas/controlChild/ventilation2.vue @@ -40,7 +40,13 @@
备选
-
+
+
A端停车线火灾
+
+
首选
+
备选
+
+
设备实际运行状态
状态比较
@@ -64,7 +70,7 @@
9
10
11
-
12
+
12
13
14
15
@@ -72,12 +78,13 @@
17
18
19
-
20
+
20
21
22
23
24
-
25
+
25
+
26
隧道通风系1
@@ -120,12 +127,12 @@ export default { return { tableTitleStyle: {'text-align': 'center', 'height': '28px', 'padding': '0', 'background': '#45607B'}, tableData: [ - {code: '415', tvf1: '打开', tvf2: '打开', tvf3: '半开', tvf4: '半开', tef1: '半开', tef2: '打开', md1: '打开', md2: '关闭', md3: '打开', md4: '打开', md5: '打开', md6: '打开', md7: '打开', md8: '打开', md9: '打开', md10: '打开', md11: '打开', md12: '打开', md13: '打开', md14:'打开', md15: '打开', md16: '打开'}, - {code: '416', tvf1: '打开', tvf2: '打开', tvf3: '半开', tvf4: '半开', tef1: '半开', tef2: '打开', md1: '打开', md2: '关闭', md3: '打开', md4: '打开', md5: '打开', md6: '打开', md7: '打开', md8: '打开', md9: '打开', md10: '打开', md11: '打开', md12: '打开', md13: '打开', md14:'打开', md15: '打开', md16: '打开'}, - {code: '417', tvf1: '打开', tvf2: '打开', tvf3: '半开', tvf4: '半开', tef1: '半开', tef2: '打开', md1: '打开', md2: '关闭', md3: '打开', md4: '打开', md5: '打开', md6: '打开', md7: '打开', md8: '打开', md9: '打开', md10: '打开', md11: '打开', md12: '打开', md13: '打开', md14:'打开', md15: '打开', md16: '打开'}, - {code: '418', tvf1: '打开', tvf2: '打开', tvf3: '半开', tvf4: '半开', tef1: '半开', tef2: '打开', md1: '打开', md2: '关闭', md3: '打开', md4: '打开', md5: '打开', md6: '打开', md7: '打开', md8: '打开', md9: '打开', md10: '打开', md11: '打开', md12: '打开', md13: '打开', md14:'打开', md15: '打开', md16: '打开'}, - {code: '419', tvf1: '打开', tvf2: '打开', tvf3: '半开', tvf4: '半开', tef1: '半开', tef2: '打开', md1: '打开', md2: '关闭', md3: '打开', md4: '打开', md5: '打开', md6: '打开', md7: '打开', md8: '打开', md9: '打开', md10: '打开', md11: '打开', md12: '打开', md13: '打开', md14:'打开', md15: '打开', md16: '打开'}, - {code: '420', tvf1: '打开', tvf2: '打开', tvf3: '半开', tvf4: '半开', tef1: '半开', tef2: '打开', md1: '打开', md2: '关闭', md3: '打开', md4: '打开', md5: '打开', md6: '打开', md7: '打开', md8: '打开', md9: '打开', md10: '打开', md11: '打开', md12: '打开', md13: '打开', md14:'打开', md15: '打开', md16: '打开'}, + {code: '430', tvf1: '打开', tvf2: '打开', tvf3: '半开', tvf4: '半开', tef1: '半开', tef2: '打开', md1: '打开', md2: '关闭', md3: '打开', md4: '打开', md5: '打开', md6: '打开', md7: '打开', md8: '打开', md9: '打开', md10: '打开', md11: '打开', md12: '打开', md13: '打开', md14:'打开', md15: '打开', md16: '打开'}, + {code: '431', tvf1: '打开', tvf2: '打开', tvf3: '半开', tvf4: '半开', tef1: '半开', tef2: '打开', md1: '打开', md2: '关闭', md3: '打开', md4: '打开', md5: '打开', md6: '打开', md7: '打开', md8: '打开', md9: '打开', md10: '打开', md11: '打开', md12: '打开', md13: '打开', md14:'打开', md15: '打开', md16: '打开'}, + {code: '432', tvf1: '打开', tvf2: '打开', tvf3: '半开', tvf4: '半开', tef1: '半开', tef2: '打开', md1: '打开', md2: '关闭', md3: '打开', md4: '打开', md5: '打开', md6: '打开', md7: '打开', md8: '打开', md9: '打开', md10: '打开', md11: '打开', md12: '打开', md13: '打开', md14:'打开', md15: '打开', md16: '打开'}, + {code: '433', tvf1: '打开', tvf2: '打开', tvf3: '半开', tvf4: '半开', tef1: '半开', tef2: '打开', md1: '打开', md2: '关闭', md3: '打开', md4: '打开', md5: '打开', md6: '打开', md7: '打开', md8: '打开', md9: '打开', md10: '打开', md11: '打开', md12: '打开', md13: '打开', md14:'打开', md15: '打开', md16: '打开'}, + {code: '434', tvf1: '打开', tvf2: '打开', tvf3: '半开', tvf4: '半开', tef1: '半开', tef2: '打开', md1: '打开', md2: '关闭', md3: '打开', md4: '打开', md5: '打开', md6: '打开', md7: '打开', md8: '打开', md9: '打开', md10: '打开', md11: '打开', md12: '打开', md13: '打开', md14:'打开', md15: '打开', md16: '打开'}, + {code: '435', tvf1: '打开', tvf2: '打开', tvf3: '半开', tvf4: '半开', tef1: '半开', tef2: '打开', md1: '打开', md2: '关闭', md3: '打开', md4: '打开', md5: '打开', md6: '打开', md7: '打开', md8: '打开', md9: '打开', md10: '打开', md11: '打开', md12: '打开', md13: '打开', md14:'打开', md15: '打开', md16: '打开'}, {code: '', tvf1: '打开', tvf2: '打开', tvf3: '半开', tvf4: '半开', tef1: '半开', tef2: '打开', md1: '打开', md2: '关闭', md3: '打开', md4: '打开', md5: '打开', md6: '打开', md7: '打开', md8: '打开', md9: '打开', md10: '打开', md11: '打开', md12: '打开', md13: '打开', md14:'打开', md15: '打开', md16: '打开'}, {} ] diff --git a/src/views/iscs/iscsSystem/config/bas/controlChild/ventilation3.vue b/src/views/iscs/iscsSystem/config/bas/controlChild/ventilation3.vue new file mode 100644 index 000000000..bc94de501 --- /dev/null +++ b/src/views/iscs/iscsSystem/config/bas/controlChild/ventilation3.vue @@ -0,0 +1,296 @@ + + + + + diff --git a/src/views/iscs/iscsSystem/config/bas/schedules.vue b/src/views/iscs/iscsSystem/config/bas/schedules.vue new file mode 100644 index 000000000..3c627f224 --- /dev/null +++ b/src/views/iscs/iscsSystem/config/bas/schedules.vue @@ -0,0 +1,123 @@ + + + + + diff --git a/src/views/iscs/iscsSystem/config/deviceControl.vue b/src/views/iscs/iscsSystem/config/deviceControl.vue index ce1a3f503..14de70143 100644 --- a/src/views/iscs/iscsSystem/config/deviceControl.vue +++ b/src/views/iscs/iscsSystem/config/deviceControl.vue @@ -113,7 +113,9 @@ export default { FrozenPump: '冷冻泵、冷却泵', TunnelFan: '隧道风机', OrbitalVentilator: '排热风机', - Draught: '水泵' + Draught: '水泵', + Stairs: '自动扶梯', + Elevator: '垂直电梯' }, modeMap: { standFAS: '火灾报警', diff --git a/src/views/iscs/iscsSystem/config/index.vue b/src/views/iscs/iscsSystem/config/index.vue index e1eacf3eb..73b47aefb 100644 --- a/src/views/iscs/iscsSystem/config/index.vue +++ b/src/views/iscs/iscsSystem/config/index.vue @@ -30,6 +30,7 @@ + @@ -68,6 +69,7 @@ import GraphicEle from './graphicEle'; import DeviceControl from './deviceControl'; import ElectricEscalator from './bas/electricEscalator'; import WaterSupply from './bas/waterSupply'; +import Schedules from './bas/schedules'; export default { components: { @@ -102,7 +104,8 @@ export default { waterSystem, LightingSystem, ElectricEscalator, - WaterSupply + WaterSupply, + Schedules }, data() { return { @@ -127,7 +130,9 @@ export default { 'FrozenPump', 'TunnelFan', 'OrbitalVentilator', - 'Draught' + 'Draught', + 'Stairs', + 'Elevator' ] }; }, From 62ede6fec72e09b8bfa75dc1b42ab0dbd2d0d30c Mon Sep 17 00:00:00 2001 From: zyy <1787816799@qq.com> Date: Tue, 9 Jun 2020 18:40:48 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BD=9B=E5=B1=B1?= =?UTF-8?q?=E7=BA=BF=E8=B7=AF=E7=8E=B0=E5=9C=B0=E6=93=8D=E4=BD=9C=EF=BC=8C?= =?UTF-8?q?=E8=B0=83=E6=95=B4=E7=8A=B6=E6=80=81=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/jmapNew/map.js | 2 ++ .../foshan_01/menus/dialog/routeControl.vue | 28 +++++++++++++++++++ .../theme/foshan_01/menus/menuSignal.vue | 26 +++++++++++++++++ .../foshan_01/menus/utils/menuOperate.js | 10 +++++++ 4 files changed, 66 insertions(+) diff --git a/src/jmapNew/map.js b/src/jmapNew/map.js index 463b980e5..e8221049f 100644 --- a/src/jmapNew/map.js +++ b/src/jmapNew/map.js @@ -448,9 +448,11 @@ class Jlmap { if (index) { status.atsControl = status.atsControl && elem.atsControl; status.fleetMode = status.fleetMode || elem.fleetMode; + status.ciControl = status.ciControl && elem.ciControl; } else { status.atsControl = elem.atsControl; status.fleetMode = elem.fleetMode; + status.ciControl = elem.ciControl; } }); } diff --git a/src/jmapNew/theme/foshan_01/menus/dialog/routeControl.vue b/src/jmapNew/theme/foshan_01/menus/dialog/routeControl.vue index e515e9d87..e2bc7e0b1 100644 --- a/src/jmapNew/theme/foshan_01/menus/dialog/routeControl.vue +++ b/src/jmapNew/theme/foshan_01/menus/dialog/routeControl.vue @@ -85,6 +85,10 @@ export default { return '信号机控制'; } else if (this.operation == OperationEvent.Signal.cancelAutoInterlock.menu.operation) { return '信号机控制'; + } else if (this.operation == OperationEvent.Signal.setAutoTrigger.menu.operation) { + return '设置联锁自动触发'; + } else if (this.operation == OperationEvent.Signal.cancelAutoTrigger.menu.operation) { + return '取消联锁自动触发'; } return ''; } @@ -146,6 +150,10 @@ export default { this.singalPassModel(); // 设置通过模式 } else if (this.operation == OperationEvent.Signal.cancelAutoInterlock.menu.operation) { this.singalCancelPassModel(); // 取消通过模式 + } else if (this.operation == OperationEvent.Signal.setAutoTrigger.menu.operation) { + this.setAutoTrigger(); /** 设置联锁自动触发*/ + } else if (this.operation == OperationEvent.Signal.cancelAutoTrigger.menu.operation) { + this.cancelAutoTrigger(); /** 取消联锁自动触发*/ } }, // 取消列车进路 @@ -208,6 +216,26 @@ export default { this.sendCommand(operate); }, + // 设置联锁自动触发 + setAutoTrigger() { + const operate = { + over: true, + operation: OperationEvent.Signal.setAutoTrigger.menu.operation, + cmdType: CMD.Signal.CMD_SIGNAL_SET_CI_AUTO_TRIGGER + }; + + this.sendCommand(operate); + }, + // 取消联锁自动触发 + cancelAutoTrigger() { + const operate = { + over: true, + operation: OperationEvent.Signal.cancelAutoTrigger.menu.operation, + cmdType: CMD.Signal.CMD_SIGNAL_CANCEL_CI_AUTO_TRIGGER + }; + + this.sendCommand(operate); + }, sendCommand(operate) { this.loading = true; this.$store.dispatch('training/nextNew', operate).then(({ valid }) => { diff --git a/src/jmapNew/theme/foshan_01/menus/menuSignal.vue b/src/jmapNew/theme/foshan_01/menus/menuSignal.vue index bb566411e..5d5b3431b 100644 --- a/src/jmapNew/theme/foshan_01/menus/menuSignal.vue +++ b/src/jmapNew/theme/foshan_01/menus/menuSignal.vue @@ -101,6 +101,16 @@ export default { handler: this.atsAutoControl, cmdType: CMD.Signal.CMD_SIGNAL_OPEN_AUTO_SETTING }, + { + label: '设置联锁自动触发', + handler: this.setAutoTrigger, + cmdType: CMD.Signal.CMD_SIGNAL_SET_CI_AUTO_TRIGGER + }, + { + label: '取消联锁自动触发', + handler: this.cancelAutoTrigger, + cmdType: CMD.Signal.CMD_SIGNAL_CANCEL_CI_AUTO_TRIGGER + }, { label: '查询进路状态', handler: this.detail, @@ -327,6 +337,22 @@ export default { this.$refs.noticeInfo.doShow({}, error.message); }); }, + // 设置联锁自动触发 + setAutoTrigger() { + commitOperate(menuOperate.Signal.setAutoTrigger, {signalCode:this.selected.code}, 0).then(({valid, operate})=>{ + if (valid) { + this.$refs.routeControl.doShow(operate, this.selected); + } + }); + }, + // 取消联锁自动触发 + cancelAutoTrigger() { + commitOperate(menuOperate.Signal.cancelAutoTrigger, {signalCode:this.selected.code}, 0).then(({valid, operate})=>{ + if (valid) { + this.$refs.routeControl.doShow(operate, this.selected); + } + }); + }, // 查询进路状态 detail() { commitOperate(menuOperate.Signal.detail, {signalCode:this.selected.code}, 0).then(({valid, operate})=>{ diff --git a/src/jmapNew/theme/foshan_01/menus/utils/menuOperate.js b/src/jmapNew/theme/foshan_01/menus/utils/menuOperate.js index 4e9b5627d..e2a7055fc 100644 --- a/src/jmapNew/theme/foshan_01/menus/utils/menuOperate.js +++ b/src/jmapNew/theme/foshan_01/menus/utils/menuOperate.js @@ -106,6 +106,16 @@ export const menuOperate = { // 取消自动折返 operation: OperationEvent.AutoTurnBack.CancelAutoTurnBackButton.menu.operation, cmdType: CMD.Signal.CMD_SIGNAL_CANCEL_AUTO_TURN_BACK + }, + setAutoTrigger: { + // 设置联锁自动触发 + operation: OperationEvent.Signal.setAutoTrigger.menu.operation, + cmdType: CMD.Signal.CMD_SIGNAL_SET_CI_AUTO_TRIGGER + }, + cancelAutoTrigger: { + // 取消联锁自动触发 + operation: OperationEvent.Signal.cancelAutoTrigger.menu.operation, + cmdType: CMD.Signal.CMD_SIGNAL_CANCEL_CI_AUTO_TRIGGER } }, Switch:{ From e4ec3dfbde185b3c184aa012bbd89d1015376a98 Mon Sep 17 00:00:00 2001 From: zyy <1787816799@qq.com> Date: Wed, 10 Jun 2020 11:18:50 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E8=B0=83=E6=95=B4=E4=BD=9B=E5=B1=B1?= =?UTF-8?q?=E7=BA=BF=E8=B7=AF=20=E7=AB=99=E5=8F=B0=E6=93=8D=E4=BD=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/jmapNew/shape/Train/EMouse.js | 2 +- .../foshan_01/menus/dialog/standRunLevel.vue | 26 ++++++++------- .../foshan_01/menus/dialog/standStopTime.vue | 33 +++++++++---------- 3 files changed, 32 insertions(+), 29 deletions(-) diff --git a/src/jmapNew/shape/Train/EMouse.js b/src/jmapNew/shape/Train/EMouse.js index c65a5515d..a040e371b 100644 --- a/src/jmapNew/shape/Train/EMouse.js +++ b/src/jmapNew/shape/Train/EMouse.js @@ -39,7 +39,7 @@ class EMouse extends Group { if (Vue.prototype.$jlmap.lineCode == '11' || Vue.prototype.$jlmap.lineCode == '10') { text = `列车类型: ${trainType}\n来\0\0\0\0源:人工标记\n车\0组\0号: ${this.device.model.groupNumber}\n表\0\0\0\0号: ${this.device.model.serviceNumber}\n车\0次\0号: ${this.device.model.tripNumber}\n目的地号: ${this.device.model.destinationCode ? this.device.model.destinationCode : ''}\n早\0晚\0点: ${destinationText}\n运行方向: ${direction ? '上行' : '下行'}\nATP报告方向: ${direction ? '上行' : '下行'}\n起点站名: \n终点站名: \n占用轨道: ${this.device.model.sectionModel ? this.device.model.sectionModel.parentName : ''}\n所在车站: \n车次通信: 通信车\n运行时间: \n停站时间: \n扣车状态: ${ this.device.model.hold ? '扣车' : '正常'}\n车载扣车: 不执行\n跳停状态: ${this.device.model.jump ? '跳停' : '正常'}\n停稳状态: ${!this.device.model.stop ? '未停稳' : '停稳'}\n阻塞状态: 无\n列车状态: CTC车\n最高信号系统控制: CTC\n驾驶模式: SM模式\n最高ATP模式: AM\nATP1状态: 激活\nATP2状态: 备用\n速度: ${this.device.model.speed || 0} km/h\n车门状态: ${this.device.model.speed ? '关闭' : direction ? '左开右关' : '左关右开'}\n制动状态: 无紧急制动\n停车保证: 可保证停车\n站台无法进入: 否\n前方站台停车点: 中间\n折法策略: \n折返状态: \n屏蔽门开门许可: 是\n运营里程: 无效\n总重量: 196T\n车长: 11860cm\n列车编组: 1`; } else { - text = `列车类型: ${trainType} \n表\0\0\0\0号: ${this.device.model.serviceNumber}\n车\0次\0号: ${this.device.model.tripNumber}\n目的地号: ${this.device.model.destinationCode ? this.device.model.destinationCode : ''}\n车\0组\0号: ${this.device.model.groupNumber}\n早\0晚\0点: ${destinationText}\n运行方向: ${direction ? '上行' : '下行'}\n乘务组号: \n起点站名: \n终点站名: \n占用轨道: ${this.device.model.sectionModel ? (this.device.model.sectionModel.parentName ? this.device.model.sectionModel.parentName : this.device.model.sectionModel.name) : ''}\n所在车站: \n车地通信: 正常\n运行等级: 4\n扣车状态: ${ this.device.model.hold ? '扣车' : '正常'}\n跳停状态: ${this.device.model.jump ? '跳停' : '正常'} \n停稳状态: ${!this.device.model.stop ? '未停稳' : '停稳'}\n阻塞状态: 无\n列车速度: ${this.device.model.speed || 0} km/h\n列车移动授权距离: ${this.device.model.maLen || 0} m`; + text = `列车类型: ${trainType} \n表\0\0\0\0号: ${this.device.model.serviceNumber}\n车\0次\0号: ${this.device.model.tripNumber}\n目的地号: ${this.device.model.destinationCode ? this.device.model.destinationCode : ''}\n车\0组\0号: ${this.device.model.groupNumber}\n早\0晚\0点: ${destinationText}\n运行方向: ${direction ? '上行' : '下行'}\n乘务组号: \n起点站名: \n终点站名: \n占用轨道: ${this.device.model.sectionModel ? (this.device.model.sectionModel.parentName ? this.device.model.sectionModel.parentName : this.device.model.sectionModel.name) : ''}\n所在车站: \n车地通信: 正常\n运行等级: 4\n扣车状态: ${this.device.model.hold ? '扣车' : '正常'}\n跳停状态: ${this.device.model.jump ? '跳停' : '正常'} \n停稳状态: ${!this.device.model.stop ? '未停稳' : '停稳'}\n阻塞状态: 无\n列车速度: ${this.device.model.speed || 0} km/h\n列车移动授权距离: ${this.device.model.maLen || 0} m`; } } const trainTip = this.device.style.Train.common.trainTip; diff --git a/src/jmapNew/theme/foshan_01/menus/dialog/standRunLevel.vue b/src/jmapNew/theme/foshan_01/menus/dialog/standRunLevel.vue index 4a53ffc85..a85029268 100644 --- a/src/jmapNew/theme/foshan_01/menus/dialog/standRunLevel.vue +++ b/src/jmapNew/theme/foshan_01/menus/dialog/standRunLevel.vue @@ -188,12 +188,12 @@ export default { getLevelByTime(time) { const times = Object.keys(this.timeList).findIndex(key => { return this.timeList[key].findIndex(obj => { - return obj.value === time; + return obj.value == time; }) >= 0; }).toString(); return times == -1 ? '0' : times; }, - loadInitData(selected, opts) { + loadInitData(selected) { this.tempData = []; const index = this.stationList.findIndex(n => n.code == selected.stationCode); if (selected.direction == '01') { // 下行 @@ -201,18 +201,18 @@ export default { if (index != 0) { const stationStand = this.$store.getters['map/getDeviceByCode'](this.stationStandList[index + 1].code); const station = this.$store.getters['map/getDeviceByCode'](stationStand.stationCode); - this.tempData.push({ name: `${stationStand.name}(${station.name})`, level: this.getLevelByTime(opts.intervalRunTime), time: opts.intervalRunTime ? opts.intervalRunTime : 0, check: opts.intervalRunTimeValidStatus }); + this.tempData.push({ name: `${stationStand.name}(${station.name})`, level: this.getLevelByTime(selected.runLevelTime), time: selected.runLevelTime ? selected.runLevelTime : 0, check: !!selected.runLevelTimeForever }); } } else { // 上行时，此站不是最后一站 if (index != this.stationList.length) { const stationStand = this.$store.getters['map/getDeviceByCode'](this.stationStandList[index + 1].code); const station = this.$store.getters['map/getDeviceByCode'](stationStand.stationCode); - this.tempData.push({ name: `${stationStand.name}(${station.name})`, level: this.getLevelByTime(opts.intervalRunTime), time: opts.intervalRunTime ? opts.intervalRunTime : 0, check: opts.intervalRunTimeValidStatus }); + this.tempData.push({ name: `${stationStand.name}(${station.name})`, level: this.getLevelByTime(selected.runLevelTime), time: selected.runLevelTime ? selected.runLevelTime : 0, check: !!selected.runLevelTimeForever }); } } }, - doShow(operate, selected, opts) { + doShow(operate, selected) { this.selected = selected; // 如果不是断点激活窗口，而是第一次显示窗口时，需要初始化窗口数据 if (!this.dialogShow) { @@ -225,7 +225,7 @@ export default { this.stationName = station.name; } } - this.loadInitData(selected, opts); + this.loadInitData(selected); } this.dialogShow = true; @@ -249,10 +249,11 @@ export default { }, timeSelectChange(time) { const operate = { - operation: OperationEvent.StationStand.setRunLevel.choose.operation + operation: OperationEvent.StationStand.setRunLevel.choose.operation, + val: this.time }; - this.time = time.toString(); + this.time = time; this.isSelect = false; this.isConfirm = true; this.$store.dispatch('training/nextNew', operate).then(({ valid }) => { @@ -263,7 +264,8 @@ export default { }, levelSelectChange(row) { const operate = { - operation: OperationEvent.StationStand.setRunLevel.chooseLevel.operation + operation: OperationEvent.StationStand.setRunLevel.chooseLevel.operation, + val: row.level }; this.time = row.time = this.timeList[row.level][0].value; @@ -277,8 +279,10 @@ export default { }, checkChange(check) { const operate = { - operation: OperationEvent.StationStand.setRunLevel.check.operation + operation: OperationEvent.StationStand.setRunLevel.check.operation, + val: check }; + this.isConfirm = true; this.$store.dispatch('training/nextNew', operate).then(({ valid }) => { if (valid) { @@ -299,7 +303,7 @@ export default { operation: OperationEvent.StationStand.setRunLevel.menu.operation, cmdType: CMD.Stand.CMD_STAND_SET_RUN_TIME, param: { - runLevelTime: this.time, + runLevelTime: Number(this.time), runLevelTimeForever: !!this.tempData[0].check } }; diff --git a/src/jmapNew/theme/foshan_01/menus/dialog/standStopTime.vue b/src/jmapNew/theme/foshan_01/menus/dialog/standStopTime.vue index 4a1abbde7..ee41c0aac 100644 --- a/src/jmapNew/theme/foshan_01/menus/dialog/standStopTime.vue +++ b/src/jmapNew/theme/foshan_01/menus/dialog/standStopTime.vue @@ -38,8 +38,8 @@ 有效次数
- 一次有效 - 一直有效 + 一次有效 + 一直有效
@@ -128,7 +128,7 @@ export default { }); }, methods: { - doShow(operate, selected, tempDate) { + doShow(operate, selected) { this.selected = selected || {}; // 如果不是断点激活，则需要对初始值进行初始化 if (!this.dialogShow) { @@ -142,11 +142,11 @@ export default { } } - this.control = Number(tempDate.parkingTime) === -1 ? '01' : '02'; - this.time = Number(tempDate.parkingTime) === -1 ? 15 : Number(tempDate.parkingTime); - // this.effective = tempDate.parkingValidStatus ? true : false; - this.effective = tempDate.parkingValidStatus ? '1' : '0'; + this.control = Number(selected.parkingTime) == -1 ? '01' : '02'; + this.effective = selected.parkingAlwaysValid ? '1' : '0'; this.direction = selected.direction; + + this.time = Number(selected.parkingTime) == -1 ? 15 : Number(selected.parkingTime); } this.dialogShow = true; this.$nextTick(function () { @@ -162,12 +162,13 @@ export default { chooseControl(control) { /** 自动时的默认时间*/ if (control == '01') { - this.inputTime = 15; - this.effective = 1; + this.time = 15; + this.effective = '1'; } const operate = { - operation: OperationEvent.StationStand.setStopTime.choose1.operation + operation: OperationEvent.StationStand.setStopTime.choose1.operation, + val: this.control }; this.$store.dispatch('training/nextNew', operate).then(({ valid }) => { @@ -178,7 +179,8 @@ export default { }, chooseEffective() { const operate = { - operation: OperationEvent.StationStand.setStopTime.choose2.operation + operation: OperationEvent.StationStand.setStopTime.choose2.operation, + val: this.effective }; this.$store.dispatch('training/nextNew', operate).then(({ valid }) => { @@ -190,7 +192,8 @@ export default { inputTime() { const operate = { repeat: true, - operation: OperationEvent.StationStand.setStopTime.input.operation + operation: OperationEvent.StationStand.setStopTime.input.operation, + val: this.time }; this.$store.dispatch('training/nextNew', operate).then(({ valid }) => { @@ -205,11 +208,9 @@ export default { operation: OperationEvent.StationStand.setStopTime.menu.operation, cmdType: CMD.Stand.CMD_STAND_SET_PARK_TIME, param: { - parkingTime: this.control == '01' ? -1 : 1, - runLevelTime: this.time, + parkingTime: this.control == '01' ? -1 : this.time, parkingAlwaysValid: this.effective == '1' } - // messages: [`停站时间: ${this.stationName} - ${this.standName}, 停站时间为${this.control == '01' ? '自动' : this.time + '秒'}, 有效次数为${this.effective == false ? '一次有效' : '一直有效'}`] }; this.loading = true; @@ -217,8 +218,6 @@ export default { this.loading = false; if (valid) { this.doClose(); - // this.$store.dispatch('menuOperation/handleBreakFlag', { break: true }); - // this.$refs.confirmControl.doShow(operate); } }).catch((error) => { this.loading = false;