From 6e9fb36b8a0039b21bd09526de54b46ee373dbe4 Mon Sep 17 00:00:00 2001
From: hdw <496960745@qq.com>
Date: 星期二, 13 十一月 2018 17:06:58 +0800
Subject: [PATCH] 添加基站信息->电池组信息
---
gx_tieta/WebRoot/index.jsp | 100 ++++++++++++++++++++++++++++++++-
gx_tieta/WebRoot/pages/css/mylayui.css | 8 ++
gx_tieta/WebRoot/css/common.css | 17 +++++
3 files changed, 121 insertions(+), 4 deletions(-)
diff --git a/gx_tieta/WebRoot/css/common.css b/gx_tieta/WebRoot/css/common.css
index 0a75363..29a0338 100644
--- a/gx_tieta/WebRoot/css/common.css
+++ b/gx_tieta/WebRoot/css/common.css
@@ -209,7 +209,22 @@
background-color: #FFFFFF;
}
-
+/* hdw-tbl-style */
+.hdw-tbl {
+ width: 100%;
+ border-collapse: collapse;
+}
+.hdw-tbl th, .hdw-tbl td {
+ border: 1px solid #cccccc;
+}
+.hdw-tbl th {
+ font-size: 14px;
+ padding: 4px 10px;
+ background: url('../image/table_th_bg.gif') repeat-x;
+}
+.hdw-tbl td {
+ padding: 4px 0 4px 8px;
+}
/* jquery ui style */
body .ui-front {
diff --git a/gx_tieta/WebRoot/index.jsp b/gx_tieta/WebRoot/index.jsp
index 16ee8da..6d93024 100644
--- a/gx_tieta/WebRoot/index.jsp
+++ b/gx_tieta/WebRoot/index.jsp
@@ -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>
@@ -2678,9 +2679,7 @@
// 鏄剧ず鏈烘埧淇℃伅
function showHomeInfo() {
- layer.msg('鍔熻兘寮�鍙戜腑...');
var sid = $('.ipt-hide.sid').val();
- console.log(sid);
var temp = {
StationId: sid
};
@@ -2694,11 +2693,106 @@
dataType: 'json',
success: function(result) {
var rs = JSON.parse(result.result);
- console.log(rs);
+ 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
function getOpt(tle, objEle) {
var opt = {
diff --git a/gx_tieta/WebRoot/pages/css/mylayui.css b/gx_tieta/WebRoot/pages/css/mylayui.css
index 38dce1d..a5aa8c4 100644
--- a/gx_tieta/WebRoot/pages/css/mylayui.css
+++ b/gx_tieta/WebRoot/pages/css/mylayui.css
@@ -116,6 +116,9 @@
left: 360px;
}
/* abs-top */
+.abs.abs-top41 {
+ top: 41px;
+}
.abs.abs-top100 {
top: 100px;
}
@@ -144,6 +147,11 @@
.abs.abs-bottom120 {
bottom: 120px;
}
+/* overflow */
+.abs.abs-overflow-y {
+ overflow:hidden;
+ overflow-y: auto;
+}
/* z-index */
.abs.abs-index1n {
z-index: -1;
--
Gitblit v1.9.1