四向穿梭车地图楼层切换后，显示楼层效果

Junjie

2023-04-06 cfb75c26838c2e8dacf663e4083484f3b1047ca1

 src/main/webapp/views/shuttle.html

@@ -33,19 +33,20 @@
                        <thead>
                            <tr>
                                <th>四向穿梭车</th>
                                <th>待定</th>
                                <th>状态</th>
                                <th>有物</th>
                                <th>在轨</th>
                                <th>任务状态</th>
                                <th>小车状态</th>
                                <th>当前二维码</th>
                                <th>电量</th>
                                <th>排</th>
                                <th>列</th>
                                <th>层</th>
                                <th>等待WCS确认</th>
                                <th>定位</th>
                                <th>充电状态</th>
                                <th>报警信息1</th>
                                <th>报警信息2</th>
                                <th>电池温度</th>
                                <th>错误编号</th>
                                <th>plc输出状态IO</th>
                                <th>错误信息码</th>
                                <th>plc输入状态</th>
                                <th>当前或之前二维码</th>
                                <th>x偏移量</th>
                                <th>y偏移量</th>
                                <th>电压</th>
                                <th>模拟量</th>
                            </tr>
                        </thead>
                        <tbody>
@@ -61,11 +62,12 @@
                            <th>四向穿梭车</th>
                            <th>工作号</th>
                            <th>状态</th>
                            <th>源站</th>
                            <th>目标站</th>
                            <th>源库位</th>
                            <th>目标库位</th>
                            <th>速度</th>
                            <th>升降伺服速度</th>
                            <th>行走伺服速度</th>
                            <th>升降伺服负载</th>
                            <th>行走伺服负载</th>
                            <th>作业标记</th>
                        </tr>
                    </thead>
@@ -95,49 +97,17 @@
                <!-- 设备任务操作 -->
                <div class="task-operator">
                    <div style="display: flex;">
                        <div class="task-operator" style="height: auto;width: auto;">
                        <div class="task-operator" style="height: auto;width: 100%;">
                            <div class="operator-item" style="height: auto">
                                <span class="select-title">源站/源库位</span>
                                <span class="select-title">源库位/目标库位</span>
                                <div class="select-container" style="height: auto">
                                    <div class="select-container-item">
                                        <span>站</span>
                                        <label><input id="sourceStaNo" type="number" name="points" min="0" /></label>
                                        <span>源库位</span>
                                        <label><input id="sourceLocNo" type="text" name="sourceLocNo" /></label>
                                    </div>
                                    <div class="select-container-item">
                                        <span>排</span>
                                        <label><input id="sourceRow" type="number" name="points" min="1" style="background-color: #a9eeff" value="1" /></label>
                                    </div>
                                    <div class="select-container-item">
                                        <span>列</span>
                                        <label><input id="sourceBay" type="number" name="points" min="0" style="background-color: #a9eeff" value="0" /></label>
                                    </div>
                                    <div class="select-container-item">
                                        <span>层</span>
                                        <label><input id="sourceLev" type="number" name="points" min="1" style="background-color: #a9eeff" value="1" /></label>
                                    </div>
                                </div>
                            </div>
                        </div>

                        <div class="task-operator" style="height: auto;width: auto;">
                            <div class="operator-item" style="height: auto">
                                <span class="select-title">源站/源库位</span>
                                <div class="select-container" style="height: auto">
                                    <div class="select-container-item">
                                        <span>站</span>
                                        <label><input id="distStaNo" type="number" name="points" min="0" /></label>
                                    </div>
                                    <div class="select-container-item">
                                        <span>排</span>
                                        <label><input id="distRow" type="number" name="points" min="1" style="background-color: #a9eeff" value="1" /></label>
                                    </div>
                                    <div class="select-container-item">
                                        <span>列</span>
                                        <label><input id="distBay" type="number" name="points" min="0" style="background-color: #a9eeff" value="0" /></label>
                                    </div>
                                    <div class="select-container-item">
                                        <span>层</span>
                                        <label><input id="distLev" type="number" name="points" min="1" style="background-color: #a9eeff" value="1" /></label>
                                        <span>目标库位</span>
                                        <label><input id="distLocNo" type="text" name="distLocNo" /></label>
                                    </div>
                                </div>
                            </div>
@@ -147,14 +117,15 @@
                    <fieldset style="height: auto;padding-bottom: 20px;">
                        <legend>手动操作</legend>
                        <div class="button-group">
                            <button class="item" onclick="shuttleOperator(4)">托盘顶升</button>
                            <button class="item" onclick="shuttleOperator(4)">托盘放下</button>
                            <button class="item" onclick="shuttleOperator(1)">入库</button>
                            <button class="item" onclick="shuttleOperator(2)">出库</button>
                            <button class="item" onclick="shuttleOperator(3)">托盘顶升</button>
                            <button class="item" onclick="shuttleOperator(4)">托盘下降</button>
                            <button class="item" onclick="shuttleOperator(5)">左移</button>
                            <button class="item" onclick="shuttleOperator(6)">右移</button>
                            <button class="item" onclick="shuttleOperator(7)">前移</button>
                            <button class="item" onclick="shuttleOperator(8)">后移</button>
                            <button class="item" onclick="shuttleOperator(9)">强制移动</button>
                            <button class="item" onclick="shuttleOperator(16)">任务完成</button>
                            <button class="item" onclick="shuttleOperator(9)">复位</button>
                        </div>
                    </fieldset>
                </div>
@@ -617,18 +588,19 @@
                        let tr = tableEl.find("tr").eq(i);
                        setVal(tr.children("td").eq(0), table[i-1].shuttleNo);
                        setVal(tr.children("td").eq(1), table[i-1].status);
                        setVal(tr.children("td").eq(2), table[i-1].status);
                        setVal(tr.children("td").eq(3), table[i-1].loading);
                        setVal(tr.children("td").eq(4), table[i-1].track);
                        setVal(tr.children("td").eq(5), table[i-1].batteryPower);
                        setVal(tr.children("td").eq(6), table[i-1].row);
                        setVal(tr.children("td").eq(7), table[i-1].bay);
                        setVal(tr.children("td").eq(8), table[i-1].lev);
                        setVal(tr.children("td").eq(9), table[i-1].waiting);
                        setVal(tr.children("td").eq(10), table[i-1].loca);
                        setVal(tr.children("td").eq(11), table[i-1].chargeStatus);
                        setVal(tr.children("td").eq(12), table[i-1].alarm1);
                        setVal(tr.children("td").eq(13), table[i-1].alarm2);
                        setVal(tr.children("td").eq(2), table[i-1].busyStatus);
                        setVal(tr.children("td").eq(3), table[i-1].currentCode);
                        setVal(tr.children("td").eq(4), table[i-1].batteryPower);
                        setVal(tr.children("td").eq(5), table[i-1].batteryTemp);
                        setVal(tr.children("td").eq(6), table[i-1].errorCode$);
                        setVal(tr.children("td").eq(7), table[i-1].plcOutputStatusIO);
                        setVal(tr.children("td").eq(8), table[i-1].statusErrorCode);
                        setVal(tr.children("td").eq(9), table[i-1].plcInputStatus);
                        setVal(tr.children("td").eq(10), table[i-1].currentOrBeforeCode);
                        setVal(tr.children("td").eq(11), table[i-1].codeOffsetX);
                        setVal(tr.children("td").eq(12), table[i-1].codeOffsetY);
                        setVal(tr.children("td").eq(13), table[i-1].currentVoltage);
                        setVal(tr.children("td").eq(14), table[i-1].currentAnalogValue);
                    }
                } else if (res.code === 403){
                    window.location.href = baseUrl+"/login";
@@ -658,12 +630,13 @@
                        setVal(tr.children("td").eq(0), table[i-1].shuttleNo);
                        setVal(tr.children("td").eq(1), table[i-1].workNo);
                        setVal(tr.children("td").eq(2), table[i-1].status);
                        setVal(tr.children("td").eq(3), table[i-1].sourceStaNo);
                        setVal(tr.children("td").eq(4), table[i-1].staNo);
                        setVal(tr.children("td").eq(5), table[i-1].sourceLocNo);
                        setVal(tr.children("td").eq(6), table[i-1].locNo);
                        setVal(tr.children("td").eq(7), table[i-1].speed);
                        setVal(tr.children("td").eq(8), table[i-1].pakMk);
                        setVal(tr.children("td").eq(3), table[i-1].sourceLocNo);
                        setVal(tr.children("td").eq(4), table[i-1].distLocNo);
                        setVal(tr.children("td").eq(5), table[i-1].currentLiftServoSpeed);
                        setVal(tr.children("td").eq(6), table[i-1].currentMoveServoSpeed);
                        setVal(tr.children("td").eq(7), table[i-1].currentLiftServoLoad);
                        setVal(tr.children("td").eq(8), table[i-1].currentMoveServoLoad);
                        setVal(tr.children("td").eq(9), table[i-1].pakMk);
                    }
                } else if (res.code === 403){
                    window.location.href = baseUrl+"/login";
@@ -696,7 +669,9 @@
    function shuttleOperator(shuttleTaskMode) {
        http.post(baseUrl+"/shuttle/operator/shuttle", {
            shuttleNo: $('input[name="shuttleSelect"]:checked').val(),
            shuttleTaskMode: shuttleTaskMode
            shuttleTaskMode: shuttleTaskMode,
            sourceLocNo: $("#sourceLocNo").val(),
            distLocNo: $("#distLocNo").val()
        }, function (res) {
            layer.msg(res.msg, {icon: 1});
        });
@@ -736,6 +711,8 @@
                "       <td></td>\n" +
                "       <td></td>\n" +
                "       <td></td>\n" +
                "       <td></td>\n" +
                "       <td></td>\n" +
                "     </tr>\n";
        }
        $('#shuttle-state-table tbody').after(html);