#

luxiaotao1123

2020-08-24 a6cf568459bd004d5302ddaaa9310ae9c885f362

 src/main/webapp/views/console.html

@@ -11,8 +11,8 @@
    <link rel="stylesheet" type="text/css" href="../static/css/common.css">
    <link rel="stylesheet" type="text/css" href="../static/css/console.css">
    <script type="text/javascript" src="../static/js/jquery/jquery-3.3.1.min.js"></script>
    <script type="text/javascript" src="../static/js/common.js"></script>
    <script type="text/javascript" src="../static/js/layer/layer.js"></script>
    <script type="text/javascript" src="../static/js/common.js"></script>
    <style>
        /* layer 深蓝色按钮修改 */
        /*.layui-layer-lan .layui-layer-btn {*/
@@ -86,6 +86,12 @@


    <!-- 左输送线 -->

    <!-- 台车1 -->




    <!-- 第一列（宽度 100px） -->
    <div class="site-row site-row-1">
        <div id="site-7" class="site" style="height: 40px;line-height: 40px">7</div>
@@ -198,7 +204,7 @@
                <span>设备号</span>
            </div>
            <div class="form-item-input">
                <input type="text" name="devpNo" value="" disabled="disabled" style="width: 4rem">
                <input type="text" name="siteId" value="" disabled="disabled" style="width: 4rem">
            </div>
        </div>
        <div class="form-item" style="width: 25%">
@@ -214,7 +220,7 @@
                <span>工作状态</span>
            </div>
            <div class="form-item-input">
                <input type="text" name="workStatus" value="" disabled="disabled" style="width: 10rem">
                <input type="text" name="wrkSts" value="" disabled="disabled" style="width: 10rem">
            </div>
        </div>

@@ -284,7 +290,7 @@
                <span>源库位</span>
            </div>
            <div class="form-item-input">
                <input type="text" name="sourceStock" value="" disabled="disabled" style="width: 8rem">
                <input type="text" name="sourceLocNo" value="" disabled="disabled" style="width: 8rem">
            </div>
        </div>
        <div class="form-item" style="width: 40%">
@@ -292,7 +298,7 @@
                <span>目标库位</span>
            </div>
            <div class="form-item-input">
                <input type="text" name="stock" value="" disabled="disabled" style="width: 8rem">
                <input type="text" name="locNo" value="" disabled="disabled" style="width: 8rem">
            </div>
        </div>
    </form>
@@ -341,7 +347,7 @@
                <span>工作状态</span>
            </div>
            <div class="form-item-input">
                <input type="text" name="workStatus" value="" disabled="disabled" style="width: 10rem">
                <input type="text" name="wrkSts" value="" disabled="disabled" style="width: 10rem">
            </div>
        </div>
        <div class="form-item" style="width: 45%">
@@ -359,7 +365,7 @@
                <span>源库位</span>
            </div>
            <div class="form-item-input">
                <input type="text" name="sourceStock" value="" disabled="disabled" style="width: 10rem">
                <input type="text" name="sourceLocNo" value="" disabled="disabled" style="width: 10rem">
            </div>
        </div>
        <div class="form-item" style="width: 45%">
@@ -367,7 +373,7 @@
                <span>目标库位</span>
            </div>
            <div class="form-item-input">
                <input type="text" name="stock" value="" disabled="disabled" style="width: 10rem">
                <input type="text" name="locNo" value="" disabled="disabled" style="width: 10rem">
            </div>
        </div>

@@ -405,7 +411,7 @@
        getCrnInfo();
        getSystemRunningStatus();
        getBarcodeInfo()
    }, 500);
    }, 1000);
    setInterval(function () {
        getSitesInfo();
    }, 3000);
@@ -502,7 +508,6 @@
                        } else {
                            siteEl.html(sites[i].siteId);
                        }

                    }
                } else if (res.code === 403){
                    window.location.href = baseUrl+"/login";
@@ -523,7 +528,10 @@
                if (res.code === 200){
                    var crns = res.data;
                    for (var i = 0; i < crns.length; i++){
                        crnAnimate(crns[i].crnId, crns[i].offset);
                        var crnEl = $("#crn-"+crns[i].crnId);
                        crnEl.attr("class", "machine " + crns[i].crnStatus);
                        // crnAnimate(crns[i].crnId, crns[i].offset);
                        crnEl.animate({left: (crns[i].bay * 30) +'px'}, 1000);
                    }
                } else if (res.code === 403){
                    window.location.href = baseUrl+"/login";