From 35fefed0792c40cb99b8d15fa5811bbb5992bff9 Mon Sep 17 00:00:00 2001
From: D:/workspace/chenjingjing/git/gx_tieta/gx_tieta/.gitignore <chenjingjing@LAPTOP-E51P2139>
Date: 星期一, 21 一月 2019 10:42:24 +0800
Subject: [PATCH] 修改
---
gx_tieta/WebRoot/index.jsp | 739 ++++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 582 insertions(+), 157 deletions(-)
diff --git a/gx_tieta/WebRoot/index.jsp b/gx_tieta/WebRoot/index.jsp
index 30785bd..45bb7c7 100644
--- a/gx_tieta/WebRoot/index.jsp
+++ b/gx_tieta/WebRoot/index.jsp
@@ -94,6 +94,11 @@
body .layui-layer-dialog {
min-width:400px;
}
+ .add-panel .addr {
+ width: 210px;
+ height: 22px;
+ border: 1px solid #ccc;
+ }
</style>
<script type="text/javascript" src="js/jquery-1.8.3.js"></script>
<script type="text/javascript" src="js/echarts.js"></script>
@@ -121,17 +126,27 @@
<div class="map-info-detail">
<div class="layui-collapse" lay-filter="test" lay-accordion="">
<div class="layui-colla-item">
- <h2 class="layui-colla-title">瀹氫綅鏈烘埧</h2>
+ <h2 class="layui-colla-title">绛涢�夋満鎴�</h2>
<div class="layui-colla-content layui-show">
<table>
<tbody>
<tr>
- <td class="w5em alg-c f-bold">鏈烘埧鍚嶇О:</td>
- <td><input type="text" id="mapToolSearch"></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 colspan="2" class="alg-r btn-container">
- <button type="button" value="鎼滅储" id="mapToolSearchBtn" class="mrr8">鎼滅储</button>
+ <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="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>
@@ -216,16 +231,21 @@
<i class="fa fa-cog"></i>
</a>
</div>
- <!-- 鐢垫睜鏁呴殰楗肩姸鍥� -->
- <div class="brdn-pie module"></div>
- <!-- 鐢垫睜鍛婅楗肩姸鍥� -->
- <div class="warn-pie module"></div>
- <!--鐢垫睜鏁呴殰淇鍥�-->
- <div class="repair-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}">
@@ -451,6 +471,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;
@@ -574,6 +603,7 @@
$('.nav-map').on('click', '.explain-list input', function() {
setMapImgStyles();
+ updateStation(true);
});
});
@@ -658,6 +688,7 @@
//map.setMapStyle({style: 'grayscale'}); // 璁剧疆鍦板浘鐨勯鏍�
// 娣诲姞鍦板浘绫诲瀷鎺т欢
map.addControl(new BMap.MapTypeControl());
+ add_control();
// 缁欏湴鍥炬坊鍔犲伐鍏锋潯(鍦板浘-鍗槦-涓夌淮)鍜屾瘮渚嬪昂鎺т欢
var bottom_left_control = new BMap.ScaleControl({anchor:BMAP_ANCHOR_BOTTOM_LEFT});
map.addControl(bottom_left_control); // 娣诲姞姣斾緥灏哄埌鍦板浘
@@ -721,7 +752,7 @@
}
},
{
- text: '鎭㈠姝ｅ父',
+ text: '閫�鍑哄叏灞忔樉绀�',
callback: function(e) {
// console.info(e);
smallMap();
@@ -770,46 +801,35 @@
}
//闇�瑕佸疄鏃舵煡璇㈢殑鏂规硶
- function Repeatoperation(){
- searchBattmaintrecords();
- searchUserTask();
- searchAnnounceall();
- searchTestsCale();
-
+ function Repeatoperation(){
+ // 鍒ゆ柇椤甸潰鏄惁姝ｅ湪琚闂�
+ if(pageIsVisit) {
+ searchBattmaintrecords();
+ searchUserTask();
+ searchAnnounceall();
+ searchTestsCale();
+ }
setTimeout(Repeatoperation,10000);
}
$(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(); //鏌ヨ缁埅楗肩姸鍥�
}
//鏌ヨ鏈�杩戠殑鏁呴殰缁存姢璁板綍
@@ -916,20 +936,29 @@
});
}
-
+ var warnPie;
//鏌ヨ鍛婅淇℃伅骞舵樉绀哄憡璀︾巼
function searchalarm_data(){
if($('#content .warn-pie').length==0){
return;
}
+ // 鍒ゆ柇椤甸潰鏄惁琚闂�
+ if(!pageIsVisit) {
+ setTimeout(searchalarm_data, 10000);
+ 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+"=");
@@ -956,6 +985,8 @@
Almarr.push(/*{
name:"<s:text name='Capacity'/><s:text name='Alarm'/><s:text name='Alarm'/>",val:parseInt(data.BattGroupId) // 瀹归噺鍛婅鍛婅
} ,*/{
+ name:"<s:text name='On-line_voltage'/>",val:parseInt(data.Record_Id), // 鍦ㄧ嚎鐢靛帇
+ },{
name:"<s:text name='Group_voltage'/>",val:parseInt(data.MonNum), // 缁勭鐢靛帇
},{
name:"<s:text name='Charging_current'/>",val:parseInt(data.alm_id), // 鍏呯數鐢垫祦
@@ -999,38 +1030,69 @@
}
//鍒涘缓鐢垫睜鍛婅楗肩姸鍥�
var warnTle="<s:text name='Battery_alarm_rate'/>"; /* 鐢垫睜鍛婅鐜� */
- createPie(warnPie,warnTle,Almarr);
+ 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 {
+ 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;
}
+
+ // 鍒ゆ柇椤甸潰鏄惁琚闂�
+ if(!pageIsVisit) {
+ setTimeout(searchmaintByMap, 10000);
+ 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);
});
}
@@ -1070,13 +1132,28 @@
{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;
}
+
+ // 鍒ゆ柇椤甸潰鏄惁琚闂�
+ if(!pageIsVisit) {
+ setTimeout(searchBatt_maint_inf, 10000);
+ 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",
@@ -1091,25 +1168,25 @@
//console.info(model);
if((model.sum>=0) && (model.newsum>=0) && (model.newsum>=model.sum)){
repairObj=[{name:"<s:text name='Computer_room'/><s:text name='Power_cut'/>",val:model.sum,color:'#FF0000'}, /*宸插仠鐢垫満鎴�*/
- {name:"<s:text name='Computer_room'/><s:text name='Not'/><s:text name='Power_cut'/>",val:model.newsum-model.sum,color:'#31CB36'}]; /* 鏈仠鐢垫満鎴� */
+ {name:"<s:text name='Computer_room'/><s:text name='Not'/><s:text name='Power_cut'/>",val:model.newsum-model.sum,color:'#31CB36'}, /* 鏈仠鐢垫満鎴� */
+ {name:"鏈烘埧鎺夌珯", val: model.code}];
}else{
repairObj=[{name:"<s:text name='Computer_room'/><s:text name='Power_cut'/>",val:0,color:'#FF0000'}, /* 宸插仠鐢垫満鎴� */
- {name:"<s:text name='Computer_room'/><s:text name='Not'/><s:text name='Power_cut'/>",val:model.sum,color:'#31CB36'}]; /* '鏈慨澶�' */
+ {name:"<s:text name='Computer_room'/><s:text name='Not'/><s:text name='Power_cut'/>",val:model.sum,color:'#31CB36'},
+ {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('powercut.jsp?power_state=0');
+ window.open('batt-state-manage.jsp');
});
}else{
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);
@@ -1118,23 +1195,33 @@
}
//鏌ヨ鍋ュ悍鐜�
+ var healthPie;
function searchGood(){
if($('#content .health-pie').length==0){
return;
}
+
+ // 鍒ゆ柇椤甸潰鏄惁琚闂�
+ if(!pageIsVisit) {
+ setTimeout(searchGood, 10000);
+ return;
+ }
+
//鐢熸垚鐢垫睜鍋ュ悍鐜�
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'}, /* '鍋ュ悍鐢垫睜' */
@@ -1148,11 +1235,134 @@
{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;
+ }
+
+ // 鍒ゆ柇椤甸潰鏄惁琚闂�
+ if(!pageIsVisit) {
+ setTimeout(searchEndurHome, 10000);
+ 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:'#619FA7'}
+ ];
+
+ if(!isEcharts) {
+ //鍒涘缓鐢垫睜鏁呴殰楗肩姸鍥�
+ createPie(endurPie,endurTle,endurObj);
+
+ // 鐐瑰嚮楗肩姸鍥捐繘琛岃烦杞�
+ endurPie.on('click', function(param) {
+ var str = '';
+ switch(param.dataIndex) {
+ case 0:
+ str = 'timelong=60';
+ break;
+ case 1:
+ str = 'timelong=120';
+ break;
+ case 2:
+ str = 'timelong=180';
+ break;
+ case 3:
+ str = 'is_stand=0';
+ break;
+ }
+
+ window.open('batt-life-manage.jsp?'+str); // 璺宠浆鍒拌惤鍚庡崟浣撴煡璇�
+ });
+
+ }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(){
@@ -1181,15 +1391,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){
@@ -1436,10 +1643,7 @@
});
});
- $(window).resize(function() {
- console.log(123);
- getMapHt();
- });
+
// 鏀瑰彉div鐨勫ぇ灏�
function changeDivBig(ele) {
// 闅愯棌闈㈡澘
@@ -1536,12 +1740,15 @@
// 鐢熸垚鍥炬爣鐨勮鏄�
function createIconExplain(mapEle) {
var iconExplain = $('<div id="mapImgDesc" style="position:absolute;background-color: #fff; border: 1px solid #ccc; right: 10px; bottom: 10px; z-index: 99999"></div>'); // 鍦板浘鍥炬爣璇存槑瀹瑰櫒
- var iconExplainHt = $('<div class="explain-header" style="padding:4px 8px; border-bottom:1px solid #ccc; background-color: #CDDCFA">鍦板浘鍥炬爣璇存槑<img src="image/explain-down.gif" style="float:right;"/></div>');
+ var iconExplainHt = $('<div class="explain-header" style="padding:4px 8px; border-bottom:1px solid #ccc; background-color: #CDDCFA">鍥炬爣鏄剧ず涓庨�夋嫨<img src="image/explain-down.gif" style="float:right;"/></div>');
iconExplain.append(iconExplainHt);
changeMapImgDesc(iconExplain, 'normal');
mapEle.parent().append(iconExplain);
+
+ // 缁熻鏈烘埧鐘舵�佷釜鏁�
+ updateMapIconBadge();
// 璁剧疆鍦板浘鍥炬爣绉嶇被
setMapImgStyles();
@@ -1561,24 +1768,64 @@
// 鏅�氭満鎴挎弿杩�
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 icon = $('<img src="'+mapImages.behind+'">');
- var span = $('<span>鐢垫睜缁勮惤鍚庢満鎴�</span>');
+ var input = $('<input type="checkbox" data-img="item-timeout" 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>');
- var input = $('<input type="checkbox" data-img="item-warn" checked="checked">');
- var icon = $('<img src="'+mapImages.warn+'">');
- var span = $('<span>鐢垫睜缁勫憡璀︽満鎴�</span>');
+ 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);
+
+ // 缁埅涓嶈冻
+ 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-xuhang" checked="checked">');
+ var icon = $('<img src="'+mapImages.xuhang+'">');
+ var span = $('<span>缁埅涓嶈冻鏈烘埧</span>');
+ var badge = $('<a href="javascript:;" class="layui-badge-rim mrr8 badge-xuhang">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-behind" checked="checked">');
+ var span = $('<span>鐢垫睜钀藉悗鏈烘埧</span>');
+ var icon = $('<img src="'+mapImages.behind+'">');
+ 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 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);
@@ -1592,28 +1839,65 @@
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);
- 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-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-xuhang'); // 缁埅涓嶈冻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); // 鍛婅鏈烘埧
+ weak.text(rs.msgT); // 缁埅涓嶈冻3灏忔椂
+ /* var normalNum = Number(rs.newsum) - (Number(rs.sum)+Number(rs.code)+Number(rs.msgN)+Number(rs.msg));
+ normal.text(normalNum); */ // 姝ｅ父鏈烘埧
+ }
+ });
+
+ }
+
// 61850鎻忚堪
function mapImgDesc61850(iconExplain) {
@@ -1746,8 +2030,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);
@@ -1761,7 +2047,7 @@
}
// 闅愯棌marker鐐�
- isShow?mk.show():mk.hide();
+ isShow&&isAcType?mk.show():mk.hide();
}
}
}
@@ -2050,10 +2336,10 @@
var content = '<div class="add-panel">'+
'<div style="padding: 6px 4px"><span>鍦板潃锛�</span>'+
- '<span class="addr">'+addComp.province+'-'+addComp.city+'-'+addComp.district+'-'+addComp.street+'</span></div>'+
+ '<input type="text" class="addr" value="'+addComp.province+'-'+addComp.city+'-'+addComp.district+'-'+addComp.street+'"></div>'+
'<div style="padding: 6px 4px">缁忓害锛�<span class="lng">'+rs.point.lng+'</span>锛岀含搴︼細<span class="lat">'+rs.point.lat+'</span></div>'+
- '<div style="padding: 6px 4px"><span>璁剧疆绔欑偣鍚嶏細</span>'+'<select style="border: 1px solid #ccc; width: 180px">'+options+'</select></div>'+
- '<div style="padding: 6px 4px; margin-top: 20px">'+
+ '<div style="padding: 6px 4px"><span>璁剧疆绔欑偣鍚嶏細</span>'+'<select style="border: 1px solid #ccc; width: 180px;height: 22px;">'+options+'</select></div>'+
+ '<div style="padding: 6px 4px; margin-top: 15px">'+
'<a href="javascript:getAddHomeInfo();" class="map-panel-btn">纭畾</a></div>'
+'</div>';
@@ -2071,7 +2357,7 @@
var lat = $('.add-panel .lat').text(); // 鑾峰彇绾害
var wgsPoint = GPS.bd2wgs(lat, lng); // 鐧惧害鍦板浘鍧愭爣杞寲涓篏PS
- var addr = $('.add-panel .addr').text(); // 鑾峰彇鍦板潃
+ var addr = $('.add-panel .addr').val(); // 鑾峰彇鍦板潃
var homeName = $('.add-panel select option:selected').text(); // 鏈烘埧鍚嶇О
var homeId = $('.add-panel select option:selected').val(); // 鏈烘埧ID
if(homeId !=0 && confirm("纭灏�"+homeName+"鏈烘埧璁剧疆鍒拌浣嶇疆鍚楋紵")){
@@ -2319,7 +2605,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){
// 璁剧疆鍒嗛〉淇℃伅
@@ -2375,9 +2661,23 @@
}
// 杞鏇存柊鍦板浘鐨勭偣鏌ヨ
- function updateStation() {
+ var updateTimeout;
+ var updateLoad;
+ function updateStation(isLoad) {
var bmap = GLOBAL.BMap; // BMap鐨勫懡鍚嶇┖闂�
var updateStationData = [];
+
+ // 鍒ゆ柇鏄惁琚闂�
+ if(!pageIsVisit) {
+ // 鍏抽棴骞舵坊鍔犲欢鏃舵墽琛�
+ clearInterval(updateTimeout);
+ updateTimeout = setTimeout(updateStation, 4000);
+ }
+
+ if(isLoad) {
+ updateLoad = layer.load(1);
+ }
+
$.ajax({
type: "post",
url: "BattMap_informationAction!searchUserManageStation2",
@@ -2385,19 +2685,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++;
@@ -2405,8 +2705,9 @@
mapPages.pageCurr=1;
mapPages.pageNew=false;
}
-
- setTimeout(updateStation, 4000);
+ // 鍏抽棴骞舵坊鍔犲欢鏃舵墽琛�
+ clearInterval(updateTimeout);
+ updateTimeout = setTimeout(updateStation, 4000);
}
});
@@ -2416,7 +2717,6 @@
function formatUpdateStation(list) {
var obj = {};
var data = list.data;
- //console.log(list);
// GPS鍧愭爣杞寲涓虹櫨搴﹀潗鏍�
var point = GPS.wgs2bd(data.latitude, data.longitude);
// 鏋勯�犵粨鏋滈泦
@@ -2427,9 +2727,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() {
@@ -2787,6 +3091,8 @@
//console.info(allStation);
console.info(allStation);
var temp = getStationMap(allStation, mk.point);
+ console.info(temp);
+ temp.StationName = temp.title;
if(confirm("纭浠庡湴鍥句笂鍒犻櫎'"+temp.title+"'鐨勪綅缃俊鎭悧锛�")){
if(temp != undefined){
var json = JSON.stringify(temp);
@@ -3005,25 +3311,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();
- }
});
// 鐐瑰嚮鍒囨崲鍐呭
@@ -3086,6 +3373,7 @@
var rs = new Object();
rs.normal = "User_ChartAction!serchByInfo?json={Chart_file:'"+user_logo+"',Chart_name:chart_normal}"; // 鏅�氭満鎴垮浘鏍�
rs.behind = "User_ChartAction!serchByInfo?json={Chart_file:'"+user_logo+"',Chart_name:chart_behind}"; // 钀藉悗鍥炬爣
+ //rs.diaozhan = "User_ChartAction!serchByInfo?json={Chart_file:'"+user_logo+"',Chart_name:chart_diaozhan}"; // 寤舵椂鏈烘埧鍥炬爣
rs.timeout = "User_ChartAction!serchByInfo?json={Chart_file:'"+user_logo+"',Chart_name:chart_timeout}"; // 寤舵椂鏈烘埧鍥炬爣
rs.warn = "User_ChartAction!serchByInfo?json={Chart_file:'"+user_logo+"',Chart_name:chart_warn}"; // 鍛婅鏈烘埧鍥炬爣
rs.nuclear = "User_ChartAction!serchByInfo?json={Chart_file:'"+user_logo+"',Chart_name:chart_nuclear_cap}"; // 鏍稿鏀剧數
@@ -3094,6 +3382,7 @@
rs.float = "User_ChartAction!serchByInfo?json={Chart_file:'"+user_logo+"',Chart_name:chart_online_charge}"; // 娴厖
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}";
+ rs.xuhang = "User_ChartAction!serchByInfo?json={Chart_file:'"+user_logo+"',Chart_name:Chart_xuhang}";
return rs;
}
@@ -3294,6 +3583,9 @@
case 'item-behind': // 钀藉悗
rs = imgs.behind;
break;
+ case 'item-diaozhan':
+ rs = imgs.timeout; // 鎺夌珯
+ break;
case 'item-timeout': // 寤舵椂
rs = imgs.timeout;
break;
@@ -3311,6 +3603,9 @@
break;
case 'item-pre_charge': // 61850棰勫厖鐢�
rs = imgs.precharge;
+ break;
+ case 'item-xuhang': // 缁埅涓嶈冻
+ rs = imgs.xuhang;
break;
default:
rs = imgs.defaults;
@@ -3522,6 +3817,11 @@
type: 1
});
$(this).prop('checked', false);
+ }else if(num == 0) {
+ layerMsg = layer.msg("鑷冲皯閫夋嫨涓�涓紒", {
+ type: 1
+ });
+ $(this).prop('checked', true);
}
});
@@ -3540,34 +3840,43 @@
data:null,
success: function(data){
var model = eval('('+data.result+')');
+ var resData;
if(model.code == 1) {
var result = model.data;
- var formatData = formatPieRsData(result[0]);
- laytpl(pieConfTpl).render(formatData, function(html) {
- layer.open({
- id: 'pie',
- title: '楗肩姸鍥鹃厤缃�',
- maxHeight: 450,
- content: html,
- yes: function(index) {
- var iptList = $('#tplTblOpts .tpl-tbl-opts-header input[type=checkbox]');
- var iptArr = [];
- iptList.each(function() {
- if($(this).is(':checked')) {
- iptArr.push(1);
- }else {
- iptArr.push(0);
- }
- });
-
- var temp = structUpdatePie(iptArr);
- layer.load();
- updateUserBieState(temp);
- }
- });
- });
+ resData = result[0];
+ }else {
+ resData = {
+ echarts1_enable:1,
+ echarts2_enable:1,
+ echarts3_enable:1,
+ echarts4_enable:1
+ };
}
+ // 鏍煎紡鑾峰彇鍒扮殑鏁版嵁
+ var formatData = formatPieRsData(resData);
+ laytpl(pieConfTpl).render(formatData, function(html) {
+ layer.open({
+ id: 'pie',
+ title: '楗肩姸鍥鹃厤缃�',
+ maxHeight: 450,
+ content: html,
+ yes: function(index) {
+ var iptList = $('#tplTblOpts .tpl-tbl-opts-header input[type=checkbox]');
+ var iptArr = [];
+ iptList.each(function() {
+ if($(this).is(':checked')) {
+ iptArr.push(1);
+ }else {
+ iptArr.push(0);
+ }
+ });
+ var temp = structUpdatePie(iptArr);
+ layer.load();
+ updateUserBieState(temp);
+ }
+ });
+ });
}
});
}
@@ -3617,6 +3926,7 @@
// 鏇存柊褰撳墠鐢ㄦ埛璁剧疆楗肩姸鍥剧殑浣胯兘鐘舵��
function updateUserBieState(temp, dialog, load){
+ var pieItemCon = $('.pie-con .pie-item-con');
// 鏇存柊鍚庡彴鏁版嵁
$.ajax({
type:"post",
@@ -3626,9 +3936,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('閰嶇疆澶辫触锛侊紒锛�');
@@ -3658,6 +3981,7 @@
$( "#mapToolSearch" ).on('input propertychange', function(){
$('#mapToolSearchBtn').data('homeInfo', 0);
});
+
// 瀹氫箟鏈烘埧鏌ヨ淇℃伅
$( "#mapToolSearch" ).autocomplete({
source: [],
@@ -3665,6 +3989,14 @@
$('#mapToolSearchBtn').data('homeInfo', ui.item); // 璁剧疆鏈烘埧淇℃伅鍐呭
}
});
+
+ // 鐐瑰嚮鏈烘埧绫诲瀷澶嶉�夋
+ $('#homeType input[type=checkbox]').click(function() {
+ var homeType = getHomeType();
+ getInstallNum();
+ updateStation(true);
+ });
+
// 鐐瑰嚮鏌ョ湅homeInfo鐨勫��
$('#mapToolSearchBtn').click(function() {
@@ -3728,7 +4060,94 @@
return point;
}
+ // 鐐瑰嚮璁惧瀹夎鐘舵�佺殑鍒锋柊鎸夐挳
+ $('#installnumbtn').click(function() {
+ getInstallNum(true);
+ });
+
+ // 缁熻璁惧瀹夎鎯呭喌
+ getInstallNum();
+ // 鑾峰彇褰撳墠宸茬粡瀹夎鐨勮澶囨暟鐩�
+ function getInstallNum(isLoad) {
+ var load;
+ // 鏌ヨ鍚庡彴鏁版嵁
+ $.ajax({
+ type: 'post',
+ async:true,
+ url: 'BattInfAction!serchDevice',
+ data: null,
+ dataType: 'json',
+ beforeSend: function(xhr) {
+ if(isLoad) {
+ load = layer.load(1);
+ }
+
+ },
+ complete: function(xhr) {
+ layer.close(load);
+ },
+ success: function(result) {
+ // 鏍煎紡鍖栨暟鎹�
+ var rs = JSON.parse(result.result);
+ //console.log(rs);
+ if(rs.code == 1) {
+ var txt = getInstallNumByType(rs.data,getHomeType());
+
+ // 鏇存柊鏂囨湰鍊�
+ $('#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) {
@@ -3747,5 +4166,11 @@
$( "#mapToolSearch" ).autocomplete('option', 'source', homeSource);
}
+
+ // 娣诲姞鍦板浘鎺т欢
+ function add_control(){
+ var bottom_left_navigation = new BMap.NavigationControl({anchor: BMAP_ANCHOR_BOTTOM_LEFT});
+ map.addControl(bottom_left_navigation);
+ }
</script>
</html>
--
Gitblit v1.9.1