Merge remote-tracking branch 'origin/mdqdwcs' into mdqdwcs

cp

2024-01-17 3fbef8c9533fea45f5ece7f8384fc8172d3fd4e2

 src/main/webapp/views/pipeline.html

@@ -53,32 +53,6 @@

            <!-- plc异常日志监控版 -->
            <div id="plc-error" class="main-board" style="padding-left: 10px">
                <!-- 头部 -->
                <div class="plc-log-header">
                    <!-- 设备任务操作 -->
                    <div class="io-mode-oper">
                        <fieldset>
                            <legend>入出库模式（IO-Mode）</legend>
                            <div class="io-mode-box">
                                <label>102</label>
                                <button id="io-mode-1" class="ioModeBtn" onclick="ioModeSwitch(this.id)"> - </button>
                            </div>
                            <div class="io-mode-box">
                                <label>105</label>
                                <button id="io-mode-2" class="ioModeBtn" onclick="ioModeSwitch(this.id)"> - </button>
                            </div>
                        </fieldset>
                    </div>
<!--                    &lt;!&ndash;            <div style="height: 40%">&ndash;&gt;-->
<!--                    &lt;!&ndash;                <span>东侧PLC执行指令</span>&ndash;&gt;-->
<!--                    &lt;!&ndash;            </div>&ndash;&gt;-->
<!--                    &lt;!&ndash;            <div style="height: 40%">&ndash;&gt;-->
<!--                    &lt;!&ndash;                <span>西侧PLC执行指令</span>&ndash;&gt;-->
<!--                    &lt;!&ndash;            </div>&ndash;&gt;-->
<!--                    &lt;!&ndash;                    <div>&ndash;&gt;-->
<!--                    &lt;!&ndash;                        <span style="color: #1E9FFF">PLC异常信息表:</span>&ndash;&gt;-->
<!--                    &lt;!&ndash;                    </div>&ndash;&gt;-->
                </div>
                <!-- 主体 -->
                <div class="plc-log-body">
                    <div>
@@ -87,7 +61,7 @@
                    <table id="plc-error-table">
                        <thead>
                        <tr>
                            <th style="width: 200px">序号</th>
                            <th style="width: 200px">站点</th>
                            <th style="width: 400px">PLC错误描述</th>
                            <th style="width: 400px">异常</th>
                        </tr>
@@ -116,7 +90,9 @@
                        <th>入库标记</th>
                        <th>空板信号</th>
                        <th>目标站</th>
                        <th>大小库位</th>
                        <th>高低库位</th>
                        <th>自动出</th>
                        <th>自动入</th>
                    </tr>
                    </thead>
                    <!-- 表格内容 -->
@@ -305,6 +281,8 @@
                        setVal(tr.children("td").eq(7), table[i-1].emptyMk);
                        setVal(tr.children("td").eq(8), table[i-1].staNo);
                        setVal(tr.children("td").eq(9), table[i-1].locType1);
                        setVal(tr.children("td").eq(10), table[i-1].autoOut);
                        setVal(tr.children("td").eq(10), table[i-1].autoIn);
                    }
                } else if (res.code === 403){
                    window.location.href = baseUrl+"/login";