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:
guanj
2025-08-22 16:21:57 +08:00
parent 2be0be681e
commit 0985cc5d7c
5 changed files with 61 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
frontend/src/api/check/interface/index.ts
View File

@@ -6,7 +6,7 @@ export namespace CheckData {
deviceName: string
chnNum: string
deviceId: string
num?: string | number | null
num?: string | number
}
export interface PhaseCheckResult {

2
frontend/src/api/check/test/index.ts
View File

@@ -101,7 +101,7 @@ export const getContrastResult = (params: {
chnNum: string | number
num: number | string | null
}) => {
return http.post('/result/getContrastResult', params, { loading: false })
return http.post('/result/getContrastResult', params, { loading: true })
}
/**

88
frontend/src/views/home/components/compareDataCheckRawDataTable.vue
View File

@@ -1,80 +1,40 @@
<template>
<div class="table-main" max-height="282px">
<el-table :data="tableData" stripe border :header-cell-style="{ textAlign: 'center' } "
:cell-style="{ textAlign: 'center' }" max-height="282px"
style="width: 100%;">
<el-table
:data="prop.tableData"
stripe
border
:header-cell-style="{ textAlign: 'center' }"
:cell-style="{ textAlign: 'center' }"
max-height="282px"
style="width: 100%"
>
<el-table-column type="index" label="序号" width="70" fixed="left" />
<el-table-column prop="dataA" :label="'被检设备'">
<el-table-column prop="time" label="数据时间" width="200"/>
<el-table-column prop="dataA" :label="'A相'"/>
<el-table-column prop="dataA" :label="'B相'"/>
<el-table-column prop="dataA" :label="'C相'"/>
<el-table-column prop="timeDev" label="数据时间" width="200" />
<el-table-column prop="uaDev" :label="'A相'" />
<el-table-column prop="ubDev" :label="'B相'" />
<el-table-column prop="ucDev" :label="'C相'" />
</el-table-column>
<el-table-column prop="dataA" :label="'标准设备'">
<el-table-column prop="time" label="数据时间" width="200"/>
<el-table-column prop="dataA" :label="'A相'"/>
<el-table-column prop="dataA" :label="'B相'"/>
<el-table-column prop="dataA" :label="'C相'"/>
<el-table-column prop="timeStdDev" label="数据时间" width="200" />
<el-table-column prop="uaStdDev" :label="'A相'" />
<el-table-column prop="ubStdDev" :label="'B相'" />
<el-table-column prop="ucStdDev" :label="'C相'" />
</el-table-column>
</el-table>
</div>
</template>
<script lang="tsx" setup>
// 模拟数据数组
const tableData = [
{
time: "2023-10-25 14:30:00",
dataA: "220.12",
isDataA: "220.05",
dataB: "219.98",
isDataB: "220.02",
dataC: "220.05",
isDataC: "220.10"
},
{
time: "2023-10-25 14:30:03",
dataA: "219.85",
isDataA: "220.00",
dataB: "220.15",
isDataB: "220.08",
dataC: "220.20",
isDataC: "220.18"
},
{
time: "2023-10-25 14:30:06",
dataA: "220.03",
isDataA: "219.95",
dataB: "220.10",
isDataB: "220.00",
dataC: "219.90",
isDataC: "220.05"
},
{
time: "2023-10-25 14:30:09",
dataA: "220.25",
isDataA: "220.15",
dataB: "219.80",
isDataB: "219.90",
dataC: "220.10",
isDataC: "220.00"
},
{
time: "2023-10-25 14:30:12",
dataA: "219.95",
isDataA: "220.05",
dataB: "220.20",
isDataB: "220.15",
dataC: "220.05",
isDataC: "219.98"
import { CheckData } from '@/api/check/interface'
const prop = defineProps({
tableData: {
type: Array as () => CheckData.TableRow[],
default: []
}
];
})
</script>
<style scoped>
</style>
<style scoped></style>

6
frontend/src/views/home/components/compareDataCheckResultTable.vue
View File

@@ -6,7 +6,7 @@
:header-cell-style="{ textAlign: 'center' }"
:cell-style="{ textAlign: 'center' }"
>
<el-table-column label="A相" v-if="prop.tableData[0].dataT ==null">
<el-table-column label="A相" v-if="prop.tableData[0].dataA ">
<el-table-column prop="stdA" :label="'被检值'">
<template #default="{ row }">
{{ row.dataA.data }}
@@ -31,7 +31,7 @@
</template>
</el-table-column>
</el-table-column>
<el-table-column label="B相" v-if="prop.tableData[0].dataT==null">
<el-table-column label="B相" v-if="prop.tableData[0].dataB">
<el-table-column prop="stdB" :label="'被检值'">
<template #default="{ row }">
{{ row.dataB.data }}
@@ -56,7 +56,7 @@
</template>
</el-table-column>
</el-table-column>
<el-table-column label="C相" v-if="prop.tableData[0].dataT==null">
<el-table-column label="C相" v-if="prop.tableData[0].dataC">
<el-table-column prop="stdC" :label="'被检值'" >
<template #default="{ row }">
{{ row.dataC.data }}

27
frontend/src/views/home/components/compareDataCheckSingleChannelSingleTestPopup.vue
View File

@@ -34,10 +34,20 @@
<el-input v-model="formContent.deviceName" :disabled="true" />
</el-form-item>
<el-form-item label="通道号">
<el-select v-model="formContent.chnNum">
<el-select v-model="formContent.chnNum" @change="getResults">
<el-option v-for="item in chnList" :key="item" :label="item" :value="item" />
</el-select>
</el-form-item>
<el-form-item label="检测次数">
<el-select v-model="formContent.num" clearable @change="getResults">
<el-option
v-for="item in chnMapList[formContent.chnNum]"
:key="item"
:label="item"
:value="item"
/>
</el-select>
</el-form-item>
<el-form-item v-if="checkStore.showDetailType === 1">
<el-button type="primary" :icon="Postcard">报告生成</el-button>
</el-form-item>
@@ -78,7 +88,7 @@
</el-tab-pane>
<el-tab-pane label="原始数据" name="rawDataTab">
<CompareDataCheckRawDataTable
:tableData="rawTableData[currentCheckItem]"
:tableData="currentRawTableData"
:currentScriptTypeName="currentScriptTypeName"
@exportRawDataHandler="exportRawDataHandler"
/>
@@ -125,6 +135,7 @@ let scriptType: string | null = null
watch(searchValue, val => {
treeRef.value!.filter(val)
})
const chnMapList: any = ref({})
// 表单数据
const formContent = reactive<CheckData.DataCheck>({
@@ -134,7 +145,7 @@ const formContent = reactive<CheckData.DataCheck>({
deviceName: '',
chnNum: '',
deviceId: '',
num: null
num: ''
})
// 通道下拉列表
@@ -153,6 +164,10 @@ const currentCheckResultData = computed(() => {
const data = checkResultData.value[currentCheckItem.value]
return Array.isArray(data) ? data : []
})
const currentRawTableData = computed(() => {
const data = rawTableData.value[currentCheckItem.value]
return Array.isArray(data) ? data : []
})
const open = async (row: any, chnNum: string, deviceId: string | null, source: number) => {
if (source == 1) {
// 正式检测进入页面
@@ -186,6 +201,7 @@ const getBasicInformation = async () => {
formContent.dataRule = res.data.dataRule
formContent.deviceName = res.data.deviceName
formContent.errorSysId = res.data.errorSysId
chnMapList.value = res.data.chnMap
let chnMap: string[] = []
for (let key in res.data.chnMap) {
chnMap.push(key)
@@ -204,12 +220,15 @@ const getTestItem = async () => {
}
// 获取结果
const getResults = async () => {
checkResultData.value = []
rawTableData.value = []
getContrastResult({
planId: checkStore.plan.id,
scriptType: rowList.value.scriptType,
deviceId: formContent.deviceId,
chnNum: formContent.chnNum,
num: formContent.num ?? null
num: formContent.num == '' ? null : formContent.num
}).then((res: any) => {
let list: string[] = []
for (let key in res.data.resultMap) {