From b1e6bf7d3ed1a1d64182127f83fdc3fad2233a7e Mon Sep 17 00:00:00 2001
From: czt <czt18638530771@163.com>
Date: 星期五, 12 十二月 2025 15:36:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fzzy-igdss-web/src/main/resources/templates/security/patrol/patrolConf/edit.html | 45 +++++++++++++++++++++++++++++++++++++++------
1 files changed, 39 insertions(+), 6 deletions(-)
diff --git a/fzzy-igdss-web/src/main/resources/templates/security/patrol/patrolConf/edit.html b/fzzy-igdss-web/src/main/resources/templates/security/patrol/patrolConf/edit.html
index 0bee380..f85f2ad 100644
--- a/fzzy-igdss-web/src/main/resources/templates/security/patrol/patrolConf/edit.html
+++ b/fzzy-igdss-web/src/main/resources/templates/security/patrol/patrolConf/edit.html
@@ -7,13 +7,14 @@
<body class="white-bg">
<div class="wrapper wrapper-content animated fadeInRight ibox-content">
<form class="form-horizontal m" id="form-patrol-edit" th:object="${patrolConf}">
- <input id="id" name="id" th:field="*{batchId}" type="hidden">
+ <input id="id" name="id" th:field="*{id}" type="hidden">
+ <input name="userId" type="hidden" th:field="*{userId}" id="userId"/>
<div class="row">
<div class="col-sm-6">
<div class="form-group">
<label class="col-sm-4 control-label is-required">鐝鍚嶇О锛�</label>
<div class="col-sm-8">
- <input name="batchName" id="batchName" th:field="*{batchName}" placeholder="璇疯緭鍏�" class="form-control "
+ <input name="name" id="name" th:field="*{name}" placeholder="璇疯緭鍏�" class="form-control "
type="text"
maxlength="30" required>
</div>
@@ -23,9 +24,34 @@
<div class="form-group">
<label class="col-sm-4 control-label is-required">宸￠�讳汉锛�</label>
<div class="col-sm-8">
- <input name="userName" id="userName" th:field="*{userName}" placeholder="璇疯緭鍏�" class="form-control "
- type="text"
- maxlength="30" required>
+ <select name="userName" id="userName" class="form-control select2" multiple required onchange="changeUser(this)">
+ <option value="">璇烽�夋嫨宸￠�讳汉</option>
+ <option th:each="user : ${userList}"
+ th:value="${user.userName}"
+ th:text="${user.userName}"
+ th:data-userid="${user.userId}"
+ th:selected="${#strings.contains(patrolConf.userId, user.userId)}"></option>
+ </select>
+ </div>
+ </div>
+ </div>
+
+
+ </div>
+ <div class="row">
+ <div class="col-sm-6">
+ <div class="form-group">
+ <label class="col-sm-4 control-label is-required">寮�濮嬫椂闂达細</label>
+ <div class="col-sm-8">
+ <input id="start" name="startTime" th:value="*{#dates.format(start, 'yyyy-MM-dd HH:mm:ss')}" data-type="datetime" placeholder="璇烽�夋嫨寮�濮嬫椂闂�" class="form-control time-input" type="text" required>
+ </div>
+ </div>
+ </div>
+ <div class="col-sm-6">
+ <div class="form-group">
+ <label class="col-sm-4 control-label is-required">缁撴潫鏃堕棿锛�</label>
+ <div class="col-sm-8">
+ <input id="end" name="endTime" th:value="*{#dates.format(end, 'yyyy-MM-dd HH:mm:ss')}" data-type="datetime" placeholder="璇烽�夋嫨缁撴潫鏃堕棿" class="form-control time-input" type="text" required>
</div>
</div>
</div>
@@ -36,7 +62,6 @@
<th:block th:include="include :: footer"/>
<th:block th:include="include :: select2-js"/>
<script type="text/javascript">
-
var prefix = ctx + "security/patrol/patrolConf";
@@ -52,6 +77,14 @@
$.operate.save(prefix + "/edit", $('#form-patrol-edit').serialize());
}
}
+
+ function changeUser(selectElement) {
+ var selectedOptions = Array.from(selectElement.selectedOptions);
+ var userIds = selectedOptions.map(option => option.getAttribute('data-userid')).filter(id => id);
+ var userIdStr = userIds.join(',');
+ $("#userId").val(userIdStr);
+ }
+
</script>
</body>
</html>
--
Gitblit v1.9.3