From 3b15ad8a18197caa5d48073f6967ab5e0a70e7a3 Mon Sep 17 00:00:00 2001
From: hdw <496960745@qq.com>
Date: 星期四, 08 十一月 2018 13:45:35 +0800
Subject: [PATCH] 停电记录默认降序排列
---
gx_tieta/WebRoot/index.jsp | 191 +++++++++++++++++++++++------------------------
1 files changed, 94 insertions(+), 97 deletions(-)
diff --git a/gx_tieta/WebRoot/index.jsp b/gx_tieta/WebRoot/index.jsp
index 809ea01..bf69554 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);
@@ -1702,6 +1714,48 @@
map.addOverlay(mk);
}
}
+ }
+
+ // 鏇存柊鍦板浘鍥炬爣
+ function updateMapDotIcon(map, dotList, isTop) {
+ // 閬嶅巻鏌ヨ鍐呭鐢熸垚瀵瑰簲鐨勫浘鏍�
+ for(var i = 0; i<dotList.length; i++) {
+ var isShow = checkMapImgStyle(dotList[i].msg);
+ var dotIcon = new BMap.Icon(getMapStateImg(mapImages, dotList[i].msg), new BMap.Size(36, 30)); // 璁剧疆鍥剧墖
+ var mk = getMapMarker(map, dotList[i].title);
+ if(mk) {
+ // 璁剧疆鍦板浘鍥炬爣
+ mk.setIcon(dotIcon);
+
+ // 灏嗗凡缁忓畨瑁呯殑鏄剧ず鍦ㄩ《閮�
+ if(isTop) {
+ mk.setTop(true);
+ }
+
+ // 闅愯棌marker鐐�
+ isShow?mk.show():mk.hide();
+ }
+ }
+ }
+
+ // 鑾峰彇鍦板浘鍥炬爣
+ function getMapMarker(map, msg) {
+ var rs = false;
+ var allOverlay = map.getOverlays();
+ for (var i = 0; i < allOverlay.length; i++){
+ try{
+ if(allOverlay[i].getLabel().content == msg){
+ rs = allOverlay[i];
+ return rs;
+ }
+ }catch(e) {
+
+ }
+
+ }
+
+ return rs;
+
}
// 鍒犻櫎鍦板浘涓婄殑鎸囧畾鐐�
@@ -2313,7 +2367,7 @@
}
}
- createMapDot(map, updateStationData, true);
+ updateMapDotIcon(map, updateStationData, true);
// 鏇存柊鍒嗛〉淇℃伅
mapPages.pageCurr++;
if(mapPages.pageCurr>mapPages.pageNum || updateStationData.length<mapPages.pageSize) {
@@ -2389,6 +2443,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 +2585,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 +2596,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,97 +3059,11 @@
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(){
- setTimeout(function(){
- var _script = document.createElement('script');
- _script.type = "text/javascript";
- _key = "55UbnVOR7XovezZC4jFvTqNDPAamsuoo";//鐧惧害鍦板浘鍙互鐢宠鍒�
- _script.src = "http://api.map.baidu.com/location/ip?ak="+_key+"&coor=bd09ll&ip=&callback=f";//鎷兼帴URL
- document.head.appendChild(_script);
-
- }, 2000);
-
- });
- var pointX;
- var pointY;
- function f(data){
- pointX = data.content.point.x;
- pointY = data.content.point.y;
- console.info("浣犳墍鍦ㄥ煄甯�:"+data.content.address);
- console.info("浣犲煄甯傜粡搴�:"+pointX);
- console.info("浣犵殑鍩庡競绾害:"+pointY);
- var point = new BMap.Point(pointX, pointY);
- map.centerAndZoom(point, 10); // 鐢ㄥ煄甯傚悕璁剧疆鍦板浘涓績鐐�
- } */
-
-
- /* $(document).ready(function(){
- //椤甸潰鍔犺浇鏃舵煡璇㈢淮鎶ゅ尯涓殑鏋㈢航绫诲瀷
- $.post("User_battgroup_baojigroup_battgroupAction!serchStationName1InGroup",null,function(data){
- data=data.result;
- data=eval("("+data+")");
- //console.info(data);
- if(data.code==1 && data.data.length>0){
- var $select = $("#station_name1");
- $select.text('');
- for(var i=0;i<=data.data.length;i++){
- $option=$("<option></option>");
- if(i==0){
- $option.html("<s:text name='All'/>(<s:text name='Common'/>"+data.data.length+"<s:text name='Species'/>)");
- $option.attr("value", "");
- }else{
- $option.text(data.data[i-1]);
- $option.attr("value",data.data[i-1]);
- }
- $select.append($option);
- }
- }else{
- $("#station_name1").text('').html('<option>鏆傛棤鍙祴缁存姢鍖�</option>');
- }
- findStationNamebyStationname1();
- });
- });
- //褰撶淮鎶ゅ尯鐨勫�煎彉鎹㈡椂鏇存柊鏈烘埧绔欑偣
- $('#station_name1').change(function(){
- findStationNamebyStationname1();
- });
-
- //鏍规嵁缁存姢鍖烘煡璇㈢珯鐐�
- function findStationNamebyStationname1(){
- var user = {
- UNote:$("#station_name1 option:selected").val()
- };
- //var selectvalue=$("#station_name1 option:selected").val();
- //alert(selectvalue);
- $.post("User_battgroup_baojigroup_battgroupAction!serchStationNameInGroup","json="+JSON.stringify(user),function(data){
- //console.info(data);
- data=data.result;
- data=eval("("+data+")");
- if(data.code==1 && data.data.length>0){
- var $select = $("#station_name");
- $select.text('');
- for(var i=0;i<=data.data.length;i++){
- var $option=$("<option></option>");
- if(i==0){
- $option.html("<s:text name='All'/>(<s:text name='Common'/>"+data.data.length+"<s:text name='Species'/>)");
- $option.attr("value", "");
- }else{
- $option.text(data.data[i-1]);
- $option.attr("value",data.data[i-1]);
- }
- $select.append($option);
- }
- }else{
- $("#station_name").text('').html('<option>鏆傛棤鍙祴鏈烘埧绔欑偣</option>');
- }
- findserchByBattGroupNamebystationname();
- });
- } */
-
//鏌ヨ鎵�鏈夌殑缁存姢鍖�
function searchAllProvince(){
$.ajax({
@@ -3270,6 +3264,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