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

Merge branch 'master' of http://192.168.1.22:3000/ClientApps/pqs-9100_client

Browse Source
This commit is contained in:
sjl
2025-12-05 11:04:11 +08:00
parent dde3f11bbe f8be28077f
commit 389857ac7e
57 changed files with 3104 additions and 1874 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
frontend/src/views/home/components/channelPairing.vue
View File

@@ -37,6 +37,7 @@ import { jwtUtil } from '@/utils/jwtUtil'
import { useCheckStore } from '@/stores/modules/check'
import { ipc } from '@/utils/ipcRenderer'
import { fa, tr } from 'element-plus/es/locale'
import { CheckData } from '@/api/check/interface'
const vueFlowElement = ref(442)
const checkStore = useCheckStore()
const dialogVisible = ref(false)
@@ -427,7 +428,7 @@ const standardDevIds = ref<string[]>()
const open = async () => {
edges.value = []
devIds.value = prop.devIdList.map(d => d.id)
//devIds.value = prop.devIdList.map(d => d.id)
standardDevIds.value = prop.pqStandardDevList.map(d => d.id)
planId.value = prop.planIdKey
nodes.value = createNodes(prop.devIdList, prop.pqStandardDevList, prop.deviceMonitor)
@@ -447,11 +448,33 @@ const handleNext = async () => {
let chnNumList: string[] = []
await edges.value.forEach(edge => {
const match = edge.source.split('-')
if (match) {
chnNumList.push(match[2])
chnNumList.push(match[1] + '-'+ match[2])
}
})
const connectedDeviceIds = [...new Set(chnNumList.map(item => item.split('-')[0]))]
devIds.value = connectedDeviceIds
//可能存在勾选的被检设备未连线的情况，需要过滤掉
let devices: CheckData.Device[] = prop.devIdList
.filter((item: any) => connectedDeviceIds.includes(item.id))
.map((item: any) => {
return {
deviceId: item.id,
deviceName: item.name,
chnNum: item.devChns,
planId: item.planId,
deviceType: item.devType,
devVolt: item.devVolt,
devCurr: item.devCurr,
factorFlag: item.factorFlag,
checkResult: item.checkResult
}
})
checkStore.clearDevices()
checkStore.addDevices(devices)
const connections = edges.value.reduce(
(map, edge) => {
// 从source中提取设备ID和通道号: 被检通道-{deviceId}-{channelNum} => {deviceId}-{channelNum}

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

@@ -21,7 +21,11 @@
</el-table-column>
<el-table-column prop="isDataA" label="检测结果">
<template #default="{ row }">
<el-tooltip effect="dark" placement="bottom">
<template v-if="row.dataA.isData === 4 || row.dataA.isData === 5">
<el-tag type="warning" v-if="row.dataA.isData === 4">/</el-tag>
<el-tag type="info" v-if="row.dataA.isData === 5">-</el-tag>
</template>
<el-tooltip v-else effect="dark" placement="bottom">
<template #content>
误差范围：{{ addPercentSigns(row.dataA.radius, row.dataA.unit) }}
<br/>
@@ -29,8 +33,7 @@
</template>
<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="warning" v-if="row.dataA.isData === 4">/</el-tag>
<el-tag type="info" v-if="row.dataA.isData === 5">-</el-tag>
</el-tooltip>
</template>
</el-table-column>
@@ -49,7 +52,11 @@
</el-table-column>
<el-table-column prop="isDataB" label="检测结果">
<template #default="{ row }">
<el-tooltip effect="dark" placement="bottom">
<template v-if="row.dataB.isData === 4 || row.dataB.isData === 5">
<el-tag type="warning" v-if="row.dataB.isData === 4">/</el-tag>
<el-tag type="info" v-if="row.dataB.isData === 5">-</el-tag>
</template>
<el-tooltip v-else effect="dark" placement="bottom">
<template #content>
误差范围：{{ addPercentSigns(row.dataB.radius, row.dataB.unit) }}
<br/>
@@ -57,8 +64,6 @@
</template>
<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="warning" v-if="row.dataB.isData === 4">/</el-tag>
<el-tag type="info" v-if="row.dataB.isData === 5">-</el-tag>
</el-tooltip>
</template>
</el-table-column>
@@ -77,7 +82,11 @@
</el-table-column>
<el-table-column prop="isDataC" label="检测结果">
<template #default="{ row }">
<el-tooltip effect="dark" placement="bottom">
<template v-if="row.dataC.isData === 4 || row.dataC.isData === 5">
<el-tag type="warning" v-if="row.dataC.isData === 4">/</el-tag>
<el-tag type="info" v-if="row.dataC.isData === 5">-</el-tag>
</template>
<el-tooltip v-else effect="dark" placement="bottom">
<template #content>
误差范围：{{ addPercentSigns(row.dataC.radius, row.dataC.unit) }}
<br/>
@@ -85,8 +94,6 @@
</template>
<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="warning" v-if="row.dataC.isData === 4">/</el-tag>
<el-tag type="info" v-if="row.dataC.isData === 5">-</el-tag>
</el-tooltip>
</template>
</el-table-column>
@@ -105,7 +112,11 @@
</el-table-column>
<el-table-column prop="isDataT" label="检测结果">
<template #default="{ row }">
<el-tooltip effect="dark" placement="bottom">
<template v-if="row.dataT.isData === 4 || row.dataT.isData === 5">
<el-tag type="warning" v-if="row.dataT.isData === 4">/</el-tag>
<el-tag type="info" v-if="row.dataT.isData === 5">-</el-tag>
</template>
<el-tooltip v-else effect="dark" placement="bottom">
<template #content>
误差范围：{{ addPercentSigns(row.dataT.radius, row.dataT.unit) }}
<br/>
@@ -113,8 +124,7 @@
</template>
<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="warning" v-if="row.dataT.isData === 4">/</el-tag>
<el-tag type="info" v-if="row.dataT.isData === 5">-</el-tag>
</el-tooltip>
</template>
</el-table-column>

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

@@ -563,7 +563,8 @@ const handleErrorSysChange = async () => {
errorSysId: formContent.errorSysId,
deviceId: formContent.deviceId,
code: checkStore.plan.code + '',
patternId: dictStore.getDictData('Pattern').find(item => item.name === modeStore.currentMode)?.id ?? ''
patternId: dictStore.getDictData('Pattern').find(item => item.name === modeStore.currentMode)?.id ?? '',
chnNum: formContent.chnNum
}).then(res => {
if (res.code === ResultEnum.SUCCESS) {
ElMessage.success('切换误差体系成功')
@@ -579,7 +580,8 @@ const handleReCalculate = async () => {
errorSysId: formContent.errorSysId,
deviceId: formContent.deviceId,
code: checkStore.plan.code + '',
patternId: dictStore.getDictData('Pattern').find(item => item.name === modeStore.currentMode)?.id ?? ''
patternId: dictStore.getDictData('Pattern').find(item => item.name === modeStore.currentMode)?.id ?? '',
chnNum: formContent.chnNum
}).then(res => {
if (res.code === ResultEnum.SUCCESS) {
ElMessage.success('重新计算成功！')

7
frontend/src/views/home/components/compareTest.vue
View File

@@ -37,9 +37,9 @@
align="center"
>
<el-table-column
v-for="(chnItem, index2) in checkStore.chnNumList"
v-for="(chnItem, index2) in checkStore.chnNumList.filter(c => c.startsWith(item.deviceId))"
:key="`${item.deviceId}${chnItem}`"
:label="'通道' + chnItem"
:label="'通道' + chnItem.split('-')[1]"
align="center"
>
<template #default="{ row }">
@@ -69,7 +69,7 @@
"
:color="row.devices[index1].chnResult[index2].color"
size="small"
@click="handleClick(row, chnItem, row.scriptType)"
@click="handleClick(row, chnItem.split('-')[1], row.scriptType)"
style="align-self: center"
>
<el-icon
@@ -804,6 +804,7 @@ const initCheckResult = (defaultValue: CheckData.ChnCheckResultEnum) => {
})
Object.assign(checkResult, result)
}
const scrollToBottom = () => {

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

@@ -17,7 +17,11 @@
<el-table-column prop="dataA" :label="'被检值' + (outerUnit == '' ? '' : '（' + outerUnit + '）')" />
<el-table-column prop="isDataA" label="检测结果">
<template #default="scope">
<el-tooltip effect="dark" placement="bottom">
<template v-if="scope.row.isDataA === 4 || scope.row.isDataA === 5">
<el-tag type="warning" v-if="scope.row.isDataA === 4">/</el-tag>
<el-tag type="info" v-if="scope.row.isDataA === 5">-</el-tag>
</template>
<el-tooltip v-else effect="dark" placement="bottom">
<template #content>
误差范围：{{ scope.row.maxErrorA }}
<br />
@@ -25,8 +29,6 @@
</template>
<el-tag type="success" v-if="scope.row.isDataA === 1">符合</el-tag>
<el-tag type="danger" v-if="scope.row.isDataA === 2">不符合</el-tag>
<el-tag type="warning" v-if="scope.row.isDataA === 4">/</el-tag>
<el-tag type="info" v-if="scope.row.isDataA === 5">-</el-tag>
</el-tooltip>
</template>
</el-table-column>
@@ -36,7 +38,11 @@
<el-table-column prop="dataB" :label="'被检值' + (outerUnit == '' ? '' : '（' + outerUnit + '）')" />
<el-table-column prop="isDataB" label="检测结果">
<template #default="scope">
<el-tooltip effect="dark" placement="bottom">
<template v-if="scope.row.isDataB === 4 || scope.row.isDataB === 5">
<el-tag type="warning" v-if="scope.row.isDataB === 4">/</el-tag>
<el-tag type="info" v-if="scope.row.isDataA === 5">-</el-tag>
</template>
<el-tooltip v-else effect="dark" placement="bottom">
<template #content>
误差范围：{{ scope.row.maxErrorB }}
<br />
@@ -44,8 +50,7 @@
</template>
<el-tag type="success" v-if="scope.row.isDataB === 1">符合</el-tag>
<el-tag type="danger" v-if="scope.row.isDataB === 2">不符合</el-tag>
<el-tag type="warning" v-if="scope.row.isDataB === 4">/</el-tag>
<el-tag type="info" v-if="scope.row.isDataA === 5">-</el-tag>
</el-tooltip>
</template>
</el-table-column>
@@ -55,7 +60,11 @@
<el-table-column prop="dataC" :label="'被检值' + (outerUnit == '' ? '' : '（' + outerUnit + '）')" />
<el-table-column prop="isDataC" label="检测结果">
<template #default="scope">
<el-tooltip effect="dark" placement="bottom">
<template v-if="scope.row.isDataC === 4 || scope.row.isDataC === 5">
<el-tag type="warning" v-if="scope.row.isDataC === 4">/</el-tag>
<el-tag type="info" v-if="scope.row.isDataA === 5">-</el-tag>
</template>
<el-tooltip v-else effect="dark" placement="bottom">
<template #content>
误差范围： {{ scope.row.maxErrorC }}
<br />
@@ -63,8 +72,7 @@
</template>
<el-tag type="success" v-if="scope.row.isDataC === 1">符合</el-tag>
<el-tag type="danger" v-if="scope.row.isDataC === 2">不符合</el-tag>
<el-tag type="warning" v-if="scope.row.isDataC === 4">/</el-tag>
<el-tag type="info" v-if="scope.row.isDataA === 5">-</el-tag>
</el-tooltip>
</template>
</el-table-column>
@@ -75,7 +83,11 @@
<el-table-column prop="dataT" :label="'被检值' + (outerUnit == '' ? '' : '（' + outerUnit + '）')" />
<el-table-column prop="isDataT" label="检测结果">
<template #default="scope">
<el-tooltip effect="dark" placement="bottom">
<template v-if="scope.row.isDataT === 4 || scope.row.isDataT === 5">
<el-tag type="warning" v-if="scope.row.isDataT === 4">/</el-tag>
<el-tag type="info" v-if="scope.row.isDataA === 5">-</el-tag>
</template>
<el-tooltip v-else effect="dark" placement="bottom">
<template #content>
误差范围： {{ scope.row.maxErrorT }}
<br />
@@ -83,8 +95,6 @@
</template>
<el-tag type="success" v-if="scope.row.isDataT === 1">符合</el-tag>
<el-tag type="danger" v-if="scope.row.isDataT === 2">不符合</el-tag>
<el-tag type="warning" v-if="scope.row.isDataT === 4">/</el-tag>
<el-tag type="info" v-if="scope.row.isDataA === 5">-</el-tag>
</el-tooltip>
</template>
</el-table-column>