From 65f62299541fc2f373991045791e280d48d20a67 Mon Sep 17 00:00:00 2001
From: hdw <hdw@192.168.1.132>
Date: 星期四, 27 十二月 2018 15:06:27 +0800
Subject: [PATCH] 添加面板申请验收面板
---
gx_tieta/WebRoot/mobil/batt-approved1.html | 45 +++++++++++++++++++++++++++++++++++++++++----
gx_tieta/WebRoot/batch-set-curr.jsp | 11 ++---------
2 files changed, 43 insertions(+), 13 deletions(-)
diff --git a/gx_tieta/WebRoot/batch-set-curr.jsp b/gx_tieta/WebRoot/batch-set-curr.jsp
index 830c3f4..2be7f7a 100644
--- a/gx_tieta/WebRoot/batch-set-curr.jsp
+++ b/gx_tieta/WebRoot/batch-set-curr.jsp
@@ -404,26 +404,19 @@
,cellMinWidth: 80
,cols: [[
{type:'checkbox',fixed: 'left'}
- ,{field:'StationName', title:'鏈烘埧鍚嶇О', align:'center', width: 360}
+ ,{field:'StationName', title:'鏈烘埧鍚嶇О', align:'center', width: 470}
,{field:'FBSDeviceName', title:'FBS璁惧鍚嶇О', align:'center', width: 160}
,{field:'GroupIndexInFBSDevice', title:'FBS璁惧绱㈠紩', align:'center', width: 160}
+ ,{field:'StationName9', title:'璁惧鐗堟湰鍙�', align:'center', width: 160}
,{field:'BattGroupId', title:'鐢垫睜缁処D', align:'center', width: 160}
- ,{field:'BattGroupNum', title:'鏈烘埧鍐呯數姹犵粍缂栧彿', align:'center', width: 160}
,{field:'BattGroupName', title:'鐢垫睜缁勫悕绉�', align:'center', width: 160}
- ,{field:'FloatVolLevel', title:'娴厖鐢靛帇闃�鍊�', align:'center', width: 160}
- ,{field:'OfflineVolLevel', title:'绂荤嚎鐢靛帇闃�鍊�', align:'center', width: 160}
- ,{field:'BattFloatCurrent', title:'娴厖闃�鍊�', align:'center', width: 100}
,{field:'MonCount', title:'鍗曚綋鏁伴噺', align:'center', width: 100}
,{field:'MonCapStd', title:'鏍囩О瀹归噺', align:'center', width: 100}
,{field:'MonVolStd', title:'鏍囩О鍗曚綋鐢靛帇', align:'center', width: 140}
,{field:'MonResStd', title:'鏍囩О鍗曚綋鍐呴樆', align:'center', width: 140}
,{field:'MonSerStd', title:'鏍囩О鍗曚綋鐢靛', align:'center', width: 140}
- ,{field:'MonVolLowToAvg', title:'鍗曚綋鐢靛帇娆′綆鍋忕Щ閲�', align:'center', width: 140}
,{field:'Load_curr', title:'璐熻浇鐢垫祦', align:'center', width: 140}
,{field:'DisCurrMax', title:'鏈�澶ф牳瀹圭數娴�', align:'center', width: 140}
- ,{field:'station_phone', title:'鍩虹珯鎵嬫満鍙风爜', align:'center', width: 140}
- ,{field:'BattProducer', title:'鐢垫睜鍝佺墝', align:'center', width: 140}
- ,{field:'BattModel', title:'鐢垫睜鍨嬪彿', align:'center', width: 260}
,{field:'doThings', fixed: 'right', title: '璁剧疆鐘舵��', toolbar: '#setStatus', align: 'center', width: 160}
]]
,data:[]
diff --git a/gx_tieta/WebRoot/mobil/batt-approved1.html b/gx_tieta/WebRoot/mobil/batt-approved1.html
index 7fde30a..7a18bac 100644
--- a/gx_tieta/WebRoot/mobil/batt-approved1.html
+++ b/gx_tieta/WebRoot/mobil/batt-approved1.html
@@ -8,6 +8,7 @@
<meta name="apple-mobile-web-app-status-bar-style" content="black">
<link rel="stylesheet" href="mobilCss/jquery.mobile-1.4.5.min.css"/>
<link rel="stylesheet" type="text/css" href="css/tbl.css">
+ <link rel="stylesheet" type="text/css" href="src/css/layui.css">
<script type="text/javascript" src="mobilJs/jquery-1.8.2.js"></script>
<script type="text/javascript" src="js/tbl.js"></script>
<script type="text/javascript" src="mobilJs/base.js"></script>
@@ -57,7 +58,7 @@
<!-- 澶撮儴鍐呭 -->
<div data-role="header" data-position="fixed">
<a href="batt-unapproved-index.html" target="_top" class="ui-btn ui-corner-all ui-shadow ui-icon-back ui-btn-icon-left" style="padding-top: 0.7em; padding-bottom: 0.7em;">杩斿洖</a>
- <h1>宸插鎵归�氳繃鐢垫満鎴胯鎯�</h1>
+ <h1>宸插鎵归�氳繃鏈烘埧璇︽儏</h1>
<fieldset data-role="controlgroup" class="ptr0" >
@@ -256,9 +257,12 @@
<a href="" data-rel="back" class="ui-btn ui-corner-all ui-shadow ui-btn-icon-left ui-icon-delete" >鏀惧純</a>
</div>
</div>
+ <!-- 瀛樺偍homeinfo鐨勫�� -->
+ <div id="homeInfoIframe"></div>
+ <div id="homeInfoIframeAll"></div>
</body>
-
+<script type="text/javascript" src="src/layui.all.js"></script>
<script type="text/javascript">
function creatAllView(num){
var allString=''
@@ -318,9 +322,42 @@
return selected;
}
var temp = getCookie("eleparm");
- //console.info(temp);
temp=JSON.parse(temp);
- console.info(temp);
+ var arr = temp;
+
+ // 鐐瑰嚮鐢宠楠屾敹鏄剧ず闈㈡澘
+ $("#applyyanshou").on('click',function(){
+ console.info(temp);
+ if(temp.length == 0) {
+ layer.msg('鑾峰彇鏁版嵁澶辫触锛侊紒');
+ return ;
+ }
+
+ // 瀛樺偍鎵�鏈夌殑鏁版嵁
+ $('#homeInfoIframeAll').data('allData', temp);
+ var _data = temp[0];
+ var _temp = {
+ homeId: _data.binf.StationId
+ ,homeName: _data.binf.StationName
+ ,addr: ''
+ ,lng: 0
+ ,lat: 0
+ }
+
+ // 瀛樺偍闇�瑕佺殑homeInfo淇℃伅
+ $('#homeInfoIframe').data('homeInfo', _temp);
+
+ iframePopup = layer.open({
+ type: 2
+ ,closeBtn: 0
+ ,title: false
+ ,area: ['100%', '100%']
+ ,full: true
+ ,anim: 4
+ ,content: 'iframe/homeinfo1.html'
+ });
+ layer.full(iframePopup);
+ })
var tempgroupid = new Array() ;
for(var i=0;i<temp.length;i++){
tempgroupid.push(temp[i].binf.BattGroupId);
--
Gitblit v1.9.1