From 5bc66d568ea4b12d23dd181fd74a17e2845f3d7d Mon Sep 17 00:00:00 2001
From: 16639036659 <577530412@qq.com>
Date: 星期三, 17 七月 2024 16:43:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/resources/templates/tr/TBSpecialCheckScoreAndDangerLog/add.html | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/src/main/resources/templates/tr/TBSpecialCheckScoreAndDangerLog/add.html b/src/main/resources/templates/tr/TBSpecialCheckScoreAndDangerLog/add.html
index 9674d47..83d92cf 100644
--- a/src/main/resources/templates/tr/TBSpecialCheckScoreAndDangerLog/add.html
+++ b/src/main/resources/templates/tr/TBSpecialCheckScoreAndDangerLog/add.html
@@ -3,14 +3,17 @@
<head>
<th:block th:include="include :: header('新增评分')"/>
<th:block th:include="include :: datetimepicker-css"/>
+ <th:block th:include="include :: select2-css" />
</head>
<body class="white-bg">
<div class="wrapper wrapper-content animated fadeInRight ibox-content">
<form class="form-horizontal m" id="form-job-add">
+ <input class="form-control" th:value="${id.split(',')[0]}" type="hidden" name="checkScoreId" id="checkScoreId" required>
+ <input class="form-control" th:value="${id.split(',')[1]}" type="hidden" name="checkItemId" id="checkItemId" required>
<div class="form-group">
<label class="col-sm-3 control-label is-required">关联隐患：</label>
<div class="col-sm-8">
- <select id="dangerId" name="dangerId" class="form-control" required>
+ <select id="dangerId" name="dangerId" class="form-control m-b" required>
<option th:each="danger : ${dangerList}" th:text="${danger.dangerName}" th:value="${danger.id}"></option>
</select>
</div>
@@ -32,7 +35,7 @@
<div class="col-sm-8">
<div class="input-group date">
<span class="input-group-addon"><i class="fa fa-calendar"></i></span>
- <input name="checkDate" class="form-control" placeholder="yyyy-MM-dd" type="text" required>
+ <input name="checkDate" class="form-control" placeholder="yyyy-MM-dd HH:mm:ss" type="text" required>
</div>
</div>
</div>
@@ -56,6 +59,7 @@
</div>
<th:block th:include="include :: footer"/>
<th:block th:include="include :: datetimepicker-js"/>
+<th:block th:include="include :: select2-js" />
<script type="text/javascript">
var prefix = ctx + "tr/TBSpecialCheckScoreAndDangerLog";
var now = new Date();
@@ -63,7 +67,7 @@
var minute = now.getMinutes(); //获取当前分钟数(0-59)
var second = now.getSeconds(); //获取当前秒数(0-59)
$("input[name='checkDate']").datetimepicker({
- format: "yyyy-mm-dd" + ' ' + hour.toString().padStart(2, '0') + ':' + minute.toString().padStart(2, '0') + ':' + second.toString().padStart(2, '0'),
+ format: "yyyy-mm-dd" + ' ' + '12:00:00',
minView: "month",
autoclose: true
});
--
Gitblit v1.9.2