#

Junjie

2023-10-13 03e68b2be24ea024eae645c47da1d4cb1773302a

 src/main/webapp/views/lift.html

@@ -29,20 +29,17 @@
                        <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>伺服1错误</th>
                        <th>伺服2错误</th>
                        <th>伺服3错误</th>
                        <th>伺服4错误</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>
                    <tbody>
@@ -57,15 +54,13 @@
                <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>层</th>
                    <th>作业标记</th>
                    <th>穿梭车号</th>
                    <th>令牌</th>
                </tr>
                </thead>
                <tbody>
@@ -98,17 +93,27 @@
                    <div class="button-group">
                        <select id="liftLev">
                            <option value="1" selected>1F</option>
                            <option value="3">2F</option>
                            <option value="4">3F</option>
                            <option value="5">4F</option>
                            <option value="2">输送线位置</option>
                            <option value="2">2F</option>
                            <option value="3">3F</option>
                            <option value="4">4F</option>
                            <option value="5">5F</option>
                            <option value="6">6F</option>
                            <option value="7">7F</option>
                            <option value="8">8F</option>
                            <option value="9">9F</option>
                            <option value="10">10F</option>
                        </select>
                        <button class="item" onclick="liftOperator(1)">移动提升机</button>
                        <button class="item" onclick="liftOperator(3)">无货正转</button>
                        <button class="item" onclick="liftOperator(4)">无货反转</button>
                        <button class="item" onclick="liftOperator(5)">有货正转</button>
                        <button class="item" onclick="liftOperator(6)">有货反转</button>
                        <button class="item" onclick="liftOperator(7)">链条停止</button>

                        <div class="select-container-item">
                            <span>源站</span>
                            <label><input id="sourceStaNo" type="text" name="sourceStaNo" /></label>
                        </div>
                        <div class="select-container-item">
                            <span>目标站</span>
                            <label><input id="staNo" type="text" name="staNo" /></label>
                        </div>
                        <button class="item" onclick="liftOperator(2)">移动托盘</button>
                        <button class="item" onclick="liftOperator(0)">复位</button>
                    </div>
                </fieldset>
@@ -138,6 +143,12 @@
                    <label class="form-label">作业标记:</label>
                    <div class="form-input">
                        <input id="pakMk" name="pakMk" type="text" class="layui-input" autocomplete="off">
                    </div>
                </div>
                <div class="form-item">
                    <label class="form-label">令牌:</label>
                    <div class="form-input">
                        <input id="token" name="token" type="text" class="layui-input" autocomplete="off">
                    </div>
                </div>
                <div class="form-item form-button-container">
@@ -204,9 +215,10 @@
            liftNo: $('#liftNo').val(),
            workNo: $('#workNo').val(),
            pakMk: $('#pakMk').val(),
            token: $('#token').val(),
        }, function (res) {
            layer.msg("修改成功", {icon: 1,});
            layer.close(layerIdx);
            layer.close(layerDetl);
        })
    })

@@ -263,20 +275,17 @@
                        setVal(tr.children("td").eq(0), table[i-1].liftNo);
                        setVal(tr.children("td").eq(1), table[i-1].taskNo);
                        setVal(tr.children("td").eq(2), table[i-1].protocolStatus$);
                        setVal(tr.children("td").eq(3), table[i-1].liftLock$);
                        setVal(tr.children("td").eq(4), table[i-1].positionArrivalFeedback);
                        setVal(tr.children("td").eq(5), table[i-1].ready$);
                        setVal(tr.children("td").eq(6), table[i-1].running$);
                        setVal(tr.children("td").eq(7), table[i-1].mode$);
                        setVal(tr.children("td").eq(8), table[i-1].platPositionDeviationAlarm$);
                        setVal(tr.children("td").eq(9), table[i-1].platTorqueDeviationAlarm$);
                        setVal(tr.children("td").eq(10), table[i-1].platShuttleCheck$);
                        setVal(tr.children("td").eq(11), table[i-1].notReady$);
                        setVal(tr.children("td").eq(12), table[i-1].servoError1);
                        setVal(tr.children("td").eq(13), table[i-1].servoError2);
                        setVal(tr.children("td").eq(14), table[i-1].servoError3);
                        setVal(tr.children("td").eq(15), table[i-1].servoError4);
                        setVal(tr.children("td").eq(16), table[i-1].liftActualSpeed);
                        setVal(tr.children("td").eq(3), table[i-1].model$);
                        setVal(tr.children("td").eq(4), table[i-1].busy$);
                        setVal(tr.children("td").eq(5), table[i-1].hasTray$);
                        setVal(tr.children("td").eq(6), table[i-1].hasCar$);
                        setVal(tr.children("td").eq(7), table[i-1].deviceError$);
                        setVal(tr.children("td").eq(8), table[i-1].frontOverrun$);
                        setVal(tr.children("td").eq(9), table[i-1].backOverrun$);
                        setVal(tr.children("td").eq(10), table[i-1].leftOverrun$);
                        setVal(tr.children("td").eq(11), table[i-1].rightOverrun$);
                        setVal(tr.children("td").eq(12), table[i-1].overHeight$);
                        setVal(tr.children("td").eq(13), table[i-1].overWeight$);
                    }
                } else if (res.code === 403){
                    window.location.href = baseUrl+"/login";
@@ -305,15 +314,13 @@
                        var tr = tableEl.find("tr").eq(i);
                        setVal(tr.children("td").eq(0), table[i-1].liftNo);
                        setVal(tr.children("td").eq(1), table[i-1].workNo);
                        setVal(tr.children("td").eq(2), table[i-1].lineFrontHasStock$);
                        setVal(tr.children("td").eq(3), table[i-1].forwardRotationFeedback$);
                        setVal(tr.children("td").eq(4), table[i-1].reverseFeedback$);
                        setVal(tr.children("td").eq(5), table[i-1].motorOverload$);
                        setVal(tr.children("td").eq(6), table[i-1].lineEndHasStock$);
                        setVal(tr.children("td").eq(7), table[i-1].inConveyLineCardTrayAlarm$);
                        setVal(tr.children("td").eq(8), table[i-1].outConveyLineCardTrayAlarm$);
                        setVal(tr.children("td").eq(9), table[i-1].pakMk);
                        setVal(tr.children("td").eq(10), table[i-1].shuttleNo);
                        setVal(tr.children("td").eq(2), table[i-1].taskAddress);
                        setVal(tr.children("td").eq(3), table[i-1].distAddress);
                        setVal(tr.children("td").eq(4), table[i-1].completeTaskNo);
                        setVal(tr.children("td").eq(5), table[i-1].lev);
                        setVal(tr.children("td").eq(6), table[i-1].pakMk);
                        setVal(tr.children("td").eq(7), table[i-1].shuttleNo);
                        setVal(tr.children("td").eq(8), table[i-1].token);
                    }
                } else if (res.code === 403){
                    window.location.href = baseUrl+"/login";
@@ -347,7 +354,9 @@
        http.post(baseUrl+"/lift/operator/lift", {
            liftNo: $('input[name="liftSelect"]:checked').val(),
            liftTaskMode: liftTaskMode,
            lev: $("#liftLev").val()
            lev: $("#liftLev").val(),
            sourceStaNo: $("#sourceStaNo").val(),
            staNo: $("#staNo").val()
        }, function (res) {
            layer.msg(res.msg, {icon: 1});
        });
@@ -464,6 +473,7 @@
                                        $('#liftNo').val(liftNo);
                                        $('#workNo').val(table[i-1].workNo);
                                        $('#pakMk').val(table[i-1].pakMk);
                                        $('#token').val(table[i-1].token);
                                    }
                                }
                            } else if (res.code === 403){
@@ -478,6 +488,7 @@
                    $('#liftNo').val("");
                    $('#workNo').val("");
                    $('#pakMk').val("");
                    $('#token').val("");
                }
            })
        }
@@ -487,6 +498,7 @@
        $('#liftNo').val("");
        $('#workNo').val("");
        $('#pakMk').val("");
        $('#token').val("");
        layer.close(layerDetl);
    })