From e98eeaaa5766511fdb8e6d5e412eb1c59d1f07ce Mon Sep 17 00:00:00 2001
From: heheng <475597332@qq.com>
Date: 星期二, 24 六月 2025 10:24:43 +0800
Subject: [PATCH] 隐患来源功能外加仓吉基础数据定时上报
---
src/main/resources/templates/tr/hiddenDangerCheck/dangerReport/detailNotJudge.html | 29 +++++++++++++++++++++++------
1 files changed, 23 insertions(+), 6 deletions(-)
diff --git a/src/main/resources/templates/tr/hiddenDangerCheck/dangerReport/detailNotJudge.html b/src/main/resources/templates/tr/hiddenDangerCheck/dangerReport/detailNotJudge.html
index f69051c..f569ef9 100644
--- a/src/main/resources/templates/tr/hiddenDangerCheck/dangerReport/detailNotJudge.html
+++ b/src/main/resources/templates/tr/hiddenDangerCheck/dangerReport/detailNotJudge.html
@@ -32,12 +32,16 @@
<a><span th:text="${'2.【'+hiddenDangerCheckPoint.judgeUserName+'】判定'}"></span>
</a>
</li>
- <!--<li role="tab" class="disabled" aria-disabled="true">
- <a><span>1</span><br/><span>1</span></a>
+ <li role="tab" class="disabled notExecute" aria-disabled="true" aria-selected="false">
+ <a><span th:text="${'3.【'+hiddenDangerCheckPoint.rectifyUserName+'】整改'}"></span><br/>
+ <span th:text="${#dates.format(hiddenDangerCheckPoint.rectifyCreateTime,'yyyy-MM-dd HH:mm:ss')}"></span>
+ </a>
</li>
- <li role="tab" class="disabled" aria-disabled="true">
- <a><span>1</span><br/><span>1</span></a>
- </li>-->
+ <li role="tab" class="disabled notExecute" aria-disabled="true" aria-selected="false">
+ <a><span th:text="${'4.【'+hiddenDangerCheckPoint.acceptUserName+'】验收'}"></span><br/>
+ <span th:text="${#dates.format(hiddenDangerCheckPoint.acceptCreateTime,'yyyy-MM-dd HH:mm:ss')}"></span>
+ </a>
+ </li>
</ul>
</div>
</div>
@@ -55,7 +59,19 @@
</div>
</div>
</div>
+ <div class="col-sm-6">
+ <div class="form-group">
+ <label class="col-sm-4 control-label">隐患来源：</label>
+ <div class="col-sm-8">
+ <select th:field="*{dangerSrc}" class="form-control m-b" th:with="type=${@dict.getType('danger_source')}" readonly="readonly">
+ <option value="" disabled>--请选择隐患来源--</option>
+ <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" disabled></option>
+ </select>
+ </div>
+ </div>
+ </div>
</div>
+
<div class="row">
<div class="col-sm-6">
@@ -137,7 +153,8 @@
<div class="form-group">
<label class="col-sm-4 control-label ">隐患发现时间：</label>
<div class="col-sm-8">
- <input th:value="*{findTime}" class="form-control" type="text" readonly="readonly">
+ <input th:value="${#dates.format(hiddenDangerCheckPoint.findTime,'yyyy-MM-dd')}"
+ class="form-control" type="text" readonly="readonly">
</div>
</div>
</div>
--
Gitblit v1.9.2