diff --git a/public/favicon.png b/public/favicon.png index 79b86d820..0af73dedc 100644 Binary files a/public/favicon.png and b/public/favicon.png differ diff --git a/src/layout/components/Entry.vue b/src/layout/components/Entry.vue index f9483f21c..cbc0506dc 100644 --- a/src/layout/components/Entry.vue +++ b/src/layout/components/Entry.vue @@ -31,22 +31,22 @@ export default { { name: 'global.designPlatformEntrance', handle: this.goToDesign, - hidden: getSessionStorage('design') + hidden: getSessionStorage('project') === 'design' }, { name: 'global.trainingPlatformEntrance', handle: this.goToTraining, - hidden: !getSessionStorage('design') + hidden: getSessionStorage('project') !== 'design' }, { name: 'global.scan', handle: this.qcodeEntry, - hidden: process.env.NODE_ENV != 'development' || getSessionStorage('design') + hidden: process.env.NODE_ENV != 'development' || getSessionStorage('project') === 'design' }, { name: 'global.quickEntry', handle: this.quickEntry, - hidden: getSessionStorage('design') + hidden: getSessionStorage('project') === 'design' }, { name: LangStorage.getLang('zh')==='zh'?'English':'中文', diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue index 933002e60..ab89cc52a 100644 --- a/src/layout/components/Navbar.vue +++ b/src/layout/components/Navbar.vue @@ -101,10 +101,10 @@ export default { ]) }, mounted() { - this.routes = this.$router.options.routes; + this.routes = this.$router.options.routes; if (this.$route.fullPath.indexOf('design/userlist')>=0) { - this.activePath='/design/userlist/home'; - } else if (this.$route.fullPath.indexOf('design/lesson')>=0 || this.$route.fullPath.indexOf('design/script')>=0 || this.$route.fullPath.indexOf('design/runPlan')>=0) { + this.activePath='/design/userlist/home'; + } else if (this.$route.fullPath.includes('design/lesson') || this.$route.fullPath.includes('design/script') || this.$route.fullPath.includes('design/runPlan') || this.$route.fullPath.includes('design/mapPreview')) { this.activePath='/design/home'; } else { this.activePath=this.$route.path; diff --git a/src/layout/components/Title.vue b/src/layout/components/Title.vue index 2e34d0ad5..c9b33a6bd 100644 --- a/src/layout/components/Title.vue +++ b/src/layout/components/Title.vue @@ -1,39 +1,30 @@ diff --git a/src/views/teach/index.vue b/src/views/teach/index.vue index 1a84741fd..2ef6435d7 100644 --- a/src/views/teach/index.vue +++ b/src/views/teach/index.vue @@ -48,7 +48,7 @@ export default { }; }, watch: { - $route(newVal) { + '$route.params.subSystem': function(newVal) { this.loadInitPage(); } }, diff --git a/src/views/trainRoom/index.vue b/src/views/trainRoom/index.vue index 6b33f5c9b..01c76b229 100644 --- a/src/views/trainRoom/index.vue +++ b/src/views/trainRoom/index.vue @@ -462,7 +462,8 @@ export default { }; if (data.state == '03') { // 房间销毁 - this.$router.push({ path: `/trainingPlatform/detail/${this.$route.query.subSystem}`, query: {mapId: this.mapId}}); + // this.$router.push({ path: `/trainingPlatform/detail/${this.$route.query.subSystem}`, query: {mapId: this.mapId}}); + this.$router.go(-1); } else if (data.state == '01') { // 进入准备中 this.starting = false; } else if (data.state == '02') { @@ -470,7 +471,7 @@ export default { await putJointTrainingSimulationEntrance(param.group); const rest = await getPublishMapInfo(param.mapId); const query = { skinCode: rest.data.skinCode, mapId: param.mapId, group: param.group, subSystem: this.$route.query.subSystem }; - this.$router.push({ path: `/jointTraining`, query: query }); + this.$router.replace({ path: `/jointTraining`, query: query }); launchFullscreen(); } this.$store.dispatch('socket/setJointRoomInfo'); // 清空房间信息 @@ -492,7 +493,7 @@ export default { await putJointTrainingSimulationEntrance(this.$route.query.group); const rest = await getPublishMapInfo(this.mapId); const query = { skinCode: rest.data.skinCode, mapId: this.mapId, group: this.$route.query.group, subSystem: this.$route.query.subSystem }; - this.$router.push({ path: `/jointTraining`, query: query }); + this.$router.replace({ path: `/jointTraining`, query: query }); launchFullscreen(); }, // 判断观众席在线/不在线 diff --git a/src/views/trainRoom/trainChat.vue b/src/views/trainRoom/trainChat.vue index c401361cb..475b1b3df 100644 --- a/src/views/trainRoom/trainChat.vue +++ b/src/views/trainRoom/trainChat.vue @@ -38,8 +38,9 @@ name="" rows="" cols="" + @keyup="changeText" /> - +
{ - this.$messageBox(this.$t('systemGenerate.getSubSystemInfoFail')); + }).catch((error) => { + if (error.code === '40004') { + this.$messageBox(this.$t('systemGenerate.getSubSystemInfoFail')); + } }); } },