Merge branch 'master' into yn
This commit is contained in:
@@ -15,7 +15,7 @@
|
|||||||
<el-table-column :label="labelA" v-if="phaseA === 1">
|
<el-table-column :label="labelA" v-if="phaseA === 1">
|
||||||
<el-table-column prop="stdA" :label="'标准值' + (outerUnit == '' ? '' : '(' + outerUnit + ')')" />
|
<el-table-column prop="stdA" :label="'标准值' + (outerUnit == '' ? '' : '(' + outerUnit + ')')" />
|
||||||
<el-table-column prop="dataA" :label="'被检值' + (outerUnit == '' ? '' : '(' + outerUnit + ')')" />
|
<el-table-column prop="dataA" :label="'被检值' + (outerUnit == '' ? '' : '(' + outerUnit + ')')" />
|
||||||
<el-table-column prop="isDataA" label="检测结果">
|
<el-table-column prop="isDataA" label="检测结果" width="90px">
|
||||||
<template #default="scope">
|
<template #default="scope">
|
||||||
<template v-if="scope.row.isDataA === 4 || scope.row.isDataA === 5">
|
<template v-if="scope.row.isDataA === 4 || scope.row.isDataA === 5">
|
||||||
<el-tag type="warning" v-if="scope.row.isDataA === 4">/</el-tag>
|
<el-tag type="warning" v-if="scope.row.isDataA === 4">/</el-tag>
|
||||||
@@ -36,7 +36,7 @@
|
|||||||
<el-table-column :label="labelB" v-if="phaseB === 1">
|
<el-table-column :label="labelB" v-if="phaseB === 1">
|
||||||
<el-table-column prop="stdB" :label="'标准值' + (outerUnit == '' ? '' : '(' + outerUnit + ')')" />
|
<el-table-column prop="stdB" :label="'标准值' + (outerUnit == '' ? '' : '(' + outerUnit + ')')" />
|
||||||
<el-table-column prop="dataB" :label="'被检值' + (outerUnit == '' ? '' : '(' + outerUnit + ')')" />
|
<el-table-column prop="dataB" :label="'被检值' + (outerUnit == '' ? '' : '(' + outerUnit + ')')" />
|
||||||
<el-table-column prop="isDataB" label="检测结果">
|
<el-table-column prop="isDataB" label="检测结果" width="90px">
|
||||||
<template #default="scope">
|
<template #default="scope">
|
||||||
<template v-if="scope.row.isDataB === 4 || scope.row.isDataB === 5">
|
<template v-if="scope.row.isDataB === 4 || scope.row.isDataB === 5">
|
||||||
<el-tag type="warning" v-if="scope.row.isDataB === 4">/</el-tag>
|
<el-tag type="warning" v-if="scope.row.isDataB === 4">/</el-tag>
|
||||||
@@ -58,7 +58,7 @@
|
|||||||
<el-table-column :label="labelC" v-if="phaseC === 1">
|
<el-table-column :label="labelC" v-if="phaseC === 1">
|
||||||
<el-table-column prop="stdC" :label="'标准值' + (outerUnit == '' ? '' : '(' + outerUnit + ')')" />
|
<el-table-column prop="stdC" :label="'标准值' + (outerUnit == '' ? '' : '(' + outerUnit + ')')" />
|
||||||
<el-table-column prop="dataC" :label="'被检值' + (outerUnit == '' ? '' : '(' + outerUnit + ')')" />
|
<el-table-column prop="dataC" :label="'被检值' + (outerUnit == '' ? '' : '(' + outerUnit + ')')" />
|
||||||
<el-table-column prop="isDataC" label="检测结果">
|
<el-table-column prop="isDataC" label="检测结果" width="90px">
|
||||||
<template #default="scope">
|
<template #default="scope">
|
||||||
<template v-if="scope.row.isDataC === 4 || scope.row.isDataC === 5">
|
<template v-if="scope.row.isDataC === 4 || scope.row.isDataC === 5">
|
||||||
<el-tag type="warning" v-if="scope.row.isDataC === 4">/</el-tag>
|
<el-tag type="warning" v-if="scope.row.isDataC === 4">/</el-tag>
|
||||||
|
|||||||
Reference in New Issue
Block a user