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

luxiaotao1123

2022-11-29 99ba901225a712fb939172048403014cf6afca6e

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

 src/main/resources/application.yml

@@ -200,14 +200,14 @@
   # LED1
  led[0]:
    id: 1
    ip: 10.10.10.205
    ip: 10.10.10.51
    port: 5005
    devpPlcId: ${wcs-slave.devp[0].id}
    staArr: 100
  # LED1
  led[1]:
    id: 2
    ip: 10.10.10.206
    ip: 10.10.10.52
    port: 5005
    devpPlcId: ${wcs-slave.devp[0].id}
    staArr: 300

 src/main/webapp/views/console.html

@@ -75,14 +75,14 @@
        </div>

        <div class="site-row site-row-5">
            <div id="site-200" class="site" style="height: 18px;line-height: 18px;width:80px;">200</div>
            <div id="site-202" class="site" style="height: 18px;line-height: 18px;width:80px;">202</div>
            <div id="site-203" class="site" style="height: 18px;line-height: 18px;width:80px;">203</div>
            <div id="site-202" class="site" style="height: 18px;line-height: 18px;width:80px;">202</div>
            <div id="site-200" class="site" style="height: 18px;line-height: 18px;width:80px;">200</div>
        </div>

        <div class="site-row site-row-6">
            <div id="site-201" class="site" style="height: 18px;line-height: 18px;width:80px;">201</div>
            <div id="site-204" class="site" style="height: 18px;line-height: 18px;width:80px;margin-top: 20px">204</div>
            <div id="site-204" class="site" style="height: 18px;line-height: 18px;width:80px;">204</div>
            <div id="site-201" class="site" style="height: 18px;line-height: 18px;width:80px;margin-top: 20px">201</div>
        </div>

        <div class="site-row site-row-7">
@@ -90,10 +90,10 @@
        </div>

        <div class="site-row site-row-8">
            <div id="site-206" class="site" style="height: 18px;line-height: 18px;width:80px;">206</div>
            <div id="site-207" class="site" style="height: 18px;line-height: 18px;width:80px;">207</div>
            <div id="site-208" class="site" style="height: 18px;line-height: 18px;width:80px;">208</div>
            <div id="site-209" class="site" style="height: 18px;line-height: 18px;width:80px;">209</div>
            <div id="site-208" class="site" style="height: 18px;line-height: 18px;width:80px;">208</div>
            <div id="site-207" class="site" style="height: 18px;line-height: 18px;width:80px;">207</div>
            <div id="site-206" class="site" style="height: 18px;line-height: 18px;width:80px;">206</div>
        </div>

        <!-- 货架 + 堆垛机 + 入库站点 -->