From a6f784d801885a6a2c785206d12085c19be3f9e3 Mon Sep 17 00:00:00 2001
From: 81041 <81041@192.168.10.20>
Date: 星期四, 29 十一月 2018 11:50:29 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whyclxw1@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/WebRoot/mobil/batt-state-statistical.html | 2
gx_tieta/WebRoot/batt-station-update1.jsp | 131 +++++++++++++++++--------
gx_tieta/WebRoot/mobil/batt-infor-conf-temp.html | 13 ++
gx_tieta/WebRoot/mobil/ele-param.html | 89 ++++++++++++-----
gx_tieta/WebRoot/batt-state-statistical.jsp | 6
5 files changed, 163 insertions(+), 78 deletions(-)
diff --git a/gx_tieta/WebRoot/batt-state-statistical.jsp b/gx_tieta/WebRoot/batt-state-statistical.jsp
index 6e01c08..883aacb 100644
--- a/gx_tieta/WebRoot/batt-state-statistical.jsp
+++ b/gx_tieta/WebRoot/batt-state-statistical.jsp
@@ -342,11 +342,9 @@
tmp.push(_data.station_event_type_tempup); // 娓╁害涓婇檺
tmp.push(_data.station_event_type_templow); // 娓╁害涓嬮檺
tmp.push(_data.station_event_type_dampup); // 婀垮害涓婇檺
- tmp.push(_data.station_event_type_damplow); // 婀垮害涓嬮檺
-
+ tmp.push(_data.station_event_type_damplow); // 婀垮害涓嬮檺
rs.push(tmp);
- }
-
+ }
return rs;
}
diff --git a/gx_tieta/WebRoot/batt-station-update1.jsp b/gx_tieta/WebRoot/batt-station-update1.jsp
index db93004..22d818d 100644
--- a/gx_tieta/WebRoot/batt-station-update1.jsp
+++ b/gx_tieta/WebRoot/batt-station-update1.jsp
@@ -380,10 +380,11 @@
,{field:'stationid', title:'鏈烘埧ID', align:'center'}
,{field:'stationname', title:'鏈烘埧鍚嶇О', align:'center', width: 400}
,{field:'fbsid', title:'璁惧ID', align:'center'}
- ,{field:'fbsname', title:'璁惧鍚嶇О', align:'center'}
,{field:'updatestatus', title:'鍗囩骇鐘舵��', align:'center'}
+ ,{field: 'version', title: '鐗堟湰鍙�', align: 'center'}
+ ,{field:'filename', title:'鍗囩骇鏂囦欢鍚�', align:'center'}
,{field:'status', title:'璇诲啓鐘舵��', align:'center'}
- ,{field:'progress', title:'涓婁紶杩涘害', align: 'center', templet:'#upProgress'}
+ ,{field:'progress', title:'璇�/鍐欒繘搴�', align: 'center', templet:'#upProgress'}
,{field:'datapackage', title:'褰撳墠鏁版嵁鍖�', align:'center'}
,{fixed: 'right', title:'鎿嶄綔', align:'center', toolbar: '#barDemo', width:100}
]]
@@ -495,17 +496,19 @@
var formaterData = formaterAddData(rs.data, allData); //瑙ｆ瀽鏁版嵁
if(formaterData.length) {
// 閬嶅巻formaterData
+ //console.log(formaterData);
for(var i=0; i<formaterData.length; i++) {
var _formaterData = formaterData[i];
var tmp = {};
tmp.stationid = _formaterData.StationId; // 鏈烘埧id
tmp.stationname = _formaterData.StationName; // 鏈烘埧鍚嶇О
tmp.fbsid = _formaterData.FBSDeviceId; // 璁惧id
- tmp.fbsname = _formaterData.FBSDeviceName; // 璁惧鍚嶇О
+ tmp.filename = getFnameByVer(_formaterData.StationIp); // 鍗囩骇鏂囦欢鍚嶇О
tmp.updatestatusnum = 0; // 0 绛夊緟鍗囩骇
tmp.updatestatus = '绛夊緟鍗囩骇'; // 鍗囩骇鐘舵��
tmp.status = '鍐�'; // 璇诲啓鐘舵��
tmp.datapackage = 1; // 褰撳墠鏁版嵁鍖�
+ tmp.version = _formaterData.StationIp; // 鐗堟湰鍙�
tmp.isNewAdd = true;
//console.log(tmp);
allData.push(tmp);
@@ -622,12 +625,16 @@
status: [],
datapackage: []
};
- //console.log(rs);
+ console.log(rs);
if(rs.code == 1 && rs.data.length>0){
var tblData = tOptions.data;
for(var i=0; i<rs.data.length; i++) {
var _data = rs.data[i];
var num = -1;
+ // 璁＄畻杩涘害
+ var currentPer = getStrPercent(_data.dfu_data_blocknum, _data.dfu_data_blocklen, _data.dfu_file_len, _data.dfu_wr_stat);
+ updateTblPorgress(_data.dev_id, currentPer);
+ //console.log(currentPer);
// 閬嶅巻鐜版湁鐨則blData/鏍规嵁琛ㄦ牸鐨勮鍒玦d瀵硅幏鍙栧埌鍊艰繘琛屾帓搴忎互渚垮搴旇〃鏍煎唴瀹�
for(var k=0; k<tblData.length;k++) {
var _tblData = tblData[k];
@@ -696,7 +703,7 @@
}
- //楠岃瘉璁惧鏄惁鍏佽璁惧杩涜杩滅▼鍗囩骇
+ // 楠岃瘉璁惧鏄惁鍏佽璁惧杩涜杩滅▼鍗囩骇
function checkStationState(temp, all){
$.ajax({
type: "post",
@@ -710,12 +717,12 @@
if(rs.code == 1) {
var data = rs.data;
var updateData = checkUpdating(data, all);
- var errorUpdate = checkErrorUpdate(data, all);
- $('#updateIframeData').data('update', updateData); // 鍙洿鏂扮殑璁惧淇℃伅
- $('#updateIframeData').data('errorUpdate', errorUpdate); // 鏃犳硶鏇存柊鐨勮澶囦俊鎭�
+ $('#updateIframeData').data('update', updateData.good); // 鍙洿鏂扮殑璁惧淇℃伅
+ $('#updateIframeData').data('errorUpdate', updateData.bad); // 鏃犳硶鏇存柊鐨勮澶囦俊鎭�
+ console.log(updateData);
// 鍒ゆ柇鏄惁鏈夊崌绾х殑璁惧
- if(updateData.length == 0) {
+ if(updateData.good.length == 0) {
if(temp.length == 1) {
layer.msg('褰撳墠璁惧鏃犳硶鍗囩骇锛�');
}else {
@@ -735,18 +742,24 @@
content: 'iframe/batt-station-update.html',
btn: ['纭鍗囩骇', '鍙栨秷'],
yes: function(index, layero) {
- var updateData = $('#updateIframeData').data('update'); // 鑾峰彇鍙崌绾ц澶囩殑淇℃伅
+ var goodUpdateData = $('#updateIframeData').data('update'); // 鑾峰彇鍙崌绾ц澶囩殑淇℃伅
// 鏍规嵁鍙崌绾ц澶囩殑淇℃伅鏋勯�犳煡璇㈡潯浠�
var updateList = [];
- for(var i=0; i<updateData.length; i++) {
+ for(var i=0; i<goodUpdateData.length; i++) {
+ var _data = goodUpdateData[i];
+ //var filename = getFnameByVer(_data.version);
var _tmp = {
- dev_id: updateData[i].fbsid
+ dev_id: _data.fbsid
+ ,dfu_file: _data.filename
};
-
+ console.log(_data);
// 娣诲姞鍒拌澶囧崌绾у垪琛ㄤ腑
- updateList.push(_tmp);
+ if(_data.filename && _data.filename.length != 0) {
+ updateList.push(_tmp);
+ }
+
}
-
+ //console.log(updateList);
// 鍏抽棴寮瑰嚭闈㈡澘
layer.close(index);
@@ -771,34 +784,12 @@
}
- // 浠庤繑鍥炵殑鍙崌绾х殑璁惧涓墧闄ゆ鍦ㄥ崌绾х殑璁惧
+ // 鏍煎紡璇濆崌绾х殑璁惧
function checkUpdating(rsData, all) {
- var rs = [];
- // 閬嶅巻all
- for(var i=0; i<all.length; i++) {
- var _all = all[i];
- var isError = true;
- for(var k=0; k<rsData.length; k++) {
- var _rsData = rsData[k];
-
- // 鍒ゆ柇褰撳墠璁惧鏄惁姝ｅ湪鍗囩骇
- if(_all.updatestatusnum == 1) {
- isError = false;
- }
- }
-
- // 鏍规嵁isError鍒よ鏄惁鏄笉鍙坊鍔犵殑鏈烘埧
- if(isError) {
- rs.push(_all);
- }
- }
-
- return rs;
- }
-
- // 鑾峰彇鏃犳硶鍗囩骇鐨勮澶�
- function checkErrorUpdate(rsData, all) {
- var rs = [];
+ var rs = {
+ good: []
+ ,bad: []
+ };
// 閬嶅巻all
for(var i=0; i<all.length; i++) {
var _all = all[i];
@@ -816,7 +807,9 @@
// 鏍规嵁isError鍒よ鏄惁鏄笉鍙坊鍔犵殑鏈烘埧
if(isError) {
- rs.push(_all);
+ rs.bad.push(_all);
+ }else {
+ rs.good.push(_all);
}
}
@@ -868,6 +861,8 @@
tmp.fbsid = _data.dev_id; // 璁惧id
tmp.fbsname = _data.fBSDeviceName; // 璁惧鍚嶇О
tmp.updatestatusnum = 1; // 0 绛夊緟鍗囩骇 1姝ｅ湪鍗囩骇
+ tmp.version = _data.note; // 鐗堟湰鍙�
+ tmp.filename = _data.dfu_file; // 鍗囩骇鏂囦欢鍚嶇О
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; // 褰撳墠鏁版嵁鍖�
@@ -878,11 +873,11 @@
// 鏇存柊琛ㄦ牸
table.render(tOptions);
+ renderTblPorgess(allData);
}
}
});
}
-
// 娓叉煋杩涘害鏉�
function renderTblPorgess(tblData) {
@@ -895,6 +890,54 @@
}
}
+
+ // 鏇存柊杩涘害鏉�
+ function updateTblPorgress(fbsid, percent) {
+
+ // 鏇存柊杩涘害鏉�
+ element.progress('upload'+fbsid, percent);
+ }
+
+ // 璁＄畻杩涘害
+ function getStrPercent(current, blocklen, all, status) {
+ var rs = '0%';
+ if(all != 0) {
+ var num = Math.ceil(current*blocklen*100/all);
+ if(num>=100) {
+ num = status == 1?'鍐欏畬鎴�':'鍗囩骇瀹屾垚';
+
+ }
+
+ rs = num+'%';
+ }
+
+ return rs;
+ }
+ //console.log(getFnameByVer('D:8,V2.53.40'));
+ // 鏇村叿鐗堟湰鍙疯幏鍙栨枃浠剁殑鍚嶇О
+ function getFnameByVer(version) {
+ var fileList = [
+ {
+ filename: 'avr_dfu.uc3'
+ ,pattern: /^.*\.24\.[0-9]*$/
+ }
+ ,{
+ filename: 'E51_DFU.SM5'
+ ,pattern: /^.*\.53\.[0-9]*$/
+ }
+ ];
+
+ // 閬嶅巻骞惰幏鍙杅ilename
+ var filename = undefined;
+ for(var i=0; i<fileList.length; i++) {
+ var _fileList = fileList[i];
+ if(_fileList.pattern.test(version)) {
+ filename = _fileList.filename;
+ }
+ }
+
+ return filename;
+ }
});
</script>
</body>
diff --git a/gx_tieta/WebRoot/mobil/batt-infor-conf-temp.html b/gx_tieta/WebRoot/mobil/batt-infor-conf-temp.html
index 41ed7af..1b9f8c8 100644
--- a/gx_tieta/WebRoot/mobil/batt-infor-conf-temp.html
+++ b/gx_tieta/WebRoot/mobil/batt-infor-conf-temp.html
@@ -253,12 +253,16 @@
<div data-role="footer" data-position="fixed" data-theme="a">
<div data-role="navbar">
<ul>
- <li><a href="" target="_top" data-role="button" data-icon="check" data-transition="slide">纭畾</a></li>
- <li><a href="" target="_top" data-role="button" data-icon="delete" data-transition="slide">鍙栨秷</a></li>
+ <li><a href="#yourPopup" data-rel="popup" class="ui-btn ui-btn-inline ui-corner-all operat-but ui-btn-icon-check" data-position-to="window" data-icon="check" data-role="button">纭畾</a></li>
+ <li><a href="" data-rel="popup" class="ui-btn ui-btn-inline ui-corner-all operat-but ui-btn-icon-delete" data-position-to="window" data-icon="delete" data-role="button">鍙栨秷</a></li>
</ul>
</div>
</div>
-
+ <div data-role="popup" id="yourPopup" class="ui-content" data-overlay-theme="b">
+ <a href="#" data-rel="back" class="ui-btn ui-corner-all ui-shadow ui-btn ui-icon-delete ui-btn-icon-notext ui-btn-right">鍏抽棴</a>
+ <a href="" id="sure" class="ui-btn ui-corner-all ui-shadow ui-btn-icon-left ui-icon-check" >鎻愪氦</a>
+ <a href="" class="ui-btn ui-corner-all ui-shadow ui-btn-icon-left ui-icon-delete" >鏀惧純</a>
+ </div>
</div>
</body>
@@ -278,6 +282,9 @@
<script type="text/javascript">
$(function(){
$(".unable").prop("readonly","readonly").attr("unselectable","on").addClass("uncheck");
+ $("#sure").click(function(){
+ window.location.href="index.html";
+ });
});
</script>
</html>
\ No newline at end of file
diff --git a/gx_tieta/WebRoot/mobil/batt-state-statistical.html b/gx_tieta/WebRoot/mobil/batt-state-statistical.html
index 274f4b7..705fc11 100644
--- a/gx_tieta/WebRoot/mobil/batt-state-statistical.html
+++ b/gx_tieta/WebRoot/mobil/batt-state-statistical.html
@@ -202,7 +202,7 @@
//console.info(data);
if(data.code==1 && data.data.length>0){
data=data.data;
- //console.info(data);
+ console.info(data);
arr=new Array();
index=0;
for(var i=0;i<data.length;i++){
diff --git a/gx_tieta/WebRoot/mobil/ele-param.html b/gx_tieta/WebRoot/mobil/ele-param.html
index b1221f2..386bb72 100644
--- a/gx_tieta/WebRoot/mobil/ele-param.html
+++ b/gx_tieta/WebRoot/mobil/ele-param.html
@@ -85,8 +85,8 @@
}
.operat-but{
margin: 0;
- padding-top: 0.7em;
- padding-bottom: 0.7em;
+ padding-top: 0.1em;
+ padding-bottom: 0.1em;
}
</style>
<link rel="stylesheet" href="css/fgpanel.css">
@@ -152,9 +152,9 @@
</div>
<div data-role="popup" id="myPopup" class="ui-content" data-overlay-theme="b">
<a href="#" data-rel="back" class="ui-btn ui-corner-all ui-shadow ui-btn ui-icon-delete ui-btn-icon-notext ui-btn-right">鍏抽棴</a>
- <a href="batt-infor-conf-temp.html" class="ui-btn ui-corner-all ui-shadow ui-btn-icon-left ui-icon-edit" >淇敼</a>
+ <a href="" id="edit" class="ui-btn ui-corner-all ui-shadow ui-btn-icon-left ui-icon-edit" >淇敼</a>
- <a href="batt-infor-delete.html" class="ui-btn ui-corner-all ui-shadow ui-btn-icon-left ui-icon-forbidden" data-icon="delete">鍒犻櫎</a>
+ <a href="" class="ui-btn ui-corner-all ui-shadow ui-btn-icon-left ui-icon-forbidden" data-icon="delete">鍒犻櫎</a>
</div>
</div>
</body>
@@ -173,13 +173,15 @@
var arr=new Array(); //褰撳墠琛ㄦ牸td鏁版嵁
var tblCon = $('.tbl-container');
var Page = {
- pageSize:10, //姣忛〉鐨勮鏁�
+ pageSize:20, //姣忛〉鐨勮鏁�
pageCurr:1, //褰撳墠椤电爜鏁�
pageAll:0,
};
$('document').ready(function(){panel.show();});
-
+ $("#edit").click(function(){
+ window.location.href="batt-infor-conf-temp.html";
+ });
var arrTh = [ '鏈烘埧缂栧彿', '鐪�', '鍩庡競','鍖哄幙','鏈烘埧鍚嶇О','璁惧鍚嶇О','鏈烘埧IP','FBS璁惧ID(閲嶈)','FBS璁惧IP(閲嶈)','瀛愮綉鎺╃爜','缃戝叧','FBS璁惧鍚嶇О','FBS鐢垫睜绱㈠紩(0-3)','鐢垫睜缁処D','鏈烘埧鍐呯數姹犵粍缂栧彿','鐢垫睜缁勫悕绉�','娴厖鐢靛帇闃�鍊�(V)','绂荤嚎鐢靛帇闃�鍊�(V)','娴厖鐢垫祦闃�鍊�(A)','鍗曚綋鏁伴噺','鏍囩О瀹归噺(AH)','鏍囩О鍗曚綋鐢靛帇(V)','鏍囩О鍗曚綋鍐呴樆(m惟)','鏍囩О鍗曚綋鐢靛','鍗曚綋鐢靛帇娆′綆鍋忕Щ閲�(V)','璐熻浇鐢垫祦(A)','鏈�澶ф牳瀹圭數娴�(A)','鍩虹珯鍙风爜','鐢垫睜鍝佺墝','鐢垫睜鍨嬪彿','鐢垫睜鐢熶骇鏃ユ湡','鎶曞叆浣跨敤鏃ユ湡','瀹夎浜哄憳','閰嶇疆鎿嶄綔'];
dataArr = [];
var startTime = "1980-01-01";
@@ -199,44 +201,78 @@
function searchBattLife(){
var temp = createSearchParam();
var json = JSON.stringify(temp);
+ console.info(json);
arrTd = new Array();
var load;
- /*if() {
- load = layer.load(1);
- }*/
$.ajax({
type:"post",
- url:"",
+ url:"BattInfAction!searchInform",
async:true,
- datatype:'json',
+ datatype:'text',
data:"json="+json,
success:function(data){
//console.info(data);
- //var data = JSON.parse(data.result);
+ var data = JSON.parse(data.result);
//layer.close(load);
+ console.info(data);
if(data.code==1&&data.data.length>0){
data=data.data;
var index = 0;
var ArryTb= new Array();
for(i=0;i<data.length;i++){
- arrTd[index++]=data[i].deviceId;
- arrTd[index++]=data[i].stationName;
- arrTd[index++]=data[i].real_cap;
-
- //arrTd[index++]=data[i].is_out_stand;
+ arrTd.push(data[i].StationId); //鏈烘埧缂栧彿
+ arrTd.push(data[i].StationName1); // 鐪�
+ arrTd.push(data[i].StationName2); // 甯�
+ arrTd.push(data[i].StationName5); // 鍖�/鍘�
+ arrTd.push(data[i].StationName3); //鏈烘埧鍚嶇О
+ arrTd.push(data[i].StationName4); //璁惧鍚嶇О
+ arrTd.push(data[i].StationIp); //鏈烘埧ip
+ arrTd.push(data[i].FBSDeviceId); //FBS璁惧ID
+ arrTd.push(data[i].FbsDeviceIp); //FBS璁惧IP
+ arrTd.push(data[i].FbsDeviceIp_YM); //瀛愮綉鎺╃爜
+ arrTd.push(data[i].FbsDeviceIp_WG); //缃戝叧
+ arrTd.push(data[i].FBSDeviceName); //FBS璁惧鍚嶇О
+ arrTd.push(data[i].GroupIndexInFBSDevice); //FBS璁惧绱㈠紩
+ arrTd.push(data[i].BattGroupId); //鐢垫睜缁処D
+ arrTd.push(data[i].BattGroupNum); //鏈烘埧鍐呯數姹犵粍缂栧彿
+ arrTd.push(data[i].BattGroupName); //鐢垫睜缁勫悕绉�
+ arrTd.push(data[i].FloatVolLevel); //娴厖鐢靛帇闃�鍊�
+ arrTd.push(data[i].OfflineVolLevel); //绂荤嚎鐢靛帇闃�鍊�
+ arrTd.push(data[i].BattFloatCurrent); //娴厖闃�鍊�
+ arrTd.push(data[i].MonCount); //鍗曚綋鏁伴噺
+ arrTd.push(data[i].MonCapStd); //鏍囩О瀹归噺
+ arrTd.push(data[i].MonVolStd); //鏍囩О鍗曚綋鐢靛帇
+ arrTd.push(data[i].MonResStd); //鏍囩О鍗曚綋鍐呴樆
+ arrTd.push(data[i].MonSerStd); //鏍囩О鍗曚綋鐢靛
+ arrTd.push(data[i].MonVolLowToAvg); //鍗曚綋鐢靛帇娆′綆鍋忕Щ閲�
+
+ arrTd.push(data[i].Load_curr); //璐熻浇鐢垫祦
+ arrTd.push(data[i].DisCurrMax); //鏈�澶ф牳瀹圭數娴�
+ arrTd.push(data[i].station_phone); //鍩虹珯鎵嬫満鍙风爜
+
+
+ arrTd.push(data[i].BattProducer); //鐢垫睜鍝佺墝
+ arrTd.push(data[i].BattModel); //鐢垫睜鍨嬪彿
+ arrTd.push(data[i].BattProductDate.substr(0,10)); //鐢垫睜鐢熶骇鏃ユ湡
+ arrTd.push(data[i].BattInUseDate.substr(0,10)); //鎶曞叆浣跨敤鏃ユ湡
+ arrTd.push(data[i].install_user); // 璁惧瀹夎浜哄憳
+ /* arrTd.push("");
+ arrTd.push("");
+ arrTd.push(model.data[i].StationId_ex); //鎶曞叆浣跨敤鏃ユ湡 */
+ arrTd.push('<a href="#myPopup" data-rel="popup" class="ui-btn ui-btn-inline ui-corner-all operat-but" data-position-to="window" >淇敼鎴栧垹闄�</a>');
+ Page.pageAll = data[i].num;
}
- Page.pageAll = data[data.length-1].page.pageAll;
+
}else{
Page.pageAll = 0;
}
- setPage();
- //console.info(Page.pageAll);
+ setPage();
createTbl(tblCon, arrTh, arrTd);
}
});
/* 妯℃嫙鏁版嵁鍋氬ソ灏卞垹锛侊紒锛侊紒锛侊紒锛侊紒 */
- for(i=0;i<340;i++){
+ /*for(i=0;i<340;i++){
if(i%34==33){
//<a href="count-report.html" target="_top" class="ui-btn ui-corner-all ui-shadow ui-icon-back ui-btn-icon-left" style="padding-top: 0.7em; padding-bottom: 0.7em;">杩斿洖</a>
arrTd[i]='<a href="#myPopup" data-rel="popup" class="ui-btn ui-btn-inline ui-corner-all operat-but" data-position-to="window" >淇敼鎴栧垹闄�</a>';
@@ -448,11 +484,12 @@
function createSearchParam(){
var temp = {
page:Page,
- stationName1:$('#mainteArea').val(),
- stationName2:$('#city').val(),
- stationName5: $('#country').val(),
- stationName:$('#homeName').val(),
-
+ binf:{
+ StationName1:$('#mainteArea').val(),
+ StationName2:$('#city').val(),
+ StationName5: $('#country').val(),
+ StationName:$('#homeName').val(),
+ },
};
console.info(temp);
return temp;
--
Gitblit v1.9.1