From e051f5c497e691bcd97c81dffa97f7946fd197b1 Mon Sep 17 00:00:00 2001
From: hdw <496960745@qq.com>
Date: 星期二, 06 十一月 2018 16:32:24 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whychdw@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/WebRoot/index.jsp | 44 +++++++++++++++++++++++++++++++++++---------
1 files changed, 35 insertions(+), 9 deletions(-)
diff --git a/gx_tieta/WebRoot/index.jsp b/gx_tieta/WebRoot/index.jsp
index 0ec2bf7..a21aa51 100644
--- a/gx_tieta/WebRoot/index.jsp
+++ b/gx_tieta/WebRoot/index.jsp
@@ -1570,7 +1570,7 @@
var iconList = $('<div class="explain-list" style="padding: 4px 6px; border-bottom: 1px slid #ccc; display:block"></div>');
var input = $('<input type="checkbox" data-img="item-poff" checked="checked">');
var icon = $('<img src="'+mapImages.powercut+'">');
- var span = $('<span>鏈烘埧鍋滅數</span>');
+ var span = $('<span>鍋滅數鏈烘埧</span>');
iconList.append(input);
iconList.append(span);
iconList.append(icon);
@@ -2401,6 +2401,7 @@
'<div style="padding:6px;"><span>鍦板潃锛�</span>'+data.data.Address+'</div>'+
'<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 county" value="'+data.data.stationName5+'">'+
'<input type="hidden" class="ipt-hide city" value="'+data.data.stationName2+'">';
var list = {
@@ -2542,7 +2543,10 @@
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+'&home='+home);
+ var county = $('.ipt-hide.county').val();
+ var url = skipUrl('control.jsp',province,city,county,home);
+ window.open(url);
+ //window.open('control.jsp?province='+province+'&city='+city+'&home='+home);
}
// 瀹氫綅鍒板巻鍙叉暟鎹〉闈�
@@ -2550,27 +2554,49 @@
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+'&home='+home);
+ var county = $('.ipt-hide.county').val();
+ var url = skipUrl('charge-test.jsp',province,city,county,home);
+ window.open(url);
+ //window.open('charge-test.jsp?province='+province+'&city='+city+'&home='+home);
}
//瀹氫綅鍒板憡璀﹂〉闈�
function loadToWarnPage() {
+ var home = $('.ipt-hide.home').val();
+ var province = $('.ipt-hide.province').val();
+ var city = $('.ipt-hide.city').val();
+ var county = $('.ipt-hide.county').val();
+ var url = skipUrl('elewarn.jsp',province,city,county,home);
+ window.open(url);
// console.info($('.ipt-hide').val());
- var stationId = $('.ipt-hide').eq(1).val();
- window.open('elewarn.jsp?stationId='+stationId);
+ //var stationId = $('.ipt-hide').eq(1).val();
+ //window.open('elewarn.jsp?stationId='+stationId);
}
// 瀹氫綅鍒拌惤鍚庡崟浣撻〉闈�
function loadToBehindPage() {
+ var home = $('.ipt-hide.home').val();
+ var province = $('.ipt-hide.province').val();
+ var city = $('.ipt-hide.city').val();
+ var county = $('.ipt-hide.county').val();
+ var url = skipUrl('taskplan.jsp',province,city,county,home);
+ window.open(url);
// console.info($('.ipt-hide').val());
- var stationId = $('.ipt-hide').eq(1).val();
- window.open('taskplan.jsp?stationId='+stationId);
+ //var stationId = $('.ipt-hide').eq(1).val();
+ //window.open('taskplan.jsp?stationId='+stationId);
}
// 瀹氫綅鍒版斁鐢靛欢鏃堕〉闈�
function loadToDischargeDelay() {
- var stationId = $('.ipt-hide').eq(1).val();
- window.open('dischargeplan.jsp?stationId='+stationId);
+ var home = $('.ipt-hide.home').val();
+ var province = $('.ipt-hide.province').val();
+ var city = $('.ipt-hide.city').val();
+ var county = $('.ipt-hide.county').val();
+ var url = skipUrl('dischargeplan.jsp',province,city,county,home);
+ window.open(url);
+
+ //var stationId = $('.ipt-hide').eq(1).val();
+ //window.open('dischargeplan.jsp?stationId='+stationId);
}
// 瀹氫綅鍒版満鎴胯缁嗕俊鎭〉闈�
--
Gitblit v1.9.1