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:
sjl
2025-08-07 14:43:56 +08:00
parent d2f92ecde4
commit 022d80f30e
7 changed files with 1410 additions and 310 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
frontend/src/api/socket/socket.ts
View File

@@ -32,3 +32,11 @@ export const pauseTest = () => {
export const resumeTest = (params) => {
return http.post(`/prepare/restartTemTest/`, params, {loading: false})
}
/**
* 比对式通道配对
* @param params
*/
export const contrastTest = (params: any) => {
return http.post(`/prepare/startContrastTest`,params)
}

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

File diff suppressed because it is too large Load Diff

16
frontend/src/views/home/components/deviceConnectionPopup.vue
View File

@@ -1,7 +1,7 @@
<template>
<el-dialog title="设备通道配对" v-model='dialogVisible' v-bind="dialogBig" >
<div class="flow-container" style="overflow: hidden; position: relative;">
<el-button @click="logConnections">打印当前配对</el-button>
<div class="flow-container" style="overflow: hidden; position: relative" :style="{ height: dialogHeight + 'px' }">
<!-- <el-button @click="logConnections">打印当前配对</el-button> -->
<VueFlow
:nodes="nodes"
:edges="edges"
@@ -51,11 +51,16 @@ import SelectTestItemPopup from "@/views/home/components/selectTestItemPopup.vue
import CompareTestPopup from './compareTestPopup.vue'
import { ElMessage } from 'element-plus';
import CustomEdge from './RemoveableEdge.vue' // 导入自定义连接线组件
import {contrastTest} from '@/api/socket/socket'
import { jwtUtil } from "@/utils/jwtUtil";
const dialogVisible = ref(false)
const selectTestItemPopupRef = ref<InstanceType<typeof SelectTestItemPopup>>()
const testPopup = ref()
const dialogTitle = ref('手动检测')
// 计算对话框高度
const dialogHeight = ref(600)
// 初始化 VueFlow，注册自定义连线类型
const { edges, setViewport } = useVueFlow({
@@ -213,7 +218,7 @@ const handleNext = () => {
selectTestItemPopupRef.value?.open(sourceIdArray.value)
}
const openTestDialog = () => {
const openTestDialog = async () => {
testPopup.value?.open(dialogTitle.value,sourceIdArray.value)
}
@@ -365,6 +370,10 @@ const createNodes = (device: Device.ResPqDev[], standardDev: StandardDevice.ResP
}
})
console.log(newNodes)
return newNodes
}
@@ -373,7 +382,6 @@ defineExpose({ open })
<style>
.flow-container {
height: 600px;
width: 100%;
overflow: hidden;
}

341
frontend/src/views/home/components/realTimeDataAlign.vue
View File

@@ -24,10 +24,10 @@
style="width: 150px;"
@change="() => handleDutChannelChange(deviceName)">
<el-option
v-for="(channelData, channelName) in device.dutData"
:key="channelName"
:label="channelName.replace('被检', '')"
:value="channelName">
v-for="channel in device.channelDataList"
:key="channel.devNum"
:label="`通道${channel.devNum}`"
:value="`通道${channel.devNum}`">
</el-option>
</el-select>
</el-form-item>
@@ -40,7 +40,7 @@
style="width: 100%"
:style="{ height: '400px',maxHeight: '400px',overflow:'hidden'}">
<el-table-column prop="monitorNum" label="数据时标" width="180"/>
<el-table-column :label="`${deviceName}-${selectedChannels[deviceName]?.replace('被检', '') || '通道1'}`">
<el-table-column :label="`${deviceName}-${selectedChannels[deviceName] || '通道1'}`">
<el-table-column prop="Ua1" label="A相(V)">
</el-table-column>
<el-table-column prop="Ub1" label="B相(V)">
@@ -48,7 +48,7 @@
<el-table-column prop="Uc1" label="C相(V)">
</el-table-column>
</el-table-column>
<el-table-column :label="`标准设备-${getMappedStandardChannel(deviceName, selectedChannels[deviceName])?.replace('标准', '') || '通道1'}`">
<el-table-column :label="`${getMappedStandardChannel(deviceName, selectedChannels[deviceName])}`">
<el-table-column prop="Ua2" label="A相(V)">
</el-table-column>
<el-table-column prop="Ub2" label="B相(V)">
@@ -71,158 +71,161 @@ import { CircleCheck, CircleClose } from '@element-plus/icons-vue';
const dialogVisible = ref(false);
const activeTab = ref('channel1');
// 重构后的 testDataStructure
const testDataStructure = ref({
// 第一层：多个被检设备
'被检设备1': {
// 被检设备数据
dutData: {
'被检通道1': {
// 第三层：各个时间点的ABC三相数据
'2023-05-20 10:30:01': {
Ua: '1',
Ub: '2',
Uc: '3',
"被检设备1": {
devName: "被检设备1",
channelDataList: [
{
devNum: "1",
standardDevInfo: "标准设备1通道1",
dataList: [
{
timeDev: "2025-09-02 14:00:02.231",
uaDev: 57.74,
ubDev: 57.74,
ucDev: 57.74,
timeStdDev: "2025-09-02 14:00:02.231",
uaStdDev: 57.73,
ubStdDev: 57.73,
ucStdDev: 57.74
},
'2023-05-20 10:30:04': {
Ua: '4',
Ub: '5',
Uc: '6',
{
timeDev: "2025-09-02 14:00:02.234",
uaDev: 57.74,
ubDev: 57.74,
ucDev: 57.74,
timeStdDev: null,
uaStdDev: null,
ubStdDev: null,
ucStdDev: null
},
'2023-05-20 10:30:07': {
Ua: '7',
Ub: '8',
Uc: '9',
},
'2023-05-20 10:30:10': {
Ua: '10',
Ub: '11',
Uc: '12',
},
'2023-05-20 10:30:13': {
Ua: '13',
Ub: '14',
Uc: '15',
{
timeDev: null,
uaDev: null,
ubDev: null,
ucDev: null,
timeStdDev: "2025-09-02 14:00:02.237",
uaStdDev: 57.74,
ubStdDev: 57.74,
ucStdDev: 57.74
}
]
},
'被检通道2': {
'2023-05-20 10:30:01': {
Ua: '7',
Ub: '8',
Uc: '9',
{
devNum: "2",
standardDevInfo: "标准设备2通道4",
dataList: [
{
timeDev: "2025-09-02 14:00:02.231",
uaDev: 57.74,
ubDev: 57.74,
ucDev: 57.74,
timeStdDev: "2025-09-02 14:00:02.231",
uaStdDev: 57.73,
ubStdDev: 57.73,
ucStdDev: 57.74
},
'2023-05-20 10:30:04': {
Ua: '10',
Ub: '11',
Uc: '12',
{
timeDev: "2025-09-02 14:00:02.231",
uaDev: 57.74,
ubDev: 57.74,
ucDev: 57.74,
timeStdDev: "2025-09-02 14:00:02.231",
uaStdDev: 57.73,
ubStdDev: 57.73,
ucStdDev: 57.74
},
'2023-05-20 10:30:07': {
Ua: '13',
Ub: '14',
Uc: '15',
},
'2023-05-20 10:30:10': {
Ua: '16',
Ub: '17',
Uc: '18',
},
'2023-05-20 10:30:13': {
Ua: '19',
Ub: '20',
Uc: '21',
{
timeDev: "2025-09-02 14:00:02.231",
uaDev: 57.74,
ubDev: 57.74,
ucDev: 57.74,
timeStdDev: "2025-09-02 14:00:02.231",
uaStdDev: 57.73,
ubStdDev: 57.73,
ucStdDev: 57.74
}
]
}
]
},
// 标准设备数据
standardData: {
'标准通道1': {
'2023-05-20 10:30:00': {
Ua: '01',
Ub: '02',
Uc: '03',
"被检设备2": {
devName: "被检设备2",
channelDataList: [
{
devNum: "1",
standardDevInfo: "标准设备1通道1",
dataList: [
{
timeDev: "2025-09-02 14:00:02.231",
uaDev: 57.74,
ubDev: 57.74,
ucDev: 57.74,
timeStdDev: "2025-09-02 14:00:02.231",
uaStdDev: 57.73,
ubStdDev: 57.73,
ucStdDev: 57.74
},
'2023-05-20 10:30:03': {
Ua: '04',
Ub: '05',
Uc: '06',
{
timeDev: "2025-09-02 14:00:02.234",
uaDev: 57.74,
ubDev: 57.74,
ucDev: 57.74,
timeStdDev: "2025-09-02 14:00:02.231",
uaStdDev: 57.73,
ubStdDev: 57.73,
ucStdDev: 57.74
},
'2023-05-20 10:30:06': {
Ua: '07',
Ub: '08',
Uc: '09',
},
'2023-05-20 10:30:09': {
Ua: '010',
Ub: '011',
Uc: '012',
},
'2023-05-20 10:30:12': {
Ua: '013',
Ub: '014',
Uc: '015',
{
timeDev: "2025-09-02 14:00:02.234",
uaDev: 57.74,
ubDev: 57.74,
ucDev: 57.74,
timeStdDev: "2025-09-02 14:00:02.237",
uaStdDev: 57.74,
ubStdDev: 57.74,
ucStdDev: 57.74
}
]
},
'标准通道2': {
'2023-05-20 10:30:01': {
Ua: '07',
Ub: '08',
Uc: '09',
{
devNum: "3",
standardDevInfo: "标准设备2通道4",
dataList: [
{
timeDev: "2025-09-02 14:00:02.231",
uaDev: 57.74,
ubDev: 57.74,
ucDev: 57.74,
timeStdDev: "2025-09-02 14:00:02.231",
uaStdDev: 57.73,
ubStdDev: 57.73,
ucStdDev: 57.74
},
'2023-05-20 10:30:04': {
Ua: '010',
Ub: '011',
Uc: '012',
{
timeDev: "2025-09-02 14:00:02.231",
uaDev: 57.74,
ubDev: 57.74,
ucDev: 57.74,
timeStdDev: "2025-09-02 14:00:02.231",
uaStdDev: 57.73,
ubStdDev: 57.73,
ucStdDev: 57.74
},
'2023-05-20 10:30:07': {
Ua: '013',
Ub: '014',
Uc: '015',
},
'2023-05-20 10:30:10': {
Ua: '016',
Ub: '017',
Uc: '018',
},
'2023-05-20 10:30:13': {
Ua: '019',
Ub: '020',
Uc: '021',
}
}
}
},
'被检设备2': {
dutData: {
'被检通道1': {
'2023-05-20 10:30:01': {
Ua: '11',
Ub: '12',
Uc: '13',
}
},
'被检通道2': {
'2023-05-20 10:30:01': {
Ua: '14',
Ub: '15',
Uc: '16',
}
}
},
standardData: {
'标准通道1': {
'2023-05-20 10:30:01': {
Ua: '011',
Ub: '012',
Uc: '013',
}
},
'标准通道2': {
'2023-05-20 10:30:01': {
Ua: '014',
Ub: '015',
Uc: '016',
}
{
timeDev: "2025-09-02 14:00:02.231",
uaDev: 57.74,
ubDev: 57.74,
ucDev: 57.74,
timeStdDev: "2025-09-02 14:00:02.231",
uaStdDev: 57.73,
ubStdDev: 57.73,
ucStdDev: 57.74
}
]
}
]
}
});
@@ -230,15 +233,14 @@ const testDataStructure = ref({
const selectedChannels = ref<Record<string, string>>({});
// 通道映射关系：被检设备通道 -> 标准设备通道
// 格式：被检设备1-被检通道1，标准设备1-标准通道2
const channelMapping = ref<Record<string, Record<string, string>>>({
'被检设备1': {
'被检通道1': '标准通道1',
'被检通道2': '标准通道2'
'通道1': '标准设备1通道1',
'通道2': '标准设备2通道4',
},
'被检设备2': {
'被检通道1': '标准通道2',
'被检通道2': '标准通道1'
'通道1': '标准设备1通道1',
'通道3': '标准设备2通道4'
}
});
@@ -248,12 +250,12 @@ const tableDataMap = ref<Record<string, any[]>>({});
// 每个tab的状态（true表示有不完整数据，false表示数据完整）
const tabStatus = ref<Record<string, boolean>>({});
// 检查设备数据是否有不完整的行（包含/的行）
// 检查设备数据是否有不完整的行（包含null的行）
const hasIncompleteData = (deviceName: string) => {
const tableData = tableDataMap.value[deviceName];
if (!tableData || tableData.length === 0) return false;
// 检查每一行是否有缺失数据（包含/的字段）
// 检查每一行是否有缺失数据（包含null的字段）
return tableData.some(row => {
return row.Ua1 === '/' || row.Ub1 === '/' || row.Uc1 === '/' ||
row.Ua2 === '/' || row.Ub2 === '/' || row.Uc2 === '/';
@@ -263,9 +265,10 @@ const hasIncompleteData = (deviceName: string) => {
// 获取映射的标准设备通道
const getMappedStandardChannel = (deviceName: string, dutChannel: string) => {
if (!channelMapping.value[deviceName]) {
return '标准通道1'; // 默认值
// 默认值
return dutChannel === '通道1' ? '标准设备1通道1' : '标准设备2通道4';
}
return channelMapping.value[deviceName][dutChannel] || '标准通道1';
return channelMapping.value[deviceName][dutChannel] || '标准设备1通道1';
};
// 处理被检设备通道切换
@@ -279,31 +282,24 @@ const generateTableData = (deviceName: string, dutChannel: string) => {
const deviceData = testDataStructure.value[deviceName];
if (!deviceData) return [];
const dutData = deviceData.dutData[dutChannel];
// 获取映射的标准设备通道
const standardChannel = getMappedStandardChannel(deviceName, dutChannel);
const standardData = deviceData.standardData[standardChannel];
if (!dutData || !standardData) return [];
// 根据实际通道编号查找对应的数据
const channelData = deviceData.channelDataList.find(channel =>
`通道${channel.devNum}` === dutChannel
);
// 获取所有时间戳并去重排序
const dutTimestamps = Object.keys(dutData);
const standardTimestamps = Object.keys(standardData);
const allTimestamps = Array.from(new Set([...dutTimestamps, ...standardTimestamps])).sort();
if (!channelData) return [];
// 生成表格数据
return allTimestamps.map(timestamp => {
const dutValues = dutData[timestamp];
const standardValues = standardData[timestamp];
return channelData.dataList.map(dataItem => {
return {
monitorNum: timestamp,
Ua1: dutValues ? dutValues.Ua : '/',
Ub1: dutValues ? dutValues.Ub : '/',
Uc1: dutValues ? dutValues.Uc : '/',
Ua2: standardValues ? standardValues.Ua : '/',
Ub2: standardValues ? standardValues.Ub : '/',
Uc2: standardValues ? standardValues.Uc : '/'
monitorNum: dataItem.timeDev || dataItem.timeStdDev || '',
Ua1: dataItem.uaDev !== null ? dataItem.uaDev : '/',
Ub1: dataItem.ubDev !== null ? dataItem.ubDev : '/',
Uc1: dataItem.ucDev !== null ? dataItem.ucDev : '/',
Ua2: dataItem.uaStdDev !== null ? dataItem.uaStdDev : '/',
Ub2: dataItem.ubStdDev !== null ? dataItem.ubStdDev : '/',
Uc2: dataItem.ucStdDev !== null ? dataItem.ucStdDev : '/'
};
});
};
@@ -320,9 +316,10 @@ const updateTableData = (deviceName: string) => {
// 初始化所有设备的数据和状态
const initAllTableData = () => {
Object.keys(testDataStructure.value).forEach(deviceName => {
// 默认选择第一个通道
const firstChannel = Object.keys(testDataStructure.value[deviceName].dutData)[0];
selectedChannels.value[deviceName] = firstChannel;
// 默认选择第一个可用通道
const firstChannel = testDataStructure.value[deviceName].channelDataList[0];
selectedChannels.value[deviceName] = `通道${firstChannel.devNum}`;
// 生成表格数据
updateTableData(deviceName);

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

@@ -33,6 +33,8 @@ import {useCheckStore} from "@/stores/modules/check";
import type {CheckData} from "@/api/check/interface";
import {ElMessageBox} from "element-plus";
import {useAppSceneStore,useModeStore} from "@/stores/modules/mode";
const AppSceneStore = useAppSceneStore()
const emit = defineEmits(['openTestDialog'])
const checkStore = useCheckStore();
@@ -66,7 +68,7 @@ const resetFormContent = () => {
Object.assign(formContent, {preTest: !hasResult, channelsTest: false, timeTest: false, test: hasResult})
}
const handleStart = () => {
const handleStart = async () => {
let count = 0
for (let key in formContent) {
if (formContent[key]) {
@@ -100,6 +102,9 @@ const handleStart = () => {
}
checkStore.setCheckType(0)
checkStore.setSelectTestItems({...formContent})
handleClose()
emit('openTestDialog',checkStore.selectTestItems.test)