diff --git a/src/views/userManagement.vue b/src/views/userManagement.vue
index 493803b..3a8ea0e 100644
--- a/src/views/userManagement.vue
+++ b/src/views/userManagement.vue
@@ -382,7 +382,7 @@
                 <el-button type="text" @click="bindRoomTop1(scope.$index, scope.row)"
                   v-if="scope.row.DeletePermissions">批量下发
                 </el-button>
-                <el-button type="text" @click="modifyCrai(scope.$index, scope.row)">修改凭证</el-button>
+                <!-- <el-button type="text" @click="modifyCrai(scope.$index, scope.row)">修改凭证</el-button> -->
                 <el-button type="text" @click="viewDistributionRecord(scope.$index, scope.row)">查看下发记录
                 </el-button>
                 <!-- <el-button type="text" class="red" @click="deletefun1(scope.$index, scope.row)">删除
@@ -1164,9 +1164,9 @@ export default {
         res1.data.list.map((li, index) => {
           this.$store.commit("increment", 1);
           li['rommNameText'] = this.screenRoomName(li.id)
-          if(li["rommNameText"] != '') {
+          if (li["rommNameText"] != '') {
             this.isCheckin++
-          }else{
+          } else {
             this.noshowNum++
           }
         });
@@ -1177,9 +1177,9 @@ export default {
     this.$store.commit("increment", 1);
   },
   methods: {
-    getFaceData(val){
-        this.faceData = val.split(',')[1]
-      },
+    getFaceData(val) {
+      this.faceData = val.split(',')[1]
+    },
     // 获取全部合同
     getLeasesList() {
       let data = {
@@ -1660,6 +1660,242 @@ export default {
               })
             })
             this.batchRenewalShow = false
+          } else if (li.manufactureId == 1201 || li.manufactureId == 1241) {
+            var endTime = new Date(this.batchRenewalFrom.endTime).getTime()
+            var startTime = new Date(this.batchRenewalFrom.startTime).getTime()
+            var deviceinfo = li
+            var unbind = {
+              id: li.id,
+              startTime: startTime,
+              endTime: endTime
+            }
+            httpPost(unbind, this.$api.setTenant).then((res) => {
+              console.log(res);
+            })
+            let data = {
+              pageNum: 0,
+              pageSize: 0,
+              orderBy: "create_at desc",
+              q: {
+                cardId: li.cardId,
+                types: "0,1,2,3,4",
+                inStatus: "0,1,702"
+              }
+            }
+            httpGet(data, this.$api.getCertificates).then(res => {
+              let dataOne = utils.zlib_unzip(res.data)
+              console.log(dataOne);
+              dataOne.map(lt => {
+                if (lt.content) {
+                  lt['contentJSON'] = JSON.parse(lt.content)
+                  console.log(lt);
+                  if (lt.type == 0) {
+                    let dataface = {
+                      code: "lwj/faceOperate",
+                      data: {
+                        faceIndex: lt.contentJSON.index,
+                        action: 3,
+                        endTime: lt.endTime,
+                        faceData: lt.contentJSON.faceData,
+                        lockerId: deviceinfo.deviceNum,
+                        lockerUserId: lt.contentJSON.userPassword,
+                        startTime: lt.startTime,
+                        operateMode: 21,
+                        order: 6221
+                      }
+                    }
+                    httpPost(dataface, this.$api.sendCommand).then(res => {
+                      console.log(res);
+                      lt.contentJSON.index = res.data.index
+                      lt.contentJSON.operateMode = 21
+                      lt.contentJSON.order = 6221
+                      lt.content = JSON.stringify(lt.contentJSON)
+                      if (res.success) {
+                        let data1 = {
+                          id: lt.id,
+                          content: lt.content, //operateMode:NFC-10、把人员添加到凭证-1
+                          startTime: lt.startTime,
+                          endTime: lt.endTime
+                        }
+                        httpPost(data1, this.$api.updateCertificates).then(res2 => {
+                          console.log(res2);
+                          if (res2.success) {
+                            this.$message.success(this.$t('checkIn.Renewalsuccessful'))
+                          } else {
+                            this.$message.error(this.$t('checkIn.Renewalfailed'))
+                          }
+                        })
+                      } else {
+                        this.$message.error(this.$t('checkIn.Renewalfailed'))
+                      }
+                    })
+                  } else if (lt.type == 1) {
+                    let fpId = new Date()
+                    let fingerprint1 = lt.contentJSON.fingerprint
+                    var str = {
+                      imei: deviceinfo.imei,
+                      deviceNum: deviceinfo.deviceNum,
+                      fingerprintAlias: lt.contentJSON.fingerprintAlias,
+                      userTelephone: lt.contentJSON.userTelephone,
+                      userPassword: lt.contentJSON.userPassword,
+                      password: lt.contentJSON.password,
+                      length: fingerprint1.length / 2,
+                      fpTimeId: fpId.getTime(),
+                      operateMode: 17,
+                      type: 1,
+                      order: 6217,
+                      fingerprint: fingerprint1,
+                      passwordStartTime: lt.startTime,
+                      passwordEndTime: lt.endTime,
+                      pzname: (lt.contentJSON.pzname ? lt.contentJSON.pzname : ''),
+                      cardName: lt.contentJSON.cardName,
+                      roomName: deviceinfo.roomName
+                    }
+                    let data = {
+                      lockerId: deviceinfo.deviceNum,
+                      lockerUserId: lt.contentJSON.userPassword,
+                      action: 3,
+                      fpData: fingerprint1,
+                      startTime: lt.startTime,
+                      endTime: lt.endTime,
+                      fpIndex: lt.contentJSON.index,
+                      cardName: lt.contentJSON.cardName,
+                      roomName: deviceinfo.roomName,
+                      operateMode: 17,
+                      order: 6217
+                    }
+                    httpPost(data, this.$api.sendCommand).then(res => {
+                      console.log(res);
+                      if (res.success) {
+                        str.index = res.data.index
+
+                        let data1 = {
+                          id: lt.id,
+                          content: JSON.stringify(str), //operateMode:NFC-10、把人员添加到凭证-1
+                          startTime: lt.startTime,
+                          endTime: lt.endTime,
+                        }
+                        httpPost(data1, this.$api.updateCertificates).then(res1 => {
+                          console.log(res1);
+                          if (res1.success) {
+                            this.$message.success(this.$t('checkIn.Renewalsuccessful'))
+                          } else {
+                            this.$message.success(this.$t('checkIn.Renewalfailed'))
+                          }
+                        })
+                      }
+                    })
+                  } else if (lt.type == 2) {
+
+                  } else if (lt.type == 3) {
+                    let data = {
+                      code: "lwj/cardOperate",
+                      data: {
+                        lockerId: deviceinfo.deviceNum,
+                        lockerUserId: lt.contentJSON.userPassword,
+                        cardIndex: lt.contentJSON.index,
+                        action: 3,
+                        cardNo: lt.contentJSON.password,
+                        startTime: lt.startTime,
+                        endTime: lt.endTime,
+                        cardName: lt.name + '-' + (lt.contentJSON.pzname ? lt.contentJSON.pzname : ''),
+                        roomName: deviceinfo.roomName,
+                        order: 6211,
+                        operateMode: 11
+                      }
+                    }
+                    var str = {
+                      imei: deviceinfo.imei,
+                      userTelephone: lt.contentJSON.userTelephone,
+                      cardId: lt.cardId,
+                      userPassword: lt.contentJSON.userPassword,
+                      password: lt.contentJSON.password,
+                      operateMode: 11,
+                      order: 6211,
+                      type: 3,
+                      passwordStartTime: lt.startTime,
+                      passwordEndTime: lt.endTime,
+                      pzname: lt.contentJSON.pzname,
+                      is: false,
+                      cardName: lt.name + '-' + (lt.contentJSON.pzname ? lt.contentJSON.pzname : ''),
+                      roomName: deviceinfo.roomName
+                    }
+                    httpPost(data, this.$api.sendCommand).then(res => {
+                      console.log(res);
+                      if (res.success) {
+                        let data1 = {
+                          id: lt.id,
+                          content: JSON.stringify(str), //operateMode:NFC-10、把人员添加到凭证-1
+                          startTime: lt.startTime,
+                          endTime: lt.endTime,
+                        }
+                        httpPost(data1, this.$api.updateCertificates).then(res1 => {
+                          console.log(res1);
+                          if (res1.success) {
+                            this.$message.success(this.$t('checkIn.Renewalsuccessful'))
+                          } else {
+                            this.$message.success(this.$t('checkIn.Renewalfailed'))
+                          }
+                        })
+                      }
+                    })
+                  } else if (lt.type == 4) {
+                    let data = {
+                      code: "lwj/passwordOperate",
+                      data: {
+                        lockerId: deviceinfo.deviceNum,
+                        lockerUserId: lt.contentJSON.userPassword,
+                        passwordIndex: lt.contentJSON.index,
+                        action: 3,
+                        password: lt.contentJSON.password,
+                        startTime: lt.startTime,
+                        endTime: lt.endTime,
+                        cardName: lt.contentJSON.cardName,
+                        roomName: deviceinfo.roomName,
+                        operateMode: 8,
+                        order: 6208
+                      }
+                    }
+                    var str = {
+                      imei: deviceinfo.imei,
+                      userTelephone: lt.contentJSON.userTelephone,
+                      cardId: lt.cardId,
+                      userPassword: lt.contentJSON.userPassword,
+                      password: lt.contentJSON.password,
+                      // password: reversedStr,
+                      operateMode: 8,
+                      order: 6208,
+                      type: 4,
+                      passwordStartTime: lt.startTime,
+                      passwordEndTime: lt.endTime,
+                      pzname: lt.contentJSON.pzname,
+                      is: false,
+                      cardName: lt.contentJSON.cardName,
+                      roomName: deviceinfo.roomName
+                    }
+                    httpPost(data, this.$api.sendCommand).then(res => {
+                      console.log(res);
+                      if (res.success) {
+                        let data1 = {
+                          id: lt.id,
+                          content: JSON.stringify(str), //operateMode:NFC-10、把人员添加到凭证-1
+                          startTime: lt.startTime,
+                          endTime: lt.endTime,
+                        }
+                        httpPost(data1, this.$api.updateCertificates).then(res1 => {
+                          console.log(res1);
+                          if (res1.success) {
+                            this.$message.success(this.$t('checkIn.Renewalsuccessful'))
+                          } else {
+                            this.$message.success(this.$t('checkIn.Renewalfailed'))
+                          }
+                        })
+                      }
+                    })
+                  }
+                } else { }
+              })
+            })
           } else {
             this.$message.error("暂未发现对应设备")
           }
@@ -2095,59 +2331,59 @@ export default {
           } else if (res.data.list[0].manufactureId == 1201 || res.data.list[0].manufactureId == 1241) {
             if (row.type == 1) {
               this.getfiId1(row, function (data) {
-                  if (data.length > 0) {
-                    let datastr={
-                      code: "lwj/fpOperate",
-                      data: {
-                        lockerId:row.deviceNum,
-                        lockerUserId:JSON.parse(row.content).userPassword,
-                        action:2,
-                        fpData:null,
-                        startTime:row.startTime,
-                        endTime:row.endTime,
-                        operateMode: 18,
-                        order: 6218,
-                        cardName:cardName,
-                        roomName: JSON.parse(row.content).roomName,
-                        fpIndex: JSON.parse(row.content).index
-                      }
+                if (data.length > 0) {
+                  let datastr = {
+                    code: "lwj/fpOperate",
+                    data: {
+                      lockerId: row.deviceNum,
+                      lockerUserId: JSON.parse(row.content).userPassword,
+                      action: 2,
+                      fpData: null,
+                      startTime: row.startTime,
+                      endTime: row.endTime,
+                      operateMode: 18,
+                      order: 6218,
+                      cardName: cardName,
+                      roomName: JSON.parse(row.content).roomName,
+                      fpIndex: JSON.parse(row.content).index
                     }
-                    httpPost(datastr,this.$api.sendCommand).then(res2=>{
-                      if(res2.success){
-                        let content = JSON.parse(row.content)
-                        content.operateMode = 18
-                        content.order = 6218
-                        let updatedata = {
-                          id: row.id,
-                          status: 0,
-                          content: JSON.stringify(content),
-                          serial: res2.data.serialNumber,
-                        };
-                        httpPost(updatedata, that.$api.updateCertificates).then((res3) => {
-                          console.log(res3);
-                        });
-                        that.$message.success('删除成功');
-                        that.obtainVoucherIssuanceRecord();
-                      }else{
-                        that.$message.error('删除失败');
-
-                      }
-                    })
-                  }else {
-                    that.$message.error('暂无发现对应指纹序号');
                   }
-                })
-            } else if(row.type == 2) {
+                  httpPost(datastr, this.$api.sendCommand).then(res2 => {
+                    if (res2.success) {
+                      let content = JSON.parse(row.content)
+                      content.operateMode = 18
+                      content.order = 6218
+                      let updatedata = {
+                        id: row.id,
+                        status: 0,
+                        content: JSON.stringify(content),
+                        serial: res2.data.serialNumber,
+                      };
+                      httpPost(updatedata, that.$api.updateCertificates).then((res3) => {
+                        console.log(res3);
+                      });
+                      that.$message.success('删除成功');
+                      that.obtainVoucherIssuanceRecord();
+                    } else {
+                      that.$message.error('删除失败');
 
-            } else if(row.type == 3) {
-              let data={
+                    }
+                  })
+                } else {
+                  that.$message.error('暂无发现对应指纹序号');
+                }
+              })
+            } else if (row.type == 2) {
+
+            } else if (row.type == 3) {
+              let data = {
                 code: "lwj/cardOperate",
                 data: {
-                  lockerId:row.deviceNum,
-                  lockerUserId:JSON.parse(row.content).userPassword,
-                  action:2,
+                  lockerId: row.deviceNum,
+                  lockerUserId: JSON.parse(row.content).userPassword,
+                  action: 2,
                   cardNo: JSON.parse(row.content).password,
-                  startTime:row.startTime,
+                  startTime: row.startTime,
                   endTime: row.endTime,
                   operateMode: 12,
                   order: 6212,
@@ -2155,7 +2391,7 @@ export default {
                   roomName: res.data.list[0].roomName
                 }
               }
-              httpPost(data,this.$api.sendCommand).then(res=>{
+              httpPost(data, this.$api.sendCommand).then(res => {
                 if (res.success) {
                   let content = JSON.parse(row.content)
                   content.operateMode = 12
@@ -2229,7 +2465,7 @@ export default {
                 let content = JSON.parse(row.content)
                 content.operateMode = 22
                 content.order = 6222
-                if(res1.success){
+                if (res1.success) {
                   let updatedata = {
                     id: row.id,
                     status: 0,
@@ -2238,9 +2474,9 @@ export default {
                   }
                   httpPost(updatedata, this.$api.updateCertificates).then(res2 => {
                     console.log(res2);
-                    if(res2.success) {
+                    if (res2.success) {
                       this.$message.success('删除成功')
-                    }else{
+                    } else {
                       this.$message.error('删除失败')
                     }
                   })
@@ -3917,7 +4153,7 @@ export default {
             }
           })
         }
-      } else if(row.type == 10){
+      } else if (row.type == 10) {
         let fpId = new Date();
         let faceData = JSON.parse(row.content).faceData;
         var str = {
@@ -3937,20 +4173,20 @@ export default {
           cardName: row.name + '-' + (pzname ? pzname : ''),
           roomName: resultArr.roomName
         };
-        let data={
+        let data = {
           code: "lwj/faceOperate",
           data: {
-            lockerId:resultArr.deviceNum,
-            lockerUserId:JSON.parse(row.content).userPassword,
-            action:1,
-            faceData:faceData,
-            startTime:startTime,
-            endTime:endTime,
+            lockerId: resultArr.deviceNum,
+            lockerUserId: JSON.parse(row.content).userPassword,
+            action: 1,
+            faceData: faceData,
+            startTime: startTime,
+            endTime: endTime,
             operateMode: 20,
             order: 6220
           }
         }
-        httpPost(data,this.$api.sendCommand).then(res=>{
+        httpPost(data, this.$api.sendCommand).then(res => {
           console.log(res);
           if (res.success) {
             str.index = res.data.index
@@ -4767,11 +5003,11 @@ export default {
         endTime: moment(this.value2[1]).valueOf() / 1000
       };
       httpPost(data, this.$api.addCertificates).then((res) => {
-        if(res.success){
+        if (res.success) {
           this.$message.success('添加成功')
           this.roomstatus1 = true;
           this.getcertificate();
-        }else{
+        } else {
           this.$message.error('添加失败')
         }
       });
@@ -5298,7 +5534,14 @@ export default {
       }
     },
     deleteRelationshipBetweenPersonnelAndRoom(index, row) {
-      var info = JSON.parse(this.drawerRow.info);
+      // console.log(row);
+      // var info = JSON.parse(this.drawerRow.info);
+      let info = ''//JSON.parse(this.drawerRow.info);
+      if (typeof (this.drawerRow.info) == 'object') {
+        info = this.drawerRow.info
+      } else if (typeof (this.drawerRow.info) == 'string') {
+        info = JSON.parse(this.drawerRow.info)
+      }
       var data = [{
         siteId: row.roomId,
         cardId: this.drawerRow.id,
@@ -5375,6 +5618,175 @@ export default {
                     }
                   }
                 );
+              } else if (resultArr.manufactureId == 1201 || resultArr.manufactureId == 1241) {
+                let data = {
+                  pageNum: 0,
+                  pageSize: 0,
+                  orderBy: "create_at desc",
+                  q: {
+                    cardId: row.cardId,
+                    types: "0,1,2,3,4",
+                    inStatus: "0,1,702"
+                  }
+                }
+                httpGet(data, _this.$api.getCertificates).then(res => {
+                  if (res.success) {
+                    let dataOne = utils.zlib_unzip(res.data)
+                    dataOne.map(lt => {
+                      if (lt.content) {
+                        lt['contentJSON'] = JSON.parse(lt.content)
+                        if (lt.type == 0) {
+                          let data = {
+                            code: "lwj/faceOperate",
+                            data: {
+                              faceIndex: lt.contentJSON.index,
+                              action: 2,
+                              endTime: lt.endTime,
+                              faceData: lt.contentJSON.faceData,
+                              lockerId: row.deviceNum,
+                              lockerUserId: lt.contentJSON.userPassword,
+                              startTime: lt.startTime,
+                              operateMode: 22,
+                              order: 6222
+                            }
+                          }
+                          httpPost(data, this.$api.sendCommand).then(res1 => {
+                            console.log(res1);
+                            lt.contentJSON.operateMode = 22
+                            lt.contentJSON.order = 6222
+                            if (res1.success) {
+                              let updatedata = {
+                                id: lt.id,
+                                status: 0,
+                                serial: res1.data.serialNumber,
+                                content: JSON.stringify(lt.contentJSON)
+                              }
+                              httpPost(updatedata, this.$api.updateCertificates).then(res2 => {
+                                console.log(res2);
+                                if (res2.success) {
+                                  this.$message.success('删除成功')
+                                } else {
+                                  this.$message.error('删除失败')
+                                }
+                              })
+                            }
+                          })
+                        } else if (lt.type == 1) {
+                          let datastr = {
+                            code: "lwj/fpOperate",
+                            data: {
+                              lockerId: row.deviceNum,
+                              lockerUserId: lt.contentJSON.userPassword,
+                              action: 2,
+                              fpData: null,
+                              startTime: lt.startTime,
+                              endTime: lt.endTime,
+                              cardName: lt.contentJSON.cardName,
+                              roomName: row.roomName,
+                              fpIndex: lt.contentJSON.index,
+                              operateMode: 18,
+                              order: 6218
+                            }
+                          }
+                          httpPost(datastr, this.$api.sendCommand).then(res1 => {
+                            console.log(res1)
+                            lt.contentJSON.operateMode = 18
+                            lt.contentJSON.order = 6218
+                            let updatedata = {
+                              id: lt.id,
+                              status: 0,
+                              content: JSON.stringify(lt.contentJSON),
+                              serial: res1.data.serialNumber
+                            }
+                            httpPost(updatedata, this.$api.updateCertificates).then(res2 => {
+                              console.log(res2);
+                              if (res2.success) {
+                                this.$message.success('删除成功')
+                              } else {
+                                this.$message.error('删除失败')
+                              }
+                            })
+                          })
+                        } else if (lt.type == 2) {
+
+                        } else if (lt.type == 3) {
+                          let data = {
+                            code: "lwj/cardOperate",
+                            data: {
+                              lockerId: row.deviceNum,
+                              lockerUserId: lt.contentJSON.userPassword,
+                              action: 2,
+                              cardNo: lt.contentJSON.password,
+                              startTime: lt.startTime,
+                              endTime: lt.endTime,
+                              cardName: lt.name + '-' + lt.contentJSON.pzname,
+                              roomName: row.roomName,
+                              operateMode: 12,
+                              order: 6212
+                            }
+                          }
+                          httpPost(data, _this.$api.sendCommand).then(res => {
+                            console.log(res);
+                            lt.contentJSON.operateMode = 12
+                            lt.contentJSON.order = 6212
+                            if (res.success) {
+                              let updatedata = {
+                                id: lt.id,
+                                status: 0,
+                                content: JSON.stringify(lt.contentJSON),
+                                serial: res.data.serialNumber
+                              }
+                              httpPost(updatedata, _this.$api.updateCertificates).then(res1 => {
+                                console.log(res1);
+                                if (res1.success) {
+                                  this.$message.success('删除成功')
+                                } else {
+                                  this.$message.error('删除失败')
+                                }
+                              })
+                            }
+                          })
+                        } else if (lt.type == 4) {
+                          let data = {
+                            code: "lwj/passwordOperate",
+                            data: {
+                              lockerId: row.deviceNum,
+                              lockerUserId: lt.contentJSON.userPassword,
+                              action: 2,
+                              passwordIndex: lt.contentJSON.index,
+                              password: lt.contentJSON.password,
+                              startTime: lt.startTime,
+                              endTime: lt.endTime,
+                              cardName: lt.contentJSON.cardName,
+                              roomName: lt.contentJSON.roomName,
+                              operateMode: 9,
+                              order: 6209
+                            }
+                          }
+                          httpPost(data, this.$api.sendCommand).then(res => {
+                            console.log(res);
+                            lt.contentJSON.operateMode = 9
+                            lt.contentJSON.order = 6209
+                            let updatedata = {
+                              id: lt.id,
+                              status: 0,
+                              content: JSON.stringify(lt.contentJSON),
+                              serial: res.data.serialNumber
+                            }
+                            httpPost(updatedata, this.$api.updateCertificates).then(res1 => {
+                              console.log(res1);
+                              if (res1.success) {
+                                this.$message.success('删除成功')
+                              } else {
+                                this.$message.error('删除失败')
+                              }
+                            })
+                          })
+                        }
+                      } else { }
+                    })
+                  }
+                })
               }
             }
           }