#

Junjie

2025-10-28 58d3d34b740a07099384152e0024e6c09891eca5

 src/main/webapp/views/crn.html

@@ -83,6 +83,12 @@
                    <!--            <span>&nbsp;</span>-->
                    <input id="crn5" disabled="disabled">
                </div>
                <div class="crn-command-item">
                    <label>6#</label>
                    <button id="demoBtn-6" class="demoBtn" onclick="demoSwitch(this.id)"> - </button>
                    <!--            <span>&nbsp;</span>-->
                    <input id="crn6" disabled="disabled">
                </div>
            </div>
            <!-- 堆垛机状态位信息 -->
            <div class="crn-state">
@@ -126,6 +132,10 @@
                    <th>升降距离(Km)</th>
                    <th>走行时长(H)</th>
                    <th>升降时长(H)</th>
                    <th>入库任务上限</th>
                    <th>当前入库任务</th>
                    <th>总任务数量上限</th>
                    <th>当前总任务数量</th>
                </tr>
                </thead>
                <tbody>
@@ -145,14 +155,15 @@
            <!-- 设备任务选择 -->
            <div class="task-select">
                <!-- 堆垛机选择 -->
                <div id="crn-select" class="operator-item">
                <div id="crn-select" class="operator-item" style="width: 55%">
                    <span class="select-title">堆垛机号</span>
                    <div class="select-container">
                    <div class="select-container" style="padding: 20px 0;">
                        <label><input type="radio" name="crnSelect" value="1" checked>&nbsp;1号堆垛机</label>
                        <label><input type="radio" name="crnSelect" value="2">&nbsp;2号堆垛机</label>
                        <label><input type="radio" name="crnSelect" value="3">&nbsp;3号堆垛机</label>
                        <label><input type="radio" name="crnSelect" value="4">&nbsp;4号堆垛机</label>
                        <label><input type="radio" name="crnSelect" value="5">&nbsp;5号堆垛机</label>
                        <label><input type="radio" name="crnSelect" value="6">&nbsp;6号堆垛机</label>
                    </div>
                </div>
                <!-- 源站/源库位 选择 -->
@@ -212,7 +223,7 @@
                        <button class="item" onclick="siteMove()">站到站</button>
                        <!--                <button class="item" onclick="bacOrigin()">回原点</button>-->
                        <!--                <button class="item" onclick="reverseOrigin()">反原点</button>-->
                        <!--                <button class="item" onclick="coorMove()">坐标移行</button>-->
                        <button class="item" onclick="coorMove()">堆垛机移动</button>
                        <button class="item" onclick="taskComplete()">任务完成</button>
                        <!--                <button class="item" onclick="pause()">暂停</button>-->
                        <!--                <button class="item" onclick="boot()">启动</button>-->
@@ -345,6 +356,7 @@
                        crnMsgTableFullRows = table.length;
                    }
                    for (var i=1;i<=table.length;i++){
                        console.log(table[i-1])
                        var tr = tableEl.find("tr").eq(i);
                        setVal(tr.children("td").eq(0), table[i-1].crnNo);
                        setVal(tr.children("td").eq(1), table[i-1].workNo);
@@ -360,6 +372,20 @@
                        setVal(tr.children("td").eq(11), table[i-1].ydistance);
                        setVal(tr.children("td").eq(12), table[i-1].xduration);
                        setVal(tr.children("td").eq(13), table[i-1].yduration);
                        setVal(tr.children("td").eq(14), table[i-1].crnSearchDetectTaskCount);

                        let currentInTask = "<span>" + table[i-1].currentInTask + "</span>";
                        if (table[i - 1].currentInTask > table[i - 1].crnSearchDetectTaskCount) {
                            currentInTask = "<span style='color: red;font-weight: bolder;'>" + table[i-1].currentInTask + "</span>";
                        }
                        setVal(tr.children("td").eq(15), currentInTask);

                        setVal(tr.children("td").eq(16), table[i-1].applyInTaskTotalCount);
                        let currentTotalTask = "<span>" + table[i-1].currentTotalTask + "</span>";
                        if (table[i - 1].currentTotalTask > table[i - 1].applyInTaskTotalCount) {
                            currentTotalTask = "<span style='color: red;font-weight: bolder;'>" + table[i-1].currentTotalTask + "</span>";
                        }
                        setVal(tr.children("td").eq(17), currentTotalTask);
                    }
                } else if (res.code === 403){
                    window.location.href = baseUrl+"/login";
@@ -425,7 +451,7 @@

    // 坐标移动
    function coorMove() {
        http.post(baseUrl+"/crn/operator/coorMove", getReqParam(), function (res) {
        http.post(baseUrl+"/crn/operator/crnMove", getReqParam(), function (res) {
            layer.msg(res.msg);
        });
    }
@@ -539,7 +565,7 @@
            var one = $('#crn-msg-table thead').height();
            var total = $('.crn-msg').height();
            var count = total / one;
            count = parseInt(count) - 1;
            count = parseInt(count);
            crnMsgTableBlankRows = count;
            line = count;
        } else {
@@ -562,6 +588,10 @@
                "       <td></td>\n" +
                "       <td></td>\n" +
                "       <td></td>\n" +
                "       <td></td>\n" +
                "       <td></td>\n" +
                "       <td></td>\n" +
                "       <td></td>\n" +
                "     </tr>\n";
        }
        $('#crn-msg-table tbody').after(html);