#

luxiaotao1123

2020-11-17 04a9dc98aab72d4cda3d24be233d82c712b4122b

#

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

@@ -58,39 +58,88 @@
        return R.ok(report);
    }

    /**
     * 库位使用情况统计
     */
    @GetMapping("/loc/rep")
    public R monitorLocRep(){
        List<Map<String, Object>> result = new ArrayList<>();
        List<Map<String, Object>> pie = new ArrayList<>();

        LocChartPie locUseRate = reportQueryMapper.getLocUseRate();
        if(locUseRate!=null) {
            Map<String, Object> map = new HashMap<>();
            map.put("name", "在库库位");
            map.put("name", "在库");
            map.put("value", locUseRate.getFqty());
            result.add(map);
            pie.add(map);

            Map<String, Object> map1 = new HashMap<>();
            map1.put("name", "空库位");
            map1.put("name", "空");
            map1.put("value", locUseRate.getOqty());
            result.add(map1);
            pie.add(map1);

            Map<String, Object> map2 = new HashMap<>();
            map2.put("name", "使用库位");
            map2.put("name", "使用");
            map2.put("value", locUseRate.getUqty());
            result.add(map2);
            pie.add(map2);

            Map<String, Object> map3 = new HashMap<>();
            map3.put("name", "禁用库位");
            map3.put("name", "禁用");
            map3.put("value", locUseRate.getXqty());
            result.add(map3);
            pie.add(map3);
        }
        return R.ok(result);


        return R.ok(
                Cools.add("pie", pie)
                .add("stockCunt", locUseRate.getFqty())
                .add("emptyCount", locUseRate.getOqty())
                .add("noneCount", locUseRate.getXqty())
        );
    }












































    /**
     * 自动补零
     */

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

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

function setDate() {

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

@@ -296,7 +296,7 @@
                            在库
                        </div>
                        <div class="elem-footer">
                            3,300
                            <span id="stock-count">0</span>
                        </div>
                    </div>
                    <div class="top-footer-elem">
@@ -306,7 +306,7 @@
                            空库
                        </div>
                        <div class="elem-footer">
                            161
                            <span id="empty-count">0</span>
                        </div>
                    </div>
                    <div class="top-footer-elem">
@@ -316,7 +316,7 @@
                            使用中
                        </div>
                        <div class="elem-footer">
                            666
                            <span id="used-count">0</span>
                        </div>
                    </div>
                </div>
@@ -486,7 +486,7 @@
        legend: {
            orient: 'vertical',
            left: 10,
            data: ['在库库位', '空库位', '使用库位', '禁用库位']
            data: ['在库', '空']
        },
        series: [
            {
@@ -509,10 +509,10 @@
                    show: false
                },
                data: [
                    {value: 1, name: '在库库位'},
                    {value: 1, name: '空库位'},
                    {value: 1, name: '使用库位'},
                    {value: 1, name: '禁用库位'},
                    {value: 1, name: '在库'},
                    {value: 1, name: '空'},
                    {value: 1, name: '使用'},
                    {value: 1, name: '禁用'},
                ],
                itemStyle: {
                    emphasis: {
@@ -533,7 +533,6 @@
            }
        ]
    };
    // pieCharts.setOption(pieChartOption)
    // 饼图加载
    function initPieChart() {
        $.ajax({
@@ -541,8 +540,13 @@
            method: 'GET',
            success: function (res) {
                if (res.code === 200){
                    pieChartOption.series[0].data = res.data;
                    pieCharts.setOption(pieChartOption)
                    console.log(res.data);
                    pieChartOption.series[0].data = res.data.pie;
                    pieCharts.setOption(pieChartOption);

                    $('#stock-count').text(res.data.stockCunt);
                    $('#empty-count').text(res.data.emptyCount);
                    $('#none-count').text(res.data.noneCount);
                } else if (res.code === 403){
                    top.location.href = "/";
                } else {