制造 产线

css/dashboard.css

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

js/service/produce-task.js

@@ -538,6 +538,7 @@ var ServiceProduceTask = {
                 item.bgcss="task-block-normal";
             }
             item.displayName = item.projectName == "" ? item.orderCode : item.projectName;
+            // item.technologicalList=[{aa:"工单",bb:"1"},{aa:"工单",bb:"1"},{aa:"工单",bb:"2"}]
         });
         return taskList;
     },

pages/dashboard/line.html

@@ -98,7 +98,7 @@
                                 <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: 23px;padding-top: 40px;">
+                                <div class="col-lg-3 col-md-3" style="text-align: center;padding: 19px 0px 0px 34px;margin-right: 7px;">
                                     <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>
@@ -108,7 +108,7 @@
                                     <!-- <div class="task-block-text">预计开工日期：{{task.planStartDate}}</div> -->
                                     <div class="task-block-text">完工日期：{{task.planCompleteDate}}</div>
                                     <div class="task-block-text">物料编码：{{task.productId}}</div>
-                                    <div class="task-block-text">物料名称：{{task.materialName}}</div>
+                                    <div class="task-block-text" style="overflow:hidden; word-break:break-all;white-space:nowrap">物料名称：{{task.materialName}}</div>
                                     <!-- <div class="task-block-text">规格：{{task.specs}}</div> -->
                                     <!-- <div class="task-block-text">规格：{{task.specs}}</div> -->
                                     <div class="task-block-text">
@@ -129,9 +129,19 @@
                                     </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 class="row" style="padding-top: 12px;" >
+                                <div class="col-lg-12 col-md-12 "  style="padding-left: 40px;overflow:hidden; word-break:break-all;white-space:nowrap">
+                                    <span class="task-block-text" ><span class="task-block-title-small center">工艺流程：</span>
+                                        <span style="color: aliceblue;" v-for="(t,index) in task.fbsTechnologicalProcessItemList" >
+                                            <!-- <span v-if="index==0&&t.isTechnological=='1'" style="font-size:15px;border-top-left-radius: 3px;border-bottom-left-radius: 3px;padding: 2px;background-color:#1ABDE6;"></span>
+                                            <span v-if="index==0&&t.isTechnological=='2'" style="font-size:15px;border-top-left-radius: 3px;border-bottom-left-radius: 3px;padding: 2px;background-color:orange;"></span> -->
+                                            <span v-if="t.isTechnological=='1'" style="border-radius:5px;background-color:#1ABDE6;padding: 2px;" >{{t.name}}</span>
+                                            <span v-if="t.isTechnological=='2'" style="border-radius:5px;background-color:orange;padding: 2px;">{{t.name}}</span>
+                                            <!-- <span v-if="index==(task.fbsTechnologicalProcessItemList.length-1)&&t.isTechnological=='1'" style="font-size:15px;border-top-right-radius: 3px;border-bottom-right-radius: 3px;padding: 2px;background-color:#1ABDE6;"></span>
+                                            <span v-if="index==(task.fbsTechnologicalProcessItemList.length-1)&&t.isTechnological=='2'" style="font-size:15px;border-top-right-radius: 3px;border-bottom-right-radius: 3px;padding: 2px;background-color:orange;"></span>     -->
+                                        </span> 
+                                        
+                                    </span>
                                 </div>
                             </div>
 
@@ -157,7 +167,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: 6%;">达成率</div>
                     <div class="col-lg-1 col-md-1 center no-padding" style="width: 6%;">生产效率</div>
-                    <div class="col-lg-1 col-md-1 center no-padding" style="width: 19%;">工艺流程</div>
+                    <div class="col-lg-1 col-md-1 center no-padding" style="width: 21%;">工艺流程</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>
@@ -175,7 +185,18 @@
                     <div style="width: 8%;" class="col-lg-1 col-md-1 center no-padding">{{product.name}}</div>
                     <div style="width: 6%;" class="col-lg-1 col-md-1 center no-padding">{{product.achievementRate}}%</div>
                     <div style="width: 6%;" class="col-lg-1 col-md-1 center no-padding">{{product.productionEfficiency}}%</div>
-                    <div style="width: 19%;" class="col-lg-1 col-md-1 center no-padding"><span style="font-size: 10px;"></span></div>
+                    <div style="width: 21%;overflow:hidden; word-break:break-all;white-space:nowrap" class="col-lg-1 col-md-1 center no-padding" >
+                        <!-- <span style="font-size: 10px;"> -->
+                            <span style="color: aliceblue;" v-for="(t,index) in product.fbsTechnologicalProcessItemList">
+                                <!-- <span v-if="index==0&&t.isTechnological=='1'" style="font-size:15px;border-top-left-radius: 3px;border-bottom-left-radius: 3px;padding: 2px;background-color:#1ABDE6;"></span>
+                                <span v-if="index==0&&t.isTechnological=='2'" style="font-size:15px;border-top-left-radius: 3px;border-bottom-left-radius: 3px;padding: 2px;background-color:orange;"></span> -->
+                                <span v-if="t.isTechnological=='1'" style="border-radius:5px;background-color:#1ABDE6;padding: 2px;" >{{t.name}}</span>
+                                <span v-if="t.isTechnological=='2'" style="border-radius:5px;background-color:orange;padding: 2px;">{{t.name}}</span>
+                                <!-- <span v-if="index==(task.fbsTechnologicalProcessItemList.length-1)&&t.isTechnological=='1'" style="font-size:15px;border-top-right-radius: 3px;border-bottom-right-radius: 3px;padding: 2px;background-color:#1ABDE6;"></span>
+                                <span v-if="index==(task.fbsTechnologicalProcessItemList.length-1)&&t.isTechnological=='2'" style="font-size:15px;border-top-right-radius: 3px;border-bottom-right-radius: 3px;padding: 2px;background-color:orange;"></span>     -->
+                            </span> 
+                        <!-- </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>