From 4b1fbea0d8099259ea7d0ef10bd7633c3bc62f2e Mon Sep 17 00:00:00 2001
From: feige <791364011@qq.com>
Date: 星期二, 17 十二月 2024 17:43:08 +0800
Subject: [PATCH] 修改了对应的bug
---
ruoyi-ui/src/views/bignote/familyeventInfo.vue | 277 ++++++++++++++++++++++++++++++++++---------------------
1 files changed, 172 insertions(+), 105 deletions(-)
diff --git a/ruoyi-ui/src/views/bignote/familyeventInfo.vue b/ruoyi-ui/src/views/bignote/familyeventInfo.vue
index b5d3e25..6e4f83f 100644
--- a/ruoyi-ui/src/views/bignote/familyeventInfo.vue
+++ b/ruoyi-ui/src/views/bignote/familyeventInfo.vue
@@ -48,7 +48,7 @@
multiple
ref="upload"
:show-file-list="true"
- :http-request="requestUpload"
+ :http-request="requestUpload"
:file-list="fileList"
:on-change="handleChange"
:auto-upload="false"
@@ -56,7 +56,7 @@
: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}">
@@ -105,29 +105,29 @@
@click="picUpload"
>涓婁紶鍒版湇鍔″櫒</el-button>
<h4 class="form-header">鍏朵粬闄勪欢 </h4>
-
+
<!-- <el-upload
action="#"
list-type="picture-card"
multiple
ref="upload"
-
- :http-request="requestUpload"
+
+ :http-request="requestUpload"
:file-list="fileList"
:on-change="handleChange"
:auto-upload="false"
:disabled="!btn"
:class="{ hide: !btn }"
-
+
>
-->
-
+
<el-upload
action="#"
multiple
list-type="picture-card"
ref="upload1"
-
+ :on-remove="handleRemoveFile"
:http-request="requestUpload1"
:file-list="fileListOther"
:on-change="handleChange1"
@@ -136,7 +136,7 @@
: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}">
@@ -150,7 +150,7 @@
></video>
<img v-else
class="el-upload-list__item-thumbnail"
- :src="file.url"
+ src="../../assets/images/deviceLis.png"
alt=""
style="width: 100%; height: 100%"
fit="cover">
@@ -225,6 +225,7 @@
fileListOther:[
],
+ fileListOther1:[],
fot:['.bmp','.jpg','.jpeg','.png','.tif','.gif','.pcx','.tga','.exif','.fpx',
'.svg','.psd','.cdr','.pcd','.dxf','.ufo','.eps','.ai','.aw','.WMF','.webp','.apng'],
dsb:true,
@@ -238,8 +239,9 @@
people: undefined,
address: undefined,
remark: undefined,
- url: undefined,
+ url: "",
},
+ ID: undefined,
dialogImageUrl: '',
url1:undefined,
dialogVisible: false,
@@ -292,11 +294,12 @@
this.isShow=false
// alert(this.btn)
}
-
+ this.ID = id;
let _this = this
if (id) {
this.loading = true;
getFamilyeventInfo(id).then((response) => {
+ // console.log(response,'666666666')
this.formData = response.data;
let paths = this.formData.url.split(",");
for(let i = 0; i < paths.length; i++)
@@ -304,53 +307,95 @@
if(paths[i]!="") {
let pth = paths[i].substr(paths[i].length - 4, paths[i].length)
-
+ // alert(pth)
if (_this.fot.includes(pth) === true)
{
- if(paths[i][0]=="/")
- _this.fileList.push({name:paths[i],url: process.env.VUE_APP_BASE_TRUE_API+paths[i].substr(1)})
- else
- _this.fileList.push({name:paths[i],url: process.env.VUE_APP_BASE_TRUE_API+paths[i]})
+ if(paths[i].includes(process.env.VUE_APP_BASE_TRUE_API)){
+ if(paths[i][0]=="/")
+ _this.fileList.push({name:paths[i],url: paths[i].substr(1),res:false})
+ else
+ _this.fileList.push({name:paths[i],url: paths[i],res:false})
+ }else{
+ if(paths[i][0]=="/")
+ _this.fileList.push({name:paths[i],url: process.env.VUE_APP_BASE_TRUE_API+paths[i].substr(1),res:false})
+ else
+ _this.fileList.push({name:paths[i],url: process.env.VUE_APP_BASE_TRUE_API+paths[i],res:false})
+ }
+
}
else {
// alert(paths[i])
+ // alert()
let nms = paths[i].split("\/")
let nm = nms[nms.length - 1]
if(paths[i][0]=="/")
- _this.fileListOther.push({name:nm, url: process.env.VUE_APP_BASE_TRUE_API+paths[i].substr(1)})
+ _this.fileListOther.push({name:nm, url: process.env.VUE_APP_BASE_TRUE_API+paths[i].substr(1),res:false})
else
- _this.fileListOther.push({name:nm, url: process.env.VUE_APP_BASE_TRUE_API+paths[i]})
-
+ _this.fileListOther.push({name:nm, url: process.env.VUE_APP_BASE_TRUE_API+paths[i],res:false})
+
}
}
- _this.fileList1 = _this.fileList
+ // _this.fileList1 = _this.fileList
}
this.loading = false;
});
}
+ console.log(this.fileList,'fileListfilelllllllllllll')
+ console.log(this.fileListOther,'fileListOtherfileListOtherfileListOther')
},
mounted() {},
methods: {
+ getData(){
+ const id = this.$route.params && this.$route.params.id;
+ let _this = this
+ if (id) {
+ this.loading = true;
+ getFamilyeventInfo(id).then((response) => {
+ // console.log(response,'666666666')
+ this.formData = response.data;
+ let paths = this.formData.url.split(",");
+ for(let i = 0; i < paths.length; i++)
+ {
+ if(paths[i]!="") {
+
+ let pth = paths[i].substr(paths[i].length - 4, paths[i].length)
+ // alert(pth)
+ if (_this.fot.includes(pth) === true)
+ {
+ console.log()
+ }
+ else {
+ let nms = paths[i].split("\/")
+ let nm = nms[nms.length - 1]
+ if(paths[i][0]=="/")
+ _this.fileListOther1.push({name:nm, url: process.env.VUE_APP_BASE_TRUE_API+paths[i].substr(1),res:false})
+ else
+ _this.fileListOther1.push({name:nm, url: process.env.VUE_APP_BASE_TRUE_API+paths[i],res:false})
+
+ }
+ }
+
+ }
+ _this.fileListOther = _this.fileListOther1
+ this.loading = false;
+ });
+ }
+ },
submitForm() {
- 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
+ // 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
this.$refs['elForm'].validate(valid => {
-
- console.log(this.formData)
if (valid) {
if (this.formData.id != undefined) {
- // alert(234)
updateFamilyevent(this.formData).then(response => {
this.$modal.msgSuccess("淇敼鎴愬姛");
- // this.open = false;
- // alert(98)
this.btn=false
});
} else {
@@ -377,46 +422,83 @@
})
},
handleRemoveFile(file) {
+ //鍒よ鏄惁鏄箣鍓嶇殑鍥剧墖
+ 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){
- 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;
-
+
+ }
}
- updateFamilyevent(this.formData).then(response => {
- this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
- // this.open = false;
-
- });
+
+ 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){
+ updateFamilyevent(this.formData).then(response => {
+ this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
+ // this.open = false;
+
+ });
+ }
},
handleRemove(file) {
+ //鍒ゆ柇鏄惁鏄箣鍓嶇殑鍥剧墖
+ let res = false
+ // alert(this.fileList.length)
for(let i = 0; i < this.fileList.length; i++)
{
if(this.fileList[i].url==file.url)
+ {
+ //鍘熸潵鍥惧儚鏍囪涓篺alse
+ //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){
- 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;
- //alert(this.formData.url)
-
+
}
- updateFamilyevent(this.formData).then(response => {
- this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
- // this.open = false;
-
- });
-
+ }
+ 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;
+ if(res==true){
+ updateFamilyevent(this.formData).then(response => {
+ this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
+ });
+ }
+
},
handleFileCardPreview(file){
this.dialogFileUrl = file.url;
@@ -425,7 +507,7 @@
// this.dialogFileUrl = 'https://47.93.189.255:8080/profile/upload/2023/03/19/test7_20230319222030A007.jpg'
if(this.dialogFileUrl.includes("47.93.189.255")==true)
this.dialogFileUrl = this.dialogFileUrl.replace("47.93.189.255","www.bendudu.com")
- //alert(this.dialogFileUrl)
+ // alert(this.dialogFileUrl)
const Base64 = require('js-base64').Base64
this.desurl = process.env.VUE_APP_BASE_OTHER_API+"preview/"+'onlinePreview?url='+encodeURIComponent(Base64.encode(this.dialogFileUrl));
@@ -437,7 +519,7 @@
},
handleDownload(url) {
var formData = {'path':"/"+url.replace(process.env.VUE_APP_BASE_TRUE_API,"")};
-
+ alert(formData['path'])
let lens = formData.path.split(".")
let suffix = lens[lens.length-1]
download(formData).then(async (response) => {
@@ -461,15 +543,16 @@
// this.uploadFileList.push(file.raw);
console.log("=========5555=========")
- //console.log(file)
- // console.log(this.uploadFileList)
- // this.fileList = fileList
+ this.uploadFileList.push(file.raw);
+ this.fileList.push({name:file.name,url:file.url,res:true})
},
//鑷畾涔変笂浼犳柟娉�
- handleChange1(file, fileListOther) {
+ handleChange1(file, fileListOther12) {
//瀹氫箟涓�涓叏灞�鏁扮粍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)
@@ -477,44 +560,31 @@
},
fileUpload(){
// var file = params.file;
+
var formData = new FormData();
- this.$refs.upload1.submit();
+ //this.$refs.upload1.submit();
+ // alert(this.uploadFileList1.length)
// formData.append('uploadFile', file);
- // if(this.uploadFileList1.length==0)
-
+ 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 => {
- // let pth = response.data.originalFilename.substr(response.data.originalFilename.length-4, response.data.originalFilename.length)
- // _this.uploading = false;
- // // this.$modal.msgSuccess("涓婁紶鎴愬姛");
- // if(_this.fot.includes(pth) === true)
- // {
- // _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)
+ _this.uploadFileList1 = []
_this.formData.url = _this.formData.url+","+response.fileNames
updateFamilyevent(_this.formData).then(response => {
this.$modal.msgSuccess("鏂囨。涓婁紶鎴愬姛");
// this.open = false;
-
+ this.getData()
+ this.fileListOther1=[]
});
})
@@ -522,16 +592,15 @@
picUpload()
{
var formData = new FormData();
- this.$refs.upload.submit();
-
-
+ //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)
@@ -553,33 +622,31 @@
//console.log(_this.fileList)
// alert(response.fileNames)
_this.formData.url = _this.formData.url+","+response.fileNames
-
+ _this.uploadFileList = []
// alert(87)
updateFamilyevent(_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);
+// this.uploadFileList.push(params.file);
//alert(34)
-
-
+
+
},
requestUpload1(params)
{
// alert(123)
- this.uploadFileList1.push(params.file);
+ // this.uploadFileList1.push(params.file);
// console.log("-----------")
//console.log(this.uploadFileList1)
},
--
Gitblit v1.9.1