Commit 6c293162 authored by zhkwei's avatar zhkwei

1、数据处理页面状态显示修改

parent 4ab5fa76
...@@ -578,7 +578,6 @@ debugger; ...@@ -578,7 +578,6 @@ debugger;
var tasks = JSON.parse(job.status); var tasks = JSON.parse(job.status);
if (job.jobStatus == 'End') { if (job.jobStatus == 'End') {
items.forEach(function (item, index) { items.forEach(function (item, index) {
item.status = 'completed'; item.status = 'completed';
...@@ -632,10 +631,11 @@ debugger; ...@@ -632,10 +631,11 @@ debugger;
items.forEach(function (item, index) { items.forEach(function (item, index) {
item.items.forEach(function (_task, index) { item.items.forEach(function (_task, index) {
var temp = false;
tasks.forEach(function (task) { tasks.forEach(function (task) {
if (task.code == _task.code) { if (task.code == _task.code) {
temp = true;
if (task.status == 'Error') { if (task.status == 'Error') {
_task.status = 'error'; _task.status = 'error';
} else if (task.status == 'End') { } else if (task.status == 'End') {
...@@ -645,7 +645,12 @@ debugger; ...@@ -645,7 +645,12 @@ debugger;
} }
_task.text = $translate.instant(_task.status); _task.text = $translate.instant(_task.status);
} }
}) });
//此时证明该code还未开始
if(!temp){
_task.status = 'unstarted';
_task.text = $translate.instant(_task.status);
}
}) })
}); });
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment