From 3549fed09cc87c323ca6c8a3d55c83fc495f4b7e Mon Sep 17 00:00:00 2001
From: feige <feige@qq.com>
Date: 星期日, 10 九月 2023 11:55:19 +0800
Subject: [PATCH] 家庭设备的打印功能已经没有问题了 家庭设备详情的时候，不可以上传文件 家谱思维导图可以打击查看信息了
---
ruoyi-ui/src/views/device/equipmentInfo.vue | 38 +++++++++++++-------------------------
1 files changed, 13 insertions(+), 25 deletions(-)
diff --git a/ruoyi-ui/src/views/device/equipmentInfo.vue b/ruoyi-ui/src/views/device/equipmentInfo.vue
index be92caf..8fc803c 100644
--- a/ruoyi-ui/src/views/device/equipmentInfo.vue
+++ b/ruoyi-ui/src/views/device/equipmentInfo.vue
@@ -4,12 +4,12 @@
<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']">
+ <el-button size="mini" type="text" 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>
- <el-button size="mini" type="text" @click="print()" v-hasPermi="['person:information:memo']">
+ <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>
@@ -60,9 +60,12 @@
<el-upload
action="#"
list-type="picture-card"
- multiple
+ 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>
@@ -114,6 +117,8 @@
:on-remove="handleRemoveFile"
:http-request="requestUpload"
:show-file-list="true"
+ :disabled="!btn"
+ :class="{ hide: !btn }"
>
<div v-if="uploading" class="upload-status">姝ｅ湪涓婁紶...</div>
@@ -266,6 +271,7 @@
else{
document.title = "瀹跺涵璁惧璇︾粏淇℃伅";
this.$route.meta.title = "瀹跺涵璁惧璇︾粏淇℃伅";//鍒楄〃鐨勫悕绉�
+ this.btn = false;
this.isShow=false
}
@@ -396,28 +402,6 @@
this.dsb = false
this.btn = true
},
- //鎵撳嵃
- print()
- {
-
- setTimeout(() => {
- // 鑾峰彇寰呮墦鍗扮殑鍐呭
- let printableContent = document.getElementById('printable-content').innerHTML;
- console.log(printableContent)
- // 鍒涘缓涓�涓柊鐨勭獥鍙ｅ苟鍔犺浇鎵撳嵃鍐呭
- let printWindow = window.open('', '_blank');
- printWindow.document.write('<html><head><title>鎵撳嵃鍐呭</title></head><body>' + printableContent + '</body></html>');
-
- // 鎵ц鎵撳嵃鎿嶄綔
- printWindow.document.close();
-
- // 濡傛灉鍐呭涓湁鍥剧墖鎴栧叾浠栭渶瑕佷竴瀹氭椂闂村姞杞界殑锛岃浣跨敤娉ㄩ噴涓殑寤舵椂鎵撳嵃
-
- printWindow.print()
- }, 1000)
- // printWindow.print();
-
- },
//鏌ョ湅澶囧繕鏈�
checkNote(row){
@@ -427,6 +411,7 @@
},
requestUpload(params)
{
+
var file = params.file;
var formData = new FormData();
formData.append('uploadFile', file);
@@ -463,6 +448,9 @@
display: block;
}
+.hide .el-upload--picture-card {
+ display: none;
+}
.form{
background:center/11% no-repeat url('../../assets/icons/form.png') ;
}
--
Gitblit v1.9.1