From 00c06715bc2426cd30df9938c158f4f6c62f41fb Mon Sep 17 00:00:00 2001
From: zhuzhuanzhuan
Date: 星期四, 25 一月 2024 16:15:31 +0800
Subject: [PATCH] 设备利用率页面打印按钮增加鉴权功能
---
src/views/WorkshopSignage.vue | 13 +++++--------
1 files changed, 5 insertions(+), 8 deletions(-)
diff --git a/src/views/WorkshopSignage.vue b/src/views/WorkshopSignage.vue
index 0d993f3..c9209c4 100644
--- a/src/views/WorkshopSignage.vue
+++ b/src/views/WorkshopSignage.vue
@@ -37,6 +37,7 @@
v-on:resizing="resize($event, index)"
v-on:dragging="resize($event, index)"
:parentLimitation="parentLimitation"
+ :parentH="parentH"
:minw="70"
:minh="70"
:isDraggable="isDraggable"
@@ -108,6 +109,7 @@
isResizable: false, // 鏄惁寮�鍚缉鏀�
isSwitchChecked: false, // 鏄惁寮�鍚姛鑳�
timingAcquisition: null, // 瀹氭椂鍒锋柊鏄惁寮�鍚�
+ parentH: 5000,//鐖剁骇楂樺害
deviceList: [
// {
// equipmentId: '123213213123232',// 璁惧ID
@@ -190,6 +192,7 @@
)})`
this.$refs.deviceContainerRef.style.height = (this.windowHeight - this.pageHeaderHeight) + 'px'
+ this.parentH = this.windowHeight - this.pageHeaderHeight
this.parentLimitation = true // 鍦ㄧ埗鍏冪礌楂樺害璁剧疆鍚庡啀璁剧疆闄愬埗鎷栨嫿鍖哄煙锛屼笉杩欐牱鏈夋鐜囧鑷寸埗鍏冪礌楂樺害鏈缃氨闄愬埗鎷栨嫿
})
},
@@ -277,7 +280,6 @@
openDetail(item) {
if (!this.isSwitchChecked) {
if (item.equipmentStatus == 0) {
- // this.$message.warn("璁惧澶勪簬鍏虫満鐘舵�侊紒");
this.$message.warning('璁惧澶勪簬鍏虫満鐘舵�侊紒')
return false
}
@@ -295,7 +297,8 @@
* 娴忚鍣ㄥ昂瀵稿彂鐢熸敼鍙樻椂瑙﹀彂
*/
handleWindowSizeChange() {
- if (this.isFullScreen) location.reload() // 濡傛灉椤甸潰杩涘叆鏃朵负鍏ㄥ睆妯″紡锛屽垯鍦ㄥ垏鎹㈡ā寮忔椂閲嶆柊鍔犺浇椤甸潰浠ラ噸鏂拌幏鍙栨祻瑙堝櫒鍙鍖哄煙楂樺害
+ this.isFullScreen = !this.isFullScreen
+ if (!this.isFullScreen) location.reload() // 濡傛灉涓哄叏灞忔ā寮忥紝鍒欏湪鍒囨崲妯″紡鏃堕噸鏂板姞杞介〉闈互閲嶆柊鑾峰彇娴忚鍣ㄥ彲瑙嗗尯鍩熼珮搴�
}
},
created() {
@@ -359,10 +362,6 @@
justify-content: space-between;
.single-status-info {
- /*width: 70px;*/
- /*display: flex;*/
- /*align-items: center;*/
- /*justify-content: space-between;*/
.status-square {
width: 14px;
@@ -376,8 +375,6 @@
.content-container {
width: 100%;
- /*height: calc(100% - 200px);*/
- /*height: 100%;*/
background-repeat: no-repeat;
background-size: 100% 100%;
--
Gitblit v1.9.3