Merge branch 'master' of http://47.92.161.104:10080/zq/jp-housekeeper-portal

src/views/base/personInfo-list.vue

@@ -676,7 +676,10 @@
         element-loading-background="rgba(0, 0, 0, 0.8)"
       >
         <el-form-item label="设备">
-          <el-select v-model="boundDeviceId" filterable placeholder="请选择">
+          <el-select v-model="boundDeviceIds" filterable 
+          placeholder="请选择" multiple
+          style="width:300px;"
+          >
             <el-option
               v-for="devices in deviceResult"
               :key="devices.id"
@@ -819,7 +822,7 @@ export default {
       batchBoundDevice: false,
       batchUnBoundDevice: false,
       deviceResult: "",
-      boundDeviceId: "",
+      boundDeviceIds: [],
       boundUnDeviceId: "",
       xlsLoading: false,
       tableHeight: 400,
@@ -1368,38 +1371,43 @@ export default {
       //self.loading = true;
       self.boundDeviceDisabled = true;
 
-      let boundDeviceId = self.boundDeviceId;
+      //选择设备
+      let boundDeviceIds = self.boundDeviceIds;
 
-      var idList = this.multipleSelection.map((record) => {
+      var idList = this.multipleSelection.map(record => {
         return record.id;
       });
-      var formData = new FormData();
 
-      formData.append("persons", idList);
-      formData.append("deviceId", boundDeviceId);
-      personDeviceRelationApi
-        .batchBindPerson(formData)
-        .then(function (response) {
-          var jsonData = response.data;
-          //self.loading = false;
-          self.boundDeviceDisabled = false;
-          if (jsonData.result) {
-            self.changePage(self.pageIndex);
-            self.batchBoundDevice = false;
-            self.boundDeviceId = "";
-            self.$message({
-              type: "success",
-              message: "绑定成功!",
-            });
-          } else {
-            self.$message({
-              showClose: true,
-              dangerouslyUseHTMLString: true,
-              message: `有部分人员绑定失败,<a href="${jsonData.message}" target="_blank">点击下载错误信息报表</a>&nbsp;`,
-              duration: 30000,
-            });
-          }
-        });
+      boundDeviceIds.forEach(boundDeviceId=>{
+        var formData = new FormData();
+
+        formData.append("persons", idList);
+        formData.append("deviceId", boundDeviceId);
+
+        personDeviceRelationApi
+          .batchBindPerson(formData)
+          .then(function(response) {
+            var jsonData = response.data;
+            //self.loading = false;
+            self.boundDeviceDisabled = false;
+            if (jsonData.result) {
+              self.changePage(self.pageIndex);
+              self.batchBoundDevice = false;
+              self.boundDeviceId = "";
+              self.$message({
+                type: "success",
+                message: "绑定成功!"
+              });
+            } else {
+              self.$message({
+                showClose: true,
+                dangerouslyUseHTMLString: true,
+                message: `有部分人员绑定失败,<a href="${jsonData.message}" target="_blank">点击下载错误信息报表</a>&nbsp;`,
+                duration: 30000
+              });
+            }
+          });
+      });
     },
     handleBatchUnBoundDevice() {
       //批量人脸