joylink/rt-sim-training-client
6
0
Fork 0
Code Issues 3 Pull Requests Actions Packages Projects Releases Wiki Activity

test

Browse Source
This commit is contained in:
sunzhenyu 2020-07-14 09:24:58 +08:00
parent 9cc69e471b
commit f1cab6fba3
5 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -96,7 +96,7 @@ export function Jl3dDrivingNew(mixers,updatemmi,sound,translation,routegroup,sta
let data = JSON.parse(Response.body); let data = JSON.parse(Response.body);
// stats.update(); // stats.update();
// 遍历后台数据 // 遍历后台数据
console.log(data);
if(data.type == "Train_Position"){ if(data.type == "Train_Position"){
@ -104,6 +104,7 @@ export function Jl3dDrivingNew(mixers,updatemmi,sound,translation,routegroup,sta
return; return;
} }
if(data.type == "Train_Hmi_3D"){ if(data.type == "Train_Hmi_3D"){
console.log(data);
updatestatus(data.body); updatestatus(data.body);
// trainhmi(data.body); // trainhmi(data.body);
return; return;

2
src/store/modules/training.js
View File

@ -231,7 +231,6 @@ const training = {
updateMemberListInScript:(state, {oldMemberId, newMemberId, userId, name}) => { updateMemberListInScript:(state, {oldMemberId, newMemberId, userId, name}) => {
if (oldMemberId) { if (oldMemberId) {
// 重置旧数据 // 重置旧数据
state.memberData[oldMemberId].trust = false;
delete state.memberData[oldMemberId].userId; delete state.memberData[oldMemberId].userId;
delete state.memberData[oldMemberId].name; delete state.memberData[oldMemberId].name;
state.memberData[oldMemberId].disabled = false; state.memberData[oldMemberId].disabled = false;
@ -240,7 +239,6 @@ const training = {
state.memberData[newMemberId].userId = userId; state.memberData[newMemberId].userId = userId;
state.memberData[newMemberId].name = name; state.memberData[newMemberId].name = name;
state.memberData[newMemberId].disabled = true; state.memberData[newMemberId].disabled = true;
state.memberData[newMemberId].trust = true;
}, },
updateMemberAndUser: (state, {simulationUserList, userId}) => { updateMemberAndUser: (state, {simulationUserList, userId}) => {
simulationUserList.forEach(item => { simulationUserList.forEach(item => {

4
src/utils/baseUrl.js
View File

@ -2,10 +2,10 @@ export function getBaseUrl() {
let BASE_API; let BASE_API;
if (process.env.NODE_ENV === 'development') { if (process.env.NODE_ENV === 'development') {
// BASE_API = 'https://joylink.club/jlcloud'; // 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.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.41:9000'; // 张赛
// BASE_API = 'http://192.168.3.82:9000'; // 杜康 // BASE_API = 'http://192.168.3.82:9000'; // 杜康
// BASE_API = 'http://b29z135112.zicp.vip'; // BASE_API = 'http://b29z135112.zicp.vip';
// BASE_API = 'http://2925963m2a.zicp.vip'; // 杜康 // BASE_API = 'http://2925963m2a.zicp.vip'; // 杜康

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

@ -118,6 +118,7 @@ import axios from 'axios';
async mounted() { async mounted() {
if(this.$route.query.group){ if(this.$route.query.group){
getSimulationInfoNew(this.$route.query.group).then(netdata => { getSimulationInfoNew(this.$route.query.group).then(netdata => {
console.log(netdata);
if(netdata.data.type == "SCRIPT_MAKING"){ if(netdata.data.type == "SCRIPT_MAKING"){
this.tuoguanbutton = true; this.tuoguanbutton = true;
} }

2
src/views/scriptManage/display/tipScriptRecordNew.vue
View File

@ -120,6 +120,7 @@ export default {
initData() { initData() {
getSimulationMemberList(this.group).then(resp => { getSimulationMemberList(this.group).then(resp => {
const lastData = JSON.stringify(resp.data); const lastData = JSON.stringify(resp.data);
console.log(resp.data);
this.$store.dispatch('training/setMemberList', {memberList:resp.data, userId:this.$store.state.user.id}); this.$store.dispatch('training/setMemberList', {memberList:resp.data, userId:this.$store.state.user.id});
this.allMemberList = this.covert(lastData, ConstConfig.ConstSelect.roleTypeNew); this.allMemberList = this.covert(lastData, ConstConfig.ConstSelect.roleTypeNew);
this.changeRunPlanStatus(); this.changeRunPlanStatus();
@ -162,6 +163,7 @@ export default {
switchMode(role) { switchMode(role) {
changeScriptRole(this.group, role).then(res=>{ changeScriptRole(this.group, role).then(res=>{
let prdType = ''; let prdType = '';
const memberInfo = this.memberList.find(member=>{ const memberInfo = this.memberList.find(member=>{
return member.id == role; return member.id == role;
}); });