#

luxiaotao1123

2020-09-18 a3c99f39f98f5fd1ced3f8b84d0789160c8d72ed

 src/main/webapp/views/console.html

@@ -16,7 +16,7 @@
    <style>
        /* layer 深蓝色按钮修改 */
        /*.layui-layer-lan .layui-layer-btn {*/
            /*border-top: none;*/
        /*border-top: none;*/
        /*}*/
        .layui-layer-lan .layui-layer-btn a {
            background: #4476A7;
@@ -79,26 +79,27 @@
    <!----------- 工具栏 ---------->
    <!-- 入库口 -->
    <div class="cargo-put"></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>-->
    <!-- 扫码器 -->
    <div id="code-decoder-1" class="code-decoder">
        <span id="code-decoder-data-1" class="code-decoder-data">0</span>
    </div>


    <!----------- 左输送线 ---------->

    <!-- 台车轨道 -->
    <div id="car-track-1" class="car-track"></div>

    <!-- 台车实例 -->
    <div id="site-8" class="site car">8</div>

    <!-- 第一列（宽度 100px） -->
    <div class="site-row site-row-1">
        <div id="site-1" class="site" style="height: 20px;line-height: 20px;">1</div>
        <div id="site-3" class="site" style="height: 20px;line-height: 20px; margin-top: 20px">3</div>
        <div id="site-5" class="site" style="height: 20px;line-height: 20px; margin-top: 0px">5</div>
        <div id="site-7" class="site" style="height: 20px;line-height: 20px; margin-top: 20px">7</div>
        <div id="site-7" class="site" style="height: 20px;line-height: 20px;margin-bottom: 20px">7</div>
        <div id="site-4" class="site" style="height: 20px;line-height: 20px;margin-bottom: 20px">4</div>
        <div id="site-3" class="site" style="height: 20px;line-height: 20px;margin-bottom: 40px">3</div>
        <div id="site-2" class="site" style="height: 20px;line-height: 20px;margin-bottom: 0px">2</div>
        <div id="site-1" class="site" style="height: 20px;line-height: 20px;margin-bottom: 20px">1</div>
    </div>

    <!-- 货架 + 堆垛机 + 入库站点 + 出库站点 -->
@@ -108,7 +109,8 @@
            <span class="row-no">1#</span>
            <!-- 货架 -->
            <div class="stock-group">
                <div id="site-2" class="site" style="">2</div>
                <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>
@@ -142,23 +144,6 @@
                <button class="item">32</button>
                <button class="item">33</button>
                <button class="item">34</button>
                <button class="item">35</button>
                <button class="item">36</button>
                <button class="item">37</button>
                <button class="item">38</button>
                <button class="item">39</button>
                <button class="item">40</button>
                <button class="item">41</button>
                <button class="item">42</button>
                <button class="item">43</button>
                <button class="item">44</button>
                <button class="item">45</button>
                <button class="item">46</button>
                <button class="item">47</button>
                <button class="item">48</button>
                <button class="item">49</button>
                <button class="item">50</button>
                <button class="item">51</button>
                <div class="site site-none">&nbsp;&nbsp;&nbsp;&nbsp;</div>
            </div>
            <!-- 堆垛机 -->
@@ -168,7 +153,8 @@
            </div>
            <!-- 货架 -->
            <div class="stock-group">
                <div id="site-4" class="site" style="">4</div>
                <div id="site-5" class="site" style="">5</div>
                <button class="item">1</button>
                <button class="item">2</button>
                <button class="item">3</button>
                <button class="item">4</button>
@@ -202,143 +188,9 @@
                <button class="item">32</button>
                <button class="item">33</button>
                <button class="item">34</button>
                <button class="item">35</button>
                <button class="item">36</button>
                <button class="item">37</button>
                <button class="item">38</button>
                <button class="item">39</button>
                <button class="item">40</button>
                <button class="item">41</button>
                <button class="item">42</button>
                <button class="item">43</button>
                <button class="item">44</button>
                <button class="item">45</button>
                <button class="item">46</button>
                <button class="item">47</button>
                <button class="item">48</button>
                <button class="item">49</button>
                <button class="item">50</button>
                <button class="item">51</button>
                <div class="site site-none">&nbsp;&nbsp;&nbsp;&nbsp;</div>
            </div>
        </div>
        <div class="lane">
            <!-- 货架 -->
            <div class="stock-group">
                <div id="site-6" class="site" style="">6</div>
                <button class="item">2</button>
                <button class="item">3</button>
                <button class="item">4</button>
                <button class="item">5</button>
                <button class="item">6</button>
                <button class="item">7</button>
                <button class="item">8</button>
                <button class="item">9</button>
                <button class="item">10</button>
                <button class="item">11</button>
                <button class="item">12</button>
                <button class="item">13</button>
                <button class="item">14</button>
                <button class="item">15</button>
                <button class="item">16</button>
                <button class="item">17</button>
                <button class="item">18</button>
                <button class="item">19</button>
                <button class="item">20</button>
                <button class="item">21</button>
                <button class="item">22</button>
                <button class="item">23</button>
                <button class="item">24</button>
                <button class="item">25</button>
                <button class="item">26</button>
                <button class="item">27</button>
                <button class="item">28</button>
                <button class="item">29</button>
                <button class="item">30</button>
                <button class="item">31</button>
                <button class="item">32</button>
                <button class="item">33</button>
                <button class="item">34</button>
                <button class="item">35</button>
                <button class="item">36</button>
                <button class="item">37</button>
                <button class="item">38</button>
                <button class="item">39</button>
                <button class="item">40</button>
                <button class="item">41</button>
                <button class="item">42</button>
                <button class="item">43</button>
                <button class="item">44</button>
                <button class="item">45</button>
                <button class="item">46</button>
                <button class="item">47</button>
                <button class="item">48</button>
                <button class="item">49</button>
                <button class="item">50</button>
                <button class="item">51</button>
                <div class="site site-none">&nbsp;&nbsp;&nbsp;&nbsp;</div>
            </div>
            <!-- 堆垛机 -->
            <div class="crn">
                <hr class="pathway">
                <div id="crn-2" class="machine"></div>
            </div>
            <!-- 货架 -->
            <div class="stock-group">
                <div id="site-8" class="site" style="">8</div>
                <button class="item">2</button>
                <button class="item">3</button>
                <button class="item">4</button>
                <button class="item">5</button>
                <button class="item">6</button>
                <button class="item">7</button>
                <button class="item">8</button>
                <button class="item">9</button>
                <button class="item">10</button>
                <button class="item">11</button>
                <button class="item">12</button>
                <button class="item">13</button>
                <button class="item">14</button>
                <button class="item">15</button>
                <button class="item">16</button>
                <button class="item">17</button>
                <button class="item">18</button>
                <button class="item">19</button>
                <button class="item">20</button>
                <button class="item">21</button>
                <button class="item">22</button>
                <button class="item">23</button>
                <button class="item">24</button>
                <button class="item">25</button>
                <button class="item">26</button>
                <button class="item">27</button>
                <button class="item">28</button>
                <button class="item">29</button>
                <button class="item">30</button>
                <button class="item">31</button>
                <button class="item">32</button>
                <button class="item">33</button>
                <button class="item">34</button>
                <button class="item">35</button>
                <button class="item">36</button>
                <button class="item">37</button>
                <button class="item">38</button>
                <button class="item">39</button>
                <button class="item">40</button>
                <button class="item">41</button>
                <button class="item">42</button>
                <button class="item">43</button>
                <button class="item">44</button>
                <button class="item">45</button>
                <button class="item">46</button>
                <button class="item">47</button>
                <button class="item">48</button>
                <button class="item">49</button>
                <button class="item">50</button>
                <button class="item">51</button>
                <div class="site site-none">&nbsp;&nbsp;&nbsp;&nbsp;</div>
            </div>
            <span class="row-no">4#</span>
            <span class="row-no">2#</span>
        </div>
    </div>
</main>
@@ -390,21 +242,21 @@
                <input type="checkbox" name="loading" disabled="disabled" style="width: 1rem">
            </div>
        </div>
         <div class="form-item" style="width: 20%">
             <div class="form-item-label">
                 <span>能入</span>
             </div>
             <div class="form-item-input">
                 <input type="checkbox" name="canining" disabled="disabled" style="width: 1rem">
             </div>
         </div>
         <div class="form-item" style="width: 20%">
             <div class="form-item-label">
                 <span>能出</span>
             </div>
             <div class="form-item-input">
                 <input type="checkbox" name="canouting" disabled="disabled" style="width: 1rem">
             </div>
        <div class="form-item" style="width: 20%">
            <div class="form-item-label">
                <span>能入</span>
            </div>
            <div class="form-item-input">
                <input type="checkbox" name="canining" disabled="disabled" style="width: 1rem">
            </div>
        </div>
        <div class="form-item" style="width: 20%">
            <div class="form-item-label">
                <span>能出</span>
            </div>
            <div class="form-item-input">
                <input type="checkbox" name="canouting" disabled="disabled" style="width: 1rem">
            </div>
        </div>

        <!-- 第三行 -->
@@ -605,9 +457,10 @@
                        parent.systemRunning = false;
                    }
                } else if (res.code === 403){
                    window.location.href = baseUrl+"/login";
                    parent.location.href = baseUrl+"/login";
                }  else {
                    console.log(res.msg);
                    
                }
            }
        });
@@ -632,7 +485,7 @@
                        parent.systemRunning = false;
                    }
                } else if (res.code === 403){
                    window.location.href = baseUrl+"/login";
                    parent.location.href = baseUrl+"/login";
                }  else {
                    console.log(res.msg);
                }
@@ -680,11 +533,10 @@
                        var crnEl = $("#crn-"+crns[i].crnId);
                        crnEl.attr("class", "machine " + crns[i].crnStatus);
                        // crnAnimate(crns[i].crnId, crns[i].offset);
                        var unit = $('.item').eq(0).width()+4;
                        crnEl.animate({left: (crns[i].bay * unit + 20) +'px'}, 1000);
                        crnEl.animate({left: (crns[i].bay * ($('.item').eq(0).width()+4)) +'px'}, 1000);
                    }
                } else if (res.code === 403){
                    window.location.href = baseUrl+"/login";
                    parent.location.href = baseUrl+"/login";
                }  else {
                    console.log(res.msg);
                }
@@ -705,7 +557,7 @@
                        $("#code-decoder-data-"+barcodes[i].barcodeId).html(barcodes[i].codeValue);
                    }
                } else if (res.code === 403){
                    window.location.href = baseUrl+"/login";
                    parent.location.href = baseUrl+"/login";
                }  else {
                    console.log(res.msg);
                }
@@ -806,7 +658,7 @@
                    targetTop += 160;
                    break;
                case 2:
                    targetTop += 120;
                    targetTop += 140;
                    break;
                case 3:
                    targetTop += 80;