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-07-08 16:30:06 +08:00
commit 5edd9f536e
4 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/jlmap3d/jl3ddevice/jl3ddeviceNew.js
View File

@ -219,7 +219,9 @@ export function Jl3ddeviceNew(dom,group,token,skinCode) {
scope.scene.remove(scope.showmodel);
scope.showmodel = null
scope.nowcode = data.code;
if(scope.nowobject){
scope.resetmodel();
}
if (data._type == "Switch") {
// scope.modelmanager.switchmodel.locateType = data.body.locateType;
scope.modelmanager.switchmodel.code = data.code;
@ -230,8 +232,9 @@ export function Jl3ddeviceNew(dom,group,token,skinCode) {
updatemenulist(scope.devicetext.devicelist);
scope.raycasterstatus = true;
}else{
scope.raycasterstatus = false;
scope.nowobject = "";
scope.nowobject = null;
updatemenulist();
}
if (data._type == "Signal") {
@ -306,7 +309,7 @@ export function Jl3ddeviceNew(dom,group,token,skinCode) {
//设备分解、归位动画按钮
this.disperdevice1 = function(){
if(scope.nowobject.animacode){
if(scope.nowobject){
if(moveanima.status == true){
if(scope.animastats == false){
scope.animastats = true;
@ -322,7 +325,7 @@ export function Jl3ddeviceNew(dom,group,token,skinCode) {
};
this.disperdevice2 = function(){
if(scope.nowobject.animacode){
if(scope.nowobject){
if(moveanima.status == true){
if(scope.animastats == false){
scope.animastats = true;
@ -337,7 +340,7 @@ export function Jl3ddeviceNew(dom,group,token,skinCode) {
};
this.resetmodel = function(){
if(scope.nowobject.animacode){
if(scope.nowobject){
scope.animastats = false;
moveanima.setplaylist(moveanima.animatelist[scope.nowobject.animacode+"fuwei"],true);
}

4
src/utils/baseUrl.js
View File

@ -2,9 +2,9 @@ export function getBaseUrl() {
let BASE_API;
if (process.env.NODE_ENV === 'development') {
// BASE_API = 'https://joylink.club/jlcloud';
// BASE_API = 'https://test.joylink.club/jlcloud';
BASE_API = 'https://test.joylink.club/jlcloud';
// BASE_API = 'http://192.168.3.5:9000'; // 袁琪
BASE_API = 'http://192.168.3.6:9000'; // 旭强
// BASE_API = 'http://192.168.3.6:9000'; // 旭强
// BASE_API = 'http://192.168.3.41:9000'; // 张赛
// BASE_API = 'http://192.168.3.82:9000'; // 杜康
// BASE_API = 'http://b29z135112.zicp.vip';

1
src/views/login/index.vue
View File

@ -413,7 +413,6 @@ export default {
};
setSessionStorage('projectDevice', JSON.stringify(res.data.deviceVO));
if (this.$route.query.type == 'LSW') {
console.log('进入', `/bigSplitScreen/${resp.data.map.id}`);
this.$router.push({ path: `/bigSplitScreen/${resp.data.map.id}`, query: query });
} else if (this.$route.query.type === 'ISCS_LW' || this.$route.query.type === 'ISCS_CW') {
this.$router.push({ path: `/displayIscs/system`, query: {

5
src/views/newMap/jointTrainingNew/index.vue
View File

@ -206,6 +206,9 @@ export default {
if (this.$route.query.type === 'VR_PSD') {
this.deviceShow = true;
}
if (this.$route.query.type === 'DRIVE') {
this.hidepanel();
}
},
'$store.state.socket.memberChangeCount': function () {
this.initMemberUserInfo();
@ -566,7 +569,7 @@ export default {
});
window.open(routeData.href, '_blank', 'noopener noreferrer');
},
hidepanel() {
hidepanel() { // 司机视角
this.panelShow = false;
this.drivingShow = true;
this.ibpShow = false;