From 08653ff6eaaef0dcb3b4984fae6250496981ff32 Mon Sep 17 00:00:00 2001
From: caill <815519168@qq.com>
Date: Mon, 28 Aug 2023 10:47:35 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=86=E8=BE=A8=E7=8E=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/css/reset.css              |  4 +-
 src/components/workshop.vue           | 26 ++++++-------
 src/pages/shunhe/LogisticsProcess.vue | 56 +++++++++++++--------------
 3 files changed, 43 insertions(+), 43 deletions(-)

diff --git a/src/assets/css/reset.css b/src/assets/css/reset.css
index 5856344..5e8eb07 100644
--- a/src/assets/css/reset.css
+++ b/src/assets/css/reset.css
@@ -79,14 +79,14 @@ li {
      -webkit-border-radius: 6px;
 }
 
-/* 顺和大屏尺寸1920*1040 */
+/* 顺和大屏尺寸1920*1200 */
 html, body {
      /* width: 100%;
      height: 100%;
      min-width: 1440px;
      min-height: 1040px; */
      width: 1920px;
-     height: 1040px;
+     height: 1200px;
 }
  
 body {
diff --git a/src/components/workshop.vue b/src/components/workshop.vue
index 2228f13..950f69e 100644
--- a/src/components/workshop.vue
+++ b/src/components/workshop.vue
@@ -123,7 +123,7 @@
         <div class="p_device ssj_wrap_1 ssj_wrap_2">
           <img class="device_img" src="../assets/images/device/ssj_gray.png" alt="">
         </div>
-        <div class="p_device ktp_cmd_wrap" v-for="(e, i) in sunloadLocation" :key="i" :class="'ktp_cmd_wrap_' + (i + 1)">
+        <div class="p_device ktp_cmd_wrap" v-for="(e, i) in loadLocation" :key="i" :class="'ktp_cmd_wrap_' + (i + 1)">
           <img v-show="e.status === '1'" class="device_img" src="../assets/images/device/ktpv_green.png" alt="">
           <img v-show="e.status === '2'" class="device_img" src="../assets/images/device/ktpv_yellow.png" alt="">
           <img v-show="e.status === '3'" class="device_img" src="../assets/images/device/ktpv_gray.png" alt="">
@@ -141,18 +141,18 @@
           <img v-show="palletizingRobot.status === '3'" class="device_img" src="../assets/images/device/robot_cmd_gray.png" alt="">
           <img v-show="palletizingRobot.status === '4'" class="device_img" src="../assets/images/device/robot_cmd_red.png" alt="">
         </div>
-        <div class="p_device ktp_cmd_wrap" v-for="(e, i) in loadLocation" :key="e.equipment" :class="'ktp_cmd_wrap_' + (i + 3)">
-          <img v-show="e.status === '1'" class="device_img" src="../assets/images/device/ktpv_green.png" alt="">
-          <img v-show="e.status === '2'" class="device_img" src="../assets/images/device/ktpv_yellow.png" alt="">
-          <img v-show="e.status === '3'" class="device_img" src="../assets/images/device/ktpv_gray.png" alt="">
-          <img v-show="e.status === '4'" class="device_img" src="../assets/images/device/ktpv_red.png" alt="">
-        </div>
         <div class="p_device fmjxt_wrap">
           <img v-show="laminatingMachine.status === '1'" class="device_img" src="../assets/images/device/fmjxt_green.png" alt="">
           <img v-show="laminatingMachine.status === '2'" class="device_img" src="../assets/images/device/fmjxt_yellow.png" alt="">
           <img v-show="laminatingMachine.status === '3'" class="device_img" src="../assets/images/device/fmjxt_gray.png" alt="">
           <img v-show="laminatingMachine.status === '4'" class="device_img" src="../assets/images/device/fmjxt_red.png" alt="">
         </div>
+        <div class="p_device ktp_cmd_wrap" v-for="(e, i) in sunloadLocation" :key="e.equipment" :class="'ktp_cmd_wrap_' + (i + 3)">
+          <img v-show="e.status === '1'" class="device_img" src="../assets/images/device/ktpv_green.png" alt="">
+          <img v-show="e.status === '2'" class="device_img" src="../assets/images/device/ktpv_yellow.png" alt="">
+          <img v-show="e.status === '3'" class="device_img" src="../assets/images/device/ktpv_gray.png" alt="">
+          <img v-show="e.status === '4'" class="device_img" src="../assets/images/device/ktpv_red.png" alt="">
+        </div>
       </div>
     </div>
     <div class="machine_block machine_block_3">
@@ -595,9 +595,9 @@ export default {
   background-color #ddb528
 .yao_layer3
   position absolute
-  left -10px
+  left -5px
   top 5%
-  _wh(calc(100% + 20px), 90%)
+  _wh(calc(100% + 10px), 90%)
 .yao_1
   left 3%
 .yao_2
@@ -662,11 +662,11 @@ export default {
   left 6%
   top 78%
 .ktp_cmd_wrap_3
-  left 77%
-  top 6%
+  left: 90%;
+  top: 0%;
 .ktp_cmd_wrap_4
-  left 77%
-  top 78%
+  left: 90%;
+  top: 42%;
 .robot_cmd_wrap_1
   _wh(1%, 1%)
   left: 9%;
diff --git a/src/pages/shunhe/LogisticsProcess.vue b/src/pages/shunhe/LogisticsProcess.vue
index 4a54801..3ea76f6 100644
--- a/src/pages/shunhe/LogisticsProcess.vue
+++ b/src/pages/shunhe/LogisticsProcess.vue
@@ -592,34 +592,34 @@ export default {
             borderWidth: 2
           }
           // smooth: true
-        }, { // 滚动点
-          type: 'lines',
-          zIndex: 999,
-          z: 999,
-          // yAxisIndex: 1,
-          coordinateSystem: 'cartesian2d',
-          polyline: true,
-          smooth: true,
-          effect: {
-            show: true,
-            trailLength: 0,
-            period: 10, // 光点滑动速度
-            delay: 2000,
-            symbol: 'circle',
-            color: '#9eefce',
-            symbolSize: 8,
-            shadowBlur: 10,
-            shadowColor: '#9eefce'
-          },
-          lineStyle: {
-            show: false,
-            opacity: 0
-          },
-          data: [{
-            coords: xData.map((item, index) => {
-              return ['' + xData[index], '' + values2[index]]
-            })
-          }]
+        // }, { // 滚动点
+        //   type: 'lines',
+        //   zIndex: 999,
+        //   z: 999,
+        //   // yAxisIndex: 1,
+        //   coordinateSystem: 'cartesian2d',
+        //   polyline: true,
+        //   smooth: true,
+        //   effect: {
+        //     show: true,
+        //     trailLength: 0,
+        //     period: 10, // 光点滑动速度
+        //     delay: 2000,
+        //     symbol: 'circle',
+        //     color: '#9eefce',
+        //     symbolSize: 8,
+        //     shadowBlur: 10,
+        //     shadowColor: '#9eefce'
+        //   },
+        //   lineStyle: {
+        //     show: false,
+        //     opacity: 0
+        //   },
+        //   data: [{
+        //     coords: xData.map((item, index) => {
+        //       return ['' + xData[index], '' + values2[index]]
+        //     })
+        //   }]
         }]
       }
       let echart = document.getElementById('echart_d2')