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

# Conflicts:
#	frontend/src/utils/webSocketClient.ts

frontend/src/views/home/components/testPopup.vue

@@ -199,7 +199,6 @@ const handleSubmitFast = () => {
       if (preTestStatus.value == 'waiting') {
         if (checkStore.selectTestItems.preTest) {
           startPreTest({
-            userPageId: "cdf",
             devIds: deviceIds,
             planId: planId,
             operateType: checkStore.reCheckType == 1 ? '1' : '2',
@@ -227,7 +226,6 @@ const handleSubmitFast = () => {
       if (channelsTestStatus.value == 'waiting') {
         if (!checkStore.selectTestItems.preTest && checkStore.selectTestItems.channelsTest) {
           startPreTest({
-            userPageId: "cdf",
             devIds: deviceIds,
             planId: planId,
             operateType: checkStore.reCheckType == 1 ? '1' : '2',
@@ -253,7 +251,6 @@ const handleSubmitFast = () => {
       if (TestStatus.value == "waiting") {
         if (!checkStore.selectTestItems.preTest && !checkStore.selectTestItems.channelsTest && checkStore.selectTestItems.test) {
           startPreTest({
-            userPageId: "cdf",
             devIds: deviceIds,
             planId: planId,
             operateType: checkStore.reCheckType == 1 ? '1' : '2',
@@ -392,7 +389,6 @@ const sendResume = () => {
 const sendReCheck = () => {
   console.log('发送重新检测指令')
   startPreTest({
-    userPageId: "cdf",
     devIds: checkStore.devices.map((item) => item.deviceId),
     planId: checkStore.plan.id,
     operateType: '2', // 0:'系数校验'，'1'为预检测、‘2‘为正式检测、'8'为不合格项复检