From 7be0d5b901b999d2347774df3cc1a64927838bb3 Mon Sep 17 00:00:00 2001
From: heheng <475597332@qq.com>
Date: 星期二, 15 四月 2025 10:10:35 +0800
Subject: [PATCH] 优化每年专项数据获取
---
src/main/resources/templates/tr/hiddenDangerCheck/dangerReport/editDangerReport.html | 101 ++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 96 insertions(+), 5 deletions(-)
diff --git a/src/main/resources/templates/tr/hiddenDangerCheck/dangerReport/editDangerReport.html b/src/main/resources/templates/tr/hiddenDangerCheck/dangerReport/editDangerReport.html
index 4b7b63c..1582ee4 100644
--- a/src/main/resources/templates/tr/hiddenDangerCheck/dangerReport/editDangerReport.html
+++ b/src/main/resources/templates/tr/hiddenDangerCheck/dangerReport/editDangerReport.html
@@ -100,17 +100,84 @@
<div class="form-group">
- <label class="col-sm-3 control-label is-required">判定人：</label>
+ <label class="col-sm-3 control-label is-required">隐患责任人（判定人）：</label>
<div class="col-sm-8">
- <input id="judgeUserName" name="judgeUserName" th:field="*{judgeUserName}" placeholder="选择判定人" class="form-control" type="text" onclick="selectJudgeUser()" maxlength="30" readonly="true" required>
+ <input id="judgeUserName" name="judgeUserName" th:field="*{judgeUserName}" placeholder="选择隐患责任人（判定人）" class="form-control" type="text" onclick="selectJudgeUser()" maxlength="30" readonly="true" required>
<input id="judgeUserId" name="judgeUserId" th:field="*{judgeUserId}" type="hidden" >
+ </div>
+ </div>
+
+ <div class="form-group">
+ <label class="col-sm-3 control-label is-required">隐患发现时间：</label>
+ <div class="col-sm-8">
+ <input name="findTime" placeholder="请选择隐患发现时间" class="form-control" type="text"
+ readonly="readonly" required>
+ </div>
+ </div>
+
+ <div class="form-group">
+ <label class="col-sm-3 control-label is-required">检查人：</label>
+ <div class="col-sm-8">
+ <input id="checkPerson" name="checkPerson" placeholder="选择检查人" class="form-control" type="text" onclick="selectCheckPerson()" maxlength="30" readonly="true" required>
+ <!-- <input id="checkPersonId" name="checkPersonId" type="hidden">-->
+ </div>
+ </div>
+
+<!-- <div class="form-group">-->
+<!-- <label class="col-sm-3 control-label is-required">安全风险分析单元名称：</label>-->
+<!-- <div class="col-sm-8">-->
+<!-- <select name="riskUnitId" th:field="*{riskUnitId}" class="form-control m-b" required>-->
+<!-- <option value="">--请选择安全风险分析单元--</option>-->
+<!-- <option th:each="u :${riskUnits}" th:value="${u.riskListId}" th:text="${u.riskListName}"></option>-->
+<!-- </select>-->
+<!-- </div>-->
+<!-- </div>-->
+ <div class="form-group">
+ <label class="col-sm-3 control-label is-required">风险对象分析编码：</label>
+ <div class="col-sm-8">
+ <textarea name="hazardCode" th:field="*{hazardCode}" maxlength="500" class="form-control" rows="3" required></textarea>
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-sm-3 control-label is-required">隐患来源：</label>
+ <div class="col-sm-8">
+ <select name="dangerSrc" th:field="*{dangerSrc}" class="form-control m-b" th:with="type=${@dict.getType('danger_source')}" required>
+ <option value="">--请选择隐患来源--</option>
+ <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
+ </select>
+ </div>
+ </div>
+
+ <div class="form-group">
+ <label class="col-sm-3 control-label is-required">隐患类型：</label>
+ <div class="col-sm-8">
+ <select name="hazardDangerType" th:field="*{hazardDangerType}" class="form-control m-b" th:with="type=${@dict.getType('danger_type')}" required>
+ <option value="">--请选择隐患类型--</option>
+ <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
+ </select>
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-sm-3 control-label is-required">隐患造成后果：</label>
+ <div class="col-sm-8">
+ <select name="dangerResult" th:field="*{dangerResult}" class="form-control m-b" th:with="type=${@dict.getType('danger_result')}" required>
+ <option value="">--请选择隐患造成后果--</option>
+ <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
+ </select>
+ </div>
+ </div>
+
+ <div class="form-group">
+ <label class="col-sm-3 control-label is-required">隐患原因：</label>
+ <div class="col-sm-8">
+ <textarea name="dangerReason" th:field="*{dangerReason}" maxlength="500" class="form-control" rows="3" required></textarea>
</div>
</div>
</form>
</div>
<th:block th:include="include :: footer"/>
<th:block th:include="include :: datetimepicker-js"/>
-<script type="text/javascript">
+<script th:inline="javascript">
@@ -178,7 +245,7 @@
- /*判定人 选择 start*/
+ /*隐患责任人 选择 start*/
function selectJudgeUser() {
var url = ctx + "system/user/selectUserListByParentSonCompany";
var options = {
@@ -197,8 +264,32 @@
});
});
}
- /*判定人 选择 end*/
+ /*隐患责任人 选择 end*/
+ function selectCheckPerson() {
+ var url = ctx + "system/user/selectUserListByParentSonCompany";
+ var options = {
+ title: '用户选择',
+ width: "800",
+ url: url,
+ };
+ $.modal.openOptionsByCallback(options, function (layero, index) {
+ var body = layer.getChildFrame('body', index);
+ body.on("click", ".selectUser", function () {
+ var userId = $(this).data("userid");
+ var userName = $(this).data("username");
+ // $("#checkPersonId").val(userId);
+ $("#checkPerson").val(userName);
+ layer.close(index);
+ });
+ });
+ }
+
+ $("input[name='findTime']").datetimepicker({
+ format: "yyyy-mm-dd",
+ minView: "month",
+ autoclose: true
+ });
var prefix = ctx + "tr/hiddenDangerCheck/dangerReport";
$("#form-hiddenDangerCheck-edit").validate({
--
Gitblit v1.9.2