From c77ffe54bbd49bfe8f60a592d9729cea86150bf9 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期一, 18 八月 2025 18:43:59 +0800
Subject: [PATCH] *
---
src/main/java/com/zy/asrs/utils/Utils.java | 96 ++++++++++++++++++++++++------------------------
src/main/webapp/views/index.html | 15 +++++--
2 files changed, 59 insertions(+), 52 deletions(-)
diff --git a/src/main/java/com/zy/asrs/utils/Utils.java b/src/main/java/com/zy/asrs/utils/Utils.java
index a98d157..5f467fb 100644
--- a/src/main/java/com/zy/asrs/utils/Utils.java
+++ b/src/main/java/com/zy/asrs/utils/Utils.java
@@ -132,54 +132,54 @@
}
public static double[] getRgvPosNew(Integer devNo,double a, double b) {
double[] rgvPosNew = getRgvPosNew(a, b);
-// switch (devNo){
-// case 101:
-// case 102:
-// case 103:
-// case 104:
-// case 105:
-// case 106:
-// case 107:
-// case 108:
-// case 109:
-// case 110:
-// case 111:
-// rgvPosNew[0] = rgvPosNew[0] - 50;
-// rgvPosNew[1] = rgvPosNew[1];
-// break;
-// case 112:
-// case 113:
-// case 114:
-// case 115:
-// rgvPosNew[0] = rgvPosNew[0] + 30;
-// rgvPosNew[1] = rgvPosNew[1];
-// break;
-// case 116:
-// case 117:
-// case 118:
-// case 119:
-// case 120:
-// case 121:
-// case 122:
-// case 123:
-// case 124:
-// case 125:
-// case 126:
-// case 127:
-// case 128:
-// case 129:
-// case 130:
-// case 131:
-// case 132:
-// case 133:
-// rgvPosNew[0] = rgvPosNew[0];
-// rgvPosNew[1] = rgvPosNew[1] + 70;
-// break;
-// case 134:
-// rgvPosNew[0] = rgvPosNew[0];
-// rgvPosNew[1] = rgvPosNew[1] - 30;
-// break;
-// }
+ switch (devNo){
+ case 101:
+ case 102:
+ case 103:
+ case 104:
+ case 105:
+ case 106:
+ case 107:
+ case 108:
+ case 109:
+ case 110:
+ case 111:
+ rgvPosNew[0] = rgvPosNew[0] - 70;
+ rgvPosNew[1] = rgvPosNew[1];
+ break;
+ case 112:
+ case 113:
+ case 114:
+ case 115:
+ rgvPosNew[0] = rgvPosNew[0] + 50;
+ rgvPosNew[1] = rgvPosNew[1];
+ break;
+ case 116:
+ case 117:
+ case 118:
+ case 119:
+ case 120:
+ case 121:
+ case 122:
+ case 123:
+ case 124:
+ case 125:
+ case 126:
+ case 127:
+ case 128:
+ case 129:
+ case 130:
+ case 131:
+ case 132:
+ case 133:
+ rgvPosNew[0] = rgvPosNew[0];
+ rgvPosNew[1] = rgvPosNew[1] + 50;
+ break;
+ case 134:
+ rgvPosNew[0] = rgvPosNew[0];
+ rgvPosNew[1] = rgvPosNew[1] - 70;
+ break;
+ }
return rgvPosNew;
}
diff --git a/src/main/webapp/views/index.html b/src/main/webapp/views/index.html
index c0cb1c5..f48ed2f 100644
--- a/src/main/webapp/views/index.html
+++ b/src/main/webapp/views/index.html
@@ -232,7 +232,7 @@
L 1100,850
C 1100,850 1200,850 1200,750
"
- style="fill:none; stroke:blue; stroke-width:4;" />
+ style="fill:none; stroke:blue; stroke-width:2;" />
</svg>
<!-- <div v-for="station in tableDataDev" class="station" :style="{ top: station.valueY + 'px', left: station.valueX + 'px' , backgroundColor: station.modeColor}">{{ station.index }}</div>-->
<div v-for="station in tableDataDev" class="station" :style="{
@@ -253,8 +253,8 @@
<!-- Buses -->
<!-- <div v-for="bus in tableDataRgv" class="bus" :style="{ top: bus.valueY + 'px', left: bus.valueX + 'px' , borderColor: bus.modeColor, backgroundColor: bus.statusColor}">{{ bus.index }}</div>-->
<div v-for="bus in tableDataRgv" class="bus" :style="{
- top: convertToCSSPosition(bus.valueX, bus.valueY).y + 'px',
- left: convertToCSSPosition(bus.valueX, bus.valueY).x + 'px',
+ top: convertToCSSPositionWithOffset(bus.valueX, bus.valueY).y + 'px',
+ left: convertToCSSPositionWithOffset(bus.valueX, bus.valueY).x + 'px',
borderColor: bus.modeColor, backgroundColor: bus.statusColor}">{{ bus.index }}</div>
</div>
@@ -592,7 +592,14 @@
height: mapEl.clientHeight
};
},
-
+ convertToCSSPositionWithOffset(svgX, svgY, radius) {
+ const basePos = this.convertToCSSPosition(svgX, svgY);
+ // 绀轰緥锛氬悜鍙冲亸绉诲崐寰勭殑璺濈锛堝彲鏍规嵁闇�姹傝皟鏁村亸绉绘柟鍚戯級
+ return {
+ x: basePos.x -14,
+ y: basePos.y -14
+ };
+ },
// 鏇存柊body灏哄
updateBodySize() {
this.bodySize = getBodySize();
--
Gitblit v1.9.1