From 70114a0014dc71f9ee2a3a8b94a74e2727d7a35c Mon Sep 17 00:00:00 2001 From: zyy <1787816799@qq.com> Date: Fri, 31 Jul 2020 16:22:29 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=AE=81=E6=B3=A2?= =?UTF-8?q?=E7=BA=BF=E8=B7=AF=E6=93=8D=E4=BD=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/jmapNew/config/skinCode/ningbo_01.js | 10 +++++----- src/jmapNew/shape/Train/TrainHead.js | 4 ++-- src/store/modules/scriptRecord.js | 2 +- src/views/newMap/displayNew/demonChat.vue | 4 ++-- src/views/planSchedule/statusBar.vue | 2 +- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/jmapNew/config/skinCode/ningbo_01.js b/src/jmapNew/config/skinCode/ningbo_01.js index b031c45bd..8e96144cb 100644 --- a/src/jmapNew/config/skinCode/ningbo_01.js +++ b/src/jmapNew/config/skinCode/ningbo_01.js @@ -741,12 +741,12 @@ class SkinCode extends defaultStyle { status: 'RMCBTC', trainLColor: '#808080', trainRColor: '#808080' + }, + { + status: 'NRMCBTC', + trainLColor: 'rgba(0, 0, 0, 0)', + trainRColor: 'rgba(0, 0, 0, 0)' } - // { - // status: 'NRM', - // trainLColor: '#A0522D', - // trainRColor: '#A0522D' - // } ], // 列车运行模式对应车头颜色 ATO自动驾驶模式AM ATP监控下的人工驾驶模式CM 限制人工驾驶模式RM 非限制人工驾驶模式NRM communicationStatus: [ ] // 设置通信状态 cbtc级别CBTC 点式通信ITC 联锁级IL diff --git a/src/jmapNew/shape/Train/TrainHead.js b/src/jmapNew/shape/Train/TrainHead.js index 786dbb7f5..9728a27ce 100644 --- a/src/jmapNew/shape/Train/TrainHead.js +++ b/src/jmapNew/shape/Train/TrainHead.js @@ -24,7 +24,7 @@ export default class TrainHead extends Group { height: style.Train.trainHead.trainHeadHeight === 'trainBox' ? style.Train.common.trainHeight : model.height }, style: { - lineWidth: 0.1, + lineWidth: 0, stroke: style.trainSidelineColor, fill: style.Train.trainHead.trainHeadFillColor } @@ -45,7 +45,7 @@ export default class TrainHead extends Group { points: points }, style: { - lineWidth: 0.1, + lineWidth: 0, stroke: style.trainSidelineColor, fill: style.Train.trainHead.trainHeadFillColor } diff --git a/src/store/modules/scriptRecord.js b/src/store/modules/scriptRecord.js index 42e1db8e6..eed8e295b 100644 --- a/src/store/modules/scriptRecord.js +++ b/src/store/modules/scriptRecord.js @@ -5,7 +5,7 @@ const scriptRecord = { namespaced: true, state: { mapLocation: {}, // 地图定位, - simulationPause: true, + simulationPause: true, // 剧本 暂停判断 scriptId: '', bgSet: false, isScriptCommand:false, // 当前是否为添加剧本动作指令状态 diff --git a/src/views/newMap/displayNew/demonChat.vue b/src/views/newMap/displayNew/demonChat.vue index 53cc7c2ce..7437503c6 100644 --- a/src/views/newMap/displayNew/demonChat.vue +++ b/src/views/newMap/displayNew/demonChat.vue @@ -85,8 +85,8 @@ export default { lastData = JSON.parse(lastData); const lastMemberList = []; const dispatcherList = []; - const electricDispatcherList = []; - const depotDispatcherList = []; + // const electricDispatcherList = []; + // const depotDispatcherList = []; const stationSupervisorList = []; this.driverList = []; const maintainerList = []; diff --git a/src/views/planSchedule/statusBar.vue b/src/views/planSchedule/statusBar.vue index f7df3461d..43fd5aa89 100644 --- a/src/views/planSchedule/statusBar.vue +++ b/src/views/planSchedule/statusBar.vue @@ -96,7 +96,7 @@ export default { }; -