修改权限相关

feige

2024-08-22 8f115311af95cb2fe0d7bee2d8a97dcbc059a263

修改权限相关

 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
  })
}


 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
  })
}


 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'
  })
}

 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 参数


 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];

 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;
        }
      );

 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')