From 6699f159bf34b079e7b67f4712f7ed610c1e5411 Mon Sep 17 00:00:00 2001
From: 81041 <81041@DESKTOP-025NVD9>
Date: 星期二, 25 十二月 2018 14:26:57 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whyclxw1@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/WebRoot/progress-control.jsp | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/gx_tieta/WebRoot/progress-control.jsp b/gx_tieta/WebRoot/progress-control.jsp
index 6fe2ac3..6e62bd8 100644
--- a/gx_tieta/WebRoot/progress-control.jsp
+++ b/gx_tieta/WebRoot/progress-control.jsp
@@ -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