From 0bf4e3e9f9adb04f2e17e02003e2d4b7a3cf0538 Mon Sep 17 00:00:00 2001
From: LiJun <LiJun@192.168.10.29>
Date: 星期二, 20 十一月 2018 12:00:10 +0800
Subject: [PATCH] 机房历史时间查询页面中将异常时长单位改城分钟并保留2位小数
---
gx_tieta/WebRoot/index.jsp | 57 ++++++++++++++++++++++++++++++++++++---------------------
1 files changed, 36 insertions(+), 21 deletions(-)
diff --git a/gx_tieta/WebRoot/index.jsp b/gx_tieta/WebRoot/index.jsp
index 33cb90f..d977595 100644
--- a/gx_tieta/WebRoot/index.jsp
+++ b/gx_tieta/WebRoot/index.jsp
@@ -121,8 +121,26 @@
<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="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 layui-show"">
+ <div class="layui-colla-content">
<table id="mapToolAddHome">
<tbody>
<tr>
@@ -149,24 +167,6 @@
</tbody>
</table>
</div>
- </div>
- <div class="layui-colla-item">
- <h2 class="layui-colla-title">瀹氫綅鏈烘埧</h2>
- <div class="layui-colla-content">
- <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>
</div>
@@ -387,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>
@@ -401,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");
@@ -953,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), // 鍏呯數鐢垫祦
@@ -1076,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,
@@ -2466,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 = {
@@ -3631,6 +3639,13 @@
});
}
+ // 鏍规嵁鏉冮檺鏇存柊鍦板浘宸ュ叿鍐呭
+ var permitAddHome = getPermit('batt_map_edit_permit', permits); // 娣诲姞鏈烘埧鐨勬潈闄�
+ // 娌℃湁娣诲姞鏈烘埧鐨勬潈闄�
+ if(!permitAddHome) {
+ $('#permitAddHome').remove();
+ }
+
// 鍦板浘宸︿笂鏂归潰鏉挎ā鍧�-鐐瑰嚮闈㈡澘涓婃柟鐨勫皬鍥炬爣鏄剧ず璁惧畾淇℃伅
$('#showMapInfoDetail').click(function() {
$('.map-info-detail').slideToggle();
--
Gitblit v1.9.1