From 12133a3b37dfd2ab0be1ee6e23d1d92a56c5276f Mon Sep 17 00:00:00 2001
From: shijing <sj_mzw@163.com>
Date: Tue, 8 Oct 2024 13:52:50 +0800
Subject: [PATCH] =?UTF-8?q?fix:coding497=E3=80=81499?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/wpm_gx/mlog_detail.vue |  6 +++++-
 src/views/wpm_gx/mlogs.vue       | 28 ++++++++++++++++++++++++++++
 2 files changed, 33 insertions(+), 1 deletion(-)

diff --git a/src/views/wpm_gx/mlog_detail.vue b/src/views/wpm_gx/mlog_detail.vue
index 6181d17a..2b9ea28e 100644
--- a/src/views/wpm_gx/mlog_detail.vue
+++ b/src/views/wpm_gx/mlog_detail.vue
@@ -610,6 +610,7 @@ export default {
 				that.$API.wf.ticket.create.req(ticket).then((res) => {
 					that.isSaveing = false;
 					that.ticketDialog = false;
+					that.visible = false;
 					that.$message.success("提交成功");
 				}).catch((e) => {
 					that.isSaveing = false;
@@ -628,7 +629,10 @@ export default {
 			console.log('res',res);
 			this.test_file = res.path;
 		},
-		handleEditSuccess() {},
+		//编辑成功后的方法调用
+		handleEditSuccess() {
+			this.getMlogItem();
+		},
 		//设置过滤项
 		setFilters(filters) {
 			this.selectionFilters = filters;
diff --git a/src/views/wpm_gx/mlogs.vue b/src/views/wpm_gx/mlogs.vue
index 0605857b..45369b92 100644
--- a/src/views/wpm_gx/mlogs.vue
+++ b/src/views/wpm_gx/mlogs.vue
@@ -72,6 +72,11 @@
 					prop="handle_user_name"
 					width="80"
 				></el-table-column>
+				<el-table-column label="保温剩余时间" v-if="mgroupName=='黑化'||mgroupName=='退火'">
+					<template #default="scope">
+						{{ getRemaTime(scope.row) }}
+					</template>
+				</el-table-column>
 				<el-table-column
 					label="开始时间"
 					prop="work_start_time"
@@ -208,6 +213,29 @@ export default {
 			});
 	},
 	methods: {
+		getRemaTime(row){
+			if(row.work_start_time !== null){
+				let times = 0;
+			    let nowTime = new Date().getTime();
+				let startTiem = new Date(row.work_start_time).getTime();
+				console.log('nowTime',nowTime)
+				console.log('startTiem',startTiem)
+				let remaTime = nowTime - startTiem;
+				console.log('remaTime',remaTime)
+				let temp = Math.floor(remaTime/1000*60);
+				console.log('temp',temp)
+				if(remaTime>0&&row.reminder_interval_list[0]){
+					if(temp<row.reminder_interval_list[0]){
+						times = row.reminder_interval_list[0]-temp;
+					}else{
+						return '/';
+					}
+					return times
+				}else{
+					return '/';
+				}
+			}
+		},
 		detailClose() {
 			this.dialog.detail = false;
 			this.$refs.table.refresh();