From 8f860f53c3c62c645f33018291d82266dd43a578 Mon Sep 17 00:00:00 2001
From: 16639036659 <577530412@qq.com>
Date: 星期五, 25 八月 2023 09:49:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/resources/templates/tr/hiddenDangerCheck/dangerReport/detailYesDanger.html | 34 +++++++++++++++++++++++++++++++---
1 files changed, 31 insertions(+), 3 deletions(-)
diff --git a/src/main/resources/templates/tr/hiddenDangerCheck/dangerReport/detailYesDanger.html b/src/main/resources/templates/tr/hiddenDangerCheck/dangerReport/detailYesDanger.html
index 77ed94b..4e7b271 100644
--- a/src/main/resources/templates/tr/hiddenDangerCheck/dangerReport/detailYesDanger.html
+++ b/src/main/resources/templates/tr/hiddenDangerCheck/dangerReport/detailYesDanger.html
@@ -105,7 +105,7 @@
<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>
@@ -125,7 +125,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>
@@ -156,11 +156,13 @@
<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;display: none"
title="查看图片"
+ class="allPics"
th:src="*{preRectifyPhoto}"
onclick="showPicture(this.getAttribute('data-id'),'preRectifyPhoto')"
th:data-id="${hiddenDangerCheckPoint.id}">
+ <div class="image-container" style="display: flex;align-items: flex-start"></div>
</div>
</div>
</div>
@@ -199,12 +201,38 @@
<th:block th:include="include :: footer"/>
<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');
+
+ // 将逗号分隔的字符串拆分为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 showPicture(id,type) {
var showPictureUrl = "/tr/hiddenDangerCheck/dangerBase/showPicture/{type}/{id}";
var urlLast = showPictureUrl.replace("{type}", type).replace("{id}", id);
$.operate.openDetailInfo("查看图片", urlLast);
}
+ function openPicture(url) {
+ window.open(url)
+ }
</script>
</body>
--
Gitblit v1.9.2