diff --git a/src/jlmap3d/jl3ddrive/moveupdate/DrivingConnectNew.js b/src/jlmap3d/jl3ddrive/moveupdate/DrivingConnectNew.js index 997930f18..8e25808d5 100644 --- a/src/jlmap3d/jl3ddrive/moveupdate/DrivingConnectNew.js +++ b/src/jlmap3d/jl3ddrive/moveupdate/DrivingConnectNew.js @@ -96,7 +96,7 @@ export function Jl3dDrivingNew(mixers,updatemmi,sound,translation,routegroup,sta let data = JSON.parse(Response.body); // stats.update(); // 遍历后台数据 - console.log(data); + if(data.type == "Train_Position"){ @@ -104,6 +104,7 @@ export function Jl3dDrivingNew(mixers,updatemmi,sound,translation,routegroup,sta return; } if(data.type == "Train_Hmi_3D"){ + console.log(data); updatestatus(data.body); // trainhmi(data.body); return; diff --git a/src/store/modules/training.js b/src/store/modules/training.js index 03c0afc8c..34c8d72c2 100644 --- a/src/store/modules/training.js +++ b/src/store/modules/training.js @@ -231,7 +231,6 @@ const training = { updateMemberListInScript:(state, {oldMemberId, newMemberId, userId, name}) => { if (oldMemberId) { // 重置旧数据 - state.memberData[oldMemberId].trust = false; delete state.memberData[oldMemberId].userId; delete state.memberData[oldMemberId].name; state.memberData[oldMemberId].disabled = false; @@ -240,7 +239,6 @@ const training = { state.memberData[newMemberId].userId = userId; state.memberData[newMemberId].name = name; state.memberData[newMemberId].disabled = true; - state.memberData[newMemberId].trust = true; }, updateMemberAndUser: (state, {simulationUserList, userId}) => { simulationUserList.forEach(item => { diff --git a/src/utils/baseUrl.js b/src/utils/baseUrl.js index 778caeb7b..55d352581 100644 --- a/src/utils/baseUrl.js +++ b/src/utils/baseUrl.js @@ -2,10 +2,10 @@ 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'; // 杜康 diff --git a/src/views/jlmap3d/drive/drivecontrol/drivecontrol.vue b/src/views/jlmap3d/drive/drivecontrol/drivecontrol.vue index 2bf1611f3..e0668d1f4 100644 --- a/src/views/jlmap3d/drive/drivecontrol/drivecontrol.vue +++ b/src/views/jlmap3d/drive/drivecontrol/drivecontrol.vue @@ -118,6 +118,7 @@ import axios from 'axios'; async mounted() { if(this.$route.query.group){ getSimulationInfoNew(this.$route.query.group).then(netdata => { + console.log(netdata); if(netdata.data.type == "SCRIPT_MAKING"){ this.tuoguanbutton = true; } diff --git a/src/views/scriptManage/display/tipScriptRecordNew.vue b/src/views/scriptManage/display/tipScriptRecordNew.vue index a5e01ab17..bd7a4a9dc 100644 --- a/src/views/scriptManage/display/tipScriptRecordNew.vue +++ b/src/views/scriptManage/display/tipScriptRecordNew.vue @@ -120,6 +120,7 @@ export default { initData() { getSimulationMemberList(this.group).then(resp => { 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.allMemberList = this.covert(lastData, ConstConfig.ConstSelect.roleTypeNew); this.changeRunPlanStatus(); @@ -162,6 +163,7 @@ export default { switchMode(role) { changeScriptRole(this.group, role).then(res=>{ let prdType = ''; + const memberInfo = this.memberList.find(member=>{ return member.id == role; });