From cd2cb6560b30864d283cf52a247f8ca63092e7fd Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期一, 03 六月 2024 17:00:49 +0800
Subject: [PATCH] #xgm辅料库初始化

---
 src/main/webapp/static/js/console.map.js   | 1018 ++++++++++++++++-----------------------------
 src/main/java/com/zy/core/MainProcess.java |   28 -
 src/main/webapp/static/js/common.js        |    2 
 pom.xml                                    |    3 
 src/main/resources/application.yml         |  216 +--------
 5 files changed, 395 insertions(+), 872 deletions(-)

diff --git a/pom.xml b/pom.xml
index 0e0b3b6..6779859 100644
--- a/pom.xml
+++ b/pom.xml
@@ -185,11 +185,12 @@
     </dependencies>
 
     <build>
-        <finalName>ykwcs</finalName>
+        <finalName>xgmFlwcs</finalName>
         <plugins>
             <plugin>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-maven-plugin</artifactId>
+                <version>2.1.3.RELEASE</version>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
diff --git a/src/main/java/com/zy/core/MainProcess.java b/src/main/java/com/zy/core/MainProcess.java
index de7ccb0..7cd2920 100644
--- a/src/main/java/com/zy/core/MainProcess.java
+++ b/src/main/java/com/zy/core/MainProcess.java
@@ -46,8 +46,6 @@
 
                     // 婕旂ず
 //                    mainService.crnDemoOfLocMove1();
-                    //鍒锋柊RGV鍦板浘
-                    mainService.refreshRgvMap();
 
                     // 鍏ュ嚭搴撴ā寮忓垏鎹㈠嚱鏁�
 //                    mainService.ioConvert();
@@ -89,32 +87,6 @@
                     }
                     i++;
 
-                    // 鍏朵粬  ===>> 鍏ュ嚭搴撴ā寮忓垏鎹�
-//                    i++;
-//                    if (i > 1) {
-//                        mainService.ioConvert();
-//                        i = 0;
-//                    }
-
-                    /////////////////////////////////////RGV璋冨害/////////////////////////////////////
-//
-                    //瀹屾垚灏忚溅浠诲姟
-                    mainService.rgvCompleteWrkMastSta();
-
-//                    //鎵ц灏忚溅绌烘澘鎼繍浠诲姟
-//                    mainService.rgvRunWrkMastEmptyStaPut();//鏀�
-//                    mainService.rgvRunWrkMastEmptyStaTake();//鍙�
-//                    if (rgcWrk){
-//                        //鎵ц灏忚溅璐х墿鎼繍浠诲姟
-                        mainService.rgvRunWrkMastFullSta();
-//                        rgcWrk = false;
-//                    }else {
-//                        mainService.rgvRunWrkMastEmptyStaAvoidance();//閬胯
-//                        rgcWrk = true;
-//                    }
-
-
-                    /////////////////////////////////////RGV璋冨害/////////////////////////////////////
 
                 } catch (Exception e) {
                     e.printStackTrace();
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index b2b590b..21170cd 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -1,5 +1,5 @@
 server:
-  port: 8080
+  port: 9090
   servlet:
     context-path: /@pom.build.finalName@
 
@@ -8,7 +8,7 @@
     name: @pom.build.finalName@
   datasource:
     driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
-    url: jdbc:sqlserver://localhost:1433;databasename=gdykasrs
+    url: jdbc:sqlserver://localhost:1433;databasename=xgmFlasrs
     username: sa
     password: sa@123
   mvc:
@@ -39,7 +39,7 @@
 # 涓嬩綅鏈洪厤缃�
 wcs-slave:
   # 鍙屾繁
-  doubleDeep: true
+  doubleDeep: false
   # 鍙屾繁搴撲綅鎺掑彿
   doubleLocs: 1,4,5,8,9,12,13,16
   # 涓�涓爢鍨涙満璐熻矗鐨勮揣鏋舵帓鏁�
@@ -116,115 +116,7 @@
       row: 11
       bay: 1
       lev: 1
-  # 鍫嗗灈鏈�4
-  crn[3]:
-    id: 4
-    ip: 10.10.10.40
-    port: 102
-    rack: 0
-    slot: 0
-    # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
-    offset: 2
-    demo: false
-    # 鍫嗗灈鏈哄叆搴撶珯鐐�
-    crnInStn[0]:
-      devpPlcId: ${wcs-slave.devp[0].id}
-      staNo: 144
-      row: 14
-      bay: 1
-      lev: 1
-    # 鍫嗗灈鏈哄嚭搴撶珯鐐�
-    crnOutStn[0]:
-      devpPlcId: ${wcs-slave.devp[0].id}
-      staNo: 148
-      row: 15
-      bay: 1
-      lev: 1
 
-  # RGV绌挎杞�1
-  rgv[0]:
-    id: 1
-    ip: 10.10.10.60
-    port: 502
-    rack: 0
-    slot: 0
-    #RGV鍏ュ簱婧愮珯鐐�
-    rgvInSStn[0]:
-      devpPlcId: ${wcs-slave.devp[0].id}
-      staNo: 100
-    rgvInSStn[1]:
-      devpPlcId: ${wcs-slave.devp[0].id}
-      staNo: 101
-    #RGV鍑哄簱婧愮珯鐐�
-    rgvOutSStn[0]:
-      devpPlcId: ${wcs-slave.devp[0].id}
-      staNo: 110
-    rgvOutSStn[1]:
-      devpPlcId: ${wcs-slave.devp[0].id}
-      staNo: 112
-    #RGV鐩爣绔欑偣
-    rgvDestStn[0]:
-      devpPlcId: ${wcs-slave.devp[0].id}
-      staNo: 102
-    rgvDestStn[1]:
-      devpPlcId: ${wcs-slave.devp[0].id}
-      staNo: 103
-  # RGV绌挎杞�2
-  rgv[1]:
-    id: 2
-    ip: 10.10.10.63
-    port: 502
-    rack: 0
-    slot: 0
-    #RGV鍏ュ簱婧愮珯鐐�
-    rgvInSStn[0]:
-      devpPlcId: ${wcs-slave.devp[0].id}
-      staNo: 100
-    rgvInSStn[1]:
-      devpPlcId: ${wcs-slave.devp[0].id}
-      staNo: 101
-    #RGV鍑哄簱婧愮珯鐐�
-    rgvOutSStn[0]:
-      devpPlcId: ${wcs-slave.devp[0].id}
-      staNo: 110
-    rgvOutSStn[1]:
-      devpPlcId: ${wcs-slave.devp[0].id}
-      staNo: 112
-    #RGV鐩爣绔欑偣
-    rgvDestStn[0]:
-      devpPlcId: ${wcs-slave.devp[0].id}
-      staNo: 102
-    rgvDestStn[1]:
-      devpPlcId: ${wcs-slave.devp[0].id}
-      staNo: 103
-  # RGV绌挎杞�2
-  rgv[2]:
-    id: 3
-    ip: 10.10.10.66
-    port: 502
-    rack: 0
-    slot: 0
-    #RGV鍏ュ簱婧愮珯鐐�
-    rgvInSStn[0]:
-      devpPlcId: ${wcs-slave.devp[0].id}
-      staNo: 100
-    rgvInSStn[1]:
-      devpPlcId: ${wcs-slave.devp[0].id}
-      staNo: 101
-    #RGV鍑哄簱婧愮珯鐐�
-    rgvOutSStn[0]:
-      devpPlcId: ${wcs-slave.devp[0].id}
-      staNo: 110
-    rgvOutSStn[1]:
-      devpPlcId: ${wcs-slave.devp[0].id}
-      staNo: 112
-    #RGV鐩爣绔欑偣
-    rgvDestStn[0]:
-      devpPlcId: ${wcs-slave.devp[0].id}
-      staNo: 102
-    rgvDestStn[1]:
-      devpPlcId: ${wcs-slave.devp[0].id}
-      staNo: 103
   # 杈撻�佺嚎1
   devp[0]:
     id: 1
@@ -234,56 +126,45 @@
     slot: 0
     # 鍏ュ簱鍙�1
     inSta[0]:
-      staNo: 106
+      staNo: 101
       barcode: ${wcs-slave.barcode[0].id}
-      backSta: 105
-      led: ${wcs-slave.led[1].id}
-    # 绌烘澘鍏ュ簱鍙�1
-    emptyInSta[0]:
-      staNo: 106
-      barcode: ${wcs-slave.barcode[0].id}
-      backSta: 105
+      backSta: 100
+      led: ${wcs-slave.led[0].id}
+    # 鍏ュ簱鍙�1
+    inSta[1]:
+      staNo: 201
+      barcode: ${wcs-slave.barcode[1].id}
+      backSta: 200
       led: ${wcs-slave.led[1].id}
     # 鎷f枡鍏ュ簱鍙�1
     pickSta[0]:
-      staNo: 159
-      barcode: ${wcs-slave.barcode[2].id}
-      led: ${wcs-slave.led[5].id}
-      backSta: 160
-    # 鍏ュ簱鍙�1
-    inSta[1]:
-      staNo: 107
+      staNo: 101
+      barcode: ${wcs-slave.barcode[0].id}
+      led: ${wcs-slave.led[0].id}
+      backSta: 100
+    # 鎷f枡鍏ュ簱鍙�1
+    pickSta[1]:
+      staNo: 201
       barcode: ${wcs-slave.barcode[1].id}
-      backSta: 108
-      led: ${wcs-slave.led[2].id}
+      led: ${wcs-slave.led[1].id}
+      backSta: 200
     # 绌烘澘鍏ュ簱鍙�1
+    emptyInSta[0]:
+      staNo: 101
+      barcode: ${wcs-slave.barcode[0].id}
+      backSta: 100
+      led: ${wcs-slave.led[0].id}
+    # 绌烘澘鍏ュ簱鍙�2
     emptyInSta[1]:
-      staNo: 107
+      staNo: 201
       barcode: ${wcs-slave.barcode[1].id}
-      backSta: 108
-      led: ${wcs-slave.led[2].id}
-    inSta[2]:
-      staNo: 159
-      barcode: ${wcs-slave.barcode[2].id}
-      backSta: 160
-      led: ${wcs-slave.led[5].id}
-#    # 鎷f枡鍏ュ簱鍙�1
-#    pickSta[1]:
-#      staNo: 107
-#      barcode: ${wcs-slave.barcode[1].id}
-#      led: ${wcs-slave.led[1].id}
-#      backSta: 108
+      backSta: 200
+      led: ${wcs-slave.led[1].id}
     # 鍑哄簱鍙�1
     outSta[0]:
-      staNo: 100
-      led: ${wcs-slave.led[0].id}
+      staNo: 117
     outSta[1]:
-      staNo: 152
-      led: ${wcs-slave.led[3].id}
-    outSta[2]:
-      staNo: 156
-      led: ${wcs-slave.led[4].id}
-
+      staNo: 223
   # 鏉$爜鎵弿浠�1
   barcode[0]:
     id: 1
@@ -294,12 +175,7 @@
     id: 2
     ip: 10.10.10.122
     port: 51236
-  # 鏉$爜鎵弿浠�3
-  barcode[2]:
-    id: 3
-    ip: 10.10.10.123
-    port: 51236
-   # LED1
+  # LED1
   led[0]:
     id: 1
     ip: 10.10.10.101
@@ -313,31 +189,3 @@
     port: 5005
     devpPlcId: ${wcs-slave.devp[0].id}
     staArr: 106
-  # LED3
-  led[2]:
-    id: 3
-    ip: 10.10.10.103
-    port: 5005
-    devpPlcId: ${wcs-slave.devp[0].id}
-    staArr: 107
-  # LED4
-  led[3]:
-    id: 4
-    ip: 10.10.10.104
-    port: 5005
-    devpPlcId: ${wcs-slave.devp[0].id}
-    staArr: 152
-  # LED5
-  led[4]:
-    id: 5
-    ip: 10.10.10.105
-    port: 5005
-    devpPlcId: ${wcs-slave.devp[0].id}
-    staArr: 156
-  # LED6
-  led[5]:
-    id: 6
-    ip: 10.10.10.106
-    port: 5005
-    devpPlcId: ${wcs-slave.devp[0].id}
-    staArr: 160,159
\ No newline at end of file
diff --git a/src/main/webapp/static/js/common.js b/src/main/webapp/static/js/common.js
index 44e7c47..3dbaab4 100644
--- a/src/main/webapp/static/js/common.js
+++ b/src/main/webapp/static/js/common.js
@@ -1,4 +1,4 @@
-var baseUrl = "/ykwcs";
+var baseUrl = "/xgmFlwcs";
 
 // 璧嬪��
 function setVal(el, val) {
diff --git a/src/main/webapp/static/js/console.map.js b/src/main/webapp/static/js/console.map.js
index 2d42ca6..03e71cf 100644
--- a/src/main/webapp/static/js/console.map.js
+++ b/src/main/webapp/static/js/console.map.js
@@ -1,775 +1,477 @@
 mapInfo = {
-    "mapName": "YKWCS",
-    "rackCount": 4,
-    "crnCount": 3,
-    "stbCount": 13,
+    "mapName": "xgmFlwcs",
+    "rackCount": 6,
+    "crnCount": 6,
+    "stbCount": 40,
     "hpPosition": 0,
-    "minBayNo": 1,
+    "minBayNo": 2,
     "floors": 1,
     "racks": [{
         "type": "rack",
-        "id": "rack16",
-        "top": 167,
-        "left": 529,
-        "width": 1280,
-        "height": 22,
-        "minBayNo": 2,
-        "maxBayNo": 56
-    }, {
-        "type": "rack",
-        "id": "rack15",
-        "top": 188,
-        "left": 529,
-        "width": 1280,
-        "height": 22,
-        "minBayNo": 2,
-        "maxBayNo": 56
-    }, {
-        "type": "rack",
-        "id": "rack14",
-        "top": 236,
-        "left": 529,
-        "width": 1280,
-        "height": 22,
-        "minBayNo": 2,
-        "maxBayNo": 56
-    }, {
-        "type": "rack",
-        "id": "rack13",
-        "top": 257,
-        "left": 529,
-        "width": 1280,
-        "height": 22,
-        "minBayNo": 2,
-        "maxBayNo": 56
-    }, {
-        "type": "rack",
-        "id": "rack12",
-        "top": 280,
-        "left": 529,
-        "width": 1280,
-        "height": 22,
-        "minBayNo": 2,
-        "maxBayNo": 56
-    }, {
-        "type": "rack",
-        "id": "rack11",
-        "top": 301,
-        "left": 529,
-        "width": 1280,
-        "height": 22,
-        "minBayNo": 2,
-        "maxBayNo": 56
-    }, {
-        "type": "rack",
-        "id": "rack10",
-        "top": 349,
-        "left": 529,
-        "width": 1280,
-        "height": 22,
-        "minBayNo": 2,
-        "maxBayNo": 56
-    }, {
-        "type": "rack",
-        "id": "rack9",
-        "top": 370,
-        "left": 529,
-        "width": 1280,
-        "height": 22,
-        "minBayNo": 2,
-        "maxBayNo": 56
-    }, {
-        "type": "rack",
-        "id": "rack8",
-        "top": 393,
-        "left": 529,
-        "width": 1280,
-        "height": 22,
-        "minBayNo": 2,
-        "maxBayNo": 56
-    }, {
-        "type": "rack",
-        "id": "rack7",
-        "top": 414,
-        "left": 529,
-        "width": 1280,
-        "height": 22,
-        "minBayNo": 2,
-        "maxBayNo": 56
-    }, {
-        "type": "rack",
         "id": "rack6",
-        "top": 462,
-        "left": 529,
-        "width": 1280,
-        "height": 22,
+        "top": 204,
+        "left": 551,
+        "width": 800,
+        "height": 20,
         "minBayNo": 2,
-        "maxBayNo": 56
+        "maxBayNo": 40
     }, {
         "type": "rack",
         "id": "rack5",
-        "top": 483,
-        "left": 529,
-        "width": 1280,
-        "height": 22,
+        "top": 250,
+        "left": 551,
+        "width": 800,
+        "height": 20,
         "minBayNo": 2,
-        "maxBayNo": 56
-    }, {
-        "type": "rack",
-        "id": "rack4",
-        "top": 506,
-        "left": 529,
-        "width": 1280,
-        "height": 22,
-        "minBayNo": 2,
-        "maxBayNo": 56
-    }, {
-        "type": "rack",
-        "id": "rack3",
-        "top": 527,
-        "left": 529,
-        "width": 1280,
-        "height": 22,
-        "minBayNo": 2,
-        "maxBayNo": 56
+        "maxBayNo": 40
     }, {
         "type": "rack",
         "id": "rack2",
-        "top": 575,
-        "left": 529,
-        "width": 1280,
-        "height": 22,
+        "top": 355,
+        "left": 551,
+        "width": 800,
+        "height": 20,
         "minBayNo": 2,
-        "maxBayNo": 56
+        "maxBayNo": 40
+    }, {
+        "type": "rack",
+        "id": "rack4",
+        "top": 277,
+        "left": 551,
+        "width": 800,
+        "height": 20,
+        "minBayNo": 2,
+        "maxBayNo": 40
     }, {
         "type": "rack",
         "id": "rack1",
-        "top": 596,
-        "left": 529,
-        "width": 1280,
-        "height": 22,
+        "top": 401,
+        "left": 551,
+        "width": 800,
+        "height": 20,
         "minBayNo": 2,
-        "maxBayNo": 56
+        "maxBayNo": 40
+    }, {
+        "type": "rack",
+        "id": "rack3",
+        "top": 324,
+        "left": 551,
+        "width": 800,
+        "height": 20,
+        "minBayNo": 2,
+        "maxBayNo": 40
     }],
     "rackDescs": [{
         "type": "rackDescs",
+        "id": "lb_desc8",
+        "text": "#8",
+        "top": 357,
+        "left": 1881,
+        "width": 33,
+        "height": 23
+    }, {
+        "type": "rackDescs",
         "id": "lb_desc1",
-        "text": "#16",
-        "top": 167,
-        "left": 1810,
+        "text": "#1",
+        "top": 93,
+        "left": 1884,
         "width": 30,
         "height": 23
     }, {
         "type": "rackDescs",
-        "id": "lb_desc2",
-        "text": "#1",
-        "top": 596,
-        "left": 1810,
-        "width": 30,
+        "id": "lb_desc9",
+        "text": "#9",
+        "top": 384,
+        "left": 1735,
+        "width": 33,
         "height": 23
-    }],
+    }, {"type": "rackDescs", "id": "lb_desc18", "text": "#18", "top": 663, "left": 1733, "width": 41, "height": 23}],
     "crns": [{
-        "type": "track",
-        "id": "lb_track4",
-        "text": "",
-        "top": 226,
-        "left": 490,
-        "width": 1300,
-        "height": 2
-    }, {
-        "type": "crane",
-        "id": "crn-4",
-        "text": "4",
-        "top": 213,
-        "left": 490,
-        "width": 93,
-        "height": 22
-    },{
         "type": "track",
         "id": "lb_track3",
         "text": "",
-        "top": 338,
-        "left": 490,
-        "width": 1300,
+        "top": 236,
+        "left": 469,
+        "width": 933,
         "height": 2
     }, {
         "type": "crane",
         "id": "crn-3",
-        "text": "3",
-        "top": 325,
-        "left": 490,
+        "text": "1",
+        "top": 226,
+        "left": 701,
         "width": 93,
         "height": 22
-    },{
-        "type": "track",
-        "id": "lb_track2",
-        "text": "",
-        "top": 451,
-        "left": 490,
-        "width": 1300,
-        "height": 2
     }, {
-        "type": "crane",
-        "id": "crn-2",
-        "text": "2",
-        "top": 438,
-        "left": 490,
-        "width": 93,
-        "height": 22
-    },{
         "type": "track",
         "id": "lb_track1",
         "text": "",
-        "top": 564,
-        "left": 490,
-        "width": 1300,
+        "top": 388,
+        "left": 469,
+        "width": 933,
         "height": 2
     }, {
         "type": "crane",
         "id": "crn-1",
         "text": "1",
-        "top": 553,
-        "left": 490,
+        "top": 377,
+        "left": 701,
         "width": 93,
         "height": 22
-    }],
+    }, {
+        "type": "track",
+        "id": "lb_track2",
+        "text": "",
+        "top": 310,
+        "left": 469,
+        "width": 933,
+        "height": 2
+    }, {"type": "crane", "id": "crn-2", "text": "1", "top": 299, "left": 701, "width": 93, "height": 22}],
     "areas": [{
         "type": "Control_floor",
         "id": "tabControl_floor1",
         "text": "妤煎眰",
-        "top": 68,
+        "top": 66,
         "left": 80,
-        "width": 1845,
-        "height": 676,
+        "width": 1810,
+        "height": 1351,
         "floors": [{
             "type": "floor",
             "id": "page_floor1",
-            "text": "1搴�",
+            "text": "1F",
             "top": 4,
             "left": 22,
-            "width": 1819,
-            "height": 668,
+            "width": 1784,
+            "height": 1343,
             "stns": [{
                 "type": "stn",
-                "id": "site-148",
-                "text": "148",
-                "top": 190,
-                "left": 468,
-                "width": 60,
-                "height": 19
+                "id": "site-204",
+                "text": "204",
+                "top": 401,
+                "left": 486,
+                "width": 63,
+                "height": 20
             }, {
                 "type": "stn",
-                "id": "site-147",
-                "text": "147",
-                "top": 190,
-                "left": 406,
-                "width": 60,
-                "height": 19
+                "id": "site-208",
+                "text": "208",
+                "top": 355,
+                "left": 486,
+                "width": 63,
+                "height": 20
             }, {
                 "type": "stn",
-                "id": "site-146",
-                "text": "146",
-                "top": 190,
-                "left": 344.5,
-                "width": 60,
-                "height": 19
+                "id": "site-211",
+                "text": "211",
+                "top": 323,
+                "left": 486,
+                "width": 63,
+                "height": 20
             }, {
                 "type": "stn",
-                "id": "site-149",
-                "text": "149",
-                "top": 190,
-                "left": 283,
-                "width": 60,
-                "height": 19
+                "id": "site-215",
+                "text": "215",
+                "top": 277,
+                "left": 486,
+                "width": 63,
+                "height": 20
             }, {
                 "type": "stn",
-                "id": "site-150",
-                "text": "150",
-                "top": 169,
-                "left": 344.5,
-                "width": 60,
-                "height": 19
+                "id": "site-218",
+                "text": "218",
+                "top": 250,
+                "left": 486,
+                "width": 63,
+                "height": 20
             }, {
                 "type": "stn",
-                "id": "site-151",
-                "text": "151",
-                "top": 148,
-                "left": 344.5,
-                "width": 60,
-                "height": 19
+                "id": "site-222",
+                "text": "222",
+                "top": 204,
+                "left": 486,
+                "width": 63,
+                "height": 20
             }, {
                 "type": "stn",
-                "id": "site-153",
-                "text": "153",
-                "top": 148,
-                "left": 283,
-                "width": 60,
-                "height": 19
+                "id": "site-221",
+                "text": "221",
+                "top": 204,
+                "left": 422,
+                "width": 63,
+                "height": 20
             }, {
                 "type": "stn",
-                "id": "site-152",
-                "text": "152",
-                "top": 148,
-                "left": 406,
-                "width": 60,
-                "height": 19
+                "id": "site-217",
+                "text": "217",
+                "top": 250,
+                "left": 422,
+                "width": 63,
+                "height": 20
             }, {
                 "type": "stn",
-                "id": "site-154",
-                "text": "154",
-                "top": 127,
-                "left": 344.5,
-                "width": 60,
-                "height": 19
+                "id": "site-214",
+                "text": "214",
+                "top": 277,
+                "left": 422,
+                "width": 63,
+                "height": 20
             }, {
                 "type": "stn",
-                "id": "site-155",
-                "text": "155",
-                "top": 106.5,
-                "left": 344.5,
-                "width": 60,
-                "height": 19
+                "id": "site-210",
+                "text": "210",
+                "top": 323,
+                "left": 422,
+                "width": 63,
+                "height": 20
             }, {
                 "type": "stn",
-                "id": "site-157",
-                "text": "157",
-                "top": 106.5,
-                "left": 283,
-                "width": 60,
-                "height": 19
+                "id": "site-207",
+                "text": "207",
+                "top": 355,
+                "left": 422,
+                "width": 63,
+                "height": 20
             }, {
                 "type": "stn",
-                "id": "site-156",
-                "text": "156",
-                "top": 106.5,
-                "left": 406,
-                "width": 60,
-                "height": 19
+                "id": "site-203",
+                "text": "203",
+                "top": 401,
+                "left": 422,
+                "width": 63,
+                "height": 20
             }, {
                 "type": "stn",
-                "id": "site-158",
-                "text": "158",
-                "top": 85.5,
-                "left": 344.5,
-                "width": 60,
-                "height": 19
+                "id": "site-200",
+                "text": "200",
+                "top": 443,
+                "left": 358,
+                "width": 63,
+                "height": 20
             }, {
                 "type": "stn",
-                "id": "site-159",
-                "text": "159",
-                "top": 64.5,
-                "left": 344.5,
-                "width": 60,
-                "height": 19
-            }, {
-                "type": "stn",
-                "id": "site-160",
-                "text": "160",
-                "top": 64.5,
-                "left": 406,
-                "width": 60,
-                "height": 19
-            }, {
-                "type": "stn",
-                "id": "site-161",
-                "text": "161",
-                "top": 64.5,
-                "left": 283,
-                "width": 60,
-                "height": 19
-            }, {
-                "type": "stn",
-                "id": "site-145",
-                "text": "145",
-                "top": 211,
-                "left": 344.5,
-                "width": 60,
-                "height": 26
-            }, {
-                "type": "stn",
-                "id": "site-142",
-                "text": "142",
-                "top": 239,
-                "left": 344.5,
-                "width": 60,
-                "height": 19
-            }, {
-                "type": "stn",
-                "id": "site-143",
-                "text": "143",
-                "top": 239,
-                "left": 406,
-                "width": 60,
-                "height": 19
-            }, {
-                "type": "stn",
-                "id": "site-144",
-                "text": "144",
-                "top": 239,
-                "left": 468,
-                "width": 60,
-                "height": 19
-            }, {
-                "type": "stn",
-                "id": "site-141",
-                "text": "141",
-                "top": 260,
-                "left": 344.5,
-                "width": 60,
-                "height": 42
-            }, {
-                "type": "stn",
-                "id": "site-139",
-                "text": "139",
-                "top": 304,
-                "left": 406,
-                "width": 120,
-                "height": 19
-            }, {
-                "type": "stn",
-                "id": "site-138",
-                "text": "138",
-                "top": 304,
-                "left": 344.5,
-                "width": 60,
-                "height": 19
-            }, {
-                "type": "stn",
-                "id": "site-134",
-                "text": "134",
-                "top": 352,
-                "left": 344.5,
-                "width": 60,
-                "height": 19
-            }, {
-                "type": "stn",
-                "id": "site-135",
-                "text": "135",
-                "top": 352,
-                "left": 406,
-                "width": 120,
-                "height": 19
-            },  {
-                "type": "stn",
-                "id": "site-137",
-                "text": "137",
-                "top": 324.5,
-                "left": 344.5,
-                "width": 60,
-                "height": 25.5
-            }, {
-                "type": "stn",
-                "id": "site-133",
-                "text": "133",
-                "top": 373,
-                "left": 344.5,
-                "width": 60,
-                "height": 42.5
-            }, {
-                "type": "stn",
-                "id": "site-130",
-                "text": "130",
-                "top": 417,
-                "left": 344.5,
-                "width": 60,
-                "height": 19
-            }, {
-                "type": "stn",
-                "id": "site-131",
-                "text": "131",
-                "top": 417,
-                "left": 406,
-                "width": 120,
-                "height": 19
-            }, {
-                "type": "stn",
-                "id": "site-129",
-                "text": "129",
-                "top": 438,
-                "left": 344.5,
-                "width": 60,
-                "height": 25
-            }, {
-                "type": "stn",
-                "id": "site-126",
-                "text": "126",
-                "top": 464.5,
-                "left": 344.5,
-                "width": 60,
-                "height": 19
-            }, {
-                "type": "stn",
-                "id": "site-127",
-                "text": "127",
-                "top": 464.5,
-                "left": 406,
-                "width": 120,
-                "height": 19
-            },  {
-                "type": "stn",
-                "id": "site-125",
-                "text": "125",
-                "top": 485,
-                "left": 344.5,
-                "width": 60,
-                "height": 42.5
-            }, {
-                "type": "stn",
-                "id": "site-124",
-                "text": "124",
-                "top": 529,
-                "left": 283,
-                "width": 60,
-                "height": 19
-            }, {
-                "type": "stn",
-                "id": "site-121",
-                "text": "121",
-                "top": 529,
-                "left": 344.5,
-                "width": 60,
-                "height": 19
-            }, {
-                "type": "stn",
-                "id": "site-122",
-                "text": "122",
-                "top": 529,
-                "left": 406,
-                "width": 60,
-                "height": 19
-            }, {
-                "type": "stn",
-                "id": "site-123",
-                "text": "123",
-                "top": 529,
-                "left": 468,
-                "width": 60,
-                "height": 19
-            }, {
-                "type": "stn",
-                "id": "site-120",
-                "text": "120",
-                "top": 550,
-                "left": 344.5,
-                "width": 60,
-                "height": 25
-            }, {
-                "type": "stn",
-                "id": "site-119",
-                "text": "119",
-                "top": 464.5,
-                "left": 283,
-                "width": 60,
-                "height": 19
-            }, {
-                "type": "stn",
-                "id": "site-116",
-                "text": "116",
-                "top": 577,
-                "left": 344.5,
-                "width": 60,
-                "height": 19
-            }, {
-                "type": "stn",
-                "id": "site-117",
-                "text": "117",
-                "top": 577,
-                "left": 406,
-                "width": 60,
-                "height": 19
-            }, {
-                "type": "stn",
-                "id": "site-118",
-                "text": "118",
-                "top": 577,
-                "left": 468,
-                "width": 60,
-                "height": 19
-            }, {
-                "type": "stn",
-                "id": "site-115",
-                "text": "115",
-                "top": 598,
-                "left": 344.5,
-                "width": 60,
-                "height": 19
-            }, {
-                "type": "stn",
-                "id": "site-114",
-                "text": "114",
-                "top": 620,
-                "left": 344.5,
-                "width": 60,
-                "height": 19
-            }, {
-                "type": "stn",
-                "id": "site-113",
-                "text": "113",
-                "top": 620,
-                "left": 283,
-                "width": 60,
-                "height": 19
-            }, {
-                "type": "track",
-                "id": "lb_trCart21",
-                "text": "",
-                "top": 65,
-                "left": 226,
-                "width": 6,
-                "height": 742
-            }, {
-                "type": "track",
-                "id": "lb_trCart22",
-                "text": "",
-                "top": 65,
-                "left": 270,
-                "width": 6,
-                "height": 742
-            },{
-                "type": "stn",
-                "id": "site-3",
-                "text": "3",
-                "top": -20,
-                "left": 220,
-                "width": 60,
-                "height": 19
-            }, {
-                "type": "stn",
-                "id": "site-2",
-                "text": "2",
-                "top": -20,
-                "left": 220,
-                "width": 60,
-                "height": 19
-            }, {
-                "type": "stn",
-                "id": "site-1",
-                "text": "1",
-                "top": -20,
-                "left": 220,
-                "width": 60,
-                "height": 19
+                "id": "site-201",
+                "text": "201",
+                "top": 422,
+                "left": 358,
+                "width": 63,
+                "height": 20
             }, {
                 "type": "stn",
                 "id": "site-202",
                 "text": "202",
-                "top": 642,
-                "left": 283,
-                "width": 184,
-                "height": 19
+                "top": 401,
+                "left": 358,
+                "width": 63,
+                "height": 20
             }, {
                 "type": "stn",
-                "id": "site-999",
-                "text": "澶囩敤PGV銆丷GV缁翠慨鍖�",
-                "top": 642,
-                "left": 283,
-                "width": 184,
-                "height": 19
+                "id": "site-205",
+                "text": "205",
+                "top": 376,
+                "left": 358,
+                "width": 63,
+                "height": 24
             }, {
                 "type": "stn",
-                "id": "site-110",
-                "text": "110",
-                "top": 663,
-                "left": 406,
-                "width": 60,
-                "height": 19
+                "id": "site-219",
+                "text": "219",
+                "top": 225,
+                "left": 358,
+                "width": 63,
+                "height": 24
+            }, {
+                "type": "stn",
+                "id": "site-223",
+                "text": "223",
+                "top": 183,
+                "left": 358,
+                "width": 63,
+                "height": 20
+            }, {
+                "type": "stn",
+                "id": "site-209",
+                "text": "209",
+                "top": 325,
+                "left": 358,
+                "width": 63,
+                "height": 24
+            }, {
+                "type": "stn",
+                "id": "site-220",
+                "text": "220",
+                "top": 204,
+                "left": 358,
+                "width": 63,
+                "height": 20
+            }, {
+                "type": "stn",
+                "id": "site-212",
+                "text": "212",
+                "top": 300,
+                "left": 358,
+                "width": 63,
+                "height": 24
+            }, {
+                "type": "stn",
+                "id": "site-213",
+                "text": "213",
+                "top": 275,
+                "left": 358,
+                "width": 63,
+                "height": 24
+            }, {
+                "type": "stn",
+                "id": "site-216",
+                "text": "216",
+                "top": 250,
+                "left": 358,
+                "width": 63,
+                "height": 24
+            }, {
+                "type": "stn",
+                "id": "site-206",
+                "text": "206",
+                "top": 351,
+                "left": 358,
+                "width": 63,
+                "height": 24
+            }, {
+                "type": "stn",
+                "id": "site-116",
+                "text": "116",
+                "top": 204,
+                "left": 1353,
+                "width": 63,
+                "height": 20
+            }, {
+                "type": "stn",
+                "id": "site-113",
+                "text": "113",
+                "top": 250,
+                "left": 1353,
+                "width": 63,
+                "height": 20
             }, {
                 "type": "stn",
                 "id": "site-111",
                 "text": "111",
-                "top": 663,
-                "left": 344.5,
-                "width": 60,
-                "height": 19
-            }, {
-                "type": "stn",
-                "id": "site-112",
-                "text": "112",
-                "top": 663,
-                "left": 283,
-                "width": 60,
-                "height": 19
-            }, {
-                "type": "stn",
-                "id": "site-109",
-                "text": "109",
-                "top": 684,
-                "left": 406,
-                "width": 60,
-                "height": 19
+                "top": 277,
+                "left": 1353,
+                "width": 63,
+                "height": 20
             }, {
                 "type": "stn",
                 "id": "site-108",
                 "text": "108",
-                "top": 705,
-                "left": 406,
-                "width": 60,
-                "height": 19
-            }, {
-                "type": "stn",
-                "id": "site-107",
-                "text": "107",
-                "top": 705,
-                "left": 283,
-                "width": 122,
-                "height": 19
-            }, {
-                "type": "stn",
-                "id": "site-105",
-                "text": "105",
-                "top": 727,
-                "left": 406,
-                "width": 60,
-                "height": 19
+                "top": 323,
+                "left": 1353,
+                "width": 63,
+                "height": 20
             }, {
                 "type": "stn",
                 "id": "site-106",
                 "text": "106",
-                "top": 727,
-                "left": 283,
-                "width": 122,
-                "height": 19
-            }, {
-                "type": "stn",
-                "id": "site-104",
-                "text": "104",
-                "top": 749,
-                "left": 406,
-                "width": 60,
-                "height": 19
+                "top": 355,
+                "left": 1353,
+                "width": 63,
+                "height": 20
             }, {
                 "type": "stn",
                 "id": "site-103",
                 "text": "103",
-                "top": 771,
-                "left": 406,
-                "width": 60,
-                "height": 19
-            }, {
-                "type": "stn",
-                "id": "site-102",
-                "text": "102",
-                "top": 771,
-                "left": 344.5,
-                "width": 60,
-                "height": 19
-            }, {
-                "type": "stn",
-                "id": "site-101",
-                "text": "101",
-                "top": 771,
-                "left": 283,
-                "width": 60,
-                "height": 19
+                "top": 401,
+                "left": 1353,
+                "width": 63,
+                "height": 20
             }, {
                 "type": "stn",
                 "id": "site-100",
                 "text": "100",
-                "top": 792,
-                "left": 283,
-                "width": 184,
-                "height": 19
-            }]
+                "top": 443,
+                "left": 1417,
+                "width": 63,
+                "height": 20
+            }, {
+                "type": "stn",
+                "id": "site-101",
+                "text": "101",
+                "top": 422,
+                "left": 1417,
+                "width": 63,
+                "height": 20
+            }, {
+                "type": "stn",
+                "id": "site-102",
+                "text": "102",
+                "top": 401,
+                "left": 1417,
+                "width": 63,
+                "height": 20
+            }, {
+                "type": "stn",
+                "id": "site-104",
+                "text": "104",
+                "top": 376,
+                "left": 1417,
+                "width": 63,
+                "height": 24
+            }, {
+                "type": "stn",
+                "id": "site-114",
+                "text": "114",
+                "top": 225,
+                "left": 1417,
+                "width": 63,
+                "height": 24
+            }, {
+                "type": "stn",
+                "id": "site-117",
+                "text": "117",
+                "top": 183,
+                "left": 1417,
+                "width": 63,
+                "height": 20
+            }, {
+                "type": "stn",
+                "id": "site-107",
+                "text": "107",
+                "top": 325,
+                "left": 1417,
+                "width": 63,
+                "height": 24
+            }, {
+                "type": "stn",
+                "id": "site-115",
+                "text": "115",
+                "top": 204,
+                "left": 1417,
+                "width": 63,
+                "height": 20
+            }, {
+                "type": "stn",
+                "id": "site-109",
+                "text": "109",
+                "top": 300,
+                "left": 1417,
+                "width": 63,
+                "height": 24
+            }, {
+                "type": "stn",
+                "id": "site-110",
+                "text": "110",
+                "top": 275,
+                "left": 1417,
+                "width": 63,
+                "height": 24
+            }, {
+                "type": "stn",
+                "id": "site-112",
+                "text": "112",
+                "top": 250,
+                "left": 1417,
+                "width": 63,
+                "height": 24
+            }, {"type": "stn", "id": "site-105", "text": "105", "top": 351, "left": 1417, "width": 63, "height": 24}]
         }]
     }]
-}
\ No newline at end of file
+}

--
Gitblit v1.9.1