From e98eeaaa5766511fdb8e6d5e412eb1c59d1f07ce Mon Sep 17 00:00:00 2001
From: heheng <475597332@qq.com>
Date: 星期二, 24 六月 2025 10:24:43 +0800
Subject: [PATCH] 隐患来源功能外加仓吉基础数据定时上报
---
src/main/resources/templates/tr/hiddenDangerCheck/dangerExamine/editDangerExamine.html | 144 ++++++++++++++++++++++++++++++++++++------------
1 files changed, 108 insertions(+), 36 deletions(-)
diff --git a/src/main/resources/templates/tr/hiddenDangerCheck/dangerExamine/editDangerExamine.html b/src/main/resources/templates/tr/hiddenDangerCheck/dangerExamine/editDangerExamine.html
index 9f53e91..ea59477 100644
--- a/src/main/resources/templates/tr/hiddenDangerCheck/dangerExamine/editDangerExamine.html
+++ b/src/main/resources/templates/tr/hiddenDangerCheck/dangerExamine/editDangerExamine.html
@@ -17,8 +17,8 @@
text-align: center;
}
- label.error{
- position :absolute !important;
+ label.error {
+ position: absolute !important;
}
</style>
@@ -69,8 +69,24 @@
<label class="col-sm-4 control-label ">排查方式：</label>
<div class="col-sm-8" th:switch="*{checkType}">
<input value="基础清单排查" class="form-control" type="text" readonly="readonly" th:case="1">
- <input value="选择风险单元清单排查" class="form-control" type="text" readonly="readonly" th:case="2">
- <input value="选择风险单元清单排查" class="form-control" type="text" readonly="readonly" th:case="*">
+ <input value="选择风险单元清单排查" class="form-control" type="text" readonly="readonly"
+ th:case="2">
+ <input value="选择风险单元清单排查" class="form-control" type="text" readonly="readonly"
+ th:case="*">
+ </div>
+ </div>
+ </div>
+ <div class="col-sm-6">
+ <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 readonly="readonly" disabled>
+ <option value="" disabled>--请选择隐患来源--</option>
+ <option th:each="dict : ${type}" th:text="${dict.dictLabel}"
+ th:value="${dict.dictValue}" disabled></option>
+ </select>
</div>
</div>
</div>
@@ -127,12 +143,22 @@
<div class="form-group">
<label class="col-sm-4 control-label ">隐患名称：</label>
<div class="col-sm-8">
- <input th:value="*{dangerName}" class="form-control" type="text" readonly="readonly">
+ <textarea th:field="*{dangerName}" class="form-control" type="text" rows="4"
+ readonly="readonly"></textarea>
</div>
</div>
</div>
</div>
-
+ <div class="row">
+ <div class="col-sm-6">
+ <div class="form-group">
+ <label class="col-sm-4 control-label ">隐患排查方法：</label>
+ <div class="col-sm-8">
+ <input th:value="*{remark}" class="form-control" type="text" readonly="readonly">
+ </div>
+ </div>
+ </div>
+ </div>
<div class="row">
<div class="col-sm-6">
@@ -147,7 +173,8 @@
<div class="form-group">
<label class="col-sm-4 control-label ">隐患描述：</label>
<div class="col-sm-8">
- <input th:value="*{dangerDescription}" class="form-control" type="text" readonly="readonly">
+ <textarea th:field="*{dangerDescription}" class="form-control" type="text" rows="4"
+ readonly="readonly"></textarea>
</div>
</div>
</div>
@@ -167,7 +194,7 @@
<div class="form-group">
<label class="col-sm-4 control-label ">隐患责任部门：</label>
<div class="col-sm-8">
- <input th:value="*{dangerDeptName}" class="form-control" type="text" readonly="readonly">
+ <input th:value="*{dangerDeptName}" class="form-control" type="text" readonly="readonly">
</div>
</div>
</div>
@@ -179,11 +206,18 @@
<div class="form-group">
<label class="col-sm-4 control-label ">隐患视图：</label>
<div class="col-sm-8">
- <img style="width: 100px; height: 100px;cursor:pointer;"
+ <!-- <img style="width: 100px; height: 100px;cursor:pointer;"-->
+ <!-- title="查看图片"-->
+ <!-- th:src="*{preRectifyPhoto}"-->
+ <!-- onclick="showPicture(this.getAttribute('data-id'),'preRectifyPhoto')"-->
+ <!-- th:data-id="${hdcp.id}">-->
+ <img style="width: 100px; height: 100px;cursor:pointer;display: none"
title="查看图片"
+ class="allPics"
th:src="*{preRectifyPhoto}"
onclick="showPicture(this.getAttribute('data-id'),'preRectifyPhoto')"
th:data-id="${hdcp.id}">
+ <div class="image-container" style="display: flex;align-items: flex-start"></div>
</div>
</div>
</div>
@@ -242,6 +276,12 @@
</div>
</div>
<div class="form-group showByDangerLevelChange">
+ <label class="col-sm-3 control-label">防范措施：</label>
+ <div class="col-sm-8">
+ <textarea name="rectifyAttachment" maxlength="500" class="form-control" rows="3"></textarea>
+ </div>
+ </div>
+ <div class="form-group showByDangerLevelChange">
<label class="col-sm-3 control-label is-required">隐患整改责任部门：</label>
<div class="col-sm-8">
<div class="input-group">
@@ -258,11 +298,11 @@
<div class="form-group showByDangerLevelChange">
<label class="col-sm-3 control-label is-required">隐患责任整改人：</label>
<div class="col-sm-8">
- <input id="rectifyUserName" name="rectifyUserName" placeholder="选择隐患责任整改人" class="form-control" type="text" onclick="selectRectifyUser()" maxlength="30" readonly="true" required>
- <input id="rectifyUserId" name="rectifyUserId" type="hidden" >
+ <input id="rectifyUserName" name="rectifyUserName" placeholder="选择隐患责任整改人" class="form-control"
+ type="text" onclick="selectRectifyUser()" maxlength="30" readonly="true" required>
+ <input id="rectifyUserId" name="rectifyUserId" type="hidden">
</div>
</div>
-
<div class="form-group showByDangerLevelChange">
@@ -290,25 +330,27 @@
<div class="form-group showByDangerLevelChange">
<label class="col-sm-3 control-label">风险单元：</label>
<div class="col-sm-8">
- <input id="checkPointName" placeholder="选择风险单元" class="form-control" type="text" onclick="selectRiskPoint()" maxlength="30" readonly="true">
+ <input id="checkPointName" placeholder="选择风险单元" class="form-control" type="text"
+ onclick="selectRiskPoint()" maxlength="30" readonly="true">
<input id="checkPointNum" name="hazardCode" type="hidden">
</div>
</div>
- <div class="form-group showByDangerLevelChange">
- <label class="col-sm-3 control-label is-required">隐患来源：</label>
- <div class="col-sm-8">
- <select name="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 showByDangerLevelChange">-->
+ <!-- <label class="col-sm-3 control-label is-required">隐患来源：</label>-->
+ <!-- <div class="col-sm-8">-->
+ <!-- <select name="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 showByDangerLevelChange">
<label class="col-sm-3 control-label is-required">隐患类型：</label>
<div class="col-sm-8">
- <select name="hazardDangerType" class="form-control m-b" th:with="type=${@dict.getType('danger_type')}" required>
+ <select name="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>
@@ -317,7 +359,8 @@
<div class="form-group showByDangerLevelChange">
<label class="col-sm-3 control-label is-required">隐患造成后果：</label>
<div class="col-sm-8">
- <select name="dangerResult" class="form-control m-b" th:with="type=${@dict.getType('danger_result')}" required>
+ <select name="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>
@@ -337,8 +380,38 @@
<th:block th:include="include :: datetimepicker-js"/>
<th:block th:include="include :: jquery-steps-js"/>
<script type="text/javascript">
+ $(document).ready(function () {
+ var imgsUrl = $('.allPics');
+ var imageUrls = imgsUrl.attr('src')
+ var ids = imgsUrl.attr('data-id')
+ var imageContainer = document.querySelector('.image-container');
+
+ if (imageUrls && imageUrls !== '') {
+ // 将逗号分隔的字符串拆分为URL数组
+ var imageUrlArray = imageUrls.split(',');
+
+ // 遍历URL数组并创建img元素
+ imageUrlArray.forEach(function (url, index) {
+ var img = document.createElement('img');
+ img.setAttribute('src', url);
+ img.setAttribute('style', 'width: 100px; height: 100px; cursor: pointer;margin-right: 10px');
+ img.setAttribute('title', '查看图片');
+ img.setAttribute('data-id', ids);
+ img.addEventListener('click', function () {
+ // showPicture(this.getAttribute('data-id'), 'preRectifyPhoto');
+ openPicture(url)
+ });
+ imageContainer.appendChild(img);
+ });
+ }
+ });
+
+ function openPicture(url) {
+ window.open(url)
+ }
+
/* 图片--查看 */
- function showPicture(id,type) {
+ function showPicture(id, type) {
var showPictureUrl = "/tr/hiddenDangerCheck/dangerBase/showPicture/{type}/{id}";
var urlLast = showPictureUrl.replace("{type}", type).replace("{id}", id);
$.operate.openDetailInfo("查看图片", urlLast);
@@ -347,17 +420,15 @@
//切换隐患核查结果（隐患级别）
$("#dangerLevel").on("change", function () {
- var dangerLevel = $("#dangerLevel").val();
- if(dangerLevel=="2"){//不是隐患
+ var dangerLevel = $("#dangerLevel").val();
+ if (dangerLevel == "2") {//不是隐患
$(".showByDangerLevelChange").hide();
$(".showByDangerLevelChange").find(":input").attr("disabled", true);
- }else{//一般隐患或重大隐患
+ } else {//一般隐患或重大隐患
$(".showByDangerLevelChange").show();
$(".showByDangerLevelChange").find(":input").attr("disabled", false);
}
});
-
-
var prefix = ctx + "tr/hiddenDangerCheck/dangerExamine";
@@ -369,8 +440,8 @@
function submitHandler() {
if ($.validate.form()) {
var data = $('#form-hdcp-edit').serializeArray();
- var dangerLevel = $("#dangerLevel").val();
- if(dangerLevel=="0"||dangerLevel=="1") {//一般隐患或重大隐患
+ var dangerLevel = $("#dangerLevel").val();
+ if (dangerLevel == "0" || dangerLevel == "1") {//一般隐患或重大隐患
// var rectifyUserName = $("select[name='rectifyUserId']").find("option:selected").text();//整改人名称
// data.push({"name": "rectifyUserName", "value": rectifyUserName});
}
@@ -397,10 +468,10 @@
function doSubmitBeCheckedDept(index, layero) {
var tree = layero.find("iframe")[0].contentWindow.$._tree;
// if ($.tree.notAllowParents(tree)) {
- var body = layer.getChildFrame('body', index);
- $("#rectifyDeptId").val(body.find('#treeId').val());
- $("#rectifyDeptName").val(body.find('#treeName').val());
- layer.close(index);
+ var body = layer.getChildFrame('body', index);
+ $("#rectifyDeptId").val(body.find('#treeId').val());
+ $("#rectifyDeptName").val(body.find('#treeName').val());
+ layer.close(index);
// }
}
@@ -431,6 +502,7 @@
});
});
}
+
/*隐患责任整改人 选择 end*/
$("input[name='rectifyCompleteTime']").datetimepicker({
--
Gitblit v1.9.2