任务超时变红色

myproject/src/main/webapp/WEB-INF/pages/storage/allBoxView.jsp

@@ -631,7 +631,6 @@
 
                         var status = data[item].status.toLowerCase();
                         options['status'] = status;
-                        options['showClass'] = 'label-'+status;
                         options['taskId'] = taskId;
                         options['barcode'] = barcode;
                         options['num'] = data[item].num;
@@ -645,10 +644,10 @@
                         }
 
 
-
                         var statusMsg ="";
 
                         var operate = '';
+                        var showClass = 'label-'+status;
 
 
                         if(data[item].cancel){
@@ -658,6 +657,14 @@
 
                             options['onClose']= cancelTask;
                             operate = '<a class="btn btn-xs default" href="#" onclick=cancelTask('+data[item].id+');><i class="fa fa-trash-o"></i> ${cancelTask_label} </a>';
+                            //执行超过1分钟还未完成,变红
+                            var startDate = new Date(data[item].updateDate);
+                            var now = new Date();
+                            var minutes = (now.getTime() - startDate.getTime())/(1000*60) ;   //时间差的分钟数
+                            if(minutes > 2){
+                                //超过1分钟变红
+                                showClass="label-pause";
+                            }
                         }else if(data[item].finished){
                             statusMsg ="[${taskFinished_label}]";
                         }else if(data[item].wait){
@@ -667,6 +674,8 @@
                             operate = '<a class="btn btn-xs default" href="#" onclick=cancelTask('+data[item].id+');><i class="fa fa-trash-o"></i> ${cancelTask_label} </a>';
                         }
 
+                        options['showClass'] = showClass;
+
                         var sourceStr = "";
                         if(data[item].sourceName){
                             sourceStr = "<br/>${source_label} " + data[item].sourceStr;
@@ -677,7 +686,7 @@
                         if(!task){
                             cidTasks[taskId] = Lobibox.notify('success', options);
                         }else{
-                            if(status != task.$options["status"]){
+                            if(showClass != task.$options["showClass"]){
                                 task.remove();
                                 delete cidTasks[taskId];
                                 cidTasks[taskId] = Lobibox.notify('success', options);

myproject/src/main/webapp/WEB-INF/pages/storage/boxView.jsp

@@ -391,13 +391,12 @@
 
                         var status = data[item].status.toLowerCase();
                         options['status'] = status;
-                        options['showClass'] = 'label-'+status;
                         options['taskId'] = taskId;
 
                         var statusMsg ="";
 
                         var operate = '';
-
+                        var showClass = 'label-'+status;
 
                         if(data[item].cancel){
                             statusMsg ="[${taskCancel_label}]";
@@ -406,6 +405,14 @@
 
                             options['onClose']= cancelTask;
                             operate = '<a class="btn btn-xs default" href="#" onclick=cancelTask('+data[item].id+');><i class="fa fa-trash-o"></i> ${cancelTask_label} </a>';
+                            //执行超过1分钟还未完成,变红
+                            var startDate = new Date(data[item].updateDate);
+                            var now = new Date();
+                            var minutes = (now.getTime() - startDate.getTime())/(1000*60) ;   //时间差的分钟数
+                            if(minutes > 2){
+                                //超过1分钟变红
+                                showClass="label-pause";
+                            }
                         }else if(data[item].finished){
                             statusMsg ="[${taskFinished_label}]";
                         }else if(data[item].wait){
@@ -416,13 +423,14 @@
                         }
 
                         options['msg']= showStr + statusMsg;
+                        options['showClass'] = showClass;
 
                         var task = tasks[taskId];
                         if(!task){
                             var task =Lobibox.notify('success', options);
                             tasks[taskId] = task;
                         }else{
-                            if(status != task.$options["status"]){
+                            if(showClass != task.$options["showClass"]){
                                 task.remove();
                                 delete task;
                                 var task =Lobibox.notify('success', options);