From 3119fa3f7f7a1791d918d77d3e8315d762719ab7 Mon Sep 17 00:00:00 2001
From: feige <791364011@qq.com>
Date: 星期日, 13 十月 2024 22:23:10 +0800
Subject: [PATCH] 修改bug
---
ruoyi-ui/src/views/honor/index.vue | 4
ruoyi-ui/src/views/self/memo.vue | 105 +++++++---
ruoyi-ui/src/views/homeRoot/personInfo.vue | 350 ++++++++++----------------------------
ruoyi-ui/src/views/self/show.vue | 4
ruoyi-ui/src/views/components/superMindmap.vue | 2
ruoyi-ui/src/api/honor/index.js | 1
ruoyi-ui/src/views/contacts/index.vue | 2
ruoyi-ui/vue.config.js | 2
ruoyi-ui/src/views/system/user/index.vue | 10
ruoyi-ui/src/views/wish/index.vue | 4
ruoyi-ui/src/views/collection/index.vue | 2
ruoyi-ui/src/views/login.vue | 13 +
12 files changed, 192 insertions(+), 307 deletions(-)
diff --git a/ruoyi-ui/src/api/honor/index.js b/ruoyi-ui/src/api/honor/index.js
index 60feeda..e97a392 100644
--- a/ruoyi-ui/src/api/honor/index.js
+++ b/ruoyi-ui/src/api/honor/index.js
@@ -90,6 +90,7 @@
// -------------------------------
// 鍒嗕韩
export function share(data) {
+
return request({
url: '/zHonorShare/share',
method: 'post',
diff --git a/ruoyi-ui/src/views/collection/index.vue b/ruoyi-ui/src/views/collection/index.vue
index 81732b1..86bb45f 100644
--- a/ruoyi-ui/src/views/collection/index.vue
+++ b/ruoyi-ui/src/views/collection/index.vue
@@ -842,7 +842,7 @@
deleteShareData(list).then(()=>{
Message({ message: "鏀跺洖鎴愬姛", type: 'success' })
this.getList1();
- alert(234)
+ //alert(234)
const list2 = {"shareIds": [this.selectWho]}
shareToWho(list2,this.queryParams2).then(response => {
this.shareList1 = response.data.data
diff --git a/ruoyi-ui/src/views/components/superMindmap.vue b/ruoyi-ui/src/views/components/superMindmap.vue
index 103ae82..824125f 100644
--- a/ruoyi-ui/src/views/components/superMindmap.vue
+++ b/ruoyi-ui/src/views/components/superMindmap.vue
@@ -239,6 +239,8 @@
})
.on("click",function (event, node) {
let data = node.data
+ // alert(213)
+ // alert("/familymodel/jiagenwang/personInfo/" + data.id)
that.$router.push("/familymodel/jiagenwang/personInfo/" + data.id);
})
diff --git a/ruoyi-ui/src/views/contacts/index.vue b/ruoyi-ui/src/views/contacts/index.vue
index ef06290..8010db4 100644
--- a/ruoyi-ui/src/views/contacts/index.vue
+++ b/ruoyi-ui/src/views/contacts/index.vue
@@ -606,7 +606,7 @@
import { treeselect as menuTreeselect, roleMenuTreeselect } from "@/api/system/menu";
import {getInfo} from "@/api/login";
import { Notification, MessageBox, Message, Loading } from 'element-ui'
-import {showShareUser} from "@/api/bignote/index";
+import {s} from "@/api/bignote/index";
import {getAllInfo} from "@/api/system/user"
//瀵煎叆鎺ュ彛鍑芥暟
diff --git a/ruoyi-ui/src/views/homeRoot/personInfo.vue b/ruoyi-ui/src/views/homeRoot/personInfo.vue
index 271c4a5..e44dbda 100644
--- a/ruoyi-ui/src/views/homeRoot/personInfo.vue
+++ b/ruoyi-ui/src/views/homeRoot/personInfo.vue
@@ -123,269 +123,59 @@
</div>
</el-container>
<el-divider />
-<el-container v-if="isshow">
- <div style="padding-left:30px;padding-top: 10px">
- <el-col>
- <el-row :span="8">
- <el-form-item label="濮撳悕" prop="nickName" label-width="50px" style="background:#D8E6F5;border-radius: 7px 7px 7px 7px;opacity: 1;" >
- <el-input v-model="personInfos[1].nickName" placeholder="璇疯緭鍏ュ鍚�" clearable :style="{width: '100%'}" :disabled="dsb">
- </el-input>
- </el-form-item>
- </el-row>
- <el-row :span="8">
- <el-form-item label="韬唤" prop="identity" label-width="50px" style="background: #D8E6F5;border-radius: 7px 7px 7px 7px;opacity: 1;">
- <el-input v-model="personInfos[1].identity" placeholder="璇疯緭鍏ヨ韩浠�" clearable :style="{width: '100%'}" :disabled="dsb">
- </el-input>
- </el-form-item>
- </el-row>
- <el-row :span="8">
- <el-form-item label="鏇剧敤鍚�" prop="oldName" label-width="68px" style="background: #D8E6F5;border-radius: 7px 7px 7px 7px;opacity: 1;">
- <el-input v-model="personInfos[1].oldName" placeholder="璇疯緭鍏ユ浘鐢ㄥ悕" clearable :style="{width: '100%'}" :disabled="dsb">
- </el-input>
- </el-form-item>
- </el-row>
- <el-row :span="8">
- <el-form-item label="鐢熻倴" prop="shengXiao" label-width="50px" style="background: #D8E6F5;border-radius: 7px 7px 7px 7px;opacity: 1;">
- <el-input v-model="personInfos[1].shengXiao" placeholder="璇疯緭鍏ョ敓鑲�" clearable :style="{width: '100%'}" :disabled="dsb">
- </el-input>
- </el-form-item>
- </el-row>
- <el-row :span="8">
- <el-form-item label="鏄熷骇" prop="constellation" label-width="50px" style="background: #D8E6F5;border-radius: 7px 7px 7px 7px;opacity: 1;">
- <el-input type="textarea" v-model="personInfos[1].constellation" placeholder="璇疯緭鍏ユ槦搴�" clearable :style="{width: '100%'}" :disabled="dsb">
- </el-input>
- </el-form-item>
- </el-row>
- </el-col>
- </div>
- <div style="padding-left:30px;padding-top: 10px" v-show="personInfos[1]">
- <el-col>
- <el-row :span="8">
- <el-form-item label="鎬у埆" prop="sex" label-width="45px" style="background:#D8E6F5;border-radius: 7px 7px 7px 7px;opacity: 1;">
- <el-input v-model="personInfos[1].sex=== 1 ? '鐢�':'濂�'" placeholder="璇疯緭鍏ユ�у埆" clearable :style="{width: '100%'}" :disabled="dsb"></el-input>
- </el-form-item>
- </el-row>
- <el-row :span="8">
- <el-form-item label="姘戞棌" prop="nation" label-width="50px" style="background: #D8E6F5;border-radius: 7px 7px 7px 7px;opacity: 1;">
- <el-input v-model="personInfos[1].nation" placeholder="璇疯緭鍏ユ皯鏃�" clearable :style="{width: '100%'}" :disabled="dsb">
- </el-input>
- </el-form-item>
- </el-row>
- <el-row :span="8">
- <el-form-item label="鑱旂郴鏂瑰紡" prop="phoneNumber" label-width="68px" style="background:#D8E6F5;border-radius: 7px 7px 7px 7px;opacity: 1;">
- <el-input v-model="personInfos[1].phoneNumber" placeholder="璇疯緭鍏ヨ仈绯绘柟寮�" clearable :style="{width: '100%'}" :disabled="dsb">
- </el-input>
- </el-form-item>
- </el-row>
- <el-row :span="8">
- <el-form-item label="寰俊鍙�" prop="wxNo" label-width="68px" style="background: #D8E6F5;border-radius: 7px 7px 7px 7px;opacity: 1;">
- <el-input v-model="personInfos[1].wxNo" placeholder="璇疯緭鍏ュ井淇″彿" clearable :style="{width: '100%'}" :disabled="dsb">
- </el-input>
- </el-form-item>
- </el-row>
-
- <el-row :span="8">
- <el-form-item label="甯镐綇鍦板潃" prop="alwaysAddress" label-width="68px" style="background: #D8E6F5;border-radius: 7px 7px 7px 7px;opacity: 1;">
- <el-input type="textarea" v-model="personInfos[1].alwaysAddress" placeholder="璇疯緭鍏ュ父浣忓湴鍧�" clearable :style="{width: '100%'}" :disabled="dsb">
- </el-input>
- </el-form-item>
- </el-row>
- </el-col>
- </div>
- <div style="padding-left:30px;padding-top: 10px">
- <el-col>
- <el-row :span="8">
- <el-form-item label="濠氬Щ鐘跺喌" prop="maritalStatus" label-width="68px" style="background:#D8E6F5;border-radius: 7px 7px 7px 7px;opacity: 1;">
- <el-input v-model="personInfos[1].maritalStatus === 1 ? '宸插':'鏈'" placeholder="璇疯緭鍏ュ濮荤姸鍐�" clearable :style="{width: '100%'}" :disabled="dsb"></el-input>
- </el-form-item>
- </el-row>
- <el-row :span="8">
- <el-form-item label="閰嶅伓" prop="nickName" label-width="50px" style="background:#D8E6F5;border-radius: 7px 7px 7px 7px;opacity: 1;">
- <el-input v-model="personInfos[0].nickName" placeholder="璇疯緭鍏ラ厤鍋�" clearable :style="{width: '100%'}" :disabled="dsb">
- </el-input>
- </el-form-item>
- </el-row>
-
-
- <el-row :span="8">
- <el-form-item label="鑱屽姟鑱岀О" prop="position" label-width="68px" style="background:#D8E6F5;border-radius: 7px 7px 7px 7px;opacity: 1;">
- <el-input v-model="personInfos[1].position" placeholder="璇疯緭鍏ヨ亴鍔¤亴绉�" clearable :style="{width: '100%'}" :disabled="dsb">
- </el-input>
- </el-form-item>
- </el-row>
- <el-row :span="8">
- <el-form-item label="鏄熷骇" prop="constellation" label-width="50px" style="background: #D8E6F5;border-radius: 7px 7px 7px 7px;opacity: 1;">
- <el-input v-model="personInfos[1].constellation" placeholder="璇疯緭鍏ユ槦搴�" clearable :style="{width: '100%'}" :disabled="dsb">
- </el-input>
- </el-form-item>
- </el-row>
- <el-row :span="8">
- <el-form-item label="鍗曚綅" prop="unit" label-width="68px" style="background:#D8E6F5;border-radius: 7px 7px 7px 7px;opacity: 1;">
- <el-input type="textarea" v-model="personInfos[1].unit" placeholder="璇疯緭鍏ュ崟浣�" clearable :style="{width: '100%'}" :disabled="dsb">
- </el-input>
- </el-form-item>
- </el-row>
- </el-col>
- </div>
- <div style="padding-left:30px;padding-top: 45px">
- <el-container>
- <el-col :span="6" :data="personInfos">
- <div class="block" :model="personInfos" >
- <el-col v-model="personInfos[1].url" prop="url">
- <el-avatar shape="square" :size=200 >
- <el-image
- :src="'https://www.bendudu.com:8080/'+ personInfos[1].url"
- style="width: 100%;height: 100%;"
- ></el-image>
- </el-avatar>
- </el-col>
- </div>
- </el-col>
- </el-container>
- </div>
- </el-container>
+ <div>
+ <el-tabs type="border-card"
+ >
+
+
+
+
+ <el-button size='mini' type="text" class="btn_edit" @click="editAutography" style='top: 0px;right: 20px;'>
+ <sapn v-html="'\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0'"></sapn>
+ <span >{{ editMode ? this.bstn='淇濆瓨' : this.bstn='淇敼' }}</span>
+ </el-button>
+ <el-tab-pane
+ label="涓汉绠�浠�">
+ <template v-if="editMode">
+ <div style="padding-top: 10px">
+ <el-input v-model="autoGrahpy" type="textarea" ></el-input></div>
+ </template>
+ <template v-else>
+ {{autoGrahpy}}
+ </template>
+ </el-tab-pane>
+ </el-tabs></div>
</el-form>
</div>
+<el-divider style="top:120px;"/>
<div id="building2" v-show="!isshow">
- <el-form ref="elForm" :model="personInfo1" :rules="rules" size="medium" label-position="center" label-width="100px">
- <el-container>
- <div style="padding-left:30px;padding-top: 50px">
- <el-container>
- <el-col :span="6" :data="personInfo1">
- <div class="block" :model="personInfo1" >
- <el-col v-model="personInfo1.url" prop="url">
- <el-avatar shape="square" :size=200 >
- <el-image
- :src="'https://www.bendudu.com:8080/'+ personInfo1.url"
- style="width: 100%;height: 100%;"
- ></el-image>
- </el-avatar>
- </el-col>
- </div>
- </el-col>
- </el-container>
- </div>
- <div style="padding-left:30px;padding-top: 15px">
- <el-container>
- <el-col>
- <el-row :span="8">
- <el-form-item label="濮撳悕" prop="nickName" label-width="50px" style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;">
- <el-input v-model="personInfo1.nickName" placeholder="璇疯緭鍏ュ鍚�" clearable :style="{width: '100%'}" :disabled="dsb">
- </el-input>
- </el-form-item>
- </el-row>
- <el-row :span="8">
- <el-form-item label="韬唤" prop="identity" label-width="50px" style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;">
- <el-input v-model="personInfo1.identity" placeholder="璇疯緭鍏ヨ韩浠�" clearable :style="{width: '100%'}" :disabled="dsb">
- </el-input>
- </el-form-item>
- </el-row>
- <el-row :span="8">
- <el-form-item label="鏇剧敤鍚�" prop="oldName" label-width="68px" style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;">
- <el-input v-model="personInfo1.oldName" placeholder="璇疯緭鍏ユ浘鐢ㄥ悕" clearable :style="{width: '100%'}" :disabled="dsb">
- </el-input>
- </el-form-item>
- </el-row>
- <el-row :span="8">
- <el-form-item label="鐢熻倴" prop="shengXiao" label-width="50px" style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;">
- <el-input v-model="personInfo1.shengXiao" placeholder="璇疯緭鍏ョ敓鑲�" clearable :style="{width: '100%'}" :disabled="dsb">
- </el-input>
- </el-form-item>
- </el-row>
- <el-row :span="8">
- <el-form-item label="鎴风睄鍦板潃" prop="locationAddress" label-width="68px" style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;">
- <el-input type="textarea" v-model="personInfo1.locationAddress" placeholder="璇疯緭鍏ユ埛绫嶅湴鍧�" clearable :style="{width: '100%'}" :disabled="dsb">
- </el-input>
- </el-form-item>
- </el-row>
-
- </el-col>
- </el-container>
- </div>
- <div style="padding-left:30px;padding-top: 15px">
- <el-container>
- <el-col>
- <el-row :span="8">
- <el-form-item label="鎬у埆" prop="sex" label-width="45px" style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;">
- <el-input v-model="personInfo1.sex === 1 ? '鐢�':'濂�'" placeholder="璇疯緭鍏ユ�у埆" clearable :style="{width: '100%'}" :disabled="dsb"></el-input>
- </el-form-item>
- </el-row>
- <el-row :span="8">
- <el-form-item label="姘戞棌" prop="nation" label-width="50px" style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;">
- <el-input v-model="personInfo1.nation" placeholder="璇疯緭鍏ユ皯鏃�" clearable :style="{width: '100%'}" :disabled="dsb">
- </el-input>
- </el-form-item>
- </el-row>
- <el-row :span="8">
- <el-form-item label="鑱旂郴鏂瑰紡" prop="phoneNumber" label-width="68px" style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;">
- <el-input v-model="personInfo1.phoneNumber" placeholder="璇疯緭鍏ヨ仈绯绘柟寮�" clearable :style="{width: '100%'}" :disabled="dsb">
- </el-input>
- </el-form-item>
- </el-row>
- <el-row :span="8">
- <el-form-item label="寰俊鍙�" prop="wxNo" label-width="68px" style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;">
- <el-input v-model="personInfo1.wxNo" placeholder="璇疯緭鍏ュ井淇″彿" clearable :style="{width: '100%'}" :disabled="dsb">
- </el-input>
- </el-form-item>
- </el-row>
- <el-row :span="8">
- <el-form-item label="甯镐綇鍦板潃" prop="alwaysAddress" label-width="68px" style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;">
- <el-input type="textarea" v-model="personInfo1.alwaysAddress" placeholder="璇疯緭鍏ュ父浣忓湴鍧�" clearable :style="{width: '100%'}" :disabled="dsb">
- </el-input>
- </el-form-item>
- </el-row>
-
-
-
-
- </el-col>
- </el-container>
- </div>
- <div style="padding-left:30px;padding-top: 15px">
- <el-container>
- <el-col>
- <el-row :span="8">
- <el-form-item label="濠氬Щ鐘跺喌" prop="maritalStatus" label-width="68px" style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;">
- <el-input v-model="personInfo1.maritalStatus === 1 ? '宸插':'鏈'" placeholder="璇疯緭鍏ュ濮荤姸鍐�" clearable :style="{width: '100%'}" :disabled="dsb"></el-input>
- </el-form-item>
- </el-row>
- <el-row :span="8">
- <el-form-item label="閰嶅伓" prop="nickName" label-width="50px" style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;">
- <el-input v-model="personInfo1.spouseId" placeholder="璇疯緭鍏ラ厤鍋�" clearable :style="{width: '100%'}" :disabled="dsb">
- </el-input>
- </el-form-item>
- </el-row>
-
- <el-row :span="8">
- <el-form-item label="鏄熷骇" prop="constellation" label-width="50px" style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;">
- <el-input v-model="personInfo1.constellation" placeholder="璇疯緭鍏ユ槦搴�" clearable :style="{width: '100%'}" :disabled="dsb">
- </el-input>
- </el-form-item>
- </el-row>
-
- <el-row :span="8">
- <el-form-item label="鑱屽姟鑱岀О" prop="position" label-width="68px" style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;">
- <el-input v-model="personInfo1.position" placeholder="璇疯緭鍏ヨ亴鍔¤亴绉�" clearable :style="{width: '100%'}" :disabled="dsb">
- </el-input>
- </el-form-item>
- </el-row>
-
- <el-row :span="8">
- <el-form-item class="centered-label" label="鍗曚綅" prop="unit" label-width="68px" style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;">
- <el-input type="textarea" v-model="personInfo1.unit" placeholder="璇疯緭鍏ュ崟浣�" clearable :style="{width: '100%'}" :disabled="dsb">
- </el-input>
- </el-form-item>
- </el-row>
- </el-col>
- </el-container>
- </div>
- </el-container>
- </el-form>
-
+
</div>
</div>
+ <div>
+ <el-row>
+ <el-col :span="11" class="bordered-col">
+ <div class="left-content">鎴戠殑鍒嗕韩</div>
+ <el-divider />
+ <el-card class="box-card">
+ <div v-for="o in 4" :key="o" class="text item">
+ <a href="www.baidu.com">{{'鍒楄〃鍐呭 ' + o }}</a>
+ </div>
+ </el-card>
+ </el-col>
+ <el-col :span="11" class="bordered-col">
+ <div class="left-content">鎴戠殑鏀惰棌</div>
+ <el-divider />
+ <el-card class="box-card">
+ <div v-for="o in 4" :key="o" class="text item">
+ {{'鍒楄〃鍐呭 ' + o }}
+ </div>
+ </el-card>
+ </el-col>
+ </el-row>
+ </div>
</div>
</template>
@@ -395,7 +185,11 @@
name: "index",
data(){
return{
+ bstn: undefined,
+ editMode:false,
+ autoGrahpy: "22222222222222222",
// 閬僵灞�
+
disabled: false,
personInfos:{},
personInfo1:{},
@@ -457,6 +251,15 @@
this.getList(id);
},
methods:{
+ editAutography(data)
+ {
+ this.editMode = true;
+ if(this.bstn=="淇濆瓨")
+ {
+ this.editMode = false
+ }
+ },
+
getList(id)
{
let _this = this;
@@ -512,4 +315,39 @@
border: 1px solid red;
text-align: center;
}
+.btn_edit{
+ background:center no-repeat url('../../assets/icons/edit.png') ;
+ position: absolute;
+ top: 0;
+ padding-right: 90px;
+}
+.bordered-col {
+ border: 1px solid #d3dce6; /* 璁剧疆杈规鏍峰紡 */
+ border-radius: 4px; /* 鍙�夛細璁剧疆鍦嗚 */
+ padding: 10px; /* 鍐呰竟璺� */
+ margin-right: 20px;
+}
+.btn_del{
+ background:center no-repeat url('../../assets/images/鍒犻櫎2.png') ;
+}
+ .el-row {
+ margin-bottom: 20px;
+ &:last-child {
+ margin-bottom: 0;
+ }
+ }
+ .el-col {
+ border-radius: 4px;
+ }
+ .text {
+ font-size: 14px;
+ }
+
+ .item {
+ padding: 18px 0;
+ }
+
+ .box-card {
+ width:100%;
+ }
</style>
diff --git a/ruoyi-ui/src/views/honor/index.vue b/ruoyi-ui/src/views/honor/index.vue
index 7e5baf4..c69999b 100644
--- a/ruoyi-ui/src/views/honor/index.vue
+++ b/ruoyi-ui/src/views/honor/index.vue
@@ -858,7 +858,7 @@
this.loading1 = true;
let userId = this.$store.state.user.userId
// alert(userId)
-
+ // alert(124)
showShareUser(userId, 2030).then(response=>{
console.log("===========ddddddddddddd")
console.log(response.data)
@@ -899,7 +899,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/login.vue b/ruoyi-ui/src/views/login.vue
index e27dce1..bff6ddb 100644
--- a/ruoyi-ui/src/views/login.vue
+++ b/ruoyi-ui/src/views/login.vue
@@ -216,7 +216,9 @@
</div>
</div>
- <div class="gpr"></div>
+ <div class="gpr">
+ <img :key="url" :src="url" style="width:100%;height:100%"></img>
+ </div>
</div>
</template>
@@ -236,6 +238,7 @@
}
};
return {
+ url: require('../assets/images/index.png'),
openRegister: false,
open: false,
codeUrl: "",
@@ -385,8 +388,8 @@
<style rel="stylesheet/scss" lang="scss">
.gpr{
width:100%;
- height:600px;
- background: no-repeat center/40% url("../assets/images/Group 132.png");
+ height:1200px;
+ //background: no-repeat center/100% url("../assets/images/index.png");
}
.customWidth{
width:40%; // 璁剧疆寮瑰嚭妗嗗搴︾殑鏁板��
@@ -396,8 +399,10 @@
margin-right: 20px;
}
.Group_132{
+ //background: no-repeat center/100% url("../assets/images/index.png");
+
// background: no-repeat center/40% url("../assets/images/Group 132.png");
- height: 100%;
+ height: 1200px;
width: 100%;
background-color: #FEF7FC;
//background-position: 49.5% 16.2% ;
diff --git a/ruoyi-ui/src/views/self/memo.vue b/ruoyi-ui/src/views/self/memo.vue
index e752d65..b05c809 100644
--- a/ruoyi-ui/src/views/self/memo.vue
+++ b/ruoyi-ui/src/views/self/memo.vue
@@ -149,7 +149,7 @@
accept="image/*"
:multiple="false"
:http-request="requestUpload"
- :on-success="handleSucess"
+
:limit="1">
<el-avatar shape="square" style="width: 200px;;height: 200px;" >
@@ -628,7 +628,7 @@
<el-option v-for="(item, index) in typeOption" :key="index" :label="item.label" :value="item.value"
></el-option>
</el-select>
- <el-input v-model="newOption" v-if="showInput" placeholder="鑻ユ湭鍦ㄤ笂杩伴�夐」涓壘鍒板搴旂被鍨嬶紝璇峰湪姝よ緭鍏ユ柊鐨勮瘉浠剁被鍨�" @change="addNewOption"></el-input>
+ <el-input v-model="newOption" placeholder="鑻ユ湭鍦ㄤ笂杩伴�夐」涓壘鍒板搴旂被鍨嬶紝璇峰湪姝よ緭鍏ユ柊鐨勮瘉浠剁被鍨�" ></el-input>
</el-form-item>
<el-form-item label="鎸佹湁鎯呭喌" prop="ownStatus">
@@ -688,7 +688,7 @@
<!--鏂板鑷紶-->
<el-dialog :title="isEdit1 ? '缂栬緫璁板綍' : '鏂板璁板綍'" :visible.sync="dialogVisible.autobiography" width="900px" append-to-body>
<el-col >
- <el-form ref="elForm" :model="formDat" :rules="rules" size="medium" label-position="left" >
+ <el-form ref="elFormzz" :model="formDat6" :rules="rules" size="medium" label-position="left" >
<el-row :span="5">
<!-- <el-form-item label="闇�瑕佷慨鏀圭殑璁板綍锛�" prop="id">-->
<!-- <el-select v-model="formDat.id" placeholder="璇烽�夋嫨闇�瑕佷慨鏀圭殑璁板綍" clearable :style="{width: '50%'}" >-->
@@ -697,10 +697,10 @@
<!-- </el-select>-->
<!-- </el-form-item>-->
<el-form-item label="骞撮緞娈碉細" prop="ageBegin ageEnd" label-width="70px">
- <el-input type="number" v-model="formDat.ageBegin" placeholder="" clearable :style="{width: '20%'}" >
+ <el-input @input="$forceUpdate()" type="number" v-model="formDat6.ageBegin" placeholder="" clearable :style="{width: '20%'}" >
</el-input>
<span> 宀� 鈥斺��</span>
- <el-input type="number" v-model="formDat.ageEnd" placeholder="" clearable :style="{width: '20%'}" >
+ <el-input @input="$forceUpdate()" type="number" v-model="formDat6.ageEnd" placeholder="" clearable :style="{width: '20%'}" >
</el-input>
<span> 宀� </span>
</el-form-item>
@@ -709,11 +709,11 @@
<!-- <el-option v-for="(item, index) in typeOptions" :key="index" :label="item.label" :value="item.value"-->
<!-- ></el-option>-->
<!-- </el-select>-->
- <el-input v-model="formDat.term" placeholder="璇疯緭鍏ユ椂鏈�" clearable :style="{width: '100%'}" >
+ <el-input @input="$forceUpdate()" v-model="formDat6.term" placeholder="璇疯緭鍏ユ椂鏈�" clearable :style="{width: '100%'}" >
</el-input>
</el-form-item>
<el-form-item label="鍐呭缂栬緫锛�" prop="content">
- <el-input v-model="formDat.content" type="textarea" :rows="5" placeholder="" clearable :style="{width: '100%'}" >
+ <el-input @input="$forceUpdate()" v-model="formDat6.content" type="textarea" :rows="5" placeholder="" clearable :style="{width: '100%'}" >
</el-input>
</el-form-item>
</el-row>
@@ -750,6 +750,7 @@
dicts: ['sys_normal_disable'],
data() {
return {
+ userId: undefined,
// 閬僵灞�
disabled: false,
inds:undefined,
@@ -759,7 +760,7 @@
formData:[],
// 閫変腑鏁扮粍
ids: [],
- fit:['cover'],
+ fit:'cover',
// 闈炲崟涓鐢�
single: true,
// 闈炲涓鐢�
@@ -797,11 +798,11 @@
},
// 涓汉缁忓巻鏁版嵁
- experienceList: [],
+ experienceList: undefined,
// isEdit:true,
editStatus: {},
//瀹跺涵鎴愬憳鍏崇郴鏁版嵁
- relationList:[],
+ relationList: undefined,
//鍑哄叆澧冭瘉浠舵儏鍐�
certificateList:[],
typeList:[],
@@ -810,7 +811,7 @@
uploading: false,
uploading1: false,
- fit:['fill'],
+ fit1: ['fill'],
keyword:'',
rules: {
//鍩烘湰淇℃伅
@@ -899,12 +900,12 @@
}],
ageBegin: [{
required: true,
- message: '',
+ message: '璇疯緭鍏ュ紑濮嬫椂闂�',
trigger: 'blur'
}],
ageEnd: [{
required: true,
- message: '',
+ message: '璇疯緭鍏ョ粨鏉熸椂闂�',
trigger: 'blur'
}],
@@ -912,6 +913,7 @@
open:false,
+ formDat6: {},
formDat: {
//涓汉璁颁簨鏈鎯�
id:undefined,
@@ -923,6 +925,7 @@
url: undefined,
},
individualList:[],
+ newOption: undefined,
// 鑿滃崟鍒楄〃
menuOptions: [],
// 閮ㄩ棬鍒楄〃
@@ -977,6 +980,7 @@
trigger: 'blur'
}],
},
+ typeOption: [],
typeOptions: [],
isShow:true,
dsb:true,
@@ -1000,10 +1004,10 @@
methods: {
getInfo(){
console.log('-----------------')
- getInfo().then(response=>{
- console.log(response.user.roles[0].roleId,'roleID')
- this.userId = response.user.roles[0].roleId
- })
+ // getInfo().then(response=>{
+ // console.log(response.user.roles[0].roleId,'roleID')
+ // this.userId = response.user.roles[0].roleId
+ // })
},
getList1() {
this.loading1 = true;
@@ -1125,7 +1129,7 @@
// 鍙栨秷鎸夐挳
cancel() {
this.open = false;
- this.reset();
+ // this.reset();
},
getRowId(row)
{
@@ -1375,7 +1379,9 @@
if (this.isEdit1) {
// 鎵ц淇敼鎿嶄綔
- updateAutobiography(this.formDat).then(response => {
+
+ console.log(this.formDat6)
+ updateAutobiography(this.formDat6).then(response => {
// 灏嗛�変腑閫夐」鐨勬枃鏈缃负"term"瀛楁鐨勫��
// this.formDat.term = selectedOption.value;
// this.formDat.id = selectedOption.id;
@@ -1384,18 +1390,30 @@
this.dialogVisible.autobiography = false;
this.isEdit1 = false;
this.getList();
+ // 娓呯┖formDat瀵硅薄鐨勬暟鎹�
+ Object.keys(this.formDat6).forEach(key => {
+ this.formDat6[key] = '';
+ });
+
}).catch(error => {
+ // alert(24)
console.log(error);
this.isEdit1 = false;
this.dialogVisible.autobiography = false;
});
} else {
// 鎵ц鏂板鎿嶄綔
- addAutobiography(this.formDat).then(response => {
+ addAutobiography(this.formDat6).then(response => {
// this.formDat.term = selectedOption.label;
this.$modal.msgSuccess("鏂板鎴愬姛");
this.dialogVisible.autobiography = false;
this.getList();
+ // 娓呯┖formDat瀵硅薄鐨勬暟鎹�
+ Object.keys(this.formDat6).forEach(key => {
+ this.formDat6[key] = '';
+ });
+ // 閲嶇疆isEdit涓篺alse锛屼互渚夸笅娆＄偣鍑绘柊澧炴椂涓烘柊澧炴搷浣�
+ this.isEdit1 = false;
}).catch(error => {
console.log(error);
this.dialogVisible.autobiography = false;
@@ -1403,12 +1421,7 @@
}
}
});
- // 娓呯┖formDat瀵硅薄鐨勬暟鎹�
- Object.keys(this.formDat).forEach(key => {
- this.formDat[key] = '';
- });
- // 閲嶇疆isEdit涓篺alse锛屼互渚夸笅娆＄偣鍑绘柊澧炴椂涓烘柊澧炴搷浣�
- this.isEdit1 = false;
+
},
editRow(row) {
@@ -1585,12 +1598,17 @@
this.dialogVisible.abroad=false;
this.dialogVisible.autobiography=false;
this.isEdit1 = false;
- this.reset();
+ // this.reset();
// alert(32)
// 娓呯┖formDat瀵硅薄鐨勬暟鎹�
Object.keys(this.formDat).forEach(key => {
this.formDat[key] = '';
});
+ // 娓呯┖formDat瀵硅薄鐨勬暟鎹�
+ Object.keys(this.formDat6).forEach(key => {
+ this.formDat6[key] = '';
+ });
+
},
handleUploadSuccess(response, file) {
// 澶勭悊鏂囦欢涓婁紶鎴愬姛鍚庣殑鍥炶皟
@@ -1600,34 +1618,51 @@
//涓嬫媺
handleChange5(activeNames) {
// console.log(activeNames);
- this.reset();
+ //this.reset();
},
showDialog(dialogName) {
this.dialogVisible[dialogName] = true;
+ // alert(dialogName)
+ // if(dialogName=="autobiography")
+ // {
+ // alert(123)
+ // }
},
//涓汉鑷紶
handleClick(tab, event) {
// console.log(tab, event);
+ alert(987)
this.getAutobiographyInfor();
// this.getSrc1(typeOptions)
},
//涓汉鑷紶缂栬緫
editData(data) {
+ // alert(1234)
this.isEdit1 = true; // 璁剧疆涓虹紪杈戞搷浣�
// 灏嗚淇敼鐨勬暟鎹～鍏呭埌formDat瀵硅薄涓�
- this.formDat.ageBegin = data.ageBegin;
- this.formDat.ageEnd = data.ageEnd;
- this.formDat.term = data.term;
- this.formDat.content = data.content;
-
+
+ this.formDat6.ageBegin = data.ageBegin;
+ this.formDat6.ageEnd = data.ageEnd;
+ this.formDat6.term = data.term;
+ this.formDat6.content = data.content;
+
// 鎵撳紑寮圭獥
this.dialogVisible.autobiography = true;
},
- editAutobiography(item) {
+ editAutobiography(data) {
+ //alert(234)
+ //alert(23)
+ console.log(data)
this.isEdit1 = true;
+ this.formDat6.ageBegin = data.ageBegin;
+ this.formDat6.ageEnd = data.ageEnd;
+ this.formDat6.term = data.term;
+ this.formDat6.content = data.content;
+ // alert(data.id)
+ this.formDat6.id = data.id
this.dialogVisible.autobiography = true;
- this.formDat = { item };
+ //this.formDat = { item };
},
getTypeOptions() {
const filteredOptions = this.typeList.filter(item => typeof item === 'string' && item !== '');
diff --git a/ruoyi-ui/src/views/self/show.vue b/ruoyi-ui/src/views/self/show.vue
index 1c33216..6ac71c1 100644
--- a/ruoyi-ui/src/views/self/show.vue
+++ b/ruoyi-ui/src/views/self/show.vue
@@ -442,12 +442,12 @@
<el-table v-loading="loading1" :data="listRoot" :row-key="getRowId2" 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>
diff --git a/ruoyi-ui/src/views/system/user/index.vue b/ruoyi-ui/src/views/system/user/index.vue
index 047804e..f7e44fa 100644
--- a/ruoyi-ui/src/views/system/user/index.vue
+++ b/ruoyi-ui/src/views/system/user/index.vue
@@ -475,7 +475,10 @@
nickName: [
{ required: true, message: "鐢ㄦ埛鏄电О涓嶈兘涓虹┖", trigger: "blur" }
],
- roleIds: [
+ roleIds: [
+ { required: true, message: "鐢ㄦ埛瑙掕壊涓嶈兘涓虹┖", trigger: "blur" }
+ ],
+ role: [
{ required: true, message: "鐢ㄦ埛瑙掕壊涓嶈兘涓虹┖", trigger: "blur" }
],
isMyFamily: [
@@ -969,6 +972,7 @@
fm.roleId = this.form.role
fm.sex = this.form.sex
// alert(fm.sex)
+
fm.status = this.form.status
if(this.originRole==102 && fm.roleId==2)
{
@@ -977,8 +981,8 @@
}
fm.fid = this.form.fid
fm.mid = this.form.mid
- alert(this.form.fid)
- alert(this.form.mid)
+ // alert(this.form.fid)
+ // alert(this.form.mid)
// alert(this.form.isMyFamily)
fm.isMyFamily = this.form.isMyFamily=='1'?1:0
diff --git a/ruoyi-ui/src/views/wish/index.vue b/ruoyi-ui/src/views/wish/index.vue
index c0456f4..eb48570 100644
--- a/ruoyi-ui/src/views/wish/index.vue
+++ b/ruoyi-ui/src/views/wish/index.vue
@@ -447,12 +447,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>
diff --git a/ruoyi-ui/vue.config.js b/ruoyi-ui/vue.config.js
index 0b0cb0e..ae06d06 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.7:8080/`,
+ // target: `https://192.168.1.6:8080/`,
target: 'https://www.bendudu.com:8080/',
changeOrigin: true,
pathRewrite: {
--
Gitblit v1.9.1