ClientApps/pqs-9100_client
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

展示单位调整

Browse Source
This commit is contained in:
caozehui
2025-01-13 15:03:24 +08:00
parent 7556f0e5bc
commit f58f7b97e5
3 changed files with 17 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
frontend/src/views/home/components/dataCheckRawDataTable.vue
View File

@@ -1,5 +1,5 @@
<template> <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"> <div class="table-main">
<el-table v-if="tableData.length > 0" :data="tableData" stripe border :header-cell-style="{ textAlign: 'center' } " <el-table v-if="tableData.length > 0" :data="tableData" stripe border :header-cell-style="{ textAlign: 'center' } "
:cell-style="{ textAlign: 'center' }" height="315px" :cell-style="{ textAlign: 'center' }" height="315px"
@@ -7,12 +7,12 @@
<el-table-column type="index" label="序号" width="70" fixed="left"/> <el-table-column type="index" label="序号" width="70" fixed="left"/>
<el-table-column prop="time" label="数据时间"/> <el-table-column prop="time" label="数据时间"/>
<template v-if="phaseT === 0"> <template v-if="phaseT === 0">
<el-table-column prop="dataA" :label="`A（${unit}）`"/> <el-table-column prop="dataA" :label="'A'+(unit==''?'':'（'+unit+'）')"/>
<el-table-column prop="dataB" :label="`B（${unit}）`"/> <el-table-column prop="dataB" :label="'B'+(unit==''?'':'（'+unit+'）')"/>
<el-table-column prop="dataC" :label="`C（${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}）`"/> <el-table-column prop="dataT" :label="'T'+(unit==''?'':'（'+unit+'）')"/>
</template> </template>
</el-table> </el-table>
</div> </div>

8
frontend/src/views/home/components/dataCheckResultTable.vue
View File

@@ -9,7 +9,7 @@
<!-- </template>--> <!-- </template>-->
<!-- </el-table-column>--> <!-- </el-table-column>-->
<template v-if="phaseT === 0"> <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="stdA" width="100" label="标准值"/>
<el-table-column prop="dataA" width="100" label="被检值"/> <el-table-column prop="dataA" width="100" label="被检值"/>
<el-table-column prop="isDataA" label="检测结果"> <el-table-column prop="isDataA" label="检测结果">
@@ -26,7 +26,7 @@
</template> </template>
</el-table-column> </el-table-column>
</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="stdB" width="100" label="标准值"/>
<el-table-column prop="dataB" width="100" label="被检值"/> <el-table-column prop="dataB" width="100" label="被检值"/>
<el-table-column prop="isDataB" label="检测结果"> <el-table-column prop="isDataB" label="检测结果">
@@ -43,7 +43,7 @@
</template> </template>
</el-table-column> </el-table-column>
</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="stdC" width="100" label="标准值"/>
<el-table-column prop="dataC" width="100" label="被检值"/> <el-table-column prop="dataC" width="100" label="被检值"/>
<el-table-column prop="isDataC" label="检测结果"> <el-table-column prop="isDataC" label="检测结果">
@@ -63,7 +63,7 @@
</template> </template>
<template v-if="phaseT === 1"> <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="stdT" label="标准值"/>
<el-table-column prop="dataT" label="被检值"/> <el-table-column prop="dataT" label="被检值"/>
<el-table-column prop="isDataT" label="检测结果"> <el-table-column prop="isDataT" label="检测结果">

13
frontend/src/views/home/components/dataCheckSingleChannelSingleTestPopup.vue
View File

@@ -267,7 +267,7 @@ const defaultOperate = () => {
defaultExpandedKeys = [node.index] defaultExpandedKeys = [node.index]
treeRef.value?.setCurrentKey(node.index); treeRef.value?.setCurrentKey(node.index);
scriptType = node.scriptType scriptType = node.scriptType ?? scriptType
} else { } else {
currentScriptTypeName.value = '' currentScriptTypeName.value = ''
currentDesc.value = '' currentDesc.value = ''
@@ -341,7 +341,10 @@ const updateTableData = async () => {
} else if (keys1.length != 0) { } else if (keys1.length != 0) {
let tempHarmNumList: { value: string, label: string }[] = [] let tempHarmNumList: { value: string, label: string }[] = []
for (let [key, value] of resTableData.resultData) { 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) Object.assign(harmNumList, tempHarmNumList)
@@ -455,10 +458,10 @@ const setCheckResultData = (data: CheckData.ResCheckResult) => {
} }
const formatHarmNum = (num: string) => { const formatHarmNum = (num: string) => {
if(num.includes('.5')){ if (num.includes('.5')) {
return num return num
}else{ } else {
return num.replace('.0','') return num.replace('.0', '')
} }
} }