From c02e430f16cb51cabb6f4b24f99ec48efc7b0596 Mon Sep 17 00:00:00 2001
From: Administrator <Administrator@192.168.10.26>
Date: 星期三, 21 十一月 2018 11:59:20 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whyccjj@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/WebRoot/batt-station-update1.jsp | 14 +++++++++-----
1 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/gx_tieta/WebRoot/batt-station-update1.jsp b/gx_tieta/WebRoot/batt-station-update1.jsp
index 605fd26..aad2da7 100644
--- a/gx_tieta/WebRoot/batt-station-update1.jsp
+++ b/gx_tieta/WebRoot/batt-station-update1.jsp
@@ -130,7 +130,9 @@
<!-- 鏁翠綋鐏拌壊閬僵灞� -->
<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/javascript" src="js/jquery-1.8.3.js"></script>
<script type="text/javascript" src="js/echarts.js"></script>
@@ -460,10 +462,12 @@
if(rs.code == 1){
searchAddStationInfo(temp); //娣诲姞鎴愬姛鐨勬椂鍊欐煡璇㈠綋鍓嶅凡缁忔坊鍔犲埌鏁版嵁搴撹〃涓殑鏈烘埧淇℃伅
}else{
- layer.msg('娣诲姞澶辫触');
+ layer.msg('娌℃湁瑕佹坊鍔犵殑鍐呭锛�');
+ layer.close(load);
}
},error:function(e){
- layer.msg('娣诲姞澶辫触');
+ layer.msg('娌℃湁瑕佹坊鍔犵殑鍐呭锛�');
+ layer.close(load);
}
});
}
@@ -729,7 +733,7 @@
var updateList = [];
for(var i=0; i<updateData.length; i++) {
var _tmp = {
- dev_id: updateData[i].FBSDeviceId
+ dev_id: updateData[i].fbsid
};
// 娣诲姞鍒拌澶囧崌绾у垪琛ㄤ腑
@@ -857,7 +861,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;
--
Gitblit v1.9.1