From e4d73d7b94999729c3f7c5e42de4161e5cc53c2f Mon Sep 17 00:00:00 2001
From: 16639036659 <577530412@qq.com>
Date: 星期五, 01 十二月 2023 16:26:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/resources/templates/tr/hiddenDangerCheck/dangerReport/detailYesDanger.html | 72 ++++++++++++++++++++++++++++--------
1 files changed, 56 insertions(+), 16 deletions(-)
diff --git a/src/main/resources/templates/tr/hiddenDangerCheck/dangerReport/detailYesDanger.html b/src/main/resources/templates/tr/hiddenDangerCheck/dangerReport/detailYesDanger.html
index 4e7b271..0639993 100644
--- a/src/main/resources/templates/tr/hiddenDangerCheck/dangerReport/detailYesDanger.html
+++ b/src/main/resources/templates/tr/hiddenDangerCheck/dangerReport/detailYesDanger.html
@@ -111,6 +111,16 @@
</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">
@@ -168,14 +178,32 @@
</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>
</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="${#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">
@@ -196,6 +224,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"/>
@@ -207,22 +245,24 @@
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, 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)
+ // 遍历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 showPicture(id,type) {
--
Gitblit v1.9.2