老河口增加二次供水系统

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysIndexController.java

@@ -489,18 +489,39 @@ public class SysIndexController extends BaseController
 //            }
 //        }
         //TODO 修改逻辑为定死的四个系统
-        UserRelate userRelate1 = new UserRelate();
-        userRelate1.setDanganName("营业收费");
-        UserRelate userRelate2 = new UserRelate();
-        userRelate2.setDanganName("报装管理");
-        UserRelate userRelate3 = new UserRelate();
-        userRelate3.setDanganName("网上营业厅");
-        UserRelate userRelate4 = new UserRelate();
-        userRelate4.setDanganName("手机抄表系统");
-        userRelateBottomList.add(userRelate1);
-        userRelateBottomList.add(userRelate2);
-        userRelateBottomList.add(userRelate3);
-        userRelateBottomList.add(userRelate4);
+        List<UserRelate> ss = userRelates.stream().filter(tx -> tx.getDanganName() != null && tx.getDanganName().contains("二次供水"))
+                .collect(Collectors.toList());
+        if (!CollectionUtils.isEmpty(ss)) {
+            UserRelate userRelate1 = new UserRelate();
+            userRelate1.setDanganName("营业收费");
+            UserRelate userRelate2 = new UserRelate();
+            userRelate2.setDanganName("二次供水系统");
+            userRelate2.setDanganUrl(ss.get(0).getDanganUrl());
+            UserRelate userRelate3 = new UserRelate();
+            userRelate3.setDanganName("网上营业厅");
+            UserRelate userRelate4 = new UserRelate();
+            userRelate4.setDanganName("手机抄表系统");
+            UserRelate userRelate5 = new UserRelate();
+            userRelate5.setDanganName("报装管理");
+            userRelateBottomList.add(userRelate1);
+            userRelateBottomList.add(userRelate2);
+            userRelateBottomList.add(userRelate3);
+            userRelateBottomList.add(userRelate4);
+            userRelateBottomList.add(userRelate5);
+        }else{
+            UserRelate userRelate1 = new UserRelate();
+            userRelate1.setDanganName("营业收费");
+            UserRelate userRelate2 = new UserRelate();
+            userRelate2.setDanganName("报装管理");
+            UserRelate userRelate3 = new UserRelate();
+            userRelate3.setDanganName("网上营业厅");
+            UserRelate userRelate4 = new UserRelate();
+            userRelate4.setDanganName("手机抄表系统");
+            userRelateBottomList.add(userRelate1);
+            userRelateBottomList.add(userRelate2);
+            userRelateBottomList.add(userRelate3);
+            userRelateBottomList.add(userRelate4);
+        }
         mmap.put("bottomDanganList",userRelateBottomList);
         return "view";
     }

ruoyi-admin/src/main/resources/static/css/customPage.css

@@ -56,6 +56,10 @@
     background-image: var(--left-image-four);
 }
 
+.bottom-tag .tag-box .left-image5 {
+    background-image: var(--left-image-four);
+}
+
 .bottom-tag .tag-box .right-word {
     font-size: 28px;
     color: #ffffff;

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

@@ -154,9 +154,9 @@
                     </div>
                     </div>
                     <div class="bottom-tag">
-                        <div th:each="bottomDangan:${bottomDanganList}" th:class="tag-box+' '+ ${bottomDanganStat.index == 2 ? 'two-box-margin':''}">
+                        <div th:each="bottomDangan:${bottomDanganList}" th:class="tag-box+' '+ ${bottomDanganStat.index == 2&&bottomDanganStat.size==4 ? 'two-box-margin':''}">
                             <div th:class="image-show+' '+left-image+${bottomDanganStat.index+1}"></div>
-                            <div class="right-word" th:text="${bottomDangan.danganName}"></div>
+                            <div class="right-word" th:onclick="opennewpage([[${bottomDangan.danganUrl}]] ,[[${bottomDangan.danganNums} ]]);" th:text="${bottomDangan.danganName}"></div>
                         </div>
                     </div>
             </div>