From 94585f26f0b4562cceb3a3041b661d8e51859bb1 Mon Sep 17 00:00:00 2001 From: zhengjie Date: Thu, 11 Apr 2019 11:15:30 +0800 Subject: [PATCH] =?UTF-8?q?1.7=E7=89=88=E6=9C=AC=E5=8F=91=E5=B8=83?= =?UTF-8?q?=EF=BC=8C=E8=AF=A6=E6=83=85=E6=9F=A5=E7=9C=8B=E7=89=88=E6=9C=AC?= =?UTF-8?q?=E8=AF=B4=E6=98=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config/prod.env.js | 2 +- index.html | 1 - package.json | 2 +- src/api/dept.js | 32 ++++ src/api/dict.js | 24 +++ src/api/dictDetail.js | 37 ++++ src/api/job.js | 37 ++++ src/api/role.js | 4 +- src/components/YamlEdit/index.vue | 3 + src/components/iframe/index.vue | 30 +++ src/components/placard/index.vue | 83 ++++++++ src/config/index.js | 26 +++ src/icons/svg/Steve-Jobs.svg | 1 + src/icons/svg/anq.svg | 1 + src/icons/svg/date.svg | 1 + src/icons/svg/dept.svg | 1 + src/icons/svg/dictionary.svg | 1 + src/icons/svg/email.svg | 2 +- src/icons/svg/gonggao.svg | 1 + src/icons/svg/phone.svg | 1 + src/icons/svg/swagger.svg | 1 + src/icons/svg/sys-tools.svg | 1 + src/icons/svg/user1.svg | 1 + src/mixins/initDict.js | 21 +++ src/permission.js | 3 +- src/store/getters.js | 9 +- src/store/modules/api.js | 6 +- src/store/modules/user.js | 24 +-- src/styles/index.scss | 2 +- src/utils/auth.js | 5 +- src/utils/md5.js | 178 ------------------ src/utils/permission.js | 1 - src/utils/request.js | 3 +- src/views/components/MarkDown.vue | 4 + src/views/components/YamlEdit.vue | 6 + src/views/generator/index.vue | 2 +- src/views/generator/module/generator.vue | 2 +- src/views/layout/components/Navbar.vue | 11 +- src/views/login/index.vue | 24 ++- src/views/monitor/log/errorLog.vue | 2 +- src/views/monitor/log/index.vue | 2 +- src/views/monitor/log/msg.vue | 15 +- src/views/monitor/redis/index.vue | 10 +- src/views/monitor/sql/index.vue | 15 ++ src/views/system/dept/index.vue | 106 +++++++++++ src/views/system/dept/module/edit.vue | 43 +++++ src/views/system/dept/module/form.vue | 126 +++++++++++++ src/views/system/dept/module/header.vue | 54 ++++++ src/views/system/dict/index.vue | 139 ++++++++++++++ src/views/system/dict/module/edit.vue | 40 ++++ src/views/system/dict/module/form.vue | 105 +++++++++++ src/views/system/dict/module/header.vue | 46 +++++ src/views/system/dictDetail/index.vue | 99 ++++++++++ src/views/system/dictDetail/module/edit.vue | 45 +++++ src/views/system/dictDetail/module/form.vue | 115 +++++++++++ src/views/system/dictDetail/module/header.vue | 38 ++++ src/views/system/job/index.vue | 117 ++++++++++++ src/views/system/job/module/edit.vue | 45 +++++ src/views/system/job/module/form.vue | 146 ++++++++++++++ src/views/system/job/module/header.vue | 54 ++++++ src/views/system/menu/index.vue | 19 +- src/views/system/menu/module/edit.vue | 7 +- src/views/system/menu/module/form.vue | 18 +- src/views/system/menu/module/header.vue | 12 +- src/views/system/permission/index.vue | 18 +- src/views/system/permission/module/edit.vue | 7 +- src/views/system/permission/module/form.vue | 18 +- src/views/system/permission/module/header.vue | 12 +- src/views/system/role/index.vue | 69 ++++--- src/views/system/role/module/edit.vue | 9 +- src/views/system/role/module/form.vue | 72 +++++-- src/views/system/timing/index.vue | 2 +- src/views/system/timing/module/log.vue | 2 +- src/views/system/user/center.vue | 139 +++++++++----- src/views/system/user/center/log.vue | 54 ++++++ src/views/system/user/center/updateEmail.vue | 8 +- src/views/system/user/center/updatePass.vue | 6 +- src/views/system/user/index.vue | 146 ++++++++------ src/views/system/user/module/edit.vue | 13 +- src/views/system/user/module/form.vue | 161 ++++++++++++---- src/views/system/user/module/header.vue | 19 +- src/views/tools/picture/index.vue | 6 +- src/views/tools/qiniu/module/description.vue | 9 +- src/views/tools/qiniu/module/list.vue | 25 ++- src/views/tools/qiniu/module/module/form.vue | 2 +- src/views/tools/swagger/index.vue | 15 ++ 86 files changed, 2287 insertions(+), 537 deletions(-) create mode 100644 src/api/dept.js create mode 100644 src/api/dict.js create mode 100644 src/api/dictDetail.js create mode 100644 src/api/job.js create mode 100644 src/components/iframe/index.vue create mode 100644 src/components/placard/index.vue create mode 100644 src/config/index.js create mode 100644 src/icons/svg/Steve-Jobs.svg create mode 100644 src/icons/svg/anq.svg create mode 100644 src/icons/svg/date.svg create mode 100644 src/icons/svg/dept.svg create mode 100644 src/icons/svg/dictionary.svg create mode 100644 src/icons/svg/gonggao.svg create mode 100644 src/icons/svg/phone.svg create mode 100644 src/icons/svg/swagger.svg create mode 100644 src/icons/svg/sys-tools.svg create mode 100644 src/icons/svg/user1.svg create mode 100644 src/mixins/initDict.js delete mode 100644 src/utils/md5.js create mode 100644 src/views/monitor/sql/index.vue create mode 100644 src/views/system/dept/index.vue create mode 100644 src/views/system/dept/module/edit.vue create mode 100644 src/views/system/dept/module/form.vue create mode 100644 src/views/system/dept/module/header.vue create mode 100644 src/views/system/dict/index.vue create mode 100644 src/views/system/dict/module/edit.vue create mode 100644 src/views/system/dict/module/form.vue create mode 100644 src/views/system/dict/module/header.vue create mode 100644 src/views/system/dictDetail/index.vue create mode 100644 src/views/system/dictDetail/module/edit.vue create mode 100644 src/views/system/dictDetail/module/form.vue create mode 100644 src/views/system/dictDetail/module/header.vue create mode 100644 src/views/system/job/index.vue create mode 100644 src/views/system/job/module/edit.vue create mode 100644 src/views/system/job/module/form.vue create mode 100644 src/views/system/job/module/header.vue create mode 100644 src/views/system/user/center/log.vue create mode 100644 src/views/tools/swagger/index.vue diff --git a/config/prod.env.js b/config/prod.env.js index 14f26a7..73e8fe1 100644 --- a/config/prod.env.js +++ b/config/prod.env.js @@ -1,5 +1,5 @@ 'use strict' module.exports = { NODE_ENV: '"production"', - BASE_API: '"http://api.auauz.net"' + BASE_API: '"https://api.auauz.net"' } diff --git a/index.html b/index.html index db13804..9d96047 100644 --- a/index.html +++ b/index.html @@ -3,7 +3,6 @@ - el-admin
diff --git a/package.json b/package.json index a47299e..3dbb754 100644 --- a/package.json +++ b/package.json @@ -18,7 +18,7 @@ }, "dependencies": { "axios": "0.18.0", - "element-ui": "^2.6.1", + "element-ui": "2.4.6", "connect": "3.6.6", "js-cookie": "2.2.0", "normalize.css": "7.0.0", diff --git a/src/api/dept.js b/src/api/dept.js new file mode 100644 index 0000000..2ca7b29 --- /dev/null +++ b/src/api/dept.js @@ -0,0 +1,32 @@ +import request from '@/utils/request' + +export function getDepts(params) { + return request({ + url: 'api/dept', + method: 'get', + params + }) +} + +export function add(data) { + return request({ + url: 'api/dept', + method: 'post', + data + }) +} + +export function del(id) { + return request({ + url: 'api/dept/' + id, + method: 'delete' + }) +} + +export function edit(data) { + return request({ + url: 'api/dept', + method: 'put', + data + }) +} diff --git a/src/api/dict.js b/src/api/dict.js new file mode 100644 index 0000000..7d37a9c --- /dev/null +++ b/src/api/dict.js @@ -0,0 +1,24 @@ +import request from '@/utils/request' + +export function add(data) { + return request({ + url: 'api/dict', + method: 'post', + data + }) +} + +export function del(id) { + return request({ + url: 'api/dict/' + id, + method: 'delete' + }) +} + +export function edit(data) { + return request({ + url: 'api/dict', + method: 'put', + data + }) +} diff --git a/src/api/dictDetail.js b/src/api/dictDetail.js new file mode 100644 index 0000000..d58bdc3 --- /dev/null +++ b/src/api/dictDetail.js @@ -0,0 +1,37 @@ +import request from '@/utils/request' + +export function get(dictName) { + const params = { + dictName, + page: 0, + size: 9999 + } + return request({ + url: 'api/dictDetail', + method: 'get', + params + }) +} + +export function add(data) { + return request({ + url: 'api/dictDetail', + method: 'post', + data + }) +} + +export function del(id) { + return request({ + url: 'api/dictDetail/' + id, + method: 'delete' + }) +} + +export function edit(data) { + return request({ + url: 'api/dictDetail', + method: 'put', + data + }) +} diff --git a/src/api/job.js b/src/api/job.js new file mode 100644 index 0000000..b887eae --- /dev/null +++ b/src/api/job.js @@ -0,0 +1,37 @@ +import request from '@/utils/request' + +export function getAllJob(deptId) { + const params = { + deptId, + page: 0, + size: 9999 + } + return request({ + url: 'api/job', + method: 'get', + params + }) +} + +export function add(data) { + return request({ + url: 'api/job', + method: 'post', + data + }) +} + +export function del(id) { + return request({ + url: 'api/job/' + id, + method: 'delete' + }) +} + +export function edit(data) { + return request({ + url: 'api/job', + method: 'put', + data + }) +} diff --git a/src/api/role.js b/src/api/role.js index 243b31c..034e84f 100644 --- a/src/api/role.js +++ b/src/api/role.js @@ -1,9 +1,9 @@ import request from '@/utils/request' // 获取所有的Role -export function getRoleTree() { +export function getAll() { return request({ - url: 'api/roles/tree', + url: 'api/roles/all', method: 'get' }) } diff --git a/src/components/YamlEdit/index.vue b/src/components/YamlEdit/index.vue index 164731c..b84bff9 100644 --- a/src/components/YamlEdit/index.vue +++ b/src/components/YamlEdit/index.vue @@ -32,6 +32,9 @@ export default { if (value !== editorValue) { this.editor.setValue(this.value) } + }, + height(value) { + this.editor.setSize('auto', this.height) } }, mounted() { diff --git a/src/components/iframe/index.vue b/src/components/iframe/index.vue new file mode 100644 index 0000000..f8fa4a8 --- /dev/null +++ b/src/components/iframe/index.vue @@ -0,0 +1,30 @@ +