自动化立体仓库 - WCS系统
parent: 06bef48d | 补丁 | 提交 | ignore whitespace
野心家
2023-05-22 fe1801f4f3b9a3e2c9c0a7c1b004a9345be1b446 
Merge remote-tracking branch 'origin/zjfnwcs' into zjfnwcs
1个文件已添加
1个文件已删除
5个文件已修改
244 ■■■■■ 已修改文件
src/main/java/com/zy/core/thread/SiemensDevpThread.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/webapp/static/js/console.map.js 38 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/webapp/views/console.html 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/webapp/views/control.html 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/webapp/views/index.html 53 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/webapp/views/index2.html 50 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/webapp/views/indexTV.html 97 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 
 src/main/java/com/zy/core/thread/SiemensDevpThread.java


@@ -44,7 +44,7 @@


    public static final ArrayList<Integer> staNos = new ArrayList<Integer>() {{


        add(201);add(202);add(203);add(204);add(205);add(206);


        add(207);add(208);add(209);add(210);add(211);add(212);


        add(213);add(101);add(102);add(103);add(104);


        add(213);add(101);add(102);add(103);add(104);add(105);


    }};




    /**




 src/main/webapp/static/js/console.map.js


@@ -11,37 +11,37 @@


        "id": "rack4",


        "top": 260,


        "left": 196,


        "width": 796,


        "width": 765,


        "height": 23,


        "minBayNo": 1,


        "maxBayNo": 25


        "maxBayNo": 24


    }, {


        "type": "rack",


        "id": "rack1",


        "top": 95,


        "left": 167,


        "width": 825,


        "width": 794,


        "height": 23,


        "minBayNo": 1,


        "maxBayNo": 26


        "maxBayNo": 25


    }, {


        "type": "rack",


        "id": "rack2",


        "top": 152,


        "left": 167,


        "width": 825,


        "width": 794,


        "height": 23,


        "minBayNo": 1,


        "maxBayNo": 26


        "maxBayNo": 25


    }, {


        "type": "rack",


        "id": "rack3",


        "top": 200,


        "left": 167,


        "width": 825,


        "width": 794,


        "height": 23,


        "minBayNo": 1,


        "maxBayNo": 26


        "maxBayNo": 25


    }],


    "rackDescs": [{


        "type": "rackDescs",


@@ -127,12 +127,28 @@


                "height": 23


            }, {


                "type": "stn",


                "id": "site-101",


                "text": "101",


                "id": "site-105",


                "text": "105",


                "top": 47,


                "left": 1188,


                "width": 65,


                "height": 95


                "height": 23


            }, {


                "type": "stn",


                "id": "site-0",


                "text": "升降",


                "top": 70,


                "left": 1203,


                "width": 35,


                "height": 49,


            }, {


                "type": "stn",


                "id": "site-101",


                "text": "101",


                "top": 119,


                "left": 1188,


                "width": 65,


                "height": 23


            }, {


                "type": "stn",


                "id": "site-211",




 src/main/webapp/views/console.html


@@ -26,7 +26,7 @@


    </div>


    <!-- 货架 + 堆垛机 + 入库站点 -->


    <div class="main-part">




    </div>


    <div class="" >


        <div id="loc-0100105" class="loc" style="top:400px; left:200px; width:70px; height: 22px;line-height: 22px;">1-1-5</div>


        <div id="loc-0100205" class="loc" style="top:400px; left:272px; width:70px; height: 22px;line-height: 22px;">1-2-5</div>




 src/main/webapp/views/control.html


@@ -84,7 +84,7 @@


    </main>




    <footer class="footer">


        Copyright © 2022 All Rights Reserved. <a href="http://www.zoneyung.com" target="_blank">立库wcs操作平台</a>


        Copyright © 2023 All Rights Reserved. <a href="http://www.zoneyung.com" target="_blank">立库wcs操作平台</a>


    </footer>




</body>




 src/main/webapp/views/index.html


@@ -6,13 +6,6 @@


    <link rel="stylesheet" href="../static/css/index.css">


    <script src="../static/js/jquery/jquery-3.3.1.min.js"></script>


    <style>


        html{


            transform: scale(1) translate(0,0);


            /*transform: scale(0.5) translate(-50%,-50%);*/


            height: 150%;


            width: 150%;


        }




    </style>


</head>


<body>


@@ -23,8 +16,7 @@


<div class="sidebar">


    <div class="nav">


        <ul class="cl-effect-4">


            <li><button id="fire" style="border-radius: 30px">消防</button><br>


                <a id="console" onclick="nav(this.id)" class="nav-select" href="#">主控图</a></li>


            <li><a id="console" onclick="nav(this.id)" class="nav-select" href="#">主控图</a></li>


            <li><a id="pipeline" onclick="nav(this.id)" class="nav-unselect" href="#">输送设备</a></li>


            <li><a id="crn" onclick="nav(this.id)" class="nav-unselect" href="#">堆垛机</a></li>


        </ul>


@@ -36,7 +28,7 @@


<!-- 主体内容 -->


<iframe id="content" src="console.html"></iframe>


<footer class="footer">


    Copyright © 2022 All Rights Reserved. <a href="http://www.zoneyung.com" target="_blank">立库wcs操作平台</a>


    Copyright © 2023 All Rights Reserved. <a href="http://www.zoneyung.com" target="_blank">立库wcs操作平台</a>


</footer>


</body>


<script>


@@ -51,46 +43,7 @@


        localStorage.removeItem("token");


        window.location.href = baseUrl + "/login";


    }


    $.ajax({


        url: "/fnwcs" + "/console/crn/detail",


        headers: {


            'token': localStorage.getItem('token')


        },


        data: {


            crnNo: 1


        },


        method: 'post',


        success: function (res) {


            for (var val in res.data) {


                var find = $("#crnWindow").find(":input[name='" + val + "']");


                if (find[0].type === 'text') {


                    find.val(res.data[val]);


                } else if (find[0].type === 'checkbox') {


                    find.attr("checked", res.data[val] === 'Y');


                }


            }


        }


    })


    $.ajax({


        url: "/fnwcs" + "/console/loc/detail2",


        headers: {


            'token': localStorage.getItem('token')


        },


        data: {


            locNo: "0101804"


        },


        method: 'post',


        success: function (res) {


            console.log(res);


            if (res.code === 200) {


                if (res.data.channel<=10240){


                    $("#fire").attr("style", "background-color: #00FF00;border-radius: 30px");


                }else {


                    $("#fire").attr("style", "background-color: #FD482C;border-radius: 30px");


                }


            }


        }


    })




    // 系统运行状态


    var systemRunning = true;


</script>




 src/main/webapp/views/index2.html


File was deleted




 src/main/webapp/views/indexTV.html


New file


@@ -0,0 +1,97 @@


<!DOCTYPE html>


<html>


<head>


    <meta charset="utf-8">


    <title>自动仓库WCS系统</title>


    <link rel="stylesheet" href="../static/css/index.css">


    <script src="../static/js/jquery/jquery-3.3.1.min.js"></script>


    <style>


        html{


            transform: scale(1) translate(0,0);


            /*transform: scale(0.5) translate(-50%,-50%);*/


            height: 150%;


            width: 150%;


        }




    </style>


</head>


<body>


<!-- 导航栏 -->


<!--        <div class="nav">-->


<!--            <li class="right">注销<a id="about" class="nav-unselect" onclick="logout()" href="#"></a></li>-->


<!--        </div>-->


<div class="sidebar">


    <div class="nav">


        <ul class="cl-effect-4">


            <li><button id="fire" style="border-radius: 30px">消防</button><br>


                <a id="console" onclick="nav(this.id)" class="nav-select" href="#">主控图</a></li>


            <li><a id="pipeline" onclick="nav(this.id)" class="nav-unselect" href="#">输送设备</a></li>


            <li><a id="crn" onclick="nav(this.id)" class="nav-unselect" href="#">堆垛机</a></li>


        </ul>


    </div>


</div>


<!--<div style="z-index: 999; position: absolute; top: 250px; left: 900px; width: 200px; height: 200px; opacity: 0.5;background-color: #0000FF">-->




<!--</div>-->


<!-- 主体内容 -->


<iframe id="content" src="console.html"></iframe>


<footer class="footer">


    Copyright © 2023 All Rights Reserved. <a href="http://www.zoneyung.com" target="_blank">立库wcs操作平台</a>


</footer>


</body>


<script>


    // 导航栏


    function nav(id) {


        $('.nav-select').attr("class", "nav-unselect");


        $('#'+id).attr("class", "nav-select");


        $('#content').attr("src", id+".html");


    }




    function logout() {


        localStorage.removeItem("token");


        window.location.href = baseUrl + "/login";


    }


    $.ajax({


        url: "/fnwcs" + "/console/crn/detail",


        headers: {


            'token': localStorage.getItem('token')


        },


        data: {


            crnNo: 1


        },


        method: 'post',


        success: function (res) {


            for (var val in res.data) {


                var find = $("#crnWindow").find(":input[name='" + val + "']");


                if (find[0].type === 'text') {


                    find.val(res.data[val]);


                } else if (find[0].type === 'checkbox') {


                    find.attr("checked", res.data[val] === 'Y');


                }


            }


        }


    })


    $.ajax({


        url: "/fnwcs" + "/console/loc/detail2",


        headers: {


            'token': localStorage.getItem('token')


        },


        data: {


            locNo: "0101804"


        },


        method: 'post',


        success: function (res) {


            console.log(res);


            if (res.code === 200) {


                if (res.data.channel<=10240){


                    $("#fire").attr("style", "background-color: #00FF00;border-radius: 30px");


                }else {


                    $("#fire").attr("style", "background-color: #FD482C;border-radius: 30px");


                }


            }


        }


    })


    // 系统运行状态


    var systemRunning = true;


</script>


</html>