Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI

yusijie

2024-12-17 a912f4944c5028cc0700c6d189bb3a7c728551b3

 WebTM/views/IpadIndex.html

@@ -288,12 +288,18 @@
                                html1 += '<h1><span>当前订单：</span><span>' + LoadData2[i].HSourceBillNo + '</span><div style="margin-left:25px;float:right"><span >巡检次数：</span><span>' + LoadData2[i].巡检次数 + '</span></div></h1>';
                                html1 += '<h1><span>物料名称：</span><span>' + LoadData2[i].HMaterName + '</span><div style="margin-left:25px;float:right"><span >过程检次数：</span><span>' + LoadData2[i].过程检次数 + '</span></div></h1>';
                                html1 += '<h1><span>计划数量：</span><span>' + LoadData2[i].HPlanQty + '</span><div style="margin-left:25px;float:right"><span >当日点检时间：</span><span>' + LoadData2[i].当日点检时间 + '</span></div></h1>';
                                html1 += '<h1><span>已汇报数量：</span><span>' + LoadData2[i].HRelationQty + '</span><div style="margin-left:25px;float:right"><span >最后保养时间：</span><span>' + LoadData2[i].最后保养时间 + '</span></div></h1>';
                                html1 += '<h1><span>已汇报数量：</span><span>' + LoadData2[i].HRelationQty + '</span><div style="margin-left:25px;float:right"><span >最后保养时间：</span><span>' + LoadData2[i].最后保养时间 + '</span></div></h1>';                                                               
                                if (LoadData2[i].HRelationQty == 0 || LoadData2[i].HRelationQty == null) {
                                    html1 += '<h1><span>进度：</span><span>0%</span><div style="margin-left:25px;float:right"><span >点检完成情况：</span><span>' + LoadData2[i].当日点检完成情况 + '</span></div></h1>';
                                }
                                else {
                                    html1 += '<h1><span>进度：</span><span>' + ((LoadData2[i].HRelationQty / LoadData2[i].HPlanQty) * 100).toFixed(2) + '%</span><div style="margin-left:25px;float:right"><span >点检完成情况：</span><span>' + LoadData2[i].当日点检完成情况 + '</span></div></h1>';
                                }
                                if (LoadData2[i].安灯未验收数量 == 0 || LoadData2[i].安灯未验收数量 == null) {
                                    html1 += '<h1><span>异常反馈未验收：</span><span class="gj_icon color_border4"></span><span>' + LoadData2[i].安灯未验收数量 + '</span></h1>';
                                }
                                else {
                                    html1 += '<h1><span>异常反馈未验收：</span><span class="gj_icon color_border5"></span><span>' + LoadData2[i].安灯未验收数量 + '</span></h1>';
                                }
                                html1 += '<h1><span>本单运行时间：</span><span>' + getSeconds(LoadData2[i].HSumTimes) + '</span></h1>';
                                html1 += '<h1><span>本资源运行时间：</span><span>' + getSeconds(LoadData2[i].HSourceWorkTime) + '</span></h1>';
@@ -397,6 +403,7 @@
                                    return false;
                                }
                                else {
                                    layer.close(index);
                                    layer.alert(data.Message, { icon: 5 });
                                    return false;