From bd4b9aa6ab74a8aa6f55265d24b4a4249abcb636 Mon Sep 17 00:00:00 2001
From: feige <feige@qq.com>
Date: 星期一, 11 十二月 2023 19:18:39 +0800
Subject: [PATCH] 问题解决
---
ruoyi-ui/src/views/system/user/profile/index.vue | 401 ++++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 380 insertions(+), 21 deletions(-)
diff --git a/ruoyi-ui/src/views/system/user/profile/index.vue b/ruoyi-ui/src/views/system/user/profile/index.vue
index ad530f9..ca1c733 100644
--- a/ruoyi-ui/src/views/system/user/profile/index.vue
+++ b/ruoyi-ui/src/views/system/user/profile/index.vue
@@ -1,50 +1,50 @@
<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>
<div>
<div class="text-center">
<userAvatar :user="user" />
- </div>
+ </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>
+ 鐢ㄦ埛鍚嶇О
+ <div class="pull-right">{{ user.nickName }}</div>
</li>
<li class="list-group-item">
- <svg-icon icon-class="phone" />鎵嬫満鍙风爜
- <div class="pull-right">{{ user.phonenumber }}</div>
+ 鎵嬫満鍙风爜
+ <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>
+ 鎵�灞炲搴�
+ <div class="pull-right" >{{ user.familyName }} </div>
</li>
<li class="list-group-item">
- <svg-icon icon-class="peoples" />鎵�灞炶鑹�
- <div class="pull-right">{{ roleGroup }}</div>
+ 鎵�灞炶鑹�
+ <div class="pull-right">{{ user.roleName }}</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>
- <el-tabs v-model="activeTab">
+ <el-tabs v-model="activeTab" >
<el-tab-pane label="鍩烘湰璧勬枡" name="userinfo">
<userInfo :user="user" />
</el-tab-pane>
@@ -55,37 +55,396 @@
</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>
+ <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-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>
+ </div>
+ </div>
+
+<div style="padding-top: 25px;">
+ <div v-if="user.roleName==='瀹跺涵绠＄悊鍛�'" style=" padding-top: 25px;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="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>
+ </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>
<script>
import userAvatar from "./userAvatar";
import userInfo from "./userInfo";
import resetPwd from "./resetPwd";
-import { getUserProfile } from "@/api/system/user";
+import { getUserProfile ,getSelfPermission,getFamilyids} from "@/api/system/user";
+import { getIndividualList } from "@/api/self";
+import {updateFamilyevent} from "@/api/bignote";
export default {
name: "Profile",
components: { userAvatar, userInfo, resetPwd },
data() {
return {
+ formDat: {
+ familyName: undefined,
+ modelName: undefined,
+ },
+ FaimlyList:undefined,
+ FaimlyList1:undefined,
+ selectedFamily: "涓�鍙峰搴�",
+ id:'',
+ command1:undefined,
+ selectedTab:"瀹舵牴缃�",// 鍒濆鍖栭�変腑鐨勫搴负绌哄瓧绗︿覆
+ selectedTab1:"瀹舵牴缃�",// 鍒濆鍖栭�変腑鐨勫搴负绌哄瓧绗︿覆
+ SelfPermission:undefined,
+ SelfPermissionList:{
+ insert:undefined,
+ delete:undefined,
+ search:undefined,
+ update:undefined,
+ },
user: {},
roleGroup: {},
postGroup: {},
- activeTab: "userinfo"
+ activeTab: "userinfo",
+ activeTab1:"瀹舵牴缃�"
};
},
+
created() {
this.getUser();
+ this.getList();
},
methods: {
- getUser() {
- getUserProfile().then(response => {
+ handleTabClick(tab) {
+ this.selectedTab = tab.label;
+ if (this.selectedFamily && this.selectedTab) {
+ this.getList();
+ }
+ },
+ handleTabClick1(tab) {
+ this.selectedTab1 = tab.label;
+ },
+ handleDropdownCommand(command) {
+ 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)); // 灏唅d杞崲涓烘暟瀛楃被鍨�
+ }
+ },
+
+
+ getUser(id) {
+
+ // getUserProfile().then(response => {
+ // this.user = response.data;
+ // this.roleGroup = response.roleGroup;
+ // this.postGroup = response.postGroup;
+ // });
+
+ 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;
+
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)
+ });
+ }
+
+
+
+ },
+ getList() {
+
+ var formData ={
+ "familyName": this.selectedFamily,
+ "modelName":this.selectedTab,
+}
+
+ var jsonString = JSON.stringify(formData);
+ // console.log(jsonString);
+
+ getSelfPermission(jsonString).then(response => {
+ this.SelfPermissionList = response.data;
+ console.log(this.SelfPermissionList)
+ });
+
}
}
+
};
</script>
+<style>
+.container {
+ display: flex;
+}
+
+.el-icon-arrow-down {
+ font-size: 12px;
+}
+</style>
--
Gitblit v1.9.1