From d47e5aa87ae01d82b00a38216e3ac83dea50f3a8 Mon Sep 17 00:00:00 2001
From: hdw <496960745@qq.com>
Date: 星期一, 22 十月 2018 16:30:46 +0800
Subject: [PATCH] 实时和历史跳转设置
---
gx_tieta/WebRoot/control.jsp | 7 +++++--
gx_tieta/WebRoot/charge-test.jsp | 6 ++++--
gx_tieta/WebRoot/index.jsp | 12 ++++++------
gx_tieta/WebRoot/pages/js/pages/siderbar.js | 14 +++++++++-----
4 files changed, 24 insertions(+), 15 deletions(-)
diff --git a/gx_tieta/WebRoot/charge-test.jsp b/gx_tieta/WebRoot/charge-test.jsp
index dd3f21c..ebe89f4 100644
--- a/gx_tieta/WebRoot/charge-test.jsp
+++ b/gx_tieta/WebRoot/charge-test.jsp
@@ -3185,8 +3185,10 @@
$(function() {
$('body').on('click', '#nav a[href="control.jsp"]', function() {
var batt = getBattinfById();
- //console.info(batt.StationId);
- $(this).attr('href', 'control.jsp?battgroupId='+BattGroupId+'&stationId='+batt.StationId);
+ var province = batt.StationName1;
+ var city = batt.StationName2;
+ var home = batt.StationName;
+ $(this).attr('href', 'control.jsp?province='+province+'&city='+city+'&home='+home);
});
});
diff --git a/gx_tieta/WebRoot/control.jsp b/gx_tieta/WebRoot/control.jsp
index 62da258..692e91d 100644
--- a/gx_tieta/WebRoot/control.jsp
+++ b/gx_tieta/WebRoot/control.jsp
@@ -2675,9 +2675,12 @@
// 瀹炴椂-鍘嗗彶鍒囨崲瀹氫綅鍒板叿浣撶數姹犵粍
$(function() {
- $('body').on('click', '#nav a[href="charge-test.jsp"]', function() {
+ $('body').on('click', '#nav a[href="charge-test.jsp"]', function(event) {
var batt = getBatt();
- $(this).attr('href', 'charge-test.jsp?battgroupId='+BattGroupId+"&stationId="+batt.StationId);
+ var province = batt.StationName1;
+ var city = batt.StationName2;
+ var home = batt.StationName;
+ $(this).attr('href', 'charge-test.jsp?province='+province+'&city='+city+'&home='+home);
});
});
diff --git a/gx_tieta/WebRoot/index.jsp b/gx_tieta/WebRoot/index.jsp
index 6398208..2f681a8 100644
--- a/gx_tieta/WebRoot/index.jsp
+++ b/gx_tieta/WebRoot/index.jsp
@@ -2236,13 +2236,13 @@
var rs = JSON.parse(result.result);
if(rs.length != 0) {
var data = rs[0];
- //console.info(data);
+ console.info(data);
var content = '<div style="padding:6px;"><span>钃勭數姹犵粍鍛婅鏁扮洰锛�</span>'+data.code+'<a style="margin-left: 14px" href="javascript:loadToWarnPage();">璇︽儏>></a></div>'+
'<div style="padding:6px;"><span>钃勭數姹犵粍钀藉悗鏁扮洰锛�</span>'+data.sum+'<a style="margin-left: 14px" href="javascript:loadToBehindPage();">璇︽儏>></a></div>'+
'<div style="padding:6px;"><span>钃勭數姹犵粍寤舵椂鏁扮洰锛�</span>'+data.newsum+'<a style="margin-left: 14px" href="javascript:loadToDischargeDelay();">璇︽儏>></a></div>'+
'<div style="padding:6px"><a href="javascript:loadToRealTime();">瀹炴椂鏁版嵁</a><a style="margin-left: 20px" href="javascript:loadToOldTime();">鍘嗗彶鏁版嵁</a></div>'+
'<div style="padding:6px;"><span>鍦板潃锛�</span>'+data.data.Address+'</div>'+
- '<input type="hidden" class="ipt-hide sid" value="'+data.data.StationId+'">'+
+ '<input type="hidden" class="ipt-hide home" value="'+data.data.StationName+'">'+
'<input type="hidden" class="ipt-hide province" value="'+data.data.stationName1+'">'+
'<input type="hidden" class="ipt-hide city" value="'+data.data.stationName2+'">';
@@ -2382,18 +2382,18 @@
}
// 瀹氫綅鍒板疄鏃舵暟鎹〉闈�
function loadToRealTime() {
- var homeId = $('.ipt-hide.sid').val();
+ var home = $('.ipt-hide.home').val();
var province = $('.ipt-hide.province').val();
var city = $('.ipt-hide.city').val();
- window.open('control.jsp?province='+province+'&city='+city+'&stationId='+homeId);
+ window.open('control.jsp?province='+province+'&city='+city+'&home='+home);
}
// 瀹氫綅鍒板巻鍙叉暟鎹〉闈�
function loadToOldTime() {
- var homeId = $('.ipt-hide.sid').val();
+ var home = $('.ipt-hide.home').val();
var province = $('.ipt-hide.province').val();
var city = $('.ipt-hide.city').val();
- window.open('charge-test.jsp?province='+province+'&city='+city+'&stationId='+homeId);
+ window.open('charge-test.jsp?province='+province+'&city='+city+'&home='+home);
}
//瀹氫綅鍒板憡璀﹂〉闈�
diff --git a/gx_tieta/WebRoot/pages/js/pages/siderbar.js b/gx_tieta/WebRoot/pages/js/pages/siderbar.js
index 385d8b4..a680935 100644
--- a/gx_tieta/WebRoot/pages/js/pages/siderbar.js
+++ b/gx_tieta/WebRoot/pages/js/pages/siderbar.js
@@ -111,7 +111,7 @@
};
// 鑾峰彇folder鐨勪竴鏉℃暟鎹�
- _prop.getFolder = function (txt, cla, attr) {
+ _prop.getFolder = function (txt, cla,attr) {
var tmp = {};
tmp.txt = txt;
tmp.cla = cla;
@@ -230,7 +230,7 @@
formatData.push(tmp);
}
treeView.treeView(container, formatData);
- treeView.spreadFolder('province', '', firstSpread);
+ treeView.spreadFolder('province', province, firstSpread);
}else {
}
@@ -274,7 +274,7 @@
treeView.treeView(container, formatData);
if(spread) {
- treeView.spreadFolder('city', '', secondSpread, true);
+ treeView.spreadFolder('city', city, secondSpread, true);
}
}else {
@@ -318,7 +318,7 @@
}
treeView.treeView(container, formatData);
if(spread) {
- treeView.spreadFolder('home', '', thirdSpread, true);
+ treeView.spreadFolder('home', home, thirdSpread, true);
}
}else {
@@ -395,6 +395,7 @@
treeView.delProgress(container);
if(rs.code == 1) {
var _data= rs.data;
+ //console.log(_data);
var formatData = [];
for(var i=0; i<_data.length;i++) {
var __data = _data[i];
@@ -402,9 +403,12 @@
formatData.push(tmp);
}
treeView.treeView(container, formatData);
-
+ //console.info(formatData);
if(active) {
treeView.activeFile('eleGroup', '');
+ var battId = formatData[0].id;
+ location.hash="#"+battId;
+ location.hash = "";
}
}else {
--
Gitblit v1.9.1