From e879b827a46e9e702f6cd80be9afdf4d35799947 Mon Sep 17 00:00:00 2001
From: czt <czt18638530771@163.com>
Date: 星期三, 17 十二月 2025 09:36:38 +0800
Subject: [PATCH] 抓拍页面布局调整
---
fzzy-igdss-web/src/main/resources/templates/security/snap/snapRecord/snapRecord.html | 58 +++++++++++++++++++++++++++++++++++++++-------------------
1 files changed, 39 insertions(+), 19 deletions(-)
diff --git a/fzzy-igdss-web/src/main/resources/templates/security/snap/snapRecord/snapRecord.html b/fzzy-igdss-web/src/main/resources/templates/security/snap/snapRecord/snapRecord.html
index 28689e1..8550b7e 100644
--- a/fzzy-igdss-web/src/main/resources/templates/security/snap/snapRecord/snapRecord.html
+++ b/fzzy-igdss-web/src/main/resources/templates/security/snap/snapRecord/snapRecord.html
@@ -18,7 +18,20 @@
<div class="select-list">
<ul>
<li>
- 鎵�灞炲簱鍖猴細<input type="text" name="deptId"/>
+ 鏀跺偍鍏徃锛�<select name="companyId">
+ <option value="all">鎵�鏈�</option>
+ </select>
+ </li>
+ <li>
+ 鎵�閫夊簱鍖猴細<select name="deptId">
+ <option value="">鎵�鏈�</option>
+ </select>
+ </li>
+ <li class="select-time">
+ <label>鎶撴媿鏃堕棿锛� </label>
+ <input type="text" class="time-input" style="width: 120px;" id="start" placeholder="寮�濮嬫椂闂�" name="params[begin]"/>
+ <span>-</span>
+ <input type="text" class="time-input" style="width: 120px;" id="end" placeholder="缁撴潫鏃堕棿" name="params[end]"/>
</li>
<li>
<a class="btn btn-primary btn-rounded btn-sm" onclick="searchRecord()"><i
@@ -37,7 +50,7 @@
</div>
- <div class="col-sm-12 " style="padding-top: 10px;">
+ <div class="col-sm-12 " style="padding-top: 10px;background: #FFFFFF;margin-top: 10px;">
<!-- 鍥剧墖缃戞牸 -->
<div class="gallery-grid" id="gallery-container">
<!-- 鍥剧墖涓虹┖鏃舵樉绀� -->
@@ -56,17 +69,9 @@
<!-- <h3 class="gallery-title" th:text="${snapRecord.id}"></h3>-->
<!-- 鏍囩鍒楄〃 -->
<div class="gallery-tags">
- <span class="tag-person">
+ <span th:each="tag : ${#strings.arraySplit(snapRecord.tags, ',')}" class="tag-person">
<i class="layui-icon layui-icon-note"></i>
- <span>姹借溅</span>
- </span>
- <span class="tag-person">
- <i class="layui-icon layui-icon-note"></i>
- <span>鍗¤溅</span>
- </span>
- <span class="tag-person">
- <i class="layui-icon layui-icon-note"></i>
- <span>缈绘枟杞�</span>
+ <span th:text="${tag}"></span>
</span>
</div>
</div>
@@ -75,17 +80,30 @@
<div style="display: flex; align-items: center; gap: 15px;width: 100%">
<div class="meta-item" style="width: 50%">
<i class="layui-icon layui-icon-video"></i>
- <span th:text="${snapRecord.cameraId}"></span>
+ <!-- 浣跨敤鏍囧織鍙橀噺璁板綍鏄惁宸插尮閰� -->
+ <th:block th:with="matchedCameras=${cameraList.?[id == #root.snapRecord.cameraId]}">
+ <!-- 濡傛灉鏈夊尮閰嶉」锛屾樉绀虹涓�涓尮閰嶇殑鎽勫儚澶村悕绉� -->
+ <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="${snapRecord.cameraId}"></span>
+ </th:block>
+ </th:block>
</div>
+
+
+
+
<div class="meta-item" style="width: 50%">
<i class="layui-icon layui-icon-date"></i>
- <span th:text="${#dates.format(snapRecord.snapTime, 'yyyy-MM-dd HH:mm')}"></span>
- </div>
+ <span th:text="${snapRecord.snapTime != null ? #dates.format(snapRecord.snapTime, 'yyyy-MM-dd HH:mm') : '鏃犳椂闂�'}"></span> </div>
</div>
- <div class="meta-item">
- <i class="layui-icon layui-icon-home"></i>
- <span th:text="${snapRecord.deptId}"></span>
- </div>
+ <!-- <div class="meta-item">-->
+ <!-- <i class="layui-icon layui-icon-home"></i>-->
+ <!-- <span th:text="${snapRecord.deptId}"></span>-->
+ <!-- </div>-->
</div>
</div>
</div>
@@ -112,9 +130,11 @@
<script th:src="@{/ajax/libs/layui-ruoyi/layui.js}"></script>
<script th:src="@{/security/snap/snapRecord.js}"></script>
<script th:inline="javascript">
+ var cameraList = [[${cameraList}]];
var currentPage = [[${currentPage}]];
var totalItems = [[${totalItems}]];
var pageSize = [[${pageSize}]];
+
</script>
</body>
--
Gitblit v1.9.3