#

Junjie

2023-11-24 6e42ae6d4cd07c4740b89221cd2e83e18d925242

#

 src/main/webapp/views/console.html

@@ -414,7 +414,10 @@
                    },
                    getSiteInfo() {
                        //获取输送站点数据
                        this.sendWs("{\"url\":\"/console/latest/data/site\",\"data\":{}}")
                        this.sendWs(JSON.stringify({
                            "url": "/console/latest/data/site",
                            "data": {}
                        }))
                    },
                    setSiteInfo(res) {
                        //获取输送站点数据
@@ -441,7 +444,10 @@
                        this.getMap(lev)
                    },
                    getShuttleStateInfo() {
                        this.sendWs("{\"url\":\"/shuttle/table/shuttle/state\",\"data\":{}}")
                        this.sendWs(JSON.stringify({
                            "url": "/shuttle/table/shuttle/state",
                            "data": {}
                        }))
                    },
                    setShuttleStateInfo(res) {
                        // 四向穿梭车信息表获取
@@ -469,7 +475,10 @@
                    },
                    getLiftStateInfo() {
                        // 提升机信息表获取
                        this.sendWs("{\"url\":\"/lift/table/lift/state\",\"data\":{}}")
                        this.sendWs(JSON.stringify({
                            "url": "/lift/table/lift/state",
                            "data": {}
                        }))
                    },
                    setLiftStateInfo(res) {
                        // 提升机信息表获取

 src/main/webapp/views/shuttle.html

@@ -48,6 +48,7 @@
                                <th>故障状态</th>
                                <th>故障码</th>
                                <th>管制状态</th>
                        <th>低电量</th>
                            </tr>
                        </thead>
                        <tbody>
@@ -142,7 +143,6 @@
                                    </div>
                                </div>
                            </div>

                        </div>
                    </fieldset>
                </div>
@@ -198,18 +198,46 @@
    var shuttleMsgTableFullRows = 0;
    // 初始化
    var shuttleOutputDom = document.getElementById("shuttle-output");

    var ws = new WebSocket("ws://" + window.location.host + baseUrl + "/shuttle/websocket");

    //当WebSocket创建成功时，触发onopen事件
    ws.onopen = function(){
        console.log("open");
    }

    //当客户端收到服务端发来的消息时，触发onmessage事件
    ws.onmessage = function(e){
        const result = JSON.parse(e.data);
        if (result.url == "/shuttle/table/shuttle/state") {
            setShuttleStateInfo(JSON.parse(result.data))
            setShuttleMsgInfo(JSON.parse(result.data))
        }else if (result.url == "/shuttle/output/shuttle") {
            setShuttleOutput(JSON.parse(result.data))
        }
        // console.log(e.data,result);
    }

    //当客户端收到服务端发送的关闭连接请求时，触发onclose事件
    ws.onclose = function(e){
        console.log("close");
    }

    //如果出现连接、处理、接收、发送数据失败的时候触发onerror事件
    ws.onerror = function(e) {
        console.log(error);
    }

    $(document).ready(function() {
        initShuttleStateTable();
        getShuttleStateInfo();
        initShuttleMsgTable();
        getShuttleMsgInfo();
        operatorBlockShow();
        setShuttleRadio();
    });

    setInterval(function () {
        getShuttleStateInfo()
        getShuttleMsgInfo();
        getShuttleStateInfo();
    },1000)
    setInterval(function () {
        getShuttleOutput();
@@ -287,12 +315,15 @@

    // 四向穿梭车信息表获取 ---- 表一
    function getShuttleStateInfo() {
        sendWs(JSON.stringify({
            "url": "/shuttle/table/shuttle/state",
            "data": {}
        }))
    }

    // 四向穿梭车信息表设置 ---- 表一
    function setShuttleStateInfo(res) {
        let tableEl = $('#shuttle-state-table');
        $.ajax({
            url: baseUrl+ "/shuttle/table/shuttle/state",
            headers: {'token': localStorage.getItem('token')},
            method: 'POST',
            success: function (res) {
                if (res.code === 200){
                    let table = res.data;
                    if (table.length > shuttleStateTableBlankRows && table.length !== shuttleStateTableFullRows) {
@@ -318,6 +349,7 @@
                        setVal(tr.children("td").eq(13), table[i-1].errState$);
                        setVal(tr.children("td").eq(14), table[i-1].errCode$);
                        setVal(tr.children("td").eq(15), table[i-1].suspendState$);
                setVal(tr.children("td").eq(16), table[i-1].lowerPower);
                    }
                } else if (res.code === 403){
                    window.location.href = baseUrl+"/login";
@@ -325,17 +357,10 @@
                    console.log(res.msg);
                }
            }
        });
    }

    // 四向穿梭车数据表获取 ---- 表二
    function getShuttleMsgInfo() {
    function setShuttleMsgInfo(res) {
        let tableEl = $('#shuttle-msg-table');
        $.ajax({
            url: baseUrl+ "/shuttle/table/shuttle/state",
            headers: {'token': localStorage.getItem('token')},
            method: 'POST',
            success: function (res) {
                if (res.code === 200){
                    var table = res.data;
                    if (table.length > shuttleMsgTableBlankRows && table.length !== shuttleMsgTableFullRows) {
@@ -369,16 +394,16 @@
                    console.log(res.msg);
                }
            }
        });
    }

    // 穿梭车日志输出 -----------------------------------------------------------------------
    function getShuttleOutput() {
        $.ajax({
            url: baseUrl + "/shuttle/output/shuttle",
            headers: {'token': localStorage.getItem('token')},
            method: 'POST',
            success: function (res) {
        sendWs(JSON.stringify({
            "url": "/shuttle/output/shuttle",
            "data": {}
        }))
    }

    function setShuttleOutput(res) {
                if (res.code === 200) {
                    shuttleOutput(res.data);
                } else if (res.code === 403) {
@@ -386,8 +411,6 @@
                } else {
                    console.log(res.msg);
                }
            }
        })
    }

    // 任务指令下发
@@ -400,6 +423,32 @@
        }, function (res) {
            layer.msg(res.msg, {icon: 1});
        });
    }

    // 跑库
    function moveLoc() {
        $.ajax({
            url: baseUrl + "/shuttle/moveLoc",
            headers: {'token': localStorage.getItem('token')},
            method: 'POST',
            data: {
                shuttleNo: $('input[name="shuttleSelect"]:checked').val(),
                xStart: $("#xStart").val(),
                xTarget: $("#xTarget").val(),
                yStart: $("#yStart").val(),
                yTarget: $("#yTarget").val(),
                moveType: $('input[name="moveType"]:checked').val()
            },
            success: function (res) {
                if (res.code === 200) {
                    layer.msg(res.msg, {icon: 1});
                } else if (res.code === 403) {
                    window.location.href = baseUrl + "/login";
                } else {
                    console.log(res.msg);
                }
            }
        })
    }


@@ -565,5 +614,10 @@
        layer.close(layerDetl);
    })

    function sendWs(message) {
        if (ws.readyState == WebSocket.OPEN) {
            ws.send(message)
        }
    }

</script>

 src/main/webapp/views/shuttle2.html

@@ -347,7 +347,10 @@

    // 四向穿梭车信息表获取 ---- 表一
    function getShuttleStateInfo() {
        sendWs("{\"url\":\"/shuttle/table/shuttle/state\",\"data\":{}}")
        sendWs(JSON.stringify({
            "url": "/shuttle/table/shuttle/state",
            "data": {}
        }))
    }

    // 四向穿梭车信息表设置 ---- 表一
@@ -426,7 +429,10 @@

    // 穿梭车日志输出 -----------------------------------------------------------------------
    function getShuttleOutput() {
        sendWs("{\"url\":\"/shuttle/output/shuttle\",\"data\":{}}")
        sendWs(JSON.stringify({
            "url": "/shuttle/output/shuttle",
            "data": {}
        }))
    }

    function setShuttleOutput(res) {