diff --git a/package.json b/package.json
index 4feda43..4c6f09f 100644
--- a/package.json
+++ b/package.json
@@ -22,7 +22,7 @@
"clipboard": "1.7.1",
"codemirror": "^5.38.0",
"connect": "3.6.6",
- "echarts": "4.1.0",
+ "echarts": "^4.1.0",
"element-ui": "^2.12.0",
"file-saver": "1.3.8",
"js-cookie": "2.2.0",
diff --git a/src/api/dept.js b/src/api/dept.js
index 2ca7b29..1c3624e 100644
--- a/src/api/dept.js
+++ b/src/api/dept.js
@@ -30,3 +30,12 @@ export function edit(data) {
data
})
}
+
+export function downloadDept(params) {
+ return request({
+ url: 'api/dept/download',
+ method: 'get',
+ params,
+ responseType: 'blob'
+ })
+}
diff --git a/src/api/dict.js b/src/api/dict.js
index 7d37a9c..e318b3b 100644
--- a/src/api/dict.js
+++ b/src/api/dict.js
@@ -22,3 +22,12 @@ export function edit(data) {
data
})
}
+
+export function downloadDict(params) {
+ return request({
+ url: 'api/dict/download',
+ method: 'get',
+ params,
+ responseType: 'blob'
+ })
+}
diff --git a/src/api/job.js b/src/api/job.js
index b887eae..49ba283 100644
--- a/src/api/job.js
+++ b/src/api/job.js
@@ -35,3 +35,12 @@ export function edit(data) {
data
})
}
+
+export function downloadJob(params) {
+ return request({
+ url: 'api/job/download',
+ method: 'get',
+ params,
+ responseType: 'blob'
+ })
+}
diff --git a/src/api/localStorage.js b/src/api/localStorage.js
index b2e1bdb..2e68c14 100644
--- a/src/api/localStorage.js
+++ b/src/api/localStorage.js
@@ -30,3 +30,12 @@ export function edit(data) {
data
})
}
+
+export function downloadStorage(params) {
+ return request({
+ url: 'api/localStorage/download',
+ method: 'get',
+ params,
+ responseType: 'blob'
+ })
+}
diff --git a/src/api/log.js b/src/api/log.js
index d776e7a..446c030 100644
--- a/src/api/log.js
+++ b/src/api/log.js
@@ -6,3 +6,12 @@ export function getErrDetail(id) {
method: 'get'
})
}
+
+export function downloadLog(params) {
+ return request({
+ url: 'api/logs/download',
+ method: 'get',
+ params,
+ responseType: 'blob'
+ })
+}
diff --git a/src/api/menu.js b/src/api/menu.js
index 52a3737..10e8bd1 100644
--- a/src/api/menu.js
+++ b/src/api/menu.js
@@ -37,3 +37,12 @@ export function edit(data) {
data
})
}
+
+export function downloadMenu(params) {
+ return request({
+ url: 'api/menus/download',
+ method: 'get',
+ params,
+ responseType: 'blob'
+ })
+}
diff --git a/src/api/online.js b/src/api/online.js
index fc9a90c..cdfe120 100644
--- a/src/api/online.js
+++ b/src/api/online.js
@@ -6,3 +6,12 @@ export function del(key) {
method: 'delete'
})
}
+
+export function downloadOnline(params) {
+ return request({
+ url: 'auth/online/download',
+ method: 'get',
+ params,
+ responseType: 'blob'
+ })
+}
diff --git a/src/api/picture.js b/src/api/picture.js
index e3ddd86..df9d720 100644
--- a/src/api/picture.js
+++ b/src/api/picture.js
@@ -14,3 +14,12 @@ export function delAll(ids) {
data: ids
})
}
+
+export function downloadPicture(params) {
+ return request({
+ url: 'api/pictures/download',
+ method: 'get',
+ params,
+ responseType: 'blob'
+ })
+}
diff --git a/src/api/qiniu.js b/src/api/qiniu.js
index 0e5850d..ce75cba 100644
--- a/src/api/qiniu.js
+++ b/src/api/qiniu.js
@@ -43,3 +43,12 @@ export function delAll(ids) {
data: ids
})
}
+
+export function downloadQiNiu(params) {
+ return request({
+ url: 'api/qiNiuContent/download/list',
+ method: 'get',
+ params,
+ responseType: 'blob'
+ })
+}
diff --git a/src/api/redis.js b/src/api/redis.js
index b16adc4..fdd3cbc 100644
--- a/src/api/redis.js
+++ b/src/api/redis.js
@@ -33,3 +33,12 @@ export function edit(data) {
data
})
}
+
+export function downloadRedis(params) {
+ return request({
+ url: 'api/redis/download',
+ method: 'get',
+ params,
+ responseType: 'blob'
+ })
+}
diff --git a/src/api/role.js b/src/api/role.js
index baf5124..e8792d4 100644
--- a/src/api/role.js
+++ b/src/api/role.js
@@ -60,3 +60,12 @@ export function editMenu(data) {
data
})
}
+
+export function downloadRole(params) {
+ return request({
+ url: 'api/roles/download',
+ method: 'get',
+ params,
+ responseType: 'blob'
+ })
+}
diff --git a/src/api/timing.js b/src/api/timing.js
index cdbfddc..fb95575 100644
--- a/src/api/timing.js
+++ b/src/api/timing.js
@@ -36,3 +36,21 @@ export function execution(id) {
method: 'put'
})
}
+
+export function downloadJobs(params) {
+ return request({
+ url: 'api/jobs/download',
+ method: 'get',
+ params,
+ responseType: 'blob'
+ })
+}
+
+export function downloadLogs(params) {
+ return request({
+ url: 'api/jobs/download/log',
+ method: 'get',
+ params,
+ responseType: 'blob'
+ })
+}
diff --git a/src/api/user.js b/src/api/user.js
index 7f5916f..334635f 100644
--- a/src/api/user.js
+++ b/src/api/user.js
@@ -7,10 +7,12 @@ export function add(data) {
data
})
}
-export function downloadUser() {
+
+export function downloadUser(params) {
return request({
url: 'api/users/download',
method: 'get',
+ params,
responseType: 'blob'
})
}
diff --git a/src/mixins/initData.js b/src/mixins/initData.js
index e49df52..2162dc1 100644
--- a/src/mixins/initData.js
+++ b/src/mixins/initData.js
@@ -3,7 +3,7 @@ import { initData } from '@/api/data'
export default {
data() {
return {
- loading: true, data: [], page: 0, size: 10, total: 0, url: '', params: {}, query: {}, time: 50, isAdd: false
+ loading: true, data: [], page: 0, size: 10, total: 0, url: '', params: {}, query: {}, time: 50, isAdd: false, downloadLoading: false
}
},
methods: {
diff --git a/src/views/monitor/log/errorLog.vue b/src/views/monitor/log/errorLog.vue
index 7189d7c..1aefbfd 100644
--- a/src/views/monitor/log/errorLog.vue
+++ b/src/views/monitor/log/errorLog.vue
@@ -32,9 +32,9 @@
-
+
{{ errorInfo }}
-
+
diff --git a/src/views/monitor/online/index.vue b/src/views/monitor/online/index.vue
index 0a93b93..ba65688 100644
--- a/src/views/monitor/online/index.vue
+++ b/src/views/monitor/online/index.vue
@@ -3,6 +3,16 @@
@@ -46,8 +56,8 @@