From 7972344897316d35069a57cccd26f5aa257107cb Mon Sep 17 00:00:00 2001
From: 马宇豪 <978517621@qq.com>
Date: Fri, 25 Aug 2023 10:26:41 +0800
Subject: [PATCH] 延期整改

---
 src/main/resources/templates/tr/hiddenDangerCheck/dangerExamine/editDangerExamine.html |   45 ++++++++++++++++++++++++++++++++++++++++-----
 1 files changed, 40 insertions(+), 5 deletions(-)

diff --git a/src/main/resources/templates/tr/hiddenDangerCheck/dangerExamine/editDangerExamine.html b/src/main/resources/templates/tr/hiddenDangerCheck/dangerExamine/editDangerExamine.html
index 1dcbe8b..d02b036 100644
--- a/src/main/resources/templates/tr/hiddenDangerCheck/dangerExamine/editDangerExamine.html
+++ b/src/main/resources/templates/tr/hiddenDangerCheck/dangerExamine/editDangerExamine.html
@@ -127,7 +127,7 @@
                 <div class="form-group">
                     <label class="col-sm-4 control-label ">隐患名称:</label>
                     <div class="col-sm-8">
-                        <input th:value="*{dangerName}" class="form-control" type="text" readonly="readonly">
+                        <textarea th:field="*{dangerName}" class="form-control" type="text" rows="4" readonly="readonly"></textarea>
                     </div>
                 </div>
             </div>
@@ -147,7 +147,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>
@@ -179,11 +179,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>
@@ -288,9 +295,9 @@
         </div>
 
         <div class="form-group showByDangerLevelChange">
-            <label class="col-sm-3 control-label is-required">风险单元:</label>
+            <label class="col-sm-3 control-label">风险单元:</label>
             <div class="col-sm-8">
-                <input id="checkPointName"  placeholder="选择风险单元" class="form-control" type="text"  onclick="selectRiskPoint()" maxlength="30" readonly="true" required>
+                <input id="checkPointName"  placeholder="选择风险单元" class="form-control" type="text"  onclick="selectRiskPoint()" maxlength="30" readonly="true">
                 <input id="checkPointNum" name="hazardCode" type="hidden">
             </div>
         </div>
@@ -337,6 +344,34 @@
 <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');
+
+        // 将逗号分隔的字符串拆分为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