更新伊宁退出登录接口相关功能,增加退出登录postmessage方法,增加保康css基础样式文件,并调整界面样式

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

@@ -284,10 +284,10 @@ public class SysIndexController extends BaseController
         mmap.put("rightThreeList",rightThreeList);
 //        return "mainLhk";
 //        return "main";
-        return "mainYining";
+//        return "mainYining";
 //        return "mainDangyang";
 //        return "mainJiangjin";
-//        return "mainBaokang";
+        return "mainBaokang";
     }
 
 

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

@@ -76,10 +76,10 @@ public class SysLoginController extends BaseController
         // 是否开启用户注册
         mmap.put("isAllowRegister", Convert.toBool(configService.getKey("sys.account.registerUser"), false));
 //        return "login";
-        return "loginYining";
+//        return "loginYining";
 //        return "loginDangyang";
 //        return "loginJiangjin";
-//        return "loginBaokang";
+        return "loginBaokang";
     }
 
     @PostMapping("/login")

ruoyi-admin/src/main/resources/application-test.yml

@@ -58,18 +58,18 @@ spring:
 #                     username: postgres
 #                     password: lhk.postgres.2347
 #                     password: kpr.23417.postgres
-                      url: jdbc:postgresql://140.246.183.164:5432/union_mgr_new?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false&allowMultiQueries=true&zeroDateTimeBehavior=convertToNull
-                      username: postgres
-                      password: kpr.23417.postgres
-#                      url: jdbc:postgresql://60.13.253.94:54321/union_mgr?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false&allowMultiQueries=true&zeroDateTimeBehavior=convertToNull
+#                      url: jdbc:postgresql://140.246.183.164:5432/union_mgr_new?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false&allowMultiQueries=true&zeroDateTimeBehavior=convertToNull
 #                      username: postgres
 #                      password: kpr.23417.postgres
-#                      url: jdbc:postgresql://10.101.3.104:5432/union_mgr?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false&allowMultiQueries=true&zeroDateTimeBehavior=convertToNull
+#                      url: jdbc:postgresql://60.13.253.94:54321/union_mgr?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false&allowMultiQueries=true&zeroDateTimeBehavior=convertToNull
 #                      username: postgres
 #                      password: kpr.23417.postgres
-#                      url: jdbc:postgresql://111.170.129.106:5432/union_mgr?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false&allowMultiQueries=true&zeroDateTimeBehavior=convertToNull
+#                      url: jdbc:postgresql://10.101.3.104:5432/union_mgr?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false&allowMultiQueries=true&zeroDateTimeBehavior=convertToNull
 #                      username: postgres
 #                      password: kpr.23417.postgres
+                      url: jdbc:postgresql://111.170.129.106:5432/union_mgr?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false&allowMultiQueries=true&zeroDateTimeBehavior=convertToNull
+                      username: postgres
+                      password: kpr.23417.postgres
                 # 从库数据源
                 slave:
                     # 从数据源开关/默认关闭

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

@@ -0,0 +1,455 @@
+/*主要样式*/
+.centerDiv{
+    position: absolute;
+    width: 39%;
+    height: 700px;
+    left: 29%;
+    top: 0;
+    z-index: 9999!important;
+}
+.topDiv{
+    position: absolute;
+    width: 100%;
+    height: 300px;
+    left: 50px;
+    top: 30px;
+    z-index: 9999!important;
+}
+.bottomDiv{
+    position: absolute;
+    width: 100%;
+    height: 300px;
+    left: 0;
+    bottom: 0;
+    z-index: 9999!important;
+}
+
+.leftOneDiv{
+    position: absolute;
+    left: 83px;
+    top: 55px;
+    background:url(../img/yining/leftOne.png) no-repeat center fixed;
+    transform: scale(0.5);
+    height: 296px;
+    width: 750px;
+    font-size: 50px;
+    color:rgb(209,231,250);
+}
+
+.leftOneTopLine{
+    position: absolute;
+    top: 0px;
+    left: 200px;
+    background:url(../img/yining/leftOneTopLine.png) no-repeat center fixed;
+    transform: scale(1.4);
+    height: 6px;
+    width: 450px;
+}
+.leftOneBottomLine{
+    position: absolute;
+    bottom: 0px;
+    left: 14px;
+    background:url(../img/yining/leftOneBottomLine.png) no-repeat center fixed;
+    transform: scale(1);
+    height: 6px;
+    width: 606px;
+}
+
+.leftTwoDiv{
+    position: absolute;
+    left: 100px;
+    top: 200px;
+    background:url(../img/yining/leftTwo.png) no-repeat center fixed;
+    transform: scale(0.5);
+    height: 296px;
+    width: 627px;
+    font-size: 50px;
+    color:rgb(209,231,250);
+}
+.leftTwoTopLine{
+    position: absolute;
+    top: 0px;
+    left: 10px;
+    background:url(../img/yining/leftTwoTopLine.png) no-repeat center fixed;
+    transform: scale(1);
+    height: 6px;
+    width: 606px;
+}
+.leftTwoBottomLine{
+    position: absolute;
+    bottom: 0px;
+    left: 22px;
+    background:url(../img/yining/leftTwoBottomLine.png) no-repeat center fixed;
+    transform: scale(1);
+    height: 6px;
+    width: 606px;
+}
+
+.leftThreeDiv{
+    position: absolute;
+    left: 65px;
+    top: 344px;
+    background:url(../img/yining/leftThree.png) no-repeat center fixed;
+    transform: scale(0.5);
+    height: 296px;
+    width: 750px;
+    font-size: 50px;
+    color:rgb(209,231,250);
+}
+.leftThreeTopLine{
+    position: absolute;
+    top: 0px;
+    left: 10px;
+    background:url(../img/yining/leftThreeTopLine.png) no-repeat center fixed;
+    transform: scale(1);
+    height: 6px;
+    width: 606px;
+}
+.leftThreeBottomLine{
+    position: absolute;
+    bottom: 0px;
+    left: 215px;
+    background:url(../img/yining/leftThreeBottomLine.png) no-repeat center fixed;
+    transform: scale(1.4);
+    height: 6px;
+    width: 450px;
+}
+
+.rightOneDiv{
+    position: absolute;
+    right: 140px;
+    top: 55px;
+    background:url(../img/yining/rightOne.png) no-repeat center fixed;
+    transform: scale(0.5);
+    height: 296px;
+    width: 750px;
+    font-size: 50px;
+    color:rgb(209,231,250);
+}
+.rightOneTopLine{
+    position: absolute;
+    top: 0px;
+    right: 200px;
+    background:url(../img/yining/rightOneTopLine.png) no-repeat center fixed;
+    transform: scale(1.4);
+    height: 6px;
+    width: 450px;
+}
+.rightOneBottomLine{
+    position: absolute;
+    bottom: 0px;
+    right: 14px;
+    background:url(../img/yining/rightOneBottomLine.png) no-repeat center fixed;
+    transform: scale(1);
+    height: 6px;
+    width: 606px;
+}
+
+.rightTwoDiv{
+    position: absolute;
+    right: 155px;
+    top: 200px;
+    background:url(../img/yining/rightTwo.png) no-repeat center fixed;
+    transform: scale(0.5);
+    height: 296px;
+    width: 627px;
+    font-size: 50px;
+    color:rgb(209,231,250);
+}
+.rightTwoTopLine{
+    position: absolute;
+    top: 0px;
+    right: 10px;
+    background:url(../img/yining/rightTwoTopLine.png) no-repeat center fixed;
+    transform: scale(1);
+    height: 6px;
+    width: 606px;
+}
+.rightTwoBottomLine{
+    position: absolute;
+    bottom: 0px;
+    right: 22px;
+    background:url(../img/yining/rightTwoBottomLine.png) no-repeat center fixed;
+    transform: scale(1);
+    height: 6px;
+    width: 606px;
+}
+
+.rightThreeDiv{
+    position: absolute;
+    right: 122px;
+    top: 344px;
+    background:url(../img/yining/rightThree.png) no-repeat center fixed;
+    transform: scale(0.5);
+    height: 296px;
+    width: 750px;
+    font-size: 50px;
+    color:rgb(209,231,250);
+}
+.rightThreeTopLine{
+    position: absolute;
+    top: 0px;
+    right: 10px;
+    background:url(../img/yining/rightThreeTopLine.png) no-repeat center fixed;
+    transform: scale(1);
+    height: 6px;
+    width: 606px;
+}
+.rightThreeBottomLine{
+    position: absolute;
+    bottom: 0px;
+    right: 215px;
+    background:url(../img/yining/rightThreeBottomLine.png) no-repeat center fixed;
+    transform: scale(1.4);
+    height: 6px;
+    width: 450px;
+}
+
+.leftOneDiv:hover{
+    background:url(../img/yining/hover/leftOneHover.png) no-repeat center fixed;
+    color:rgb(0,251,255);
+    z-index: 99999;
+}
+.leftOneDiv:hover .leftOneIcon{
+    content:url(../img/jiangjin/左一.png)
+}
+.leftOneDiv:hover .leftOneTopLine{
+    background:url(../img/yining/分割线高亮.png) no-repeat center fixed;
+    transform: scale(1.5);
+    z-index: 99999;
+}
+.leftOneDiv:hover .leftOneBottomLine{
+    background:url(../img/yining/分割线高亮.png) no-repeat center fixed;
+    transform: scale(1.1);
+    z-index: 99999;
+}
+
+.leftTwoDiv:hover{
+    background:url(../img/yining/hover/leftTwoHover.png) no-repeat center fixed;
+    color:rgb(0,251,255);
+    z-index: 99999;
+}
+.leftTwoDiv:hover .leftTwoIcon{
+    content:url(../img/jiangjin/左二.png)
+}
+.leftTwoDiv:hover .leftTwoTopLine{
+    background:url(../img/yining/分割线高亮.png) no-repeat center fixed;
+    transform: scale(1.2);
+    z-index: 99999;
+}
+.leftTwoDiv:hover .leftTwoBottomLine{
+    background:url(../img/yining/分割线高亮.png) no-repeat center fixed;
+    transform: scale(1.1);
+    z-index: 99999;
+}
+
+.leftThreeDiv:hover{
+    background:url(../img/yining/hover/leftThreeHover.png) no-repeat center fixed;
+    color:rgb(0,251,255);
+    z-index: 99999;
+}
+.leftThreeDiv:hover .leftThreeIcon{
+    content:url(../img/jiangjin/左三.png)
+}
+.leftThreeDiv:hover .leftThreeTopLine{
+    background:url(../img/yining/分割线高亮.png) no-repeat center fixed;
+    transform: scale(1.1);
+    z-index: 99999;
+}
+.leftThreeDiv:hover .leftThreeBottomLine{
+    background:url(../img/yining/分割线高亮.png) no-repeat center fixed;
+    transform: scale(1.3);
+    z-index: 99999;
+}
+
+.rightOneDiv:hover{
+    background:url(../img/yining/hover/rightOneHover.png) no-repeat center fixed;
+    color:rgb(0,251,255);
+    z-index: 99999;
+}
+.rightOneDiv:hover .rightOneIcon{
+    content:url(../img/jiangjin/右一.png)
+}
+.rightOneDiv:hover .rightOneTopLine{
+    background:url(../img/yining/分割线高亮rotated.png) no-repeat center fixed;
+    transform: scale(1.4);
+    z-index: 99999;
+}
+.rightOneDiv:hover .rightOneBottomLine{
+    background:url(../img/yining/分割线高亮rotated.png) no-repeat center fixed;
+    transform: scale(1.1);
+    z-index: 99999;
+}
+
+.rightTwoDiv:hover{
+    background:url(../img/yining/hover/rightTwoHover.png) no-repeat center fixed;
+    color:rgb(0,251,255);
+    z-index: 99999;
+}
+.rightTwoDiv:hover .rightTwoIcon{
+    content:url(../img/jiangjin/右二.png)
+}
+.rightTwoDiv:hover .rightTwoTopLine{
+    background:url(../img/yining/分割线高亮rotated.png) no-repeat center fixed;
+    transform: scale(1.2);
+    z-index: 99999;
+}
+.rightTwoDiv:hover .rightTwoBottomLine{
+    background:url(../img/yining/分割线高亮rotated.png) no-repeat center fixed;
+    transform: scale(1.1);
+    z-index: 99999;
+}
+
+.rightThreeDiv:hover{
+    background:url(../img/yining/hover/rightThreeHover.png) no-repeat center fixed;
+    color:rgb(0,251,255);
+    z-index: 99999;
+}
+.rightThreeDiv:hover .rightThreeIcon{
+    content:url(../img/jiangjin/右三.png)
+}
+.rightThreeDiv:hover .rightThreeTopLine{
+    background:url(../img/yining/分割线高亮rotated.png) no-repeat center fixed;
+    transform: scale(1.1);
+    z-index: 99999;
+}
+.rightThreeDiv:hover .rightThreeBottomLine{
+    background:url(../img/yining/分割线高亮rotated.png) no-repeat center fixed;
+    transform: scale(1.3);
+    z-index: 99999;
+}
+
+
+/* 其他样式 */
+.leftAllLine{
+    height: 1048px;
+    width: 91px;
+    transform: scale(0.5);
+    position: absolute;
+    left: 180px;
+    top: 35px;
+}
+.rightAllLine{
+    height: 1048px;
+    width: 91px;
+    transform: scale(0.5);
+    position: absolute;
+    right: 180px;
+    top: 35px;
+}
+
+.leftMenu{
+    background:url(../img/yining/二级菜单背景.png) no-repeat center fixed;
+    height: 1048px;
+    /*width: 424px;*/
+    width: 0;
+    transform: scale(0.5);
+    position: absolute;
+    /*left: -60px;*/
+    right: 81%;
+    top: 35px;
+    /*display: none;*/
+}
+.leftMenuMedLine{
+    background:url(../img/yining/背景弧小号.png) no-repeat center fixed;
+    height: 100%;
+    width: 87px;
+    position: absolute;
+    left: -40px;
+    top: -40px;
+}
+.leftMenuLeftLine{
+    background:url(../img/yining/背景弧中号.png) no-repeat center fixed;
+    height: 100%;
+    width: 91px;
+    position: absolute;
+    left: 0px;
+    top: -40px;
+}
+.leftMenuRightLine{
+    background:url(../img/yining/背景弧中号.png) no-repeat center fixed;
+    height: 100%;
+    width: 91px;
+    position: absolute;
+    right: 0px;
+    top: -40px;
+}
+
+.rightMenu{
+    background:url(../img/yining/二级菜单背景_rotated.png) no-repeat center fixed;
+    height: 1048px;
+    /*width: 424px;*/
+    width: 0;
+    transform: scale(0.5);
+    position: absolute;
+    /*right: -60px;*/
+    left: 81%;
+    top: 35px;
+    /*display: none;*/
+}
+.rightMenuMedLine{
+    background:url(../img/yining/背景弧小号_rotated.png) no-repeat center fixed;
+    height: 100%;
+    width: 87px;
+    position: absolute;
+    right: -40px;
+    top: -40px;
+}
+.rightMenuLeftLine{
+    background:url(../img/yining/背景弧中号_rotated.png) no-repeat center fixed;
+    height: 100%;
+    width: 91px;
+    position: absolute;
+    left: 0px;
+    top: -40px;
+}
+.rightMenuRightLine{
+    background:url(../img/yining/背景弧中号_rotated.png) no-repeat center fixed;
+    height: 100%;
+    width: 91px;
+    position: absolute;
+    right: 0px;
+    top: -40px;
+}
+
+.menuUl {
+    font-size: 40px;
+    color:rgb(209,231,250);
+    width: 100%;
+    height: 80%;
+    position: absolute;
+    left: -40px;
+    top: 70px;
+    display: flex;
+    flex-direction: column;
+    justify-content: center;
+}
+.menuUlLi{
+    list-style: none;
+    margin: 0 auto;
+    padding: 10px;
+}
+.menuUlLi:hover{
+    color:rgb(0,251,255);
+}
+
+.menuUlRight{
+    font-size: 40px;
+    color:rgb(209,231,250);
+    width: 100%;
+    height: 80%;
+    position: absolute;
+    left: 10px;
+    top: 70px;
+    display: flex;
+    flex-direction: column;
+    justify-content: center;
+}
+.menuUlLiRight{
+    list-style: none;
+    margin: 0 auto;
+    padding: 10px;
+}
+.menuUlLiRight:hover{
+    color:rgb(0,251,255);
+}

ruoyi-admin/src/main/resources/static/ruoyi/index.js

@@ -54,17 +54,27 @@ document.addEventListener('touchmove', resetTimer, false);
 document.addEventListener('',resetTimer,false);
 
 // var danganYiningList = [[${danganList}]];
-/*document.getElementById('yiningLogoutLink').addEventListener('click', function(event) {
+var quanjuChildWindow = [];
+document.getElementById('yiningLogoutLink').addEventListener('click', function(event) {
     // // 阻止默认的链接跳转行为
-    // event.preventDefault();
-    // alert(111);
+    event.preventDefault();
+    alert(111);
     debugger
-    // 执行你的方法
-    console.log(1111);
 
     // // 如果需要，可以在这里进行其他操作，例如重定向
     // window.location.href = this.href;
-});*/
+    if(quanjuChildWindow.length>=1){
+        for(let i = 0;i<quanjuChildWindow.length;i++){
+            let childWindow = quanjuChildWindow[i];
+            // 确保子窗口加载完成后发送消息
+            childWindow.onload = function() {
+                // 使用 postMessage 向子窗口发送消息
+                childWindow.postMessage('log0ut', '*');
+            };
+        }
+    }
+
+});
 
 $(function() {
     // 初始化定时器

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

@@ -7,7 +7,7 @@
 	<title></title>
 	<link rel="shortcut icon" href="favicon.ico">
 	<link href="../static/css/bootstrap.min.css" th:href="@{/css/bootstrap.min.css}" rel="stylesheet"/>
-	<link href="../static/css/mainJiangjin.css" th:href="@{/css/mainJiangjin.css}" rel="stylesheet"/>
+	<link href="../static/css/mainBaokang.css" th:href="@{/css/mainBaokang.css}" rel="stylesheet"/>
 	<link href="../static/css/font-awesome.min.css" th:href="@{/css/font-awesome.min.css}" rel="stylesheet"/>
 	<link href="../static/css/animate.min.css" th:href="@{/css/animate.min.css}" rel="stylesheet"/>
 	<link href="../static/css/style.min862f.css" th:href="@{/css/style.min862f.css}" rel="stylesheet"/>
@@ -64,7 +64,7 @@
 		}
 		.hClass{
 			position:fixed;
-			left:27%;
+			left:34%;
 			transform: translateY(100px);
 			font-size: 30px;
 			animation: myanimation 2s;
@@ -160,9 +160,9 @@
                     str += "<div style=\"\" class=\"leftOneDiv\">"+
 						"<div class=\"leftOneTopLine\"></div>" +
                     "<div>" +
-                    "<p style=\"line-height: 6em;margin-left:-1em;display: inline-block;\">"+danganList[i-1].danganName+"</p>" +
-                    "<img class=\"leftOneIcon\" alt=\"[ "+danganList[i-1].danganName+" ]\" src=\"../img/jiangjin/左一.png\" " +
-                    " style=\"width: 150px;height: 150px;vertical-align:middle;position: absolute;top: 75px;margin-left: 1em\">" +
+                    "<p style=\"word-wrap: break-word;width:400px;margin-top:1.5em;margin-left:-1em;display: inline-block;\">"+danganList[i-1].danganName+"</p>" +
+                    "<img class=\"leftOneIcon\" alt=\"[ "+danganList[i-1].danganName+" ]\" src=\"../img/baokang/左一.png\" " +
+                    " style=\"width: 150px;height: 150px;vertical-align:middle;position: absolute;top: 75px;margin-left: 0em\">" +
                     "</div>" +
                     "<div class=\"leftOneBottomLine\"></div>"+
                     "<input style='display: none' value='"+danganList[i-1].danganUrl+"' class='.divUrl'>";
@@ -171,16 +171,16 @@
                     str +="<div style=\"\" class=\"leftTwoDiv\">"+
 						"<div class=\"leftTwoTopLine\"></div>" +
                         "<div>" +
-                        "<p class='pWidth' style=\"line-height: 60px;padding-left: 0;display: inline-block;white-space: pre-wrap;" +
-						"margin-top:80px;text-align: right;";
+                        "<p class='pWidth' style=\"line-height: 60px;margin-left:-1em;display: inline-block;white-space: pre-wrap;" +
+						"margin-top:110px;text-align: right;";
                     //配合样式white-space: pre-wrap;使用该逻辑
                     let left2DanganName = danganList[i-1].danganName;
                     if(left2DanganName.includes("供水运营")){
                         left2DanganName = insertChar(left2DanganName,4,"\n")
 					}
                     str+="\">"+left2DanganName+"</p>" +
-                        "<img class=\"leftTwoIcon\" alt=\"[ "+danganList[i-1].danganName+" ]\" src=\"../img/jiangjin/左二.png\" th:src=\"@{/img/yining/icon/智慧生产系统,未选中.png}\"" +
-                        " style=\"width: 150px;height: 150px;vertical-align:middle;position: absolute;top: 75px;margin-left: 1em\">" +
+                        "<img class=\"leftTwoIcon\" alt=\"[ "+danganList[i-1].danganName+" ]\" src=\"../img/baokang/左二.png\" th:src=\"@{/img/yining/icon/智慧生产系统,未选中.png}\"" +
+                        " style=\"width: 150px;height: 150px;vertical-align:middle;position: absolute;top: 75px;margin-left: 1.5em\">" +
                         "</div>" +
                         "<div class=\"leftTwoBottomLine\"></div>"+
                         "<input style='display: none' value='"+danganList[i-1].danganUrl+"' class='.divUrl'>";
@@ -190,7 +190,7 @@
 						"<div class=\"leftThreeTopLine\"></div>" +
                         "<div>" +
                         "<p style=\"line-height: 6em;padding-left: 1em;display: inline-block;\">"+danganList[i-1].danganName+"</p>" +
-                        "<img class=\"leftThreeIcon\" alt=\"[ "+danganList[i-1].danganName+" ]\" src=\"../img/jiangjin/左三.png\" th:src=\"@{/img/yining/icon/智慧管网系统,未选中.png}\"" +
+                        "<img class=\"leftThreeIcon\" alt=\"[ "+danganList[i-1].danganName+" ]\" src=\"../img/baokang/左三.png\" th:src=\"@{/img/yining/icon/智慧管网系统,未选中.png}\"" +
                         " style=\"width: 150px;height: 150px;vertical-align:middle;position: absolute;top: 75px;margin-left: 1em\">" +
                         "</div>" +
                         "<div class=\"leftThreeBottomLine\"></div>"+
@@ -200,7 +200,7 @@
                     str +=	"<div style=\"\" class=\"rightOneDiv\">"+
 						"<div class=\"rightOneTopLine\"></div>" +
                         "<div>" +
-                        "<img class=\"rightOneIcon\" alt=\"[ "+danganList[i-1].danganName+" ]\" src=\"../img/jiangjin/右一.png\" th:src=\"@{/img/yining/icon/智慧营业系统,未选中.png}\"" +
+                        "<img class=\"rightOneIcon\" alt=\"[ "+danganList[i-1].danganName+" ]\" src=\"../img/baokang/右一.png\" th:src=\"@{/img/yining/icon/智慧营业系统,未选中.png}\"" +
                         " style=\"width: 150px;height: 150px;vertical-align:middle;position: absolute;top: 75px;left: 120px;margin-left: 1em\">" +
                         "<p style=\"line-height: 60px;margin-left: 360px;display: inline-block;white-space: pre-wrap;" +
 						"margin-top:80px;text-align: right;" +
@@ -219,7 +219,7 @@
                     str +=	"<div style=\"\" class=\"rightTwoDiv\">"+
 						"<div class=\"rightTwoTopLine\"></div>" +
                         "<div>" +
-                        "<img class=\"rightTwoIcon\" alt=\"[ "+danganList[i-1].danganName+" ]\" src=\"../img/jiangjin/右二.png\" th:src=\"@{/img/yining/icon/智慧客服系统,未选中.png}\"" +
+                        "<img class=\"rightTwoIcon\" alt=\"[ "+danganList[i-1].danganName+" ]\" src=\"../img/baokang/右二.png\" th:src=\"@{/img/yining/icon/智慧客服系统,未选中.png}\"" +
                         " style=\"width: 150px;height: 150px;vertical-align:middle;position: absolute;top: 75px;left: 60px;margin-left: 1em\">" +
                         "<p style=\"line-height: 6em;margin-left: 300px;display: inline-block;\">"+danganList[i-1].danganName+"</p>" +
                         "</div>" +
@@ -230,7 +230,7 @@
                     str += "<div style=\"\" class=\"rightThreeDiv\">"+
 						"<div class=\"rightThreeTopLine\"></div>" +
                         "<div>" +
-                        "<img class=\"rightThreeIcon\" alt=\"[ "+danganList[i-1].danganName+" ]\" src=\"../img/jiangjin/右三.png\" th:src=\"@{/img/yining/icon/智慧办公系统,未选中.png}\"" +
+                        "<img class=\"rightThreeIcon\" alt=\"[ "+danganList[i-1].danganName+" ]\" src=\"../img/baokang/右三.png\" th:src=\"@{/img/yining/icon/智慧办公系统,未选中.png}\"" +
                         " style=\"width: 150px;height: 150px;vertical-align:middle;position: absolute;top: 75px;left: 120px;margin-left: 1em\">" +
                         "<p style=\"line-height: 6em;margin-left: 360px;display: inline-block;\">"+danganList[i-1].danganName+"</p>" +
                         "</div>" +

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

@@ -172,6 +172,7 @@
 	 style="width: 100px;height: 100px;cursor: pointer;position:fixed;
 			right: 2%;bottom: 10%;z-index: 9999">
 </a>
+<script th:src="@{/ruoyi/index.js}"></script>
 <script th:inline="javascript">
 	//TODO 逻辑解释:
     //第一段视频放到第4秒的时候，就可以降低透明度了
@@ -194,6 +195,7 @@
     }, 4000);
 
 	var sessionId = [[${sessionId}]];
+
 	function opennewpage(url) {
 
 		// window.location.href=url;
@@ -207,17 +209,8 @@
 		console.log(url)
 
 		let childWindow = window.open(url)
-		// console.log(danganLoginName)
-		//
-		// console.log(sessionId)
-
-        // 确保子窗口加载完成后发送消息
-        childWindow.onload = function() {
-            // 使用 postMessage 向子窗口发送消息
-            childWindow.postMessage('log0ut', '*');
-        };
-
-
+        console.log(quanjuChildWindow);
+        window.top.quanjuChildWindow.push({"url":url,"childWindow":childWindow});
 	}
 
 		//TODO div与空白处点击事件