From 824d4e6be22a1d101897bf1be575bb5e3ed33845 Mon Sep 17 00:00:00 2001
From: sgj <1442489573@qq.com>
Date: 星期二, 09 十二月 2025 15:12:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fzzy-igdss-web/src/main/resources/templates/security/eventInfo/eventInfo.html | 64 ++++++++++++++++++++-----------
1 files changed, 41 insertions(+), 23 deletions(-)
diff --git a/fzzy-igdss-web/src/main/resources/templates/security/eventInfo/eventInfo.html b/fzzy-igdss-web/src/main/resources/templates/security/eventInfo/eventInfo.html
index 4ae7291..6181a3f 100644
--- a/fzzy-igdss-web/src/main/resources/templates/security/eventInfo/eventInfo.html
+++ b/fzzy-igdss-web/src/main/resources/templates/security/eventInfo/eventInfo.html
@@ -1,18 +1,19 @@
<!DOCTYPE html>
-<html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
+<html lang="zh" xmlns:th="http://www.thymeleaf.org">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
<meta name="renderer" content="webkit">
- <th:block th:include="include :: header('AI浜嬩欢绠＄悊')" />
+ <th:block th:include="include :: header('AI浜嬩欢绠＄悊')"/>
<link rel="stylesheet" type="text/css" th:href="@{/ajax/libs/layui-ruoyi/css/layui.css}"/>
<link rel="stylesheet" th:href="@{/security/eventInfo/eventInfo-style.css}">
</head>
<body class="gray-bg">
<div class="container-div">
<div class="row">
- <div class="col-sm-12 search-collapse">
+ <div class="col-sm-12 search-collapse"
+ style="display: flex; justify-content: space-between; align-items: center;">
<form id="eventInfo-form">
<div class="select-list">
<ul>
@@ -20,12 +21,22 @@
鎵�灞炲簱鍖猴細<input type="text" name="deptId"/>
</li>
<li>
- <a class="btn btn-primary btn-rounded btn-sm" onclick="searchRecord()"><i class="fa fa-search"></i> 鎼滅储</a>
- <a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i> 閲嶇疆</a>
+ 鎵�灞炰粨搴擄細<input type="text" name="depotId"/>
+ </li>
+ <li>
+ <a class="btn btn-primary btn-rounded btn-sm" onclick="searchRecord()"><i
+ class="fa fa-search"></i> 鎼滅储</a>
+ <a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i
+ class="fa fa-refresh"></i> 閲嶇疆</a>
</li>
</ul>
</div>
</form>
+ <div class="btn-group-sm" role="group">
+ <a class="btn btn-success">
+ <i class="fa fa-plus"></i> 浜嬩欢閰嶇疆
+ </a>
+ </div>
</div>
<div class="col-sm-12 " style="padding-top: 10px;">
@@ -45,31 +56,38 @@
<div class="gallery-info">
<div class="gallery-header">
<h3 class="gallery-title" th:text="${eventInfo.name}"></h3>
+ <div class="gallery-tags">
+ <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>
+ <span class="tag-person">
+ <i class="layui-icon layui-icon-note"></i>
+ <span>缈绘枟杞�</span>
+ </span>
+ </div>
</div>
<div class="gallery-meta">
+ <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="${eventInfo.serId}"></span>
+ </div>
+ <div class="meta-item" style="width: 50%">
+ <i class="layui-icon layui-icon-date"></i>
+ <span th:text="${#dates.format(eventInfo.time, 'yyyy-MM-dd HH:mm:ss')}"></span>
+ </div>
+ </div>
<div class="meta-item">
<i class="layui-icon layui-icon-home"></i>
<span th:text="${eventInfo.deptId}"></span>
</div>
- <div class="meta-item">
- <i class="layui-icon layui-icon-video"></i>
- <span th:text="${eventInfo.serId}"></span>
- </div>
- <div class="meta-item">
- <i class="layui-icon layui-icon-date"></i>
- <span th:text="${#dates.format(eventInfo.time, 'yyyy-MM-dd HH:mm:ss')}"></span>
- </div>
</div>
-
- <!-- 鏍囩鍒楄〃 -->
- <div class="gallery-tags">
- <span class="tag-person">
- <i class="layui-icon layui-icon-face-smile"></i>
- <span th:text="${eventInfo.level}"></span>
- </span>
- </div>
-
</div>
</div>
</div>
@@ -90,7 +108,7 @@
</div>
</div>
</div>
-<th:block th:include="include :: footer" />
+<th:block th:include="include :: footer"/>
<script th:src="@{/ajax/libs/layui-ruoyi/layui.js}"></script>
<script th:src="@{/security/eventInfo/eventInfo.js}"></script>
<script th:inline="javascript">
--
Gitblit v1.9.3