From 3975e782e7ced174503cd3572cb64aba90264468 Mon Sep 17 00:00:00 2001 From: ZhengJie <201507802@qq.com> Date: Tue, 5 May 2020 21:20:36 +0800 Subject: [PATCH] =?UTF-8?q?[=E6=96=B0=E5=A2=9E=E5=8A=9F=E8=83=BD](el-admin?= =?UTF-8?q?=20v2.5):=20v2.5=20beta?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 详情 https://www.ydyno.com/archives/1225.html --- package.json | 11 +- src/api/monitor/server.js | 27 -- src/api/monitor/visits.js | 22 - src/api/system/code.js | 5 +- src/api/system/job.js | 3 +- src/assets/icons/svg/money.svg | 1 + src/assets/icons/svg/shopping.svg | 1 + src/assets/icons/svg/system1.svg | 1 + src/assets/styles/eladmin.scss | 2 +- src/components/Crud/crud.js | 3 - src/components/Github/index.vue | 16 - src/components/GithubCorner/index.vue | 54 +++ src/layout/components/Navbar.vue | 8 +- src/main.js | 1 + src/views/dashboard/LineChart.vue | 72 ++-- src/views/dashboard/PanelGroup.vue | 113 +++-- src/views/dashboard/mixins/resize.js | 55 +++ src/views/home.vue | 60 ++- src/views/monitor/online/index.vue | 4 +- src/views/monitor/server/index.vue | 421 +++++++++++-------- src/views/system/dict/dictDetail.vue | 12 +- src/views/system/dict/index.vue | 8 +- src/views/system/job/index.vue | 15 +- src/views/system/job/module/form.vue | 53 +-- src/views/system/menu/index.vue | 22 +- src/views/system/role/index.vue | 23 +- src/views/system/timing/index.vue | 72 +++- src/views/system/user/center.vue | 8 +- src/views/system/user/center/updateEmail.vue | 4 +- src/views/system/user/index.vue | 66 ++- vue.config.js | 6 +- 31 files changed, 687 insertions(+), 482 deletions(-) delete mode 100644 src/api/monitor/server.js delete mode 100644 src/api/monitor/visits.js create mode 100644 src/assets/icons/svg/money.svg create mode 100644 src/assets/icons/svg/shopping.svg create mode 100644 src/assets/icons/svg/system1.svg delete mode 100644 src/components/Github/index.vue create mode 100644 src/components/GithubCorner/index.vue create mode 100644 src/views/dashboard/mixins/resize.js diff --git a/package.json b/package.json index b80f53c..122b0a5 100644 --- a/package.json +++ b/package.json @@ -38,12 +38,13 @@ "clipboard": "2.0.4", "codemirror": "^5.49.2", "connect": "3.6.6", - "echarts": "4.2.1", + "echarts": "^4.2.1", "echarts-gl": "^1.1.1", "echarts-wordcloud": "^1.1.3", "element-ui": "^2.12.0", "file-saver": "1.3.8", "fuse.js": "3.4.4", + "js-beautify": "^1.10.2", "js-cookie": "2.2.0", "jsencrypt": "^3.0.0-rc.1", "jszip": "3.1.5", @@ -53,18 +54,18 @@ "path-to-regexp": "2.4.0", "qs": "^6.9.1", "screenfull": "4.2.0", + "sortablejs": "1.8.4", "vue": "2.6.10", "vue-count-to": "1.0.13", "vue-cropper": "0.4.9", + "vue-echarts": "^5.0.0-beta.0", "vue-highlightjs": "^1.3.3", "vue-router": "3.0.2", "vue-splitpane": "1.0.4", + "vuedraggable": "2.20.0", "vuex": "3.1.0", "wangeditor": ">=3.0.0", - "xlsx": "^0.11.16", - "js-beautify": "^1.10.2", - "sortablejs": "1.8.4", - "vuedraggable": "2.20.0" + "xlsx": "^0.11.16" }, "devDependencies": { "@babel/core": "7.0.0", diff --git a/src/api/monitor/server.js b/src/api/monitor/server.js deleted file mode 100644 index 2ade356..0000000 --- a/src/api/monitor/server.js +++ /dev/null @@ -1,27 +0,0 @@ -import request from '@/utils/request' - -export function add(data) { - return request({ - url: 'api/server', - method: 'post', - data - }) -} - -export function del(ids) { - return request({ - url: 'api/server', - method: 'delete', - data: ids - }) -} - -export function edit(data) { - return request({ - url: 'api/server', - method: 'put', - data - }) -} - -export default { add, edit, del } diff --git a/src/api/monitor/visits.js b/src/api/monitor/visits.js deleted file mode 100644 index 147ae7c..0000000 --- a/src/api/monitor/visits.js +++ /dev/null @@ -1,22 +0,0 @@ -import request from '@/utils/request' - -export function count() { - return request({ - url: 'api/visits', - method: 'post' - }) -} - -export function get() { - return request({ - url: 'api/visits', - method: 'get' - }) -} - -export function getChartData() { - return request({ - url: 'api/visits/chartData', - method: 'get' - }) -} diff --git a/src/api/system/code.js b/src/api/system/code.js index b410f48..0d2e4c2 100644 --- a/src/api/system/code.js +++ b/src/api/system/code.js @@ -2,9 +2,8 @@ import request from '@/utils/request' export function resetEmail(data) { return request({ - url: 'api/code/resetEmail', - method: 'post', - data + url: 'api/code/resetEmail?email=' + data, + method: 'post' }) } diff --git a/src/api/system/job.js b/src/api/system/job.js index 2888c05..1029ce9 100644 --- a/src/api/system/job.js +++ b/src/api/system/job.js @@ -1,8 +1,7 @@ import request from '@/utils/request' -export function getAllJob(deptId) { +export function getAllJob() { const params = { - deptId, page: 0, size: 9999 } diff --git a/src/assets/icons/svg/money.svg b/src/assets/icons/svg/money.svg new file mode 100644 index 0000000..c1580de --- /dev/null +++ b/src/assets/icons/svg/money.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/icons/svg/shopping.svg b/src/assets/icons/svg/shopping.svg new file mode 100644 index 0000000..87513e7 --- /dev/null +++ b/src/assets/icons/svg/shopping.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/icons/svg/system1.svg b/src/assets/icons/svg/system1.svg new file mode 100644 index 0000000..37b0a0a --- /dev/null +++ b/src/assets/icons/svg/system1.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/styles/eladmin.scss b/src/assets/styles/eladmin.scss index c89c992..9bc5d22 100644 --- a/src/assets/styles/eladmin.scss +++ b/src/assets/styles/eladmin.scss @@ -20,7 +20,7 @@ vertical-align: middle; margin-bottom: 10px; height: 30.5px !important; - width: 223px !important; + width: 230px !important; } } .el-avatar { diff --git a/src/components/Crud/crud.js b/src/components/Crud/crud.js index bb04f2f..03a035c 100644 --- a/src/components/Crud/crud.js +++ b/src/components/Crud/crud.js @@ -490,9 +490,6 @@ function CRUD(options) { Vue.set(crud.props, name, value) }, getDataId(data) { - if (!data.hasOwnProperty(this.idField)) { - console.error('[CRUD error]: no property [%s] in %o', this.idField, data) - } return data[this.idField] }, attchTable() { diff --git a/src/components/Github/index.vue b/src/components/Github/index.vue deleted file mode 100644 index eef2905..0000000 --- a/src/components/Github/index.vue +++ /dev/null @@ -1,16 +0,0 @@ - - - diff --git a/src/components/GithubCorner/index.vue b/src/components/GithubCorner/index.vue new file mode 100644 index 0000000..fd77324 --- /dev/null +++ b/src/components/GithubCorner/index.vue @@ -0,0 +1,54 @@ + + + diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue index ebd3c5c..f3cd392 100644 --- a/src/layout/components/Navbar.vue +++ b/src/layout/components/Navbar.vue @@ -8,10 +8,6 @@ - + - diff --git a/src/views/system/dict/dictDetail.vue b/src/views/system/dict/dictDetail.vue index b840832..1025a63 100644 --- a/src/views/system/dict/dictDetail.vue +++ b/src/views/system/dict/dictDetail.vue @@ -21,8 +21,8 @@ - - + +
@@ -37,7 +37,7 @@ - +