制造看板

js/service/produce-task.js

@@ -525,11 +525,11 @@ var ServiceProduceTask = {
             item.incompletePercent = (100 - item.completePercent) + "%";
             item.completePercent = item.completePercent + "%";
             const dateNow = DateOperation.formatDate(new Date(), "YYYY-mm-dd");
-            // if(item.planCompleteDate){
-            //     item.bgcss = DateOperation.subtraction(item.planCompleteDate, dateNow, "s")>0?"task-block-timeout":"task-block-normal";
-            // }else{
+            if(item.plannedEndTime){
+                item.bgcss = DateOperation.subtraction(item.plannedEndTime, dateNow, "s")>0?"task-block-timeout":"task-block-normal";
+            }else{
                 item.bgcss="task-block-normal";
-            // }
+            }
             item.displayName = item.projectName == "" ? item.orderCode : item.projectName;
         });
         return taskList;

pages/dashboard/produce.html

@@ -150,23 +150,21 @@
                 <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:280px" id="charts_32"></div> -->
                     <!--月生产计划-->
-                <div class="col-lg-12 col-md-12">
+                <div class="row block-padding">
                     <!-- <div class="col-lg-3 col-md-3 center no-padding">工单号</div> -->
-                    <div class="col-lg-3 col-md-3 center no-padding" style="text-align: left;padding-left: 5%;">项目名</div>
+                    <div class="col-lg-3 col-md-3 center no-padding" style="text-align: center;">项目名</div>
                     <div class="col-lg-2 col-md-2 center no-padding">计划数量</div>
                     <div class="col-lg-2 col-md-2 center no-padding">标准工时</div>
                     <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>
                 <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>
+                            <div class="col-lg-3 col-md-3 center no-padding" style="overflow:hidden; word-break:break-all;white-space:nowrap;text-align: center;">{{product.define12}}</div>
                             <div class="col-lg-2 col-md-2 center no-padding">{{product.planSum}}</div>
                             <div class="col-lg-2 col-md-2 center no-padding">{{product.workHour}}</div>
                             <div class="col-lg-2 col-md-2 center no-padding">{{product.manHoursInvested}}</div>