From 1e2369de8e321bdf7d9ee692aa55d65d8ac560b8 Mon Sep 17 00:00:00 2001
From: whyclj <1525436766@qq.com>
Date: 星期六, 29 十二月 2018 14:36:08 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whyclj@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/WebRoot/iframe/batt-station-update.html | 16 ++++++++++++----
1 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/gx_tieta/WebRoot/iframe/batt-station-update.html b/gx_tieta/WebRoot/iframe/batt-station-update.html
index ed84629..633ec9b 100644
--- a/gx_tieta/WebRoot/iframe/batt-station-update.html
+++ b/gx_tieta/WebRoot/iframe/batt-station-update.html
@@ -38,15 +38,19 @@
<table class="hdw-tbl">
<thead>
<tr>
- <th style="width:30%">璁惧ID</th>
+ <th style="width:120px">璁惧ID</th>
<th>鏈烘埧鍚嶇О</th>
+ <th>鐗堟湰鍙�</th>
+ <th>鍗囩骇鏂囦欢鍚�</th>
</tr>
</thead>
<tbody>
{{# layui.each(d, function(index, item){ }}
<tr>
- <td>{{ item.FBSDeviceId }}</td>
- <td>{{ item.StationName }}</td>
+ <td>{{ item.fbsid }}</td>
+ <td>{{ item.stationname }}</td>
+ <td>{{ item.version }}</td>
+ <td>{{ item.filename }}</td>
</tr>
{{# }); }}
</tbody>
@@ -59,8 +63,10 @@
<table class="hdw-tbl">
<thead>
<tr>
- <th style="width:30%">璁惧ID</th>
+ <th style="width:120px">璁惧ID</th>
<th>鏈烘埧鍚嶇О</th>
+ <th>鐗堟湰鍙�</th>
+ <th>鍗囩骇鏂囦欢鍚�</th>
</tr>
</thead>
<tbody>
@@ -68,6 +74,8 @@
<tr>
<td>{{ item.fbsid }}</td>
<td>{{ item.stationname }}</td>
+ <td>{{ item.version }}</td>
+ <td>{{ item.filename }}</td>
</tr>
{{# }); }}
</tbody>
--
Gitblit v1.9.1