From a7adbf6bf46de9ec3753d4b6cc6c8b5cc83cdcf9 Mon Sep 17 00:00:00 2001
From: hdw <496960745@qq.com>
Date: 星期一, 26 十一月 2018 16:03:32 +0800
Subject: [PATCH] 修改实时和历史机历卡为基站机历卡
---
gx_tieta/WebRoot/charge-test.jsp | 20 ++++++++++++++++++--
1 files changed, 18 insertions(+), 2 deletions(-)
diff --git a/gx_tieta/WebRoot/charge-test.jsp b/gx_tieta/WebRoot/charge-test.jsp
index 0c280ba..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>
@@ -484,6 +488,10 @@
<td><s:text name="Head"/></td> <!-- 璐熻矗浜� -->
<td></td>
</tr>
+ <tr>
+ <td>瀹夎浜哄憳</td> <!-- 璐熻矗浜� -->
+ <td id="installUser"></td>
+ </tr>
</table>
</div>
<div class="con-list ele-infor" style="height: 400px;overflow-y: auto">
@@ -727,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;
@@ -4919,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