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-08-26 15:39:58 +08:00
parent ac4e0e2077
commit d7f1224df4
4 changed files with 236 additions and 219 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,4 +1,3 @@
import { pa } from 'element-plus/es/locale/index.mjs'
import http from '@/api' import http from '@/api'
import {CheckData} from '@/api/check/interface' import {CheckData} from '@/api/check/interface'
@@ -85,8 +84,8 @@ export const getContrastFormContent = (params: {
planId: string planId: string
scriptType: string scriptType: string
deviceId: string deviceId: string
chnNum: string | number chnNum: string
num: number | string | null num: number | null
}) => { }) => {
return http.post('/result/getContrastFormContent', params, {loading: false}) return http.post('/result/getContrastFormContent', params, {loading: false})
} }

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

@@ -13,17 +13,17 @@
<el-table-column prop="dataA" :label="'被检设备'"> <el-table-column prop="dataA" :label="'被检设备'">
<el-table-column prop="timeDev" label="数据时间" width="200"/> <el-table-column prop="timeDev" label="数据时间" width="200"/>
<el-table-column prop="uaDev" :label="'A相'" v-if="prop.tableData.length==0||prop.tableData[0]?.uaDev != null" /> <el-table-column prop="uaDev" :label="'A相'+(outerUnit==''?'':'（'+outerUnit+'）')" v-if="prop.tableData.length==0||prop.tableData[0]?.uaDev != null"/>
<el-table-column prop="ubDev" :label="setB" v-if="prop.tableData.length==0||prop.tableData[0]?.ubDev != null" /> <el-table-column prop="ubDev" :label="setB+(outerUnit==''?'':'（'+outerUnit+'）')" v-if="prop.tableData.length==0||prop.tableData[0]?.ubDev != null"/>
<el-table-column prop="ucDev" :label="'C相'" v-if="prop.tableData.length==0||prop.tableData[0]?.ucDev != null" /> <el-table-column prop="ucDev" :label="'C相'+(outerUnit==''?'':'（'+outerUnit+'）')" v-if="prop.tableData.length==0||prop.tableData[0]?.ucDev != null"/>
<el-table-column prop="utDev" :label="'T相'" v-if="prop.tableData[0]?.utDev != null" /> <el-table-column prop="utDev" :label="setT+(outerUnit==''?'':'（'+outerUnit+'）')" v-if="prop.tableData[0]?.utDev != null"/>
</el-table-column> </el-table-column>
<el-table-column prop="dataA" :label="'标准设备'"> <el-table-column prop="dataA" :label="'标准设备'">
<el-table-column prop="timeStdDev" label="数据时间" width="200"/> <el-table-column prop="timeStdDev" label="数据时间" width="200"/>
<el-table-column prop="uaStdDev" :label="'A相'" v-if="prop.tableData.length==0||prop.tableData[0]?.uaStdDev != null" /> <el-table-column prop="uaStdDev" :label="'A相'+(outerUnit==''?'':'（'+outerUnit+'）')" v-if="prop.tableData.length==0||prop.tableData[0]?.uaStdDev != null"/>
<el-table-column prop="ubStdDev" :label="setB" v-if="prop.tableData.length==0||prop.tableData[0]?.ubStdDev != null" /> <el-table-column prop="ubStdDev" :label="setB+(outerUnit==''?'':'（'+outerUnit+'）')" v-if="prop.tableData.length==0||prop.tableData[0]?.ubStdDev != null"/>
<el-table-column prop="ucStdDev" :label="'C相'" v-if="prop.tableData.length==0||prop.tableData[0]?.ucStdDev != null" /> <el-table-column prop="ucStdDev" :label="'C相'+(outerUnit==''?'':'（'+outerUnit+'）')" v-if="prop.tableData.length==0||prop.tableData[0]?.ucStdDev != null"/>
<el-table-column prop="utStdDev" :label="'T相'" v-if="prop.tableData[0]?.utStdDev != null" /> <el-table-column prop="utStdDev" :label="setT+(outerUnit==''?'':'（'+outerUnit+'）')" v-if="prop.tableData[0]?.utStdDev != null"/>
</el-table-column> </el-table-column>
</el-table> </el-table>
</div> </div>
@@ -43,6 +43,11 @@ const prop = defineProps({
default: '' default: ''
} }
}) })
const outerUnit = computed(() => {
return prop.tableData.length > 0 ? prop.tableData[0].unit : '';
})
const setB = computed(() => { const setB = computed(() => {
return prop.currentCheckItem == '三相电流不平衡度' return prop.currentCheckItem == '三相电流不平衡度'
? '三相电流不平衡度' ? '三相电流不平衡度'
@@ -50,6 +55,9 @@ const setB = computed(() => {
? '三相电压不平衡度' ? '三相电压不平衡度'
: 'B相' : 'B相'
}) })
const setT = computed(() => {
return prop.currentCheckItem == '频率' ? '频率' : 'T相'
})
</script> </script>
<style scoped></style> <style scoped></style>

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

@@ -8,12 +8,12 @@
> >
<el-table-column type="index" label="序号" width="70" fixed="left" /> <el-table-column type="index" label="序号" width="70" fixed="left" />
<el-table-column label="A相" v-if="prop.tableData.length==0|| prop.tableData[0]?.dataA"> <el-table-column label="A相" v-if="prop.tableData.length==0|| prop.tableData[0]?.dataA">
<el-table-column prop="stdA" :label="'被检值'"> <el-table-column prop="stdA" :label="'被检值'+(outerUnit==''?'':'（'+outerUnit+'）')">
<template #default="{ row }"> <template #default="{ row }">
{{ row.dataA.data }} {{ row.dataA.data }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="dataA" :label="'标准值'"> <el-table-column prop="dataA" :label="'标准值'+(outerUnit==''?'':'（'+outerUnit+'）')">
<template #default="{ row }"> <template #default="{ row }">
{{ row.dataA.resultData }} {{ row.dataA.resultData }}
</template> </template>
@@ -24,7 +24,7 @@
<template #content> <template #content>
误差范围：{{ addPercentSigns(row.dataA.radius, row.dataA.unit) }} 误差范围：{{ addPercentSigns(row.dataA.radius, row.dataA.unit) }}
<br/> <br/>
误差值：{{ row.dataA.errorData }} 误差值：{{ row.dataA.errorData }}{{ row.dataA.unit }}
</template> </template>
<el-tag type="success" v-if="row.dataA.isData === 1">符合</el-tag> <el-tag type="success" v-if="row.dataA.isData === 1">符合</el-tag>
<el-tag type="danger" v-if="row.dataA.isData === 2">不符合</el-tag> <el-tag type="danger" v-if="row.dataA.isData === 2">不符合</el-tag>
@@ -35,12 +35,12 @@
</el-table-column> </el-table-column>
</el-table-column> </el-table-column>
<el-table-column :label="setB" v-if="prop.tableData.length==0|| prop.tableData[0]?.dataB"> <el-table-column :label="setB" v-if="prop.tableData.length==0|| prop.tableData[0]?.dataB">
<el-table-column prop="stdB" :label="'被检值'"> <el-table-column prop="stdB" :label="'被检值'+(outerUnit==''?'':'（'+outerUnit+'）')">
<template #default="{ row }"> <template #default="{ row }">
{{ row.dataB.data }} {{ row.dataB.data }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="dataB" :label="'标准值'"> <el-table-column prop="dataB" :label="'标准值'+(outerUnit==''?'':'（'+outerUnit+'）')">
<template #default="{ row }"> <template #default="{ row }">
{{ row.dataB.resultData }} {{ row.dataB.resultData }}
</template> </template>
@@ -51,7 +51,7 @@
<template #content> <template #content>
误差范围：{{ addPercentSigns(row.dataB.radius, row.dataB.unit) }} 误差范围：{{ addPercentSigns(row.dataB.radius, row.dataB.unit) }}
<br/> <br/>
误差值：{{ row.dataB.errorData }} 误差值：{{ row.dataB.errorData }}{{ row.dataB.unit }}
</template> </template>
<el-tag type="success" v-if="row.dataB.isData === 1">符合</el-tag> <el-tag type="success" v-if="row.dataB.isData === 1">符合</el-tag>
<el-tag type="danger" v-if="row.dataB.isData === 2">不符合</el-tag> <el-tag type="danger" v-if="row.dataB.isData === 2">不符合</el-tag>
@@ -62,12 +62,12 @@
</el-table-column> </el-table-column>
</el-table-column> </el-table-column>
<el-table-column label="C相" v-if="prop.tableData.length==0|| prop.tableData[0]?.dataC"> <el-table-column label="C相" v-if="prop.tableData.length==0|| prop.tableData[0]?.dataC">
<el-table-column prop="stdC" :label="'被检值'"> <el-table-column prop="stdC" :label="'被检值'+(outerUnit==''?'':'（'+outerUnit+'）')">
<template #default="{ row }"> <template #default="{ row }">
{{ row.dataC.data }} {{ row.dataC.data }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="dataC" :label="'标准值'"> <el-table-column prop="dataC" :label="'标准值'+(outerUnit==''?'':'（'+outerUnit+'）')">
<template #default="{ row }"> <template #default="{ row }">
{{ row.dataC.resultData }} {{ row.dataC.resultData }}
</template> </template>
@@ -78,7 +78,7 @@
<template #content> <template #content>
误差范围：{{ addPercentSigns(row.dataC.radius, row.dataC.unit) }} 误差范围：{{ addPercentSigns(row.dataC.radius, row.dataC.unit) }}
<br/> <br/>
误差值：{{ row.dataC.errorData }} 误差值：{{ row.dataC.errorData }}{{ row.dataC.unit }}
</template> </template>
<el-tag type="success" v-if="row.dataC.isData === 1">符合</el-tag> <el-tag type="success" v-if="row.dataC.isData === 1">符合</el-tag>
<el-tag type="danger" v-if="row.dataC.isData === 2">不符合</el-tag> <el-tag type="danger" v-if="row.dataC.isData === 2">不符合</el-tag>
@@ -88,13 +88,13 @@
</template> </template>
</el-table-column> </el-table-column>
</el-table-column> </el-table-column>
<el-table-column label="T相" v-if="prop.tableData[0]?.dataT"> <el-table-column :label="setT" v-if="prop.tableData[0].dataT">
<el-table-column prop="stdT" :label="'被检值'"> <el-table-column prop="stdT" :label="'被检值'+(outerUnit==''?'':'（'+outerUnit+'）')">
<template #default="{ row }"> <template #default="{ row }">
{{ row.dataT.data }} {{ row.dataT.data }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="dataT" :label="'标准值'"> <el-table-column prop="dataT" :label="'标准值'+(outerUnit==''?'':'（'+outerUnit+'）')">
<template #default="{ row }"> <template #default="{ row }">
{{ row.dataT.resultData }} {{ row.dataT.resultData }}
</template> </template>
@@ -105,7 +105,7 @@
<template #content> <template #content>
误差范围：{{ addPercentSigns(row.dataT.radius, row.dataT.unit) }} 误差范围：{{ addPercentSigns(row.dataT.radius, row.dataT.unit) }}
<br/> <br/>
误差值：{{ row.dataT.errorData }} 误差值：{{ row.dataT.errorData }}{{ row.dataT.unit }}
</template> </template>
<el-tag type="success" v-if="row.dataT.isData === 1">符合</el-tag> <el-tag type="success" v-if="row.dataT.isData === 1">符合</el-tag>
<el-tag type="danger" v-if="row.dataT.isData === 2">不符合</el-tag> <el-tag type="danger" v-if="row.dataT.isData === 2">不符合</el-tag>
@@ -135,6 +135,11 @@ const prop = defineProps({
}) })
// 添加单位 // 添加单位
const outerUnit = computed(() => {
return prop.tableData.length > 0 ? prop.tableData[0].unit : '';
})
const addPercentSigns = (text: string, unit: string) => { const addPercentSigns = (text: string, unit: string) => {
return text return text
.split('~') .split('~')
@@ -148,6 +153,10 @@ const setB = computed(() => {
? '三相电压不平衡度' ? '三相电压不平衡度'
: 'B相' : 'B相'
}) })
const setT = computed(() => {
return prop.currentCheckItem == '频率' ? '频率' : 'T相'
})
</script> </script>
<style scoped> <style scoped>

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

@@ -243,7 +243,7 @@ const getBasicInformation = async () => {
scriptType: rowList.value.scriptType, scriptType: rowList.value.scriptType,
deviceId: formContent.deviceId, deviceId: formContent.deviceId,
chnNum: formContent.chnNum, chnNum: formContent.chnNum,
num: formContent.num ?? null num: formContent.num == '' ? null : parseInt(formContent.num)
}).then((res: any) => { }).then((res: any) => {
formContent.dataRule = res.data.dataRule formContent.dataRule = res.data.dataRule
formContent.deviceName = res.data.deviceName formContent.deviceName = res.data.deviceName
@@ -271,6 +271,7 @@ const handleNodeClick = (data: any) => {
const getResults = async () => { const getResults = async () => {
checkResultData.value = [] checkResultData.value = []
rawTableData.value = [] rawTableData.value = []
getContrastResult({ getContrastResult({
planId: checkStore.plan.id, planId: checkStore.plan.id,
scriptType: rowList.value.scriptType, scriptType: rowList.value.scriptType,