From b9f97457e9d8e8a0f784c25b103697fca8fea2e4 Mon Sep 17 00:00:00 2001
From: feige <791364011@qq.com>
Date: 星期二, 20 二月 2024 18:00:20 +0800
Subject: [PATCH] 再次修改
---
ruoyi-ui/src/views/bignote/familyeventInfo.vue | 402 ++++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 312 insertions(+), 90 deletions(-)
diff --git a/ruoyi-ui/src/views/bignote/familyeventInfo.vue b/ruoyi-ui/src/views/bignote/familyeventInfo.vue
index d97a9ec..cb2fbad 100644
--- a/ruoyi-ui/src/views/bignote/familyeventInfo.vue
+++ b/ruoyi-ui/src/views/bignote/familyeventInfo.vue
@@ -1,8 +1,15 @@
<template>
- <div class="app-container">
+ <div class="app-container" id="printable-content">
<div class="form-header mt">
- <h4 class="dt h4">瀹跺ぇ浜嬭璇︾粏淇℃伅 </h4>
-
+ <h1 style="font-size:21px;padding-top:30px;display: flex;justify-content: space-between;align-items: center;" >
+ <span>瀹跺ぇ浜嬭璇︽儏</span>
+ <div style="display: flex; align-items: center;">
+ <el-button size="mini" type="text" v-print="'#printable-content'" v-hasPermi="['person:information:memo']">
+ <div class="form" ><el-icon style="padding-right:100px;"></el-icon>
+ <span class="text" style="width: 69px;height: 26px;font-size: 16px;
+ font-family: Microsoft YaHei-Regular, Microsoft YaHei; color: #EBA4AA;">鎵撳嵃</span></div>
+ </el-button></div>
+ </h1>
</div>
<el-form ref="elForm" :model="formData" :rules="rules" size="medium" label-width="100px">
@@ -20,23 +27,38 @@
</el-input>
</el-form-item>
<el-form-item label="鍙戠敓鏃堕棿" prop="happenTime">
- <el-input v-model="formData.happenTime" placeholder="璇疯緭鍏ュ彂鐢熸椂闂�" clearable :style="{width: '100%'}" :disabled="dsb">
- </el-input>
+ <el-date-picker v-model="formData.happenTime" type="date" placeholder="璇烽�夋嫨鏃ユ湡"
+ :editable="false" :clearable="false" :style="{width: '100%'}" :disabled="dsb" value-format="yyyy-MM-dd"
+ ></el-date-picker>
</el-form-item>
<el-form-item label="澶囨敞" prop="remark">
<el-input v-model="formData.remark" placeholder="璇疯緭鍏ュ娉�" clearable :style="{width: '100%'}" :disabled="dsb"></el-input>
</el-form-item>
- <h4 class="form-header">鐢靛瓙鏂囦欢 </h4>
+<!-- <el-form-item label="鏄惁鏄湰瀹跺涵璁板綍" prop="ownData">-->
+<!-- <el-input v-model="formData.ownData=== 1 ? '鏄�':'鍚�'" placeholder=" " clearable :style="{width: '100%'}" :disabled=true></el-input>-->
+<!-- </el-form-item>-->
+ <!-- :http-request="requestUpload" -->
+
+ <h4 class="form-header">鐩稿叧鍥剧墖 </h4>
<el-upload
action="#"
list-type="picture-card"
multiple
- :http-request="requestUpload"
+ ref="upload"
+ :show-file-list="true"
+ :http-request="requestUpload"
:file-list="fileList"
+ :on-change="handleChange"
+ :auto-upload="false"
+ :disabled="!btn"
+ :class="{ hide: !btn }"
+
>
- <i slot="default" class="el-icon-plus"></i>
+
+ <!-- <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}">
<img
class="el-upload-list__item-thumbnail"
@@ -48,14 +70,14 @@
>
<span class="el-upload-list__item-actions">
<span
- v-if="isShow"
+
class="el-upload-list__item-preview"
@click="handlePictureCardPreview(file)"
>
<i class="el-icon-zoom-in"></i>
</span>
<span
- v-if="isShow"
+
class="el-upload-list__item-delete"
@click="handleDownload(file.url)"
>
@@ -72,68 +94,108 @@
</div>
- </el-upload>
+
+ </el-upload>
+ <el-button
+ style="margin-left: 10px"
+ size="small"
+ type="success"
+ @click="picUpload"
+ >涓婁紶鍒版湇鍔″櫒</el-button>
<h4 class="form-header">鍏朵粬闄勪欢 </h4>
+
+<!-- <el-upload
+ action="#"
+ list-type="picture-card"
+ multiple
+ ref="upload"
+
+ :http-request="requestUpload"
+ :file-list="fileList"
+ :on-change="handleChange"
+ :auto-upload="false"
+ :disabled="!btn"
+ :class="{ hide: !btn }"
+
+ >
+ -->
+
<el-upload
- action=""
- :file-list="fileListOther"
- class="upload-demo"
+ action="#"
multiple
list-type="picture-card"
- :on-preview="handleFileCardPreview"
- :on-remove="handleRemove"
- :http-request="requestUpload"
- :show-file-list="true"
- >
+ ref="upload1"
+
+ :http-request="requestUpload1"
+ :file-list="fileListOther"
+ :on-change="handleChange1"
+ :auto-upload="false"
+ :disabled="!btn"
- <i slot="default" class="el-icon-plus"></i>
+ :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}">
- <img
+ <!-- 娣诲姞video鍏冪礌鐢ㄤ簬鏄剧ず瑙嗛 -->
+ <video
+ v-if="file.url.includes('.mp4')"
class="el-upload-list__item-thumbnail"
- src="../../assets/401_images/401.gif"
- alt=""
+ :src="file.url"
style="width: 147px; height: 147px"
fit="cover"
- >
+ ></video>
+ <img v-else
+ class="el-upload-list__item-thumbnail"
+ :src="file.url"
+ alt=""
+ style="width: 100%; height: 100%"
+ fit="cover">
+
<span class="el-upload-list__item-actions">
- <span
- v-if="isShow"
- class="el-upload-list__item-preview"
- @click="handleFileCardPreview(file)"
- >
- <i class="el-icon-zoom-in"></i>
- </span>
- <span
- v-if="isShow"
- @click="handleRemove(file)"
- class="el-upload-list__item-delete"
+ <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
- >
- <i class="el-icon-download"></i>
- </span>
- <span
- v-if="isShow"
- class="el-upload-list__item-delete"
- @click="handleRemoveFile(file)"
- >
- <i class="el-icon-delete"></i>
- </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)"
+ >
+ <i class="el-icon-delete"></i>
+ </span>
</span>
-
</div>
</el-upload>
-
+ <el-button
+ style="margin-left: 10px"
+ size="small"
+ type="success"
+ @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>
</el-form>
<el-dialog :visible.sync="dialogVisible">
- <img w-full :src="dialogImageUrl" style="width: 700px; height: 700px" alt="Preview Image" />
+ <img w-full :src="dialogImageUrl" style="width: 100%; height: 100%" alt="Preview Image" />
</el-dialog>
</div>
</template>
@@ -152,18 +214,22 @@
return {
cdi:"瀹跺涵澶т簨璁颁俊鎭�",
udi:"瀹跺涵澶т簨璁颁慨鏀�",
- fot:[".jpg",".jif","png"],
+
fileList:[
],
+ fileList1:[],
+ uploadFileList:[],
+ uploadFileList1:[],
fileListOther:[
],
+ fot:['.bmp','.jpg','.jpeg','.png','.tif','.gif','.pcx','.tga','.exif','.fpx',
+ '.svg','.psd','.cdr','.pcd','.dxf','.ufo','.eps','.ai','.aw','.WMF','.webp','.apng'],
dsb:true,
btn:false,
isShow:true,
-
- doctorList: [],
-
+ uploading: false,
+ uploading1:false,
formData: {
id: undefined,
title: undefined,
@@ -173,6 +239,7 @@
url: undefined,
},
dialogImageUrl: '',
+ url1:undefined,
dialogVisible: false,
disabled: false,
rules: {
@@ -181,11 +248,7 @@
message: '璇疯緭鍏ュぇ浜嬫爣棰�',
trigger: 'blur'
}],
- familyId: [{
- required: true,
- message: '璇疯緭鍏ュ搴彿',
- trigger: 'blur'
- }],
+
people: [{
required: true,
message: '璇疯緭鍏ヤ汉鐗�',
@@ -217,13 +280,15 @@
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=true
+ this.btn = false;
+ this.isShow=false
+ // alert(this.btn)
}
let _this = this
@@ -231,7 +296,7 @@
this.loading = true;
getFamilyeventInfo(id).then((response) => {
this.formData = response.data;
- let paths = response.data.url.split(",");
+ let paths = this.formData.url.split(",");
for(let i = 0; i < paths.length; i++)
{
if(paths[i]!="") {
@@ -239,19 +304,27 @@
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]})
+ {
+ if(paths[i][0]=="/")
+ _this.fileList.push({name:paths[i],url: process.env.VUE_APP_BASE_TRUE_API+paths[i].substr(1)})
+ else
+ _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]})
- }
+ if(paths[i][0]=="/")
+ _this.fileListOther.push({name:nm, url: process.env.VUE_APP_BASE_TRUE_API+paths[i].substr(1)})
+ else
+ _this.fileListOther.push({name:nm, url: process.env.VUE_APP_BASE_TRUE_API+paths[i]})
+
+ }
}
+ _this.fileList1 = _this.fileList
}
this.loading = false;
});
- this.getCateInfor()
-
}
},
mounted() {},
@@ -268,12 +341,14 @@
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 {
@@ -304,20 +379,55 @@
{
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;
+
}
+ updateFamilyevent(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;
+ //alert(this.formData.url)
+
}
+ updateFamilyevent(this.formData).then(response => {
+ this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
+ // this.open = false;
+
+ });
+
},
handleFileCardPreview(file){
this.dialogFileUrl = file.url;
+ // alert(file.url)
+ // this.dialogFileUrl = 'https://www.bendudu.com:8080/profile/upload/2023/10/18/20231018214647A011.doc'
+ // this.dialogFileUrl = 'https://47.93.189.255:8080/profile/upload/2023/03/19/test7_20230319222030A007.jpg'
+ 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+'onlinePreview?url='+encodeURIComponent(Base64.encode(this.dialogFileUrl));
- myWindow=window.open(this.desurl,'','width=1200,height=800,top=150,left=300');
+
+ 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');
},
handlePictureCardPreview(file) {
this.dialogImageUrl = file.url;
@@ -339,31 +449,137 @@
handleEdit()
{
this.dsb = false
- // this.btn = true
+ this.btn = true
this.isShow=false
},
- requestUpload(params)
+
+//鑷畾涔変笂浼犳柟娉�
+ handleChange(file, fileList1) {
+ //瀹氫箟涓�涓叏灞�鏁扮粍uploadFileList鏉ュ仛瀛樺偍
+
+ // this.uploadFileList.push(file.raw);
+ console.log("=========5555=========")
+ //console.log(file)
+ // console.log(this.uploadFileList)
+ // this.fileList = fileList
+ },
+ //鑷畾涔変笂浼犳柟娉�
+ handleChange1(file, fileListOther) {
+ //瀹氫箟涓�涓叏灞�鏁扮粍uploadFileList鏉ュ仛瀛樺偍
+
+ // this.uploadFileList.push(file.raw);
+ 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();
+ // formData.append('uploadFile', file);
+
+
+ this.uploadFileList1.forEach((elem)=>{
+ formData.append("files", elem)
+
+ })
+ console.log(this.uploadFileList1)
+ 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.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)
+ _this.formData.url = _this.formData.url+","+response.fileNames
+ updateFamilyevent(_this.formData).then(response => {
+ this.$modal.msgSuccess("鏂囨。涓婁紶鎴愬姛");
+ // this.open = false;
+
+ });
+ })
+
+ },
+ picUpload()
+ {
+ var formData = new FormData();
+ this.$refs.upload.submit();
+
+
+ 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
+
+ // alert(87)
+ updateFamilyevent(_this.formData).then(response => {
+ _this.$modal.msgSuccess("鍥剧墖涓婁紶鎴愬姛");
+ // this.open = false;
+
+ });
+ // }
+ // else{
+ // _this.fileListOther.push({name:response.data.fileName, url:response.data.url})
+
+ // }
+ });
+ },
+ requestUpload(params)
{
- var file = params.file;
- var formData = new FormData();
- formData.append('uploadFile', file);
- let _this = this
+ // alert(124)
+ this.uploadFileList.push(params.file);
- uploadPic(formData).then(response => {
- let pth = response.data.originalFilename.substr(response.data.originalFilename.length-4, response.data.originalFilename.length)
-
- 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})
-
- }
- })
-
+ //alert(34)
+
+
+ },
+ requestUpload1(params)
+ {
+ // alert(123)
+ this.uploadFileList1.push(params.file);
+ // console.log("-----------")
+ //console.log(this.uploadFileList1)
},
/** 瀵煎嚭鎸夐挳鎿嶄綔 */
@@ -390,10 +606,16 @@
display: block;
}
+.hide /deep/ .el-upload--picture-card {
+ display: none;
+}
.pt{
right: 10px;
top:-3px;
display: block;
position: absolute;
}
+.form{
+ background:center/11% no-repeat url('../../assets/icons/form.png') ;
+}
</style>
--
Gitblit v1.9.1