From f196bbea81977c5e0cf5906cba2609a547fd6a3b Mon Sep 17 00:00:00 2001
From: hdw <hdw@192.168.7.112>
Date: 星期六, 29 十二月 2018 15:30:54 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/WebRoot/control.jsp | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/gx_tieta/WebRoot/control.jsp b/gx_tieta/WebRoot/control.jsp
index 4ab7004..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'}},
@@ -5324,7 +5326,7 @@
//鏌ヨ璁惧鐨凷D鍗＄姸鎬�
function searchDevSDState(){
var obj= getBatt();
- console.info(obj);
+ var status = GLOBAL.circleStatus.status;
$.ajax({
type: "post",
url: "Bts_station_stateAction_action_serchSDCard",
@@ -5333,8 +5335,10 @@
data: "json = " + JSON.stringify(obj),
success: function(result) {
var rs = JSON.parse(result.result);
- console.info(rs);
-
+ //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();
--
Gitblit v1.9.1