产线

css/dashboard.css

@@ -82,10 +82,10 @@ body{
     height: 160px;
 }
 .task-block-normal{
-    background-image: url(../images/content/task-bg-normal.jpg);
+    background-image: url(../images/content/task-bg-normal-1.jpg);
 }
 .task-block-timeout{
-    background-image: url(../images/content/task-bg-timeout.jpg);
+    background-image: url(../images/content/task-bg-timeout-1.jpg);
 }
 .padding-around{
     padding: 0px 2px 10px 20px;

pages/dashboard/line.html

@@ -90,15 +90,15 @@
                     <div class="col-lg-12 col-md-2" style="height:240px" id="charts_13"></div>
                 </div>
             </div>
-            <div class="col-lg-7" style="padding-left: 50px;">
+            <div class="col-lg-7" >
                 <div class="row block-padding" style="height: 350px;">
-                    <div style="height: 180px;padding: 0px 30px;"  class="col-lg-4 col-md-4 " v-for="task in doingTaskList">
-                        <div class="task-block" :class="task.bgcss">
+                    <div style="height: 200px;padding-left: 0px;"  class="col-lg-4 col-md-4 " v-for="task in doingTaskList">
+                        <div class="task-block" :class="task.bgcss" style="height: 190px;width: 350px;">
                             <div class="row ">
                                 <div class="col-lg-12 col-md-12 center task-block-title">{{task.displayName}}</div>
                             </div>
                             <div class="row">
-                                <div class="col-lg-4 col-md-4" style="padding-left: 34px;padding-top: 27px;">
+                                <div class="col-lg-4 col-md-4" style="padding-left: 23px;padding-top: 40px;">
                                     <div class="task-block-title-small center">任务数量</div>
                                     <div class="task-block-title-big center">{{task.planSum}}</div>
                                     <div class="task-block-title-small center" style="padding-top:17px;">已完工总数</div>
@@ -129,6 +129,11 @@
                                     </div>
                                 </div>
                             </div>
+                            <div class="row">
+                                <div class="col-lg-12 col-md-12" style="padding-left: 23px;">
+                                    <div class="task-block-text">工艺进度：{{task.fbsTechnologicalProcessItemName}}</div>
+                                </div>
+                            </div>
 
                         </div>
                     </div>
@@ -152,6 +157,7 @@
                     <div class="col-lg-1 col-md-1 center no-padding" style="width: 8%;">作业人员</div>
                     <div class="col-lg-1 col-md-1 center no-padding" style="width: 8%;">达成率</div>
                     <div class="col-lg-1 col-md-1 center no-padding" style="width: 8%;">生产效率</div>
+                    <!-- <div class="col-lg-1 col-md-1 center no-padding" style="width: 22%;">状态</div> -->
                     <div class="col-lg-1 col-md-1 center no-padding" style="width: 7%;text-align: left;">状态</div>
                     <!-- <div class="col-lg-2 col-md-2 center no-padding">完成进度(已/未)</div> -->
                 </div>
@@ -169,6 +175,7 @@
                     <div style="width: 8%;" class="col-lg-1 col-md-1 center no-padding">{{product.name}}</div>
                     <div style="width: 8%;" class="col-lg-1 col-md-1 center no-padding">{{product.achievementRate}}%</div>
                     <div style="width: 8%;" class="col-lg-1 col-md-1 center no-padding">{{product.productionEfficiency}}%</div>
+                    <!-- <div style="width: 22%;" class="col-lg-1 col-md-1 center no-padding"><span style="font-size: 10px;">线束=>地板=>输送机=>测试=>测试</span></div> -->
                     <div style="width: 7%;text-align: left;" class="col-lg-1 col-md-1 center no-padding" >     
                         <strong style="font-size:10px;" :style="{color:product.color}">●</strong>{{product.stateName}}
                     </div>