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-14 15:34:35 +08:00
parent d83c04dc8b
commit 40fe12cd96
3 changed files with 21 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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==''?'':'（'+unit+'）')"/>
<el-table-column prop="dataB" :label="'B'+(unit==''?'':'（'+unit+'）')"/>
<el-table-column prop="dataC" :label="'C'+(unit==''?'':'（'+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==''?'':'（'+unit+'）')"/>
<el-table-column prop="dataT" :label="'T相'+(unit==''?'':'（'+unit+'）')"/>
</template>
</el-table>
</div>

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

@@ -9,7 +9,7 @@
<!-- </template>-->
<!-- </el-table-column>-->
<template v-if="phaseT === 0">
<el-table-column :label="'A'+(unit==''?'':'（'+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==''?'':'（'+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==''?'':'（'+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==''?'':'（'+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="检测结果">

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

@@ -312,6 +312,13 @@ const updateTableData = async () => {
let resCheckResult: CheckData.ResCheckResult = {}
let resRawData: CheckData.RawDataItem[] = []
if (keys1.length === 0) {
checkList.length = 0
checkResultData.length = 0
rawTableData.length = 0
currentCheckItem.value = ''
}
if (keys1.length === 1) {
resCheckResult = resTableData.resultData.get(keys1[0])
resRawData = resTableData.rawData.get(keys2[0])
@@ -364,7 +371,7 @@ const updateTableData = async () => {
})
}
// debugger
Object.assign(checkList, tempCheckList)
currentCheckItem.value = checkList[0].value
@@ -433,9 +440,13 @@ const close = () => {
visible.value = false;
};
const setCheckResultData = (data: CheckData.ResCheckResult) => {
const setCheckResultData = (data: CheckData.ResCheckResult|null) => {
// console.log("检测结果", data);
let result: CheckData.CheckResult[] = []
if (data == null || data == undefined) {
Object.assign(checkResultData, [])
return
}
if (data.dataA != null && data.dataB != null && data.dataC != null) {
result.push({
stdA: numberToFixed(data.dataA.resultData),