From fd4187118da32fb956588762bd58469857a49927 Mon Sep 17 00:00:00 2001
From: caill <815519168@qq.com>
Date: Thu, 28 Dec 2023 09:59:32 +0800
Subject: [PATCH] =?UTF-8?q?=E6=98=BE=E7=A4=BA1080=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/App.vue                                    | 12 ++++++------
 src/assets/css/reset.css                       |  4 ++--
 src/pages/shunhe/LogisticsProcess/index.vue    | 10 +++++-----
 src/pages/shunhe/LogisticsProcess/workshop.vue |  6 +++---
 4 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index 3133a1f..00f60e9 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -23,12 +23,12 @@ export default {
     ...mapGetters(['showToast', 'showAlert'])
   },
   mounted () {
-    // const htmlStyle = document.getElementsByTagName('html')[0].style
-    // if (window.screen.height <= 1080) {
-    //   htmlStyle.height = 1080
-    // } else {
-    //   htmlStyle.height = 1200
-    // }
+    const htmlStyle = document.getElementsByTagName('html')[0].style
+    if (window.screen.height <= 1080) {
+      htmlStyle.height = 1080
+    } else {
+      htmlStyle.height = 1200
+    }
   }
 }
 </script>
diff --git a/src/assets/css/reset.css b/src/assets/css/reset.css
index af6fe4e..5ba0457 100644
--- a/src/assets/css/reset.css
+++ b/src/assets/css/reset.css
@@ -82,9 +82,9 @@ li {
 /* 顺安大屏尺寸1920*1200 */
 html, body {
      width: 1920px;
-     height: 1200px;
+     /* height: 1200px; */
      /* height: 1080px; */
-     /* height: 100%; */
+     height: 100%;
 }
  
 body {
diff --git a/src/pages/shunhe/LogisticsProcess/index.vue b/src/pages/shunhe/LogisticsProcess/index.vue
index 4be656e..ab3267e 100644
--- a/src/pages/shunhe/LogisticsProcess/index.vue
+++ b/src/pages/shunhe/LogisticsProcess/index.vue
@@ -283,11 +283,11 @@ export default {
     clearInterval(this.timer1)
     clearInterval(this.timer2)
     this.refresh()
-    // if (window.screen.height <= 1080) {
-    //   this.$refs.container.style.paddingTop = '0.8%'
-    //   this.$refs.container.style.height = '90%'
-    //   this.$refs.bottom.style.height = '2%'
-    // }
+    if (window.screen.height <= 1080) {
+      this.$refs.container.style.paddingTop = '0.8%'
+      this.$refs.container.style.height = '90%'
+      this.$refs.bottom.style.height = '2%'
+    }
   },
   beforeDestroy () {
     this.$once('hook:beforeDestroy', () => {
diff --git a/src/pages/shunhe/LogisticsProcess/workshop.vue b/src/pages/shunhe/LogisticsProcess/workshop.vue
index 950a9e0..ac56125 100644
--- a/src/pages/shunhe/LogisticsProcess/workshop.vue
+++ b/src/pages/shunhe/LogisticsProcess/workshop.vue
@@ -651,15 +651,15 @@
 
 <script>
 import TCanvas1 from './canvas_1.vue'
-// import TCanvas2 from './canvas_2.vue'
+import TCanvas2 from './canvas_2.vue'
 import DevicePop from '@components/devicepop.vue'
 import {homepageEquipment} from '@js/getData2.js'
 // import {homepageEquipment} from '@js/mork2.js'
 export default {
   name: 'workshop',
   components: {
-    // TCanvas: window.screen.height <= 1080 ? TCanvas2 : TCanvas1,
-    TCanvas: TCanvas1,
+    TCanvas: window.screen.height <= 1080 ? TCanvas2 : TCanvas1,
+    // TCanvas: TCanvas1,
     DevicePop: DevicePop
   },
   data () {