From 4cd7f917d45130fae2af3b07171efb311e8c3738 Mon Sep 17 00:00:00 2001
From: Administrator <Administrator@USER-20180117QL>
Date: 星期三, 26 十二月 2018 16:45:19 +0800
Subject: [PATCH] aaa
---
gx_tieta/WebRoot/index.jsp | 291 ++++++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 222 insertions(+), 69 deletions(-)
diff --git a/gx_tieta/WebRoot/index.jsp b/gx_tieta/WebRoot/index.jsp
index 4593492..3a85a6e 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,10 +126,17 @@
<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="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>
@@ -591,6 +603,7 @@
$('.nav-map').on('click', '.explain-list input', function() {
setMapImgStyles();
+ updateStation(true);
});
});
@@ -675,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); // 娣诲姞姣斾緥灏哄埌鍦板浘
@@ -1242,12 +1256,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);
@@ -1697,6 +1733,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-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-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">');
@@ -1722,17 +1794,7 @@
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>');
@@ -1743,18 +1805,6 @@
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>');
- 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>');
@@ -1789,7 +1839,7 @@
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灏忔椂鏈烘埧
+ var weak = mapImgDesc.find('.badge-xuhang'); // 缁埅涓嶈冻3灏忔椂鏈烘埧
console.log(warn.length);
// 璇锋眰鍚庡彴鏁版嵁
$.ajax({
@@ -1800,12 +1850,12 @@
,dataType: 'json'
,success:function(res) {
var rs = JSON.parse(res.result);
- //console.log(rs);
+ 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); */ // 姝ｅ父鏈烘埧
}
@@ -1945,8 +1995,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 +2012,7 @@
}
// 闅愯棌marker鐐�
- isShow?mk.show():mk.hide();
+ isShow&&isAcType?mk.show():mk.hide();
}
}
}
@@ -2249,10 +2301,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>';
@@ -2270,7 +2322,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+"鏈烘埧璁剧疆鍒拌浣嶇疆鍚楋紵")){
@@ -2518,7 +2570,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 +2626,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 +2643,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 +2655,7 @@
bmap.updateDots(_list);
}
}
-
+ //console.log(updateStationData);
updateMapDotIcon(map, updateStationData, true);
// 鏇存柊鍒嗛〉淇℃伅
mapPages.pageCurr++;
@@ -2603,8 +2663,9 @@
mapPages.pageCurr=1;
mapPages.pageNew=false;
}
-
- setTimeout(updateStation, 4000);
+ // 鍏抽棴骞舵坊鍔犲欢鏃舵墽琛�
+ clearInterval(updateTimeout);
+ updateTimeout = setTimeout(updateStation, 4000);
}
});
@@ -2614,7 +2675,6 @@
function formatUpdateStation(list) {
var obj = {};
var data = list.data;
- //console.log(list);
// GPS鍧愭爣杞寲涓虹櫨搴﹀潗鏍�
var point = GPS.wgs2bd(data.latitude, data.longitude);
// 鏋勯�犵粨鏋滈泦
@@ -2625,9 +2685,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 +3049,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);
@@ -3265,6 +3331,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}"; // 鏍稿鏀剧數
@@ -3273,6 +3340,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;
}
@@ -3473,6 +3541,9 @@
case 'item-behind': // 钀藉悗
rs = imgs.behind;
break;
+ case 'item-diaozhan':
+ rs = imgs.timeout; // 鎺夌珯
+ break;
case 'item-timeout': // 寤舵椂
rs = imgs.timeout;
break;
@@ -3490,6 +3561,9 @@
break;
case 'item-pre_charge': // 61850棰勫厖鐢�
rs = imgs.precharge;
+ break;
+ case 'item-xuhang': // 缁埅涓嶈冻
+ rs = imgs.xuhang;
break;
default:
rs = imgs.defaults;
@@ -3701,6 +3775,11 @@
type: 1
});
$(this).prop('checked', false);
+ }else if(num == 0) {
+ layerMsg = layer.msg("鑷冲皯閫夋嫨涓�涓紒", {
+ type: 1
+ });
+ $(this).prop('checked', true);
}
});
@@ -3719,35 +3798,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 +3939,7 @@
$( "#mapToolSearch" ).on('input propertychange', function(){
$('#mapToolSearchBtn').data('homeInfo', 0);
});
+
// 瀹氫箟鏈烘埧鏌ヨ淇℃伅
$( "#mapToolSearch" ).autocomplete({
source: [],
@@ -3859,6 +3947,14 @@
$('#mapToolSearchBtn').data('homeInfo', ui.item); // 璁剧疆鏈烘埧淇℃伅鍐呭
}
});
+
+ // 鐐瑰嚮鏈烘埧绫诲瀷澶嶉�夋
+ $('#homeType input[type=checkbox]').click(function() {
+ var homeType = getHomeType();
+ getInstallNum();
+ updateStation(true);
+ });
+
// 鐐瑰嚮鏌ョ湅homeInfo鐨勫��
$('#mapToolSearchBtn').click(function() {
@@ -3951,14 +4047,65 @@
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) {
@@ -3977,5 +4124,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