From a5a81efad512d32da6d1027fe8ab5cc29a3b6af4 Mon Sep 17 00:00:00 2001
From: feige <791364011@qq.com>
Date: 星期五, 01 三月 2024 20:46:49 +0800
Subject: [PATCH] Merge branch 'master' of http://47.93.189.255:8099/r/zhangshi_app_web
---
ruoyi-ui/src/views/wish/wishInfo.vue | 187 +++++++++++++++++++++++++++++++++-------------
1 files changed, 134 insertions(+), 53 deletions(-)
diff --git a/ruoyi-ui/src/views/wish/wishInfo.vue b/ruoyi-ui/src/views/wish/wishInfo.vue
index 95fa711..df95a07 100644
--- a/ruoyi-ui/src/views/wish/wishInfo.vue
+++ b/ruoyi-ui/src/views/wish/wishInfo.vue
@@ -1,11 +1,15 @@
<template>
- <div class="app-container">
+ <div class="app-container" id="printable-content">
<div class="form-header mt">
- <h4 class="dt h4">鐧惧勾蹇冩効璇︾粏淇℃伅 </h4>
- <!-- <el-button v-if="isShow" type="primary" class="pt" icon="el-icon-edit" @click="handleEdit()" >缂栬緫</el-button>-->
- <!-- <br>-->
- <!-- <el-button type="primary" class="pt" @click="handleExport"-->
- <!-- v-hasPermi="['self:user:export']" >瀵煎嚭</el-button>-->
+ <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>
<div style="padding-left:15px">
<el-form ref="elForm" :model="formData" :rules="rules" size="medium" label-position="left" label-width="120px">
@@ -72,13 +76,16 @@
</el-cow>
</el-row>
</el-container>
- <h4 class="form-header">鐢靛瓙鏂囦欢 </h4>
+ <h4 class="form-header">鐩稿叧鍥剧墖 </h4>
<el-upload
action="#"
+ accept="image/jpeg, image/png,image/jpg, image/WMF,image/gif"
list-type="picture-card"
multiple
:http-request="requestUpload"
:file-list="fileList"
+ :disabled="!btn"
+ :class="{ hide: !btn }"
>
<div v-if="uploading" class="upload-status">姝ｅ湪涓婁紶...</div>
<i v-if="!uploading" slot="default" class="el-icon-plus"></i>
@@ -87,7 +94,7 @@
class="el-upload-list__item-thumbnail"
:src="file.url"
alt=""
- style="width: 147px; height: 147px"
+ style="width: 100%; height: 100%; object-fit: cover;"
fit="cover"
:preview-src-list="[file.url]"
>
@@ -128,23 +135,34 @@
list-type="picture-card"
:on-preview="handleFileCardPreview"
:on-remove="handleRemoveFile"
- :http-request="requestUpload"
+ :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 v-if="uploading1" class="upload-status">姝ｅ湪涓婁紶...</div>
+ <i v-if="!uploading1" 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="../../assets/401_images/401.gif"
+ alt=""
+ style="width: 147px; height: 147px"
+ 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)"
+ class="el-upload-list__item-preview"
+ @click="handleFileCardPreview(file)"
>
<i class="el-icon-zoom-in"></i>
</span>
@@ -162,11 +180,9 @@
>
<i class="el-icon-delete"></i>
</span>
- </span>
-
+ </span>
</div>
-
</el-upload>
@@ -177,7 +193,7 @@
</div>
<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>
@@ -190,6 +206,7 @@
import errorCode from "@/utils/errorCode";
import {Message} from "element-ui";
import {getWish, updateWish,download,uploadPic} from "@/api/wish/index";
+import {updateCollection} from "@/api/collection";
export default {
components: {},
@@ -198,16 +215,17 @@
return {
cdi:"鐧惧勾蹇冩効璇︾粏淇℃伅",
udi:"鐧惧勾蹇冩効淇℃伅璇︽儏",
- fot:[".jpg",".jif"],
- 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'],
+
+ fileList:[],
+ fileListOther:[],
dsb:true,
btn:false,
isShow:true,
uploading: false,
+ uploading1: false,
// 鐧惧勾蹇冩効琛ㄦ牸鏁版嵁
wishList: [],
@@ -224,6 +242,7 @@
remark:undefined,
url: undefined,
},
+ desurl:'',
dialogImageUrl: '',
dialogVisible: false,
disabled: false,
@@ -285,13 +304,14 @@
jd = this.$route.query.detail
this.btn= jd
this.dsb = !jd
- document.title = "淇敼鐧惧勾蹇冩効璇︾粏淇℃伅";
+ // document.title = "淇敼鐧惧勾蹇冩効璇︾粏淇℃伅";
this.$route.meta.title = "淇敼鐧惧勾蹇冩効璇︾粏淇℃伅";//鍒楄〃鐨勫悕绉�
}
else{
- document.title = "鐧惧勾蹇冩効璇︾粏淇℃伅";
+ // document.title = "鐧惧勾蹇冩効璇︾粏淇℃伅";
this.$route.meta.title = "鐧惧勾蹇冩効璇︾粏淇℃伅";//鍒楄〃鐨勫悕绉�
this.isShow=false
+ this.btn = false;
}
let _this = this
@@ -324,17 +344,6 @@
},
mounted() {},
methods: {
- /** 鏌ヨ绫诲埆淇℃伅 */
- // getCateInfor()
- // {
- // let _this = this
- // getCategory().then(response=>{
- //
- // response.data.itemValues.replace("{","").replace("}","").split(",").map(elem=>{
- // _this.typeOptions.push({"label":elem.split(":")[0], "value":elem.split(":")[0]})
- // })
- // })
- // },
submitForm() {
let ul = this.fileList.map(function (elem){
return elem.url.replace(process.env.VUE_APP_BASE_TRUE_API,"")
@@ -386,6 +395,18 @@
{
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;
+ updateWish(this.formData).then(response => {
+ this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
+ // this.open = false;
+ // this.btn=false
+ });
}
},
handleRemove(file) {
@@ -393,13 +414,29 @@
{
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;
+ updateWish(this.formData).then(response => {
+ this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
+ // this.open = false;
+ // this.btn=false
+ });
}
},
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")
+
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;
@@ -421,7 +458,7 @@
handleEdit()
{
this.dsb = false
- // this.btn = true
+ this.btn = true
this.isShow=false
},
requestUpload(params)
@@ -431,10 +468,44 @@
formData.append('uploadFile', file);
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})
+ 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)
+ updateWish(this.formData).then(response => {
+ this.$modal.msgSuccess("鍥剧墖涓婁紶鎴愬姛");
+ // this.open = false;
+ // this.btn=false
+ });
+ }
+ else{
+ _this.fileListOther.push({name:response.data.fileName, url:response.data.url})
+
+ }
+ })
+ },
+ requestUpload1(params)
+ {
+ var file = params.file;
+ var formData = new FormData();
+ formData.append('uploadFile', file);
+ let _this = this
+ this.uploading1 = true;
+ uploadPic(formData).then(response => {
+ let pth = response.data.originalFilename.substr(response.data.originalFilename.length-4, response.data.originalFilename.length)
+ this.uploading1 = false;
+ // this.$modal.msgSuccess("涓婁紶鎴愬姛");
if(_this.fot.includes(pth) === true)
{
_this.fileList.push({name:response.data.fileName, "url":response.data.url})
@@ -443,18 +514,22 @@
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)
+ updateWish(this.formData).then(response => {
+ this.$modal.msgSuccess("鏂囨。涓婁紶鎴愬姛");
+ // this.open = false;
+ // this.btn=false
+ });
}
})
-
},
-
- /** 瀵煎嚭鎸夐挳鎿嶄綔 */
- handleExport() {
- this.download('/zIdea/export', {
- ...this.queryParams
- }, `zIdea_${new Date().getTime()}.xlsx`)
- }
}
}
@@ -479,6 +554,12 @@
display: block;
position: absolute;
}
+.hide /deep/ .el-upload--picture-card {
+ display: none;
+}
+.form{
+ background:center/11% no-repeat url('../../assets/icons/form.png') ;
+}
.form_item{
font-size: 12px;
font-family: Microsoft YaHei-Regular, Microsoft YaHei;
--
Gitblit v1.9.1