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:
lVAL 2021-01-21 15:28:32 +08:00
commit 5bf71f2d7a
10 changed files with 77 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/jlmap3d/jl3ddrive/moveupdate/DrivingConnectNew.js
View File

@ -320,13 +320,16 @@ export function Jl3dDrivingNew(mixers,updatemmi,sound,translation,routegroup,dri
}
function otherTrainRun(data){
if(data.length != trainlisttest.otherTrainmodels.length && trainlisttest.updatStatus == false){
if(data.length > trainlisttest.otherTrainmodels.length && trainlisttest.updatStatus == false){
trainlisttest.addDriveTrain(data);
}else if(data.length < trainlisttest.otherTrainmodels.length){
let removelength = trainlisttest.otherTrainmodels.length - data.length;
trainlisttest.removeDriveTrain(removelength);
}else{
for(let i=0,leni=data.length;i<leni;i++){
let updateTrain = trainlisttest.otherTrainList[data[i].code];
let updateTrain = trainlisttest.otherTrainmodels[i];
if(data[i].code != trainmodel.code){

12
src/jlmap3d/main/newmodel/TrainListN.js
View File

@ -52,12 +52,20 @@ export function TrainListN() {
}
scope.otherTrainList = [];
for(let j=0,lenj = data.length;j<lenj;j++){
this.otherTrainmodels[j].code = data[j].code;
scope.otherTrainmodels[j].code = data[j].code;
scope.otherTrainList[data[j].code] = this.otherTrainmodels[j];
}
this.updatStatus = false;
}
this.removeDriveTrain = function(removeLength){
console.log(removeLength);
scope.group.remove(scope.otherTrainmodels[0]);
scope.otherTrainmodels.splice(0,removeLength);
}
this.drivertrain = function(data,scene,assetloader,mixers,actionss,mode){
return new Promise(function(resolve, reject){
@ -170,6 +178,8 @@ export function TrainListN() {
resolve("loadedtrain");
});
}
this.initpromise = function(data,scene,assetloader,mixers,actionss,mode){
return new Promise(function(resolve, reject){
let selectmesh,ntracks1,ntracks2,tclip,fclip;

8
src/jmapNew/mouseController.js
View File

@ -247,6 +247,14 @@ class MouseController extends Eventful {
x2: item.namePosition.x,
y2: item.namePosition.y
};
} else if (item.type == '05') {
const rect = item.instance.getBoundingRect();
deviceBoundingRect = {
x1: rect.x,
y1: rect.y,
x2: rect.x + rect.width,
y2:rect.y + rect.height
};
} else {
deviceBoundingRect = {
x1: item.points[0].x,

7
src/jmapNew/shape/Section/ELines.js
View File

@ -384,10 +384,7 @@ export default class ELines extends Group {
this.centerSquare && this.centerSquare.setStyle({fill:this.model.style.Section.cross.centerSquare.defaultColor});
}
setCrossSpeedUpperLimit(speedLimit) {
if (speedLimit) {
debugger;
this.crossSpeedText && this.crossSpeedText.setStyle({text:speedLimit, textFill: 'red' });
}
this.crossSpeedText && this.crossSpeedText.setStyle({text:speedLimit, textFill: 'red' });
}
setZleve(lev) {
@ -402,6 +399,8 @@ export default class ELines extends Group {
show() {
this.section && this.section.show();
this.crossSection && this.crossSection.show();
this.crossText && this.crossText.show();
this.crossSpeedText && this.crossSpeedText.show();
this.centerSquare && this.centerSquare.show();
}

1
src/jmapNew/shape/Section/index.js
View File

@ -179,6 +179,7 @@ export default class Section extends Group {
/** 封锁 06*/
block(routeLock) {
if (this.sectionBlock && this.model.type !== '03') {
this.sectionBlock.setStyle({stroke: this.style.Section.line.blockColor});
this.sectionBlock.show();
routeLock && this.style.Section.line.routeBlockFlashing && this.sectionBlock.animateStyle(true, [
{ time: 500, styles: { stroke: this.style.backgroundColor } },

2
src/jmapNew/theme/ningbo_01/menus/menuBar.vue
View File

@ -162,7 +162,7 @@ export default {
},
{
title: '站遥控',
operate: OperationEvent.MixinCommand.remoteControl.mbar,
operate: OperationEvent.Command.mBar.remoteControl,
click: this.stationRemoteControl
},
{

21
src/jmapNew/theme/ningbo_01/menus/menuDialog/stationControl.vue
View File

@ -85,22 +85,23 @@ export default {
return this.dialogShow && !this.$store.state.menuOperation.break;
},
domIdChooseControl() {
return this.dialogShow ? OperationEvent.Command.order.choose.domId : '';
return this.dialogShow ? OperationEvent.MixinCommand.remoteControl.select.domId : '';
},
domIdChooseStation() {
return this.dialogShow ? OperationEvent.Command.order.choose1.domId : '';
},
domIdCommit() {
if (this.dialogShow) {
if (this.stationType == '01') {
return OperationEvent.StationControl.requestCentralControl.menu.domId;
} else if (this.stationType == '02') {
return OperationEvent.StationControl.requestStationControl.menu.domId;
} else if (this.stationType == '03') {
return OperationEvent.StationControl.emergencyStationControl.menu.domId;
} else {
return '';
}
// if (this.stationType == '01') {
// return OperationEvent.StationControl.requestCentralControl.menu.domId;
// } else if (this.stationType == '02') {
// return OperationEvent.StationControl.requestStationControl.menu.domId;
// } else if (this.stationType == '03') {
// return OperationEvent.StationControl.emergencyStationControl.menu.domId;
// } else {
// return '';
// }
return OperationEvent.MixinCommand.remoteControl.confirm.domId;
} else {
return '';
}

18
src/jmapNew/theme/ningbo_01/operationConfig.js
View File

@ -779,6 +779,22 @@ export default {
{ deviceType: '05', orderNum: 2, operateCode: '2023', tip: '鼠标左键点击【应用】' }
]
},
{
maxDuration: 15,
minDuration: 8,
operateType: 'CM_Emergency_Station_Control',
skinCode: '06',
trainingName: '紧急站控({1})',
trainingRemark: '控制权限转换，中控转紧急站控',
trainingType: 'ControlConvertMenu',
productTypes: ['01'],
stepVOList: [
{ deviceType: 'mBar', orderNum: 1, operateCode: '002', tip: '鼠标左键点击【系统】' },
{ deviceType: '05', orderNum: 2, operateCode: '0024', tip: '鼠标左键点击【站遥控】' },
{ deviceType: '05', orderNum: 3, operateCode: '299b', tip: '选择【紧急站控】' },
{ deviceType: '05', orderNum: 4, operateCode: '299c', tip: '鼠标左键点击【设置】' }
]
},
{
maxDuration: 15,
minDuration: 8,
@ -864,7 +880,6 @@ export default {
productTypes: ['01'],
stepVOList: [
{ deviceType: '05', orderNum: 1, operateCode: '602', tip: '鼠标右键菜单选择【全站取消联锁自动触发】'}
// { deviceType: '05', orderNum: 2, operateCode: '602', tip: '鼠标左键点击【确定】' }
]
},
{
@ -878,7 +893,6 @@ export default {
productTypes: ['01'],
stepVOList: [
{ deviceType: '05', orderNum: 1, operateCode: '601', tip: '鼠标右键菜单选择【全站设置联锁自动触发】'}
// { deviceType: '05', orderNum: 2, operateCode: '601', tip: '鼠标左键点击【确定】' }
]
}
]

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

@ -181,9 +181,9 @@ export default {
/** 站台总取消 */
CMD_STAND_TOTAL_CANCLE:{value:'Stand_Total_Cancle', label: '站台总取消'},
/** 手动开启屏蔽门 */
CMD_STAND_OPEN_PSD:{value:'Stand_Open_Psd', label: '手动开启屏蔽门'},
/** 取消设置*/
CMD_STAND_CANCEL_SETTING: {value: 'Stand_Cancel_Setting', label: '取消设置'}
CMD_STAND_OPEN_PSD:{value:'Stand_Open_Psd', label: '手动开启屏蔽门'},
/** 取消设置*/
CMD_STAND_CANCEL_SETTING: {value: 'Stand_Cancel_Setting', label: '取消设置'}
},
Station: {

26
src/scripts/cmdPlugin/OperationHandler.js
View File

@ -97,11 +97,11 @@ export const OperationEvent = {
domId: '_Tips-Mbar-0-detainControl'
},
cbtcMode: {
operation: '0030',
operation: '002a',
domId: '_Tips-Mbar-0-cbtcMode'
},
reserveMode: {
operation: '0031',
operation: '002b',
domId: '_Tips-Mbar-0-reserveMode'
}
},
@ -2522,13 +2522,6 @@ export const OperationEvent = {
// 混合指令
MixinCommand: {
/** 控制模式操作 */
remoteControl: {
mbar: {
operation: '2999',
domId: '_Tips-Control-StationControl-Mbar{TOP}'
}
},
// 封锁
block: {
button: {
@ -2584,6 +2577,21 @@ export const OperationEvent = {
operation: '2998',
domId: '_Tips-SetLink-Menu{TOP}'
}
},
/** 控制模式操作 */
remoteControl: {
mbar: {
operation: '299a',
domId: '_Tips-Control-StationControl-Mbar{TOP}'
},
select: {
operation: '299b',
domId: '_Tips-Control-StationControl-Select{TOP}'
},
confirm: {
operation: '299c',
domId: '_Tips-Control-StationControl-Confirm{TOP}'
}
}
}