From ef05f1416c204098f003c3f4c3861354d18cd503 Mon Sep 17 00:00:00 2001
From: 张钢 <floatgang@163.com>
Date: 星期六, 24 八月 2024 13:48:35 +0800
Subject: [PATCH] Merge branch 'master' of http://47.93.189.255:8099/r/zhangshi_app_web
---
ruoyi-ui/src/views/pet/noteInfo.vue | 401 ++++++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 323 insertions(+), 78 deletions(-)
diff --git a/ruoyi-ui/src/views/pet/noteInfo.vue b/ruoyi-ui/src/views/pet/noteInfo.vue
index 9d53ee6..883fa48 100644
--- a/ruoyi-ui/src/views/pet/noteInfo.vue
+++ b/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鍏冪礌鐢ㄤ簬鏄剧ず瑙嗛 -->
@@ -102,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">
@@ -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>
@@ -163,18 +182,21 @@
// 鏁版嵁鑼冨洿閫夐」
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:[],
fileListOther:[
],
+ fileListOther1:[],
dsb:true,
btn:false,
isShow:true,
uploading: false,
formData: {
-
type: undefined,
title: undefined,
location: undefined,
@@ -231,11 +253,11 @@
this.btn= jd
this.dsb = !jd
this.isShow=true
- document.title = "淇敼榄呭疇澶囧繕褰曡缁嗕俊鎭�";
+ // document.title = "淇敼榄呭疇澶囧繕褰曡缁嗕俊鎭�";
this.$route.meta.title = "淇敼榄呭疇澶囧繕褰曡缁嗕俊鎭�";//鍒楄〃鐨勫悕绉�
}
else{
- document.title = "榄呭疇澶囧繕褰曡缁嗕俊鎭�";
+ //document.title = "榄呭疇澶囧繕褰曡缁嗕俊鎭�";
this.$route.meta.title = "榄呭疇澶囧繕褰曡缁嗕俊鎭�";//鍒楄〃鐨勫悕绉�
this.isShow=false
this.btn = false;
@@ -248,21 +270,46 @@
this.formData = response.data;
let paths = response.data.url.split(",");
for(let i = 0; i < paths.length; i++)
- {
- if(paths[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]})
- }
- }
+ 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].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),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;
});
@@ -270,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 => {
@@ -300,10 +384,18 @@
this.$refs['elForm'].resetFields()
},
handleFileCardPreview(file){
- this.dialogFileUrl = file.url;
- const Base64 = require('js-base64').Base64
- this.desurl = process.env.VUE_APP_BASE_OTHER_API+'onlinePreview?url='+encodeURIComponent(Base64.encode(this.dialogFileUrl));
- myWindow=window.open(this.desurl,'','width=1200,height=800,top=150,left=300');
+
+ this.dialogFileUrl = file.url;
+ if(this.dialogFileUrl.includes("47.93.189.255")==true)
+ this.dialogFileUrl = this.dialogFileUrl.replace("47.93.189.255","www.bendudu.com")
+ //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));
+ let myWindow=window.open(this.desurl,'','width=1200,height=800,top=150,left=300');
+
+
+
},
handlePreview(file)
{
@@ -319,18 +411,83 @@
})
},
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)
+ {
+ //鍘熸潵鍥惧儚鏍囪涓篺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){
+ 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;
+ console.log(this.formData,'formDataformDataformDataformDataformDataformDataformData')
+ if(res==true){
+ updatenotePet(this.formData).then(response => {
+ this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
+ });
+ }
},
handlePictureCardPreview(file) {
this.dialogImageUrl = file.url;
@@ -362,41 +519,129 @@
// 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, 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)
+ // 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;
+ // alert(234)
+ uploadPic(formData).then(response => {
+ _this.uploadFileList1 = []
+ _this.formData.url = _this.formData.url+","+response.fileNames
+ // alert(2346)
+ updatenotePet(_this.formData).then(response => {
+ this.$modal.msgSuccess("鏂囨。涓婁紶鎴愬姛");
+ // this.open = false;
+ this.uploading = false;
+ this.getData()
+ this.fileListOther1=[]
+ });
+ })
+
+ },
+ 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)
+ },
}
}
--
Gitblit v1.9.1