From ae3ad906ed4b09f72fc716957c4dbbe16341b38f Mon Sep 17 00:00:00 2001
From: zhuzhuanzhuan
Date: 星期二, 26 十二月 2023 11:39:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/views/WorkshopSignage.vue |   26 ++++++++++++++------------
 1 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/src/views/WorkshopSignage.vue b/src/views/WorkshopSignage.vue
index 645ebbd..53d8115 100644
--- a/src/views/WorkshopSignage.vue
+++ b/src/views/WorkshopSignage.vue
@@ -1,6 +1,6 @@
 <template>
   <dv-full-screen-container class="full-screen-container">
-    <header class="page-header">
+    <header class="page-header" :style="{height: pageHeaderHeight+'px'}">
       {{ workshopDetails.workshopName }}
       <div class="header-left" v-has="'home:saveDevicePositionAndSize'">
         <a-space>
@@ -77,7 +77,6 @@
             </div>
           </div>
         </VueDragResize>
-
       </div>
     </dv-border-box-8>
 
@@ -103,6 +102,11 @@
     },
     data() {
       return {
+        pageHeaderHeight: 80,// 椤靛ご楂樺害
+        taskBarHeight: window.screen.height - window.screen.availHeight,// 灞忓箷搴曢儴浠诲姟鏍忛珮搴�
+        utilsBarHeight: window.outerHeight - window.innerHeight,// 娴忚鍣ㄥ伐鍏锋爮楂樺害
+        normalPageHeight: 0,
+        fullScreenPageHeight: 0,
         workshopDetails: {}, //  杞﹂棿璇︾粏淇℃伅,
         isDraggable: false, // 鏄惁寮�鍚嫋鎷�
         isResizable: false, // 鏄惁寮�鍚缉鏀�
@@ -141,7 +145,7 @@
             value: 22,
             color: '#FF0000'
           }
-        ] // 璁惧鐘舵�佹寚绀虹伅鍒楄〃
+        ]// 璁惧鐘舵�佹寚绀虹伅鍒楄〃锛�
       }
     },
     watch: {
@@ -185,8 +189,7 @@
           this.$refs.deviceContainerRef.style.backgroundImage = `url(${this.getImgView(
             this.workshopDetails.backgroundImage
           )})`
-
-
+          this.$refs.deviceContainerRef.style.height = this.normalPageHeight
         })
       },
 
@@ -286,9 +289,10 @@
           // },1000*10)
         }
       }
-
     },
     created() {
+      if (this.utilsBarHeight > 0) this.normalPageHeight = `calc(100% - ${this.pageHeaderHeight}px - ${this.taskBarHeight}px - ${this.utilsBarHeight}px)`
+      else this.normalPageHeight = `calc(100% - ${this.pageHeaderHeight}px - ${this.taskBarHeight}px - 87px)`
       if (this.$route.params.id) {
         this.getDeviceListByApi(this.$route.params.id)
         this.getWorkshopDetailsByApi(this.$route.params.id)
@@ -299,7 +303,7 @@
       document.onselectstart = () => false
     },
     beforeDestroy() {
-      // 纭繚閿�姣佸畾鏃跺櫒鍙婂洖鏀惰祫婧�
+      // 纭繚閿�姣佸畾鏃跺櫒銆佷簨浠跺強鍥炴敹璧勬簮
       clearInterval(this.timingAcquisition)
       this.timingAcquisition = null
     }
@@ -313,7 +317,6 @@
     color: #fff;
 
     .page-header {
-      height: 80px;
       font-size: 50px;
       text-align: center;
       position: relative;
@@ -357,10 +360,10 @@
 
     .content-container {
       width: 100%;
-      height: calc(100% - 80px);
+      /*height: calc(100% - 200px);*/
+      /*height: 100%;*/
       background-repeat: no-repeat;
       background-size: 100% 100%;
-
 
       .single-device {
         position: absolute;
@@ -380,8 +383,7 @@
           width: 100%;
           height: 100%;
           display: flex;
-          align-items:end ;
-
+          align-items: end;
 
           .status-image {
             background-size: 100% 100%;

--
Gitblit v1.9.3