From 90b6b8c9e342d07e8a7121d732900287d997a8b6 Mon Sep 17 00:00:00 2001
From: feige <791364011@qq.com>
Date: 星期一, 03 三月 2025 22:57:35 +0800
Subject: [PATCH] Merge branch 'master' of http://47.93.189.255:8099/r/zhangshi_app_web
---
ruoyi-ui/src/views/pet/petnote.vue | 183 +++++++++++++++++++++++++++++++++++++--------
1 files changed, 149 insertions(+), 34 deletions(-)
diff --git a/ruoyi-ui/src/views/pet/petnote.vue b/ruoyi-ui/src/views/pet/petnote.vue
index f2c326b..2cc88d3 100644
--- a/ruoyi-ui/src/views/pet/petnote.vue
+++ b/ruoyi-ui/src/views/pet/petnote.vue
@@ -60,7 +60,7 @@
</el-upload>
</el-col>
</el-row>
- <el-table v-loading="loading" :data="PetNoteList" @selection-change="handleSelectionChange" :row-class-name="tableRowClassName" style="background: #FFEFF2; border-radius: 14px 14px 14px 14px;width: 100%;">
+ <el-table v-loading="loading" border :data="PetNoteList" @selection-change="handleSelectionChange" :row-class-name="tableRowClassName" style="background: #FFEFF2; border-radius: 14px 14px 14px 14px;width: 100%;">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="搴忓彿" sortable type="index" :index="(queryParams.pageNum-1)*queryParams.pageSize+1" width="80px"/>
<el-table-column label="鏃ユ湡" prop="happenTime" sortable width="200px" align="center">
@@ -181,12 +181,12 @@
:preview-src-list="[file.url]"
>
<span class="el-upload-list__item-actions">
- <span
+<!-- <span
class="el-upload-list__item-preview"
@click="handlePictureCardPreview(file)"
>
<i class="el-icon-zoom-in"></i>
- </span>
+ </span> -->
<span
v-if="!disabled"
@@ -202,7 +202,7 @@
style="margin-left: 10px"
size="small"
type="success"
-
+
@click="picUpload"
>涓婁紶鍒版湇鍔″櫒</el-button>
<h4 class="form-header">鍏朵粬闄勪欢 </h4>
@@ -220,11 +220,54 @@
list-type="picture-card"
:http-request="requestUpload1"
>
- <el-button type="primary">鐐瑰嚮涓婁紶</el-button>
+ <!-- <el-button type="primary">鐐瑰嚮涓婁紶</el-button> -->
<template #tip>
<div class="el-upload__tip">
</div>
</template>
+
+ <i v-if="true" slot="default" class="el-icon-plus"></i>
+ <div slot="file" slot-scope="{file}">
+ <!-- 娣诲姞video鍏冪礌鐢ㄤ簬鏄剧ず瑙嗛 -->
+ <video
+ v-if="file.url.includes('.mp4')"
+ class="el-upload-list__item-thumbnail"
+ :src="file.url"
+ style="width: 147px; height: 147px"
+ fit="cover"
+ ></video>
+ <img v-else
+ class="el-upload-list__item-thumbnail"
+ src="../../assets/images/deviceLis.png"
+ alt=""
+ style="width: 100%; height: 100%"
+ fit="cover">
+
+ <span class="el-upload-list__item-actions">
+ <span class="el-upload-list__item-name">{{ file.name }}</span>
+ <!-- <span
+ class="el-upload-list__item-preview"
+ @click="handleFileCardPreview(file)"
+ >
+ <i class="el-icon-zoom-in"></i>
+ </span>
+ <span
+
+ class="el-upload-list__item-delete"
+ @click="handleDownload(file.url)"
+ >
+ <i class="el-icon-download"></i>
+ </span> -->
+ <span
+ class="el-upload-list__item-delete"
+ @click="handleRemoveFile2(file)"
+ >
+ <i class="el-icon-delete"></i>
+ </span>
+ </span>
+
+ </div>
+
</el-upload>
<el-button
@@ -298,8 +341,8 @@
// 鏁版嵁鑼冨洿閫夐」
// 鏁版嵁鑼冨洿閫夐」
fot:['.bmp','.jpg','.jpeg','.png','.tif','.gif','.pcx','.tga','.exif','.fpx',
- '.svg','.psd','.cdr','.pcd','.dxf','.ufo','.eps','.ai','.aw','.WMF','.webp','.apng'],
-
+ '.svg','.psd','.cdr','.pcd','.dxf','.ufo','.eps','.ai','.aw','.WMF','.webp','.apng','.M4A'],
+
fileList:[
],
fileList1:[],
@@ -389,7 +432,59 @@
return "statistics-warning-row";
}
},
+ handleRemoveFile2(file) {
+ this.formData=this.formDat
+ //鍒よ鏄惁鏄箣鍓嶇殑鍥剧墖
+ 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){
+ updateNote(this.formData).then(response => {
+ this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
+ // this.open = false;
+
+ });
+ }
+ },
+ // 涓嬭浇鎸夐挳
+ handleDownload(url) {
+ var formData = {'path':"/"+url.replace(process.env.VUE_APP_BASE_TRUE_API,"")};
+
+ let lens = formData.path.split(".")
+ let suffix = lens[lens.length-1]
+ download(formData).then(async (response) => {
+ const isLogin = await blobValidate(response);
+ let nt = new Date().getTime()
+ let filename = 'familyevent_'+nt+'.'+suffix
+ const blob = new Blob([response])
+ saveAs(blob, filename)
+ })
+ },
/** 鏌ヨ瑙掕壊鍒楄〃 */
getList() {
@@ -418,9 +513,9 @@
this.$delete(this.fileList,i);
this.$delete(this.uploadFileList,i);
}
-
+
//alert(this.formData.url)
-
+
}
},
handleRemoveFile(file) {
@@ -428,10 +523,10 @@
{
if(this.fileListOther[i].url==file.url)
{
-
+
this.$delete(this.fileListOther,i);
this.$delete(this.uploadFileList1,i);
-
+
}
}
},
@@ -471,7 +566,7 @@
deptCheckStrictly: true,
remark: undefined
};
- this.resetForm("form");
+ this.resetForm("elForm");
},
// 澶氶�夋閫変腑鏁版嵁
@@ -500,6 +595,17 @@
}
});
},
+ // 鏌ョ湅鏂囦欢
+ handleFileCardPreview(file){
+ 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');
+ },
/** 鏌ョ湅璇︾粏淇℃伅 */
handleCheck(row){
const id = row.id;
@@ -514,13 +620,9 @@
/** 鎻愪氦鎸夐挳锛堟暟鎹潈闄愶級 */
submitDataScope: function() {
const pid = this.$route.params && this.$route.params.id;
- // 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.pid = pid;
+ // console.log(this.formDat,'formDatformDatformDatformDat')
// this.formDat.url = ul+","+uls
this.$refs["elForm"].validate(valid => {
if (valid) {
@@ -536,10 +638,17 @@
Object.keys(this.formDat).forEach(key => {
this.formDat[key] = '';
});
+ for(let i = 0; i <= this.fileList.length; i++)
+ {
+ this.handleRemove(this.fileList[0]);
+ }
+ for(let i = 0; i < this.fileListOther.length; i++){
+ this.handleRemoveFile(this.fileListOther[0]);
+ }
},
handleChange(file, fileList1) {
//瀹氫箟涓�涓叏灞�鏁扮粍uploadFileList鏉ュ仛瀛樺偍
-
+
// this.uploadFileList.push(file.raw);
console.log("=========5555=========")
console.log(file)
@@ -562,7 +671,7 @@
},
fileUpload(){
// var file = params.file;
-
+
var formData = new FormData();
// this.$refs.upload1.submit();
// formData.append('uploadFile', file);
@@ -572,18 +681,18 @@
}
this.uploadFileList1.forEach((elem)=>{
formData.append("files", elem)
-
+
})
-
+
let _this = this
-
+
this.uploading = true;
uploadPic(formData).then(response => {
_this.uploadFileList1 = []
_this.formDat.url = _this.formDat.url+","+response.fileNames
_this.$modal.msgSuccess("鏂囦欢涓婁紶鎴愬姛!");
})
-
+
},
picUpload()
{
@@ -598,7 +707,7 @@
//console.log(this.uploadFileList)
this.uploadFileList.forEach((elem)=>{
formData.append("files", elem)
-
+
})
//alert(90)
let _this = this
@@ -606,10 +715,12 @@
uploadPic(formData).then(response => {
// alert("dds")
_this.formDat.url = _this.formDat.url+","+response.fileNames
+ // alert(_this.formDat.url)
_this.uploadFileList = []
_this.$modal.msgSuccess("鍥剧墖涓婁紶鎴愬姛");
-
+
});
+ // console.log(this.formDat,'formDatformDatformDatformDat')
},
requestUpload(params) {
//alert(98)
@@ -638,6 +749,7 @@
...this.queryParams
};
+
if (Object.keys(queryParams).length === 1 && 'pid' in queryParams) {
this.download('/family/zfPetNote/export', queryParams, `zfPetNote_${new Date().getTime()}.xlsx`);
} else {
@@ -662,10 +774,11 @@
var formData = new FormData();
formData.append('excelImport', file);
formData.append('pid', pid); // 娣诲姞瀵煎叆鍒板摢涓� ID 鐨勪俊鎭�
- console.log(this.pid);
+ // console.log(formData,'formDataformDataformData')
+ // alert(this.pid);
let _this = this;
- enload(formData)
+ enload(this.pid,formData)
.then(response => {
_this.getList();
Message({ message: "瀵煎叆鎴愬姛", type: 'warning' });
@@ -673,15 +786,17 @@
.catch(error => {
Message({ message: "瀵煎叆澶辫触", type: 'error' });
});
- }
+ },
+ // 寮圭獥
+ handleShow(scope){
+
+ this.openDataScope = true
+ this.getList()
+ },
+
},
- // 寮圭獥
- handleShow(scope){
- this.openDataScope = true
- this.getList()
- }
};
</script>
--
Gitblit v1.9.1