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

# Conflicts:
#	frontend/src/views/home/components/compareTestPopup.vue
#	frontend/src/views/home/components/testPopup.vue

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,contrastTest} from '@/api/socket/socket'
 import {useUserStore} from "@/stores/modules/user";
+import {JwtUtil} from "@/utils/jwtUtil";
 
 
 const userStore = useUserStore()
@@ -185,14 +186,14 @@ const handleSubmitFast = async () => {
           standardDevIds: standardDevIds.value,
           pairs:pairs.value
         })
+
           preTestStatus.value = 'start'
         }
       }
       break;
     case 2:
       if (TestStatus.value == "waiting") {
-        //if (!checkStore.selectTestItems.preTest && !checkStore.selectTestItems.channelsTest && checkStore.selectTestItems.test) { 
-        //}
+
         TestStatus.value = 'start'
       } else if (TestStatus.value == 'paused') {
         // 发送继续指令
@@ -292,7 +293,7 @@ const sendResume = () => {
 const sendReCheck = () => {
   console.log('发送重新检测指令')
   startPreTest({
-    userPageId: "cdf",
+    userPageId: JwtUtil.getLoginName(),
     devIds: checkStore.devices.map((item) => item.deviceId),
     planId: checkStore.plan.id,
     reCheckType: '2', // 0:'系数校验'，'1'为预检测、‘2‘为正式检测、'8'为不合格项复检