From dd504b9715596f27c5720232f0dadc82432e5175 Mon Sep 17 00:00:00 2001
From: xiangxy <shione_xxy@163.com>
Date: Thu, 29 Jun 2023 10:22:44 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=B7=E6=96=99=E6=8A=A5=E8=A1=A8=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/modules/hunniankunliao/two.vue | 32 +++++++++++++-----------
 1 file changed, 18 insertions(+), 14 deletions(-)

diff --git a/src/pages/modules/hunniankunliao/two.vue b/src/pages/modules/hunniankunliao/two.vue
index f86dcbe..924e707 100644
--- a/src/pages/modules/hunniankunliao/two.vue
+++ b/src/pages/modules/hunniankunliao/two.vue
@@ -276,9 +276,10 @@
                             <div class="scroll_wrap">
                                 <ul class="scroll_tab_1">
                                     <li>货位</li>
-                                    <li>BOM号</li>
+                                    <li style="width: 10%">BOM号</li>
+                                    <li style="width: 14%">设备名称</li>
                                     <li>物料名称</li>
-                                    <li>重量</li>
+                                    <li style="width: 7%">重量</li>
                                     <li>载具号</li>
                                     <li style="width: 6%">静置(h)</li>
                                     <li>碾次</li>
@@ -290,9 +291,10 @@
                                             <li v-for="(e, i) in array1" :key="i">
                                                 <!-- <div class="scroll-ul_1_div" :class="['c_gray', 'c_yellow', 'c_green', 'c_red'][Number(e.stand_status_color)]">{{e.point_name}}</div> -->
                                                 <div class="scroll-ul_1_div">{{e.point_name}}</div>
-                                                <div class="scroll-ul_1_div">{{e.bom}}</div>
+                                                <div class="scroll-ul_1_div" style="width: 10%">{{e.bom}}</div>
+                                                <div class="scroll-ul_1_div" style="width: 14%">{{e.device_name}}</div>
                                                 <div class="scroll-ul_1_div">{{e.material_code}}</div>
-                                                <div class="scroll-ul_1_div">{{e.weight}}</div>
+                                                <div class="scroll-ul_1_div" style="width: 7%">{{e.weight}}</div>
                                                 <div class="scroll-ul_1_div">{{e.vehicle_code}}</div>
                                                 <div class="scroll-ul_1_div" style="width: 6%">{{e.standing_time}}</div>
                                                 <div class="scroll-ul_1_div">{{e.mix_num}}</div>
@@ -311,26 +313,28 @@
                         <div class="item_content">
                             <div class="scroll_wrap">
                                 <ul class="scroll_tab_1">
-                                    <li style="width: 6.5%;">类别</li>
-                                    <li>BOM号</li>
+                                    <li style="width: 6%;">类别</li>
+                                    <li style="width: 9%">BOM号</li>
+                                    <li style="width: 14%">设备名称</li>
                                     <li>物料名称</li>
-                                    <li>重量</li>
-                                    <li>载具号</li>
+                                    <li style="width: 8%">重量</li>
+                                    <li style="width: 9%">载具号</li>
                                     <li>碾次</li>
-                                    <li>货位</li>
+                                    <li style="width: 9%">货位</li>
                                     <li style="width: 18%;">出入时间</li>
                                 </ul>
                                 <div class="scroll_container_1">
                                     <vue-seamless-scroll :data="array2" :class-option="defaultOption2">
                                         <ul class="scroll-ul_1">
                                             <li v-for="(e, i) in array2" :key="i">
-                                                <div class="scroll-ul_1_div" style="width: 6.5%;">{{e.io_type}}</div>
-                                                <div class="scroll-ul_1_div">{{e.bom}}</div>
+                                                <div class="scroll-ul_1_div" style="width: 6%;">{{e.io_type}}</div>
+                                                <div class="scroll-ul_1_div" style="width: 9%">{{e.bom}}</div>
+                                                <div class="scroll-ul_1_div" style="width: 14%">{{e.device_name}}</div>
                                                 <div class="scroll-ul_1_div">{{e.material_code}}</div>
-                                                <div class="scroll-ul_1_div">{{e.weight}}</div>
-                                                <div class="scroll-ul_1_div">{{e.vehicle_code}}</div>
+                                                <div class="scroll-ul_1_div" style="width: 8%">{{e.weight}}</div>
+                                                <div class="scroll-ul_1_div" style="width: 9%">{{e.vehicle_code}}</div>
                                                 <div class="scroll-ul_1_div">{{e.mix_num}}</div>
-                                                <div class="scroll-ul_1_div">{{e.point_code}}</div>
+                                                <div class="scroll-ul_1_div" style="width: 9%">{{e.point_code}}</div>
                                                 <div class="scroll-ul_1_div" style="width: 18%;">{{e.create_time}}</div>
                                             </li>
                                         </ul>