From a0a4c3f6dec1da75860fa6fcd184773d43bf0645 Mon Sep 17 00:00:00 2001
From: hdw <hdw@192.168.1.132>
Date: 星期三, 26 十二月 2018 09:56:55 +0800
Subject: [PATCH] SD卡显示逻辑问题
---
gx_tieta/WebRoot/control.jsp | 4 ++--
gx_tieta/WebRoot/ex-battinfo.jsp | 2 +-
gx_tieta/WebRoot/js/elecircle.content.js | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/gx_tieta/WebRoot/control.jsp b/gx_tieta/WebRoot/control.jsp
index 4a45041..771ee6c 100644
--- a/gx_tieta/WebRoot/control.jsp
+++ b/gx_tieta/WebRoot/control.jsp
@@ -5334,9 +5334,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();
diff --git a/gx_tieta/WebRoot/ex-battinfo.jsp b/gx_tieta/WebRoot/ex-battinfo.jsp
index e97bd63..c5fec0d 100644
--- a/gx_tieta/WebRoot/ex-battinfo.jsp
+++ b/gx_tieta/WebRoot/ex-battinfo.jsp
@@ -219,7 +219,7 @@
,data:[]
,limit: 10000
,page: false
- ,height: 'full-10'
+ ,height: 'full-235'
};
// 鐢熸垚琛ㄦ牸鏁版嵁
diff --git a/gx_tieta/WebRoot/js/elecircle.content.js b/gx_tieta/WebRoot/js/elecircle.content.js
index 4ea08fb..d25ed1a 100644
--- a/gx_tieta/WebRoot/js/elecircle.content.js
+++ b/gx_tieta/WebRoot/js/elecircle.content.js
@@ -1041,7 +1041,7 @@
status: 0,
notShow: false,
content: {
- text: 'sd鍗＄姸鎬侊細锛燂紵锛�'
+ text: 'SD鍗＄姸鎬侊細锛燂紵锛�'
}
},
{
--
Gitblit v1.9.1