Merge remote-tracking branch 'origin/master'

YYC

2026-02-27 1369c87ddcc0e76e17d01208ef66261ee0cd27da

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

@@ -8,10 +8,10 @@
    <th:block th:include="include :: header('AI事件管理')"/>
    <link rel="stylesheet" type="text/css" th:href="@{/ajax/libs/layui/css/layui.css}"/>
    <link rel="stylesheet" th:href="@{/security/eventInfo/eventInfo-style.css}">
    <th:block th:include="include :: select2-css" />
    <th:block th:include="include :: select2-css"/>
    <style>
        .select-list .select2-container--bootstrap {
            width: 280px!important;
            width: 280px !important;
            display: inline-block;
        }
    </style>
@@ -25,7 +25,7 @@
                <div class="select-list">
                    <ul>
                        <li>
                            收储公司：<select  class="form-control"  name="key">
                            收储公司：<select class="form-control" name="key">
                            <option th:each="company : ${companyList}" th:value="${company.id}"
                                    th:text="${company.dwmc}"
                                    th:selected="${company.id == defaultCompany}">
@@ -33,21 +33,23 @@
                        </select>
                        </li>
                        <li>
                            所选库区：<select class="form-control"  name="deptId">
                            <option value="">所有</option>
                            <option th:each="dept : ${deptList}" th:value="${dept.id}" th:text="${dept.kqmc}">
                            所选库区：<select class="form-control" name="deptId" >
                            <option th:each="dept : ${deptList}" th:value="${dept.id}" th:text="${dept.kqmc}"
                                    th:selected="${dept.id == defaultDeptId}">
                            </option>
                        </select>
                        </li>
                        <li th:if="${viewType == '1'}" style="display: flex">
                            <label>事件名称：</label>
                            <input class="form-control"  type="text" name="name" placeholder="请输入事件名称">
                            <label>事件标签：</label>
                            <input class="form-control" type="text" name="name" placeholder="请输入事件标签">
                        </li>
                        <li class="select-time">
                            <label style="width: 100px">事件时间： </label>
                            <input type="text" class="time-input" style="width: 140px;" id="start" placeholder="开始时间" name="start"/>
                            <input type="text" class="time-input" style="width: 140px;" id="start"
                                   placeholder="开始时间" name="start"/>
                            <span>-</span>
                            <input type="text" class="time-input" style="width: 140px;" id="end" placeholder="结束时间" name="end"/>
                            <input type="text" class="time-input" style="width: 140px;" id="end" placeholder="结束时间"
                                   name="end"/>
                        </li>
                        <li>
                            <a class="btn btn-primary btn-rounded btn-sm" onclick="searchRecord()"><i
@@ -87,20 +89,11 @@

                        <div class="gallery-meta">
                            <div style="display: flex; align-items: center; gap: 15px;width: 100%">
                                <div class="meta-item" style="width: 50%">
                                <div class="meta-item" style="min-width: 60%">
                                    <i class="layui-icon layui-icon-video"></i>
                                    <th:block th:with="matchedCameras=${cameraList.?[id == #root.eventInfo.serId]}">
                                        <!-- 如果有匹配项，显示第一个匹配的摄像头名称 -->
                                        <th:block th:if="${!#lists.isEmpty(matchedCameras)}">
                                            <span th:text="${matchedCameras[0].name}"></span>
                                        </th:block>
                                        <!-- 如果没有匹配项，显示原始ID -->
                                        <th:block th:if="${#lists.isEmpty(matchedCameras)}">
                                            <span th:text="${eventInfo.serId}"></span>
                                        </th:block>
                                    </th:block>
                                    <span th:text="${eventInfo.serId}"></span>
                                </div>
                                <div class="meta-item" style="width: 50%">
                                <div class="meta-item" style="min-width: 40%">
                                    <i class="layui-icon layui-icon-date"></i>
                                    <span th:text="${eventInfo.time != null ? #dates.format(eventInfo.time, 'yyyy-MM-dd HH:mm') : '无时间'}"></span>
                                </div>
@@ -108,11 +101,9 @@
                            <div class="meta-item">
                                <i class="layui-icon layui-icon-component"></i>
                                <th:block th:with="matchedTypes=${bizTypeList.?[code == #root.eventInfo.bizType]}">
                                    <!-- 如果有匹配项，显示第一个匹配的摄像头名称 -->
                                    <th:block th:if="${!#lists.isEmpty(matchedTypes)}">
                                        <span th:text="${matchedTypes[0].msg}"></span>
                                    </th:block>
                                    <!-- 如果没有匹配项，显示原始ID -->
                                    <th:block th:if="${#lists.isEmpty(matchedTypes)}">
                                        <span th:text="${eventInfo.bizType}"></span>
                                    </th:block>
@@ -141,7 +132,7 @@
</div>
<th:block th:include="include :: footer"/>
<script th:src="@{/ajax/libs/layui/layui.js}"></script>
<th:block th:include="include :: select2-js" />
<th:block th:include="include :: select2-js"/>
<script th:src="@{/security/eventInfo/eventInfo.js}"></script>
<script th:inline="javascript">
    var cameraList = [[${cameraList}]];