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:
fan 2020-08-27 10:45:54 +08:00
commit 9dc290a550
3 changed files with 89 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/jmapNew/theme/xian_02/planConvert.js
View File

@ -277,20 +277,18 @@ export default {
}
/** 计算折返点*/
var num = this.computedReentryNumber(elem.tripNumber);
var nextPoint = [parseInt(time), this.getCoordYByElem(stations, kmRangeCoordMap, elem, elem.directionCode, false, num), elem.stationCode, elem.directionCode];
/** 添加车组号数据到对应的服务图数据中*/
serie.data.push(nextPoint);
// var num = this.computedReentryNumber(elem.tripNumber);
var nextPoint = [parseInt(time), this.getCoordYByElem(stations, kmRangeCoordMap, elem, elem.directionCode, false), elem.stationCode, elem.directionCode];
if (serie.data.length > 0) {
var lastPoint = serie.data[serie.data.length - 1];
// if (elem.reentry) {
// console.log(1111, '折返');
// }
if (lastPoint[3] !== nextPoint[3]) {
serie.data.push([lastPoint[0], this.getYvalueByDirectionCode(lastPoint[1], lastPoint[3], num), lastPoint[2], lastPoint[3]]);
serie.data.push([nextPoint[0], this.getYvalueByDirectionCode(nextPoint[1], nextPoint[3], num), nextPoint[2], nextPoint[3]]);
serie.data.push([lastPoint[0], this.getYvalueByDirectionCode(lastPoint[1], lastPoint[3]), lastPoint[2], lastPoint[3]]);
serie.data.push([nextPoint[0], this.getYvalueByDirectionCode(nextPoint[1], lastPoint[3]), lastPoint[2], nextPoint[3]]);
}
}
/** 添加车组号数据到对应的服务图数据中*/
serie.data.push(nextPoint);
/** 保证原始数据排序*/
serie.data.sort((a, b) => {
@ -354,9 +352,9 @@ export default {
/** 根据方向计算y折返偏移量*/
getYvalueByDirectionCode(defaultVlue, directionCode, num) {
if (directionCode == '1') {
defaultVlue -= this.EdgeHeight / 2 * num;
defaultVlue -= this.EdgeHeight / 2;
} else if (directionCode == '2') {
defaultVlue += this.EdgeHeight / 2 * num;
defaultVlue += this.EdgeHeight / 2;
}
return defaultVlue;

10
src/views/newMap/displayNew/demon/runPlanView.vue
View File

@ -220,22 +220,12 @@ export default {
const initialPlanData = this.$store.state.runPlan.initialPlanData;
data.forEach(item => {
if (item && initialPlanData[item.serviceNumber]) {
// if (initialPlanData[item.serviceNumber]) {
// console.log(this.runSeries, data, '=====');
// debugger;
// }
Object.keys(initialPlanData[item.serviceNumber].trainMap).forEach(ele => {
if (initialPlanData[item.serviceNumber].trainMap[ele + ''].tripNumber == item.tripNumber) {
item.directionCode = initialPlanData[item.serviceNumber].trainMap[ele + ''].directionCode;
// item.reentry = initialPlanData[item.serviceNumber].trainMap[ele + ''].reentry;
// if (item.reentry) {
// debugger;
// }
// item.stationCode = initialPlanData[item.serviceNumber].trainMap[ele + ''].stationCode;
}
});
item.secondTime = item.second;
// item.backup = initialPlanData[item.serviceNumber].backup;
}
});
this.kmRangeCoordMap = this.PlanConvert.convertStationsToMap(stations);

85
src/views/newMap/displayNew/scriptDisplay/component/covertOperation.js
View File

@ -56,7 +56,50 @@ export const operateEnum = {
},
Stand:{
code:'standCode',
type:'站台'
type:'站台',
Stand_Set_Park_Time:{
isList:true,
params:[
{
code:'parkingTime',
name:'控制方式',
result:[
{data:-1, name:'自动', judge:'='},
{data:-1, name:'人工', judge:'>', showUnit:'秒'}
]
},
{
code:'parkingAlwaysValid',
name:'有效次数',
result:[
{data:true, name:'一直有效', judge:'='},
{data:false, name:'一次有效', judge:'='}
]
}
]
},
Stand_Set_Run_Time:{
isList:true,
params:[
{
code:'runLevelTime',
name:'区间运行时间',
result:[
{data:0, name:'自动', judge:'='},
{data:0, name:'非自动', judge:'>', showUnit:'秒'}
]
},
{
code:'runLevelTimeForever',
name:'有效次数',
result:[
{data:true, name:'一直有效', judge:'='},
{data:false, name:'一次有效', judge:'='}
]
}
]
}
},
Station:{
code:'stationCode',
@ -77,10 +120,10 @@ export function covertOperate(operationType, operationParamMap) {
const operateName = Object.values(CMD[device]).find(res=>{ return res.value == operationType; });
const deviceInfo = covertOperation(device, operationParamMap, operationType);
let tip = '请找到' + deviceInfo.deviceName + '，';
if (deviceInfo.paramName) {
tip += '参数为:' + deviceInfo.paramName + '，';
}
tip += ' 执行【' + operateName.label + '】操作';
if (deviceInfo.paramName) {
tip += ',参数为:' + deviceInfo.paramName;
}
return tip;
}
}
@ -111,7 +154,39 @@ function covertOperation(deviceType, operationParamMap, operationType) {
paramName += getRouteNameById(operationParamMap[paramInfo.code]) + '】';
}
} else {
if (paramInfo.isList) {
const params = paramInfo.params;
if (params && params.length > 0) {
paramName += '【';
params.forEach(param=>{
paramName += ' ' + param.name;
const data = operationParamMap[param.code];
param.result.forEach(result=>{
switch (result.judge) {
case '=': {
if (data == result.data) {
paramName += '为' + result.name;
if (result.showUnit) {
paramName += ',值为' + data + result.showUnit;
}
}
break;
} case '>': {
if (data > result.data) {
paramName += '为' + result.name;
if (result.showUnit) {
paramName += ',值为' + data + result.showUnit;
}
}
break;
}
}
});
paramName += ',';
});
paramName += '】';
}
}
}
}
return {deviceName:deviceName, paramName:paramName};