From 2fe250ece8de95b3f70172fe5b45793ab6a3084a Mon Sep 17 00:00:00 2001
From: D:/workspace/chenjingjing/git/gx_tieta/gx_tieta/.gitignore <chenjingjing@LAPTOP-E51P2139>
Date: 星期五, 18 一月 2019 17:30:50 +0800
Subject: [PATCH] 未审批可更改
---
gx_tieta/WebRoot/progress-control.jsp | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/gx_tieta/WebRoot/progress-control.jsp b/gx_tieta/WebRoot/progress-control.jsp
index 6fe2ac3..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); //杩愯鏃堕棿
@@ -394,7 +394,8 @@
// 鍒ゆ柇閲嶅惎鐨勭被鍨�
function checkRestartType(temp) {
//var _restart = '<img src="image/restart.gif" title="閲嶅惎绾跨▼" class="restart"/>';
- var _restart = '<img src="image/restart.gif" title="<s:text name='Restart'/><s:text name='Thread'/>" class="restart"/>';
+ var text = "<s:text name='Restart'/><s:text name='Thread'/>";
+ var _restart = '<img src="image/restart.gif" title="'+text+'" class="restart"/>';
if(temp.ServerFlag == 2) {
_restart = '';
--
Gitblit v1.9.1