From 7be0d5b901b999d2347774df3cc1a64927838bb3 Mon Sep 17 00:00:00 2001
From: heheng <475597332@qq.com>
Date: 星期二, 15 四月 2025 10:10:35 +0800
Subject: [PATCH] 优化每年专项数据获取

---
 src/main/resources/templates/tr/hiddenDangerCheck/dangerRectify/editDangerRectify.html |   56 ++++++++++++++++++++++++++++++++++++++++++++++++++++----
 1 files changed, 52 insertions(+), 4 deletions(-)

diff --git a/src/main/resources/templates/tr/hiddenDangerCheck/dangerRectify/editDangerRectify.html b/src/main/resources/templates/tr/hiddenDangerCheck/dangerRectify/editDangerRectify.html
index de8eb71..0eddc74 100644
--- a/src/main/resources/templates/tr/hiddenDangerCheck/dangerRectify/editDangerRectify.html
+++ b/src/main/resources/templates/tr/hiddenDangerCheck/dangerRectify/editDangerRectify.html
@@ -176,7 +176,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">
                 <div class="form-group">
@@ -222,11 +231,18 @@
                 <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;"-->
+<!--                             title="查看图片"-->
+<!--                             th:src="*{preRectifyPhoto}"-->
+<!--                             onclick="showPicture(this.getAttribute('data-id'),'preRectifyPhoto')"-->
+<!--                             th:data-id="${hdcp.id}">-->
+                        <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="${hdcp.id}">
+                        <div class="image-container" style="display: flex;align-items: flex-start"></div>
                     </div>
                 </div>
             </div>
@@ -364,8 +380,10 @@
         <div class="form-group">
             <label class="col-sm-3 control-label is-required">验收负责人:</label>
             <div class="col-sm-8">
-                <input id="acceptUserName"  name="acceptUserName"  placeholder="选择验收负责人" class="form-control" type="text"  onclick="selectAcceptUser()" maxlength="30" readonly="true" required>
-                <input id="acceptUserId" name="acceptUserId"   type="hidden" >
+<!--                <input id="acceptUserName"  name="acceptUserName"  placeholder="选择验收负责人" class="form-control" type="text"  onclick="selectAcceptUser()" maxlength="30" readonly="true" required>-->
+<!--                <input id="acceptUserId" name="acceptUserId"   type="hidden" >-->
+                <input name="acceptUserName" th:value="*{registerUserName}" class="form-control" type="text" readonly="readonly">
+                <input name="acceptUserId" th:value="*{registerUserId}" type="hidden">
             </div>
         </div>
 
@@ -402,6 +420,36 @@
 <th:block th:include="include :: datetimepicker-js"/>
 <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