-
diff --git a/src/api/data.js b/src/api/data.js
index 7a91ac6..d975d75 100644
--- a/src/api/data.js
+++ b/src/api/data.js
@@ -1,9 +1,17 @@
import request from '@/utils/request'
+import qs from 'qs'
export function initData(url, params) {
return request({
- url: url,
- method: 'get',
- params
+ url: url + '?' + qs.stringify(params, { indices: false }),
+ method: 'get'
+ })
+}
+
+export function download(url, params) {
+ return request({
+ url: url + '?' + qs.stringify(params, { indices: false }),
+ method: 'get',
+ responseType: 'blob'
})
}
diff --git a/src/api/generator.js b/src/api/generator.js
deleted file mode 100644
index c9302d6..0000000
--- a/src/api/generator.js
+++ /dev/null
@@ -1,9 +0,0 @@
-import request from '@/utils/request'
-
-export function generator(data, tableName) {
- return request({
- url: 'api/generator?tableName=' + tableName,
- data,
- method: 'post'
- })
-}
diff --git a/src/api/genConfig.js b/src/api/generator/genConfig.js
similarity index 73%
rename from src/api/genConfig.js
rename to src/api/generator/genConfig.js
index 5535d37..e15b200 100644
--- a/src/api/genConfig.js
+++ b/src/api/generator/genConfig.js
@@ -1,8 +1,8 @@
import request from '@/utils/request'
-export function get() {
+export function get(tableName) {
return request({
- url: 'api/genConfig',
+ url: 'api/genConfig/' + tableName,
method: 'get'
})
}
diff --git a/src/api/generator/generator.js b/src/api/generator/generator.js
new file mode 100644
index 0000000..0c49718
--- /dev/null
+++ b/src/api/generator/generator.js
@@ -0,0 +1,33 @@
+import request from '@/utils/request'
+
+export function getAllTable() {
+ return request({
+ url: 'api/generator/tables/all',
+ method: 'get'
+ })
+}
+
+export function generator(tableName, type) {
+ return request({
+ url: 'api/generator/' + tableName + '/' + type,
+ method: 'post',
+ responseType: type === 2 ? 'blob' : ''
+ })
+}
+
+export function save(data) {
+ return request({
+ url: 'api/generator',
+ data,
+ method: 'put'
+ })
+}
+
+export function sync(tables) {
+ return request({
+ url: 'api/generator/sync',
+ method: 'post',
+ data: tables
+ })
+}
+
diff --git a/src/api/log.js b/src/api/log.js
deleted file mode 100644
index 446c030..0000000
--- a/src/api/log.js
+++ /dev/null
@@ -1,17 +0,0 @@
-import request from '@/utils/request'
-
-export function getErrDetail(id) {
- return request({
- url: 'api/logs/error/' + id,
- method: 'get'
- })
-}
-
-export function downloadLog(params) {
- return request({
- url: 'api/logs/download',
- method: 'get',
- params,
- responseType: 'blob'
- })
-}
diff --git a/src/api/mnt/app.js b/src/api/mnt/app.js
new file mode 100644
index 0000000..2a27054
--- /dev/null
+++ b/src/api/mnt/app.js
@@ -0,0 +1,27 @@
+import request from '@/utils/request'
+
+export function add(data) {
+ return request({
+ url: 'api/app',
+ method: 'post',
+ data
+ })
+}
+
+export function del(ids) {
+ return request({
+ url: 'api/app',
+ method: 'delete',
+ data: ids
+ })
+}
+
+export function edit(data) {
+ return request({
+ url: 'api/app',
+ method: 'put',
+ data
+ })
+}
+
+export default { add, edit, del }
diff --git a/src/api/mnt/connect.js b/src/api/mnt/connect.js
new file mode 100644
index 0000000..1bbe90b
--- /dev/null
+++ b/src/api/mnt/connect.js
@@ -0,0 +1,17 @@
+import request from '@/utils/request'
+
+export function testDbConnect(data) {
+ return request({
+ url: 'api/database/testConnect',
+ method: 'post',
+ data
+ })
+}
+
+export function testServerConnect(data) {
+ return request({
+ url: 'api/serverDeploy/testConnect',
+ method: 'post',
+ data
+ })
+}
diff --git a/src/api/mnt/database.js b/src/api/mnt/database.js
new file mode 100644
index 0000000..91797fb
--- /dev/null
+++ b/src/api/mnt/database.js
@@ -0,0 +1,35 @@
+import request from '@/utils/request'
+
+export function add(data) {
+ return request({
+ url: 'api/database',
+ method: 'post',
+ data
+ })
+}
+
+export function del(ids) {
+ return request({
+ url: 'api/database',
+ method: 'delete',
+ data: ids
+ })
+}
+
+export function edit(data) {
+ return request({
+ url: 'api/database',
+ method: 'put',
+ data
+ })
+}
+
+export function testDbConnection(data) {
+ return request({
+ url: 'api/database/testConnect',
+ method: 'post',
+ data
+ })
+}
+
+export default { add, edit, del, testDbConnection }
diff --git a/src/api/mnt/deploy.js b/src/api/mnt/deploy.js
new file mode 100644
index 0000000..c1475ea
--- /dev/null
+++ b/src/api/mnt/deploy.js
@@ -0,0 +1,77 @@
+import request from '@/utils/request'
+
+export function add(data) {
+ return request({
+ url: 'api/deploy',
+ method: 'post',
+ data
+ })
+}
+
+export function del(ids) {
+ return request({
+ url: 'api/deploy',
+ method: 'delete',
+ data: ids
+ })
+}
+
+export function edit(data) {
+ return request({
+ url: 'api/deploy',
+ method: 'put',
+ data
+ })
+}
+
+export function getApps() {
+ return request({
+ url: 'api/app',
+ method: 'get'
+ })
+}
+
+export function getServers() {
+ return request({
+ url: 'api/serverDeploy',
+ method: 'get'
+ })
+}
+
+/**
+ * 启动服务
+ * @param data 选中行
+ */
+export function startServer(data) {
+ return request({
+ url: 'api/deploy/startServer',
+ method: 'post',
+ data
+ })
+}
+
+/**
+ * 停止服务
+ * @param data 选中行
+ */
+export function stopServer(data) {
+ return request({
+ url: 'api/deploy/stopServer',
+ method: 'post',
+ data
+ })
+}
+
+/**
+ * 停止服务
+ * @param data 选中行
+ */
+export function serverStatus(data) {
+ return request({
+ url: 'api/deploy/serverStatus',
+ method: 'post',
+ data
+ })
+}
+
+export default { add, edit, del, stopServer, serverStatus, startServer, getServers, getApps }
diff --git a/src/api/mnt/deployHistory.js b/src/api/mnt/deployHistory.js
new file mode 100644
index 0000000..30335e4
--- /dev/null
+++ b/src/api/mnt/deployHistory.js
@@ -0,0 +1,21 @@
+import request from '@/utils/request'
+
+export function del(ids) {
+ return request({
+ url: 'api/deployHistory',
+ method: 'delete',
+ data: ids
+ })
+}
+
+/**
+ * 版本回退
+ * @param data 选中行
+ */
+export function reducte(data) {
+ return request({
+ url: 'api/deploy/serverReduction',
+ method: 'post',
+ data
+ })
+}
diff --git a/src/api/mnt/serverDeploy.js b/src/api/mnt/serverDeploy.js
new file mode 100644
index 0000000..e796114
--- /dev/null
+++ b/src/api/mnt/serverDeploy.js
@@ -0,0 +1,27 @@
+import request from '@/utils/request'
+
+export function add(data) {
+ return request({
+ url: 'api/serverDeploy',
+ method: 'post',
+ data
+ })
+}
+
+export function del(ids) {
+ return request({
+ url: 'api/serverDeploy',
+ method: 'delete',
+ data: ids
+ })
+}
+
+export function edit(data) {
+ return request({
+ url: 'api/serverDeploy',
+ method: 'put',
+ data
+ })
+}
+
+export default { add, edit, del }
diff --git a/src/api/monitor/log.js b/src/api/monitor/log.js
new file mode 100644
index 0000000..13f0d39
--- /dev/null
+++ b/src/api/monitor/log.js
@@ -0,0 +1,22 @@
+import request from '@/utils/request'
+
+export function getErrDetail(id) {
+ return request({
+ url: 'api/logs/error/' + id,
+ method: 'get'
+ })
+}
+
+export function delAllError() {
+ return request({
+ url: 'api/logs/del/error',
+ method: 'delete'
+ })
+}
+
+export function delAllInfo() {
+ return request({
+ url: 'api/logs/del/info',
+ method: 'delete'
+ })
+}
diff --git a/src/api/monitor/online.js b/src/api/monitor/online.js
new file mode 100644
index 0000000..057275b
--- /dev/null
+++ b/src/api/monitor/online.js
@@ -0,0 +1,9 @@
+import request from '@/utils/request'
+
+export function del(keys) {
+ return request({
+ url: 'auth/online',
+ method: 'delete',
+ data: keys
+ })
+}
diff --git a/src/api/monitor/server.js b/src/api/monitor/server.js
new file mode 100644
index 0000000..2ade356
--- /dev/null
+++ b/src/api/monitor/server.js
@@ -0,0 +1,27 @@
+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/visits.js b/src/api/monitor/visits.js
similarity index 100%
rename from src/api/visits.js
rename to src/api/monitor/visits.js
diff --git a/src/api/online.js b/src/api/online.js
deleted file mode 100644
index cdfe120..0000000
--- a/src/api/online.js
+++ /dev/null
@@ -1,17 +0,0 @@
-import request from '@/utils/request'
-
-export function del(key) {
- return request({
- url: 'auth/online/' + 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
deleted file mode 100644
index df9d720..0000000
--- a/src/api/picture.js
+++ /dev/null
@@ -1,25 +0,0 @@
-import request from '@/utils/request'
-
-export function del(id) {
- return request({
- url: 'api/pictures/' + id,
- method: 'delete'
- })
-}
-
-export function delAll(ids) {
- return request({
- url: 'api/pictures/',
- method: 'delete',
- data: ids
- })
-}
-
-export function downloadPicture(params) {
- return request({
- url: 'api/pictures/download',
- method: 'get',
- params,
- responseType: 'blob'
- })
-}
diff --git a/src/api/redis.js b/src/api/redis.js
deleted file mode 100644
index fdd3cbc..0000000
--- a/src/api/redis.js
+++ /dev/null
@@ -1,44 +0,0 @@
-import request from '@/utils/request'
-
-export function add(data) {
- return request({
- url: 'api/redis',
- method: 'post',
- data
- })
-}
-
-export function del(key) {
- const data = {
- key
- }
- return request({
- url: 'api/redis/',
- method: 'delete',
- data
- })
-}
-
-export function delAll() {
- return request({
- url: 'api/redis/all',
- method: 'delete'
- })
-}
-
-export function edit(data) {
- return request({
- url: 'api/redis',
- method: 'put',
- data
- })
-}
-
-export function downloadRedis(params) {
- return request({
- url: 'api/redis/download',
- method: 'get',
- params,
- responseType: 'blob'
- })
-}
diff --git a/src/api/code.js b/src/api/system/code.js
similarity index 100%
rename from src/api/code.js
rename to src/api/system/code.js
diff --git a/src/api/dept.js b/src/api/system/dept.js
similarity index 63%
rename from src/api/dept.js
rename to src/api/system/dept.js
index 1c3624e..59998ba 100644
--- a/src/api/dept.js
+++ b/src/api/system/dept.js
@@ -16,10 +16,11 @@ export function add(data) {
})
}
-export function del(id) {
+export function del(ids) {
return request({
- url: 'api/dept/' + id,
- method: 'delete'
+ url: 'api/dept',
+ method: 'delete',
+ data: ids
})
}
@@ -31,11 +32,4 @@ export function edit(data) {
})
}
-export function downloadDept(params) {
- return request({
- url: 'api/dept/download',
- method: 'get',
- params,
- responseType: 'blob'
- })
-}
+export default { add, edit, del, getDepts }
diff --git a/src/api/dict.js b/src/api/system/dict.js
similarity index 75%
rename from src/api/dict.js
rename to src/api/system/dict.js
index e318b3b..11911cf 100644
--- a/src/api/dict.js
+++ b/src/api/system/dict.js
@@ -1,5 +1,12 @@
import request from '@/utils/request'
+export function getDicts() {
+ return request({
+ url: 'api/dict/all',
+ method: 'get'
+ })
+}
+
export function add(data) {
return request({
url: 'api/dict',
@@ -23,11 +30,4 @@ export function edit(data) {
})
}
-export function downloadDict(params) {
- return request({
- url: 'api/dict/download',
- method: 'get',
- params,
- responseType: 'blob'
- })
-}
+export default { add, edit, del }
diff --git a/src/api/dictDetail.js b/src/api/system/dictDetail.js
similarity index 95%
rename from src/api/dictDetail.js
rename to src/api/system/dictDetail.js
index b03d1cc..e8dc512 100644
--- a/src/api/dictDetail.js
+++ b/src/api/system/dictDetail.js
@@ -48,3 +48,5 @@ export function edit(data) {
data
})
}
+
+export default { add, edit, del }
diff --git a/src/api/job.js b/src/api/system/job.js
similarity index 66%
rename from src/api/job.js
rename to src/api/system/job.js
index 49ba283..2888c05 100644
--- a/src/api/job.js
+++ b/src/api/system/job.js
@@ -21,10 +21,11 @@ export function add(data) {
})
}
-export function del(id) {
+export function del(ids) {
return request({
- url: 'api/job/' + id,
- method: 'delete'
+ url: 'api/job',
+ method: 'delete',
+ data: ids
})
}
@@ -36,11 +37,4 @@ export function edit(data) {
})
}
-export function downloadJob(params) {
- return request({
- url: 'api/job/download',
- method: 'get',
- params,
- responseType: 'blob'
- })
-}
+export default { add, edit, del }
diff --git a/src/api/menu.js b/src/api/system/menu.js
similarity index 65%
rename from src/api/menu.js
rename to src/api/system/menu.js
index 10e8bd1..4e8ac90 100644
--- a/src/api/menu.js
+++ b/src/api/system/menu.js
@@ -1,6 +1,5 @@
import request from '@/utils/request'
-// 获取所有的菜单树
export function getMenusTree() {
return request({
url: 'api/menus/tree',
@@ -23,10 +22,11 @@ export function add(data) {
})
}
-export function del(id) {
+export function del(ids) {
return request({
- url: 'api/menus/' + id,
- method: 'delete'
+ url: 'api/menus',
+ method: 'delete',
+ data: ids
})
}
@@ -38,11 +38,4 @@ export function edit(data) {
})
}
-export function downloadMenu(params) {
- return request({
- url: 'api/menus/download',
- method: 'get',
- params,
- responseType: 'blob'
- })
-}
+export default { add, edit, del, getMenusTree }
diff --git a/src/api/role.js b/src/api/system/role.js
similarity index 66%
rename from src/api/role.js
rename to src/api/system/role.js
index e8792d4..1f7bc1e 100644
--- a/src/api/role.js
+++ b/src/api/system/role.js
@@ -30,10 +30,11 @@ export function getLevel() {
})
}
-export function del(id) {
+export function del(ids) {
return request({
- url: 'api/roles/' + id,
- method: 'delete'
+ url: 'api/roles',
+ method: 'delete',
+ data: ids
})
}
@@ -45,14 +46,6 @@ export function edit(data) {
})
}
-export function editPermission(data) {
- return request({
- url: 'api/roles/permission',
- method: 'put',
- data
- })
-}
-
export function editMenu(data) {
return request({
url: 'api/roles/menu',
@@ -61,11 +54,4 @@ export function editMenu(data) {
})
}
-export function downloadRole(params) {
- return request({
- url: 'api/roles/download',
- method: 'get',
- params,
- responseType: 'blob'
- })
-}
+export default { add, edit, del, get, editMenu, getLevel }
diff --git a/src/api/timing.js b/src/api/system/timing.js
similarity index 56%
rename from src/api/timing.js
rename to src/api/system/timing.js
index fb95575..613e15f 100644
--- a/src/api/timing.js
+++ b/src/api/system/timing.js
@@ -8,10 +8,11 @@ export function add(data) {
})
}
-export function del(id) {
+export function del(ids) {
return request({
- url: 'api/jobs/' + id,
- method: 'delete'
+ url: 'api/jobs',
+ method: 'delete',
+ data: ids
})
}
@@ -37,20 +38,4 @@ export function execution(id) {
})
}
-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'
- })
-}
+export default { del, updateIsPause, execution, add, edit }
diff --git a/src/api/user.js b/src/api/system/user.js
similarity index 50%
rename from src/api/user.js
rename to src/api/system/user.js
index 334635f..6cd91a5 100644
--- a/src/api/user.js
+++ b/src/api/system/user.js
@@ -1,4 +1,5 @@
import request from '@/utils/request'
+import { encrypt } from '@/utils/rsaEncrypt'
export function add(data) {
return request({
@@ -8,19 +9,11 @@ export function add(data) {
})
}
-export function downloadUser(params) {
+export function del(ids) {
return request({
- url: 'api/users/download',
- method: 'get',
- params,
- responseType: 'blob'
- })
-}
-
-export function del(id) {
- return request({
- url: 'api/users/' + id,
- method: 'delete'
+ url: 'api/users',
+ method: 'delete',
+ data: ids
})
}
@@ -32,10 +25,18 @@ export function edit(data) {
})
}
+export function editUser(data) {
+ return request({
+ url: 'api/users/center',
+ method: 'put',
+ data
+ })
+}
+
export function updatePass(user) {
const data = {
- oldPass: user.oldPass,
- newPass: user.newPass
+ oldPass: encrypt(user.oldPass),
+ newPass: encrypt(user.newPass)
}
return request({
url: 'api/users/updatePass/',
@@ -44,10 +45,17 @@ export function updatePass(user) {
})
}
-export function updateEmail(code, data) {
+export function updateEmail(form) {
+ const data = {
+ password: encrypt(form.pass),
+ email: form.email
+ }
return request({
- url: 'api/users/updateEmail/' + code,
+ url: 'api/users/updateEmail/' + form.code,
method: 'post',
data
})
}
+
+export default { add, edit, del }
+
diff --git a/src/api/alipay.js b/src/api/tools/alipay.js
similarity index 100%
rename from src/api/alipay.js
rename to src/api/tools/alipay.js
diff --git a/src/api/email.js b/src/api/tools/email.js
similarity index 100%
rename from src/api/email.js
rename to src/api/tools/email.js
diff --git a/src/api/localStorage.js b/src/api/tools/localStorage.js
similarity index 54%
rename from src/api/localStorage.js
rename to src/api/tools/localStorage.js
index 2e68c14..63ebe2b 100644
--- a/src/api/localStorage.js
+++ b/src/api/tools/localStorage.js
@@ -8,14 +8,7 @@ export function add(data) {
})
}
-export function del(id) {
- return request({
- url: 'api/localStorage/' + id,
- method: 'delete'
- })
-}
-
-export function delAll(ids) {
+export function del(ids) {
return request({
url: 'api/localStorage/',
method: 'delete',
@@ -31,11 +24,4 @@ export function edit(data) {
})
}
-export function downloadStorage(params) {
- return request({
- url: 'api/localStorage/download',
- method: 'get',
- params,
- responseType: 'blob'
- })
-}
+export default { add, edit, del }
diff --git a/src/api/tools/picture.js b/src/api/tools/picture.js
new file mode 100644
index 0000000..237d5f5
--- /dev/null
+++ b/src/api/tools/picture.js
@@ -0,0 +1,18 @@
+import request from '@/utils/request'
+
+export function del(ids) {
+ return request({
+ url: 'api/pictures',
+ method: 'delete',
+ data: ids
+ })
+}
+
+export function sync() {
+ return request({
+ url: 'api/pictures/synchronize',
+ method: 'post'
+ })
+}
+
+export default { del, sync }
diff --git a/src/api/qiniu.js b/src/api/tools/qiniu.js
similarity index 62%
rename from src/api/qiniu.js
rename to src/api/tools/qiniu.js
index ce75cba..6d56771 100644
--- a/src/api/qiniu.js
+++ b/src/api/tools/qiniu.js
@@ -15,13 +15,6 @@ export function update(data) {
})
}
-export function del(id) {
- return request({
- url: 'api/qiNiuContent/' + id,
- method: 'delete'
- })
-}
-
export function download(id) {
return request({
url: 'api/qiNiuContent/download/' + id,
@@ -36,19 +29,12 @@ export function sync() {
})
}
-export function delAll(ids) {
+export function del(ids) {
return request({
- url: 'api/qiNiuContent/',
+ url: 'api/qiNiuContent',
method: 'delete',
data: ids
})
}
-export function downloadQiNiu(params) {
- return request({
- url: 'api/qiNiuContent/download/list',
- method: 'get',
- params,
- responseType: 'blob'
- })
-}
+export default { del, download, sync }
diff --git a/src/assets/404_images/404.png b/src/assets/404_images/404.png
index 9ec0e39..3d8e230 100644
Binary files a/src/assets/404_images/404.png and b/src/assets/404_images/404.png differ
diff --git a/src/assets/404_images/404_cloud.png b/src/assets/404_images/404_cloud.png
index 9ccec13..c6281d0 100644
Binary files a/src/assets/404_images/404_cloud.png and b/src/assets/404_images/404_cloud.png differ
diff --git a/src/icons/index.js b/src/assets/icons/index.js
similarity index 79%
rename from src/icons/index.js
rename to src/assets/icons/index.js
index d9fe4d8..2c6b309 100644
--- a/src/icons/index.js
+++ b/src/assets/icons/index.js
@@ -1,9 +1,9 @@
import Vue from 'vue'
-import SvgIcon from '@/components/SvgIcon' // svg组件
+import SvgIcon from '@/components/SvgIcon'// svg component
// register globally
Vue.component('svg-icon', SvgIcon)
-const requireAll = requireContext => requireContext.keys().map(requireContext)
const req = require.context('./svg', false, /\.svg$/)
+const requireAll = requireContext => requireContext.keys().map(requireContext)
requireAll(req)
diff --git a/src/icons/svg/Steve-Jobs.svg b/src/assets/icons/svg/Steve-Jobs.svg
similarity index 100%
rename from src/icons/svg/Steve-Jobs.svg
rename to src/assets/icons/svg/Steve-Jobs.svg
diff --git a/src/icons/svg/alipay.svg b/src/assets/icons/svg/alipay.svg
similarity index 100%
rename from src/icons/svg/alipay.svg
rename to src/assets/icons/svg/alipay.svg
diff --git a/src/icons/svg/anq.svg b/src/assets/icons/svg/anq.svg
similarity index 100%
rename from src/icons/svg/anq.svg
rename to src/assets/icons/svg/anq.svg
diff --git a/src/assets/icons/svg/app.svg b/src/assets/icons/svg/app.svg
new file mode 100644
index 0000000..0796da3
--- /dev/null
+++ b/src/assets/icons/svg/app.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/src/assets/icons/svg/backup.svg b/src/assets/icons/svg/backup.svg
new file mode 100644
index 0000000..a3272a4
--- /dev/null
+++ b/src/assets/icons/svg/backup.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/src/icons/svg/chain.svg b/src/assets/icons/svg/chain.svg
similarity index 100%
rename from src/icons/svg/chain.svg
rename to src/assets/icons/svg/chain.svg
diff --git a/src/assets/icons/svg/chart.svg b/src/assets/icons/svg/chart.svg
new file mode 100644
index 0000000..27728fb
--- /dev/null
+++ b/src/assets/icons/svg/chart.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/src/icons/svg/codeConsole.svg b/src/assets/icons/svg/codeConsole.svg
similarity index 100%
rename from src/icons/svg/codeConsole.svg
rename to src/assets/icons/svg/codeConsole.svg
diff --git a/src/assets/icons/svg/dashboard.svg b/src/assets/icons/svg/dashboard.svg
new file mode 100644
index 0000000..5317d37
--- /dev/null
+++ b/src/assets/icons/svg/dashboard.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/src/assets/icons/svg/database.svg b/src/assets/icons/svg/database.svg
new file mode 100644
index 0000000..7fbad9b
--- /dev/null
+++ b/src/assets/icons/svg/database.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/src/icons/svg/date.svg b/src/assets/icons/svg/date.svg
similarity index 100%
rename from src/icons/svg/date.svg
rename to src/assets/icons/svg/date.svg
diff --git a/src/assets/icons/svg/deploy.svg b/src/assets/icons/svg/deploy.svg
new file mode 100644
index 0000000..f4a1c56
--- /dev/null
+++ b/src/assets/icons/svg/deploy.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/src/icons/svg/dept.svg b/src/assets/icons/svg/dept.svg
similarity index 100%
rename from src/icons/svg/dept.svg
rename to src/assets/icons/svg/dept.svg
diff --git a/src/icons/svg/dev.svg b/src/assets/icons/svg/dev.svg
similarity index 100%
rename from src/icons/svg/dev.svg
rename to src/assets/icons/svg/dev.svg
diff --git a/src/icons/svg/develop.svg b/src/assets/icons/svg/develop.svg
similarity index 100%
rename from src/icons/svg/develop.svg
rename to src/assets/icons/svg/develop.svg
diff --git a/src/icons/svg/dictionary.svg b/src/assets/icons/svg/dictionary.svg
similarity index 100%
rename from src/icons/svg/dictionary.svg
rename to src/assets/icons/svg/dictionary.svg
diff --git a/src/assets/icons/svg/edit.svg b/src/assets/icons/svg/edit.svg
new file mode 100644
index 0000000..d26101f
--- /dev/null
+++ b/src/assets/icons/svg/edit.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/src/assets/icons/svg/education.svg b/src/assets/icons/svg/education.svg
new file mode 100644
index 0000000..7bfb01d
--- /dev/null
+++ b/src/assets/icons/svg/education.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/src/icons/svg/email.svg b/src/assets/icons/svg/email.svg
similarity index 100%
rename from src/icons/svg/email.svg
rename to src/assets/icons/svg/email.svg
diff --git a/src/icons/svg/error.svg b/src/assets/icons/svg/error.svg
similarity index 100%
rename from src/icons/svg/error.svg
rename to src/assets/icons/svg/error.svg
diff --git a/src/assets/icons/svg/exit-fullscreen.svg b/src/assets/icons/svg/exit-fullscreen.svg
new file mode 100644
index 0000000..485c128
--- /dev/null
+++ b/src/assets/icons/svg/exit-fullscreen.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/src/assets/icons/svg/fullscreen.svg b/src/assets/icons/svg/fullscreen.svg
new file mode 100644
index 0000000..0e86b6f
--- /dev/null
+++ b/src/assets/icons/svg/fullscreen.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/src/icons/svg/fwb.svg b/src/assets/icons/svg/fwb.svg
similarity index 100%
rename from src/icons/svg/fwb.svg
rename to src/assets/icons/svg/fwb.svg
diff --git a/src/assets/icons/svg/github.svg b/src/assets/icons/svg/github.svg
new file mode 100644
index 0000000..40b3131
--- /dev/null
+++ b/src/assets/icons/svg/github.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/src/icons/svg/gonggao.svg b/src/assets/icons/svg/gonggao.svg
similarity index 100%
rename from src/icons/svg/gonggao.svg
rename to src/assets/icons/svg/gonggao.svg
diff --git a/src/icons/svg/icon.svg b/src/assets/icons/svg/icon.svg
similarity index 100%
rename from src/icons/svg/icon.svg
rename to src/assets/icons/svg/icon.svg
diff --git a/src/icons/svg/image.svg b/src/assets/icons/svg/image.svg
similarity index 100%
rename from src/icons/svg/image.svg
rename to src/assets/icons/svg/image.svg
diff --git a/src/icons/svg/index.svg b/src/assets/icons/svg/index.svg
similarity index 100%
rename from src/icons/svg/index.svg
rename to src/assets/icons/svg/index.svg
diff --git a/src/assets/icons/svg/international.svg b/src/assets/icons/svg/international.svg
new file mode 100644
index 0000000..e9b56ee
--- /dev/null
+++ b/src/assets/icons/svg/international.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/src/icons/svg/ipvisits.svg b/src/assets/icons/svg/ipvisits.svg
similarity index 100%
rename from src/icons/svg/ipvisits.svg
rename to src/assets/icons/svg/ipvisits.svg
diff --git a/src/icons/svg/java.svg b/src/assets/icons/svg/java.svg
similarity index 100%
rename from src/icons/svg/java.svg
rename to src/assets/icons/svg/java.svg
diff --git a/src/assets/icons/svg/link.svg b/src/assets/icons/svg/link.svg
new file mode 100644
index 0000000..48197ba
--- /dev/null
+++ b/src/assets/icons/svg/link.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/src/assets/icons/svg/list.svg b/src/assets/icons/svg/list.svg
new file mode 100644
index 0000000..20259ed
--- /dev/null
+++ b/src/assets/icons/svg/list.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/src/icons/svg/lock.svg b/src/assets/icons/svg/lock.svg
similarity index 100%
rename from src/icons/svg/lock.svg
rename to src/assets/icons/svg/lock.svg
diff --git a/src/icons/svg/log.svg b/src/assets/icons/svg/log.svg
similarity index 100%
rename from src/icons/svg/log.svg
rename to src/assets/icons/svg/log.svg
diff --git a/src/assets/icons/svg/login.svg b/src/assets/icons/svg/login.svg
new file mode 100644
index 0000000..cc5a854
--- /dev/null
+++ b/src/assets/icons/svg/login.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/src/icons/svg/markdown.svg b/src/assets/icons/svg/markdown.svg
similarity index 100%
rename from src/icons/svg/markdown.svg
rename to src/assets/icons/svg/markdown.svg
diff --git a/src/icons/svg/menu.svg b/src/assets/icons/svg/menu.svg
similarity index 100%
rename from src/icons/svg/menu.svg
rename to src/assets/icons/svg/menu.svg
diff --git a/src/assets/icons/svg/message.svg b/src/assets/icons/svg/message.svg
new file mode 100644
index 0000000..14ca817
--- /dev/null
+++ b/src/assets/icons/svg/message.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/src/assets/icons/svg/mnt.svg b/src/assets/icons/svg/mnt.svg
new file mode 100644
index 0000000..502a7c0
--- /dev/null
+++ b/src/assets/icons/svg/mnt.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/src/assets/icons/svg/monitor.svg b/src/assets/icons/svg/monitor.svg
new file mode 100644
index 0000000..fbf0a2f
--- /dev/null
+++ b/src/assets/icons/svg/monitor.svg
@@ -0,0 +1 @@
+
diff --git a/src/assets/icons/svg/nested.svg b/src/assets/icons/svg/nested.svg
new file mode 100644
index 0000000..06713a8
--- /dev/null
+++ b/src/assets/icons/svg/nested.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/src/icons/svg/password.svg b/src/assets/icons/svg/password.svg
similarity index 100%
rename from src/icons/svg/password.svg
rename to src/assets/icons/svg/password.svg
diff --git a/src/assets/icons/svg/people.svg b/src/assets/icons/svg/people.svg
new file mode 100644
index 0000000..2bd54ae
--- /dev/null
+++ b/src/assets/icons/svg/people.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/src/icons/svg/peoples.svg b/src/assets/icons/svg/peoples.svg
similarity index 100%
rename from src/icons/svg/peoples.svg
rename to src/assets/icons/svg/peoples.svg
diff --git a/src/icons/svg/permission.svg b/src/assets/icons/svg/permission.svg
similarity index 100%
rename from src/icons/svg/permission.svg
rename to src/assets/icons/svg/permission.svg
diff --git a/src/icons/svg/phone.svg b/src/assets/icons/svg/phone.svg
similarity index 100%
rename from src/icons/svg/phone.svg
rename to src/assets/icons/svg/phone.svg
diff --git a/src/icons/svg/qiniu.svg b/src/assets/icons/svg/qiniu.svg
similarity index 100%
rename from src/icons/svg/qiniu.svg
rename to src/assets/icons/svg/qiniu.svg
diff --git a/src/icons/svg/redis.svg b/src/assets/icons/svg/redis.svg
similarity index 100%
rename from src/icons/svg/redis.svg
rename to src/assets/icons/svg/redis.svg
diff --git a/src/icons/svg/role.svg b/src/assets/icons/svg/role.svg
similarity index 100%
rename from src/icons/svg/role.svg
rename to src/assets/icons/svg/role.svg
diff --git a/src/icons/svg/search.svg b/src/assets/icons/svg/search.svg
similarity index 100%
rename from src/icons/svg/search.svg
rename to src/assets/icons/svg/search.svg
diff --git a/src/assets/icons/svg/server.svg b/src/assets/icons/svg/server.svg
new file mode 100644
index 0000000..db6dcdf
--- /dev/null
+++ b/src/assets/icons/svg/server.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/src/assets/icons/svg/size.svg b/src/assets/icons/svg/size.svg
new file mode 100644
index 0000000..ddb25b8
--- /dev/null
+++ b/src/assets/icons/svg/size.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/src/assets/icons/svg/skill.svg b/src/assets/icons/svg/skill.svg
new file mode 100644
index 0000000..a3b7312
--- /dev/null
+++ b/src/assets/icons/svg/skill.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/src/assets/icons/svg/source.svg b/src/assets/icons/svg/source.svg
new file mode 100644
index 0000000..1c3a038
--- /dev/null
+++ b/src/assets/icons/svg/source.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/src/icons/svg/sqlMonitor.svg b/src/assets/icons/svg/sqlMonitor.svg
similarity index 100%
rename from src/icons/svg/sqlMonitor.svg
rename to src/assets/icons/svg/sqlMonitor.svg
diff --git a/src/icons/svg/swagger.svg b/src/assets/icons/svg/swagger.svg
similarity index 100%
rename from src/icons/svg/swagger.svg
rename to src/assets/icons/svg/swagger.svg
diff --git a/src/assets/icons/svg/sys-tools.svg b/src/assets/icons/svg/sys-tools.svg
new file mode 100644
index 0000000..324aa04
--- /dev/null
+++ b/src/assets/icons/svg/sys-tools.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/src/icons/svg/system.svg b/src/assets/icons/svg/system.svg
similarity index 68%
rename from src/icons/svg/system.svg
rename to src/assets/icons/svg/system.svg
index 54fedb9..9333c60 100644
--- a/src/icons/svg/system.svg
+++ b/src/assets/icons/svg/system.svg
@@ -1,5 +1 @@
-<<<<<<< HEAD
-=======
-
->>>>>>> 2.3dev
diff --git a/src/assets/icons/svg/tab.svg b/src/assets/icons/svg/tab.svg
new file mode 100644
index 0000000..b4b48e4
--- /dev/null
+++ b/src/assets/icons/svg/tab.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/src/assets/icons/svg/theme.svg b/src/assets/icons/svg/theme.svg
new file mode 100644
index 0000000..5982a2f
--- /dev/null
+++ b/src/assets/icons/svg/theme.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/src/icons/svg/timing.svg b/src/assets/icons/svg/timing.svg
similarity index 100%
rename from src/icons/svg/timing.svg
rename to src/assets/icons/svg/timing.svg
diff --git a/src/icons/svg/tools.svg b/src/assets/icons/svg/tools.svg
similarity index 100%
rename from src/icons/svg/tools.svg
rename to src/assets/icons/svg/tools.svg
diff --git a/src/assets/icons/svg/tree-table.svg b/src/assets/icons/svg/tree-table.svg
new file mode 100644
index 0000000..8aafdb8
--- /dev/null
+++ b/src/assets/icons/svg/tree-table.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/src/assets/icons/svg/tree.svg b/src/assets/icons/svg/tree.svg
new file mode 100644
index 0000000..dd4b7dd
--- /dev/null
+++ b/src/assets/icons/svg/tree.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/src/icons/svg/unlock.svg b/src/assets/icons/svg/unlock.svg
similarity index 100%
rename from src/icons/svg/unlock.svg
rename to src/assets/icons/svg/unlock.svg
diff --git a/src/icons/svg/user.svg b/src/assets/icons/svg/user.svg
similarity index 100%
rename from src/icons/svg/user.svg
rename to src/assets/icons/svg/user.svg
diff --git a/src/icons/svg/user1.svg b/src/assets/icons/svg/user1.svg
similarity index 100%
rename from src/icons/svg/user1.svg
rename to src/assets/icons/svg/user1.svg
diff --git a/src/icons/svg/validCode.svg b/src/assets/icons/svg/validCode.svg
similarity index 100%
rename from src/icons/svg/validCode.svg
rename to src/assets/icons/svg/validCode.svg
diff --git a/src/icons/svg/visits.svg b/src/assets/icons/svg/visits.svg
similarity index 100%
rename from src/icons/svg/visits.svg
rename to src/assets/icons/svg/visits.svg
diff --git a/src/icons/svg/web.svg b/src/assets/icons/svg/web.svg
similarity index 100%
rename from src/icons/svg/web.svg
rename to src/assets/icons/svg/web.svg
diff --git a/src/assets/icons/svg/wechat.svg b/src/assets/icons/svg/wechat.svg
new file mode 100644
index 0000000..c586e55
--- /dev/null
+++ b/src/assets/icons/svg/wechat.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/src/icons/svg/weixin.svg b/src/assets/icons/svg/weixin.svg
similarity index 100%
rename from src/icons/svg/weixin.svg
rename to src/assets/icons/svg/weixin.svg
diff --git a/src/assets/icons/svg/zujian.svg b/src/assets/icons/svg/zujian.svg
new file mode 100644
index 0000000..2aba32f
--- /dev/null
+++ b/src/assets/icons/svg/zujian.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/src/icons/svgo.yml b/src/assets/icons/svgo.yml
similarity index 100%
rename from src/icons/svgo.yml
rename to src/assets/icons/svgo.yml
diff --git a/src/assets/avatar/avatar.png b/src/assets/images/avatar.png
similarity index 100%
rename from src/assets/avatar/avatar.png
rename to src/assets/images/avatar.png
diff --git a/src/assets/images/logo.png b/src/assets/images/logo.png
new file mode 100644
index 0000000..f757710
Binary files /dev/null and b/src/assets/images/logo.png differ
diff --git a/src/assets/logo/logo.png b/src/assets/logo/logo.png
deleted file mode 100644
index 1670e67..0000000
Binary files a/src/assets/logo/logo.png and /dev/null differ
diff --git a/src/assets/styles/btn.scss b/src/assets/styles/btn.scss
new file mode 100644
index 0000000..8f47f2c
--- /dev/null
+++ b/src/assets/styles/btn.scss
@@ -0,0 +1,99 @@
+@import 'variables';
+
+@mixin colorBtn($color) {
+ background: $color;
+
+ &:hover {
+ color: $color;
+
+ &:before,
+ &:after {
+ background: $color;
+ }
+ }
+}
+
+.blue-btn {
+ @include colorBtn($blue)
+}
+
+.light-blue-btn {
+ @include colorBtn($light-blue)
+}
+
+.red-btn {
+ @include colorBtn($red)
+}
+
+.pink-btn {
+ @include colorBtn($pink)
+}
+
+.green-btn {
+ @include colorBtn($green)
+}
+
+.tiffany-btn {
+ @include colorBtn($tiffany)
+}
+
+.yellow-btn {
+ @include colorBtn($yellow)
+}
+
+.pan-btn {
+ font-size: 14px;
+ color: #fff;
+ padding: 14px 36px;
+ border-radius: 8px;
+ border: none;
+ outline: none;
+ transition: 600ms ease all;
+ position: relative;
+ display: inline-block;
+
+ &:hover {
+ background: #fff;
+
+ &:before,
+ &:after {
+ width: 100%;
+ transition: 600ms ease all;
+ }
+ }
+
+ &:before,
+ &:after {
+ content: '';
+ position: absolute;
+ top: 0;
+ right: 0;
+ height: 2px;
+ width: 0;
+ transition: 400ms ease all;
+ }
+
+ &::after {
+ right: inherit;
+ top: inherit;
+ left: 0;
+ bottom: 0;
+ }
+}
+
+.custom-button {
+ display: inline-block;
+ line-height: 1;
+ white-space: nowrap;
+ cursor: pointer;
+ background: #fff;
+ color: #fff;
+ -webkit-appearance: none;
+ text-align: center;
+ box-sizing: border-box;
+ outline: 0;
+ margin: 0;
+ padding: 10px 15px;
+ font-size: 14px;
+ border-radius: 4px;
+}
diff --git a/src/assets/styles/eladmin.scss b/src/assets/styles/eladmin.scss
new file mode 100644
index 0000000..338cbba
--- /dev/null
+++ b/src/assets/styles/eladmin.scss
@@ -0,0 +1,100 @@
+.head-container {
+ padding-bottom: 10px;
+ .filter-item {
+ display: inline-block;
+ vertical-align: middle;
+ margin: 0 2px 10px 0;
+ input {
+ height: 30.5px;
+ line-height: 30.5px;
+ }
+ }
+ .el-select__caret.el-input__icon.el-icon-arrow-up{
+ line-height: 30.5px;
+ }
+ .date-item {
+ display: inline-block;
+ vertical-align: middle;
+ margin-bottom: 10px;
+ height: 30.5px;
+ width: 223px;
+ }
+}
+.el-avatar {
+ display: inline-block;
+ text-align: center;
+ background: #ccc;
+ color: #fff;
+ white-space: nowrap;
+ position: relative;
+ overflow: hidden;
+ vertical-align: middle;
+ width: 32px;
+ height: 32px;
+ line-height: 32px;
+ border-radius: 16px;
+}
+
+.logo-con{
+ height: 60px;
+ padding: 13px 0 0;
+ img{
+ height: 32px;
+ width: 135px;
+ display: block;
+ //margin: 0 auto;
+ }
+}
+
+#el-login-footer {
+ height: 40px;
+ line-height: 40px;
+ position: fixed;
+ bottom: 0;
+ width: 100%;
+ text-align: center;
+ color: #fff;
+ font-family: Arial, serif;
+ font-size: 12px;
+ letter-spacing: 1px;
+}
+
+#el-main-footer {
+ background: none repeat scroll 0 0 white;
+ border-top: 1px solid #e7eaec;
+ overflow: hidden;
+ padding: 10px 6px 0 6px;
+ height: 33px;
+ font-size: 0.7rem !important;
+ color: #7a8b9a;
+ letter-spacing: 0.8px;
+ font-family: Arial, sans-serif !important;
+ position: fixed;
+ bottom: 0;
+ z-index: 99;
+ width: 100%;
+}
+.eladmin-upload {
+ border: 1px dashed #c0ccda;
+ border-radius: 5px;
+ height: 45px;
+ line-height: 45px;
+ width: 368px;
+}
+.my-blockquote{
+ margin: 0 0 10px;
+ padding: 15px;
+ line-height: 22px;
+ border-left: 5px solid #00437B;
+ border-radius: 0 2px 2px 0;
+ background-color: #f2f2f2;
+}
+.my-code{
+ position: relative;
+ padding: 15px;
+ line-height: 20px;
+ border-left: 5px solid #ddd;
+ color: #333;
+ font-family: Courier New, serif;
+ font-size: 12px
+}
diff --git a/src/assets/styles/element-ui.scss b/src/assets/styles/element-ui.scss
new file mode 100644
index 0000000..8f7881c
--- /dev/null
+++ b/src/assets/styles/element-ui.scss
@@ -0,0 +1,79 @@
+// cover some element-ui styles
+
+.el-breadcrumb__inner,
+.el-breadcrumb__inner a {
+ font-weight: 400 !important;
+}
+
+.el-upload {
+ input[type="file"] {
+ display: none !important;
+ }
+}
+
+.el-upload__input {
+ display: none;
+}
+
+.cell {
+ .el-tag {
+ margin-right: 0;
+ }
+}
+
+.small-padding {
+ .cell {
+ padding-left: 5px;
+ padding-right: 5px;
+ }
+}
+
+.fixed-width {
+ .el-button--mini {
+ padding: 7px 10px;
+ width: 60px;
+ }
+}
+
+.status-col {
+ .cell {
+ padding: 0 10px;
+ text-align: center;
+
+ .el-tag {
+ margin-right: 0;
+ }
+ }
+}
+
+// to fixed https://github.com/ElemeFE/element/issues/2461
+.el-dialog {
+ transform: none;
+ left: 0;
+ position: relative;
+ margin: 0 auto;
+}
+
+// refine element ui upload
+.upload-container {
+ .el-upload {
+ width: 100%;
+
+ .el-upload-dragger {
+ width: 100%;
+ height: 200px;
+ }
+ }
+}
+
+// dropdown
+.el-dropdown-menu {
+ a {
+ display: block
+ }
+}
+
+// fix date-picker ui bug in filter-item
+.el-range-editor.el-input__inner {
+ display: inline-flex !important;
+}
diff --git a/src/styles/element-variables.scss b/src/assets/styles/element-variables.scss
similarity index 90%
rename from src/styles/element-variables.scss
rename to src/assets/styles/element-variables.scss
index 30a0e6b..a4f8c4a 100644
--- a/src/styles/element-variables.scss
+++ b/src/assets/styles/element-variables.scss
@@ -22,7 +22,7 @@ $--table-border:1px solid#dfe6ec;
/* icon font path, required */
$--font-path: '~element-ui/lib/theme-chalk/fonts';
-@import "~element-ui/packages/theme-chalk/src/index";
+@import "../../../node_modules/element-ui/packages/theme-chalk/src/index";
// the :export directive is the magic sauce for webpack
// https://www.bluematador.com/blog/how-to-share-variables-between-js-and-sass
diff --git a/src/assets/styles/index.scss b/src/assets/styles/index.scss
new file mode 100644
index 0000000..21fbda1
--- /dev/null
+++ b/src/assets/styles/index.scss
@@ -0,0 +1,182 @@
+@import 'variables';
+@import 'mixin';
+@import 'transition';
+@import 'element-ui';
+@import 'sidebar';
+@import 'btn';
+@import 'eladmin';
+
+body {
+ height: 100%;
+ -moz-osx-font-smoothing: grayscale;
+ -webkit-font-smoothing: antialiased;
+ text-rendering: optimizeLegibility;
+ font-family: Helvetica Neue, Helvetica, PingFang SC, Hiragino Sans GB, Microsoft YaHei, Arial, sans-serif;
+}
+
+label {
+ font-weight: 700;
+}
+
+html {
+ height: 100%;
+ box-sizing: border-box;
+}
+
+#app {
+ height: 100%;
+}
+
+*,
+*:before,
+*:after {
+ box-sizing: inherit;
+}
+
+.no-padding {
+ padding: 0 !important;
+}
+
+.padding-content {
+ padding: 4px 0;
+}
+
+a:focus,
+a:active {
+ outline: none;
+}
+
+a,
+a:focus,
+a:hover {
+ cursor: pointer;
+ color: inherit;
+ text-decoration: none;
+}
+
+div:focus {
+ outline: none;
+}
+
+.fr {
+ float: right;
+}
+
+.fl {
+ float: left;
+}
+
+.pr-5 {
+ padding-right: 5px;
+}
+
+.pl-5 {
+ padding-left: 5px;
+}
+
+.block {
+ display: block;
+}
+
+.pointer {
+ cursor: pointer;
+}
+
+.inlineBlock {
+ display: block;
+}
+
+.clearfix {
+ &:after {
+ visibility: hidden;
+ display: block;
+ font-size: 0;
+ content: " ";
+ clear: both;
+ height: 0;
+ }
+}
+
+aside {
+ background: #eef1f6;
+ padding: 8px 24px;
+ margin-bottom: 20px;
+ border-radius: 2px;
+ display: block;
+ line-height: 32px;
+ font-size: 16px;
+ font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen, Ubuntu, Cantarell, "Fira Sans", "Droid Sans", "Helvetica Neue", sans-serif;
+ color: #2c3e50;
+ -webkit-font-smoothing: antialiased;
+ -moz-osx-font-smoothing: grayscale;
+
+ a {
+ color: #337ab7;
+ cursor: pointer;
+
+ &:hover {
+ color: rgb(32, 160, 255);
+ }
+ }
+}
+
+//main-container全局样式
+.app-container {
+ padding: 20px 20px 45px 20px;
+}
+
+.components-container {
+ margin: 30px 50px;
+ position: relative;
+}
+
+.pagination-container {
+ margin-top: 30px;
+}
+
+.text-center {
+ text-align: center
+}
+
+.sub-navbar {
+ height: 50px;
+ line-height: 50px;
+ position: relative;
+ width: 100%;
+ text-align: right;
+ padding-right: 20px;
+ transition: 600ms ease position;
+ background: linear-gradient(90deg, rgba(32, 182, 249, 1) 0%, rgba(32, 182, 249, 1) 0%, rgba(33, 120, 241, 1) 100%, rgba(33, 120, 241, 1) 100%);
+
+ .subtitle {
+ font-size: 20px;
+ color: #fff;
+ }
+
+ &.draft {
+ background: #d0d0d0;
+ }
+
+ &.deleted {
+ background: #d0d0d0;
+ }
+}
+
+.link-type,
+.link-type:focus {
+ color: #337ab7;
+ cursor: pointer;
+
+ &:hover {
+ color: rgb(32, 160, 255);
+ }
+}
+
+//refine vue-multiselect plugin
+.multiselect {
+ line-height: 16px;
+}
+
+.multiselect--active {
+ z-index: 1000 !important;
+}
diff --git a/src/assets/styles/mixin.scss b/src/assets/styles/mixin.scss
new file mode 100644
index 0000000..06fa061
--- /dev/null
+++ b/src/assets/styles/mixin.scss
@@ -0,0 +1,66 @@
+@mixin clearfix {
+ &:after {
+ content: "";
+ display: table;
+ clear: both;
+ }
+}
+
+@mixin scrollBar {
+ &::-webkit-scrollbar-track-piece {
+ background: #d3dce6;
+ }
+
+ &::-webkit-scrollbar {
+ width: 6px;
+ }
+
+ &::-webkit-scrollbar-thumb {
+ background: #99a9bf;
+ border-radius: 20px;
+ }
+}
+
+@mixin relative {
+ position: relative;
+ width: 100%;
+ height: 100%;
+}
+
+@mixin pct($pct) {
+ width: #{$pct};
+ position: relative;
+ margin: 0 auto;
+}
+
+@mixin triangle($width, $height, $color, $direction) {
+ $width: $width/2;
+ $color-border-style: $height solid $color;
+ $transparent-border-style: $width solid transparent;
+ height: 0;
+ width: 0;
+
+ @if $direction==up {
+ border-bottom: $color-border-style;
+ border-left: $transparent-border-style;
+ border-right: $transparent-border-style;
+ }
+
+ @else if $direction==right {
+ border-left: $color-border-style;
+ border-top: $transparent-border-style;
+ border-bottom: $transparent-border-style;
+ }
+
+ @else if $direction==down {
+ border-top: $color-border-style;
+ border-left: $transparent-border-style;
+ border-right: $transparent-border-style;
+ }
+
+ @else if $direction==left {
+ border-right: $color-border-style;
+ border-top: $transparent-border-style;
+ border-bottom: $transparent-border-style;
+ }
+}
diff --git a/src/assets/styles/sidebar.scss b/src/assets/styles/sidebar.scss
new file mode 100644
index 0000000..17381fc
--- /dev/null
+++ b/src/assets/styles/sidebar.scss
@@ -0,0 +1,209 @@
+#app {
+
+ .main-container {
+ min-height: 100%;
+ transition: margin-left .28s;
+ margin-left: $sideBarWidth;
+ position: relative;
+ }
+
+ .sidebar-container {
+ transition: width 0.28s;
+ width: $sideBarWidth !important;
+ background-color: $menuBg;
+ height: 100%;
+ position: fixed;
+ font-size: 0;
+ top: 0;
+ bottom: 0;
+ left: 0;
+ z-index: 1001;
+ overflow: hidden;
+
+ // reset element-ui css
+ .horizontal-collapse-transition {
+ transition: 0s width ease-in-out, 0s padding-left ease-in-out, 0s padding-right ease-in-out;
+ }
+
+ .scrollbar-wrapper {
+ overflow-x: hidden !important;
+ }
+
+ .el-scrollbar__bar.is-vertical {
+ right: 0;
+ }
+
+ .el-scrollbar {
+ height: 100%;
+ }
+
+ &.has-logo {
+ .el-scrollbar {
+ height: calc(100% - 50px);
+ }
+ }
+
+ .is-horizontal {
+ display: none;
+ }
+
+ a {
+ display: inline-block;
+ width: 100%;
+ overflow: hidden;
+ }
+
+ .svg-icon {
+ margin-right: 16px;
+ }
+
+ .el-menu {
+ border: none;
+ height: 100%;
+ width: 100% !important;
+ }
+
+ // menu hover
+ .submenu-title-noDropdown,
+ .el-submenu__title {
+ &:hover {
+ background-color: $menuHover !important;
+ }
+ }
+
+ .is-active>.el-submenu__title {
+ color: $subMenuActiveText !important;
+ }
+
+ & .nest-menu .el-submenu>.el-submenu__title,
+ & .el-submenu .el-menu-item {
+ min-width: $sideBarWidth !important;
+ background-color: $subMenuBg !important;
+
+ &:hover {
+ background-color: $subMenuHover !important;
+ }
+ }
+ }
+
+ .hideSidebar {
+ .sidebar-container {
+ width: 54px !important;
+ }
+
+ .main-container {
+ margin-left: 54px;
+ }
+
+ .submenu-title-noDropdown {
+ padding: 0 !important;
+ position: relative;
+
+ .el-tooltip {
+ padding: 0 !important;
+
+ .svg-icon {
+ margin-left: 20px;
+ }
+ }
+ }
+
+ .el-submenu {
+ overflow: hidden;
+
+ &>.el-submenu__title {
+ padding: 0 !important;
+
+ .svg-icon {
+ margin-left: 20px;
+ }
+
+ .el-submenu__icon-arrow {
+ display: none;
+ }
+ }
+ }
+
+ .el-menu--collapse {
+ .el-submenu {
+ &>.el-submenu__title {
+ &>span {
+ height: 0;
+ width: 0;
+ overflow: hidden;
+ visibility: hidden;
+ display: inline-block;
+ }
+ }
+ }
+ }
+ }
+
+ .el-menu--collapse .el-menu .el-submenu {
+ min-width: $sideBarWidth !important;
+ }
+
+ // mobile responsive
+ .mobile {
+ .main-container {
+ margin-left: 0;
+ }
+
+ .sidebar-container {
+ transition: transform .28s;
+ width: $sideBarWidth !important;
+ }
+
+ &.hideSidebar {
+ .sidebar-container {
+ pointer-events: none;
+ transition-duration: 0.3s;
+ transform: translate3d(-$sideBarWidth, 0, 0);
+ }
+ }
+ }
+
+ .withoutAnimation {
+
+ .main-container,
+ .sidebar-container {
+ transition: none;
+ }
+ }
+}
+
+// when menu collapsed
+.el-menu--vertical {
+ &>.el-menu {
+ .svg-icon {
+ margin-right: 16px;
+ }
+ }
+
+ .nest-menu .el-submenu>.el-submenu__title,
+ .el-menu-item {
+ &:hover {
+ // you can use $subMenuHover
+ background-color: $menuHover !important;
+ }
+ }
+
+ // the scroll bar appears when the subMenu is too long
+ >.el-menu--popup {
+ max-height: 100vh;
+ overflow-y: auto;
+
+ &::-webkit-scrollbar-track-piece {
+ background: #d3dce6;
+ }
+
+ &::-webkit-scrollbar {
+ width: 6px;
+ }
+
+ &::-webkit-scrollbar-thumb {
+ background: #99a9bf;
+ border-radius: 20px;
+ }
+ }
+}
diff --git a/src/styles/transition.scss b/src/assets/styles/transition.scss
similarity index 87%
rename from src/styles/transition.scss
rename to src/assets/styles/transition.scss
index 8dd9b04..4cb27cc 100644
--- a/src/styles/transition.scss
+++ b/src/assets/styles/transition.scss
@@ -1,6 +1,6 @@
-//globl transition css
+// global transition css
-/*fade*/
+/* fade */
.fade-enter-active,
.fade-leave-active {
transition: opacity 0.28s;
@@ -11,21 +11,23 @@
opacity: 0;
}
-/*fade-transform*/
+/* fade-transform */
.fade-transform-leave-active,
.fade-transform-enter-active {
transition: all .5s;
}
+
.fade-transform-enter {
opacity: 0;
transform: translateX(-30px);
}
+
.fade-transform-leave-to {
opacity: 0;
transform: translateX(30px);
}
-/*fade*/
+/* breadcrumb transition */
.breadcrumb-enter-active,
.breadcrumb-leave-active {
transition: all .5s;
diff --git a/src/styles/variables.scss b/src/assets/styles/variables.scss
similarity index 75%
rename from src/styles/variables.scss
rename to src/assets/styles/variables.scss
index 61e9628..41de79c 100644
--- a/src/styles/variables.scss
+++ b/src/assets/styles/variables.scss
@@ -1,4 +1,14 @@
-//sidebar
+// base color
+$blue:#324157;
+$light-blue:#3A71A8;
+$red:#C03639;
+$pink: #E65D6E;
+$green: #30B08F;
+$tiffany: #4AB7BD;
+$yellow:#FEC171;
+$panGreen: #30B08F;
+
+// sidebar
$menuText:#bfcbd9;
$menuActiveText:#409EFF;
$subMenuActiveText:#f4f4f5; // https://github.com/ElemeFE/element/issues/12951
@@ -9,9 +19,7 @@ $menuHover:#263445;
$subMenuBg:#1f2d3d;
$subMenuHover:#001528;
-$sideBarWidth: 193px;
-
-$hideSidebarWidth: 38px;
+$sideBarWidth: 205px;
// the :export directive is the magic sauce for webpack
// https://www.bluematador.com/blog/how-to-share-variables-between-js-and-sass
diff --git a/src/components/Breadcrumb/index.vue b/src/components/Breadcrumb/index.vue
index 96b78dc..204ea59 100644
--- a/src/components/Breadcrumb/index.vue
+++ b/src/components/Breadcrumb/index.vue
@@ -1,7 +1,7 @@
+
+
+
+ 新增
+
+
+ 修改
+
+
+ 删除
+
+ 导出
+
+
+
+
+
+
+
+ 全选
+
+
+ {{ item.label }}
+
+
+
+
+
+
+
+
diff --git a/src/components/Crud/Pagination.vue b/src/components/Crud/Pagination.vue
new file mode 100644
index 0000000..d4482fb
--- /dev/null
+++ b/src/components/Crud/Pagination.vue
@@ -0,0 +1,18 @@
+
+
+
+
+
+
+
+
diff --git a/src/components/Crud/crud.js b/src/components/Crud/crud.js
new file mode 100644
index 0000000..a07ce92
--- /dev/null
+++ b/src/components/Crud/crud.js
@@ -0,0 +1,773 @@
+import { initData, download } from '@/api/data'
+import { parseTime, downloadFile } from '@/utils/index'
+import Vue from 'vue'
+
+/**
+ * CRUD配置
+ * @author moxun
+ * @param {*} options {{ msg }}
+
+ 取消
+ 确定
+
+ + * @return crud instance. + * @example + */ +function CRUD(options) { + const defaultOptions = { + // 标题 + title: '', + // 请求数据的url + url: '', + // 表格数据 + data: [], + // 选择项 + selections: [], + // 待查询的对象 + query: {}, + // 查询数据的参数 + params: {}, + // Form 表单 + form: {}, + // 重置表单 + defaultForm: () => {}, + // 排序规则，默认 id 降序， 支持多字段排序 ['id,desc', 'createTime,asc'] + sort: ['id,desc'], + // 等待时间 + time: 50, + // CRUD Method + crudMethod: { + add: (form) => {}, + delete: (id) => {}, + edit: (form) => {}, + get: (id) => {} + }, + // 主页操作栏显示哪些按钮 + optShow: { + add: true, + edit: true, + del: true, + download: true + }, + // 自定义一些扩展属性 + props: {}, + // 在主页准备 + queryOnPresenterCreated: true, + // 调试开关 + debug: false + } + options = mergeOptions(defaultOptions, options) + const data = { + ...options, + // 记录数据状态 + dataStatus: {}, + status: { + add: CRUD.STATUS.NORMAL, + edit: CRUD.STATUS.NORMAL, + // 添加或编辑状态 + get cu() { + if (this.add === CRUD.STATUS.NORMAL && this.edit === CRUD.STATUS.NORMAL) { + return CRUD.STATUS.NORMAL + } else if (this.add === CRUD.STATUS.PREPARED || this.edit === CRUD.STATUS.PREPARED) { + return CRUD.STATUS.PREPARED + } else if (this.add === CRUD.STATUS.PROCESSING || this.edit === CRUD.STATUS.PROCESSING) { + return CRUD.STATUS.PROCESSING + } + throw new Error('wrong crud\'s cu status') + }, + // 标题 + get title() { + return this.add > CRUD.STATUS.NORMAL ? `新增${crud.title}` : this.edit > CRUD.STATUS.NORMAL ? `编辑${crud.title}` : crud.title + } + }, + msg: { + submit: '提交成功', + add: '新增成功', + edit: '编辑成功', + del: '删除成功' + }, + page: { + // 页码 + page: 0, + // 每页数据条数 + size: 10, + // 总数据条数 + total: 0 + }, + // 整体loading + loading: true, + // 导出的 Loading + downloadLoading: false, + // 删除的 Loading + delAllLoading: false + } + const methods = { + /** + * 通用的提示 + */ + submitSuccessNotify() { + crud.notify(crud.msg.submit, CRUD.NOTIFICATION_TYPE.SUCCESS) + }, + addSuccessNotify() { + crud.notify(crud.msg.add, CRUD.NOTIFICATION_TYPE.SUCCESS) + }, + editSuccessNotify() { + crud.notify(crud.msg.edit, CRUD.NOTIFICATION_TYPE.SUCCESS) + }, + delSuccessNotify() { + crud.notify(crud.msg.del, CRUD.NOTIFICATION_TYPE.SUCCESS) + }, + // 搜索 + toQuery() { + crud.page.page = 1 + crud.refresh() + }, + // 刷新 + refresh() { + if (!callVmHook(crud, CRUD.HOOK.beforeRefresh)) { + return + } + return new Promise((resolve, reject) => { + crud.loading = true + // 请求数据 + initData(crud.url, crud.getQueryParams()).then(data => { + crud.page.total = data.totalElements + crud.data = data.content + crud.resetDataStatus() + // time 毫秒后显示表格 + setTimeout(() => { + crud.loading = false + callVmHook(crud, CRUD.HOOK.afterRefresh) + }, crud.time) + resolve(data) + }).catch(err => { + crud.loading = false + reject(err) + }) + }) + }, + /** + * 启动添加 + */ + toAdd() { + if (!(callVmHook(crud, CRUD.HOOK.beforeToAdd, crud.form) && callVmHook(crud, CRUD.HOOK.beforeToCU, crud.form))) { + return + } + crud.status.add = CRUD.STATUS.PREPARED + callVmHook(crud, CRUD.HOOK.afterToAdd, crud.form) + callVmHook(crud, CRUD.HOOK.afterToCU, crud.form) + }, + /** + * 启动编辑 + * @param {*} data 数据项 + */ + toEdit(data) { + crud.resetForm(JSON.parse(JSON.stringify(data))) + if (!(callVmHook(crud, CRUD.HOOK.beforeToEdit, crud.form) && callVmHook(crud, CRUD.HOOK.beforeToCU, crud.form))) { + return + } + crud.status.edit = CRUD.STATUS.PREPARED + crud.getDataStatus(data.id).edit = CRUD.STATUS.PREPARED + callVmHook(crud, CRUD.HOOK.afterToEdit, crud.form) + callVmHook(crud, CRUD.HOOK.afterToCU, crud.form) + }, + /** + * 启动删除 + * @param {*} data 数据项 + */ + toDelete(data) { + crud.getDataStatus(data.id).delete = CRUD.STATUS.PREPARED + }, + /** + * 取消删除 + * @param {*} data 数据项 + */ + cancelDelete(data) { + if (!callVmHook(crud, CRUD.HOOK.beforeDeleteCancel, data)) { + return + } + crud.getDataStatus(data.id).delete = CRUD.STATUS.NORMAL + callVmHook(crud, CRUD.HOOK.afterDeleteCancel, data) + }, + /** + * 取消新增/编辑 + */ + cancelCU() { + const addStatus = crud.status.add + const editStatus = crud.status.edit + if (addStatus === CRUD.STATUS.PREPARED) { + if (!callVmHook(crud, CRUD.HOOK.beforeAddCancel, crud.form)) { + return + } + crud.status.add = CRUD.STATUS.NORMAL + } + if (editStatus === CRUD.STATUS.PREPARED) { + if (!callVmHook(crud, CRUD.HOOK.beforeEditCancel, crud.form)) { + return + } + crud.status.edit = CRUD.STATUS.NORMAL + crud.getDataStatus(crud.form.id).edit = CRUD.STATUS.NORMAL + } + crud.resetForm() + if (addStatus === CRUD.STATUS.PREPARED) { + callVmHook(crud, CRUD.HOOK.afterAddCancel, crud.form) + } + if (editStatus === CRUD.STATUS.PREPARED) { + callVmHook(crud, CRUD.HOOK.afterEditCancel, crud.form) + } + // 清除表单验证 + if (crud.findVM('form').$refs['form']) { + crud.findVM('form').$refs['form'].clearValidate() + } + }, + /** + * 提交新增/编辑 + */ + submitCU() { + if (!callVmHook(crud, CRUD.HOOK.beforeValidateCU)) { + return + } + crud.findVM('form').$refs['form'].validate(valid => { + if (!valid) { + return + } + if (!callVmHook(crud, CRUD.HOOK.afterValidateCU)) { + return + } + if (crud.status.add === CRUD.STATUS.PREPARED) { + crud.doAdd() + } else if (crud.status.edit === CRUD.STATUS.PREPARED) { + crud.doEdit() + } + }) + }, + /** + * 执行添加 + */ + doAdd() { + if (!callVmHook(crud, CRUD.HOOK.beforeSubmit)) { + return + } + crud.crudMethod.add(crud.form).then(() => { + crud.status.add = CRUD.STATUS.NORMAL + crud.resetForm() + crud.addSuccessNotify() + callVmHook(crud, CRUD.HOOK.afterSubmit) + crud.toQuery() + }).catch(() => { + callVmHook(crud, CRUD.HOOK.afterAddError) + }) + }, + /** + * 执行编辑 + */ + doEdit() { + if (!callVmHook(crud, CRUD.HOOK.beforeSubmit)) { + return + } + crud.crudMethod.edit(crud.form).then(() => { + crud.status.edit = CRUD.STATUS.NORMAL + crud.getDataStatus(crud.form.id).edit = CRUD.STATUS.NORMAL + crud.editSuccessNotify() + crud.resetForm() + callVmHook(crud, CRUD.HOOK.afterSubmit) + crud.refresh() + }).catch(() => { + callVmHook(crud, CRUD.HOOK.afterEditError) + }) + }, + /** + * 执行删除 + * @param {*} data 数据项 + */ + doDelete(data) { + let delAll = false + let dataStatus + const ids = [] + if (data instanceof Array) { + delAll = true + data.forEach(val => { + ids.push(val.id) + }) + } else { + ids.push(data.id) + dataStatus = crud.getDataStatus(data.id) + } + if (!callVmHook(crud, CRUD.HOOK.beforeDelete, data)) { + return + } + if (!delAll) { + dataStatus.delete = CRUD.STATUS.PROCESSING + } + return crud.crudMethod.del(ids).then(() => { + if (delAll) { + crud.delAllLoading = false + } else dataStatus.delete = CRUD.STATUS.PREPARED + crud.dleChangePage(1) + crud.delSuccessNotify() + callVmHook(crud, CRUD.HOOK.afterDelete, data) + crud.refresh() + }).catch(() => { + if (delAll) { + crud.delAllLoading = false + } else dataStatus.delete = CRUD.STATUS.PREPARED + }) + }, + /** + * 通用导出 + */ + doExport() { + crud.downloadLoading = true + download(crud.url + '/download', crud.getQueryParams()).then(result => { + downloadFile(result, crud.title + '数据', 'xlsx') + crud.downloadLoading = false + }).catch(() => { + crud.downloadLoading = false + }) + }, + /** + * 获取查询参数 + */ + getQueryParams: function() { + return { + page: crud.page.page - 1, + size: crud.page.size, + sort: crud.sort, + ...crud.query, + ...crud.params + } + }, + // 当前页改变 + pageChangeHandler(e) { + crud.page.page = e + crud.refresh() + }, + // 每页条数改变 + sizeChangeHandler(e) { + crud.page.size = e + crud.page.page = 1 + crud.refresh() + }, + // 预防删除第二页最后一条数据时，或者多选删除第二页的数据时，页码错误导致请求无数据 + dleChangePage(size) { + if (crud.data.length === size && crud.page.page !== 1) { + crud.page.page -= 1 + } + }, + // 选择改变 + selectionChangeHandler(val) { + crud.selections = val + }, + /** + * 重置查询参数 + * @param {Boolean} toQuery 重置后进行查询操作 + */ + resetQuery(toQuery = true) { + const defaultQuery = JSON.parse(JSON.stringify(crud.defaultQuery)) + const query = crud.query + Object.keys(query).forEach(key => { + query[key] = defaultQuery[key] + }) + if (toQuery) { + crud.toQuery() + } + }, + /** + * 重置表单 + * @param {Array} data 数据 + */ + resetForm(data) { + const form = data || (typeof crud.defaultForm === 'object' ? JSON.parse(JSON.stringify(crud.defaultForm)) : crud.defaultForm()) + const crudFrom = crud.form + for (const key in form) { + if (crudFrom.hasOwnProperty(key)) { + crudFrom[key] = form[key] + } else { + Vue.set(crudFrom, key, form[key]) + } + } + }, + /** + * 重置数据状态 + */ + resetDataStatus() { + const dataStatus = {} + function resetStatus(datas) { + datas.forEach(e => { + dataStatus[e.id] = { + delete: 0, + edit: 0 + } + if (e.children) { + resetStatus(e.children) + } + }) + } + resetStatus(crud.data) + crud.dataStatus = dataStatus + }, + /** + * 获取数据状态 + * @param {Number | String} id 数据项id + */ + getDataStatus(id) { + return crud.dataStatus[id] + }, + /** + * 用于树形表格多选, 选中所有 + * @param selection + */ + selectAllChange(selection) { + // 如果选中的数目与请求到的数目相同就选中子节点，否则就清空选中 + if (selection && selection.length === crud.data.length) { + selection.forEach(val => { + crud.selectChange(selection, val) + }) + } else { + crud.findVM('presenter').$refs['table'].clearSelection() + } + }, + /** + * 用于树形表格多选，单选的封装 + * @param selection + * @param row + */ + selectChange(selection, row) { + // 如果selection中存在row代表是选中，否则是取消选中 + if (selection.find(val => { return val.id === row.id })) { + if (row.children) { + row.children.forEach(val => { + crud.findVM('presenter').$refs['table'].toggleRowSelection(val, true) + selection.push(val) + if (val.children) { + crud.selectChange(selection, val) + } + }) + } + } else { + crud.toggleRowSelection(selection, row) + } + }, + /** + * 切换选中状态 + * @param selection + * @param data + */ + toggleRowSelection(selection, data) { + if (data.children) { + data.children.forEach(val => { + crud.findVM('presenter').$refs['table'].toggleRowSelection(val, false) + if (val.children) { + crud.toggleRowSelection(selection, val) + } + }) + } + }, + findVM(type) { + return crud.vms.find(vm => vm && vm.type === type).vm + }, + notify(title, type = CRUD.NOTIFICATION_TYPE.INFO) { + crud.vms[0].vm.$notify({ + title, + type, + duration: 2500 + }) + }, + updateProp(name, value) { + Vue.set(crud.props, name, value) + } + } + const crud = Object.assign({}, data) + // 可观测化 + Vue.observable(crud) + // 附加方法 + Object.assign(crud, methods) + // 记录初始默认的查询参数，后续重置查询时使用 + Object.assign(crud, { + defaultQuery: JSON.parse(JSON.stringify(data.query)), + // 预留4位存储：组件 主页、头部、分页、表单，调试查看也方便找 + vms: Array(4), + /** + * 注册组件实例 + * @param {String} type 类型 + * @param {*} vm 组件实例 + * @param {Number} index 该参数内部使用 + */ + registerVM(type, vm, index = -1) { + const vmObj = { + type, + vm: vm + } + if (index < 0) { + this.vms.push(vmObj) + return + } + this.vms.length = Math.max(this.vms.length, index) + this.vms.splice(index, 1, vmObj) + }, + /** + * 取消注册组件实例 + * @param {*} vm 组件实例 + */ + unregisterVM(vm) { + this.vms.splice(this.vms.findIndex(e => e && e.vm === vm), 1) + } + }) + // 冻结处理，需要扩展数据的话，使用crud.updateProp(name, value)，以crud.props.name形式访问，这个是响应式的，可以做数据绑定 + Object.freeze(crud) + return crud +} + +// hook VM +function callVmHook(crud, hook) { + if (crud.debug) { + console.log('callVmHook: ' + hook) + } + let ret = true + const nargs = [crud] + for (let i = 2; i < arguments.length; ++i) { + nargs.push(arguments[i]) + } + // 有些组件扮演了多个角色，调用钩子时，需要去重 + const vmSet = new Set() + crud.vms.forEach(vm => vm && vmSet.add(vm.vm)) + vmSet.forEach(vm => { + if (vm[hook]) { + ret = vm[hook].apply(vm, nargs) !== false && ret + } + }) + return ret +} + +function mergeOptions(src, opts) { + const optsRet = { + ...src + } + for (const key in src) { + if (opts.hasOwnProperty(key)) { + optsRet[key] = opts[key] + } + } + return optsRet +} + +/** + * crud主页 + */ +function presenter(crud) { + function obColumns(columns) { + return { + visible(col) { + return !columns || !columns[col] ? true : columns[col].visible + } + } + } + return { + inject: ['crud'], + beforeCreate() { + // 由于initInjections在initProvide之前执行，如果该组件自己就需要crud，需要在initInjections前准备好crud + this._provided = { + crud, + 'crud.query': crud.query, + 'crud.page': crud.page, + 'crud.form': crud.form + } + }, + data() { + return { + searchToggle: true, + columns: obColumns() + } + }, + methods: { + parseTime + }, + created() { + this.crud.registerVM('presenter', this, 0) + if (crud.queryOnPresenterCreated) { + crud.toQuery() + } + }, + beforeDestroy() { + this.crud.unregisterVM(this) + }, + mounted() { + const columns = {} + this.$refs.table.columns.forEach(e => { + if (!e.property || e.type !== 'default') { + return + } + columns[e.property] = { + label: e.label, + visible: true + } + }) + this.columns = obColumns(columns) + this.crud.updateProp('tableColumns', columns) + } + } +} + +/** + * 头部 + */ +function header() { + return { + inject: { + crud: { + from: 'crud' + }, + query: { + from: 'crud.query' + } + }, + created() { + this.crud.registerVM('header', this, 1) + }, + beforeDestroy() { + this.crud.unregisterVM(this) + } + } +} + +/** + * 分页 + */ +function pagination() { + return { + inject: { + crud: { + from: 'crud' + }, + page: { + from: 'crud.page' + } + }, + created() { + this.crud.registerVM('pagination', this, 2) + }, + beforeDestroy() { + this.crud.unregisterVM(this) + } + } +} + +/** + * 表单 + */ +function form(defaultForm) { + return { + inject: { + crud: { + from: 'crud' + }, + form: { + from: 'crud.form' + } + }, + created() { + this.crud.registerVM('form', this, 3) + this.crud.defaultForm = defaultForm + this.crud.resetForm() + }, + beforeDestroy() { + this.crud.unregisterVM(this) + } + } +} + +/** + * crud + */ +function crud(options = {}) { + const defaultOptions = { + type: undefined + } + options = mergeOptions(defaultOptions, options) + return { + inject: { + crud: { + from: 'crud' + } + }, + created() { + this.crud.registerVM(options.type, this) + }, + beforeDestroy() { + this.crud.unregisterVM(this) + } + } +} + +/** + * CRUD钩子 + */ +CRUD.HOOK = { + /** 刷新 - 之前 */ + beforeRefresh: 'beforeCrudRefresh', + /** 刷新 - 之后 */ + afterRefresh: 'afterCrudRefresh', + /** 删除 - 之前 */ + beforeDelete: 'beforeCrudDelete', + /** 删除 - 之后 */ + afterDelete: 'afterCrudDelete', + /** 删除取消 - 之前 */ + beforeDeleteCancel: 'beforeCrudDeleteCancel', + /** 删除取消 - 之后 */ + afterDeleteCancel: 'afterCrudDeleteCancel', + /** 新建 - 之前 */ + beforeToAdd: 'beforeCrudToAdd', + /** 新建 - 之后 */ + afterToAdd: 'afterCrudToAdd', + /** 编辑 - 之前 */ + beforeToEdit: 'beforeCrudToEdit', + /** 编辑 - 之后 */ + afterToEdit: 'afterCrudToEdit', + /** 开始 "新建/编辑" - 之前 */ + beforeToCU: 'beforeCrudToCU', + /** 开始 "新建/编辑" - 之后 */ + afterToCU: 'afterCrudToCU', + /** "新建/编辑" 验证 - 之前 */ + beforeValidateCU: 'beforeCrudValidateCU', + /** "新建/编辑" 验证 - 之后 */ + afterValidateCU: 'afterCrudValidateCU', + /** 添加取消 - 之前 */ + beforeAddCancel: 'beforeCrudAddCancel', + /** 添加取消 - 之后 */ + afterAddCancel: 'afterCrudAddCancel', + /** 编辑取消 - 之前 */ + beforeEditCancel: 'beforeCrudEditCancel', + /** 编辑取消 - 之后 */ + afterEditCancel: 'afterCrudEditCancel', + /** 提交 - 之前 */ + beforeSubmit: 'beforeCrudSubmitCU', + /** 提交 - 之后 */ + afterSubmit: 'afterCrudSubmitCU', + afterAddError: 'afterCrudAddError', + afterEditError: 'afterCrudEditError' +} + +/** + * CRUD状态 + */ +CRUD.STATUS = { + NORMAL: 0, + PREPARED: 1, + PROCESSING: 2 +} + +/** + * CRUD通知类型 + */ +CRUD.NOTIFICATION_TYPE = { + SUCCESS: 'success', + WARNING: 'warning', + INFO: 'info', + ERROR: 'error' +} + +export default CRUD + +export { + presenter, + header, + form, + pagination, + crud +} diff --git a/src/components/Dict/Dict.js b/src/components/Dict/Dict.js index 1b81a4e..48554de 100644 --- a/src/components/Dict/Dict.js +++ b/src/components/Dict/Dict.js @@ -1,5 +1,5 @@ import Vue from 'vue' -import { get as getDictDetail } from '@/api/dictDetail' +import { get as getDictDetail } from '@/api/system/dictDetail' export default class Dict { constructor(dict) { diff --git a/src/views/dashboard/BarChart.vue b/src/components/Echarts/BarChart.vue similarity index 97% rename from src/views/dashboard/BarChart.vue rename to src/components/Echarts/BarChart.vue index 28e0aef..fa265ef 100644 --- a/src/views/dashboard/BarChart.vue +++ b/src/components/Echarts/BarChart.vue @@ -1,5 +1,5 @@ - + diff --git a/src/components/Echarts/Funnel.vue b/src/components/Echarts/Funnel.vue new file mode 100644 index 0000000..380b373 --- /dev/null +++ b/src/components/Echarts/Funnel.vue @@ -0,0 +1,120 @@ + + + + + diff --git a/src/components/Echarts/Gauge.vue b/src/components/Echarts/Gauge.vue new file mode 100644 index 0000000..40ce775 --- /dev/null +++ b/src/components/Echarts/Gauge.vue @@ -0,0 +1,74 @@ + + + + + diff --git a/src/components/Echarts/Graph.vue b/src/components/Echarts/Graph.vue new file mode 100644 index 0000000..a5a88b3 --- /dev/null +++ b/src/components/Echarts/Graph.vue @@ -0,0 +1,101 @@ + + + + + diff --git a/src/components/Echarts/HeatMap.vue b/src/components/Echarts/HeatMap.vue new file mode 100644 index 0000000..6606278 --- /dev/null +++ b/src/components/Echarts/HeatMap.vue @@ -0,0 +1,105 @@ + + + + + diff --git a/src/components/Echarts/Line3D.vue b/src/components/Echarts/Line3D.vue new file mode 100644 index 0000000..c3f16f6 --- /dev/null +++ b/src/components/Echarts/Line3D.vue @@ -0,0 +1,96 @@ + + + + + diff --git a/src/views/dashboard/PieChart.vue b/src/components/Echarts/PieChart.vue similarity index 96% rename from src/views/dashboard/PieChart.vue rename to src/components/Echarts/PieChart.vue index edb17d5..ff1bc52 100644 --- a/src/views/dashboard/PieChart.vue +++ b/src/components/Echarts/PieChart.vue @@ -1,5 +1,5 @@ - + diff --git a/src/views/dashboard/RaddarChart.vue b/src/components/Echarts/RadarChart.vue similarity index 97% rename from src/views/dashboard/RaddarChart.vue rename to src/components/Echarts/RadarChart.vue index 11fde32..de70e52 100644 --- a/src/views/dashboard/RaddarChart.vue +++ b/src/components/Echarts/RadarChart.vue @@ -1,5 +1,5 @@ - + diff --git a/src/components/Echarts/Sankey.vue b/src/components/Echarts/Sankey.vue new file mode 100644 index 0000000..49968c4 --- /dev/null +++ b/src/components/Echarts/Sankey.vue @@ -0,0 +1,100 @@ + + + + + diff --git a/src/components/Echarts/Scatter.vue b/src/components/Echarts/Scatter.vue new file mode 100644 index 0000000..b776efb --- /dev/null +++ b/src/components/Echarts/Scatter.vue @@ -0,0 +1,143 @@ + + + + + diff --git a/src/components/Echarts/Sunburst.vue b/src/components/Echarts/Sunburst.vue new file mode 100644 index 0000000..fafc1a8 --- /dev/null +++ b/src/components/Echarts/Sunburst.vue @@ -0,0 +1,107 @@ + + + + + diff --git a/src/components/Echarts/ThemeRiver.vue b/src/components/Echarts/ThemeRiver.vue new file mode 100644 index 0000000..967fc05 --- /dev/null +++ b/src/components/Echarts/ThemeRiver.vue @@ -0,0 +1,148 @@ + + + + + diff --git a/src/components/Echarts/WordCloud.vue b/src/components/Echarts/WordCloud.vue new file mode 100644 index 0000000..415f2a8 --- /dev/null +++ b/src/components/Echarts/WordCloud.vue @@ -0,0 +1,192 @@ + + + + + diff --git a/src/components/Github/index.vue b/src/components/Github/index.vue index 0d181d9..793956e 100644 --- a/src/components/Github/index.vue +++ b/src/components/Github/index.vue @@ -1,22 +1,16 @@ - - - +
+
-
-
diff --git a/src/components/Hamburger/index.vue b/src/components/Hamburger/index.vue
index e4cf00a..368b002 100644
--- a/src/components/Hamburger/index.vue
+++ b/src/components/Hamburger/index.vue
@@ -1,16 +1,13 @@
-
+
@@ -23,10 +20,11 @@ export default {
isActive: {
type: Boolean,
default: false
- },
- toggleClick: {
- type: Function,
- default: null
+ }
+ },
+ methods: {
+ toggleClick() {
+ this.$emit('toggleClick')
}
}
}
@@ -34,14 +32,13 @@ export default {
diff --git a/src/components/HeaderSearch/index.vue b/src/components/HeaderSearch/index.vue
new file mode 100644
index 0000000..be9b177
--- /dev/null
+++ b/src/components/HeaderSearch/index.vue
@@ -0,0 +1,180 @@
+
+
-
+
+
+
+
+
+
+
+
+
diff --git a/src/components/IconSelect/index.vue b/src/components/IconSelect/index.vue
index 719b3bc..0611dc5 100644
--- a/src/components/IconSelect/index.vue
+++ b/src/components/IconSelect/index.vue
@@ -2,7 +2,7 @@
diff --git a/src/components/IconSelect/requireIcons.js b/src/components/IconSelect/requireIcons.js
index 83a3395..99e5c54 100644
--- a/src/components/IconSelect/requireIcons.js
+++ b/src/components/IconSelect/requireIcons.js
@@ -1,5 +1,5 @@
-const req = require.context('../../icons/svg', false, /\.svg$/)
+const req = require.context('../../assets/icons/svg', false, /\.svg$/)
const requireAll = requireContext => requireContext.keys()
const re = /\.\/(.*)\.svg/
diff --git a/src/components/Iframe/index.vue b/src/components/Iframe/index.vue
index f8fa4a8..9f395a3 100644
--- a/src/components/Iframe/index.vue
+++ b/src/components/Iframe/index.vue
@@ -1,6 +1,6 @@
![]()
diff --git a/src/components/Permission/permission.js b/src/components/Permission/permission.js
index b27f24d..e731ebf 100644
--- a/src/components/Permission/permission.js
+++ b/src/components/Permission/permission.js
@@ -4,7 +4,6 @@ export default {
inserted(el, binding, vnode) {
const { value } = binding
const roles = store.getters && store.getters.roles
-
if (value && value instanceof Array && value.length > 0) {
const permissionRoles = value
@@ -16,7 +15,7 @@ export default {
el.parentNode && el.parentNode.removeChild(el)
}
} else {
- throw new Error(`need roles! Like v-permission="['admin','editor']"`)
+ throw new Error(`使用方式： v-permission="['admin','editor']"`)
}
}
}
diff --git a/src/components/RightPanel/index.vue b/src/components/RightPanel/index.vue
index 6d46d57..b65ecec 100644
--- a/src/components/RightPanel/index.vue
+++ b/src/components/RightPanel/index.vue
@@ -2,10 +2,6 @@
-
+
+
+
diff --git a/src/components/Pagination/index.vue b/src/components/Pagination/index.vue
new file mode 100644
index 0000000..c815e13
--- /dev/null
+++ b/src/components/Pagination/index.vue
@@ -0,0 +1,101 @@
+
+
+
+
+
+
+
+
diff --git a/src/components/PanThumb/index.vue b/src/components/PanThumb/index.vue
index ec549f4..de6940a 100644
--- a/src/components/PanThumb/index.vue
+++ b/src/components/PanThumb/index.vue
@@ -2,7 +2,7 @@
-
-
-
+
+
+ {{
+ item.label }}
+
+
+
+
+
+
diff --git a/src/components/SvgIcon/index.vue b/src/components/SvgIcon/index.vue
index 12a1f58..9a3318e 100644
--- a/src/components/SvgIcon/index.vue
+++ b/src/components/SvgIcon/index.vue
@@ -1,10 +1,14 @@
-
-
-
diff --git a/src/components/ThemePicker/index.vue b/src/components/ThemePicker/index.vue
new file mode 100644
index 0000000..ecc6d28
--- /dev/null
+++ b/src/components/ThemePicker/index.vue
@@ -0,0 +1,175 @@
+
+
-
@@ -21,35 +21,42 @@ export default {
return this.$store.state.tagsView.cachedViews
},
key() {
- return this.$route.fullPath
+ return this.$route.path
}
}
}
+
diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue
index 900e585..8d2fd8e 100644
--- a/src/layout/components/Navbar.vue
+++ b/src/layout/components/Navbar.vue
@@ -1,23 +1,31 @@
-
+
@@ -32,25 +9,17 @@ import screenfull from 'screenfull'
export default {
name: 'Screenfull',
- props: {
- width: {
- type: Number,
- default: 22
- },
- height: {
- type: Number,
- default: 22
- },
- fill: {
- type: String,
- default: '#48576a'
- }
- },
data() {
return {
isFullscreen: false
}
},
+ mounted() {
+ this.init()
+ },
+ beforeDestroy() {
+ this.destroy()
+ },
methods: {
click() {
if (!screenfull.enabled) {
@@ -61,6 +30,19 @@ export default {
return false
}
screenfull.toggle()
+ },
+ change() {
+ this.isFullscreen = screenfull.isFullscreen
+ },
+ init() {
+ if (screenfull.enabled) {
+ screenfull.on('change', this.change)
+ }
+ },
+ destroy() {
+ if (screenfull.enabled) {
+ screenfull.off('change', this.change)
+ }
}
}
}
diff --git a/src/components/SizeSelect/index.vue b/src/components/SizeSelect/index.vue
new file mode 100644
index 0000000..e490dce
--- /dev/null
+++ b/src/components/SizeSelect/index.vue
@@ -0,0 +1,57 @@
+
+
+
+
-
+
@@ -9,7 +9,7 @@ import CodeMirror from 'codemirror'
import 'codemirror/lib/codemirror.css'
// 替换主题这里需修改名称
import 'codemirror/theme/idea.css'
-require('codemirror/mode/yaml/yaml.js')
+import 'codemirror/mode/yaml/yaml'
export default {
props: {
value: {
diff --git a/src/icons/svg/add.svg b/src/icons/svg/add.svg
deleted file mode 100644
index d9edd88..0000000
--- a/src/icons/svg/add.svg
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/src/icons/svg/github.svg b/src/icons/svg/github.svg
deleted file mode 100644
index a58c9be..0000000
--- a/src/icons/svg/github.svg
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/src/icons/svg/monitor.svg b/src/icons/svg/monitor.svg
deleted file mode 100644
index c5a1f46..0000000
--- a/src/icons/svg/monitor.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-<<<<<<< HEAD
-
-=======
-
->>>>>>> 2.3dev
diff --git a/src/icons/svg/run.svg b/src/icons/svg/run.svg
deleted file mode 100644
index 9eaddb6..0000000
--- a/src/icons/svg/run.svg
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/src/icons/svg/running.svg b/src/icons/svg/running.svg
deleted file mode 100644
index 59c5873..0000000
--- a/src/icons/svg/running.svg
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/src/icons/svg/sys-tools.svg b/src/icons/svg/sys-tools.svg
deleted file mode 100644
index c813067..0000000
--- a/src/icons/svg/sys-tools.svg
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/src/icons/svg/zujian.svg b/src/icons/svg/zujian.svg
deleted file mode 100644
index 8e0cc0a..0000000
--- a/src/icons/svg/zujian.svg
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/src/layout/components/AppMain.vue b/src/layout/components/AppMain.vue
index 5c3a0b5..c235dc9 100644
--- a/src/layout/components/AppMain.vue
+++ b/src/layout/components/AppMain.vue
@@ -2,11 +2,11 @@
-
+
-
-
-
-
-
+
+
+
+
+
-
+
+
![]()
-
+
@@ -50,14 +58,19 @@
import { mapGetters } from 'vuex'
import Breadcrumb from '@/components/Breadcrumb'
import Hamburger from '@/components/Hamburger'
-import Screenfull from '@/components/Screenfull'
import Github from '@/components/Github'
-import Avatar from '@/assets/avatar/avatar.png'
+import Screenfull from '@/components/Screenfull'
+import SizeSelect from '@/components/SizeSelect'
+import Search from '@/components/HeaderSearch'
+import Avatar from '@/assets/images/avatar.png'
+
export default {
components: {
Breadcrumb,
Hamburger,
Screenfull,
+ SizeSelect,
+ Search,
Github
},
data() {
@@ -69,23 +82,26 @@ export default {
computed: {
...mapGetters([
'sidebar',
- 'user',
'device',
+ 'user',
'baseApi'
]),
show: {
get() {
- return this.$store.state.settings.showRightPanel
+ return this.$store.state.settings.showSettings
},
set(val) {
- this.$store.dispatch('changeSetting', {
- key: 'showRightPanel',
+ this.$store.dispatch('settings/changeSetting', {
+ key: 'showSettings',
value: val
})
}
}
},
methods: {
+ toggleSideBar() {
+ this.$store.dispatch('app/toggleSideBar')
+ },
open() {
this.$confirm('确定注销并退出系统吗？', '提示', {
confirmButtonText: '确定',
@@ -95,77 +111,95 @@ export default {
this.logout()
})
},
- toggleSideBar() {
- this.$store.dispatch('ToggleSideBar')
- },
logout() {
- this.dialogVisible = false
this.$store.dispatch('LogOut').then(() => {
- location.reload() // 为了重新实例化vue-router对象 避免bug
+ location.reload()
})
}
}
}
-
diff --git a/src/layout/components/Settings/index.vue b/src/layout/components/Settings/index.vue
index bc1ee6c..749de87 100644
--- a/src/layout/components/Settings/index.vue
+++ b/src/layout/components/Settings/index.vue
@@ -1,33 +1,42 @@
diff --git a/src/layout/components/Sidebar/FixiOSBug.js b/src/layout/components/Sidebar/FixiOSBug.js
index 5e0a926..bc14856 100644
--- a/src/layout/components/Sidebar/FixiOSBug.js
+++ b/src/layout/components/Sidebar/FixiOSBug.js
@@ -5,16 +5,16 @@ export default {
}
},
mounted() {
- // In order to fix the click on menu on the ios device will trigger the mouseeleave bug
+ // In order to fix the click on menu on the ios device will trigger the mouseleave bug
// https://github.com/PanJiaChen/vue-element-admin/issues/1135
this.fixBugIniOS()
},
methods: {
fixBugIniOS() {
- const $submenu = this.$refs.submenu
- if ($submenu) {
- const handleMouseleave = $submenu.handleMouseleave
- $submenu.handleMouseleave = (e) => {
+ const $subMenu = this.$refs.subMenu
+ if ($subMenu) {
+ const handleMouseleave = $subMenu.handleMouseleave
+ $subMenu.handleMouseleave = (e) => {
if (this.device === 'mobile') {
return
}
diff --git a/src/layout/components/Sidebar/Link.vue b/src/layout/components/Sidebar/Link.vue
index 5d366f2..eb4dd10 100644
--- a/src/layout/components/Sidebar/Link.vue
+++ b/src/layout/components/Sidebar/Link.vue
@@ -1,13 +1,13 @@
-
+
-
-
diff --git a/src/layout/components/Sidebar/SidebarItem.vue b/src/layout/components/Sidebar/SidebarItem.vue
index eb57b2a..2d49dd8 100644
--- a/src/layout/components/Sidebar/SidebarItem.vue
+++ b/src/layout/components/Sidebar/SidebarItem.vue
@@ -1,41 +1,32 @@
-
-
系统布局配置
+系统布局设置
+
- 显示 Logo
-
+
- 固定 Header
-
-
- 开启 Tags-Views
+ 显示标签
+
- 显示 SettingButton
-
+
- 菜单 UniqueOpened
+ 显示LOGO
+
+
+
+ 菜单UniqueOpened
+
+
-
-
-
diff --git a/src/layout/mixin/ResizeHandler.js b/src/layout/mixin/ResizeHandler.js
index 2636d5b..e8d0df8 100644
--- a/src/layout/mixin/ResizeHandler.js
+++ b/src/layout/mixin/ResizeHandler.js
@@ -1,39 +1,43 @@
import store from '@/store'
const { body } = document
-const WIDTH = 1024
-const RATIO = 3
+const WIDTH = 992 // refer to Bootstrap's responsive design
export default {
watch: {
$route(route) {
if (this.device === 'mobile' && this.sidebar.opened) {
- store.dispatch('closeSideBar', { withoutAnimation: false })
+ store.dispatch('app/closeSideBar', { withoutAnimation: false })
}
}
},
beforeMount() {
- window.addEventListener('resize', this.resizeHandler)
+ window.addEventListener('resize', this.$_resizeHandler)
+ },
+ beforeDestroy() {
+ window.removeEventListener('resize', this.$_resizeHandler)
},
mounted() {
- const isMobile = this.isMobile()
+ const isMobile = this.$_isMobile()
if (isMobile) {
- store.dispatch('toggleDevice', 'mobile')
- store.dispatch('closeSideBar', { withoutAnimation: true })
+ store.dispatch('app/toggleDevice', 'mobile')
+ store.dispatch('app/closeSideBar', { withoutAnimation: true })
}
},
methods: {
- isMobile() {
+ // use $_ for mixins properties
+ // https://vuejs.org/v2/style-guide/index.html#Private-property-names-essential
+ $_isMobile() {
const rect = body.getBoundingClientRect()
- return rect.width - RATIO < WIDTH
+ return rect.width - 1 < WIDTH
},
- resizeHandler() {
+ $_resizeHandler() {
if (!document.hidden) {
- const isMobile = this.isMobile()
- store.dispatch('toggleDevice', isMobile ? 'mobile' : 'desktop')
+ const isMobile = this.$_isMobile()
+ store.dispatch('app/toggleDevice', isMobile ? 'mobile' : 'desktop')
if (isMobile) {
- store.dispatch('closeSideBar', { withoutAnimation: true })
+ store.dispatch('app/closeSideBar', { withoutAnimation: true })
}
}
}
diff --git a/src/main.js b/src/main.js
index 51d4870..f785423 100644
--- a/src/main.js
+++ b/src/main.js
@@ -1,34 +1,43 @@
import Vue from 'vue'
-import 'normalize.css/normalize.css' // A modern alternative to CSS resets
-import ElementUI from 'element-ui'
-import 'element-ui/lib/theme-chalk/index.css'
-import locale from 'element-ui/lib/locale/lang/zh-CN' // lang i18n
+import Cookies from 'js-cookie'
+
+import 'normalize.css/normalize.css'
+
+import Element from 'element-ui'
+//
import mavonEditor from 'mavon-editor'
import 'mavon-editor/dist/css/index.css'
-import '@/styles/index.scss' // global css
+
+// 数据字典
+import dict from './components/Dict'
+
+// 权限指令
+import permission from './components/Permission'
+import './assets/styles/element-variables.scss'
+// global css
+import './assets/styles/index.scss'
+
+// 代码高亮
+import VueHighlightJS from 'vue-highlightjs'
+import 'highlight.js/styles/atom-one-dark.css'
import App from './App'
-import router from './router/routers'
-import permission from './components/Permission'
-import dict from './components/Dict'
import store from './store'
+import router from './router/routers'
-import '@/icons' // icon
+import './assets/icons' // icon
import './router/index' // permission control
-import Router from 'vue-router'
+Vue.use(VueHighlightJS)
Vue.use(mavonEditor)
Vue.use(permission)
Vue.use(dict)
-Vue.use(ElementUI, { locale })
-Vue.config.productionTip = false
+Vue.use(Element, {
+ size: Cookies.get('size') || 'small' // set element-ui default size
+})
-const routerPush = Router.prototype.push
-Router.prototype.push = function push(location) {
- return routerPush.call(this, location).catch(error => error)
-}
-require('babel-polyfill')
+Vue.config.productionTip = false
new Vue({
el: '#app',
diff --git a/src/mixins/crud.js b/src/mixins/crud.js
new file mode 100644
index 0000000..0ccbde2
--- /dev/null
+++ b/src/mixins/crud.js
@@ -0,0 +1,337 @@
+import {
+ initData,
+ download
+} from '@/api/data'
+import {
+ parseTime,
+ downloadFile
+} from '@/utils/index'
+import checkPermission from '@/utils/permission'
+
+export default {
+ data() {
+ return {
+ // 表格数据
+ data: [],
+ // 排序规则，默认 id 降序， 支持多字段排序 ['id,desc', 'createTime,asc']
+ sort: ['id,desc'],
+ // 页码
+ page: 0,
+ // 每页数据条数
+ size: 10,
+ // 总数据条数
+ total: 0,
+ // 请求数据的url
+ url: '',
+ // 查询数据的参数
+ params: {},
+ // 待查询的对象
+ query: {},
+ // 等待时间
+ time: 50,
+ // 是否为新增类型的表单
+ isAdd: false,
+ // 导出的 Loading
+ downloadLoading: false,
+ // 表格 Loading 属性
+ loading: true,
+ // 删除 Loading 属性
+ delLoading: false,
+ delAllLoading: false,
+ // 弹窗属性
+ dialog: false,
+ // Form 表单
+ form: {},
+ // 重置表单
+ resetForm: {},
+ // 标题
+ title: ''
+ }
+ },
+ methods: {
+ parseTime,
+ downloadFile,
+ checkPermission,
+ async init() {
+ if (!await this.beforeInit()) {
+ return
+ }
+ return new Promise((resolve, reject) => {
+ this.loading = true
+ // 请求数据
+ initData(this.url, this.getQueryParame()).then(data => {
+ this.total = data.totalElements
+ this.data = data.content
+ // time 毫秒后显示表格
+ setTimeout(() => {
+ this.loading = false
+ }, this.time)
+ resolve(data)
+ }).catch(err => {
+ this.loading = false
+ reject(err)
+ })
+ })
+ },
+ beforeInit() {
+ return true
+ },
+ getQueryParame: function() {
+ return {
+ page: this.page,
+ size: this.size,
+ sort: this.sort,
+ ...this.query,
+ ...this.params
+ }
+ },
+ // 改变页码
+ pageChange(e) {
+ this.page = e - 1
+ this.init()
+ },
+ // 改变每页显示数
+ sizeChange(e) {
+ this.page = 0
+ this.size = e
+ this.init()
+ },
+ // 预防删除第二页最后一条数据时，或者多选删除第二页的数据时，页码错误导致请求无数据
+ dleChangePage(size) {
+ if (size === undefined) {
+ size = 1
+ }
+ if (this.data.length === size && this.page !== 0) {
+ this.page = this.page - 1
+ }
+ },
+ // 查询方法
+ toQuery() {
+ this.page = 0
+ this.init()
+ },
+ /**
+ * 通用的提示封装
+ */
+ submitSuccessNotify() {
+ this.$notify({
+ title: '提交成功',
+ type: 'success',
+ duration: 2500
+ })
+ },
+ addSuccessNotify() {
+ this.$notify({
+ title: '新增成功',
+ type: 'success',
+ duration: 2500
+ })
+ },
+ editSuccessNotify() {
+ this.$notify({
+ title: '编辑成功',
+ type: 'success',
+ duration: 2500
+ })
+ },
+ delSuccessNotify() {
+ this.$notify({
+ title: '删除成功',
+ type: 'success',
+ duration: 2500
+ })
+ },
+ notify(title, type) {
+ this.$notify({
+ title: title,
+ type: type,
+ duration: 2500
+ })
+ },
+ /**
+ * 删除前可以调用 beforeDelMethod 做一些操作
+ */
+ beforeDelMethod() {
+ return true
+ },
+ /**
+ * 通用的删除
+ */
+ delMethod(id) {
+ if (!this.beforeDelMethod()) {
+ return
+ }
+ this.delLoading = true
+ this.crudMethod.del(id).then(() => {
+ this.delLoading = false
+ this.$refs[id].doClose()
+ this.dleChangePage()
+ this.delSuccessNotify()
+ this.afterDelMethod()
+ this.init()
+ }).catch(() => {
+ this.delLoading = false
+ this.$refs[id].doClose()
+ })
+ },
+ afterDelMethod() {},
+ /**
+ * 多选删除提示
+ */
+ beforeDelAllMethod() {
+ this.$confirm('你确定删除选中的数据吗？', '提示', {
+ confirmButtonText: '确定',
+ cancelButtonText: '取消',
+ type: 'warning'
+ }).then(() => {
+ this.delAllMethod()
+ })
+ },
+ /**
+ * 多选删除
+ */
+ delAllMethod() {
+ this.delAllLoading = true
+ const data = this.$refs.table.selection
+ const ids = []
+ for (let i = 0; i < data.length; i++) {
+ ids.push(data[i].id)
+ }
+ this.crudMethod.delAll(ids).then(() => {
+ this.delAllLoading = false
+ this.dleChangePage(ids.length)
+ this.init()
+ this.$notify({
+ title: '删除成功',
+ type: 'success',
+ duration: 2500
+ })
+ }).catch(() => {
+ this.delAllLoading = false
+ })
+ },
+ /**
+ * 显示新增弹窗前可以调用该方法
+ */
+ beforeShowAddForm() {},
+ /**
+ * 显示新增弹窗
+ */
+ showAddFormDialog() {
+ this.isAdd = true
+ this.resetForm = JSON.parse(JSON.stringify(this.form))
+ this.beforeShowAddForm()
+ this.dialog = true
+ },
+ /**
+ * 显示编辑弹窗前可以调用该方法
+ */
+ beforeShowEditForm(data) {},
+ /**
+ * 显示编辑弹窗
+ */
+ showEditFormDialog(data = '') {
+ this.isAdd = false
+ if (data) {
+ this.resetForm = JSON.parse(JSON.stringify(this.form))
+ this.form = JSON.parse(JSON.stringify(data))
+ }
+ this.beforeShowEditForm(data)
+ this.dialog = true
+ },
+ /**
+ * 新增方法
+ */
+ addMethod() {
+ this.crudMethod.add(this.form).then(() => {
+ this.addSuccessNotify()
+ this.loading = false
+ this.afterAddMethod()
+ this.cancel()
+ this.init()
+ }).catch(() => {
+ this.loading = false
+ this.afterAddErrorMethod()
+ })
+ },
+ /**
+ * 新增后可以调用该方法
+ */
+ afterAddMethod() {},
+ /**
+ * 新增失败后调用该方法
+ */
+ afterAddErrorMethod() {},
+ /**
+ * 通用的编辑方法
+ */
+ editMethod() {
+ this.crudMethod.edit(this.form).then(() => {
+ this.editSuccessNotify()
+ this.loading = false
+ this.afterEditMethod()
+ this.cancel()
+ this.init()
+ }).catch(() => {
+ this.loading = false
+ })
+ },
+ /**
+ * 编辑后可以调用该方法
+ */
+ afterEditMethod() {},
+ /**
+ * 提交前可以调用该方法
+ */
+ beforeSubmitMethod() {
+ return true
+ },
+ /**
+ * 提交
+ */
+ submitMethod() {
+ if (!this.beforeSubmitMethod()) {
+ return
+ }
+ if (this.$refs['form']) {
+ this.$refs['form'].validate((valid) => {
+ if (valid) {
+ this.loading = true
+ if (this.isAdd) {
+ this.addMethod()
+ } else this.editMethod()
+ }
+ })
+ }
+ },
+ /**
+ * 隐藏弹窗
+ */
+ cancel() {
+ this.dialog = false
+ if (this.$refs['form']) {
+ this.$refs['form'].clearValidate()
+ this.form = this.resetForm
+ }
+ },
+ /**
+ * 获取弹窗的标题
+ */
+ getFormTitle() {
+ return this.isAdd ? `新增${this.title}` : `编辑${this.title}`
+ },
+ /**
+ * 通用导出
+ */
+ downloadMethod() {
+ this.beforeInit()
+ this.downloadLoading = true
+ download(this.url + '/download', this.params).then(result => {
+ this.downloadFile(result, this.title + '数据', 'xlsx')
+ this.downloadLoading = false
+ }).catch(() => {
+ this.downloadLoading = false
+ })
+ }
+ }
+}
diff --git a/src/mixins/initData.js b/src/mixins/initData.js
deleted file mode 100644
index 2162dc1..0000000
--- a/src/mixins/initData.js
+++ /dev/null
@@ -1,55 +0,0 @@
-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, downloadLoading: false
- }
- },
- methods: {
- async init() {
- if (!await this.beforeInit()) {
- return
- }
- return new Promise((resolve, reject) => {
- this.loading = true
- initData(this.url, this.params).then(res => {
- this.total = res.totalElements
- this.data = res.content
- setTimeout(() => {
- this.loading = false
- }, this.time)
- resolve(res)
- }).catch(err => {
- this.loading = false
- reject(err)
- })
- })
- },
- beforeInit() {
- return true
- },
- pageChange(e) {
- this.page = e - 1
- this.init()
- },
- sizeChange(e) {
- this.page = 0
- this.size = e
- this.init()
- },
- // 预防删除第二页最后一条数据时，或者多选删除第二页的数据时，页码错误导致请求无数据
- dleChangePage(size) {
- if (size === undefined) {
- size = 1
- }
- if (this.data.length === size && this.page !== 0) {
- this.page = this.page - 1
- }
- },
- toQuery() {
- this.page = 0
- this.init()
- }
- }
-}
diff --git a/src/mixins/initDict.js b/src/mixins/initDict.js
deleted file mode 100644
index 43b8cdf..0000000
--- a/src/mixins/initDict.js
+++ /dev/null
@@ -1,41 +0,0 @@
-import { get, getDictMap } from '@/api/dictDetail'
-
-export default {
- data() {
- return {
- dicts: [], dictMap: {}
- }
- },
- methods: {
- async getDict(name) {
- return new Promise((resolve, reject) => {
- get(name).then(res => {
- this.dicts = res.content
- resolve(res)
- }).catch(err => {
- reject(err)
- })
- })
- },
- // 多个字典查询时使用逗号拼接， 如：
- // 加载多个数据字典，如何调用如下：
- // this.getDict('user_status,job_status')
- // 在vue中使用加载出来的字典：
- // dictMap.[字典名称] 如：dictMap.user_status、 dictMap.job_status
- async getDictMap(names) {
- // 优先放入到dictMap中，避免页面加载时 undefined
- const arr = names.split(',')
- for (let i = 0; i < arr.length; i++) {
- this.dictMap[arr[i]] = []
- }
- return new Promise((resolve, reject) => {
- getDictMap(names).then(res => {
- this.dictMap = res
- resolve(res)
- }).catch(err => {
- reject(err)
- })
- })
- }
- }
-}
diff --git a/src/router/index.js b/src/router/index.js
index ecacf7f..b2a231b 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -1,10 +1,10 @@
import router from './routers'
import store from '@/store'
-import Config from '@/config'
+import Config from '@/settings'
import NProgress from 'nprogress' // progress bar
import 'nprogress/nprogress.css'// progress bar style
import { getToken } from '@/utils/auth' // getToken from cookie
-import { buildMenus } from '@/api/menu'
+import { buildMenus } from '@/api/system/menu'
import { filterAsyncRouter } from '@/store/modules/permission'
NProgress.configure({ showSpinner: false })// NProgress Configuration
@@ -13,14 +13,14 @@ const whiteList = ['/login']// no redirect whitelist
router.beforeEach((to, from, next) => {
if (to.meta.title) {
- document.title = to.meta.title + ' - ' + Config.webName
+ document.title = to.meta.title + ' - ' + Config.title
}
- NProgress.start() // start progress bar
+ NProgress.start()
if (getToken()) {
// 已登录且要跳转的页面是登录页
if (to.path === '/login') {
next({ path: '/' })
- NProgress.done() // if current page is dashboard will not trigger afterEach hook, so manually handle it
+ NProgress.done()
} else {
if (store.getters.roles.length === 0) { // 判断当前用户是否已拉取完user_info信息
store.dispatch('GetInfo').then(res => { // 拉取user_info
diff --git a/src/router/routers.js b/src/router/routers.js
index 492de7e..dbdfb78 100644
--- a/src/router/routers.js
+++ b/src/router/routers.js
@@ -1,24 +1,9 @@
import Vue from 'vue'
import Router from 'vue-router'
+import Layout from '../layout/index'
Vue.use(Router)
-/* Layout */
-import Layout from '../layout/Layout'
-
-/**
-* hidden: true if `hidden:true` will not show in the sidebar(default is false)
-* alwaysShow: true if set true, will always show the root menu, whatever its child routes length
-* if not set alwaysShow, only more than one route under the children
-* it will becomes nested mode, otherwise not show the root menu
-* redirect: noredirect if `redirect:noredirect` will no redirect in the breadcrumb
-* name:'router-name' the name is used by (must set!!!)
-* meta : {
- title: 'title' the name show in submenu and breadcrumb (recommend set)
- icon: 'svg-name' the icon show in the sidebar,
- }
-**/
-
export const constantRouterMap = [
{ path: '/login',
meta: { title: '登录', noCache: true },
@@ -49,13 +34,13 @@ export const constantRouterMap = [
{
path: '/',
component: Layout,
- redirect: 'dashboard',
+ redirect: '/dashboard',
children: [
{
path: 'dashboard',
component: () => import('@/views/home'),
- name: '首页',
- meta: { title: '首页', icon: 'index', noCache: true, affix: true }
+ name: 'Dashboard',
+ meta: { title: '首页', icon: 'index', affix: true, noCache: true }
}
]
},
@@ -69,11 +54,10 @@ export const constantRouterMap = [
path: 'center',
component: () => import('@/views/system/user/center'),
name: '个人中心',
- meta: { title: '个人中心', icon: 'user' }
+ meta: { title: '个人中心' }
}
]
}
- // { path: '*', redirect: '/404', hidden: true }
]
export default new Router({
diff --git a/src/config/index.js b/src/settings.js
similarity index 81%
rename from src/config/index.js
rename to src/settings.js
index 492405f..fc96165 100644
--- a/src/config/index.js
+++ b/src/settings.js
@@ -1,19 +1,24 @@
-/**
- * @description 系统全局配置
- */
-export default {
+module.exports = {
+ /**
+ * @description 网站标题
+ */
+ title: 'EL-ADMIN',
+ /**
+ * @description 是否显示 tagsView
+ */
+ tagsView: true,
+ /**
+ * @description 固定头部
+ */
+ fixedHeader: true,
/**
* @description 记住密码状态下的token在Cookie中存储的天数，默认1天
*/
tokenCookieExpires: 1,
/**
- * @description 记住密码状态下的密码在Cookie中存储的天数，默认1天
+ * @description 记住密码状态下的密码在Cookie中存储的天数，默认1天s
*/
passCookieExpires: 1,
- /**
- * @description 此处修改网站名称
- */
- webName: 'EL-ADMIN',
/**
* @description 是否只保持一个子菜单的展开
*/
@@ -22,42 +27,22 @@ export default {
* @description token key
*/
TokenKey: 'EL-ADMIN-TOEKN',
-
/**
* @description 请求超时时间，毫秒（默认2分钟）
*/
timeout: 1200000,
-
- /**
- * @description 是否显示 tagsView
- */
- tagsView: true,
-
- /**
- * @description 固定头部
- */
- fixedHeader: true,
-
/**
* @description 是否显示logo
*/
sidebarLogo: true,
-
- /**
- * 是否显示设置的悬浮按钮
- */
- settingBtn: false,
-
/**
* 是否显示设置的底部信息
*/
showFooter: true,
-
/**
* 底部文字，支持html语法
*/
footerTxt: '© 2019 Zheng Jie Apache License 2.0',
-
/**
* 备案号
*/
diff --git a/src/store/getters.js b/src/store/getters.js
index 6273784..376e2a8 100644
--- a/src/store/getters.js
+++ b/src/store/getters.js
@@ -1,4 +1,7 @@
const getters = {
+ deployUploadApi: state => state.api.deployUploadApi,
+ databaseUploadApi: state => state.api.databaseUploadApi,
+ size: state => state.app.size,
sidebar: state => state.app.sidebar,
device: state => state.app.device,
token: state => state.user.token,
diff --git a/src/store/index.js b/src/store/index.js
index 1fc27ae..0fd8395 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -1,24 +1,24 @@
import Vue from 'vue'
import Vuex from 'vuex'
-import app from './modules/app'
-import api from './modules/api'
-import user from './modules/user'
-import tagsView from './modules/tagsView'
-import permission from './modules/permission'
-import settings from './modules/settings'
import getters from './getters'
Vue.use(Vuex)
+// https://webpack.js.org/guides/dependency-management/#requirecontext
+const modulesFiles = require.context('./modules', true, /\.js$/)
+
+// you do not need `import app from './modules/app'`
+// it will auto require all vuex module from modules file
+const modules = modulesFiles.keys().reduce((modules, modulePath) => {
+ // set './app.js' => 'app'
+ const moduleName = modulePath.replace(/^\.\/(.*)\.\w+$/, '$1')
+ const value = modulesFiles(modulePath)
+ modules[moduleName] = value.default
+ return modules
+}, {})
+
const store = new Vuex.Store({
- modules: {
- app,
- api,
- user,
- tagsView,
- permission,
- settings
- },
+ modules,
getters
})
diff --git a/src/store/modules/api.js b/src/store/modules/api.js
index dbda078..92202f6 100644
--- a/src/store/modules/api.js
+++ b/src/store/modules/api.js
@@ -1,6 +1,10 @@
-const baseUrl = process.env.BASE_API
+const baseUrl = process.env.VUE_APP_BASE_API
const api = {
state: {
+ // 部署包上传
+ deployUploadApi: baseUrl + '/api/deploy/upload',
+ // SQL脚本上传
+ databaseUploadApi: baseUrl + '/api/database/upload',
// 实时控制台
socketApi: baseUrl + '/websocket?token=kl',
// 图片上传
diff --git a/src/store/modules/app.js b/src/store/modules/app.js
index 8aefaa6..a384479 100644
--- a/src/store/modules/app.js
+++ b/src/store/modules/app.js
@@ -1,43 +1,56 @@
import Cookies from 'js-cookie'
-const app = {
- state: {
- sidebar: {
- opened: !+Cookies.get('sidebarStatus'),
- withoutAnimation: false
- },
- device: 'desktop'
+const state = {
+ sidebar: {
+ opened: Cookies.get('sidebarStatus') ? !!+Cookies.get('sidebarStatus') : true,
+ withoutAnimation: false
},
- mutations: {
- TOGGLE_SIDEBAR: state => {
- if (state.sidebar.opened) {
- Cookies.set('sidebarStatus', 1)
- } else {
- Cookies.set('sidebarStatus', 0)
- }
- state.sidebar.opened = !state.sidebar.opened
- state.sidebar.withoutAnimation = false
- },
- CLOSE_SIDEBAR: (state, withoutAnimation) => {
+ device: 'desktop',
+ size: Cookies.get('size') || 'small'
+}
+
+const mutations = {
+ TOGGLE_SIDEBAR: state => {
+ state.sidebar.opened = !state.sidebar.opened
+ state.sidebar.withoutAnimation = false
+ if (state.sidebar.opened) {
Cookies.set('sidebarStatus', 1)
- state.sidebar.opened = false
- state.sidebar.withoutAnimation = withoutAnimation
- },
- TOGGLE_DEVICE: (state, device) => {
- state.device = device
+ } else {
+ Cookies.set('sidebarStatus', 0)
}
},
- actions: {
- ToggleSideBar: ({ commit }) => {
- commit('TOGGLE_SIDEBAR')
- },
- closeSideBar({ commit }, { withoutAnimation }) {
- commit('CLOSE_SIDEBAR', withoutAnimation)
- },
- toggleDevice({ commit }, device) {
- commit('TOGGLE_DEVICE', device)
- }
+ CLOSE_SIDEBAR: (state, withoutAnimation) => {
+ Cookies.set('sidebarStatus', 0)
+ state.sidebar.opened = false
+ state.sidebar.withoutAnimation = withoutAnimation
+ },
+ TOGGLE_DEVICE: (state, device) => {
+ state.device = device
+ },
+ SET_SIZE: (state, size) => {
+ state.size = size
+ Cookies.set('size', size)
}
}
-export default app
+const actions = {
+ toggleSideBar({ commit }) {
+ commit('TOGGLE_SIDEBAR')
+ },
+ closeSideBar({ commit }, { withoutAnimation }) {
+ commit('CLOSE_SIDEBAR', withoutAnimation)
+ },
+ toggleDevice({ commit }, device) {
+ commit('TOGGLE_DEVICE', device)
+ },
+ setSize({ commit }, size) {
+ commit('SET_SIZE', size)
+ }
+}
+
+export default {
+ namespaced: true,
+ state,
+ mutations,
+ actions
+}
diff --git a/src/store/modules/permission.js b/src/store/modules/permission.js
index ef77b71..35d1e8e 100644
--- a/src/store/modules/permission.js
+++ b/src/store/modules/permission.js
@@ -1,5 +1,5 @@
import { constantRouterMap } from '@/router/routers'
-import Layout from '@/layout/Layout'
+import Layout from '@/layout/index'
const permission = {
state: {
@@ -20,7 +20,7 @@ const permission = {
}
export const filterAsyncRouter = (routers) => { // 遍历后台传来的路由字符串，转换为组件对象
- const accessedRouters = routers.filter(router => {
+ return routers.filter(router => {
if (router.component) {
if (router.component === 'Layout') { // Layout组件特殊处理
router.component = Layout
@@ -34,10 +34,9 @@ export const filterAsyncRouter = (routers) => { // 遍历后台传来的路由
}
return true
})
- return accessedRouters
}
-export const loadView = (view) => { // 路由懒加载
+export const loadView = (view) => {
return () => import(`@/views/${view}`)
}
diff --git a/src/store/modules/settings.js b/src/store/modules/settings.js
index 64bbb45..c913e59 100644
--- a/src/store/modules/settings.js
+++ b/src/store/modules/settings.js
@@ -1,30 +1,38 @@
-import Config from '@/config'
-import variables from '@/styles/element-variables.scss'
+import variables from '@/assets/styles/element-variables.scss'
+import defaultSettings from '@/settings'
-const settings = {
- state: {
- showRightPanel: false,
- tagsView: Config.tagsView,
- fixedHeader: Config.fixedHeader,
- sidebarLogo: Config.sidebarLogo,
- theme: variables.theme,
- settingBtn: Config.settingBtn,
- uniqueOpened: Config.uniqueOpened,
- showFooter: Config.showFooter,
- footerTxt: Config.footerTxt,
- caseNumber: Config.caseNumber
- },
- mutations: {
- CHANGE_SETTING: (state, { key, value }) => {
- if (state.hasOwnProperty(key)) {
- state[key] = value
- }
- }
- },
- actions: {
- changeSetting({ commit }, data) {
- commit('CHANGE_SETTING', data)
+const { tagsView, fixedHeader, sidebarLogo, uniqueOpened, showFooter, footerTxt, caseNumber } = defaultSettings
+
+const state = {
+ theme: variables.theme,
+ showSettings: false,
+ tagsView: tagsView,
+ fixedHeader: fixedHeader,
+ sidebarLogo: sidebarLogo,
+ uniqueOpened: uniqueOpened,
+ showFooter: showFooter,
+ footerTxt: footerTxt,
+ caseNumber: caseNumber
+}
+
+const mutations = {
+ CHANGE_SETTING: (state, { key, value }) => {
+ if (state.hasOwnProperty(key)) {
+ state[key] = value
}
}
}
-export default settings
+
+const actions = {
+ changeSetting({ commit }, data) {
+ commit('CHANGE_SETTING', data)
+ }
+}
+
+export default {
+ namespaced: true,
+ state,
+ mutations,
+ actions
+}
+
diff --git a/src/store/modules/tagsView.js b/src/store/modules/tagsView.js
index 0b457ab..3e2c170 100644
--- a/src/store/modules/tagsView.js
+++ b/src/store/modules/tagsView.js
@@ -1,162 +1,165 @@
-const tagsView = {
- state: {
- visitedViews: [],
- cachedViews: []
+const state = {
+ visitedViews: [],
+ cachedViews: []
+}
+
+const mutations = {
+ ADD_VISITED_VIEW: (state, view) => {
+ if (state.visitedViews.some(v => v.path === view.path)) return
+ state.visitedViews.push(
+ Object.assign({}, view, {
+ title: view.meta.title || 'no-name'
+ })
+ )
+ },
+ ADD_CACHED_VIEW: (state, view) => {
+ if (state.cachedViews.includes(view.name)) return
+ if (!view.meta.noCache) {
+ state.cachedViews.push(view.name)
+ }
},
- mutations: {
- ADD_VISITED_VIEW: (state, view) => {
- if (state.visitedViews.some(v => v.path === view.path)) return
- state.visitedViews.push(
- Object.assign({}, view, {
- title: view.meta.title || 'no-name'
- })
- )
- },
- ADD_CACHED_VIEW: (state, view) => {
- if (state.cachedViews.includes(view.name)) return
- if (!view.meta.noCache) {
- state.cachedViews.push(view.name)
- }
- },
- DEL_VISITED_VIEW: (state, view) => {
- for (const [i, v] of state.visitedViews.entries()) {
- if (v.path === view.path) {
- state.visitedViews.splice(i, 1)
- break
- }
- }
- },
- DEL_CACHED_VIEW: (state, view) => {
- for (const i of state.cachedViews) {
- if (i === view.name) {
- const index = state.cachedViews.indexOf(i)
- state.cachedViews.splice(index, 1)
- break
- }
- }
- },
-
- DEL_OTHERS_VISITED_VIEWS: (state, view) => {
- for (const [i, v] of state.visitedViews.entries()) {
- if (v.path === view.path) {
- state.visitedViews = state.visitedViews.slice(i, i + 1)
- break
- }
- }
- },
- DEL_OTHERS_CACHED_VIEWS: (state, view) => {
- for (const i of state.cachedViews) {
- if (i === view.name) {
- const index = state.cachedViews.indexOf(i)
- state.cachedViews = state.cachedViews.slice(index, index + 1)
- break
- }
- }
- },
-
- DEL_ALL_VISITED_VIEWS: state => {
- const affixTags = state.visitedViews.filter(tag => tag.meta.affix)
- state.visitedViews = affixTags
- },
- DEL_ALL_CACHED_VIEWS: state => {
- state.cachedViews = []
- },
-
- UPDATE_VISITED_VIEW: (state, view) => {
- for (let v of state.visitedViews) {
- if (v.path === view.path) {
- v = Object.assign(v, view)
- break
- }
+ DEL_VISITED_VIEW: (state, view) => {
+ for (const [i, v] of state.visitedViews.entries()) {
+ if (v.path === view.path) {
+ state.visitedViews.splice(i, 1)
+ break
+ }
+ }
+ },
+ DEL_CACHED_VIEW: (state, view) => {
+ for (const i of state.cachedViews) {
+ if (i === view.name) {
+ const index = state.cachedViews.indexOf(i)
+ state.cachedViews.splice(index, 1)
+ break
}
}
-
},
- actions: {
- addView({ dispatch }, view) {
- dispatch('addVisitedView', view)
- dispatch('addCachedView', view)
- },
- addVisitedView({ commit }, view) {
- commit('ADD_VISITED_VIEW', view)
- },
- addCachedView({ commit }, view) {
- commit('ADD_CACHED_VIEW', view)
- },
- delView({ dispatch, state }, view) {
- return new Promise(resolve => {
- dispatch('delVisitedView', view)
- dispatch('delCachedView', view)
- resolve({
- visitedViews: [...state.visitedViews],
- cachedViews: [...state.cachedViews]
- })
- })
- },
- delVisitedView({ commit, state }, view) {
- return new Promise(resolve => {
- commit('DEL_VISITED_VIEW', view)
- resolve([...state.visitedViews])
- })
- },
- delCachedView({ commit, state }, view) {
- return new Promise(resolve => {
- commit('DEL_CACHED_VIEW', view)
- resolve([...state.cachedViews])
- })
- },
+ DEL_OTHERS_VISITED_VIEWS: (state, view) => {
+ state.visitedViews = state.visitedViews.filter(v => {
+ return v.meta.affix || v.path === view.path
+ })
+ },
+ DEL_OTHERS_CACHED_VIEWS: (state, view) => {
+ for (const i of state.cachedViews) {
+ if (i === view.name) {
+ const index = state.cachedViews.indexOf(i)
+ state.cachedViews = state.cachedViews.slice(index, index + 1)
+ break
+ }
+ }
+ },
- delOthersViews({ dispatch, state }, view) {
- return new Promise(resolve => {
- dispatch('delOthersVisitedViews', view)
- dispatch('delOthersCachedViews', view)
- resolve({
- visitedViews: [...state.visitedViews],
- cachedViews: [...state.cachedViews]
- })
- })
- },
- delOthersVisitedViews({ commit, state }, view) {
- return new Promise(resolve => {
- commit('DEL_OTHERS_VISITED_VIEWS', view)
- resolve([...state.visitedViews])
- })
- },
- delOthersCachedViews({ commit, state }, view) {
- return new Promise(resolve => {
- commit('DEL_OTHERS_CACHED_VIEWS', view)
- resolve([...state.cachedViews])
- })
- },
- delAllViews({ dispatch, state }, view) {
- return new Promise(resolve => {
- dispatch('delAllVisitedViews', view)
- dispatch('delAllCachedViews', view)
- resolve({
- visitedViews: [...state.visitedViews],
- cachedViews: [...state.cachedViews]
- })
- })
- },
- delAllVisitedViews({ commit, state }) {
- return new Promise(resolve => {
- commit('DEL_ALL_VISITED_VIEWS')
- resolve([...state.visitedViews])
- })
- },
- delAllCachedViews({ commit, state }) {
- return new Promise(resolve => {
- commit('DEL_ALL_CACHED_VIEWS')
- resolve([...state.cachedViews])
- })
- },
+ DEL_ALL_VISITED_VIEWS: state => {
+ // keep affix tags
+ const affixTags = state.visitedViews.filter(tag => tag.meta.affix)
+ state.visitedViews = affixTags
+ },
+ DEL_ALL_CACHED_VIEWS: state => {
+ state.cachedViews = []
+ },
- updateVisitedView({ commit }, view) {
- commit('UPDATE_VISITED_VIEW', view)
+ UPDATE_VISITED_VIEW: (state, view) => {
+ for (let v of state.visitedViews) {
+ if (v.path === view.path) {
+ v = Object.assign(v, view)
+ break
+ }
}
}
}
-export default tagsView
+const actions = {
+ addView({ dispatch }, view) {
+ dispatch('addVisitedView', view)
+ dispatch('addCachedView', view)
+ },
+ addVisitedView({ commit }, view) {
+ commit('ADD_VISITED_VIEW', view)
+ },
+ addCachedView({ commit }, view) {
+ commit('ADD_CACHED_VIEW', view)
+ },
+
+ delView({ dispatch, state }, view) {
+ return new Promise(resolve => {
+ dispatch('delVisitedView', view)
+ dispatch('delCachedView', view)
+ resolve({
+ visitedViews: [...state.visitedViews],
+ cachedViews: [...state.cachedViews]
+ })
+ })
+ },
+ delVisitedView({ commit, state }, view) {
+ return new Promise(resolve => {
+ commit('DEL_VISITED_VIEW', view)
+ resolve([...state.visitedViews])
+ })
+ },
+ delCachedView({ commit, state }, view) {
+ return new Promise(resolve => {
+ commit('DEL_CACHED_VIEW', view)
+ resolve([...state.cachedViews])
+ })
+ },
+
+ delOthersViews({ dispatch, state }, view) {
+ return new Promise(resolve => {
+ dispatch('delOthersVisitedViews', view)
+ dispatch('delOthersCachedViews', view)
+ resolve({
+ visitedViews: [...state.visitedViews],
+ cachedViews: [...state.cachedViews]
+ })
+ })
+ },
+ delOthersVisitedViews({ commit, state }, view) {
+ return new Promise(resolve => {
+ commit('DEL_OTHERS_VISITED_VIEWS', view)
+ resolve([...state.visitedViews])
+ })
+ },
+ delOthersCachedViews({ commit, state }, view) {
+ return new Promise(resolve => {
+ commit('DEL_OTHERS_CACHED_VIEWS', view)
+ resolve([...state.cachedViews])
+ })
+ },
+
+ delAllViews({ dispatch, state }, view) {
+ return new Promise(resolve => {
+ dispatch('delAllVisitedViews', view)
+ dispatch('delAllCachedViews', view)
+ resolve({
+ visitedViews: [...state.visitedViews],
+ cachedViews: [...state.cachedViews]
+ })
+ })
+ },
+ delAllVisitedViews({ commit, state }) {
+ return new Promise(resolve => {
+ commit('DEL_ALL_VISITED_VIEWS')
+ resolve([...state.visitedViews])
+ })
+ },
+ delAllCachedViews({ commit, state }) {
+ return new Promise(resolve => {
+ commit('DEL_ALL_CACHED_VIEWS')
+ resolve([...state.cachedViews])
+ })
+ },
+
+ updateVisitedView({ commit }, view) {
+ commit('UPDATE_VISITED_VIEW', view)
+ }
+}
+
+export default {
+ namespaced: true,
+ state,
+ mutations,
+ actions
+}
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index 6a19860..beb351a 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -1,6 +1,5 @@
import { login, getInfo, logout } from '@/api/login'
import { getToken, setToken, removeToken } from '@/utils/auth'
-import { decrypt } from '@/utils/rsaEncrypt'
const user = {
state: {
@@ -29,13 +28,9 @@ const user = {
actions: {
// 登录
Login({ commit }, userInfo) {
- const username = userInfo.username
- const password = decrypt(userInfo.password)
- const code = userInfo.code
- const uuid = userInfo.uuid
const rememberMe = userInfo.rememberMe
return new Promise((resolve, reject) => {
- login(username, password, code, uuid).then(res => {
+ login(userInfo.username, userInfo.password, userInfo.code, userInfo.uuid).then(res => {
setToken(res.token, rememberMe)
commit('SET_TOKEN', res.token)
setUserInfo(res.user, commit)
@@ -59,7 +54,6 @@ const user = {
})
})
},
-
// 登出
LogOut({ commit }) {
return new Promise((resolve, reject) => {
diff --git a/src/styles/description.scss b/src/styles/description.scss
deleted file mode 100644
index 76b0992..0000000
--- a/src/styles/description.scss
+++ /dev/null
@@ -1,17 +0,0 @@
-.my-blockquote{
- margin: 0px 0px 10px;
- padding: 15px;
- line-height: 22px;
- border-left: 5px solid #00437B;
- border-radius: 0 2px 2px 0;
- background-color: #f2f2f2;
-}
-.my-code{
- position: relative;
- padding: 15px;
- line-height: 20px;
- border-left: 5px solid #ddd;
- color: #333;
- font-family: Courier New;
- font-size: 12px
-}
diff --git a/src/styles/element-ui.scss b/src/styles/element-ui.scss
deleted file mode 100644
index ef7bb5d..0000000
--- a/src/styles/element-ui.scss
+++ /dev/null
@@ -1,29 +0,0 @@
- //to reset element-ui default css
-.el-upload {
- input[type="file"] {
- display: none !important;
- }
-}
-
-.el-upload__input {
- display: none;
-}
-
-//暂时性解决diolag 问题 https://github.com/ElemeFE/element/issues/2461
-.el-dialog {
- transform: none;
- left: 0;
- position: relative;
- margin: 0 auto;
-}
-
-//element ui upload
-.upload-container {
- .el-upload {
- width: 100%;
- .el-upload-dragger {
- width: 100%;
- height: 200px;
- }
- }
-}
diff --git a/src/styles/index.scss b/src/styles/index.scss
deleted file mode 100644
index bb8142a..0000000
--- a/src/styles/index.scss
+++ /dev/null
@@ -1,173 +0,0 @@
-@import './variables.scss';
-@import './mixin.scss';
-@import './transition.scss';
-@import './element-ui.scss';
-@import './sidebar.scss';
-
-body {
- height: 100%;
- -moz-osx-font-smoothing: grayscale;
- -webkit-font-smoothing: antialiased;
- text-rendering: optimizeLegibility;
- font-family: Helvetica Neue, Helvetica, PingFang SC, Hiragino Sans GB, Microsoft YaHei, Arial, sans-serif;
-}
-
-.el-dialog__body {
- padding: 20px 20px;
- color: #606266;
- font-size: 14px;
-}
-
-label {
- font-weight: 700;
-}
-
-html {
- height: 100%;
- box-sizing: border-box;
-}
-
-#app{
- height: 100%;
-}
-
-*,
-*:before,
-*:after {
- box-sizing: inherit;
-}
-
-a,
-a:focus,
-a:hover {
- cursor: pointer;
- color: inherit;
- outline: none;
- text-decoration: none;
-}
-
-div:focus{
- outline: none;
-}
-
-a:focus,
-a:active {
- outline: none;
-}
-
-a,
-a:focus,
-a:hover {
- cursor: pointer;
- color: inherit;
- text-decoration: none;
-}
-
-.clearfix {
- &:after {
- visibility: hidden;
- display: block;
- font-size: 0;
- content: " ";
- clear: both;
- height: 0;
- }
-}
-
-.warn-content{
- background: rgba(66,185,131,.1);
- border-radius: 2px;
- padding: 11px;
- word-spacing: .05rem;
- a{
- color: #42b983;
- font-weight: 400;
- }
-}
-
-//main-container全局样式
-.app-main{
- height: 100%;
-}
-
-.app-container {
- padding: 20px;
-}
-
-.head-container {
- padding-bottom: 10px;
- .filter-item {
- display: inline-block;
- vertical-align: middle;
- margin-bottom: 10px;
- }
- input {
- height: 30.5px;
- line-height: 30.5px;
- }
- .el-input__icon {
- line-height: 31px;
- }
-}
-
-.el-avatar {
- display: inline-block;
- text-align: center;
- background: #ccc;
- color: #fff;
- white-space: nowrap;
- position: relative;
- overflow: hidden;
- vertical-align: middle;
- width: 32px;
- height: 32px;
- line-height: 32px;
- border-radius: 16px;
-}
-
-.logo-con{
- height: 60px;
- padding: 13px 0px 0px;
- img{
- height: 32px;
- width: 135px;
- display: block;
- //margin: 0 auto;
- }
-}
-
-#el-login-footer {
- height: 40px;
- line-height: 40px;
- position: fixed;
- bottom: 0;
- width: 100%;
- text-align: center;
- color: #fff;
- font-family: Arial;
- font-size: 12px;
- letter-spacing: 1px;
-}
-
-#el-main-footer {
- background: none repeat scroll 0 0 white;
- border-top: 1px solid #e7eaec;
- overflow: hidden;
- padding: 10px 6px 0px 6px;
- height: 33px;
- font-size: 0.7rem !important;
- color: #7a8b9a;
- letter-spacing: 0.8px;
- font-family: Arial, sans-serif !important;
- position: fixed;
- bottom: 0;
- z-index: 99;
- width: 100%;
-}
-.eladmin-upload {
- border: 1px dashed #c0ccda;
- border-radius: 5px;
- height: 45px;
- line-height: 45px;
- width: 368px;
-}
diff --git a/src/styles/mixin.scss b/src/styles/mixin.scss
deleted file mode 100644
index 601d7a0..0000000
--- a/src/styles/mixin.scss
+++ /dev/null
@@ -1,27 +0,0 @@
-@mixin clearfix {
- &:after {
- content: "";
- display: table;
- clear: both;
- }
-}
-
-@mixin scrollBar {
- &::-webkit-scrollbar-track-piece {
- background: #d3dce6;
- }
- &::-webkit-scrollbar {
- width: 6px;
- }
- &::-webkit-scrollbar-thumb {
- background: #99a9bf;
- border-radius: 20px;
- }
-}
-
-@mixin relative {
- position: relative;
- width: 100%;
- height: 100%;
-}
-
diff --git a/src/styles/sidebar.scss b/src/styles/sidebar.scss
deleted file mode 100644
index 6457bce..0000000
--- a/src/styles/sidebar.scss
+++ /dev/null
@@ -1,133 +0,0 @@
-#app {
- // 主体区域
- .main-container {
- min-height: 100%;
- transition: margin-left .28s;
- margin-left: 193px;
- position: relative;
- }
- // 侧边栏
- .sidebar-container {
- transition: width 0.28s;
- width: 193px !important;
- height: 100%;
- position: fixed;
- font-size: 0px;
- top: 0;
- bottom: 0;
- left: 0;
- z-index: 1001;
- overflow: hidden;
- //reset element-ui css
- .horizontal-collapse-transition {
- transition: 0s width ease-in-out, 0s padding-left ease-in-out, 0s padding-right ease-in-out;
- }
- .el-scrollbar__bar.is-vertical{
- right: 0px;
- }
- .scrollbar-wrapper {
- overflow-x: hidden!important;
- .el-scrollbar__view {
- height: 100%;
- }
- }
- .is-horizontal {
- display: none;
- }
- a {
- display: inline-block;
- width: 100%;
- overflow: hidden;
- }
- .svg-icon {
- margin-right: 16px;
- }
- .el-menu {
- border: none;
- height: 100%;
- width: 100% !important;
- }
- .is-active > .el-submenu__title{
- color: #f4f4f5!important;
- }
- }
- .hideSidebar {
- .sidebar-container {
- width: 36px !important;
- }
- .main-container {
- margin-left: 36px;
- }
- .submenu-title-noDropdown {
- padding-left: 10px !important;
- position: relative;
- .el-tooltip {
- padding: 0 10px !important;
- }
- }
- .el-submenu {
- overflow: hidden;
- &>.el-submenu__title {
- padding-left: 10px !important;
- .el-submenu__icon-arrow {
- display: none;
- }
- }
- }
- .el-menu--collapse {
- .el-submenu {
- &>.el-submenu__title {
- &>span {
- height: 0;
- width: 0;
- overflow: hidden;
- visibility: hidden;
- display: inline-block;
- }
- }
- }
- }
- }
- .sidebar-container .nest-menu .el-submenu>.el-submenu__title,
- .sidebar-container .el-submenu .el-menu-item {
- min-width: 195px !important;
- background-color: $subMenuBg !important;
- &:hover {
- background-color: $menuHover !important;
- }
- }
- .el-menu--collapse .el-menu .el-submenu {
- min-width: 195px !important;
- }
-
- //适配移动端
- .mobile {
- .main-container {
- margin-left: 0px;
- }
- .sidebar-container {
- transition: transform .28s;
- width: 195px !important;
- }
- &.hideSidebar {
- .sidebar-container {
- transition-duration: 0.3s;
- transform: translate3d(-195px, 0, 0);
- }
- }
- }
- .withoutAnimation {
- .main-container,
- .sidebar-container {
- transition: none;
- }
- }
-}
-
-.el-menu--vertical{
- & >.el-menu{
- .svg-icon{
- margin-right: 16px;
- }
- }
-}
diff --git a/src/utils/auth.js b/src/utils/auth.js
index 9ea9f3f..b643e73 100644
--- a/src/utils/auth.js
+++ b/src/utils/auth.js
@@ -1,5 +1,5 @@
import Cookies from 'js-cookie'
-import Config from '@/config'
+import Config from '@/settings'
const TokenKey = Config.TokenKey
diff --git a/src/utils/clipboard.js b/src/utils/clipboard.js
index 2529590..e916a44 100644
--- a/src/utils/clipboard.js
+++ b/src/utils/clipboard.js
@@ -3,7 +3,7 @@ import Clipboard from 'clipboard'
function clipboardSuccess() {
Vue.prototype.$message({
- message: '复制成功',
+ message: 'Copy successfully',
type: 'success',
duration: 1500
})
@@ -11,7 +11,7 @@ function clipboardSuccess() {
function clipboardError() {
Vue.prototype.$message({
- message: '复制失败',
+ message: 'Copy failed',
type: 'error'
})
}
diff --git a/src/utils/export2Excel.js b/src/utils/export2Excel.js
deleted file mode 100644
index ba956dc..0000000
--- a/src/utils/export2Excel.js
+++ /dev/null
@@ -1,206 +0,0 @@
-/* eslint-disable */
-require('script-loader!file-saver');
-import XLSX from 'xlsx'
-
-function generateArray(table) {
- var out = [];
- var rows = table.querySelectorAll('tr');
- var ranges = [];
- for (var R = 0; R < rows.length; ++R) {
- var outRow = [];
- var row = rows[R];
- var columns = row.querySelectorAll('td');
- for (var C = 0; C < columns.length; ++C) {
- var cell = columns[C];
- var colspan = cell.getAttribute('colspan');
- var rowspan = cell.getAttribute('rowspan');
- var cellValue = cell.innerText;
- if (cellValue !== "" && cellValue == +cellValue) cellValue = +cellValue;
-
- //Skip ranges
- ranges.forEach(function (range) {
- if (R >= range.s.r && R <= range.e.r && outRow.length >= range.s.c && outRow.length <= range.e.c) {
- for (var i = 0; i <= range.e.c - range.s.c; ++i) outRow.push(null);
- }
- });
-
- //Handle Row Span
- if (rowspan || colspan) {
- rowspan = rowspan || 1;
- colspan = colspan || 1;
- ranges.push({
- s: {
- r: R,
- c: outRow.length
- },
- e: {
- r: R + rowspan - 1,
- c: outRow.length + colspan - 1
- }
- });
- };
-
- //Handle Value
- outRow.push(cellValue !== "" ? cellValue : null);
-
- //Handle Colspan
- if (colspan)
- for (var k = 0; k < colspan - 1; ++k) outRow.push(null);
- }
- out.push(outRow);
- }
- return [out, ranges];
-};
-
-function datenum(v, date1904) {
- if (date1904) v += 1462;
- var epoch = Date.parse(v);
- return (epoch - new Date(Date.UTC(1899, 11, 30))) / (24 * 60 * 60 * 1000);
-}
-
-function sheet_from_array_of_arrays(data, opts) {
- var ws = {};
- var range = {
- s: {
- c: 10000000,
- r: 10000000
- },
- e: {
- c: 0,
- r: 0
- }
- };
- for (var R = 0; R != data.length; ++R) {
- for (var C = 0; C != data[R].length; ++C) {
- if (range.s.r > R) range.s.r = R;
- if (range.s.c > C) range.s.c = C;
- if (range.e.r < R) range.e.r = R;
- if (range.e.c < C) range.e.c = C;
- var cell = {
- v: data[R][C]
- };
- if (cell.v == null) continue;
- var cell_ref = XLSX.utils.encode_cell({
- c: C,
- r: R
- });
-
- if (typeof cell.v === 'number') cell.t = 'n';
- else if (typeof cell.v === 'boolean') cell.t = 'b';
- else if (cell.v instanceof Date) {
- cell.t = 'n';
- cell.z = XLSX.SSF._table[14];
- cell.v = datenum(cell.v);
- } else cell.t = 's';
-
- ws[cell_ref] = cell;
- }
- }
- if (range.s.c < 10000000) ws['!ref'] = XLSX.utils.encode_range(range);
- return ws;
-}
-
-function Workbook() {
- if (!(this instanceof Workbook)) return new Workbook();
- this.SheetNames = [];
- this.Sheets = {};
-}
-
-function s2ab(s) {
- var buf = new ArrayBuffer(s.length);
- var view = new Uint8Array(buf);
- for (var i = 0; i != s.length; ++i) view[i] = s.charCodeAt(i) & 0xFF;
- return buf;
-}
-
-export function export_table_to_excel(id) {
- var theTable = document.getElementById(id);
- var oo = generateArray(theTable);
- var ranges = oo[1];
-
- /* original data */
- var data = oo[0];
- var ws_name = "SheetJS";
-
- var wb = new Workbook(),
- ws = sheet_from_array_of_arrays(data);
-
- /* add ranges to worksheet */
- // ws['!cols'] = ['apple', 'banan'];
- ws['!merges'] = ranges;
-
- /* add worksheet to workbook */
- wb.SheetNames.push(ws_name);
- wb.Sheets[ws_name] = ws;
-
- var wbout = XLSX.write(wb, {
- bookType: 'xlsx',
- bookSST: false,
- type: 'binary'
- });
-
- saveAs(new Blob([s2ab(wbout)], {
- type: "application/octet-stream"
- }), "test.xlsx")
-}
-
-export function export_json_to_excel({
- header,
- data,
- filename,
- autoWidth = true,
- bookType= 'xlsx'
-} = {}) {
- /* original data */
- filename = filename || 'excel-list'
- data = [...data]
- data.unshift(header);
- var ws_name = "SheetJS";
- var wb = new Workbook(),
- ws = sheet_from_array_of_arrays(data);
-
- if (autoWidth) {
- /*设置worksheet每列的最大宽度*/
- const colWidth = data.map(row => row.map(val => {
- /*先判断是否为null/undefined*/
- if (val == null) {
- return {
- 'wch': 10
- };
- }
- /*再判断是否为中文*/
- else if (val.toString().charCodeAt(0) > 255) {
- return {
- 'wch': val.toString().length * 2
- };
- } else {
- return {
- 'wch': val.toString().length
- };
- }
- }))
- /*以第一行为初始值*/
- let result = colWidth[0];
- for (let i = 1; i < colWidth.length; i++) {
- for (let j = 0; j < colWidth[i].length; j++) {
- if (result[j]['wch'] < colWidth[i][j]['wch']) {
- result[j]['wch'] = colWidth[i][j]['wch'];
- }
- }
- }
- ws['!cols'] = result;
- }
-
- /* add worksheet to workbook */
- wb.SheetNames.push(ws_name);
- wb.Sheets[ws_name] = ws;
-
- var wbout = XLSX.write(wb, {
- bookType: bookType,
- bookSST: false,
- type: 'binary'
- });
- saveAs(new Blob([s2ab(wbout)], {
- type: "application/octet-stream"
- }), `${filename}.${bookType}`);
-}
diff --git a/src/utils/export2Zip.js b/src/utils/export2Zip.js
deleted file mode 100644
index f776465..0000000
--- a/src/utils/export2Zip.js
+++ /dev/null
@@ -1,24 +0,0 @@
-/* eslint-disable */
-require('script-loader!file-saver');
-import JSZip from 'jszip'
-
-export function export_txt_to_zip(th, jsonData, txtName, zipName) {
- const zip = new JSZip()
- const txt_name = txtName || 'file'
- const zip_name = zipName || 'file'
- const data = jsonData
- let txtData = `${th}\r\n`
- data.forEach((row) => {
- let tempStr = ''
- tempStr = row.toString()
- txtData += `${tempStr}\r\n`
- })
- zip.file(`${txt_name}.txt`, txtData)
- zip.generateAsync({
- type: "blob"
- }).then((blob) => {
- saveAs(blob, `${zip_name}.zip`)
- }, (err) => {
- alert('导出失败')
- })
-}
diff --git a/src/utils/get-page-title.js b/src/utils/get-page-title.js
new file mode 100644
index 0000000..cab7fd9
--- /dev/null
+++ b/src/utils/get-page-title.js
@@ -0,0 +1,10 @@
+import defaultSettings from '@/settings'
+
+const title = defaultSettings.title || 'Vue Element Admin'
+
+export default function getPageTitle(pageTitle) {
+ if (pageTitle) {
+ return `${pageTitle} - ${title}`
+ }
+ return `${title}`
+}
diff --git a/src/utils/index.js b/src/utils/index.js
index d12da2f..ab7ad30 100644
--- a/src/utils/index.js
+++ b/src/utils/index.js
@@ -1,28 +1,64 @@
/**
- * Created by jiachenpan on 16/11/18.
+ * Created by PanJiaChen on 16/11/18.
*/
-export function parseTime(time) {
- if (time) {
- var date = new Date(time)
- var year = date.getFullYear()
- /* 在日期格式中，月份是从0开始的，因此要加0
- * 使用三元表达式在小于10的前面加0，以达到格式统一 如 09:11:05
- * */
- var month = date.getMonth() + 1 < 10 ? '0' + (date.getMonth() + 1) : date.getMonth() + 1
- var day = date.getDate() < 10 ? '0' + date.getDate() : date.getDate()
- var hours = date.getHours() < 10 ? '0' + date.getHours() : date.getHours()
- var minutes = date.getMinutes() < 10 ? '0' + date.getMinutes() : date.getMinutes()
- var seconds = date.getSeconds() < 10 ? '0' + date.getSeconds() : date.getSeconds()
- // 拼接
- return year + '-' + month + '-' + day + ' ' + hours + ':' + minutes + ':' + seconds
- } else {
- return ''
+/**
+ * Parse the time to string
+ * @param {(Object|string|number)} time
+ * @param {string} cFormat
+ * @returns {string}
+ */
+export function parseTime(time, cFormat) {
+ if (arguments.length === 0) {
+ return null
}
+ const format = cFormat || '{y}-{m}-{d} {h}:{i}:{s}'
+ let date
+ if (typeof time === 'undefined' || time === null || time === 'null') {
+ return ''
+ } else if (typeof time === 'object') {
+ date = time
+ } else {
+ if ((typeof time === 'string') && (/^[0-9]+$/.test(time))) {
+ time = parseInt(time)
+ }
+ if ((typeof time === 'number') && (time.toString().length === 10)) {
+ time = time * 1000
+ }
+ date = new Date(time)
+ }
+ const formatObj = {
+ y: date.getFullYear(),
+ m: date.getMonth() + 1,
+ d: date.getDate(),
+ h: date.getHours(),
+ i: date.getMinutes(),
+ s: date.getSeconds(),
+ a: date.getDay()
+ }
+ const time_str = format.replace(/{(y|m|d|h|i|s|a)+}/g, (result, key) => {
+ let value = formatObj[key]
+ // Note: getDay() returns 0 on Sunday
+ if (key === 'a') { return ['日', '一', '二', '三', '四', '五', '六'][value ] }
+ if (result.length > 0 && value < 10) {
+ value = '0' + value
+ }
+ return value || 0
+ })
+ return time_str
}
+/**
+ * @param {number} time
+ * @param {string} option
+ * @returns {string}
+ */
export function formatTime(time, option) {
- time = +time * 1000
+ if (('' + time).length === 10) {
+ time = parseInt(time) * 1000
+ } else {
+ time = +time
+ }
const d = new Date(time)
const now = Date.now()
@@ -55,6 +91,161 @@ export function formatTime(time, option) {
}
}
+/**
+ * @param {string} url
+ * @returns {Object}
+ */
+export function getQueryObject(url) {
+ url = url == null ? window.location.href : url
+ const search = url.substring(url.lastIndexOf('?') + 1)
+ const obj = {}
+ const reg = /([^?&=]+)=([^?&=]*)/g
+ search.replace(reg, (rs, $1, $2) => {
+ const name = decodeURIComponent($1)
+ let val = decodeURIComponent($2)
+ val = String(val)
+ obj[name] = val
+ return rs
+ })
+ return obj
+}
+
+/**
+ * @param {string} input value
+ * @returns {number} output value
+ */
+export function byteLength(str) {
+ // returns the byte length of an utf8 string
+ let s = str.length
+ for (var i = str.length - 1; i >= 0; i--) {
+ const code = str.charCodeAt(i)
+ if (code > 0x7f && code <= 0x7ff) s++
+ else if (code > 0x7ff && code <= 0xffff) s += 2
+ if (code >= 0xDC00 && code <= 0xDFFF) i--
+ }
+ return s
+}
+
+/**
+ * @param {Array} actual
+ * @returns {Array}
+ */
+export function cleanArray(actual) {
+ const newArray = []
+ for (let i = 0; i < actual.length; i++) {
+ if (actual[i]) {
+ newArray.push(actual[i])
+ }
+ }
+ return newArray
+}
+
+/**
+ * @param {Object} json
+ * @returns {Array}
+ */
+export function param(json) {
+ if (!json) return ''
+ return cleanArray(
+ Object.keys(json).map(key => {
+ if (json[key] === undefined) return ''
+ return encodeURIComponent(key) + '=' + encodeURIComponent(json[key])
+ })
+ ).join('&')
+}
+
+/**
+ * @param {string} url
+ * @returns {Object}
+ */
+export function param2Obj(url) {
+ const search = url.split('?')[1]
+ if (!search) {
+ return {}
+ }
+ return JSON.parse(
+ '{"' +
+ decodeURIComponent(search)
+ .replace(/"/g, '\\"')
+ .replace(/&/g, '","')
+ .replace(/=/g, '":"')
+ .replace(/\+/g, ' ') +
+ '"}'
+ )
+}
+
+/**
+ * @param {string} val
+ * @returns {string}
+ */
+export function html2Text(val) {
+ const div = document.createElement('div')
+ div.innerHTML = val
+ return div.textContent || div.innerText
+}
+
+/**
+ * Merges two objects, giving the last one precedence
+ * @param {Object} target
+ * @param {(Object|Array)} source
+ * @returns {Object}
+ */
+export function objectMerge(target, source) {
+ if (typeof target !== 'object') {
+ target = {}
+ }
+ if (Array.isArray(source)) {
+ return source.slice()
+ }
+ Object.keys(source).forEach(property => {
+ const sourceProperty = source[property]
+ if (typeof sourceProperty === 'object') {
+ target[property] = objectMerge(target[property], sourceProperty)
+ } else {
+ target[property] = sourceProperty
+ }
+ })
+ return target
+}
+
+/**
+ * @param {HTMLElement} element
+ * @param {string} className
+ */
+export function toggleClass(element, className) {
+ if (!element || !className) {
+ return
+ }
+ let classString = element.className
+ const nameIndex = classString.indexOf(className)
+ if (nameIndex === -1) {
+ classString += '' + className
+ } else {
+ classString =
+ classString.substr(0, nameIndex) +
+ classString.substr(nameIndex + className.length)
+ }
+ element.className = classString
+}
+
+/**
+ * @param {string} type
+ * @returns {Date}
+ */
+export function getTime(type) {
+ if (type === 'start') {
+ return new Date().getTime() - 3600 * 1000 * 24 * 90
+ } else {
+ return new Date(new Date().toDateString())
+ }
+}
+
+/**
+ * @param {Function} func
+ * @param {number} wait
+ * @param {boolean} immediate
+ * @return {*}
+ */
export function debounce(func, wait, immediate) {
let timeout, args, context, timestamp, result
@@ -62,7 +253,7 @@ export function debounce(func, wait, immediate) {
// 据上一次触发时间间隔
const last = +new Date() - timestamp
- // 上次被包装函数被调用时间间隔last小于设定时间间隔wait
+ // 上次被包装函数被调用时间间隔 last 小于设定时间间隔 wait
if (last < wait && last > 0) {
timeout = setTimeout(later, wait - last)
} else {
@@ -90,31 +281,43 @@ export function debounce(func, wait, immediate) {
}
}
-export function isExternal(path) {
- return /^(https?:|mailto:|tel:)/.test(path)
-}
-
-// 替换邮箱字符
-export function regEmail(email) {
- if (String(email).indexOf('@') > 0) {
- const str = email.split('@')
- let _s = ''
- if (str[0].length > 3) {
- for (var i = 0; i < str[0].length - 3; i++) {
- _s += '*'
- }
+/**
+ * This is just a simple version of deep copy
+ * Has a lot of edge cases bug
+ * If you want to use a perfect deep copy, use lodash's _.cloneDeep
+ * @param {Object} source
+ * @returns {Object}
+ */
+export function deepClone(source) {
+ if (!source && typeof source !== 'object') {
+ throw new Error('error arguments', 'deepClone')
+ }
+ const targetObj = source.constructor === Array ? [] : {}
+ Object.keys(source).forEach(keys => {
+ if (source[keys] && typeof source[keys] === 'object') {
+ targetObj[keys] = deepClone(source[keys])
+ } else {
+ targetObj[keys] = source[keys]
}
- var new_email = str[0].substr(0, 3) + _s + '@' + str[1]
- }
- return new_email
+ })
+ return targetObj
}
-// 替换手机字符
-export function regMobile(mobile) {
- if (mobile.length > 7) {
- var new_mobile = mobile.substr(0, 3) + '****' + mobile.substr(7)
- }
- return new_mobile
+/**
+ * @param {Array} arr
+ * @returns {Array}
+ */
+export function uniqueArr(arr) {
+ return Array.from(new Set(arr))
+}
+
+/**
+ * @returns {string}
+ */
+export function createUniqueString() {
+ const timestamp = +new Date() + ''
+ const randomNum = parseInt((1 + Math.random()) * 65536) + ''
+ return (+(randomNum + timestamp)).toString(32)
}
/**
@@ -148,6 +351,30 @@ export function removeClass(ele, cls) {
}
}
+// 替换邮箱字符
+export function regEmail(email) {
+ if (String(email).indexOf('@') > 0) {
+ const str = email.split('@')
+ let _s = ''
+ if (str[0].length > 3) {
+ for (var i = 0; i < str[0].length - 3; i++) {
+ _s += '*'
+ }
+ }
+ var new_email = str[0].substr(0, 3) + _s + '@' + str[1]
+ }
+ return new_email
+}
+
+// 替换手机字符
+export function regMobile(mobile) {
+ if (mobile.length > 7) {
+ var new_mobile = mobile.substr(0, 3) + '****' + mobile.substr(7)
+ }
+ return new_mobile
+}
+
+// 下载文件
export function downloadFile(obj, name, suffix) {
const url = window.URL.createObjectURL(new Blob([obj]))
const link = document.createElement('a')
diff --git a/src/utils/open-window.js b/src/utils/open-window.js
new file mode 100644
index 0000000..1a655d7
--- /dev/null
+++ b/src/utils/open-window.js
@@ -0,0 +1,25 @@
+/**
+ *Created by PanJiaChen on 16/11/29.
+ * @param {Sting} url
+ * @param {Sting} title
+ * @param {Number} w
+ * @param {Number} h
+ */
+export default function openWindow(url, title, w, h) {
+ // Fixes dual-screen position Most browsers Firefox
+ const dualScreenLeft = window.screenLeft !== undefined ? window.screenLeft : screen.left
+ const dualScreenTop = window.screenTop !== undefined ? window.screenTop : screen.top
+
+ const width = window.innerWidth ? window.innerWidth : document.documentElement.clientWidth ? document.documentElement.clientWidth : screen.width
+ const height = window.innerHeight ? window.innerHeight : document.documentElement.clientHeight ? document.documentElement.clientHeight : screen.height
+
+ const left = ((width / 2) - (w / 2)) + dualScreenLeft
+ const top = ((height / 2) - (h / 2)) + dualScreenTop
+ const newWindow = window.open(url, title, 'toolbar=no, location=no, directories=no, status=no, menubar=no, scrollbars=no, resizable=yes, copyhistory=no, width=' + w + ', height=' + h + ', top=' + top + ', left=' + left)
+
+ // Puts focus on the newWindow
+ if (window.focus) {
+ newWindow.focus()
+ }
+}
+
diff --git a/src/utils/permission.js b/src/utils/permission.js
index 77b7f77..221d384 100644
--- a/src/utils/permission.js
+++ b/src/utils/permission.js
@@ -3,12 +3,13 @@ import store from '@/store'
/**
* @param {Array} value
* @returns {Boolean}
- * @example see @/views/auth/directive.vue
+ * @example see @/views/permission/directive.vue
*/
export default function checkPermission(value) {
if (value && value instanceof Array && value.length > 0) {
const roles = store.getters && store.getters.roles
const permissionRoles = value
+
const hasPermission = roles.some(role => {
return permissionRoles.includes(role)
})
diff --git a/src/utils/request.js b/src/utils/request.js
index dcc614c..f997d12 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -3,11 +3,11 @@ import router from '@/router/routers'
import { Notification, MessageBox } from 'element-ui'
import store from '../store'
import { getToken } from '@/utils/auth'
-import Config from '@/config'
+import Config from '@/settings'
// 创建axios实例
const service = axios.create({
- baseURL: process.env.NODE_ENV === 'production' ? process.env.BASE_API : '/', // api 的 base_url
+ baseURL: process.env.NODE_ENV === 'production' ? process.env.VUE_APP_BASE_API : '/', // api 的 base_url
timeout: Config.timeout // 请求超时时间
})
@@ -15,7 +15,7 @@ const service = axios.create({
service.interceptors.request.use(
config => {
if (getToken()) {
- config.headers['Authorization'] = 'Bearer ' + getToken() // 让每个请求携带自定义token 请根据实际情况自行修改
+ config.headers['Authorization'] = getToken() // 让每个请求携带自定义token 请根据实际情况自行修改
}
config.headers['Content-Type'] = 'application/json'
return config
@@ -48,42 +48,42 @@ service.interceptors.response.use(
if (error.toString().indexOf('Error: timeout') !== -1) {
Notification.error({
title: '网络请求超时',
- duration: 2500
- })
- return Promise.reject(error)
- }
- if (error.toString().indexOf('Error: Network Error') !== -1) {
- Notification.error({
- title: '网络请求错误',
- duration: 2500
+ duration: 5000
})
return Promise.reject(error)
}
}
- if (code === 401) {
- MessageBox.confirm(
- '登录状态已过期，您可以继续留在该页面，或者重新登录',
- '系统提示',
- {
- confirmButtonText: '重新登录',
- cancelButtonText: '取消',
- type: 'warning'
+ if (code) {
+ if (code === 401) {
+ MessageBox.confirm(
+ '登录状态已过期，您可以继续留在该页面，或者重新登录',
+ '系统提示',
+ {
+ confirmButtonText: '重新登录',
+ cancelButtonText: '取消',
+ type: 'warning'
+ }
+ ).then(() => {
+ store.dispatch('LogOut').then(() => {
+ location.reload() // 为了重新实例化vue-router对象 避免bug
+ })
+ })
+ } else if (code === 403) {
+ router.push({ path: '/401' })
+ } else {
+ const errorMsg = error.response.data.message
+ if (errorMsg !== undefined) {
+ Notification.error({
+ title: errorMsg,
+ duration: 5000
+ })
}
- ).then(() => {
- store.dispatch('LogOut').then(() => {
- location.reload() // 为了重新实例化vue-router对象 避免bug
- })
- })
- } else if (code === 403) {
- router.push({ path: '/401' })
- } else {
- const errorMsg = error.response.data.message
- if (errorMsg !== undefined) {
- Notification.error({
- title: errorMsg,
- duration: 3000
- })
}
+ } else {
+ Notification.error({
+ title: '接口请求失败',
+ duration: 5000
+ })
}
return Promise.reject(error)
}
diff --git a/src/utils/scroll-to.js b/src/utils/scroll-to.js
new file mode 100644
index 0000000..c5d8e04
--- /dev/null
+++ b/src/utils/scroll-to.js
@@ -0,0 +1,58 @@
+Math.easeInOutQuad = function(t, b, c, d) {
+ t /= d / 2
+ if (t < 1) {
+ return c / 2 * t * t + b
+ }
+ t--
+ return -c / 2 * (t * (t - 2) - 1) + b
+}
+
+// requestAnimationFrame for Smart Animating http://goo.gl/sx5sts
+var requestAnimFrame = (function() {
+ return window.requestAnimationFrame || window.webkitRequestAnimationFrame || window.mozRequestAnimationFrame || function(callback) { window.setTimeout(callback, 1000 / 60) }
+})()
+
+/**
+ * Because it's so fucking difficult to detect the scrolling element, just move them all
+ * @param {number} amount
+ */
+function move(amount) {
+ document.documentElement.scrollTop = amount
+ document.body.parentNode.scrollTop = amount
+ document.body.scrollTop = amount
+}
+
+function position() {
+ return document.documentElement.scrollTop || document.body.parentNode.scrollTop || document.body.scrollTop
+}
+
+/**
+ * @param {number} to
+ * @param {number} duration
+ * @param {Function} callback
+ */
+export function scrollTo(to, duration, callback) {
+ const start = position()
+ const change = to - start
+ const increment = 20
+ let currentTime = 0
+ duration = (typeof (duration) === 'undefined') ? 500 : duration
+ var animateScroll = function() {
+ // increment the time
+ currentTime += increment
+ // find the value with the quadratic in-out easing function
+ var val = Math.easeInOutQuad(currentTime, start, change, duration)
+ // move the document.body
+ move(val)
+ // do the animation unless its over
+ if (currentTime < duration) {
+ requestAnimFrame(animateScroll)
+ } else {
+ if (callback && typeof (callback) === 'function') {
+ // the animation is done so lets callback
+ callback()
+ }
+ }
+ }
+ animateScroll()
+}
diff --git a/src/utils/upload.js b/src/utils/upload.js
new file mode 100644
index 0000000..945414b
--- /dev/null
+++ b/src/utils/upload.js
@@ -0,0 +1,11 @@
+import axios from 'axios'
+import { getToken } from '@/utils/auth'
+
+export function upload(api, file) {
+ var data = new FormData()
+ data.append('file', file)
+ const config = {
+ headers: { 'Authorization': getToken() }
+ }
+ return axios.post(api, data, config)
+}
diff --git a/src/utils/validate.js b/src/utils/validate.js
index 7ec38b4..d215791 100644
--- a/src/utils/validate.js
+++ b/src/utils/validate.js
@@ -1,37 +1,168 @@
/**
- * Created by jiachenpan on 16/11/18.
+ * Created by PanJiaChen on 16/11/18.
*/
-/* 合法uri*/
-export function validateURL(textval) {
- const urlregex = /^(https?|ftp):\/\/([a-zA-Z0-9.-]+(:[a-zA-Z0-9.&%$-]+)*@)*((25[0-5]|2[0-4][0-9]|1[0-9]{2}|[1-9][0-9]?)(\.(25[0-5]|2[0-4][0-9]|1[0-9]{2}|[1-9]?[0-9])){3}|([a-zA-Z0-9-]+\.)*[a-zA-Z0-9-]+\.(com|edu|gov|int|mil|net|org|biz|arpa|info|name|pro|aero|coop|museum|[a-zA-Z]{2}))(:[0-9]+)*(\/($|[a-zA-Z0-9.,?'\\+&%$#=~_-]+))*$/
- return urlregex.test(textval)
+/**
+ * @param {string} path
+ * @returns {Boolean}
+ */
+export function isExternal(path) {
+ return /^(https?:|mailto:|tel:)/.test(path)
}
-/* 小写字母*/
-export function validateLowerCase(str) {
+/**
+ * @param {string} str
+ * @returns {Boolean}
+ */
+export function validUsername(str) {
+ const valid_map = ['admin', 'editor']
+ return valid_map.indexOf(str.trim()) >= 0
+}
+
+/**
+ * @param {string} url
+ * @returns {Boolean}
+ */
+export function validURL(url) {
+ const reg = /^(https?|ftp):\/\/([a-zA-Z0-9.-]+(:[a-zA-Z0-9.&%$-]+)*@)*((25[0-5]|2[0-4][0-9]|1[0-9]{2}|[1-9][0-9]?)(\.(25[0-5]|2[0-4][0-9]|1[0-9]{2}|[1-9]?[0-9])){3}|([a-zA-Z0-9-]+\.)*[a-zA-Z0-9-]+\.(com|edu|gov|int|mil|net|org|biz|arpa|info|name|pro|aero|coop|museum|[a-zA-Z]{2}))(:[0-9]+)*(\/($|[a-zA-Z0-9.,?'\\+&%$#=~_-]+))*$/
+ return reg.test(url)
+}
+
+/**
+ * @param {string} str
+ * @returns {Boolean}
+ */
+export function validLowerCase(str) {
const reg = /^[a-z]+$/
return reg.test(str)
}
-/* 大写字母*/
-export function validateUpperCase(str) {
+/**
+ * @param {string} str
+ * @returns {Boolean}
+ */
+export function validUpperCase(str) {
const reg = /^[A-Z]+$/
return reg.test(str)
}
-/* 大小写字母*/
-export function validatAlphabets(str) {
+/**
+ * @param {string} str
+ * @returns {Boolean}
+ */
+export function validAlphabets(str) {
const reg = /^[A-Za-z]+$/
return reg.test(str)
}
/**
- * 验证邮箱
- * @param str
- * @returns {boolean}
+ * @param {string} email
+ * @returns {Boolean}
*/
-export function validatEmail(str) {
- const reg = /^([a-zA-Z0-9_-])+@([a-zA-Z0-9_-])+(.[a-zA-Z0-9_-])+/
- return reg.test(str)
+export function validEmail(email) {
+ const reg = /^(([^<>()\[\]\\.,;:\s@"]+(\.[^<>()\[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/
+ return reg.test(email)
}
+
+export function isvalidPhone(phone) {
+ const reg = /^1[3|4|5|7|8][0-9]\d{8}$/
+ return reg.test(phone)
+}
+
+/**
+ * @param {string} str
+ * @returns {Boolean}
+ */
+export function isString(str) {
+ if (typeof str === 'string' || str instanceof String) {
+ return true
+ }
+ return false
+}
+
+/**
+ * @param {Array} arg
+ * @returns {Boolean}
+ */
+export function isArray(arg) {
+ if (typeof Array.isArray === 'undefined') {
+ return Object.prototype.toString.call(arg) === '[object Array]'
+ }
+ return Array.isArray(arg)
+}
+
+/**
+ * 是否合法IP地址
+ * @param rule
+ * @param value
+ * @param callback
+ */
+export function validateIP(rule, value, callback) {
+ if (value === '' || value === undefined || value == null) {
+ callback()
+ } else {
+ const reg = /^(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])\.(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])\.(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])\.(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])$/
+ if ((!reg.test(value)) && value !== '') {
+ callback(new Error('请输入正确的IP地址'))
+ } else {
+ callback()
+ }
+ }
+}
+
+/* 是否手机号码或者固话*/
+export function validatePhoneTwo(rule, value, callback) {
+ const reg = /^((0\d{2,3}-\d{7,8})|(1[34578]\d{9}))$/
+ if (value === '' || value === undefined || value == null) {
+ callback()
+ } else {
+ if ((!reg.test(value)) && value !== '') {
+ callback(new Error('请输入正确的电话号码或者固话号码'))
+ } else {
+ callback()
+ }
+ }
+}
+
+/* 是否固话*/
+export function validateTelephone(rule, value, callback) {
+ const reg = /0\d{2}-\d{7,8}/
+ if (value === '' || value === undefined || value == null) {
+ callback()
+ } else {
+ if ((!reg.test(value)) && value !== '') {
+ callback(new Error('请输入正确的固话（格式：区号+号码,如010-1234567）'))
+ } else {
+ callback()
+ }
+ }
+}
+
+/* 是否手机号码*/
+export function validatePhone(rule, value, callback) {
+ const reg = /^[1][3,4,5,7,8][0-9]{9}$/
+ if (value === '' || value === undefined || value == null) {
+ callback()
+ } else {
+ if ((!reg.test(value)) && value !== '') {
+ callback(new Error('请输入正确的电话号码'))
+ } else {
+ callback()
+ }
+ }
+}
+
+/* 是否身份证号码*/
+export function validateIdNo(rule, value, callback) {
+ const reg = /(^\d{15}$)|(^\d{18}$)|(^\d{17}(\d|X|x)$)/
+ if (value === '' || value === undefined || value == null) {
+ callback()
+ } else {
+ if ((!reg.test(value)) && value !== '') {
+ callback(new Error('请输入正确的身份证号码'))
+ } else {
+ callback()
+ }
+ }
+}
+
diff --git a/src/views/components/Echarts.vue b/src/views/components/Echarts.vue
new file mode 100644
index 0000000..d70a8a3
--- /dev/null
+++ b/src/views/components/Echarts.vue
@@ -0,0 +1,124 @@
+
+
+
+
+
+
+
+
diff --git a/src/views/components/Editor.vue b/src/views/components/Editor.vue
index 1ae75de..415ad15 100644
--- a/src/views/components/Editor.vue
+++ b/src/views/components/Editor.vue
@@ -1,26 +1,33 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
+
+
{{ parseTime(scope.row.createTime) }}
-
+
-
+
+ 预览
+
+
+ 下载
+
+
+ 编辑
+
+
+ 生成
-
diff --git a/src/views/home.vue b/src/views/home.vue
index bf2cad1..f99da16 100644
--- a/src/views/home.vue
+++ b/src/views/home.vue
@@ -1,26 +1,24 @@
HTML渲染如下：
-
+
+
+
+
+
+
+
+
+
diff --git a/src/views/components/IconSelect.vue b/src/views/components/IconSelect.vue
deleted file mode 100644
index b4e5cb0..0000000
--- a/src/views/components/IconSelect.vue
+++ /dev/null
@@ -1,70 +0,0 @@
-
-
+ 富文本基于
+
-
-
-
-
-
-
diff --git a/src/views/components/MarkDown.vue b/src/views/components/MarkDown.vue
index da96b98..ed734a5 100644
--- a/src/views/components/MarkDown.vue
+++ b/src/views/components/MarkDown.vue
@@ -2,24 +2,21 @@
+
+
diff --git a/src/views/components/icons/svg-icons.js b/src/views/components/icons/svg-icons.js
new file mode 100644
index 0000000..724cd8e
--- /dev/null
+++ b/src/views/components/icons/svg-icons.js
@@ -0,0 +1,10 @@
+const req = require.context('../../../assets/icons/svg', false, /\.svg$/)
+const requireAll = requireContext => requireContext.keys()
+
+const re = /\.\/(.*)\.svg/
+
+const svgIcons = requireAll(req).map(i => {
+ return i.match(re)[1]
+})
+
+export default svgIcons
diff --git a/src/views/dashboard/LineChart.vue b/src/views/dashboard/LineChart.vue
index 1aa650f..13521aa 100644
--- a/src/views/dashboard/LineChart.vue
+++ b/src/views/dashboard/LineChart.vue
@@ -1,12 +1,12 @@
-
+
-
+
+
diff --git a/src/views/generator/generator.vue b/src/views/generator/generator.vue
deleted file mode 100644
index 550800b..0000000
--- a/src/views/generator/generator.vue
+++ /dev/null
@@ -1,182 +0,0 @@
-
- - 使用教程参考 Documentation -
-
-
-
-
-
-
-
- {{ generateIconCode(item) }}
-
-
-
-
- 生成代码
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 是
- 否
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/views/generator/index.vue b/src/views/generator/index.vue
index fd6eb43..a0d022b 100644
--- a/src/views/generator/index.vue
+++ b/src/views/generator/index.vue
@@ -2,102 +2,110 @@
{{ scope.$index + 1 }}
-
-
- 搜索
+
+
+ 同步
+
+
-
+
+ {{ scope.$index + 1 }}
-
-
-
-
-
@@ -29,31 +27,27 @@
diff --git a/src/views/login.vue b/src/views/login.vue
index d3a5f2b..c95efa3 100644
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -1,26 +1,30 @@
-
-
-
-
![]()
- 记住我
+
+ 记住我
+
登 录
@@ -30,7 +34,7 @@
@@ -39,7 +43,7 @@
+
+
diff --git a/src/views/mnt/database/execute.vue b/src/views/mnt/database/execute.vue
new file mode 100644
index 0000000..94622fc
--- /dev/null
+++ b/src/views/mnt/database/execute.vue
@@ -0,0 +1,86 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/mnt/database/index.vue b/src/views/mnt/database/index.vue
new file mode 100644
index 0000000..c5fb4dd
--- /dev/null
+++ b/src/views/mnt/database/index.vue
@@ -0,0 +1,152 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/mnt/deploy/index.vue b/src/views/mnt/deploy/index.vue
new file mode 100644
index 0000000..0f0762e
--- /dev/null
+++ b/src/views/mnt/deploy/index.vue
@@ -0,0 +1,232 @@
+
+
+
+
+
+
+
+
+
+
+
+ {{ parseTime(scope.row.deployDate) }}
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/mnt/deployHistory/index.vue b/src/views/mnt/deployHistory/index.vue
new file mode 100644
index 0000000..21397fa
--- /dev/null
+++ b/src/views/mnt/deployHistory/index.vue
@@ -0,0 +1,105 @@
+
+
-
-
-
EL-ADMIN 后台管理系统
++ EL-ADMIN 后台管理系统 +
+ 将文件拖到此处，或
+ 点击上传
+
+ 上传后，系统会自动执行SQL脚本
+
+
+
+
+
+
+
+ 测试
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ parseTime(scope.row.createTime) }}
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/mnt/deploy/deploy.vue b/src/views/mnt/deploy/deploy.vue
new file mode 100644
index 0000000..4a411b4
--- /dev/null
+++ b/src/views/mnt/deploy/deploy.vue
@@ -0,0 +1,190 @@
+
+
+
+ 执行脚本
+
+
+
+
+
+
+
+
+ 将文件拖到此处，或
+ 点击上传
+
+ 多个应用上传文件名称为all.zip,数据库更新脚本扩展名为.sql,上传成功后系统自动部署系统。
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ parseTime(scope.row.createTime) }}
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/mnt/deploy/sysRestore.vue b/src/views/mnt/deploy/sysRestore.vue
new file mode 100644
index 0000000..46b568d
--- /dev/null
+++ b/src/views/mnt/deploy/sysRestore.vue
@@ -0,0 +1,120 @@
+
+
+
+
+ 系统还原
+
+ 状态查询
+
+ 启动
+
+ 停止
+
+ 一键部署
+
+
+
+
+
+
+
+
+
+ 搜索
+
+
+
+
+
+
+ {{ parseTime(scope.row.deployDate) }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/mnt/server/index.vue b/src/views/mnt/server/index.vue
new file mode 100644
index 0000000..dab6dc5
--- /dev/null
+++ b/src/views/mnt/server/index.vue
@@ -0,0 +1,147 @@
+
+
+
+
+
+
+
+ 确定删除本条数据吗？
+
+ 取消
+ 确定
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 测试连接
+
+
+
+
+
+
+
+
+ {{ parseTime(scope.row.createTime) }}
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/monitor/log/errorLog.vue b/src/views/monitor/log/errorLog.vue
index 1aefbfd..630b770 100644
--- a/src/views/monitor/log/errorLog.vue
+++ b/src/views/monitor/log/errorLog.vue
@@ -1,8 +1,23 @@
+
+
+
+
+
+
-
+
@@ -15,98 +30,109 @@
-
+
{{ parseTime(scope.row.createTime) }}
-
+
查看详情
-
-
+
-
-
diff --git a/src/views/monitor/log/index.vue b/src/views/monitor/log/index.vue
index e44ae4d..f5b68bc 100644
--- a/src/views/monitor/log/index.vue
+++ b/src/views/monitor/log/index.vue
@@ -1,8 +1,23 @@
+
+
+ 清空
+ v-if="columns.visible('username')"
+
+
-
- {{ errorInfo }}
-
+
-
+
@@ -15,83 +30,88 @@
-
+
{{ scope.row.time }}ms
{{ scope.row.time }}ms
{{ scope.row.time }}ms
-
+
{{ parseTime(scope.row.createTime) }}
-
diff --git a/src/views/monitor/log/search.vue b/src/views/monitor/log/search.vue
index a9fdc66..0a3387e 100644
--- a/src/views/monitor/log/search.vue
+++ b/src/views/monitor/log/search.vue
@@ -1,55 +1,35 @@
-
+
+
+ 清空
+
+
+
-
-
+ 搜索
-
-
diff --git a/src/views/monitor/online/index.vue b/src/views/monitor/online/index.vue
index 5ed9691..cb735b6 100644
--- a/src/views/monitor/online/index.vue
+++ b/src/views/monitor/online/index.vue
@@ -1,110 +1,127 @@
- 导出
-
+ end-placeholder="结束日期"
+ />
+
- 搜索
-
-
-
+
+
{{ parseTime(scope.row.loginTime) }}
-
+
-
取消
- 确定
+ 确定
- 踢出
+ 强退
-
-
-
diff --git a/src/views/monitor/server/index.vue b/src/views/monitor/server/index.vue
new file mode 100644
index 0000000..6e3c461
--- /dev/null
+++ b/src/views/monitor/server/index.vue
@@ -0,0 +1,193 @@
+
+
- 导出
+
+
+ 强退
+
+
-
+
+ 确定踢出该用户吗？
+ width="180" + > +确定强制退出该用户吗？
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ formatMem(scope.row) }}
+
+
+
+
+
+
+
+
+
+
+ {{ formatDisk(scope.row) }}
+
+
+
+
+
+
+
+
+
+
+ {{ formatSwap(scope.row) }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/monitor/sql/index.vue b/src/views/monitor/sql/index.vue
index cd37191..0ed9034 100644
--- a/src/views/monitor/sql/index.vue
+++ b/src/views/monitor/sql/index.vue
@@ -1,5 +1,5 @@
-
+
+
+
+
+
+
-
-
-
- 搜索
-
-
+
+
+
+
+ {{ item.label }}
+
+
+
+
+
+
-
-
+
+
-
+
{{ parseTime(scope.row.createTime) }}
-
+
-
-
+
@@ -79,87 +76,61 @@
diff --git a/src/views/system/dict/dictDetail.vue b/src/views/system/dict/dictDetail.vue
new file mode 100644
index 0000000..31e7d61
--- /dev/null
+++ b/src/views/system/dict/dictDetail.vue
@@ -0,0 +1,110 @@
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/views/system/dict/index.vue b/src/views/system/dict/index.vue
index 461a4b7..64e58ad 100644
--- a/src/views/system/dict/index.vue
+++ b/src/views/system/dict/index.vue
@@ -1,12 +1,27 @@
- 新增
-
-
-
- 导出
+
-
+
+
+
+
+ 确定删除本条数据吗？
-
- 取消
- 确定
-
-
+
+
+
+
+
+
diff --git a/src/views/system/dict/form.vue b/src/views/system/dict/form.vue
deleted file mode 100644
index 166204e..0000000
--- a/src/views/system/dict/form.vue
+++ /dev/null
@@ -1,101 +0,0 @@
-
-
+
+ 点击字典查看详情
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ dictName }}
+
+
+
+
+
+
+
+
+
+
+
+
+ 搜索
+
+
+ 确定删除本条数据吗？
+
+ 取消
+ 确定
+
+
-
+
+
+
+
+
+
+
+
+
-
+
-
+ width="180"
+ >
取消
- 确定
+ 确定
-
@@ -61,9 +77,11 @@
style="margin-top: 8px;"
layout="total, prev, pager, next, sizes"
@size-change="sizeChange"
- @current-change="pageChange"/>
+ @current-change="pageChange"
+ />
+
@@ -85,23 +104,27 @@
diff --git a/src/views/system/dictDetail/form.vue b/src/views/system/dictDetail/form.vue
deleted file mode 100644
index 5b213b2..0000000
--- a/src/views/system/dictDetail/form.vue
+++ /dev/null
@@ -1,116 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/views/system/dictDetail/index.vue b/src/views/system/dictDetail/index.vue
deleted file mode 100644
index a738028..0000000
--- a/src/views/system/dictDetail/index.vue
+++ /dev/null
@@ -1,123 +0,0 @@
-
-
-
-
-
-
-
-
- {{ item.label }}
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/views/system/job/index.vue b/src/views/system/job/index.vue
index eab2207..d06e352 100644
--- a/src/views/system/job/index.vue
+++ b/src/views/system/job/index.vue
@@ -2,181 +2,94 @@
-
+
+
-
+
{{ scope.row.sort }}
-
+
-
+
{{ parseTime(scope.row.createTime) }}
-
+
+
-
-
+
-
-
diff --git a/src/views/system/job/module/form.vue b/src/views/system/job/module/form.vue
new file mode 100644
index 0000000..ce4bbcc
--- /dev/null
+++ b/src/views/system/job/module/form.vue
@@ -0,0 +1,149 @@
+
+
+
+
+
+
+
+
+
+ {{ item.label }}
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/system/job/module/header.vue b/src/views/system/job/module/header.vue
new file mode 100644
index 0000000..fda5285
--- /dev/null
+++ b/src/views/system/job/module/header.vue
@@ -0,0 +1,43 @@
+
+
-
-
-
- 目录
- 菜单
- 按钮
-
-
-
-
-
-
-
-
-
-
- 是
- 否
-
-
-
-
- 是
- 否
-
-
-
-
- 是
- 否
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/views/system/menu/index.vue b/src/views/system/menu/index.vue
index ec39db6..362bad9 100644
--- a/src/views/system/menu/index.vue
+++ b/src/views/system/menu/index.vue
@@ -2,95 +2,143 @@
字典列表
+
新增
+ @click="showAddFormDialog"
+ >新增
- 搜索
- 导出
-
- 导出
-
+ 此操作将删除字典与对应的字典详情，确定要删除吗？
@@ -75,9 +93,10 @@
style="float: right;padding: 4px 10px"
type="primary"
icon="el-icon-plus"
- @click="$refs.dictDetail.$refs.form.dialog = true;$refs.dictDetail.isAdd = true">新增
+ @click="$refs.dictDetail.showAddFormDialog"
+ >新增
-
-
-
-
-
-
-
diff --git a/src/views/system/job/form.vue b/src/views/system/job/form.vue
deleted file mode 100644
index c650865..0000000
--- a/src/views/system/job/form.vue
+++ /dev/null
@@ -1,140 +0,0 @@
-
-
-
- 点击字典查看详情
-
-
-
-
-
- {{ dictName }}
-
-
-
-
-
-
-
-
-
-
-
-
-
- 搜索
-
-
- 确定删除本条数据吗？
-
- 取消
- 确定
-
-
-
-
-
- 搜索
-
-
-
-
- 新增
-
-
-
- 导出
-
+ {{ scope.row.deptSuperiorName ? scope.row.deptSuperiorName + ' / ' : '' }}{{ scope.row.dept.name }}
确定删除本条数据吗？
-
- 取消
- 确定
-
-
+
+
+
+
+
+
diff --git a/src/views/system/menu/form.vue b/src/views/system/menu/form.vue
deleted file mode 100644
index b696f64..0000000
--- a/src/views/system/menu/form.vue
+++ /dev/null
@@ -1,169 +0,0 @@
-
-
-
- 搜索
-
-
+
+
+
+ 目录
+ 菜单
+ 按钮
+
+
+
+
+
+
+
+
+
+
+ 是
+ 否
+
+
+
+
+ 是
+ 否
+
+
+
+
+ 是
+ 否
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
-
+
{{ scope.row.sort }}
-
+
是
否
-
+
是
否
-
+
否
是
-
+
{{ parseTime(scope.row.createTime) }}
-
+
-
-
+
@@ -98,88 +146,60 @@
-
diff --git a/src/views/system/role/form.vue b/src/views/system/role/form.vue
deleted file mode 100644
index 20ac0b6..0000000
--- a/src/views/system/role/form.vue
+++ /dev/null
@@ -1,148 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/views/system/role/index.vue b/src/views/system/role/index.vue
index dde5d10..a0ab4c4 100644
--- a/src/views/system/role/index.vue
+++ b/src/views/system/role/index.vue
@@ -1,41 +1,59 @@
- 新增
-
-
-
- 导出
+
-
-
+
+
+ 确定删除吗,如果存在下级节点则一并删除，此操作不能撤销！
-
- 取消
- 确定
-
-
-
-
-
- 搜索
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -43,46 +61,33 @@
-
+
+
{{ parseTime(scope.row.createTime) }}
-
+
-
-
+
-
-
+
@@ -115,75 +122,110 @@
+
+
diff --git a/src/views/system/user/center.vue b/src/views/system/user/center.vue
index 5f69ea3..88dd76e 100644
--- a/src/views/system/user/center.vue
+++ b/src/views/system/user/center.vue
@@ -14,16 +14,17 @@
:on-error="handleError"
:headers="headers"
:action="updateAvatarApi"
- class="avatar-uploader">
+ class="avatar-uploader"
+ >
![]( "点击上传头像")
- 新增
-
-
-
- 导出
+
+
+
+
+
+
角色列表
- 确定删除本条数据吗？
-
- 取消
- 确定
-
-
@@ -97,7 +102,8 @@
size="mini"
style="float: right; padding: 6px 9px"
type="primary"
- @click="saveMenu">保存
+ @click="saveMenu"
+ >保存