Commit dc466b0f authored by 张伯涛's avatar 张伯涛

接口添加lineDate参数

parent adc586cf
<template> <template>
<div class="app-container-quaTest"> <div class="app-container-quaTest">
<div class="testSearch" style="margin-left: 10px"> <div class="testSearch" style="margin-left: 10px">
<el-form ref="queryForm" :model="queryParams" :inline="true"> <el-form ref="queryForm" :model="queryParams" :inline="true">
<el-form-item label="开工时间" prop="revisedStartDate"> <el-form-item label="开工时间" prop="revisedStartDate">
<div slot="label" class="labelClass"> <div slot="label" class="labelClass">
<div>开工时间</div> <div>开工时间</div>
...@@ -14,8 +14,8 @@ ...@@ -14,8 +14,8 @@
:editable="false" :editable="false"
:clearable="false" :clearable="false"
format="yyyy/MM/dd" format="yyyy/MM/dd"
value-format="yyyy/MM/dd"> value-format="yyyy/MM/dd"
</el-date-picker> />
</el-form-item> </el-form-item>
<el-form-item label="主板SN编号" prop="materSn"> <el-form-item label="主板SN编号" prop="materSn">
<div slot="label" class="labelClass"> <div slot="label" class="labelClass">
...@@ -64,7 +64,8 @@ ...@@ -64,7 +64,8 @@
> >
<el-table-column <el-table-column
type="index" type="index"
width="50"> width="50"
>
<template slot="header"> <template slot="header">
<div>序号</div> <div>序号</div>
<div>No.</div> <div>No.</div>
...@@ -91,7 +92,7 @@ ...@@ -91,7 +92,7 @@
<el-table-column :show-overflow-tooltip="true" align="center" prop="materCode"> <el-table-column :show-overflow-tooltip="true" align="center" prop="materCode">
<template slot="header"> <template slot="header">
<div>成品料号</div> <div>成品料号</div>
<!-- <div>Main SN</div>--> <!-- <div>Main SN</div>-->
</template> </template>
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.materCode || '-' }}</span> <span>{{ scope.row.materCode || '-' }}</span>
...@@ -130,7 +131,7 @@ ...@@ -130,7 +131,7 @@
@pagination="getTestData" @pagination="getTestData"
/> />
<el-dialog :close-on-click-modal="false" title="测试结果" class="testDialog" :visible.sync="open" width="80%" append-to-body> <el-dialog :close-on-click-modal="false" title="测试结果" class="testDialog" :visible.sync="open" width="80%" append-to-body>
<el-form v-loading="Loading1" ref="form" :model="form" size="small" label-width="120px" :inline="true"> <el-form ref="form" v-loading="Loading1" :model="form" size="small" label-width="120px" :inline="true">
<el-form-item class="labelHeight" label="主板SN编号" prop="materSn"> <el-form-item class="labelHeight" label="主板SN编号" prop="materSn">
<div slot="label" class="labelClass"> <div slot="label" class="labelClass">
<div class="labelName">主板SN编号</div> <div class="labelName">主板SN编号</div>
...@@ -154,7 +155,8 @@ ...@@ -154,7 +155,8 @@
> >
<el-table-column <el-table-column
type="index" type="index"
width="60"> width="60"
>
<template slot="header"> <template slot="header">
<div>排序</div> <div>排序</div>
<div>Sort</div> <div>Sort</div>
...@@ -163,7 +165,7 @@ ...@@ -163,7 +165,7 @@
<el-table-column :show-overflow-tooltip="true" align="center" prop="staName"> <el-table-column :show-overflow-tooltip="true" align="center" prop="staName">
<template slot="header"> <template slot="header">
<div>测试工站名称</div> <div>测试工站名称</div>
<!-- <div>Line Beach No.</div>--> <!-- <div>Line Beach No.</div>-->
</template> </template>
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.staName || '-' }}</span> <span>{{ scope.row.staName || '-' }}</span>
...@@ -201,7 +203,7 @@ ...@@ -201,7 +203,7 @@
<el-table-column label="测试参数" align="center" class-name="small-padding fixed-width"> <el-table-column label="测试参数" align="center" class-name="small-padding fixed-width">
<template slot="header"> <template slot="header">
<div>测试参数</div> <div>测试参数</div>
<!-- <div>Operate</div>--> <!-- <div>Operate</div>-->
</template> </template>
<template slot-scope="scope"> <template slot-scope="scope">
<el-link <el-link
...@@ -243,7 +245,8 @@ ...@@ -243,7 +245,8 @@
> >
<el-table-column <el-table-column
type="index" type="index"
width="60"> width="60"
>
<template slot="header"> <template slot="header">
<div>测试序号</div> <div>测试序号</div>
<div>Test Sort</div> <div>Test Sort</div>
...@@ -261,7 +264,7 @@ ...@@ -261,7 +264,7 @@
<el-table-column :show-overflow-tooltip="true" align="center" prop="value"> <el-table-column :show-overflow-tooltip="true" align="center" prop="value">
<template slot="header"> <template slot="header">
<div>结果</div> <div>结果</div>
<!-- <div>Test Time</div>--> <!-- <div>Test Time</div>-->
</template> </template>
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.value || '-' }}</span> <span>{{ scope.row.value || '-' }}</span>
...@@ -295,7 +298,7 @@ export default { ...@@ -295,7 +298,7 @@ export default {
Loading: true, Loading: true,
Loading2: true, Loading2: true,
Loading4: true, Loading4: true,
//对话框遮罩标志 // 对话框遮罩标志
Loading1: true, Loading1: true,
Loading3: true, Loading3: true,
// 测试表格数据 // 测试表格数据
...@@ -318,7 +321,7 @@ export default { ...@@ -318,7 +321,7 @@ export default {
page: 1, page: 1,
rows: 10, rows: 10,
materSn: undefined materSn: undefined
}, }
} }
}, },
/** 路由离开前存储筛选条件*/ /** 路由离开前存储筛选条件*/
...@@ -363,12 +366,13 @@ export default { ...@@ -363,12 +366,13 @@ export default {
this.Loading1 = true this.Loading1 = true
this.Loading2 = true this.Loading2 = true
this.open = true this.open = true
console.log(row,'row数据') console.log(row, 'row数据')
const temp = JSON.parse(JSON.stringify(row)) const temp = JSON.parse(JSON.stringify(row))
this.form = temp this.form = temp
console.log(temp,'temp数据') console.log(temp, 'temp数据')
this.detailForm.materSn = this.form.materSn this.detailForm.materSn = this.form.materSn
this.form1.materSn = this.form.materSn this.form1.materSn = this.form.materSn
this.detailForm.page = 1
this.getDetailTestData() this.getDetailTestData()
}, },
/** /**
...@@ -405,7 +409,7 @@ export default { ...@@ -405,7 +409,7 @@ export default {
/** /**
* 关闭对话框 * 关闭对话框
*/ */
cancel(){ cancel() {
this.open = false this.open = false
}, },
cancel1() { cancel1() {
...@@ -415,7 +419,7 @@ export default { ...@@ -415,7 +419,7 @@ export default {
* 获取测试结果详情数据 * 获取测试结果详情数据
*/ */
getTestResultDetail(row) { getTestResultDetail(row) {
listDetailQuaTestResult({businessId: row.testId}).then(response => { listDetailQuaTestResult({ businessId: row.testId, lineDate: row.lineDate }).then(response => {
console.log(response) console.log(response)
this.testResultDetailList = response.data this.testResultDetailList = response.data
this.Loading3 = false this.Loading3 = false
......
...@@ -763,7 +763,8 @@ export default { ...@@ -763,7 +763,8 @@ export default {
this.open.passDialog = true this.open.passDialog = true
this.dialogTitle = '测试参数结果' this.dialogTitle = '测试参数结果'
const params = { const params = {
businessId: row.testId businessId: row.testId,
lineDate: row.lineDate
} }
queryTestInfo(params).then(res => { queryTestInfo(params).then(res => {
this.testInfoTable = res.data this.testInfoTable = res.data
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment