Browse Source

修复嵌套scrollbar问题

insomniaLee 6 years ago
parent
commit
21aa4ae7bf
1 changed files with 35 additions and 32 deletions
  1. 35 32
      src/main/resources/templates/agg_report_new.html

+ 35 - 32
src/main/resources/templates/agg_report_new.html

@@ -311,46 +311,49 @@
 
                         </h3>
                     </div>
-                    <div th:fragment="ul_reports" id="new-created-reports" class="box-body"
-                         style="font-size: 12px; max-height: 340px; overflow: scroll;">
-                        <div th:if="${finalReports.size() == 0}" style="font-size: 20px">
-                            暂无 <a onclick="showCreateBlock()" style="cursor: pointer">立即创建报告</a>
-                        </div>
-                        <ul class="list-group">
-
-                            <!-- other reports -->
-                            <th:block th:each="finalReport : ${finalReports}">
-                                <li class="list-group-item">
-                                    <div style="overflow: auto;">
-                                        <span th:text="${finalReport.id}"></span>
-                                        <span class="pull-right">
+                    <div th:fragment="ul_reports" id="new-created-reports-panel">
+                        <div  id="new-created-reports" class="box-body"
+                              style="font-size: 12px; max-height: 340px; overflow: scroll;">
+                            <div th:if="${finalReports.size() == 0}" style="font-size: 20px">
+                                暂无 <a onclick="showCreateBlock()" style="cursor: pointer">立即创建报告</a>
+                            </div>
+                            <ul class="list-group">
+
+                                <!-- other reports -->
+                                <th:block th:each="finalReport : ${finalReports}">
+                                    <li class="list-group-item">
+                                        <div style="overflow: auto;">
+                                            <span th:text="${finalReport.id}"></span>
+                                            <span class="pull-right">
                                             <a href="#" th:onclick="'editReport('+${finalReport.id}+')'" >编辑</a>
                                             <a href="#" th:onclick="'deleteReport('+ ${finalReport.id} +')'">删除</a>
                                         </span>
-                                    </div>
+                                        </div>
 
-                                    <div>
+                                        <div>
                                         <span>
                                             复现程度:<span th:text="${recurrent2String.get(finalReport.recurrent)}"></span>
                                         </span>
-                                        <span class="pull-right">
+                                            <span class="pull-right">
                                             分类:<span th:text="${category2String.get(finalReport.category)}"></span>
                                         </span>
-                                    </div>
-                                    <div>
-                                        严重程度:<span th:text="${severity2String.get(finalReport.severity)}"></span>
-                                    </div>
-                                    <br/>
-                                    <span th:text="${finalReport.description}"></span>
-                                    <br/>
-                                    <img class="my-img-thumbnail pointer to-add" th:src="${imgUrl}"
-                                         th:each="imgUrl,iterStat : ${finalReport.getImgUrls()}"
-                                         th:onclick="'javascript:showimage(\''+${imgUrl}+'\');'"/>
-                                </li>
-
-                            </th:block>
-
-                        </ul>
+                                        </div>
+                                        <div>
+                                            严重程度:<span th:text="${severity2String.get(finalReport.severity)}"></span>
+                                        </div>
+                                        <br/>
+                                        <span th:text="${finalReport.description}"></span>
+                                        <br/>
+                                        <img class="my-img-thumbnail pointer to-add" th:src="${imgUrl}"
+                                             th:each="imgUrl,iterStat : ${finalReport.getImgUrls()}"
+                                             th:onclick="'javascript:showimage(\''+${imgUrl}+'\');'"/>
+                                    </li>
+
+                                </th:block>
+
+                            </ul>
+                        </div>
+
                     </div>
                 </div>
 
@@ -510,7 +513,7 @@
     function loadPartReports() {
         console.log("局部刷新")
         /*<![CDATA[*/
-        $('#new-created-reports').load("/created_reports?masterId="+ masterId +"&caseId="+ caseId +"&examId="+ examId );
+        $('#new-created-reports-panel').load("/created_reports?masterId="+ masterId +"&caseId="+ caseId +"&examId="+ examId );
         //$('#new-report-create-block').load("/created_reports_form");
         finalReportId = null