From c0702fb50443fb03a4f5a7beb127294a17fc1dcd Mon Sep 17 00:00:00 2001
From: yz3456 <2753272399@qq.com>
Date: 星期六, 30 三月 2024 23:58:01 +0800
Subject: [PATCH] 修改了3月30这周的所有bug
---
ruoyi-ui/src/views/self/show.vue | 30 +-
ruoyi-ui/src/views/selfeconomy/selfeconomyInfo.vue | 54 +++---
ruoyi-ui/src/views/self/memoInfo.vue | 282 +++++++++++++++++++++---------
ruoyi-ui/src/views/bignote/index.vue | 4
ruoyi-ui/src/views/bignote/familyeventInfo.vue | 50 ----
ruoyi-ui/src/api/memo/index.js | 2
ruoyi-ui/src/views/clean/cleanInfo.vue | 74 ++++----
ruoyi-ui/src/views/pet/index.vue | 21 +
8 files changed, 299 insertions(+), 218 deletions(-)
diff --git a/ruoyi-ui/src/api/memo/index.js b/ruoyi-ui/src/api/memo/index.js
index 17bdbd8..b71ec0e 100644
--- a/ruoyi-ui/src/api/memo/index.js
+++ b/ruoyi-ui/src/api/memo/index.js
@@ -47,7 +47,7 @@
//涓婁紶鏂囦欢
export function uploadPic(data) {
return request({
- url: '/common/upload',
+ url: '/common/uploads',
method: 'post',
data: data
})
diff --git a/ruoyi-ui/src/views/bignote/familyeventInfo.vue b/ruoyi-ui/src/views/bignote/familyeventInfo.vue
index e2252e4..9263d10 100644
--- a/ruoyi-ui/src/views/bignote/familyeventInfo.vue
+++ b/ruoyi-ui/src/views/bignote/familyeventInfo.vue
@@ -336,13 +336,13 @@
methods: {
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 => {
if (valid) {
@@ -583,43 +583,7 @@
// alert(87)
updateFamilyevent(_this.formData).then(response => {
_this.$modal.msgSuccess("鍥剧墖涓婁紶鎴愬姛");
- let id = _this.ID
- if (id) {
- _this.loading = true;
- getFamilyeventInfo(id).then((response) => {
- _this.formData = response.data;
- alert(123)
- 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)
- {
- 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),res:false})
- else
- _this.fileListOther.push({name:nm, url: process.env.VUE_APP_BASE_TRUE_API+paths[i],res:false})
-
- }
- }
- // _this.fileList1 = _this.fileList
- }
- _this.loading = false;
- });
- }
// this.open = false;
});
diff --git a/ruoyi-ui/src/views/bignote/index.vue b/ruoyi-ui/src/views/bignote/index.vue
index 26eb5eb..70835d5 100644
--- a/ruoyi-ui/src/views/bignote/index.vue
+++ b/ruoyi-ui/src/views/bignote/index.vue
@@ -660,6 +660,7 @@
}
}
},
+
handlePictureCardPreview(file) {
this.dialogImageUrl = file.url;
this.dialogVisible = true;
@@ -761,12 +762,13 @@
formData.append("files", elem)
})
+ // console.log(formData,'465456456')
//alert(90)
let _this = this
//alert(9)
uploadPic(formData).then(response => {
// alert("dds")
- // console.log(response)
+ // console.log(response,'123123123')
// console.log(_this.formDat.url,'666')
_this.formDat.url = _this.formDat.url+","+response.fileNames
// alert(_this.formDat.url)
diff --git a/ruoyi-ui/src/views/clean/cleanInfo.vue b/ruoyi-ui/src/views/clean/cleanInfo.vue
index 967a0ac..92647bc 100644
--- a/ruoyi-ui/src/views/clean/cleanInfo.vue
+++ b/ruoyi-ui/src/views/clean/cleanInfo.vue
@@ -57,7 +57,7 @@
action="#"
list-type="picture-card"
multiple
-
+
:http-request="requestUpload"
:file-list="fileList"
:on-change="handleChange"
@@ -213,11 +213,11 @@
// 鏁版嵁鑼冨洿閫夐」
fot:['.bmp','.jpg','.jpeg','.png','.tif','.gif','.pcx','.tga','.exif','.fpx',
'.svg','.psd','.cdr','.pcd','.dxf','.ufo','.eps','.ai','.aw','.WMF','.webp','.apng'],
-
+
fileList:[
],
-
-
+
+
fileList1:[],
uploadFileList:[],
uploadFileList1:[],
@@ -319,7 +319,7 @@
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)
@@ -338,7 +338,7 @@
_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],res:false})
-
+
}
}
}
@@ -386,13 +386,13 @@
},
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 => {
@@ -461,10 +461,10 @@
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)
@@ -481,12 +481,12 @@
updateClean(this.formData).then(response => {
this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
// this.open = false;
-
+
});
}
-
-
+
+
},
handleRemove(file) {
//鍒ゆ柇鏄惁鏄箣鍓嶇殑鍥剧墖
@@ -508,7 +508,7 @@
// alert(this.uploadFileList.length)
}
this.$delete(this.fileList,i);
-
+
}
}
let ul = ""
@@ -527,7 +527,7 @@
this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
});
}
-
+
},
handleDownload(url) {
var formData = {'path':"/"+url.replace(process.env.VUE_APP_BASE_TRUE_API,"")};
@@ -544,7 +544,7 @@
},
handleChange(file, fileList1) {
//瀹氫箟涓�涓叏灞�鏁扮粍uploadFileList鏉ュ仛瀛樺偍
-
+
// this.uploadFileList.push(file.raw);
console.log("=========5555=========")
this.uploadFileList.push(file.raw);
@@ -553,7 +553,7 @@
//鑷畾涔変笂浼犳柟娉�
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})
@@ -564,7 +564,7 @@
},
fileUpload(){
// var file = params.file;
-
+
var formData = new FormData();
//this.$refs.upload1.submit();
// alert(this.uploadFileList1.length)
@@ -572,14 +572,14 @@
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 = []
@@ -589,25 +589,25 @@
// 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)
@@ -634,16 +634,16 @@
updateClean(_this.formData).then(response => {
_this.$modal.msgSuccess("鍥剧墖涓婁紶鎴愬姛");
// this.open = false;
-
+
});
// }
// else{
// _this.fileListOther.push({name:response.data.fileName, url:response.data.url})
-
+
// }
});
},
-
+
handleEdit()
{
this.dsb = false
@@ -651,12 +651,12 @@
},
requestUpload(params)
{
-
+
},
requestUpload1(params)
{
-
+
},
diff --git a/ruoyi-ui/src/views/pet/index.vue b/ruoyi-ui/src/views/pet/index.vue
index 3b4ff76..4ec2eb4 100644
--- a/ruoyi-ui/src/views/pet/index.vue
+++ b/ruoyi-ui/src/views/pet/index.vue
@@ -380,6 +380,7 @@
fileList1:[ ],
fileList2:[ ],
fileListOther:[ ],
+ uploadFileList1: [],
dsb:true,
btn:false,
formDat: {
@@ -614,11 +615,19 @@
}
},
handleRemoveFile(file) {
+ // for(let i = 0; i < this.fileList2.length; i++)
+ // {
+ // if(this.fileList2[i].url==file.url)
+ // this.$delete(this.fileList2,i);
+ // }
for(let i = 0; i < this.fileList2.length; i++)
+ {
+ if(this.fileList2[i].url==file.url)
{
- if(this.fileList2[i].url==file.url)
- this.$delete(this.fileList2,i);
- }
+ this.$delete(this.fileList2,i);
+ this.$delete(this.uploadFileList1,i);
+ }
+ }
},
// 鍙栨秷鎸夐挳
cancel() {
@@ -730,11 +739,9 @@
{
this.handleRemove(this.fileList1[0]);
}
- for(let i = 0; i < this.fileListOther.length; i++){
- this.handleRemoveFile(this.fileListOther[0]);
+ for(let i = 0; i < this.fileList2.length; i++){
+ this.handleRemoveFile(this.fileList2[0]);
}
- // this.handleRemove(this.fileList[0]);
- // this.handleRemoveFile(this.fileListOther[0]);
this.getList();
});
}
diff --git a/ruoyi-ui/src/views/self/memoInfo.vue b/ruoyi-ui/src/views/self/memoInfo.vue
index 17ee705..dcb20c7 100644
--- a/ruoyi-ui/src/views/self/memoInfo.vue
+++ b/ruoyi-ui/src/views/self/memoInfo.vue
@@ -58,7 +58,6 @@
<h4 class="form-header">鐩稿叧鍥剧墖 </h4>
<el-upload
action="#"
- accept="image/jpeg, image/png,image/jpg, image/WMF,image/gif"
list-type="picture-card"
multiple
:http-request="requestUpload"
@@ -69,7 +68,6 @@
:show-file-list="true"
:on-change="handleChange"
:auto-upload="false"
-
>
<div v-if="uploading" class="upload-status">姝ｅ湪涓婁紶...</div>
<i v-if="!uploading" slot="default" class="el-icon-plus"></i>
@@ -109,6 +107,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
@@ -204,6 +209,8 @@
fileList:[],
fileList1:[],
fileListOther:[],
+ uploadFileList:[],
+ uploadFileList1:[],
dsb:true,
btn:false,
isShow:true,
@@ -219,7 +226,7 @@
address:undefined,
title:undefined,
remark:undefined,
- url: undefined,
+ url: '',
},
desurl:'',
dialogImageUrl: '',
@@ -281,25 +288,9 @@
if (id) {
this.loading = true;
getNote({id}).then((response) => {
-console.log(response , '666')
+console.log(response.data , '6666666666')
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)
-
- // if (_this.fot.includes(pth) === true)
- // _this.fileList.push({name:paths[i],url: process.env.VUE_APP_BASE_TRUE_API+paths[i]})
- // else {
- // // alert(paths[i])
- // let nms = paths[i].split("\/")
- // let nm = nms[nms.length - 1]
- // _this.fileListOther.push({name:nm, url: process.env.VUE_APP_BASE_TRUE_API+paths[i]})
- // }
- // }
- // }
for(let i = 0; i < paths.length; i++)
{
if(paths[i]!="") {
@@ -329,20 +320,20 @@
}
this.loading = false;
});
- this.getCateInfor()
+ // this.getCateInfor()
}
},
mounted() {},
methods: {
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 => {
@@ -378,43 +369,158 @@
saveAs(blob, filename)
})
},
- handleRemoveFile(file,) {
+ 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,"")
+ // }).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;
+ // updateNote(this.formData).then(response => {
+ // this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
+ // // this.open = false;
+ // // this.btn=false
+ // });
+
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,"")
- }).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;
- updateNote(this.formData).then(response => {
- this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
- // this.open = false;
- // this.btn=false
- });
+ {
+ 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){
+ updateNote(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 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;
+ // updateNote(this.formData).then(response => {
+ // this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
+ // // this.open = false;
+ // // this.btn=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 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 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
+ {
+
+ this.$delete(this.uploadFileList, Math.abs(i - this.uploadFileList.length-1))
+
+ }
+ 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)
+ uls = uls +","+elem.url.replace(process.env.VUE_APP_BASE_TRUE_API,"")
+ })
this.formData.url = ul+","+uls;
- updateNote(this.formData).then(response => {
- this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
- // this.open = false;
- // this.btn=false
- });
- }
+ if(res==true){
+ updateNote(this.formData).then(response => {
+ this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
+ });
+ }
+ },
+ //鑷畾涔変笂浼犳柟娉�
+ 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
+ },
+ picUpload(){
+ var formData = new FormData();
+ 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)
+ _this.formData.url = _this.formData.url+","+response.fileNames
+ _this.uploadFileList = []
+ // alert(87)
+ updateNote(_this.formData).then(response => {
+ _this.$modal.msgSuccess("鍥剧墖涓婁紶鎴愬姛");
+ });
+ });
+ this.uploading = false;
},
handleFileCardPreview(file){
this.dialogFileUrl = file.url;
@@ -490,38 +596,38 @@
},
requestUpload1(params)
{
- var file = params.file;
- var formData = new FormData();
- formData.append('uploadFile', file);
- let _this = this
- this.uploading1 = true;
- uploadPic(formData).then(response => {
- let pth = response.data.originalFilename.substr(response.data.originalFilename.length-4, response.data.originalFilename.length)
- this.uploading1 = false;
- // this.$modal.msgSuccess("涓婁紶鎴愬姛");
- if(_this.fot.includes(pth) === true)
- {
- _this.fileList.push({name:response.data.fileName, "url":response.data.url})
+ // var file = params.file;
+ // var formData = new FormData();
+ // formData.append('uploadFile', file);
+ // let _this = this
+ // this.uploading1 = true;
+ // uploadPic(formData).then(response => {
+ // let pth = response.data.originalFilename.substr(response.data.originalFilename.length-4, response.data.originalFilename.length)
+ // this.uploading1 = 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)
- updateNote(this.formData).then(response => {
- this.$modal.msgSuccess("鏂囨。涓婁紶鎴愬姛");
- // this.open = false;
- // this.btn=false
- });
- }
- })
+ // 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)
+ // updateNote(this.formData).then(response => {
+ // this.$modal.msgSuccess("鏂囨。涓婁紶鎴愬姛");
+ // // this.open = false;
+ // // this.btn=false
+ // });
+ // }
+ // })
},
}
diff --git a/ruoyi-ui/src/views/self/show.vue b/ruoyi-ui/src/views/self/show.vue
index 72919db..2ae5ebb 100644
--- a/ruoyi-ui/src/views/self/show.vue
+++ b/ruoyi-ui/src/views/self/show.vue
@@ -1206,16 +1206,17 @@
//console.log(this.uploadFileList)
// alert(this.uploadFileList)
this.uploadFileList.forEach((elem)=>{
- formData.append("uploadFile", elem)
+ formData.append("files", elem)
})
//alert(90)
let _this = this
//alert(9)
uploadPic(formData).then(response => {
- // console.log(response)
+ // console.log(response,'123123123')
// console.log(_this.formDat.url,'666')
- _this.formDat.url = _this.formDat.url+","+response.data.fileName
+ _this.formDat.url = _this.formDat.url+","+response.fileNames
+
// alert(_this.formDat.url)
_this.uploadFileList = []
_this.$modal.msgSuccess("鍥剧墖涓婁紶鎴愬姛");
@@ -1524,7 +1525,7 @@
{
var file = params.file;
var formData = new FormData();
- formData.append('uploadFile', file);
+ formData.append('files', file);
let _this = this
this.uploading = true;
uploadPic(formData).then(response => {
@@ -1533,7 +1534,7 @@
this.$modal.msgSuccess("涓婁紶鎴愬姛");
if(_this.fot.includes(pth) === true)
{
- _this.fileList.push({name:response.data.fileName, "url":response.data.url})
+ _this.fileList.push({name:response.fileNames, "url":response.data.url})
}
})
},
@@ -1541,7 +1542,7 @@
{
var file = params.file;
var formData = new FormData();
- formData.append('uploadFile', file);
+ formData.append('files', file);
let _this = this
this.uploading1 = true;
uploadPic(formData).then(response => {
@@ -1550,7 +1551,7 @@
this.$modal.msgSuccess("涓婁紶鎴愬姛");
if(_this.fot.includes(pth) !== true)
{
- _this.fileListOther.push({name:response.data.fileName, url:response.data.url})
+ _this.fileListOther.push({name:response.fileNames, url:response.data.url})
}
})
},
@@ -1593,17 +1594,18 @@
/** 鎻愪氦鎸夐挳锛堟暟鎹潈闄愶級 */
submitDataScopem: function() {
- 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
+ // 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.$refs["elForm"].validate(valid => {
if (valid) {
addNote(this.formDat).then(response => {
+ console.log(this.formDat)
this.$modal.msgSuccess("鏂板鎴愬姛");
this.getList();
this.open = false;
diff --git a/ruoyi-ui/src/views/selfeconomy/selfeconomyInfo.vue b/ruoyi-ui/src/views/selfeconomy/selfeconomyInfo.vue
index e5315f9..887e067 100644
--- a/ruoyi-ui/src/views/selfeconomy/selfeconomyInfo.vue
+++ b/ruoyi-ui/src/views/selfeconomy/selfeconomyInfo.vue
@@ -93,8 +93,6 @@
action="#"
list-type="picture-card"
multiple
-
-
ref="upload"
:show-file-list="true"
:http-request="requestUpload"
@@ -258,9 +256,7 @@
fileList1:[],
uploadFileList:[],
uploadFileList1:[],
- fileListOther:[
-
- ],
+ fileListOther:[],
dsb:true,
btn:false,
isShow:true,
@@ -338,11 +334,11 @@
}],
},
typeOptions: [{
- value: '1',
+ value: '鏄�',
label: '鏄�',
},
{
- value: '0',
+ value: '鍚�',
label: '鍚�',
}],
typeOptions1: [{
@@ -390,7 +386,7 @@
if(paths[i]!="") {
let pth = paths[i].substr(paths[i].length - 4, paths[i].length)
- // alert(pth)
+ // alert(pth)
if (_this.fot.includes(pth) === true)
{
if(paths[i][0]=="/")
@@ -416,6 +412,8 @@
// this.getCateInfor()
}
+ console.log(_this.fileList,'666')
+ console.log(_this.fileListOther,'888')
},
mounted() {},
methods: {
@@ -431,19 +429,19 @@
// })
// },
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 => {
- // if(this.formData.status=="鏄�")
- // this.formData.status = 1
- // else
- // this.formData.status = 0
+ if(this.formData.status=='鏄�')
+ this.formData.status = 1
+ else
+ this.formData.status = 0
/// alert(this.formData.status)
if (valid) {
@@ -459,11 +457,12 @@
});
} else {
this.$modal.msgSuccess("淇敼澶辫触");
- if(this.formData.status=='鏄�')
- this.formData.status = 1
- else
- this.formData.status = 0
+ if(this.formData.status==1)
+ this.formData.status = '鏄�'
+ else
+ this.formData.status = '鍚�'
}
+
}
})
},
@@ -661,10 +660,10 @@
updateSelfEconomy(_this.formData).then(response => {
this.$modal.msgSuccess("鏂囨。涓婁紶鎴愬姛");
// this.open = false;
- if(this.formData.status=='鏄�')
- this.formData.status = 1
+ if(this.formData.status== 1)
+ this.formData.status = '鏄�'
else
- this.formData.status = 0
+ this.formData.status = '鍚�'
});
})
@@ -684,6 +683,7 @@
formData.append("files", elem)
})
+
let _this = this
if(this.formData.status=='鏄�')
@@ -709,7 +709,7 @@
// return elem.url.replace(process.env.VUE_APP_BASE_TRUE_API,"")
// }).join(",")
//console.log(_this.fileList)
- // alert(response.fileNames)
+ // alert(response.fileNames)
_this.formData.url = _this.formData.url+","+response.fileNames
_this.uploadFileList = []
// alert(87)
--
Gitblit v1.9.1