From 397a22ada727aa759e8b08172e940f26c813f69b Mon Sep 17 00:00:00 2001
From: hdw <496960745@qq.com>
Date: 星期三, 21 十一月 2018 11:58:49 +0800
Subject: [PATCH] 修改页面显示文本
---
gx_tieta/WebRoot/index.jsp | 382 ++++++++++++++++++++++++++++++------------------------
1 files changed, 213 insertions(+), 169 deletions(-)
diff --git a/gx_tieta/WebRoot/index.jsp b/gx_tieta/WebRoot/index.jsp
index a21aa51..abbd9d9 100644
--- a/gx_tieta/WebRoot/index.jsp
+++ b/gx_tieta/WebRoot/index.jsp
@@ -112,38 +112,62 @@
<div class="nav-map small">
<!-- 鍦板浘鍐呭绛涢�� -->
- <div class="map-info-panel-left">
+ <div class="map-info-panel-left w300">
<div class="map-info-panel-content">
- <div class="map-info">
- <span>闄愬埗鏄剧ず鍖哄煙: </span><span class="k-point red" id="mapVsArea">涓浗</span>
- <span class="mr5">鏈烘埧鏄剧ず绫诲瀷:</span><span class="k-point red" id="mapIconStyle">鍏ㄩ儴</span>
- <span class="map-info-btn-icon" id="showMapInfoDetail" title="璇︽儏"><i class="fa fa-angle-double-down"></i></span>
+ <div class="map-info" id="showMapInfoDetail">
+ <span>鍦板浘宸ュ叿</span>
+ <span class="map-info-btn-icon" title="璇︽儏"><i class="fa fa-angle-double-down"></i></span>
</div>
<div class="map-info-detail">
- <table>
- <tbody>
- <tr>
- <td class="w8em alg-c">闄愬埗鏄剧ず鍖哄煙:</td>
- <td>
- <select name="mapVsAreaSel" id="mapVsAreaSel">
- <option>涓浗</option>
- <option>涓浗-骞胯タ</option>
- </select>
- </td>
- </tr>
- <tr>
- <td class="w8em alg-c">鏈烘埧鏄剧ず绫诲瀷:</td>
- <td>
- <select name="mapIconStyleSel" id="mapIconStyleSel">
- <option>鍏ㄩ儴</option>
- </select>
- </td>
- </tr>
- </tbody>
- </table>
- <div class="map-info-footer alg-r">
- <button type="button" class="mr10 map-panel-hide" value="纭畾" id="mapPanelEn">纭畾</button>
- <button type="button" class="mr10 map-panel-hide" value="闅愯棌">闅愯棌</button>
+ <div class="layui-collapse" lay-filter="test" lay-accordion="">
+ <div class="layui-colla-item">
+ <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>
+ </tr>
+ <tr>
+ <td colspan="2" class="alg-r btn-container">
+ <button type="button" value="鎼滅储" id="mapToolSearchBtn" class="mrr8">鎼滅储</button>
+ </td>
+ </tr>
+ </tbody>
+ </table>
+ </div>
+ </div>
+ <div class="layui-colla-item" id="permitAddHome">
+ <h2 class="layui-colla-title">娣诲姞鏈烘埧</h2>
+ <div class="layui-colla-content">
+ <table id="mapToolAddHome">
+ <tbody>
+ <tr>
+ <td class="w4em alg-c f-bold">缁忓害:</td>
+ <td><input type="text" class="lng"></td>
+ </tr>
+ <tr>
+ <td class="w4em alg-c f-bold">绾害:</td>
+ <td><input type="text" class="lat"></td>
+ </tr>
+ <tr>
+ <td class="w4em alg-c f-bold">绫诲瀷:</td>
+ <td>
+ <input type="radio" class="pointStyle" name="pointStyle" value="0" checked><span class="mrr8">GPS</span>
+ <input type="radio" class="pointStyle" name="pointStyle" value="1"><span class="mrr8">鐧惧害</span>
+ <input type="radio" class="pointStyle" name="pointStyle" value="2"><span class="mrr8">鑵捐/楂樺痉</span>
+ </td>
+ </tr>
+ <tr>
+ <td colspan="2" class="alg-r btn-container">
+ <button type="button" value="娣诲姞" id="mapToolAddHomeBtn" class="mrr8">娣诲姞</button>
+ </td>
+ </tr>
+ </tbody>
+ </table>
+ </div>
+ </div>
</div>
</div>
</div>
@@ -192,12 +216,12 @@
<i class="fa fa-cog"></i>
</a>
</div>
+ <!--鐢垫睜鏁呴殰淇鍥�-->
+ <div class="repair-pie module"></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>
<!--娓呴櫎娴姩-->
@@ -363,6 +387,7 @@
</div>
</div>
<input type="hidden" id="user_logo" value="<%=user_logo %>">
+ <div id="homeInfoIframeData"></div>
<!--娓呴櫎娴姩-->
<div class="clear"></div>
<script type="text/javascript" src="pages/js/base.js"></script>
@@ -377,6 +402,8 @@
<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" src="src/layui.all.js"></script>
+ <script type="text/javascript" src="pages/js/pages/homeInfo.js"></script>
<script type="text/javascript">
var permits;
<% Object obj=session.getAttribute("permits");
@@ -694,7 +721,7 @@
}
},
{
- text: '鎭㈠姝ｅ父',
+ text: '閫�鍑哄叏灞忔樉绀�',
callback: function(e) {
// console.info(e);
smallMap();
@@ -929,6 +956,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), // 鍏呯數鐢垫祦
@@ -1052,7 +1081,8 @@
}
$.ajax({
type: "post",
- url: "BattPower_offAction!serchPowerOff",
+ //url: "BattPower_offAction!serchPowerOff",
+ url: "Bts_station_stateAction_action_serchPowerOff",
async:true,
dataType:'text',
data:null,
@@ -1074,7 +1104,7 @@
powercut_isNew = false;
createPie(repairPie,repairTle,repairObj);
repairPie.on('click', function() {
- window.open('powercut.jsp?power_state=0');
+ window.open('batt-state-manage.jsp?power_state=0');
});
}else{
var opt = getOpt(repairTle, repairObj);
@@ -1716,6 +1746,48 @@
}
}
+ // 鏇存柊鍦板浘鍥炬爣
+ function updateMapDotIcon(map, dotList, isTop) {
+ // 閬嶅巻鏌ヨ鍐呭鐢熸垚瀵瑰簲鐨勫浘鏍�
+ for(var i = 0; i<dotList.length; i++) {
+ 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);
+ if(mk) {
+ // 璁剧疆鍦板浘鍥炬爣
+ mk.setIcon(dotIcon);
+
+ // 灏嗗凡缁忓畨瑁呯殑鏄剧ず鍦ㄩ《閮�
+ if(isTop) {
+ mk.setTop(true);
+ }
+
+ // 闅愯棌marker鐐�
+ isShow?mk.show():mk.hide();
+ }
+ }
+ }
+
+ // 鑾峰彇鍦板浘鍥炬爣
+ function getMapMarker(map, msg) {
+ var rs = false;
+ var allOverlay = map.getOverlays();
+ for (var i = 0; i < allOverlay.length; i++){
+ try{
+ if(allOverlay[i].getLabel().content == msg){
+ rs = allOverlay[i];
+ return rs;
+ }
+ }catch(e) {
+
+ }
+
+ }
+
+ return rs;
+
+ }
+
// 鍒犻櫎鍦板浘涓婄殑鎸囧畾鐐�
function deletePoint(map, msg){
var allOverlay = map.getOverlays();
@@ -1746,7 +1818,7 @@
});
magImgStyles.push('');
// 鏍规嵁褰撳墠鍐呭鏇存柊鍦板浘鍥炬爣
- searchStation();
+ //searchStation();
}
// 妫�娴嬪綋鍓嶅浘鏍囨槸鍚︾鍚�
@@ -2266,6 +2338,9 @@
bmap.queryInRect(map, createMapDot);
updateStation();
+ // 鏇存柊灏忓伐鍏锋悳绱㈡満鎴垮姛鑳�
+ updateSearchSource(allStation);
+
// 鏄惁绗竴娆℃墽琛�
if(setRect) {
map.addEventListener("moveend", bmap.queryInRect.bind({},map, createMapDot)); // 鎷栧姩
@@ -2325,7 +2400,7 @@
}
}
- createMapDot(map, updateStationData, true);
+ updateMapDotIcon(map, updateStationData, true);
// 鏇存柊鍒嗛〉淇℃伅
mapPages.pageCurr++;
if(mapPages.pageCurr>mapPages.pageNum || updateStationData.length<mapPages.pageSize) {
@@ -2373,7 +2448,7 @@
// 鏌ヨ鏈烘埧闈㈡澘淇℃伅
function searchPanelInfo(data) {
- var point = data.point;
+ var point = new BMap.Point(data.point.lng, data.point.lat);
var stationInfo = getStaionByPoint(point);
if(!stationInfo) {
alert('闈㈡澘淇℃伅鏌ヨ澶辫触锛�');
@@ -2397,11 +2472,13 @@
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"><a href="javascript:loadToRealTime();">瀹炴椂鏁版嵁</a><a style="margin-left: 20px" href="javascript:loadToOldTime();">鍘嗗彶鏁版嵁</a>'+
+ '<a style="margin-left: 20px" href="javascript:showHomeInfo('+data.data.StationId+');">鍩虹珯淇℃伅</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 county" value="'+data.data.stationName5+'">'+
+ '<input type="hidden" class="ipt-hide sid" value="'+data.data.StationId+'">'+
'<input type="hidden" class="ipt-hide city" value="'+data.data.stationName2+'">';
var list = {
@@ -3021,94 +3098,7 @@
rs.defaults = "User_ChartAction!serchByInfo?json={Chart_file:'"+user_logo+"',Chart_name:chart_install}";
return rs;
}
- /* $(function(){
- setTimeout(function(){
- var _script = document.createElement('script');
- _script.type = "text/javascript";
- _key = "55UbnVOR7XovezZC4jFvTqNDPAamsuoo";//鐧惧害鍦板浘鍙互鐢宠鍒�
- _script.src = "http://api.map.baidu.com/location/ip?ak="+_key+"&coor=bd09ll&ip=&callback=f";//鎷兼帴URL
- document.head.appendChild(_script);
-
- }, 2000);
-
- });
- var pointX;
- var pointY;
- function f(data){
- pointX = data.content.point.x;
- pointY = data.content.point.y;
- console.info("浣犳墍鍦ㄥ煄甯�:"+data.content.address);
- console.info("浣犲煄甯傜粡搴�:"+pointX);
- console.info("浣犵殑鍩庡競绾害:"+pointY);
- var point = new BMap.Point(pointX, pointY);
- map.centerAndZoom(point, 10); // 鐢ㄥ煄甯傚悕璁剧疆鍦板浘涓績鐐�
- } */
-
-
- /* $(document).ready(function(){
- //椤甸潰鍔犺浇鏃舵煡璇㈢淮鎶ゅ尯涓殑鏋㈢航绫诲瀷
- $.post("User_battgroup_baojigroup_battgroupAction!serchStationName1InGroup",null,function(data){
- data=data.result;
- data=eval("("+data+")");
- //console.info(data);
- if(data.code==1 && data.data.length>0){
- var $select = $("#station_name1");
- $select.text('');
- for(var i=0;i<=data.data.length;i++){
- $option=$("<option></option>");
- if(i==0){
- $option.html("<s:text name='All'/>(<s:text name='Common'/>"+data.data.length+"<s:text name='Species'/>)");
- $option.attr("value", "");
- }else{
- $option.text(data.data[i-1]);
- $option.attr("value",data.data[i-1]);
- }
- $select.append($option);
- }
- }else{
- $("#station_name1").text('').html('<option>鏆傛棤鍙祴缁存姢鍖�</option>');
- }
- findStationNamebyStationname1();
- });
- });
- //褰撶淮鎶ゅ尯鐨勫�煎彉鎹㈡椂鏇存柊鏈烘埧绔欑偣
- $('#station_name1').change(function(){
- findStationNamebyStationname1();
- });
-
- //鏍规嵁缁存姢鍖烘煡璇㈢珯鐐�
- function findStationNamebyStationname1(){
- var user = {
- UNote:$("#station_name1 option:selected").val()
- };
- //var selectvalue=$("#station_name1 option:selected").val();
- //alert(selectvalue);
- $.post("User_battgroup_baojigroup_battgroupAction!serchStationNameInGroup","json="+JSON.stringify(user),function(data){
- //console.info(data);
- data=data.result;
- data=eval("("+data+")");
- if(data.code==1 && data.data.length>0){
- var $select = $("#station_name");
- $select.text('');
- for(var i=0;i<=data.data.length;i++){
- var $option=$("<option></option>");
- if(i==0){
- $option.html("<s:text name='All'/>(<s:text name='Common'/>"+data.data.length+"<s:text name='Species'/>)");
- $option.attr("value", "");
- }else{
- $option.text(data.data[i-1]);
- $option.attr("value",data.data[i-1]);
- }
- $select.append($option);
- }
- }else{
- $("#station_name").text('').html('<option>鏆傛棤鍙祴鏈烘埧绔欑偣</option>');
- }
- findserchByBattGroupNamebystationname();
- });
- } */
-
//鏌ヨ鎵�鏈夌殑缁存姢鍖�
function searchAllProvince(){
$.ajax({
@@ -3506,10 +3496,11 @@
});
});
- layui.use(['form', 'layer', 'laytpl'], function() {
+ layui.use(['form', 'layer', 'laytpl', 'element'], function() {
var form = layui.form;
var layer = layui.layer;
var laytpl = layui.laytpl;
+ var element = layui.element;
// 鐐瑰嚮楗肩姸鍥鹃厤缃�
$('#faCog').click(function() {
@@ -3648,9 +3639,14 @@
});
}
- // 鍦板浘宸︿笂鏂归潰鏉挎ā鍧�
- var mapViewArea = GLOBAL.BMap.mapViewArea; // 鍦板浘鏄剧ず鍖哄煙鐨勪俊鎭�
- // 鐐瑰嚮闈㈡澘涓婃柟鐨勫皬鍥炬爣鏄剧ず璁惧畾淇℃伅
+ // 鏍规嵁鏉冮檺鏇存柊鍦板浘宸ュ叿鍐呭
+ var permitAddHome = getPermit('batt_map_edit_permit', permits); // 娣诲姞鏈烘埧鐨勬潈闄�
+ // 娌℃湁娣诲姞鏈烘埧鐨勬潈闄�
+ if(!permitAddHome) {
+ $('#permitAddHome').remove();
+ }
+
+ // 鍦板浘宸︿笂鏂归潰鏉挎ā鍧�-鐐瑰嚮闈㈡澘涓婃柟鐨勫皬鍥炬爣鏄剧ず璁惧畾淇℃伅
$('#showMapInfoDetail').click(function() {
$('.map-info-detail').slideToggle();
});
@@ -3660,50 +3656,98 @@
$('.map-info-detail').slideUp();
});
- // 閬嶅巻mapViewArea鑾峰彇mapVsAreaSel涓嬫媺妗嗙殑鍊�
- var mapVsAreaSel = $('#mapVsAreaSel');
- var mapVsAreaSelOpts = [];
- for(var i=0; i<mapViewArea.length; i++) {
- var _data = mapViewArea[i];
- var tmp = getOptionsData(_data.name, _data.area, _data);
- mapVsAreaSelOpts.push(tmp);
- }
- // 鐢熸垚闈㈡澘涓殑mapVsAreaSel
- createOptions(mapVsAreaSel, mapVsAreaSelOpts);
- // 鏄剧ず榛樿鍖哄煙-涓浗
- setMapViewArea(mapViewArea[0]);
- centerMapByPoint(map); // 鏍规嵁褰撳墠鐢ㄦ埛璁惧畾鐨勪綅缃樉绀轰腑蹇冪偣
- // 鐐瑰嚮闈㈡澘纭畾鎸夐挳
- $('#mapPanelEn').click(function() {
- var areaData = mapVsAreaSel.find('option:selected').data('attr');
-
- // 璁剧疆澶撮儴鍙鍖哄煙鐨勬枃鏈�
- $('#mapVsArea').text(areaData.name);
-
- // 璁剧疆鍙鍖哄煙
- setMapViewArea(areaData);
+ // 鍐呭鏀瑰彉鍒濆璇�$('#mapToolSearchBtn').data('homeInfo')鐨勫��
+ $( "#mapToolSearch" ).on('input propertychange', function(){
+ $('#mapToolSearchBtn').data('homeInfo', 0);
+ });
+ // 瀹氫箟鏈烘埧鏌ヨ淇℃伅
+ $( "#mapToolSearch" ).autocomplete({
+ source: [],
+ select: function(event, ui) {
+ $('#mapToolSearchBtn').data('homeInfo', ui.item); // 璁剧疆鏈烘埧淇℃伅鍐呭
+ }
});
- // 璁剧疆鍦板浘鐨勫彲瑙嗗尯鍩�
- function setMapViewArea(data) {
- var left = new BMap.Point(data.left.lng, data.left.lat);
- var right = new BMap.Point(data.right.lng, data.right.lat);
- var b = new BMap.Bounds(left, right);
-
- var cLng = (data.left.lng+data.right.lng)/2;
- var cLat = (data.left.lat+data.right.lat)/2;
- var f = new BMap.Point(cLng, cLat);
- map.panTo(f, {
- noAnimation: "no"
- });
-
-
- try {
- BMapLib.AreaRestriction.setBounds(map, b);
- } catch (e) {
- alert(e);
+ // 鐐瑰嚮鏌ョ湅homeInfo鐨勫��
+ $('#mapToolSearchBtn').click(function() {
+ var homeInfo = $(this).data('homeInfo');
+ if(homeInfo) {
+ searchPanelInfo(homeInfo);
+ $(this).data('homeInfo', 0);
+ $( "#mapToolSearch" ).val('');
+ }else {
+ layer.msg('璇烽噸鏂拌緭鍏ユ満鎴夸俊鎭紒');
+ $( "#mapToolSearch" ).val("");
}
+ });
+
+ /* 鍦板浘宸ュ叿娣诲姞鍦板浘鍥炬爣 */
+ var mapToolAddHome = $('#mapToolAddHome');
+ var mapToolAddHomeBtn = $('#mapToolAddHomeBtn');
+
+ // 鐐瑰嚮鍦板浘宸ュ叿娣诲姞鍦板浘鎸夐挳
+ mapToolAddHomeBtn.click(function() {
+ var lng = mapToolAddHome.find('.lng').val().trim();
+ var lat = mapToolAddHome.find('.lat').val().trim();
+ var pointStyles = mapToolAddHome.find('.pointStyle');
+ var pointStyle = 0;
+ pointStyles.each(function() {
+ if($(this).is(':checked')) {
+ pointStyle = $(this).val();
+ }
+ });
+ if(lng && lat) {
+ var point = getBaiduPoint(lng, lat, pointStyle);
+ var pt = new BMap.Point(point.lon, point.lat);
+ addCommonDot(map, pt);
+ map.centerAndZoom(pt, 18); // 鐢ㄥ煄甯傚悕璁剧疆鍦板浘涓績鐐�
+ }else {
+ layer.msg('璇疯緭鍏ョ粡绾害');
+ }
+
+ });
+
+ // 鑾峰彇鐧惧害鍦板浘鐨勭粡绾害
+ function getBaiduPoint(lng, lat, type) {
+ var point = {};
+ lng = Number(lng);
+ lat = Number(lat);
+ var _type = Number(type);
+ switch(_type) {
+ case 0: // GPS鍘熷鍧愭爣
+ point = GPS.wgs2bd(lat, lng);
+ break;
+ case 1: // 鐧惧害鍦板浘鍧愭爣
+ point = {
+ lon: lng,
+ lat: lat
+ };
+ break;
+ case 2: // 鑵捐/楂樺痉
+ point = GPS.bd_encrypt(lat, lng);
+ break;
+ }
+
+ return point;
}
});
+
+ // 鏇存柊鍦板浘宸ュ叿鎼滅储鏈烘埧
+ function updateSearchSource(data) {
+ var homeSource = [];
+ for(var i=0; i<data.length; i++) {
+ var _data = data[i];
+ var tmp = {
+ label: _data.title+'('+_data.sId+')',
+ point: {
+ lng: _data.lng,
+ lat: _data.lat
+ }
+ };
+ homeSource.push(tmp);
+ }
+
+ $( "#mapToolSearch" ).autocomplete('option', 'source', homeSource);
+ }
</script>
</html>
--
Gitblit v1.9.1