From 79b11ea2bfeba796c38e50ce0bbedb4a86f950f5 Mon Sep 17 00:00:00 2001
From: CJJ <Administrator@192.168.10.18>
Date: 星期六, 01 十二月 2018 10:49:13 +0800
Subject: [PATCH] 手机 头部链接返回问题
---
gx_tieta/WebRoot/index.jsp | 195 +++++++++++++++++++++++++++++++++++++++---------
1 files changed, 157 insertions(+), 38 deletions(-)
diff --git a/gx_tieta/WebRoot/index.jsp b/gx_tieta/WebRoot/index.jsp
index 4593492..b17e1e2 100644
--- a/gx_tieta/WebRoot/index.jsp
+++ b/gx_tieta/WebRoot/index.jsp
@@ -126,6 +126,13 @@
<table>
<tbody>
<tr>
+ <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">
@@ -591,6 +598,7 @@
$('.nav-map').on('click', '.explain-list input', function() {
setMapImgStyles();
+ updateStation(true);
});
});
@@ -1242,12 +1250,34 @@
{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'}
+ ,{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);
@@ -1945,8 +1975,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);
@@ -1960,7 +1992,7 @@
}
// 闅愯棌marker鐐�
- isShow?mk.show():mk.hide();
+ isShow&&isAcType?mk.show():mk.hide();
}
}
}
@@ -2518,7 +2550,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){
// 璁剧疆鍒嗛〉淇℃伅
@@ -2574,9 +2606,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",
@@ -2584,6 +2623,7 @@
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++) {
@@ -2595,7 +2635,7 @@
bmap.updateDots(_list);
}
}
-
+ //console.log(updateStationData);
updateMapDotIcon(map, updateStationData, true);
// 鏇存柊鍒嗛〉淇℃伅
mapPages.pageCurr++;
@@ -2603,8 +2643,9 @@
mapPages.pageCurr=1;
mapPages.pageNew=false;
}
-
- setTimeout(updateStation, 4000);
+ // 鍏抽棴骞舵坊鍔犲欢鏃舵墽琛�
+ clearInterval(updateTimeout);
+ updateTimeout = setTimeout(updateStation, 4000);
}
});
@@ -2614,7 +2655,6 @@
function formatUpdateStation(list) {
var obj = {};
var data = list.data;
- //console.log(list);
// GPS鍧愭爣杞寲涓虹櫨搴﹀潗鏍�
var point = GPS.wgs2bd(data.latitude, data.longitude);
// 鏋勯�犵粨鏋滈泦
@@ -2625,9 +2665,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() {
@@ -2985,6 +3029,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);
@@ -3701,6 +3747,11 @@
type: 1
});
$(this).prop('checked', false);
+ }else if(num == 0) {
+ layerMsg = layer.msg("鑷冲皯閫夋嫨涓�涓紒", {
+ type: 1
+ });
+ $(this).prop('checked', true);
}
});
@@ -3719,35 +3770,43 @@
data:null,
success: function(data){
var model = eval('('+data.result+')');
+ var resData;
if(model.code == 1) {
var result = model.data;
- //console.log(result);
- 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);
+ }
+ });
+ });
}
});
}
@@ -3852,6 +3911,7 @@
$( "#mapToolSearch" ).on('input propertychange', function(){
$('#mapToolSearchBtn').data('homeInfo', 0);
});
+
// 瀹氫箟鏈烘埧鏌ヨ淇℃伅
$( "#mapToolSearch" ).autocomplete({
source: [],
@@ -3859,6 +3919,14 @@
$('#mapToolSearchBtn').data('homeInfo', ui.item); // 璁剧疆鏈烘埧淇℃伅鍐呭
}
});
+
+ // 鐐瑰嚮鏈烘埧绫诲瀷澶嶉�夋
+ $('#homeType input[type=checkbox]').click(function() {
+ var homeType = getHomeType();
+ getInstallNum();
+ updateStation(true);
+ });
+
// 鐐瑰嚮鏌ョ湅homeInfo鐨勫��
$('#mapToolSearchBtn').click(function() {
@@ -3951,15 +4019,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