From 3f924e7081cd27ab8989c404602b89ccdf230e6f Mon Sep 17 00:00:00 2001
From: hdw <496960745@qq.com>
Date: 星期一, 12 十一月 2018 14:03:22 +0800
Subject: [PATCH] 上一次核容测试终止原因bug修改
---
gx_tieta/WebRoot/control.jsp | 23 +++++++++++++++--------
1 files changed, 15 insertions(+), 8 deletions(-)
diff --git a/gx_tieta/WebRoot/control.jsp b/gx_tieta/WebRoot/control.jsp
index d59fe55..c51e1bb 100644
--- a/gx_tieta/WebRoot/control.jsp
+++ b/gx_tieta/WebRoot/control.jsp
@@ -1216,7 +1216,7 @@
// 璁剧疆椤甸潰鏉冮檺妯″潡
$(function() {
var testOp = checkUserPermit(permits, 'batt_test_op_permit');
- console.log(testOp);
+ //console.log(testOp);
if(!testOp) {
$(".ele-circle .tools-btn").remove();
}
@@ -3479,10 +3479,20 @@
// 鎷撴墤鍥惧浘鏍�
changeEleCircleOpt(eleCircle, 'DCDC1', {statusImg:-1}); // 鏀剧數鍗曞厓
changeEleCircleOpt(eleCircle, 'DCDC2', {statusImg:-1}); // 鍏呯數鍗曞厓
- console.log(data);
+ //console.log(data);
// 娌℃湁褰㈠弬灏变笉鍋氫换浣曟搷浣�
if(data == undefined) {
- status.hide();
+ var opts = [{
+ name: 'none',
+ type: 'text',
+ status: 0,
+ notShow: false,
+ content: {
+ text:'璁惧鐘舵�侊細<span class="red">鏈繛鎺�</span>'
+ }
+ }];
+ status.setOpts(opts);
+ //status.hide();
return false; // 缁撴潫鍑芥暟
}
@@ -3518,6 +3528,7 @@
status.setStatus('msg', isLink);
// 璁剧疆娓╁害淇℃伅
status.setStatus('tmp', alarms[2] == 'true'?0:1);
+
// 璁剧疆鏍稿鍋滄鍘熷洜
if(data.dev_workstate == 2) {
status.setStatus('stop', 99);
@@ -3539,11 +3550,7 @@
status.setStatus('workstatus', data.dev_workstate);
// 璁剧疆鏍稿鍋滄鍘熷洜
- if(data.dev_workstate == 2) {
- status.setStatus('stop', 99);
- }else {
- status.setStatus('stop', data.dev_last_captest_stop_type);
- }
+ status.setStatus('stop', data.dev_last_captest_stop_type);
// 璁剧疆閫氫俊璁℃暟
status.setText('count', "閫氫俊璁℃暟锛�"+data.dev_commcount);
--
Gitblit v1.9.1