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

Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev

Browse Source
This commit is contained in:
zyy 2019-09-03 13:15:53 +08:00
commit 8d06b98ba1
2 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/views/jointTraining/index.vue
View File

@ -27,7 +27,6 @@
</template> </template>
<script> <script>
// import Hamburger from '@/components/Hamburger';
import MapSystemDraft from '@/views/mapsystem/index'; import MapSystemDraft from '@/views/mapsystem/index';
import MenuDemonJoint from './menuDemon'; import MenuDemonJoint from './menuDemon';
import MenuDemonSchema from './menuSchema'; import MenuDemonSchema from './menuSchema';
@ -37,10 +36,8 @@ import JoinRunPlanView from '@/views/display/demon/runPlanView';
import menuSystemTime from '@/views/display/menuSystemTime'; import menuSystemTime from '@/views/display/menuSystemTime';
import IbpPlate from '@/views/ibp/index'; import IbpPlate from '@/views/ibp/index';
import { mapGetters } from 'vuex'; import { mapGetters } from 'vuex';
// import { getProductDetail } from '@/api/jmap/training';
import { OperateMode, TrainingMode } from '@/scripts/ConstDic'; import { OperateMode, TrainingMode } from '@/scripts/ConstDic';
import { checkLoginLine } from '@/api/login'; import { checkLoginLine } from '@/api/login';
// import { isFullscreen } from '@/utils/screen';
import { loadMapData } from '@/utils/loaddata'; import { loadMapData } from '@/utils/loaddata';
import { getUserRoles, deljointTrainRoom } from '@/api/chat'; import { getUserRoles, deljointTrainRoom } from '@/api/chat';
import { runDiagramOver, getSimulationInfo } from '@/api/simulation'; import { runDiagramOver, getSimulationInfo } from '@/api/simulation';

3
src/views/trainRoom/index.vue
View File

@ -384,7 +384,6 @@ export default {
} }
}, },
async joinJointTrain() { async joinJointTrain() {
// launchFullscreen();
this.loading = true; this.loading = true;
await putJointTrainingSimulationEntrance(this.$route.query.group); await putJointTrainingSimulationEntrance(this.$route.query.group);
const rest = await getPublishMapInfo(this.mapId); const rest = await getPublishMapInfo(this.mapId);
@ -621,7 +620,7 @@ export default {
this.loading = true; this.loading = true;
await putJointTrainingExit(this.$route.query.group); await putJointTrainingExit(this.$route.query.group);
this.loading = false; this.loading = false;
this.$router.push({ path: `/` }); this.$router.push({ path: `/demonstration/detail/${this.mapId}` });
} catch (error) { } catch (error) {
this.messageInfo('操作失败！', 'error'); this.messageInfo('操作失败！', 'error');
} }