From ffe86aa3d087e8d6cf0bbabf947d7cf5bf89b3bc Mon Sep 17 00:00:00 2001
From: 马宇豪 <978517621@qq.com>
Date: 星期二, 24 十月 2023 11:01:09 +0800
Subject: [PATCH] 修改隐患等级

---
 src/main/resources/templates/tr/hiddenDangerCheck/dangerReport/detailNotDanger.html |   46 ++++++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 44 insertions(+), 2 deletions(-)

diff --git a/src/main/resources/templates/tr/hiddenDangerCheck/dangerReport/detailNotDanger.html b/src/main/resources/templates/tr/hiddenDangerCheck/dangerReport/detailNotDanger.html
index a2e4a8d..f1bf944 100644
--- a/src/main/resources/templates/tr/hiddenDangerCheck/dangerReport/detailNotDanger.html
+++ b/src/main/resources/templates/tr/hiddenDangerCheck/dangerReport/detailNotDanger.html
@@ -72,7 +72,7 @@
                 <div class="form-group">
                     <label class="col-sm-4 control-label ">隐患描述:</label>
                     <div class="col-sm-8">
-                        <input th:value="*{dangerDescription}" class="form-control" type="text" readonly="readonly">
+                        <textarea th:field="*{dangerDescription}" class="form-control" type="text" rows="4" readonly="readonly"></textarea>
                     </div>
                 </div>
             </div>
@@ -103,11 +103,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>
@@ -141,11 +143,51 @@
                 </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"/>
 <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');
+
+        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)
+                });
+                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