#

luxiaotao1123

2020-09-01 85784d74c87c95d6f6994be691166dba3a3a32b6

 src/main/webapp/views/console.html

@@ -51,14 +51,14 @@
            <div class="tips-item">
                <label>堆垛机状态颜色:&nbsp;</label>
                <div class="item-group">
                    <span class="machine-put">入库</span>
                    <span class="machine-take">出库</span>
                    <span class="machine-stock-move">库到库</span>
                    <span class="machine-site-move">站到站</span>
                    <span class="machine-p-move">PToP</span>
                    <span class="machine-error">异常</span>
                    <span class="machine-auto">自动</span>
                    <span class="machine-unauto">非自动/手动</span>
                    <span class="machine-put-flag">入库</span>
                    <span class="machine-take-flag">出库</span>
                    <span class="machine-stock-move-flag">库到库</span>
                    <span class="machine-site-move-flag">站到站</span>
                    <span class="machine-p-move-flag">PToP</span>
                    <span class="machine-error-flag">异常</span>
                    <span class="machine-auto-flag">自动</span>
                    <span class="machine-unauto-flag">非自动/手动</span>
                </div>
            </div>
            <div class="tips-item">
@@ -79,15 +79,16 @@
    <!----------- 工具栏 ---------->
    <!-- 入库口 -->
    <div class="cargo-put"></div>
    <!-- 扫码器 -->
    <div id="code-decoder-1" class="code-decoder">
        <span id="code-decoder-data-1" class="code-decoder-data">0</span>
    </div>

    <!-- 扫码器 -->
    <div id="code-decoder-2" class="code-decoder">
        <span id="code-decoder-data-2" class="code-decoder-data">0</span>
    </div>
<!--    &lt;!&ndash; 扫码器 1&ndash;&gt;-->
<!--    <div id="code-decoder-1" class="code-decoder">-->
<!--        <span id="code-decoder-data-1" class="code-decoder-data">0</span>-->
<!--    </div>-->

<!--    &lt;!&ndash; 扫码器 2&ndash;&gt;-->
<!--    <div id="code-decoder-2" class="code-decoder">-->
<!--        <span id="code-decoder-data-2" class="code-decoder-data">0</span>-->
<!--    </div>-->


    <!----------- 左输送线 ---------->
@@ -108,7 +109,6 @@
            <!-- 货架 -->
            <div class="stock-group">
                <div id="site-2" class="site" style="">2</div>
                <button class="item">1</button>
                <button class="item">2</button>
                <button class="item">3</button>
                <button class="item">4</button>
@@ -169,7 +169,6 @@
            <!-- 货架 -->
            <div class="stock-group">
                <div id="site-4" class="site" style="">4</div>
                <button class="item">1</button>
                <button class="item">2</button>
                <button class="item">3</button>
                <button class="item">4</button>
@@ -227,7 +226,6 @@
            <!-- 货架 -->
            <div class="stock-group">
                <div id="site-6" class="site" style="">6</div>
                <button class="item">1</button>
                <button class="item">2</button>
                <button class="item">3</button>
                <button class="item">4</button>
@@ -288,7 +286,6 @@
            <!-- 货架 -->
            <div class="stock-group">
                <div id="site-8" class="site" style="">8</div>
                <button class="item">1</button>
                <button class="item">2</button>
                <button class="item">3</button>
                <button class="item">4</button>
@@ -610,7 +607,7 @@
                } else if (res.code === 403){
                    window.location.href = baseUrl+"/login";
                }  else {
                    alert(res.msg);
                    console.log(res.msg);
                }
            }
        });
@@ -637,7 +634,7 @@
                } else if (res.code === 403){
                    window.location.href = baseUrl+"/login";
                }  else {
                    alert(res.msg);
                    console.log(res.msg);
                }
            }
        });
@@ -664,7 +661,7 @@
                } else if (res.code === 403){
                    window.location.href = baseUrl+"/login";
                }  else {
                    alert(res.msg);
                    console.log(res.msg);
                }
            }
        });
@@ -683,12 +680,13 @@
                        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 * ($('.item').eq(0).width()+4)) +'px'}, 1000);
                        var unit = $('.item').eq(0).width()+4;
                        crnEl.animate({left: (crns[i].bay * unit + 20) +'px'}, 1000);
                    }
                } else if (res.code === 403){
                    window.location.href = baseUrl+"/login";
                }  else {
                    alert(res.msg);
                    console.log(res.msg);
                }
            }
        });
@@ -709,7 +707,7 @@
                } else if (res.code === 403){
                    window.location.href = baseUrl+"/login";
                }  else {
                    alert(res.msg);
                    console.log(res.msg);
                }
            }
        });