#

luxiaotao1123

2020-08-19 cf94ec501adf48741fbe7969e7d36f4a1c43dcbe

 src/main/webapp/views/pipeline.html

@@ -61,9 +61,8 @@
                    <th>有物</th>
                    <th>可入</th>
                    <th>可出</th>
                    <th>需求入</th>
                    <th>需求出</th>
                    <th>高低库</th>
                    <th>需求1</th>
                    <th>空板信号</th>
                    <th>目标站</th>
                </tr>
            </thead>
@@ -84,8 +83,6 @@
    // 实际行数
    var plcErrorTableFullRows = 0;
    var siteTableFullRows = 0;


    var outputDom = document.getElementById("output");
    $(document).ready(function() {
        initPlcErrorTable();
@@ -99,7 +96,7 @@
        getSite();
    }, 1000);
    setInterval(function () {
        output("\n" +new Date().toLocaleString() + "【2020-5-29 13:14:22】扫描plcA 目标站--27328372372832763643234323432342");
        getSiteOutput();
    },500);


@@ -121,7 +118,7 @@
                        tr.children("td").eq(2).html(table[i-1].error);
                    }
                } else if (res.code === 403){
                    top.location.href = baseUrl+"/login";
                    window.location.href = baseUrl+"/login";
                }  else {
                    alert(res.msg);
                }
@@ -132,7 +129,6 @@
    // 站点信息表获取
    function getSite() {
        var tableEl = $('#site-table');
        // tableEl.children("tr").children("td").html("");
        $.ajax({
            url: baseUrl+ "/site/table/site",
            headers: {'token': localStorage.getItem('token')},
@@ -150,31 +146,37 @@
                        setVal(tr.children("td").eq(1), table[i-1].workNo);
                        setVal(tr.children("td").eq(2), table[i-1].autoing);
                        setVal(tr.children("td").eq(3), table[i-1].loading);
                        setVal(tr.children("td").eq(4), table[i-1].canining);
                        setVal(tr.children("td").eq(5), table[i-1].canouting);
                        setVal(tr.children("td").eq(6), table[i-1].inreqIn);
                        setVal(tr.children("td").eq(7), table[i-1].inreqOut);
                        setVal(tr.children("td").eq(8), table[i-1].highLow);
                        setVal(tr.children("td").eq(4), table[i-1].inEnable);
                        setVal(tr.children("td").eq(5), table[i-1].outEnable);
                        setVal(tr.children("td").eq(6), table[i-1].inreq1);
                        setVal(tr.children("td").eq(7), table[i-1].emptyMk);
                        setVal(tr.children("td").eq(9), table[i-1].staNo);

                        // tr.children("td").eq(0).html(table[i-1].devNo);
                        // tr.children("td").eq(1).html(table[i-1].workNo);
                        // tr.children("td").eq(2).html(table[i-1].autoing);
                        // tr.children("td").eq(3).html(table[i-1].loading);
                        // tr.children("td").eq(4).html(table[i-1].canining);
                        // tr.children("td").eq(5).html(table[i-1].canouting);
                        // tr.children("td").eq(6).html(table[i-1].inreqIn);
                        // tr.children("td").eq(7).html(table[i-1].inreqOut);
                        // tr.children("td").eq(8).html(table[i-1].highLow);
                        // tr.children("td").eq(9).html(table[i-1].staNo);
                    }
                } else if (res.code === 403){
                    top.location.href = baseUrl+"/login";
                    window.location.href = baseUrl+"/login";
                }  else {
                    alert(res.msg);
                }
            }
        });
    }

    // 输送设备日志输出
    function getSiteOutput() {
        $.ajax({
            url: baseUrl + "/site/output/site",
            headers: {'token': localStorage.getItem('token')},
            method: 'POST',
            success: function (res) {
                if (res.code === 200) {
                    output(res.data);
                } else if (res.code === 403) {
                    window.location.href = baseUrl + "/login";
                } else {
                    alert(res.msg);
                }
            }
        })
    }

    // 日志输出框
@@ -225,7 +227,6 @@
        var html = "";
        for (var i = 0; i < line; i ++){
            html += " <tr>\n" +
                "       <td></td>\n" +
                "       <td></td>\n" +
                "       <td></td>\n" +
                "       <td></td>\n" +