From c2f53466b46f8da5648d1528822612509c9dca6f Mon Sep 17 00:00:00 2001
From: dubin <bindu_bean@163.com>
Date: 星期三, 26 十一月 2025 18:26:01 +0800
Subject: [PATCH] 济南二机床加工线库初始化
---
src/main/webapp/views/crn.html | 70 +++++++++++-----------
src/main/webapp/views/index.html | 2
src/main/webapp/static/js/console.map.js | 29 +++++----
src/main/resources/application.yml | 46 +++++++-------
4 files changed, 74 insertions(+), 73 deletions(-)
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index de3dc26..ffed26d 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -84,29 +84,29 @@
# bay: 120
# lev: 1
# 鍫嗗灈鏈�2
- crn[1]:
- id: 2
- ip: 172.17.60.20
- port: 102
- rack: 0
- slot: 0
- # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
- offset: 2
- demo: false
- # 鍫嗗灈鏈哄叆搴撶珯鐐�
- crnInStn[0]:
- devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 1023
- row: 8
- bay: 1
- lev: 1
- # 鍫嗗灈鏈哄嚭搴撶珯鐐�
- crnOutStn[0]:
- devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 1026
- row: 9
- bay: 1
- lev: 1
+# crn[1]:
+# id: 2
+# ip: 172.17.60.20
+# port: 102
+# rack: 0
+# slot: 0
+# # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
+# offset: 2
+# demo: false
+# # 鍫嗗灈鏈哄叆搴撶珯鐐�
+# crnInStn[0]:
+# devpPlcId: ${wcs-slave.devp[0].id}
+# staNo: 1023
+# row: 8
+# bay: 1
+# lev: 1
+# # 鍫嗗灈鏈哄嚭搴撶珯鐐�
+# crnOutStn[0]:
+# devpPlcId: ${wcs-slave.devp[0].id}
+# staNo: 1026
+# row: 9
+# bay: 1
+# lev: 1
# 鍫嗗灈鏈�3
# crn[2]:
# id: 3
diff --git a/src/main/webapp/static/js/console.map.js b/src/main/webapp/static/js/console.map.js
index d791832..92da8b6 100644
--- a/src/main/webapp/static/js/console.map.js
+++ b/src/main/webapp/static/js/console.map.js
@@ -16,12 +16,12 @@
// {"type":"rack","id":"rack16","top":396,"left":641,"width":667,"height":18,"minBayNo":2,"maxBayNo":31},
// {"type":"rack","id":"rack11","top":287,"left":641,"width":667,"height":18,"minBayNo":2,"maxBayNo":31},
// {"type":"rack","id":"rack14","top":357,"left":641,"width":667,"height":18,"minBayNo":2,"maxBayNo":31},
- {"type":"rack","id":"rack13","top":341,"left":641,"width":1100,"height":20,"minBayNo":2,"maxBayNo":28},
- {"type":"rack","id":"rack12","top":302,"left":641,"width":1100,"height":20,"minBayNo":2,"maxBayNo":28},
+ {"type":"rack","id":"rack13","top":341,"left":400,"width":1100,"height":20,"minBayNo":2,"maxBayNo":32},
+ {"type":"rack","id":"rack12","top":302,"left":400,"width":1100,"height":20,"minBayNo":2,"maxBayNo":32},
// {"type":"rack","id":"rack7","top":193,"left":641,"width":667,"height":18,"minBayNo":2,"maxBayNo":31},
// {"type":"rack","id":"rack10","top":268,"left":641,"width":667,"height":18,"minBayNo":2,"maxBayNo":31},
- {"type":"rack","id":"rack9","top":249,"left":641,"width":1100,"height":20,"minBayNo":2,"maxBayNo":28},
- {"type":"rack","id":"rack8","top":212,"left":641,"width":1100,"height":20,"minBayNo":2,"maxBayNo":28},
+ // {"type":"rack","id":"rack9","top":249,"left":641,"width":1100,"height":20,"minBayNo":2,"maxBayNo":28},
+ // {"type":"rack","id":"rack8","top":212,"left":641,"width":1100,"height":20,"minBayNo":2,"maxBayNo":28},
// {"type":"rack","id":"rack2","top":83,"left":641,"width":667,"height":18,"minBayNo":2,"maxBayNo":61},
// {"type":"rack","id":"rack3","top":103,"left":641,"width":667,"height":18,"minBayNo":2,"maxBayNo":61},
// {"type":"rack","id":"rack6","top":174,"left":641,"width":667,"height":18,"minBayNo":2,"maxBayNo":31}
@@ -35,10 +35,10 @@
// {"type":"crane","id":"crn-6","text":"6","top":597,"left":731,"width":67,"height":13},
// {"type":"crane","id":"crn-1","text":"1","top":162,"left":730,"width":67,"height":13},
// {"type":"track","id":"lb_track3","text":"","top":424,"left":593,"width":733,"height":1},
- {"type":"crane","id":"crn-2","text":"2","top":234,"left":741,"width":67,"height":13},
- {"type":"track","id":"lb_track4","text":"","top":333,"left":593,"width":733,"height":1},
- {"type":"crane","id":"crn-3","text":"3","top":325,"left":730,"width":67,"height":13},
- {"type":"track","id":"lb_track5","text":"","top":241,"left":595,"width":733,"height":1},
+ // {"type":"crane","id":"crn-2","text":"2","top":234,"left":741,"width":67,"height":13},
+ {"type":"track","id":"lb_track4","text":"","top":333,"left":400,"width":1100,"height":1},
+ {"type":"crane","id":"crn-3","text":"3","top":325,"left":1450,"width":67,"height":13},
+ // {"type":"track","id":"lb_track5","text":"","top":241,"left":595,"width":733,"height":1},
// {"type":"track","id":"lb_track6","text":"","top":168,"left":596,"width":733,"height":1},
// {"type":"crane","id":"crn-4","text":"4","top":417,"left":730,"width":67,"height":13}
],
@@ -100,14 +100,15 @@
// {"type":"stn","id":"site-1038","text":"1038","top":418,"left":501,"width":67,"height":45},
// {"type":"stn","id":"site-1036","text":"1036","top":397,"left":571,"width":67,"height":17},
// {"type":"stn","id":"site-1035","text":"1035","top":398,"left":501,"width":67,"height":17},
- {"type":"stn","id":"site-101","text":"101","top":344,"left":571,"width":67,"height":17},
- {"type":"stn","id":"site-102","text":"102","top":336,"left":501,"width":67,"height":25},
+ {"type":"stn","id":"site-203","text":"203","top":344,"left":1500,"width":67,"height":17},
+ {"type":"stn","id":"site-204","text":"204","top":344,"left":1570,"width":67,"height":17},
// {"type":"stn","id":"site-1029","text":"1029","top":308,"left":571,"width":67,"height":17},
- {"type":"stn","id":"site-103","text":"103","top":306,"left":501,"width":67,"height":25},
+ {"type":"stn","id":"site-201","text":"201","top":306,"left":1500,"width":67,"height":17},
// {"type":"stn","id":"site-1026","text":"1026","top":250,"left":571,"width":67,"height":17},
- {"type":"stn","id":"site-104","text":"104","top":274,"left":501,"width":67,"height":25},
- {"type":"stn","id":"site-106","text":"106","top":252,"left":571,"width":67,"height":17},
- {"type":"stn","id":"site-105","text":"105","top":243,"left":501,"width":67,"height":25},
+ {"type":"stn","id":"site-202","text":"202","top":306,"left":1570,"width":67,"height":17},
+ {"type":"stn","id":"site-205","text":"205","top":370,"left":1200,"width":67,"height":17},
+ // {"type":"stn","id":"site-106","text":"106","top":252,"left":571,"width":67,"height":17},
+ // {"type":"stn","id":"site-105","text":"105","top":243,"left":501,"width":67,"height":25},
// {"type":"stn","id":"site-1020","text":"1020","top":177,"left":571,"width":67,"height":17},
// {"type":"stn","id":"site-1019","text":"1019","top":178,"left":502,"width":67,"height":17},
// {"type":"stn","id":"site-1016","text":"1016","top":142,"left":571,"width":67,"height":17},
diff --git a/src/main/webapp/views/crn.html b/src/main/webapp/views/crn.html
index 77ba3f9..d33d040 100644
--- a/src/main/webapp/views/crn.html
+++ b/src/main/webapp/views/crn.html
@@ -59,36 +59,36 @@
<!-- <span> </span>-->
<input id="crn1" disabled="disabled">
</div>
- <div class="crn-command-item">
- <label>2#</label>
- <button id="demoBtn-2" class="demoBtn" onclick="demoSwitch(this.id)"> - </button>
- <!-- <span> </span>-->
- <input id="crn2" disabled="disabled">
- </div>
- <div class="crn-command-item">
- <label>3#</label>
- <button id="demoBtn-3" class="demoBtn" onclick="demoSwitch(this.id)"> - </button>
- <!-- <span> </span>-->
- <input id="crn3" disabled="disabled">
- </div>
- <div class="crn-command-item">
- <label>4#</label>
- <button id="demoBtn-4" class="demoBtn" onclick="demoSwitch(this.id)"> - </button>
- <!-- <span> </span>-->
- <input id="crn4" disabled="disabled">
- </div>
- <div class="crn-command-item">
- <label>5#</label>
- <button id="demoBtn-5" class="demoBtn" onclick="demoSwitch(this.id)"> - </button>
- <!-- <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 class="crn-command-item">-->
+<!-- <label>2#</label>-->
+<!-- <button id="demoBtn-2" class="demoBtn" onclick="demoSwitch(this.id)"> - </button>-->
+<!-- <!– <span> </span>–>-->
+<!-- <input id="crn2" disabled="disabled">-->
+<!-- </div>-->
+<!-- <div class="crn-command-item">-->
+<!-- <label>3#</label>-->
+<!-- <button id="demoBtn-3" class="demoBtn" onclick="demoSwitch(this.id)"> - </button>-->
+<!-- <!– <span> </span>–>-->
+<!-- <input id="crn3" disabled="disabled">-->
+<!-- </div>-->
+<!-- <div class="crn-command-item">-->
+<!-- <label>4#</label>-->
+<!-- <button id="demoBtn-4" class="demoBtn" onclick="demoSwitch(this.id)"> - </button>-->
+<!-- <!– <span> </span>–>-->
+<!-- <input id="crn4" disabled="disabled">-->
+<!-- </div>-->
+<!-- <div class="crn-command-item">-->
+<!-- <label>5#</label>-->
+<!-- <button id="demoBtn-5" class="demoBtn" onclick="demoSwitch(this.id)"> - </button>-->
+<!-- <!– <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">
@@ -159,11 +159,11 @@
<span class="select-title">鍫嗗灈鏈哄彿</span>
<div class="select-container" style="padding: 20px 0;">
<label><input type="radio" name="crnSelect" value="1" checked> 1鍙峰爢鍨涙満</label>
- <label><input type="radio" name="crnSelect" value="2"> 2鍙峰爢鍨涙満</label>
- <label><input type="radio" name="crnSelect" value="3"> 3鍙峰爢鍨涙満</label>
- <label><input type="radio" name="crnSelect" value="4"> 4鍙峰爢鍨涙満</label>
- <label><input type="radio" name="crnSelect" value="5"> 5鍙峰爢鍨涙満</label>
- <label><input type="radio" name="crnSelect" value="6"> 6鍙峰爢鍨涙満</label>
+<!-- <label><input type="radio" name="crnSelect" value="2"> 2鍙峰爢鍨涙満</label>-->
+<!-- <label><input type="radio" name="crnSelect" value="3"> 3鍙峰爢鍨涙満</label>-->
+<!-- <label><input type="radio" name="crnSelect" value="4"> 4鍙峰爢鍨涙満</label>-->
+<!-- <label><input type="radio" name="crnSelect" value="5"> 5鍙峰爢鍨涙満</label>-->
+<!-- <label><input type="radio" name="crnSelect" value="6"> 6鍙峰爢鍨涙満</label>-->
</div>
</div>
<!-- 婧愮珯/婧愬簱浣� 閫夋嫨 -->
diff --git a/src/main/webapp/views/index.html b/src/main/webapp/views/index.html
index beb9a59..87ceab8 100644
--- a/src/main/webapp/views/index.html
+++ b/src/main/webapp/views/index.html
@@ -24,7 +24,7 @@
<li><a id="console" onclick="nav(this.id)" class="nav-select" href="#">涓绘帶鍥�</a></li>
<li><a id="pipeline" onclick="nav(this.id)" class="nav-unselect" href="#">杈撻�佽澶�</a></li>
<li><a id="crn" onclick="nav(this.id)" class="nav-unselect" href="#">鍫嗗灈鏈�</a></li>
- <li><a id="rgv" onclick="nav(this.id)" class="nav-unselect" href="#">RGV</a></li>
+<!-- <li><a id="rgv" onclick="nav(this.id)" class="nav-unselect" href="#">RGV</a></li>-->
</ul>
</div>
</div>
--
Gitblit v1.9.1