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/dangerReport/detailNotDanger.html | 104 ++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 84 insertions(+), 20 deletions(-)
diff --git a/src/main/resources/templates/tr/hiddenDangerCheck/dangerReport/detailNotDanger.html b/src/main/resources/templates/tr/hiddenDangerCheck/dangerReport/detailNotDanger.html
index 13fb68c..9c7d6b2 100644
--- a/src/main/resources/templates/tr/hiddenDangerCheck/dangerReport/detailNotDanger.html
+++ b/src/main/resources/templates/tr/hiddenDangerCheck/dangerReport/detailNotDanger.html
@@ -33,12 +33,16 @@
<span th:text="${#dates.format(hiddenDangerCheckPoint.judgeCreateTime,'yyyy-MM-dd HH:mm:ss')}"></span>
</a>
</li>
- <!--<li role="tab" class="disabled" aria-disabled="true">
- <a><span>1</span><br/><span>1</span></a>
+ <li role="tab" class="disabled notExecute" aria-disabled="true" aria-selected="false">
+ <a><span th:text="${'3.【'+hiddenDangerCheckPoint.rectifyUserName+'】整改'}"></span><br/>
+ <span th:text="${#dates.format(hiddenDangerCheckPoint.rectifyCreateTime,'yyyy-MM-dd HH:mm:ss')}"></span>
+ </a>
</li>
- <li role="tab" class="disabled" aria-disabled="true">
- <a><span>1</span><br/><span>1</span></a>
- </li>-->
+ <li role="tab" class="disabled notExecute" aria-disabled="true" aria-selected="false">
+ <a><span th:text="${'4.【'+hiddenDangerCheckPoint.acceptUserName+'】验收'}"></span><br/>
+ <span th:text="${#dates.format(hiddenDangerCheckPoint.acceptCreateTime,'yyyy-MM-dd HH:mm:ss')}"></span>
+ </a>
+ </li>
</ul>
</div>
</div>
@@ -56,8 +60,30 @@
</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>
+
+ <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">
@@ -109,13 +135,13 @@
th:src="*{preRectifyPhoto}"
onclick="showPicture(this.getAttribute('data-id'),'preRectifyPhoto')"
th:data-id="${hiddenDangerCheckPoint.id}">
- <div class="image-container"></div>
+ <div class="image-container" style="display: flex;align-items: flex-start"></div>
</div>
</div>
</div>
<div class="col-sm-6">
<div class="form-group">
- <label class="col-sm-4 control-label ">判定人：</label>
+ <label class="col-sm-4 control-label ">隐患责任人（判定人）：</label>
<div class="col-sm-8">
<input th:value="*{judgeUserName}" class="form-control" type="text" readonly="readonly">
</div>
@@ -123,6 +149,26 @@
</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="*{findTime}" class="form-control" type="text" readonly="readonly">-->
+ <input th:value="${#dates.format(hiddenDangerCheckPoint.findTime,'yyyy-MM-dd')}"
+ class="form-control" type="text" readonly="readonly">
+ </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">
+ <input th:value="*{checkPerson}" class="form-control" type="text" readonly="readonly">
+ </div>
+ </div>
+ </div>
+ </div>
<div class="row">
<div class="col-sm-6">
@@ -143,6 +189,16 @@
</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="*{examineUserName}" class="form-control" type="text" readonly="readonly">
+ </div>
+ </div>
+ </div>
+ </div>
</form>
</div>
<th:block th:include="include :: footer"/>
@@ -151,25 +207,33 @@
$(document).ready(function () {
var imgsUrl = $('.allPics');
var imageUrls = imgsUrl.attr('src')
+ var ids = imgsUrl.attr('data-id')
var imageContainer = document.querySelector('.image-container');
- // 将逗号分隔的字符串拆分为URL数组
- var imageUrlArray = imageUrls.split(',');
+ if(imageUrls && imageUrls !== ''){
+ // 将逗号分隔的字符串拆分为URL数组
+ var imageUrlArray = imageUrls.split(',');
- // 遍历URL数组并创建img元素
- imageUrlArray.forEach(function(url) {
- var img = document.createElement('img');
- img.setAttribute('src', url);
- img.setAttribute('style', 'width: 100px; height: 100px; cursor: pointer;');
- img.setAttribute('title', '查看图片');
- img.setAttribute('data-id', hiddenDangerCheckPoint.id);
- img.addEventListener('click', function() {
- showPicture(this.getAttribute('data-id'), 'preRectifyPhoto');
+ // 遍历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);
});
- imageContainer.appendChild(img);
- });
+ }
});
+ function openPicture(url) {
+ window.open(url)
+ }
+
/* 图片--查看 */
function showPicture(id,type) {
var showPictureUrl = "/tr/hiddenDangerCheck/dangerBase/showPicture/{type}/{id}";
--
Gitblit v1.9.2