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 2021-07-19 13:20:18 +08:00
commit d0d9d9cc7a
4 changed files with 20 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/jlmap3d/lesson3d/lesson3dplayer.js
View File

@ -94,10 +94,10 @@ export function Lesson3dPlayer(dom,lessonData,lessonIndex) {
if(lessonData.lessonProgress[lessonIndex].roleName == nowRole){
controlManager.initControlMode(lessonIndex);
controlManager.initRoleMode(true,nowRole);
controlManager.changeIndexEvent(lessonData.lessonProgress[lessonIndex].action,true);
controlManager.changeIndexEvent(lessonData.lessonProgress[lessonIndex].action,true,assetModelManager.lessonTriggerList[scope.nowSceneType]);
}else{
controlManager.initRoleMode(false,nowRole);
controlManager.changeIndexEvent(lessonData.lessonProgress[lessonIndex].action,false);
controlManager.changeIndexEvent(lessonData.lessonProgress[lessonIndex].action,false,assetModelManager.lessonTriggerList[scope.nowSceneType]);
}
}
@ -117,7 +117,7 @@ export function Lesson3dPlayer(dom,lessonData,lessonIndex) {
controlManager.initRoleMode(roleMode);
console.log(assetModelManager);
// if(lessonData.lessonProgress[lessonIndex].action.length>0){
controlManager.changeIndexEvent(lessonData.lessonProgress[lessonIndex].action,roleMode,assetModelManager.lessonTriggerList);
controlManager.changeIndexEvent(lessonData.lessonProgress[lessonIndex].action,roleMode,assetModelManager.lessonTriggerList[scope.nowSceneType]);
// }
};

14
src/jlmap3d/lesson3d/manager/controlmanager.js
View File

@ -500,21 +500,21 @@ export function ControlManager(dom,scene,lessonData,lessonIndex) {
}
this.changeIndexEvent = function(actions,rMode,lessonTriggerList){
if(lessonTriggerList){
eventTrigger = lessonTriggerList;
scope.eventHitMode = true;
}
console.log(actions);
console.log(rMode);
eventTrigger = lessonTriggerList;
nowActions = actions;
// let newEventBoxs = [];
// eventBoxs = newEventBoxs;
raycasterBoxs = [];
roleMode = rMode;
console.log("changeIndex-----------------");
console.log("---------changeIndex--------");
console.log(actions);
console.log(roleMode);
console.log(eventTrigger);
console.log("----------------------------");
if(actions.length>0 && roleMode){
scope.eventHitMode = true;
for(let i=0;i<actions.length;i++){
if(actions[i].actionType == "auto"){
if(actions[i].actionMode == "play"){

11
src/jmapNew/shape/graph/Psd/ESafeDoor.js
View File

@ -44,8 +44,8 @@ class ESafeDoor extends Group {
},
style: {
lineWidth: 0,
stroke:style.backgroundColor,
fill:style.backgroundColor
stroke: style.backgroundColor,
fill: style.backgroundColor
// stroke: style.Psd.safetyDoorNormal.defaultColor,
// fill: style.Psd.safetyDoorNormal.defaultColor
}
@ -72,11 +72,12 @@ class ESafeDoor extends Group {
} else if (model.fault == 'PSD_CANNOT_BE_CLOSED') {
this.safeC.show();
}
} else {
model.screenDoorOpenStatus == 0 ? this.safeC.show() : this.safeC.hide();
}
if (model.interlockRelease) {
const style = this.model.style;
this.setColor(style.Psd.safetyDoorNormal.splitDoorColor);
} else {
// model.screenDoorOpenStatus == 0 ? this.safeC.hide() : this.safeC.show();
model.screenDoorOpenStatus == 0 ? this.safeC.show() : this.safeC.hide();
}
}

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

@ -49,7 +49,8 @@ export const deviceFaultType = {
],
StationStand: [
{label: '屏蔽门无法关闭', value: 'PSD_CANNOT_BE_CLOSED'},
{label: '屏蔽门无法开启', value: 'PSD_CANNOT_BE_OPENED'}
{label: '屏蔽门无法开启', value: 'PSD_CANNOT_BE_OPENED'},
{label: '无关闭锁紧信号', value: 'NO_CLOSE_AND_LOCK'}
],
ZcControl:[
{label: 'zc故障', value: 'FAULT'}
@ -87,7 +88,8 @@ export const deviceFaultMap = {
},
StationStand: {
PSD_CANNOT_BE_CLOSED: '屏蔽门无法关闭',
PSD_CANNOT_BE_OPENED: '屏蔽门无法开启'
PSD_CANNOT_BE_OPENED: '屏蔽门无法开启',
NO_CLOSE_AND_LOCK: '无关闭锁紧信号'
},
ZcControl: {
FAULT: 'zc故障'