From 4e36430302a603bfc9913d49238cea96d5fda571 Mon Sep 17 00:00:00 2001
From: linwenling <3256558519@qq.com>
Date: 星期二, 17 十月 2023 22:44:30 +0800
Subject: [PATCH] 10.17
---
ruoyi-ui/src/views/system/user/profile/index.vue | 166 ++++++++++++++++++++++++++++++++++++++++++++++++++-----
ruoyi-ui/src/api/system/user.js | 9 +++
ruoyi-ui/src/views/login.vue | 4 +
3 files changed, 163 insertions(+), 16 deletions(-)
diff --git a/ruoyi-ui/src/api/system/user.js b/ruoyi-ui/src/api/system/user.js
index 75421f1..b28e58c 100644
--- a/ruoyi-ui/src/api/system/user.js
+++ b/ruoyi-ui/src/api/system/user.js
@@ -141,3 +141,12 @@
data: data
})
}
+
+//鏌ョ湅
+export function getFamilyids(id) {
+ return request({
+ url: '/family/'+id ,
+ method: 'get',
+
+ })
+}
diff --git a/ruoyi-ui/src/views/login.vue b/ruoyi-ui/src/views/login.vue
index 3067e67..30ca632 100644
--- a/ruoyi-ui/src/views/login.vue
+++ b/ruoyi-ui/src/views/login.vue
@@ -117,9 +117,11 @@
<span v-if="!loading" style="width: 97px;height: 62px;">鐧诲綍</span>
<span v-else>鐧� 褰� 涓�...</span>
</el-button>
+ <a href="https://47.93.189.255:8080/profile/upload/2023/10/10/Bendudu20231010_20231010203358A033.apk">鐐瑰嚮姝ゅ涓嬭浇搴旂敤绋嬪簭</a>
<div style="float: right;
height:94px;" v-if="register">
<router-link class="link-type" :to="'/register'">绔嬪嵆娉ㄥ唽</router-link>
+
</div>
</el-form-item>
</el-form>
@@ -132,7 +134,7 @@
</template>
<script>
-import { getCodeImg } from "@/api/login";
+import { getCodeImg,Download } from "@/api/login";
import Cookies from "js-cookie";
import { encrypt, decrypt } from '@/utils/jsencrypt'
diff --git a/ruoyi-ui/src/views/system/user/profile/index.vue b/ruoyi-ui/src/views/system/user/profile/index.vue
index 4018369..ca1c733 100644
--- a/ruoyi-ui/src/views/system/user/profile/index.vue
+++ b/ruoyi-ui/src/views/system/user/profile/index.vue
@@ -13,11 +13,11 @@
<ul class="list-group list-group-striped">
<li class="list-group-item">
鐢ㄦ埛鍚嶇О
- <div class="pull-right">{{ user.userName }}</div>
+ <div class="pull-right">{{ user.nickName }}</div>
</li>
<li class="list-group-item">
鎵嬫満鍙风爜
- <div class="pull-right">{{ user.phonenumber }}</div>
+ <div class="pull-right">{{ user.phoneNumber }}</div>
</li>
<li class="list-group-item">
鐢ㄦ埛閭
@@ -25,11 +25,11 @@
</li>
<li class="list-group-item">
鎵�灞炲搴�
- <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">
鎵�灞炶鑹�
- <div class="pull-right">{{ roleGroup }}</div>
+ <div class="pull-right">{{ user.roleName }}</div>
</li>
<li class="list-group-item">
鍒涘缓鏃ユ湡
@@ -89,6 +89,7 @@
<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>
@@ -102,6 +103,7 @@
<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="瀹跺涵璧勪骇">
@@ -116,7 +118,7 @@
<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>
@@ -130,7 +132,7 @@
<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>
@@ -144,7 +146,7 @@
<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>
@@ -158,7 +160,7 @@
<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>
@@ -172,7 +174,7 @@
<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>
@@ -186,7 +188,7 @@
<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>
@@ -200,7 +202,7 @@
<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>
@@ -214,19 +216,102 @@
<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 ,getSelfPermission} from "@/api/system/user";
+import { getUserProfile ,getSelfPermission,getFamilyids} from "@/api/system/user";
+import { getIndividualList } from "@/api/self";
import {updateFamilyevent} from "@/api/bignote";
export default {
@@ -238,8 +323,13 @@
familyName: undefined,
modelName: undefined,
},
+ FaimlyList:undefined,
+ FaimlyList1:undefined,
selectedFamily: "涓�鍙峰搴�",
+ id:'',
+ command1:undefined,
selectedTab:"瀹舵牴缃�",// 鍒濆鍖栭�変腑鐨勫搴负绌哄瓧绗︿覆
+ selectedTab1:"瀹舵牴缃�",// 鍒濆鍖栭�変腑鐨勫搴负绌哄瓧绗︿覆
SelfPermission:undefined,
SelfPermissionList:{
insert:undefined,
@@ -266,6 +356,9 @@
this.getList();
}
},
+ handleTabClick1(tab) {
+ this.selectedTab1 = tab.label;
+ },
handleDropdownCommand(command) {
this.selectedFamily = command; // 鏇存柊閫変腑鐨勫搴�
console.log(this.selectedFamily)
@@ -274,14 +367,57 @@
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() {
- getUserProfile().then(response => {
+ 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() {
--
Gitblit v1.9.1