From bb65f33c9fdff40844f17e95e3e75aed2b42bda2 Mon Sep 17 00:00:00 2001 From: hdw <496960745@qq.com> Date: 星期四, 25 十月 2018 14:47:33 +0800 Subject: [PATCH] 修改内容 --- gx_tieta/WebRoot/index.jsp | 477 +++++++++++++++++++++++++++++++++++++++++++++++++++++------ 1 files changed, 424 insertions(+), 53 deletions(-) diff --git a/gx_tieta/WebRoot/index.jsp b/gx_tieta/WebRoot/index.jsp index 27666f9..eb12531 100644 --- a/gx_tieta/WebRoot/index.jsp +++ b/gx_tieta/WebRoot/index.jsp @@ -34,6 +34,8 @@ <link rel="stylesheet" href="css/img-change.css"> <link rel="stylesheet" href="css/confirm.css"> <link rel="stylesheet" href="css/loading.css"> + <link rel="stylesheet" href="src/css/layui.css"> + <link rel="stylesheet" href="pages/css/mylayui.css"> <style type="text/css"> #map .explain-header:hover { cursor: pointer; @@ -75,6 +77,21 @@ .ui-resizable-s, .ui-resizable-se { display: none !important; } + + .ui-autocomplete { + height: 200px; + overflow-y: auto; + overflow-x: hidden; + } + .BMapLib_bubble_content a { + color: #2A3AF0; + } + .BMapLib_bubble_content a:hover { + text-decoration: underline; + } + body .layui-layer-dialog { + min-width:400px; + } </style> <script type="text/javascript" src="js/jquery-1.8.3.js"></script> @@ -91,6 +108,20 @@ <jsp:include page="nav.jsp" flush="true"/> <!--瀵艰埅缁撴潫--> <div id="content"> + <!-- <div id="mapStatusOpts" class="map-status-container"> + <div class="layui-form layui-form-pane"> + <label class="layui-form-label">鏈烘埧绫诲瀷</label> + <div class="layui-input-inline"> + <select name="warnType" id="warnType"> + <option value="0">鍏ㄩ儴</option> + <option value="1">钀藉悗</option> + <option value="2">鍛婅</option> + <option value="3">寤舵椂</option> + <option value="4">姝e父</option> + </select> + </div> + </div> + </div> --> <div class="nav-map small"> <!-- 鐢垫睜鍒嗗竷鍥� --> <div class="china-map" id="map"> @@ -131,7 +162,11 @@ <!-- 鐢垫睜鏁呴殰涓庣數姹犲憡璀﹂ゼ鐘跺浘 --> <div class="pie-con"> - + <div class="pie-conf"> + <a href="javascript:;" class="pie-btn" id="faCog" title="鍥捐〃閰嶇疆"> + <i class="fa fa-cog"></i> + </a> + </div> <!-- 鐢垫睜鏁呴殰楗肩姸鍥� --> <div class="brdn-pie module"></div> <!-- 鐢垫睜鍛婅楗肩姸鍥� --> @@ -308,12 +343,14 @@ <script type="text/javascript" src="pages/js/base.js"></script> <script type="text/javascript" src="pages/js/common.js"></script> <script type="text/javascript" src="pages/js/pages/siderbar.js"></script> + <script type="text/javascript" src="pages/js/pages/index-common.js"></script> <script type="text/javascript" src="js/panel.js"></script> <script type="text/javascript" src="js/search.js"></script> <script type="text/javascript" src="js/changePinYin.js"></script> <script type="text/javascript" src="js/createMap.js"></script> <script type="text/javascript" src="js/myConfirm.js"></script> <script type="text/javascript" src="js/loading.js"></script> + <script type="text/javascript" src="src/layui.js"></script> <script type="text/javascript"> var permits; <% Object obj=session.getAttribute("permits"); @@ -1333,15 +1370,6 @@ }); }); - // 鐐瑰嚮鍦板浘鐨勬悳绱㈡寜閽畾浣嶅湴鍧� - $(function() { - $('#map').on('click', '.search .search-btn', function() { - var posTxt = $('#map .search .pos-txt').val(); - addrAnalyze(posTxt); - }); - }); - - $(window).resize(function() { getMapHt(); }); @@ -1586,12 +1614,17 @@ // 閬嶅巻鏌ヨ鍐呭鐢熸垚瀵瑰簲鐨勫浘鏍� for(var i = 0; i < dotList.length; i++) { - var dotIcon = new BMap.Icon(getMapStateImg(mapImages, dotList[0].msg), new BMap.Size(36, 30)); // 璁剧疆鍥剧墖 + var dotIcon = new BMap.Icon(getMapStateImg(mapImages, dotList[i].msg), new BMap.Size(36, 30)); // 璁剧疆鍥剧墖 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'}); @@ -1607,18 +1640,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){ @@ -1740,6 +1769,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) { @@ -1769,10 +1799,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, @@ -1995,7 +2024,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); // 鏈娣诲姞杩� @@ -2028,19 +2057,75 @@ 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; })(jQuery, window, document, GLOBAL); - searchStation(true); - var allStation; + + // 鍦板浘鏈烘埧鎼滅储妯″潡 + ;(function($, window, document, gl, undefined) { + // 璁剧疆鍛藉悕绌洪棿BMap.Search妯″潡 + gl.namespace('BMap.Search'); + + var homeInfor = []; + + // 璁剧疆homeInfor鐨勫�� + function setHomeInfor(data) { + homeInfor = data; + } + // 灏嗗嚱鏁扮粦瀹氬埌鍛藉悕绌洪棿涓� + gl.BMap.Search.setHomeInfor = setHomeInfor; + + // 鏍规嵁homeInfor鐨勫�艰繑鍥瀐ome鍒楄〃 + function getHomeList() { + var rs = []; + // 閬嶅巻homeInfor鐨勫�� + for(var i=0; i<homeInfor.length; i++) { + rs.push(homeInfor[i].title); + } + return rs; + } + // 灏嗗嚱鏁扮粦瀹氬埌鍛藉悕绌洪棿涓� + gl.BMap.Search.getHomeList = getHomeList; + })(jQuery, window, document, GLOBAL); + + // 鏌ヨ骞惰缃満鎴跨殑鍥炬爣 + $(function () { + searchStation(true); + }); + + + var allStation = []; + var mapPages = { + pageSize:1000, // 姣忛〉鐨勮鏁� + pageCurr:1, // 褰撳墠椤电爜鏁� + pageAll:1, // 鏁扮洰 + pageNum: 0, + pageNew: true + }; //鏌ヨ鏈烘埧 function searchStation(setRect){ var temp = createSearchParam(); var json = JSON.stringify(temp); + var bmap = GLOBAL.BMap; // BMap鐨勫懡鍚嶇┖闂� + var bmap_s = bmap.Search; // Search鐨勫懡鍚嶇┖闂� commonDot = new Array(); warnDotList = new Array(); dischargeDotList = []; @@ -2054,41 +2139,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)); } + // 鏄剧ず鍖哄煙鐨勫浘鏍� - GLOBAL.BMap.setDots(allStation); - GLOBAL.BMap.queryInRect(map,createMapDot); - // 鏄惁璁剧疆鎷栧埌鍜岀缉鏀� + bmap.setDots(allStation); + bmap.queryInRect(map, createMapDot); + // 鏄惁绗竴娆℃墽琛� if(setRect) { - map.addEventListener("moveend", GLOBAL.BMap.queryInRect.bind({},map, createMapDot)); // 鎷栧姩 - map.addEventListener("zoomend", GLOBAL.BMap.queryInRect.bind({},map, createMapDot)); // 缂╂斁 + 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); + 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); + } + } + + 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; @@ -2195,16 +2413,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); } //瀹氫綅鍒板憡璀﹂〉闈� @@ -2338,11 +2558,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", @@ -2384,8 +2603,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]; } } } @@ -3115,5 +3334,157 @@ img.attr('src', navImg); } } + + // 鐐瑰嚮鍦板浘鐨勬悳绱㈡寜閽畾浣嶅湴鍧� + $(function() { + $('#map').on('click', '.search .search-btn', function() { + var posTxt = $('#map .search .pos-txt').val(); + addrAnalyze(posTxt); + }); + }); + + layui.use(['form', 'layer', 'laytpl'], function() { + var form = layui.form; + var layer = layui.layer; + var laytpl = layui.laytpl; + + // 鐐瑰嚮楗肩姸鍥鹃厤缃� + $('#faCog').click(function() { + searchUserBieState(); // 鏌ヨ褰撳墠楗肩姸鍥剧殑閰嶇疆鐘舵�� + }); + + var layerMsg; + + // 鐐瑰嚮閰嶇疆椤瑰閫夋 + $('body').on('click', '#tplTblOpts .tpl-tbl-opts-header input[type=checkbox]', function(event) { + layer.close(layerMsg); + var iptList = $('#tplTblOpts .tpl-tbl-opts-header input[type=checkbox]'); + var num = 0; + iptList.each(function() { + if($(this).is(':checked')) { + num++; + } + }); + if(num>4) { + layerMsg = layer.msg("鏈�澶氶�夋嫨鍥涗釜锛�", { + type: 1 + }); + $(this).prop('checked', false); + } + + }); + + + var pie = GLOBAL.Index.Pie; + var pieType = pie.pieType; + var pieConfTpl = getTpl('iframe/pie-config.html'); + //鏌ヨ褰撳墠鐢ㄦ埛璁剧疆楗肩姸鍥剧殑浣胯兘鐘舵�� + function searchUserBieState(){ + $.ajax({ + type:"post", + url: "Echarts_usrAction!serchByCondition", + async:true, + dataType:'json', + data:null, + success: function(data){ + var model = eval('('+data.result+')'); + 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); + } + }); + }); + } + + } + }); + } + + // 鏍煎紡鍖栨煡璇㈢粨鏋� + function formatPieRsData(result) { + var data={}; + data.tblData=[]; + // 閬嶅巻pieType鐨勭被鍨� + for(var i=0; i<pieType.length; i++) { + var tmp = {}; + var num = i+1; + var key = 'echarts'+num+'_enable'; + tmp.name = pieType[i].name; + tmp.status = result[key]; + data.tblData.push(tmp); + } + + return data; + } + + + // 鏋勯�犳洿鏂伴ゼ鐘跺浘鍙傛暟 + function structUpdatePie(arr) { + var rs = { + echarts1_enable:0, + echarts2_enable:0, + echarts3_enable:0, + echarts4_enable:0, + echarts5_enable:0, + echarts6_enable:0, + echarts7_enable:0, + echarts8_enable:0, + echarts9_enable:0, + echarts10_enable:0 + }; + + // 閬嶅巻arr缁檙s鍊奸噸瀹氫箟 + for(var i=0; i<arr.length; i++) { + var num = i+1; + var key = 'echarts'+num+'_enable'; + rs[key] = arr[i]; + } + + return rs; + } + + // 鏇存柊褰撳墠鐢ㄦ埛璁剧疆楗肩姸鍥剧殑浣胯兘鐘舵�� + function updateUserBieState(temp, dialog, load){ + // 鏇存柊鍚庡彴鏁版嵁 + $.ajax({ + type:"post", + url: "Echarts_usrAction!add", + async:true, + dataType:'json', + data:'json='+JSON.stringify(temp), + success: function(data){ + layer.closeAll(); + + var model = eval('('+data.result+')'); + if(model.code == 1) { + layer.msg('閰嶇疆鎴愬姛锛侊紒锛�'); + }else { + layer.msg('閰嶇疆澶辫触锛侊紒锛�'); + } + } + }); + } + + }); </script> </html> -- Gitblit v1.9.1