diff --git a/ruoyi-ui/src/components/BoardTopNav/index.vue b/ruoyi-ui/src/components/BoardTopNav/index.vue index 7a01320..8b063f4 100644 --- a/ruoyi-ui/src/components/BoardTopNav/index.vue +++ b/ruoyi-ui/src/components/BoardTopNav/index.vue @@ -14,7 +14,7 @@ {{ name }} - + @@ -78,7 +78,7 @@ export default { if (!this.$store.getters.sceneId) { this.$router.replace({path: "/board/index"}) } - if (this.$route.name === 'SmartScene' || this.$route.name === 'GPS' || this.$route.name === 'index' || this.$store.getters.sceneId) { + if (this.$route.name === 'smartScene' || this.$route.name === 'GPS' || this.$route.name === 'index' || this.$store.getters.sceneId) { } else { if (this.$store.state.user.permissions.includes('business:monitor:index') || this.$store.state.user.permissions.includes('*:*:*')) { await this.$router.replace({path: "/board/index"}); @@ -88,7 +88,7 @@ export default { } } await this.setSelectSecnes() - if (this.$route.name === 'SmartScene' || this.$route.name === 'GPS') { + if (this.$route.name === 'smartScene' || this.$route.name === 'GPS') { if (this.$route.query?.name) { this.name = this.$route.query?.name } else { diff --git a/ruoyi-ui/src/components/RuoYi/Git/index.vue b/ruoyi-ui/src/components/RuoYi/Git/index.vue index 64846d7..be3e5cb 100644 --- a/ruoyi-ui/src/components/RuoYi/Git/index.vue +++ b/ruoyi-ui/src/components/RuoYi/Git/index.vue @@ -21,6 +21,7 @@ export default { } else { selectSecnes().then((e)=>{ let data = e.data.find(e=> e.defaultFlag === '1') + this.$store.dispatch('app/setSceneId', data.sceneId) this.$router.push({path: '/board/'+data.router+'?name='+data.sceneName}) }) // this.$router.push({path: '/board/smartScene'})