Merge remote-tracking branch 'origin/master'

sgj

20 小时以前 ef7cde2fb1f44de1ffa8b961ee1732fb327e1cd4

 fzzy-igdss-web/src/main/resources/templates/security/patrol-count.html

@@ -94,28 +94,28 @@
    <div class="layui-row layui-col-space15" style="background: #FFFFFF;margin: 10px">
        <div class="layui-col-sm3  layui-col-xs6">
            <div class="console-link-block">
                <div class="console-link-block-num">0</div>
                <div class="console-link-block-num" th:text="${patrolSuperData.isDeptNum}">0</div>
                <div class="console-link-block-text">已巡检库区数(当天)</div>
                <i class="console-link-block-icon layui-icon layui-icon-form"></i>
            </div>
        </div>
        <div class="layui-col-sm3 layui-col-xs6">
            <div class="console-link-block">
                <div class="console-link-block-num">0</div>
                <div class="console-link-block-num" th:text="${patrolSuperData.noDeptNum}">0</div>
                <div class="console-link-block-text">未巡检库区数(当天)</div>
                <i class="console-link-block-icon layui-icon layui-icon-survey"></i>
            </div>
        </div>
        <div class="layui-col-sm3 layui-col-xs6">
            <div class="console-link-block">
                <div class="console-link-block-num">0</div>
                <div class="console-link-block-num" th:text="${patrolSuperData.yesterdaySum}">0</div>
                <div class="console-link-block-text">巡检人次(昨天)</div>
                <i class="console-link-block-icon layui-icon layui-icon-chart"></i>
            </div>
        </div>
       <div class="layui-col-sm3 layui-col-xs6">
            <div class="console-link-block">
                <div class="console-link-block-num">0</div>
                <div class="console-link-block-num" th:text="${patrolSuperData.weekSum}">0</div>
                <div class="console-link-block-text">巡检人次(近7天)</div>
                <i class="console-link-block-icon layui-icon layui-icon-chart"></i>
            </div>
@@ -125,17 +125,6 @@
</div>
<!-- js部分 -->
<script th:src="@{/ajax/libs/layui-ruoyi/layui.js}"></script>
<!--<script src="${ctxPath}/assets/js/common.js"></script>-->
<script th:src="@{/ajax/libs/echarts/echarts.min.js}"></script>
<script th:src="@{/ajax/libs/echarts/china.js}"></script>
<script th:src="@{/ajax/libs/echarts/echarts-wordcloud.min.js}"></script>
<script>
    layui.use(['layer'], function () {
        var $ = layui.jquery;
        var layer = layui.layer;


    });
</script>
</body>
</html>