From 7d8e98f8f2262b8d4db5a532a2260d297947018d Mon Sep 17 00:00:00 2001
From: xiangxy <shione_xxy@163.com>
Date: Mon, 29 Apr 2024 15:17:38 +0800
Subject: [PATCH] change

---
 src/config/mork1.js                         | 459 +++++++++++++++++++-
 src/pages/modules/board/SortWorkMonitor.vue |  30 +-
 2 files changed, 462 insertions(+), 27 deletions(-)

diff --git a/src/config/mork1.js b/src/config/mork1.js
index 4a23090..0d66b5a 100644
--- a/src/config/mork1.js
+++ b/src/config/mork1.js
@@ -249,18 +249,232 @@ export const cockpitpress = () => {
 /**  分拣作业监控 */
 export const cockpitsorting = () => {
   let res = {
-    'stackingList': [],
+    'stackingList': [
+      {
+        'materialQty': '252',
+        'materialModel': '20/10',
+        'materialCode': 'ML-70BD',
+        'createTime': '03-29 10:00:50'
+      },
+      {
+        'materialQty': '252',
+        'materialModel': '20/10',
+        'materialCode': 'ML-70BD',
+        'createTime': '03-29 08:33:22'
+      },
+      {
+        'materialQty': '252',
+        'materialModel': '20/10',
+        'materialCode': 'ML-70BD',
+        'createTime': '03-29 08:20:41'
+      },
+      {
+        'materialQty': '252',
+        'materialModel': '20/10',
+        'materialCode': 'ML-70BD',
+        'createTime': '03-28 13:30:49'
+      },
+      {
+        'materialQty': '252',
+        'materialModel': '20/10',
+        'materialCode': 'ML-70BD',
+        'createTime': '03-28 13:00:22'
+      },
+      {
+        'materialQty': '252',
+        'materialModel': '20/10',
+        'materialCode': 'ML-70BD',
+        'createTime': '03-28 10:37:02'
+      },
+      {
+        'materialQty': '252',
+        'materialModel': '20/10',
+        'materialCode': 'ML-70BD',
+        'createTime': '03-28 10:35:57'
+      },
+      {
+        'materialQty': '252',
+        'materialModel': '20/30',
+        'materialCode': 'ML-70BD',
+        'createTime': '03-28 08:43:04'
+      },
+      {
+        'materialQty': '252',
+        'materialModel': '20/30',
+        'materialCode': 'ML-70BD',
+        'createTime': '03-28 08:39:43'
+      },
+      {
+        'materialQty': '252',
+        'materialModel': '18/10',
+        'materialCode': 'ML-60BT',
+        'createTime': '03-16 17:13:26'
+      },
+      {
+        'materialQty': '252',
+        'materialModel': '18/30',
+        'materialCode': 'ML-60BT',
+        'createTime': '03-16 15:08:38'
+      },
+      {
+        'materialQty': '252',
+        'materialModel': '18/30',
+        'materialCode': 'ML-60BT',
+        'createTime': '03-16 14:54:16'
+      },
+      {
+        'materialQty': '126',
+        'materialModel': '40/0',
+        'materialCode': 'AP-70A',
+        'createTime': '03-16 13:20:19'
+      },
+      {
+        'materialQty': '126',
+        'materialModel': '40/0',
+        'materialCode': 'AP-70A',
+        'createTime': '03-16 11:28:38'
+      },
+      {
+        'materialQty': '126',
+        'materialModel': '40/0',
+        'materialCode': 'AP-70A',
+        'createTime': '03-16 10:35:55'
+      },
+      {
+        'materialQty': '126',
+        'materialModel': '40/0',
+        'materialCode': 'AP-70A',
+        'createTime': '03-16 09:13:43'
+      },
+      {
+        'materialQty': '126',
+        'materialModel': '40/0',
+        'materialCode': 'AP-70A',
+        'createTime': '03-16 09:05:29'
+      },
+      {
+        'materialQty': '252',
+        'materialModel': '18/10',
+        'materialCode': 'ML-60BT',
+        'createTime': '03-15 15:48:21'
+      },
+      {
+        'materialQty': '252',
+        'materialModel': '18/10',
+        'materialCode': 'ML-60BT',
+        'createTime': '03-15 15:17:40'
+      },
+      {
+        'materialQty': '252',
+        'materialModel': '18/10',
+        'materialCode': 'ML-60BT',
+        'createTime': '03-15 14:27:23'
+      },
+      {
+        'materialQty': '252',
+        'materialModel': '20/10',
+        'materialCode': 'ML-60BT',
+        'createTime': '03-15 13:23:13'
+      },
+      {
+        'materialQty': '252',
+        'materialModel': '20/10',
+        'materialCode': 'ML-60BT',
+        'createTime': '03-15 13:11:03'
+      },
+      {
+        'materialQty': '252',
+        'materialModel': '20/10',
+        'materialCode': 'ML-60BT',
+        'createTime': '03-15 11:06:05'
+      },
+      {
+        'materialQty': '252',
+        'materialModel': '20/30',
+        'materialCode': 'ML-60BT',
+        'createTime': '03-15 08:50:52'
+      },
+      {
+        'materialQty': '252',
+        'materialModel': '20/30',
+        'materialCode': 'ML-60BT',
+        'createTime': '03-15 08:15:38'
+      },
+      {
+        'materialQty': '0',
+        'materialModel': '20/30',
+        'materialCode': 'ML-60BT',
+        'createTime': '03-15 08:03:13'
+      },
+      {
+        'materialQty': '0',
+        'materialModel': '20/30',
+        'materialCode': 'MT-14AT',
+        'createTime': '01-20 16:22:03'
+      },
+      {
+        'materialQty': '252',
+        'materialModel': '20/30',
+        'materialCode': 'MT-14AT',
+        'createTime': '01-20 15:27:45'
+      },
+      {
+        'materialQty': '126',
+        'materialModel': '20/30',
+        'materialCode': 'MT-14AT',
+        'createTime': '01-20 14:47:00'
+      },
+      {
+        'materialQty': '0',
+        'materialModel': '20/30',
+        'materialCode': 'MT-14AT',
+        'createTime': '01-20 13:46:11'
+      },
+      {
+        'materialQty': '0',
+        'materialModel': '20/30',
+        'materialCode': 'MT-14AT',
+        'createTime': '01-20 12:28:36'
+      },
+      {
+        'materialQty': '0',
+        'materialModel': '20/30',
+        'materialCode': 'MT-14AT',
+        'createTime': '01-20 11:12:05'
+      },
+      {
+        'materialQty': '0',
+        'materialModel': '20/30',
+        'materialCode': 'MT-14AT',
+        'createTime': '01-20 10:53:27'
+      },
+      {
+        'materialQty': '0',
+        'materialModel': '20/30',
+        'materialCode': 'MT-14AT',
+        'createTime': '01-20 10:08:29'
+      },
+      {
+        'materialQty': '0',
+        'materialModel': '20/30',
+        'materialCode': 'MT-14AT',
+        'createTime': '01-20 09:23:01'
+      },
+      {
+        'materialQty': '0',
+        'materialModel': '20/30',
+        'materialCode': 'MT-14AT',
+        'createTime': '01-20 09:00:53'
+      },
+      {
+        'materialQty': '252',
+        'materialModel': null,
+        'materialCode': null,
+        'createTime': '01-14 13:23:47'
+      }
+    ],
     'sortingLine': {
       'sortingLines': [
-        {
-          'workorderCode': '240315001',
-          'pointName': '分拣拆垛机械手01',
-          'customer': '实业股份',
-          'materialName': 'ML-60BT',
-          'materialSpec': 'BB',
-          'planQty': '50',
-          'realQty': '0'
-        },
         {
           'workorderCode': '240329001',
           'pointName': '分拣拆垛机械手01',
@@ -275,7 +489,230 @@ export const cockpitsorting = () => {
       'rgPlanQty': '0',
       'rgRealQty': '0'
     },
-    'unstackingList': [],
+    'unstackingList': [
+      {
+        'materialQty': '252',
+        'materialModel': '20/10',
+        'materialCode': 'ML-70BD',
+        'createTime': '03-29 10:00:50'
+      },
+      {
+        'materialQty': '252',
+        'materialModel': '20/10',
+        'materialCode': 'ML-70BD',
+        'createTime': '03-29 08:33:22'
+      },
+      {
+        'materialQty': '252',
+        'materialModel': '20/10',
+        'materialCode': 'ML-70BD',
+        'createTime': '03-29 08:20:41'
+      },
+      {
+        'materialQty': '252',
+        'materialModel': '20/10',
+        'materialCode': 'ML-70BD',
+        'createTime': '03-28 13:30:49'
+      },
+      {
+        'materialQty': '252',
+        'materialModel': '20/10',
+        'materialCode': 'ML-70BD',
+        'createTime': '03-28 13:00:22'
+      },
+      {
+        'materialQty': '252',
+        'materialModel': '20/10',
+        'materialCode': 'ML-70BD',
+        'createTime': '03-28 10:37:02'
+      },
+      {
+        'materialQty': '252',
+        'materialModel': '20/10',
+        'materialCode': 'ML-70BD',
+        'createTime': '03-28 10:35:57'
+      },
+      {
+        'materialQty': '252',
+        'materialModel': '20/30',
+        'materialCode': 'ML-70BD',
+        'createTime': '03-28 08:43:04'
+      },
+      {
+        'materialQty': '252',
+        'materialModel': '20/30',
+        'materialCode': 'ML-70BD',
+        'createTime': '03-28 08:39:43'
+      },
+      {
+        'materialQty': '252',
+        'materialModel': '18/10',
+        'materialCode': 'ML-60BT',
+        'createTime': '03-16 17:13:26'
+      },
+      {
+        'materialQty': '252',
+        'materialModel': '18/30',
+        'materialCode': 'ML-60BT',
+        'createTime': '03-16 15:08:38'
+      },
+      {
+        'materialQty': '252',
+        'materialModel': '18/30',
+        'materialCode': 'ML-60BT',
+        'createTime': '03-16 14:54:16'
+      },
+      {
+        'materialQty': '126',
+        'materialModel': '40/0',
+        'materialCode': 'AP-70A',
+        'createTime': '03-16 13:20:19'
+      },
+      {
+        'materialQty': '126',
+        'materialModel': '40/0',
+        'materialCode': 'AP-70A',
+        'createTime': '03-16 11:28:38'
+      },
+      {
+        'materialQty': '126',
+        'materialModel': '40/0',
+        'materialCode': 'AP-70A',
+        'createTime': '03-16 10:35:55'
+      },
+      {
+        'materialQty': '126',
+        'materialModel': '40/0',
+        'materialCode': 'AP-70A',
+        'createTime': '03-16 09:13:43'
+      },
+      {
+        'materialQty': '126',
+        'materialModel': '40/0',
+        'materialCode': 'AP-70A',
+        'createTime': '03-16 09:05:29'
+      },
+      {
+        'materialQty': '252',
+        'materialModel': '18/10',
+        'materialCode': 'ML-60BT',
+        'createTime': '03-15 15:48:21'
+      },
+      {
+        'materialQty': '252',
+        'materialModel': '18/10',
+        'materialCode': 'ML-60BT',
+        'createTime': '03-15 15:17:40'
+      },
+      {
+        'materialQty': '252',
+        'materialModel': '18/10',
+        'materialCode': 'ML-60BT',
+        'createTime': '03-15 14:27:23'
+      },
+      {
+        'materialQty': '252',
+        'materialModel': '20/10',
+        'materialCode': 'ML-60BT',
+        'createTime': '03-15 13:23:13'
+      },
+      {
+        'materialQty': '252',
+        'materialModel': '20/10',
+        'materialCode': 'ML-60BT',
+        'createTime': '03-15 13:11:03'
+      },
+      {
+        'materialQty': '252',
+        'materialModel': '20/10',
+        'materialCode': 'ML-60BT',
+        'createTime': '03-15 11:06:05'
+      },
+      {
+        'materialQty': '252',
+        'materialModel': '20/30',
+        'materialCode': 'ML-60BT',
+        'createTime': '03-15 08:50:52'
+      },
+      {
+        'materialQty': '252',
+        'materialModel': '20/30',
+        'materialCode': 'ML-60BT',
+        'createTime': '03-15 08:15:38'
+      },
+      {
+        'materialQty': '0',
+        'materialModel': '20/30',
+        'materialCode': 'ML-60BT',
+        'createTime': '03-15 08:03:13'
+      },
+      {
+        'materialQty': '0',
+        'materialModel': '20/30',
+        'materialCode': 'MT-14AT',
+        'createTime': '01-20 16:22:03'
+      },
+      {
+        'materialQty': '252',
+        'materialModel': '20/30',
+        'materialCode': 'MT-14AT',
+        'createTime': '01-20 15:27:45'
+      },
+      {
+        'materialQty': '126',
+        'materialModel': '20/30',
+        'materialCode': 'MT-14AT',
+        'createTime': '01-20 14:47:00'
+      },
+      {
+        'materialQty': '0',
+        'materialModel': '20/30',
+        'materialCode': 'MT-14AT',
+        'createTime': '01-20 13:46:11'
+      },
+      {
+        'materialQty': '0',
+        'materialModel': '20/30',
+        'materialCode': 'MT-14AT',
+        'createTime': '01-20 12:28:36'
+      },
+      {
+        'materialQty': '0',
+        'materialModel': '20/30',
+        'materialCode': 'MT-14AT',
+        'createTime': '01-20 11:12:05'
+      },
+      {
+        'materialQty': '0',
+        'materialModel': '20/30',
+        'materialCode': 'MT-14AT',
+        'createTime': '01-20 10:53:27'
+      },
+      {
+        'materialQty': '0',
+        'materialModel': '20/30',
+        'materialCode': 'MT-14AT',
+        'createTime': '01-20 10:08:29'
+      },
+      {
+        'materialQty': '0',
+        'materialModel': '20/30',
+        'materialCode': 'MT-14AT',
+        'createTime': '01-20 09:23:01'
+      },
+      {
+        'materialQty': '0',
+        'materialModel': '20/30',
+        'materialCode': 'MT-14AT',
+        'createTime': '01-20 09:00:53'
+      },
+      {
+        'materialQty': '252',
+        'materialModel': null,
+        'materialCode': null,
+        'createTime': '01-14 13:23:47'
+      }
+    ],
     'lastWorkOrderList': [
       {
         'pointCode': 'HCHJ02',
diff --git a/src/pages/modules/board/SortWorkMonitor.vue b/src/pages/modules/board/SortWorkMonitor.vue
index 5680eb5..559ecd9 100644
--- a/src/pages/modules/board/SortWorkMonitor.vue
+++ b/src/pages/modules/board/SortWorkMonitor.vue
@@ -82,15 +82,14 @@
           <vue-seamless-scroll :data="chaiduoArr" :class-option="defaultOption1">
             <ul class="scroll-ul_1">
               <li v-for="(e, i) in chaiduoArr" :key="i">
+                <span class="scroll_th">时间:</span>
                 <span>{{e.createTime}}&nbsp;</span>
-                <span class="scroll_th">托盘号:</span>
-                <span>{{ e.vehicleCode }}，</span>
-                <span class="scroll_th">物料:</span>
-                <span>{{ e.materialName }}，</span>
-                <span class="scroll_th">数量:</span>
-                <span>{{ e.materialQty }}，</span>
-                <span class="scroll_th">重量:</span>
-                <span>{{ e.materialWeight }}</span>
+                <span class="scroll_th">产品型号:</span>
+                <span>{{ e.materialModel }}，</span>
+                <span class="scroll_th">产品牌号:</span>
+                <span>{{ e.materialCode }}，</span>
+                <span class="scroll_th">总数:</span>
+                <span>{{ e.materialQty }}</span>
               </li>
             </ul>
           </vue-seamless-scroll>
@@ -99,15 +98,14 @@
           <vue-seamless-scroll :data="maduoArr" :class-option="defaultOption1">
             <ul class="scroll-ul_1">
               <li v-for="(e, i) in maduoArr" :key="i">
+                <span class="scroll_th">时间:</span>
                 <span>{{e.createTime}}&nbsp;</span>
-                <span class="scroll_th">托盘号:</span>
-                <span>{{ e.vehicleCode }}，</span>
-                <span class="scroll_th">物料:</span>
-                <span>{{ e.materialName }}，</span>
-                <span class="scroll_th">数量:</span>
-                <span>{{ e.materialQty }}，</span>
-                <span class="scroll_th">重量:</span>
-                <span>{{ e.materialWeight }}</span>
+                <span class="scroll_th">产品型号:</span>
+                <span>{{ e.materialModel }}，</span>
+                <span class="scroll_th">产品牌号:</span>
+                <span>{{ e.materialCode }}，</span>
+                <span class="scroll_th">总数:</span>
+                <span>{{ e.materialQty }}</span>
               </li>
             </ul>
           </vue-seamless-scroll>