diff --git a/package.json b/package.json index c34b19709..2a6961ba7 100644 --- a/package.json +++ b/package.json @@ -20,6 +20,7 @@ "dependencies": { "axios": "0.18.1", "deepmerge": "^4.2.2", + "echarts": "^4.7.0", "element-ui": "2.13.0", "eslint-plugin-html": "^6.0.0", "jquery": "^3.5.0", @@ -44,6 +45,7 @@ "vue": "2.6.10", "vue-codemirror-lite": "^1.0.4", "vue-cookie": "^1.1.4", + "vue-echarts": "^5.0.0-beta.0", "vue-i18n": "^8.15.5", "vue-router": "3.0.6", "vue-select": "^3.9.5", diff --git a/src/components/Dialog/index.vue b/src/components/Dialog/index.vue index f93878e35..ed65d0cb9 100644 --- a/src/components/Dialog/index.vue +++ b/src/components/Dialog/index.vue @@ -7,8 +7,8 @@ @@ -21,6 +21,26 @@ export default { title: { type: String, default: 'Title' + }, + showCancel: { + type: Boolean, + default: true + }, + cancelTitle: { + type: String, + default() { + return this.$t('common.Cancel') + } + }, + showConfirm: { + type: Boolean, + default: true + }, + confirmTitle: { + type: String, + default() { + return this.$t('common.Confirm') + } } }, data() { diff --git a/src/components/IBox/index.vue b/src/components/IBox/index.vue index b339ac5c6..f1960a17f 100644 --- a/src/components/IBox/index.vue +++ b/src/components/IBox/index.vue @@ -1,8 +1,12 @@ diff --git a/src/components/ListTable/TableAction/ExportDialog.vue b/src/components/ListTable/TableAction/ExportDialog.vue index 527404204..a875d223d 100644 --- a/src/components/ListTable/TableAction/ExportDialog.vue +++ b/src/components/ListTable/TableAction/ExportDialog.vue @@ -1,5 +1,5 @@ @@ -32,23 +32,18 @@ export default { RunSuccessConfig: { icon: 'fa-info', title: this.$t('jobcenter.lastRunSuccessHosts'), - content: [ - { - hostname: 'linux', - result: 'api没有该数据,api没有该数据api没有该数据api没有该数据api没有该数据api没有该数据api没有该数据api没有该数据api没有该数据api没有该数据api没有该数据api没有该数据' - } - ] + content: { + hostname: 'linux', + result: 'api没有该数据,api没有该数据api没有该数据api没有该数据api没有该数据api没有该数据api没有该数据api没有该数据api没有该数据api没有该数据api没有该数据api没有该数据' + } }, RunFailedConfig: { icon: 'fa-info', title: this.$t('jobcenter.lastRunFailedHosts'), - headerColor: 'danger', - content: [ - { - hostname: 'window', - result: 'api没有该数据api没有该数据api没有该数据api没有该数据api没有该数据api没有该数据api没有该数据api没有该数据' - } - ] + content: { + hostname: 'window', + result: 'api没有该数据api没有该数据api没有该数据api没有该数据api没有该数据api没有该数据api没有该数据api没有该数据' + } } } }, diff --git a/src/views/jobcenter/TaskDetail/HistoryExecutionDetail/HistoryExecutionDetail.vue b/src/views/jobcenter/TaskDetail/HistoryExecutionDetail/HistoryExecutionDetail.vue index 9d5c4dd1b..47ef8e14d 100644 --- a/src/views/jobcenter/TaskDetail/HistoryExecutionDetail/HistoryExecutionDetail.vue +++ b/src/views/jobcenter/TaskDetail/HistoryExecutionDetail/HistoryExecutionDetail.vue @@ -5,7 +5,7 @@ - + @@ -32,23 +32,18 @@ export default { RunSuccessConfig: { icon: 'fa-info', title: this.$t('jobcenter.lastRunSuccessHosts'), - content: [ - { - hostname: 'linux', - result: 'api没有该数据==api没有该数据api没有该数据api没有该数据api没有该数据' - } - ] + content: { + hostname: 'linux', + result: 'api没有该数据==api没有该数据api没有该数据api没有该数据api没有该数据' + } }, RunFailedConfig: { icon: 'fa-info', title: this.$t('jobcenter.lastRunFailedHosts'), - headerColor: 'danger', - content: [ - { - hostname: 'window', - result: 'api没有该数据api没有该数据api没有该数据api没有该数据api没有该数据' - } - ] + content: { + hostname: 'linux', + result: 'api没有该数据==api没有该数据api没有该数据api没有该数据api没有该数据' + } } } }, diff --git a/src/views/jobcenter/TaskDetail/TaskDetail.vue b/src/views/jobcenter/TaskDetail/TaskDetail.vue index 3dd6f8f6a..81fc81251 100644 --- a/src/views/jobcenter/TaskDetail/TaskDetail.vue +++ b/src/views/jobcenter/TaskDetail/TaskDetail.vue @@ -32,23 +32,18 @@ export default { RunSuccessConfig: { icon: 'fa-info', title: this.$t('jobcenter.lastRunSuccessHosts'), - content: [ - { - hostname: 'linux', - result: 'api没有该数据==api没有该数据api没有该数据api没有该数据api没有该数据' - } - ] + content: { + hostname: 'linux', + result: 'api没有该数据==api没有该数据api没有该数据api没有该数据api没有该数据' + } }, RunFailedConfig: { icon: 'fa-info', title: this.$t('jobcenter.lastRunFailedHosts'), - headerColor: 'danger', - content: [ - { - hostname: 'window', - result: 'api没有该数据api没有该数据api没有该数据api没有该数据api没有该数据' - } - ] + content: { + hostname: 'window', + result: 'api没有该数据api没有该数据api没有该数据api没有该数据api没有该数据' + } }, taskData: {} } diff --git a/src/views/jobcenter/runinfocard/RunInfoCard.vue b/src/views/jobcenter/runinfocard/RunInfoCard.vue index 49f14bbc5..3f4ed9bb0 100644 --- a/src/views/jobcenter/runinfocard/RunInfoCard.vue +++ b/src/views/jobcenter/runinfocard/RunInfoCard.vue @@ -1,13 +1,11 @@ @@ -29,8 +27,8 @@ export default { default: '' }, content: { - type: Array, - default: () => [] + type: Object, + default: () => ({}) }, url: { type: String, @@ -45,5 +43,13 @@ export default { diff --git a/src/views/xpack/GatherUser.vue b/src/views/xpack/GatheredUser/GatheredUserList.vue similarity index 61% rename from src/views/xpack/GatherUser.vue rename to src/views/xpack/GatheredUser/GatheredUserList.vue index cc24229c5..77db4c940 100644 --- a/src/views/xpack/GatherUser.vue +++ b/src/views/xpack/GatheredUser/GatheredUserList.vue @@ -1,5 +1,5 @@ diff --git a/src/views/xpack/GatheredUser/TaskCreateUpdate.vue b/src/views/xpack/GatheredUser/TaskCreateUpdate.vue new file mode 100644 index 000000000..bc124141e --- /dev/null +++ b/src/views/xpack/GatheredUser/TaskCreateUpdate.vue @@ -0,0 +1,46 @@ + + + + + diff --git a/src/views/xpack/GatheredUser/TaskList.vue b/src/views/xpack/GatheredUser/TaskList.vue new file mode 100644 index 000000000..e0b8a33f8 --- /dev/null +++ b/src/views/xpack/GatheredUser/TaskList.vue @@ -0,0 +1,35 @@ + + + + + diff --git a/src/views/xpack/InterfaceSettings.vue b/src/views/xpack/InterfaceSettings.vue index eceedeaa8..34f08a655 100644 --- a/src/views/xpack/InterfaceSettings.vue +++ b/src/views/xpack/InterfaceSettings.vue @@ -1,11 +1,14 @@