修改了很多

feige

2024-01-23 d0136913a2c74a44f5bb30327ebbb3fd85e24fce

 ruoyi-ui/src/views/system/user/profile/index.vue

@@ -56,252 +56,77 @@
      </el-col>
    </el-row>
    <div style="padding-top: 20px; background-color: #F4FFF8;">
      <div class="container">
        <div>
          <span style="font-family: Microsoft YaHei-Regular, Microsoft YaHei; padding-left: 10px;">权限情况</span>
        </div>
        <div style="padding-left: 10px;">
          <el-dropdown v-model="selectedFamily"  @command="handleDropdownCommand">
        <span class="el-dropdown-link">
          {{ selectedFamily || '下拉菜单' }}<i class="el-icon-arrow-down el-icon--right"></i>
        </span>
            <el-dropdown-menu slot="dropdown">
              <el-dropdown-item command="一号家庭">一号家庭</el-dropdown-item>
              <el-dropdown-item command="二号家庭">二号家庭</el-dropdown-item>
              <el-dropdown-item command="三号家庭">三号家庭</el-dropdown-item>
              <el-dropdown-item command="四号家庭">四号家庭</el-dropdown-item>
            </el-dropdown-menu>
          </el-dropdown>
        </div>
      </div>

      <el-divider></el-divider>
      <div >
        <el-tabs v-model="activeTab1" style="padding-left: 25px;" @tab-click="handleTabClick">
          <el-tab-pane label="家根网"  prop="家根网">
            <span >查看权限</span>
            <span style="padding-left: 1200px;">{{SelfPermissionList.search === 0 ? '未持有' : '持有' }}</span>
            <el-divider></el-divider>
            <span>新增权限</span>
            <span style="padding-left: 1200px;">{{ SelfPermissionList.insert === 0 ? '未持有' : '持有'  }}</span>
            <el-divider></el-divider>
            <span>删除权限</span>
            <span style="padding-left: 1200px;">{{ SelfPermissionList.delete  === 0 ? '未持有' : '持有' }}</span>
            <el-divider></el-divider>
            <span>修改权限</span>
            <span style="padding-left: 1200px;">{{ SelfPermissionList.update  === 0 ? '未持有' : '持有' }}</span>
            <el-divider></el-divider>
          </el-tab-pane>
          <el-tab-pane label="家大事记">
            <span >查看权限</span>
            <span style="padding-left: 1200px;">{{SelfPermissionList.search === 0 ? '未持有' : '持有' }}</span>
            <el-divider></el-divider>
            <span>新增权限</span>
            <span style="padding-left: 1200px;">{{ SelfPermissionList.insert === 0 ? '未持有' : '持有'  }}</span>
            <el-divider></el-divider>
            <span>删除权限</span>
            <span style="padding-left: 1200px;">{{ SelfPermissionList.delete  === 0 ? '未持有' : '持有' }}</span>
            <el-divider></el-divider>
            <span>修改权限</span>
            <span style="padding-left: 1200px;">{{ SelfPermissionList.update  === 0 ? '未持有' : '持有' }}</span>
            <el-divider></el-divider>
          <el-form ref="form" :model="form" :rules="rules" label-width="100px">
       <el-row>
       <el-col :span="10" :xs="24">
        <el-form-item label="菜单权限">
       <el-tree
            class="tree-border"
            :data="menuOptions"
            show-checkbox
            ref="authr"
            node-key="id"
:default-expand-all="true"

          </el-tab-pane>
          <el-tab-pane label="家庭资产">
            <span >查看权限</span>
            <span style="padding-left: 1200px;">{{SelfPermissionList.search === 0 ? '未持有' : '持有' }}</span>
            <el-divider></el-divider>
            <span>新增权限</span>
            <span style="padding-left: 1200px;">{{ SelfPermissionList.insert === 0 ? '未持有' : '持有'  }}</span>
            <el-divider></el-divider>
            <span>删除权限</span>
            <span style="padding-left: 1200px;">{{ SelfPermissionList.delete  === 0 ? '未持有' : '持有' }}</span>
            <el-divider></el-divider>
            <span>修改权限</span>
            <span style="padding-left: 1200px;">{{ SelfPermissionList.update  === 0 ? '未持有' : '持有' }}</span>
            <el-divider></el-divider>
          </el-tab-pane>
          <el-tab-pane label="家庭设备">
            <span >查看权限</span>
            <span style="padding-left: 1200px;">{{SelfPermissionList.search === 0 ? '未持有' : '持有' }}</span>
            <el-divider></el-divider>
            <span>新增权限</span>
            <span style="padding-left: 1200px;">{{ SelfPermissionList.insert === 0 ? '未持有' : '持有'  }}</span>
            <el-divider></el-divider>
            <span>删除权限</span>
            <span style="padding-left: 1200px;">{{ SelfPermissionList.delete  === 0 ? '未持有' : '持有' }}</span>
            <el-divider></el-divider>
            <span>修改权限</span>
            <span style="padding-left: 1200px;">{{ SelfPermissionList.update  === 0 ? '未持有' : '持有' }}</span>
            <el-divider></el-divider>
          </el-tab-pane>
          <el-tab-pane label="收藏荣誉">
            <span >查看权限</span>
            <span style="padding-left: 1200px;">{{SelfPermissionList.search === 0 ? '未持有' : '持有' }}</span>
            <el-divider></el-divider>
            <span>新增权限</span>
            <span style="padding-left: 1200px;">{{ SelfPermissionList.insert === 0 ? '未持有' : '持有'  }}</span>
            <el-divider></el-divider>
            <span>删除权限</span>
            <span style="padding-left: 1200px;">{{ SelfPermissionList.delete  === 0 ? '未持有' : '持有' }}</span>
            <el-divider></el-divider>
            <span>修改权限</span>
            <span style="padding-left: 1200px;">{{ SelfPermissionList.update  === 0 ? '未持有' : '持有' }}</span>
            <el-divider></el-divider>
          </el-tab-pane>
          <el-tab-pane label="小医生">
            <span >查看权限</span>
            <span style="padding-left: 1200px;">{{SelfPermissionList.search === 0 ? '未持有' : '持有' }}</span>
            <el-divider></el-divider>
            <span>新增权限</span>
            <span style="padding-left: 1200px;">{{ SelfPermissionList.insert === 0 ? '未持有' : '持有'  }}</span>
            <el-divider></el-divider>
            <span>删除权限</span>
            <span style="padding-left: 1200px;">{{ SelfPermissionList.delete  === 0 ? '未持有' : '持有' }}</span>
            <el-divider></el-divider>
            <span>修改权限</span>
            <span style="padding-left: 1200px;">{{ SelfPermissionList.update  === 0 ? '未持有' : '持有' }}</span>
            <el-divider></el-divider>
          </el-tab-pane>
          <el-tab-pane label="保洁收纳">
            <span >查看权限</span>
            <span style="padding-left: 1200px;">{{SelfPermissionList.search === 0 ? '未持有' : '持有' }}</span>
            <el-divider></el-divider>
            <span>新增权限</span>
            <span style="padding-left: 1200px;">{{ SelfPermissionList.insert === 0 ? '未持有' : '持有'  }}</span>
            <el-divider></el-divider>
            <span>删除权限</span>
            <span style="padding-left: 1200px;">{{ SelfPermissionList.delete  === 0 ? '未持有' : '持有' }}</span>
            <el-divider></el-divider>
            <span>修改权限</span>
            <span style="padding-left: 1200px;">{{ SelfPermissionList.update  === 0 ? '未持有' : '持有' }}</span>
            <el-divider></el-divider>
          </el-tab-pane>
          <el-tab-pane label="通讯录">
            <span >查看权限</span>
            <span style="padding-left: 1200px;">{{SelfPermissionList.search === 0 ? '未持有' : '持有' }}</span>
            <el-divider></el-divider>
            <span>新增权限</span>
            <span style="padding-left: 1200px;">{{ SelfPermissionList.insert === 0 ? '未持有' : '持有'  }}</span>
            <el-divider></el-divider>
            <span>删除权限</span>
            <span style="padding-left: 1200px;">{{ SelfPermissionList.delete  === 0 ? '未持有' : '持有' }}</span>
            <el-divider></el-divider>
            <span>修改权限</span>
            <span style="padding-left: 1200px;">{{ SelfPermissionList.update  === 0 ? '未持有' : '持有' }}</span>
            <el-divider></el-divider>
          </el-tab-pane>
          <el-tab-pane label="魅宠">
            <span >查看权限</span>
            <span style="padding-left: 1200px;">{{SelfPermissionList.search === 0 ? '未持有' : '持有' }}</span>
            <el-divider></el-divider>
            <span>新增权限</span>
            <span style="padding-left: 1200px;">{{ SelfPermissionList.insert === 0 ? '未持有' : '持有'  }}</span>
            <el-divider></el-divider>
            <span>删除权限</span>
            <span style="padding-left: 1200px;">{{ SelfPermissionList.delete  === 0 ? '未持有' : '持有' }}</span>
            <el-divider></el-divider>
            <span>修改权限</span>
            <span style="padding-left: 1200px;">{{ SelfPermissionList.update  === 0 ? '未持有' : '持有' }}</span>
            <el-divider></el-divider>
          </el-tab-pane>
          <el-tab-pane label="家庭收支台账">
            <span >查看权限</span>
            <span style="padding-left: 1200px;">{{SelfPermissionList.search === 0 ? '未持有' : '持有' }}</span>
            <el-divider></el-divider>
            <span>新增权限</span>
            <span style="padding-left: 1200px;">{{ SelfPermissionList.insert === 0 ? '未持有' : '持有'  }}</span>
            <el-divider></el-divider>
            <span>删除权限</span>
            <span style="padding-left: 1200px;">{{ SelfPermissionList.delete  === 0 ? '未持有' : '持有' }}</span>
            <el-divider></el-divider>
            <span>修改权限</span>
            <span style="padding-left: 1200px;">{{ SelfPermissionList.update  === 0 ? '未持有' : '持有' }}</span>
            <el-divider></el-divider>
          </el-tab-pane>
        </el-tabs>
            empty-text="加载中，请稍候"
            :props="defaultProps"
          ></el-tree>     </el-form-item>
          </el-col>
          <el-col :span="4" :xs="24" type="flex" align="middle">可以授权相关人员</el-col>
          <el-col  :span="10" :xs="24">
          <el-tree
               class="tree-border"
               :data="menuOptions1"
               show-checkbox
               ref="peoInfo"
               node-key="id"

               empty-text="加载中，请稍候"
               :props="defaultProps"
             ></el-tree>
             </el-col>
</el-row>
<el-button type="primary" @click="upAuthority">授权</el-button>
        </el-form>
      </div>
    </div>

<div style="padding-top: 25px;">
  <div v-if="user.roleName==='家庭管理员'" style=" padding-top: 25px;background-color: #F4FFF8;" >
    <div class="container">
      <el-divider></el-divider>
      <div>
        <span style="font-family: Microsoft YaHei-Regular, Microsoft YaHei; padding-left: 10px;">其他家庭权限管理</span>
      </div>
      <div style="padding-left: 10px;">
        <el-dropdown v-model="selectedFamily"  @command="handleDropdownCommand1">
        <span class="el-dropdown-link">
          {{ command1 ||'下拉菜单' }}<i class="el-icon-arrow-down el-icon--right"></i>
        </span>
          <el-dropdown-menu slot="dropdown">
            <el-dropdown-item command="一号家庭">一号家庭</el-dropdown-item>
            <el-dropdown-item command="二号家庭">二号家庭</el-dropdown-item>
            <el-dropdown-item command="三号家庭">三号家庭</el-dropdown-item>
            <el-dropdown-item command="四号家庭">四号家庭</el-dropdown-item>
          </el-dropdown-menu>
        </el-dropdown>
        <el-form>
        <el-row>
          <el-col :span="10" :xs="24">
           <el-form-item label="收回权限">
              <el-select v-model="st" placeholder="请选择菜单" @change="handleChange">
                   <el-option v-for="mo in menuOptions2" :label="mo.label" :value="mo.id" :key="mo.id"></el-option>
                 </el-select>


              </el-form-item>
              </el-col>
              <el-col :span="4" :xs="24" class="centered">已经授权相关人员</el-col>
             <el-col :span="10" :xs="24">
                     <el-form-item label="已经授权相关成员">
                    <el-tree
                         class="tree-border"
                         :data="menuOptionsp"
                         show-checkbox
                         ref="spp"
                         node-key="id"
             :default-expand-all="true"

                         empty-text="加载中，请稍候"
                         :props="defaultProps"
                       ></el-tree>     </el-form-item>
                       </el-col>
              </el-row>
              <el-button type="primary" @click="deleteAuthority">收回授权</el-button>
              </el-form>
      </div>
    </div>
    <el-divider></el-divider>
    <div v-if="FaimlyList && FaimlyList.length > 0">
      <el-tabs v-model="activeTab2" style="padding-left: 25px;" @tab-click="handleTabClick1">
        <el-tab-pane label="家根网"  prop="家根网">

          <span v-for="member in FaimlyList" :key="member.id">{{ member.name }}<el-divider></el-divider></span>
        </el-tab-pane>
        <el-tab-pane label="家大事记">
            <span v-for="member in FaimlyList" :key="member.id">{{ member.name }}<el-divider></el-divider></span>

        </el-tab-pane>
        <el-tab-pane label="家庭资产">
          <span>
            <span v-for="member in FaimlyList" :key="member.id">{{ member.name }}<el-divider></el-divider></span>

          </span>
        </el-tab-pane>
        <el-tab-pane label="家庭设备">
          <span v-for="member in FaimlyList" :key="member.id">{{ member.name }}<el-divider></el-divider></span>

        </el-tab-pane>
        <el-tab-pane label="收藏荣誉">
          <span v-for="member in FaimlyList" :key="member.id">{{ member.name }}<el-divider></el-divider></span>

        </el-tab-pane>
        <el-tab-pane label="小医生">
          <span v-for="member in FaimlyList" :key="member.id">{{ member.name }}<el-divider></el-divider></span>

        </el-tab-pane>
        <el-tab-pane label="保洁收纳">
          <span v-for="member in FaimlyList" :key="member.id">{{ member.name }}<el-divider></el-divider></span>

        </el-tab-pane>
        <el-tab-pane label="通讯录">
          <span v-for="member in FaimlyList" :key="member.id">{{ member.name }}<el-divider></el-divider></span>

        </el-tab-pane>
        <el-tab-pane label="魅宠">
          <span v-for="member in FaimlyList" :key="member.id">{{ member.name }}<el-divider></el-divider></span>

        </el-tab-pane>
        <el-tab-pane label="家庭收支台账">
          <span v-for="member in FaimlyList" :key="member.id">{{ member.name }}<el-divider></el-divider></span>

        </el-tab-pane>
      </el-tabs>
    </div>
  </div>
</div>

<div style="padding-top: 20px">
      <div v-if="user.roleName==='家庭管理员'" style=" padding-top: 25px;background-color: #F4FFF8;" >
          <div>
            <span style="font-family: Microsoft YaHei-Regular, Microsoft YaHei; padding-left: 10px;">家庭成员管理</span><el-divider></el-divider>
          </div>
        <div style="padding-left: 20px;padding-top: 10px">
        <span v-for="member in FaimlyList1" :key="member.id">{{ member.name }}<el-divider></el-divider></span>
        </div>
    </div>
</div>
  </div>

</template>
@@ -310,7 +135,8 @@
import userAvatar from "./userAvatar";
import userInfo from "./userInfo";
import resetPwd from "./resetPwd";
import { getUserProfile ,getSelfPermission,getFamilyids} from "@/api/system/user";
import { getAllInfo,getUserProfile ,getSelfPermission,getFamilyids,setAuority
,getUserByFidAid,deleteUserByFidAid} from "@/api/system/user";
import { getIndividualList } from "@/api/self";
import {updateFamilyevent} from "@/api/bignote";

@@ -323,6 +149,100 @@
        familyName: undefined,
        modelName: undefined,
      },
      fid: undefined,
      st: undefined,
      menuOptionsp:[
        {
          id: 1,
          label: '家庭成员',
          children:[]
        }
      ],
      menuOptions2:[
        {
          id: 2000,
          label: '家庭资产管理',

        },
        {
          id: 2012,
          label: '家大事记',
        },
        { id:2016,
          label: '家庭设备',
          },
          {
          id: 2004,
          label: '收藏和荣誉',

        },
        {
          id: 2029,
          label: '家庭小医生',
        },
        { id:2024,
          label: '保洁收纳',
          },
        {
          id: 2021,
          label: '通讯录',
        },
        { id:2033,
          label: '魅宠',
          },
          {id:2008,
            label: '家庭收支台账',
            }
      ],
      menuOptions1:[
        {
          id: 1,
          label: '家庭成员',
          children:[]
        }
      ],
      menuOptions:[
          {
            id: 1,
            label: '家庭模块',
            children: [
              {
                id: 2000,
                label: '家庭资产管理',

              },
              {
                id: 2012,
                label: '家大事记',
              },
              { id:2016,
                label: '家庭设备',
                },
                {
                id: 2004,
                label: '收藏和荣誉',

              },
              {
                id: 2029,
                label: '家庭小医生',
              },
              { id:2024,
                label: '保洁收纳',
                },
              {
                id: 2021,
                label: '通讯录',
              },
              { id:2033,
                label: '魅宠',
                },
                {id:2008,
                  label: '家庭收支台账',
                  }
            ],
          },
      ],
      FaimlyList:undefined,
      FaimlyList1:undefined,
      selectedFamily: "一号家庭",
@@ -350,6 +270,85 @@
    this.getList();
  },
  methods: {
    deleteAuthority(){
    //  alert(this.st)
      let uidKeys = this.$refs.spp.getCheckedKeys();
      let auIds = []
      auIds.push(this.st)
      let data = {
        uids:  uidKeys,
        fid: this.fid,
        authoritys: auIds
      }
      let _this = this
      if(this.st!=undefined&&uidKeys.length!=0){
        deleteUserByFidAid(data).then(response=>{
             this.$modal.msgSuccess(response.msg)
             let data = {
               "fid": _this.fid,
               "authority": _this.st
             }
           //  alert(data.authority)
            // let _this = this
             getUserByFidAid(data).then(response=>{
               console.log(response)
               let fams = response.data;
               for(let i = 0 ; i < fams.length; i++)
                 _this.menuOptionsp[0]['children'].push({id:fams[i].userId,label:fams[i].nickName })

             })
        })
        }
      else{
           this.$modal.msgSuccess("权限或被授权人不能为空！")
      }
    },
    getDeptAllCheckedKeys() {
      // 目前被选中的部门节点
      let checkedKeys = this.$refs.authr.getCheckedKeys();
     // console.log(checkedKeys)
      },
    upAuthority(){
      let checkedKeys = this.$refs.authr.getCheckedKeys();
      let peoKeys = this.$refs.peoInfo.getCheckedKeys();
     // console.log(peoKeys)
     // alert(checkedKeys.length)
     // this.getDeptAllCheckedKeys()
     if(checkedKeys.length!=0&&peoKeys.length!=0)
     {
       let data = {
         uids:  peoKeys,
         fid: this.fid,
         authoritys: checkedKeys
       }
     //  console.log(data)
      //  alert(123)
        setAuority(data).then(response=>{
       //   console.log(response)
           this.$modal.msgSuccess(response.msg)
        //  alert(response.data)
        })
      }
      else{
        this.$modal.msgSuccess("权限或被授权人不能为空！");
  }
    },
    handleChange(value){

      let data = {
        "fid": this.fid,
        "authority": value
      }
      alert(data.authority)
      let _this = this
      getUserByFidAid(data).then(response=>{
        console.log(response)
        let fams = response.data;
        for(let i = 0 ; i < fams.length; i++)
          _this.menuOptionsp[0]['children'].push({id:fams[i].userId,label:fams[i].nickName })

      })
    },
    handleTabClick(tab) {
      this.selectedTab = tab.label;
      if (this.selectedFamily && this.selectedTab) {
@@ -360,29 +359,29 @@
      this.selectedTab1 = tab.label;
    },
    handleDropdownCommand(command) {
      this.selectedFamily = command; // 更新选中的家庭
      console.log(this.selectedFamily)
      // 检查下拉菜单和切片页面是否都被选中
      if (this.selectedFamily && this.selectedTab) {
        this.getList();
      }
      // this.selectedFamily = command; // 更新选中的家庭
      // console.log(this.selectedFamily)
      // // 检查下拉菜单和切片页面是否都被选中
      // if (this.selectedFamily && this.selectedTab) {
      //   this.getList();
      // }
    },
    handleDropdownCommand1(command1) {
      this.command1= command1;
      console.log(command1)
      let id = null;
      if (command1 == '一号家庭') {
        id = 1;
      } else if (command1 == '二号家庭') {
        id = 2;
      } else if (command1 == '三号家庭') {
        id = 3;
      } else if (command1 == '四号家庭') {
        id = 4;
      }
      if (id) {
        this.getUser(parseInt(id)); // 将id转换为数字类型
      }
      // this.command1= command1;
      // console.log(command1)
      // let id = null;
      // if (command1 == '一号家庭') {
      //   id = 1;
      // } else if (command1 == '二号家庭') {
      //   id = 2;
      // } else if (command1 == '三号家庭') {
      //   id = 3;
      // } else if (command1 == '四号家庭') {
      //   id = 4;
      // }
      // if (id) {
      //   this.getUser(parseInt(id)); // 将id转换为数字类型
      // }
    },


@@ -394,45 +393,54 @@
      //   this.postGroup = response.postGroup;
      // });

      getFamilyids(id).then(response => {
        console.log(id)
        this.FaimlyList = response.data;
        console.log("打印家庭成员序列"+id)
        console.log(this.FaimlyList)
      });
     //  getFamilyids(id).then(response => {
     //    console.log(id)
     // //   this.FaimlyList = response.data;
     //    console.log("打印家庭成员序列"+id)
     //    console.log(this.FaimlyList)
     //  });
      getIndividualList().then(response => {
        this.user = response.data;

       // alert(890)
        this.fid = response.data.familyId
    //    alert(this.fid)
        this.roleGroup = response.roleGroup;
        this.postGroup = response.postGroup;
      });
      if (this.user.familyName='一号家庭'){
        id=1;
        getFamilyids(id).then(response => {
          console.log(id)
          this.FaimlyList1 = response.data;
          console.log("打印家庭成员序列"+id)
          console.log(this.FaimlyList)
        });
      }
      // if (this.user.familyName='一号家庭'){
      //   id=1;
      //   getFamilyids(id).then(response => {
      //     console.log(id)
      //     this.FaimlyList1 = response.data;
      //     console.log("打印家庭成员序列"+id)
      //     console.log(this.FaimlyList)
      //   });
      // }



    },
    getList() {

      var formData ={
    "familyName": this.selectedFamily,
    "modelName":this.selectedTab,
}
    let _this = this

      var jsonString = JSON.stringify(formData);
    //  console.log(jsonString);
    getAllInfo().then(response=>{
      let fams = response.data
      for(let i = 0; i < fams.length; i++)
        _this.menuOptions1[0]['children'].push({id:fams[i].userId,label:fams[i].nickName })
    })
//       var formData ={
//     "familyName": this.selectedFamily,
//     "modelName":this.selectedTab,
// }

      getSelfPermission(jsonString).then(response => {
        this.SelfPermissionList = response.data;
        console.log(this.SelfPermissionList)
      });
//       var jsonString = JSON.stringify(formData);
//     //  console.log(jsonString);

//       getSelfPermission(jsonString).then(response => {
//         this.SelfPermissionList = response.data;
//         console.log(this.SelfPermissionList)
//       });

    }
  }
@@ -443,7 +451,13 @@
.container {
  display: flex;
}

.centered {
  display: flex;
  flex-direction: column;
  align-items: center;
  justify-content: center;
  text-align: center;
}
.el-icon-arrow-down {
  font-size: 12px;
}