From 45b19cb64db7a8e70ed1d25b16bfe0ca93576267 Mon Sep 17 00:00:00 2001
From: feige <feige@qq.com>
Date: 星期二, 05 十二月 2023 22:05:27 +0800
Subject: [PATCH] 增加了修改
---
ruoyi-ui/src/views/bignote/familyeventInfo.vue | 136 +++++++++++++++++++++++++--------------------
1 files changed, 76 insertions(+), 60 deletions(-)
diff --git a/ruoyi-ui/src/views/bignote/familyeventInfo.vue b/ruoyi-ui/src/views/bignote/familyeventInfo.vue
index 59adf31..04ef621 100644
--- a/ruoyi-ui/src/views/bignote/familyeventInfo.vue
+++ b/ruoyi-ui/src/views/bignote/familyeventInfo.vue
@@ -27,8 +27,9 @@
</el-input>
</el-form-item>
<el-form-item label="鍙戠敓鏃堕棿" prop="happenTime">
- <el-input v-model="formData.happenTime" placeholder="璇疯緭鍏ュ彂鐢熸椂闂�" type="date" 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">
@@ -39,21 +40,20 @@
<!-- <el-input v-model="formData.ownData=== 1 ? '鏄�':'鍚�'" placeholder=" " clearable :style="{width: '100%'}" :disabled=true></el-input>-->
<!-- </el-form-item>-->
+
<h4 class="form-header">鐩稿叧鍥剧墖 </h4>
<el-upload
action="#"
list-type="picture-card"
multiple
- accept="image/jpeg, image/png,image/jpg, image/WMF,image/gif"
:http-request="requestUpload"
:file-list="fileList"
:disabled="!btn"
:class="{ hide: !btn }"
-
>
- <div v-if="uploading1" class="upload-status">姝ｅ湪涓婁紶...</div>
- <i v-if="!uploading1" 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"
@@ -93,52 +93,56 @@
<h4 class="form-header">鍏朵粬闄勪欢 </h4>
<el-upload
- action=""
- :file-list="fileListOther"
- class="upload-demo"
+ action="#"
multiple
list-type="picture-card"
- :on-preview="handleFileCardPreview"
- :on-remove="handleRemoveFile"
+ :file-list="fileListOther"
:http-request="requestUpload1"
- :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}">
- <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
+ <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-preview"
- @click="handleFileCardPreview(file)"
- >
- <i class="el-icon-zoom-in"></i>
- </span>
- <span
-
- class="el-upload-list__item-delete"
- @click="handleDownload(file.url)"
- >
+ 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
+ v-if="isShow"
+ class="el-upload-list__item-delete"
+ @click="handleRemoveFile(file)"
+ >
+ <i class="el-icon-delete"></i>
+ </span>
</span>
-
</div>
@@ -151,7 +155,7 @@
</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>
@@ -170,12 +174,14 @@
return {
cdi:"瀹跺涵澶т簨璁颁俊鎭�",
udi:"瀹跺涵澶т簨璁颁慨鏀�",
- fot:[".jpg",".jif","png"],
+
fileList:[
],
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,
@@ -190,6 +196,7 @@
url: undefined,
},
dialogImageUrl: '',
+ url1:undefined,
dialogVisible: false,
disabled: false,
rules: {
@@ -238,6 +245,7 @@
this.$route.meta.title = "瀹跺ぇ浜嬭璇︾粏淇℃伅";//鍒楄〃鐨勫悕绉�
this.btn = false;
this.isShow=false
+ // alert(this.btn)
}
let _this = this
@@ -245,7 +253,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]!="") {
@@ -264,8 +272,6 @@
}
this.loading = false;
});
- this.getCateInfor()
-
}
},
mounted() {},
@@ -285,9 +291,11 @@
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 {
@@ -328,7 +336,7 @@
updateFamilyevent(this.formData).then(response => {
this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
// this.open = false;
- // this.btn=false
+
});
}
},
@@ -347,16 +355,23 @@
updateFamilyevent(this.formData).then(response => {
this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
// this.open = false;
- // this.btn=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;
@@ -392,24 +407,25 @@
uploadPic(formData).then(response => {
let pth = response.data.originalFilename.substr(response.data.originalFilename.length-4, response.data.originalFilename.length)
- this.uploading1= false;
+ _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){
+ 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){
+ 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)
- updateFamilyevent(this.formData).then(response => {
- this.$modal.msgSuccess("鍥剧墖涓婁紶鎴愬姛");
+ _this.formData.url = ul+","+uls
+ console.log(_this.formData.url)
+ // alert(87)
+ updateFamilyevent(_this.formData).then(response => {
+ _this.$modal.msgSuccess("鍥剧墖涓婁紶鎴愬姛");
// this.open = false;
- // this.btn=false
+
});
}
else{
@@ -428,7 +444,7 @@
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.uploading = false;
// this.$modal.msgSuccess("涓婁紶鎴愬姛");
if(_this.fot.includes(pth) === true)
{
@@ -438,18 +454,18 @@
else{
_this.fileListOther.push({name:response.data.fileName, url:response.data.url})
- let ul = this.fileList.map(function (elem){
+ 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){
+ 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)
- updateFamilyevent(this.formData).then(response => {
+ _this.formData.url = ul+","+uls
+ console.log(_this.formData.url)
+ updateFamilyevent(_this.formData).then(response => {
this.$modal.msgSuccess("鏂囨。涓婁紶鎴愬姛");
// this.open = false;
- // this.btn=false
+
});
}
})
@@ -480,7 +496,7 @@
display: block;
}
-.hide .el-upload--picture-card {
+.hide /deep/ .el-upload--picture-card {
display: none;
}
.pt{
--
Gitblit v1.9.1