From 8801d159bfec12a0b581ce3deb31143b60773c80 Mon Sep 17 00:00:00 2001
From: LSH <1>
Date: 星期三, 15 五月 2024 08:42:30 +0800
Subject: [PATCH] #yuxingxc
---
src/main/java/com/zy/core/thread/SiemensCrnThread.java | 14
src/main/webapp/static/js/console.map.js | 934 +++++++--------------------------------------------
src/main/java/com/zy/core/MainProcess.java | 4
src/main/webapp/views/news.html | 2
src/main/java/com/zy/core/thread/SiemensDevpThread.java | 73 ++-
src/main/resources/application.yml | 9
6 files changed, 196 insertions(+), 840 deletions(-)
diff --git a/src/main/java/com/zy/core/MainProcess.java b/src/main/java/com/zy/core/MainProcess.java
index 104120c..f671080 100644
--- a/src/main/java/com/zy/core/MainProcess.java
+++ b/src/main/java/com/zy/core/MainProcess.java
@@ -87,7 +87,7 @@
if (i<7) {
// RGV ===>> 灏忚溅浠诲姟浣滀笟涓嬪彂
try{
- boolean rgvIoExecuteSign = mainService.rgvIoExecute(i);
+// boolean rgvIoExecuteSign = mainService.rgvIoExecute(i);
// if (rgvIoExecuteSign){
// k = 0;
// } else if (k>7){
@@ -101,7 +101,7 @@
i = 0;
}
// //瀹屾垚灏忚溅浠诲姟
- mainService.rgvCompleteWrkMastSta();
+// mainService.rgvCompleteWrkMastSta();
// /////////////////////////////////////RGV璋冨害/////////////////////////////////////
// // 寮傚父淇℃伅璁板綍
diff --git a/src/main/java/com/zy/core/thread/SiemensCrnThread.java b/src/main/java/com/zy/core/thread/SiemensCrnThread.java
index ceec3f6..23b173b 100644
--- a/src/main/java/com/zy/core/thread/SiemensCrnThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensCrnThread.java
@@ -206,11 +206,15 @@
//宸ヤ綅2鏁版嵁 鏃犲垯鏃犻渶鐞嗕細
- crnProtocol.setTaskNoTwo(siemensNet.getByteTransform().TransInt16(result.Content, 56));
- crnProtocol.setStatusTwo(siemensNet.getByteTransform().TransInt16(result.Content, 56));
- crnProtocol.setForkPosTwo(siemensNet.getByteTransform().TransInt16(result.Content, 58));
- crnProtocol.setLiftPosTwo(siemensNet.getByteTransform().TransInt16(result.Content, 60));
- crnProtocol.setLoadedTwo(siemensNet.getByteTransform().TransInt16(result.Content, 64));
+ try{
+ crnProtocol.setTaskNoTwo(siemensNet.getByteTransform().TransInt16(result.Content, 56));
+ crnProtocol.setStatusTwo(siemensNet.getByteTransform().TransInt16(result.Content, 56));
+ crnProtocol.setForkPosTwo(siemensNet.getByteTransform().TransInt16(result.Content, 58));
+ crnProtocol.setLiftPosTwo(siemensNet.getByteTransform().TransInt16(result.Content, 60));
+ crnProtocol.setLoadedTwo(siemensNet.getByteTransform().TransInt16(result.Content, 64));
+ }catch (Exception e){
+
+ }
OutputQueue.CRN.offer(MessageFormat.format("銆恵0}銆慬id:{1}] <<<<< 瀹炴椂鏁版嵁鏇存柊鎴愬姛",DateUtils.convert(new Date()), slave.getId()));
diff --git a/src/main/java/com/zy/core/thread/SiemensDevpThread.java b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
index f581c87..e41eb73 100644
--- a/src/main/java/com/zy/core/thread/SiemensDevpThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -46,39 +46,44 @@
public boolean charge1; //璇锋眰鍏呯數
private short heartBeatVal = 1;
public static final ArrayList<Integer> staNos1 = new ArrayList<Integer>() {{
- add(100);add(101);add(102);add(103);
- add(104);add(105);add(106);add(107);
- add(108);add(109);add(110);add(111);
- add(112);add(113);add(114);add(115);
- add(116);add(117);add(118);add(119);
- add(120);add(121);add(122);add(123);
- add(124);add(125);add(126);add(127);
- add(128);add(129);add(130);add(131);
- add(132);add(133);add(134);add(135);
- add(136);add(137);add(138);add(139);
- add(140);add(141);add(142);add(143);
- add(144);add(145);add(146);add(147);
- add(148);add(149);add(150);add(151);
- add(152);add(153);add(154);add(155);
- add(156);add(157);add(158);add(159);
- add(160);add(161);add(162);add(163);
- add(164);add(165);add(166);add(167);
- add(168);add(169);add(170);add(171);
- add(172);add(173);add(174);add(175);
- add(176);add(177);add(178);add(179);
- add(180);add(181);add(182);add(183);
- add(184);add(185);add(186);add(187);
- add(188);add(189);add(190);add(191);
- add(192);add(193);
+ add(100);add(101);add(102);add(103);add(104);add(105);add(106);add(107);
+ add(108);add(109);add(110);add(111);add(112);add(113);add(114);add(115);
+ add(116);add(117);add(118);add(119);add(120);add(121);add(122);add(123);
+ add(124);add(125);add(126);add(127);add(128);add(129);add(130);add(131);
+ add(132);add(133);add(134);add(135);add(136);add(137);add(138);add(139);
+ add(140);add(141);add(142);add(143);add(144);add(145);add(146);add(147);
+ add(148);add(149);add(150);add(151);add(152);add(153);add(154);add(155);
+ add(156);add(157);add(158);add(159);add(160);add(161);add(162);add(163);
+ add(164);add(165);add(166);add(167);add(168);add(169);add(170);add(171);
+ add(172);add(173);add(174);add(175);add(176);add(177);add(178);add(179);
+ add(180);add(181);add(182);add(183);add(184);add(185);add(186);add(187);
+ add(188);add(189);add(190);add(191);add(192);add(193);
+ add(200);add(201);add(202);add(203);add(204);add(205);add(206);add(207);
+ add(208);add(209);add(210);add(211);add(212);add(213);add(214);add(215);
+ add(216);add(217);add(218);add(219);add(220);add(221);add(222);add(2000);
}};
-// public static final ArrayList<Integer> staNos2 = new ArrayList<Integer>() {{
-// add(200);add(201);add(202);add(203);
-// add(204);add(205);add(206);add(207);
-// add(208);add(209);add(210);add(211);
-// add(212);add(213);add(214);add(215);
-// add(216);add(217);add(218);add(219);
-// add(220);add(221);add(222);add(2000);
-// }};
+ public static final ArrayList<Integer> staNos2 = new ArrayList<Integer>() {{
+ add(400);add(401);add(402);add(403);add(404);add(405);add(406);add(407);
+ add(408);add(409);add(410);add(411);add(412);add(413);add(414);add(415);
+ add(416);add(417);add(418);add(419);add(420);add(421);add(422);add(423);
+ add(424);add(425);add(426);add(427);add(428);add(429);add(430);add(431);
+ add(432);add(433);add(434);add(435);add(436);add(437);add(438);add(439);
+ add(440);add(441);add(442);add(443);add(444);add(445);add(446);add(447);
+ add(448);add(449);add(450);add(451);add(452);add(453);add(454);add(455);
+ add(456);add(457);add(458);add(459);add(460);add(461);add(462);add(463);
+ add(464);add(465);add(466);add(467);add(468);add(469);add(470);add(471);
+ add(472);add(473);add(474);add(475);add(476);add(477);add(478);add(479);
+ add(480);add(481);add(482);add(483);add(484);add(485);add(486);add(487);
+ add(488);add(489);add(490);add(491);add(492);add(493);add(494);add(495);
+ add(496);add(497);add(498);add(499);
+ add(500);add(501);add(502);add(503);add(504);add(505);add(506);add(507);
+ add(508);add(509);add(510);add(511);add(512);add(513);add(514);add(515);
+ add(516);add(517);add(518);add(519);add(520);add(521);add(522);add(523);
+ add(524);add(525);add(526);add(527);add(528);add(529);add(530);add(531);
+ add(532);add(533);add(534);add(535);add(536);add(537);add(538);add(539);
+ add(540);add(541);add(542);add(543);add(544);add(545);add(546);add(547);
+ add(548);add(549);
+ }};
/**
* 鏉＄爜鏁伴噺
@@ -106,8 +111,8 @@
switch (slave.getId()) {
case 1:
return staNos1;
-// case 2:
-// return staNos2;
+ case 2:
+ return staNos2;
default:
throw new CoolException("鏈嶅姟鍣ㄥ紓甯�");
}
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index f6ed368..918b0fe 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -28,6 +28,7 @@
logging:
path: /stock/out/@pom.build.finalName@/logs
+ enableEveryThreadLog: true
super:
pwd: xltys1995
@@ -285,6 +286,14 @@
# 澶ф枡绠� 鍙屽伐浣嶅崟浼� 绌烘澘鍏ュ簱鍙�1
emptyInLargeSta[0]:
staNo: 104
+ # 杈撻�佺嚎
+ devp[1]:
+ id: 2
+ ip: 10.10.10.30
+ port: 102
+ rack: 0
+ slot: 0
+
# 鏉＄爜鎵弿浠�
barcode[0]:
diff --git a/src/main/webapp/static/js/console.map.js b/src/main/webapp/static/js/console.map.js
index 032f41b..2e42923 100644
--- a/src/main/webapp/static/js/console.map.js
+++ b/src/main/webapp/static/js/console.map.js
@@ -6,231 +6,9 @@
"hpPosition": 1,
"minBayNo": 2,
"floors": 1,
- "racks": [{
- "type": "rack",
- "id": "rack1",
- "top": 661,
- "left": 350,
- "width": 917,
- "height": 22,
- "minBayNo": 2,
- "maxBayNo": 42
- }, {
- "type": "rack",
- "id": "rack2",
- "top": 639,//-48 ==>3
- "left": 350,
- "width": 917,
- "height": 22,
- "minBayNo": 2,
- "maxBayNo": 42
- }, {
- "type": "rack",
- "id": "rack3",
- "top": 591,//-22 ==>4 //67,//92 103 //591 +25 ==>//616 +11 ==>//627
- "left": 350,
- "width": 917,
- "height": 22,
- "minBayNo": 2,
- "maxBayNo": 42
- }, {
- "type": "rack",
- "id": "rack4",
- "top": 569,
- "left": 350,
- "width": 917,
- "height": 22,
- "minBayNo": 2,
- "maxBayNo": 42
- },{
- "type": "rack",
- "id": "rack5",
- "top": 547,
- "left": 350,
- "width": 917,
- "height": 22,
- "minBayNo": 2,
- "maxBayNo": 42
- }, {
- "type": "rack",
- "id": "rack6",
- "top": 525,
- "left": 350,
- "width": 917,
- "height": 22,
- "minBayNo": 2,
- "maxBayNo": 42
- }, {
- "type": "rack",
- "id": "rack7",
- "top": 477,
- "left": 350,
- "width": 917,
- "height": 22,
- "minBayNo": 2,
- "maxBayNo": 42
- }, {
- "type": "rack",
- "id": "rack8",
- "top": 455,
- "left": 350,
- "width": 917,
- "height": 22,
- "minBayNo": 2,
- "maxBayNo": 42
- }, {
- "type": "rack",
- "id": "rack9",
- "top": 432,//-22 ==>10
- "left": 350,
- "width": 917,
- "height": 22,
- "minBayNo": 2,
- "maxBayNo": 42
- }, {
- "type": "rack",
- "id": "rack10",
- "top": 384,//+25 ==>409 +11 ==>420
- "left": 350,
- "width": 917,
- "height": 22,
- "minBayNo": 2,
- "maxBayNo": 42
- },{
- "type": "rack",
- "id": "rack11",
- "top": 362,
- "left": 350,
- "width": 917,
- "height": 22,
- "minBayNo": 2,
- "maxBayNo": 42
- }, {
- "type": "rack",
- "id": "rack12",
- "top": 314,//+25 ==>339
- "left": 350,
- "width": 917,
- "height": 22,
- "minBayNo": 2,
- "maxBayNo": 42
- }, {
- "type": "rack",
- "id": "rack13",
- "top": 292,
- "left": 350,
- "width": 917,
- "height": 22,
- "minBayNo": 2,
- "maxBayNo": 42
- }, {
- "type": "rack",
- "id": "rack14",
- "top": 244,//+25 ==> 269
- "left": 350,
- "width": 917,
- "height": 22,
- "minBayNo": 2,
- "maxBayNo": 42
- }],
- "rackDescs": [{
- "type": "rackDescs",
- "id": "lb_desc16",
- "text": "#1",
- "top": 661,
- "left": 270,
- "width": 30,
- "height": 23
- }, {
- "type": "rackDescs",
- "id": "lb_desc1",
- "text": "#4",
- "top": 569,
- "left": 270,
- "width": 41,
- "height": 23
- }],
- "crns": [{
- "type": "crane",
- "id": "crn-1",
- "text": "1",
- "top": 616,// 591(3鍙峰爢鍨涙満),//-22 ==>4 //67,//92 103 //锛堟祴绠楀爢鍨涙満浣嶇疆锛�591 +25 ==>//616 +11 ==>//627
- "left": 439,
- "width": 93,
- "height": 22
- }, {
- "type": "track",
- "id": "lb_track1",
- "text": "",
- "top": 627,
- "left": 273,
- "width": 1042,
- "height": 2
- },{
- "type": "crane",
- "id": "crn-2",
- "text": "2",
- "top": 502,
- "left": 439,
- "width": 93,
- "height": 22
- }, {
- "type": "track",
- "id": "lb_track2",
- "text": "",
- "top": 513,
- "left": 273,
- "width": 1042,
- "height": 2
- },{
- "type": "crane",
- "id": "crn-3",
- "text": "3",
- "top": 409,
- "left": 439,
- "width": 93,
- "height": 22
- }, {
- "type": "track",
- "id": "lb_track3",
- "text": "",
- "top": 420,
- "left": 273,
- "width": 1042,
- "height": 2
- },{
- "type": "crane",
- "id": "crn-4",
- "text": "4",
- "top": 339,
- "left": 439,
- "width": 93,
- "height": 22
- }, {
- "type": "track",
- "id": "lb_track4",
- "text": "",
- "top": 350,
- "left": 273,
- "width": 1042,
- "height": 2
- },{
- "type": "crane",
- "id": "crn-5",
- "text": "5",
- "top": 269,
- "left": 439,
- "width": 93,
- "height": 22
- }, {
- "type": "track",
- "id": "lb_track5",
- "text": "",
- "top": 280,
- "left": 273,
- "width": 1042,
- "height": 2
- }],
+ "racks": [],
+ "rackDescs": [],
+ "crns": [],
"areas": [{
"type": "Control_floor",
"id": "tabControl_floor1",
@@ -242,455 +20,183 @@
"floors": [{
"type": "floor",
"id": "page_floor1",
- "text": "灏忔枡绠�",
+ "text": "1",
"top": 4,
"left": 22,
"width": 1374,
"height": 672,
"stns": [{
"type": "stn",
- "id": "site-100",
- "text": "100",
- "top": 641.5,
- "left": 1267,
+ "id": "site-524",
+ "text": "524",
+ "top": 650,
+ "left": 230,
"width": 49,
- "height": 20
+ "height": 74
},{
"type": "stn",
- "id": "site-101",
- "text": "101",
- "top": 664,
- "left": 1267,
+ "id": "site-523",
+ "text": "523",
+ "top": 570,
+ "left": 230,
"width": 49,
- "height": 20
+ "height": 79
},{
"type": "stn",
- "id": "site-102",
- "text": "102",
- "top": 664,
- "left": 1318,
+ "id": "site-522",
+ "text": "522",
+ "top": 540,
+ "left": 230,
+ "width": 29,
+ "height": 29
+ },{
+ "type": "stn",
+ "id": "site-521",
+ "text": "521",
+ "top": 540,
+ "left": 260,
+ "width": 29,
+ "height": 29
+ },{
+ "type": "stn",
+ "id": "site-520",
+ "text": "520",
+ "top": 540,
+ "left": 290,
+ "width": 59,
+ "height": 29
+ },{
+ "type": "stn",
+ "id": "site-519",
+ "text": "519",
+ "top": 540,
+ "left": 350,
+ "width": 59,
+ "height": 29
+ },{
+ "type": "stn",
+ "id": "site-504",
+ "text": "504",
+ "top": 540,
+ "left": 410,
+ "width": 59,
+ "height": 29
+ },{
+ "type": "stn",
+ "id": "site-503",
+ "text": "503",
+ "top": 490,
+ "left": 410,
"width": 49,
- "height": 20
+ "height": 49
},{
"type": "stn",
- "id": "site-103",
- "text": "103",
- "top": 629,
- "left": 1369,
- "width": 29,
- "height": 55
+ "id": "site-502",
+ "text": "502",
+ "top": 440,
+ "left": 410,
+ "width": 49,
+ "height": 49
},{
"type": "stn",
- "id": "site-104",
- "text": "104",
- "top": 624,
- "left": 1400,
- "width": 29,
- "height": 60
- },{
- "type": "stn",
- "id": "site-123",
- "text": "123",
- "top": 58,
- "left": 1133,
- "width": 29,
- "height": 29
- },{
- "type": "stn",
- "id": "site-124",
- "text": "124",
- "top": 88,
- "left": 1133,
- "width": 29,
- "height": 29
- },{
- "type": "stn",
- "id": "site-125",
- "text": "125",
- "top": 118,
- "left": 1133,
- "width": 29,
- "height": 39
- },{
- "type": "stn",
- "id": "site-126",
- "text": "126",
- "top": 128,
- "left": 1103,
- "width": 29,
- "height": 19
- },{
- "type": "stn",
- "id": "site-122",
- "text": "122",
- "top": 58,
- "left": 1163,
- "width": 25,
- "height": 20
- },{
- "type": "stn",
- "id": "site-121",
- "text": "121",
- "top": 58,
- "left": 1189,
- "width": 29,
- "height": 29
- },{
- "type": "stn",
- "id": "site-129",
- "text": "129",
- "top": 88,
- "left": 1189,
- "width": 29,
- "height": 29
- },{
- "type": "stn",
- "id": "site-130",
- "text": "130",
- "top": 118,
- "left": 1189,
- "width": 29,
- "height": 39
- },{
- "type": "stn",
- "id": "site-131",
- "text": "131",
- "top": 128,
- "left": 1219,
- "width": 29,
- "height": 19
- },{
- "type": "stn",
- "id": "site-120",
- "text": "120",
- "top": 58,
- "left": 1219,
+ "id": "site-501",
+ "text": "501",
+ "top": 410,
+ "left": 410,
"width": 59,
- "height": 20
- },{
- "type": "stn",
- "id": "site-119",
- "text": "119",
- "top": 58,
- "left": 1279,
- "width": 59,
- "height": 20
- },{
- "type": "stn",
- "id": "site-118",
- "text": "118",
- "top": 58,
- "left": 1339,
- "width": 59,
- "height": 20
- },{
- "type": "stn",
- "id": "site-117",
- "text": "117",
- "top": 58,
- "left": 1400,
- "width": 29,
- "height": 39
- },{
- "type": "stn",
- "id": "site-116",
- "text": "116",
- "top": 98,
- "left": 1400,
- "width": 29,
- "height": 39
- },{
- "type": "stn",
- "id": "site-115",
- "text": "115",
- "top": 138,
- "left": 1400,
- "width": 29,
- "height": 39
- },{
- "type": "stn",
- "id": "site-114",
- "text": "114",
- "top": 178,
- "left": 1400,
- "width": 29,
- "height": 39
- },{
- "type": "stn",
- "id": "site-113",
- "text": "113",
- "top": 218,
- "left": 1400,
- "width": 29,
- "height": 39
- },{
- "type": "stn",
- "id": "site-112",
- "text": "112",
- "top": 258,
- "left": 1400,
- "width": 29,
- "height": 39
- },{
- "type": "stn",
- "id": "site-111",
- "text": "111",
- "top": 298,
- "left": 1400,
- "width": 29,
- "height": 39
- },{
- "type": "stn",
- "id": "site-110",
- "text": "110",
- "top": 338,
- "left": 1400,
- "width": 29,
- "height": 39
- },{
- "type": "stn",
- "id": "site-109",
- "text": "109",
- "top": 378,
- "left": 1400,
- "width": 29,
- "height": 39
- },{
- "type": "stn",
- "id": "site-108",
- "text": "108",
- "top": 418,
- "left": 1400,
- "width": 29,
- "height": 39
- },{
- "type": "stn",
- "id": "site-107",
- "text": "107",
- "top": 458,
- "left": 1400,
- "width": 29,
- "height": 59
- },{
- "type": "stn",
- "id": "site-106",
- "text": "106",
- "top": 518,
- "left": 1400,
- "width": 29,
"height": 29
},{
"type": "stn",
- "id": "site-105",
- "text": "105",
- "top": 548,
- "left": 1400,
- "width": 29,
- "height": 75
+ "id": "site-500",
+ "text": "500",
+ "top": 360,
+ "left": 410,
+ "width": 49,
+ "height": 49
},{
"type": "stn",
- "id": "site-154",
- "text": "154",
- "top": 572,
- "left": 1369,
- "width": 29,
- "height": 55
+ "id": "site-499",
+ "text": "499",
+ "top": 310,
+ "left": 410,
+ "width": 49,
+ "height": 49
},{
"type": "stn",
- "id": "site-127",
- "text": "127",
- "top": 158,
- "left": 1133,
- "width": 29,
- "height": 40
+ "id": "site-498",
+ "text": "498",
+ "top": 280,
+ "left": 410,
+ "width": 59,
+ "height": 29
},{
"type": "stn",
- "id": "site-128",
- "text": "128",
- "top": 178,
- "left": 1163,
- "width": 25,
- "height": 20
+ "id": "site-497",
+ "text": "497",
+ "top": 230,
+ "left": 410,
+ "width": 49,
+ "height": 49
},{
"type": "stn",
- "id": "site-132",
- "text": "132",
- "top": 158,
- "left": 1189,
- "width": 29,
- "height": 40
+ "id": "site-496",
+ "text": "496",
+ "top": 180,
+ "left": 410,
+ "width": 49,
+ "height": 49
},{
"type": "stn",
- "id": "site-133",
- "text": "133",
- "top": 178,
- "left": 1219,
+ "id": "site-495",
+ "text": "495",
+ "top": 150,
+ "left": 400,
"width": 69,
- "height": 20
+ "height": 29
},{
"type": "stn",
- "id": "site-134",
- "text": "134",
- "top": 178,
- "left": 1289,
- "width": 79,
- "height": 20
+ "id": "site-505",
+ "text": "505",
+ "top": 680,
+ "left": 290,
+ "width": 59,
+ "height": 29
},{
"type": "stn",
- "id": "site-135",
- "text": "135",
- "top": 178,
- "left": 1369,
- "width": 29,
- "height": 39
+ "id": "site-506",
+ "text": "506",
+ "top": 680,
+ "left": 350,
+ "width": 59,
+ "height": 29
},{
"type": "stn",
- "id": "site-136",
- "text": "136",
- "top": 218,
- "left": 1369,
- "width": 29,
- "height": 39
+ "id": "site-507",
+ "text": "507",
+ "top": 680,
+ "left": 410,
+ "width": 59,
+ "height": 29
},{
"type": "stn",
- "id": "site-137",
- "text": "137",
- "top": 258,
- "left": 1369,
- "width": 29,
- "height": 39
- },{
- "type": "stn",
- "id": "site-138",
- "text": "138",
- "top": 298,
- "left": 1369,
- "width": 29,
- "height": 39
- },{
- "type": "stn",
- "id": "site-139",
- "text": "139",
- "top": 338,
- "left": 1369,
- "width": 29,
- "height": 39
- },{
- "type": "stn",
- "id": "site-140",
- "text": "140",
- "top": 378,
- "left": 1369,
- "width": 29,
- "height": 39
- },{
- "type": "stn",
- "id": "site-141",
- "text": "141",
- "top": 418,
- "left": 1369,
- "width": 29,
- "height": 39
- },{
- "type": "stn",
- "id": "site-142",
- "text": "142",
- "top": 458,
- "left": 1369,
- "width": 29,
- "height": 39
- },{
- "type": "stn",
- "id": "site-143",
- "text": "143",
- "top": 458,
- "left": 1318,
+ "id": "site-517",
+ "text": "517",
+ "top": 570,
+ "left": 410,
"width": 49,
- "height": 20
+ "height": 79
},{
"type": "stn",
- "id": "site-144",
- "text": "144",
- "top": 458,
- "left": 1267,
+ "id": "site-518",
+ "text": "518",
+ "top": 650,
+ "left": 410,
"width": 49,
- "height": 20
+ "height": 29
},{
"type": "stn",
- "id": "site-145",
- "text": "145",
- "top": 480,
- "left": 1267,
- "width": 49,
- "height": 20
- },{
- "type": "stn",
- "id": "site-148",
- "text": "148",
- "top": 528,
- "left": 1267,
- "width": 49,
- "height": 20
- },{
- "type": "stn",
- "id": "site-149",
- "text": "149",
- "top": 550,
- "left": 1267,
- "width": 49,
- "height": 20
- },{
- "type": "stn",
- "id": "site-150",
- "text": "150",
- "top": 550,
- "left": 1318,
- "width": 49,
- "height": 20
- },{
- "type": "stn",
- "id": "site-147",
- "text": "147",
- "top": 535,
- "left": 1369,
- "width": 29,
- "height": 35
- },{
- "type": "stn",
- "id": "site-146",
- "text": "146",
- "top": 499,
- "left": 1369,
- "width": 29,
- "height": 34
- },{
- "type": "stn",
- "id": "site-151",
- "text": "151",
- "top": 572,
- "left": 1318,
- "width": 49,
- "height": 20
- },{
- "type": "stn",
- "id": "site-152",
- "text": "152",
- "top": 572,
- "left": 1267,
- "width": 49,
- "height": 20
- },{
- "type": "stn",
- "id": "site-153",
- "text": "153",
- "top": 593,
- "left": 1267,
- "width": 49,
- "height": 20
- },{
- "type": "stn",
- "id": "site-155",
- "text": "155",
+ "id": "site-420",
+ "text": "420",
"top": 258,
"left": 1430,
"width": 24,
@@ -831,179 +337,11 @@
"left": 1855,
"width": 24,
"height": 19
- },{
- "type": "stn",
- "id": "site-193",
- "text": "193",
- "top": 238,
- "left": 1430,
- "width": 24,
- "height": 19
- },{
- "type": "stn",
- "id": "site-192",
- "text": "192",
- "top": 238,
- "left": 1455,
- "width": 24,
- "height": 19
- },{
- "type": "stn",
- "id": "site-191",
- "text": "191",
- "top": 238,
- "left": 1480,
- "width": 24,
- "height": 19
- },{
- "type": "stn",
- "id": "site-190",
- "text": "190",
- "top": 238,
- "left": 1505,
- "width": 24,
- "height": 19
- },{
- "type": "stn",
- "id": "site-189",
- "text": "189",
- "top": 238,
- "left": 1530,
- "width": 24,
- "height": 19
- },{
- "type": "stn",
- "id": "site-188",
- "text": "188",
- "top": 238,
- "left": 1555,
- "width": 24,
- "height": 19
- },{
- "type": "stn",
- "id": "site-187",
- "text": "187",
- "top": 238,
- "left": 1580,
- "width": 24,
- "height": 19
- },{
- "type": "stn",
- "id": "site-186",
- "text": "186",
- "top": 238,
- "left": 1605,
- "width": 24,
- "height": 19
- },{
- "type": "stn",
- "id": "site-185",
- "text": "185",
- "top": 238,
- "left": 1630,
- "width": 24,
- "height": 19
- },{
- "type": "stn",
- "id": "site-184",
- "text": "184",
- "top": 238,
- "left": 1655,
- "width": 24,
- "height": 19
- },{
- "type": "stn",
- "id": "site-183",
- "text": "183",
- "top": 238,
- "left": 1680,
- "width": 24,
- "height": 19
- },{
- "type": "stn",
- "id": "site-182",
- "text": "182",
- "top": 238,
- "left": 1705,
- "width": 24,
- "height": 19
- },{
- "type": "stn",
- "id": "site-181",
- "text": "181",
- "top": 238,
- "left": 1730,
- "width": 24,
- "height": 19
- },{
- "type": "stn",
- "id": "site-180",
- "text": "180",
- "top": 238,
- "left": 1755,
- "width": 24,
- "height": 19
- },{
- "type": "stn",
- "id": "site-179",
- "text": "179",
- "top": 238,
- "left": 1780,
- "width": 24,
- "height": 19
- },{
- "type": "stn",
- "id": "site-178",
- "text": "178",
- "top": 238,
- "left": 1805,
- "width": 24,
- "height": 19
- },{
- "type": "stn",
- "id": "site-177",
- "text": "177",
- "top": 238,
- "left": 1830,
- "width": 24,
- "height": 19
- },{
- "type": "stn",
- "id": "site-176",
- "text": "176",
- "top": 238,
- "left": 1855,
- "width": 24,
- "height": 19
- },{
- "type": "stn",
- "id": "site-175",
- "text": "175",
- "top": 238,
- "left": 1880,
- "width": 24,
- "height": 19
- },{
- "type": "stn",
- "id": "site-174",
- "text": "174",
- "top": 258,
- "left": 1880,
- "width": 24,
- "height": 59
- },{
- "type": "stn",
- "id": "site-173",
- "text": "173",
- "top": 318,
- "left": 1880,
- "width": 24,
- "height": 19
}]
- }, {
+ },{
"type": "floor",
"id": "page_floor2",
- "text": "澶ф枡绠�",
+ "text": "2",
"top": 4,
"left": 22,
"width": 1374,
diff --git a/src/main/webapp/views/news.html b/src/main/webapp/views/news.html
index a38876e..e548501 100644
--- a/src/main/webapp/views/news.html
+++ b/src/main/webapp/views/news.html
@@ -46,7 +46,7 @@
color: #333333;
}
.level-2 {
- color: #1E9FFF;
+ color: #0087ec;
}
.level-3 {
color: red;
--
Gitblit v1.9.1