From 1dd58f69fa1daedfc7ffa2b16b1646246a7c40f7 Mon Sep 17 00:00:00 2001
From: xiangxy <shione_xxy@163.com>
Date: Wed, 3 Aug 2022 09:03:22 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/pages/DeviceScreen.vue b/src/pages/DeviceScreen.vue
index f07f32c..c5574a5 100644
--- a/src/pages/DeviceScreen.vue
+++ b/src/pages/DeviceScreen.vue
@@ -181,7 +181,7 @@
         <div class="item_content_4">
           <div class="scroll_wrap">
             <ul class="scroll_tab_2">
-              <li>编号</li>
+              <!-- <li>编号</li> -->
               <li>名称</li>
               <li>报警原因</li>
               <li>报警时间</li>
@@ -190,7 +190,7 @@
               <vue-seamless-scroll :data="array2" :class-option="defaultOption2">
                 <ul class="scroll-ul_2">
                   <li v-for="(e, i) in array2" :key="i">
-                    <div class="scroll-ul_2_div">{{e.device_code}}</div>
+                    <!-- <div class="scroll-ul_2_div">{{e.device_code}}</div> -->
                     <div class="scroll-ul_2_div">{{e.device_name}}</div>
                     <div class="scroll-ul_2_div">{{e.err_name}}</div>
                     <div class="scroll-ul_2_div">{{e.start_time}}</div>
@@ -459,7 +459,7 @@ export default {
       this.week = `${week}`
     },
     setEchart08 () {
-      var dataLine = this.data06_d1
+      var dataLine = this.data06_d1.sort()
       let numMax = Math.max.apply(null, dataLine)
       let manNum = numMax + 1
       let positionLeft = 0.4
@@ -503,7 +503,7 @@ export default {
                 fontSize: '12'
               }
             },
-            data: this.data06_d0
+            data: this.data06_d0.reverse() // 数组倒序排列
             // data: ['设备01', '设备02', '设备03', '设备04', '设备05']
           },
           {
@@ -690,7 +690,7 @@ export default {
             show: false, // 为true滚动条出现
             type: 'slider', // type:'inside'，滚动条在最下面，鼠标点击滚动
             startValue: 0, // 从头开始。
-            endValue: 2 // end百分比显示范围，endValue具体显示几个数值
+            endValue: 3 // end百分比显示范围，endValue具体显示几个数值
           }
         ],
         grid: {
@@ -729,7 +729,7 @@ export default {
             interval: 0,
             textStyle: {
               color: '#8FABBF',
-              fontSize: 14
+              fontSize: 12
             }
           },
           data: this.xData
@@ -746,7 +746,7 @@ export default {
           axisLabel: {
             textStyle: {
               color: '#8FABBF',
-              fontSize: 14
+              fontSize: 12
             }
           },
           splitLine: {
@@ -891,7 +891,7 @@ export default {
             interval: 0,
             textStyle: {
               color: '#8FABBF',
-              fontSize: 14
+              fontSize: 12
             }
           },
           data: ['设备综合效率OEE', '产能利用效率TEEP']
@@ -909,7 +909,7 @@ export default {
             formatter: '{value} %',
             textStyle: {
               color: '#8FABBF',
-              fontSize: 14
+              fontSize: 12
             }
           },
           splitLine: {
@@ -1062,7 +1062,7 @@ export default {
           itemGap: 30.86,
           itemWidth: 14.16,
           itemHeight: 7.38,
-          data: [{name: '运行设备', itemStyle: {color: '#0E90FD'}}, {name: '暂未生产设备', itemStyle: {color: '#07E083'}}, {name: '关机设备', itemStyle: {color: '#EAAD24'}}, {name: '故障设备', itemStyle: {color: '#CC6060'}}]
+          data: [{name: '运行设备', itemStyle: {color: '#0E90FD'}}, {name: '暂未生产设备', itemStyle: {color: '#07E083'}}, {name: '空闲设备', itemStyle: {color: '#EAAD24'}}, {name: '故障设备', itemStyle: {color: '#CC6060'}}]
         },
         xAxis: {
           type: 'category',
@@ -1161,7 +1161,7 @@ export default {
             // data: ['230', '230', '230', '230', '230', '230']
           },
           {
-            name: '关机设备',
+            name: '空闲设备',
             type: 'bar',
             barWidth: '8',
             barGap: '100%', // 柱图间距
@@ -1458,7 +1458,7 @@ export default {
       if (type === 1) {
         this.timeOut1 = setInterval(() => {
           if (Number(option.dataZoom[0].endValue) === option.series[0].data.length - 1) {
-            option.dataZoom[0].endValue = 2
+            option.dataZoom[0].endValue = 3
             option.dataZoom[0].startValue = 0
           } else {
             option.dataZoom[0].endValue = option.dataZoom[0].endValue + 1
@@ -1841,7 +1841,7 @@ header
   border-bottom .01rem solid rgba(8,205,248,0.3)
   li
     float left
-    width 18%
+    width 20%
     _font(.14rem,.4rem,#78B1DE,,center)
     word-wrap break-word
     word-break break-all
@@ -1849,8 +1849,10 @@ header
     padding 0 .02rem
     overflow hidden
     box-sizing border-box
-    &:nth-child(4)
-      width 46%
+    &:nth-child(2)
+      width 42%
+    &:nth-child(3)
+      width 38%
 .scroll_container_2
   width 100%
   height calc(100% - .4rem)
@@ -1864,7 +1866,7 @@ header
       box-shadow inset 0px 1px 0px 0px rgba(13,89,115,0.3)
     .scroll-ul_2_div
       float left
-      _wh(18%, .44rem)
+      _wh(20%, .44rem)
       _fj(center)
       _font(.12rem, .44rem, #fff,,center)
       word-wrap break-word
@@ -1872,10 +1874,13 @@ header
       white-space nowrap
       padding 0 .02rem
       overflow hidden
-      &:nth-child(4)
+      &:nth-child(2)
         font-size .12rem
-        width 46%
-        _fj(left)
+        width 42%
+      &:nth-child(3)
+        font-size .12rem
+        width 38%
+        // _fj(left)
         _font(.12rem, .44rem, #fff,,left)
         word-wrap break-word
         word-break break-all