From c911a53f1e5bb45e4d32ca5e912a0ad4f53c9bfa Mon Sep 17 00:00:00 2001
From: feige <791364011@qq.com>
Date: 星期六, 07 十二月 2024 14:26:32 +0800
Subject: [PATCH] 修改了bug
---
ruoyi-ui/src/views/pet/noteInfo.vue | 96 +++++++++++++++++++++++++++++++++++++----------
1 files changed, 75 insertions(+), 21 deletions(-)
diff --git a/ruoyi-ui/src/views/pet/noteInfo.vue b/ruoyi-ui/src/views/pet/noteInfo.vue
index 832b643..883fa48 100644
--- a/ruoyi-ui/src/views/pet/noteInfo.vue
+++ b/ruoyi-ui/src/views/pet/noteInfo.vue
@@ -114,7 +114,7 @@
></video>
<img v-else
class="el-upload-list__item-thumbnail"
- src="../../assets/401_images/401.gif"
+ src="../../assets/images/deviceLis.png"
alt=""
style="width: 147px; height: 147px"
fit="cover">
@@ -191,12 +191,12 @@
fileListOther:[
],
+ fileListOther1:[],
dsb:true,
btn:false,
isShow:true,
uploading: false,
formData: {
-
type: undefined,
title: undefined,
location: undefined,
@@ -272,16 +272,30 @@
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})
- }
+ // {
+ // 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})
+ // }
+ {
+ 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()
@@ -291,7 +305,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})
-
+
}
}
// _this.fileList1 = _this.fileList
@@ -303,14 +317,51 @@
},
mounted() {},
methods: {
+ getData(){
+ const id = this.$route.params && this.$route.params.id;
+ let _this = this
+ if (id) {
+ this.loading = true;
+ getPetnoteList(id).then((response) => {
+ this.formData = response.data;
+ let paths = response.data.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 {
+ // alert(paths[i])
+ // alert()
+ 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 => {
@@ -341,7 +392,7 @@
const Base64 = require('js-base64').Base64
this.desurl = process.env.VUE_APP_BASE_OTHER_API+"preview/"+'onlinePreview?url='+encodeURIComponent(Base64.encode(this.dialogFileUrl));
- let myWindow=window.open(this.desurl,'','width=1200,height=800,top=150,left=300');
+ let myWindow=window.open(this.desurl,'','width=1200,height=800,top=150,left=300');
@@ -431,6 +482,7 @@
uls = uls +","+elem.url.replace(process.env.VUE_APP_BASE_TRUE_API,"")
})
this.formData.url = ul+","+uls;
+ console.log(this.formData,'formDataformDataformDataformDataformDataformDataformData')
if(res==true){
updatenotePet(this.formData).then(response => {
this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
@@ -477,7 +529,7 @@
this.fileList.push({name:file.name,url:file.url,res:true})
},
//鑷畾涔変笂浼犳柟娉�
- handleChange1(file, fileListOther1) {
+ handleChange1(file, fileListOther12) {
//瀹氫箟涓�涓叏灞�鏁扮粍uploadFileList鏉ュ仛瀛樺偍
// this.uploadFileList.push(file.raw);
@@ -507,15 +559,17 @@
let _this = this
this.uploading = true;
- alert(234)
+ // alert(234)
uploadPic(formData).then(response => {
_this.uploadFileList1 = []
_this.formData.url = _this.formData.url+","+response.fileNames
- alert(2346)
+ // alert(2346)
updatenotePet(_this.formData).then(response => {
this.$modal.msgSuccess("鏂囨。涓婁紶鎴愬姛");
// this.open = false;
this.uploading = false;
+ this.getData()
+ this.fileListOther1=[]
});
})
--
Gitblit v1.9.1