From de072c451bdf8b49efea074e86d129e043e9df6b Mon Sep 17 00:00:00 2001
From: 81041 <81041@DESKTOP-025NVD9>
Date: 星期二, 08 一月 2019 08:50:23 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/WebRoot/bat-set-test.jsp | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/gx_tieta/WebRoot/bat-set-test.jsp b/gx_tieta/WebRoot/bat-set-test.jsp
index c633f5f..9768896 100644
--- a/gx_tieta/WebRoot/bat-set-test.jsp
+++ b/gx_tieta/WebRoot/bat-set-test.jsp
@@ -707,15 +707,15 @@
// 澶勭悊娣诲姞鏈烘埧淇℃伅鐨勭粨鏋�
function formatSearchData(data) {
+ console.log(data);
var rs = [];
// 閬嶅巻data鐨�
for(var i=0; i<data.length; i++) {
var _data = data[i];
- if(!_data.obj) {
- continue;
- }
+
var obj = _data.obj[0];
var tmp = {};
+ tmp.num = _data.num; // 鍒ゆ柇鏄惁璇诲彇鎴愬姛
tmp.key_id = i;
tmp.dev_id = obj.dev_id; // 璁惧ID
tmp.dev_ip = obj.dev_ip; // 璁惧IP
--
Gitblit v1.9.1