From 99f47aed6169857221bbabf058754c818611e0e8 Mon Sep 17 00:00:00 2001
From: 马宇豪 <978517621@qq.com>
Date: 星期三, 20 九月 2023 15:26:42 +0800
Subject: [PATCH] 验收时间
---
src/main/resources/templates/tr/hiddenDangerCheck/dangerAccept/editDangerAccept.html | 77 ++++++++++++++++++++++++++++++++++++--
1 files changed, 73 insertions(+), 4 deletions(-)
diff --git a/src/main/resources/templates/tr/hiddenDangerCheck/dangerAccept/editDangerAccept.html b/src/main/resources/templates/tr/hiddenDangerCheck/dangerAccept/editDangerAccept.html
index 08987e1..6814c2f 100644
--- a/src/main/resources/templates/tr/hiddenDangerCheck/dangerAccept/editDangerAccept.html
+++ b/src/main/resources/templates/tr/hiddenDangerCheck/dangerAccept/editDangerAccept.html
@@ -130,7 +130,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>
@@ -150,7 +150,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>
@@ -182,11 +182,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="allPics1"
th:src="*{preRectifyPhoto}"
onclick="showPicture(this.getAttribute('data-id'),'preRectifyPhoto')"
th:data-id="${hdcp.id}">
+ <div class="image-container1" style="display: flex;align-items: flex-start"></div>
</div>
</div>
</div>
@@ -346,11 +353,18 @@
<label class="col-sm-4 control-label ">隐患整改后视图：</label>
<div class="col-sm-8">
<div class="col-sm-8">
- <img style="width: 100px; height: 100px;cursor:pointer;"
+<!-- <img style="width: 100px; height: 100px;cursor:pointer;"-->
+<!-- title="查看图片"-->
+<!-- th:src="*{postRectifyPhoto}"-->
+<!-- onclick="showPicture(this.getAttribute('data-id'),'postRectifyPhoto')"-->
+<!-- th:data-id="${hdcp.id}">-->
+ <img style="width: 100px; height: 100px;cursor:pointer;display: none"
title="查看图片"
+ class="allPics2"
th:src="*{postRectifyPhoto}"
onclick="showPicture(this.getAttribute('data-id'),'postRectifyPhoto')"
th:data-id="${hdcp.id}">
+ <div class="image-container2" style="display: flex;align-items: flex-start"></div>
</div>
</div>
</div>
@@ -386,6 +400,16 @@
</div>
<div class="form-group">
+ <label class="col-sm-3 control-label is-required">验收时间：</label>
+ <div class="col-sm-8">
+ <div class="input-group date">
+ <input name="acceptCreateTime" class="form-control" type="text" readonly="readonly" required>
+ <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
+ </div>
+ </div>
+ </div>
+
+ <div class="form-group">
<label class="col-sm-3 control-label">验收文件上传：</label>
<div class="col-sm-8">
<input name="acceptFile" id="acceptFile" type="hidden">
@@ -406,6 +430,51 @@
<th:block th:include="include :: jasny-bootstrap-js"/>
<th:block th:include="include :: jquery-steps-js"/>
<script type="text/javascript">
+ $(document).ready(function () {
+ var imgsUrl1 = $('.allPics1');
+ var imageUrls1 = imgsUrl1.attr('src')
+ var ids = imgsUrl1.attr('data-id')
+ var imageContainer1 = document.querySelector('.image-container1');
+ // 将逗号分隔的字符串拆分为URL数组
+ var imageUrlArray1 = imageUrls1.split(',');
+ // 遍历URL数组并创建img元素
+ imageUrlArray1.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)
+ });
+ imageContainer1.appendChild(img);
+ });
+
+ var imgsUrl2 = $('.allPics2');
+ var imageUrls2 = imgsUrl2.attr('src')
+ var imageContainer2 = document.querySelector('.image-container2');
+ // 将逗号分隔的字符串拆分为URL数组
+ var imageUrlArray2 = imageUrls2.split(',');
+ // 遍历URL数组并创建img元素
+ imageUrlArray2.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)
+ });
+ imageContainer2.appendChild(img);
+ });
+ });
+
+ function openPicture(url) {
+ window.open(url)
+ }
+
/* 图片--查看 */
function showPicture(id,type) {
var showPictureUrl = "/tr/hiddenDangerCheck/dangerBase/showPicture/{type}/{id}";
--
Gitblit v1.9.2