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 |   25 ++++++++++++++++++++++---
 1 files changed, 22 insertions(+), 3 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>

--
Gitblit v1.9.1