From dfd2060bdcc0de929b4770a6a4a580c17bd72104 Mon Sep 17 00:00:00 2001
From: czt <czt18638530771@163.com>
Date: 星期三, 17 十二月 2025 16:31:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fzzy-igdss-web/src/main/resources/templates/security/snap/snapRecord/snapRecord.html | 23 +++++++++++++++--------
1 files changed, 15 insertions(+), 8 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 b10c88c..318cc3d 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
@@ -1,13 +1,14 @@
<!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('鏅鸿兘鎶撴媿')"/>
- <link rel="stylesheet" type="text/css" th:href="@{/ajax/libs/layui-ruoyi/css/layui.css}"/>
+ <link rel="stylesheet" type="text/css" th:href="@{/ajax/libs/layui/css/layui.css}"/>
<link rel="stylesheet" th:href="@{/security/snap/snapRecord-style.css}">
+ <th:block th:include="include :: select2-css" />
</head>
<body class="gray-bg">
<div class="container-div">
@@ -18,20 +19,24 @@
<div class="select-list">
<ul>
<li>
- 鏀跺偍鍏徃锛�<select name="companyId">
- <option value="all">鎵�鏈�</option>
+ 鏀跺偍鍏徃锛�<select class="form-control" name="key">
+ <option value="">鎵�鏈�</option>
+ <option th:each="company : ${companyList}" th:value="${company.id}" th:text="${company.dwmc}">
+ </option>
</select>
</li>
<li>
- 鎵�閫夊簱鍖猴細<select name="deptId">
+ 鎵�閫夊簱鍖猴細<select class="form-control" name="deptId">
<option value="">鎵�鏈�</option>
+ <option th:each="dept : ${deptList}" th:value="${dept.id}" th:text="${dept.kqmc}">
+ </option>
</select>
</li>
<li class="select-time">
<label style="width: 100px">鎶撴媿鏃堕棿锛�</label>
- <input type="text" class="time-input" style="width: 120px;" id="start" placeholder="寮�濮嬫椂闂�" name="params[begin]"/>
+ <input type="text" class="time-input" style="width: 120px;" id="start" placeholder="寮�濮嬫椂闂�" name="start"/>
<span>-</span>
- <input type="text" class="time-input" style="width: 120px;" id="end" placeholder="缁撴潫鏃堕棿" name="params[end]"/>
+ <input type="text" class="time-input" style="width: 120px;" id="end" placeholder="缁撴潫鏃堕棿" name="end"/>
</li>
<li>
<a class="btn btn-primary btn-rounded btn-sm" onclick="searchRecord()"><i
@@ -135,11 +140,13 @@
</div>
</div>
<th:block th:include="include :: footer"/>
-<script th:src="@{/ajax/libs/layui-ruoyi/layui.js}"></script>
+<script th:src="@{/ajax/libs/layui/layui.js}"></script>
+<th:block th:include="include :: select2-js" />
<script th:src="@{/security/snap/snapRecord.js}"></script>
<script th:inline="javascript">
var cameraList = [[${cameraList}]];
var deptList = [[${deptList}]];
+ var companyList = [[${companyList}]];
var currentPage = [[${currentPage}]];
var totalItems = [[${totalItems}]];
var pageSize = [[${pageSize}]];
--
Gitblit v1.9.3