Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: 跳转到 luna 组织不对 #3747

Merged
merged 1 commit into from
Feb 27, 2024
Merged

fix: 跳转到 luna 组织不对 #3747

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion src/layout/components/NavHeader/WebTerminal.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,8 @@ export default {
name: 'WebTerminal',
computed: {
webTerminalUrl() {
let url = `${BASE_URL}/luna/?_=${Date.now()}`
const oid = this.$store.getters.currentOrg ? this.$store.getters.currentOrg.id : ''
let url = `${BASE_URL}/luna/?_=${Date.now()}${oid ? `&oid=${oid}` : ''}`
if (process.env.NODE_ENV !== 'production') {
url = url.replace('9528', '4200')
}
Expand Down
4 changes: 3 additions & 1 deletion src/views/myassets/index.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,9 @@ export default {
type: 'primary',
can: ({ row }) => row.is_active,
callback: ({ row }) => {
window.open(`/luna/?login_to=${row.id}`, '_blank')
const oid = this.$store.getters.currentOrg ? this.$store.getters.currentOrg.id : ''
const url = `/luna/?login_to=${row.id}${oid ? `&oid=${oid}` : ''}`
window.open(url, '_blank')
}
},
{
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lina 和 luna 之间 org 我记得有公用的 cookie 吧。

Expand Down
Loading