|
|
@@ -2,7 +2,7 @@ |
|
|
|
* @Author: zwq |
|
|
|
* @Date: 2023-08-01 14:55:51 |
|
|
|
* @LastEditors: DY |
|
|
|
* @LastEditTime: 2024-04-26 09:58:51 |
|
|
|
* @LastEditTime: 2024-04-28 16:10:20 |
|
|
|
* @Description: |
|
|
|
--> |
|
|
|
<template> |
|
|
@@ -47,7 +47,7 @@ |
|
|
|
</el-form> |
|
|
|
<!-- <base-table :max-height="tableH" :table-props="tableProps" :page="listQuery.pageNo" :limit="listQuery.pageSize" |
|
|
|
:table-data="list"> --> |
|
|
|
<base-table :max-height="tableH" :table-props="tableProps" |
|
|
|
<base-table :max-height="tableH" :table-props="tableProps" :page="1" :limit="100" |
|
|
|
:table-data="list"> |
|
|
|
<method-btn v-if="tableBtn.length" slot="handleBtn" :width="220" label="缺陷操作" :method-list="tableBtn" |
|
|
|
@clickBtn="handleClick" /> |
|
|
@@ -282,12 +282,31 @@ export default { |
|
|
|
handleClick(raw) { |
|
|
|
if (raw.type === 'detail1') { |
|
|
|
// 原片缺陷 |
|
|
|
// console.log('你好', raw.data._pageIndex) |
|
|
|
// const tempArray = this?.list[raw.data._pageIndex] |
|
|
|
// console.log('你好tempArray', tempArray) |
|
|
|
// let startTime = raw.data.originalGlassOutputTime |
|
|
|
// if (tempArray) { |
|
|
|
// startTime = tempArray.originalGlassOutputTime |
|
|
|
// } |
|
|
|
// console.log('你好', parseTime(raw.data.originalGlassOutputTime)) |
|
|
|
const startTime = new Date(raw.data.originalGlassOutputTime) |
|
|
|
const endTime = new Date(raw.data.originalGlassOutputTime) |
|
|
|
startTime.setHours(startTime.getHours() - 1) |
|
|
|
startTime.setMinutes(0) |
|
|
|
startTime.setSeconds(0) |
|
|
|
endTime.setHours(endTime.getHours() + 1) |
|
|
|
endTime.setMinutes(0) |
|
|
|
// endTime.setSeconds(0) |
|
|
|
// console.log('设置时间', startTime, parseTime(startTime)) |
|
|
|
// console.log('设置时间11', endTime, parseTime(endTime)) |
|
|
|
this.$router.push({ |
|
|
|
path: '/quality/base/quality-isra', |
|
|
|
query: { |
|
|
|
// deepProcessingLineId: raw.data.deepProcessingLineId, |
|
|
|
lineName: raw.data.deepProcessingLineName, |
|
|
|
originalGlassOutputTime: raw.data.originalGlassOutputTime |
|
|
|
endTime: endTime, |
|
|
|
startTime: startTime |
|
|
|
}, |
|
|
|
}); |
|
|
|
} else { |
|
|
@@ -328,7 +347,11 @@ export default { |
|
|
|
} else { |
|
|
|
if (this.useTime === true) { |
|
|
|
if (this.listQuery.packTime !== null && this.listQuery.packTime !== '' && this.listQuery.lineName !== null && this.listQuery.lineName !== '') { |
|
|
|
getOriginalGlassRetrace({ ...this.listQuery }).then(res => { |
|
|
|
|
|
|
|
getOriginalGlassRetrace({ |
|
|
|
lineNameList: [this.listQuery.lineName], |
|
|
|
...this.listQuery |
|
|
|
}).then(res => { |
|
|
|
console.log(res); |
|
|
|
this.list = res.data || [] |
|
|
|
console.log(this.list); |
|
|
|