0823更新

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,

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;
   }

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))