diff --git a/Bench4Q-Master/src/main/java/org/bench4q/master/api/ScriptController.java b/Bench4Q-Master/src/main/java/org/bench4q/master/api/ScriptController.java index 871058f1..d96b4499 100644 --- a/Bench4Q-Master/src/main/java/org/bench4q/master/api/ScriptController.java +++ b/Bench4Q-Master/src/main/java/org/bench4q/master/api/ScriptController.java @@ -368,7 +368,7 @@ public class ScriptController extends BaseController { OperateScriptServerResponseModel responseModel = new OperateScriptServerResponseModel(); responseModel.setSuccess(isSuccess); responseModel.setFailCauseString(failCauseString); - responseModel.setHostName(hostName); + responseModel.setHostNameString(hostName); responseModel.setPort(port); responseModel.setFileName(fileName); if (scriptModels == null || scriptModels.size() == 0) { diff --git a/Bench4Q-Share/src/main/java/org/bench4q/share/models/master/OperateScriptServerResponseModel.java b/Bench4Q-Share/src/main/java/org/bench4q/share/models/master/OperateScriptServerResponseModel.java index d151d486..c740bcdf 100644 --- a/Bench4Q-Share/src/main/java/org/bench4q/share/models/master/OperateScriptServerResponseModel.java +++ b/Bench4Q-Share/src/main/java/org/bench4q/share/models/master/OperateScriptServerResponseModel.java @@ -37,16 +37,7 @@ public class OperateScriptServerResponseModel { public void setFailCauseString(String failCauseString) { this.failCauseString = failCauseString; } - - @XmlElement - public String getHostNameString() { - return hostNameString; - } - - public void setHostName(String hostNameString) { - this.hostNameString = hostNameString; - } - + @XmlElement public int getPort() { return port; @@ -65,6 +56,15 @@ public class OperateScriptServerResponseModel { this.fileName = fileName; } + @XmlElement + public String getHostNameString() { + return hostNameString; + } + + public void setHostNameString(String hostNameString) { + this.hostNameString = hostNameString; + } + @XmlElement public List getScriptModels() { return scriptModels; diff --git a/Bench4Q-Web/src/main/webapp/createScript.jsp b/Bench4Q-Web/src/main/webapp/createScript.jsp index 996d5298..13d69a4f 100644 --- a/Bench4Q-Web/src/main/webapp/createScript.jsp +++ b/Bench4Q-Web/src/main/webapp/createScript.jsp @@ -226,11 +226,11 @@ body { - + diff --git a/Bench4Q-Web/src/main/webapp/css/test.css b/Bench4Q-Web/src/main/webapp/css/test.css index 4e34e13d..ae60ebbf 100644 --- a/Bench4Q-Web/src/main/webapp/css/test.css +++ b/Bench4Q-Web/src/main/webapp/css/test.css @@ -91,13 +91,15 @@ select{ border:red 2px solid; } .load-config-input{ - width:100px; + width:150px; } .load-config-input-alert{ width:100px; - border:red 2px solid; } +#loadConfig td{ + padding-left:50px; +} .allocation-input{ width:100px; } @@ -112,3 +114,6 @@ select{ width:150px; border:red 2px solid; } +#addStep{ + margin-left:50px; +} \ No newline at end of file diff --git a/Bench4Q-Web/src/main/webapp/script.jsp b/Bench4Q-Web/src/main/webapp/script.jsp index 79ce3003..8ded5155 100644 --- a/Bench4Q-Web/src/main/webapp/script.jsp +++ b/Bench4Q-Web/src/main/webapp/script.jsp @@ -145,7 +145,7 @@ body {