From ecbc3c30c8386877b512cdd62e340afcd0a9224d Mon Sep 17 00:00:00 2001
From: sjl <1716605279@qq.com>
Date: Fri, 8 Aug 2025 13:24:19 +0800
Subject: [PATCH] 1

---
 frontend/src/views/home/components/testPopup.vue | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/frontend/src/views/home/components/testPopup.vue b/frontend/src/views/home/components/testPopup.vue
index f947666..3bf5ff3 100644
--- a/frontend/src/views/home/components/testPopup.vue
+++ b/frontend/src/views/home/components/testPopup.vue
@@ -461,11 +461,7 @@ const sendResume = () => {
     userPageId: "cdf",
     devIds: checkStore.devices.map((item) => item.deviceId),
     planId: checkStore.plan.id,
-<<<<<<< HEAD
     reCheckType: '2', //  0:'系数校验'，'1'为预检测、‘2‘为正式检测、'8'为不合格项复检
-=======
-    operateType: '2', // 操作类型：0-系数校验，1-预检测，2-正式检测，8-不合格项复检
->>>>>>> 3d1b4eb7c617a76aa37d9d81af4136da08932228
     userId: userStore.userInfo.id,
     temperature: checkStore.temperature,
     humidity: checkStore.humidity
@@ -488,11 +484,7 @@ const sendReCheck = () => {
     userPageId:JwtUtil.getLoginName(),
     devIds: checkStore.devices.map((item) => item.deviceId),
     planId: checkStore.plan.id,
-<<<<<<< HEAD
     reCheckType: '2', // 0:'系数校验'，'1'为预检测、‘2‘为正式检测、'8'为不合格项复检
-=======
-    operateType: '2', // 操作类型：0-系数校验，1-预检测，2-正式检测，8-不合格项复检
->>>>>>> 3d1b4eb7c617a76aa37d9d81af4136da08932228
     userId: userStore.userInfo.id,
     temperature: checkStore.temperature,
     humidity: checkStore.humidity,