From b6c43fa1689bc154645a07c4cab68c6d57daf53a Mon Sep 17 00:00:00 2001
From: 81041 <81041@192.168.10.28>
Date: 星期五, 12 十月 2018 14:03:16 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whyclxw1@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/WebRoot/iframe/set-match-group.html | 12 ++++++++----
1 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/gx_tieta/WebRoot/iframe/set-match-group.html b/gx_tieta/WebRoot/iframe/set-match-group.html
index e61b55b..7db3d80 100644
--- a/gx_tieta/WebRoot/iframe/set-match-group.html
+++ b/gx_tieta/WebRoot/iframe/set-match-group.html
@@ -162,6 +162,7 @@
// 鏋勯�犵敓鎴愯〃鏍兼暟鎹殑鏂规硶
function formaterTblData(data) {
+ console.log(data);
var rs = []; // 缁撴灉闆�
// 閬嶅巻鏌ヨ鐨勭粨鏋滄牴鎹煡璇㈢粨鏋滅敓鎴愭寚瀹氱殑鏍煎紡
@@ -177,8 +178,11 @@
// 涓嶆樉绀哄唴瀹�
obj.num = _data.MonNum; // 鍗曚綋缂栧彿涓嶅姞#
obj.battgroupid = _data.BattGroupId; // 鐢垫睜缁刬d
- obj.stationid = _data.StationId; // 鏈烘埧id
- rs.push(obj);
+ obj.stationid = _data.StationId; // 鏈烘埧id
+ // 鍒ゆ柇褰撳墠浣嶇疆鐨勫崟浣撴槸鍚︿负绌虹櫧()
+ if(_data.num || _data.num == undefined) {
+ rs.push(obj);
+ }
}
return rs; // 杩斿洖缁撴灉闆�
@@ -251,7 +255,7 @@
obj.old_battproducer = oData.brandname; // 鍗曚綋鐨勫搧鐗�
obj.old_stationid = oData.stationid; // 鏈烘埧id
obj.old_battgroupid = oData.battgroupid; // 鐢垫睜缁刬d
- obj.old_monnum = oData.num; // 鍗曚綋缂栧彿
+ obj.old_monum = oData.num; // 鍗曚綋缂栧彿
// 琚厤缁勫崟浣撶殑淇℃伅
obj.new_stationname = nData.stationname; // 鏈烘埧鍚嶇О
@@ -259,7 +263,7 @@
obj.new_battproducer = nData.brandname; // 鍗曚綋鐨勫搧鐗�
obj.new_stationid = nData.stationid; // 鏈烘埧id
obj.new_battgroupid = nData.battgroupid; // 鐢垫睜缁刬d
- obj.new_monnum = nData.num; // 鍗曚綋缂栧彿
+ obj.new_monum = nData.num; // 鍗曚綋缂栧彿
// 鍏叡淇℃伅
obj.rebuild_time = nowTime;
--
Gitblit v1.9.1