diff --git a/nezha-fronted/src/assets/css/components/cli/fileDirectory.scss b/nezha-fronted/src/assets/css/components/cli/fileDirectory.scss index b127dda13..276eeb4b6 100644 --- a/nezha-fronted/src/assets/css/components/cli/fileDirectory.scss +++ b/nezha-fronted/src/assets/css/components/cli/fileDirectory.scss @@ -163,7 +163,7 @@ font-family: Roboto-Regular; } .my-loading-box{ - background: #1a1a1a; + //background: #1a1a1a; } .nz-icon:hover{ color: $--color-primary; diff --git a/nezha-fronted/src/components/cli/terminal.vue b/nezha-fronted/src/components/cli/terminal.vue index 9071cbba7..c16b1713f 100644 --- a/nezha-fronted/src/components/cli/terminal.vue +++ b/nezha-fronted/src/components/cli/terminal.vue @@ -94,7 +94,7 @@ export default { const data = JSON.parse(e.data) self.$get('asset/asset/' + data.id).then(res => { const asset = res.data - self.$refs.websshNew.addConsole(asset.id, asset.manageIp, '', '', 'asset', asset) + self.$refs.websshNew.addConsole(asset.id, asset.manageIp, '', '', 'asset', asset, 'father') }) } catch (e) { console.log(e) diff --git a/nezha-fronted/src/components/cli/webSSHNew.vue b/nezha-fronted/src/components/cli/webSSHNew.vue index 74ce8d424..c764da0e0 100644 --- a/nezha-fronted/src/components/cli/webSSHNew.vue +++ b/nezha-fronted/src/components/cli/webSSHNew.vue @@ -575,9 +575,13 @@ export default { authProtocol: 1 } this.prevent_opt.save = false - requestsArr.forEach(xhr => xhr.cancel('cancel')) + requestsArr.forEach(xhr => { + if (!xhr.parentWindow) { + xhr.cancel('cancel') + } + }) }, - addConsole (id, host, accountId, port, type, asset) { + addConsole (id, host, accountId, port, type, asset, father) { if (!id) { id = '' } if (!host) { host = '' } if (!accountId) { accountId = '' } @@ -645,7 +649,8 @@ export default { authPin: this.$loadsh.get(terminal, 'custom.authPin', ''), authPriKey: this.$loadsh.get(terminal, 'custom.authPriKey', ''), authUserTip: this.$loadsh.get(terminal, 'custom.authUserTip', ''), - authPinTip: this.$loadsh.get(terminal, 'custom.authPinTip', '') + authPinTip: this.$loadsh.get(terminal, 'custom.authPinTip', ''), + parentWindow: !!father } this.$post('/terminal/login', params).then(res => { if (res.code == 200) { diff --git a/nezha-fronted/src/http.js b/nezha-fronted/src/http.js index 6d20477ba..4d20b545f 100644 --- a/nezha-fronted/src/http.js +++ b/nezha-fronted/src/http.js @@ -24,7 +24,8 @@ axios.interceptors.request.use( config.id = id requestsArr.push({ id, - cancel: source.cancel + cancel: source.cancel, + params: config.data }) // 将该实例添加到队列中 } const token = localStorage.getItem('nz-token')