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

剧本代码调整

Browse Source
This commit is contained in:
joylink_cuiweidong 2020-06-19 18:58:55 +08:00
parent b1439d4903
commit 32f4ead036
2 changed files with 20 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/views/newMap/displayNew/index.vue
View File

@ -52,7 +52,7 @@
@showScheduling="showScheduling" @showScheduling="showScheduling"
/> />
<menu-script v-if="isScript" ref="menuScript" @script3ddriveshow="script3ddriveshow" :offset-bottom="offsetBottom" :group="group" :data-error="dataError" /> <menu-script v-if="isScript" ref="menuScript" :offset-bottom="offsetBottom" :group="group" :data-error="dataError" @script3ddriveshow="script3ddriveshow" />
<menu-practice <menu-practice
v-if="isPractice" v-if="isPractice"
@ -181,6 +181,7 @@ export default {
questId: 0, // 加载任务的Id questId: 0, // 加载任务的Id
showStation: '', showStation: '',
stationList: [], stationList: [],
grouper:'',
showSelectStation: false, // 是否展示现地选择设备集中站select showSelectStation: false, // 是否展示现地选择设备集中站select
prdTypeMap: { prdTypeMap: {
'01': '01', // 现地 => 现地 '01': '01', // 现地 => 现地
@ -326,6 +327,9 @@ export default {
'$store.state.map.map': function (val) { '$store.state.map.map': function (val) {
this.showSelectStation = val.skinVO.code === '06' && this.$store.state.training.prdType === '01'; this.showSelectStation = val.skinVO.code === '06' && this.$store.state.training.prdType === '01';
this.showSelectStation && this.setStationList(val); this.showSelectStation && this.setStationList(val);
},
'group':function(group) {
this.grouper = group;
} }
}, },
async created() { async created() {
@ -335,15 +339,15 @@ export default {
EventBus.$on('clearCheckLogin', () => { EventBus.$on('clearCheckLogin', () => {
this.clearCheckLogin(); this.clearCheckLogin();
}); });
this.grouper = this.group;
await this.setWindowSize(); await this.setWindowSize();
await this.initLoadData(); await this.initLoadData();
}, },
async beforeDestroy() { beforeDestroy() {
await this.clearAllTimer(); this.quit(this.grouper);
await this.quit(); this.clearAllTimer();
await this.$store.dispatch('training/reset'); this.$store.dispatch('training/reset');
await this.$store.dispatch('map/mapClear'); this.$store.dispatch('map/mapClear');
EventBus.$off('clearCheckLogin'); EventBus.$off('clearCheckLogin');
}, },
methods: { methods: {
@ -577,9 +581,9 @@ export default {
}, },
// 销毁仿真 // 销毁仿真
async quit() { quit(group) {
await clearSimulation(this.group); clearSimulation(group);
await this.$store.dispatch('training/over'); this.$store.dispatch('training/over');
}, },
// 仿真错误时，被动退出时调用 // 仿真错误时，被动退出时调用
async back() { async back() {
@ -624,10 +628,10 @@ export default {
window.open(routeData.href, '_blank', 'noopener noreferrer'); window.open(routeData.href, '_blank', 'noopener noreferrer');
} }
}, },
script3ddriveshow(){ script3ddriveshow() {
this.panelShow = false; this.panelShow = false;
this.drivingShow = true; this.drivingShow = true;
this.$refs.Jl3dDrive.show(this.mapId, this.group); this.$refs.Jl3dDrive.show(this.mapId, this.group);
}, },
passflow() { passflow() {
const routeData = this.$router.resolve({ const routeData = this.$router.resolve({

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

@ -7,7 +7,7 @@
<el-button type="danger" @click="dumpScenesData">重置剧本</el-button> <el-button type="danger" @click="dumpScenesData">重置剧本</el-button>
</el-button-group> --> </el-button-group> -->
<el-button-group> <el-button-group>
<el-button type="jumpjlmap3d" @click="jumpjlmap3d">{{ $t('joinTraining.driverPerspective') }}</el-button> <el-button type="jumpjlmap3d" @click="jumpjlmap3d">{{ $t('joinTraining.driverPerspective') }}</el-button>
<el-button v-if="!isScriptCommand" type="success" :disabled="isDisable || dataError" @click="selectBeginTime">{{ $t('scriptRecord.drivingByPlan') }}</el-button> <el-button v-if="!isScriptCommand" type="success" :disabled="isDisable || dataError" @click="selectBeginTime">{{ $t('scriptRecord.drivingByPlan') }}</el-button>
<el-button v-if="!isScriptCommand" type="danger" :disabled="dataError" @click="end">初始化</el-button> <el-button v-if="!isScriptCommand" type="danger" :disabled="dataError" @click="end">初始化</el-button>
<el-button type="primary" @click="back">{{ $t('scriptRecord.scriptBack') }}</el-button> <el-button type="primary" @click="back">{{ $t('scriptRecord.scriptBack') }}</el-button>
@ -200,7 +200,7 @@ export default {
}); });
}, },
jumpjlmap3d() { jumpjlmap3d() {
this.$emit('script3ddriveshow'); this.$emit('script3ddriveshow');
}, },
async loadSystemTime() { async loadSystemTime() {