diff --git a/src/api/system/dataScope.js b/src/api/system/dataScope.js
index 4047461ca3e669dc806a9ed53ca3a712007caeea..081b0ceb50cf7c93b625ef9a9d118411e3b95d21 100644
--- a/src/api/system/dataScope.js
+++ b/src/api/system/dataScope.js
@@ -102,24 +102,24 @@ export function del (id) {
}
/**
- * 保存关联部门
+ * 获取关联部门id
*/
-export function saveDeptAssign (obj) {
+export function getDeptIds (id) {
return axios({
- url: '/data/scope/saveDeptAssign',
- method: 'POST',
- data: obj
+ url: '/data/scope/getDeptIds',
+ method: 'GET',
+ params: { id }
})
}
/**
- * 获取关联部门id
+ * 保存关联部门
*/
-export function getDeptIds (id) {
+export function saveDeptAssign (obj) {
return axios({
- url: '/data/scope/getDeptIds',
- method: 'GET',
- params: { id }
+ url: '/data/scope/saveDeptAssign',
+ method: 'POST',
+ data: obj
})
}
diff --git a/src/api/system/user.js b/src/api/system/user.js
index 9518c419a00dc136f99dbdd4268b1e156131029c..cc07d17327790c7e55c1766f7c9cad996f00ed34 100644
--- a/src/api/system/user.js
+++ b/src/api/system/user.js
@@ -142,11 +142,11 @@ export function bindThird (obj) {
/**
* 解除用户绑定三方开放平台
*/
-export function unbindThird (clientCode) {
+export function unbindThird (loginType) {
return axios({
url: `/user/third/unbind`,
method: 'post',
- params: { clientCode }
+ params: { loginType }
})
}
diff --git a/src/api/system/userAssign.js b/src/api/system/userAssign.js
index 22018ddc4015317f3e4155cc467fcfd60358a804..f5d9c9c31c94bfee43d539219f5b6ef61614bcdd 100644
--- a/src/api/system/userAssign.js
+++ b/src/api/system/userAssign.js
@@ -89,22 +89,22 @@ export function addUserRoleBatch (data) {
}
/**
- * 获取用户拥有数据权限id集合
+ * 获取用户拥有数据权限id
*/
-export function findDataScopeIdsByUser (id) {
+export function getDataScopeIdByUser (id) {
return axios({
- url: `/user/data/scope/findIdsByUser`,
+ url: `/user/data/scope/findDataScopeIdByUser`,
method: 'GET',
params: { id }
})
}
/**
- * 获取用户拥有数据权限集合
+ * 获取用户拥有数据权限
*/
-export function getDataScopes (id) {
+export function getDataScopeByUser (id) {
return axios({
- url: `/user/data/scope/findAllByUser`,
+ url: `/user/data/scope/findDataScopeByUser`,
method: 'GET',
params: { id }
})
diff --git a/src/api/system/userAssist.js b/src/api/system/userAssist.js
index 264f954a023f0983899d909e1b170dc9a98b86ff..96b18d6919af3e3cab93cbd7d3a727dbd633e481 100644
--- a/src/api/system/userAssist.js
+++ b/src/api/system/userAssist.js
@@ -112,7 +112,7 @@ export function sendCurrentEmailChangeCaptcha () {
*/
export function validateCurrentEmailChangeCaptcha (captcha) {
return axios({
- url: `/user/validateCurrentEmailChangeCaptcha`,
+ url: `/user/validateCurrentChangeEmailCaptcha`,
method: 'get',
params: { captcha }
})
diff --git a/src/components/Bootx/RoleSelectModal/BRoleSelectModal.vue b/src/components/Bootx/RoleSelectModal/BRoleSelectModal.vue
index 77f091a9a406833a21a66c1dd46dc053d1a8e809..b95c051f78921caaab784b109857cda268f314e6 100644
--- a/src/components/Bootx/RoleSelectModal/BRoleSelectModal.vue
+++ b/src/components/Bootx/RoleSelectModal/BRoleSelectModal.vue
@@ -27,10 +27,10 @@
:radio-config="radioConfig"
:loading="loading"
:data="tableData">
-
-
-
-
+
+
+
+
-
-
-
-
+
+
+
+
{
+ return { label: o.name, value: o.code }
+ })
+ },
/**
* 获取字典项列表(code值为数字)
* 字段 name code 结构
@@ -96,13 +103,9 @@ export const FormMixin = {
return getDictItemsByNumber(dictCode)
},
// 获取字典项列表(code值为数字) 异步
- getDictItemsByNumberAsync (dictCode) {
+ async getDictItemsByNumberAsync (dictCode) {
return getDictItemsByNumberAsync(dictCode)
},
- // 获取系统参数值
- getParam (key) {
- return findByParamKey(key)
- },
// 判断脱敏参数是否被修改的参数, 未修改返回空值
diffForm (o1, o2) {
return o1 === o2 ? null : o1
diff --git a/src/views/account/bind/Binding.vue b/src/views/account/bind/Binding.vue
index 80ad58b9da8f8c3dc040cce0f5726182a1ee89c8..36653637db2d61ca47b05e27d986325a00082153 100644
--- a/src/views/account/bind/Binding.vue
+++ b/src/views/account/bind/Binding.vue
@@ -99,10 +99,10 @@ export default {
/**
* 绑定账号
*/
- bindThird (clientCode) {
- this.currentClientCode = clientCode
- const url = process.env.VUE_APP_API_BASE_URL + `/auth/third/toLoginUrl/${clientCode}`
- window.open(url, `login ${clientCode}`, 'height=600, width=500, top=0, left=0, toolbar=no, menubar=no, scrollbars=no, resizable=no,location=n o, status=no')
+ bindThird (loginType) {
+ this.currentLoginType = loginType
+ const url = process.env.VUE_APP_API_BASE_URL + `/auth/third/toLoginUrl/${loginType}`
+ window.open(url, `login ${loginType}`, 'height=600, width=500, top=0, left=0, toolbar=no, menubar=no, scrollbars=no, resizable=no,location=n o, status=no')
// 监听回调
window.addEventListener('message', this.bindThirdCallback, false)
@@ -118,7 +118,7 @@ export default {
this.loading = true
bindThird({
...data,
- clientCode: this.currentClientCode
+ loginType: this.currentLoginType
}).then(() => {
this.$message.success('绑定成功')
}).finally(() => {
@@ -145,14 +145,13 @@ export default {
/**
* 解绑账号
*/
- unBindThird (clientCode) {
+ unBindThird (loginType) {
const that = this
this.$confirm({
- title: '是否解除绑定的第三方平台账号',
- okText: '确定',
- cancelText: '取消',
+ title: '警告',
+ content: '是否解除绑定的第三方平台账号',
onOk: async function () {
- await unbindThird(clientCode)
+ await unbindThird(loginType)
that.init()
}
})
diff --git a/src/views/account/bind/WeChatQrBind.vue b/src/views/account/bind/WeChatQrBind.vue
index 38ad1eafb930b91dd9864daa365ef74fffa0ac90..28ca21d09b1efa4f8fd317fba2d3fb5e2697a358 100644
--- a/src/views/account/bind/WeChatQrBind.vue
+++ b/src/views/account/bind/WeChatQrBind.vue
@@ -20,7 +20,6 @@