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/dangerRectify/detailDangerRectify.html | 88 ++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 84 insertions(+), 4 deletions(-)
diff --git a/src/main/resources/templates/tr/hiddenDangerCheck/dangerRectify/detailDangerRectify.html b/src/main/resources/templates/tr/hiddenDangerCheck/dangerRectify/detailDangerRectify.html
index 5474e69..84de8e8 100644
--- a/src/main/resources/templates/tr/hiddenDangerCheck/dangerRectify/detailDangerRectify.html
+++ b/src/main/resources/templates/tr/hiddenDangerCheck/dangerRectify/detailDangerRectify.html
@@ -68,6 +68,17 @@
</div>
</div>
</div>
+ <div class="col-sm-6">
+ <div class="form-group">
+ <label class="col-sm-4 control-label">隐患来源：</label>
+ <div class="col-sm-8">
+ <select th:field="*{dangerSrc}" class="form-control m-b" th:with="type=${@dict.getType('danger_source')}" readonly="readonly">
+ <option value="" disabled>--请选择隐患来源--</option>
+ <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" disabled></option>
+ </select>
+ </div>
+ </div>
+ </div>
</div>
@@ -122,12 +133,22 @@
<div class="form-group">
<label class="col-sm-4 control-label ">隐患名称：</label>
<div class="col-sm-8">
- <textarea th:value="*{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>
</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">
@@ -142,7 +163,7 @@
<div class="form-group">
<label class="col-sm-4 control-label ">隐患描述：</label>
<div class="col-sm-8">
- <textarea th:value="*{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>
@@ -173,11 +194,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="allPics1"
th:src="*{preRectifyPhoto}"
onclick="showPicture(this.getAttribute('data-id'),'preRectifyPhoto')"
th:data-id="${hdcp.id}">
+ <div class="image-container1" style="display: flex;align-items: flex-start"></div>
</div>
</div>
</div>
@@ -337,11 +365,18 @@
<div class="col-sm-6">
<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="*{postRectifyPhoto}"-->
+<!-- onclick="showPicture(this.getAttribute('data-id'),'postRectifyPhoto')"-->
+<!-- th:data-id="${hdcp.id}">-->
+ <img style="width: 100px; height: 100px;cursor:pointer;display: none"
title="查看图片"
+ class="allPics2"
th:src="*{postRectifyPhoto}"
onclick="showPicture(this.getAttribute('data-id'),'postRectifyPhoto')"
th:data-id="${hdcp.id}">
+ <div class="image-container2" style="display: flex;align-items: flex-start"></div>
</div>
</div>
</div>
@@ -360,6 +395,51 @@
<th:block th:include="include :: footer"/>
<th:block th:include="include :: jquery-steps-js"/>
<script type="text/javascript">
+ $(document).ready(function () {
+ var imgsUrl1 = $('.allPics1');
+ var imageUrls1 = imgsUrl1.attr('src')
+ var ids = imgsUrl1.attr('data-id')
+ var imageContainer1 = document.querySelector('.image-container1');
+ // 将逗号分隔的字符串拆分为URL数组
+ var imageUrlArray1 = imageUrls1.split(',');
+ // 遍历URL数组并创建img元素
+ imageUrlArray1.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)
+ });
+ imageContainer1.appendChild(img);
+ });
+
+ var imgsUrl2 = $('.allPics2');
+ var imageUrls2 = imgsUrl2.attr('src')
+ var imageContainer2 = document.querySelector('.image-container2');
+ // 将逗号分隔的字符串拆分为URL数组
+ var imageUrlArray2 = imageUrls2.split(',');
+ // 遍历URL数组并创建img元素
+ imageUrlArray2.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)
+ });
+ imageContainer2.appendChild(img);
+ });
+ });
+
+ function openPicture(url) {
+ window.open(url)
+ }
+
/* 图片--查看 */
function showPicture(id,type) {
var showPictureUrl = "/tr/hiddenDangerCheck/dangerBase/showPicture/{type}/{id}";
--
Gitblit v1.9.2