From 8f115311af95cb2fe0d7bee2d8a97dcbc059a263 Mon Sep 17 00:00:00 2001
From: feige <791364011@qq.com>
Date: 星期四, 22 八月 2024 10:59:03 +0800
Subject: [PATCH] 修改权限相关
---
ruoyi-ui/src/views/mindMap/index.vue | 4 +++-
ruoyi-ui/src/views/genealogy/index.vue | 3 ++-
ruoyi-ui/src/views/system/family/index.vue | 18 ++++++++++--------
ruoyi-ui/src/views/system/user/index.vue | 8 ++++++--
ruoyi-ui/src/api/system/family.js | 4 ++--
ruoyi-ui/src/api/root/index.js | 6 +++---
ruoyi-ui/src/api/system/user.js | 4 ++--
7 files changed, 28 insertions(+), 19 deletions(-)
diff --git a/ruoyi-ui/src/api/root/index.js b/ruoyi-ui/src/api/root/index.js
index aad208b..d245238 100644
--- a/ruoyi-ui/src/api/root/index.js
+++ b/ruoyi-ui/src/api/root/index.js
@@ -1,12 +1,12 @@
import request from '@/utils/request'
// 鑾峰彇瀹舵牴缃�
-export function listRoot(query) {
+export function listRoot(depth,clanId) {
// alert(3)
return request({
- url: '/self/user/root?depth='+query,
+ url: '/self/user/root?depth='+depth+'&clanId='+clanId,
method: 'get',
- // params: query
+ // params: query
})
}
diff --git a/ruoyi-ui/src/api/system/family.js b/ruoyi-ui/src/api/system/family.js
index 327665e..58b52f2 100644
--- a/ruoyi-ui/src/api/system/family.js
+++ b/ruoyi-ui/src/api/system/family.js
@@ -2,11 +2,11 @@
import { parseStrEmpty } from "@/utils/ruoyi";
// 鏌ヨ瀹跺涵鍒楄〃
-export function listFamily() {
+export function listFamily(query) {
return request({
url: '/family/all',
method: 'get',
-
+ params: query
})
}
diff --git a/ruoyi-ui/src/api/system/user.js b/ruoyi-ui/src/api/system/user.js
index 963737b..231d1e3 100644
--- a/ruoyi-ui/src/api/system/user.js
+++ b/ruoyi-ui/src/api/system/user.js
@@ -179,9 +179,9 @@
method: 'get'
})
}
-export function getAllInfo(){
+export function getAllInfo(clanId){
return request({
- url:'/self/user/allFamInfo',
+ url:'/self/user/allFamInfo?clanId='+clanId,
method: 'get'
})
}
diff --git a/ruoyi-ui/src/views/genealogy/index.vue b/ruoyi-ui/src/views/genealogy/index.vue
index 8dfffb7..5341ab5 100644
--- a/ruoyi-ui/src/views/genealogy/index.vue
+++ b/ruoyi-ui/src/views/genealogy/index.vue
@@ -255,6 +255,7 @@
nickName:undefined,
sex:undefined,
birth:undefined,
+ clanId: undefined
},
// searchVal:"",
@@ -366,7 +367,7 @@
//alert(23)
this.queryParams.happenStartTime = this.dateRange.length > 0 && this.dateRange[0]
this.queryParams.happenEndTime = this.dateRange.length > 0 && this.dateRange[1]
-
+ this.queryParams.clanId = this.$store.state.user.clanId
// this.queryParams.pageSize = this.pageSize; // 娣诲姞 pageSize 鍙傛暟
// this.queryParams.pageNum = this.pageNum; // 娣诲姞 pageNum 鍙傛暟
diff --git a/ruoyi-ui/src/views/mindMap/index.vue b/ruoyi-ui/src/views/mindMap/index.vue
index bb2f133..e19ed33 100644
--- a/ruoyi-ui/src/views/mindMap/index.vue
+++ b/ruoyi-ui/src/views/mindMap/index.vue
@@ -78,7 +78,9 @@
getUserProfile().then(response => {
this.user = response.data;
});
- listRoot(10).then(response =>{
+ let clanId = this.$store.state.user.clanId
+ // alert(clanId)
+ listRoot(10,clanId).then(response =>{
this.rootList =response.data;
const mindMapData = this.rootList[0];
diff --git a/ruoyi-ui/src/views/system/family/index.vue b/ruoyi-ui/src/views/system/family/index.vue
index 33546cb..23e196b 100644
--- a/ruoyi-ui/src/views/system/family/index.vue
+++ b/ruoyi-ui/src/views/system/family/index.vue
@@ -197,9 +197,8 @@
queryParams: {
pageNum: 1,
pageSize: 10,
- roleName: undefined,
- roleKey: undefined,
- status: undefined
+ name: undefined,
+ clanId: undefined
},
personInfos:[],
personInfos1:[],
@@ -268,7 +267,8 @@
},
getAllUser(){
- getAllInfo().then(response=>{
+ let clanId = this.$store.state.user.clanId
+ getAllInfo(clanId).then(response=>{
let fams = response.data
let _this = this;
console.log(fams)
@@ -287,10 +287,12 @@
getList() {
this.loading = true;
let clanId = this.$store.state.user.clanId
- alert(clanId)
- listFamily().then(response => {
- this.roleList = response.data;
- // this.total = response.total;
+ // alert(clanId)
+ this.queryParams.clanId = clanId;
+ listFamily(this.queryParams).then(response => {
+ console.log(response)
+ this.roleList = response.data.data;
+ this.total = response.data.total;
this.loading = false;
}
);
diff --git a/ruoyi-ui/src/views/system/user/index.vue b/ruoyi-ui/src/views/system/user/index.vue
index dc992d8..89eccb6 100644
--- a/ruoyi-ui/src/views/system/user/index.vue
+++ b/ruoyi-ui/src/views/system/user/index.vue
@@ -670,7 +670,10 @@
this.isshowMri = true
},
getAllIn(){
- getAllInfo().then(response => {
+ let clanId = this.$store.state.user.clanId
+ getAllInfo(clanId).then(response => {
+ console.log(response)
+ console.log('-------00000000000000000-----------')
this.allInfo = response.data;
console.log(response.data,'allInfoallInfoallInfoallInfo')
for(var i = 0; i < this.allInfo.length; i++)
@@ -924,7 +927,8 @@
fm.spouseId = this.form.spouseId
fm.sysId = this.form.userId
fm.userName = this.form.userName
- fm.remark = this.form.remark
+ fm.remark = this.form.remark
+ fm.clanId = this.$store.state.user.clanId
// alert(fm.remark)
console.log(fm,'fmfmfmfmfmfmfmfm')
--
Gitblit v1.9.1