From 651c30db295e199e08105dab74b3a7a5e503e74b Mon Sep 17 00:00:00 2001
From: 81041 <81041@192.168.10.14>
Date: 星期三, 28 十一月 2018 11:16:28 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whyclxw1@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/WebRoot/control.jsp | 125 +++++++++++++++++++++++++++---
gx_tieta/WebRoot/index.jsp | 34 +++++++-
gx_tieta/WebRoot/batt-station-update1.jsp | 25 +++++
3 files changed, 162 insertions(+), 22 deletions(-)
diff --git a/gx_tieta/WebRoot/batt-station-update1.jsp b/gx_tieta/WebRoot/batt-station-update1.jsp
index aad2da7..db93004 100644
--- a/gx_tieta/WebRoot/batt-station-update1.jsp
+++ b/gx_tieta/WebRoot/batt-station-update1.jsp
@@ -134,6 +134,11 @@
<a class="layui-btn layui-btn-xs" lay-event="update">鍗囩骇</a>
{{# } }}
</script>
+ <script type="text/html" id="upProgress">
+ <div class="layui-progress layui-progress-big" lay-showpercent="true" lay-filter="upload{{d.fbsid}}" style="margin-top:6px">
+ <div class="layui-progress-bar" lay-percent="0%"></div>
+ </div>
+ </script>
<script type="text/javascript" src="js/jquery-1.8.3.js"></script>
<script type="text/javascript" src="js/echarts.js"></script>
<script type="text/javascript" src="jqueryui/jquery-ui.min.js"></script>
@@ -145,6 +150,7 @@
var table = layui.table; // 鑾峰彇琛ㄦ牸妯″潡
var form = layui.form; // 鑾峰彇琛ㄥ崟妯″潡
var layer = layui.layer; // 鑾峰彇寮瑰嚭妗嗘ā鍧�
+ var element = layui.element; // 鑾峰彇鍏冪礌鎿嶄綔妯″潡
var isNewLoad = true;
var pre_province = getQueryString('province');
@@ -377,6 +383,7 @@
,{field:'fbsname', title:'璁惧鍚嶇О', align:'center'}
,{field:'updatestatus', title:'鍗囩骇鐘舵��', align:'center'}
,{field:'status', title:'璇诲啓鐘舵��', align:'center'}
+ ,{field:'progress', title:'涓婁紶杩涘害', align: 'center', templet:'#upProgress'}
,{field:'datapackage', title:'褰撳墠鏁版嵁鍖�', align:'center'}
,{fixed: 'right', title:'鎿嶄綔', align:'center', toolbar: '#barDemo', width:100}
]]
@@ -506,6 +513,7 @@
// 鐢熸垚琛ㄦ牸鏁版嵁
table.render(tOptions);
+ renderTblPorgess(allData);
}else {
layer.msg('娌℃湁瑕佹坊鍔犵殑鍐呭锛�');
}
@@ -620,14 +628,13 @@
for(var i=0; i<rs.data.length; i++) {
var _data = rs.data[i];
var num = -1;
- // 閬嶅巻鐜版湁鐨則blData
+ // 閬嶅巻鐜版湁鐨則blData/鏍规嵁琛ㄦ牸鐨勮鍒玦d瀵硅幏鍙栧埌鍊艰繘琛屾帓搴忎互渚垮搴旇〃鏍煎唴瀹�
for(var k=0; k<tblData.length;k++) {
var _tblData = tblData[k];
if(_tblData.fbsid == _data.dev_id) {
num = k;
break;
}
-
}
if(num == -1) {
@@ -652,7 +659,7 @@
tmp.datapackage[num] = dfuData;
}
var pageTbl = $('#pageTbl');
-
+ //console.log(tmp);
// 鏇存柊琛ㄦ牸鍐呭
Object.keys(tmp).forEach(function(key) {
updateLayuiTblCol(pageTbl, key, tmp[key]);
@@ -876,6 +883,18 @@
});
}
+
+ // 娓叉煋杩涘害鏉�
+ function renderTblPorgess(tblData) {
+ // 閬嶅巻tblData鏍规嵁fbsid娓叉煋杩涘害鏉�
+ for(var i=0; i<tblData.length; i++) {
+ var fbsid = tblData[i].fbsid;
+
+ // 娓叉煋杩涘害鏉�
+ element.render('progress', 'upload'+fbsid);
+ }
+
+ }
});
</script>
</body>
diff --git a/gx_tieta/WebRoot/control.jsp b/gx_tieta/WebRoot/control.jsp
index 5e1f4ce..865aa6c 100644
--- a/gx_tieta/WebRoot/control.jsp
+++ b/gx_tieta/WebRoot/control.jsp
@@ -252,7 +252,12 @@
<br>
<a href="javascript:void(0);" id="stopTest" class="whyc-btn whyc-btn-disabled" id="specialGraphExport">
<span class="whyc-btn-icon fa fa-stop-circle"></span>
- <span class="whyc-btn-txt" id="stopTestBtn">鍋滄娴嬭瘯</span>
+ <span class="whyc-btn-txt">鍋滄娴嬭瘯</span>
+ </a>
+ <br>
+ <a href="javascript:void(0);" id="battInfoBtn" class="whyc-btn whyc-btn-disabled" id="specialGraphExport">
+ <span class="whyc-btn-icon fa fa-battery-full"></span>
+ <span class="whyc-btn-txt">鐢垫睜鍙傛暟</span>
</a>
<br>
<a href="javascript:void(0);" id="sysSet" class="whyc-btn whyc-btn-disabled" id="specialGraphExport">
@@ -1064,6 +1069,76 @@
<input type="button" name="" id="sysSet_en" class="status-change-set " value="璁剧疆" >
</div>
</div>
+ <!-- 鐢垫睜鍙傛暟 -->
+ <div class="popup" id="battInfo_popup">
+ <div class="popup-title"><span>鐢垫睜鍙傛暟璁剧疆</span> <a href="javascript:;" class="close">X</a></div>
+ <div class="popup-content">
+ <div class="popup-tbl">
+ <table>
+ <tbody>
+ <tr>
+ <th>鏈烘埧ID</th>
+ <th>鏈烘埧鍚嶇О</th>
+ </tr>
+ <tr>
+ <td><input type="text" id="battInfo_home_id" readonly="readonly" value=""></td>
+ <td><input type="text" id="battInfo_home_name" readonly="readonly" value=""></td>
+ </tr>
+ <tr>
+ <th>鐢垫睜鏍囩О瀹归噺(AH)</th>
+ <th>鐢垫睜鏍囩О鍐呴樆(u惟)</th>
+ </tr>
+ <tr>
+ <td><input type="text" id="battInfo_nom_cap" value=""></td>
+ <td><input type="text" id="battInfo_nom_res" value=""></td>
+ </tr>
+ <tr>
+ <th>鐢垫睜缁勬暟</th>
+ <th>姣忕粍鐢垫睜鍗曚綋鏁伴噺</th>
+ </tr>
+ <tr>
+ <td><input type="text" id="battInfo_batt_num" value=""></td>
+ <td><input type="text" id="battInfo_batt_mon_num" value=""></td>
+ </tr>
+ <tr>
+ <th>鍗曚綋鏍囩О鐢靛帇锛圴锛�</th>
+ <th>鐢垫睜缁勭鏍囩О鐢靛帇锛圴锛�</th>
+ </tr>
+ <tr>
+ <td><input type="text" id="battInfo_batt_nom_vol" value=""></td>
+ <td><input type="text" id="battInfo_group_nom_vol" value=""></td>
+ </tr>
+ <tr>
+ <th>鐢垫睜鏍囩О娓╁害锛堚剝锛�</th>
+ <th>鐢垫睜娴厖鐢靛帇闃�鍊硷紙V锛�</th>
+ </tr>
+ <tr>
+ <td><input type="text" id="battInfo_batt_nom_temp" value=""></td>
+ <td><input type="text" id="battInfo_batt_float_vol" value=""></td>
+ </tr>
+ <tr>
+ <th>鐢垫睜娴厖鐢垫祦闃�鍊硷紙A锛�</th>
+ <th>鍦ㄧ嚎鐢靛帇浣庨榾鍊硷紙V锛�</th>
+ </tr>
+ <tr>
+ <td><input type="text" id="battInfo_batt_float_curr" value=""></td>
+ <td><input type="text" id="battInfo_online_low_vol" value=""></td>
+ </tr>
+ <tr>
+ <th>鐢垫睜缁勮繛鎺ョ被鍨�</th>
+ </tr>
+ <tr>
+ <td><input type="text" id="battInfo_batt_link_type" value=""></td>
+ </tr>
+ </tbody>
+ </table>
+ </div>
+ </div>
+ <div class="popup-footer">
+ <input type="button" name="" id="battInfo_read" value="璇诲彇" >
+ <input type="button" name="" id="battInfo_en" class="status-change-set " value="璁剧疆" >
+ </div>
+ </div>
<!-- 鍗曚綋鏇茬嚎 -->
<div class="popup w960 mr480x" id="monLineGraphPopup">
@@ -1260,6 +1335,7 @@
var equip4016_popup = new Popup($('#equip4016'));
var sysSet_popup = new Popup($('#sysSet_popup'));
var localNav = new Popup($('#localNav'));
+ var battInfo_popup = new Popup($('#battInfo_popup'));
// 鍏呮斁鐢靛脊鍑烘璁剧疆
$(function() {
// 鍒濆鍖朙D9鍏呮斁鐢靛脊鍑烘
@@ -1291,6 +1367,12 @@
$('#sysSet_popup').find('.close').bind('click', function() {
sysSet_popup.hidePopup(); // 闅愯棌sysSet_popup寮瑰嚭妗嗗拰閬僵灞�
});
+
+ // 璁剧疆鐢垫睜鍙傛暟
+ $('#battInfo_popup').find('.close').bind('click', function() {
+ battInfo_popup.hidePopup(); // 闅愯棌battInfo_popup寮瑰嚭妗嗗拰閬僵灞�
+ });
+
// bts闈㈡澘鍏呯數鐢垫祦缂栬緫
$('#ChargeCurrSetLabel .fa-edit').click(function() {
@@ -1364,6 +1446,7 @@
equip4016_popup.hidePopup(); // 闅愯棌4016寮瑰嚭妗嗗拰閬僵灞�
localNav.hidePopup();
sysSet_popup.hidePopup(); // 闅愯棌sysSet_popup寮瑰嚭妗嗗拰閬僵灞�
+ battInfo_popup.hidePopup(); // 闅愯棌battInfo_popup寮瑰嚭妗嗗拰閬僵灞�
});
});
//鍒濆鍖栨煴鐘跺浘
@@ -4983,17 +5066,19 @@
// 鐐瑰嚮璁惧杩涚▼鎸夐挳
$('#threadInfo').click(function() {
- console.log(threadInfoSearch);
+ // console.log(threadInfoSearch);
+ var batt = getBatt();
+ //console.log(batt);
+ threadInfoSearch.dev_id = batt.FBSDeviceId;
SendDeviceThreadInfo(threadInfoSearch,function(data){
- searchDeviceThreadInfo({dev_id:910000001});
+ searchDeviceThreadInfo({dev_id: threadInfoSearch.dev_id});
});
});
-
-
-
//缁橤PRS鍙戦�佹寚瀹氱殑鍛戒护锛岃幏鍙朅T杩斿洖鍊�
+ var threadInfoLoad;
function SendDeviceThreadInfo(param,callback){
+ threadInfoLoad = layer.load(1);
$.ajax({
type:"post",
url: "Bts_gprs_stateAction_action_update_bts_task_inf",
@@ -5027,16 +5112,21 @@
async:true,
dataType:'json',
data:'json='+JSON.stringify(param),
- success: function(data){
+ success: function(data){
+ layer.close(threadInfoLoad);
var model = eval('('+data.result+')');
- console.info(model);
- var btsTaskInf = model.data[0].bts_task_inf;
- layer.open({
- title: '璁惧杩涚▼',
- width: 380,
- height: 450,
- content: '<pre>'+btsTaskInf+'</pre>'
- });
+ if(model.code == 1) {
+ var btsTaskInf = model.data[0].bts_task_inf;
+ layer.open({
+ title: '璁惧杩涚▼',
+ width: 380,
+ height: 450,
+ content: '<pre>'+btsTaskInf+'</pre>'
+ });
+ }else {
+ layer.msg('鏌ヨ澶辫触');
+ }
+
if(callback && typeof callback == 'function'){
callback(model);
@@ -5054,6 +5144,11 @@
});
}
+
+ // 鐢垫睜鍙傛暟
+ $('#battInfoBtn').click(function() {
+ battInfo_popup.showPopup(); // 鏄剧ずbattInfo_popup寮瑰嚭妗嗗拰閬僵灞�
+ });
});
// 鏈哄巻鍗℃ā鍧�
diff --git a/gx_tieta/WebRoot/index.jsp b/gx_tieta/WebRoot/index.jsp
index fdcef10..351d3e4 100644
--- a/gx_tieta/WebRoot/index.jsp
+++ b/gx_tieta/WebRoot/index.jsp
@@ -3886,6 +3886,7 @@
// 鐐瑰嚮鏈烘埧绫诲瀷澶嶉�夋
$('#homeType input[type=checkbox]').click(function() {
var homeType = getHomeType();
+ getInstallNum();
updateStation(true);
});
@@ -3981,13 +3982,38 @@
success: function(result) {
// 鏍煎紡鍖栨暟鎹�
var rs = JSON.parse(result.result);
- var txt = rs.newsum+'/'+rs.sum;
+ //console.log(rs);
+ if(rs.code == 1) {
+ var txt = getInstallNumByType(rs.data,getHomeType());
- // 鏇存柊鏂囨湰鍊�
- $('#installnum').text(txt);
+ // 鏇存柊鏂囨湰鍊�
+ $('#installnum').text(txt);
+ }
+
}
});
- };
+ }
+
+ // 鏇村叿閫夋嫨鏈烘埧鐨勭被鍨嬭繑鍥炴枃鏈�
+ function getInstallNumByType(data,type) {
+ var rs = '鏈煡/鏈煡';
+ switch(type) {
+ case 0:
+ rs = '0/0';
+ break;
+ case 2:
+ rs = data[0]+'/'+data[1];
+ break;
+ case 12:
+ rs = data[2]+'/'+data[3];
+ break;
+ case 14:
+ rs = data[4]+'/'+data[5];
+ break;
+ }
+
+ return rs;
+ }
});
// 0=鍏ㄩ儴涓嶉�� 14=鍏ㄩ儴閫変腑 2=閫変腑2V 12=閫変腑12V
--
Gitblit v1.9.1