#

luxiaotao1123

2020-11-19 9fb00ee422c7e1b6bf3712d1fe192af9cdba5975

#

 src/main/java/com/zy/asrs/controller/MonitorController.java

@@ -56,6 +56,8 @@
    public R monitorOther(@RequestParam("crnId") Integer crnId) {
        Double xSpeed = 0.0D;
        Double ySpeed = 0.0D;
        Double zSpeed = 0.0D;
        Short forkPos = 1;
        Double xDistance = 0.0D;
        Double yDistance = 0.0D;
        Double xDuration = 0.0D;
@@ -68,6 +70,21 @@
                if (crnProtocol != null) {
                    xSpeed = Double.valueOf(crnProtocol.getXSpeed());
                    ySpeed = Double.valueOf(crnProtocol.getYSpeed());
                    zSpeed = Double.valueOf(crnProtocol.getZSpeed());
                    switch (crnProtocol.getForkPos()) {
                        case 0:
                            forkPos = 1;
                            break;
                        case 1:
                            forkPos = 0;
                            break;
                        case 2:
                            forkPos = 2;
                            break;
                        default:
                            forkPos = 1;
                            break;
                    }
                    xDistance = Double.valueOf(crnProtocol.getXDistance());
                    yDistance = Double.valueOf(crnProtocol.getYDistance());
                    xDuration = Double.valueOf(crnProtocol.getXDuration());
@@ -85,6 +102,8 @@
        return R.ok(
                Cools.add("xSpeed", xSpeed) // 行走速度
                .add("ySpeed", ySpeed)  // 升降速度
                .add("zSpeed", zSpeed)  // 叉牙速度
                .add("forkPos", forkPos)  // 叉牙速度
//                .add("totalLoc", totalLoc)  // 总库位数
//                .add("totalWrk", totalWrk)    // 总任务数
                .add("xDistance", xDistance)    // 累计走行距离km

 src/main/webapp/views/monitor/js/monitor.js

@@ -60,17 +60,16 @@
            $('#yDuration').text(res.data.yDuration);

            // 中上
            crnChartOption.series[0].data[0].value = (Math.random()*100).toFixed(2) - 0;
            crnChartOption.series[1].data[0].value = (Math.random()*7).toFixed(2) - 0;
            crnChartOption.series[2].data[0].value = (Math.random()*2).toFixed(2) - 0;
            crnChartOption.series[3].data[0].value = (Math.random()*2).toFixed(2) - 0;
            crnChartOption.series[0].data[0].value = res.data.xSpeed - 0; // 走行
            crnChartOption.series[1].data[0].value = res.data.ySpeed - 0; // 升降
            crnChartOption.series[2].data[0].value = res.data.zSpeed - 0; // 叉牙
            crnChartOption.series[3].data[0].value = res.data.forkPos - 0; // 货叉位置
            // crnChartOption.series[0].data[0].value = (Math.random()*100).toFixed(2) - 0;
            // crnChartOption.series[1].data[0].value = (Math.random()*7).toFixed(2) - 0;
            // crnChartOption.series[2].data[0].value = (Math.random()*2).toFixed(2) - 0;
            // crnChartOption.series[3].data[0].value = (Math.random()*2).toFixed(2) - 0;
            crnChart.setOption(crnChartOption);

            $('#xSpeed').text(res.data.xSpeed);
            $('#ySpeed').text(res.data.ySpeed);

            // 计数动画
            $('.counter').countUp();
        } else if (res.code === 403){
            parent.location.href = baseUrl+"/login";
        }  else {

 src/main/webapp/views/monitor/monitor.html

@@ -458,7 +458,7 @@
                        color: '#fff'
                    }
                },
                data: [{value: 40, name: 'm/min\nx'}]
                data: [{value: 40, name: 'x\nm/min'}]
            },
            {
                name: '升降速度',