From ea8222504e0609c6a207aec129725919751c5504 Mon Sep 17 00:00:00 2001 From: fan <18706759286@163.com> Date: Wed, 20 May 2020 10:02:07 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=AB=9E=E8=B5=9B?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/competition.js | 38 +++++++++++++++++++ .../iscs/iscsSystem/config/pis/lcdControl.vue | 30 ++++++++++++++- 2 files changed, 66 insertions(+), 2 deletions(-) create mode 100644 src/api/competition.js diff --git a/src/api/competition.js b/src/api/competition.js new file mode 100644 index 000000000..483d58386 --- /dev/null +++ b/src/api/competition.js @@ -0,0 +1,38 @@ +import request from '@/utils/request'; + +/** 裁判退出仿真*/ +export function refereeExitSimulation(group) { + return request({ + url: `/api/v1/competition/room/${group}/refree`, + method: 'delete' + }); +} +/** 裁判进入仿真 */ +export function refereeEnterSimulation(group) { + return request({ + url: `/api/v1/competition/room/${group}/refree`, + method: 'post' + }); +} +/** 裁判查询竞赛人员的房间列表 */ +export function refereeGetCompetitionList(id) { + return request({ + url: `/api/v1/competition/${id}/room`, + method: 'get' + }); +} +/** 参赛者创建演练房间 */ +export function participantCreatTrainingRoom(id, data) { + return request({ + url: `/api/v1/competition/${id}/room`, + method: 'post', + data: data + }); +} +/** 参赛者完成竞赛 */ +export function participantCompleteCompetition(id, group) { + return request({ + url: `/api/v1/competition/${id}/room/${group}`, + method: 'post' + }); +} diff --git a/src/views/iscs/iscsSystem/config/pis/lcdControl.vue b/src/views/iscs/iscsSystem/config/pis/lcdControl.vue index 9f827a7a0..64cc1e513 100644 --- a/src/views/iscs/iscsSystem/config/pis/lcdControl.vue +++ b/src/views/iscs/iscsSystem/config/pis/lcdControl.vue @@ -7,8 +7,8 @@
- 开启LCD屏 - 关闭LCD屏 + 开启LCD屏 + 关闭LCD屏
确定
@@ -69,3 +69,29 @@ export default { line-height: 30px; } + From ca7e92f6a131a89c40f7b9001d2cfc09b9c0b34e Mon Sep 17 00:00:00 2001 From: joylink_cuiweidong <364937672@qq.com> Date: Wed, 20 May 2020 10:28:16 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E5=89=A7=E6=9C=AC=E7=BC=96=E5=88=B6?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/jmapNew/shape/Section/EAxle.js | 1 - src/scripts/cmdPlugin/Handler.js | 2 +- src/scripts/cmdPlugin/MenuContextHandler.js | 3 +- .../scriptManage/scriptRecord/addAction.vue | 32 +++++++++++++++++++ 4 files changed, 34 insertions(+), 4 deletions(-) diff --git a/src/jmapNew/shape/Section/EAxle.js b/src/jmapNew/shape/Section/EAxle.js index c7d07decd..492efc9ec 100644 --- a/src/jmapNew/shape/Section/EAxle.js +++ b/src/jmapNew/shape/Section/EAxle.js @@ -257,7 +257,6 @@ export default class EAxle111 extends Group { setStyle(styles) { if (this.model.shape.isSpecial) { - this.isogonInside.setStyle(styles); this.isogonOutside.setStyle(styles); this.line1.setStyle(styles); this.line2.setStyle(styles); diff --git a/src/scripts/cmdPlugin/Handler.js b/src/scripts/cmdPlugin/Handler.js index 1fde94d33..3c6075115 100644 --- a/src/scripts/cmdPlugin/Handler.js +++ b/src/scripts/cmdPlugin/Handler.js @@ -101,7 +101,7 @@ class Handler { const command = this.getCommand(operation); if (command) { // 判断当前是否是剧本 添加动作指令操作 - if (store.state.scriptRecord.isScriptCommand) { + if (store.state.scriptRecord.isScriptCommand && store.state.scriptRecord.bgSet ) { store.dispatch('scriptRecord/updateScriptCommand', {operationId:command.id, cmdType:operation.cmdType, param:command.get()}); resolve(rtn); } else { diff --git a/src/scripts/cmdPlugin/MenuContextHandler.js b/src/scripts/cmdPlugin/MenuContextHandler.js index 3ec7adf69..464a4a8dd 100644 --- a/src/scripts/cmdPlugin/MenuContextHandler.js +++ b/src/scripts/cmdPlugin/MenuContextHandler.js @@ -62,8 +62,7 @@ class MenuContextHandler { const selected = this.getCurrentStateObject(); let menu = []; const control = this.getStationControl(selected); - - if (control) { + if (control && (!store.state.scriptRecord.bgSet || store.state.scriptRecord.isScriptCommand)) { if (this.getPrdType() != '') { const type = State2SimulationMap[this.getPrdType()]; const status = State2ControlMap[control.controlMode]; // 判断当前模式 diff --git a/src/views/scriptManage/scriptRecord/addAction.vue b/src/views/scriptManage/scriptRecord/addAction.vue index 06edacbf2..ed776e389 100644 --- a/src/views/scriptManage/scriptRecord/addAction.vue +++ b/src/views/scriptManage/scriptRecord/addAction.vue @@ -221,11 +221,21 @@ export default { // this.commandDataNew.action.operationId = val.operationId; this.commandDataNew.action.operationParamMap = val.param; this.messageTips2 = ''; + }, + 'commandDataNew.action.memberId':function(val) { + if (val) { + this.$store.dispatch('scriptRecord/updateIsScriptCommand', true); + } else { + this.$store.dispatch('scriptRecord/updateIsScriptCommand', false); + } } }, mounted() { this.initData(); }, + beforeDestroy() { + this.$store.dispatch('scriptRecord/updateIsScriptCommand', false); + }, methods:{ initData() { this.buttonName = this.$t('scriptRecord.addConversitionButton'); @@ -362,10 +372,16 @@ export default { }, changeMember(member) { if (member) { + if (this.isFirstTips) { + this.$message('请在右侧地图上选择操作'); + this.isFirstTips = false; + } this.messageTips1 = ''; this.executeCommandName = ''; this.commandDataNew.action.operationType = ''; this.commandDataNew.action.operationParamMap = {}; + this.$store.dispatch('scriptRecord/updateIsScriptCommand', true); + this.switchMode(member); } }, addCommandActionNew() { @@ -537,6 +553,22 @@ export default { if (!this.drawWay) { this.$refs.command.resetData(); } + }, + switchMode(role) { + let prdType = ''; + const memberInfo = this.memberList.find(member=>{ + return member.id == role; + }); + if (memberInfo) { + if (memberInfo.role == '行值') { + prdType = '01'; + } else if (memberInfo.role == '行调') { + prdType = '02'; + } else if (memberInfo.role == '司机') { + prdType = '04'; + } + } + this.$store.dispatch('training/setPrdType', prdType); } } }; From 5ad20c565991877c40900b7f47c36b595ce4c566 Mon Sep 17 00:00:00 2001 From: joylink_cuiweidong <364937672@qq.com> Date: Wed, 20 May 2020 10:46:38 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E5=89=A7=E6=9C=AC=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/trainRoom/e-roles.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/trainRoom/e-roles.vue b/src/views/trainRoom/e-roles.vue index 6aebf51cc..e9e218732 100644 --- a/src/views/trainRoom/e-roles.vue +++ b/src/views/trainRoom/e-roles.vue @@ -63,7 +63,7 @@ @changeUser="handleUpdUser" @delUser="handleDelUser" /> - + /> --> Date: Wed, 20 May 2020 10:50:13 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E9=9A=90=E8=97=8F=E4=B8=89=E7=BB=B4?= =?UTF-8?q?=E7=AB=99=E5=8F=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../connect/Jlmap3dSubscribeNew.js | 1 + .../drive/drivecontrol/drivecontrol.vue | 22 ++++++---------- src/views/jlmap3d/drive/jl3ddrive.vue | 25 +++++++++++++++++++ src/views/newMap/displayNew/menuDemon.vue | 2 +- 4 files changed, 34 insertions(+), 16 deletions(-) diff --git a/src/jlmap3d/jl3dsimulation/connect/Jlmap3dSubscribeNew.js b/src/jlmap3d/jl3dsimulation/connect/Jlmap3dSubscribeNew.js index 790191d3b..57285b9f7 100644 --- a/src/jlmap3d/jl3dsimulation/connect/Jlmap3dSubscribeNew.js +++ b/src/jlmap3d/jl3dsimulation/connect/Jlmap3dSubscribeNew.js @@ -58,6 +58,7 @@ export function Jlmap3dSubscribeNew(jlmap3d,routegroup,jsonwebwork) { // // console.log(event.data); // // } + console.log(event.data); if(event.data.type == "Device_Load_Destroy_3D"){ DeviceDestroy(event.data); return; diff --git a/src/views/jlmap3d/drive/drivecontrol/drivecontrol.vue b/src/views/jlmap3d/drive/drivecontrol/drivecontrol.vue index ab1a69a8e..7392fc72b 100644 --- a/src/views/jlmap3d/drive/drivecontrol/drivecontrol.vue +++ b/src/views/jlmap3d/drive/drivecontrol/drivecontrol.vue @@ -23,11 +23,7 @@ {{ jl3dname }} {{ jl3dmodel }}