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 | 10 +++++++---
1 files changed, 7 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 2f97af7..4e7b271 100644
--- a/src/main/resources/templates/tr/hiddenDangerCheck/dangerReport/detailYesDanger.html
+++ b/src/main/resources/templates/tr/hiddenDangerCheck/dangerReport/detailYesDanger.html
@@ -162,7 +162,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>
@@ -214,11 +214,12 @@
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('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');
+ // showPicture(this.getAttribute('data-id'), 'preRectifyPhoto');
+ openPicture(url)
});
imageContainer.appendChild(img);
});
@@ -229,6 +230,9 @@
var urlLast = showPictureUrl.replace("{type}", type).replace("{id}", id);
$.operate.openDetailInfo("查看图片", urlLast);
}
+ function openPicture(url) {
+ window.open(url)
+ }
</script>
</body>
--
Gitblit v1.9.2