From 435bcabb789985b6596ceffbdee97455ab313f36 Mon Sep 17 00:00:00 2001
From: ruanqi <qi.ruan@xujiesoft.com>
Date: Tue, 19 Apr 2022 21:58:40 +0800
Subject: [PATCH] =?UTF-8?q?0823=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/base/maintainProductRouting.vue   | 13 +++++++++----
 src/views/modules/production/dailyPlan.vue          |  2 +-
 .../modules/production/resourceCapacityLoading.vue  |  4 ++--
 3 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/src/views/modules/base/maintainProductRouting.vue b/src/views/modules/base/maintainProductRouting.vue
index bd52f0f..c497209 100644
--- a/src/views/modules/base/maintainProductRouting.vue
+++ b/src/views/modules/base/maintainProductRouting.vue
@@ -1570,11 +1570,16 @@
           }
           let size;
           let itemNo;
-          if(this.dataList2){
-            size=this.dataList2.length;
-            itemNo=this.dataList2[Number(size-1)].itemNo+10;
-          }else {
+          if(this.dataList2===[]||this.dataList2.length==0){
             itemNo=10;
+          }else {
+            itemNo=this.dataList2[0].itemNo;
+            for (let i = 0; i < this.dataList2.length; i++) {
+              if(itemNo<this.dataList2[i].itemNo){
+                itemNo=this.dataList2[i].itemNo
+              }
+            }
+            itemNo+=10;
           }
           this.detailData={
             itemNo:itemNo,
diff --git a/src/views/modules/production/dailyPlan.vue b/src/views/modules/production/dailyPlan.vue
index fb6ce98..432fdab 100644
--- a/src/views/modules/production/dailyPlan.vue
+++ b/src/views/modules/production/dailyPlan.vue
@@ -1401,7 +1401,7 @@
   /* 控制el-card标签的数据*/
   div.customer-el-card {
     margin-left: 110px;
-    margin-top: -15px;
+    margin-top: -6px;
     height: 20px;
     width: 60px;
   }
diff --git a/src/views/modules/production/resourceCapacityLoading.vue b/src/views/modules/production/resourceCapacityLoading.vue
index 3fc1075..5296155 100644
--- a/src/views/modules/production/resourceCapacityLoading.vue
+++ b/src/views/modules/production/resourceCapacityLoading.vue
@@ -148,8 +148,8 @@
               for (let i = 0; i <data.total ; i++) {
                 xAxisData.push(data.rows[i].planDate)
                 seriesData1.push(data.rows[i].workTime)
-                seriesData2.push(data.rows[i].time1)
-                seriesData3.push(data.rows[i].time2)
+                seriesData2.push(data.rows[i].time2)
+                seriesData3.push(data.rows[i].time1)
               }
               xAxisData=JSON.parse(JSON.stringify(xAxisData))
               seriesData1=JSON.parse(JSON.stringify(seriesData1))