修改

src/views/base/personDeviceRelation-BoundList.vue

@@ -389,8 +389,13 @@ export default {
     handleUpdateIsWrite() {
       var self = this;
       self.loading = true;
+
+      var deviceIdList = this.multipleSelection.map((record) => {
+        return record.deviceId;
+      });
       var formData = new FormData();
       formData.append("personId", self.personId);
+      formData.append("deviceIds", self.deviceIds);
       personDeviceRelationApi
         .updatePersonIsWrite(formData)
         .then(function (response) {

src/views/base/personInfo-detail.vue

@@ -71,7 +71,15 @@
           </el-col>
         </el-row>
         <el-row>
-          <el-col :span="24">
+          <el-col :span="12">
+            <el-form-item label="工号" prop="jobNumber">
+              <el-input
+                v-model="formModel.jobNumber"
+                placeholder="请输入身份证"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
             <el-form-item label="身份证" prop="idCard">
               <el-input
                 v-model="formModel.idCard"

src/views/base/personInfo-list.vue

@@ -330,6 +330,12 @@
         width="80"
         fixed="left"
       ></el-table-column>
+      <el-table-column
+        prop="jobNumber"
+        label="工号"
+        width="80"
+        fixed="left"
+      ></el-table-column>
       <el-table-column
         prop="name"
         label="姓名"
@@ -1509,8 +1515,7 @@ export default {
     handleBatchBoundDevice() {
       //批量人脸
       var self = this;
-      //self.loading = true;
-      self.boundDeviceDisabled = true;
+      var formData = new FormData();
 
       //选择设备
       let boundDeviceIds = self.boundDeviceIds;
@@ -1518,37 +1523,85 @@ export default {
       var idList = this.multipleSelection.map((record) => {
         return record.id;
       });
-
-      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,
+      self
+        .$confirm("是否立刻同步照片到设备？", "提示", {
+          confirmButtonText: "同步到设备",
+          cancelButtonText: "只绑定不同步",
+          type: "warning",
+          distinguishCancelAndClose: true,
+        })
+        .then(() => {
+          boundDeviceIds.forEach((boundDeviceId) => {
+            var formData = new FormData();
+            self.boundDeviceDisabled = true;
+
+            formData.append("persons", idList);
+            formData.append("deviceId", boundDeviceId);
+            formData.append("isWrite", true);
+
+            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,
+                  });
+                }
               });
-            }
           });
-      });
+        })
+        .catch((error) => {
+          if (error === "cancel") {
+            boundDeviceIds.forEach((boundDeviceId) => {
+              var formData = new FormData();
+              self.boundDeviceDisabled = true;
+
+              formData.append("persons", idList);
+              formData.append("deviceId", boundDeviceId);
+              formData.append("isWrite", false);
+
+              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,
+                    });
+                  }
+                });
+            });
+          } else {
+            self.boundDeviceDisabled = false;
+          }
+        });
     },
     handleBatchUnBoundDevice() {
       //批量人脸

src/views/base/workPersonScheduling-change.vue

@@ -210,13 +210,13 @@ export default {
       currentRow: "",
       leftClickType: false,
       rightClickType: false,
-      number1: "0",
-      number2: "0",
-      number3: "0",
-      number4: "0",
-      number5: "0",
-      number6: "0",
-      number7: "0",
+      number1: "无",
+      number2: "无",
+      number3: "无",
+      number4: "无",
+      number5: "无",
+      number6: "无",
+      number7: "无",
       personInfoData: [],
       selectId: "",
     };

src/views/base/workPersonScheduling-list.vue

@@ -292,7 +292,7 @@ export default {
     showItem(item) {
       var str = item;
       if (item == null || item == "") {
-        str = " ";
+        str = "无";
       }
       return str;
     },