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/dangerExamine/editDangerExamine.html | 108 ++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 104 insertions(+), 4 deletions(-)
diff --git a/src/main/resources/templates/tr/hiddenDangerCheck/dangerExamine/editDangerExamine.html b/src/main/resources/templates/tr/hiddenDangerCheck/dangerExamine/editDangerExamine.html
index d5188bc..51a4935 100644
--- a/src/main/resources/templates/tr/hiddenDangerCheck/dangerExamine/editDangerExamine.html
+++ b/src/main/resources/templates/tr/hiddenDangerCheck/dangerExamine/editDangerExamine.html
@@ -127,12 +127,21 @@
<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 +156,7 @@
<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>
@@ -179,11 +188,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 +258,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">
@@ -287,6 +309,49 @@
</div>
</div>
+ <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="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="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 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>
+ <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">
+ <textarea name="dangerReason" maxlength="500" class="form-control" rows="3" required></textarea>
+ </div>
+ </div>
</form>
</div>
@@ -294,6 +359,36 @@
<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) {
var showPictureUrl = "/tr/hiddenDangerCheck/dangerBase/showPicture/{type}/{id}";
@@ -363,6 +458,11 @@
/*隐患整改责任部门 选择 end*/
+ // 选择风险单元
+ function selectRiskPoint() {
+ var url = "/tr/riskList/selectRiskList/1"
+ $.modal.openNoConfirm("风险单元", url, '700', '500');
+ }
/*隐患责任整改人 选择 start*/
function selectRectifyUser() {
--
Gitblit v1.9.2