From b4b9c8587e72bc27804551b406f2e4f6ffc2cbb0 Mon Sep 17 00:00:00 2001
From: 81041 <81041@192.168.10.27>
Date: 星期二, 06 十一月 2018 11:24:07 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whyclxw1@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/WebRoot/index.jsp | 62 ++++++++++++++++++++++++++-----
1 files changed, 52 insertions(+), 10 deletions(-)
diff --git a/gx_tieta/WebRoot/index.jsp b/gx_tieta/WebRoot/index.jsp
index 0a5081b..8d57304 100644
--- a/gx_tieta/WebRoot/index.jsp
+++ b/gx_tieta/WebRoot/index.jsp
@@ -1554,11 +1554,23 @@
iconList.append('<div class="clear"></div>');
iconExplain.append(iconList);
+
+
// 鏈烘埧寤舵椂
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-timeout" checked="checked">');
var icon = $('<img src="'+mapImages.timeout+'">');
var span = $('<span>鐢垫睜缁勬斁鐢靛欢鏃舵満鎴�</span>');
+ iconList.append(input);
+ iconList.append(span);
+ iconList.append(icon);
+ iconExplain.append(iconList);
+
+ // 鍋滅數鏈烘埧
+ 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>');
iconList.append(input);
iconList.append(span);
iconList.append(icon);
@@ -2331,7 +2343,7 @@
function formatUpdateStation(list) {
var obj = {};
var data = list.data;
- console.log(list);
+ //console.log(list);
// GPS鍧愭爣杞寲涓虹櫨搴﹀潗鏍�
var point = GPS.wgs2bd(data.latitude, data.longitude);
// 鏋勯�犵粨鏋滈泦
@@ -2389,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 = {
@@ -2530,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);
}
// 瀹氫綅鍒板巻鍙叉暟鎹〉闈�
@@ -2538,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);
}
// 瀹氫綅鍒版満鎴胯缁嗕俊鎭〉闈�
@@ -2979,7 +3017,8 @@
rs.devalarm = "User_ChartAction!serchByInfo?json={Chart_file:'"+user_logo+"',Chart_name:chart_dev_alarm}"; // 璁惧鍛婅
rs.precharge = "User_ChartAction!serchByInfo?json={Chart_file:'"+user_logo+"',Chart_name:chart_pre_charge}"; // 棰勫厖鐢�
rs.float = "User_ChartAction!serchByInfo?json={Chart_file:'"+user_logo+"',Chart_name:chart_online_charge}"; // 娴厖
- rs.defaults = mapDefults;
+ rs.powercut = "User_ChartAction!serchByInfo?json={Chart_file:'"+user_logo+"',Chart_name:chart_poff}";
+ rs.defaults = "User_ChartAction!serchByInfo?json={Chart_file:'"+user_logo+"',Chart_name:chart_install}";
return rs;
}
/* $(function(){
@@ -3270,6 +3309,9 @@
case 'item-timeout': // 寤舵椂
rs = imgs.timeout;
break;
+ case 'item-poff': // 鍋滅數
+ rs = imgs.powercut;
+ break;
case 'item-dev_alarm': // 61850鍛婅
rs = imgs.devalarm;
break;
--
Gitblit v1.9.1