From 1660e0f0083d1a682bf0dca9dcaf2e8ba2502f38 Mon Sep 17 00:00:00 2001
From: linwenling <3256558519@qq.com>
Date: 星期日, 22 十月 2023 23:10:13 +0800
Subject: [PATCH] 1022 修正时间
---
ruoyi-ui/src/views/bignote/familyeventInfo.vue | 84 ++++++++++++++++++++++--------------------
1 files changed, 44 insertions(+), 40 deletions(-)
diff --git a/ruoyi-ui/src/views/bignote/familyeventInfo.vue b/ruoyi-ui/src/views/bignote/familyeventInfo.vue
index cb007b3..f487da1 100644
--- a/ruoyi-ui/src/views/bignote/familyeventInfo.vue
+++ b/ruoyi-ui/src/views/bignote/familyeventInfo.vue
@@ -40,19 +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"
@@ -99,11 +100,12 @@
list-type="picture-card"
:on-preview="handleFileCardPreview"
:on-remove="handleRemoveFile"
- :http-request="requestUpload1"
+ :http-request="requestUpload"
: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}">
@@ -115,28 +117,27 @@
fit="cover"
>
<span class="el-upload-list__item-actions">
- <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>
+ <span
+ v-if="isShow"
+ class="el-upload-list__item-delete"
+ @click="handleRemoveFile(file)"
+ >
+ <i class="el-icon-delete"></i>
+ </span>
+ </span>
</div>
@@ -256,23 +257,19 @@
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);
+ 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]})
}
}
}
@@ -366,9 +363,16 @@
},
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;
--
Gitblit v1.9.1