Merge remote-tracking branch 'origin/master'

ruoyi-ui/src/components/RuoYi/Git/index.vue

@@ -5,6 +5,7 @@
 </template>
 
 <script>
+import {selectSecnes} from '@/api/board/nav'
 export default {
   name: 'RuoYiGit',
   data() {
@@ -14,14 +15,14 @@ export default {
   },
   methods: {
     goto() {
-      console.log(this.$store.state.user.permissions)
-      console.log(this.$store.state.user.permissions.includes('business:monitor:index'))
-      console.log( this.$store.state.user.permissions.includes('*:*:*'))
-      console.log( this.$store.state.user.permissions.filter(e=>e.includes('business:monitor')))
       if (this.$store.state.user.permissions.includes('business:monitor:index') || this.$store.state.user.permissions.includes('*:*:*')) {
         this.$router.push({path: "/board/index"});
       } else {
-        this.$router.push({path: '/board/smartScene'})
+        selectSecnes().then((e)=>{
+         let data = e.data.find(e=> e.defaultFlag === '1')
+          this.$router.push({path: '/board/'+data.router+'?name='+data.sceneName})
+        })
+        // this.$router.push({path: '/board/smartScene'})
       }
     }
   }