Merge remote-tracking branch 'origin/master'

src/views/smartaccess/comps/face-card.vue

@@ -534,7 +534,7 @@
           //来访人员
           item.targetType = 2;
           item.userType = 'FK_';
-          item.userFace = item.imageUri;
+          item.userFace = item.faceUrl;
           item.userName = item.guestName;
         } else if (index == 2) {
           //服务人员

src/views/smartaccess/form/guest.vue

@@ -45,6 +45,7 @@
   import {
     deepClone
   } from '@/util/util.js'
+  import {pushFace} from "@/api/estate/useraccesspermissions";
   export default {
     components: {
       detail
@@ -380,8 +381,15 @@
     },
     methods: {
       //下发人脸
-      pushUserFaceToDevice(id) {
-        pushGuestFace(id).then(res => {
+      pushUserFaceToDevice(id, userName, deviceIdList) {
+        let params ={
+          userId: id,
+          userName: userName,
+          userType: "FK_",
+          targetType: 1,
+          deviceIds: deviceIdList.join(","),
+        }
+        pushFace(params).then(res => {
           this.$message({
             type: "success",
             message: "操作成功!"
@@ -389,14 +397,19 @@
         })
       },
       //禁用人脸
-      deleteUserFaceFromDevice(id) {
+      deleteUserFaceFromDevice(id, deviceIdList) {
         this.$confirm("确定禁用人脸吗?", {
             confirmButtonText: "确定",
             cancelButtonText: "取消",
             type: "warning"
           })
           .then(() => {
-            return deleteGuestFace(id);
+            let params={
+              deviceIds:deviceIdList.join(','),
+              userId:id,
+              userType:"FK_"
+            };
+            return deleteGuestFace(params);
           })
           .then(() => {
             this.$message({