admin/zhgdyun
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

flx：解决冲突

Browse Source
This commit is contained in:
Rain_ 2025-09-23 15:51:52 +08:00
parent 5b73555171
commit a33fc66663
2 changed files with 0 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/views/projectFront/laborManage/components/comboForm/dialogPage/temporaryDialog.vue
View File

@ -2421,11 +2421,7 @@ export default {
}, },
//人脸监测、 //人脸监测、
checkFace(url) { checkFace(url) {
<<<<<<< HEAD
checkFaceApi({ fileUrl: url, projectSn: this.$store.state.projectSn, }).then((res) => { 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 (res.result.checkType == 1) {
if(this.isIscDevice){ if(this.isIscDevice){
const loading = this.$loading({ const loading = this.$loading({

4
src/views/projectFront/laborManage/personModule/temporary.vue
View File

@ -848,11 +848,7 @@ export default {
}, },
//人脸监测、 //人脸监测、
checkFace(url) { checkFace(url) {
<<<<<<< HEAD
checkFaceApi({ fileUrl: url, projectSn: this.$store.state.projectSn, }).then((res) => { 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 (res.result.checkType == 1) {
if(this.isIscDevice){ if(this.isIscDevice){
const loading = this.$loading({ const loading = this.$loading({