#

mrzhssss

2022-09-20 d373e41c5b6519bd7d3242612b86f19c567260d7

#

 src/main/java/com/zy/core/thread/SiemensDevpThread.java

@@ -142,6 +142,7 @@
                staProtocol.setWorkNo(siemensS7Net.getByteTransform().TransInt16(result.Content, i*4));     // 工作号

                staProtocol.setStaNo(siemensS7Net.getByteTransform().TransInt16(result.Content, i*4 + 2));   // 目标站
                System.out.println("这里卡一下");
            }
        }
//        Thread.sleep(200);

 src/main/resources/application.yml

@@ -143,7 +143,7 @@
  # 输送线
  devp[0]:
    id: 1
    ip: 10.10.10.50
    ip: 192.168.4.250
    port: 102
    rack: 0
    slot: 0

 src/main/webapp/static/css/pipeline.css

@@ -33,7 +33,7 @@
    height: 15%;
}
.plc-log-body {
    height: 85%;
    height: 100%;
    overflow: auto;
}


 src/main/webapp/static/images/zy-logo.png

 src/main/webapp/views/console.html

@@ -569,6 +569,7 @@
                        }

                        if (sites[i].siteId === '16' || sites[i].siteId === '016') {

                            carAnimate(Number(sites[i].siteId), Number(sites[i].nearbySta));
                        }
                    }
@@ -698,23 +699,39 @@

    // 小车偏移动画
    function carAnimate(id, target) {
        var targetTop = 122;
        // debugger
        var targetTop = 0;
        if (id === 16 || id === '16' || id === '016') {
            switch (target) {
                case 1:
                    targetTop += 160;
                    targetTop += 827;
                    break;
                case 2:
                    targetTop += 140;
                    targetTop += 765;
                    break;
                case 3:
                    targetTop += 80;
                    targetTop += 651;
                    break;
                case 4:
                    targetTop += 40;
                    targetTop += 589;
                    break;
                case 5:
                    targetTop += 505;
                    break;
                case 6:
                    targetTop += 443;
                    break;
                case 7:
                    targetTop += 0;
                    targetTop += 362;
                    break;
                case 8:
                    targetTop += 297;
                    break;
                case 9:
                    targetTop += 243;
                    break;
                case 10:
                    targetTop += 129;
                    break;
                default:
                    return;
@@ -722,7 +739,8 @@
        } else {
            return;
        }
        $("#site-" + id).animate({top: targetTop + 'px'}, 1000);

        $("#site-0" + id).animate({top: targetTop + 'px'}, 1000);
    }



 src/main/webapp/views/pipeline.html

@@ -53,31 +53,31 @@
            <!-- plc异常日志监控版 -->
            <div id="plc-error" class="main-board" style="padding-left: 10px">
                <!-- 头部 -->
                <div class="plc-log-header">
                    <!-- 设备任务操作 -->
                    <div class="io-mode-oper">
                        <fieldset>
                            <legend>入出库模式（IO-Mode）</legend>
                            <div class="io-mode-box">
                                <label>F2</label>
                                <button id="io-mode-2" class="ioModeBtn" onclick="ioModeSwitch(this.id)"> - </button>
                            </div>
                            <div class="io-mode-box">
                                <label>F4</label>
                                <button id="io-mode-4" class="ioModeBtn" onclick="ioModeSwitch(this.id)"> - </button>
                            </div>
                        </fieldset>
                    </div>
                    <!--            <div style="height: 40%">-->
                    <!--                <span>东侧PLC执行指令</span>-->
                    <!--            </div>-->
                    <!--            <div style="height: 40%">-->
                    <!--                <span>西侧PLC执行指令</span>-->
                    <!--            </div>-->
                    <!--                    <div>-->
                    <!--                        <span style="color: #1E9FFF">PLC异常信息表:</span>-->
                    <!--                    </div>-->
                </div>
<!--                <div class="plc-log-header">-->
<!--                    &lt;!&ndash; 设备任务操作 &ndash;&gt;-->
<!--                    <div class="io-mode-oper">-->
<!--                        <fieldset>-->
<!--                            <legend>入出库模式（IO-Mode）</legend>-->
<!--                            <div class="io-mode-box">-->
<!--                                <label>F2</label>-->
<!--                                <button id="io-mode-2" class="ioModeBtn" onclick="ioModeSwitch(this.id)"> - </button>-->
<!--                            </div>-->
<!--                            <div class="io-mode-box">-->
<!--                                <label>F4</label>-->
<!--                                <button id="io-mode-4" class="ioModeBtn" onclick="ioModeSwitch(this.id)"> - </button>-->
<!--                            </div>-->
<!--                        </fieldset>-->
<!--                    </div>-->
<!--                    &lt;!&ndash;            <div style="height: 40%">&ndash;&gt;-->
<!--                    &lt;!&ndash;                <span>东侧PLC执行指令</span>&ndash;&gt;-->
<!--                    &lt;!&ndash;            </div>&ndash;&gt;-->
<!--                    &lt;!&ndash;            <div style="height: 40%">&ndash;&gt;-->
<!--                    &lt;!&ndash;                <span>西侧PLC执行指令</span>&ndash;&gt;-->
<!--                    &lt;!&ndash;            </div>&ndash;&gt;-->
<!--                    &lt;!&ndash;                    <div>&ndash;&gt;-->
<!--                    &lt;!&ndash;                        <span style="color: #1E9FFF">PLC异常信息表:</span>&ndash;&gt;-->
<!--                    &lt;!&ndash;                    </div>&ndash;&gt;-->
<!--                </div>-->
                <!-- 主体 -->
                <div class="plc-log-body">
                    <div>