11

js/content/mycharts.js

@@ -489,18 +489,19 @@ var ChartsService = {
                         position: 'insideRight'
                     },
                     data: yDataList
-                },
-                {
-                    name: '未打卡',
-                    type: 'bar',
-                    stack: '总量',
-                    label: {
-                        show: true,
-                        formatter: '{c}%',//显示百分号
-                        position: 'insideRight'
-                    },
-                    data: yDataList2
                 }
+                // ,
+                // {
+                //     name: '未打卡',
+                //     type: 'bar',
+                //     stack: '总量',
+                //     label: {
+                //         show: false,
+                //         formatter: '{c}%',//显示百分号
+                //         position: 'insideRight'
+                //     },
+                //     data: yDataList2
+                // }
             ]
         };
 

js/service/produce-task.js

@@ -506,10 +506,10 @@ var ServiceProduceTask = {
             }
             element.projectName=element.productionOrderNumberName;
             element.orderCode=element.productionOrderNumberName;
-            if(element.endDate){
+            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("yyyy-MM-dd")+"至"+e.Format("yyyy-MM-dd");
             }else{
                 element.planCompleteDate="";
             }

pages/dashboard/produce.html

@@ -155,7 +155,7 @@
                     <!--月生产计划-->
                 <div class="col-lg-12 col-md-12">
                     <!-- <div class="col-lg-3 col-md-3 center no-padding">工单号</div> -->
-                    <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-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>
@@ -165,7 +165,7 @@
                     <div class="col-lg-12 col-md-12" >
                         <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">{{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: left;">{{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>