Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
This commit is contained in:
commit
982f383981
@ -36,11 +36,11 @@ export function TdtList() {
|
|||||||
let pos = stationData[k].mesh.position;
|
let pos = stationData[k].mesh.position;
|
||||||
if(stationData[k].stands[i].right == true){
|
if(stationData[k].stands[i].right == true){
|
||||||
newmesh.rotation.y = -Math.PI/2;
|
newmesh.rotation.y = -Math.PI/2;
|
||||||
newmesh.position.set(pos.x+75,0,pos.z+12.8);
|
newmesh.position.set(pos.x+72,0,pos.z+14.5);
|
||||||
|
|
||||||
}else{
|
}else{
|
||||||
newmesh.rotation.y = Math.PI/2;
|
newmesh.rotation.y = Math.PI/2;
|
||||||
newmesh.position.set(pos.x-75,0,pos.z-12.8);
|
newmesh.position.set(pos.x-72,0,pos.z-14.5);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -675,7 +675,7 @@ const map = {
|
|||||||
((item.stationCodeList.includes(stationCode) && item.elementList.includes(deviceCode)) || !stationCode)
|
((item.stationCodeList.includes(stationCode) && item.elementList.includes(deviceCode)) || !stationCode)
|
||||||
) {
|
) {
|
||||||
flag = true;
|
flag = true;
|
||||||
} else if (store.state.training.prdType === '02' && item.type === 'CENTER' && item.elementList.includes(deviceCode)) {
|
} else if (['02', '04', '05'].includes(store.state.training.prdType) && item.type === 'CENTER' && item.elementList.includes(deviceCode)) {
|
||||||
flag = true;
|
flag = true;
|
||||||
} else if (store.state.training.prdType === '09' && item.type === 'DEPOT_IL' && item.stationCodeList.includes(stationCode) && item.elementList.includes(deviceCode)) {
|
} else if (store.state.training.prdType === '09' && item.type === 'DEPOT_IL' && item.stationCodeList.includes(stationCode) && item.elementList.includes(deviceCode)) {
|
||||||
flag = true;
|
flag = true;
|
||||||
|
Loading…
Reference in New Issue
Block a user