kyfx
/
LuckyFrameWeb
mirror of https://gitee.com/seagull1985/LuckyFrameWeb.git
5
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

优化任务执行界面在14寸屏下头部展示不全的问题

This commit is contained in:
seagull 2019-06-14 11:53:09 +08:00
parent b5be250ed4
commit 1482cbc758
3 changed files with 1354 additions and 1359 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2690
mysqldb/initialization(create table)/V3.0 初始化.sql
View File

File diff suppressed because it is too large Load Diff

2
src/main/java/com/luckyframe/project/api/OpenPostApiController.java
View File

@ -205,7 +205,7 @@ public class OpenPostApiController
taskExecute.setTaskStatus(taskStatus); taskExecute.setTaskStatus(taskStatus);
taskExecute.setUpdateTime(new Date()); taskExecute.setUpdateTime(new Date());
/*状态完成时,更新结束时间*/ /*状态完成时,更新结束时间*/
if(taskStatus==2){ if(taskStatus==2||taskStatus==3){
taskExecute.setFinishTime(new Date()); taskExecute.setFinishTime(new Date());
} }
taskExecuteService.updateTaskExecute(taskExecute); taskExecuteService.updateTaskExecute(taskExecute);

21
src/main/resources/templates/testexecution/taskExecute/taskExecute.html
View File

@ -108,7 +108,7 @@
{ {
field : 'project.projectName', field : 'project.projectName',
title : '项目名称', title : '项目名称',
width : '10%', width : '9%',
class : 'myTDLengthHidden' class : 'myTDLengthHidden'
}, },
{ {
@ -154,7 +154,7 @@
}else if(value==2){ }else if(value==2){
return "执行完成"; return "执行完成";
}else if(value==3){ }else if(value==3){
return "执行失败"; return "任务超时中断";
}else if(value==4){ }else if(value==4){
return "唤起客户端失败"; return "唤起客户端失败";
}else{ }else{
@ -164,15 +164,13 @@
}, },
{ {
field : 'caseTotalCount', field : 'caseTotalCount',
title : '总用例数', title : '总共',
width : '5%', width : '5%',
class : 'myTDLengthHidden'
}, },
{ {
field : 'caseSuccCount', field : 'caseSuccCount',
title : '成功数', title : '成功',
width : '5%', width : '5%',
class : 'myTDLengthHidden',
formatter : function(value, formatter : function(value,
row, index) { row, index) {
return '<a id="casesucc'+row.taskId+'" style="color:#00bf5f" onclick="caseExcuteDetail('+row.taskId+',0'+')">' + value + '</a> '; return '<a id="casesucc'+row.taskId+'" style="color:#00bf5f" onclick="caseExcuteDetail('+row.taskId+',0'+')">' + value + '</a> ';
@ -180,9 +178,8 @@
}, },
{ {
field : 'caseFailCount', field : 'caseFailCount',
title : '失败数', title : '失败',
width : '5%', width : '5%',
class : 'myTDLengthHidden',
formatter : function(value, formatter : function(value,
row, index) { row, index) {
return '<a id="casefail'+row.taskId+'" style="color:#ff0000" onclick="caseExcuteDetail('+row.taskId+',1'+')">' + value + '</a> '; return '<a id="casefail'+row.taskId+'" style="color:#ff0000" onclick="caseExcuteDetail('+row.taskId+',1'+')">' + value + '</a> ';
@ -190,9 +187,8 @@
}, },
{ {
field : 'caseLockCount', field : 'caseLockCount',
title : '锁定数', title : '锁定',
width : '5%', width : '5%',
class : 'myTDLengthHidden',
formatter : function(value, formatter : function(value,
row, index) { row, index) {
return '<a id="caselock'+row.taskId+'" style="color:#FF7F00" onclick="caseExcuteDetail('+row.taskId+',2'+')">' + value + '</a> '; return '<a id="caselock'+row.taskId+'" style="color:#FF7F00" onclick="caseExcuteDetail('+row.taskId+',2'+')">' + value + '</a> ';
@ -201,8 +197,7 @@
{ {
field : 'caseNoexecCount', field : 'caseNoexecCount',
title : '执行中', title : '执行中',
width : '5%', width : '6%',
class : 'myTDLengthHidden',
formatter : function(value, formatter : function(value,
row, index) { row, index) {
return '<a id="casenoexec'+row.taskId+'" style="color:#6A5ACD" onclick="caseExcuteDetail('+row.taskId+',3'+')">' + value + '</a> '; return '<a id="casenoexec'+row.taskId+'" style="color:#6A5ACD" onclick="caseExcuteDetail('+row.taskId+',3'+')">' + value + '</a> ';
@ -252,7 +247,7 @@
document.getElementById("finishtime"+taskId).innerText = $.common.formatTime(result.finishTime); document.getElementById("finishtime"+taskId).innerText = $.common.formatTime(result.finishTime);
clearTimeout(t); clearTimeout(t);
}else if(result.taskStatus==3){ }else if(result.taskStatus==3){
document.getElementById("progressFont"+taskId).innerText = "执行失败"; document.getElementById("progressFont"+taskId).innerText = "任务超时中断";
document.getElementById("finishtime"+taskId).innerText = $.common.formatTime(result.finishTime); document.getElementById("finishtime"+taskId).innerText = $.common.formatTime(result.finishTime);
clearTimeout(t); clearTimeout(t);
}else if(result.taskStatus==4){ }else if(result.taskStatus==4){