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 @@
+
+
+
+
+
+
diff --git a/src/components/placard/index.vue b/src/components/placard/index.vue
new file mode 100644
index 0000000..f6cef7f
--- /dev/null
+++ b/src/components/placard/index.vue
@@ -0,0 +1,83 @@
+
+
+
+
+ 1.7版本更新说明
+
+
一、后端
+
+ - 完成部门管理，岗位管理，字典管理，完成数据权限
+ - 用户权限加入到缓存，避免重复请求数据库
+ - 修复七牛云存储中文名下载失败的bug
+ - 修复上级目录选择自己导致列表不显示的bug
+ - 大量细节优化
+ - 【文档】已更新至1.7版本，访问地址：https://docs.auauz.net
+
+
二、前端
+
+ - 优化实时控制台全屏后高宽自适应
+ - 七牛云列表显示添加【文件类型】字段
+ - sm.ms图床列表添加【缩略图】显示
+ - 提供外链嵌入内部菜单的组件（可参考Sql监控或者接口文档菜单）
+ - 重新设计个人中心页面
+ - 取消无意义的前端MD5加密
+ - 前端新增全局配置文件，文件位于src/config 下，目前可配置：网站名称、Cookie过期天数、TokenKey、请求超时时间
+ - 大量细节优化
+
+
+
-
+
{{ scope.$index + 1 }}
diff --git a/src/views/generator/module/generator.vue b/src/views/generator/module/generator.vue
index 228b3bf..f2ace28 100644
--- a/src/views/generator/module/generator.vue
+++ b/src/views/generator/module/generator.vue
@@ -2,7 +2,7 @@
生成代码
-
+
{{ scope.$index + 1 }}
diff --git a/src/views/layout/components/Navbar.vue b/src/views/layout/components/Navbar.vue
index ecdafa3..45a9814 100644
--- a/src/views/layout/components/Navbar.vue
+++ b/src/views/layout/components/Navbar.vue
@@ -4,6 +4,11 @@