同步和删除同步

src/api/base/personInfo.js

@@ -65,7 +65,7 @@ function enabledApp(formData) {
 
 function enabledGuest(formData) {
   //访客授权
-  return request.post(constant.serverUrl + "/base/personInfo/EnabledGuest", formData);
+  return request.post(constant.serverUrl + "/base/personInfo/enabledGuest", formData);
 }
 
 function dataSync(idList){

src/views/base/companyInfo-list.vue

@@ -59,7 +59,7 @@
         <template slot-scope="{row}">
           <a :href="row.logo" target="_blank">
             <el-avatar
-              :size="80"
+              :size="60"
               :src="row.logo+'?x-oss-process=image/resize,m_lfit,h_100,w_100'"
               :key="row.id"
             ></el-avatar>

src/views/base/personDeviceLog-list.vue

@@ -89,7 +89,7 @@
         <template slot-scope="{row}">
           <a :href="row.faceImage" target="_blank">
             <el-avatar
-              :size="80"
+              :size="60"
               :src="row.faceImage+'?x-oss-process=image/resize,m_lfit,h_100,w_100'"
               :key="row.id"
             ></el-avatar>

src/views/base/personDeviceRelation-BoundList.vue

@@ -31,7 +31,7 @@
         @selection-change="handleSelectionChange"
       >
         <el-table-column type="selection" width="55"></el-table-column>
-        <el-table-column prop="deviceInfo.aliasName" label="设备名称" width="180"></el-table-column>
+        <el-table-column prop="deviceInfo.aliasName" label="设备名称" width="220"></el-table-column>
         <el-table-column prop="personInfo.name" label="人员名称" width="180"></el-table-column>
         <el-table-column prop="createTime" label="绑定时间" width="180"></el-table-column>
         <el-table-column label="操作">

src/views/base/personDeviceRelation-list.vue

@@ -32,7 +32,7 @@
         @selection-change="handleSelectionChange"
       >
         <el-table-column type="selection" :selectable="disableSelect" width="55"></el-table-column>
-        <el-table-column prop="deviceNo" label="设备编号" width="180"></el-table-column>
+        <el-table-column prop="deviceNo" label="设备编号" width="220"></el-table-column>
         <el-table-column prop="aliasName" label="设备名称" width="180"></el-table-column>
         <el-table-column prop="typeN" label="类型" width="120"></el-table-column>
         <el-table-column prop="isBindPerson" label="绑定状态" width="120">

src/views/base/personInfo-list.vue

@@ -107,7 +107,7 @@
         <template slot-scope="{row}">
           <a :href="row.faceImageUrl" target="_blank">
             <el-avatar
-              :size="80"
+              :size="60"
               :src="row.faceImageUrl+'?x-oss-process=image/resize,m_lfit,h_100,w_100'"
               :key="row.id"
             ></el-avatar>
@@ -120,11 +120,14 @@
       <el-table-column prop="openId" label="是否绑定公众号" width="180">
         <template slot-scope="{row}">{{row.openId == null ? "否" : "是"}}</template>
       </el-table-column>
+      <el-table-column prop="faceBound" label="是否同步人脸信息" width="180">
+        <template slot-scope="{row}">{{row.faceBound ? "是" : "否"}}</template>
+      </el-table-column>
       <el-table-column label="人脸授权">
         <template slot-scope="{row}">
           <el-switch
             v-model="row.faceEnabled"
-            @change="enabledTo(row.id,'face',row.faceEnabled)"
+            @change="enabledTo(row,'face',row.faceEnabled)"
             active-color="#13ce66"
             inactive-color="#ff4949"
             :disabled="disabled"
@@ -135,7 +138,7 @@
         <template slot-scope="{row}">
           <el-switch
             v-model="row.cardEnabled"
-            @change="enabledTo(row.id,'card')"
+            @change="enabledTo(row,'card','')"
             active-color="#13ce66"
             inactive-color="#ff4949"
             :disabled="disabled"
@@ -146,7 +149,7 @@
         <template slot-scope="{row}">
           <el-switch
             v-model="row.appEnabled"
-            @change="enabledTo(row.id,'app')"
+            @change="enabledTo(row,'app','')"
             active-color="#13ce66"
             inactive-color="#ff4949"
             :disabled="disabled"
@@ -162,7 +165,7 @@
         <template slot-scope="{row}">
           <el-switch
             v-model="row.guestEnabled"
-            @change="enabledTo(row.id,'guest')"
+            @change="enabledTo(row,'guest','')"
             active-color="#13ce66"
             inactive-color="#ff4949"
             :disabled="disabled"
@@ -179,7 +182,15 @@
           <el-button size="mini" type="warning" @click="handleEdit(row)">编辑</el-button>
           <el-button size="mini" type="danger" @click="handleDelete(row)">删除</el-button>
           <el-button size="mini" type="success" @click="bindDevice(row)">绑定设备</el-button>
-          <el-button size="mini" type="success" @click="uploadData(row)">上传数据</el-button>
+          <span v-if="row.faceBound">
+            &#8195;&#8195;&#8195;
+            <el-button size="mini" type="success" disabled="true" @click="uploadData(row)">上传数据</el-button>
+          </span>
+          <span v-if="!row.faceBound">
+            &#8195;&#8195;&#8195;
+            <el-button size="mini" type="success" @click="uploadData(row)">上传数据</el-button>
+          </span>
+          &#8195;&#8195;&#8195;
           <el-button size="mini" type="info" @click="showBound(row)">已绑定设备</el-button>
         </template>
       </el-table-column>
@@ -331,7 +342,8 @@ export default {
       position5: "",
       showDeviceModal: false,
       showBoundModal: false,
-      personId: ""
+      personId: "",
+      uploadSync: []
     };
   },
   created() {
@@ -483,9 +495,6 @@ export default {
       this.personId = record.id;
       this.showDeviceModal = true;
     },
-    uploadData(record) {
-      //上传数据
-    },
     showBound(record) {
       //展示绑定设备
       //人员信息ID
@@ -569,13 +578,14 @@ export default {
         }
       });
     },
-    enabledTo(id, type, value) {
+    enabledTo(row, type, value) {
       var self = this;
       if (!self.disabled) {
         var formData = new FormData();
-        formData.append("id", id);
+        formData.append("id", row.id);
         if ("face" == type) {
           personInfoApi.enabledFace(formData);
+          row.faceBound = false;
         } else if ("card" == type) {
           personInfoApi.enabledCard(formData);
         } else if ("app" == type) {
@@ -595,9 +605,34 @@ export default {
         });
       }
     },
-    dataSync() {
+    uploadData(record) {
+      //同步人脸数据
       var self = this;
+      self.loading = true;
+      this.uploadSync.push(record.id);
+      var idList = this.uploadSync;
 
+      personInfoApi.dataSync(idList).then(function(response) {
+        var jsonData = response.data;
+        self.loading = false;
+        if (jsonData.result) {
+          self.changePage(self.pageIndex);
+          self.$message({
+            type: "success",
+            message: "同步成功!"
+          });
+        } else {
+          self.$message({
+            type: "warning",
+            message: jsonData.message
+          });
+        }
+      });
+    },
+    dataSync() {
+      //批量同步人脸
+      var self = this;
+      self.loading = true;
       var idList = this.multipleSelection.map(record => {
         return record.id;
       });
@@ -609,7 +644,7 @@ export default {
       }).then(() => {
         personInfoApi.dataSync(idList).then(function(response) {
           var jsonData = response.data;
-
+          self.loading = false;
           if (jsonData.result) {
             self.changePage(self.pageIndex);