gfwleak/nezha-nezha-fronted
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev-3.8' of git.mesalab.cn:nezha/nezha-fronted into dev-3.8

Browse Source
This commit is contained in:
zyh
2023-10-25 13:45:13 +08:00
parent 25b45cf1ce a1c7d06f6a
commit e3633f62a3
1 changed files with 17 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
nezha-fronted/src/components/common/popBox/guide.vue
View File

@@ -124,6 +124,11 @@ export default {
interval: null interval: null
} }
}, },
computed: {
externalTerminal () {
return this.$store.getters.getExternalTerminal
}
},
methods: { methods: {
close () { close () {
this.$emit('close') this.$emit('close')
@@ -154,13 +159,18 @@ export default {
return return
} }
this.$emit('close') this.$emit('close')
this.$router.push({ if (!this.externalTerminal) {
path: '/asset', this.$store.dispatch('dispatchExternalTerminal')
query: { } else {
t: +new Date() this.$store.dispatch('dispatchOpenExternalTerminalWindow')
} }
}) // this.$router.push({
this.$store.commit('openConsole') // path: '/asset',
// query: {
// t: +new Date()
// }
// })
// this.$store.commit('openConsole')
}, },
jump (guide) { jump (guide) {
if (!this.hasButton(guide.permissionCode)) { if (!this.hasButton(guide.permissionCode)) {