From d905c9dd73ff7bcfdb125c0d076f9fdb41b83c30 Mon Sep 17 00:00:00 2001
From: caill <815519168@qq.com>
Date: Tue, 13 Aug 2024 16:28:08 +0800
Subject: [PATCH] =?UTF-8?q?=E9=9C=80=E6=B1=82=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/Setup.vue           |  2 +-
 src/pages/modules/InStore.vue | 37 ++++++++++++++++++-----------------
 2 files changed, 20 insertions(+), 19 deletions(-)

diff --git a/src/pages/Setup.vue b/src/pages/Setup.vue
index ac9524d..df8879f 100644
--- a/src/pages/Setup.vue
+++ b/src/pages/Setup.vue
@@ -68,7 +68,7 @@ export default {
     return {
       loginname: '',
       password: '',
-      options: [{value: '1', label: '称重'}, {value: '2', label: '入库'}, {value: '3', label: '生产'}],
+      options: [{value: '1', label: '称重'}, {value: '2', label: '晶棒库'}, {value: '3', label: '回温库'}],
       value: this.$store.getters.equipId,
       baseUrl: this.$store.getters.baseUrl,
       setTime: this.$store.getters.setTime / 1000,
diff --git a/src/pages/modules/InStore.vue b/src/pages/modules/InStore.vue
index 2fa663a..6fd9d1a 100644
--- a/src/pages/modules/InStore.vue
+++ b/src/pages/modules/InStore.vue
@@ -11,23 +11,25 @@
               <div class="item_content">
                 <div class="scroll_wrap">
                   <ul class="scroll_tab_1">
-                    <li style="width: 22%;">客户名称</li>
-                    <li style="width: 22%">规格型号</li>
-                    <li style="width: 14%">总根数</li>
-                    <li style="width: 14%">总托数</li>
-                    <li style="width: 14%">总重量</li>
-                    <li style="width: 14%">总长度</li>
+                    <li style="width: 20%;">客户名称</li>
+                    <li style="width: 20%">规格型号</li>
+                    <li style="width: 8%">总根数</li>
+                    <li style="width: 8%">总托数</li>
+                    <li style="width: 13%">总重量/吨</li>
+                    <li style="width: 13%">总长度/毫米</li>
+                    <li style="width: 18%">批次</li>
                   </ul>
                   <div class="scroll_container_1">
                     <vue-seamless-scroll :data="kc.list" :class-option="defaultOption1">
                       <ul class="scroll-ul_1">
                         <li v-for="(e, i) in kc.list" :key="i">
-                          <div class="scroll-ul_2_div" style="width: 22%;">{{e.supplierName}}</div>
-                          <div class="scroll-ul_2_div" style="width: 22%">{{e.productDescription}}</div>
-                          <div class="scroll-ul_2_div" style="width: 14%">{{e.count1}}</div>
-                          <div class="scroll-ul_2_div" style="width: 14%">{{e.count2}}</div>
-                          <div class="scroll-ul_2_div" style="width: 14%">{{e.count3}}<span>吨</span></div>
-                          <div class="scroll-ul_2_div" style="width: 14%">{{e.count4}}<span>毫米</span></div>
+                          <div class="scroll-ul_2_div" style="width: 20%;">{{e.supplierName}}</div>
+                          <div class="scroll-ul_2_div" style="width: 20%">{{e.productDescription}}</div>
+                          <div class="scroll-ul_2_div" style="width: 8%">{{e.count1}}</div>
+                          <div class="scroll-ul_2_div" style="width: 8%">{{e.count2}}</div>
+                          <div class="scroll-ul_2_div" style="width: 13%">{{e.count3}}</div>
+                          <div class="scroll-ul_2_div" style="width: 13%">{{e.count4}}</div>
+                          <div class="scroll-ul_2_div" style="width: 18%">{{e.ingotBatch}}</div>
                         </li>
                       </ul>
                     </vue-seamless-scroll>
@@ -167,7 +169,7 @@ export default {
     defaultOption1 () {
       return {
         step: 0.4, // 数值越大速度滚动越快
-        limitMoveNum: 4, // 开始无缝滚动的数据量 this.dataList.length
+        limitMoveNum: 5, // 开始无缝滚动的数据量 this.dataList.length
         hoverStop: true, // 是否开启鼠标悬停stop
         direction: 1, // 0向下 1向上 2向左 3向右
         openWatch: true, // 开启数据实时监控刷新dom
@@ -254,9 +256,9 @@ export default {
   color #FF0000 !important
 .four_wrap
   height 100%
-  width 34%
+  width 32%
 .four_wrap_1
-  width 65%
+  width 67%
 .scroll-ul_1
   width 100%
   li
@@ -339,9 +341,8 @@ export default {
         line-height: 13px;
         text-align: center;
         color: #fff;
-        padding 0 2px
-        word-wrap break-word
-        overflow-wrap break-word
+        padding 0 5px
+        word-break break-all
 .scroll_container_2
     width 100%
     overflow hidden