From 1369c87ddcc0e76e17d01208ef66261ee0cd27da Mon Sep 17 00:00:00 2001
From: YYC <1833023622@qq.com>
Date: 星期五, 27 二月 2026 18:13:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fzzy-igdss-web/src/main/resources/templates/security/eventInfo.html | 21 +++++----------------
1 files changed, 5 insertions(+), 16 deletions(-)
diff --git a/fzzy-igdss-web/src/main/resources/templates/security/eventInfo.html b/fzzy-igdss-web/src/main/resources/templates/security/eventInfo.html
index bd7d5b6..85ddda1 100644
--- a/fzzy-igdss-web/src/main/resources/templates/security/eventInfo.html
+++ b/fzzy-igdss-web/src/main/resources/templates/security/eventInfo.html
@@ -40,8 +40,8 @@
</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>
@@ -89,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>
@@ -110,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>
--
Gitblit v1.9.3