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

zjj

2024-06-26 e1c01c13fc47a433cd6ec0b46d834f57a7b25c97

 src/main/webapp/views/rgv.html

@@ -102,6 +102,7 @@
<!--                        <th>有物2</th>-->
                        <th>故障代码</th>
                        <th>故障描述</th>
                        <th>锁定状态</th>
                    </tr>
                    </thead>
                    <tbody>
@@ -152,6 +153,7 @@
                    <div class="select-container" style="padding: 20px 0;">
                        <label><input type="radio" name="rgvSelect" value="1" checked>&nbsp;1号RGV</label>
                        <label><input type="radio" name="rgvSelect" value="2">&nbsp;2号RGV</label>
                        <label><input type="radio" name="rgvSelect" value="3">&nbsp;3号RGV</label>
                    </div>
                </div>
                <!-- 源站/源库位 选择 -->
@@ -213,10 +215,11 @@
                        <!--                <button class="item" onclick="reverseOrigin()">反原点</button>-->
                        <!--                <button class="item" onclick="coorMove()">坐标移行</button>-->
                        <button class="item" onclick="taskComplete()">任务完成</button>
                        <button class="item" onclick="lock()">解锁</button>
                        <!--                <button class="item" onclick="pause()">暂停</button>-->
                        <!--                <button class="item" onclick="boot()">启动</button>-->
<!--                        <button class="item" onclick="clearCommand()">清除命令</button>-->
                        <button class="item" onclick="handleReset()">复位</button>
<!--                        <button class="item" onclick="handleReset()">复位</button>-->
                    </div>
                </fieldset>
            </div>
@@ -322,6 +325,7 @@
                        // setVal(tr.children("td").eq(10), table[i-1].loading2);
                        setVal(tr.children("td").eq(8), table[i-1].warnCode);
                        setVal(tr.children("td").eq(9), table[i-1].alarm);
                        setVal(tr.children("td").eq(10), table[i-1].pakMk);
                    }
                } else if (res.code === 403){
                    window.location.href = baseUrl+"/login";
@@ -453,6 +457,12 @@
        });
    }

    function lock() {
        http.post(baseUrl+"/rgv/lock", getReqParam(), function (res) {
            layer.msg(res.msg);
        });
    }

    // 暂停
    function pause() {
        http.post(baseUrl+"/rgv/operator/pause", getReqParam(), function (res) {