fix:coding497、499
This commit is contained in:
		
							parent
							
								
									1dc5710f84
								
							
						
					
					
						commit
						12133a3b37
					
				|  | @ -610,6 +610,7 @@ export default { | ||||||
| 				that.$API.wf.ticket.create.req(ticket).then((res) => { | 				that.$API.wf.ticket.create.req(ticket).then((res) => { | ||||||
| 					that.isSaveing = false; | 					that.isSaveing = false; | ||||||
| 					that.ticketDialog = false; | 					that.ticketDialog = false; | ||||||
|  | 					that.visible = false; | ||||||
| 					that.$message.success("提交成功"); | 					that.$message.success("提交成功"); | ||||||
| 				}).catch((e) => { | 				}).catch((e) => { | ||||||
| 					that.isSaveing = false; | 					that.isSaveing = false; | ||||||
|  | @ -628,7 +629,10 @@ export default { | ||||||
| 			console.log('res',res); | 			console.log('res',res); | ||||||
| 			this.test_file = res.path; | 			this.test_file = res.path; | ||||||
| 		}, | 		}, | ||||||
| 		handleEditSuccess() {}, | 		//编辑成功后的方法调用 | ||||||
|  | 		handleEditSuccess() { | ||||||
|  | 			this.getMlogItem(); | ||||||
|  | 		}, | ||||||
| 		//设置过滤项 | 		//设置过滤项 | ||||||
| 		setFilters(filters) { | 		setFilters(filters) { | ||||||
| 			this.selectionFilters = filters; | 			this.selectionFilters = filters; | ||||||
|  |  | ||||||
|  | @ -72,6 +72,11 @@ | ||||||
| 					prop="handle_user_name" | 					prop="handle_user_name" | ||||||
| 					width="80" | 					width="80" | ||||||
| 				></el-table-column> | 				></el-table-column> | ||||||
|  | 				<el-table-column label="保温剩余时间" v-if="mgroupName=='黑化'||mgroupName=='退火'"> | ||||||
|  | 					<template #default="scope"> | ||||||
|  | 						{{ getRemaTime(scope.row) }} | ||||||
|  | 					</template> | ||||||
|  | 				</el-table-column> | ||||||
| 				<el-table-column | 				<el-table-column | ||||||
| 					label="开始时间" | 					label="开始时间" | ||||||
| 					prop="work_start_time" | 					prop="work_start_time" | ||||||
|  | @ -208,6 +213,29 @@ export default { | ||||||
| 			}); | 			}); | ||||||
| 	}, | 	}, | ||||||
| 	methods: { | 	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() { | 		detailClose() { | ||||||
| 			this.dialog.detail = false; | 			this.dialog.detail = false; | ||||||
| 			this.$refs.table.refresh(); | 			this.$refs.table.refresh(); | ||||||
|  |  | ||||||
		Loading…
	
		Reference in New Issue