Merge remote-tracking branch 'origin/master'

sgj

20 小时以前 18127822f3cdb4778fb62ba0304bb8372dada516

 fzzy-igdss-web/src/main/resources/templates/security/video-list-dept.html

@@ -223,6 +223,13 @@
            width: 100%;
            height: 100%;
        }
        .dept{
            margin-left: 150px;
            font-size: 16px;
            color: #FFFFFF;
            width: 400px;
            padding-top: 8px;
        }
    </style>
</head>

@@ -238,6 +245,10 @@
                            <h3>
                                <i></i>视频实时预览
                            </h3>
                            <div id="deptList" class="dept" onclick="showDepotAreaSelect()">
                                <img style="width: 18px" th:src="@{/img/web/security/qh.png}"/>
                                [[${#strings.defaultString(dept.deptName, '-')}]]
                            </div>
                            <div class="fenping_icon">
                                <img onclick="fenping(1)" id="f_1" style="width: 30px" th:src="@{/img/web/group/fp_1_active.png}"/>
                                <img onclick="fenping(4)" id="f_4" style="width: 30px" th:src="@{/img/web/group/fp_4.png}"/>
@@ -419,6 +430,8 @@

<script th:inline="javascript">
    var listCamera = [[${listCamera}]];
    var showDeptList = [[${showDeptList}]];
    var type = [[${type}]];
</script>
<script th:src="@{/js/jquery.min.js}"></script>
<script th:src="@{/ajax/libs/layui/layui.js}"></script>