ruoyi-ui/src/api/pet/index.js | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
ruoyi-ui/src/views/bignote/index.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
ruoyi-ui/src/views/pet/noteInfo.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
ruoyi-ui/src/views/pet/petnote.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
ruoyi-ui/src/views/self/show.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
ruoyi-ui/src/api/pet/index.js
@@ -92,7 +92,7 @@ //上传文件 export function uploadPic(data) { return request({ url: '/common/upload', url: '/common/uploads', method: 'post', data: data }) ruoyi-ui/src/views/bignote/index.vue
@@ -640,9 +640,6 @@ this.$delete(this.fileList,i); this.$delete(this.uploadFileList,i); } //alert(this.formData.url) } // let ul = this.fileList.map(function (elem){ // return elem.url.replace(process.env.VUE_APP_BASE_TRUE_API,"") @@ -657,11 +654,9 @@ for(let i = 0; i < this.fileListOther.length; i++) { if(this.fileListOther[i].url==file.url) { { this.$delete(this.fileListOther,i); this.$delete(this.uploadFileList1,i); this.$delete(this.uploadFileList1,i); } } }, ruoyi-ui/src/views/pet/noteInfo.vue
@@ -32,8 +32,11 @@ list-type="picture-card" multiple :http-request="requestUpload" :file-list="fileList" :disabled="!btn" :file-list="fileList" :on-change="handleChange" :auto-upload="false" ref="upload" :class="{ hide: !btn }" > <div v-if="uploading" class="upload-status">正在上传...</div> @@ -74,7 +77,13 @@ </div> </el-upload> <el-button style="margin-left: 10px" size="small" type="success" v-if="btn" @click="picUpload" >上传到服务器</el-button> <h4 class="form-header">其他附件 </h4> <el-upload action="" @@ -84,12 +93,15 @@ list-type="picture-card" :on-preview="handleFileCardPreview" :on-remove="handleRemoveFile" :http-request="requestUpload" ref="upload1" :http-request="requestUpload1" :on-change="handleChange1" :auto-upload="false" :show-file-list="true" :disabled="!btn" :class="{ hide: !btn }" > <div v-if="uploading" class="upload-status">正在上传...</div> <i v-if="!uploading" slot="default" class="el-icon-plus"></i> <div slot="file" slot-scope="{file}"> <!-- 添加video元素用于显示视频 --> @@ -135,7 +147,14 @@ </el-upload> <el-button style="margin-left: 10px" size="small" type="success" v-if="btn" @click="fileUpload" >上传到服务器</el-button> <h4 class="form-header"> </h4> <el-form-item size="large"> <el-button v-if="isShow" type="primary" @click="submitForm" :disabled="dsb">修改</el-button> </el-form-item> @@ -166,8 +185,11 @@ fileList:[ ], fileList1:[], uploadFileList:[], uploadFileList1:[], fileListOther:[ ], dsb:true, btn:false, @@ -319,18 +341,82 @@ }) }, handleRemoveFile(file) { for(let i = 0; i < this.fileListOther.length; i++) { if(this.fileListOther[i].url==file.url) this.$delete(this.fileListOther,i); } //判读是否是之前的图片 let res = false for(let i = 0; i < this.fileListOther.length; i++) { if(this.fileListOther[i].url==file.url) { if(this.fileListOther[i].res==false) res = true else { this.$delete(this.uploadFileList1, Math.abs(i - this.uploadFileList1.length-1)) } this.$delete(this.fileListOther,i); } } let ul = "" this.fileList.map(function (elem){ if(elem.res==false) ul = ul + ","+elem.url.replace(process.env.VUE_APP_BASE_TRUE_API,"") }) let uls = "" this.fileListOther.map(function (elem){ if(elem.res==false) uls = uls +","+elem.url.replace(process.env.VUE_APP_BASE_TRUE_API,"") }) this.formData.url = ul+","+uls; // alert(this.formData.url) if(res==true){ updatenotePet(this.formData).then(response => { this.$modal.msgSuccess("删除成功"); // this.open = false; }); } }, handleRemove(file) { for(let i = 0; i < this.fileList.length; i++) { if(this.fileList[i].url==file.url) this.$delete(this.fileList,i); } //判断是否是之前的图片 let res = false // alert(this.fileList.length) for(let i = 0; i < this.fileList.length; i++) { if(this.fileList[i].url==file.url) { //原来图像标记为false //alert(this.fileList[i].res) if(this.fileList[i].res==false) res = true else { // alert(this.uploadFileList.length) // alert(87) this.$delete(this.uploadFileList, Math.abs(i - this.uploadFileList.length-1)) // alert(this.uploadFileList.length) } this.$delete(this.fileList,i); } } let ul = "" this.fileList.map(function (elem){ if(elem.res==false) ul = ul + ","+elem.url.replace(process.env.VUE_APP_BASE_TRUE_API,"") }) let uls = "" this.fileListOther.map(function (elem){ if(elem.res==false) elem.url.replace(process.env.VUE_APP_BASE_TRUE_API,"") }) this.formData.url = ul+","+uls; if(res==true){ updatenotePet(this.formData).then(response => { this.$modal.msgSuccess("删除成功"); }); } }, handlePictureCardPreview(file) { this.dialogImageUrl = file.url; @@ -362,41 +448,124 @@ // const fid =2031 this.$router.push("/familymodel/property/memo/" + id ); }, requestUpload(params) { var file = params.file; var formData = new FormData(); formData.append('uploadFile', file); let _this = this this.uploading = true; uploadPic(formData).then(response => { let pth = response.data.originalFilename.substr(response.data.originalFilename.length-4, response.data.originalFilename.length) this.uploading = false; this.$modal.msgSuccess("上传成功"); if(_this.fot.indexOf(pth) !== -1) { _this.fileList.push({"name":response.data.fileName, "url":response.data.url}) } else{ _this.fileListOther.push({"name":response.data.fileName, "url":response.data.url}) } 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.formData.url = ul+","+uls console.log(_this.formData.url) // alert(87) updatenotePet(_this.formData).then(response => { this.$modal.msgSuccess("图片上传成功"); // this.open = false; }); }) } //自定义上传方法 handleChange(file, fileList1) { //定义一个全局数组uploadFileList来做存储 // this.uploadFileList.push(file.raw); console.log("=========5555=========") this.uploadFileList.push(file.raw); this.fileList.push({name:file.name,url:file.url,res:true}) }, //自定义上传方法 handleChange1(file, fileListOther1) { //定义一个全局数组uploadFileList来做存储 // this.uploadFileList.push(file.raw); this.uploadFileList1.push(file.raw); this.fileListOther.push({name:file.name,url:file.url,res:true}) console.log("=========5555=========") //console.log(file) // console.log(this.uploadFileList) // this.fileList = fileList }, fileUpload(){ // var file = params.file; var formData = new FormData(); //this.$refs.upload1.submit(); // alert(this.uploadFileList1.length) // formData.append('uploadFile', file); if(this.uploadFileList1.length==0){ this.$modal.msgSuccess("文档上传列表不能为空!"); return} this.uploadFileList1.forEach((elem)=>{ formData.append("files", elem) }) console.log(this.uploadFileList1) let _this = this this.uploading = true; uploadPic(formData).then(response => { _this.uploadFileList1 = [] _this.formData.url = _this.formData.url+","+response.fileNames updatenotePet(_this.formData).then(response => { this.$modal.msgSuccess("文档上传成功"); // this.open = false; }); }) }, picUpload() { var formData = new FormData(); //this.$refs.upload.submit(); //alert(this.uploadFileList.length) if(this.uploadFileList.length==0){ this.$modal.msgSuccess("图像上传列表不能为空!"); return} this.uploadFileList.forEach((elem)=>{ formData.append("files", elem) }) let _this = this uploadPic(formData).then(response => { // console.log(response.originalFilenames) // console.log(response.urls) // console.log(response.fileNames) // console.log(response.newFileNames) // let pth = response.data.originalFilename.substr(response.data.originalFilename.length-4, response.data.originalFilename.length) // _this.uploading1= false; // console.log(_this.fot.includes(pth)) // // debugger // if(_this.fot.includes(pth) === true) // { // _this.fileList.push({name:response.data.fileName, "url":response.data.url}) // 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(",") //console.log(_this.fileList) // alert(response.fileNames) _this.formData.url = _this.formData.url+","+response.fileNames _this.uploadFileList = [] // alert(87) updatenotePet(_this.formData).then(response => { _this.$modal.msgSuccess("图片上传成功"); // this.open = false; }); // } // else{ // _this.fileListOther.push({name:response.data.fileName, url:response.data.url}) // } }); }, requestUpload(params) { // alert(124) // this.uploadFileList.push(params.file); //alert(34) }, requestUpload1(params) { // alert(123) // this.uploadFileList1.push(params.file); // console.log("-----------") //console.log(this.uploadFileList1) }, } } ruoyi-ui/src/views/pet/petnote.vue
@@ -166,6 +166,9 @@ multiple :http-request="requestUpload" :file-list="fileList" :on-change="handleChange" :auto-upload="false" ref="upload" > <i slot="default" class="el-icon-plus"></i> <div slot="file" slot-scope="{file}"> @@ -193,10 +196,15 @@ <i class="el-icon-delete"></i> </span> </span> </div> </el-upload> <el-button style="margin-left: 10px" size="small" type="success" @click="picUpload" >上传到服务器</el-button> <h4 class="form-header">其他附件 </h4> <el-upload action="" @@ -205,8 +213,12 @@ multiple :on-remove="handleRemoveFile" :http-request="requestUpload" :show-file-list="true" ref="upload1" :on-change="handleChange1" :auto-upload="false" list-type="picture-card" :http-request="requestUpload1" > <el-button type="primary">点击上传</el-button> <template #tip> @@ -215,7 +227,12 @@ </template> </el-upload> <el-button style="margin-left: 10px" size="small" type="success" @click="fileUpload" >上传到服务器</el-button> </el-form> <h4 class="form-header"> </h4> @@ -285,9 +302,10 @@ fileList:[ ], fileListOther:[ ], fileList1:[], uploadFileList: [], uploadFileList1: [], fileListOther:[], dsb:true, btn:false, PetNoteList:{}, @@ -295,7 +313,7 @@ formDat: { fid:undefined, remindTime:undefined, url:undefined, url:'', title: undefined, happenTime: undefined, }, @@ -393,12 +411,30 @@ }, handleRemove(file) { for(let i = 0; i < this.fileListOther.length; i++) for(let i = 0; i < this.fileList.length; i++) { if(this.fileListOther[i].url==file.url) this.$delete(this.fileListOther,i); if(this.fileList[i].url==file.url) { this.$delete(this.fileList,i); this.$delete(this.uploadFileList,i); } //alert(this.formData.url) } }, handleRemoveFile(file) { for(let i = 0; i < this.fileListOther.length; i++) { if(this.fileListOther[i].url==file.url) { this.$delete(this.fileListOther,i); this.$delete(this.uploadFileList1,i); } } }, // 取消按钮 cancel() { @@ -478,14 +514,14 @@ /** 提交按钮(数据权限) */ submitDataScope: function() { const pid = this.$route.params && this.$route.params.id; 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(",") // 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.formDat.pid = pid; this.formDat.url = ul+","+uls // this.formDat.url = ul+","+uls this.$refs["elForm"].validate(valid => { if (valid) { // alert(33) @@ -501,46 +537,88 @@ this.formDat[key] = ''; }); }, requestUpload(params) { var file = params.file; var formData1 = new FormData(); formData1.append('uploadFile', file); let _this = this // alert(123) uploadPic(formData1).then(response => { let pth = response.data.originalFilename.substr(response.data.originalFilename.length-4, response.data.originalFilename.length) if(_this.fot.includes(pth) === true) handleChange(file, fileList1) { //定义一个全局数组uploadFileList来做存储 // this.uploadFileList.push(file.raw); console.log("=========5555=========") console.log(file) // console.log(this.uploadFileList) // this.fileList = fileList //alert(file) this.uploadFileList.push(file.raw); this.fileList.push({name:file.name,url:file.url}) //alert(fileList1.length) }, handleChange1(file, fileOtherList1) { //定义一个全局数组uploadFileList来做存储 this.uploadFileList1.push(file.raw); this.fileListOther.push({name:file.name,url:file.url}) // this.uploadFileList.push(file.raw); console.log("=========5555=========") //console.log(file) // console.log(this.uploadFileList) // this.fileList = fileList }, fileUpload(){ // var file = params.file; var formData = new FormData(); // this.$refs.upload1.submit(); // formData.append('uploadFile', file); if(this.uploadFileList1.length==0){ this.$modal.msgSuccess("文档上传列表不能为空!"); return } this.uploadFileList1.forEach((elem)=>{ formData.append("files", elem) }) let _this = this this.uploading = true; uploadPic(formData).then(response => { _this.uploadFileList1 = [] _this.formDat.url = _this.formDat.url+","+response.fileNames _this.$modal.msgSuccess("文件上传成功!"); }) }, picUpload() { var formData = new FormData(); //alert(976) //this.$refs.upload.submit(); //alert(8) //alert(this.uploadFileList.length) if(this.uploadFileList.length==0){ this.$modal.msgSuccess("图片上传列表不能为空!"); return} //console.log(this.uploadFileList) this.uploadFileList.forEach((elem)=>{ formData.append("files", elem) }) //alert(90) let _this = this //alert(9) uploadPic(formData).then(response => { // alert("dds") _this.formDat.url = _this.formDat.url+","+response.fileNames _this.uploadFileList = [] _this.$modal.msgSuccess("图片上传成功"); }); }, requestUpload(params) { //alert(98) // this.uploadFileList.push(params.file); }, requestUpload1(params) { _this.fileList.push({name:response.data.fileName, "url":response.data.url}) } else{ _this.fileListOther.push({name:response.data.fileName, url:response.data.url}) } 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.formData.url = ul+","+uls console.log(_this.formData.url) // alert(87) const pid = _this.$route.params && _this.$route.params.id; _this.formData.pid = pid updatenotePet(_this.formData).then(response => { this.$modal.msgSuccess("图片上传成功"); // this.open = false; }); }) }, // this.uploadFileList1.push(params.file); }, /** 删除按钮操作 */ handleDelete(row) { const Ids = row.id || this.ids; ruoyi-ui/src/views/self/show.vue
@@ -1585,7 +1585,10 @@ }, cancelDataPer() { this.open = false this.open = false; alert(123) alert(this.open) }, /** 查询自传信息 */