From 94c3b603ae4fd3f26e23a33e3eabc781d9c08846 Mon Sep 17 00:00:00 2001
From: 81041 <81041@DESKTOP-025NVD9>
Date: 星期三, 26 十二月 2018 11:33:37 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whyclxw1@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/WebRoot/control.jsp | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/gx_tieta/WebRoot/control.jsp b/gx_tieta/WebRoot/control.jsp
index 4ab7004..579c089 100644
--- a/gx_tieta/WebRoot/control.jsp
+++ b/gx_tieta/WebRoot/control.jsp
@@ -4606,6 +4606,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 +5325,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 +5334,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