From 26ecfe554c2337bbf4ad36ddece547459340ce1d Mon Sep 17 00:00:00 2001
From: caill <815519168@qq.com>
Date: Sun, 23 Apr 2023 15:40:46 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E7=9B=91=E6=8E=A7=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/DeviceMonitor.vue | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/pages/DeviceMonitor.vue b/src/pages/DeviceMonitor.vue
index b7f7750..cd7e6f3 100644
--- a/src/pages/DeviceMonitor.vue
+++ b/src/pages/DeviceMonitor.vue
@@ -14,7 +14,7 @@
             </div>
             <div class="info_block clearfix">
               <div class="fl info_table_block">
-                <div v-if="e.material_name !== null && e.material_name !== undefined" class="info_table"><p>当前生产：</p></div>
+                <div v-if="e.material_name !== null && e.material_name !== undefined" class="info_table info_table_1"><p>当前生产：</p></div>
                 <div v-if="e.work_time !== null && e.work_time !== undefined" class="info_table"><p>已工作：</p></div>
                 <div v-if="e.real_qty !== null && e.real_qty !== undefined" class="info_table"><p>已生产：</p></div>
                 <div v-if="e.vehicle_qty !== null && e.vehicle_qty !== undefined" class="info_table"><p>当前窑车数：</p></div>
@@ -23,7 +23,7 @@
                 <div v-if="e.device_status_name !== null && e.device_status_name !== undefined" class="info_table"><p>当前状态：</p></div>
               </div>
               <div class="fr info_data_block">
-                <div v-if="e.material_name !== null && e.material_name !== undefined" class="info_data"><p>{{e.material_name}}</p></div>
+                <div v-if="e.material_name !== null && e.material_name !== undefined" class="info_data info_data_1"><p>{{e.material_name}}</p></div>
                 <div v-if="e.work_time !== null && e.work_time !== undefined" class="info_data"><p>{{e.work_time}}小时</p></div>
                 <div v-if="e.real_qty !== null && e.real_qty !== undefined" class="info_data"><p>{{e.real_qty}}KG</p></div>
                 <div v-if="e.vehicle_qty !== null && e.vehicle_qty !== undefined" class="info_data"><p>{{e.vehicle_qty}}车</p></div>
@@ -450,20 +450,22 @@ export default {
   cursor pointer
 .content
   width 100%
-  height calc(100% - 135px)
-  overflow-y auto
-  padding 10px 1rem 0
+  height calc(100% - 100px)
+  padding 0 15px
 .item_tr
   width 100%
+  height 100%
 .item_block
   position relative
-  _wh(180px,209px)
+  _wh(10.5%,calc((100% - 45px) / 4))
   padding 8px 4px
-  margin-bottom 21px
-  margin-right calc((100% - 180px * 9) / 8)
+  margin-bottom 15px
+  margin-right 0.6875%
   background center center / 100% 100% url(../assets/images/bg_item.png) no-repeat
   &:nth-child(9n)
     margin-right 0
+  &:nth-child(n+28):nth-child(-n+36)
+    margin-bottom 0
 .item_inner
   _wh(100%,100%)
 .item_img
@@ -506,6 +508,8 @@ export default {
     white-space nowrap
 .info_table_1
   height 36px
+.info_table_1
+  height 36px
 .info_data
   width 100%
   height 18px
@@ -519,10 +523,6 @@ export default {
     word-break break-all
 .info_data_1
   height 36px
-  p
-    letter-spacing -1px
-    transform scale(0.9)
-    transform-origin center center
 .popover_block
   position absolute
   left 0
@@ -635,7 +635,7 @@ export default {
         border-bottom none
 .tag_block
   position fixed
-  bottom 25px
+  bottom 10px
   right 54px
 .tag_type
   display inline-block