From db3a96f5be1646601d559c7d652116600c7b8646 Mon Sep 17 00:00:00 2001
From: 马宇豪 <978517621@qq.com>
Date: 星期二, 31 十月 2023 09:30:02 +0800
Subject: [PATCH] 添加详情字段
---
src/main/resources/templates/tr/hiddenDangerCheck/dangerReport/detailNotDanger.html | 55 +++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 41 insertions(+), 14 deletions(-)
diff --git a/src/main/resources/templates/tr/hiddenDangerCheck/dangerReport/detailNotDanger.html b/src/main/resources/templates/tr/hiddenDangerCheck/dangerReport/detailNotDanger.html
index c2202d7..0b56ee1 100644
--- a/src/main/resources/templates/tr/hiddenDangerCheck/dangerReport/detailNotDanger.html
+++ b/src/main/resources/templates/tr/hiddenDangerCheck/dangerReport/detailNotDanger.html
@@ -58,6 +58,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">
@@ -109,7 +119,7 @@
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>
@@ -143,6 +153,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"/>
@@ -154,23 +174,30 @@
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;');
- img.setAttribute('title', '查看图片');
- img.setAttribute('data-id', ids);
- 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