From 9ecf652fd73d3b789571ee32637ab1c89081fef4 Mon Sep 17 00:00:00 2001
From: caill <815519168@qq.com>
Date: Thu, 9 Nov 2023 16:54:10 +0800
Subject: [PATCH] =?UTF-8?q?=E7=89=A9=E6=B5=81=E5=B7=A5=E8=89=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/App.vue                                          |  8 ++++++++
 src/assets/css/reset.css                             |  7 +------
 .../LogisticsProcess/{canvas.vue => canvas_1.vue}    |  0
 src/pages/shunhe/LogisticsProcess/index.vue          |  6 +++---
 src/pages/shunhe/LogisticsProcess/workshop.vue       | 12 ++++++------
 5 files changed, 18 insertions(+), 15 deletions(-)
 rename src/pages/shunhe/LogisticsProcess/{canvas.vue => canvas_1.vue} (100%)

diff --git a/src/App.vue b/src/App.vue
index e9fb7c5..00f60e9 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -21,6 +21,14 @@ export default {
   },
   computed: {
     ...mapGetters(['showToast', 'showAlert'])
+  },
+  mounted () {
+    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 cdd533c..eae30bf 100644
--- a/src/assets/css/reset.css
+++ b/src/assets/css/reset.css
@@ -81,13 +81,8 @@ li {
 
 /* 顺安大屏尺寸1920*1200 */
 html, body {
-     /* width: 100%;
-     height: 100%; */
      width: 1920px;
-     height: 1200px; 
-     /* 顺和大屏尺寸 */
-     /* height: 1080px;  */
-     /* 顺和看板尺寸 */
+     height: 100%;
 }
  
 body {
diff --git a/src/pages/shunhe/LogisticsProcess/canvas.vue b/src/pages/shunhe/LogisticsProcess/canvas_1.vue
similarity index 100%
rename from src/pages/shunhe/LogisticsProcess/canvas.vue
rename to src/pages/shunhe/LogisticsProcess/canvas_1.vue
diff --git a/src/pages/shunhe/LogisticsProcess/index.vue b/src/pages/shunhe/LogisticsProcess/index.vue
index 16c06b0..98d248a 100644
--- a/src/pages/shunhe/LogisticsProcess/index.vue
+++ b/src/pages/shunhe/LogisticsProcess/index.vue
@@ -32,7 +32,7 @@
         <div class="right_wrap">
           <div class="item_wrap">
             <div class="item_tip">
-              <div class="item_tip_left">当日工序生产统计</div>
+              <div class="item_tip_left">工序生产统计</div>
             </div>
             <div class="item_content_1 item_content_3">
               <div class="item_inner_wrap">
@@ -232,7 +232,7 @@
 
 <script>
 import THeader from '@components/header.vue'
-import TWorkshop from './workshop.vue'
+import TWorkshop from './workshop'
 // import {homepageData} from '@js/getData2.js'
 import {homepageData} from '@js/mork2.js'
 export default {
@@ -681,7 +681,7 @@ export default {
       this.currentMonth = res.monthlyFailureStatistics.currentMonth
       this.average = res.monthlyFailureStatistics.average
       this.setEchart2()
-      // 当日工序生产统计
+      // 工序生产统计
       this.mix = res.dailyProductionStatistics.mix
       this.stand = res.dailyProductionStatistics.stand
       this.press = res.dailyProductionStatistics.press
diff --git a/src/pages/shunhe/LogisticsProcess/workshop.vue b/src/pages/shunhe/LogisticsProcess/workshop.vue
index d57733c..d0d9c31 100644
--- a/src/pages/shunhe/LogisticsProcess/workshop.vue
+++ b/src/pages/shunhe/LogisticsProcess/workshop.vue
@@ -121,7 +121,7 @@
               @closePop="closePop"
             ></device-pop>
           </div>
-          <div class="yao_layer3" :style="{background: ['#11ff0d', '#fdfd0f', '#bfbfbf', '#ff1016'][Number(e.status) - 1]}">
+          <div class="yao_layer3" :style="{background: ['#11ff0d', '#11ff0d', '#bfbfbf', '#11ff0d'][Number(e.status) - 1]}">
           </div>
           <div class="yao_layer4"></div>
           <div class="yao_layer4 yao_layer5"></div>
@@ -190,9 +190,9 @@
           <!-- <img class="device_img" src="../../../assets/images/device/ltssj_green.png" alt=""> -->
           <div class="ltssj" v-for="e in  conveyorLine" :key="e.equipment">
             <img v-show="e.status === 1" class="device_img" src="../../../assets/images/device/ktpv_green.png" alt="" @click="getInfo(e)">
-            <img v-show="e.status === 2" class="device_img" src="../../../assets/images/device/ktpv_yellow.png" alt="" @click="getInfo(e)">
+            <img v-show="e.status === 2" class="device_img" src="../../../assets/images/device/ktpv_green.png" alt="" @click="getInfo(e)">
             <img v-show="e.status === 3" class="device_img" src="../../../assets/images/device/ktpv_gray.png" alt="" @click="getInfo(e)">
-            <img v-show="e.status === 4" class="device_img" src="../../../assets/images/device/ktpv_red.png" alt="" @click="getInfo(e)">
+            <img v-show="e.status === 4" class="device_img" src="../../../assets/images/device/ktpv_green.png" alt="" @click="getInfo(e)">
             <device-pop
               type="ssx"
               :pkId="pkId"
@@ -650,15 +650,15 @@
 </template>
 
 <script>
-import TCanvas from './canvas.vue'
+import TCanvas from './canvas_1.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,
-    DevicePop
+    TCanvas: TCanvas,
+    DevicePop: DevicePop
   },
   data () {
     return {