预见测

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

@@ -11,7 +11,7 @@
     </div>
 
     <ComparePreTest v-if="showComponent&&preTestSelected" v-show="preTestSelected && stepsActiveView==1" ref="preTestRef" v-model:testStatus="preTestStatus"
-             :webMsgSend="webMsgSend"/>
+             :webMsgSend="webMsgSend" :mapping = "channelMapping"/>
     <CompareTest v-if="showComponent&&testSelected" ref="testRef" v-show="testSelected && stepsActiveView==2" v-model:testStatus="TestStatus" 
           :stepsActive="stepsActive"/>
     <template #footer>
@@ -66,7 +66,7 @@ import ComparePreTest from './comparePreTest.vue'
 import CompareTest from './compareTest.vue'
 import socketClient from '@/utils/webSocketClient';
 import {useCheckStore} from "@/stores/modules/check";
-import {pauseTest, resumeTest, startPreTest} from '@/api/socket/socket'
+import {pauseTest, resumeTest, startPreTest,contrastTest} from '@/api/socket/socket'
 import {useUserStore} from "@/stores/modules/user";
 
 
@@ -131,8 +131,19 @@ const initOperate = () => {
   }
 }
 
-const open = (title: string,sourceIds: string[]) => {
-
+const channelMapping = ref<Record<string, Record<string, string>>>({})
+const planId = ref('')
+const loginName = ref('')
+const devIds = ref<[]>()
+const standardDevIds = ref<[]>()
+const pairs = ref<any>()
+const open = (title: string,mapping:any,plan: string,login: string,devIdsArray: [],standardDevIdsArray: [],pair:any) => {
+  channelMapping.value = mapping
+  planId.value = plan
+  loginName.value = login
+  devIds.value = devIdsArray
+  standardDevIds.value = standardDevIdsArray
+  pairs.value = pair
   showSteps.value = true
   initOperate()
   dialogTitle.value = title;
@@ -157,10 +168,7 @@ const open = (title: string,sourceIds: string[]) => {
   });
 }
 
-const handleSubmitFast = () => {
-  let deviceIds = checkStore.devices.map((item) => item.deviceId)
-  let planId = checkStore.plan.id
-
+const handleSubmitFast = async () => {
   if (!dataSocket.socketServe.connected) {
     ElMessage.error('webSocket连接中断！')
     return
@@ -170,54 +178,25 @@ const handleSubmitFast = () => {
     case 1:
       if (preTestStatus.value == 'waiting') {
         if (checkStore.selectTestItems.preTest) {
-          startPreTest({
-            userPageId: "cdf",
-            devIds: deviceIds,
-            planId: planId,
-            operateType: checkStore.reCheckType == 1 ? '1' : '2',
-            userId: userStore.userInfo.id,
-            temperature: checkStore.temperature,
-            humidity: checkStore.humidity,
-            testItemList: [checkStore.selectTestItems.preTest, checkStore.selectTestItems.channelsTest, checkStore.selectTestItems.test]
-          }).then(res => {
-            if (res.code === 'A001014') {
-              ElMessageBox.alert('装置配置异常', '检测失败', {
-                confirmButtonText: '确定',
-                type: 'error',
-              })
-              preTestStatus.value = 'error'
-            }
-          })
+        await contrastTest({
+          planId: planId.value,
+          loginName: loginName.value,
+          devIds: devIds.value,
+          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) {
-          startPreTest({
-            userPageId: "cdf",
-            devIds: deviceIds,
-            planId: planId,
-            operateType: checkStore.reCheckType == 1 ? '1' : '2',
-            userId: userStore.userInfo.id,
-            temperature: checkStore.temperature,
-            humidity: checkStore.humidity,
-            testItemList: [checkStore.selectTestItems.preTest, checkStore.selectTestItems.channelsTest, checkStore.selectTestItems.test]
-          }).then(res => {
-            if (res.code === 'A001014') {
-              ElMessageBox.alert('装置配置异常', '初始化失败', {
-                confirmButtonText: '确定',
-                type: 'error',
-              })
-              TestStatus.value = 'test_init_fail'
-            }
-          })
-        }
+        //if (!checkStore.selectTestItems.preTest && !checkStore.selectTestItems.channelsTest && checkStore.selectTestItems.test) { 
+        //}
         TestStatus.value = 'start'
       } else if (TestStatus.value == 'paused') {
         // 发送继续指令
-        sendResume()
+        //sendResume()
       }
       break;
     default:
@@ -300,7 +279,7 @@ const sendResume = () => {
     userPageId: "cdf",
     devIds: checkStore.devices.map((item) => item.deviceId),
     planId: checkStore.plan.id,
-    operateType: '2', //  0:'系数校验'，'1'为预检测、‘2‘为正式检测、'8'为不合格项复检
+    reCheckType: '2', //  0:'系数校验'，'1'为预检测、‘2‘为正式检测、'8'为不合格项复检
     userId: userStore.userInfo.id,
     temperature: checkStore.temperature,
     humidity: checkStore.humidity
@@ -316,7 +295,7 @@ const sendReCheck = () => {
     userPageId: "cdf",
     devIds: checkStore.devices.map((item) => item.deviceId),
     planId: checkStore.plan.id,
-    operateType: '2', // 0:'系数校验'，'1'为预检测、‘2‘为正式检测、'8'为不合格项复检
+    reCheckType: '2', // 0:'系数校验'，'1'为预检测、‘2‘为正式检测、'8'为不合格项复检
     userId: userStore.userInfo.id,
     temperature: checkStore.temperature,
     humidity: checkStore.humidity,