产线看板 esop看板

pages/dashboard/esop.html

@@ -140,10 +140,14 @@ iframe.height = iframeWin.document.documentElement.scrollHeight || iframeWin.doc
         // const taskList1 = [];//ServiceProduceTask.getEsopFileList();
         // const taskList2 = [];//ServiceProduceTask.getEsopTaskList();
         // setIframeHeight(document.getElementById('frameMain'));
-        $("#frameMain").height($(window).height()+110);
+        // $("#frameMain").height($(window).height()+110);
+        // $("#imgType").height($(window).height()-110);
+        // $("#videoType").height($(window).height()-110);
+        $("#frameMain").height($(window).height()-110);
         $("#imgType").height($(window).height()-110);
         $("#videoType").height($(window).height()-110);
 
+
         const taskList2 = ServiceProduceTask.getEsopTaskList();
         
         //获取总页数

pages/dashboard/line.html

@@ -130,19 +130,30 @@
                                 </div>
                             </div>
                             <div class="row" style="padding-top: 8px;" >
-                                <div class="col-lg-12 col-md-12 "  style="padding-left: 40px;overflow:hidden; word-break:break-all;white-space:nowrap">
+                                <div class="col-lg-3 col-md-3" style="text-align: center;padding: 4px 0px 0px 34px;margin-right: 7px;">
+                                    <div class="task-block-title-small center">工艺流程</div>
+                                </div>
+                                <div class="col-lg-8 col-md-8" style="padding-left: 4px;padding-top: 3px;">
+                                    <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> 
+                                </div>
+                                <!-- <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" style="margin-right: 10%;">工艺流程</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> -->
                             </div>
 
                         </div>
@@ -182,7 +193,7 @@
                     <!-- <div style="width: 7%;" class="col-lg-1 col-md-1 center no-padding">{{product.workHour}}</div> -->
                     <div style="width: 7%;" class="col-lg-1 col-md-1 center no-padding">{{product.latestCompletedQuantity}}</div>
                     <!-- <div style="width: 7%;" class="col-lg-1 col-md-1 center no-padding">{{product.manHoursCompleted}}</div> -->
-                    <div style="width: 8%;" class="col-lg-1 col-md-1 center no-padding">{{product.name}}</div>
+                    <div style="width: 8%;overflow:hidden; word-break:break-all;white-space:nowrap" 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: 21%;overflow:hidden; word-break:break-all;white-space:nowrap" class="col-lg-1 col-md-1 center no-padding" >