diff --git a/frontend/src/views/home/components/compareTestPopup.vue b/frontend/src/views/home/components/compareTestPopup.vue index 8d87155..2161805 100644 --- a/frontend/src/views/home/components/compareTestPopup.vue +++ b/frontend/src/views/home/components/compareTestPopup.vue @@ -68,6 +68,7 @@ import socketClient from '@/utils/webSocketClient'; import {useCheckStore} from "@/stores/modules/check"; import {pauseTest, resumeTest, startPreTest} from '@/api/socket/socket' import {useUserStore} from "@/stores/modules/user"; +import {JwtUtil} from "@/utils/jwtUtil"; const userStore = useUserStore() @@ -171,7 +172,7 @@ const handleSubmitFast = () => { if (preTestStatus.value == 'waiting') { if (checkStore.selectTestItems.preTest) { startPreTest({ - userPageId: "cdf", + userPageId: JwtUtil.getLoginName(), devIds: deviceIds, planId: planId, operateType: checkStore.reCheckType == 1 ? '1' : '2', @@ -196,7 +197,7 @@ const handleSubmitFast = () => { if (TestStatus.value == "waiting") { if (!checkStore.selectTestItems.preTest && !checkStore.selectTestItems.channelsTest && checkStore.selectTestItems.test) { startPreTest({ - userPageId: "cdf", + userPageId: JwtUtil.getLoginName(), devIds: deviceIds, planId: planId, operateType: checkStore.reCheckType == 1 ? '1' : '2', @@ -313,7 +314,7 @@ const sendResume = () => { const sendReCheck = () => { console.log('发送重新检测指令') startPreTest({ - userPageId: "cdf", + userPageId: JwtUtil.getLoginName(), devIds: checkStore.devices.map((item) => item.deviceId), planId: checkStore.plan.id, operateType: '2', // 0:'系数校验','1'为预检测、‘2‘为正式检测、'8'为不合格项复检 diff --git a/frontend/src/views/home/components/testPopup.vue b/frontend/src/views/home/components/testPopup.vue index fc2e62f..b030752 100644 --- a/frontend/src/views/home/components/testPopup.vue +++ b/frontend/src/views/home/components/testPopup.vue @@ -80,6 +80,7 @@ import socketClient from '@/utils/webSocketClient'; import {useCheckStore} from "@/stores/modules/check"; import {pauseTest, resumeTest, startPreTest} from '@/api/socket/socket' import {useUserStore} from "@/stores/modules/user"; +import {JwtUtil} from "@/utils/jwtUtil"; const userStore = useUserStore() const checkStore = useCheckStore(); @@ -199,6 +200,7 @@ const handleSubmitFast = () => { if (preTestStatus.value == 'waiting') { if (checkStore.selectTestItems.preTest) { startPreTest({ + userPageId:JwtUtil.getLoginName(), devIds: deviceIds, planId: planId, operateType: checkStore.reCheckType == 1 ? '1' : '2', @@ -226,6 +228,7 @@ const handleSubmitFast = () => { if (channelsTestStatus.value == 'waiting') { if (!checkStore.selectTestItems.preTest && checkStore.selectTestItems.channelsTest) { startPreTest({ + userPageId:JwtUtil.getLoginName(), devIds: deviceIds, planId: planId, operateType: checkStore.reCheckType == 1 ? '1' : '2', @@ -251,6 +254,7 @@ const handleSubmitFast = () => { if (TestStatus.value == "waiting") { if (!checkStore.selectTestItems.preTest && !checkStore.selectTestItems.channelsTest && checkStore.selectTestItems.test) { startPreTest({ + userPageId:JwtUtil.getLoginName(), devIds: deviceIds, planId: planId, operateType: checkStore.reCheckType == 1 ? '1' : '2', @@ -389,6 +393,7 @@ const sendResume = () => { const sendReCheck = () => { console.log('发送重新检测指令') startPreTest({ + userPageId:JwtUtil.getLoginName(), devIds: checkStore.devices.map((item) => item.deviceId), planId: checkStore.plan.id, operateType: '2', // 0:'系数校验','1'为预检测、‘2‘为正式检测、'8'为不合格项复检