diff --git a/src/i18n/langs/cn.json b/src/i18n/langs/cn.json index 272201818..cee9cad48 100644 --- a/src/i18n/langs/cn.json +++ b/src/i18n/langs/cn.json @@ -151,6 +151,7 @@ "DateLastWeek": "最近一周", "DateLastMonth": "最近一月", "DateLast3Months": "最近三月", + "TestSuccessMsg": "测试成功", "MFAConfirm": "MFA 认证", "Yes": "是", "No": "否", @@ -332,6 +333,7 @@ "Node": "节点", "SystemUser": "系统用户", "User": "用户", + "USER": "用户", "UserGroups": "用户组", "addAssetToThisPermission": "添加资产", "addDatabaseAppToThisPermission": "添加数据库应用", diff --git a/src/i18n/langs/en.json b/src/i18n/langs/en.json index d87e3c1e9..df40950e7 100644 --- a/src/i18n/langs/en.json +++ b/src/i18n/langs/en.json @@ -147,6 +147,7 @@ "CrontabHelpTips": "eg: Every Sunday 03:05 run <5 3 * * 0>
Tips:Using 5 digits linux crontab expressions (Online tools)
Note:If both Regularly perform and Cycle perform are set,give priority to Regularly perform", "BadRequestErrorMsg" : "Bad request, please check again", "DateLast24Hours": "Last 24 hours", + "TestSuccessMsg": "Test Success", "DateLastWeek": "Last week", "DateLastMonth": "Last month", "DateLast3Months": "Last 3 months", @@ -329,6 +330,7 @@ "Node": "Node", "SystemUser": "System user", "User": "User", + "USER": "User", "UserGroups": "UserGroups", "addAssetToThisPermission": "Add asset to this permission", "addDatabaseAppToThisPermission": "Add DatabaseApp to this permission", diff --git a/src/router/ops.js b/src/router/ops.js index faeb27e8a..e24d0b50e 100644 --- a/src/router/ops.js +++ b/src/router/ops.js @@ -34,13 +34,13 @@ export default [ component: () => import('@/views/ops/CommandExecution'), meta: { title: i18n.t('route.BatchCommand') } }, - { - path: 'celery/task/:id', - component: () => import('@/views/ops/CeleryTaskLog'), - name: 'CeleryTaskLog', - hidden: true, - meta: { title: i18n.t('route.CeleryTaskLog') } - }, + // { + // path: 'celery/task/:id', + // component: () => import('@/views/ops/CeleryTaskLog'), + // name: 'CeleryTaskLog', + // hidden: true, + // meta: { title: i18n.t('route.CeleryTaskLog') } + // }, { path: 'task/monitor', name: 'TaskMonitor', diff --git a/src/views/assets/Domain/DomainDetail/GatewayList.vue b/src/views/assets/Domain/DomainDetail/GatewayList.vue index b9a4dd035..2d2a45171 100644 --- a/src/views/assets/Domain/DomainDetail/GatewayList.vue +++ b/src/views/assets/Domain/DomainDetail/GatewayList.vue @@ -66,7 +66,14 @@ export default { name: 'TestConnection', title: this.$t('assets.TestConnection'), callback: function(val) { - console.log(val) + if (!val.row.port) { + return this.$message.error(this.$t('common.BadRequestErrorMsg')) + } + this.$axios.post(`/api/v1/assets/gateways/${val.cellValue}/test-connective/`, { port: val.row.port }).then( + res => { + return this.$message.success(this.$t('common.TestSuccessMsg')) + } + ) } } ] diff --git a/src/views/xpack/ChangeAuthPlan/ChangeAuthPlanDetail/ChangeAuthPlanExecution/ChangeAuthPlanExecutionDetail/ChangeAuthPlanExecutionTaskList.vue b/src/views/xpack/ChangeAuthPlan/ChangeAuthPlanDetail/ChangeAuthPlanExecution/ChangeAuthPlanExecutionDetail/ChangeAuthPlanExecutionTaskList.vue index 662299851..d39accde7 100644 --- a/src/views/xpack/ChangeAuthPlan/ChangeAuthPlanDetail/ChangeAuthPlanExecution/ChangeAuthPlanExecutionDetail/ChangeAuthPlanExecutionTaskList.vue +++ b/src/views/xpack/ChangeAuthPlan/ChangeAuthPlanDetail/ChangeAuthPlanExecution/ChangeAuthPlanExecutionDetail/ChangeAuthPlanExecutionTaskList.vue @@ -55,7 +55,7 @@ export default { this.$axios.put( `/api/v1/xpack/change-auth-plan/plan-execution-subtask/${cellValue}/`, ).then(res => { - window.open(`/core/ops/celery/task/${res.task}/log/`, '_blank', 'toolbar=yes, width=900, height=600') + window.open(`/#/ops/celery/task/${res.task}/log/`, '_blank', 'toolbar=yes, width=900, height=600') }) }.bind(this) } diff --git a/src/views/xpack/ChangeAuthPlan/ChangeAuthPlanDetail/ChangeAuthPlanExecution/ChangeAuthPlanExecutionList.vue b/src/views/xpack/ChangeAuthPlan/ChangeAuthPlanDetail/ChangeAuthPlanExecution/ChangeAuthPlanExecutionList.vue index 7b331e27b..4865abaf7 100644 --- a/src/views/xpack/ChangeAuthPlan/ChangeAuthPlanDetail/ChangeAuthPlanExecution/ChangeAuthPlanExecutionList.vue +++ b/src/views/xpack/ChangeAuthPlan/ChangeAuthPlanDetail/ChangeAuthPlanExecution/ChangeAuthPlanExecutionList.vue @@ -75,7 +75,7 @@ export default { type: 'primary', title: this.$t('xpack.ChangeAuthPlan.Log'), callback: function({ cellValue, tableData }) { - window.open(`/core/ops/celery/task/${cellValue}/log/`, '_blank', 'toolbar=yes, width=900, height=600') + window.open(`/#/ops/celery/task/${cellValue}/log/`, '_blank', 'toolbar=yes, width=900, height=600') } }, { diff --git a/src/views/xpack/ChangeAuthPlan/ChangeAuthPlanDetail/ChangeAuthPlanInfo.vue b/src/views/xpack/ChangeAuthPlan/ChangeAuthPlanDetail/ChangeAuthPlanInfo.vue index 395c5f8f3..7afd60ee1 100644 --- a/src/views/xpack/ChangeAuthPlan/ChangeAuthPlanDetail/ChangeAuthPlanInfo.vue +++ b/src/views/xpack/ChangeAuthPlan/ChangeAuthPlanDetail/ChangeAuthPlanInfo.vue @@ -40,7 +40,7 @@ export default { `/api/v1/xpack/change-auth-plan/plan-execution/`, { plan: this.object.id } ).then(res => { - window.open(`/core/ops/celery/task/${res.task}/log/`, '_blank', 'toolbar=yes, width=900, height=600') + window.open(`/#/ops/celery/task/${res.task}/log/`, '_blank', 'toolbar=yes, width=900, height=600') }) }.bind(this) } diff --git a/src/views/xpack/ChangeAuthPlan/ChangeAuthPlanList.vue b/src/views/xpack/ChangeAuthPlan/ChangeAuthPlanList.vue index b62c89f39..36fb1eae0 100644 --- a/src/views/xpack/ChangeAuthPlan/ChangeAuthPlanList.vue +++ b/src/views/xpack/ChangeAuthPlan/ChangeAuthPlanList.vue @@ -56,7 +56,7 @@ export default { `/api/v1/xpack/change-auth-plan/plan-execution/`, { plan: data.cellValue } ).then(res => { - window.open(`/core/ops/celery/task/${res.task}/log/`, '_blank', 'toolbar=yes, width=900, height=600') + window.open(`/#/ops/celery/task/${res.task}/log/`, '_blank', 'toolbar=yes, width=900, height=600') }) }.bind(this) } diff --git a/src/views/xpack/Vault/VaultList.vue b/src/views/xpack/Vault/VaultList.vue index 339d9a7fa..b79199a9a 100644 --- a/src/views/xpack/Vault/VaultList.vue +++ b/src/views/xpack/Vault/VaultList.vue @@ -1,6 +1,28 @@