#

Junjie

2025-10-28 58d3d34b740a07099384152e0024e6c09891eca5

 src/main/webapp/views/crn.html

@@ -132,6 +132,10 @@
                    <th>升降距离(Km)</th>
                    <th>走行时长(H)</th>
                    <th>升降时长(H)</th>
                    <th>入库任务上限</th>
                    <th>当前入库任务</th>
                    <th>总任务数量上限</th>
                    <th>当前总任务数量</th>
                </tr>
                </thead>
                <tbody>
@@ -219,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>-->
@@ -352,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);
@@ -367,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";
@@ -432,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);
        });
    }
@@ -546,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 {
@@ -569,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);