From cfa12a50f8e6de09a2e57fa8359dbec5e2b07628 Mon Sep 17 00:00:00 2001
From: 81041 <81041@192.168.10.30>
Date: 星期二, 23 十月 2018 11:02:52 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whyclxw1@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/WebRoot/index.jsp | 232 ++++++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 194 insertions(+), 38 deletions(-)
diff --git a/gx_tieta/WebRoot/index.jsp b/gx_tieta/WebRoot/index.jsp
index 479baa5..165155e 100644
--- a/gx_tieta/WebRoot/index.jsp
+++ b/gx_tieta/WebRoot/index.jsp
@@ -1587,8 +1587,13 @@
var pt = new BMap.Point(dotList[i].lng, dotList[i].lat);
var mk = new BMap.Marker(pt, {icon: dotIcon}); // 瀹氫箟marker鐐�
- addMenu(mk, mapDel);
+
+ // 鍒犻櫎鎸囧畾鐨勭偣(璇ョ偣浼氬湪鏈嚱鏁板悗闈㈤噸鏂板垱寤�)
deletePoint(map, dotList[i].title);
+
+ // 缁欑偣鍙抽敭鑿滃崟娣诲姞鍒犻櫎鎸夐挳
+ addMenu(mk, mapDel);
+
// 鍚憁k鐐规坊鍔爈abel
var home_name = new BMap.Label(dotList[i].title, {offset:new BMap.Size(20,-10)});
home_name.setStyle({display: 'none', padding: '4px 2px'});
@@ -1604,18 +1609,14 @@
mk.addEventListener('click', function(e) {
var target = e.target;
- showMapPanel(target, dotList);
+ //showMapPanel(target, dotList);
+ searchPanelInfo(target);
});
mkList.push(mk);
// 鍚戝湴鍥炬坊鍔犺鐩栫墿
map.addOverlay(mk);
}
}
-
-
-
-
- //
// 鍒犻櫎鍦板浘涓婄殑鎸囧畾鐐�
function deletePoint(map, msg){
@@ -1737,6 +1738,7 @@
function showMapPanel(target, warnList) {
var point = target.point;
+ console.log(target.getLabel());
var searchInforWin = null;
for(var i = 0; i < warnList.length; i++) {
if(warnList[i].lng == point.lng && warnList[i].lat == point.lat) {
@@ -1766,10 +1768,9 @@
function showMapPanelByPoint(point, dataList) {
var searchInforWin = null;
var opts = {
- //title : warnList[i].title+'<a href="javascript:loadToHomeInfo();" style="margin-left: 1em;text-decoration:none">璇︽儏>></a>', //鏍囬
title : dataList.title+'<a href="javascript:loadToHomeInfo();" style="margin-left: 1em;text-decoration:none;cursor:not-allowed">璇︽儏>></a>', //鏍囬鏈紑鍚�
width : '290', //瀹藉害
- height : 140, //楂樺害
+ height : 160, //楂樺害
panel : "panel", //妫�绱㈢粨鏋滈潰鏉�
enableAutoPan : true, //鑷姩骞崇Щ
enableSendToPhone:false,
@@ -1992,7 +1993,7 @@
var dot = dots[i];
var lat = dot.lat;
var lng = dot.lng;
- var sId = dot.binformation.StationId;
+ var sId = dot.sId;
var isExist = checkMarker(sId);
// 鏈娣诲姞杩�
@@ -2025,8 +2026,22 @@
function setDots(data) {
dots = data;
}
+
// 灏嗗彉閲忕粦瀹氬埌鍛藉悕绌洪棿涓�
gl.BMap.setDots = setDots;
+
+ // 鏇存柊dots闆嗗悎鐨勬暟鎹�
+ function updateDots(data) {
+ for(var i=0; i<dots.length; i++) {
+ var _dots = dots[i];
+ if(_dots.sId == data.sId) {
+ _dots.msg = data.msg;
+ }
+ }
+ }
+
+ // 灏嗗彉閲忕粦瀹氬埌鍛藉悕绌洪棿涓�
+ gl.BMap.updateDots = updateDots;
// 灏嗗嚱鏁扮粦瀹氬埌鍛藉悕绌洪棿涓�
gl.BMap.queryInRect = queryInRect;
@@ -2066,7 +2081,14 @@
});
- var allStation;
+ var allStation = [];
+ var mapPages = {
+ pageSize:100, // 姣忛〉鐨勮鏁�
+ pageCurr:1, // 褰撳墠椤电爜鏁�
+ pageAll:1, // 鏁扮洰
+ pageNum: 0,
+ pageNew: true
+ };
//鏌ヨ鏈烘埧
function searchStation(setRect){
var temp = createSearchParam();
@@ -2086,41 +2108,174 @@
data:"json="+json,
success: function(data){
data = eval('('+data+')');
- var list = eval('('+data.result+')');
- console.log(list.length);
+ // 鑾峰彇缁撴灉闆�
+ var rs = JSON.parse(data.result);
+ var list = rs.data;
+ // console.log(list);
allStation = new Array();
if(list!=undefined && list.length>0){
+ // 璁剧疆鍒嗛〉淇℃伅
+ mapPages.pageAll = list.length;
+ setMapPages();
+
+ // 閬嶅巻鏌ヨ缁撴灉
for(var i=0;i<list.length;i++){
- var tmp = {
- binformation:list[i].data,
- alarm_num:list[i].code, //鍛婅鏁扮洰
- low_num:list[i].sum, //钀藉悗鏁扮洰
- delay_num:list[i].newsum, //寤舵椂鏁扮洰
- msg: list[i].msg
- };
- allStation.push(analyzeData(tmp));
+ var _list = list[i];
+ allStation.push(formatAllStation(_list));
}
+
// 鏄剧ず鍖哄煙鐨勫浘鏍�
bmap.setDots(allStation);
- bmap.queryInRect(map,createMapDot);
- // 鏄惁璁剧疆鎷栧埌鍜岀缉鏀�
+ bmap.queryInRect(map, createMapDot);
+ // 鏄惁绗竴娆℃墽琛�
if(setRect) {
map.addEventListener("moveend", bmap.queryInRect.bind({},map, createMapDot)); // 鎷栧姩
map.addEventListener("zoomend", bmap.queryInRect.bind({},map, createMapDot)); // 缂╂斁
+ updateStation();
}
-
- //createMapDot(map, allStation);
-
}
}
});
}
+ // 鏍煎紡鍖栨煡璇㈢粨鏋�
+ function formatAllStation(list) {
+ var obj = new Object();
+ // 鏋勯�犵粨鏋滈泦
+ obj.lng = list.longitude;
+ obj.lat = list.latitude;
+ obj.title = list.StationName;
+ obj.sId = list.StationId;
+ obj.fbsId = list.FBSDeviceId;
+ obj.addr = list.Address;
+ obj.msg = "";
+ obj.num = list.num;
+ return obj;
+ }
+
+ // 璁剧疆鍒嗛〉鐨勪俊鎭�
+ function setMapPages() {
+ var pageNum = Math.ceil(mapPages.pageAll/mapPages.pageSize);
+ mapPages.pageNum = pageNum;
+ mapPages.pageNew= true;
+ }
+
+ // 杞鏇存柊鍦板浘鐨勭偣鏌ヨ
+ function updateStation() {
+ var bmap = GLOBAL.BMap; // BMap鐨勫懡鍚嶇┖闂�
+ var updateStationData = [];
+ $.ajax({
+ type: "post",
+ url: "BattMap_informationAction!searchUserManageStation2",
+ async: true,
+ dataType:'json',
+ data: "json="+JSON.stringify(mapPages),
+ success: function(result) {
+ var data = JSON.parse(result.result);
+ 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);
+ }
+ }
+
+ createMapDot(map, updateStationData);
+
+ // 鏇存柊鍒嗛〉淇℃伅
+ mapPages.pageCurr++;
+ if(mapPages.pageCurr>mapPages.pageNum) {
+ mapPages.pageCurr=1;
+ mapPages.pageNew=false;
+ }
+
+ setTimeout(updateStation, 4000);
+ }
+ });
+ }
+
+ // 鏍煎紡鍖栨煡璇㈢粨鏋�
+ function formatUpdateStation(list) {
+ var obj = {};
+ var data = list.data;
+ // 鏋勯�犵粨鏋滈泦
+ obj.lng = data.longitude;
+ obj.lat = data.latitude;
+ obj.title = data.StationName;
+ obj.sId = data.StationId;
+ obj.fbsId = data.FBSDeviceId;
+ obj.addr = data.Address;
+ obj.msg = list.msg;
+ obj.num = list.num;
+ return obj;
+ }
+
+ // 鏌ヨ鏈烘埧闈㈡澘淇℃伅
+ function searchPanelInfo(data) {
+ var point = data.point;
+ var stationInfo = getStaionByPoint(point);
+ if(!stationInfo) {
+ alert('闈㈡澘淇℃伅鏌ヨ澶辫触锛�');
+ return;
+ }
+
+ var temp = {
+ StationId: stationInfo.sId
+ };
+ // 鏌ヨ闈㈡澘淇℃伅
+ $.ajax({
+ type: 'post',
+ async: true,
+ url: 'BattMap_informationAction!searchUserManageStation3',
+ data: 'json='+JSON.stringify(temp),
+ dataType: 'json',
+ success: function(result) {
+ var rs = JSON.parse(result.result);
+ if(rs.length != 0) {
+ var data = rs[0];
+ console.info(data);
+ var content = '<div style="padding:6px;"><span>钃勭數姹犵粍鍛婅鏁扮洰锛�</span>'+data.code+'<a style="margin-left: 14px" href="javascript:loadToWarnPage();">璇︽儏>></a></div>'+
+ '<div style="padding:6px;"><span>钃勭數姹犵粍钀藉悗鏁扮洰锛�</span>'+data.sum+'<a style="margin-left: 14px" href="javascript:loadToBehindPage();">璇︽儏>></a></div>'+
+ '<div style="padding:6px;"><span>钃勭數姹犵粍寤舵椂鏁扮洰锛�</span>'+data.newsum+'<a style="margin-left: 14px" href="javascript:loadToDischargeDelay();">璇︽儏>></a></div>'+
+ '<div style="padding:6px"><a href="javascript:loadToRealTime();">瀹炴椂鏁版嵁</a><a style="margin-left: 20px" href="javascript:loadToOldTime();">鍘嗗彶鏁版嵁</a></div>'+
+ '<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 city" value="'+data.data.stationName2+'">';
+
+ var list = {
+ title: data.data.StationName,
+ content: content
+ };
+
+ showMapPanelByPoint(point, list);
+ }
+
+ }
+ });
+ }
+
+
+ // 鏍规嵁缁忕含搴﹁幏鍙栨満鎴跨殑淇℃伅
+ function getStaionByPoint(point) {
+ var stationInfo = false;
+ // 閬嶅巻鎵�鏈夋満鎴�
+ for(var i=0; i<allStation.length; i++) {
+ var info = allStation[i];
+ if(info.lng == point.lng && info.lat == point.lat) {
+ stationInfo = info;
+ }
+ }
+ return stationInfo;
+ }
function setAllStation(obj,allstation){
//console.info(allstation);
var flag = false;
var index = 0;
- for(var i = 0;i < allstation.length;i++){
+ for(var i = 0;i < allStation.length;i++){
//console.info(obj.binformation.num + "==" + allstation[i].binformation.num);
if(obj.binformation.num == allstation[i].binformation.num){
flag = true;
@@ -2227,16 +2382,18 @@
}
// 瀹氫綅鍒板疄鏃舵暟鎹〉闈�
function loadToRealTime() {
- var battgroupId = $('.ipt-hide').eq(0).val();
- var homeId = $('.ipt-hide').eq(1).val();
- window.open('control.jsp?battgroupId='+battgroupId+'&stationId='+homeId);
+ 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);
}
// 瀹氫綅鍒板巻鍙叉暟鎹〉闈�
function loadToOldTime() {
- var battgroupId = $('.ipt-hide').eq(0).val();
- var homeId = $('.ipt-hide').eq(1).val();
- window.open('charge-test.jsp?battgroupId='+battgroupId+'&stationId='+homeId);
+ 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);
}
//瀹氫綅鍒板憡璀﹂〉闈�
@@ -2370,11 +2527,10 @@
text: '鍒犻櫎',
callback: function(e) {
//console.info(allStation);
- console.info(mk);
+ console.info(allStation);
var temp = getStationMap(allStation, mk.point);
- if(confirm("纭浠庡湴鍥句笂鍒犻櫎'"+temp.StationName+"'鐨勪綅缃俊鎭悧锛�")){
+ if(confirm("纭浠庡湴鍥句笂鍒犻櫎'"+temp.title+"'鐨勪綅缃俊鎭悧锛�")){
if(temp != undefined){
- //console.info(temp);
var json = JSON.stringify(temp);
$.ajax({
type: "post",
@@ -2416,8 +2572,8 @@
function getStationMap(list,localposi){
if(list != undefined){
for(var i = 0 ; i < list.length ; i++){
- if(list[i].binformation.latitude == localposi.lat && list[i].binformation.longitude == localposi.lng){
- return list[i].binformation;
+ if(list[i].lat == localposi.lat && list[i].lng == localposi.lng){
+ return list[i];
}
}
}
--
Gitblit v1.9.1