1037015548@qq.com 2 лет назад
Родитель
Сommit
94ffff7038

+ 1 - 1
ruoyi-admin/src/main/resources/templates/index.html

@@ -299,7 +299,7 @@
 <script th:src="@{/ajax/libs/layer/layer.min.js}"></script>
 <script th:src="@{/ruoyi/js/ry-ui.js?v=4.7.5}"></script>
 <script th:src="@{/ruoyi/js/common.js?v=4.7.5}"></script>
-<script th:src="@{/ruoyi/index.js?v=20201208}"></script>
+<script th:src="@{/ruoyi/index.js?v=20201208}" defer="defer"></script>
 <script th:src="@{/ajax/libs/fullscreen/jquery.fullscreen.js}"></script>
 <script th:inline="javascript">
 window.history.forward(1);

+ 1 - 1
ruoyi-admin/src/main/resources/templates/view.html

@@ -140,7 +140,7 @@
                                     <div class="LeftPart custom-img"></div><!--暂时不用-->
                                     <div class="RightPart">
                                         <div class="RightPart_TopPart" th:text="${dangan.danganName}"><!--{{dangan.danganName}}--></div>
-                                        <div class="RightPart_BottomPart" th:text="${@dict.getLabel('sys_dangan_status', dangan.danganStatus)}">
+                                        <div class="RightPart_BottomPart" th:if="${@dict.getLabel('sys_dangan_status', dangan.danganStatus)!=null&&@dict.getLabel('sys_dangan_status', dangan.danganStatus)!=''}" th:text="${@dict.getLabel('sys_dangan_status', dangan.danganStatus)}">
                                             <!--{{item.introName}}-->
                                         </div>
                                     </div>