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

Merge remote-tracking branch 'origin/test'

Browse Source
This commit is contained in:
walker-sheng 2021-03-13 00:21:34 +08:00
commit 1ce2d504ff
13 changed files with 51 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/jlmap3d/edit/testEditorModel/StationStandList.js
View File

@ -92,6 +92,22 @@ export function StationStandList() {
// console.log(jlmap3ddata); // console.log(jlmap3ddata);
let jlmapstationdata = jlmapdata.stationList; let jlmapstationdata = jlmapdata.stationList;
let jlmapstanddata = jlmapdata.stationStandList; let jlmapstanddata = jlmapdata.stationStandList;
// jlmapstationdata.splice(0,1);
console.log(standsdata);
console.log(jlmapstationdata);
// for(let i=0;i<jlmapstationdata.length;i++){// || jlmapstationdata[i].subheadDisplay == false
// if(jlmapstationdata[i].visible == false){
// jlmapstationdata.splice(i,1);
// i--;
// }else{
// standsdata[i].code = jlmapstationdata[i].code;
// standsdata[i].name = jlmapstationdata[i].name;
// }
// // console.log(jlmapstationdata[i].subheadDisplay);
// }
// console.log(jlmapstationdata);
console.log(standsdata);
// //
// console.log(jlmapstationdata); // console.log(jlmapstationdata);
// //

1
src/utils/baseUrl.js
View File

@ -1,6 +1,7 @@
export function getBaseUrl() { 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://api.joylink.club/jlcloud'; // BASE_API = 'https://api.joylink.club/jlcloud';
BASE_API = 'https://test.joylink.club/jlcloud'; BASE_API = 'https://test.joylink.club/jlcloud';
// BASE_API = 'http://192.168.8.107:9000'; // 袁琪 // BASE_API = 'http://192.168.8.107:9000'; // 袁琪

3
src/views/jlmap3d/simulation/jl3dsimulation.vue
View File

@ -203,7 +203,8 @@ export default {
lineCode:this.lineCode lineCode:this.lineCode
} }
}); });
window.open(routeData.href, '_blank', 'noopener noreferrer'); window.open(routeData.href, '_blank');
// window.open(routeData.href, '_blank');
}, },
back() { back() {
if (this.$route.query.projectDevice) { if (this.$route.query.projectDevice) {

2
src/views/messageBoard/manage.vue
View File

@ -107,7 +107,7 @@ export default {
noPreLogout: true noPreLogout: true
} }
}); });
window.open(routeData.href, '_blank', 'noopener noreferrer'); window.open(routeData.href, '_blank');
}, },
handleUpdate(index, row) { handleUpdate(index, row) {
this.$refs.createDraft.doShow(row); this.$refs.createDraft.doShow(row);

2
src/views/newMap/displayNew/demon/selectIbp.vue
View File

@ -117,7 +117,7 @@ export default {
// group: this.$route.query.group // group: this.$route.query.group
// } // }
// }); // });
// window.open(routeData.href, '_blank', 'noopener noreferrer'); // window.open(routeData.href, '_blank');
}, },
reloadTable() { reloadTable() {

10
src/views/newMap/displayNew/demonMenu.vue
View File

@ -200,7 +200,7 @@ export default {
noPreLogout: true noPreLogout: true
} }
}); });
window.open(routeData.href, '_blank', 'noopener noreferrer'); window.open(routeData.href, '_blank');
}, },
jumpjl3dpassflow() { jumpjl3dpassflow() {
const routeData = this.$router.resolve({ const routeData = this.$router.resolve({
@ -213,7 +213,7 @@ export default {
lineCode:this.lineCode lineCode:this.lineCode
} }
}); });
window.open(routeData.href, '_blank', 'noopener noreferrer'); window.open(routeData.href, '_blank');
}, },
// jumpjl3dtrafficplan() { // jumpjl3dtrafficplan() {
// const routeData = this.$router.resolve({ // const routeData = this.$router.resolve({
@ -226,7 +226,7 @@ export default {
// lineCode:this.lineCode // lineCode:this.lineCode
// } // }
// }); // });
// window.open(routeData.href, '_blank', 'noopener noreferrer'); // window.open(routeData.href, '_blank');
// }, // },
// jumpjl3dtraffictrain() { // jumpjl3dtraffictrain() {
// const routeData = this.$router.resolve({ // const routeData = this.$router.resolve({
@ -239,7 +239,7 @@ export default {
// lineCode:this.lineCode // lineCode:this.lineCode
// } // }
// }); // });
// window.open(routeData.href, '_blank', 'noopener noreferrer'); // window.open(routeData.href, '_blank');
// }, // },
jumpjlmap3dFault() { jumpjlmap3dFault() {
const routeData = this.$router.resolve({ const routeData = this.$router.resolve({
@ -285,7 +285,7 @@ export default {
noPreLogout: true noPreLogout: true
} }
}); });
window.open(routeData.href, '_blank', 'noopener noreferrer'); window.open(routeData.href, '_blank');
}, },
contectUs() { contectUs() {
this.$refs.contectUs.doShow(); this.$refs.contectUs.doShow();

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

@ -310,7 +310,7 @@ export default {
noPreLogout: true noPreLogout: true
} }
}); });
window.open(routeData.href, '_blank', 'noopener noreferrer'); window.open(routeData.href, '_blank');
} }
} }
}; };

4
src/views/newMap/displayNew/menuSchema.vue
View File

@ -191,7 +191,7 @@ export default {
noPreLogout: true noPreLogout: true
} }
}); });
window.open(routeData.href, '_blank', 'noopener noreferrer'); window.open(routeData.href, '_blank');
}, },
goIbp() { goIbp() {
const deviceCode = this.$refs.selectStation.showStation; const deviceCode = this.$refs.selectStation.showStation;
@ -208,7 +208,7 @@ export default {
noPreLogout: true noPreLogout: true
} }
}); });
window.open(routeData.href, '_blank', 'noopener noreferrer'); window.open(routeData.href, '_blank');
} else { } else {
this.$messageBox('本车站暂无IBP盘数据！'); this.$messageBox('本车站暂无IBP盘数据！');
} }

4
src/views/newMap/displayNew/practiceDisplay.vue
View File

@ -342,7 +342,7 @@ export default {
noPreLogout: true noPreLogout: true
} }
}); });
window.open(routeData.href, '_blank', 'noopener noreferrer'); window.open(routeData.href, '_blank');
}, },
contectUs() { contectUs() {
this.$refs.contectUs.doShow(); this.$refs.contectUs.doShow();
@ -359,7 +359,7 @@ export default {
initTime: this.$store.state.training.initTime initTime: this.$store.state.training.initTime
} }
}); });
window.open(routeData.href, '_blank', 'noopener noreferrer'); window.open(routeData.href, '_blank');
}, },
dispatcherWorkStation() { dispatcherWorkStation() {
if (this.openWindow) { if (this.openWindow) {

8
src/views/newMap/jlmapNew/index.vue
View File

@ -407,7 +407,9 @@ export default {
deviceCode:em.deviceCode deviceCode:em.deviceCode
} }
}); });
window.open(routeData.href, '_blank', 'noopener noreferrer'); window.open(routeData.href, '_blank');
} else {
window.open(routeData.href, '_blank');
} }
}); });
} }
@ -426,7 +428,9 @@ export default {
deviceCode:em.deviceCode deviceCode:em.deviceCode
} }
}); });
window.open(routeData.href, '_blank', 'noopener noreferrer'); window.open(routeData.href, '_blank');
} else {
window.open(routeData.href, '_blank');
} }
}); });

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

@ -446,7 +446,7 @@ export default {
noPreLogout: true noPreLogout: true
} }
}); });
window.open(routeData.href, '_blank', 'noopener noreferrer'); window.open(routeData.href, '_blank');
}, },
faultdevice() { faultdevice() {
const routeData = this.$router.resolve({ const routeData = this.$router.resolve({
@ -458,7 +458,7 @@ export default {
noPreLogout: true noPreLogout: true
} }
}); });
window.open(routeData.href, '_blank', 'noopener noreferrer'); window.open(routeData.href, '_blank');
}, },
showdriving() { showdriving() {
this.panelShow = true; this.panelShow = true;
@ -481,7 +481,7 @@ export default {
noPreLogout: true noPreLogout: true
} }
}); });
window.open(routeData.href, '_blank', 'noopener noreferrer'); window.open(routeData.href, '_blank');
}, },
hidepanel() { // 司机视角 hidepanel() { // 司机视角
if (this.$store.state.training.prdType == '04') { if (this.$store.state.training.prdType == '04') {
@ -499,7 +499,7 @@ export default {
noPreLogout: true noPreLogout: true
} }
}); });
window.open(routeData.href, '_blank', 'noopener noreferrer'); window.open(routeData.href, '_blank');
} }
}, },

12
src/views/newMap/jointTrainingNew/menuDemon.vue
View File

@ -386,7 +386,7 @@ export default {
lineCode:this.lineCode lineCode:this.lineCode
} }
}); });
window.open(routeData.href, '_blank', 'noopener noreferrer'); window.open(routeData.href, '_blank');
}, },
jumpjl3dtraffictrain() { jumpjl3dtraffictrain() {
const routeData = this.$router.resolve({ const routeData = this.$router.resolve({
@ -399,7 +399,7 @@ export default {
lineCode:this.lineCode lineCode:this.lineCode
} }
}); });
window.open(routeData.href, '_blank', 'noopener noreferrer'); window.open(routeData.href, '_blank');
}, },
jumpjl3dfaultdevice() { jumpjl3dfaultdevice() {
this.$emit('faultdevice'); this.$emit('faultdevice');
@ -459,7 +459,7 @@ export default {
noPreLogout: true noPreLogout: true
} }
}); });
window.open(routeData.href, '_blank', 'noopener noreferrer'); window.open(routeData.href, '_blank');
}, },
handleTeach() { handleTeach() {
getPublishLessonListByMapId({mapId: this.mapId}).then(resp => { getPublishLessonListByMapId({mapId: this.mapId}).then(resp => {
@ -475,7 +475,7 @@ export default {
noPreLogout: true noPreLogout: true
} }
}); });
window.open(routeData.href, '_blank', 'noopener noreferrer'); window.open(routeData.href, '_blank');
} else { } else {
this.$message.error('暂无教学系统数据！'); this.$message.error('暂无教学系统数据！');
} }
@ -495,7 +495,7 @@ export default {
noPreLogout: true noPreLogout: true
} }
}); });
window.open(routeData.href, '_blank', 'noopener noreferrer'); window.open(routeData.href, '_blank');
} else { } else {
getPublishLessonListByMapId({mapId: this.mapId}).then(resp => { getPublishLessonListByMapId({mapId: this.mapId}).then(resp => {
const lesson = resp.data.find(item => { const lesson = resp.data.find(item => {
@ -510,7 +510,7 @@ export default {
noPreLogout: true noPreLogout: true
} }
}); });
window.open(routeData.href, '_blank', 'noopener noreferrer'); window.open(routeData.href, '_blank');
} else { } else {
this.$message.error('暂无考试系统数据！'); this.$message.error('暂无考试系统数据！');
} }

8
src/views/newMap/jointTrainingNew/menuSchema.vue
View File

@ -219,7 +219,7 @@ export default {
noPreLogout: true noPreLogout: true
} }
}); });
window.open(routeData.href, '_blank', 'noopener noreferrer'); window.open(routeData.href, '_blank');
} else { } else {
this.$refs.runPlanView.doShow(); this.$refs.runPlanView.doShow();
} }
@ -241,7 +241,7 @@ export default {
noPreLogout: true noPreLogout: true
} }
}); });
window.open(routeData.href, '_blank', 'noopener noreferrer'); window.open(routeData.href, '_blank');
}, },
goIscs() { goIscs() {
const routeData = this.$router.resolve({ const routeData = this.$router.resolve({
@ -253,7 +253,7 @@ export default {
noPreLogout: true noPreLogout: true
} }
}); });
window.open(routeData.href, '_blank', 'noopener noreferrer'); window.open(routeData.href, '_blank');
}, },
// 点击ibp预览 // 点击ibp预览
goIbp() { goIbp() {
@ -271,7 +271,7 @@ export default {
noPreLogout: true noPreLogout: true
} }
}); });
window.open(routeData.href, '_blank', 'noopener noreferrer'); window.open(routeData.href, '_blank');
} else { } else {
this.$messageBox('本车站暂无IBP盘数据！'); this.$messageBox('本车站暂无IBP盘数据！');
} }