diff --git a/README.md b/README.md index 87cc9d0..62bd05a 100644 --- a/README.md +++ b/README.md @@ -1,9 +1,9 @@
-
+
-
+
diff --git a/package.json b/package.json
index 382a184..9e76592 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "saber-admin",
- "version": "3.1.0",
+ "version": "3.2.0",
"private": true,
"scripts": {
"serve": "vue-cli-service serve",
diff --git a/src/api/system/menu.js b/src/api/system/menu.js
index 5ff0482..dc4266a 100644
--- a/src/api/system/menu.js
+++ b/src/api/system/menu.js
@@ -46,3 +46,14 @@ export const getMenu = (id) => {
}
})
}
+
+export const getLazyMenuList = (parentId, params) => {
+ return request({
+ url: '/api/blade-system/menu/lazy-menu-list',
+ method: 'get',
+ params: {
+ ...params,
+ parentId
+ }
+ })
+}
diff --git a/src/api/system/role.js b/src/api/system/role.js
index 8a862ab..1801d43 100644
--- a/src/api/system/role.js
+++ b/src/api/system/role.js
@@ -18,13 +18,14 @@ export const grantTree = () => {
})
}
-export const grant = (roleIds, menuIds) => {
+export const grant = (roleIds, menuIds, dataScopeIds) => {
return request({
url: '/api/blade-system/role/grant',
method: 'post',
data: {
roleIds,
- menuIds
+ menuIds,
+ dataScopeIds
}
})
}
diff --git a/src/api/system/scope.js b/src/api/system/scope.js
new file mode 100644
index 0000000..938066d
--- /dev/null
+++ b/src/api/system/scope.js
@@ -0,0 +1,50 @@
+import request from '@/router/axios';
+
+export const getListDataScope = (current, size, params) => {
+ return request({
+ url: '/api/blade-system/data-scope/list',
+ method: 'get',
+ params: {
+ ...params,
+ current,
+ size,
+ }
+ })
+}
+
+export const removeDataScope = (ids) => {
+ return request({
+ url: '/api/blade-system/data-scope/remove',
+ method: 'post',
+ params: {
+ ids,
+ }
+ })
+}
+
+export const addDataScope = (row) => {
+ return request({
+ url: '/api/blade-system/data-scope/submit',
+ method: 'post',
+ data: row
+ })
+}
+
+export const updateDataScope = (row) => {
+ return request({
+ url: '/api/blade-system/data-scope/submit',
+ method: 'post',
+ data: row
+ })
+}
+
+export const getMenuDataScope = (id) => {
+ return request({
+ url: '/api/blade-system/data-scope/detail',
+ method: 'get',
+ params: {
+ id,
+ }
+ })
+}
+
diff --git a/src/lang/en.js b/src/lang/en.js
index 5cb73c7..8e1b6a0 100644
--- a/src/lang/en.js
+++ b/src/lang/en.js
@@ -50,7 +50,6 @@ export default {
route: {
info: 'info',
website: 'website',
- avuexwebsite: 'avuex',
dashboard: 'dashboard',
tags: 'tags',
store: 'store',
diff --git a/src/lang/zh.js b/src/lang/zh.js
index 854f0aa..0e71651 100644
--- a/src/lang/zh.js
+++ b/src/lang/zh.js
@@ -50,7 +50,6 @@ export default {
route: {
info: '个人信息',
website: 'bladex官网',
- avuexwebsite: 'avuex官网',
dashboard: '首页',
tags: '标签',
store: '本地存储',
diff --git a/src/mock/menu.js b/src/mock/menu.js
index ce5eaea..8bcaada 100644
--- a/src/mock/menu.js
+++ b/src/mock/menu.js
@@ -18,15 +18,6 @@ const top = [{
path: "https://bladex.vip/#/",
parentId: 1
},
- {
- label: "avuex官网",
- icon: 'el-icon-document',
- meta: {
- i18n: 'avuexwebsite',
- },
- path: "https://avuex.avue.top",
- parentId: 2
- },
{
label: "测试",
icon: 'el-icon-document',
diff --git a/src/views/authority/datascope.vue b/src/views/authority/datascope.vue
new file mode 100644
index 0000000..330e8ac
--- /dev/null
+++ b/src/views/authority/datascope.vue
@@ -0,0 +1,727 @@
+
+