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

merge

Browse Source
This commit is contained in:
sunzhenyu 2020-12-29 10:00:44 +08:00
parent 0eedf1bd6b
commit ec1f215104
1 changed files with 0 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -408,7 +408,6 @@ export default {
this.hideIbp(); this.hideIbp();
} }
}, },
<<<<<<< HEAD
async getTrainDetail() { async getTrainDetail() {
try { try {
// await loadNewMapDataByGroup(this.group); // await loadNewMapDataByGroup(this.group);
@ -422,8 +421,6 @@ export default {
this.endViewLoading(); this.endViewLoading();
} }
}, },
=======
>>>>>>> 8b2291e18b7c517f153aaea124740b2245fbd332
back() { back() {
this.$refs.demonMenu.back(); this.$refs.demonMenu.back();
}, },