From ed96edec7c6dfd4944d0ee1c6d924c7cb808428c Mon Sep 17 00:00:00 2001
From: feige <791364011@qq.com>
Date: 星期五, 18 十月 2024 10:43:47 +0800
Subject: [PATCH] 修改了相应的bug
---
ruoyi-ui/src/views/self/memo.vue | 12 ++-
ruoyi-ui/src/views/homeRoot/personInfo.vue | 13 ++--
ruoyi-ui/src/views/clanManager/ancestor/index.vue | 26 ++++++--
ruoyi-ui/src/views/system/user/profile/index.vue | 12 +++-
ruoyi-ui/src/views/clanManager/clan/index.vue | 20 ++++++
ruoyi-ui/src/App.vue | 1
ruoyi-ui/src/views/contacts/index.vue | 10 +-
ruoyi-ui/vue.config.js | 2
ruoyi-ui/src/views/wish/index.vue | 2
ruoyi-ui/src/views/login.vue | 23 +++++--
10 files changed, 86 insertions(+), 35 deletions(-)
diff --git a/ruoyi-ui/src/App.vue b/ruoyi-ui/src/App.vue
index 4cd4eac..10b07df 100644
--- a/ruoyi-ui/src/App.vue
+++ b/ruoyi-ui/src/App.vue
@@ -34,5 +34,6 @@
<style scoped>
#app .theme-picker {
display: none;
+
}
</style>
diff --git a/ruoyi-ui/src/views/clanManager/ancestor/index.vue b/ruoyi-ui/src/views/clanManager/ancestor/index.vue
index 9d104a0..347e9a5 100644
--- a/ruoyi-ui/src/views/clanManager/ancestor/index.vue
+++ b/ruoyi-ui/src/views/clanManager/ancestor/index.vue
@@ -76,7 +76,7 @@
<el-table-column label="鐢ㄦ埛瑙掕壊" align="center" key="roleName" prop="roleName" width="120" />
<el-table-column label="鎬у埆" align="center" key="sex" prop="sex" width="120" >
- <template slot-scope="scope">{{scope.row.sex==0? '濂�': '鐢�'}}</template>
+ <template slot-scope="scope">{{scope.row.sex==1? '濂�': '鐢�'}}</template>
</el-table-column>
@@ -484,14 +484,23 @@
/** 鎼滅储鎸夐挳鎿嶄綔 */
handleQuery() {
this.queryParams.pageNum = 1;
+
this.getList();
},
/** 閲嶇疆鎸夐挳鎿嶄綔 */
resetQuery() {
this.dateRange = [];
this.resetForm("queryForm");
- this.queryParams.deptId = undefined;
- this.$refs.tree.setCurrentKey(null);
+ this.queryParams = {
+ pageNum: 1,
+ pageSize: 10,
+ name: undefined,
+ role: undefined,
+ sex: undefined,
+
+ },
+
+ // this.$refs.tree.setCurrentKey(null);
this.handleQuery();
},
// 澶氶�夋閫変腑鏁版嵁
@@ -533,18 +542,21 @@
/** 淇敼鎸夐挳鎿嶄綔 */
handleUpdate(row) {
this.a = 2
- this.pOID = row.userId
+ console.log(row)
+ console.log("000000000--")
+ this.pOID = row.id
this.sex = row.sex
// this.getSex();
this.reset();
- const userId = row.userId || this.ids;
- this.cuid= row.userId || this.ids;
+ const userId = row.id || this.ids;
+ this.cuid= row.id || this.ids;
// this.fid = response.data.familyId
+ // alert(userId)
//alert(this.fid)
getUser(userId).then(response => {
this.form = response.data;
console.log(response.data,'formformformformform')
- console.log(this.form.spouseId,'浼翠荆id')
+ // console.log(this.form.spouseId,'浼翠荆id')
this.postOptions = response.posts;
this.roleOptions= []
this.roleOptions.push(response.roles[1])
diff --git a/ruoyi-ui/src/views/clanManager/clan/index.vue b/ruoyi-ui/src/views/clanManager/clan/index.vue
index 34d93a4..6b0bcf1 100644
--- a/ruoyi-ui/src/views/clanManager/clan/index.vue
+++ b/ruoyi-ui/src/views/clanManager/clan/index.vue
@@ -203,6 +203,7 @@
},
personInfos:[],
personInfos1:[],
+ res: false,
// 琛ㄥ崟鍙傛暟
form: {
clanId: undefined,
@@ -221,6 +222,17 @@
}
};
},
+ watch: {
+ 'form.clanName': function(newVal, oldVal){
+ // alert(newVal)
+ // alert(oldVal)
+
+ if(newVal==oldVal||oldVal==undefined)
+ this.res = false;
+ else
+ this.res = true;
+ },
+ },
created() {
this.getList();
//this.getAllUser();
@@ -475,6 +487,13 @@
/** 鎻愪氦鎸夐挳 */
submitForm: function() {
let _this = this
+ //alert(this.res)
+ if(this.res == false)
+ {
+ this.$modal.msgSuccess("瀹舵棌鍚嶇О娌℃湁淇敼锛屼笉鑳芥彁浜�")
+
+ return;
+ }
this.$refs["form"].validate(valid => {
if (valid) {
//alert(this.form.id)
@@ -483,6 +502,7 @@
// this.form.menuIds = this.getMenuAllCheckedKeys();
updateClan(this.form).then(response => {
console.log(response)
+ this.res = false;
if(response.msg=="瀹舵棌鍚嶇О涓嶈兘閲嶅锛�")
this.$modal.msgSuccess("瀹舵棌鍚嶇О涓嶈兘閲嶅")
else{
diff --git a/ruoyi-ui/src/views/contacts/index.vue b/ruoyi-ui/src/views/contacts/index.vue
index 8010db4..96f5fed 100644
--- a/ruoyi-ui/src/views/contacts/index.vue
+++ b/ruoyi-ui/src/views/contacts/index.vue
@@ -461,12 +461,12 @@
<el-table v-loading="loading1" :data="listRoot" :row-key="getRowId1" ref="table1" @selection-change="handleSelectionChange1" :row-class-name="tableRowClassName" style="background: #FFEFF2; border-radius: 14px 14px 14px 14px;">
<el-table-column type="selection" width="55" align="center" />
<el-table-column fixed label="搴忓彿" sortable type="index" :index="(queryParams1.pageNum-1)*queryParams1.pageSize+1" width="130"/>
- <el-table-column label="韬唤" prop="identity" sortable width="130" >
+ <!-- <el-table-column label="韬唤" prop="identity" sortable width="130" >
<template slot-scope="scope" >
<span v-if="scope.row.isMyFamily==1">绗瑊{scope.row.identity}}浠�</span>
<span v-else>鈥斺��</span>
</template>
- </el-table-column>
+ </el-table-column> -->
<el-table-column label="濮撳悕" prop="nickName" sortable :show-overflow-tooltip="true" width="145" align="center"/>
</el-table>
@@ -606,9 +606,8 @@
import { treeselect as menuTreeselect, roleMenuTreeselect } from "@/api/system/menu";
import {getInfo} from "@/api/login";
import { Notification, MessageBox, Message, Loading } from 'element-ui'
-import {s} from "@/api/bignote/index";
import {getAllInfo} from "@/api/system/user"
-
+import {showShareUser} from "@/api/bignote/index";
//瀵煎叆鎺ュ彛鍑芥暟
import {getContactList,enload, addContact, delContact,uploadPic,
share,shareToWho,getWhoShare,downShareData,deleteShareData,showShareData
@@ -973,6 +972,7 @@
this.listRoot.forEach(element => {
kon[element['nickName']] = element['userId']
})
+ console.log(this.listRoot)
// for(let i in kon){
// this.userOptions.push({label: i,value: kon[i]})
// }
@@ -993,7 +993,7 @@
this.$modal.confirm('鏄惁纭鍒嗕韩锛�').then(function() {
return share(shareList);
}).then(() => {
-
+ this.userOptions = []
this.getList();
this.getList1();
this.$modal.msgSuccess("鍒嗕韩鎴愬姛");
diff --git a/ruoyi-ui/src/views/homeRoot/personInfo.vue b/ruoyi-ui/src/views/homeRoot/personInfo.vue
index e44dbda..c253e12 100644
--- a/ruoyi-ui/src/views/homeRoot/personInfo.vue
+++ b/ruoyi-ui/src/views/homeRoot/personInfo.vue
@@ -129,16 +129,18 @@
-
- <el-button size='mini' type="text" class="btn_edit" @click="editAutography" style='top: 0px;right: 20px;'>
+ <div style="margin-bottom: 20px;">
+ <el-button size='mini' type="text" class="btn_edit" @click="editAutography" style='top: 0px; bottom:20px;right: 20px;'>
<sapn v-html="'\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0'"></sapn>
<span >{{ editMode ? this.bstn='淇濆瓨' : this.bstn='淇敼' }}</span>
</el-button>
+ </div>
<el-tab-pane
label="涓汉绠�浠�">
<template v-if="editMode">
- <div style="padding-top: 10px">
- <el-input v-model="autoGrahpy" type="textarea" ></el-input></div>
+ <div style="padding-top: 20px;margin-top: 10px;width: 90%;">
+ <el-input v-model="autoGrahpy" autosize type="textarea" maxlength="1024"
+></el-input></div>
</template>
<template v-else>
{{autoGrahpy}}
@@ -317,8 +319,7 @@
}
.btn_edit{
background:center no-repeat url('../../assets/icons/edit.png') ;
- position: absolute;
- top: 0;
+ float: right;
padding-right: 90px;
}
.bordered-col {
diff --git a/ruoyi-ui/src/views/login.vue b/ruoyi-ui/src/views/login.vue
index bff6ddb..ca81110 100644
--- a/ruoyi-ui/src/views/login.vue
+++ b/ruoyi-ui/src/views/login.vue
@@ -217,7 +217,7 @@
</div>
<div class="gpr">
- <img :key="url" :src="url" style="width:100%;height:100%"></img>
+<!-- <img :key="url" :src="url" style="width:100%;height:30%"></img> -->
</div>
</div>
</template>
@@ -388,7 +388,8 @@
<style rel="stylesheet/scss" lang="scss">
.gpr{
width:100%;
- height:1200px;
+ // height:1000px;
+
//background: no-repeat center/100% url("../assets/images/index.png");
}
.customWidth{
@@ -396,14 +397,22 @@
}
.topHeight{
height: 40px;
+
margin-right: 20px;
+ top:5px;
+ position: absolute;
}
.Group_132{
- //background: no-repeat center/100% url("../assets/images/index.png");
+ // background-image: url("../assets/images/index.png");
+
+
// background: no-repeat center/40% url("../assets/images/Group 132.png");
- height: 1200px;
- width: 100%;
+ // height: 1200px;
+ min-width: 1300px;
+ width: 100vw;
+ height: 100vh;
+
background-color: #FEF7FC;
//background-position: 49.5% 16.2% ;
// background-position: 81.7px 71.3px;
@@ -415,9 +424,9 @@
display: flex;
justify-content: flex-end;
align-items: center;
- height: 100%;
+ // height: 60px;
width: 100%;
- background: no-repeat center/40% url("../assets/images/login_logo.png");
+ background: no-repeat center/100% url("../assets/images/index.png");
background-color: #FEF7FC;
diff --git a/ruoyi-ui/src/views/self/memo.vue b/ruoyi-ui/src/views/self/memo.vue
index b05c809..24212d6 100644
--- a/ruoyi-ui/src/views/self/memo.vue
+++ b/ruoyi-ui/src/views/self/memo.vue
@@ -529,14 +529,15 @@
<el-tab-pane v-for="(item, index) in AutobiographyList"
:key='item.id' :label="item.ageBegin+'~'+item.ageEnd+'宀�'+'('+item.term+')'">
<div>{{ item.content }}</div>
- <el-button size='mini' type="text" class="btn_edit" @click="editAutobiography(item)" style='position: absolute;right:40px;top:5px;'>
+ <div style="margin-bottom: 20px;">
+ <el-button size='mini' type="text" class="btn_edit" @click="editAutobiography(item)" style='right:40px;top:5px;'>
<span v-html="'\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0'"></span>
</el-button>
- <el-button size="mini" type="text" class="btn_del" @click="handleAutobiography(item)" style='position: absolute;right:10px;top:5px;'>
+ <el-button size="mini" type="text" class="btn_del" @click="handleAutobiography(item)" style='right:10px;top:5px;'>
<span v-html="'\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0'"></span>
</el-button>
-
+ </div>
</el-tab-pane>
</el-tabs></div>
</el-container>
@@ -1632,7 +1633,7 @@
//涓汉鑷紶
handleClick(tab, event) {
// console.log(tab, event);
- alert(987)
+ // alert(987)
this.getAutobiographyInfor();
// this.getSrc1(typeOptions)
},
@@ -1734,9 +1735,10 @@
.btn_edit{
background:center no-repeat url('../../assets/icons/edit.png') ;
+ float:right;
}
.btn_del{
- background:center no-repeat url('../../assets/images/鍒犻櫎2.png') ;
+ background:center no-repeat url('../../assets/images/鍒犻櫎2.png') ;float:right;
}
.button-container {
text-align: right;
diff --git a/ruoyi-ui/src/views/system/user/profile/index.vue b/ruoyi-ui/src/views/system/user/profile/index.vue
index 1f10f90..1aa1188 100644
--- a/ruoyi-ui/src/views/system/user/profile/index.vue
+++ b/ruoyi-ui/src/views/system/user/profile/index.vue
@@ -238,7 +238,7 @@
label: '淇濇磥鏀剁撼',
},
{
- id: 2021,
+ id: 2020,
label: '閫氳褰�',
},
{ id:2033,
@@ -297,6 +297,7 @@
}
// alert(data.authority)
// let _this = this
+ this.menuOptionsp[0]['children'] = []
getUserByFidAid(data).then(response=>{
console.log(response)
let fams = response.data;
@@ -318,8 +319,10 @@
upAuthority(){
let checkedKeys = this.$refs.authr.getCheckedKeys();
let peoKeys = this.$refs.peoInfo.getCheckedKeys();
- // console.log(peoKeys)
+ console.log(peoKeys)
+ //alert(this.fid)
// alert(checkedKeys.length)
+
// this.getDeptAllCheckedKeys()
if(checkedKeys.length!=0&&peoKeys.length!=0)
{
@@ -346,7 +349,8 @@
"fid": this.fid,
"authority": value
}
- alert(data.authority)
+ this.menuOptionsp[0]['children'] = []
+ // alert(data.authority)
let _this = this
getUserByFidAid(data).then(response=>{
console.log(response)
@@ -439,6 +443,8 @@
return
getAllInfo(clanId).then(response=>{
let fams = response.data
+ // console.log(fams)
+ // console.log("++++++++++++++++++++++++==")
for(let i = 0; i < fams.length; i++)
_this.menuOptions1[0]['children'].push({id:fams[i].userId,label:fams[i].nickName })
})
diff --git a/ruoyi-ui/src/views/wish/index.vue b/ruoyi-ui/src/views/wish/index.vue
index eb48570..f536a42 100644
--- a/ruoyi-ui/src/views/wish/index.vue
+++ b/ruoyi-ui/src/views/wish/index.vue
@@ -940,7 +940,7 @@
this.$modal.confirm('鏄惁纭鍒嗕韩锛�').then(function() {
return share(shareList);
}).then(() => {
-
+ this.userOptions = []
this.getList();
this.getList1();
this.$modal.msgSuccess("鍒嗕韩鎴愬姛");
diff --git a/ruoyi-ui/vue.config.js b/ruoyi-ui/vue.config.js
index ae06d06..fac86a7 100644
--- a/ruoyi-ui/vue.config.js
+++ b/ruoyi-ui/vue.config.js
@@ -37,7 +37,7 @@
// detail: https://cli.vuewww.bendudu.comjs.org/config/#devserver-proxy
[process.env.VUE_APP_BASE_API]: {
//target: `https://10.39.18.174:8080/`,
- // target: `https://192.168.1.6:8080/`,
+ // target: `https://192.168.1.3:8080/`,
target: 'https://www.bendudu.com:8080/',
changeOrigin: true,
pathRewrite: {
--
Gitblit v1.9.1