joylink/rt-sim-training-client
6
0
Fork 0
Code Issues 3 Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test

Browse Source
This commit is contained in:
joylink_cuiweidong 2021-08-17 17:48:58 +08:00
commit f65e84b5a4
4 changed files with 23 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/jmapNew/config/skinCode/nanjing_02.js
View File

@ -127,12 +127,12 @@ class SkinCode extends defaultStyle {
rightName: false, // 右侧限速值是否展示 rightName: false, // 右侧限速值是否展示
nameBackgroundIsRect: true, // 限速值背景是否为矩形 nameBackgroundIsRect: true, // 限速值背景是否为矩形
nameBackgroundBorderWidth: 0, // 限速值背景是否边框宽度 nameBackgroundBorderWidth: 0, // 限速值背景是否边框宽度
nameBackgroundBorderColor: '#C00808', // 限速值背景边框颜色 nameBackgroundBorderColor: '#f00', // 限速值背景边框颜色
limitValueDistance: 18, limitValueDistance: 18,
kilometerFontSize: 0, // 公里标大小 kilometerFontSize: 0, // 公里标大小
switchSectionNoShow: true, // 道岔区段不展示限速 switchSectionNoShow: true, // 道岔区段不展示限速
nameNumberFontSize: 11, // 限速值大小 nameNumberFontSize: 15, // 限速值大小
nameNumberColor: '#C00808', // 限速值颜色 nameNumberColor: '#f00', // 限速值颜色
nameBackground: 'rgba(0,0,0,0)', // 限速名称背景颜色 nameBackground: 'rgba(0,0,0,0)', // 限速名称背景颜色
drogueWidth: 15, // 浮标宽度 drogueWidth: 15, // 浮标宽度
drogueHeight: 12 // 浮标高度 drogueHeight: 12 // 浮标高度

4
src/jmapNew/shape/graph/Section/ELimitName.js
View File

@ -49,7 +49,7 @@ export default class ELimitName extends Group {
style: { style: {
x: x1 + 2, x: x1 + 2,
y: y1, y: y1,
fontWeight: 'normal', fontWeight: 'bolder',
fontSize: style.Section.speedLimitName.nameNumberFontSize, fontSize: style.Section.speedLimitName.nameNumberFontSize,
fontFamily: style.fontFamily, fontFamily: style.fontFamily,
text: '', text: '',
@ -107,7 +107,7 @@ export default class ELimitName extends Group {
style: { style: {
x: x2 - 2, x: x2 - 2,
y: y2, y: y2,
fontWeight: 'normal', fontWeight: 'bolder',
fontSize: style.Section.speedLimitName.nameNumberFontSize, fontSize: style.Section.speedLimitName.nameNumberFontSize,
fontFamily: style.fontFamily, fontFamily: style.fontFamily,
text: '', text: '',

24
src/jmapNew/theme/nanjing_02/menus/menuButton.vue
View File

@ -882,6 +882,16 @@ export default {
this.param.speedLimitValue = -1; this.param.speedLimitValue = -1;
} }
if (this.cmdType === CMD.Stand.CMD_STAND_EARLY_DEPART) {
const stand = this.stationStandList.find(item => item.standTrackCode === this.selectedObj.code);
this.param.standCode = stand.code;
}
if (this.cmdType === CMD.Stand.CMD_STAND_SET_REENTRY_STRATEGY) {
const stand = this.stationStandList.find(item => item.standTrackCode === this.selectedObj.code);
this.param.standCode = stand.code;
this.param.standReentryStrategy = row.params.val;
}
if (this.cmdType == CMD.Section.CMD_SECTION_SET_LIMIT_SPEED || this.cmdType == CMD.Switch.CMD_SWITCH_SET_LIMIT_SPEED) { if (this.cmdType == CMD.Section.CMD_SECTION_SET_LIMIT_SPEED || this.cmdType == CMD.Switch.CMD_SWITCH_SET_LIMIT_SPEED) {
if (this.operate == OperationEvent.Section.setSpeed.menuButton.operation || if (this.operate == OperationEvent.Section.setSpeed.menuButton.operation ||
this.operate == OperationEvent.Switch.setSpeed.menuButton.operation) { this.operate == OperationEvent.Switch.setSpeed.menuButton.operation) {
@ -1311,13 +1321,13 @@ export default {
{ name: '下行自动折返', commandTip: '下行自动折返', cmdType: CMD.Section.CMD_STAND_SET_REENTRY_STRATEGY, operate: OperationEvent.Section.setBackStrategy.menuBtnDown04, params: {val: '04'}, disabledCb: (stationControl) => !this.modeMatch, isShow: (section) => section.roadType != 'RIGHT' && section.standTrack && this.$store.state.training.prdType == '02' }, { name: '下行自动折返', commandTip: '下行自动折返', cmdType: CMD.Section.CMD_STAND_SET_REENTRY_STRATEGY, operate: OperationEvent.Section.setBackStrategy.menuBtnDown04, params: {val: '04'}, disabledCb: (stationControl) => !this.modeMatch, isShow: (section) => section.roadType != 'RIGHT' && section.standTrack && this.$store.state.training.prdType == '02' },
{ name: '车站发车', commandTip: '车站发车', cmdType: CMD.Section.CMD_STAND_EARLY_DEPART, operate: OperationEvent.Section.earlyDeparture.menuBtn, disabledCb: (stationControl) => !this.modeMatch, isShow: (section) => section.standTrack && this.$store.state.training.prdType == '02' }, { name: '车站发车', commandTip: '车站发车', cmdType: CMD.Section.CMD_STAND_EARLY_DEPART, operate: OperationEvent.Section.earlyDeparture.menuBtn, disabledCb: (stationControl) => !this.modeMatch, isShow: (section) => section.standTrack && this.$store.state.training.prdType == '02' },
{ name: '折返 DTO', commandTip: '折返 DTO', cmdType: CMD.Section.CMD_SECTION_1, operate: OperationEvent.Section.turnBackDTO.menuButton, disabledCb: (stationControl) => !this.modeMatch, isShow: () => this.$store.state.training.prdType == '01' }, { name: '折返 DTO', commandTip: '折返 DTO', cmdType: CMD.Stand.CMD_STAND_SET_REENTRY_STRATEGY, operate: OperationEvent.Section.turnBackDTO.menuButton, params: {val: 'UNMANNED'}, disabledCb: (stationControl) => !this.modeMatch, isShow: (section) => section.standTrack && this.$store.state.training.prdType == '01' },
{ name: '取消折返', commandTip: '取消折返', cmdType: CMD.Section.CMD_SECTION_2, operate: OperationEvent.Section.CancelTurnBack.menuButton, disabledCb: (stationControl) => !this.modeMatch, isShow: () => this.$store.state.training.prdType == '01' }, { name: '取消折返', commandTip: '取消折返', cmdType: CMD.Stand.CMD_STAND_SET_REENTRY_STRATEGY, operate: OperationEvent.Section.CancelTurnBack.menuButton, params: {val: 'NONE'}, disabledCb: (stationControl) => !this.modeMatch, isShow: (section) => section.standTrack && this.$store.state.training.prdType == '01' },
{ name: '自动折返', commandTip: '自动折返', cmdType: CMD.Section.CMD_SECTION_3, operate: OperationEvent.Section.AutoTurnBack.menuButton, disabledCb: (stationControl) => !this.modeMatch, isShow: () => this.$store.state.training.prdType == '01' }, { name: '自动折返', commandTip: '自动折返', cmdType: CMD.Stand.CMD_STAND_SET_REENTRY_STRATEGY, operate: OperationEvent.Section.AutoTurnBack.menuButton, params: {val: 'DEFAULT'}, disabledCb: (stationControl) => !this.modeMatch, isShow: (section) => section.standTrack && this.$store.state.training.prdType == '01' },
{ name: '换上至下', commandTip: '换上至下', cmdType: CMD.Section.CMD_SECTION_4, operate: OperationEvent.Section.PutUpTheDown.menuButton, disabledCb: (stationControl) => !this.modeMatch, isShow: (section) => section.roadType == 'RIGHT' && this.$store.state.training.prdType == '01' }, { name: '换上至下', commandTip: '换上至下', cmdType: CMD.Stand.CMD_STAND_SET_REENTRY_STRATEGY, operate: OperationEvent.Section.PutUpTheDown.menuButton, params: {val: 'AUTO'}, disabledCb: (stationControl) => !this.modeMatch, isShow: (section) => ((section.roadType === 'RIGHT' && this.$store.state.map.mapConfig.upRight) || (section.roadType === 'LEFT' && !this.$store.state.map.mapConfig.upRight)) && section.standTrack && this.$store.state.training.prdType == '01' },
{ name: '换下至上', commandTip: '换下至上', cmdType: CMD.Section.CMD_SECTION_5, operate: OperationEvent.Section.PutDownTheUp.menuButton, disabledCb: (stationControl) => !this.modeMatch, isShow: (section) => section.roadType != 'RIGHT' && this.$store.state.training.prdType == '01' }, { name: '换下至上', commandTip: '换下至上', cmdType: CMD.Stand.CMD_STAND_SET_REENTRY_STRATEGY, operate: OperationEvent.Section.PutDownTheUp.menuButton, params: {val: 'AUTO'}, disabledCb: (stationControl) => !this.modeMatch, isShow: (section) => ((section.roadType === 'LEFT' && this.$store.state.map.mapConfig.upRight) || (section.roadType === 'RIGHT' && !this.$store.state.map.mapConfig.upRight)) && section.standTrack && this.$store.state.training.prdType == '01' },
{ name: '终止站停-上', commandTip: '上行终止站停', cmdType: CMD.Section.CMD_SECTION_6, operate: OperationEvent.Section.PutUpStop.menuButton, disabledCb: (stationControl) => !this.modeMatch, isShow: (section) => section.roadType == 'RIGHT' && this.$store.state.training.prdType == '01' }, { name: '终止站停-上', commandTip: '上行终止站停', cmdType: CMD.Stand.CMD_STAND_EARLY_DEPART, operate: OperationEvent.Section.PutUpStop.menuButton, disabledCb: (stationControl) => !this.modeMatch, isShow: (section) => ((section.roadType === 'RIGHT' && this.$store.state.map.mapConfig.upRight) || (section.roadType === 'LEFT' && !this.$store.state.map.mapConfig.upRight)) && section.standTrack && this.$store.state.training.prdType == '01' },
{ name: '终止站停-下', commandTip: '下行终止站停', cmdType: CMD.Section.CMD_SECTION_7, operate: OperationEvent.Section.PutDownStop.menuButton, disabledCb: (stationControl) => !this.modeMatch, isShow: (section) => section.roadType != 'RIGHT' && this.$store.state.training.prdType == '01' } { name: '终止站停-下', commandTip: '下行终止站停', cmdType: CMD.Stand.CMD_STAND_EARLY_DEPART, operate: OperationEvent.Section.PutDownStop.menuButton, disabledCb: (stationControl) => !this.modeMatch, isShow: (section) => ((section.roadType === 'LEFT' && this.$store.state.map.mapConfig.upRight) || (section.roadType === 'RIGHT' && !this.$store.state.map.mapConfig.upRight)) && section.standTrack && this.$store.state.training.prdType == '01' }
]; ];
this.switchParamList = [ this.switchParamList = [
{ name: '岔区设限', cmdType: CMD.Switch.CMD_SWITCH_SET_LIMIT_SPEED, operate: OperationEvent.Switch.setSpeed.menuButton, securityCommand: true, disabledCb: (stationControl) => !this.modeMatch}, { name: '岔区设限', cmdType: CMD.Switch.CMD_SWITCH_SET_LIMIT_SPEED, operate: OperationEvent.Switch.setSpeed.menuButton, securityCommand: true, disabledCb: (stationControl) => !this.modeMatch},

17
src/scripts/cmdPlugin/CommandEnum.js
View File

@ -166,22 +166,7 @@ export default {
/** 设置折返策略 */ /** 设置折返策略 */
CMD_STAND_SET_REENTRY_STRATEGY: {value:'Stand_Set_Reentry_Strategy', label: '设置折返策略'}, CMD_STAND_SET_REENTRY_STRATEGY: {value:'Stand_Set_Reentry_Strategy', label: '设置折返策略'},
/** 提前发车 */ /** 提前发车 */
CMD_STAND_EARLY_DEPART: {value:'Stand_Early_Depart', label: '提前发车'}, CMD_STAND_EARLY_DEPART: {value:'Stand_Early_Depart', label: '提前发车'}
/** 折返 DTO */
CMD_SECTION_1: {value: 'Section_1', label: '折返 DTO'},
/** 取消折返 */
CMD_SECTION_2: {value: 'Section_2', label: '取消折返'},
/** 自动折返 */
CMD_SECTION_3: {value: 'Section_3', label: '自动折返'},
/** 换上至下 */
CMD_SECTION_4: {value: 'Section_4', label: '换上至下'},
/** 换下至上 */
CMD_SECTION_5: {value: 'Section_5', label: '换下至上'},
/** 上行终止站停 */
CMD_SECTION_6: {value: 'Section_6', label: '上行终止站停'},
/** 下行终止站停 */
CMD_SECTION_7: {value: 'Section_7', label: '下行终止站停'}
}, },
// 站台 // 站台