diff --git a/frontend/src/api/socket/socket.ts b/frontend/src/api/socket/socket.ts index 33fd498..23d8554 100644 --- a/frontend/src/api/socket/socket.ts +++ b/frontend/src/api/socket/socket.ts @@ -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) +} diff --git a/frontend/src/views/home/components/compareTest.vue b/frontend/src/views/home/components/compareTest.vue index fc01889..a7dd07e 100644 --- a/frontend/src/views/home/components/compareTest.vue +++ b/frontend/src/views/home/components/compareTest.vue @@ -8,137 +8,1213 @@ 检测用时:{{ timeView }} - + + 检测项进度
- - - - -
- - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - -

这是第二个主标签页的内容

-
-
+ + + + + +
+ +
+ +
+

+ {{ item.log }}
+

+
+
+
+ + - \ No newline at end of file + + + diff --git a/frontend/src/views/home/components/deviceConnectionPopup.vue b/frontend/src/views/home/components/deviceConnectionPopup.vue index ed4e836..a398beb 100644 --- a/frontend/src/views/home/components/deviceConnectionPopup.vue +++ b/frontend/src/views/home/components/deviceConnectionPopup.vue @@ -1,7 +1,7 @@ @@ -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>() 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 })