From 5fe2efb71f6ad809a1cfc59beab18bbea99fff5e Mon Sep 17 00:00:00 2001
From: 81041 <81041@DESKTOP-025NVD9>
Date: 星期五, 18 一月 2019 09:01:41 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/WebRoot/control.jsp | 45 +++++++++++++++++++++++++++++++++++++++++----
1 files changed, 41 insertions(+), 4 deletions(-)
diff --git a/gx_tieta/WebRoot/control.jsp b/gx_tieta/WebRoot/control.jsp
index 8ff0c27..41c33a3 100644
--- a/gx_tieta/WebRoot/control.jsp
+++ b/gx_tieta/WebRoot/control.jsp
@@ -1811,7 +1811,6 @@
$('.fir:first').next().children().eq(i).children().eq(0).css('display','none');
}
}
-
//alert(BattGroupId);
clearInterval(time);
searchBattAlarmParam(); //鏌ヨ鐢垫睜鍛婅鍙傛暟
@@ -1934,11 +1933,13 @@
//鏌ヨ鐢垫睜缁勭殑瀹炴椂鐘舵�佷俊鎭�
function showtable(){
//searbattrealInfomation();
- searchDevStatusByDev_id();
findrtstate();
findrtdata();
//鏌ヨ璁惧鐨刣cdc鐘舵��
searchDevDcDcState();
+
+ // 鏇存柊鎷撴墤鍥剧姸鎬�
+ searchDevStatusByDev_id();
}
//鏍规嵁璁惧id鏌ヨ璁惧褰撳墠鐨勫紑鍏崇姸鎬�
@@ -1981,8 +1982,7 @@
//console.info("涓婁竴娆℃牳瀹规祴璇曞仠姝㈠師鍥狅細"+lastStopReason);
//console.info("閫氫俊璁℃暟锛�"+_data.dev_commcount);
//console.info("閫氫俊涓㈠寘鐜囷細"+(_data.dev_commcount==0?0:(_data.dev_errcommcount*100/_data.dev_commcount)));
-
- var nowTime = new Date().getTime(); //褰撳墠鏃堕棿
+ var nowTime = new Date(model.data[0].note).getTime(); //褰撳墠鏃堕棿
var record = new Date(model.data[0].record_datetime).getTime();
//console.info(Math.abs(nowTime-record)/1000);
@@ -2290,6 +2290,7 @@
table_index = 0;
createAllTbl(tbHd, tbBd, thVol, mon_vol_table_list);
title.setAvg(parseFloat(sum/array.length).toFixed(3));
+ title.setSum(sum);
getBattAlarmTitle(batt,"Voltage",title);
//title.alow = temp.alow; //璁剧疆鐢靛帇鍛婅浣庡��
//title.ahight = temp.ahight; //璁剧疆鐢靛帇鍛婅楂樺��
@@ -3734,6 +3735,9 @@
// 璁剧疆閫氫俊璁℃暟
status.setText('count', "閫氫俊璁℃暟锛�"+data.dev_commcount);
+ // 璁剧疆璁惧鐗堟湰鍙�
+ status.setText('devVersion', '璁惧鐗堟湰鍙凤細'+data.dev_version);
+
// 璁剧疆涓㈠寘鐜�
var errorCount = data.dev_errcommcount;
var allCount = data.dev_commcount+errorCount;
@@ -4563,6 +4567,7 @@
getBattStr();
searchBattAlarmParam(); //鏌ヨ鐢垫睜鍛婅鍙傛暟
+ searchDevSDState();
clearInterval(time);
mygraph.graphtype = 4;
showtable();
@@ -4606,6 +4611,7 @@
// 鐢佃矾鎷撴墤鍥惧彸閿彍鍗�
var menuItems = [
{txt: '鍩虹珯鏈哄巻鍗�', cla: 'home-info-card'},
+ {txt: '鏈烘埧闂璁板綍', cla: 'target', data:{target: 'batt-fault-manage.jsp'}},
{txt: '鏈烘埧瀹炴椂鐘舵�佹煡璇�', cla: 'target', data:{target: 'batt-state-manage.jsp'}},
{txt: '璁惧娴侀噺缁熻鏌ヨ', cla: 'target', data:{target: 'batt-traffic-statistics1.jsp'}},
{txt: '鏈烘埧缁埅鑳藉姏鏌ヨ', cla: 'target', data: {target: 'batt-life-manage.jsp'}},
@@ -5319,6 +5325,37 @@
}
});
}
+
+
+ //鏌ヨ璁惧鐨凷D鍗＄姸鎬�
+ function searchDevSDState(){
+ var obj= getBatt();
+ var status = GLOBAL.circleStatus.status;
+ $.ajax({
+ type: "post",
+ url: "Bts_station_stateAction_action_serchSDCard",
+ async: true,
+ dataType: 'json',
+ data: "json = " + JSON.stringify(obj),
+ success: function(result) {
+ var rs = JSON.parse(result.result);
+ //console.info(rs);
+ var sdStatus = (rs.data == 0)?'姝ｅ父': '<span style="color: #FF0000">鏁呴殰</span>';
+ //console.log(sdStatus);
+ status.setText('sdCard', "SD鍗＄姸鎬侊細"+sdStatus);
+ clearTimeout(searchDevSDState.timeout);
+ searchDevSDState.timeout = setTimeout(function() {
+ searchDevSDState();
+ }, 2000);
+ },
+ error: function() {
+ clearTimeout(searchDevSDState.timeout);
+ searchDevSDState.timeout = setTimeout(function() {
+ searchDevSDState();
+ }, 5000);
+ }
+ });
+ }
</script>
<script type="text/javascript" src="js/Title.js"></script>
<script type="text/javascript" src="js/control.js"></script>
--
Gitblit v1.9.1