From 920004ebb4f6305d0be692db20a5a15839985394 Mon Sep 17 00:00:00 2001
From: D:/workspace/chenjingjing/git/gx_tieta/gx_tieta/.gitignore <chenjingjing@LAPTOP-E51P2139>
Date: 星期一, 14 一月 2019 16:23:18 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whyccjj@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/WebRoot/sys-set-test.jsp | 12 ++++++++++++
1 files changed, 12 insertions(+), 0 deletions(-)
diff --git a/gx_tieta/WebRoot/sys-set-test.jsp b/gx_tieta/WebRoot/sys-set-test.jsp
index b323bfd..f6c0c9d 100644
--- a/gx_tieta/WebRoot/sys-set-test.jsp
+++ b/gx_tieta/WebRoot/sys-set-test.jsp
@@ -1261,6 +1261,18 @@
_tmp.allStatus = 0;
}
+ // 鑾峰彇褰撳墠dev_id鎵�鍦ㄨ鐨勬暟鎹�
+ var _trData = layuiTbl.getTr('dev_id', _data.dev_id);
+ // 鍒ゆ柇鏄惁鑾峰彇鍒颁簡褰撳墠dev_id鎵�鍦ㄨ鐨勬暟鎹�
+ if(_trData.code == 1) {
+ var monVolStd = _trData.data.MonVolStd; // 鍗曚綋鏍囩О鐢靛帇
+ // 璁剧疆鐢垫祦閽抽噺绋嬬姸鎬�
+ _tmp.CurrentRange_bool = checkCurrentRange(monVolStd, _tmp.CurrentRange);
+
+ // 璁剧疆DCDC妯″潡鏁伴噺鐘舵��
+ _tmp.LoaderCount_bool = checkLoaderCount(monVolStd, _tmp.LoaderCount);
+ }
+
rsData.push(_tmp);
}
}else {
--
Gitblit v1.9.1