diff --git a/src/config/getData1.js b/src/config/getData1.js
index bc20d2d..fcdbbf2 100644
--- a/src/config/getData1.js
+++ b/src/config/getData1.js
@@ -4,4 +4,4 @@ import {post} from '@js/http.js'
 export const cockpitpress = (id) => post('api/cockpit/press', {})
 
 /**  分拣作业监控 */
-export const sortProductionMonitor = (id) => post('api/cockpit/sortProductionMonitor', {})
+export const cockpitsorting = (id) => post('api/cockpit/sorting', {})
diff --git a/src/config/mork1.js b/src/config/mork1.js
index ca72e7b..294a679 100644
--- a/src/config/mork1.js
+++ b/src/config/mork1.js
@@ -215,254 +215,138 @@ export const cockpitpress = () => {
 }
 
 /**  分拣作业监控 */
-export const sortProductionMonitor = () => {
+export const cockpitsorting = () => {
   let res = {
-    // 当前工单信息
-    'current': {
-      // 物料
-      'materialName': '转炉镁碳砖MASC-65鞍钢Z01',
-      // 当前工单
-      'workOrderCode': '230919001',
-      // 数量
-      'qty': '10000块',
-      // 重量
-      'weight': '10.00吨',
-      // 是否留有半托
-      'hasHalf': '否',
-      // 订单号
-      'orderCode': '',
-      // 规格
-      'spec': '11/11',
-      // 托盘类型
-      'vehicleType': '一类木托盘',
-      // 客户
-      'customer': '客户'
-    },
-    // 已拆垛
-    'depalletize': {
-      // 未完成
-      'uncompleted': 10000,
-      // 已完成
-      'completed': 0
-    },
-    // 已码垛
-    'palletize': {
-      // 未完成
-      'uncompleted': 50,
-      // 已完成
-      'completed': 50
-    },
-    // 已拆垛信息
-    'depalletizedVehicle': [
+    'sortingLine': [
       {
-        // 物料
-        'materialName': '紫铜弯通连接帽CGM11',
-        // 时间
-        'datetime': '2023-09-14 14:23:57',
-        // 数量
-        'qty': '18块',
-        // 托盘号
-        'vehicleCode': 'M0002',
-        // 重量
-        'weight': '0.18吨'
+        'workorderCode': '240119006',
+        'pointName': '分拣拆垛机械手01',
+        'customer': '实业股份',
+        'materialName': '004',
+        'materialSpec': 'ZX',
+        'planQty': '500',
+        'realQty': '200'
       },
       {
-        // 物料
-        'materialName': '紫铜弯通连接帽CGM22',
-        // 时间
-        'datetime': '2023-09-14 14:23:57',
-        // 数量
-        'qty': '18块',
-        // 托盘号
-        'vehicleCode': 'M0002',
-        // 重量
-        'weight': '0.18吨'
+        'workorderCode': '240228001',
+        'pointName': '分拣拆垛机械手02',
+        'customer': '实业股份',
+        'materialName': '004',
+        'materialSpec': 'ZX',
+        'planQty': '1000',
+        'realQty': '0'
       },
       {
-        // 物料
-        'materialName': '紫铜弯通连接帽CGM33',
-        // 时间
-        'datetime': '2023-09-14 14:23:57',
-        // 数量
-        'qty': '18块',
-        // 托盘号
-        'vehicleCode': 'M0002',
-        // 重量
-        'weight': '0.18吨'
-      },
-      {
-        // 物料
-        'materialName': '紫铜弯通连接帽CGM44',
-        // 时间
-        'datetime': '2023-09-14 14:23:57',
-        // 数量
-        'qty': '18块',
-        // 托盘号
-        'vehicleCode': 'M0002',
-        // 重量
-        'weight': '0.18吨'
-      },
-      {
-        // 物料
-        'materialName': '紫铜弯通连接帽CGM55',
-        // 时间
-        'datetime': '2023-09-14 14:23:57',
-        // 数量
-        'qty': '18块',
-        // 托盘号
-        'vehicleCode': 'M0002',
-        // 重量
-        'weight': '0.18吨'
+        'workorderCode': '240228002',
+        'pointName': '人工分拣拆01',
+        'customer': '沙湾',
+        'materialName': '004',
+        'materialSpec': 'ZX',
+        'planQty': '500',
+        'realQty': '0'
       }
     ],
-    // 已码垛信息
-    'palletizedVehicle': [
+    'unstackingList': [
       {
-        // 物料
-        'materialName': '紫铜弯通连接帽CGM11',
-        // 时间
-        'datetime': '2023-09-14 14:23:57',
-        // 数量
-        'qty': '18块',
-        // 托盘号
-        'vehicleCode': 'M0002',
-        // 重量
-        'weight': '0.18吨'
+        'vehicleCode': '0014',
+        'materialQty': '0',
+        'materialWeight': '0.00',
+        'materialName': '004',
+        'createTime': '03-04 16:13:37'
       },
       {
-        // 物料
-        'materialName': '紫铜弯通连接帽CGM22',
-        // 时间
-        'datetime': '2023-09-14 14:23:57',
-        // 数量
-        'qty': '18块',
-        // 托盘号
-        'vehicleCode': 'M0002',
-        // 重量
-        'weight': '0.18吨'
+        'vehicleCode': '0005',
+        'materialQty': '252',
+        'materialWeight': '0.00',
+        'materialName': '004',
+        'createTime': '03-04 15:22:50'
       },
       {
-        // 物料
-        'materialName': '紫铜弯通连接帽CGM33',
-        // 时间
-        'datetime': '2023-09-14 14:23:57',
-        // 数量
-        'qty': '18块',
-        // 托盘号
-        'vehicleCode': 'M0002',
-        // 重量
-        'weight': '0.18吨'
+        'vehicleCode': '0040',
+        'materialQty': '126',
+        'materialWeight': '0.00',
+        'materialName': '004',
+        'createTime': '03-04 14:42:00'
       },
       {
-        // 物料
-        'materialName': '紫铜弯通连接帽CGM44',
-        // 时间
-        'datetime': '2023-09-14 14:23:57',
-        // 数量
-        'qty': '18块',
-        // 托盘号
-        'vehicleCode': 'M0002',
-        // 重量
-        'weight': '0.18吨'
+        'vehicleCode': '0050',
+        'materialQty': '0',
+        'materialWeight': '0.00',
+        'materialName': '004',
+        'createTime': '03-04 13:21:53'
       },
       {
-        // 物料
-        'materialName': '紫铜弯通连接帽CGM55',
-        // 时间
-        'datetime': '2023-09-14 14:23:57',
-        // 数量
-        'qty': '18块',
-        // 托盘号
-        'vehicleCode': 'M0002',
-        // 重量
-        'weight': '0.18吨'
+        'vehicleCode': '1069',
+        'materialQty': '252',
+        'materialWeight': '0.00',
+        'materialName': null,
+        'createTime': '03-04 13:21:01'
+      },
+      {
+        'vehicleCode': '1066',
+        'materialQty': '0',
+        'materialWeight': '0.00',
+        'materialName': '004',
+        'createTime': '03-04 12:23:39'
+      },
+      {
+        'vehicleCode': '0006',
+        'materialQty': '0',
+        'materialWeight': '0.00',
+        'materialName': '004',
+        'createTime': '03-04 11:05:11'
+      },
+      {
+        'vehicleCode': '1055',
+        'materialQty': '0',
+        'materialWeight': '0.00',
+        'materialName': '004',
+        'createTime': '03-04 10:48:18'
+      },
+      {
+        'vehicleCode': '0048',
+        'materialQty': '0',
+        'materialWeight': '0.00',
+        'materialName': '004',
+        'createTime': '03-04 09:58:48'
+      },
+      {
+        'vehicleCode': '0011',
+        'materialQty': '0',
+        'materialWeight': '0.00',
+        'materialName': '004',
+        'createTime': '03-04 09:16:21'
+      },
+      {
+        'vehicleCode': '0046',
+        'materialQty': '0',
+        'materialWeight': '0.00',
+        'materialName': '004',
+        'createTime': '03-04 08:56:25'
       }
     ],
-    // 剩余工单列表
-    'residualWorkOrder': [
+    'lastWorkOrderList': [
       {
-        // 物料
-        'materialName': '转炉镁碳砖MASC-65鞍钢Z01',
-        // 当前工单
-        'workOrderCode': '230919001',
-        // 数量
-        'qty': '10000块',
-        // 重量
-        'weight': '10.00吨',
-        // 是否留有半托
-        'hasHalf': '否',
-        // 订单号
-        'orderCode': '12333',
-        // 规格
-        'spec': '11/11',
-        // 托盘类型
-        'vehicleType': '一类木托盘',
-        // 客户
-        'customer': '客户',
-        'createTime': '2023-09-14 14:23:57'
+        'workorderCode': '240119006',
+        'materialName': '004',
+        'materialSpec': 'ZX',
+        'planQty': '500',
+        'planWeight': '0',
+        'produceOrder': null,
+        'customer': '实业股份',
+        'vehicleType': '3',
+        'createTime': '01-19 18:04:57'
       },
       {
-        // 物料
-        'materialName': '转炉镁碳砖MASC-65鞍钢Z02',
-        // 当前工单
-        'workOrderCode': '230919002',
-        // 数量
-        'qty': '10000块',
-        // 重量
-        'weight': '10.00吨',
-        // 是否留有半托
-        'hasHalf': '否',
-        // 订单号
-        'orderCode': '12333',
-        // 规格
-        'spec': '11/11',
-        // 托盘类型
-        'vehicleType': '一类木托盘',
-        // 客户
-        'customer': '客户',
-        'createTime': '2023-09-14 14:23:57'
-      },
-      {
-        // 物料
-        'materialName': '转炉镁碳砖MASC-65鞍钢Z03',
-        // 当前工单
-        'workOrderCode': '230919001',
-        // 数量
-        'qty': '10000块',
-        // 重量
-        'weight': '10.00吨',
-        // 是否留有半托
-        'hasHalf': '否',
-        // 订单号
-        'orderCode': '12333',
-        // 规格
-        'spec': '11/11',
-        // 托盘类型
-        'vehicleType': '一类木托盘',
-        // 客户
-        'customer': '客户',
-        'createTime': '2023-09-14 14:23:57'
-      },
-      {
-        // 物料
-        'materialName': '转炉镁碳砖MASC-65鞍钢Z04',
-        // 当前工单
-        'workOrderCode': '230919002',
-        // 数量
-        'qty': '10000块',
-        // 重量
-        'weight': '10.00吨',
-        // 是否留有半托
-        'hasHalf': '否',
-        // 订单号
-        'orderCode': '12333',
-        // 规格
-        'spec': '11/11',
-        // 托盘类型
-        'vehicleType': '一类木托盘',
-        // 客户
-        'customer': '客户',
-        'createTime': '2023-09-14 14:23:57'
+        'workorderCode': '240228001',
+        'materialName': '004',
+        'materialSpec': 'ZX',
+        'planQty': '1000',
+        'planWeight': '0',
+        'produceOrder': null,
+        'customer': '实业股份',
+        'vehicleType': '2',
+        'createTime': '02-28 09:50:48'
       }
     ]
   }
diff --git a/src/pages/modules/SortWorkMonitor.vue b/src/pages/modules/SortWorkMonitor.vue
index 70f7343..9f8f12f 100644
--- a/src/pages/modules/SortWorkMonitor.vue
+++ b/src/pages/modules/SortWorkMonitor.vue
@@ -6,13 +6,13 @@
       <div class="zdy_box">
         <div class="zero-wrap">
           <div class="zero-title">
-            <div class="item_tip_left">分拣线1</div>
+            <div class="item_tip_left">{{topSec1.pointName}}</div>
           </div>
           <div class="zero-title">
-            <div class="item_tip_left">分拣线2</div>
+            <div class="item_tip_left">{{topSec2.pointName}}</div>
           </div>
           <div class="zero-title">
-            <div class="item_tip_left">人工分拣线</div>
+            <div class="item_tip_left">{{topSec3.pointName}}</div>
           </div>
         </div>
         <div class="one_wrap">
@@ -26,11 +26,11 @@
               </div>
             </div>
             <div class="b-box">
-              <div class="b-item"><span>当前工单：</span><span>GD0000001</span></div>
-              <div class="b-item"><span>客户：</span><span>XXXX有限公司</span></div>
-              <div class="b-item"><span>物料：</span><span>VOD钢包砖</span></div>
-              <div class="b-item"><span>规格：</span><span>200*165/135*100</span></div>
-              <div class="b-item"><span>数量：</span><span>10000块</span></div>
+              <div class="b-item"><span>当前工单：</span><span>{{topSec1.workorderCode}}</span></div>
+              <div class="b-item"><span>客户：</span><span>{{topSec1.customer}}</span></div>
+              <div class="b-item"><span>物料：</span><span>{{topSec1.materialName}}</span></div>
+              <div class="b-item"><span>规格：</span><span>{{topSec1.materialSpec}}</span></div>
+              <div class="b-item"><span>数量：</span><span>{{topSec1.planQty}}</span></div>
             </div>
           </div>
           <div class="e-box">
@@ -43,11 +43,11 @@
               </div>
             </div>
             <div class="b-box">
-              <div class="b-item"><span>当前工单：</span><span>GD0000001</span></div>
-              <div class="b-item"><span>客户：</span><span>XXXX有限公司</span></div>
-              <div class="b-item"><span>物料：</span><span>VOD钢包砖</span></div>
-              <div class="b-item"><span>规格：</span><span>200*165/135*100</span></div>
-              <div class="b-item"><span>数量：</span><span>10000块</span></div>
+              <div class="b-item"><span>当前工单：</span><span>{{topSec2.workorderCode}}</span></div>
+              <div class="b-item"><span>客户：</span><span>{{topSec2.customer}}</span></div>
+              <div class="b-item"><span>物料：</span><span>{{topSec2.materialName}}</span></div>
+              <div class="b-item"><span>规格：</span><span>{{topSec2.materialSpec}}</span></div>
+              <div class="b-item"><span>数量：</span><span>{{topSec2.planQty}}</span></div>
             </div>
           </div>
           <div class="e-box">
@@ -60,11 +60,11 @@
               </div>
             </div>
             <div class="b-box">
-              <div class="b-item"><span>分拣1：</span><span>VOD钢包砖</span></div>
-              <div class="b-item"><span>分拣2：</span><span>VOD钢包砖</span></div>
-              <div class="b-item"><span>分拣3：</span><span>VOD钢包砖</span></div>
-              <div class="b-item"><span>分拣4：</span><span>VOD钢包砖</span></div>
-              <div class="b-item"><span>分拣5：</span><span>VOD钢包砖</span></div>
+              <div class="b-item"><span>当前工单：</span><span>{{topSec3.workorderCode}}</span></div>
+              <div class="b-item"><span>客户：</span><span>{{topSec3.customer}}</span></div>
+              <div class="b-item"><span>物料：</span><span>{{topSec3.materialName}}</span></div>
+              <div class="b-item"><span>规格：</span><span>{{topSec3.materialSpec}}</span></div>
+              <div class="b-item"><span>数量：</span><span>{{topSec3.planQty}}</span></div>
             </div>
           </div>
         </div>
@@ -84,15 +84,15 @@
               <vue-seamless-scroll :data="chaiduoArr" :class-option="defaultOption1">
                 <ul class="scroll-ul_1">
                   <li v-for="(e, i) in chaiduoArr" :key="i">
-                    <span>{{e.datetime}}&nbsp;</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.qty }}，</span>
+                    <span>{{ e.materialQty }}，</span>
                     <span class="scroll_th">重量:</span>
-                    <span>{{ e.weight }}</span>
+                    <span>{{ e.materialWeight }}</span>
                   </li>
                 </ul>
               </vue-seamless-scroll>
@@ -101,15 +101,15 @@
               <vue-seamless-scroll :data="maduoArr" :class-option="defaultOption1">
                 <ul class="scroll-ul_1">
                   <li v-for="(e, i) in maduoArr" :key="i">
-                    <span>{{e.datetime}}&nbsp;</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.qty }}，</span>
+                    <span>{{ e.materialQty }}，</span>
                     <span class="scroll_th">重量:</span>
-                    <span>{{ e.weight }}</span>
+                    <span>{{ e.materialWeight }}</span>
                   </li>
                 </ul>
               </vue-seamless-scroll>
@@ -135,15 +135,15 @@
                   <li>创建时间</li>
                 </ul>
                 <div class="scroll_container_2">
-                  <vue-seamless-scroll :data="residualWorkOrder" :class-option="defaultOption2">
+                  <vue-seamless-scroll :data="lastWorkOrderList" :class-option="defaultOption2">
                     <ul class="scroll-ul_2">
-                      <li v-for="(e, i) in residualWorkOrder" :key="i">
-                        <div class="scroll-ul_2_div">{{e.workOrderCode}}</div>
+                      <li v-for="(e, i) in lastWorkOrderList" :key="i">
+                        <div class="scroll-ul_2_div">{{e.workorderCode}}</div>
                         <div class="scroll-ul_2_div">{{e.materialName}}</div>
-                        <div class="scroll-ul_2_div">{{e.spec}}</div>
-                        <div class="scroll-ul_2_div">{{e.qty}}</div>
-                        <div class="scroll-ul_2_div">{{e.weight}}</div>
-                        <div class="scroll-ul_2_div">{{e.orderCode}}</div>
+                        <div class="scroll-ul_2_div">{{e.materialSpec}}</div>
+                        <div class="scroll-ul_2_div">{{e.planQty}}</div>
+                        <div class="scroll-ul_2_div">{{e.planWeight}}</div>
+                        <div class="scroll-ul_2_div">{{e.produceOrder}}</div>
                         <div class="scroll-ul_2_div">{{e.customer}}</div>
                         <div class="scroll-ul_2_div">{{e.vehicleType}}</div>
                         <div class="scroll-ul_2_div">{{e.hasHalf}}</div>
@@ -163,8 +163,8 @@
 
 <script>
 import THeader from '@components/header3.vue'
-// import {sortProductionMonitor} from '@js/getData1.js'
-import {sortProductionMonitor} from '@js/mork1.js'
+// import {cockpitsorting} from '@js/getData1.js'
+import {cockpitsorting} from '@js/mork1.js'
 export default {
   name: 'SortWorkMonitor',
   components: {
@@ -174,16 +174,16 @@ export default {
     return {
       timer: null,
       interTime: this.$store.getters.setTime,
-      current: {},
-      chaiduo: {},
-      maduo: {},
+      topSec1: {},
+      topSec2: {},
+      topSec3: {},
       chaiduoArr: [],
       maduoArr: [],
-      residualWorkOrder: [],
+      lastWorkOrderList: [],
       stateStatistics: {
         count: '20',
         // fourState: [{'status': '5', 'stateName': '正常运行'}, {'status': '5', 'stateName': '暂未生产'}, {'status': '5', 'stateName': '空闲设备'}, {'status': '5', 'stateName': '故障设备'}]
-        fourState: [{'status': '80', 'stateName': '正常运行'}, {'status': '20', 'stateName': '暂未生产'}]
+        fourState: [{'status': '80', 'stateName': '实际数量'}, {'status': '20', 'stateName': '计划数量'}]
       }
     }
   },
@@ -207,7 +207,7 @@ export default {
         timer1: null,
         timer2: null,
         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
@@ -218,9 +218,6 @@ export default {
     }
   },
   mounted () {
-    this.setEchart01()
-    this.setEchart02()
-    this.setEchart03()
     this.refresh()
   },
   beforeDestroy () {
@@ -230,29 +227,34 @@ export default {
   },
   methods: {
     refresh () {
-      this._sortProductionMonitor()
+      this._cockpitsorting()
       this.timer2 = setInterval(() => {
-        this._sortProductionMonitor()
+        this._cockpitsorting()
       }, this.interTime)
     },
-    async _sortProductionMonitor () {
-      let res = await sortProductionMonitor()
-      this.current = res.current
-      this.chaiduo = res.depalletize
-      this.maduo = res.palletize
-      this.chaiduoArr = [...res.depalletizedVehicle]
-      this.maduoArr = [...res.palletizedVehicle]
-      this.residualWorkOrder = [...res.residualWorkOrder]
+    async _cockpitsorting () {
+      let res = await cockpitsorting()
+      this.topSec1 = res.sortingLine[0]
+      this.topSec2 = res.sortingLine[1]
+      this.topSec3 = res.sortingLine[2]
+      this.setEchart01()
+      this.setEchart02()
+      this.setEchart03()
+      this.lastWorkOrderList = [...res.lastWorkOrderList]
+      this.chaiduoArr = [...res.unstackingList]
+      this.maduoArr = [...res.unstackingList]
     },
     setEchart01 () {
       let colors = ['#1980EA', '#67D470', '#B4C9EF', '#EF5252', '#BCBF5C', '#6d5edd', '#bf41bb']
-      let seriesData = this.stateStatistics.fourState
-      seriesData.map((el, i) => {
-        el.value = el.status
-        el.name = el.stateName
-      })
+      // let seriesData = this.stateStatistics.fourState
+      // seriesData.map((el, i) => {
+      //   el.value = el.status
+      //   el.name = el.stateName
+      // })
+      let seriesData = []
+      seriesData = [{'value': Number(this.topSec1.planQty) - Number(this.topSec1.realQty), 'name': '剩余数量'}, {'value': this.topSec1.realQty, 'name': '实际数量'}]
       // let total = this.stateStatistics.count
-      let total = 1850
+      let total = this.topSec1.realQty
       let option = {
         color: colors,
         grid: {
@@ -318,13 +320,15 @@ export default {
     },
     setEchart02 () {
       let colors = ['#1980EA', '#67D470', '#B4C9EF', '#EF5252', '#BCBF5C', '#6d5edd', '#bf41bb']
-      let seriesData = this.stateStatistics.fourState
-      seriesData.map((el, i) => {
-        el.value = el.status
-        el.name = el.stateName
-      })
+      // let seriesData = this.stateStatistics.fourState
+      // seriesData.map((el, i) => {
+      //   el.value = el.status
+      //   el.name = el.stateName
+      // })
+      let seriesData = []
+      seriesData = [{'value': Number(this.topSec2.planQty) - Number(this.topSec2.realQty), 'name': '剩余数量'}, {'value': this.topSec2.realQty, 'name': '实际数量'}]
       // let total = this.stateStatistics.count
-      let total = 1850
+      let total = this.topSec2.realQty
       let option = {
         color: colors,
         grid: {
@@ -390,13 +394,15 @@ export default {
     },
     setEchart03 () {
       let colors = ['#1980EA', '#67D470', '#B4C9EF', '#EF5252', '#BCBF5C', '#6d5edd', '#bf41bb']
-      let seriesData = this.stateStatistics.fourState
-      seriesData.map((el, i) => {
-        el.value = el.status
-        el.name = el.stateName
-      })
+      // let seriesData = this.stateStatistics.fourState
+      // seriesData.map((el, i) => {
+      //   el.value = el.status
+      //   el.name = el.stateName
+      // })
+      let seriesData = []
+      seriesData = [{'value': Number(this.topSec3.planQty) - Number(this.topSec3.realQty), 'name': '剩余数量'}, {'value': this.topSec3.realQty, 'name': '实际数量'}]
       // let total = this.stateStatistics.count
-      let total = 1850
+      let total = this.topSec3.realQty
       let option = {
         color: colors,
         grid: {