From bd40473c9c634005bc7e62e7fc901bcd8b598fa0 Mon Sep 17 00:00:00 2001
From: feige <feige@qq.com>
Date: 星期五, 02 二月 2024 15:20:26 +0800
Subject: [PATCH] 提交了修改
---
ruoyi-ui/src/views/bignote/familyeventInfo.vue | 171 ++++++++++++++++++++++++++++++--------------------------
1 files changed, 91 insertions(+), 80 deletions(-)
diff --git a/ruoyi-ui/src/views/bignote/familyeventInfo.vue b/ruoyi-ui/src/views/bignote/familyeventInfo.vue
index f4265b7..59ce0a7 100644
--- a/ruoyi-ui/src/views/bignote/familyeventInfo.vue
+++ b/ruoyi-ui/src/views/bignote/familyeventInfo.vue
@@ -40,19 +40,21 @@
<!-- <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"
+ :on-change="handleChange"
: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"
@@ -92,52 +94,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>
@@ -150,7 +156,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>
@@ -172,6 +178,7 @@
fileList:[
],
+ uploadFileList:[],
fileListOther:[
],
@@ -232,52 +239,41 @@
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.btn = false;
this.isShow=false
+ // alert(this.btn)
}
let _this = this
if (id) {
this.loading = true;
getFamilyeventInfo(id).then((response) => {
- console.log("涓婇潰");
- console.log(this.btn);
this.formData = response.data;
- const url = this.formData.url;
- // const url1 = url.replace(/^http:/, 'https:');
- const url1 = url.replace(/http:\/\/47\.93\.189\.255:8080\//g, '');
- this.formData.url = url1; // 鏇存柊 formData 瀵硅薄涓殑 url 瀛楁
- console.log(url);
- console.log(url1); // 杈撳嚭淇敼鍚庣殑 https URL
- let paths = this.formData.url.split(","); // 淇姝ゅ
- for (let i = 0; i < paths.length; i++) {
- if (paths[i] !== "") {
- let pth = paths[i].substr(paths[i].length - 4);
+ let paths = this.formData.url.split(",");
+ for(let i = 0; i < paths.length; i++)
+ {
+ if(paths[i]!="") {
- if (this.fot.includes(pth)) {
+ let pth = paths[i].substr(paths[i].length - 4, paths[i].length)
- let nms = paths[i].split("/");
- let nm = nms[nms.length - 1];
-
- this.fileList.push({ name: nm, url: "http://www.bendudu.com/" + paths[i] });
- console.log(this.fileList)
- } 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 (_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]})
}
}
}
+ this.loading = false;
});
- this.loading = false;
}
},
mounted() {},
@@ -297,9 +293,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 {
@@ -340,7 +338,7 @@
updateFamilyevent(this.formData).then(response => {
this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
// this.open = false;
- // this.btn=false
+
});
}
},
@@ -359,7 +357,7 @@
updateFamilyevent(this.formData).then(response => {
this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
// this.open = false;
- // this.btn=false
+
});
}
@@ -401,34 +399,47 @@
this.isShow=false
},
- requestUpload(params)
+//鑷畾涔変笂浼犳柟娉�
+ handleChange(file, fileList) {
+ //瀹氫箟涓�涓叏灞�鏁扮粍uploadFileList鏉ュ仛瀛樺偍
+
+ this.uploadFileList.push(file.raw);
+ console.log("=========5555=========")
+ //console.log(file)
+ console.log(this.uploadFileList)
+ },
+ async requestUpload(params)
{
+ // alert(124)
var file = params.file;
+
var formData = new FormData();
formData.append('uploadFile', file);
let _this = this
+ //alert(34)
this.uploading1 = true;
- uploadPic(formData).then(response => {
+ await 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{
@@ -447,7 +458,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)
{
@@ -457,18 +468,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
+
});
}
})
@@ -499,7 +510,7 @@
display: block;
}
-.hide .el-upload--picture-card {
+.hide /deep/ .el-upload--picture-card {
display: none;
}
.pt{
--
Gitblit v1.9.1