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/secret/secretInfo.vue | 232 ++++++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 178 insertions(+), 54 deletions(-)
diff --git a/ruoyi-ui/src/views/secret/secretInfo.vue b/ruoyi-ui/src/views/secret/secretInfo.vue
index 38d6b36..4af8f93 100644
--- a/ruoyi-ui/src/views/secret/secretInfo.vue
+++ b/ruoyi-ui/src/views/secret/secretInfo.vue
@@ -1,5 +1,5 @@
<template>
- <div class="app-container">
+ <div class="app-container" id="printable-content">
<div class="form-header mt">
<h1 style="font-size:21px;padding-top:30px;display: flex;justify-content: space-between;align-items: center;">
<span>闅愮璇︽儏</span>
@@ -8,6 +8,11 @@
<div class="form" ><el-icon style="padding-right:110px;"></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>
+ <el-button size="mini" type="text" v-print="'#printable-content'" v-hasPermi="['person:information:memo']">
+ <div class="form" ><el-icon style="padding-right:110px;"></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>
@@ -33,15 +38,27 @@
</el-input>
</el-form-item>
<el-form-item label="鏄惁寮�鍚寚绾�" prop="isFinger">
- <el-input v-model="formData.isFinger" placeholder="璇疯緭鍏ユ寔鏈変汉" clearable :style="{width: '100%'}" :disabled="dsb">
+
+ <el-select v-model="formData.isFinger" placeholder="璇烽�夋嫨鏄�/鍚�" clearable :style="{width: '100%'}" :disabled="dsb" >
+ <el-option v-for="(item, index) in typeOptions2" :key="index" :label="item.label" :value="item.value"
+ ></el-option>
+ </el-select>
+ <!-- <el-input v-model="formData.isFinger" :active-value="鏄�" :inactive-value="鍚�" placeholder="璇疯緭鍏ユ寔鏈変汉" clearable :style="{width: '100%'}" :disabled="dsb"> -->
</el-input>
</el-form-item>
<el-form-item label="鏄惁寮�鍚汉鑴�" prop="isFace">
- <el-input v-model="formData.isFace" placeholder="璇烽�夋嫨鐜伴噾/鑷姩鍒掓墸" clearable :style="{width: '100%'}" :disabled="dsb">
- </el-input>
+
+ <el-select v-model="formData.isFace" placeholder="璇烽�夋嫨鏄�/鍚�" clearable :style="{width: '100%'}" :disabled="dsb" >
+ <el-option v-for="(item, index) in typeOptions2" :key="index" :label="item.label" :value="item.value"
+ ></el-option>
+ </el-select>
</el-form-item>
<el-form-item label="绉佹湁/鍏湁" prop="isPrivate">
- <el-input v-model="formData.isPrivate" placeholder="璇疯緭鍏ヤ綑棰�" clearable :style="{width: '100%'}" :disabled="dsb"></el-input>
+ <el-select v-model="formData.isPrivate" placeholder="璇烽�夋嫨鏄�/鍚�" clearable :style="{width: '100%'}" :disabled="dsb" >
+ <el-option v-for="(item, index) in typeOptions3" :key="index" :label="item.label" :value="item.value"
+ ></el-option>
+ </el-select>
+
</el-form-item>
<el-form-item label="澶囨敞" prop="remark">
<el-input v-model="formData.remark" placeholder="璇疯緭鍏ュ娉�" clearable :style="{width: '100%'}" :disabled="dsb"></el-input>
@@ -55,8 +72,11 @@
multiple
:http-request="requestUpload"
:file-list="fileList"
+ :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"
@@ -68,14 +88,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)"
>
@@ -105,44 +125,52 @@
:on-remove="handleRemoveFile"
: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}">
+ <!-- 娣诲姞video鍏冪礌鐢ㄤ簬鏄剧ず瑙嗛 -->
+ <video
+ v-if="file.url.includes('.mp4')"
+ class="el-upload-list__item-thumbnail"
+ :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">
- <i slot="default" class="el-icon-plus"></i>
- <div slot="file" slot-scope="{file}">
- <img
- 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
- 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-actions">
+ <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>
- </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>
+ </div>
</el-upload>
@@ -154,7 +182,7 @@
<el-dialog :visible.sync="dialogVisible">
- <img w-full :src="dialogImageUrl" alt="Preview Image" />
+ <img w-full :src="dialogImageUrl" style="width: 100%; height: 100%" alt="Preview Image" />
</el-dialog>
</div>
</template>
@@ -172,7 +200,10 @@
return {
cdi:"闅愮璇︾粏淇℃伅",
udi:"闅愮淇℃伅淇敼",
- fot:[".jpg",".jif"],
+ // 鏁版嵁鑼冨洿閫夐」
+ 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:[
@@ -181,6 +212,7 @@
dsb:true,
btn:false,
isShow:true,
+ uploading: false,
formData: {
type: undefined,
happenTime: undefined,
@@ -240,6 +272,26 @@
}],
},
+ typeOptions2: [
+ {
+ value: '鍚�',
+ label: '鍚�',
+ },
+ {
+ value: '鏄�',
+ label: '鏄�',
+ }
+ ],
+ typeOptions3: [
+ {
+ value: '绉佹湁',
+ label: '绉佹湁',
+ },
+ {
+ value: '鍏湁',
+ label: '鍏湁',
+ }
+ ],
typeOptions: [{
value: '0',
label: '鍩洪噾',
@@ -261,13 +313,14 @@
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=false
+ this.btn = false;
}
let _this = this
@@ -275,6 +328,18 @@
this.loading = true;
getSecretInfo({id}).then((response) => {
this.formData = response.data;
+ if(this.formData.isFinger==1)
+ this.formData.isFinger = '鏄�'
+ else
+ this.formData.isFinger = '鍚�'
+ if(this.formData.isFace==1)
+ this.formData.isFace = '鏄�'
+ else
+ this.formData.isFace = '鍚�'
+ if(this.formData.isPrivate==0)
+ this.formData.isPrivate = '鍏湁'
+ else
+ this.formData.isPrivate = '绉佹湁'
let paths = response.data.url.split(",");
for(let i = 0; i < paths.length; i++)
{
@@ -325,7 +390,18 @@
return elem.url.replace(process.env.VUE_APP_BASE_TRUE_API,"")
}).join(",")
this.formData.url = ul+","+uls
-
+if(this.formData.isFinger=='鏄�')
+ this.formData.isFinger = 1
+ else
+ this.formData.isFinger = 0
+ if(this.formData.isFace=='鏄�')
+ this.formData.isFace = 1
+ else
+ this.formData.isFace = 0
+ if(this.formData.isPrivate== '鍏湁')
+ this.formData.isPrivate =0
+ else
+ this.formData.isPrivate = 1
this.$refs['elForm'].validate(valid => {
@@ -333,10 +409,34 @@
if (this.formData.id != undefined) {
updateSecret(this.formData).then(response => {
this.$modal.msgSuccess("淇敼鎴愬姛");
+ if(this.formData.isFinger==1)
+ this.formData.isFinger = '鏄�'
+ else
+ this.formData.isFinger = '鍚�'
+ if(this.formData.isFace==1)
+ this.formData.isFace = '鏄�'
+ else
+ this.formData.isFace = '鍚�'
+ if(this.formData.isPrivate==0)
+ this.formData.isPrivate = '鍏湁'
+ else
+ this.formData.isPrivate = '绉佹湁'
// this.open = false;
this.btn=false
});
} else {
+ if(this.formData.isFinger==1)
+ this.formData.isFinger = '鏄�'
+ else
+ this.formData.isFinger = '鍚�'
+ if(this.formData.isFace==1)
+ this.formData.isFace = '鏄�'
+ else
+ this.formData.isFace = '鍚�'
+ if(this.formData.isPrivate==0)
+ this.formData.isPrivate = '鍏湁'
+ else
+ this.formData.isPrivate = '绉佹湁'
this.$modal.msgSuccess("淇敼澶辫触");
}
@@ -375,9 +475,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;
@@ -408,10 +515,11 @@
var formData = new FormData();
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})
@@ -422,6 +530,20 @@
_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)
+ // alert(87)
+ updateSecret(_this.formData).then(response => {
+ this.$modal.msgSuccess("鍥剧墖涓婁紶鎴愬姛");
+ // this.open = false;
+
+ });
})
},
@@ -437,14 +559,14 @@
// const id =row.id;
const id = this.$route.params && this.$route.params.id;
// const fid =2031
- this.$router.push("/self/secret/memo/" + id );
+ this.$router.push("/self/secret/memo/" + id);
},
}
}
</script>
- <style scoped lang="scss">
+ <style scoped>
.mt
{
position: relative;
@@ -459,7 +581,9 @@
display: block;
position: absolute;
}
-
+ .hide /deep/ .el-upload--picture-card {
+ display: none;
+ }
.form{
background:center/11% no-repeat url('../../assets/icons/form.png') ;
}
--
Gitblit v1.9.1