From 42ec1e6f397f5dea9fa1f2448db34fe1a05403e0 Mon Sep 17 00:00:00 2001
From: xiangxy <shione_xxy@163.com>
Date: Mon, 1 Aug 2022 10:21:20 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=98=BE=E7=A4=BA=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/DeviceScreen.vue | 42 +++++++++++++++++++++-----------------
 1 file changed, 23 insertions(+), 19 deletions(-)

diff --git a/src/pages/DeviceScreen.vue b/src/pages/DeviceScreen.vue
index 82ddea1..6535a26 100644
--- a/src/pages/DeviceScreen.vue
+++ b/src/pages/DeviceScreen.vue
@@ -151,10 +151,10 @@
                 <li>设备名称</li>
                 <li>设备大类</li>
                 <li>设备状态</li>
-                <li>产量</li>
+                <!-- <li>产量</li> -->
                 <li>开机时间</li>
                 <li>关机时间</li>
-                <li>生产日期</li>
+                <!-- <li>生产日期</li> -->
               </ul>
               <div class="scroll_container_1 scroll_container_3" v-if="array1.length">
                 <vue-seamless-scroll :data="array1" :class-option="defaultOption1">
@@ -164,10 +164,10 @@
                       <div class="scroll-ul_1_div">{{e.device_name}}</div>
                       <div class="scroll-ul_1_div">{{e.workprocedure_name}}</div>
                       <div class="scroll-ul_1_div scroll-ul_1_div4"><span :style="{'background-color': e.color}"></span><i>{{e.device_status}}</i></div>
-                      <div class="scroll-ul_1_div">{{e.product_qty}}</div>
+                      <!-- <div class="scroll-ul_1_div">{{e.product_qty}}</div> -->
                       <div class="scroll-ul_1_div">{{e.start_time}}</div>
                       <div class="scroll-ul_1_div">{{e.end_time}}</div>
-                      <div class="scroll-ul_1_div">{{e.product_time}}</div>
+                      <!-- <div class="scroll-ul_1_div">{{e.product_time}}</div> -->
                     </li>
                   </ul>
               </vue-seamless-scroll>
@@ -365,7 +365,7 @@ export default {
       // array2: [{material_code: '01'}, {material_code: '01'}, {material_code: '01'}, {material_code: '01'}],
       array1: [],
       array2: [],
-      num: 8
+      num: 800
     }
   },
   computed: {
@@ -468,16 +468,16 @@ export default {
         grid: [
           {
             left: '8%',
-            top: '12%',
+            top: '5%',
             right: '5%',
-            bottom: '8%',
+            bottom: '0%',
             containLabel: true
           },
           {
             left: '10%',
-            top: '12%',
+            top: '5%',
             right: '5%',
-            bottom: '8%',
+            bottom: '0%',
             containLabel: true
           }
         ],
@@ -1205,7 +1205,7 @@ export default {
             show: false, // 为true滚动条出现
             type: 'slider', // type:'inside'，滚动条在最下面，鼠标点击滚动
             startValue: 0, // 从头开始。
-            endValue: 6 // end百分比显示范围，endValue具体显示几个数值
+            endValue: 8 // end百分比显示范围，endValue具体显示几个数值
           }
         ],
         grid: {
@@ -1645,7 +1645,7 @@ export default {
       if (type === 2) {
         this.timeOut2 = setInterval(() => {
           if (Number(option.dataZoom[0].endValue) === option.series[0].data.length - 1) {
-            option.dataZoom[0].endValue = 6
+            option.dataZoom[0].endValue = 8
             option.dataZoom[0].startValue = 0
           } else {
             option.dataZoom[0].endValue = option.dataZoom[0].endValue + 1
@@ -1942,12 +1942,12 @@ header
   background center bottom / 1.02rem .03rem url(../assets/images/screen1/line_1.png) no-repeat
 .item_content_1_inner_2_p1
   float left
-  margin 0.26rem 0 0 0.08rem
+  margin 0.17rem 0 0 0.08rem
   font-family "SourceHanSansCN"
   _font(.14rem, .14rem, #84B0DA, 700, left)
 .item_content_1_inner_2_p2
   float right
-  margin 0.26rem 0.08rem 0 0
+  margin 0.15rem 0.08rem 0 0
   font-family "SourceHanSansCN"
   _font(.18rem, .18rem, #FFFFFF, 700, right)
 .item_wrap_1
@@ -1973,7 +1973,7 @@ header
   border-bottom .01rem solid rgba(8,205,248,0.3)
   li
     float left
-    width 12.2%
+    width 15%
     _font(.14rem,.4rem,#78B1DE,,center)
     word-wrap break-word
     word-break break-all
@@ -1981,8 +1981,10 @@ header
     padding 0 .02rem
     overflow hidden
     box-sizing border-box
-    &:nth-child(8)
-      width 13.2%
+    &:nth-child(5)
+      width 20%
+    &:nth-child(6)
+      width 20%
 .scroll_container_1
   width 100%
   height calc(100% - .4rem)
@@ -1996,7 +1998,7 @@ header
       box-shadow inset 0px 1px 0px 0px rgba(13,89,115,0.3)
     .scroll-ul_1_div
       float left
-      _wh(12.2%, .4rem)
+      _wh(15%, .4rem)
       _fj(center)
       _font(.14rem, .4rem, #fff,,center)
       word-wrap break-word
@@ -2004,8 +2006,10 @@ header
       white-space nowrap
       padding 0 .02rem
       overflow hidden
-      &:nth-child(8)
-        width 13.2%
+      &:nth-child(5)
+        width 20%
+      &:nth-child(6)
+        width 20%
       &:nth-child(4)
         // text-align left
         span