From aa2051a2327c079105110f5424f3a44ffaa0c7bb Mon Sep 17 00:00:00 2001
From: 马宇豪 <978517621@qq.com>
Date: 星期五, 25 八月 2023 10:11:08 +0800
Subject: [PATCH] 延期整改

---
 src/main/resources/templates/tr/riskCheckPoint/detailByLS.html |  227 +++++++++++++++++++++++++++-----------------------------
 1 files changed, 110 insertions(+), 117 deletions(-)

diff --git a/src/main/resources/templates/tr/riskCheckPoint/detailByLS.html b/src/main/resources/templates/tr/riskCheckPoint/detailByLS.html
index 21eb777..823e0e6 100644
--- a/src/main/resources/templates/tr/riskCheckPoint/detailByLS.html
+++ b/src/main/resources/templates/tr/riskCheckPoint/detailByLS.html
@@ -130,6 +130,70 @@
                 </div>
             </div>
 
+            <!--现有评分-->
+            <div class="panel panel-default">
+                <div class="panel-heading">
+                    固有风险评分
+                </div>
+                <div class="panel-body">
+                    <div class="form-group">
+                        <label class="col-sm-3 control-label">LS_L的数值:</label>
+                        <div class="col-sm-8">
+                            <input id="detailScoreByLS_LNow"  placeholder="选择分值" th:field="*{evaluationNowLsLScore}" class="form-control" type="text"  maxlength="30" readonly  required>
+                            <input id="detailIdByLS_LNow" name="evaluationNowLsL" th:field="*{evaluationNowLsL}" type="hidden">
+                        </div>
+                    </div>
+                    <div class="form-group">
+                        <label class="col-sm-3 control-label">LS_S的数值:</label>
+                        <div class="col-sm-8">
+                            <input id="detailScoreByLS_SNow"  placeholder="选择分值" th:field="*{evaluationNowLsSScore}" class="form-control" type="text"   maxlength="30" readonly  required>
+                            <input id="detailIdByLS_SNow" name="evaluationNowLsS" th:field="*{evaluationNowLsS}" type="hidden">
+                        </div>
+                    </div>
+
+                </div>
+
+            </div>
+
+            <!--现有分值-->
+            <div class="panel panel-default">
+                <div class="panel-heading">
+                    固有风险分值
+                </div>
+                <div class="panel-body">
+                    <div class="form-group">
+                        <label class="col-sm-3 control-label">风险值:</label>
+                        <div class="col-sm-8">
+                            <input id="evaluationNowFengxianzhi" name="evaluationNowFengxianzhi" th:field="*{evaluationNowFengxianzhi}" class="form-control" type="text" readonly>
+                        </div>
+                    </div>
+                    <div class="form-group">
+                        <label class="col-sm-3 control-label">级别:</label>
+                        <div class="col-sm-8">
+                            <input id="evaluationNowJibie" name="evaluationNowJibie" th:field="*{evaluationNowJibie}" class="form-control" type="text" readonly>
+                        </div>
+                    </div>
+                    <div class="form-group">
+                        <label class="col-sm-3 control-label">风险级别:</label>
+                        <div class="col-sm-8">
+                            <input id="evaluationNowFengxianJibie" name="evaluationNowFengxianJibie" th:field="*{evaluationNowFengxianJibie}" class="form-control" type="text" readonly>
+                        </div>
+                    </div>
+                    <div class="form-group">
+                        <label class="col-sm-3 control-label">风险色:</label>
+                        <div class="col-sm-8">
+                            <input id="evaluationNowFengxianse" name="evaluationNowFengxianse" th:field="*{evaluationNowFengxianse}" class="form-control" type="text" readonly>
+                        </div>
+                    </div>
+                    <div class="form-group">
+                        <label class="col-sm-3 control-label">管控层级:</label>
+                        <div class="col-sm-8">
+                            <input id="evaluationNowGuankongCengji" name="evaluationNowGuankongCengji" th:field="*{evaluationNowGuankongCengji}" class="form-control" type="text" readonly>
+                        </div>
+                    </div>
+                </div>
+
+            </div>
 
             <!--现有措施-->
             <div class="panel panel-default">
@@ -138,24 +202,21 @@
                 </div>
                 <div class="panel-body">
                     <!--现有管控措施-->
-                    <span th:if="(*{evaluationNowGuanli} == null or *{evaluationNowGuanli} == '' )or
-                            (*{evaluationNowJiaoyu} == null  or *{evaluationNowJiaoyu} == '' ) or
-                            (*{evaluationNowFanghu} == null  or *{evaluationNowFanghu} == '' ) or
-                            (*{evaluationNowYingji} == null or *{evaluationNowYingji} == '') " >
-                        <!--只输入工程技术措施,显示模式-->
-                        <div class="form-group">
-                            <label class="col-sm-3 control-label">管控措施:</label>
-                            <div class="col-sm-8">
-                                <input name="evaluationNowJishu" th:field="*{evaluationNowJishu}" class="form-control" type="text" readonly>
-                            </div>
-                        </div>
+<!--                    <span th:if="(*{evaluationNowGuanli} == null or *{evaluationNowGuanli} == '' )or-->
+<!--                            (*{evaluationNowJiaoyu} == null  or *{evaluationNowJiaoyu} == '' ) or-->
+<!--                            (*{evaluationNowFanghu} == null  or *{evaluationNowFanghu} == '' ) or-->
+<!--                            (*{evaluationNowYingji} == null or *{evaluationNowYingji} == '') " >-->
+<!--                        &lt;!&ndash;只输入工程技术措施,显示模式&ndash;&gt;-->
+<!--                        <div class="form-group">-->
+<!--                            <label class="col-sm-3 control-label">管控措施:</label>-->
+<!--                            <div class="col-sm-8">-->
+<!--                                <input name="evaluationNowJishu" th:field="*{evaluationNowJishu}" class="form-control" type="text" readonly>-->
+<!--                            </div>-->
+<!--                        </div>-->
 
-                    </span>
+<!--                    </span>-->
 
-                    <span th:if="${evaluationNowGuanli} != null and
-                            *{evaluationNowJiaoyu} != null and
-                            *{evaluationNowFanghu} != null and
-                            *{evaluationNowYingji} != null ">
+                    <span>
                         <!--五条管控措施都输入的模式,显示模式-->
                         <div class="form-group">
                             <label class="col-sm-3 control-label">技术措施:</label>
@@ -193,72 +254,71 @@
                 </div>
             </div>
 
-            <!--现有评分-->
+
+            <!--建议评分-->
             <div class="panel panel-default">
                 <div class="panel-heading">
-                    现有评分
+                    现有风险评分
                 </div>
                 <div class="panel-body">
                     <div class="form-group">
                         <label class="col-sm-3 control-label">LS_L的数值:</label>
                         <div class="col-sm-8">
-                            <input id="detailScoreByLS_LNow"  placeholder="选择分值" th:field="*{evaluationNowLsLScore}" class="form-control" type="text"  maxlength="30" readonly  required>
-                            <input id="detailIdByLS_LNow" name="evaluationNowLsL" th:field="*{evaluationNowLsL}" type="hidden">
+                            <input id="detailScoreByLS_LAfter"  placeholder="选择分值" th:field="*{evaluationAfterLsLScore}" class="form-control" type="text" maxlength="30" readonly  required>
+                            <input id="detailIdByLS_LAfter" name="evaluationAfterLsL" th:field="*{evaluationAfterLsL}" type="hidden">
                         </div>
                     </div>
                     <div class="form-group">
                         <label class="col-sm-3 control-label">LS_S的数值:</label>
                         <div class="col-sm-8">
-                            <input id="detailScoreByLS_SNow"  placeholder="选择分值" th:field="*{evaluationNowLsSScore}" class="form-control" type="text"   maxlength="30" readonly  required>
-                            <input id="detailIdByLS_SNow" name="evaluationNowLsS" th:field="*{evaluationNowLsS}" type="hidden">
+                            <input id="detailScoreByLS_SAfter"  placeholder="选择分值" th:field="*{evaluationAfterLsSScore}" class="form-control" type="text"  maxlength="30" readonly  required>
+                            <input id="detailIdByLS_SAfter" name="evaluationAfterLsS" th:field="*{evaluationAfterLsS}" type="hidden">
                         </div>
                     </div>
-
                 </div>
 
             </div>
 
-            <!--现有分值-->
+
+            <!--建议分值-->
             <div class="panel panel-default">
                 <div class="panel-heading">
-                    现有分值
+                    现有风险分值
                 </div>
                 <div class="panel-body">
                     <div class="form-group">
-                        <label class="col-sm-3 control-label">风险值:</label>
+                        <label class="col-sm-3 control-label">风险评价风险值:</label>
                         <div class="col-sm-8">
-                            <input id="evaluationNowFengxianzhi" name="evaluationNowFengxianzhi" th:field="*{evaluationNowFengxianzhi}" class="form-control" type="text" readonly>
+                            <input name="evaluationAfterFengxianzhi" th:field="*{evaluationAfterFengxianzhi}" class="form-control" type="text" readonly>
                         </div>
                     </div>
                     <div class="form-group">
-                        <label class="col-sm-3 control-label">级别:</label>
+                        <label class="col-sm-3 control-label">风险评价级别:</label>
                         <div class="col-sm-8">
-                            <input id="evaluationNowJibie" name="evaluationNowJibie" th:field="*{evaluationNowJibie}" class="form-control" type="text" readonly>
+                            <input name="evaluationAfterJibie" th:field="*{evaluationAfterJibie}" class="form-control" type="text" readonly>
                         </div>
                     </div>
                     <div class="form-group">
-                        <label class="col-sm-3 control-label">风险级别:</label>
+                        <label class="col-sm-3 control-label">风险评价风险级别:</label>
                         <div class="col-sm-8">
-                            <input id="evaluationNowFengxianJibie" name="evaluationNowFengxianJibie" th:field="*{evaluationNowFengxianJibie}" class="form-control" type="text" readonly>
+                            <input name="evaluationAfterFengxianJibie" th:field="*{evaluationAfterFengxianJibie}" class="form-control" type="text" readonly>
                         </div>
                     </div>
                     <div class="form-group">
-                        <label class="col-sm-3 control-label">风险色:</label>
+                        <label class="col-sm-3 control-label">风险评价风险色:</label>
                         <div class="col-sm-8">
-                            <input id="evaluationNowFengxianse" name="evaluationNowFengxianse" th:field="*{evaluationNowFengxianse}" class="form-control" type="text" readonly>
+                            <input name="evaluationAfterFengxianse" th:field="*{evaluationAfterFengxianse}" class="form-control" type="text" readonly>
                         </div>
                     </div>
                     <div class="form-group">
-                        <label class="col-sm-3 control-label">管控层级:</label>
+                        <label class="col-sm-3 control-label">风险评价管控层级:</label>
                         <div class="col-sm-8">
-                            <input id="evaluationNowGuankongCengji" name="evaluationNowGuankongCengji" th:field="*{evaluationNowGuankongCengji}" class="form-control" type="text" readonly>
+                            <input name="evaluationAfterGuankongCengji" th:field="*{evaluationAfterGuankongCengji}" class="form-control" type="text" readonly>
                         </div>
                     </div>
                 </div>
 
             </div>
-
-
 
             <!--建议措施-->
             <div class="panel panel-default">
@@ -268,24 +328,21 @@
                 <div class="panel-body">
                     <!--建议管控措施-->
 
-                    <span th:if="(*{evaluationAfterGuanli} == null or *{evaluationAfterGuanli} == '' )or
-                            (*{evaluationAfterJiaoyu} == null  or *{evaluationAfterJiaoyu} == '' ) or
-                            (*{evaluationAfterFanghu} == null  or *{evaluationAfterFanghu} == '' ) or
-                            (*{evaluationAfterYingji} == null or *{evaluationAfterYingji} == '') " >
-                        <!--只输入工程技术措施,显示模式-->
-                        <div class="form-group">
-                            <label class="col-sm-3 control-label">管控措施:</label>
-                            <div class="col-sm-8">
-                                <input name="evaluationAfterJishu" th:field="*{evaluationAfterJishu}" class="form-control" type="text" readonly>
-                            </div>
-                        </div>
+<!--                    <span th:if="(*{evaluationAfterGuanli} == null or *{evaluationAfterGuanli} == '' )or-->
+<!--                            (*{evaluationAfterJiaoyu} == null  or *{evaluationAfterJiaoyu} == '' ) or-->
+<!--                            (*{evaluationAfterFanghu} == null  or *{evaluationAfterFanghu} == '' ) or-->
+<!--                            (*{evaluationAfterYingji} == null or *{evaluationAfterYingji} == '') " >-->
+<!--                        &lt;!&ndash;只输入工程技术措施,显示模式&ndash;&gt;-->
+<!--                        <div class="form-group">-->
+<!--                            <label class="col-sm-3 control-label">管控措施:</label>-->
+<!--                            <div class="col-sm-8">-->
+<!--                                <input name="evaluationAfterJishu" th:field="*{evaluationAfterJishu}" class="form-control" type="text" readonly>-->
+<!--                            </div>-->
+<!--                        </div>-->
 
-                    </span>
+<!--                    </span>-->
 
-                    <span th:if="*{evaluationAfterGuanli} != null and
-                            *{evaluationAfterJiaoyu} != null and
-                            *{evaluationAfterFanghu} != null and
-                            *{evaluationAfterYingji} != null ">
+                    <span>
                         <!--五条管控措施都输入的模式,显示模式-->
                         <div class="form-group">
                             <label class="col-sm-3 control-label">技术措施:</label>
@@ -323,70 +380,6 @@
 
             </div>
 
-            <!--建议评分-->
-            <div class="panel panel-default">
-                <div class="panel-heading">
-                    建议评分
-                </div>
-                <div class="panel-body">
-                    <div class="form-group">
-                        <label class="col-sm-3 control-label">LS_L的数值:</label>
-                        <div class="col-sm-8">
-                            <input id="detailScoreByLS_LAfter"  placeholder="选择分值" th:field="*{evaluationAfterLsLScore}" class="form-control" type="text" maxlength="30" readonly  required>
-                            <input id="detailIdByLS_LAfter" name="evaluationAfterLsL" th:field="*{evaluationAfterLsL}" type="hidden">
-                        </div>
-                    </div>
-                    <div class="form-group">
-                        <label class="col-sm-3 control-label">LS_S的数值:</label>
-                        <div class="col-sm-8">
-                            <input id="detailScoreByLS_SAfter"  placeholder="选择分值" th:field="*{evaluationAfterLsSScore}" class="form-control" type="text"  maxlength="30" readonly  required>
-                            <input id="detailIdByLS_SAfter" name="evaluationAfterLsS" th:field="*{evaluationAfterLsS}" type="hidden">
-                        </div>
-                    </div>
-                </div>
-
-            </div>
-
-
-            <!--建议分值-->
-            <div class="panel panel-default">
-                <div class="panel-heading">
-                    建议分值
-                </div>
-                <div class="panel-body">
-                    <div class="form-group">
-                        <label class="col-sm-3 control-label">固有风险评价风险值:</label>
-                        <div class="col-sm-8">
-                            <input name="evaluationAfterFengxianzhi" th:field="*{evaluationAfterFengxianzhi}" class="form-control" type="text" readonly>
-                        </div>
-                    </div>
-                    <div class="form-group">
-                        <label class="col-sm-3 control-label">固有风险评价级别:</label>
-                        <div class="col-sm-8">
-                            <input name="evaluationAfterJibie" th:field="*{evaluationAfterJibie}" class="form-control" type="text" readonly>
-                        </div>
-                    </div>
-                    <div class="form-group">
-                        <label class="col-sm-3 control-label">固有风险评价风险级别:</label>
-                        <div class="col-sm-8">
-                            <input name="evaluationAfterFengxianJibie" th:field="*{evaluationAfterFengxianJibie}" class="form-control" type="text" readonly>
-                        </div>
-                    </div>
-                    <div class="form-group">
-                        <label class="col-sm-3 control-label">固有风险评价风险色:</label>
-                        <div class="col-sm-8">
-                            <input name="evaluationAfterFengxianse" th:field="*{evaluationAfterFengxianse}" class="form-control" type="text" readonly>
-                        </div>
-                    </div>
-                    <div class="form-group">
-                        <label class="col-sm-3 control-label">固有风险评价管控层级:</label>
-                        <div class="col-sm-8">
-                            <input name="evaluationAfterGuankongCengji" th:field="*{evaluationAfterGuankongCengji}" class="form-control" type="text" readonly>
-                        </div>
-                    </div>
-                </div>
-
-            </div>
 
             <div class="form-group">
                 <label class="col-sm-3 control-label">评价状态:</label>

--
Gitblit v1.9.2