From 7d507d03cb2055c4d09e315b06ef2d983b460bcd Mon Sep 17 00:00:00 2001
From: hdw <496960745@qq.com>
Date: 星期三, 10 十月 2018 15:52:53 +0800
Subject: [PATCH] 更新点击查询的显示效果
---
gx_tieta/WebRoot/charge-test.jsp | 100 +++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 95 insertions(+), 5 deletions(-)
diff --git a/gx_tieta/WebRoot/charge-test.jsp b/gx_tieta/WebRoot/charge-test.jsp
index a0c25c3..465ee8e 100644
--- a/gx_tieta/WebRoot/charge-test.jsp
+++ b/gx_tieta/WebRoot/charge-test.jsp
@@ -25,8 +25,8 @@
<link href="css/loading.css" type="text/css" rel="stylesheet" />
<link href="jqueryui/jquery-ui.css" type="text/css" rel="stylesheet" />
<link href="css/collapse.css" type="text/css" rel="stylesheet" />
- <link rel="stylesheet" type="text/css" href="css/confirm.css">
-
+<link rel="stylesheet" type="text/css" href="css/confirm.css">
+<link rel="stylesheet" href="css/common.css">
<!-- font-awesome-4.7.0 -->
<link rel="stylesheet" href="font-awesome-4.7.0/css/font-awesome.min.css">
<script type="text/javascript" src="js/echarts2.js"></script>
@@ -542,6 +542,7 @@
<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="pages/js/pages/siderbar.js"></script>
<script type="text/javascript">
var permits;
<% Object obj=session.getAttribute("permits");
@@ -1924,7 +1925,7 @@
//鏍规嵁褰撳墠閫変腑鐨勭數姹犵粍id鏌ヨ褰撳墠鐢垫睜缁勭殑鍩烘湰淇℃伅
function getBattinfById(){
- if(battinlist!=undefined && BattGroupId!=undefined){
+ /* if(battinlist!=undefined && BattGroupId!=undefined){
for(var i=0;i<battinlist.length;i++){
for(var k=0;k<battinlist[i].length;k++){
if(BattGroupId==battinlist[i][k].BattGroupId){
@@ -1933,7 +1934,13 @@
}
}
}
- return undefined;
+ return undefined; */
+ var activeFile = $('.whyc-sider-menu .sider-menu-file.active');
+ if(activeFile.length == 1) {
+ return activeFile.data('attr');
+ }else {
+ return undefined;
+ }
}
function clearfourPicture(){
@@ -3728,7 +3735,7 @@
});
});
searchAll_lowAction(); //鑾峰彇闃�鍊�
- seachAllStation();
+ //seachAllStation();
//鏌ヨ鎵�鏈夋満鎴�
function seachAllStation(){
$.ajax({
@@ -4598,5 +4605,88 @@
var cont = '褰撳墠鐢垫睜缁勭殑鏍囩О瀹归噺锛�<input style="border: 1px solid #ccc;height: 24px;" type="text" value="'+batt.MonCapStd+'" class ="batt-moncapstd">AH';
myConfirm.show({content: cont, class: 'show-historydata'});
}
+ // siderbar妯″潡
+ $(function() {
+ var TreeView = GLOBAL.pages.TreeView;
+ var first = GLOBAL.pages.siderbar.first; // 涓�绾у鑸�
+ var second = GLOBAL.pages.siderbar.second; // 浜岀骇瀵艰埅
+ var third = GLOBAL.pages.siderbar.third; // 涓夌骇瀵艰埅
+ var fourth = GLOBAL.pages.siderbar.fourth; // 鍥涚骇瀵艰埅
+ var treeView = new TreeView($('#lside'));
+ $('#lside').width($('#ele_content').width());
+ treeView.setContainer();
+ // 璁剧疆瀹瑰櫒鍙嫋鍔�
+ $('#ele_content').resizable({
+ handles: 'e',
+ maxWidth: 520,
+ minWidth: 200,
+ alsoResize: $('#lside'),
+ resize:function() {
+ treeView.setContainer();
+ }
+ });
+
+ // 鐢熸垚涓�绾у鑸�-鐪�
+ first(treeView, treeView.container);
+
+ // 鐪�->甯�
+ treeView.ele.on('click', '.province', function() {
+ var province = $(this).data('attr');
+ second(treeView, $(this).parent(), province);
+ });
+
+ // 甯�->鏈烘埧
+ treeView.ele.on('click', '.city', function() {
+ var city = $(this).data('attr');
+ third(treeView, $(this).parent(), city);
+ });
+
+ battinlist = [];
+ // 鏈烘埧->鐢垫睜缁�
+ treeView.ele.on('click', '.home', function() {
+ var home = $(this).data('attr');
+ var tmp = {
+ StationName1: home.StationName1,
+ StationName2: home.StationName2,
+ StationName3: home.StationName3,
+ StationId: home.StationId
+ };
+ fourth(treeView, $(this).parent(), tmp);
+ });
+
+ // 鐢垫睜缁�
+ treeView.ele.on('click', '.eleGroup', function() {
+ var eleGroup = $(this).data('attr');
+
+ // 鍒濆鍖栫壒娈婅澶囩殑鍥炬爣
+ initSpecialGraphLine();
+
+ //鏄剧ず鐢垫睜鐨勮缁嗕俊鎭�
+ $('#address_infor').text($(this).parent().parent().parent().parent().siblings().first().text()+"-"+$(this).parent().parent().siblings().first().text()+"-"+$(this).text());
+ var fbsId = eleGroup.FBSDeviceId;
+ var isSpecial = regFbsId(fbsId);
+ $('.special-mon-data').removeClass('show');
+ BattGroupId=$(this).attr("id");
+ if(isSpecial) {
+ $('.special-mon-data').addClass('show');
+ var temp = {
+ BattGroupId:$(this).attr("id")
+ };
+ searchMonTestInfo(temp);
+ resizeSpecailGraph();
+ }else {
+ getBattStr();
+ findBattinfObj();
+ AllBataDate=new Array();
+ clearfourPicture();
+ findBatttestdata_infByBattGroupId();
+ searchAll_lowAction(); //鑾峰彇闃�鍊�
+ }
+
+
+ // 璁剧疆璁板綍鐨勭瑪鏁颁负-1
+ $('#testrecordcout').val('-1');
+ });
+ });
</script>
</html>
--
Gitblit v1.9.1