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:
joylink_cuiweidong 2020-06-19 10:07:54 +08:00
commit 090d2bdfc1
4 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/utils/baseUrl.js
View File

@ -2,15 +2,15 @@ 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.41:9000'; // 张赛
// BASE_API = 'http://192.168.3.41:9000'; // 张赛
// BASE_API = 'http://192.168.3.82:9000'; // 杜康
// BASE_API = 'http://b29z135112.zicp.vip';
// BASE_API = 'http://2925963m2a.zicp.vip'; // 杜康
// BASE_API = 'http://2i38984j47.qicp.vip'; // 张赛
} else {
} else {
BASE_API = process.env.VUE_APP_BASE_API;
}
return BASE_API;

1
src/views/jlmap3d/drive/drivecontrol/centerpane.vue
View File

@ -238,6 +238,7 @@
groupNumber:this.groupNum,
percent:this.move
};
console.log(this.groupnum);
throttle(
trainSimulationForce(this.group,param).then(res => {
console.log(res);

18
src/views/jlmap3d/drive/drivecontrol/drivecontrol.vue
View File

@ -160,13 +160,21 @@ import axios from 'axios';
if(netdata.data[i].driverId){
if(netdata.data[i].driverId == this.userId){
this.selVal = netdata.data[i].groupNumber;
this.groupnum = netdata.data[i].groupNumber;
bindSimulationTrain(this.group,this.selVal).then(netdata => {
bindSimulationTrain(this.group,netdata.data[i].groupNumber).then(netdata => {
this.selVal = selVal;
this.dialogVisible = true;
this.groupnum = netdata.data[i].groupNumber;
this.value = netdata.data[i].groupNumber;
this.nowdrive = netdata.data[i].groupNumber;
for(let i=0;i<this.trainlist.length;i++){
if(this.trainlist[i].groupNumber == this.groupnum){
// console.log(this.trainlist[i].gear);
// this.groupnum
this.$refs.centercontrol.centerstate(this.trainlist[i].gear);
}
}
this.value = this.groupnum;
this.nowdrive = this.groupnum;
}).catch(error => {
});

2
src/views/newMap/displayNew/index.vue
View File

@ -245,8 +245,6 @@ export default {
return this.mode === 'practice';
},
isDrive() {
console.log(this.mode);
console.log(this.prdType);
return this.prdType == '04';
},
isShowScheduling() {