From bd40473c9c634005bc7e62e7fc901bcd8b598fa0 Mon Sep 17 00:00:00 2001 From: feige <feige@qq.com> Date: 星期五, 02 二月 2024 15:20:26 +0800 Subject: [PATCH] 提交了修改 --- ruoyi-ui/src/views/pet/petInfo.vue | 180 ++++++++++++++++++++++++++++++++++++++++++++--------------- 1 files changed, 134 insertions(+), 46 deletions(-) diff --git a/ruoyi-ui/src/views/pet/petInfo.vue b/ruoyi-ui/src/views/pet/petInfo.vue index 4b1ca0a..e0d5a8c 100644 --- a/ruoyi-ui/src/views/pet/petInfo.vue +++ b/ruoyi-ui/src/views/pet/petInfo.vue @@ -139,16 +139,37 @@ <el-col :span="6" :data="petList"> <div class="block" :model="petList" > <el-col v-model="petList.headPicture" prop="headPicture"> - <el-avatar shape="square" :size=200 > + <!-- <el-avatar shape="square" :size=200 > <el-image - :src="'http://47.93.189.255:8080/'+ petList.headPicture" + :src="'https://www.bendudu.com:8080/'+ petList.headPicture" :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-avatar> --> + <el-upload ref="upload1" + action="" + :file-list="fileListOther" + list-type="picture-card" + accept="image/*" + :multiple="false" + :http-request="requestUpload1" + :on-success="handleSucess" + :limit="1"> + + <el-avatar shape="square" style="width: 200px;;height: 200px;" > + <el-image + :src="'https://www.bendudu.com:8080/'+ petList.headPicture" + :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> </el-col> </div> - <el-button v-if="isShow" type="primary" @click="submitForm" :disabled="dsb">淇敼榄呭疇淇℃伅</el-button> + +<!-- <el-button v-if="isShow" type="primary" @click="submitForm" :disabled="dsb">淇敼榄呭疇淇℃伅</el-button> --> </el-col> + </div> </el-container> @@ -212,25 +233,43 @@ <el-col :span="6" :data="petList"> <div class="block" :model="petList" > <el-col v-model="petList.fullPicture" prop="fullPicture"> - <el-avatar shape="square" style="width: 1000px;;height: 500px;" > - <el-image - :src="'http://47.93.189.255:8080/'+ petList.fullPicture" - :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-upload class="upload-demo" action="/uploadImage" :on-success="handleUploadSuccess"> - <el-button slot="trigger">鐐瑰嚮涓婁紶鏂板浘鐗�</el-button> + + <el-upload ref="upload" + action="" + :file-list="fileList" + list-type="picture-card" + accept="image/*" + :multiple="false" + :http-request="requestUpload" + :on-success="handleSucess" + :limit="1"> + + <el-avatar shape="square" style="width: 1000px;;height: 500px;" > + <el-image + :src="'https://www.bendudu.com:8080/'+ petList.fullPicture" + :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> - </el-avatar> + + + </el-col> </div> - <el-button>淇敼</el-button> + </el-col> + </div> + <div class="form-header mt"> - - +</div> + <div> + <el-button v-if="isShow" type="primary" @click="submitForm" :disabled="dsb">淇敼榄呭疇淇℃伅</el-button> + </div> <el-dialog :visible.sync="dialogVisible"> <img w-full :src="dialogImageUrl" alt="Preview Image" /> @@ -361,7 +400,10 @@ return { cdi:"榄呭疇璇︾粏淇℃伅", udi:"榄呭疇淇℃伅淇敼", - 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:[ @@ -416,6 +458,7 @@ dialogImageUrl: '', dialogVisible: false, disabled: false, + btn: false, // 琛ㄥ崟鏍¢獙 rules: { animal: [{ @@ -520,13 +563,16 @@ jd = this.$route.query.detail this.btn= jd this.dsb = !jd - document.title = "淇敼榄呭疇璇︾粏淇℃伅"; + this.isShow = true + + // document.title = "淇敼榄呭疇璇︾粏淇℃伅"; this.$route.meta.title = "淇敼榄呭疇璇︾粏淇℃伅";//鍒楄〃鐨勫悕绉� } else{ - document.title = "鏌ョ湅榄呭疇璇︾粏淇℃伅"; + // document.title = "鏌ョ湅榄呭疇璇︾粏淇℃伅"; this.$route.meta.title = "鏌ョ湅榄呭疇璇︾粏淇℃伅";//鍒楄〃鐨勫悕绉� this.btn = false; + this.isShow = false; } let _this = this @@ -536,6 +582,7 @@ getPetList(id).then((response) => { this.petList = response.data; console.log(this.petList) + // alert(this.petList.headPicture) this.loading = false; }); // getPetowner(id).then((response) => { @@ -553,34 +600,17 @@ this.loading = true; // this.queryParams.happenStartTime = this.dateRange.length > 0 && this.dateRange[0] // this.queryParams.happenEndTime = this.dateRange.length > 0 && this.dateRange[1] - - // console.log(this.queryParams) this.queryParams.pid = this.pid; // listProperty(this.addDateRange(this.queryParams, this.dateRange)).then(response => { listPetnote(this.queryParams).then(response => { - // alert(123) - // console.log(response.data) this.PetNoteList = response.data.data; + this.total = response.data.total; this.loading = false; } ); }, - requestUpload(params) - { - var file = params.file; - var formData = new FormData(); - formData.append('uploadFile', file); - let _this = this - - uploadPic(formData).then(response => { - let pth = response.data.originalFilename.substr(response.data.originalFilename.length-4, response.data.originalFilename.length) - _this.fileList1.push({name:response.data.fileName, url:response.data.url}) - console("ok") - }) - - }, requestUpload2(params) { var file = params.file; @@ -598,14 +628,14 @@ }, submitForm() { - let ul = this.fileList1.map(function (elem){ - return elem.url.replace(process.env.VUE_APP_BASE_TRUE_API,"") - }).join(",") - let uls = this.fileList2.map(function (elem){ - return elem.url.replace(process.env.VUE_APP_BASE_TRUE_API,"") - }).join(",") - this.petList.headPicture = ul, - this.petList.fullPicture = uls, + // let ul = this.fileList1.map(function (elem){ + // return elem.url.replace(process.env.VUE_APP_BASE_TRUE_API,"") + // }).join(",") + // let uls = this.fileList2.map(function (elem){ + // return elem.url.replace(process.env.VUE_APP_BASE_TRUE_API,"") + // }).join(",") + // this.petList.headPicture = ul, + // this.petList.fullPicture = uls, this.$refs['elForm'].validate(valid => { @@ -708,13 +738,71 @@ this.dsb = false this.btn = true }, + handleSucess() + { + // alert(15) + this.$refs.upload.clearFiles(); + }, + requestUpload(params) + { + var file = params.file; + var formData = new FormData(); + formData.append('uploadFile', file); + let _this = this + this.$refs.upload.clearFiles(); + // this.uploading1 = true; + //alert(100) + uploadPic(formData).then(response => { + // alert(18) + // let pth = response.data.originalFilename.substr(response.data.originalFilename.length-4, response.data.originalFilename.length) + // _this.fileList1.push({name:response.data.fileName, url:response.data.url}) + // console("ok") + // alert(90) + // alert(response.data.url) + _this.petList.fullPicture = response.data.url.replace(process.env.VUE_APP_BASE_TRUE_API,"") + updatePet(_this.petList).then(response => { + _this.$modal.msgSuccess("鍥惧儚淇敼鎴愬姛"); + // this.open = false; + _this.btn=false + }); + // alert(100) + }) + //alert(90) + }, +requestUpload1(params) + { + var file = params.file; + var formData = new FormData(); + formData.append('uploadFile', file); + let _this = this + + this.$refs.upload1.clearFiles(); + // this.uploading1 = true; + //alert(100) + uploadPic(formData).then(response => { + // alert(18) + // let pth = response.data.originalFilename.substr(response.data.originalFilename.length-4, response.data.originalFilename.length) + // _this.fileList1.push({name:response.data.fileName, url:response.data.url}) + // console("ok") + // alert(90) + // alert(response.data.url) + _this.petList.headPicture = response.data.url.replace(process.env.VUE_APP_BASE_TRUE_API,"") + updatePet(_this.petList).then(response => { + _this.$modal.msgSuccess("淇敼鎴愬姛"); + // this.open = false; + _this.btn=false + }); + // alert(100) + }) + //alert(90) + }, } } </script> -<style scoped lang="scss"> +<style scoped> .mt { position: relative; @@ -723,7 +811,7 @@ display: block; } -.hide .el-upload--picture-card { +.hide /deep/ .el-upload--picture-card { display: none; } .form{ -- Gitblit v1.9.1