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/bat-set-test.jsp | 14 +++++++
gx_tieta/WebRoot/sys-set-test.jsp | 27 +++++++++++++
gx_tieta/WebRoot/pages/js/mylayui.js | 31 +++++++++++++++
3 files changed, 72 insertions(+), 0 deletions(-)
diff --git a/gx_tieta/WebRoot/bat-set-test.jsp b/gx_tieta/WebRoot/bat-set-test.jsp
index bea238d..abb69c7 100644
--- a/gx_tieta/WebRoot/bat-set-test.jsp
+++ b/gx_tieta/WebRoot/bat-set-test.jsp
@@ -163,6 +163,8 @@
<button class="layui-btn layui-btn-sm mrl8" id="batchAdd"><i class="fa fa-plus mrr8"></i>娣诲姞璁惧</button>
<button class="layui-btn layui-btn-sm" id="sysSet">鎵归噺璁剧疆鐢垫睜鍙傛暟</button>
<button class="layui-btn layui-btn-sm" id="batchRead">鎵归噺璇诲彇鐢垫睜鍙傛暟</button>
+ <span class="mrl8">閫変腑涓暟/鎬绘暟锛�</span>
+ <button class="layui-btn layui-btn-sm" id="qNumber">0/0</button>
</div>
</div>
<!-- 琛ㄦ牸鍐呭 -->
@@ -589,6 +591,16 @@
// 鏇存柊琛ㄦ牸鐨勫璞�
var layuiTbl = new LayuiTbl(tOptions, layui, laytpl, table.cache.pageTbl);
+ // 缁熻宸查�変腑涓暟鍜屾坊鍔犲埌琛ㄦ牸涓暟鎹殑涓暟
+ var quantNum = new QuantNumber($('#qNumber'));
+
+ // 琛ㄦ牸澶嶉�夋鐐瑰嚮鐩戞祴
+ table.on('checkbox(pageTbl)', function(obj){
+ var checkStatus = table.checkStatus('pageTbl'); //idTest 鍗充负鍩虹鍙傛暟 id 瀵瑰簲鐨勫��
+ var checkData = checkStatus.data; // 琚�変腑鐨勬暟鎹�
+ quantNum.setMol(checkData.length);
+ });
+
// 鐐瑰嚮琛ㄦ牸涓悓姝ョ殑鎸夐挳
$('.layui-page-content').on('click', '.layui-table-header .fa', function() {
var title = $(this).attr('title');
@@ -949,6 +961,8 @@
}
tOptions.data = data;
+ // 缁熻娣诲姞鍒拌〃鏍间腑鐨勪釜鏁�
+ quantNum.set(0, data.length);
//console.log(data);
// 鐢熸垚琛ㄦ牸鏁版嵁
table.render(tOptions);
diff --git a/gx_tieta/WebRoot/pages/js/mylayui.js b/gx_tieta/WebRoot/pages/js/mylayui.js
index 63b4f22..86ac70f 100644
--- a/gx_tieta/WebRoot/pages/js/mylayui.js
+++ b/gx_tieta/WebRoot/pages/js/mylayui.js
@@ -607,3 +607,34 @@
return isGood;
}
};
+
+// 缁熻鏁版嵁閫変腑涓暟/鎬讳釜鏁�
+var QuantNumber = function(ele) {
+ this.ele = ele;
+ this.mol = 0;
+ this.den = 0;
+ this._init();
+}
+// 璁剧疆鍘熷瀷鏂规硶
+QuantNumber.prototype = {
+ _init: function() {
+ this._setEleTxt();
+ }
+ ,set: function(mol, den) {
+ this.mol = mol;
+ this.den = den;
+ this._setEleTxt();
+ }
+ ,setMol: function(val) {
+ this.mol = val;
+ this._setEleTxt();
+ }
+ ,setDen: function(val) {
+ this.den = val;
+ this._setEleTxt();
+ }
+ ,_setEleTxt: function() {
+ var str = this.mol+'/'+this.den;
+ this.ele.text(str)
+ }
+};
\ No newline at end of file
diff --git a/gx_tieta/WebRoot/sys-set-test.jsp b/gx_tieta/WebRoot/sys-set-test.jsp
index ad6f985..f6c0c9d 100644
--- a/gx_tieta/WebRoot/sys-set-test.jsp
+++ b/gx_tieta/WebRoot/sys-set-test.jsp
@@ -165,6 +165,8 @@
<button class="layui-btn layui-btn-sm" id="sysSet">涓嬪彂绯荤粺鍙傛暟</button>
<button class="layui-btn layui-btn-sm" id="readSysSet">璇诲彇绯荤粺鍙傛暟</button>
<button class="layui-btn layui-btn-sm" id="sysRestart">鎵归噺閲嶅惎璁惧</button>
+ <span class="mrl8">閫変腑涓暟/鎬绘暟锛�</span>
+ <button class="layui-btn layui-btn-sm" id="qNumber">0/0</button>
</div>
</div>
<!-- 琛ㄦ牸鍐呭 -->
@@ -584,6 +586,16 @@
// 鏇存柊琛ㄦ牸鐨勫璞�
var layuiTbl = new LayuiTbl(tOptions, layui, laytpl, table.cache.pageTbl);
+ // 缁熻宸查�変腑涓暟鍜屾坊鍔犲埌琛ㄦ牸涓暟鎹殑涓暟
+ var quantNum = new QuantNumber($('#qNumber'));
+
+ // 琛ㄦ牸澶嶉�夋鐐瑰嚮鐩戞祴
+ table.on('checkbox(pageTbl)', function(obj){
+ var checkStatus = table.checkStatus('pageTbl'); //idTest 鍗充负鍩虹鍙傛暟 id 瀵瑰簲鐨勫��
+ var checkData = checkStatus.data; // 琚�変腑鐨勬暟鎹�
+ quantNum.setMol(checkData.length);
+ });
+
// 瀹氫箟绯荤粺鍙傛暟闈㈡澘涓璮orm
var sysSetForm = new LayuiForm('sysSetForm');
@@ -899,6 +911,9 @@
}
tOptions.data = formaterSearchRsData(data);
+
+ // 缁熻閫変腑鐨勪釜鏁�/鎬绘暟
+ quantNum.set(0, data.length);
// 鐢熸垚琛ㄦ牸鏁版嵁
table.render(tOptions);
@@ -1246,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