From a86db2491e96752d04c5c6e6e7c0a7efdb80f014 Mon Sep 17 00:00:00 2001
From: 81041 <81041@192.168.10.20>
Date: 星期四, 29 十一月 2018 09:08:15 +0800
Subject: [PATCH] 文件升级修改
---
gx_tieta/WebRoot/index.jsp | 495 +++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 377 insertions(+), 118 deletions(-)
diff --git a/gx_tieta/WebRoot/index.jsp b/gx_tieta/WebRoot/index.jsp
index 99731a3..351d3e4 100644
--- a/gx_tieta/WebRoot/index.jsp
+++ b/gx_tieta/WebRoot/index.jsp
@@ -126,16 +126,22 @@
<table>
<tbody>
<tr>
- <td class="w5em alg-c f-bold">鏈烘埧鍚嶇О:</td>
+ <td class="alg-c f-bold"><span class="mrl8">鏈烘埧绫诲瀷:</span></td>
+ <td colspan="2" id="homeType">
+ <span class="mrl8 mrr8"><input type="checkbox" value="2" checked="checked">2V</span>
+ <span><input type="checkbox" checked="checked" value="12">12V</span>
+ </td>
+ </tr>
+ <tr>
+ <td class="w5em alg-c f-bold"><span class="mrl8">鏈烘埧鍚嶇О:</span></td>
<td><input type="text" id="mapToolSearch"></td>
<td class="w54 btn-container">
<button type="button" value="鎼滅储" id="mapToolSearchBtn" class="mrr8"><i class="fa fa-search page-link"></i></button>
</td>
</tr>
<tr>
- <td colspan="3" class="alg-r btn-container">
- <span class="mrr8">宸插畨瑁呰澶囨暟/璁惧鎬绘暟锛�<span id="installnum">12/600</span><i id="installnumbtn" class="fa fa-refresh mrl8 page-link" title="鍒锋柊"></i></span>
-
+ <td colspan="3" class="btn-container">
+ <span class="mrl8">宸插畨瑁呰澶囨暟/璁惧鎬绘暟锛�<span id="installnum">12/600</span><i id="installnumbtn" class="fa fa-refresh mrl8 page-link" title="鍒锋柊"></i></span>
</td>
</tr>
</tbody>
@@ -220,16 +226,21 @@
<i class="fa fa-cog"></i>
</a>
</div>
- <!--鐢垫睜鏁呴殰淇鍥�-->
- <div class="repair-pie module"></div>
- <!-- 鐢垫睜鏁呴殰楗肩姸鍥� -->
- <div class="brdn-pie module"></div>
- <!-- 鐢垫睜鍛婅楗肩姸鍥� -->
- <div class="warn-pie module"></div>
- <!--鐢垫睜鍋ュ悍楗肩姸鍥�-->
- <div class="health-pie module"></div>
- <!--娓呴櫎娴姩-->
- <div class="clear"></div>
+ <div class="pie-item-con">
+ <!-- 鏈烘埧鍋滅數 -->
+ <div class="repair-pie module"></div>
+ <!-- 鐢垫睜鐘舵�侀ゼ鐘跺浘 -->
+ <div class="brdn-pie module"></div>
+ <!-- 鐢垫睜鍛婅楗肩姸鍥� -->
+ <div class="warn-pie module"></div>
+ <!--鐢垫睜瀹归噺楗肩姸鍥�-->
+ <div class="health-pie module"></div>
+ <!-- 鏈烘埧缁埅鑳藉姏楗肩姸鍥� -->
+ <div class="endur-pie module"></div>
+ <!--娓呴櫎娴姩-->
+ <div class="clear"></div>
+ </div>
+
</div>
<c:forEach var="cust" items="${sessionScope.custompages}">
<c:if test="${cust.submenu eq 'My_work' && cust.subflag eq 1}">
@@ -455,6 +466,15 @@
];
+ // 璁剧疆椤甸潰涓璸ie鐨勬ā鍧�
+ ;(function() {
+ var pieStatus = GLOBAL.Index.Pie.pieStatus; // 鏌ヨ楗肩姸鍥炬樉绀虹殑鐘舵��
+ var pieItemCon = $('.pie-con .pie-item-con');
+ pieItemCon.text('');
+ var pieItems = pieStatus();
+ pieItemCon.html(pieItems);
+ })();
+
var locationcity;
var moduleSqlArr;
@@ -578,6 +598,7 @@
$('.nav-map').on('click', '.explain-list input', function() {
setMapImgStyles();
+ updateStation(true);
});
});
@@ -784,36 +805,23 @@
}
$(function() {
- flushFourPie();
-
- if($('#content .brdn-pie').length>0){
- //鐢熸垚鐢垫睜鐘舵�侀ゼ鐘跺浘
- var $brdn=$('#content .pie-con .brdn-pie'); //鑾峰彇鏁呴殰瀹瑰櫒鐨刯query瀵硅薄
- var brdn=$brdn.get(0); //灏嗗鍣ㄧ殑jquery瀵硅薄杞寲涓篸om瀵硅薄
- brdnPie=echarts.init(brdn); //鍒濆鍖栬〃鏍煎鍣�
- brdnPie.showLoading();
- }
-
- if($('#content .repair-pie').length>0){
- var $repair=$('#content .pie-con .repair-pie'); //鑾峰彇鏈烘埧鍋滅數鍥惧鍣ㄧ殑jquery瀵硅薄
- var repair=$repair.get(0); //灏嗘晠闅滃鍣ㄧ殑jquery瀵硅薄杞寲涓篸om瀵硅薄
- repairPie=echarts.init(repair); //鍒濆鍖栬〃鏍煎鍣�
- repairPie.showLoading();
- }
+ flushFourPie(true);
});
//鏇存柊鍥涚楗肩姸鍥�
- function flushFourPie(){
+ function flushFourPie(create){
var cityname = $('#panelCity').val();
locationcity = getCityByName(cityname);
+ if(create) {
+ initPieObj();
+ }
+
+
searchalarm_data(); //鏌ヨ鍛婅鐜�
searchGood(); //鏌ヨ鍋ュ悍鐜�
searchmaintByMap(); //鏌ヨ鐢垫睜鐘舵��
-
searchBatt_maint_inf(); //鏌ヨ鏈烘埧鍋滅數姣斾緥
-
-
-
+ searchEndurHome(); //鏌ヨ缁埅楗肩姸鍥�
}
//鏌ヨ鏈�杩戠殑鏁呴殰缁存姢璁板綍
@@ -920,20 +928,22 @@
});
}
-
+ var warnPie;
//鏌ヨ鍛婅淇℃伅骞舵樉绀哄憡璀︾巼
function searchalarm_data(){
if($('#content .warn-pie').length==0){
return;
}
-
//鐢熸垚鐢垫睜鍛婅鐜囬ゼ鐘跺浘
var $warn=$('#content .pie-con .warn-pie'); //鑾峰彇鍛婅瀹瑰櫒鐨刯query瀵硅薄
if($warn.length!=0){
- var warn=$warn.get(0); //灏嗗憡璀﹀鍣ㄧ殑jquery瀵硅薄杞寲涓篸om瀵硅薄
- var warnPie=echarts.init(warn); //鍒濆鍖栧浘琛ㄥ鍣�
- window.warnPie = warnPie;
- warnPie.showLoading();
+ var isEcharts = isObject(warnPie)?true:false;
+ if(!isEcharts) {
+ var warn=$warn.get(0); //灏嗗憡璀﹀鍣ㄧ殑jquery瀵硅薄杞寲涓篸om瀵硅薄
+ warnPie=echarts.init(warn); //鍒濆鍖栧浘琛ㄥ鍣�
+ warnPie.showLoading();
+ }
+
var cityname='';
//console.info("="+locationcity.pinyin+"=");
@@ -1005,47 +1015,63 @@
}
//鍒涘缓鐢垫睜鍛婅楗肩姸鍥�
var warnTle="<s:text name='Battery_alarm_rate'/>"; /* 鐢垫睜鍛婅鐜� */
- createPie(warnPie,warnTle,Almarr);
- warnPie.on('click', function(param) {
- // 0:鍦ㄧ嚎鐢靛帇 1:缁勭鐢靛帇 2:鍏呯數鐢垫祦 3:鏀剧數鐢垫祦 4:鍗曚綋鐢靛帇 5:瀹归噺鍛婅
- if(param.dataIndex == 5) {
+ if(!isEcharts) {
+ createPie(warnPie,warnTle,Almarr);
+ warnPie.on('click', function(param) {
+ // 0:鍦ㄧ嚎鐢靛帇 1:缁勭鐢靛帇 2:鍏呯數鐢垫祦 3:鏀剧數鐢垫祦 4:鍗曚綋鐢靛帇 5:瀹归噺鍛婅
+ if(param.dataIndex == 5) {
+
+ }else {
+ window.open('elewarn.jsp?warntype='+param.dataIndex+'&warntxt='+param.name);
+ }
- }else {
- window.open('elewarn.jsp?warntype='+param.dataIndex+'&warntxt='+param.name);
- }
-
- });
+ });
+ }else {
+ var opts = getOpt(warnTle, Almarr);
+ warnPie.setOption(opts);
+ }
+
+ setTimeout(searchalarm_data, 10000)
+
}
});
}
}
- var battstate_isExist = true;
var brdnPie;
//鏌ヨ鍚勪釜鏈烘埧鐨勭數姹犵姸鎬�
function searchmaintByMap(){
if($('#content .brdn-pie').length==0){
return;
}
+
+ // 鍒ゆ柇鏄惁涓篍charts瀵硅薄
+ var isEcharts = isObject(brdnPie)?true:false;
+
+ if(!isEcharts) {
+ //鐢熸垚鐢垫睜鐘舵�侀ゼ鐘跺浘
+ var $brdn=$('#content .pie-con .brdn-pie'); //鑾峰彇鏁呴殰瀹瑰櫒鐨刯query瀵硅薄
+ var brdn=$brdn.get(0); //灏嗗鍣ㄧ殑jquery瀵硅薄杞寲涓篸om瀵硅薄
+ brdnPie=echarts.init(brdn); //鍒濆鍖栬〃鏍煎鍣�
+ }
+
+
var brdnTle="<s:text name='Batte_state'/>"; /* 鐢垫睜鐘舵�� */
$.post("Batt_rtstateAction!serchBattStateRate",null,function(data){
var model=eval("("+data.result+")");
//console.info(model);
var maintarr = new Array();
setBatt_list(maintarr,model.data);
- if(battstate_isExist){
+ if(!isEcharts){
//鍒涘缓鐢垫睜鏁呴殰鐜囩姸鍥�
createPie(brdnPie,brdnTle,maintarr);
- battstate_isExist = false;
brdnPie.on('click', function(param) {
- console.info(param);
window.open('elestatus.jsp?battstate='+param.dataIndex);
});
}else{
brdnPie.setOption(getOpt(brdnTle, maintarr));
- //console.info("鏇存柊鎴愬姛");
}
- setTimeout("searchmaintByMap()",10000);
+ setTimeout(searchmaintByMap, 10000);
});
}
@@ -1085,13 +1111,21 @@
{state:4,value:"<s:text name='Average_charge'/>",color:'#800080'}, //鍧囧厖
];
- var repairPie;
- var powercut_isNew = true;
+ var repairPie;
//鏌ヨ鏈烘埧鍋滅數鐘舵��
function searchBatt_maint_inf(){
if($('#content .repair-pie').length==0){
return;
}
+ // 鍒ゆ柇鏄惁涓篍charts瀵硅薄
+ var isEcharts = isObject(repairPie)?true:false;
+ if(!isEcharts) {
+ var $repair=$('#content .pie-con .repair-pie'); //鑾峰彇鏈烘埧鍋滅數鍥惧鍣ㄧ殑jquery瀵硅薄
+ var repair=$repair.get(0); //灏嗘晠闅滃鍣ㄧ殑jquery瀵硅薄杞寲涓篸om瀵硅薄
+ repairPie=echarts.init(repair); //鍒濆鍖栬〃鏍煎鍣�
+ }
+
+ // 璇锋眰鍚庡彴
$.ajax({
type: "post",
//url: "BattPower_offAction!serchPowerOff",
@@ -1114,9 +1148,7 @@
{name:"鏈烘埧鎺夌珯", val: model.code}]; /* '鏈慨澶�' */
}
var repairTle="<s:text name='Computer_room'/><s:text name='Power_cut'/>"; /* '鏈烘埧鍋滅數' */
- if(powercut_isNew){
- //鍒涘缓鏈烘埧鍋滅數楗肩姸鍥�
- powercut_isNew = false;
+ if(!isEcharts){
createPie(repairPie,repairTle,repairObj);
repairPie.on('click', function() {
window.open('batt-state-manage.jsp');
@@ -1125,8 +1157,8 @@
var opt = getOpt(repairTle, repairObj);
repairPie.setOption(opt);
}
- //console.info(repairPie);
- setTimeout("searchBatt_maint_inf()", 10000);
+
+ setTimeout(searchBatt_maint_inf, 10000);
},
error:function(){
//setTimeout("searchBatt_maint_inf()", 10000);
@@ -1135,6 +1167,7 @@
}
//鏌ヨ鍋ュ悍鐜�
+ var healthPie;
function searchGood(){
if($('#content .health-pie').length==0){
return;
@@ -1142,16 +1175,18 @@
//鐢熸垚鐢垫睜鍋ュ悍鐜�
var $health=$('#content .pie-con .health-pie'); //鑾峰彇鏁呴殰瀹瑰櫒鐨刯query瀵硅薄
if($health.length!=0){
- var health=$health.get(0); //灏嗘晠闅滃鍣ㄧ殑jquery瀵硅薄杞寲涓篸om瀵硅薄
- var healthPie=echarts.init(health); //鍒濆鍖栬〃鏍煎鍣�
- window.healthPie = healthPie;
+ // 鏄惁echarts瀵硅薄
+ var isEcharts = isObject(healthPie)?true:false;
+ if(!isEcharts) {
+ var health=$health.get(0); //灏嗘晠闅滃鍣ㄧ殑jquery瀵硅薄杞寲涓篸om瀵硅薄
+ healthPie=echarts.init(health); //鍒濆鍖栬〃鏍煎鍣�
+ healthPie.showLoading();
+ }
+
var healthTle="<s:text name='Monomer_cap_health_rate'/>"; /* '鐢垫睜鍋ュ悍鐜�' */
- healthPie.showLoading();
$.post("Battalarm_dataAction!serchGood",null,function(data){
var model=eval("("+data.result+")");
- //console.info(model);
var healthObj;
- //console.info(model);
if(model.code==1){
healthObj=[
{name:"鍗曚綋瀹归噺鍋ュ悍",val:model.sum-model.data[0]-model.data[1],color:'#31CB36'}, /* '鍋ュ悍鐢垫睜' */
@@ -1165,11 +1200,106 @@
{name:"鍗曚綋瀹归噺鏇存崲",val:0,color:'#FF0000'}
];
}
- //鍒涘缓鐢垫睜鏁呴殰楗肩姸鍥�
- createPie(healthPie,healthTle,healthObj);
+ if(!isEcharts) {
+ //鍒涘缓鐢垫睜鏁呴殰楗肩姸鍥�
+ createPie(healthPie,healthTle,healthObj);
+
+ // 鐐瑰嚮楗肩姸鍥捐繘琛岃烦杞�
+ healthPie.on('click', function(param) {
+ window.open('taskplan.jsp'); // 璺宠浆鍒拌惤鍚庡崟浣撴煡璇�
+ });
+ }else {
+ var opt = getOpt(healthTle, healthObj);
+ healthPie.setOption(opt);
+ }
+
+ setTimeout(searchGood, 10000);
});
}
}
+
+ // 鏌ヨ缁埅涓嶈冻鐨勬満鎴挎暟
+ var endurPie;
+ function searchEndurHome() {
+ if($('#content .endur-pie').length==0){
+ return;
+ }
+
+ //鐢熸垚鐢垫睜鍛婅鐜囬ゼ鐘跺浘
+ var $endur=$('#content .pie-con .endur-pie'); //鑾峰彇鍛婅瀹瑰櫒鐨刯query瀵硅薄
+ if($endur.length!=0){
+ var isEcharts = endurPie?true:false;
+ if(!isEcharts) {
+ var endur=$endur.get(0); //灏嗘晠闅滃鍣ㄧ殑jquery瀵硅薄杞寲涓篸om瀵硅薄
+ endurPie=echarts.init(endur); //鍒濆鍖栬〃鏍煎鍣�
+ }
+
+ var endurTle="鏈烘埧缁埅鑳藉姏"; /* 鏈烘埧缁埅鑳藉姏 */
+ // 鏌ヨ鍚庡彴鍐呭
+ $.ajax({
+ type: 'post'
+ ,async: true
+ ,url: 'Batt_enduranceAction!serchByState_xuhang'
+ ,data: null
+ ,dataType: 'json'
+ ,success: function(res) {
+ var rs = JSON.parse(res.result);
+ if(rs.code == 1) {
+ var data = rs.data;
+ var endurObj =[
+ {name:"缁埅涓嶈冻1灏忔椂",val:data[0],color:'#FF0000'}
+ ,{name:"缁埅1~2灏忔椂",val:data[1],color:'#D1D105'}
+ ,{name:"缁埅2~3灏忔椂",val:data[2],color:'#31CB36'}
+ ,{name:"缁埅3灏忔椂浠ヤ笂",val:data[3],color:'#800080'}
+ ];
+
+ if(!isEcharts) {
+ //鍒涘缓鐢垫睜鏁呴殰楗肩姸鍥�
+ createPie(endurPie,endurTle,endurObj);
+ }else {
+ var opts = getOpt(endurTle, endurObj);
+ endurPie.setOption(opts);
+ }
+ }
+
+ setTimeout(searchEndurHome, 10000);
+ }
+ });
+
+ }
+ }
+
+ // 鍒濆鍖栭ゼ鐘跺浘瀹瑰櫒瀵硅薄
+ function initPieObj() {
+ warnPie = false;
+ brdnPie = false;
+ repairPie = false;
+ healthPie = false;
+ endurPie = false;
+ }
+
+ //璁╁湴鍥惧拰楗肩姸鍥鹃殢娴忚鍣ㄧ獥鍙ｇ殑鏀瑰彉鑰屾敼鍙�
+ $(window).resize(function(){
+ getMapHt();
+ if(isObject(warnPie))
+ {
+ warnPie.resize();
+ }
+ if(isObject(brdnPie))
+ {
+ brdnPie.resize();
+ }
+ if(isObject(repairPie))
+ {
+ repairPie.resize();
+ }
+ if(isObject(healthPie)) {
+ healthPie.resize();
+ }
+ if(isObject(endurPie)) {
+ endurPie.resize();
+ }
+ });
//鏌ヨ鎵�鏈夌殑鍏憡淇℃伅
function searchAnnounceall(){
@@ -1198,15 +1328,12 @@
//鏌ヨ鏀剧數娴嬭瘯鐨勬瘮渚�
function searchTestsCale(){
if($('#content .discharge-test').length==0){
- //alert();
return;
}
//鐢熸垚鐢垫睜鏈斁鐢垫瘮渚嬪浘
var $health=$('#content .discharge-test .test-pie'); //鑾峰彇鏁呴殰瀹瑰櫒鐨刯query瀵硅薄
if($health.length!=0){
var health=$health.get(0); //灏嗘晠闅滃鍣ㄧ殑jquery瀵硅薄杞寲涓篸om瀵硅薄
- //console.info(health);
- //healthPie.showLoading();
var healthTle="<s:text name='Battery_discharge_scale_map'/>"; /* '鐢垫睜鏀剧數姣斾緥鍥�' */
Batttest_Td=new Array();
$.post("Batttestdata_infAction!searchTestsCale",$('#batttest_form').serialize(),function(data){
@@ -1453,10 +1580,7 @@
});
});
- $(window).resize(function() {
- console.log(123);
- getMapHt();
- });
+
// 鏀瑰彉div鐨勫ぇ灏�
function changeDivBig(ele) {
// 闅愯棌闈㈡澘
@@ -1560,6 +1684,9 @@
mapEle.parent().append(iconExplain);
+ // 缁熻鏈烘埧鐘舵�佷釜鏁�
+ updateMapIconBadge();
+
// 璁剧疆鍦板浘鍥炬爣绉嶇被
setMapImgStyles();
}
@@ -1578,28 +1705,42 @@
// 鏅�氭満鎴挎弿杩�
function mapImgDescNormal(iconExplain) {
- // 鏈烘埧钀藉悗
+ // 钀藉悗鏈烘埧
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-behind" checked="checked">');
+ var span = $('<span>鐢垫睜钀藉悗鏈烘埧</span>');
var icon = $('<img src="'+mapImages.behind+'">');
- var span = $('<span>鐢垫睜缁勮惤鍚庢満鎴�</span>');
+ var badge = $('<a href="javascript:;" class="layui-badge-rim mrr8 badge-behind">0</a>');
iconList.append(input);
iconList.append(span);
iconList.append(icon);
+ iconList.append(badge);
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-warn" checked="checked">');
+ var span = $('<span>鐢垫睜鍛婅鏈烘埧</span>');
var icon = $('<img src="'+mapImages.warn+'">');
- var span = $('<span>鐢垫睜缁勫憡璀︽満鎴�</span>');
+ var badge = $('<a href="javascript:;" class="layui-badge-rim mrr8 badge-warn">0</a>');
iconList.append(input);
iconList.append(span);
iconList.append(icon);
+ iconList.append(badge);
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-down" checked="checked">');
+ var icon = $('<img src="'+mapImages.timeout+'">');
+ var span = $('<span>鎺夌珯鏈烘埧</span>');
+ var badge = $('<a href="javascript:;" class="layui-badge-rim mrr8 badge-down">0</a>');
+ iconList.append(input);
+ iconList.append(span);
+ iconList.append(icon);
+ iconList.append(badge);
+ iconExplain.append(iconList);
// 鏈烘埧寤舵椂
var iconList = $('<div class="explain-list" style="padding: 4px 6px; border-bottom: 1px slid #ccc; display:block"></div>');
@@ -1609,16 +1750,18 @@
iconList.append(input);
iconList.append(span);
iconList.append(icon);
- iconExplain.append(iconList);
+ //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>');
+ var badge = $('<a href="javascript:;" class="layui-badge-rim mrr8 badge-powercut">0</a>');
iconList.append(input);
iconList.append(span);
iconList.append(icon);
+ iconList.append(badge);
iconExplain.append(iconList);
// 姝ｅ父鏈烘埧
@@ -1626,11 +1769,58 @@
var input = $('<input type="checkbox" data-img="item-normal" checked="checked">');
var icon = $('<img src="'+mapImages.normal+'">');
var span = $('<span>姝ｅ父鏈烘埧</span>');
+ var badge = $('<a href="javascript:;" class="layui-badge-rim mrr8 badge-normal">0</a>');
iconList.append(input);
iconList.append(span);
iconList.append(icon);
+ //iconList.append(badge);
iconExplain.append(iconList);
+
+ // 缁埅涓嶈冻3灏忔椂鏈烘埧
+ 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-weak" checked="checked">');
+ var icon = $('<img src="'+mapImages.normal+'">');
+ var span = $('<span>缁埅涓嶈冻3灏忔椂鏈烘埧</span>');
+ var badge = $('<a href="javascript:;" class="layui-badge-rim mrr8 badge-weak">0</a>');
+ iconList.append(input);
+ iconList.append(span);
+ iconList.append(icon);
+ iconList.append(badge);
+ //iconExplain.append(iconList);
}
+
+ // 鏇存柊鍦板浘鍥炬爣badge鐨勫��
+ function updateMapIconBadge() {
+ var mapImgDesc = $('#mapImgDesc');
+ var behind = mapImgDesc.find('.badge-behind'); // 鐢垫睜钀藉悗鏈烘埧
+ var warn = mapImgDesc.find('.badge-warn'); // 鐢垫睜鍛婅鏈烘埧
+ var down = mapImgDesc.find('.badge-down'); // 鎺夌珯鏈烘埧
+ var powercut = mapImgDesc.find('.badge-powercut'); // 鍋滅數鏈烘埧
+ var normal = mapImgDesc.find('.badge-normal'); // 姝ｅ父鏈烘埧
+ var weak = mapImgDesc.find('.badge-weak'); // 缁埅涓嶈冻3灏忔椂鏈烘埧
+ console.log(warn.length);
+ // 璇锋眰鍚庡彴鏁版嵁
+ $.ajax({
+ type: 'post'
+ ,async: true
+ ,url: 'Bts_station_stateAction_action_serchStationState'
+ ,data: null
+ ,dataType: 'json'
+ ,success:function(res) {
+ var rs = JSON.parse(res.result);
+ //console.log(rs);
+ powercut.text(rs.sum); // 鍋滅數鏁�
+ down.text(rs.code); // 鎺夌珯鏁�
+ behind.text(rs.msgN); // 钀藉悗鏈烘埧
+ warn.text(rs.msg); // 鍛婅鏈烘埧
+
+ /* var normalNum = Number(rs.newsum) - (Number(rs.sum)+Number(rs.code)+Number(rs.msgN)+Number(rs.msg));
+ normal.text(normalNum); */ // 姝ｅ父鏈烘埧
+ }
+ });
+
+ }
+
// 61850鎻忚堪
function mapImgDesc61850(iconExplain) {
@@ -1763,8 +1953,10 @@
// 鏇存柊鍦板浘鍥炬爣
function updateMapDotIcon(map, dotList, isTop) {
+ var homeType = getHomeType();
// 閬嶅巻鏌ヨ鍐呭鐢熸垚瀵瑰簲鐨勫浘鏍�
for(var i = 0; i<dotList.length; i++) {
+ var isAcType = checkHomeType(dotList[i].type, homeType);
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);
@@ -1778,7 +1970,7 @@
}
// 闅愯棌marker鐐�
- isShow?mk.show():mk.hide();
+ isShow&&isAcType?mk.show():mk.hide();
}
}
}
@@ -2336,7 +2528,7 @@
// 鑾峰彇缁撴灉闆�
var rs = JSON.parse(data.result);
var list = rs.data;
- // console.log(list);
+ //console.log(list);
allStation = new Array();
if(list!=undefined && list.length>0){
// 璁剧疆鍒嗛〉淇℃伅
@@ -2351,7 +2543,7 @@
// 鏄剧ず鍖哄煙鐨勫浘鏍�
bmap.setDots(allStation);
bmap.queryInRect(map, createMapDot);
- updateStation();
+ updateStation(setRect);
// 鏇存柊灏忓伐鍏锋悳绱㈡満鎴垮姛鑳�
updateSearchSource(allStation);
@@ -2392,9 +2584,16 @@
}
// 杞鏇存柊鍦板浘鐨勭偣鏌ヨ
- function updateStation() {
+ var updateTimeout;
+ var updateLoad;
+ function updateStation(isLoad) {
var bmap = GLOBAL.BMap; // BMap鐨勫懡鍚嶇┖闂�
var updateStationData = [];
+
+ if(isLoad) {
+ updateLoad = layer.load(1);
+ }
+
$.ajax({
type: "post",
url: "BattMap_informationAction!searchUserManageStation2",
@@ -2402,19 +2601,19 @@
dataType:'json',
data: "json="+JSON.stringify(mapPages),
success: function(result) {
+ layer.close(updateLoad);
var data = JSON.parse(result.result);
//console.log(data);
for(var i=0; i<data.length; i++) {
var _data = data[i];
var _list = formatUpdateStation(_data);
updateStationData.push(_list);
- //_list.msg = 'item-nuclear_cap';
// 鍒ゆ柇鏄惁鏇存柊
if(mapPages.pageNew) {
bmap.updateDots(_list);
}
}
-
+ //console.log(updateStationData);
updateMapDotIcon(map, updateStationData, true);
// 鏇存柊鍒嗛〉淇℃伅
mapPages.pageCurr++;
@@ -2422,8 +2621,9 @@
mapPages.pageCurr=1;
mapPages.pageNew=false;
}
-
- setTimeout(updateStation, 4000);
+ // 鍏抽棴骞舵坊鍔犲欢鏃舵墽琛�
+ clearInterval(updateTimeout);
+ updateTimeout = setTimeout(updateStation, 4000);
}
});
@@ -2433,7 +2633,6 @@
function formatUpdateStation(list) {
var obj = {};
var data = list.data;
- //console.log(list);
// GPS鍧愭爣杞寲涓虹櫨搴﹀潗鏍�
var point = GPS.wgs2bd(data.latitude, data.longitude);
// 鏋勯�犵粨鏋滈泦
@@ -2444,9 +2643,13 @@
obj.fbsId = data.FBSDeviceId;
obj.addr = data.Address;
obj.msg = list.msg;
- obj.num = list.num;
+ obj.num = data.num;
+ obj.type = data.monvolstd;
return obj;
}
+
+ // 鏍规嵁鏄剧ず鐨勭被鍨嬬瓫閫夋暟鎹�
+
// 鏍规嵁allStation鐨勫�煎幓鏇存柊鍐呭
function updateMapByAllStation() {
@@ -3022,25 +3225,6 @@
$(function() {
searchProvince();
- });
-
- //璁╁湴鍥惧拰楗肩姸鍥鹃殢娴忚鍣ㄧ獥鍙ｇ殑鏀瑰彉鑰屾敼鍙�
- $(window).resize(function(){
- if(warnPie != undefined)
- {
- warnPie.resize();
- }
- if(brdnPie != undefined)
- {
- brdnPie.resize();
- }
- if(repairPie != undefined)
- {
- repairPie.resize();
- }
- if(healthPie != undefined) {
- healthPie.resize();
- }
});
// 鐐瑰嚮鍒囨崲鍐呭
@@ -3559,6 +3743,7 @@
var model = eval('('+data.result+')');
if(model.code == 1) {
var result = model.data;
+ //console.log(result);
var formatData = formatPieRsData(result[0]);
laytpl(pieConfTpl).render(formatData, function(html) {
layer.open({
@@ -3634,6 +3819,7 @@
// 鏇存柊褰撳墠鐢ㄦ埛璁剧疆楗肩姸鍥剧殑浣胯兘鐘舵��
function updateUserBieState(temp, dialog, load){
+ var pieItemCon = $('.pie-con .pie-item-con');
// 鏇存柊鍚庡彴鏁版嵁
$.ajax({
type:"post",
@@ -3643,9 +3829,22 @@
data:'json='+JSON.stringify(temp),
success: function(data){
layer.closeAll();
-
var model = eval('('+data.result+')');
if(model.code == 1) {
+ // 鏇村叿temp鐨勫�艰缃ゼ鐘跺浘鐨勫唴瀹�
+ var formaterTmp = GLOBAL.Index.Pie.formaterPieStauts(temp);
+ //console.log(formaterTmp);
+ var pieItems = GLOBAL.Index.Pie.getPieList(formaterTmp);
+ //console.log(pieItems);
+ pieItemCon.text('');
+ pieItemCon.append(pieItems);
+
+ // 璁剧疆楂樺害
+ getMapHt();
+
+ // 鏇存柊楗肩姸鍥�
+ flushFourPie(true);
+
layer.msg('閰嶇疆鎴愬姛锛侊紒锛�');
}else {
layer.msg('閰嶇疆澶辫触锛侊紒锛�');
@@ -3675,6 +3874,7 @@
$( "#mapToolSearch" ).on('input propertychange', function(){
$('#mapToolSearchBtn').data('homeInfo', 0);
});
+
// 瀹氫箟鏈烘埧鏌ヨ淇℃伅
$( "#mapToolSearch" ).autocomplete({
source: [],
@@ -3682,6 +3882,14 @@
$('#mapToolSearchBtn').data('homeInfo', ui.item); // 璁剧疆鏈烘埧淇℃伅鍐呭
}
});
+
+ // 鐐瑰嚮鏈烘埧绫诲瀷澶嶉�夋
+ $('#homeType input[type=checkbox]').click(function() {
+ var homeType = getHomeType();
+ getInstallNum();
+ updateStation(true);
+ });
+
// 鐐瑰嚮鏌ョ湅homeInfo鐨勫��
$('#mapToolSearchBtn').click(function() {
@@ -3774,15 +3982,66 @@
success: function(result) {
// 鏍煎紡鍖栨暟鎹�
var rs = JSON.parse(result.result);
- var txt = rs.newsum+'/'+rs.sum;
+ //console.log(rs);
+ if(rs.code == 1) {
+ var txt = getInstallNumByType(rs.data,getHomeType());
- // 鏇存柊鏂囨湰鍊�
- $('#installnum').text(txt);
+ // 鏇存柊鏂囨湰鍊�
+ $('#installnum').text(txt);
+ }
+
}
});
- };
+ }
+
+ // 鏇村叿閫夋嫨鏈烘埧鐨勭被鍨嬭繑鍥炴枃鏈�
+ function getInstallNumByType(data,type) {
+ var rs = '鏈煡/鏈煡';
+ switch(type) {
+ case 0:
+ rs = '0/0';
+ break;
+ case 2:
+ rs = data[0]+'/'+data[1];
+ break;
+ case 12:
+ rs = data[2]+'/'+data[3];
+ break;
+ case 14:
+ rs = data[4]+'/'+data[5];
+ break;
+ }
+
+ return rs;
+ }
});
+ // 0=鍏ㄩ儴涓嶉�� 14=鍏ㄩ儴閫変腑 2=閫変腑2V 12=閫変腑12V
+ function getHomeType() {
+ var boxList = $('#homeType input[type=checkbox]')
+ var rs = 0; // 鍏ㄩ儴
+
+ boxList.each(function() {
+ if($(this).is(':checked')) {
+ rs += Number($(this).val());
+ }
+ });
+
+ return rs;
+ }
+
+
+ // 妫�娴嬪綋鍓嶆満鎴挎槸鍚︾鍚�2V鎴�12V
+ function checkHomeType(homeType, type) {
+ var rs = false;
+ var _homeType = Number(homeType);
+ if(type == 14 || homeType == type) {
+ rs = true;
+ }
+
+ return rs;
+ }
+
// 鏇存柊鍦板浘宸ュ叿鎼滅储鏈烘埧
function updateSearchSource(data) {
var homeSource = [];
--
Gitblit v1.9.1