日志

src/views/monitor/job/log.vue

@@ -145,13 +145,6 @@
         align="center"
         prop="nickName"
       />
- <el-table-column
-        label="任务员工编号"
-        width="80"
-        align="center"
-        prop="enpno"
-      />
-
       <el-table-column
         label="任务大类"
         width="80"
@@ -396,17 +389,35 @@ export default {
             const { executionTime, createTime, duration } = item;
 
             const durations=`${duration}h`;
+            let tqaaaa  = null;
 
-            const tqaaaa = (
+
+            if(executionTime != null){
+              tqaaaa = (
+                parseInt (
+                  new Date(executionTime).getTime() - new Date(createTime).getTime()
+                ) /
+                1000 /
+                60 /
+                60
+              ).toFixed(2);
+            }
+            
+
+            /** 用于计算超时时长 */
+             const calculateTime = (
               parseInt (
-                new Date(executionTime).getTime() - new Date(createTime).getTime()
+                new Date(executionTime == null ? Date(): executionTime).getTime() - new Date(createTime).getTime()
               ) /
               1000 /
               60 /
               60
-            ).toFixed(2)+'h';
-            const tqbbbb =
-              tqaaaa - duration > 0 ? `超时${tqaaaa - duration}h` : `未超时`;
+            ).toFixed(2);
+
+            /** 计算超时时长 */
+            const timestemp = (calculateTime - duration).toFixed(2)  ;
+
+            const tqbbbb = timestemp > 0 ? `超时 ${timestemp}h` : `未超时`;
 
             return {
               ...item,