#
luxiaotao1123
2020-11-18 a8aefe43581049a8d73574f37901b6553c6c18aa
src/main/webapp/views/monitor/monitor.html
@@ -71,6 +71,7 @@
            }
        }
    </style>
</head>
<body class="monitor-bg">
@@ -196,11 +197,11 @@
                        <div class="layui-carousel" id="test1">
                            <div carousel-item>
                                <div style="background-color: red">条目1</div>
                                <div style="background-color: gold">条目2</div>
                                <div style="background-color: #333333">条目3</div>
                                <div style="background-color: #00FF00">条目4</div>
                                <div style="background-color: #5FB878">条目5</div>
                                <div class="item-img" id="img-1" style="background-color: red"></div>
                                <div class="item-img" id="img-2" style="background-color: gold"></div>
                                <div class="item-img" id="img-3" style="background-color: green"></div>
                                <div class="item-img" id="img-4" style="background-color: white"></div>
                                <div class="item-img" id="img-5" style="background-color: darkgoldenrod"></div>
                            </div>
                        </div>
@@ -313,10 +314,10 @@
                        <div class="elem-header" id="elem-header-third">
                        </div>
                        <div class="elem-main">
                            使用中
                            禁用
                        </div>
                        <div class="elem-footer">
                            <span id="used-count">0</span>
                            <span id="none-count">0</span>
                        </div>
                    </div>
                </div>
@@ -337,9 +338,12 @@
                    </div>
                </div>
                <div class="progress-bar-modal">
                    <div class="bar-container">
                        <div class="bar-proportion"><span>实际使用</span></div>
                    <div class="layui-progress layui-progress-big" lay-filter="used-progress" style="background-color: #233751;width: 80%;display: inline-block">
                        <div class="layui-progress-bar layui-bg-red" lay-percent="0%"></div>
                    </div>
<!--                    <div class="bar-container">-->
<!--                        <div class="bar-proportion"><span>实际使用</span></div>-->
<!--                    </div>-->
                    <i class="bar-container-count"><span id="used">0</span></i>
                </div>
            </div>
@@ -348,8 +352,9 @@
    </div>
</body>
<script>
    layui.use('carousel', function(){
    layui.use(['element', 'carousel'], function(){
        var carousel = layui.carousel;
        var element = layui.element;
        //建造实例
        carousel.render({
            elem: '#test1'
@@ -358,6 +363,16 @@
            //,anim: 'updown' //切换动画方式
        });
    });
    /***********************************************************************************/
    /************************************ 堆垛机速度 *************************************/
    /***********************************************************************************/
    /***********************************************************************************/
    /************************************* 折线图 ***************************************/
@@ -540,6 +555,8 @@
                    $('#usedPr').text(res.data.usedPr);
                    $('#used').text(res.data.used);
                    layui.element.progress('used-progress', res.data.usedPr + '%');
                } else if (res.code === 403){
                    top.location.href = "/";
                } else {