From 080c526d3633c6b2c3f770ccf43b1b08346f2692 Mon Sep 17 00:00:00 2001 From: tqs <56479841@qq.com> Date: 星期六, 03 十二月 2022 12:57:23 +0800 Subject: [PATCH] # --- src/main/webapp/views/crn.html | 6 +++ src/main/java/com/zy/asrs/controller/RgvController.java | 12 ------ src/main/webapp/static/images/zy-logo.png | 0 src/main/webapp/views/index.html | 2 src/main/resources/application.yml | 48 ++++++++++++++++++++++++ 5 files changed, 55 insertions(+), 13 deletions(-) diff --git a/src/main/java/com/zy/asrs/controller/RgvController.java b/src/main/java/com/zy/asrs/controller/RgvController.java index e50d1dc..854199d 100644 --- a/src/main/java/com/zy/asrs/controller/RgvController.java +++ b/src/main/java/com/zy/asrs/controller/RgvController.java @@ -152,18 +152,6 @@ return R.ok().add(str.toString()); } - @GetMapping("/demo/status") - public R demoStatus(){ - List<Map<String, Object>> res = new ArrayList<>(); - for (RgvSlave rgvSlave : slaveProperties.getRgv()) { - Map<String, Object> map = new HashMap<>(); - map.put("rgvNo", rgvSlave.getId()); - map.put("demo", rgvSlave.getDemo()); - res.add(map); - } - return R.ok().add(res); - } - /****************************************************************/ /************************** 鎵嬪姩鎿嶄綔 ******************************/ /****************************************************************/ diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 8a64d97..e62f9fb 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -142,6 +142,54 @@ row: 14 bay: 1 lev: 1 + # 鍫嗗灈鏈�5 + crn[4]: + id: 5 + ip: 10.10.10.141 + port: 102 + rack: 0 + slot: 0 + # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2 + offset: 2 + demo: false + # 鍫嗗灈鏈哄叆搴撶珯鐐� + crnInStn[0]: + devpPlcId: ${wcs-slave.devp[0].id} + staNo: 001 + row: 15 + bay: 1 + lev: 1 + # 鍫嗗灈鏈哄嚭搴撶珯鐐� + crnOutStn[0]: + devpPlcId: ${wcs-slave.devp[0].id} + staNo: 002 + row: 14 + bay: 1 + lev: 1 + # 鍫嗗灈鏈�6 + crn[5]: + id: 6 + ip: 10.10.10.142 + port: 102 + rack: 0 + slot: 0 + # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2 + offset: 2 + demo: false + # 鍫嗗灈鏈哄叆搴撶珯鐐� + crnInStn[0]: + devpPlcId: ${wcs-slave.devp[0].id} + staNo: 001 + row: 15 + bay: 1 + lev: 1 + # 鍫嗗灈鏈哄嚭搴撶珯鐐� + crnOutStn[0]: + devpPlcId: ${wcs-slave.devp[0].id} + staNo: 002 + row: 14 + bay: 1 + lev: 1 # RGV绌挎杞�1 rgv[0]: diff --git a/src/main/webapp/static/images/zy-logo.png b/src/main/webapp/static/images/zy-logo.png index 3726d78..e2fc662 100644 --- a/src/main/webapp/static/images/zy-logo.png +++ b/src/main/webapp/static/images/zy-logo.png Binary files differ diff --git a/src/main/webapp/views/crn.html b/src/main/webapp/views/crn.html index f5e66e6..bbb40b9 100644 --- a/src/main/webapp/views/crn.html +++ b/src/main/webapp/views/crn.html @@ -83,6 +83,12 @@ <!-- <span> </span>--> <input id="crn5" disabled="disabled"> </div> + <div class="crn-command-item"> + <label>6#</label> + <button id="demoBtn-6" class="demoBtn" onclick="demoSwitch(this.id)"> - </button> + <!-- <span> </span>--> + <input id="crn6" disabled="disabled"> + </div> </div> <!-- 鍫嗗灈鏈虹姸鎬佷綅淇℃伅 --> <div class="crn-state"> diff --git a/src/main/webapp/views/index.html b/src/main/webapp/views/index.html index 0af4762..72f9e61 100644 --- a/src/main/webapp/views/index.html +++ b/src/main/webapp/views/index.html @@ -27,7 +27,7 @@ <!-- 涓讳綋鍐呭 --> <iframe id="content" src="console.html"></iframe> <footer class="footer"> - Copyright 漏 2015 All Rights Reserved. <a href="https://www.superton.cn/" target="_blank">娴欐睙閫熻吘鐢靛瓙鎶�鏈湁闄愬叕鍙�</a> 淇濈暀鎵�鏈夋潈鍒� + Copyright 漏 2015 All Rights Reserved. <a href="https://www.zoneyung.com" target="_blank">娴欐睙涓壃绔嬪簱鎶�鏈湁闄愬叕鍙�</a> 淇濈暀鎵�鏈夋潈鍒� </footer> </body> <script> -- Gitblit v1.9.1