From cfa12a50f8e6de09a2e57fa8359dbec5e2b07628 Mon Sep 17 00:00:00 2001
From: 81041 <81041@192.168.10.30>
Date: 星期二, 23 十月 2018 11:02:52 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whyclxw1@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/WebRoot/index.jsp | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/gx_tieta/WebRoot/index.jsp b/gx_tieta/WebRoot/index.jsp
index 6398208..165155e 100644
--- a/gx_tieta/WebRoot/index.jsp
+++ b/gx_tieta/WebRoot/index.jsp
@@ -1770,7 +1770,7 @@
var opts = {
title : dataList.title+'<a href="javascript:loadToHomeInfo();" style="margin-left: 1em;text-decoration:none;cursor:not-allowed">璇︽儏>></a>', //鏍囬鏈紑鍚�
width : '290', //瀹藉害
- height : 140, //楂樺害
+ height : 160, //楂樺害
panel : "panel", //妫�绱㈢粨鏋滈潰鏉�
enableAutoPan : true, //鑷姩骞崇Щ
enableSendToPhone:false,
@@ -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);
}
//瀹氫綅鍒板憡璀﹂〉闈�
--
Gitblit v1.9.1