Merge branch 'gzynwcs' of http://47.97.1.152:5880/r/zy-wcs into gzynwcs

18516761980

2022-08-13 7b91c4ce2b3cabfa65ff2c3d77cfff0c24162cd0

Merge branch 'gzynwcs' of http://47.97.1.152:5880/r/zy-wcs into gzynwcs


 Conflicts:

	src/main/webapp/views/console.html

 src/main/webapp/static/css/render.css

@@ -359,6 +359,36 @@
.site-unauto {
    background-color: rgb(184,184,184);
}


/* 静置完成 */
.loc-empty {
    background-color: rgb(163,214,242);
}
/* 在库静置中*/
.loc-wait {
    background-color: rgb(151,180,0);
}
/* 在库待测 */
.loc-in-wait {
    background-color: rgb(58,77,249);
}
/* 在库测试中 */
.loc-testing {
    background-color: rgb(240,140,10);
}
/* 异常 */
.loc-error {
    background-color: rgb(252,48,48);
}
/* 空库位 */
.loc-empty {
    background-color: rgb(132,255,115);
}




#code {
    background-image: url(../images/status_bar_2.png);
    background-repeat: no-repeat;

 src/main/webapp/views/console.html

@@ -10,6 +10,7 @@
    <script src="../static/js/console.map.js"></script>
    <script src="../static/js/console.js"></script>
    <script src="../static/js/common.js"></script>
    <script src="info.js"></script>


</head>
@@ -193,7 +194,7 @@
        <span class="site machine-site-move-flag" style="color:#FFFFFF; top:600px; left:442px">在库测试中</span>
        <span class="site machine-take-flag" style="color:#FFFFFF; top:600px; left:534px">在库静置中</span>
        <span class="site machine-put-flag" style="color:#FFFFFF; top:600px; left:626px">静置完成</span>
        <span class="site machine-error-flag" style="color:#FFFFFF; top:600px; left:704px">异常报警</span>
        <span class="site machine-error-flag" style="color:#FFFFFF; top:600px; left:696px">异常报警</span>
    </div>

    <div id="body">
@@ -844,6 +845,9 @@
            }
        });
    }
    function getInfo() {

    }

    // 库位实时数据获取
    function getLocInfo() {
@@ -857,7 +861,6 @@
                    for (var i = 0; i < locs.length; i++) {
                        var siteEl = $("#loc-" + locs[i].locNo);
                        siteEl.attr("class", "site " + locs[i].packStatus);
                        debugger;
                        // if (locs[i].workNo != null && locs[i].workNo > 0) {
                        //     siteEl.html(locs[i].siteId + "[" + locs[i].workNo + "]");
                        // } else {

 src/main/webapp/views/info.js

New file
@@ -0,0 +1,8 @@
var res = {
    code:200,
    data:[
        {locNo:"0201503",packStatus:"loc-testing"},
        {locNo:"0201804",packStatus:"loc-testing"},
        {locNo:"0100404",packStatus:"loc-testing"},
        ]
}