制造 产线

js/service/produce-task.js

@@ -509,7 +509,7 @@ var ServiceProduceTask = {
             if(element.plannedStartTime&&element.plannedEndTime){
                 var s = new Date(element.plannedStartTime);//计划开工时间
                 var e = new Date(element.plannedEndTime);//计划完成时间
-                element.planCompleteDate=s.Format("yyyy-MM-dd")+"至"+e.Format("yyyy-MM-dd");
+                element.planCompleteDate=s.Format("MM-dd")+"至"+e.Format("MM-dd");
             }else{
                 element.planCompleteDate="";
             }

pages/dashboard/line.html

@@ -84,7 +84,7 @@
                     <div class="col-lg-12 col-md-2" style="height:240px" id="charts_12"></div>
                 </div>
                 <div class="row">
-                    <div class="col-lg-12 col-md-12 center block-title">质量异常分类</div>
+                    <div class="col-lg-12 col-md-12 center block-title">生产异常分类</div>
                 </div>
                 <div class="row">
                     <div class="col-lg-12 col-md-2" style="height:240px" id="charts_13"></div>

pages/dashboard/produce.html

@@ -49,21 +49,21 @@
                     <div class="col-lg-12 col-md-12 center block-title">生产计划达成率</div>
                 </div>
                 <div class="row block-padding">
-                    <div class="col-lg-12 col-md-12" style="height:290px" id="charts_11"></div>
+                    <div class="col-lg-12 col-md-12" style="height:295px" id="charts_11"></div>
                 </div>
                 <!--月工时分布情况-->
                 <div class="row block-padding">
                     <div class="col-lg-12 col-md-12 center block-title">月工时分布情况</div>
                 </div>
                 <div class="row block-padding">
-                    <div class="col-lg-12 col-md-12" style="height:290px" id="charts_12"></div>
+                    <div class="col-lg-12 col-md-12" style="height:295px" id="charts_12"></div>
                 </div>
                 <!--月质量异常分类 -->
                 <div class="row block-padding">
                     <div class="col-lg-12 col-md-12 center block-title">月生产异常分类</div>
                 </div>
                 <div class="row">
-                    <div class="col-lg-12 col-md-12" style="height:290px" id="charts_13"></div>
+                    <div class="col-lg-12 col-md-12" style="height:260px" id="charts_13"></div>
                 </div>
             </div>
             <div class="col-lg-6 col-md-6">
@@ -121,12 +121,12 @@
                             <div class="col-lg-12 col-md-12 center block-title">当月产品良率</div>
                         </div>
                         <div class="row">
-                            <div class="col-lg-12 col-md-2" style="height:250px" id="charts_22"></div>
+                            <div class="col-lg-12 col-md-2" style="height:260px" id="charts_22"></div>
                         </div>
                     </div>
                     <div class="col-lg-6 col-md-6">
                         <div class="row">
-                            <div class="col-lg-12 col-md-12 center block-title">月制程质量异常</div>
+                            <div class="col-lg-12 col-md-12 center block-title">月制程质量不良</div>
                         </div>
                         <div class="row">
                             <div class="col-lg-12 col-md-2" style="height:250px" id="charts_23"></div>
@@ -135,22 +135,22 @@
                             <div class="col-lg-12 col-md-12 center block-title">周成品入库数量</div>
                         </div>
                         <div class="row">
-                            <div class="col-lg-12 col-md-2" style="height:250px" id="charts_24"></div>
+                            <div class="col-lg-12 col-md-2" style="height:260px" id="charts_24"></div>
                         </div>
                     </div>
                 </div>
             </div>
-            <div class="col-lg-3" style="height: 100%;">
+            <div class="col-lg-3" >
                 <div class="row block-padding"  >
                     <div class="col-lg-12 col-md-12 center block-title" >当月生产效率</div>
                 </div>
-                <div class="row block-padding" style="height: 33%;min-height: 290px;">
-                    <div class="col-lg-12 col-md-12" style="height:260px" id="charts_31"></div>
+                <div class="row block-padding">
+                    <div class="col-lg-12 col-md-12" style="height:290px" id="charts_31"></div>
                 </div>
                 <div class="row block-padding">
                     <div class="col-lg-12 col-md-12 center block-title">项目完工进度</div>
                 </div>
-                <div class="row block-padding" style="height: 33%;min-height: 290px;">
+                <div class="row block-padding">
                     <!-- <div class="col-lg-12 col-md-12" style="height:280px" id="charts_32"></div> -->
                     <!--月生产计划-->
                 <div class="col-lg-12 col-md-12">
@@ -161,8 +161,9 @@
                     <div class="col-lg-2 col-md-2 center no-padding">实际工时</div>
                     <div class="col-lg-3 col-md-3 center no-padding">完工百分比</div>
                 </div>
-                <div class="col-lg-12 col-md-12">
-                    <div class="col-lg-12 col-md-12" >
+                </div>
+                <div class="row" >
+                    <div class="col-lg-12 col-md-12" style="height:295px">
                         <div class="row" v-for="product in projectScheduleCompletionList">
                             <!-- <div class="col-lg-3 col-md-3 center no-padding">{{product.productionOrderNumberName}}</div> -->
                             <div class="col-lg-3 col-md-3 center no-padding" style="overflow:hidden; word-break:break-all;white-space:nowrap;text-align: left;">{{product.define12}}</div>
@@ -183,12 +184,11 @@
                         </div>
                     </div>
                 </div>
-                </div>
-                <div class="row block-padding">
+                <div class="row ">
                     <div class="col-lg-12 col-md-12 center block-title">月度项目发货统计</div>
                 </div>
-                <div class="row" style="height: 33%;">
-                    <div class="col-lg-12 col-md-12" style="height:250px" id="charts_33"></div>
+                <div class="row " >
+                    <div class="col-lg-12 col-md-12" style="height:260px" id="charts_33"></div>
                 </div>
             </div>
         </div>
@@ -358,7 +358,7 @@
                     const projectScheduleCompletionList = ServiceProduceTask.getProjectScheduleCompletion();
                     this.cacheDataObject.projectScheduleCompletionList = {
                         data: projectScheduleCompletionList,
-                        pagesize: 8,
+                        pagesize: 7,
                         pageindex: 0
                     }
                     this.projectScheduleCompletionList = projectScheduleCompletionList.slice(0, this.cacheDataObject