T相显示为检测名称

This commit is contained in:
caozehui
2025-01-15 10:14:33 +08:00
parent 6369c8ee63
commit 3ea2c93e43
3 changed files with 17 additions and 15 deletions

View File

@@ -12,7 +12,7 @@
<el-table-column prop="dataC" :label="'C相'+(unit==''?'':''+unit+'')"/> <el-table-column prop="dataC" :label="'C相'+(unit==''?'':''+unit+'')"/>
</template> </template>
<template v-if="phaseT === 1"> <template v-if="phaseT === 1">
<el-table-column prop="dataT" :label="'T相'+(unit==''?'':''+unit+'')"/> <el-table-column prop="dataT" :label="currentScriptTypeName+(unit==''?'':''+unit+'')"/>
</template> </template>
</el-table> </el-table>
</div> </div>
@@ -27,6 +27,7 @@ import {exportRawData} from "@/api/check/test"
const {tableData} = defineProps<{ const {tableData} = defineProps<{
tableData: CheckData.RawDataItem[] tableData: CheckData.RawDataItem[]
currentScriptTypeName: string
}>() }>()
const unit = computed(() => { const unit = computed(() => {

View File

@@ -9,9 +9,9 @@
<!-- </template>--> <!-- </template>-->
<!-- </el-table-column>--> <!-- </el-table-column>-->
<template v-if="phaseT === 0"> <template v-if="phaseT === 0">
<el-table-column :label="'A相'+(unit==''?'':''+unit+'')"> <el-table-column label="A相">
<el-table-column prop="stdA" width="100" label="标准值"/> <el-table-column prop="stdA" width="110" :label="'标准值'+(unit==''?'':''+unit+'')"/>
<el-table-column prop="dataA" width="100" label="被检值"/> <el-table-column prop="dataA" width="110" :label="'被检值'+(unit==''?'':''+unit+'')"/>
<el-table-column prop="isDataA" label="检测结果"> <el-table-column prop="isDataA" label="检测结果">
<template #default="scope"> <template #default="scope">
<el-tooltip effect="dark" placement="bottom"> <el-tooltip effect="dark" placement="bottom">
@@ -26,9 +26,9 @@
</template> </template>
</el-table-column> </el-table-column>
</el-table-column> </el-table-column>
<el-table-column :label="'B相'+(unit==''?'':''+unit+'')"> <el-table-column label="B相">
<el-table-column prop="stdB" width="100" label="标准值"/> <el-table-column prop="stdB" width="110" :label="'标准值'+(unit==''?'':''+unit+'')"/>
<el-table-column prop="dataB" width="100" label="被检值"/> <el-table-column prop="dataB" width="110" :label="'被检值'+(unit==''?'':''+unit+'')"/>
<el-table-column prop="isDataB" label="检测结果"> <el-table-column prop="isDataB" label="检测结果">
<template #default="scope"> <template #default="scope">
<el-tooltip effect="dark" placement="bottom"> <el-tooltip effect="dark" placement="bottom">
@@ -43,9 +43,9 @@
</template> </template>
</el-table-column> </el-table-column>
</el-table-column> </el-table-column>
<el-table-column :label="'C相'+(unit==''?'':''+unit+'')"> <el-table-column label="C相">
<el-table-column prop="stdC" width="100" label="标准值"/> <el-table-column prop="stdC" width="110" :label="'标准值'+(unit==''?'':''+unit+'')"/>
<el-table-column prop="dataC" width="100" label="被检值"/> <el-table-column prop="dataC" width="110" :label="'被检值'+(unit==''?'':''+unit+'')"/>
<el-table-column prop="isDataC" label="检测结果"> <el-table-column prop="isDataC" label="检测结果">
<template #default="scope"> <template #default="scope">
<el-tooltip effect="dark" placement="bottom"> <el-tooltip effect="dark" placement="bottom">
@@ -63,9 +63,9 @@
</template> </template>
<template v-if="phaseT === 1"> <template v-if="phaseT === 1">
<el-table-column :label="'T相'+(unit==''?'':''+unit+'')"> <el-table-column :label="currentScriptTypeName">
<el-table-column prop="stdT" label="标准值"/> <el-table-column prop="stdT" :label="'标准值'+(unit==''?'':''+unit+'')"/>
<el-table-column prop="dataT" label="被检值"/> <el-table-column prop="dataT" :label="'被检值'+(unit==''?'':''+unit+'')"/>
<el-table-column prop="isDataT" label="检测结果"> <el-table-column prop="isDataT" label="检测结果">
<template #default="scope"> <template #default="scope">
<el-tooltip effect="dark" placement="bottom"> <el-tooltip effect="dark" placement="bottom">
@@ -101,6 +101,7 @@ import {CheckData} from "@/api/check/interface";
const {tableData} = defineProps<{ const {tableData} = defineProps<{
tableData: CheckData.CheckResult[], tableData: CheckData.CheckResult[],
currentScriptTypeName: string
}>(); }>();

View File

@@ -77,10 +77,10 @@
<div class="content-right-Tabs"> <div class="content-right-Tabs">
<el-tabs type="border-card" v-model="activeTab"> <el-tabs type="border-card" v-model="activeTab">
<el-tab-pane label="检测结果" name="resultTab"> <el-tab-pane label="检测结果" name="resultTab">
<DataCheckResultTable :tableData="checkResultData"/> <DataCheckResultTable :tableData="checkResultData" :currentScriptTypeName="currentScriptTypeName"/>
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="原始数据" name="rawDataTab"> <el-tab-pane label="原始数据" name="rawDataTab">
<DataCheckRawDataTable :tableData="rawTableData"/> <DataCheckRawDataTable :tableData="rawTableData" :currentScriptTypeName="currentScriptTypeName"/>
</el-tab-pane> </el-tab-pane>
</el-tabs> </el-tabs>
</div> </div>