Merge remote-tracking branch 'origin/master'

dev
xins 1 year ago
commit e5886ff546

@ -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 {

@ -20,7 +20,13 @@ export default {
this.$router.push({path: "/board/index"});
} else {
selectSecnes().then((e)=>{
let data = e.data.find(e=> e.defaultFlag === '1')
let data = e.data.find(e=> e.defaultFlag === '1') || null
debugger
if(!data){
data = e.data[0]
}
debugger
this.$store.dispatch('app/setSceneId', data.sceneId)
this.$router.push({path: '/board/'+data.router+'?name='+data.sceneName})
})
// this.$router.push({path: '/board/smartScene'})

Loading…
Cancel
Save