From ee2500aac8c1933c7c553904ba4df5baf44702f5 Mon Sep 17 00:00:00 2001
From: 野心家 <1051256694@qq.com>
Date: 星期一, 29 一月 2024 18:40:30 +0800
Subject: [PATCH] #
---
src/main/webapp/static/wcs/js/console.map.js | 478 +++++++++-----------
src/main/resources/application-prod.yml | 857 ++++++++++++++++++++++---------------
src/main/webapp/static/wcs/js/console.js | 34
pom.xml | 4
src/main/resources/application.yml | 4
5 files changed, 753 insertions(+), 624 deletions(-)
diff --git a/pom.xml b/pom.xml
index f6d259a..5b3e5d3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
<relativePath/> <!-- lookup parent from repository -->
</parent>
<groupId>com.zy</groupId>
- <artifactId>wcs</artifactId>
+ <artifactId>wxwcs</artifactId>
<version>1.0.0</version>
<packaging>war</packaging>
@@ -200,7 +200,7 @@
</dependencies>
<build>
- <finalName>wcs</finalName>
+ <finalName>wxwcs</finalName>
<plugins>
<plugin>
<groupId>org.springframework.boot</groupId>
diff --git a/src/main/resources/application-prod.yml b/src/main/resources/application-prod.yml
index 36fabaf..03f2ec8 100644
--- a/src/main/resources/application-prod.yml
+++ b/src/main/resources/application-prod.yml
@@ -1,379 +1,546 @@
wcs-slave:
doubleDeep: true #鍙屾繁
- doubleLocs: 1,4,7,10,11,14,15,18,19 #鍙屾繁搴撲綅鎺掑彿
+ doubleLocs: 3,6,7,10,13 #鍙屾繁搴撲綅鎺掑彿 3,6,7,10,13
groupCount: 4 #涓�涓爢鍨涙満璐熻矗鐨勮揣鏋舵帓鏁�
crn[0]: #鍫嗗灈鏈�1
- id: 1
- ip: 172.17.91.2
- slot: 0
- demo: false
rack: 0
- offset: 2 #鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
+ offset: 2 #鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
port: 102
- crnOutStn[0]: #鍫嗗灈鏈哄嚭搴撶珯鐐�
+ crnOutStn[1]: #鍫嗗灈鏈哄嚭搴撶珯鐐�
+ staNo: 101
+ row: 2
+ bay: 1
+ lev: 1
+ devpPlcId: ${wcs-slave.devp[0].id}
+ crnOutStn[0]: #鍫嗗灈鏈哄嚭搴撶珯鐐�
staNo: 100
- row: 2
+ row: 1
bay: 1
lev: 1
devpPlcId: ${wcs-slave.devp[0].id}
- crnInStn[0]: #鍫嗗灈鏈哄叆搴撶珯鐐�1
- staNo: 103
- row: 3
- bay: 1
- lev: 1
- backSta: 102
- devpPlcId: ${wcs-slave.devp[0].id}
- crnOutStn[1]: #鍫嗗灈鏈哄嚭搴撶珯鐐�
- staNo: 200
- row: 2
- bay: 22
- lev: 2
- devpPlcId: ${wcs-slave.devp[1].id}
- crnInStn[1]: #鍫嗗灈鏈哄叆搴撶珯鐐�2
- staNo: 205
- row: 3
- bay: 22
- lev: 2
- devpPlcId: ${wcs-slave.devp[1].id}
- crn[1]: #鍫嗗灈鏈�2
- id: 2
- ip: 172.17.91.7
- slot: 0
- demo: false
- rack: 0
- offset: 2 #鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
- port: 102
- crnOutStn[0]: #鍫嗗灈鏈哄嚭搴撶珯鐐�
- staNo: 104
- row: 5
+ ip: 192.168.4.250
+ crnInStn[0]: #鍫嗗灈鏈哄叆搴撶珯鐐�1
+ staNo: 100
+ row: 1
bay: 1
lev: 1
devpPlcId: ${wcs-slave.devp[0].id}
- crnInStn[0]: #鍫嗗灈鏈哄叆搴撶珯鐐�1
- staNo: 107
- row: 6
- bay: 1
- lev: 1
- backSta: 106
- devpPlcId: ${wcs-slave.devp[0].id}
- crnOutStn[1]: #鍫嗗灈鏈哄嚭搴撶珯鐐�
- staNo: 206
- row: 5
- bay: 22
- lev: 2
- devpPlcId: ${wcs-slave.devp[1].id}
- crnInStn[1]: #鍫嗗灈鏈哄叆搴撶珯鐐�2
- staNo: 211
- row: 6
- bay: 22
- lev: 2
- devpPlcId: ${wcs-slave.devp[1].id}
- crn[2]: #鍫嗗灈鏈�3
- id: 3
- ip: 172.17.91.12
- slot: 0
- demo: false
- rack: 0
- offset: 2 #鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
- port: 102
- crnOutStn[0]: #鍫嗗灈鏈哄嚭搴撶珯鐐�
- staNo: 108
- row: 8
- bay: 1
- lev: 1
- devpPlcId: ${wcs-slave.devp[0].id}
- crnInStn[0]: #鍫嗗灈鏈哄叆搴撶珯鐐�1
- staNo: 111
- row: 9
- bay: 1
- lev: 1
- backSta: 110
- devpPlcId: ${wcs-slave.devp[0].id}
- crnOutStn[1]: #鍫嗗灈鏈哄嚭搴撶珯鐐�
- staNo: 212
- row: 8
- bay: 22
- lev: 2
- devpPlcId: ${wcs-slave.devp[1].id}
- crnInStn[1]: #鍫嗗灈鏈哄叆搴撶珯鐐�2
- staNo: 217
- row: 9
- bay: 22
- lev: 2
- devpPlcId: ${wcs-slave.devp[1].id}
- crn[3]: #鍫嗗灈鏈�4
- id: 4
- ip: 172.17.91.17
- slot: 0
- demo: false
- rack: 0
- offset: 2 #鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
- port: 102
- crnOutStn[0]: #鍫嗗灈鏈哄嚭搴撶珯鐐�
- staNo: 112
- row: 12
- bay: 1
- lev: 1
- devpPlcId: ${wcs-slave.devp[0].id}
- crnInStn[0]: #鍫嗗灈鏈哄叆搴撶珯鐐�1
- staNo: 115
- row: 13
- bay: 1
- lev: 1
- backSta: 114
- devpPlcId: ${wcs-slave.devp[0].id}
- crnOutStn[1]: #鍫嗗灈鏈哄嚭搴撶珯鐐�
- staNo: 218
- row: 12
- bay: 22
- lev: 2
- devpPlcId: ${wcs-slave.devp[1].id}
- crnInStn[1]: #鍫嗗灈鏈哄叆搴撶珯鐐�2
- staNo: 223
- row: 13
- bay: 22
- lev: 2
- devpPlcId: ${wcs-slave.devp[1].id}
- crn[4]: #鍫嗗灈鏈�5
- id: 5
- ip: 172.17.91.22
- slot: 0
- demo: false
- rack: 0
- offset: 2 #鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
- port: 102
- crnOutStn[0]: #鍫嗗灈鏈哄嚭搴撶珯鐐�
- staNo: 116
- row: 16
- bay: 1
- lev: 1
- devpPlcId: ${wcs-slave.devp[0].id}
- crnInStn[0]: #鍫嗗灈鏈哄叆搴撶珯鐐�1
- staNo: 119
- row: 17
- bay: 1
- lev: 1
- backSta: 118
- devpPlcId: ${wcs-slave.devp[0].id}
- crnOutStn[1]: #鍫嗗灈鏈哄嚭搴撶珯鐐�
- staNo: 224
- row: 16
- bay: 22
- lev: 2
- devpPlcId: ${wcs-slave.devp[1].id}
- crnInStn[1]: #鍫嗗灈鏈哄叆搴撶珯鐐�2
- staNo: 229
- row: 17
- bay: 22
- lev: 2
- devpPlcId: ${wcs-slave.devp[1].id}
- crn[5]: #鍫嗗灈鏈�6
- id: 6
- ip: 172.17.91.27
- slot: 0
- demo: false
- rack: 0
- offset: 2 #鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
- port: 102
- crnOutStn[0]: #鍫嗗灈鏈哄嚭搴撶珯鐐�
- staNo: 120
- row: 20
- bay: 1
- lev: 1
- devpPlcId: ${wcs-slave.devp[0].id}
- crnInStn[0]: #鍫嗗灈鏈哄叆搴撶珯鐐�1
- staNo: 123
- row: 21
- bay: 1
- lev: 1
- backSta: 122
- devpPlcId: ${wcs-slave.devp[0].id}
- crnOutStn[1]: #鍫嗗灈鏈哄嚭搴撶珯鐐�
- staNo: 230
- row: 20
- bay: 22
- lev: 2
- devpPlcId: ${wcs-slave.devp[1].id}
- crnInStn[1]: #鍫嗗灈鏈哄叆搴撶珯鐐�2
- staNo: 235
- row: 21
- bay: 22
- lev: 2
- devpPlcId: ${wcs-slave.devp[1].id}
- devp[0]: #杈撻�佺嚎
id: 1
- ip: 172.17.91.36
- rack: 0
- port: 102
slot: 0
- emptyInSta[0]: #绌烘澘鍏ュ簱鍙�0
+ demo: false
+ crn[1]: #鍫嗗灈鏈�2
+ rack: 0
+ offset: 2 #鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
+ port: 102
+ crnOutStn[1]: #鍫嗗灈鏈哄嚭搴撶珯鐐�
staNo: 103
- emptyInSta[1]: #绌烘澘鍏ュ簱鍙�1
+ row: 5
+ bay: 1
+ lev: 1
+ devpPlcId: ${wcs-slave.devp[0].id}
+ crnOutStn[0]: #鍫嗗灈鏈哄嚭搴撶珯鐐�
+ staNo: 102
+ row: 4
+ bay: 1
+ lev: 1
+ devpPlcId: ${wcs-slave.devp[0].id}
+ ip: 10.10.10.10
+ crnInStn[0]: #鍫嗗灈鏈哄叆搴撶珯鐐�1
+ staNo: 102
+ row: 4
+ bay: 1
+ lev: 1
+ devpPlcId: ${wcs-slave.devp[0].id}
+ id: 2
+ slot: 0
+ demo: false
+ barcode[3]: #鏉＄爜鎵弿浠�4
+ port: 51236
+ ip: 10.10.10.52
+ id: 4
+ barcode[2]: #鏉＄爜鎵弿浠�3
+ port: 51236
+ ip: 10.10.10.52
+ id: 3
+
+ barcode[1]: #鏉＄爜鎵弿浠�2
+ port: 51236
+ ip: 10.10.10.52
+ id: 2
+
+ devp[0]: #杈撻�佺嚎
+ emptyInSta[2]: #绌烘澘鍏ュ簱鍙�3
+ staNo: 104
+ emptyInSta[1]: #绌烘澘鍏ュ簱鍙�2
+ staNo: 102
+ rack: 0
+ emptyInSta[0]: #绌烘澘鍏ュ簱鍙�1
+ staNo: 100
+ ip: 192.168.4.250
+ outSta[4]: #鍑哄簱鍙�5
+ staNo: 104
+ outSta[3]: #鍑哄簱鍙�4
+ staNo: 103
+ outSta[6]: #鍑哄簱鍙�7
+ staNo: 106
+ slot: 0
+ outSta[5]: #鍑哄簱鍙�6
staNo: 105
- emptyInSta[2]: #绌烘澘鍏ュ簱鍙�2
- staNo: 109
- emptyInSta[3]: #绌烘澘鍏ュ簱鍙�3
- staNo: 113
- emptyInSta[4]: #绌烘澘鍏ュ簱鍙�4
- staNo: 117
- emptyInSta[5]: #绌烘澘鍏ュ簱鍙�5
- staNo: 121
+ outSta[0]: #鍑哄簱鍙�1
+ staNo: 100
+ outSta[2]: #鍑哄簱鍙�3
+ staNo: 102
+ emptyInSta[3]: #绌烘澘鍏ュ簱鍙�4
+ staNo: 106
+ outSta[1]: #鍑哄簱鍙�2
+ staNo: 101
+ inSta[2]:
+ staNo: 104
+ barcode: ${wcs-slave.barcode[2].id}
+ inSta[3]:
+ staNo: 106
+ barcode: ${wcs-slave.barcode[3].id}
+ port: 102
+ outSta[7]: #鍑哄簱鍙�8
+ staNo: 107
inSta[0]: #鍏ュ簱鍙�1
- #scale: ${wcs-slave.scale[0].id}
- staNo: 103
- backSta: 102
+ staNo: 100
barcode: ${wcs-slave.barcode[0].id}
inSta[1]: #鍏ュ簱鍙�2
- #scale: ${wcs-slave.scale[1].id}
- staNo: 107
- backSta: 106
+ staNo: 102
barcode: ${wcs-slave.barcode[1].id}
- #slot: 0
- inSta[2]: #鍏ュ簱鍙�1
- #scale: ${wcs-slave.scale[0].id}
- staNo: 111
- backSta: 110
- barcode: ${wcs-slave.barcode[2].id}
- inSta[3]: #鍏ュ簱鍙�1
- #scale: ${wcs-slave.scale[0].id}
- staNo: 115
- backSta: 114
- barcode: ${wcs-slave.barcode[3].id}
- inSta[4]: #鍏ュ簱鍙�2
- #scale: ${wcs-slave.scale[1].id}
- staNo: 119
- backSta: 118
- barcode: ${wcs-slave.barcode[4].id}
- #slot: 0
- inSta[5]: #鍏ュ簱鍙�1
- #scale: ${wcs-slave.scale[0].id}
- staNo: 123
- backSta: 122
- barcode: ${wcs-slave.barcode[5].id}
- outSta[0]: #鍑哄簱鍙�1
- staNo: 100
- outSta[1]: #鍑哄簱鍙�2
+ id: 1
+ barcode[0]: #鏉＄爜鎵弿浠�1
+ port: 51236
+ ip: 10.10.10.52
+ id: 1
+
+ crn[2]: #鍫嗗灈鏈�3
+ rack: 0
+ offset: 2 #鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
+ port: 102
+ crnOutStn[1]: #鍫嗗灈鏈哄嚭搴撶珯鐐�
+ staNo: 105
+ row: 9
+ bay: 1
+ lev: 1
+ devpPlcId: ${wcs-slave.devp[0].id}
+ crnOutStn[0]: #鍫嗗灈鏈哄嚭搴撶珯鐐�
staNo: 104
- outSta[2]: #鍑哄簱鍙�2
- staNo: 108
- outSta[3]: #鍑哄簱鍙�1
- staNo: 112
- outSta[4]: #鍑哄簱鍙�2
- staNo: 116
- outSta[5]: #鍑哄簱鍙�2
- staNo: 120
- devp[1]: #杈撻�佺嚎
- id: 2
- ip: 172.17.91.45
- rack: 0
- port: 102
- slot: 0
- inSta[0]: #鍏ュ簱鍙�2
- #scale: ${wcs-slave.scale[1].id}
- staNo: 205
- backSta: 203
- #barcode: ${wcs-slave.barcode[4].id}
- inSta[1]: #鍏ュ簱鍙�2
- #scale: ${wcs-slave.scale[1].id}
- staNo: 211
- backSta: 209
- #barcode: ${wcs-slave.barcode[4].id}
- inSta[2]: #鍏ュ簱鍙�2
- #scale: ${wcs-slave.scale[1].id}
- staNo: 217
- backSta: 215
- #barcode: ${wcs-slave.barcode[4].id}
- inSta[3]: #鍏ュ簱鍙�2
- #scale: ${wcs-slave.scale[1].id}
- staNo: 223
- backSta: 221
- #barcode: ${wcs-slave.barcode[4].id}
- inSta[4]: #鍏ュ簱鍙�2
- #scale: ${wcs-slave.scale[1].id}
- staNo: 229
- backSta: 227
- #barcode: ${wcs-slave.barcode[4].id}
- inSta[5]: #鍏ュ簱鍙�2
- #scale: ${wcs-slave.scale[1].id}
- staNo: 235
- backSta: 232
- #barcode: ${wcs-slave.barcode[4].id}
- outSta[0]: #鍑哄簱鍙�1
- staNo: 200
- outSta[1]: #鍑哄簱鍙�1
- staNo: 206
- outSta[2]: #鍑哄簱鍙�1
- staNo: 212
- outSta[3]: #鍑哄簱鍙�1
- staNo: 218
- outSta[4]: #鍑哄簱鍙�1
- staNo: 224
- outSta[5]: #鍑哄簱鍙�1
- staNo: 230
- devp[2]: #杈撻�佺嚎
+ row: 8
+ bay: 1
+ lev: 1
+ devpPlcId: ${wcs-slave.devp[0].id}
+ ip: 10.10.10.11
+ crnInStn[0]: #鍫嗗灈鏈哄叆搴撶珯鐐�1
+ staNo: 104
+ row: 8
+ bay: 1
+ lev: 1
+ devpPlcId: ${wcs-slave.devp[0].id}
id: 3
- ip: 172.17.8.201
- rack: 0
slot: 0
+ demo: false
+ crn[3]: #鍫嗗灈鏈�4
+ rack: 0
+ offset: 2 #鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
port: 102
- emptyInSta[0]: #绌烘澘鍏ュ簱鍙�1
- staNo: 306
- inSta[0]: #鍏ュ簱鍙�1
- scale: ${wcs-slave.scale[1].id}
- staNo: 301
- barcode: ${wcs-slave.barcode[6].id}
- backSta: 300
- #slot: 0
- outSta[0]: #鍑哄簱鍙�1
- staNo: 307
-# devp[3]: #杈撻�佺嚎
+ crnOutStn[1]: #鍫嗗灈鏈哄嚭搴撶珯鐐�
+ staNo: 107
+ row: 12
+ bay: 1
+ lev: 1
+ devpPlcId: ${wcs-slave.devp[0].id}
+ crnOutStn[0]: #鍫嗗灈鏈哄嚭搴撶珯鐐�
+ staNo: 106
+ row: 11
+ bay: 1
+ lev: 1
+ devpPlcId: ${wcs-slave.devp[0].id}
+ ip: 10.10.10.11
+ crnInStn[0]: #鍫嗗灈鏈哄叆搴撶珯鐐�1
+ staNo: 106
+ row: 11
+ bay: 1
+ lev: 1
+ devpPlcId: ${wcs-slave.devp[0].id}
+ id: 4
+ slot: 0
+ demo: false
+
+
+# crn[0]: #鍫嗗灈鏈�1
+# id: 1
+# ip: 172.17.91.2
+# slot: 0
+# demo: false
+# rack: 0
+# offset: 2 #鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
+# port: 102
+# crnOutStn[0]: #鍫嗗灈鏈哄嚭搴撶珯鐐�
+# staNo: 100
+# row: 2
+# bay: 1
+# lev: 1
+# devpPlcId: ${wcs-slave.devp[0].id}
+# crnInStn[0]: #鍫嗗灈鏈哄叆搴撶珯鐐�1
+# staNo: 103
+# row: 3
+# bay: 1
+# lev: 1
+# backSta: 102
+# devpPlcId: ${wcs-slave.devp[0].id}
+# crnOutStn[1]: #鍫嗗灈鏈哄嚭搴撶珯鐐�
+# staNo: 200
+# row: 2
+# bay: 22
+# lev: 2
+# devpPlcId: ${wcs-slave.devp[1].id}
+# crnInStn[1]: #鍫嗗灈鏈哄叆搴撶珯鐐�2
+# staNo: 205
+# row: 3
+# bay: 22
+# lev: 2
+# devpPlcId: ${wcs-slave.devp[1].id}
+# crn[1]: #鍫嗗灈鏈�2
+# id: 2
+# ip: 172.17.91.7
+# slot: 0
+# demo: false
+# rack: 0
+# offset: 2 #鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
+# port: 102
+# crnOutStn[0]: #鍫嗗灈鏈哄嚭搴撶珯鐐�
+# staNo: 104
+# row: 5
+# bay: 1
+# lev: 1
+# devpPlcId: ${wcs-slave.devp[0].id}
+# crnInStn[0]: #鍫嗗灈鏈哄叆搴撶珯鐐�1
+# staNo: 107
+# row: 6
+# bay: 1
+# lev: 1
+# backSta: 106
+# devpPlcId: ${wcs-slave.devp[0].id}
+# crnOutStn[1]: #鍫嗗灈鏈哄嚭搴撶珯鐐�
+# staNo: 206
+# row: 5
+# bay: 22
+# lev: 2
+# devpPlcId: ${wcs-slave.devp[1].id}
+# crnInStn[1]: #鍫嗗灈鏈哄叆搴撶珯鐐�2
+# staNo: 211
+# row: 6
+# bay: 22
+# lev: 2
+# devpPlcId: ${wcs-slave.devp[1].id}
+# crn[2]: #鍫嗗灈鏈�3
+# id: 3
+# ip: 172.17.91.12
+# slot: 0
+# demo: false
+# rack: 0
+# offset: 2 #鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
+# port: 102
+# crnOutStn[0]: #鍫嗗灈鏈哄嚭搴撶珯鐐�
+# staNo: 108
+# row: 8
+# bay: 1
+# lev: 1
+# devpPlcId: ${wcs-slave.devp[0].id}
+# crnInStn[0]: #鍫嗗灈鏈哄叆搴撶珯鐐�1
+# staNo: 111
+# row: 9
+# bay: 1
+# lev: 1
+# backSta: 110
+# devpPlcId: ${wcs-slave.devp[0].id}
+# crnOutStn[1]: #鍫嗗灈鏈哄嚭搴撶珯鐐�
+# staNo: 212
+# row: 8
+# bay: 22
+# lev: 2
+# devpPlcId: ${wcs-slave.devp[1].id}
+# crnInStn[1]: #鍫嗗灈鏈哄叆搴撶珯鐐�2
+# staNo: 217
+# row: 9
+# bay: 22
+# lev: 2
+# devpPlcId: ${wcs-slave.devp[1].id}
+# crn[3]: #鍫嗗灈鏈�4
# id: 4
-# ip: 10.10.10.30
+# ip: 172.17.91.17
+# slot: 0
+# demo: false
+# rack: 0
+# offset: 2 #鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
+# port: 102
+# crnOutStn[0]: #鍫嗗灈鏈哄嚭搴撶珯鐐�
+# staNo: 112
+# row: 12
+# bay: 1
+# lev: 1
+# devpPlcId: ${wcs-slave.devp[0].id}
+# crnInStn[0]: #鍫嗗灈鏈哄叆搴撶珯鐐�1
+# staNo: 115
+# row: 13
+# bay: 1
+# lev: 1
+# backSta: 114
+# devpPlcId: ${wcs-slave.devp[0].id}
+# crnOutStn[1]: #鍫嗗灈鏈哄嚭搴撶珯鐐�
+# staNo: 218
+# row: 12
+# bay: 22
+# lev: 2
+# devpPlcId: ${wcs-slave.devp[1].id}
+# crnInStn[1]: #鍫嗗灈鏈哄叆搴撶珯鐐�2
+# staNo: 223
+# row: 13
+# bay: 22
+# lev: 2
+# devpPlcId: ${wcs-slave.devp[1].id}
+# crn[4]: #鍫嗗灈鏈�5
+# id: 5
+# ip: 172.17.91.22
+# slot: 0
+# demo: false
+# rack: 0
+# offset: 2 #鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
+# port: 102
+# crnOutStn[0]: #鍫嗗灈鏈哄嚭搴撶珯鐐�
+# staNo: 116
+# row: 16
+# bay: 1
+# lev: 1
+# devpPlcId: ${wcs-slave.devp[0].id}
+# crnInStn[0]: #鍫嗗灈鏈哄叆搴撶珯鐐�1
+# staNo: 119
+# row: 17
+# bay: 1
+# lev: 1
+# backSta: 118
+# devpPlcId: ${wcs-slave.devp[0].id}
+# crnOutStn[1]: #鍫嗗灈鏈哄嚭搴撶珯鐐�
+# staNo: 224
+# row: 16
+# bay: 22
+# lev: 2
+# devpPlcId: ${wcs-slave.devp[1].id}
+# crnInStn[1]: #鍫嗗灈鏈哄叆搴撶珯鐐�2
+# staNo: 229
+# row: 17
+# bay: 22
+# lev: 2
+# devpPlcId: ${wcs-slave.devp[1].id}
+# crn[5]: #鍫嗗灈鏈�6
+# id: 6
+# ip: 172.17.91.27
+# slot: 0
+# demo: false
+# rack: 0
+# offset: 2 #鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
+# port: 102
+# crnOutStn[0]: #鍫嗗灈鏈哄嚭搴撶珯鐐�
+# staNo: 120
+# row: 20
+# bay: 1
+# lev: 1
+# devpPlcId: ${wcs-slave.devp[0].id}
+# crnInStn[0]: #鍫嗗灈鏈哄叆搴撶珯鐐�1
+# staNo: 123
+# row: 21
+# bay: 1
+# lev: 1
+# backSta: 122
+# devpPlcId: ${wcs-slave.devp[0].id}
+# crnOutStn[1]: #鍫嗗灈鏈哄嚭搴撶珯鐐�
+# staNo: 230
+# row: 20
+# bay: 22
+# lev: 2
+# devpPlcId: ${wcs-slave.devp[1].id}
+# crnInStn[1]: #鍫嗗灈鏈哄叆搴撶珯鐐�2
+# staNo: 235
+# row: 21
+# bay: 22
+# lev: 2
+# devpPlcId: ${wcs-slave.devp[1].id}
+# devp[0]: #杈撻�佺嚎
+# id: 1
+# ip: 172.17.91.36
+# rack: 0
+# port: 102
+# slot: 0
+# emptyInSta[0]: #绌烘澘鍏ュ簱鍙�0
+# staNo: 103
+# emptyInSta[1]: #绌烘澘鍏ュ簱鍙�1
+# staNo: 105
+# emptyInSta[2]: #绌烘澘鍏ュ簱鍙�2
+# staNo: 109
+# emptyInSta[3]: #绌烘澘鍏ュ簱鍙�3
+# staNo: 113
+# emptyInSta[4]: #绌烘澘鍏ュ簱鍙�4
+# staNo: 117
+# emptyInSta[5]: #绌烘澘鍏ュ簱鍙�5
+# staNo: 121
+# inSta[0]: #鍏ュ簱鍙�1
+# #scale: ${wcs-slave.scale[0].id}
+# staNo: 103
+# backSta: 102
+# barcode: ${wcs-slave.barcode[0].id}
+# inSta[1]: #鍏ュ簱鍙�2
+# #scale: ${wcs-slave.scale[1].id}
+# staNo: 107
+# backSta: 106
+# barcode: ${wcs-slave.barcode[1].id}
+# #slot: 0
+# inSta[2]: #鍏ュ簱鍙�1
+# #scale: ${wcs-slave.scale[0].id}
+# staNo: 111
+# backSta: 110
+# barcode: ${wcs-slave.barcode[2].id}
+# inSta[3]: #鍏ュ簱鍙�1
+# #scale: ${wcs-slave.scale[0].id}
+# staNo: 115
+# backSta: 114
+# barcode: ${wcs-slave.barcode[3].id}
+# inSta[4]: #鍏ュ簱鍙�2
+# #scale: ${wcs-slave.scale[1].id}
+# staNo: 119
+# backSta: 118
+# barcode: ${wcs-slave.barcode[4].id}
+# #slot: 0
+# inSta[5]: #鍏ュ簱鍙�1
+# #scale: ${wcs-slave.scale[0].id}
+# staNo: 123
+# backSta: 122
+# barcode: ${wcs-slave.barcode[5].id}
+# outSta[0]: #鍑哄簱鍙�1
+# staNo: 100
+# outSta[1]: #鍑哄簱鍙�2
+# staNo: 104
+# outSta[2]: #鍑哄簱鍙�2
+# staNo: 108
+# outSta[3]: #鍑哄簱鍙�1
+# staNo: 112
+# outSta[4]: #鍑哄簱鍙�2
+# staNo: 116
+# outSta[5]: #鍑哄簱鍙�2
+# staNo: 120
+# devp[1]: #杈撻�佺嚎
+# id: 2
+# ip: 172.17.91.45
+# rack: 0
+# port: 102
+# slot: 0
+# inSta[0]: #鍏ュ簱鍙�2
+# #scale: ${wcs-slave.scale[1].id}
+# staNo: 205
+# backSta: 203
+# #barcode: ${wcs-slave.barcode[4].id}
+# inSta[1]: #鍏ュ簱鍙�2
+# #scale: ${wcs-slave.scale[1].id}
+# staNo: 211
+# backSta: 209
+# #barcode: ${wcs-slave.barcode[4].id}
+# inSta[2]: #鍏ュ簱鍙�2
+# #scale: ${wcs-slave.scale[1].id}
+# staNo: 217
+# backSta: 215
+# #barcode: ${wcs-slave.barcode[4].id}
+# inSta[3]: #鍏ュ簱鍙�2
+# #scale: ${wcs-slave.scale[1].id}
+# staNo: 223
+# backSta: 221
+# #barcode: ${wcs-slave.barcode[4].id}
+# inSta[4]: #鍏ュ簱鍙�2
+# #scale: ${wcs-slave.scale[1].id}
+# staNo: 229
+# backSta: 227
+# #barcode: ${wcs-slave.barcode[4].id}
+# inSta[5]: #鍏ュ簱鍙�2
+# #scale: ${wcs-slave.scale[1].id}
+# staNo: 235
+# backSta: 232
+# #barcode: ${wcs-slave.barcode[4].id}
+# outSta[0]: #鍑哄簱鍙�1
+# staNo: 200
+# outSta[1]: #鍑哄簱鍙�1
+# staNo: 206
+# outSta[2]: #鍑哄簱鍙�1
+# staNo: 212
+# outSta[3]: #鍑哄簱鍙�1
+# staNo: 218
+# outSta[4]: #鍑哄簱鍙�1
+# staNo: 224
+# outSta[5]: #鍑哄簱鍙�1
+# staNo: 230
+# devp[2]: #杈撻�佺嚎
+# id: 3
+# ip: 172.17.8.201
# rack: 0
# slot: 0
# port: 102
# emptyInSta[0]: #绌烘澘鍏ュ簱鍙�1
-# staNo: 406
+# staNo: 306
# inSta[0]: #鍏ュ簱鍙�1
# scale: ${wcs-slave.scale[1].id}
-# staNo: 406
-# barcode: ${wcs-slave.barcode[1].id}
+# staNo: 301
+# barcode: ${wcs-slave.barcode[6].id}
+# backSta: 300
# #slot: 0
# outSta[0]: #鍑哄簱鍙�1
-# staNo: 407
- scale[0]: #纾呯Г
- port: 5005
- ip: 10.10.10.201
- id: 1
- scale[1]: #纾呯Г
- port: 5005
- ip: 10.10.10.202
- id: 2
- barcode[0]: #鏉＄爜鎵弿浠�
- port: 51236
- ip: 172.17.91.39
- id: 1
- barcode[1]:
- port: 51236
- ip: 172.17.91.40
- id: 2
- barcode[2]:
- port: 51236
- ip: 172.17.91.41
- id: 3
- barcode[3]:
- port: 51236
- ip: 172.17.91.42
- id: 4
- barcode[4]:
- port: 51236
- ip: 172.17.91.43
- id: 5
- barcode[5]:
- port: 51236
- ip: 172.17.91.44
- id: 6
- barcode[6]:
- port: 51236
- ip: 172.17.8.203
- id: 7
+# staNo: 307
+## devp[3]: #杈撻�佺嚎
+## id: 4
+## ip: 10.10.10.30
+## rack: 0
+## slot: 0
+## port: 102
+## emptyInSta[0]: #绌烘澘鍏ュ簱鍙�1
+## staNo: 406
+## inSta[0]: #鍏ュ簱鍙�1
+## scale: ${wcs-slave.scale[1].id}
+## staNo: 406
+## barcode: ${wcs-slave.barcode[1].id}
+## #slot: 0
+## outSta[0]: #鍑哄簱鍙�1
+## staNo: 407
+# scale[0]: #纾呯Г
+# port: 5005
+# ip: 10.10.10.201
+# id: 1
+# scale[1]: #纾呯Г
+# port: 5005
+# ip: 10.10.10.202
+# id: 2
+# barcode[0]: #鏉＄爜鎵弿浠�
+# port: 51236
+# ip: 172.17.91.39
+# id: 1
+# barcode[1]:
+# port: 51236
+# ip: 172.17.91.40
+# id: 2
+# barcode[2]:
+# port: 51236
+# ip: 172.17.91.41
+# id: 3
+# barcode[3]:
+# port: 51236
+# ip: 172.17.91.42
+# id: 4
+# barcode[4]:
+# port: 51236
+# ip: 172.17.91.43
+# id: 5
+# barcode[5]:
+# port: 51236
+# ip: 172.17.91.44
+# id: 6
+# barcode[6]:
+# port: 51236
+# ip: 172.17.8.203
+# id: 7
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 96400a2..e88b143 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -8,7 +8,7 @@
name: @pom.build.finalName@
datasource:
driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
- url: jdbc:sqlserver://localhost:1433;databasename=ghtzasrs
+ url: jdbc:sqlserver://localhost:1433;databasename=rywxasrs
username: sa
password: sa@123
mvc:
@@ -37,7 +37,7 @@
#License鐩稿叧閰嶇疆
license:
- subject: ghtzwcs
+ subject: ryzhwcs
publicAlias: publicCert
storePass: public_zhongyang_123456789
licensePath: license.lic
diff --git a/src/main/webapp/static/wcs/js/console.js b/src/main/webapp/static/wcs/js/console.js
index c7984a3..3787624 100644
--- a/src/main/webapp/static/wcs/js/console.js
+++ b/src/main/webapp/static/wcs/js/console.js
@@ -40,10 +40,16 @@
}
}else {
bNum = minBayNo
+ let hiddenArr = [];
+ if (rackss[i].hiddenArr != undefined) {
+ hiddenArr = rackss[i].hiddenArr
+ }
for (let j = 0; j < bLen; j++) {
-
- bay = "<button class='item' style='width: "+ bayWidth +"px'>" + bNum + "</button>"
- bays = bays + bay
+ bay = "<button class='item' style='width: "+ bayWidth +"px'>" + bNum + "</button>";
+ if (hiddenArr.indexOf(bNum) != -1) {
+ bay = "<button class='item' style='width: "+ bayWidth +"px;visibility: hidden'>" + bNum + "</button>";
+ }
+ bays = bays + bay;
bNum = bNum + minBayNo;
}
}
@@ -57,17 +63,17 @@
racks = racks + rack
// getCrnInfo(minBayNo);
}
- // 璐ф灦鎻忚堪
- for (let i = 0;i < rackDescss.length;i++) {
- rackDesc = "<div class='rackDescs' id='" + rackDescss[i].id +
- "'style='width:"+ rackDescss[i].width +
- "px;height: "+ rackDescss[i].height+
- "px;line-height: "+ rackDescss[i].height+
- "px;top: "+ rackDescss[i].top +
- "px;left: "+ rackDescss[i].left +
- "px'>" + rackDescss[i].text + "</div>"
- rackDescs = rackDescs + rackDesc
- }
+ // // 璐ф灦鎻忚堪
+ // for (let i = 0;i < rackDescss.length;i++) {
+ // rackDesc = "<div class='rackDescs' id='" + rackDescss[i].id +
+ // "'style='width:"+ rackDescss[i].width +
+ // "px;height: "+ rackDescss[i].height+
+ // "px;line-height: "+ rackDescss[i].height+
+ // "px;top: "+ rackDescss[i].top +
+ // "px;left: "+ rackDescss[i].left +
+ // "px'>" + rackDescss[i].text + "</div>"
+ // rackDescs = rackDescs + rackDesc
+ // }
// 鍫嗗灈鏈哄拰鍦拌建
for (let i = 0;i < crnss.length;i++) {
if (crnss[i].type == "crane") {
diff --git a/src/main/webapp/static/wcs/js/console.map.js b/src/main/webapp/static/wcs/js/console.map.js
index 6d01c79..d6e75f0 100644
--- a/src/main/webapp/static/wcs/js/console.map.js
+++ b/src/main/webapp/static/wcs/js/console.map.js
@@ -1,328 +1,284 @@
mapInfo = {
- "mapName": "ZHRUWXWCS",
- "rackCount": 16,
+ "mapName": "rywxwcs",
+ "rackCount": 13,
"crnCount": 4,
- "stbCount": 16,
+ "stbCount": 4,
"hpPosition": 0,
- "minBayNo": 2,
+ "minBayNo": 1,
"floors": 1,
"racks": [{
"type": "rack",
- "id": "rack1",
- "top": 67,//92 103
- "left": 600,
- "width": 885,
- "height": 22,
- "minBayNo": 1,
- "maxBayNo": 19
- }, {
- "type": "rack",
- "id": "rack2",
- "top": 115,//48
- "left": 600,
- "width": 885,
- "height": 22,
- "minBayNo": 1,
- "maxBayNo": 19
- }, {
- "type": "rack",
- "id": "rack3",
- "top": 140,
- "left": 553.5,
- "width": 931.6,
- "height": 22,
- "minBayNo": 1,
- "maxBayNo": 20
- }, {
- "type": "rack",
"id": "rack4",
- "top": 163,//188 199
- "left": 553.5,
- "width": 931.6,
- "height": 22,
+ "top": 209,
+ "left": 475,
+ "width": 795,
+ "height": 23,
"minBayNo": 1,
- "maxBayNo": 20
+ "maxBayNo": 22,
+ "hiddenArr": [22]
}, {
"type": "rack",
- "id": "rack5",
- "top": 211,
- "left": 553.5,
- "width": 931.6,
- "height": 22,
+ "id": "rack13",
+ "top": 598,
+ "left": 475,
+ "width": 795,
+ "height": 23,
"minBayNo": 1,
- "maxBayNo": 20
+ "maxBayNo": 22,
+ "hiddenArr": [1,2]
}, {
"type": "rack",
- "id": "rack6",
- "top": 234,
- "left": 553.5,
- "width": 931.6,
- "height": 22,
+ "id": "rack12",
+ "top": 574,
+ "left": 475,
+ "width": 795,
+ "height": 23,
"minBayNo": 1,
- "maxBayNo": 20
+ "maxBayNo": 22,
+ "hiddenArr": [1]
}, {
"type": "rack",
- "id": "rack7",
- "top": 259,
- "left": 553.5,
- "width": 978.2,//46.5
- "height": 22,
+ "id": "rack11",
+ "top": 502,
+ "left": 475,
+ "width": 795,
+ "height": 23,
"minBayNo": 1,
- "maxBayNo": 21
- }, {
- "type": "rack",
- "id": "rack8",
- "top": 282,
- "left": 553.5,
- "width": 978.2,
- "height": 22,
- "minBayNo": 1,
- "maxBayNo": 21
- }, {
- "type": "rack",
- "id": "rack9",
- "top": 330,
- "left": 553.5,
- "width": 978.2,//46.5
- "height": 22,
- "minBayNo": 1,
- "maxBayNo": 21
+ "maxBayNo": 22,
+ "hiddenArr": [1]
}, {
"type": "rack",
"id": "rack10",
- "top": 353,
- "left": 553.5,
- "width": 978.2,
- "height": 22,
+ "top": 466,
+ "left": 475,
+ "width": 795,
+ "height": 23,
"minBayNo": 1,
- "maxBayNo": 21
- }],
- "rackDescs": [{
- "type": "rackDescs",
- "id": "lb_desc16",
- "text": "#1",
- "top": 23,
- "left": 1300,
- "width": 30,
- "height": 23
+ "maxBayNo": 22
}, {
- "type": "rackDescs",
- "id": "lb_desc1",
- "text": "#13",
- "top": 500,
- "left": 1300,
- "width": 41,
- "height": 23
+ "type": "rack",
+ "id": "rack9",
+ "top": 443,
+ "left": 475,
+ "width": 795,
+ "height": 23,
+ "minBayNo": 1,
+ "maxBayNo": 22
+ }, {
+ "type": "rack",
+ "id": "rack8",
+ "top": 368,
+ "left": 475,
+ "width": 795,
+ "height": 23,
+ "minBayNo": 1,
+ "maxBayNo": 22
+ }, {
+ "type": "rack",
+ "id": "rack7",
+ "top": 345,
+ "left": 475,
+ "width": 795,
+ "height": 23,
+ "minBayNo": 1,
+ "maxBayNo": 22,
+ "hiddenArr": [3,10,11,17,18]
+ }, {
+ "type": "rack",
+ "id": "rack6",
+ "top": 303,
+ "left": 475,
+ "width": 795,
+ "height": 23,
+ "minBayNo": 1,
+ "maxBayNo": 22,
+ "hiddenArr": [1,3,10,11,17,18,22]
+ }, {
+ "type": "rack",
+ "id": "rack5",
+ "top": 280,
+ "left": 475,
+ "width": 795,
+ "height": 23,
+ "minBayNo": 1,
+ "maxBayNo": 22,
+ "hiddenArr": [3,10,11,17,18,22]
+ }, {
+ "type": "rack",
+ "id": "rack3",
+ "top": 182,
+ "left": 475,
+ "width": 795,
+ "height": 23,
+ "minBayNo": 1,
+ "maxBayNo": 22,
+ "hiddenArr": [1,22]
+ }, {
+ "type": "rack",
+ "id": "rack2",
+ "top": 159,
+ "left": 475,
+ "width": 795,
+ "height": 23,
+ "minBayNo": 1,
+ "maxBayNo": 22,
+ "hiddenArr": [1,22]
+ }, {
+ "type": "rack",
+ "id": "rack1",
+ "top": 98,
+ "left": 475,
+ "width": 795,
+ "height": 23,
+ "minBayNo": 1,
+ "maxBayNo": 22,
+ "hiddenArr": [1,22]
}],
"crns": [{
"type": "crane",
- "id": "crn-1",
- "text": "1",
- "top": 92,
- "left": 1689,
- "width": 93,
- "height": 22
- }, {
- "type": "track",
- "id": "lb_track1",
- "text": "",
- "top": 103,
- "left": 523,
- "width": 1042,
- "height": 2
- }, {
- "type": "crane",
- "id": "crn-2",
- "text": "2",
- "top": 188,
- "left": 1539,
- "width": 93,
- "height": 22
- }, {
- "type": "track",
- "id": "lb_track2",
- "text": "",
- "top": 199,
- "left": 523,
- "width": 1042,
- "height": 2
- }, {
- "type": "crane",
- "id": "crn-3",
- "text": "3",
- "top": 307,
- "left": 539,
- "width": 93,
- "height": 22
- }, {
- "type": "track",
- "id": "lb_track3",
- "text": "",
- "top": 318,
- "left": 523,
- "width": 1042,
- "height": 2
- }, {
- "type": "crane",
"id": "crn-4",
"text": "4",
- "top": 390,
- "left": 539,
+ "top": 539,
+ "left": 530,
"width": 93,
"height": 22
}, {
"type": "track",
"id": "lb_track4",
"text": "",
- "top": 401,
- "left": 373,
- "width": 1042,
+ "top": 550,
+ "left": 444,
+ "width": 850,
+ "height": 2
+ }, {
+ "type": "crane",
+ "id": "crn-3",
+ "text": "3",
+ "top": 408,
+ "left": 530,
+ "width": 93,
+ "height": 22
+ }, {
+ "type": "track",
+ "id": "lb_track3",
+ "text": "",
+ "top": 418,
+ "left": 444,
+ "width": 850,
+ "height": 2
+ }, {
+ "type": "crane",
+ "id": "crn-2",
+ "text": "2",
+ "top": 245,
+ "left": 530,
+ "width": 93,
+ "height": 22
+ }, {
+ "type": "crane",
+ "id": "crn-1",
+ "text": "1",
+ "top": 132,
+ "left": 530,
+ "width": 93,
+ "height": 22
+ }, {
+ "type": "track",
+ "id": "lb_track2",
+ "text": "",
+ "top": 255,
+ "left": 444,
+ "width": 850,
+ "height": 2
+ }, {
+ "type": "track",
+ "id": "lb_track1",
+ "text": "",
+ "top": 143,
+ "left": 447,
+ "width": 850,
"height": 2
}],
"areas": [{
"type": "Control_floor",
"id": "tabControl_floor1",
"text": "妤煎眰",
- "top": 68,
+ "top": 66,
"left": 80,
- "width": 1400,
- "height": 680,
+ "width": 334,
+ "height": 714,
"floors": [{
"type": "floor",
"id": "page_floor1",
"text": "1F",
"top": 4,
"left": 22,
- "width": 1374,
- "height": 672,
+ "width": 308,
+ "height": 706,
"stns": [{
"type": "stn",
- "id": "site-100",
- "text": "100",
- "top": 68,
- "left": 401,
- "width": 49,
- "height": 20
- }, {
- "type": "stn",
- "id": "site-101",
- "text": "101",
- "top": 68,
- "left": 350,
- "width": 49,
- "height": 20
- }, {
- "type": "stn",
- "id": "site-102",
- "text": "102",
- "top": 116,
- "left": 350,
- "width": 49,
- "height": 20
- }, {
- "type": "stn",
- "id": "site-103",
- "text": "103",
- "top": 116,
- "left": 401,
- "width": 49,
- "height": 20
- }, {
- "type": "stn",
- "id": "site-104",
- "text": "104",
- "top": 160,
- "left": 401,
- "width": 49,
- "height": 20
- }, {
- "type": "stn",
- "id": "site-105",
- "text": "105",
- "top": 160,
- "left": 350,
- "width": 49,
- "height": 20
+ "id": "site-107",
+ "text": "107",
+ "top": 576,
+ "left": 386,
+ "width": 92,
+ "height": 23
}, {
"type": "stn",
"id": "site-106",
"text": "106",
- "top": 208,
- "left": 350,
- "width": 49,
- "height": 20
+ "top": 504,
+ "left": 386,
+ "width": 92,
+ "height": 23
}, {
"type": "stn",
- "id": "site-107",
- "text": "107",
- "top": 208,
- "left": 401,
- "width": 49,
- "height": 20
+ "id": "site-105",
+ "text": "105",
+ "top": 444,
+ "left": 386,
+ "width": 92,
+ "height": 23
}, {
"type": "stn",
- "id": "site-108",
- "text": "108",
- "top": 252,
- "left": 401,
- "width": 49,
- "height": 20
+ "id": "site-104",
+ "text": "104",
+ "top": 369,
+ "left": 386,
+ "width": 92,
+ "height": 23
}, {
"type": "stn",
- "id": "site-109",
- "text": "109",
- "top": 252,
- "left": 350,
- "width": 49,
- "height": 20
+ "id": "site-103",
+ "text": "103",
+ "top": 281,
+ "left": 386,
+ "width": 92,
+ "height": 23
}, {
"type": "stn",
- "id": "site-110",
- "text": "110",
- "top": 300,
- "left": 350,
- "width": 49,
- "height": 20
+ "id": "site-102",
+ "text": "102",
+ "top": 210,
+ "left": 386,
+ "width": 92,
+ "height": 23
}, {
"type": "stn",
- "id": "site-111",
- "text": "111",
- "top": 300,
- "left": 401,
- "width": 49,
- "height": 20
+ "id": "site-101",
+ "text": "101",
+ "top": 160,
+ "left": 386,
+ "width": 92,
+ "height": 23
}, {
"type": "stn",
- "id": "site-112",
- "text": "112",
- "top": 366,
- "left": 401,
- "width": 49,
- "height": 20
- }, {
- "type": "stn",
- "id": "site-113",
- "text": "113",
- "top": 366,
- "left": 350,
- "width": 49,
- "height": 20
- }, {
- "type": "stn",
- "id": "site-114",
- "text": "114",
- "top": 414,
- "left": 350,
- "width": 49,
- "height": 20
- }, {
- "type": "stn",
- "id": "site-115",
- "text": "115",
- "top": 414,
- "left": 401,
- "width": 49,
- "height": 20
+ "id": "site-100",
+ "text": "100",
+ "top": 99,
+ "left": 386,
+ "width": 92,
+ "height": 23
}]
}]
}]
--
Gitblit v1.9.1