From e35963c6c457a46c11309ddac7458481b586737e Mon Sep 17 00:00:00 2001
From: songshankun <songshankun@foxmail.com>
Date: 星期四, 26 十月 2023 11:51:31 +0800
Subject: [PATCH] feat: 工序运行时间取值调整
---
src/views/visualization.vue | 64 ++++++++++++++++++++++++--------
1 files changed, 48 insertions(+), 16 deletions(-)
diff --git a/src/views/visualization.vue b/src/views/visualization.vue
index 24b7b59..86e6442 100644
--- a/src/views/visualization.vue
+++ b/src/views/visualization.vue
@@ -53,7 +53,7 @@
>
<template v-if="taskData">
<div class="gong-date">
- 宸ュ簭杩愯鏃堕棿锛歿{ getFormatTime(taskData.Procedure.startTime) }}
+ 宸ュ簭杩愯鏃堕棿锛歿{ getTaskRunningTime(taskData.Procedure.realStartTime,taskData.Procedure.realEndTime) }}
</div>
<div class="statelist">
<span class="title-item"
@@ -902,7 +902,7 @@
}
}
this.resResult[i]=res;
- console.log( this.resResult[i],'===res111')
+ // console.log( this.resResult[i],'===res111')
})
}
}
@@ -1058,23 +1058,55 @@
let now = new Date();
this.formatTime2 = this.getDateObj(now, "yyyy骞碝M鏈坉d鏃�");
},
- getFormatTime(date){
- const getCha=()=>{
- let now=new Date().getTime()
- let String=now-date*1000;
- let seconds=Math.floor(String/1000)
- let minutes=Math.floor(seconds/60)
-
- let days=Math.floor(String/1000/60/60/24)
- let hours=Math.floor(minutes/60)-days*24
- let m=minutes-days*24*60-hours*60
- return days+'澶�'+hours+'鏃�'+m+'鍒�'
+ /**
+ * 璁＄畻鏃堕棿娈�, 娉ㄦ剰鍙傛暟瑕佹眰鏃堕棿鎴充负 JS Date 鐨�13浣嶆椂闂存埑
+ * @param {number} startTime
+ * @param {number} endTime
+ * @return {string}
+ */
+ calcRunningDuration(startTime,endTime){
+ let timeDuration=endTime-startTime;
+ if (timeDuration<0){
+ return '0澶�0鏃�0鍒�'
}
- let d= getCha()
+
+ let seconds=Math.floor(timeDuration/1000)
+ let minutes=Math.floor(seconds/60)
+
+ let days=Math.floor(timeDuration/1000/60/60/24)
+ let hours=Math.floor(minutes/60)-days*24
+ let m=minutes-days*24*60-hours*60
+ return `${days}澶�${hours}鏃�${m}鍒哷
+ },
+
+ /**
+ * 宸ュ簭杩愯鏃堕棿
+ * 鏍规嵁鎺ュ彛杩斿洖 realStartTime realEndTime 鍒ゆ柇濡備綍灞曠ず
+ * 濡傛灉 realEndTime 涓� 0 鍒� 鐢ㄥ綋鍓嶆椂闂� - realStartTime
+ * 濡傛灉 瀛樺湪 realEndTime, 鍒� realEndTime - realStartTime
+ * 娉ㄦ剰 realStartTime realEndTime 鏄帴鍙ｈ繑鍥炵殑10浣嶆椂闂存埑
+ * @param realStartTime
+ * @param realEndTime
+ * @return {string}
+ */
+ getTaskRunningTime(realStartTime,realEndTime){
+ const getInfo = ()=>{
+ if (!realStartTime && !realEndTime){
+ return '--'
+ }
+ if(!realEndTime){
+ const now = Math.floor(new Date().getTime()/1000) * 1000
+ return this.calcRunningDuration(realStartTime*1000,now)
+ }
+
+ return this.calcRunningDuration(realStartTime*1000,realEndTime*1000)
+ }
+
+ let result = getInfo()
setInterval(() => {
- d= getCha();
+ result = getInfo();
}, 6000);
- return date?d:'--';
+ return result;
},
setInterCard(value, name, i) {
if (this.TasksCopy[i].Procedure.procedure[value]!=null) {
--
Gitblit v1.8.0