#

luxiaotao1123

2020-09-18 a3c99f39f98f5fd1ced3f8b84d0789160c8d72ed

 src/main/webapp/views/pipeline.html

@@ -22,12 +22,12 @@
    <div id="plc-error" class="main-board" style="padding-left: 10px">
        <!-- 头部 -->
        <div class="plc-log-header">
            <div style="height: 40%">
                <span>东侧PLC执行指令</span>
            </div>
            <div style="height: 40%">
                <span>西侧PLC执行指令</span>
            </div>
<!--            <div style="height: 40%">-->
<!--                <span>东侧PLC执行指令</span>-->
<!--            </div>-->
<!--            <div style="height: 40%">-->
<!--                <span>西侧PLC执行指令</span>-->
<!--            </div>-->
            <div>
                <span style="color: #1E9FFF">PLC异常信息表:</span>
            </div>
@@ -62,7 +62,7 @@
                    <th>有物</th>
                    <th>可入</th>
                    <th>可出</th>
                    <th>需求1</th>
                    <th>入库标记</th>
                    <th>空板信号</th>
                    <th>目标站</th>
                </tr>
@@ -147,7 +147,7 @@
                } else if (res.code === 403){
                    window.location.href = baseUrl+"/login";
                }  else {
                    alert(res.msg);
                    console.log(res.msg);
                }
            }
        });
@@ -175,14 +175,14 @@
                        setVal(tr.children("td").eq(3), table[i-1].loading);
                        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(6), table[i-1].pakMk);
                        setVal(tr.children("td").eq(7), table[i-1].emptyMk);
                        setVal(tr.children("td").eq(9), table[i-1].staNo);
                        setVal(tr.children("td").eq(8), table[i-1].staNo);
                    }
                } else if (res.code === 403){
                    window.location.href = baseUrl+"/login";
                }  else {
                    alert(res.msg);
                    console.log(res.msg);
                }
            }
        });