From 8d9d79af2fc93d2a5ba592d54ad5b3a3aa056f55 Mon Sep 17 00:00:00 2001
From: xiangxy <shione_xxy@163.com>
Date: Thu, 31 Aug 2023 14:32:44 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=93=E5=82=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/shunhe/StorageMonitor.vue | 35 +++++++++++++++++++++--------
 1 file changed, 26 insertions(+), 9 deletions(-)

diff --git a/src/pages/shunhe/StorageMonitor.vue b/src/pages/shunhe/StorageMonitor.vue
index 3a21326..8bb96db 100644
--- a/src/pages/shunhe/StorageMonitor.vue
+++ b/src/pages/shunhe/StorageMonitor.vue
@@ -393,7 +393,7 @@
             <vue-seamless-scroll :data="array1" :class-option="classOption" class="content-block-scroll">
               <ul class="content-block-scroll-ul">
                 <li v-for="(e, i) in array1" :key="i">
-                  <span>{{e.storageLocation}}</span><span>{{e.materialCode}}</span><span>{{e.materialName}}</span><span>{{e.weight}}</span><span>{{e.standTime}}</span><span>{{e.standStatus}}</span>
+                  <span>{{e.storageLocation}}</span><span>{{e.materialCode}}</span><span>{{e.materialName}}</span><span>{{e.weight}}</span><span>{{e.standTime}}</span><span>{{e.standStatusName}}</span>
                 </li>
               </ul>
             </vue-seamless-scroll>
@@ -550,8 +550,8 @@ export default {
     // }
     classOption () {
       return {
-        step: 0.6, // 数值越大速度滚动越快
-        limitMoveNum: 10, // 开始无缝滚动的数据量 this.dataList.length
+        step: 0.4, // 数值越大速度滚动越快
+        limitMoveNum: 7, // 开始无缝滚动的数据量 this.dataList.length
         hoverStop: true, // 是否开启鼠标悬停stop
         direction: 1, // 0向下 1向上 2向左 3向右
         openWatch: true, // 开启数据实时监控刷新dom
@@ -580,6 +580,23 @@ export default {
     async initData () {
       let res = await storageMonitor()
       this.array1 = res.standStock
+      this.array1.map(el => {
+        if (el.standStatus === '1') {
+          return el.standStatusName = '静置中'
+        }
+        if (el.standStatus === '2') {
+          return el.standStatusName = '静置完成'
+        }
+        if (el.standStatus === '3') {
+          return el.standStatusName = '强制静置完成'
+        }
+        if (el.standStatus === '4') {
+          return el.standStatusName = '静置超时'
+        }
+        if (el.standStatus === '5') {
+          return el.standStatusName = '强制静置超时'
+        }
+      })
       this.array2 = res.frontWarehouseStock
       this.array3 = res.backWarehouseStock
       this.group01 = res.standMonitor
@@ -870,14 +887,14 @@ height 90px
   background #262F52
   span
     display inline-block
-    width 16%
+    width 14%
     text-align center
     line-height 32px
     font-size 12px
     color rgba(255,255,255,0.60)
     // float left
-    &:nth-child(2)
-      width 20%
+    &:nth-child(6)
+      width 30%
 .content-block-scroll
   // width calc(100% - 30px)
   // margin 0 15px 4px 15px
@@ -895,15 +912,15 @@ height 90px
       background rgba(38,47,82,0.50)
     span
       display inline-block
-      width 18%
+      width 14%
       padding 0 2px
       font-size 12px
       text-align center
       line-height 38px
       box-sizing border-box
       // float left
-      &:nth-child(2)
-        width 28%
+      &:nth-child(6)
+        width 30%
 .foldcricle0
   position absolute
   z-index 102