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/dangerReport/editJudgeDangerReport.html |   60 +++++++++++++++++++++++++++++++++++++++++++-----------------
 1 files changed, 43 insertions(+), 17 deletions(-)

diff --git a/src/main/resources/templates/tr/hiddenDangerCheck/dangerReport/editJudgeDangerReport.html b/src/main/resources/templates/tr/hiddenDangerCheck/dangerReport/editJudgeDangerReport.html
index 1988a2c..2f134b0 100644
--- a/src/main/resources/templates/tr/hiddenDangerCheck/dangerReport/editJudgeDangerReport.html
+++ b/src/main/resources/templates/tr/hiddenDangerCheck/dangerReport/editJudgeDangerReport.html
@@ -45,6 +45,12 @@
                 <input th:value="*{dangerName}" class="form-control" type="text" readonly="readonly">
             </div>
         </div>
+        <div class="form-group">
+            <label class="col-sm-3 control-label is-required">排查方法:</label>
+            <div class="col-sm-8">
+                <input th:value="*{remark}" class="form-control" type="text" readonly="readonly">
+            </div>
+        </div>
 
         <div class="form-group">
             <label class="col-sm-3 control-label is-required">隐患描述:</label>
@@ -92,9 +98,25 @@
 
 
         <div class="form-group">
-            <label class="col-sm-3 control-label  is-required">判定人:</label>
+            <label class="col-sm-3 control-label  is-required">隐患责任人(判定人):</label>
             <div class="col-sm-8">
                 <input th:value="*{judgeUserName}" class="form-control" type="text" readonly="readonly">
+            </div>
+        </div>
+
+        <div class="form-group">
+            <label class="col-sm-3 control-label  is-required">隐患发现时间:</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 class="form-group">
+            <label class="col-sm-3 control-label is-required">检查人:</label>
+            <div class="col-sm-8">
+                <input th:value="*{checkPerson}" class="form-control" type="text" readonly="readonly">
             </div>
         </div>
 
@@ -104,14 +126,14 @@
             <label class="col-sm-3 control-label  is-required">隐患判定结果:</label>
             <div class="col-sm-8">
                 <select name="reportStatus" class="form-control m-b" required>
-                    <option value="1">不是隐患</option>
                     <option value="2">是隐患</option>
+<!--                    <option value="1">不是隐患</option>-->
                 </select>
             </div>
         </div>
 
 
-        <div class="form-group" id="showByReportStatusChange" style="display:none;">
+        <div class="form-group" id="showByReportStatusChange">
             <label class="col-sm-3 control-label is-required">核查人:</label>
             <div class="col-sm-8">
                 <input id="examineUserName"  name="examineUserName" placeholder="选择核查人" class="form-control" type="text"  onclick="selectExamineUser()" maxlength="30" readonly="true" required>
@@ -154,19 +176,19 @@
 
 
     //根据是否为隐患--来控制--显示选择核查人--是否显示
-    $("select[name='reportStatus']").change(function () {
-        var $thisVal = $(this).val();
-        if ($thisVal == "1") {
-            $("#showByReportStatusChange").hide();
-            $(".requiredByReportStatusChange").removeClass("is-required");
-            $("select[name='troubleTypeId']").attr("required", "required");
-
-        } else if ($thisVal == "2") {
-            $("#showByReportStatusChange").show();
-            $(".requiredByReportStatusChange").addClass("is-required");
-            $("select[name='troubleTypeId']").removeAttr("required");
-        }
-    });
+    // $("select[name='reportStatus']").change(function () {
+    //     var $thisVal = $(this).val();
+        // if ($thisVal == "1") {
+        //     $("#showByReportStatusChange").hide();
+        //     $(".requiredByReportStatusChange").removeClass("is-required");
+        //     $("select[name='troubleTypeId']").attr("required", "required");
+        //
+        // } else if ($thisVal == "2") {
+        //     $("#showByReportStatusChange").show();
+        //     $(".requiredByReportStatusChange").addClass("is-required");
+        //     $("select[name='troubleTypeId']").removeAttr("required");
+        // }
+    // });
 
 
     function submitHandler() {
@@ -215,7 +237,11 @@
 
     /*隐患责任部门 选择 end*/
 
-
+    $("input[name='findTime']").datetimepicker({
+        format: "yyyy-mm-dd",
+        minView: "month",
+        autoclose: true
+    });
 
     <!--layui图片文件上传-->
     layui.use('upload', function () {

--
Gitblit v1.9.2