#

luxiaotao1123

2020-11-17 ebcaed76a00f824e57ccd7e2c38efe725e160374

#

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

@@ -56,6 +56,11 @@
    public R monitorOther(@RequestParam("crnId") Integer crnId) {
        Double xSpeed = 0.0D;
        Double ySpeed = 0.0D;
        Double xDistance = 0.0D;
        Double yDistance = 0.0D;
        Double xDuration = 0.0D;
        Double yDuration = 0.0D;

        if (null != crnId) {
            CrnThread crnThread = (CrnThread) SlaveConnection.get(SlaveType.Crn, crnId);
            if (crnThread != null) {
@@ -63,6 +68,10 @@
                if (crnProtocol != null) {
                    xSpeed = Double.valueOf(crnProtocol.getXSpeed());
                    ySpeed = Double.valueOf(crnProtocol.getYSpeed());
                    xDistance = Double.valueOf(crnProtocol.getXDistance());
                    yDistance = Double.valueOf(crnProtocol.getYDistance());
                    xDuration = Double.valueOf(crnProtocol.getXDuration());
                    yDuration = Double.valueOf(crnProtocol.getYDuration());
                }
            }
        }
@@ -70,15 +79,18 @@
        xSpeed = Double.valueOf(new Random().nextInt(10));
        ySpeed = Double.valueOf(new Random().nextInt(10));

        int totalWrk = reportQueryMapper.getTotalWrkByCrnId(crnId);
        int totalLoc = reportQueryMapper.getTotalLocByCrnId();
//        int totalWrk = reportQueryMapper.getTotalWrkByCrnId(crnId);
//        int totalLoc = reportQueryMapper.getTotalLocByCrnId();

        return R.ok(
                Cools.add("xSpeed", xSpeed) // 行走速度
                .add("ySpeed", ySpeed)  // 升降速度
                .add("totalLoc", totalLoc)  // 总库位数
                .add("totalWrk", totalWrk)    // 总任务数

//                .add("totalLoc", totalLoc)  // 总库位数
//                .add("totalWrk", totalWrk)    // 总任务数
                .add("xDistance", xDistance)    // 累计走行距离km
                .add("yDistance", yDistance)    // 累计升降距离km
                .add("xDuration", xDuration)    // 累计走行时长h
                .add("yDuration", yDuration)    // 累计升降时长h
        );
    }


 src/main/webapp/views/monitor/css/monitor.css

@@ -172,7 +172,7 @@
}
.footer span {
    position: absolute;
    left: 20%;
    left: 18%;
    top: 50%;
    transform:translateY(-50%);
    -webkit-transform:translateY(-50%);  /*兼容-webkit-引擎浏览器*/

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

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

            $('#totalLoc').text(res.data.totalLoc);
            $('#totalWrk').text(res.data.totalWrk);
            $('#xDistance').text(res.data.xDistance);
            $('#yDistance').text(res.data.yDistance);
            $('#xDuration').text(res.data.xDuration);
            $('#yDuration').text(res.data.yDuration);

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

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

@@ -124,40 +124,40 @@
                        <img src="img/a.png">
                        <div class="info-detail">
                            <div class="real-data">
                                <i class="count" id="totalLoc">0</i>
                                <span class="unit">个</span>
                                <i class="count" id="xDistance">0</i>
                                <span class="unit">km</span>
                            </div>
                            <div class="content">库位总数(个)</div>
                            <div class="content">累计走行距离(千米)</div>
                        </div>
                    </div>
                    <div class="charge-info-elem">
                        <img src="img/b.png">
                        <div class="info-detail">
                            <div class="real-data">
                                <i class="count" id="totalWrk">0</i>
                                <span class="unit">托</span>
                                <i class="count" id="yDistance">0</i>
                                <span class="unit">km</span>
                            </div>
                            <div class="content">总任务数(托)</div>
                            <div class="content">累计升降距离(千米)</div>
                        </div>
                    </div>
                    <div class="charge-info-elem">
                        <img src="img/c.png">
                        <div class="info-detail">
                            <div class="real-data">
                                <i class="count" id="">33</i>
                                <span class="unit">托</span>
                                <i class="count" id="xDuration">0</i>
                                <span class="unit">h</span>
                            </div>
                            <div class="content">今日入库(托)</div>
                            <div class="content">累计走行时长(小时)</div>
                        </div>
                    </div>
                    <div class="charge-info-elem">
                        <img src="img/d.png">
                        <div class="info-detail">
                            <div class="real-data">
                                <i class="count">14296</i>
                                <span class="unit">千瓦时</span>
                                <i class="count" id="yDuration">0</i>
                                <span class="unit">h</span>
                            </div>
                            <div class="content">今日电总量(千瓦时)</div>
                            <div class="content">累计升降时长(小时)</div>
                        </div>
                    </div>
                </div>
@@ -166,7 +166,7 @@
                    <div class="image-border image-border2"></div>
                    <div class="image-border image-border3"></div>
                    <div class="image-border image-border4"></div>
                    <span>中扬物流客户服务中心</span>
                    <span>浙江中扬物流装备有限公司</span>
                    <img src="img/wxCode.jpg">
                </div>
            </div>