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 | 135 ++++-----------------------------------------
1 files changed, 12 insertions(+), 123 deletions(-)
diff --git a/gx_tieta/WebRoot/index.jsp b/gx_tieta/WebRoot/index.jsp
index 6d93024..abbd9d9 100644
--- a/gx_tieta/WebRoot/index.jsp
+++ b/gx_tieta/WebRoot/index.jsp
@@ -121,7 +121,7 @@
<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>
+ <h2 class="layui-colla-title">鎼滅储鏈烘埧</h2>
<div class="layui-colla-content layui-show">
<table>
<tbody>
@@ -216,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>
<!--娓呴櫎娴姩-->
@@ -403,6 +403,7 @@
<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");
@@ -720,7 +721,7 @@
}
},
{
- text: '鎭㈠姝ｅ父',
+ text: '閫�鍑哄叏灞忔樉绀�',
callback: function(e) {
// console.info(e);
smallMap();
@@ -955,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), // 鍏呯數鐢垫祦
@@ -1078,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,
@@ -1100,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);
@@ -2468,7 +2472,8 @@
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><a style="margin-left: 20px" href="javascript:showHomeInfo();">鍩虹珯淇℃伅</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+'">'+
@@ -2675,122 +2680,6 @@
function loadToHomeInfo() {
var stationId = $('.ipt-hide').eq(1).val();
//window.open('homeinfor.jsp?stationId='+stationId);
- }
-
- // 鏄剧ず鏈烘埧淇℃伅
- function showHomeInfo() {
- var sid = $('.ipt-hide.sid').val();
- var temp = {
- StationId: sid
- };
-
- // 鏌ヨ鍩虹珯鐨勪俊鎭�
- $.ajax({
- type: 'post',
- async: true,
- url: 'BattInfAction!serchBattAllInfoByStationId',
- data: 'json='+JSON.stringify(temp),
- dataType: 'json',
- success: function(result) {
- var rs = JSON.parse(result.result);
- if(rs.code == 1) {
- var data = rs.data;
- console.log(data);
- var rsData = formatHomeInfo(data);
- $('#homeInfoIframeData').data('data', rsData);
- // 鏄剧ず闈㈡澘
- layer.open({
- type: 2,
- title: '<i class="fa fa-home"></i>鍩虹珯淇℃伅',
- area: ['960px', '524px'],
- fixed: false, //涓嶅浐瀹�
- maxmin: true,
- content: 'iframe/homeinfo.html'
- });
- }else {
- layer.msg('鏆傛棤鍩虹珯淇℃伅锛�');
- }
-
- }
- });
- }
-
- // 鏍煎紡鍖栨満鎴夸俊鎭暟鎹�
- function formatHomeInfo(data) {
- var groupDefaults = {
- homeid: '',
- homename: '',
- homeip: '',
- groupid: '',
- groupname: '',
- ordernum: '',
- brand: '',
- model: '',
- monproperty: '',
- startusetime: '',
- chargecurr: '',
- chargevol: '',
- equipeinfo: '',
- person: ''
- };
-
- var homeDefaults = {
-
- };
- var rs = {
- tabc:[]
- };
- var tabc = rs.tabc;
- // 閬嶅巻data鐢熸垚鏈烘埧鐨勫��
- for(var i=0; i<data.length; i++) {
- var _data = data[i];
- var tmp = {};
- tmp.title = '鐢垫睜缁�'+(i+1)+'淇℃伅';
- tmp.type = 'group';
- tmp.content = $.extend({}, groupDefaults);
- tmp.tshow = '';
- tmp.cshow = '';
- if(i==0) {
- tmp.tshow = 'layui-this';
- tmp.cshow = 'layui-show';
- }
- // 璁剧疆content鐨勫��
- var content = tmp.content;
- content.homeid = _data.StationId; // 鏈烘埧id
- content.homename = _data.StationName; // 鏈烘埧鍚嶇О
- content.homeip = _data.StationIp; // 鏈烘埧ip
- content.groupid = _data.BattGroupId; // 鐢垫睜缁刬d
- content.groupname = _data.BattGroupName; // 鐢垫睜缁勫悕绉�
- content.ordernum = _data.GroupIndexInFBSDevice+1;// 鐢垫睜缁勭紪鍙�
- content.brand = _data.BattProducer; // 鐢垫睜鍝佺墝
- content.model = _data.BattModel;
- var monproperty = '鏍囩О瀹归噺锛�'+_data.MonCapStd+'AH'+'锛屾爣绉板崟浣撶數鍘嬶細'+_data.MonVolStd+'V'+'锛屾爣绉板唴闃伙細'+_data.MonResStd.toFixed(3)+'m惟'
- +'锛屾爣绉版俯搴︼細'+_data.MonTmpStd+'鈩�'+'锛屽崟浣撴暟閲忥細'+_data.MonCount+'鑺�';
- content.monproperty = monproperty;
- content.startusetime = new Date(_data.BattInUseDate).format('yyyy-MM-dd');
- content.chargecurr = _data.BattFloatCurrent;
- content.chargevol = _data.FloatVolLevel;
- var equipeinfo = '鍨嬪彿锛�'+_data.FBSDeviceName+'锛孖D锛�'+_data.FBSDeviceId
- +'锛孖P锛�'+_data.FbsDeviceIp+'锛孊Index锛�'+_data.GroupIndexInFBSDevice;
- content.equipeinfo = equipeinfo;
- content.person = '';
-
- tabc.push(tmp);
- }
-
- var home = data[0].binf_ex;
- var tmp = {};
- tmp.title = '鍩虹珯淇℃伅';
- tmp.type = 'home';
- tmp.content = $.extend({}, homeDefaults);
- tmp.tshow = '';
- tmp.cshow = '';
- // 璁剧疆content鐨勫��
- var content = tmp.content;
-
- tabc.push(tmp);
- // 杩斿洖缁撴灉闆�
- return rs;
}
// 鑾峰彇echarts瀵硅薄鐨刼pt
--
Gitblit v1.9.1