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/editNextConfirm.html | 90 +++++++++++++++++++++++++++------------------
1 files changed, 54 insertions(+), 36 deletions(-)
diff --git a/src/main/resources/templates/tr/hiddenDangerCheck/dangerExamine/editNextConfirm.html b/src/main/resources/templates/tr/hiddenDangerCheck/dangerExamine/editNextConfirm.html
index 2cc3097..6311f5f 100644
--- a/src/main/resources/templates/tr/hiddenDangerCheck/dangerExamine/editNextConfirm.html
+++ b/src/main/resources/templates/tr/hiddenDangerCheck/dangerExamine/editNextConfirm.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,7 +143,8 @@
<div class="form-group">
<label class="col-sm-4 control-label ">隐患名称：</label>
<div class="col-sm-8">
- <textarea th:field="*{dangerName}" class="form-control" type="text" rows="4" readonly="readonly"></textarea>
+ <textarea th:field="*{dangerName}" class="form-control" type="text" rows="4"
+ readonly="readonly"></textarea>
</div>
</div>
</div>
@@ -147,12 +164,22 @@
<div class="form-group">
<label class="col-sm-4 control-label ">隐患描述：</label>
<div class="col-sm-8">
- <textarea th:field="*{dangerDescription}" class="form-control" type="text" rows="4" readonly="readonly"></textarea>
+ <textarea th:field="*{dangerDescription}" 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">
@@ -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,11 @@
<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;"-->
-<!-- title="查看图片"-->
-<!-- th:src="*{preRectifyPhoto}"-->
-<!-- onclick="showPicture(this.getAttribute('data-id'),'preRectifyPhoto')"-->
-<!-- th:data-id="${hdcp.id}">-->
+ <!-- <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"
@@ -229,8 +256,10 @@
<div class="form-group showByDangerLevelChange">
<label class="col-sm-3 control-label is-required">选择核查人：</label>
<div class="col-sm-8">
- <input id="examineUserName" name="examineUserName" placeholder="选择下一步隐患核查人" class="form-control" type="text" onclick="selectConfirmUser()" maxlength="30" readonly="true" required>
- <input id="examineUserId" name="examineUserId" type="hidden" >
+ <input id="examineUserName" name="examineUserName" placeholder="选择下一步隐患核查人"
+ class="form-control" type="text" onclick="selectConfirmUser()" maxlength="30" readonly="true"
+ required>
+ <input id="examineUserId" name="examineUserId" type="hidden">
</div>
</div>
@@ -246,7 +275,7 @@
var ids = imgsUrl.attr('data-id')
var imageContainer = document.querySelector('.image-container');
- if(imageUrls && imageUrls !== '') {
+ if (imageUrls && imageUrls !== '') {
// 将逗号分隔的字符串拆分为URL数组
var imageUrlArray = imageUrls.split(',');
@@ -271,7 +300,7 @@
}
/* 图片--查看 */
- 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);
@@ -279,11 +308,11 @@
//切换隐患核查结果（隐患级别）
$("#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);
}
@@ -299,25 +328,14 @@
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 examineUserName = $("select[name='examineUserId']").find("option:selected").text();//整改人名称
// data.push({"name": "examineUserName", "value": examineUserName});
}
- var newData = {
- id: null,
- examineUserName: '',
- examineUserId: null
- }
- for(var i=0,i<data.length,i++){
- if(data[i].name == 'id'){newData.id = data[i].value}
- if(data[i].name == 'examineUserName'){newData.examineUserName = data[i].value}
- if(data[i].name == 'examineUserId'){newData.examineUserId = data[i].value}
- }
- console.log(newData,'data')
- $.operate.save(prefix + "/editNextConfirmSave", newData);
+ $.operate.save(prefix + "/editNextConfirmSave", data);
}
- }
+ };
/*隐患责任整改人 选择 start*/
function selectConfirmUser() {
@@ -337,7 +355,7 @@
layer.close(index);
});
});
- }
+ };
/*隐患责任整改人 选择 end*/
$("input[name='rectifyCompleteTime']").datetimepicker({
--
Gitblit v1.9.2