From c02e430f16cb51cabb6f4b24f99ec48efc7b0596 Mon Sep 17 00:00:00 2001
From: Administrator <Administrator@192.168.10.26>
Date: 星期三, 21 十一月 2018 11:59:20 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whyccjj@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/WebRoot/index.jsp | 136 ++++++++++++++++++++++++++++++++++----------
1 files changed, 104 insertions(+), 32 deletions(-)
diff --git a/gx_tieta/WebRoot/index.jsp b/gx_tieta/WebRoot/index.jsp
index 2d3d475..abbd9d9 100644
--- a/gx_tieta/WebRoot/index.jsp
+++ b/gx_tieta/WebRoot/index.jsp
@@ -114,37 +114,15 @@
<!-- 鍦板浘鍐呭绛涢�� -->
<div class="map-info-panel-left w300">
<div class="map-info-panel-content">
- <div class="map-info">
+ <div class="map-info" id="showMapInfoDetail">
<span>鍦板浘宸ュ叿</span>
- <span class="map-info-btn-icon" id="showMapInfoDetail" title="璇︽儏"><i class="fa fa-angle-double-down"></i></span>
+ <span class="map-info-btn-icon" title="璇︽儏"><i class="fa fa-angle-double-down"></i></span>
</div>
<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>
- <div class="layui-colla-content layui-show"">
- <table>
- <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 colspan="2" class="alg-r btn-container">
- <button type="button" value="娣诲姞" id="mapToolAddHome" class="mrr8">娣诲姞</button>
- </td>
- </tr>
- </tbody>
- </table>
- </div>
- </div>
- <div class="layui-colla-item">
- <h2 class="layui-colla-title">瀹氫綅鏈烘埧</h2>
- <div class="layui-colla-content">
+ <h2 class="layui-colla-title">鎼滅储鏈烘埧</h2>
+ <div class="layui-colla-content layui-show">
<table>
<tbody>
<tr>
@@ -159,6 +137,36 @@
</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>
@@ -208,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>
<!--娓呴櫎娴姩-->
@@ -379,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>
@@ -393,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");
@@ -710,7 +721,7 @@
}
},
{
- text: '鎭㈠姝ｅ父',
+ text: '閫�鍑哄叏灞忔樉绀�',
callback: function(e) {
// console.info(e);
smallMap();
@@ -945,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), // 鍏呯數鐢垫祦
@@ -1068,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,
@@ -1090,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);
@@ -2458,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 = {
@@ -3623,6 +3639,13 @@
});
}
+ // 鏍规嵁鏉冮檺鏇存柊鍦板浘宸ュ叿鍐呭
+ var permitAddHome = getPermit('batt_map_edit_permit', permits); // 娣诲姞鏈烘埧鐨勬潈闄�
+ // 娌℃湁娣诲姞鏈烘埧鐨勬潈闄�
+ if(!permitAddHome) {
+ $('#permitAddHome').remove();
+ }
+
// 鍦板浘宸︿笂鏂归潰鏉挎ā鍧�-鐐瑰嚮闈㈡澘涓婃柟鐨勫皬鍥炬爣鏄剧ず璁惧畾淇℃伅
$('#showMapInfoDetail').click(function() {
$('.map-info-detail').slideToggle();
@@ -3658,6 +3681,55 @@
}
});
+ /* 鍦板浘宸ュ叿娣诲姞鍦板浘鍥炬爣 */
+ 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;
+ }
});
// 鏇存柊鍦板浘宸ュ叿鎼滅储鏈烘埧
--
Gitblit v1.9.1