From 09b151e830b78df1e4c2c4b63194510859739d54 Mon Sep 17 00:00:00 2001 From: zyy <1787816799@qq.com> Date: Tue, 11 Aug 2020 15:46:15 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=9C=B0=E5=9B=BE?= =?UTF-8?q?=E7=BB=98=E5=88=B6=E6=B5=81=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/utils/baseUrl.js | 4 ++-- src/views/newMap/jointTrainingNew/chatView/chatContent.vue | 3 --- src/views/newMap/jointTrainingNew/index.vue | 2 +- src/views/newMap/newMapdraft/mapoperate/section/index.vue | 7 ++++++- 4 files changed, 9 insertions(+), 7 deletions(-) diff --git a/src/utils/baseUrl.js b/src/utils/baseUrl.js index 55d352581..778caeb7b 100644 --- a/src/utils/baseUrl.js +++ b/src/utils/baseUrl.js @@ -2,10 +2,10 @@ 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.41:9000'; // 张赛 // BASE_API = 'http://192.168.3.82:9000'; // 杜康 // BASE_API = 'http://b29z135112.zicp.vip'; // BASE_API = 'http://2925963m2a.zicp.vip'; // 杜康 diff --git a/src/views/newMap/jointTrainingNew/chatView/chatContent.vue b/src/views/newMap/jointTrainingNew/chatView/chatContent.vue index a3d85e945..645fc5bbb 100644 --- a/src/views/newMap/jointTrainingNew/chatView/chatContent.vue +++ b/src/views/newMap/jointTrainingNew/chatView/chatContent.vue @@ -55,7 +55,6 @@ export default { data() { return { chatContentList:[], - coversition:{}, currentAudioList:[], currentAudioIndex:0, isPlay:false, @@ -93,8 +92,6 @@ export default { } }, mounted() { - // this.coversition = this.currentCoversition; - // this.inintData(); }, methods:{ scrollTop() { diff --git a/src/views/newMap/jointTrainingNew/index.vue b/src/views/newMap/jointTrainingNew/index.vue index c875763ba..763d22831 100644 --- a/src/views/newMap/jointTrainingNew/index.vue +++ b/src/views/newMap/jointTrainingNew/index.vue @@ -389,7 +389,7 @@ export default { }, // 设置prdType和role setSimulationPrdType(deviceCode) { - // Admin 管理员 Dispatcher 行调 STATION_SUPERVISOR 车站 Audience 观众 Driver 司机 MAINTAINER 通号 IBP:IBP盘 + // Dispatcher 行调 STATION_SUPERVISOR 车站 Audience 观众 Driver 司机 MAINTAINER 通号 switch (this.userRole) { case 'DISPATCHER': this.$store.dispatch('training/setPrdType', '02'); diff --git a/src/views/newMap/newMapdraft/mapoperate/section/index.vue b/src/views/newMap/newMapdraft/mapoperate/section/index.vue index 5a80b8881..f53b27b07 100644 --- a/src/views/newMap/newMapdraft/mapoperate/section/index.vue +++ b/src/views/newMap/newMapdraft/mapoperate/section/index.vue @@ -603,7 +603,12 @@ export default { models = [...models, ...arr]; } else { const sectionModel = this.$store.getters['map/getDeviceByCode'](model.parentCode); - const arr = this.setLogicOffset(sectionModel, models); + let arr = []; + if (sectionModel) { + arr = this.setLogicOffset(sectionModel, models); + } else { + arr = this.setLogicOffset(model, models); + } models = [...models, ...arr]; } From 2d5f4520d4f6cb99c0bd68c5ce2a2a459cfc91d5 Mon Sep 17 00:00:00 2001 From: zyy <1787816799@qq.com> Date: Wed, 12 Aug 2020 09:50:10 +0800 Subject: [PATCH 2/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=20=E5=BC=BA=E5=88=B6=E5=8F=96=E6=B6=88?= =?UTF-8?q?=E6=89=A3=E8=BD=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../theme/components/menus/dialog/standControl.vue | 9 +++++++++ .../theme/foshan_01/menus/menuStationStand.vue | 13 +++++++++++++ 2 files changed, 22 insertions(+) diff --git a/src/jmapNew/theme/components/menus/dialog/standControl.vue b/src/jmapNew/theme/components/menus/dialog/standControl.vue index c8b7af6c7..fadbe1b95 100644 --- a/src/jmapNew/theme/components/menus/dialog/standControl.vue +++ b/src/jmapNew/theme/components/menus/dialog/standControl.vue @@ -191,6 +191,8 @@ export default { return '区间自动扣车'; } else if (this.operation == OperationEvent.StationStand.cancelDetainTrainAuto.menu.operation) { return '区间取消扣车'; + } else if (this.operation == OperationEvent.StationStand.cancelDetainTrainForce.menu.operation) { + return '强制取消扣车'; } return ''; } @@ -311,6 +313,9 @@ export default { } else if (this.operation == OperationEvent.StationStand.cancelDetainTrainAuto.menu.operation) { /** 取消区间自动扣车*/ this.cancelDetainTrainAuto(); + } else if (this.operation == OperationEvent.StationStand.cancelDetainTrainForce.menu.operation) { + /** 强制取消扣车*/ + this.cancelDetainTrainForce(); } }, setDetainTrainAuto() { // 区间自动扣车 @@ -331,6 +336,10 @@ export default { earlyDeparture() { this.sendCommand(menuOperate.StationStand.earlyDeparture); }, + // 强制取消扣车 + cancelDetainTrainForce() { + this.sendCommand(menuOperate.StationStand.cancelDetainTrainForce); + }, sendCommand(operate, param) { this.loading = true; commitOperate(operate, param, 2).then(({valid})=>{ diff --git a/src/jmapNew/theme/foshan_01/menus/menuStationStand.vue b/src/jmapNew/theme/foshan_01/menus/menuStationStand.vue index e106b2db6..b8fe68a0e 100644 --- a/src/jmapNew/theme/foshan_01/menus/menuStationStand.vue +++ b/src/jmapNew/theme/foshan_01/menus/menuStationStand.vue @@ -73,6 +73,11 @@ export default { handler: this.cancelDetainTrainAll, cmdType:CMD.Stand.CMD_STAND_WHOLE_LINE_CANCEL_HOLD_TRAIN }, + { + label: '强制取消扣车', + handler: this.cancelDetainTrainForce, + cmdType: CMD.Stand.CMD_STAND_FORCE_CANCEL_HOLD_TRAIN + }, { label: '设置提前发车', handler: this.earlyDeparture, @@ -227,6 +232,14 @@ export default { } }); }, + // 强制取消扣车 + cancelDetainTrainForce() { + commitOperate(menuOperate.StationStand.cancelDetainTrainForce, { standCode: this.selected.code }, 0).then(({valid, operate})=>{ + if (valid) { + this.$refs.standControl.doShow(operate, this.selected); + } + }); + }, // 设置跳停 setJumpStop() { commitOperate(menuOperate.StationStand.setJumpStop, {standCode:this.selected.code}, 0).then(({valid, operate})=>{ From 0e36937718de47492af2733ef7245378bbd48333 Mon Sep 17 00:00:00 2001 From: zyy <1787816799@qq.com> Date: Wed, 12 Aug 2020 10:02:19 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=8C=BA=E6=AE=B5?= =?UTF-8?q?=E6=93=8D=E4=BD=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../theme/foshan_01/menus/dialog/speedLimitControl.vue | 8 ++++---- src/jmapNew/theme/foshan_01/menus/menuSection.vue | 5 +++++ 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/src/jmapNew/theme/foshan_01/menus/dialog/speedLimitControl.vue b/src/jmapNew/theme/foshan_01/menus/dialog/speedLimitControl.vue index b452c3adc..efe69bee6 100644 --- a/src/jmapNew/theme/foshan_01/menus/dialog/speedLimitControl.vue +++ b/src/jmapNew/theme/foshan_01/menus/dialog/speedLimitControl.vue @@ -134,7 +134,7 @@ export default { }, speedList() { const list = [{ name: '不限速', value: '-1' }]; - for (var i = 0; i * this.speedSpace <= this.maxSpeed; i++) { + for (var i = 1; i * this.speedSpace <= this.maxSpeed; i++) { const speed = String(i * this.speedSpace); list.push({ name: speed, value: speed }); } @@ -382,15 +382,15 @@ export default { } else if (this.operation == OperationEvent.Section.cancelSpeed.menu.operation) { /** 区段取消限速*/ operate.operation = OperationEvent.Section.cancelSpeed.order.operation; - operate.message = `在【${this.name}】区段，区段取消限速${this.speed}km/h，确认下达吗？`; + operate.message = `在【${this.name}】区段，区段取消限速，确认下达吗？`; } else if (this.operation == OperationEvent.Switch.setSpeed.menu.operation) { /** 道岔设置限速*/ operate.operation = OperationEvent.Switch.setSpeed.order.operation; operate.message = `在【${this.name}】区段，道岔设置限速${this.speed}km/h，确认下达吗？`; } else if (this.operation == OperationEvent.Switch.cancelSpeed.menu.operation) { - /** 区段取消限速*/ + /** 道岔区段取消限速*/ operate.operation = OperationEvent.Switch.cancelSpeed.order.operation; - operate.message = `在【${this.name}】区段，道岔取消限速${this.speed}km/h，确认下达吗？`; + operate.message = `在【${this.name}】区段，道岔区段取消限速，确认下达吗？`; } this.setMessage('请点击“确认1”按钮，确认命令！'); diff --git a/src/jmapNew/theme/foshan_01/menus/menuSection.vue b/src/jmapNew/theme/foshan_01/menus/menuSection.vue index f319bf5a7..9c81537e1 100644 --- a/src/jmapNew/theme/foshan_01/menus/menuSection.vue +++ b/src/jmapNew/theme/foshan_01/menus/menuSection.vue @@ -57,6 +57,11 @@ export default { label: '区段切除', handler: this.split, cmdType: CMD.Section.CMD_SECTION_CUT_OFF + }, + { + label: '设置临时限速', + handler: this.setSpeed, + cmdType: CMD.Section.CMD_SECTION_SET_LIMIT_SPEED } // { // label: '区段故障解锁', From 1f0aaffe6f6442cfc74541dff167a4e165c23f6a Mon Sep 17 00:00:00 2001 From: joylink_cuiweidong <364937672@qq.com> Date: Wed, 12 Aug 2020 10:02:56 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E4=BD=9B=E5=B1=B1=E6=9C=89=E8=BD=A8?= =?UTF-8?q?=E7=94=B5=E8=BD=A6=E4=BF=A1=E5=8F=B7=E6=9C=BA=E4=BC=98=E5=8C=96?= =?UTF-8?q?=EF=BC=88=E5=85=A8=E7=BA=BF=E4=BF=A1=E5=8F=B7=E6=9C=BA=E8=AE=BE?= =?UTF-8?q?=E7=BD=AE=E6=88=90=E5=9B=BE=E6=A0=B7=E7=B1=BB=E5=9E=8B=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/jmapNew/config/skinCode/foshan_01.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/jmapNew/config/skinCode/foshan_01.js b/src/jmapNew/config/skinCode/foshan_01.js index dc22d8a4d..c730067dd 100644 --- a/src/jmapNew/config/skinCode/foshan_01.js +++ b/src/jmapNew/config/skinCode/foshan_01.js @@ -141,7 +141,7 @@ class SkinCode extends defaultStyle { }, lamp: { bgShow: false, // 是否被选中 - guidName: 'double', // 默认引导类型 + guidName: 'defult', // 默认引导类型 stopWidth: 2, // 禁止线宽度 borderWidth: 1, // 信号灯边框线宽度 borderColor: '#3149C3', // 信号灯边框线颜色