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/self/show.vue | 251 ++++++++++++++++++++++++++------------------------
1 files changed, 130 insertions(+), 121 deletions(-)
diff --git a/ruoyi-ui/src/views/self/show.vue b/ruoyi-ui/src/views/self/show.vue
index 2259c78..fa51a96 100644
--- a/ruoyi-ui/src/views/self/show.vue
+++ b/ruoyi-ui/src/views/self/show.vue
@@ -148,47 +148,29 @@
<div style="padding-left:100px;padding-top:30px">
<el-col :span="6" :data="individualList">
<div class="block" :model="individualList">
- <div v-if="!isEditing">
- <el-avatar shape="square" style="width: 200px; height: 150px;">
- <el-image
- class="el-upload-list__item-thumbnail"
- v-if="!individualList.img"
- src="default-avatar-url"
- :fit="fit"
- style="width: 100%; height: 100%;"
- ></el-image>
- <el-image
- v-else
- :src="'http://47.93.189.255:8080/' + individualList.img"
- :fit="fit"
- style="width: 100%; height: 100%;"
- ></el-image>
- </el-avatar>
- </div>
- <el-upload v-else
- class="upload-demo"
- action="#"
- :auto-upload="false"
- :http-request="requestUpload"
- :limit="1"
- :file-list="fileList"
- >
- <el-avatar shape="square" style="width: 200px; height: 150px;">
- <el-image
- class="el-upload-list__item-thumbnail"
- v-if="!individualList.img"
- src="default-avatar-url"
- :fit="fit"
- style="width: 100%; height: 100%;"
- ></el-image>
- <el-image
- v-else
- :src="'http://47.93.189.255:8080/' + individualList.img"
- :fit="fit"
- style="width: 100%; height: 100%;"
- ></el-image>
- </el-avatar>
- </el-upload>
+
+
+
+
+ <el-upload ref="uploadDemo"
+ action=""
+ :file-list="fileList1"
+ list-type="picture-card"
+ accept="image/*"
+ :multiple="false"
+ :http-request="requestUpload"
+ :on-success="handleSucess"
+ :limit="1">
+
+ <el-avatar shape="square" style="width: 200px;;height: 200px;" >
+ <el-image
+ :src="'https://www.bendudu.com:8080/'+ individualList.url"
+ :fit="fit" style="width: 100%;height: 100%;border-radius: 0px 0px 0px 0px;opacity: 1;border: 1px solid rgba(0,0,0,0.5);"
+ ></el-image>
+
+
+ </el-avatar>
+ </el-upload>
<div class="edit-text" v-if="isEditing" @click="uploadImage">鐐瑰嚮鏇存崲鍥剧墖</div>
</div>
</el-col>
@@ -205,24 +187,26 @@
<el-container>
<el-col v-loading="loading" :data="individualList" @selection-change="handleSelectionChange">
<el-form ref="elForm" :model="individualList" :rules="rules" size="medium" label-position="left">
- <el-row :span="16">
- <el-form-item label="鎴风睄鍦板潃" prop="locationAddress" label-width="70px">
- <el-input v-model="individualList.locationAddress" placeholder="" clearable :style="{width: '100%'}" :disabled="dsb">
- </el-input>
- </el-form-item>
- </el-row>
- <el-row :span="16">
- <el-form-item label="甯镐綇鍦板潃" prop="alwaysAddress" label-width="70px">
- <el-input v-model="individualList.alwaysAddress" placeholder="" clearable :style="{width: '100%'}" :disabled="dsb">
- </el-input>
- </el-form-item>
- </el-row>
<el-row :span="16" >
<el-form-item label="鍗曚綅" prop="unit" label-width="40px">
<el-input v-model="individualList.unit" placeholder="" clearable :style="{width: '100%'}" :disabled="dsb">
</el-input>
</el-form-item>
</el-row>
+ <el-row :span="16">
+ <el-form-item label="鎴风睄鍦板潃" prop="locationAddress" label-width="70px">
+ <el-input type="textarea" v-model="individualList.locationAddress" placeholder="" clearable :style="{width: '280px'}" :disabled="dsb">
+ </el-input>
+ </el-form-item>
+ </el-row>
+
+ <el-row :span="28">
+ <el-form-item label="甯镐綇鍦板潃" prop="alwaysAddress" label-width="70px">
+ <el-input type="textarea" v-model="individualList.alwaysAddress" placeholder="" clearable :style="{width: '280px'}" :disabled="dsb">
+ </el-input>
+ </el-form-item>
+ </el-row>
+
</el-form>
</el-col>
@@ -232,24 +216,25 @@
<el-container>
<el-col v-loading="loading" :data="individualList" @selection-change="handleSelectionChange">
<el-form ref="elForm" :model="individualList" :rules="rules" size="medium" label-position="left">
- <el-row :span="12">
- <el-form-item label="鎴风睄鍦板叕瀹夋満鍏�" prop="locationPolice" label-width="110px">
- <el-input v-model="individualList.locationPolice" placeholder="" clearable :style="{width: '100%'}" :disabled="dsb">
- </el-input>
- </el-form-item>
- </el-row>
- <el-row :span="12">
- <el-form-item label="甯镐綇鍦板叕瀹夋満鍏�" prop="alwaysPolice" label-width="110px">
- <el-input v-model="individualList.alwaysPolice" placeholder="" clearable :style="{width: '100%'}" :disabled="dsb">
- </el-input>
- </el-form-item>
- </el-row>
<el-row :span="12" >
<el-form-item label="鑱屽姟鑱岀О" prop="position" label-width="70px">
<el-input v-model="individualList.position" placeholder="" clearable :style="{width: '100%'}" :disabled="dsb">
</el-input>
</el-form-item>
</el-row>
+ <el-row :span="12">
+ <el-form-item label="鎴风睄鍦板叕瀹夋満鍏�" prop="locationPolice" label-width="110px">
+ <el-input type="textarea" v-model="individualList.locationPolice" placeholder="" clearable :style="{width: '280px'}" :disabled="dsb">
+ </el-input>
+ </el-form-item>
+ </el-row>
+ <el-row :span="12">
+ <el-form-item label="甯镐綇鍦板叕瀹夋満鍏�" prop="alwaysPolice" label-width="110px">
+ <el-input type="textarea" v-model="individualList.alwaysPolice" placeholder="" clearable :style="{width: '280px'}" :disabled="dsb">
+ </el-input>
+ </el-form-item>
+ </el-row>
+
</el-form>
</el-col>
</el-container>
@@ -529,18 +514,14 @@
<el-tab-pane v-for="(item, index) in AutobiographyList"
:key='item.id' :label="item.ageBegin+'~'+item.ageEnd+'宀�'+'('+item.term+')'">
<div>{{ item.content }}</div>
-<!-- <div v-if="item.term === '濠村効'"> {{item.content}}</div>-->
-<!-- <div v-if="item.term === '骞煎効'"> {{item.content}}</div>-->
-<!-- <div v-if="item.term === '灏忓'"> {{item.content}}</div>-->
-<!-- <div v-if="item.term === '鍒濅腑'"> {{item.content}}</div>-->
-<!-- <div v-if="item.term === '楂樹腑'"> {{item.content}}</div>-->
-<!-- <div v-if="item.term === '澶у'"> {{item.content}}</div>-->
-<!-- <div v-if="item.term === '鐮旂┒鐢�'"> {{item.content}}</div>-->
-<!-- <div v-if="item.term === '宸ヤ綔'"> {{item.content}}</div>-->
-<!-- <div v-if="item.term === '缁撳鍚�'"> {{item.content}}</div>-->
- <el-button size='mini' type="text" class="btn_edit" @click="editAutobiography(item)" style='position: absolute;right:10px;top:5px;'>
+ <el-button size='mini' type="text" class="btn_edit" @click="editAutobiography(item)" style='position: absolute;right:40px;top:5px;'>
<sapn v-html="'\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0'"></sapn>
</el-button>
+
+ <el-button size="mini" type="text" class="btn_del" @click="handleAutobiography(item)" style='position: absolute;right:10px;top:5px;'>
+ <sapn v-html="'\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0'"></sapn>
+ </el-button>
+
</el-tab-pane>
</el-tabs></div>
</el-contain>
@@ -740,12 +721,13 @@
import axios from 'axios';
//鍦╯ystem/note/index.js涓鍏ユ帴鍙ｅ嚱鏁� --鎺ュソ浜�
-import {getIndividualList, addIndividual, updateIndividual, delIndividual,
+import {
+ getIndividualList, addIndividual, updateIndividual, delIndividual,
listExperience, addExperience, updateExperience, delExperience,
getIndividualRelation, addRelation, updateRelation, delRelation,
getCertificateList, addCertificate, updateCertificate, delCertificate,
- getAbroadList, addAbroad, updateAbroad, delAbroad,listType,
- getAutobiographyList, getAutobiographyTermList, addAutobiography,updateAutobiography,
+ getAbroadList, addAbroad, updateAbroad, delAbroad, listType,
+ getAutobiographyList, getAutobiographyTermList, addAutobiography, updateAutobiography,delAutobiography,
getCategory,
} from "@/api/self/index";
import { delFamilyevent, uploadPic } from '../../api/bignote'
@@ -839,7 +821,10 @@
// 鏃ユ湡鑼冨洿
dateRange: [],
// 鏁版嵁鑼冨洿閫夐」
- fot:[".jpg",".jif"],
+ // 鏁版嵁鑼冨洿閫夐」
+ fot:['.bmp','.jpg','.jpeg','.png','.tif','.gif','.pcx','.tga','.exif','.fpx',
+ '.svg','.psd','.cdr','.pcd','.dxf','.ufo','.eps','.ai','.aw','.WMF','.webp','.apng'],
+
fileList:[],
fileListOther:[],
dsb:true,
@@ -1119,57 +1104,59 @@
// console.log(this.queryParams)
// listProperty(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
//涓汉缁忓巻
+ let _this = this;
listExperience(this.queryParams).then(response => {
// alert(123)
// console.log(response.data)
- this.experienceList = response.data;
+ _this.experienceList = response.data;
// this.total = response.data.total;
- this.loading = false;
+ _this.loading = false;
}
);
//鎴愬憳鍏崇郴
getIndividualRelation(this.queryParams).then(response => {
// alert(123)
// console.log(response.data)
- this.relationList = response.data;
+ _this.relationList = response.data;
// this.total = response.data.total;
- this.loading = false;
+ _this.loading = false;
}
);
//涓汉淇℃伅
getIndividualList(this.queryParams).then(response => {
// alert(123)
// console.log(response.data)
- this.individualList = response.data;
+ _this.individualList = response.data;
+
// this.total = response.data.total;
- this.loading = false;
+ _this.loading = false;
}
);
//鍑哄叆澧冭瘉浠舵儏鍐�
getCertificateList(this.queryParams).then(response => {
// alert(123)
// console.log(response.data)
- this.certificateList = response.data;
+ _this.certificateList = response.data;
// this.total = response.data.total;
- this.loading = false;
+ _this.loading = false;
}
);
//鍑哄浗鎯呭喌
getAbroadList(this.queryParams).then(response => {
// alert(123)
// console.log(response.data)
- this.AbroadList = response.data;
+ _this.AbroadList = response.data;
// this.total = response.data.total;
- this.loading = false;
+ _this.loading = false;
}
);
//鏌ヨ涓汉鎵�鏈夎嚜浼�
getAutobiographyList(this.queryParams).then(response => {
// alert(123)
// console.log(response.data)
- this.AutobiographyList = response.data;
+ _this.AutobiographyList = response.data;
// this.total = response.data.total;
- this.loading = false;
+ _this.loading = false;
});
//鏍规嵁涓嶅悓鏃舵鐨勪釜浜鸿嚜浼�
@@ -1181,12 +1168,12 @@
// this.loading = false;
// });
listType(this.queryParams).then(response => {
- this.typeList = response.data;
+ _this.typeList = response.data;
// this.total = response.data.total;
// console.log( this.typeList )
// 鍦ㄥ洖璋冨嚱鏁颁腑璋冪敤 getTypeOptions()
- this.getTypeOptions();
- this.loading = false;
+ _this.getTypeOptions();
+ _this.loading = false;
}
);
},
@@ -1346,12 +1333,13 @@
/** 鎻愪氦鎸夐挳锛堟暟鎹潈闄愶級 */
//鏂板涓昏缁忓巻鐨勪繚瀛�
submitDataScope: function() {
+ let _this = this
this.$refs["elForm"].validate(valid => {
if (valid) {
- addExperience(this.formDat).then(response => {
- this.$modal.msgSuccess("鏂板鎴愬姛");
- this.dialogVisible.open = false;
- this.getList();
+ addExperience(_this.formDat).then(response => {
+ _this.$modal.msgSuccess("鏂板鎴愬姛");
+ _this.dialogVisible.open = false;
+ _this.getList();
});
}
});
@@ -1470,14 +1458,14 @@
this.individualList.maritalStatus = 1
else
this.individualList.maritalStatus = 2
- let ul = this.fileList.map(function (elem){
- return elem.url.replace(process.env.VUE_APP_BASE_TRUE_API,"")
- }).join(",")
- let uls = this.fileListOther.map(function (elem){
- return elem.url.replace(process.env.VUE_APP_BASE_TRUE_API,"")
- }).join(",")
- this.individualList.url = ul+","+uls
-
+ // let ul = this.fileList.map(function (elem){
+ // return elem.url.replace(process.env.VUE_APP_BASE_TRUE_API,"")
+ // }).join(",")
+ // let uls = this.fileListOther.map(function (elem){
+ // return elem.url.replace(process.env.VUE_APP_BASE_TRUE_API,"")
+ // }).join(",")
+ // // this.individualList.url = ul+","+uls
+ // console.log(this.individualList)
this.$refs['elForm'].validate(valid => {
if (valid) {
if (this.individualList.userId !== undefined) {
@@ -1638,7 +1626,12 @@
formData.append('uploadFile', file);
let _this = this
+ // console.log(this.individualList)
+ this.$refs.uploadDemo.clearFiles();
+ // alert(234)
uploadPic(formData).then(response => {
+ // alert(response.data.url)
+ // alert(response.data.originalFilename)
let pth = response.data.originalFilename.substr(response.data.originalFilename.length-4, response.data.originalFilename.length)
if(_this.fot.includes(pth) === true)
@@ -1648,9 +1641,25 @@
}
else{
- _this.fileListOther.push({name:response.data.fileName, url:response.data.url})
+ _this.fileList.push({name:response.data.fileName, url:response.data.url})
}
+ _this.individualList.img = response.data.url.replace(process.env.VUE_APP_BASE_TRUE_API,"")
+ _this.individualList.url = response.data.url.replace(process.env.VUE_APP_BASE_TRUE_API,"")
+ updateIndividual(_this.individualList).then(response => {
+ // 灏嗛�変腑閫夐」鐨勬枃鏈缃负"term"瀛楁鐨勫��
+ // this.formDat.term = selectedOption.value;
+ // this.formDat.id = selectedOption.id;
+ console.log("1")
+ _this.$modal.msgSuccess("淇敼鎴愬姛");
+ _this.dialogVisible.autobiography = false;
+ _this.isEdit1 = false;
+ _this.getList();
+ }).catch(error => {
+ console.log(error);
+ _this.isEdit1 = false;
+ _this.dialogVisible.autobiography = false;
+ });
})
},
@@ -1695,6 +1704,16 @@
this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
}).catch(() => {});
},
+ /** 鍒犻櫎涓汉鑷紶鎸夐挳鎿嶄綔 */
+ handleAutobiography(row) {
+ const Ids = row.id || this.ids;
+ this.$modal.confirm('鏄惁纭鍒犻櫎鏁版嵁椤癸紵').then(function() {
+ return delAutobiography(Ids);
+ }).then(() => {
+ this.getList();
+ this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
+ }).catch(() => {});
+ },
/** 瀵煎嚭鎸夐挳鎿嶄綔 */
handleExport() {
@@ -1706,7 +1725,7 @@
};
</script>
-<style >
+<style scoped="">
/*.uoloadSty {*/
/* width:110px;*/
/* height:110px;*/
@@ -1752,7 +1771,9 @@
.btn_edit{
background:center no-repeat url('../../assets/icons/edit.png') ;
}
-
+.btn_del{
+ background:center no-repeat url('../../assets/images/鍒犻櫎2.png') ;
+}
.button-container {
text-align: right;
display: flex;
@@ -1766,18 +1787,6 @@
flex-shrink: 0;
width: 30px;
height: 28px;
-}
-.button2 {
- background: center no-repeat url('../../assets/icons/add1.png') ;
- margin-left: 66vw;
-}
-.button4 {
- background: center no-repeat url('../../assets/icons/add1.png') ;
- margin-left: 71.5vw;
-}
-.button5 {
- background:center no-repeat url('../../assets/icons/add1.png') ;
- margin-left: 71vw;
}
.form{
background:center/11% no-repeat url('../../assets/icons/form.png') ;
--
Gitblit v1.9.1