From 7f953d9aa0e7d4fcbe3c366c7f9f0b3f847f12bd Mon Sep 17 00:00:00 2001
From: hdw <hdw@192.168.137.1>
Date: 星期六, 19 一月 2019 09:16:08 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/WebRoot/progress-control.jsp | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/gx_tieta/WebRoot/progress-control.jsp b/gx_tieta/WebRoot/progress-control.jsp
index 6e62bd8..41c0404 100644
--- a/gx_tieta/WebRoot/progress-control.jsp
+++ b/gx_tieta/WebRoot/progress-control.jsp
@@ -261,12 +261,12 @@
data = eval('('+data+')');
var model = eval('('+data.result+')');
allstate = model.data;
- //console.info(model);
+ console.info(model);
if(model.code ==1){
for(var i=0;i<model.data.length;i++){
arrTd.push(i+1); //缂栧彿
arrTd.push(model.data[i].ProcessId); // 绾跨▼ID
- arrTd.push(model.data[i].note); //绾跨▼鍚嶇О
+ arrTd.push(model.data[i].ProcessName_CN); //绾跨▼鍚嶇О
arrTd.push(model.data[i].ProcessVersion); //鏈嶅姟鐗堟湰鍙�
arrTd.push(model.data[i].ServerName); //鏈嶅姟鍚嶇О
arrTd.push(model.data[i].ProcessTime); //杩愯鏃堕棿
--
Gitblit v1.9.1