From e22fd0bac62d20d94e58409ea15049c67f6ff1eb Mon Sep 17 00:00:00 2001 From: 81041 <81041@192.168.10.26> Date: 星期四, 13 十二月 2018 10:33:35 +0800 Subject: [PATCH] 修改 --- gx_tieta/WebRoot/charge-test.jsp | 16 ++++++++++++++-- 1 files changed, 14 insertions(+), 2 deletions(-) diff --git a/gx_tieta/WebRoot/charge-test.jsp b/gx_tieta/WebRoot/charge-test.jsp index b6a0c0a..3407383 100644 --- a/gx_tieta/WebRoot/charge-test.jsp +++ b/gx_tieta/WebRoot/charge-test.jsp @@ -24,6 +24,7 @@ <link href="css/charge_test_style.css" type="text/css" rel="stylesheet" /> <link href="css/loading.css" type="text/css" rel="stylesheet" /> <link href="jqueryui/jquery-ui.css" type="text/css" rel="stylesheet" /> +<link rel="stylesheet" href="src/css/layui.css"> <link href="css/collapse.css" type="text/css" rel="stylesheet" /> <link rel="stylesheet" type="text/css" href="css/confirm.css"> <link rel="stylesheet" href="css/common.css"> @@ -63,6 +64,9 @@ height: 100%; z-index: 99; background-color: #FFFFFF; + } + .myconfirm { + z-index: 999998 } </style> </head> @@ -731,12 +735,17 @@ </div> <input type="hidden" id="lineStatus" value="0"> <input type="hidden" id="testrecordcout" value="-1"/> <!-- 璁板綍褰撳墠鏄剧ず鐨勬暟鎹槸绗嚑绗� --> + <!-- iframe鏁版嵁涓存椂瀛樺偍浣嶇疆 --> + <div id="homeInfoIframeData"></div> </body> <script type="text/javascript" src="jqueryui/jquery-ui.js"></script> +<!-- 寮曞叆layui妗嗘灦 --> +<script type="text/javascript" src="src/layui.all.js"></script> <script type="text/javascript" src="js/collapse.js"></script> <script type="text/javascript" src="js/charge.js"></script> <script type="text/javascript" src="js/myConfirm.js"></script> <!-- 纭妗� --> <script type="text/javascript" src="js/popup.js"></script> +<script type="text/javascript" src="pages/js/pages/homeInfo.js"></script> <script type="text/javascript" src="pages/js/pages/siderbar.js"></script> <script type="text/javascript"> var permits; @@ -4923,8 +4932,11 @@ homeid: batt.StationId, battid: batt.BattGroupId }; - findBattinfByBattGroupId(batt.BattGroupId); - findStationInfoByStation(batt); + // findBattinfByBattGroupId(batt.BattGroupId); + // findStationInfoByStation(batt); + // 鏄剧ず鍩虹珯鏈哄巻鍗� + console.log(batt); + showHomeInfo(batt.StationId); // 鏍规嵁鏁版嵁瀹氫綅 localSideBar(treeView, treeView.container, tmp); }); -- Gitblit v1.9.1