From a33fc66663746af013e5ed6dc3abece1ae0c1c5c Mon Sep 17 00:00:00 2001
From: Rain_ <904416525@qq.com>
Date: Tue, 23 Sep 2025 15:51:52 +0800
Subject: [PATCH] =?UTF-8?q?flx=EF=BC=9A=E8=A7=A3=E5=86=B3=E5=86=B2?=
 =?UTF-8?q?=E7=AA=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/comboForm/dialogPage/temporaryDialog.vue       | 4 ----
 src/views/projectFront/laborManage/personModule/temporary.vue | 4 ----
 2 files changed, 8 deletions(-)

diff --git a/src/views/projectFront/laborManage/components/comboForm/dialogPage/temporaryDialog.vue b/src/views/projectFront/laborManage/components/comboForm/dialogPage/temporaryDialog.vue
index af10519a..7573ace2 100644
--- a/src/views/projectFront/laborManage/components/comboForm/dialogPage/temporaryDialog.vue
+++ b/src/views/projectFront/laborManage/components/comboForm/dialogPage/temporaryDialog.vue
@@ -2421,11 +2421,7 @@ export default {
     },
     //人脸监测、
     checkFace(url) {
-<<<<<<< HEAD
       checkFaceApi({ fileUrl: url, projectSn: this.$store.state.projectSn, }).then((res) => {
-=======
-      checkFaceApi({ fileUrl: url,projectSn: this.$store.state.projectSn, }).then((res) => {
->>>>>>> aaee4c2abe041e7a4cc1b8c7ded584707e577c92
         if (res.result.checkType == 1) {
           if(this.isIscDevice){
             const loading = this.$loading({
diff --git a/src/views/projectFront/laborManage/personModule/temporary.vue b/src/views/projectFront/laborManage/personModule/temporary.vue
index f8706a9a..d49bee98 100644
--- a/src/views/projectFront/laborManage/personModule/temporary.vue
+++ b/src/views/projectFront/laborManage/personModule/temporary.vue
@@ -848,11 +848,7 @@ export default {
     },
     //人脸监测、
     checkFace(url) {
-<<<<<<< HEAD
       checkFaceApi({ fileUrl: url, projectSn: this.$store.state.projectSn, }).then((res) => {
-=======
-      checkFaceApi({ fileUrl: url,projectSn: this.$store.state.projectSn, }).then((res) => {
->>>>>>> aaee4c2abe041e7a4cc1b8c7ded584707e577c92
         if (res.result.checkType == 1) {
           if(this.isIscDevice){
             const loading = this.$loading({