linwenling
2023-09-12 66db80bd6679d011c67ae289e4ded4fa4a76e5d4
修改个人中心
4个文件已修改
264 ■■■■■ 已修改文件
ruoyi-ui/src/api/system/user.js 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-ui/src/views/system/user/profile/index.vue 238 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-ui/src/views/system/user/profile/resetPwd.vue 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-ui/src/views/system/user/profile/userInfo.vue 10 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-ui/src/api/system/user.js
@@ -133,3 +133,13 @@
    method: 'get'
  })
}
//查看自己的权限
export function getSelfPermission(data) {
  return request({
    url: '/authority/condition',
    method: 'get',
    data: data
  })
}
ruoyi-ui/src/views/system/user/profile/index.vue
@@ -1,8 +1,8 @@
<template>
  <div class="app-container">
  <div class="app-container" style="background-color: #FEF7FC;">
    <el-row :gutter="20">
      <el-col :span="6" :xs="24">
        <el-card class="box-card">
      <el-col :span="8" :xs="24" >
        <el-card class="box-card" style="background-color: #EBF4FE;">
          <div slot="header" class="clearfix">
            <span>个人信息</span>
          </div>
@@ -12,35 +12,35 @@
            </div>
            <ul class="list-group list-group-striped">
              <li class="list-group-item">
                <svg-icon icon-class="user" />用户名称
                用户名称
                <div class="pull-right">{{ user.userName }}</div>
              </li>
              <li class="list-group-item">
                <svg-icon icon-class="phone" />手机号码
                手机号码
                <div class="pull-right">{{ user.phonenumber }}</div>
              </li>
              <li class="list-group-item">
                <svg-icon icon-class="email" />用户邮箱
                用户邮箱
                <div class="pull-right">{{ user.email }}</div>
              </li>
              <li class="list-group-item">
                <svg-icon icon-class="tree" />所属部门
                所属家庭
                <div class="pull-right" v-if="user.dept">{{ user.dept.deptName }} / {{ postGroup }}</div>
              </li>
              <li class="list-group-item">
                <svg-icon icon-class="peoples" />所属角色
                所属角色
                <div class="pull-right">{{ roleGroup }}</div>
              </li>
              <li class="list-group-item">
                <svg-icon icon-class="date" />创建日期
                创建日期
                <div class="pull-right">{{ user.createTime }}</div>
              </li>
            </ul>
          </div>
        </el-card>
      </el-col>
      <el-col :span="18" :xs="24">
        <el-card>
      <el-col :span="16" :xs="24" >
        <el-card style="background-color: #FFF5F7;">
          <div slot="header" class="clearfix">
            <span>基本资料</span>
          </div>
@@ -55,6 +55,161 @@
        </el-card>
      </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>
            <el-divider></el-divider>
            <span>新增权限</span>
<!--            <span style="padding-left: 1200px;">{{ SelfPermission.insert }}</span>-->
            <el-divider></el-divider>
            <span>删除权限</span>
<!--            <span style="padding-left: 1200px;">{{ SelfPermission.delete }}</span>-->
            <el-divider></el-divider>
            <span>修改权限</span>
<!--            <span style="padding-left: 1200px;">{{ SelfPermission.update }}</span>-->
          </el-tab-pane>
<!--          <el-tab-pane label="家大事记">-->
<!--            <span>查看权限</span>-->
<!--            <span style="padding-left: 1200px;">{{ SelfPermission.search }}</span>-->
<!--            <el-divider></el-divider>-->
<!--            <span>新增权限</span>-->
<!--            <span style="padding-left: 1200px;">{{ SelfPermission.insert }}</span>-->
<!--            <el-divider></el-divider>-->
<!--            <span>删除权限</span>-->
<!--            <span style="padding-left: 1200px;">{{ SelfPermission.delete }}</span>-->
<!--            <el-divider></el-divider>-->
<!--            <span>修改权限</span>-->
<!--            <span style="padding-left: 1200px;">{{ SelfPermission.update }}</span>-->
<!--          </el-tab-pane>-->
<!--          <el-tab-pane label="家庭资产">-->
<!--            <span>查看权限</span>-->
<!--            <span style="padding-left: 1200px;">{{ SelfPermission.search }}</span>-->
<!--            <el-divider></el-divider>-->
<!--            <span>新增权限</span>-->
<!--            <span style="padding-left: 1200px;">{{ SelfPermission.insert }}</span>-->
<!--            <el-divider></el-divider>-->
<!--            <span>删除权限</span>-->
<!--            <span style="padding-left: 1200px;">{{ SelfPermission.delete }}</span>-->
<!--            <el-divider></el-divider>-->
<!--            <span>修改权限</span>-->
<!--            <span style="padding-left: 1200px;">{{ SelfPermission.update }}</span>-->
<!--          </el-tab-pane>-->
<!--          <el-tab-pane label="家庭设备">-->
<!--            <span>查看权限</span>-->
<!--            <span style="padding-left: 1200px;">{{ SelfPermission.search }}</span>-->
<!--            <el-divider></el-divider>-->
<!--            <span>新增权限</span>-->
<!--            <span style="padding-left: 1200px;">{{ SelfPermission.insert }}</span>-->
<!--            <el-divider></el-divider>-->
<!--            <span>删除权限</span>-->
<!--            <span style="padding-left: 1200px;">{{ SelfPermission.delete }}</span>-->
<!--            <el-divider></el-divider>-->
<!--            <span>修改权限</span>-->
<!--            <span style="padding-left: 1200px;">{{ SelfPermission.update }}</span>-->
<!--          </el-tab-pane>-->
<!--          <el-tab-pane label="收藏荣誉">-->
<!--            <span>查看权限</span>-->
<!--            <span style="padding-left: 1200px;">{{ SelfPermission.search }}</span>-->
<!--            <el-divider></el-divider>-->
<!--            <span>新增权限</span>-->
<!--            <span style="padding-left: 1200px;">{{ SelfPermission.insert }}</span>-->
<!--            <el-divider></el-divider>-->
<!--            <span>删除权限</span>-->
<!--            <span style="padding-left: 1200px;">{{ SelfPermission.delete }}</span>-->
<!--            <el-divider></el-divider>-->
<!--            <span>修改权限</span>-->
<!--            <span style="padding-left: 1200px;">{{ SelfPermission.update }}</span>-->
<!--          </el-tab-pane>-->
<!--          <el-tab-pane label="小医生">-->
<!--            <span>查看权限</span>-->
<!--            <span style="padding-left: 1200px;">{{ SelfPermission.search }}</span>-->
<!--            <el-divider></el-divider>-->
<!--            <span>新增权限</span>-->
<!--            <span style="padding-left: 1200px;">{{ SelfPermission.insert }}</span>-->
<!--            <el-divider></el-divider>-->
<!--            <span>删除权限</span>-->
<!--            <span style="padding-left: 1200px;">{{ SelfPermission.delete }}</span>-->
<!--            <el-divider></el-divider>-->
<!--            <span>修改权限</span>-->
<!--            <span style="padding-left: 1200px;">{{ SelfPermission.update }}</span>-->
<!--          </el-tab-pane>-->
<!--          <el-tab-pane label="保洁收纳">-->
<!--            <span>查看权限</span>-->
<!--            <span style="padding-left: 1200px;">{{ SelfPermission.search }}</span>-->
<!--            <el-divider></el-divider>-->
<!--            <span>新增权限</span>-->
<!--            <span style="padding-left: 1200px;">{{ SelfPermission.insert }}</span>-->
<!--            <el-divider></el-divider>-->
<!--            <span>删除权限</span>-->
<!--            <span style="padding-left: 1200px;">{{ SelfPermission.delete }}</span>-->
<!--            <el-divider></el-divider>-->
<!--            <span>修改权限</span>-->
<!--            <span style="padding-left: 1200px;">{{ SelfPermission.update }}</span>-->
<!--          </el-tab-pane>-->
<!--          <el-tab-pane label="通讯录">-->
<!--            <span>查看权限</span>-->
<!--            <span style="padding-left: 1200px;">{{ SelfPermission.search }}</span>-->
<!--            <el-divider></el-divider>-->
<!--            <span>新增权限</span>-->
<!--            <span style="padding-left: 1200px;">{{ SelfPermission.insert }}</span>-->
<!--            <el-divider></el-divider>-->
<!--            <span>删除权限</span>-->
<!--            <span style="padding-left: 1200px;">{{ SelfPermission.delete }}</span>-->
<!--            <el-divider></el-divider>-->
<!--            <span>修改权限</span>-->
<!--            <span style="padding-left: 1200px;">{{ SelfPermission.update }}</span>-->
<!--          </el-tab-pane>-->
<!--          <el-tab-pane label="魅宠">-->
<!--            <span>查看权限</span>-->
<!--            <span style="padding-left: 1200px;">{{ SelfPermission.search }}</span>-->
<!--            <el-divider></el-divider>-->
<!--            <span>新增权限</span>-->
<!--            <span style="padding-left: 1200px;">{{ SelfPermission.insert }}</span>-->
<!--            <el-divider></el-divider>-->
<!--            <span>删除权限</span>-->
<!--            <span style="padding-left: 1200px;">{{ SelfPermission.delete }}</span>-->
<!--            <el-divider></el-divider>-->
<!--            <span>修改权限</span>-->
<!--            <span style="padding-left: 1200px;">{{ SelfPermission.update }}</span>-->
<!--          </el-tab-pane>-->
<!--          <el-tab-pane label="家庭收支台账">-->
<!--            <span>查看权限</span>-->
<!--            <span style="padding-left: 1200px;">{{ SelfPermission.search }}</span>-->
<!--            <el-divider></el-divider>-->
<!--            <span>新增权限</span>-->
<!--            <span style="padding-left: 1200px;">{{ SelfPermission.insert }}</span>-->
<!--            <el-divider></el-divider>-->
<!--            <span>删除权限</span>-->
<!--            <span style="padding-left: 1200px;">{{ SelfPermission.delete }}</span>-->
<!--            <el-divider></el-divider>-->
<!--            <span>修改权限</span>-->
<!--            <span style="padding-left: 1200px;">{{ SelfPermission.update }}</span>-->
<!--          </el-tab-pane>-->
        </el-tabs>
      </div>
    </div>
  </div>
</template>
@@ -62,30 +217,87 @@
import userAvatar from "./userAvatar";
import userInfo from "./userInfo";
import resetPwd from "./resetPwd";
import { getUserProfile } from "@/api/system/user";
import { getUserProfile ,getSelfPermission} from "@/api/system/user";
export default {
  name: "Profile",
  components: { userAvatar, userInfo, resetPwd },
  data() {
    return {
      data: {
        familyName: undefined,
        modelName: undefined,
      },
      selectedFamily: '', // 初始化选中的家庭为空字符串
      SelfPermission:undefined,
      user: {},
      roleGroup: {},
      postGroup: {},
      activeTab: "userinfo"
      activeTab: "userinfo",
      activeTab1:"ueserinfopermission"
    };
  },
  created() {
    this.getUser();
    this.getUserPermission();
  },
  methods: {
    handleTabClick(tab) {
      this.selectedTab = tab.label;
      if (this.selectedFamily && this.selectedTab) {
        this.getUserPermission(); // 调用 getList 方法
      }
    },
    handleDropdownCommand(command) {
      this.selectedFamily = command; // 更新选中的家庭
      // 检查下拉菜单和切片页面是否都被选中
      if (this.selectedFamily && this.selectedTab) {
        this.getUserPermission(); // 调用 getList 方法
      }
    },
    getUser() {
      getUserProfile().then(response => {
        this.user = response.data;
        this.roleGroup = response.roleGroup;
        this.postGroup = response.postGroup;
      });
    },
    getUserPermission(){
      console.log(this.selectedTab)
      console.log(this.selectedFamily)
      this.data = ({
        familyName: this.selectedFamily,
        modelName: this.selectedTab
      });
      console.log(this.data)
      console.log(typeof this.data)
      const jsonData = JSON.stringify(this.data); // 将对象转换为 JSON 字符串
      console.log(jsonData); // 打印 JSON 字符串
      // debugger
      if(jsonData){
      getSelfPermission(jsonData).then(response => {
          this.SelfPermission = response.data;
          console.log(111);
          console.log(this.SelfPermission);
        })
        .catch(error => {
          // 处理错误
        });
      }
    }
  }
};
</script>
<style>
.container {
  display: flex;
}
.el-icon-arrow-down {
  font-size: 12px;
}
</style>
ruoyi-ui/src/views/system/user/profile/resetPwd.vue
@@ -1,4 +1,5 @@
<template>
  <div style="background-color: #FFF5F7; height: 343px;">
  <el-form ref="form" :model="user" :rules="rules" label-width="80px">
    <el-form-item label="旧密码" prop="oldPassword">
      <el-input v-model="user.oldPassword" placeholder="请输入旧密码" type="password" show-password/>
@@ -10,10 +11,11 @@
      <el-input v-model="user.confirmPassword" placeholder="请确认新密码" type="password" show-password/>
    </el-form-item>
    <el-form-item>
      <el-button type="primary" size="mini" @click="submit">保存</el-button>
      <el-button type="danger" size="mini" @click="close">关闭</el-button>
        <el-button style="background-color: #E0EEFE; " size="medium" @click="submit" >保存</el-button>
        <el-button style="background-color: #EBAFB4;" size="medium" @click="close">关闭</el-button>
    </el-form-item>
  </el-form>
  </div>
</template>
<script>
ruoyi-ui/src/views/system/user/profile/userInfo.vue
@@ -1,5 +1,6 @@
<template>
  <el-form ref="form" :model="user" :rules="rules" label-width="80px">
  <div style="background-color: #FFF5F7; height: 343px;" >
    <el-form ref="form" :model="user" :rules="rules" label-width="80px" style="padding-top: 40;">
    <el-form-item label="用户昵称" prop="nickName">
      <el-input v-model="user.nickName" maxlength="30" />
    </el-form-item> 
@@ -9,17 +10,20 @@
    <el-form-item label="邮箱" prop="email">
      <el-input v-model="user.email" maxlength="50" />
    </el-form-item>
      <div style="padding-top: 20px;">
    <el-form-item label="性别">
      <el-radio-group v-model="user.sex">
        <el-radio label="0">男</el-radio>
        <el-radio label="1">女</el-radio>
      </el-radio-group>
    </el-form-item>
      </div>
    <el-form-item>
      <el-button type="primary" size="mini" @click="submit">保存</el-button>
      <el-button type="danger" size="mini" @click="close">关闭</el-button>
        <el-button style="background-color: #E0EEFE; " size="medium" @click="submit" >保存</el-button>
        <el-button style="background-color: #EBAFB4;" size="medium" @click="close">关闭</el-button>
    </el-form-item>
  </el-form>
  </div>
</template>
<script>