pjb
4 天以前 c7ecb255c9e685725095be2a6bd74b1696d4af22
rgv界面优化
2个文件已修改
84 ■■■■ 已修改文件
src/main/java/com/zy/asrs/utils/Utils.java 53 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/webapp/views/index.html 31 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/utils/Utils.java
@@ -129,53 +129,12 @@
    }
    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] - 30;
                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] + 30;
                break;
            case 134:
                rgvPosNew[0] = rgvPosNew[0];
                rgvPosNew[1] = rgvPosNew[1] - 30;
                break;
        if (devNo>=1083){
            rgvPosNew[0] = rgvPosNew[0] + 34;
        } else  if (devNo>=1044){
            rgvPosNew[1] = rgvPosNew[1] -30;
        } else {
            rgvPosNew[1] = rgvPosNew[1]+30;
        }
        return rgvPosNew;
src/main/webapp/views/index.html
@@ -137,7 +137,8 @@
            background: #f0f9eb;
        }
        .container {
            width: 100vh;
            margin-left: 20vh;
            width: 120vh;
            height: 90vh;
            position: absolute;
            /*background: #8c939d;*/
@@ -203,16 +204,20 @@
<!--                        C 1150,150 1150,100 1100,100-->
<!--                        L 250,100-->
<!--                        C 250,100 90,90 100,250 z"-->
                <!--                C 32,810 32,850 65,850-->
                <!--                C 65,850 100,850 100,810-->
<!--                      style="fill:none; stroke:blue; stroke-width:4;" />-->
                <path d="M 0 0
                L 32 -40
                L 32 810
                L 1100 810
                L 1100 770
                L 100 770
                L 100 -40
<!--                L 40 40-->
                Z"
                <path d="M 66,0
                C 66,0 32,0 32,40
                L 32,770
                C 32,770 31,810 72,810
                L 1000,810
                C 1000,810 1020,810 1020,790
                C 1020,790 1020,770 1000,770
                L 120,770
                C 120,770 100,770 100,750
                L 100,40
                C 100,40 100,0 66,0 z"
                      style="fill:none; stroke:blue; stroke-width:1;" />
            </svg>
<!--            <div class="bus-station">-->
@@ -374,7 +379,7 @@
                activeNames: ['1'],
                valueLeft: '0',
                valueRight: '0',
                licenseDay: '已过期',
                licenseDay: ' ',
                licenseDayI: 100,
                valueSystem: false,
                tableDataRgv: [],
@@ -551,14 +556,14 @@
                        success: function (res) {
                            if (res.code == 200) {
                                if (res.data.day<0){
                                    that.licenseDay = "已过期"+res.data.day+"天";
                                    that.licenseDay = " "+res.data.day+"天";
                                    that.licenseDayI = -1;
                                } else {
                                    that.licenseDay = "许可证有效期"+res.data.day+"天";
                                    that.licenseDayI = res.data.day;
                                }
                            }else {
                                that.licenseDay = "已过期";
                                that.licenseDay = " ";
                                that.licenseDayI = -1;
                            }
                        }