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:
zyy 2020-11-03 16:18:29 +08:00
commit eef7ccfba3
16 changed files with 115 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/jmapNew/config/skinCode/bejing_01.js
View File

@ -321,7 +321,8 @@ class SkinCode extends defaultStyle {
z:0,
position: -1, // 扣车标识在站台上显示方向
text: 'H', // 扣车显示内容
offset: { x: -8, y: 13 }, // 扣车偏移量
insideOffset: { x: -8, y: 13 }, // 内站台扣车偏移量
outsideOffset: { x: -8, y: 13 }, // 外站台扣车偏移量
centerTrainColor: '#FFFFFF', // 中心扣车颜色
andCenterTrainColor: '#F61107', // 车站+中心扣车颜色
detainTrainTextColor: '#E4EF50', // 车站扣除文字颜色

3
src/jmapNew/config/skinCode/chengdu_01.js
View File

@ -238,7 +238,8 @@ class SkinCode extends defaultStyle {
z:0,
position: -1, // 扣车标识在站台上显示方向
text: 'H', // 扣车显示内容
offset: { x: -8, y: 13 }, // 扣车偏移量
insideOffset: { x: -8, y: 13 }, // 内站台扣车偏移量
outsideOffset:{ x: -8, y: 13 }, // 外站台扣车偏移量
centerTrainColor: 'white', // 中心扣车颜色
andCenterTrainColor: 'red', // 车站+中心扣车颜色
detainTrainTextColor: '#E4EF50', // 车站扣除文字颜色

3
src/jmapNew/config/skinCode/chengdu_03.js
View File

@ -259,7 +259,8 @@ class SkinCode extends defaultStyle {
z:0,
position: -1, // 扣车标识在站台上显示方向
text: '扣', // 扣车显示内容
offset: {x: -8, y: 20}, // 扣车偏移量
insideOffset: {x: -8, y: 20}, // 内站台扣车偏移量
outsideOffset: {x: -8, y: 20}, // 外站台扣车偏移量
centerTrainColor: '#C0C0C0', // 中心扣车颜色
andCenterTrainColor: '#C0C0C0', // 车站+中心扣车颜色
detainTrainTextColor: '#E4EF50', // 车站扣除文字颜色

3
src/jmapNew/config/skinCode/foshan_01.js
View File

@ -229,7 +229,8 @@ class SkinCode extends defaultStyle {
z:0,
position: 1, // 扣车标识在站台上显示方向
text: 'H', // 扣车显示内容
offset: {x: -8, y: 17}, // 扣车偏移量
insideOffset: {x: -8, y: 17}, // 内站台扣车偏移量
outsideOffset: {x: -8, y: 17}, // 外站台扣车偏移量
centerTrainColor: '#FFFFFF', // 中心扣车颜色
andCenterTrainColor: '#F61107', // 车站+中心扣车颜色
detainTrainTextColor: '#E4EF50', // 车站扣除文字颜色

3
src/jmapNew/config/skinCode/fuzhou_01.js
View File

@ -228,7 +228,8 @@ class SkinCode extends defaultStyle {
z:0,
position: 1, // 扣车标识在站台上显示方向
text: 'H', // 扣车显示内容
offset: {x: -8, y: 25}, // 扣车偏移量
insideOffset: {x: -8, y: 25}, // 内站台扣车偏移量
outsideOffset: {x: -8, y: 25}, // 外站台扣车偏移量
centerTrainColor: '#FFFFFF', // 中心扣车颜色
andCenterTrainColor: '#F61107', // 车站+中心扣车颜色
detainTrainTextColor: '#E4EF50', // 车站扣除文字颜色

13
src/jmapNew/config/skinCode/haerbin_01.js
View File

@ -216,7 +216,7 @@ class SkinCode extends defaultStyle {
this[deviceType.StationStand] = {
// 哈尔滨一号线站台元素 站台 站台紧急关闭 扣车元素 停站时间 运行等级 跳停
elemnetType:['gapStand', 'emergentArrow', 'detainNormal', 'level', 'jump', 'trainStop', 'trainDepart'],
elemnetType:['gapStand', 'emergentArrow', 'detainNormal', 'level', 'jump', 'trainStop', 'trainDepart', 'trainSetButton'],
// 站台
gapStand:{
// 层级
@ -245,7 +245,8 @@ class SkinCode extends defaultStyle {
z:0,
position: 1, // 扣车标识在站台上显示方向
text: 'H', // 扣车显示内容
offset: { x: 60, y: -18 }, // 扣车偏移量
insideOffset: { x: 60, y: -18 }, // 内站台扣车偏移量
outsideOffset: { x: 60, y: 25 }, // 外站台扣车偏移量
centerTrainColor: '#F61107', // 中心扣车颜色
andCenterTrainColor: '#F61107', // 车站+中心扣车颜色
detainTrainTextColor: '#E4EF50', // 车站扣除文字颜色
@ -288,8 +289,16 @@ class SkinCode extends defaultStyle {
textBorderColor: '#00FF00', // 文字边框颜色
fontSize: 10 // 字体大小
},
// 站台 扣车/取消扣车，越站/取消越站 设置按钮
trainSetButton:{
z:1,
offset: { x: 80, y:10}, // 按钮偏移
textFontSize: 13, // 按钮字体大小
textColor:'#00FF00'
},
common: { // 通用属性
bgShow: true, // 是否被选中
textFontSize: 11, // 站台默认字体大小
functionButtonShow: '03' // 功能灯按钮显示条件（01所有模式下显示 02 行调显示 03现地显示）
},

3
src/jmapNew/config/skinCode/ningbo_01.js
View File

@ -354,7 +354,8 @@ class SkinCode extends defaultStyle {
z:0,
position: 1, // 扣车标识在站台上显示方向
text: 'H', // 扣车显示内容
offset: { x: -8, y: 10 }, // 扣车偏移量
insideOffset: { x: -8, y: 10 }, // 内站台扣车偏移量
outsideOffset: { x: -8, y: 10 }, // 外站台扣车偏移量
centerTrainColor: 'white', // 中心扣车颜色
andCenterTrainColor: 'red', // 车站+中心扣车颜色
detainTrainTextColor: '#E4EF50', // 车站扣除文字颜色

3
src/jmapNew/config/skinCode/race_01.js
View File

@ -337,7 +337,8 @@ class SkinCode extends defaultStyle {
z:0,
position: -1, // 扣车标识在站台上显示方向
text: 'H', // 扣车显示内容
offset: { x: -8, y: 13 }, // 扣车偏移量
insideOffset: { x: -8, y: 13 }, // 内站台扣车偏移量
outsideOffset: { x: -8, y: 13 }, // 外站台扣车偏移量
centerTrainColor: '#00FF00', // 中心扣车颜色
andCenterTrainColor: '#00FF00', // 车站+中心扣车颜色
detainTrainTextColor: '#00FF00', // 车站扣车文字颜色

3
src/jmapNew/config/skinCode/xian_01.js
View File

@ -237,7 +237,8 @@ class SkinCode extends defaultStyle {
z:0,
position: 1, // 扣车标识在站台上显示方向
text: 'H', // 扣车显示内容
offset: {x: -8, y: -6}, // 扣车偏移量
insideOffset: {x: -8, y: -6}, // 内站台扣车偏移量
outsideOffset: {x: -8, y: 16}, // 外站台扣车偏移量
trainColor: '#E4EF50', // 车站扣车颜色
centerTrainColor: '#FFFFFF', // 中心扣车颜色
andCenterTrainColor: '#F61107', // 车站+中心扣车颜色

54
src/jmapNew/shape/StationStand/ETrainSetButton.js Normal file
View File

@ -0,0 +1,54 @@
import Group from 'zrender/src/container/Group';
import Text from 'zrender/src/graphic/Text';
class ETime extends Group {
constructor(model) {
super();
this.model = model;
this.create();
}
create() {
const model = this.model.modelData;
const style = this.model.style;
const buttonD = model.right ? 1 : -1;
const buttonX = model.position.x - buttonD * (style.StationStand.trainSetButton.offset.x - model.width / 2);
const buttonY = model.position.y + buttonD * (style.StationStand.trainSetButton.offset.y - model.height / 2);
this.trainSetButton = new Text({
zlevel: this.model.zlevel,
z: this.model.z,
position: [0, 0],
_subType: 'trainSetButton',
style: {
x: buttonX,
y: buttonY,
fontWeight: style.textStyle.fontWeight,
fontSize: style.StationStand.trainSetButton.textFontSize,
fontFamily: style.fontFamily,
text: 'E',
textFill: style.StationStand.trainSetButton.textColor,
textAlign: style.textStyle.textAlign,
textVerticalAlign: style.textStyle.textVerticalAlign
}
});
this.add(this.trainSetButton);
}
hideMode() {
this.trainSetButton && this.trainSetButton.hide();
}
showMode() {
this.trainSetButton && this.trainSetButton.show();
}
recover() {
}
setState(model) {
}
}
export default ETime;

5
src/jmapNew/shape/StationStand/detain/EDetain.js
View File

@ -16,9 +16,10 @@ class EDetain extends Group {
this.isNew = true;
/** 站台扣车*/
const detainOffset = model.inside ? deviceParam.insideOffset : deviceParam.outsideOffset;
const detainD = model.right ? 1 : -1;
const detainX = model.position.x - detainD * (deviceParam.offset.x - model.width / 2);
const detainY = model.position.y + detainD * (deviceParam.offset.y - model.height / 2);
const detainX = model.position.x - detainD * (detainOffset.x - model.width / 2);
const detainY = model.position.y + detainD * (detainOffset.y - model.height / 2);
this.detain = new Text({
zlevel: this.model.zlevel,

5
src/jmapNew/shape/StationStand/detain/EDetainHollow.js
View File

@ -12,9 +12,10 @@ class EDetainHollow extends EDetain {
const model = this.model.modelData;
const style = this.model.style;
/** 站台扣车*/
const detainOffset = model.inside ? style.StationStand.detainHollow.insideOffset : style.StationStand.detainHollow.outsideOffset;
const detainD = model.right ? 1 : -1;
const detainX = model.position.x - detainD * (style.StationStand.detainHollow.offset.x - model.width / 2);
const detainY = model.position.y + detainD * (style.StationStand.detainHollow.offset.y - model.height / 2);
const detainX = model.position.x - detainD * (detainOffset.x - model.width / 2);
const detainY = model.position.y + detainD * (detainOffset.y - model.height / 2);
if (!this.isNew) {
super.create(style.StationStand.detainHollow);
const offsetX = model.right ? 8 : -8;

13
src/jmapNew/shape/StationStand/index.js
View File

@ -33,6 +33,8 @@ import ECancelStopJumpLamp from './functionButton/ECancelStopJumpLamp';
import EUpDetainLamp from './functionButton/EUpDetainLamp';
import EDownDetainLamp from './functionButton/EDownDetainLamp';
import ETrainSetButton from './ETrainSetButton';
import {isShowThePrdType} from '../../utils/handlePath';
import {traverseLineElements, traverseStatusElements} from '../utils/ShapeStatusCovert';
@ -85,7 +87,8 @@ class StationStand extends Group {
'reentry':EReentry, // 站台折返策略
'trainStop':ETrainStop, // 列车停车点标识 哈尔滨一号线
'trainDepart':ETrainDepart// 列车停站时间 哈尔滨一号线
'trainDepart':ETrainDepart, // 列车停站时间 哈尔滨一号线
'trainSetButton':ETrainSetButton // 站台 扣车/取消扣车，越站/取消越站 设置按钮 哈尔滨一号线
};
// 遍历当前线路下的绘图元素 组合模式
traverseLineElements(style.StationStand, elementTypeList, model, style, this);
@ -117,6 +120,10 @@ class StationStand extends Group {
this.on('mouseout', (e) => { this.mouseEvent.mouseout(e); });
this.on('mouseover', (e) => { this.mouseEvent.mouseover(e); });
}
if (this.style.StationStand.common.bgShow) {
this.highlight = new EHighlight(this);
this.add(this.highlight);
}
}
}
@ -180,6 +187,10 @@ class StationStand extends Group {
rect = this.downDetainLamp.getBoundingRect();
break;
}
case 'trainSetButton': {
rect = this.trainSetButton.getBoundingRect();
break;
}
default: {
rect = this.getBoundingRect();
break;

12
src/jmapNew/theme/haerbin_01/operationConfig.js
View File

@ -876,7 +876,8 @@ export default {
trainingType: 'Stand',
productTypes: ['02'],
stepVOList: [
{ deviceType: '04', orderNum: 1, operateCode: 'click', tip: '鼠标左键点击选择该站台' },
// { deviceType: '04', orderNum: 1, tip: '鼠标左键点击选择该站台' },
{ deviceType: 'trainSetButton', orderNum: 1, operateCode: 'click', tip: '鼠标左键点击选择该站台', codeType:'STAND'},
{ deviceType: '04', orderNum: 2, operateCode: '5041', tip: '鼠标左键点击【扣车】按钮' },
{ deviceType: '04', orderNum: 3, operateCode: '008', tip: '鼠标左键点击【执行】按钮' }
]
@ -891,7 +892,8 @@ export default {
trainingType: 'Stand',
productTypes: ['02'],
stepVOList: [
{ deviceType: '04', orderNum: 1, operateCode: 'click', tip: '鼠标左键点击选择该站台' },
// { deviceType: '04', orderNum: 1, operateCode: 'click', tip: '鼠标左键点击选择该站台' },
{ deviceType: 'trainSetButton', orderNum: 1, operateCode: 'click', tip: '鼠标左键点击选择该站台', codeType:'STAND'},
{ deviceType: '04', orderNum: 2, operateCode: '5052', tip: '鼠标左键点击【取消扣车】按钮' },
{ deviceType: '04', orderNum: 3, operateCode: '008', tip: '鼠标左键点击【执行】按钮' }
]
@ -906,7 +908,8 @@ export default {
trainingType: 'Stand',
productTypes: ['02'],
stepVOList: [
{ deviceType: '04', orderNum: 1, operateCode: 'click', tip: '鼠标左键点击选择该站台' },
// { deviceType: '04', orderNum: 1, operateCode: 'click', tip: '鼠标左键点击选择该站台' },
{ deviceType: 'trainSetButton', orderNum: 1, operateCode: 'click', tip: '鼠标左键点击选择该站台', codeType:'STAND'},
{ deviceType: '04', orderNum: 2, operateCode: '5025', tip: '鼠标左键点击【越站】按钮' },
{ deviceType: '04', orderNum: 3, operateCode: '008', tip: '鼠标左键点击【执行】按钮' }
]
@ -921,7 +924,8 @@ export default {
trainingType: 'Stand',
productTypes: ['02'],
stepVOList: [
{ deviceType: '04', orderNum: 1, operateCode: 'click', tip: '鼠标左键点击选择该站台' },
// { deviceType: '04', orderNum: 1, operateCode: 'click', tip: '鼠标左键点击选择该站台' },
{ deviceType: 'trainSetButton', orderNum: 1, operateCode: 'click', tip: '鼠标左键点击选择该站台', codeType:'STAND'},
{ deviceType: '04', orderNum: 2, operateCode: '5035', tip: '鼠标左键点击【取消越站】按钮' },
{ deviceType: '04', orderNum: 3, operateCode: '008', tip: '鼠标左键点击【执行】按钮' }
]

3
src/scripts/ConstConfig.js
View File

@ -212,7 +212,8 @@ export default {
ControlConvertMenu: {enlabel: 'Control mode training', label:'控制模式实训'},
LimitControl: {enlabel: 'Control mode limit', label:'全线限速实训'},
TrainWindow: {enlabel: 'TrainWindow training', label:'车次窗实训'},
Driver:{enlabel: 'Driver training', label:'司机实训'}
Driver:{enlabel: 'Driver training', label:'司机实训'},
DirectionRod:{enlabel: 'Direction rod training', label:'方向杆实训'}
},
interfaceErrorConfig: {
'500000': { type: '权限错误:', message: '您尚未有该操作权限！'},

9
src/views/newMap/displayNew/dispatherContest/sceneList.vue
View File

@ -77,13 +77,16 @@ export default {
mounted() {
getCompetitionPracticalScene({pageSize:100, pageNum:1}).then(res=>{
if (res.data.list && res.data.list.length > 0) {
res.data.list.forEach(each=>{
const list = res.data.list.sort((a, b) => {
return parseInt(a.name.replace('场景', '')) - parseInt(b.name.replace('场景', ''));
});
list.forEach(each=>{
if (each.name == '场景1' || each.name == '场景2' || each.name == '场景3' || each.name == '场景7') {
this.mainSceneData[1].result.push({id:each.id, name:each.name});
} else if (each.name == '场景4') {
this.mainSceneData[0].result.push({id:each.id, name:'场景4'});
} else if (each.name == '场景5') {
this.mainSceneData[4].result.push({id:each.id, name:'场景5'});
} else if (each.name == '场景5' || each.name == '场景11') {
this.mainSceneData[4].result.push({id:each.id, name:each.name});
} else if (each.name == '场景9') {
this.mainSceneData[6].result.push({id:each.id, name:'场景9'});
} else if (each.name == '场景8') {