*
lsh
2025-08-18 c77ffe54bbd49bfe8f60a592d9729cea86150bf9
*
2个文件已修改
111 ■■■■ 已修改文件
src/main/java/com/zy/asrs/utils/Utils.java 96 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/webapp/views/index.html 15 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
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;
    }
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();