From 33d3e978e5e8fd8bdd6cab927edd923f52dc1705 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A4=9C=E7=AC=99=E6=AD=8C?= <2277317060@qq.com>
Date: Thu, 19 Oct 2023 15:27:29 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=B7=B3=E8=BD=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ruoyi-ui/src/components/BoardTopNav/index.vue | 6 +++---
 ruoyi-ui/src/components/RuoYi/Git/index.vue   | 1 +
 2 files changed, 4 insertions(+), 3 deletions(-)

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 }} <i class="el-icon-arrow-down el-icon--right"></i>
                     </span>
           <el-dropdown-menu slot="dropdown">
-            <div class="topNavScroll" style="height: 300px;overflow: auto;background-color: #053563;padding: 0;border: none;">
+            <div class="topNavScroll" style="max-height: 300px;overflow: auto;background-color: #053563;padding: 0;border: none;">
               <el-dropdown-item v-for="i in selectSecnesList" :key="i.sceneId"
                                 :command="{router:i.router,name:i.sceneName,sceneId:i.sceneId}">
                 <span style="color: #f8fefd">
@@ -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'})