From 2af220aea29189b750f08585052f498b8e14a6ba Mon Sep 17 00:00:00 2001
From: hdw <496960745@qq.com>
Date: 星期三, 28 十一月 2018 11:10:20 +0800
Subject: [PATCH] 升级进度条显示
---
gx_tieta/WebRoot/batt-station-update1.jsp | 37 +++++++++++++++++++++++++++++--------
1 files changed, 29 insertions(+), 8 deletions(-)
diff --git a/gx_tieta/WebRoot/batt-station-update1.jsp b/gx_tieta/WebRoot/batt-station-update1.jsp
index d580e7a..db93004 100644
--- a/gx_tieta/WebRoot/batt-station-update1.jsp
+++ b/gx_tieta/WebRoot/batt-station-update1.jsp
@@ -130,7 +130,14 @@
<!-- 鏁翠綋鐏拌壊閬僵灞� -->
<div id="allShade"></div>
<script type="text/html" id="barDemo">
- <a class="layui-btn layui-btn-xs" lay-event="update">鍗囩骇</a>
+ {{# if(d.updatestatusnum != 1){ }}
+ <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>
@@ -143,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');
@@ -375,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}
]]
@@ -460,11 +469,11 @@
if(rs.code == 1){
searchAddStationInfo(temp); //娣诲姞鎴愬姛鐨勬椂鍊欐煡璇㈠綋鍓嶅凡缁忔坊鍔犲埌鏁版嵁搴撹〃涓殑鏈烘埧淇℃伅
}else{
- layer.msg('娣诲姞澶辫触');
+ layer.msg('娌℃湁瑕佹坊鍔犵殑鍐呭锛�');
layer.close(load);
}
},error:function(e){
- layer.msg('娣诲姞澶辫触');
+ layer.msg('娌℃湁瑕佹坊鍔犵殑鍐呭锛�');
layer.close(load);
}
});
@@ -504,6 +513,7 @@
// 鐢熸垚琛ㄦ牸鏁版嵁
table.render(tOptions);
+ renderTblPorgess(allData);
}else {
layer.msg('娌℃湁瑕佹坊鍔犵殑鍐呭锛�');
}
@@ -618,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) {
@@ -650,7 +659,7 @@
tmp.datapackage[num] = dfuData;
}
var pageTbl = $('#pageTbl');
-
+ //console.log(tmp);
// 鏇存柊琛ㄦ牸鍐呭
Object.keys(tmp).forEach(function(key) {
updateLayuiTblCol(pageTbl, key, tmp[key]);
@@ -731,7 +740,7 @@
var updateList = [];
for(var i=0; i<updateData.length; i++) {
var _tmp = {
- dev_id: updateData[i].FBSDeviceId
+ dev_id: updateData[i].fbsid
};
// 娣诲姞鍒拌澶囧崌绾у垪琛ㄤ腑
@@ -859,7 +868,7 @@
tmp.fbsid = _data.dev_id; // 璁惧id
tmp.fbsname = _data.fBSDeviceName; // 璁惧鍚嶇О
tmp.updatestatusnum = 1; // 0 绛夊緟鍗囩骇 1姝ｅ湪鍗囩骇
- tmp.updatestatus = '姝ｅ湪鍗囩骇'; // 鍗囩骇鐘舵��
+ tmp.updatestatus = '鍗囩骇涓�'; // 鍗囩骇鐘舵��
tmp.status = _data.dfu_wr_stat == 1?'鍐�':_data.dfu_wr_stat == 2?'璇�':_data.dfu_wr_stat == 3?'瀹屾垚':''; // 璇诲啓鐘舵��
tmp.datapackage = _data.dfu_data_blocknum; // 褰撳墠鏁版嵁鍖�
tmp.isNewAdd = false;
@@ -874,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>
--
Gitblit v1.9.1