github/lina
1
0
Fork 0
mirror of https://github.com/jumpserver/lina.git synced 2026-01-13 19:35:24 +00:00
Code Issues Projects Releases Wiki Activity

perf: 优化打开task页面

Browse Source
This commit is contained in:
ibuler
2021-07-22 13:33:48 +08:00
committed by 老广
parent e38817b24a
commit dfd710daf7
15 changed files with 44 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/components/AccountListTable/index.vue
View File

@@ -12,6 +12,7 @@ import { ActionsFormatter, DetailFormatter, DisplayFormatter } from '@/component
import ShowSecretInfo from './ShowSecretInfo'
import UpdateSecretInfo from './UpdateSecretInfo'
import { connectivityMeta } from './const'
import { openTaskPage } from '@/utils/jms'
export default {
name: 'Detail',
@@ -123,7 +124,7 @@ export default {
`/api/v1/assets/accounts/${row.id}/verify/`,
{ action: 'test' }
).then(res => {
window.open(`/#/ops/celery/task/${res.task}/log/`, '', 'width=900,height=600')
openTaskPage(res['task'])
})
}
},

3
src/utils/jms.js Normal file
View File

@@ -0,0 +1,3 @@
export function openTaskPage(taskId) {
window.open(`/#/ops/celery/task/${taskId}/log/`, '', 'width=900,height=600')
}

3
src/views/accounts/ChangeAuthPlan/ChangeAuthPlanList.vue
View File

@@ -5,6 +5,7 @@
<script>
import { GenericListPage } from '@/layout/components'
import { DetailFormatter } from '@/components/TableFormatters'
import { openTaskPage } from '@/utils/jms'
export default {
name: 'ChangeAuthPlanList',
@@ -73,7 +74,7 @@ export default {
`/api/v1/xpack/change-auth-plan/plan-execution/`,
{ plan: row.id }
).then(res => {
window.open(`/#/ops/celery/task/${res.task}/log/`, '_blank', 'toolbar=yes, width=900, height=600')
openTaskPage(res['task'])
})
}.bind(this)
}

3
src/views/accounts/GatheredUser/TaskList.vue
View File

@@ -5,6 +5,7 @@
<script>
import GenericListTable from '@/layout/components/GenericListTable'
import { DetailFormatter } from '@/components/TableFormatters'
import { openTaskPage } from '@/utils/jms'
export default {
components: {
@@ -65,7 +66,7 @@ export default {
`/api/v1/xpack/gathered-user/task-executions/`,
{ task: data.row.id }
).then(res => {
window.open(`/#/ops/celery/task/${res.task}/log/`, '_blank', 'toolbar=yes, width=900, height=600')
openTaskPage(res['task'])
}).catch(res => {
})
}

3
src/views/assets/Asset/AssetDetail/Account.vue
View File

@@ -14,6 +14,7 @@
<script>
import QuickActions from '@/components/QuickActions'
import { AccountListTable } from '@/components'
import { openTaskPage } from '@/utils/jms'
export default {
name: 'Detail',
@@ -43,7 +44,7 @@ export default {
`/api/v1/assets/accounts/tasks/?asset=${this.object.id}`,
{ action: 'test' }
).then(res => {
window.open(`/#/ops/celery/task/${res.task}/log/`, '', 'width=900,height=600')
openTaskPage(res['task'])
}
)
}.bind(this)

5
src/views/assets/Asset/AssetDetail/Detail.vue
View File

@@ -17,6 +17,7 @@ import RelationCard from '@/components/RelationCard'
import QuickActions from '@/components/QuickActions'
import LabelCard from './components/LabelCard'
import { toSafeLocalDateStr } from '@/utils/common'
import { openTaskPage } from '@/utils/jms'
export default {
name: 'Detail',
@@ -67,7 +68,7 @@ export default {
`/api/v1/assets/assets/${this.object.id}/tasks/`,
{ action: 'refresh' }
).then(res => {
window.open(`/#/ops/celery/task/${res.task}/log/`, '', 'width=900,height=600')
openTaskPage(res['task'])
}
)
}.bind(this)
@@ -85,7 +86,7 @@ export default {
`/api/v1/assets/assets/${this.object.id}/tasks/`,
{ action: 'test' }
).then(res => {
window.open(`/#/ops/celery/task/${res.task}/log/`, '', 'width=900,height=600')
openTaskPage(res['task'])
}
)
}.bind(this)

13
src/views/assets/Asset/AssetDetail/SystemUser.vue
View File

@@ -18,6 +18,7 @@ import RelationCard from '@/components/RelationCard'
import ListTable from '@/components/ListTable'
import { DetailFormatter } from '@/components/TableFormatters'
import { connectivityMeta } from '@/components/AccountListTable/const'
import { openTaskPage } from '@/utils/jms'
export default {
name: 'SystemUserList',
@@ -68,7 +69,7 @@ export default {
const theUrl = `/api/v1/assets/system-users/${row.systemuser}/tasks/`
const data = { action: 'test', assets: [this.object.id] }
this.$axios.post(theUrl, data).then(resp => {
window.open(`/#/ops/celery/task/${resp.task}/log/`, '', 'width=900,height=600')
openTaskPage(resp['task'])
})
}
},
@@ -80,7 +81,7 @@ export default {
const theUrl = `/api/v1/assets/system-users/${row.systemuser}/tasks/`
const data = { action: 'push', assets: [this.object.id] }
this.$axios.post(theUrl, data).then(resp => {
window.open(`/#/ops/celery/task/${resp.task}/log/`, '', 'width=900,height=600')
openTaskPage(resp['task'])
})
}
},
@@ -136,7 +137,7 @@ export default {
const theUrl = `/api/v1/assets/assets/${this.object.id}/tasks/`
const data = { action: 'test_system_user' }
this.$axios.post(theUrl, data).then(resp => {
window.open(`/#/ops/task/task/${resp.task}/log/`, '', 'width=900,height=600')
openTaskPage(resp['task'])
})
}.bind(this)
}
@@ -152,7 +153,7 @@ export default {
const theUrl = `/api/v1/assets/assets/${this.object.id}/tasks/`
const data = { action: 'push_system_user' }
this.$axios.post(theUrl, data).then(resp => {
window.open(`/#/ops/task/task/${resp.task}/log/`, '', 'width=900,height=600')
openTaskPage(resp['task'])
})
}.bind(this)
}
@@ -194,7 +195,7 @@ export default {
})
const data = { action: 'push_system_user', system_users: systemUsers }
this.$axios.post(theUrl, data).then(resp => {
window.open(`/#/ops/task/task/${resp.task}/log/`, '', 'width=900,height=600')
openTaskPage(resp['task'])
})
},
bulkTestCallback({ selectedRows }) {
@@ -204,7 +205,7 @@ export default {
})
const data = { action: 'test_system_user', system_users: systemUsers }
this.$axios.post(theUrl, data).then(resp => {
window.open(`/#/ops/task/task/${resp.task}/log/`, '', 'width=900,height=600')
openTaskPage(resp['task'])
})
}
}

7
src/views/assets/Asset/AssetList.vue
View File

@@ -76,6 +76,7 @@ import rules from '@/components/DataForm/rules'
import Protocols from '@/views/assets/Asset/components/Protocols/index'
import { mapGetters } from 'vuex'
import { connectivityMeta } from '@/components/AccountListTable/const'
import { openTaskPage } from '@/utils/jms'
export default {
components: {
@@ -418,7 +419,7 @@ export default {
`/api/v1/assets/nodes/${currentNode.meta.node.id}/tasks/`,
{ 'action': 'refresh' }
).then((res) => {
window.open(`/core/ops/celery/task/${res.task}/log/`, '_blank', 'toolbar=yes, width=900, height=600')
openTaskPage(res['task'])
}).catch(error => {
this.$message.error(this.$t('common.updateErrorMsg' + ' ' + error))
})
@@ -433,7 +434,7 @@ export default {
`/api/v1/assets/nodes/${currentNode.meta.node.id}/tasks/`,
{ 'action': 'test' }
).then((res) => {
window.open(`/core/ops/celery/task/${res.task}/log/`, '_blank', 'toolbar=yes, width=900, height=600')
openTaskPage(res['task'])
}).catch(error => {
this.$message.error(this.$t('common.updateErrorMsg' + ' ' + error))
})
@@ -484,7 +485,7 @@ export default {
this.$axios.post(
`/api/v1/assets/nodes/check_assets_amount_task/`
).then(res => {
window.open(`/#/ops/celery/task/${res.task}/log/`, '', 'width=900,height=600')
openTaskPage(res['task'])
}).catch(error => {
this.$message.error(this.$t('common.getErrorMsg' + ' ' + error))
})

14
src/views/assets/SystemUser/SystemUserDetail/AssetList.vue
View File

@@ -20,6 +20,7 @@ import AssetRelationCard from '@/components/AssetRelationCard'
import ListTable from '@/components/ListTable'
import { DetailFormatter } from '@/components/TableFormatters'
import { connectivityMeta } from '@/components/AccountListTable/const'
import { openTaskPage } from '@/utils/jms'
export default {
name: 'AssetList',
@@ -72,7 +73,7 @@ export default {
const theUrl = `/api/v1/assets/system-users/${vm.object.id}/tasks/`
const data = { action: 'push', assets: [row.asset] }
this.$axios.post(theUrl, data).then(resp => {
window.open(`/#/ops/celery/task/${resp.task}/log/`, '', 'width=900,height=600')
openTaskPage(resp['task'])
})
}
},
@@ -129,9 +130,8 @@ export default {
`/api/v1/assets/system-users/${this.object.id}/tasks/`,
{ action: 'test' }
).then(res => {
window.open(`/#/ops/celery/task/${res.task}/log/`, '', 'width=900,height=600')
}
)
openTaskPage(res['task'])
})
}.bind(this)
}
},
@@ -147,7 +147,7 @@ export default {
const theUrl = `/api/v1/assets/system-users/${vm.object.id}/tasks/`
const data = { action: 'push' }
this.$axios.post(theUrl, data).then(resp => {
window.open(`/#/ops/celery/task/${resp.task}/log/`, '', 'width=900,height=600')
openTaskPage(resp['task'])
})
}.bind(this)
}
@@ -219,7 +219,7 @@ export default {
})
const data = { action: 'push', assets: assets }
this.$axios.post(theUrl, data).then(resp => {
window.open(`/#/ops/task/task/${resp.task}/log/`, '', 'width=900,height=600')
openTaskPage(resp['task'])
})
},
bulkTestCallback({ selectedRows }) {
@@ -229,7 +229,7 @@ export default {
})
const data = { action: 'test', assets: assets }
this.$axios.post(theUrl, data).then(resp => {
window.open(`/#/ops/task/task/${resp.task}/log/`, '', 'width=900,height=600')
openTaskPage(resp['task'])
})
}
}

3
src/views/ops/TaskDetail/HistoryExecutionDetail/HistoryExecutionDetail.vue
View File

@@ -15,6 +15,7 @@ import DetailCard from '@/components/DetailCard'
import { toSafeLocalDateStr } from '@/utils/common'
import RunInfoCard from '../../RunInfoCard'
import { toLastFailureDisplay, toLastSucessDisplay } from '../business'
import { openTaskPage } from '@/utils/jms'
export default {
name: 'HistoryExecutionDetail',
@@ -77,7 +78,7 @@ export default {
value: this.object.id,
formatter: function(row, value) {
const onClick = function() {
window.open(`/#/ops/task/task/${value}/log/?type=ansible`, '', 'width=900,height=600')
openTaskPage(value)
}
const title = this.$t('common.View')
return <a onClick={onClick} >{ title }</a>

3
src/views/ops/TaskDetail/TaskDetail.vue
View File

@@ -15,6 +15,7 @@ import DetailCard from '@/components/DetailCard'
import RunInfoCard from '../RunInfoCard/index'
import { toLastFailureDisplay, toLastSucessDisplay } from './business'
import { toSafeLocalDateStr } from '@/utils/common'
import { openTaskPage } from '@/utils/jms'
export default {
name: 'TaskDetail',
@@ -101,7 +102,7 @@ export default {
value: this.object.latest_execution.id,
formatter: function(row, value) {
const onClick = function() {
window.open(`/#/ops/task/task/${value}/log/?type=ansible`, '', 'width=900,height=600')
openTaskPage(value)
}
const title = this.$t('common.View')
return <a onClick={onClick} >{ title }</a>

3
src/views/ops/TaskList.vue
View File

@@ -5,6 +5,7 @@
<script type="text/jsx">
import { timeOffset, toSafeLocalDateStr } from '@/utils/common'
import { GenericListPage } from '@/layout/components'
import { openTaskPage } from '@/utils/jms'
export default {
components: {
@@ -82,7 +83,7 @@ export default {
this.$axios.get(
`/api/v1/ops/tasks/${row.id}/run/`
).then(res => {
window.open(`/#/ops/celery/task/${res.task}/log/`, '', 'width=900,height=600')
openTaskPage(res['task'])
})
}
}

3
src/views/xpack/Cloud/SyncInstanceTask/SyncInstanceTaskDetail/HistoryList.vue
View File

@@ -5,6 +5,7 @@
<script>
import GenericListTable from '@/layout/components/GenericListTable/index'
import { ActionsFormatter, DateFormatter } from '@/components/TableFormatters'
import { openTaskPage } from '@/utils/jms'
export default {
name: 'HistoryList',
@@ -68,7 +69,7 @@ export default {
title: this.$t('common.View'),
type: 'primary',
callback: function(val) {
window.open(`/#/ops/celery/task/${val.row.id}/log/`, '', 'width=900,height=600')
openTaskPage(val.row.id)
}
}
]

3
src/views/xpack/Cloud/SyncInstanceTask/SyncInstanceTaskDetail/detail.vue
View File

@@ -13,6 +13,7 @@
import DetailCard from '@/components/DetailCard'
import QuickActions from '@/components/QuickActions'
import { toSafeLocalDateStr } from '@/utils/common'
import { openTaskPage } from '@/utils/jms'
export default {
name: 'Detail',
@@ -40,7 +41,7 @@ export default {
this.$axios.get(
`/api/v1/xpack/cloud/sync-instance-tasks/${this.object.id}/run/`
).then(res => {
window.open(`/#/ops/celery/task/${res.task}/log/`, '', 'width=900,height=600')
openTaskPage(res['task'])
}
)
}.bind(this)

3
src/views/xpack/Cloud/SyncInstanceTask/SyncInstanceTaskList.vue
View File

@@ -5,6 +5,7 @@
<script>
import GenericListTable from '@/layout/components/GenericListTable'
import { DetailFormatter } from '@/components/TableFormatters'
import { openTaskPage } from '@/utils/jms'
export default {
components: {
@@ -40,7 +41,7 @@ export default {
type: 'info',
callback: function(data) {
this.$axios.get(`/api/v1/xpack/cloud/sync-instance-tasks/${data.row.id}/run/`).then(res => {
window.open(`/#/ops/celery/task/${res.task}/log/`, '', 'width=900,height=600')
openTaskPage(res['task'])
})
}
}