-
卡片内容
+
+
+
+
+ {{ body.comment }}
+
@@ -14,12 +23,55 @@
export default {
name: 'SummaryCard',
props: {
+ title: {
+ type: String,
+ default: ''
+ },
+ rightSideLabel: {
+ type: Object,
+ default: () => ({})
+ },
+ body: {
+ type: Object,
+ default: () => ({})
+ }
}
}
-
diff --git a/src/components/UploadField/index.vue b/src/components/UploadField/index.vue
index f87f907ec..d18184e77 100644
--- a/src/components/UploadField/index.vue
+++ b/src/components/UploadField/index.vue
@@ -1,12 +1,11 @@
-
- 点击上传
- 只能上传jpg/png文件,且不超过500kb
-
+
+
+
{{ tip }}
+
+
![]()
+
+
+
+
diff --git a/src/views/dashboard/DatesLoginSummary/LoginMetric.vue b/src/views/dashboard/DatesLoginSummary/LoginMetric.vue
new file mode 100644
index 000000000..934ec0b27
--- /dev/null
+++ b/src/views/dashboard/DatesLoginSummary/LoginMetric.vue
@@ -0,0 +1,167 @@
+
+
+
+
+
+
+
diff --git a/src/views/dashboard/DatesLoginSummary/LoginTop.vue b/src/views/dashboard/DatesLoginSummary/LoginTop.vue
new file mode 100644
index 000000000..fbfdc7fb5
--- /dev/null
+++ b/src/views/dashboard/DatesLoginSummary/LoginTop.vue
@@ -0,0 +1,101 @@
+
+
+
过去一周, 共有 2 位用户登录 31 次资产.
+
+ -
+
+ {{ item.count }} 次/周
+
+ {{ index + 1 }}
+ {{ item.username }}
+
+
+
+
+
+
+
+
diff --git a/src/views/dashboard/DatesLoginSummary/index.vue b/src/views/dashboard/DatesLoginSummary/index.vue
new file mode 100644
index 000000000..60875e6a0
--- /dev/null
+++ b/src/views/dashboard/DatesLoginSummary/index.vue
@@ -0,0 +1,72 @@
+
+
+
+
+
+
+
diff --git a/src/views/dashboard/ResourceSummary.vue b/src/views/dashboard/ResourceSummary.vue
new file mode 100644
index 000000000..e6267956d
--- /dev/null
+++ b/src/views/dashboard/ResourceSummary.vue
@@ -0,0 +1,80 @@
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue
index dddcdd4ae..6e43cf567 100644
--- a/src/views/dashboard/index.vue
+++ b/src/views/dashboard/index.vue
@@ -1,42 +1,27 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
diff --git a/src/views/jobcenter/TaskDetail/AdhocDetail/AdhocDetail.vue b/src/views/jobcenter/TaskDetail/AdhocDetail/AdhocDetail.vue
index bb6e745d0..1cd86f045 100644
--- a/src/views/jobcenter/TaskDetail/AdhocDetail/AdhocDetail.vue
+++ b/src/views/jobcenter/TaskDetail/AdhocDetail/AdhocDetail.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没有该数据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 @@
-
-
-
-
- {{ scope.row.result }}
-
-
-
+
+
+ {{ content.hostname }} |
+ {{ content.result }} |
+
+
@@ -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 @@
-
-
+
+
@@ -13,9 +16,9 @@
diff --git a/src/views/xpack/api.js b/src/views/xpack/api.js
new file mode 100644
index 000000000..25d386ca6
--- /dev/null
+++ b/src/views/xpack/api.js
@@ -0,0 +1,25 @@
+import request from '@/utils/request'
+
+export function postInterface(formData) {
+ return request({
+ url: '/api/v1/xpack/interface/setting',
+ method: 'put',
+ headers: {
+ 'Content-Type': 'multipart/form-data'
+ },
+ data: formData
+ })
+}
+export function getInterfaceInfo() {
+ return request({
+ url: '/api/v1/xpack/interface/setting',
+ method: 'get'
+ })
+}
+
+export function restoreInterface() {
+ return request({
+ url: '/xpack/interface/restore/default',
+ method: 'get'
+ })
+}
diff --git a/src/views/xpack/router.js b/src/views/xpack/router.js
index 70a305604..aa7d43865 100644
--- a/src/views/xpack/router.js
+++ b/src/views/xpack/router.js
@@ -1,4 +1,5 @@
import Layout from '@/layout/index'
+import i18n from '@/i18n/i18n'
export default {
path: '/xpack',
@@ -11,7 +12,7 @@ export default {
path: 'interface-setting',
component: () => import('@/views/xpack/InterfaceSettings.vue'),
name: 'InterfaceSetting',
- meta: { title: 'InterfaceSetting' }
+ meta: { title: i18n.t('xpack.InterfaceSettings') }
},
{
path: 'license',
@@ -21,9 +22,30 @@ export default {
},
{
path: 'gathered-users',
- component: () => import('@/views/xpack/GatherUser'),
- name: 'GatherUser',
- meta: { title: 'GatherUser' }
+ component: () => import('@/views/xpack/GatheredUser/GatheredUserList'),
+ name: 'GatherUserList',
+ meta: { title: 'GatherUserList' }
+ },
+ {
+ path: 'gathered-users/tasks',
+ component: () => import('@/views/xpack/GatheredUser/TaskList'),
+ name: 'GatherUserTaskList',
+ meta: { title: 'GatherUserTask' },
+ hidden: true
+ },
+ {
+ path: 'gathered-users/tasks/create',
+ component: () => import('@/views/xpack/GatheredUser/TaskCreateUpdate'),
+ name: 'GatherUserTaskCreate',
+ meta: { title: 'GatherUserTaskCreate', action: 'create' },
+ hidden: true
+ },
+ {
+ path: 'gathered-users/tasks/update',
+ component: () => import('@/views/xpack/GatheredUser/TaskCreateUpdate'),
+ name: 'GatherUserTaskUpdate',
+ meta: { title: 'GatherUserTaskUpdate', action: 'update' },
+ hidden: true
}
]
}
diff --git a/yarn.lock b/yarn.lock
index 713bdbd3c..6bbce58d4 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2689,6 +2689,11 @@ core-js@^2.4.0, core-js@^2.5.0, core-js@^2.5.7, core-js@^2.6.5:
version "2.6.11"
resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.6.11.tgz#38831469f9922bded8ee21c9dc46985e0399308c"
+core-js@^3.4.4:
+ version "3.6.5"
+ resolved "https://registry.npm.taobao.org/core-js/download/core-js-3.6.5.tgz#7395dc273af37fb2e50e9bd3d9fe841285231d1a"
+ integrity sha1-c5XcJzrzf7LlDpvT2f6EEoUjHRo=
+
core-util-is@1.0.2, core-util-is@~1.0.0:
version "1.0.2"
resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7"
@@ -3331,6 +3336,13 @@ ecc-jsbn@~0.1.1:
jsbn "~0.1.0"
safer-buffer "^2.1.0"
+echarts@^4.7.0:
+ version "4.7.0"
+ resolved "https://registry.npm.taobao.org/echarts/download/echarts-4.7.0.tgz?cache=0&sync_timestamp=1584522755461&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fecharts%2Fdownload%2Fecharts-4.7.0.tgz#5b3875a4c2f91e3929425fabab9eace7e4098b3f"
+ integrity sha1-Wzh1pML5HjkpQl+rq56s5+QJiz8=
+ dependencies:
+ zrender "4.3.0"
+
editorconfig@^0.15.3:
version "0.15.3"
resolved "https://registry.yarnpkg.com/editorconfig/-/editorconfig-0.15.3.tgz#bef84c4e75fb8dcb0ce5cee8efd51c15999befc5"
@@ -8187,6 +8199,11 @@ reselect@^3.0.1:
version "3.0.1"
resolved "https://registry.yarnpkg.com/reselect/-/reselect-3.0.1.tgz#efdaa98ea7451324d092b2b2163a6a1d7a9a2147"
+resize-detector@^0.1.10:
+ version "0.1.10"
+ resolved "https://registry.npm.taobao.org/resize-detector/download/resize-detector-0.1.10.tgz#1da3f961aa5f914ccbcfd3752d52fd45beeb692c"
+ integrity sha1-HaP5YapfkUzLz9N1LVL9Rb7raSw=
+
resize-observer-polyfill@^1.5.0:
version "1.5.1"
resolved "https://registry.yarnpkg.com/resize-observer-polyfill/-/resize-observer-polyfill-1.5.1.tgz#0e9020dd3d21024458d4ebd27e23e40269810464"
@@ -9573,6 +9590,15 @@ vue-cookie@^1.1.4:
dependencies:
tiny-cookie "^1.0"
+vue-echarts@^5.0.0-beta.0:
+ version "5.0.0-beta.0"
+ resolved "https://registry.npm.taobao.org/vue-echarts/download/vue-echarts-5.0.0-beta.0.tgz#438dd4b0fc5ccea281709c1f7c6321b05352bdf4"
+ integrity sha1-Q43UsPxczqKBcJwffGMhsFNSvfQ=
+ dependencies:
+ core-js "^3.4.4"
+ lodash "^4.17.15"
+ resize-detector "^0.1.10"
+
vue-eslint-parser@^2.0.3:
version "2.0.3"
resolved "https://registry.yarnpkg.com/vue-eslint-parser/-/vue-eslint-parser-2.0.3.tgz#c268c96c6d94cfe3d938a5f7593959b0ca3360d1"
@@ -10152,6 +10178,11 @@ yorkie@^2.0.0:
normalize-path "^1.0.0"
strip-indent "^2.0.0"
+zrender@4.3.0:
+ version "4.3.0"
+ resolved "https://registry.npm.taobao.org/zrender/download/zrender-4.3.0.tgz#9f056121b20bbae44414d287bf6a119ff7042661"
+ integrity sha1-nwVhIbILuuREFNKHv2oRn/cEJmE=
+
ztree@^3.5.24:
version "3.5.24"
resolved "https://registry.yarnpkg.com/ztree/-/ztree-3.5.24.tgz#b63fe52981fdf2c329675cfd2772f0d147521ff1"