From 62f9d5341d45836cf4a9605d136dcbd752993727 Mon Sep 17 00:00:00 2001
From: feige <791364011@qq.com>
Date: 星期四, 22 二月 2024 11:52:02 +0800
Subject: [PATCH] 提交新内容
---
ruoyi-ui/src/views/bignote/index.vue | 40 +++++++-----
ruoyi-ui/vue.config.js | 2
ruoyi-ui/src/views/bignote/familyeventInfo.vue | 81 ++++++++++++++++----------
3 files changed, 74 insertions(+), 49 deletions(-)
diff --git a/ruoyi-ui/src/views/bignote/familyeventInfo.vue b/ruoyi-ui/src/views/bignote/familyeventInfo.vue
index ca99b19..0c0a81a 100644
--- a/ruoyi-ui/src/views/bignote/familyeventInfo.vue
+++ b/ruoyi-ui/src/views/bignote/familyeventInfo.vue
@@ -304,26 +304,27 @@
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)})
+ _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]})
+ _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;
});
@@ -342,15 +343,10 @@
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,9 +373,12 @@
})
},
handleRemoveFile(file) {
+ //鍒よ鏄惁鏄箣鍓嶇殑鍥剧墖
+ let res = false
for(let i = 0; i < this.fileListOther.length; i++)
{
if(this.fileListOther[i].url==file.url)
+
this.$delete(this.fileListOther,i);
let ul = this.fileList.map(function (elem){
return elem.url.replace(process.env.VUE_APP_BASE_TRUE_API,"")
@@ -396,27 +395,46 @@
});
},
- handleRemove(file) {
+ 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)
+ 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;
@@ -461,9 +479,8 @@
// 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) {
@@ -480,6 +497,7 @@
var formData = new FormData();
this.$refs.upload1.submit();
+
// formData.append('uploadFile', file);
if(this.uploadFileList1.length==0){
this.$modal.msgSuccess("鏂囨。涓婁紶鍒楄〃涓嶈兘涓虹┖锛�");
@@ -507,7 +525,8 @@
{
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}
@@ -557,7 +576,7 @@
requestUpload(params)
{
// alert(124)
- this.uploadFileList.push(params.file);
+// this.uploadFileList.push(params.file);
//alert(34)
diff --git a/ruoyi-ui/src/views/bignote/index.vue b/ruoyi-ui/src/views/bignote/index.vue
index 1a8a82e..0f5bf7a 100644
--- a/ruoyi-ui/src/views/bignote/index.vue
+++ b/ruoyi-ui/src/views/bignote/index.vue
@@ -334,16 +334,10 @@
@click="handleFileCardPreview(file)"
>
<i class="el-icon-zoom-in"></i>
- </span>
+ </span>A
+
<span
-
- class="el-upload-list__item-delete"
- @click="handleDownload(file.url)"
- >
- <i class="el-icon-download"></i>
- </span>
- <span
- v-if="isShow"
+
class="el-upload-list__item-delete"
@click="handleRemoveFile(file)"
>
@@ -642,23 +636,33 @@
for(let i = 0; i < this.fileList.length; i++)
{
if(this.fileList[i].url==file.url)
+ {
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.formDat.url = ul+","+uls;
+ 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,"")
+ // }).join(",")
+ // alert(this.fileListOther.length)
+ // let uls = this.fileListOther.map(function (elem){
+ // return elem.url.replace(process.env.VUE_APP_BASE_TRUE_API,"")
+ // }).join(",")
+ // this.formDat.url = ul+","+uls;
},
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);
+
+ }
}
},
handlePictureCardPreview(file) {
@@ -714,7 +718,8 @@
},
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)
@@ -752,6 +757,7 @@
//alert(976)
//this.$refs.upload.submit();
//alert(8)
+ alert(this.uploadFileList.length)
if(this.uploadFileList.length==0){
this.$modal.msgSuccess("鍥剧墖涓婁紶鍒楄〃涓嶈兘涓虹┖锛�");
return}
diff --git a/ruoyi-ui/vue.config.js b/ruoyi-ui/vue.config.js
index 08accfb..4bb1e04 100644
--- a/ruoyi-ui/vue.config.js
+++ b/ruoyi-ui/vue.config.js
@@ -35,7 +35,7 @@
proxy: {
// detail: https://cli.vuewww.bendudu.comjs.org/config/#devserver-proxy
[process.env.VUE_APP_BASE_API]: {
- // target: `https://192.168.1.3:8080/`,
+ // target: `https://192.168.1.3:8080/`,
target: 'https://www.bendudu.com:8080/',
changeOrigin: true,
pathRewrite: {
--
Gitblit v1.9.1