|
|
|
|
@ -206,7 +206,43 @@ |
|
|
|
|
v-if="scope.row.item.specialType == 1" |
|
|
|
|
style="margin: 12px" |
|
|
|
|
> |
|
|
|
|
<el-table-column label="程式编号" prop="gaugeValue7" align="center"></el-table-column> |
|
|
|
|
<el-table-column width="57px"> |
|
|
|
|
<template #header> |
|
|
|
|
<div style="display: flex;align-items: center;"> |
|
|
|
|
<!-- <el-button |
|
|
|
|
circle |
|
|
|
|
type="primary" |
|
|
|
|
icon="el-icon-plus" |
|
|
|
|
@click="addSpecimen()" |
|
|
|
|
/> --> |
|
|
|
|
<!-- <div> --> |
|
|
|
|
<img src="@/assets/add.png" style="cursor:pointer;" alt="" @click="addSpecimen()"> |
|
|
|
|
|
|
|
|
|
<!-- </div> --> |
|
|
|
|
</div> |
|
|
|
|
|
|
|
|
|
</template> |
|
|
|
|
<template #default="subScope"> |
|
|
|
|
<el-button |
|
|
|
|
circle |
|
|
|
|
type="danger" |
|
|
|
|
icon="el-icon-delete" |
|
|
|
|
@click="removeSpecimen(subScope.$index, subScope.row)" |
|
|
|
|
/> |
|
|
|
|
</template> |
|
|
|
|
</el-table-column> |
|
|
|
|
<el-table-column label="程式编号" prop="gaugeValue7" align="center"> |
|
|
|
|
<template #header> |
|
|
|
|
<div style="display: flex;align-items: center;"> |
|
|
|
|
<img style="margin-right: 15px;cursor:pointer;" v-if="!isStart" @click="searchThinkData" src="@/assets/pause.png" alt=""> |
|
|
|
|
<img style="margin-right: 15px;cursor:pointer;" v-if="isStart" @click="searchThinkData" src="@/assets/play.png" alt=""> |
|
|
|
|
<span>程式编号</span> |
|
|
|
|
</div> |
|
|
|
|
</template> |
|
|
|
|
<template #default="subScope"> |
|
|
|
|
<el-input v-model="subScope.row.gaugeValue7" :disabled="scope.row.checkUserRealName != ''"></el-input> |
|
|
|
|
</template> |
|
|
|
|
</el-table-column> |
|
|
|
|
<el-table-column label="名称1" prop="gaugeValue1" align="center"> |
|
|
|
|
<template #default="subScope"> |
|
|
|
|
<el-input v-model="subScope.row.gaugeValue1" :disabled="scope.row.checkUserRealName != ''"></el-input> |
|
|
|
|
@ -288,9 +324,10 @@ |
|
|
|
|
> |
|
|
|
|
<template #default="scope"> |
|
|
|
|
<div v-if="scope.row.item.specialType == '1'"> |
|
|
|
|
<el-button @click="testMeasurementData(scope.row, scope.$index)" link type="primary" |
|
|
|
|
>{{!isStart ? '测厚数据' : '结束查询'}}</el-button |
|
|
|
|
> |
|
|
|
|
<el-button @click="testMeasurementData(scope.row, scope.$index)" link type="primary"> |
|
|
|
|
<!-- {{!isStart ? '测厚数据' : '结束查询'}} --> |
|
|
|
|
测厚数据 |
|
|
|
|
</el-button> |
|
|
|
|
</div> |
|
|
|
|
<div v-else-if="scope.row.item.specialType == '3'"> |
|
|
|
|
<el-button @click="testValue(scope.row, scope.$index)" link type="primary" |
|
|
|
|
@ -411,7 +448,7 @@ import sametankView from './components/sametankView.vue'; |
|
|
|
|
export default { |
|
|
|
|
components: { sametankView }, |
|
|
|
|
data() { |
|
|
|
|
return { |
|
|
|
|
return{ |
|
|
|
|
query: {}, |
|
|
|
|
openView: false, |
|
|
|
|
loading: false, |
|
|
|
|
@ -422,7 +459,7 @@ export default { |
|
|
|
|
secondInderval:null, |
|
|
|
|
form: {}, |
|
|
|
|
getDChyData:[], |
|
|
|
|
showDialog: false, |
|
|
|
|
showDialog: true, |
|
|
|
|
page: { |
|
|
|
|
pageSize: 10, |
|
|
|
|
currentPage: 1, |
|
|
|
|
@ -888,6 +925,15 @@ export default { |
|
|
|
|
|
|
|
|
|
}, |
|
|
|
|
methods: { |
|
|
|
|
addSpecimen(){ |
|
|
|
|
this.thicknessData.push({}) |
|
|
|
|
}, |
|
|
|
|
removeSpecimen(index,row){ |
|
|
|
|
this.thicknessData.splice(index,1) |
|
|
|
|
let arr = this.getDChyData.filter(item => JSON.stringify(item) === JSON.stringify(row)) |
|
|
|
|
console.log('arr=============',arr) |
|
|
|
|
this.getDChyData = arr |
|
|
|
|
}, |
|
|
|
|
handleCreate(){ |
|
|
|
|
createInspection({}).then(res => { |
|
|
|
|
if(res.data.code == 200){ |
|
|
|
|
@ -940,6 +986,16 @@ export default { |
|
|
|
|
this.thicknessData = row.wpItemDetailList |
|
|
|
|
return |
|
|
|
|
} |
|
|
|
|
}, |
|
|
|
|
searchThinkData(){ |
|
|
|
|
const itemDetail = { |
|
|
|
|
// tools: row.trialItem, |
|
|
|
|
// testType: '镀后测厚', |
|
|
|
|
// ruleSize: row.trialStandard, |
|
|
|
|
// prWorkPlanItem: { wpiId: row.wpiId }, |
|
|
|
|
gaugeValue7: null, |
|
|
|
|
gaugeValue8: null |
|
|
|
|
}; |
|
|
|
|
this.isStart = !this.isStart; |
|
|
|
|
if(this.isStart){ |
|
|
|
|
this.thicknessData = this.thicknessData.length > 0 ? this.thicknessData : [] |
|
|
|
|
@ -961,7 +1017,6 @@ export default { |
|
|
|
|
clearInterval(this.firstInterval) |
|
|
|
|
clearInterval(this.secondInderval) |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
}, |
|
|
|
|
getValue(value) { |
|
|
|
|
if (value == '/') { |
|
|
|
|
@ -999,23 +1054,24 @@ export default { |
|
|
|
|
// endTime:endTime, |
|
|
|
|
allData, |
|
|
|
|
// count:val |
|
|
|
|
}).then(res =>{ |
|
|
|
|
}).catch(res =>{ |
|
|
|
|
console.log('res111111111111',res) |
|
|
|
|
if (res.data.data != null) { |
|
|
|
|
const resultList = res.data.data; |
|
|
|
|
// if (res.data.data != null) { |
|
|
|
|
// const resultList = res.data.data; |
|
|
|
|
|
|
|
|
|
// const resultList = [{ |
|
|
|
|
// IP:"10.15.3.26", |
|
|
|
|
// devCode:"Ni/CuZn59", |
|
|
|
|
// devId:"LG020029", |
|
|
|
|
// fi1etime: "2025/11/21 16:38:32", |
|
|
|
|
// measurings: [ |
|
|
|
|
// {unit: "um", name: "Ni", value: "8.92142"}, |
|
|
|
|
// {unit: "/", name: "Cu", value: "/"}, |
|
|
|
|
// {unit: "/", name: "Cu", value: "/"} |
|
|
|
|
// ] |
|
|
|
|
// }] |
|
|
|
|
const resultList = [{ |
|
|
|
|
IP:"10.15.3.26", |
|
|
|
|
devCode:"Ni/CuZn59", |
|
|
|
|
devId:"LG020029", |
|
|
|
|
fi1etime: "2025/11/21 16:38:32", |
|
|
|
|
measurings: [ |
|
|
|
|
{unit: "um", name: "Ni", value: "8.92142"}, |
|
|
|
|
{unit: "/", name: "Cu", value: "/"}, |
|
|
|
|
{unit: "/", name: "Cu", value: "/"} |
|
|
|
|
] |
|
|
|
|
}] |
|
|
|
|
console.log('resultList--------------',resultList) |
|
|
|
|
console.log('getDChyData--------------',this.getDChyData) |
|
|
|
|
if (resultList.length > 0) { |
|
|
|
|
resultList.forEach((item) => { |
|
|
|
|
let isExist = false; |
|
|
|
|
@ -1083,7 +1139,7 @@ export default { |
|
|
|
|
} |
|
|
|
|
this.getDChyData = [...map.values()]; |
|
|
|
|
console.log('this.getDChyData',this.getDChyData) |
|
|
|
|
} |
|
|
|
|
// } |
|
|
|
|
}) |
|
|
|
|
}, |
|
|
|
|
testValue(row, index) { |
|
|
|
|
@ -1279,6 +1335,10 @@ export default { |
|
|
|
|
}) |
|
|
|
|
// },window.YINGDU_Trigger) |
|
|
|
|
} |
|
|
|
|
if(item.item.specialType == 1){ |
|
|
|
|
console.log('item------------------',item) |
|
|
|
|
this.thicknessData = item.wpItemDetailList |
|
|
|
|
} |
|
|
|
|
}) |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
jinna
4 weeks ago
