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/control.jsp | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/gx_tieta/WebRoot/control.jsp b/gx_tieta/WebRoot/control.jsp
index 4a45041..6e69e0d 100644
--- a/gx_tieta/WebRoot/control.jsp
+++ b/gx_tieta/WebRoot/control.jsp
@@ -2289,6 +2289,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; //璁剧疆鐢靛帇鍛婅楂樺��
@@ -4606,6 +4607,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'}},
@@ -5334,9 +5336,9 @@
success: function(result) {
var rs = JSON.parse(result.result);
//console.info(rs);
- var sdStatus = rs.data?'宸叉彃鍏�': '<span style="color: #FF0000">鏈彃鍏�</span>';
+ var sdStatus = (rs.data == 0)?'姝ｅ父': '<span style="color: #FF0000">鏁呴殰</span>';
//console.log(sdStatus);
- status.setText('sdCard', "sd鍗＄姸鎬侊細"+sdStatus);
+ status.setText('sdCard', "SD鍗＄姸鎬侊細"+sdStatus);
clearTimeout(searchDevSDState.timeout);
searchDevSDState.timeout = setTimeout(function() {
searchDevSDState();
--
Gitblit v1.9.1