Merge branch 'v4' of github.com:jumpserver/lina into v4

This commit is contained in:
ibuler
2024-03-04 19:08:53 +08:00
3 changed files with 5 additions and 3 deletions

View File

@@ -181,7 +181,7 @@ export default {
name: 'Execution', name: 'Execution',
component: () => import('@/views/ops/Execution'), component: () => import('@/views/ops/Execution'),
meta: { meta: {
title: i18n.t('Executions'), title: i18n.t('ExecutionHistory'),
permissions: ['ops.view_jobexecution'] permissions: ['ops.view_jobexecution']
} }
}, },

View File

@@ -159,7 +159,9 @@ export default {
}, },
helpText: i18n.t('CrontabOfCreateUpdatePage') helpText: i18n.t('CrontabOfCreateUpdatePage')
} }
} },
createSuccessNextRoute: { name: 'JobManagement' },
updateSuccessNextRoute: { name: 'JobManagement' }
} }
}, },
mounted() { mounted() {

View File

@@ -27,7 +27,7 @@ export default {
min: ['name', 'actions'], min: ['name', 'actions'],
default: [ default: [
'name', 'type', 'asset_amount', 'average_time_cost', 'name', 'type', 'asset_amount', 'average_time_cost',
'summary', 'comment', 'date_last_run', 'actions' 'summary', 'date_last_run', 'actions'
] ]
}, },
columns: [ columns: [