From c0961ec9d3819f862ac97885e3a144c95aab2b05 Mon Sep 17 00:00:00 2001
From: caill <815519168@qq.com>
Date: Fri, 22 Sep 2023 14:04:11 +0800
Subject: [PATCH] =?UTF-8?q?=E7=9C=8B=E6=9D=BF=E6=89=93=E5=8C=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/css/reset.css             |  5 ++++-
 src/pages/Setup.vue                  |  1 +
 src/pages/shunhe/SortWorkMonitor.vue | 18 +++++++++---------
 3 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/src/assets/css/reset.css b/src/assets/css/reset.css
index 8839f4d..ada25e7 100644
--- a/src/assets/css/reset.css
+++ b/src/assets/css/reset.css
@@ -86,7 +86,10 @@ html, body {
      min-width: 1440px;
      min-height: 1040px; */
      width: 1920px;
-     height: 1200px;
+     height: 1200px; 
+     /* 顺和大屏尺寸 */
+     /* height: 1080px;  */
+     /* 顺和看板尺寸 */
 }
  
 body {
diff --git a/src/pages/Setup.vue b/src/pages/Setup.vue
index f2afbcf..eb61371 100644
--- a/src/pages/Setup.vue
+++ b/src/pages/Setup.vue
@@ -99,6 +99,7 @@ export default {
       }
       this.$store.dispatch('setConfig', obj)
       this.$router.push('/LogisticsProcess')
+      // this.$router.push('/SortWorkMonitor')
       // this.$router.push('/MonitoringScreen')
       // this.$router.push('/HomeScreen')
       // if (this.active === '0') {
diff --git a/src/pages/shunhe/SortWorkMonitor.vue b/src/pages/shunhe/SortWorkMonitor.vue
index b85f4ae..397e698 100644
--- a/src/pages/shunhe/SortWorkMonitor.vue
+++ b/src/pages/shunhe/SortWorkMonitor.vue
@@ -171,14 +171,14 @@ export default {
     // })
   },
   beforeDestroy () {
-    this.$nextTick(() => {
-      const bodyStyle = document.body.style
-      const htmlStyle = document.getElementsByTagName('html')[0].style
-      bodyStyle.width = '1920px'
-      htmlStyle.width = '1920px'
-      bodyStyle.height = '1200px'
-      htmlStyle.height = '1200px'
-    })
+    // this.$nextTick(() => {
+    //   const bodyStyle = document.body.style
+    //   const htmlStyle = document.getElementsByTagName('html')[0].style
+    //   bodyStyle.width = '1920px'
+    //   htmlStyle.width = '1920px'
+    //   bodyStyle.height = '1080px'
+    //   htmlStyle.height = '1080px'
+    // })
   },
   data () {
     return {
@@ -206,7 +206,7 @@ export default {
         timer1: null,
         timer2: null,
         step: 0.4, // 数值越大速度滚动越快
-        limitMoveNum: 7, // 开始无缝滚动的数据量 this.dataList.length
+        limitMoveNum: 6, // 开始无缝滚动的数据量 this.dataList.length
         hoverStop: true, // 是否开启鼠标悬停stop
         direction: 1, // 0向下 1向上 2向左 3向右
         openWatch: true, // 开启数据实时监控刷新dom