#

luxiaotao1123

2020-11-19 eb04b3b9ad98d68f9aff7fd30c6abe019efb91ac

#

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

@@ -9,7 +9,7 @@
setInterval(function () {
    getOther();
    setDate();
    initlinChart();
    initlineChart();
    initPieChart();
}, 1000);

@@ -53,11 +53,19 @@
    http.get(baseUrl+"/monitor/other", {crnId: getUrlVal("crnId")}, function (res) {
        if (res.code === 200){

            // 左
            $('#xDistance').text(res.data.xDistance);
            $('#yDistance').text(res.data.yDistance);
            $('#xDuration').text(res.data.xDuration);
            $('#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;
            crnChart.setOption(crnChartOption);

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


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

@@ -271,7 +271,7 @@
                <div class="image-border image-border4"></div>
                <div class="line-chart-title">
                    <div class="order-report">
                        <span class="order-report-left" >入库单统计</span>
                        <span class="order-report-left" >入出库统计</span>
                        <span class="order-report-right">31</span>
                    </div>
                    <div class="order-report-english english">
@@ -366,12 +366,12 @@
    layui.use(['element', 'carousel'], function(){
        var carousel = layui.carousel;
        var element = layui.element;
        //建造实例
        // 轮播图
        carousel.render({
            elem: '#test1'
            ,width: '100%' //设置容器宽度
            ,arrow: 'always' //始终显示箭头
            //,anim: 'updown' //切换动画方式
            ,arrow: 'hover' // 切换箭头默认显示状态，可选值为 hover（悬停显示） always（始终显示） none（始终不显示）
            ,interval: '3000' // 自动切换的时间间隔，单位：ms（毫秒），不能低于800
        });
    });

@@ -531,7 +531,6 @@
                },
                data: [{value: 1.5, name: 'm/min'}]
            },
            // 货叉最大速度，3.几米
            {
                name: '货叉速度',
                type: 'gauge',
@@ -558,19 +557,19 @@
                        shadowBlur: 10
                    }
                },
                axisLabel: {
                    fontWeight: 'bolder',
                    color: '#fff',
                    shadowColor: '#fff', //默认透明
                    shadowBlur: 10,
                    formatter: function (v){
                        switch (v + '') {
                            case '0': return 'E';
                            case '1': return 'Gas';
                            case '2': return 'F';
                        }
                    }
                },
                // axisLabel: {
                //     fontWeight: 'bolder',
                //     color: '#fff',
                //     shadowColor: '#fff', //默认透明
                //     shadowBlur: 10,
                //     formatter: function (v){
                //         switch (v + '') {
                //             case '0': return 'E';
                //             case '1': return 'Gas';
                //             case '2': return 'F';
                //         }
                //     }
                // },
                splitLine: {           // 分隔线
                    length:15,         // 属性length控制线长
                    lineStyle: {       // 属性lineStyle（详见lineStyle）控制线条样式
@@ -591,10 +590,10 @@
                detail: {
                    show: false
                },
                data: [{value: 0.5, name: 'gas'}]
                data: [{value: 0.5, name: 'm/min'}]
            },
            {
                name: '水表',
                name: '货叉位置',
                type: 'gauge',
                center: ['75%', '50%'],    // 默认全局居中
                radius: '30%',
@@ -621,9 +620,9 @@
                    shadowBlur: 10,
                    formatter: function(v){
                        switch (v + '') {
                            case '0': return 'H';
                            case '1': return 'Water';
                            case '2': return 'C';
                            case '0': return '右';
                            case '1': return '中';
                            case '2': return '左';
                        }
                    }
                },
@@ -651,13 +650,6 @@
            }
        ]
    };
    setInterval(function (){
        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);
    }, 1000);


    /***********************************************************************************/
@@ -747,8 +739,7 @@
        ]
    };

    // 访问量报表加载
    function initlinChart() {
    function initlineChart() {
        var reportView = lineChartOption;
        $.ajax({
            url: baseUrl+"/monitor/line/charts",