产线

js/service/produce-task.js

@@ -333,6 +333,18 @@ var ServiceProduceTask = {
             element.planSum=element.numberOfTasks
             element.workHour= element.standardWorkingHours
             // element.completeSum=element.qualifiedinqty
+            if(element.state==='0'){
+                element.stateName="派工"
+            }
+            if(element.state==='1'){
+                element.stateName="上岗"
+            }
+            if(element.state==='2'){
+                element.stateName="暂停"
+            }
+            if(element.state==='3'&&element.latestCompletedQuantity!==element.numberOfTasks){
+                element.stateName="进行中"
+            }
         })
 
         $.each(taskList, function (index, item) {

pages/dashboard/line.html

@@ -83,9 +83,9 @@
                     <div class="col-lg-12 col-md-2" style="height:240px" id="charts_13"></div>
                 </div>
             </div>
-            <div class="col-lg-6" >
+            <div class="col-lg-7" >
                 <div class="row block-padding" style="height: 350px;">
-                    <div  class="col-lg-4 col-md-4 padding-around" v-for="task in doingTaskList">
+                    <div style="height: 180px;" class="col-lg-4 col-md-4 padding-around" v-for="task in doingTaskList">
                         <div class="task-block" :class="task.bgcss">
                             <div class="row ">
                                 <div class="col-lg-12 col-md-12 center task-block-title">{{task.displayName}}</div>
@@ -134,7 +134,7 @@
                 <div class="row block-padding">
                     <div class="col-lg-1 col-md-1 center no-padding">项目名称</div>
                     <div class="col-lg-1 col-md-1 center no-padding">工单号</div>
-                    <div class="col-lg-2 col-md-2 center no-padding">物料编码</div>
+                    <div class="col-lg-1 col-md-1 center no-padding">物料编码</div>
                     <!-- <div class="col-lg-2 col-md-2 center no-padding">型号规格</div> -->
                     <div class="col-lg-1 col-md-1 center no-padding">物料名称</div>
                     <div class="col-lg-1 col-md-1 center no-padding">计划数量</div>
@@ -144,12 +144,13 @@
                     <div class="col-lg-1 col-md-1 center no-padding">作业人员</div>
                     <div class="col-lg-1 col-md-1 center no-padding">达成率</div>
                     <div class="col-lg-1 col-md-1 center no-padding">生产效率</div>
+                    <div class="col-lg-1 col-md-1 center no-padding">状态</div>
                     <!-- <div class="col-lg-2 col-md-2 center no-padding">完成进度(已/未)</div> -->
                 </div>
                 <div class="row" v-for="product in dayProduceTaskList">
-                    <div class="col-lg-1 col-md-1 center no-padding">{{product.projectName}}</div>
+                    <div style="overflow:hidden; word-break:break-all;white-space:nowrap" class="col-lg-1 col-md-1 center no-padding">{{product.projectName}}</div>
                     <div class="col-lg-1 col-md-1 center no-padding">{{product.orderSheetCode}}</div>
-                    <div style="overflow:hidden; word-break:break-all;white-space:nowrap" class="col-lg-2 col-md-2 center no-padding">{{product.materialCode}}</div>
+                    <div style="overflow:hidden; word-break:break-all;white-space:nowrap" class="col-lg-1 col-md-1 center no-padding">{{product.materialCode}}</div>
                     <!-- <div class="col-lg-2 col-md-2 center no-padding">{{product.specs}}</div> -->
                     <div style="overflow:hidden; word-break:break-all;white-space:nowrap" class="col-lg-1 col-md-1 left no-padding">{{product.materialName}}</div>
                     <div class="col-lg-1 col-md-1 center no-padding">{{product.planSum}}</div>
@@ -159,6 +160,9 @@
                     <div class="col-lg-1 col-md-1 center no-padding">{{product.name}}</div>
                     <div class="col-lg-1 col-md-1 center no-padding">{{product.productionEfficiency}}%</div>
                     <div class="col-lg-1 col-md-1 center no-padding">{{product.productionEfficiency}}%</div>
+                    <div class="col-lg-1 col-md-1 center no-padding">
+                        {{product.stateName}}
+                    </div>
                     <!-- <div class="col-lg-2 col-md-2 center no-padding progress">
                         <div class="progress-bar progress-bar-info" role="progressbar" aria-valuenow="60"
                             aria-valuemin="0" aria-valuemax="100" :style="{width:product.completePercent}">
@@ -171,7 +175,7 @@
                     </div> -->
                 </div>
             </div>
-            <div class="col-lg-3">
+            <div class="col-lg-2">
                 <div class="row block-padding">
                     <div class="col-lg-12 col-md-12 center block-title">生产效率</div>
                 </div>