合并

ch

2022-11-17 d271cd6aa2c4d76e0dbe34e7aa8a8a498a20fd40

 WebTM/views/IpadStepIndex.html

@@ -83,6 +83,9 @@
                                html1 += '<dd>';
                                html1 += '<h1 style="display:none;"><span>资源ID：</span><span id="eqpid' + i + '">' + LoadData[i - 1].HSourceID + '</span></h1>';
                                html1 += '<h1><span>设备编号：</span><span id="eqp' + i + '">' + LoadData[i - 1].HSourceName + '</span></h1>';
                                html1 += '<h1><span>设备代码：</span><span id="eqp' + i + '">' + LoadData[i - 1].HSourceNumber + '</span></h1>';
                                html1 += '<h1><span>操作员：</span><span id="eqp' + i + '">' + LoadData[i - 1].HUserName + '</span></h1>';
                                html1 += '<h1><span>生产班组：</span><span id="eqp' + i + '">' + LoadData[i - 1].GroupName + '</span></h1>';
                                //html1 += '<h1><span>当前工单：</span><span id="po' + i + '">' + (LoadData[i - 1].HSourceBillNo == null ? '' : LoadData[i - 1].HSourceBillNo) + '</span></h1>';
                                //html1 += '<h1><span>产品名称：</span><span id="ptn' + i + '">' + (LoadData[i - 1].HName == null ? '' : LoadData[i - 1].HName) + '</span></h1>';
                                //html1 += '<h1><span>产品规格：</span><span id="pts' + i + '">' + (LoadData[i - 1].HModel == null ? '' : LoadData[i - 1].HModel) + '</span></h1>';
@@ -195,8 +198,8 @@
                                }
                                html1 += '<span class="prs">生产进度：</span>';
                                html1 += '<div class="layui-progress layui-progress-big" lay-showPercent="yes">';
                                html1 += '<div class="layui-progress-bar" lay-percent="' + (LoadData1[i].HDateFinishQty / LoadData1[i].HDatePlanQty)*100 + '%" style="width:' + (LoadData1[i].HDateFinishQty / LoadData1[i].HDatePlanQty)*100 + '%;">';
                                html1 += '<span class="layui-progress-text">' + (LoadData1[i].HDateFinishQty / LoadData1[i].HDatePlanQty)*100 + '%</span>';
                                html1 += '<div class="layui-progress-bar" lay-percent="' + ((LoadData1[i].HDateFinishQty / LoadData1[i].HDatePlanQty) * 100).toFixed(2) + '%" style="width:' + ((LoadData1[i].HDateFinishQty / LoadData1[i].HDatePlanQty) * 100).toFixed(2) + '%;">';
                                html1 += '<span class="layui-progress-text">' + ((LoadData1[i].HDateFinishQty / LoadData1[i].HDatePlanQty) * 100).toFixed(2) + '%</span>';
                                html1 += '</div > ';
                                html1 += '</div>';
                                html1 += '</dd>';
@@ -225,7 +228,7 @@
                                    html1 += '<h1><span>进度：</span><span>0%</span></h1>';
                                }
                                else {
                                    html1 += '<h1><span>进度：</span><span>' + (LoadData2[i].HRelationQty / LoadData2[i].HPlanQty) * 100 + '%</span></h1>';
                                    html1 += '<h1><span>进度：</span><span>' + ((LoadData2[i].HRelationQty / LoadData2[i].HPlanQty) * 100).toFixed(2) + '%</span></h1>';
                                }
                                html1 += '<h1><span>本单运行时间：</span><span>' + getSeconds(LoadData2[i].HSumTimes) + '</span></h1>';
                                html1 += '<h1><span>当前工序：</span><span>' + LoadData2[i].HProcName + '</span></h1>';