展示单位调整
This commit is contained in:
@@ -1,5 +1,5 @@
|
||||
<template>
|
||||
<el-button type="primary" @click="exportData" style="margin-bottom: 10px">导出</el-button>
|
||||
<el-button v-if="tableData.length > 0" type="primary" @click="exportData" style="margin-bottom: 10px">导出</el-button>
|
||||
<div class="table-main">
|
||||
<el-table v-if="tableData.length > 0" :data="tableData" stripe border :header-cell-style="{ textAlign: 'center' } "
|
||||
:cell-style="{ textAlign: 'center' }" height="315px"
|
||||
@@ -7,12 +7,12 @@
|
||||
<el-table-column type="index" label="序号" width="70" fixed="left"/>
|
||||
<el-table-column prop="time" label="数据时间"/>
|
||||
<template v-if="phaseT === 0">
|
||||
<el-table-column prop="dataA" :label="`A(${unit})`"/>
|
||||
<el-table-column prop="dataB" :label="`B(${unit})`"/>
|
||||
<el-table-column prop="dataC" :label="`C(${unit})`"/>
|
||||
<el-table-column prop="dataA" :label="'A'+(unit==''?'':'('+unit+')')"/>
|
||||
<el-table-column prop="dataB" :label="'B'+(unit==''?'':'('+unit+')')"/>
|
||||
<el-table-column prop="dataC" :label="'C'+(unit==''?'':'('+unit+')')"/>
|
||||
</template>
|
||||
<template v-if="phaseT === 1">
|
||||
<el-table-column prop="dataT" :label="`T(${unit})`"/>
|
||||
<el-table-column prop="dataT" :label="'T'+(unit==''?'':'('+unit+')')"/>
|
||||
</template>
|
||||
</el-table>
|
||||
</div>
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
<!-- </template>-->
|
||||
<!-- </el-table-column>-->
|
||||
<template v-if="phaseT === 0">
|
||||
<el-table-column :label="`A(${unit})`">
|
||||
<el-table-column :label="'A'+(unit==''?'':'('+unit+')')">
|
||||
<el-table-column prop="stdA" width="100" label="标准值"/>
|
||||
<el-table-column prop="dataA" width="100" label="被检值"/>
|
||||
<el-table-column prop="isDataA" label="检测结果">
|
||||
@@ -26,7 +26,7 @@
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table-column>
|
||||
<el-table-column :label="`B(${unit})`">
|
||||
<el-table-column :label="'B'+(unit==''?'':'('+unit+')')">
|
||||
<el-table-column prop="stdB" width="100" label="标准值"/>
|
||||
<el-table-column prop="dataB" width="100" label="被检值"/>
|
||||
<el-table-column prop="isDataB" label="检测结果">
|
||||
@@ -43,7 +43,7 @@
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table-column>
|
||||
<el-table-column :label="`C(${unit})`">
|
||||
<el-table-column :label="'C'+(unit==''?'':'('+unit+')')">
|
||||
<el-table-column prop="stdC" width="100" label="标准值"/>
|
||||
<el-table-column prop="dataC" width="100" label="被检值"/>
|
||||
<el-table-column prop="isDataC" label="检测结果">
|
||||
@@ -63,7 +63,7 @@
|
||||
</template>
|
||||
|
||||
<template v-if="phaseT === 1">
|
||||
<el-table-column :label="`T(${unit})`">
|
||||
<el-table-column :label="'T'+(unit==''?'':'('+unit+')')">
|
||||
<el-table-column prop="stdT" label="标准值"/>
|
||||
<el-table-column prop="dataT" label="被检值"/>
|
||||
<el-table-column prop="isDataT" label="检测结果">
|
||||
|
||||
@@ -267,7 +267,7 @@ const defaultOperate = () => {
|
||||
defaultExpandedKeys = [node.index]
|
||||
|
||||
treeRef.value?.setCurrentKey(node.index);
|
||||
scriptType = node.scriptType
|
||||
scriptType = node.scriptType ?? scriptType
|
||||
} else {
|
||||
currentScriptTypeName.value = ''
|
||||
currentDesc.value = ''
|
||||
@@ -341,7 +341,10 @@ const updateTableData = async () => {
|
||||
} else if (keys1.length != 0) {
|
||||
let tempHarmNumList: { value: string, label: string }[] = []
|
||||
for (let [key, value] of resTableData.resultData) {
|
||||
tempHarmNumList.push({value: key, label: value.isData === 1 ? key : value.isData === 4 ? `${formatHarmNum(key)}(/)` : `${formatHarmNum(key)}(不符合)`})
|
||||
tempHarmNumList.push({
|
||||
value: key,
|
||||
label: value.isData === 1 ? key : value.isData === 4 ? `${formatHarmNum(key)}(/)` : `${formatHarmNum(key)}(不符合)`
|
||||
})
|
||||
}
|
||||
|
||||
Object.assign(harmNumList, tempHarmNumList)
|
||||
|
||||
Reference in New Issue
Block a user