diff --git a/config/prod.env.js b/config/prod.env.js
index a1c6dd9..4d307cf 100644
--- a/config/prod.env.js
+++ b/config/prod.env.js
@@ -1,6 +1,6 @@
 'use strict'
 module.exports = {
   NODE_ENV: '"production"',
-  BASE_API: '"http://111.198.10.15:11802"'
+  BASE_API: '"http://198.168.0.10:20005"'
   // BASE_API: '"http://192.168.8.211:20005"'
 }

diff --git a/config/prod.env.js b/config/prod.env.js
index a1c6dd9..4d307cf 100644
--- a/config/prod.env.js
+++ b/config/prod.env.js
@@ -1,6 +1,6 @@
 'use strict'
 module.exports = {
   NODE_ENV: '"production"',
-  BASE_API: '"http://111.198.10.15:11802"'
+  BASE_API: '"http://198.168.0.10:20005"'
   // BASE_API: '"http://192.168.8.211:20005"'
 }
diff --git a/src/api/access.js b/src/api/access.js
index 54dda50..156c1c4 100644
--- a/src/api/access.js
+++ b/src/api/access.js
@@ -30,14 +30,15 @@
   })
 }
 // 新增授权
-export function addPermission(params) {
+export function addPermission(form) {
   return request({
     url: 'acsPermission/add',
     method: 'post',
-    params,
-    paramsSerializer: params => {
-      return qs.stringify(params, { indices: false })
-    }
+    params: {
+      doorCode: form.doorCode,
+      strategyId: form.strategyId
+    },
+    data: form.personList
   })
 }
 

diff --git a/config/prod.env.js b/config/prod.env.js
index a1c6dd9..4d307cf 100644
--- a/config/prod.env.js
+++ b/config/prod.env.js
@@ -1,6 +1,6 @@
 'use strict'
 module.exports = {
   NODE_ENV: '"production"',
-  BASE_API: '"http://111.198.10.15:11802"'
+  BASE_API: '"http://198.168.0.10:20005"'
   // BASE_API: '"http://192.168.8.211:20005"'
 }
diff --git a/src/api/access.js b/src/api/access.js
index 54dda50..156c1c4 100644
--- a/src/api/access.js
+++ b/src/api/access.js
@@ -30,14 +30,15 @@
   })
 }
 // 新增授权
-export function addPermission(params) {
+export function addPermission(form) {
   return request({
     url: 'acsPermission/add',
     method: 'post',
-    params,
-    paramsSerializer: params => {
-      return qs.stringify(params, { indices: false })
-    }
+    params: {
+      doorCode: form.doorCode,
+      strategyId: form.strategyId
+    },
+    data: form.personList
   })
 }
 
diff --git a/src/assets/global_images/eye.png b/src/assets/global_images/eye.png
new file mode 100644
index 0000000..afef275
--- /dev/null
+++ b/src/assets/global_images/eye.png
Binary files differ

diff --git a/config/prod.env.js b/config/prod.env.js
index a1c6dd9..4d307cf 100644
--- a/config/prod.env.js
+++ b/config/prod.env.js
@@ -1,6 +1,6 @@
 'use strict'
 module.exports = {
   NODE_ENV: '"production"',
-  BASE_API: '"http://111.198.10.15:11802"'
+  BASE_API: '"http://198.168.0.10:20005"'
   // BASE_API: '"http://192.168.8.211:20005"'
 }
diff --git a/src/api/access.js b/src/api/access.js
index 54dda50..156c1c4 100644
--- a/src/api/access.js
+++ b/src/api/access.js
@@ -30,14 +30,15 @@
   })
 }
 // 新增授权
-export function addPermission(params) {
+export function addPermission(form) {
   return request({
     url: 'acsPermission/add',
     method: 'post',
-    params,
-    paramsSerializer: params => {
-      return qs.stringify(params, { indices: false })
-    }
+    params: {
+      doorCode: form.doorCode,
+      strategyId: form.strategyId
+    },
+    data: form.personList
   })
 }
 
diff --git a/src/assets/global_images/eye.png b/src/assets/global_images/eye.png
new file mode 100644
index 0000000..afef275
--- /dev/null
+++ b/src/assets/global_images/eye.png
Binary files differ
diff --git a/src/views/doorManage/controlDoor.vue b/src/views/doorManage/controlDoor.vue
index dc19d8e..a931668 100644
--- a/src/views/doorManage/controlDoor.vue
+++ b/src/views/doorManage/controlDoor.vue
@@ -107,6 +107,10 @@
     },
     // 保存数据
     saveData: function() {
+      if(this.doorForm.beginDateTime >= this.doorForm.endDateTime){
+        this.$message.warning("生效时间必须小于失效时间")
+        return
+      }
       this.updateData()
     },
     // 修改数据

diff --git a/config/prod.env.js b/config/prod.env.js
index a1c6dd9..4d307cf 100644
--- a/config/prod.env.js
+++ b/config/prod.env.js
@@ -1,6 +1,6 @@
 'use strict'
 module.exports = {
   NODE_ENV: '"production"',
-  BASE_API: '"http://111.198.10.15:11802"'
+  BASE_API: '"http://198.168.0.10:20005"'
   // BASE_API: '"http://192.168.8.211:20005"'
 }
diff --git a/src/api/access.js b/src/api/access.js
index 54dda50..156c1c4 100644
--- a/src/api/access.js
+++ b/src/api/access.js
@@ -30,14 +30,15 @@
   })
 }
 // 新增授权
-export function addPermission(params) {
+export function addPermission(form) {
   return request({
     url: 'acsPermission/add',
     method: 'post',
-    params,
-    paramsSerializer: params => {
-      return qs.stringify(params, { indices: false })
-    }
+    params: {
+      doorCode: form.doorCode,
+      strategyId: form.strategyId
+    },
+    data: form.personList
   })
 }
 
diff --git a/src/assets/global_images/eye.png b/src/assets/global_images/eye.png
new file mode 100644
index 0000000..afef275
--- /dev/null
+++ b/src/assets/global_images/eye.png
Binary files differ
diff --git a/src/views/doorManage/controlDoor.vue b/src/views/doorManage/controlDoor.vue
index dc19d8e..a931668 100644
--- a/src/views/doorManage/controlDoor.vue
+++ b/src/views/doorManage/controlDoor.vue
@@ -107,6 +107,10 @@
     },
     // 保存数据
     saveData: function() {
+      if(this.doorForm.beginDateTime >= this.doorForm.endDateTime){
+        this.$message.warning("生效时间必须小于失效时间")
+        return
+      }
       this.updateData()
     },
     // 修改数据
diff --git a/src/views/memberManage/addIris.vue b/src/views/memberManage/addIris.vue
index 67e85eb..5e908e2 100644
--- a/src/views/memberManage/addIris.vue
+++ b/src/views/memberManage/addIris.vue
@@ -21,7 +21,8 @@
         image_zy1: '',
         image_yy1: ''
       },
-      iframeMsg: ''
+      iframeMsg: '',
+      type: '' // 跳转类型
     }
   },
   mounted() {
@@ -36,6 +37,9 @@
     if (this.$route.query.idCardNo) {
       this.irisForm.idCardNo = this.$route.query.idCardNo
     }
+    if (this.$route.query.type) {
+      this.type = this.$route.query.type
+    }
     // console.log(this.irisForm)
   },
   activated() {
@@ -50,6 +54,9 @@
     if (this.$route.query.idCardNo) {
       this.irisForm.idCardNo = this.$route.query.idCardNo
     }
+    if (this.$route.query.type) {
+      this.type = this.$route.query.type
+    }
     // console.log(this.irisForm)
   },
   methods: {
@@ -89,7 +96,12 @@
         if (response.code === 200) {
           this.$message.success('保存虹膜成功')
           this.resetForm()
-          this.$router.push({ path: '/staff' })
+          if (this.type === 'visitor') {
+            this.$router.push({ path: '/visitor' })
+          } else {
+            this.$router.push({ path: '/staff' })
+          }
+
         }
       })
     }

diff --git a/config/prod.env.js b/config/prod.env.js
index a1c6dd9..4d307cf 100644
--- a/config/prod.env.js
+++ b/config/prod.env.js
@@ -1,6 +1,6 @@
 'use strict'
 module.exports = {
   NODE_ENV: '"production"',
-  BASE_API: '"http://111.198.10.15:11802"'
+  BASE_API: '"http://198.168.0.10:20005"'
   // BASE_API: '"http://192.168.8.211:20005"'
 }
diff --git a/src/api/access.js b/src/api/access.js
index 54dda50..156c1c4 100644
--- a/src/api/access.js
+++ b/src/api/access.js
@@ -30,14 +30,15 @@
   })
 }
 // 新增授权
-export function addPermission(params) {
+export function addPermission(form) {
   return request({
     url: 'acsPermission/add',
     method: 'post',
-    params,
-    paramsSerializer: params => {
-      return qs.stringify(params, { indices: false })
-    }
+    params: {
+      doorCode: form.doorCode,
+      strategyId: form.strategyId
+    },
+    data: form.personList
   })
 }
 
diff --git a/src/assets/global_images/eye.png b/src/assets/global_images/eye.png
new file mode 100644
index 0000000..afef275
--- /dev/null
+++ b/src/assets/global_images/eye.png
Binary files differ
diff --git a/src/views/doorManage/controlDoor.vue b/src/views/doorManage/controlDoor.vue
index dc19d8e..a931668 100644
--- a/src/views/doorManage/controlDoor.vue
+++ b/src/views/doorManage/controlDoor.vue
@@ -107,6 +107,10 @@
     },
     // 保存数据
     saveData: function() {
+      if(this.doorForm.beginDateTime >= this.doorForm.endDateTime){
+        this.$message.warning("生效时间必须小于失效时间")
+        return
+      }
       this.updateData()
     },
     // 修改数据
diff --git a/src/views/memberManage/addIris.vue b/src/views/memberManage/addIris.vue
index 67e85eb..5e908e2 100644
--- a/src/views/memberManage/addIris.vue
+++ b/src/views/memberManage/addIris.vue
@@ -21,7 +21,8 @@
         image_zy1: '',
         image_yy1: ''
       },
-      iframeMsg: ''
+      iframeMsg: '',
+      type: '' // 跳转类型
     }
   },
   mounted() {
@@ -36,6 +37,9 @@
     if (this.$route.query.idCardNo) {
       this.irisForm.idCardNo = this.$route.query.idCardNo
     }
+    if (this.$route.query.type) {
+      this.type = this.$route.query.type
+    }
     // console.log(this.irisForm)
   },
   activated() {
@@ -50,6 +54,9 @@
     if (this.$route.query.idCardNo) {
       this.irisForm.idCardNo = this.$route.query.idCardNo
     }
+    if (this.$route.query.type) {
+      this.type = this.$route.query.type
+    }
     // console.log(this.irisForm)
   },
   methods: {
@@ -89,7 +96,12 @@
         if (response.code === 200) {
           this.$message.success('保存虹膜成功')
           this.resetForm()
-          this.$router.push({ path: '/staff' })
+          if (this.type === 'visitor') {
+            this.$router.push({ path: '/visitor' })
+          } else {
+            this.$router.push({ path: '/staff' })
+          }
+
         }
       })
     }
diff --git a/src/views/memberManage/addPersonIris.vue b/src/views/memberManage/addPersonIris.vue
index 269c83d..4317e16 100644
--- a/src/views/memberManage/addPersonIris.vue
+++ b/src/views/memberManage/addPersonIris.vue
@@ -617,6 +617,19 @@
         this.iframeMsg = res
       }
     },
+    // 注册虹膜
+    registerIris() {
+      // 如果已经保存
+      // this.isSave = true
+      if (this.isSave) {
+        this.step = '2'
+        this.irisBtnName = '初始化设备'
+        this.irisBtnDisable = true
+        this.devLoading = true
+      } else {
+        this.$message.warning('请先保存用户基本信息')
+      }
+    },
     // 保存虹膜数据
     addSuccess() {
       // this.$message.success('保存虹膜成功')

diff --git a/config/prod.env.js b/config/prod.env.js
index a1c6dd9..4d307cf 100644
--- a/config/prod.env.js
+++ b/config/prod.env.js
@@ -1,6 +1,6 @@
 'use strict'
 module.exports = {
   NODE_ENV: '"production"',
-  BASE_API: '"http://111.198.10.15:11802"'
+  BASE_API: '"http://198.168.0.10:20005"'
   // BASE_API: '"http://192.168.8.211:20005"'
 }
diff --git a/src/api/access.js b/src/api/access.js
index 54dda50..156c1c4 100644
--- a/src/api/access.js
+++ b/src/api/access.js
@@ -30,14 +30,15 @@
   })
 }
 // 新增授权
-export function addPermission(params) {
+export function addPermission(form) {
   return request({
     url: 'acsPermission/add',
     method: 'post',
-    params,
-    paramsSerializer: params => {
-      return qs.stringify(params, { indices: false })
-    }
+    params: {
+      doorCode: form.doorCode,
+      strategyId: form.strategyId
+    },
+    data: form.personList
   })
 }
 
diff --git a/src/assets/global_images/eye.png b/src/assets/global_images/eye.png
new file mode 100644
index 0000000..afef275
--- /dev/null
+++ b/src/assets/global_images/eye.png
Binary files differ
diff --git a/src/views/doorManage/controlDoor.vue b/src/views/doorManage/controlDoor.vue
index dc19d8e..a931668 100644
--- a/src/views/doorManage/controlDoor.vue
+++ b/src/views/doorManage/controlDoor.vue
@@ -107,6 +107,10 @@
     },
     // 保存数据
     saveData: function() {
+      if(this.doorForm.beginDateTime >= this.doorForm.endDateTime){
+        this.$message.warning("生效时间必须小于失效时间")
+        return
+      }
       this.updateData()
     },
     // 修改数据
diff --git a/src/views/memberManage/addIris.vue b/src/views/memberManage/addIris.vue
index 67e85eb..5e908e2 100644
--- a/src/views/memberManage/addIris.vue
+++ b/src/views/memberManage/addIris.vue
@@ -21,7 +21,8 @@
         image_zy1: '',
         image_yy1: ''
       },
-      iframeMsg: ''
+      iframeMsg: '',
+      type: '' // 跳转类型
     }
   },
   mounted() {
@@ -36,6 +37,9 @@
     if (this.$route.query.idCardNo) {
       this.irisForm.idCardNo = this.$route.query.idCardNo
     }
+    if (this.$route.query.type) {
+      this.type = this.$route.query.type
+    }
     // console.log(this.irisForm)
   },
   activated() {
@@ -50,6 +54,9 @@
     if (this.$route.query.idCardNo) {
       this.irisForm.idCardNo = this.$route.query.idCardNo
     }
+    if (this.$route.query.type) {
+      this.type = this.$route.query.type
+    }
     // console.log(this.irisForm)
   },
   methods: {
@@ -89,7 +96,12 @@
         if (response.code === 200) {
           this.$message.success('保存虹膜成功')
           this.resetForm()
-          this.$router.push({ path: '/staff' })
+          if (this.type === 'visitor') {
+            this.$router.push({ path: '/visitor' })
+          } else {
+            this.$router.push({ path: '/staff' })
+          }
+
         }
       })
     }
diff --git a/src/views/memberManage/addPersonIris.vue b/src/views/memberManage/addPersonIris.vue
index 269c83d..4317e16 100644
--- a/src/views/memberManage/addPersonIris.vue
+++ b/src/views/memberManage/addPersonIris.vue
@@ -617,6 +617,19 @@
         this.iframeMsg = res
       }
     },
+    // 注册虹膜
+    registerIris() {
+      // 如果已经保存
+      // this.isSave = true
+      if (this.isSave) {
+        this.step = '2'
+        this.irisBtnName = '初始化设备'
+        this.irisBtnDisable = true
+        this.devLoading = true
+      } else {
+        this.$message.warning('请先保存用户基本信息')
+      }
+    },
     // 保存虹膜数据
     addSuccess() {
       // this.$message.success('保存虹膜成功')
diff --git a/src/views/memberManage/listStaff.vue b/src/views/memberManage/listStaff.vue
index 0706ff5..092d85a 100644
--- a/src/views/memberManage/listStaff.vue
+++ b/src/views/memberManage/listStaff.vue
@@ -268,6 +268,26 @@
         }
       })
     },
+    registerIris(row) {
+      // const token = getToken()
+      // const id = row.id
+      // const idCardNo = row.idCardNo
+      // const baseUrl = getProject().register_url
+      // if (isIE()) {
+      //   const url = baseUrl + '?token=' + token + '_id=' + id + '_idCardNo=' + idCardNo
+      //   window.open(url, '_blank')
+      // } else {
+      //   const url = 'openIE:' + baseUrl + '?token=' + token + '_id=' + id + '_idCardNo=' + idCardNo
+      //   window.location.href = url
+      // }
+      this.$router.push({
+        path: '/addIris',
+        query: {
+          personId: row.id,
+          idCardNo: row.idCardNo
+        }
+      })
+    },
     // 批量导出
     batchExport() {
       // 全屏加载动画

diff --git a/config/prod.env.js b/config/prod.env.js
index a1c6dd9..4d307cf 100644
--- a/config/prod.env.js
+++ b/config/prod.env.js
@@ -1,6 +1,6 @@
 'use strict'
 module.exports = {
   NODE_ENV: '"production"',
-  BASE_API: '"http://111.198.10.15:11802"'
+  BASE_API: '"http://198.168.0.10:20005"'
   // BASE_API: '"http://192.168.8.211:20005"'
 }
diff --git a/src/api/access.js b/src/api/access.js
index 54dda50..156c1c4 100644
--- a/src/api/access.js
+++ b/src/api/access.js
@@ -30,14 +30,15 @@
   })
 }
 // 新增授权
-export function addPermission(params) {
+export function addPermission(form) {
   return request({
     url: 'acsPermission/add',
     method: 'post',
-    params,
-    paramsSerializer: params => {
-      return qs.stringify(params, { indices: false })
-    }
+    params: {
+      doorCode: form.doorCode,
+      strategyId: form.strategyId
+    },
+    data: form.personList
   })
 }
 
diff --git a/src/assets/global_images/eye.png b/src/assets/global_images/eye.png
new file mode 100644
index 0000000..afef275
--- /dev/null
+++ b/src/assets/global_images/eye.png
Binary files differ
diff --git a/src/views/doorManage/controlDoor.vue b/src/views/doorManage/controlDoor.vue
index dc19d8e..a931668 100644
--- a/src/views/doorManage/controlDoor.vue
+++ b/src/views/doorManage/controlDoor.vue
@@ -107,6 +107,10 @@
     },
     // 保存数据
     saveData: function() {
+      if(this.doorForm.beginDateTime >= this.doorForm.endDateTime){
+        this.$message.warning("生效时间必须小于失效时间")
+        return
+      }
       this.updateData()
     },
     // 修改数据
diff --git a/src/views/memberManage/addIris.vue b/src/views/memberManage/addIris.vue
index 67e85eb..5e908e2 100644
--- a/src/views/memberManage/addIris.vue
+++ b/src/views/memberManage/addIris.vue
@@ -21,7 +21,8 @@
         image_zy1: '',
         image_yy1: ''
       },
-      iframeMsg: ''
+      iframeMsg: '',
+      type: '' // 跳转类型
     }
   },
   mounted() {
@@ -36,6 +37,9 @@
     if (this.$route.query.idCardNo) {
       this.irisForm.idCardNo = this.$route.query.idCardNo
     }
+    if (this.$route.query.type) {
+      this.type = this.$route.query.type
+    }
     // console.log(this.irisForm)
   },
   activated() {
@@ -50,6 +54,9 @@
     if (this.$route.query.idCardNo) {
       this.irisForm.idCardNo = this.$route.query.idCardNo
     }
+    if (this.$route.query.type) {
+      this.type = this.$route.query.type
+    }
     // console.log(this.irisForm)
   },
   methods: {
@@ -89,7 +96,12 @@
         if (response.code === 200) {
           this.$message.success('保存虹膜成功')
           this.resetForm()
-          this.$router.push({ path: '/staff' })
+          if (this.type === 'visitor') {
+            this.$router.push({ path: '/visitor' })
+          } else {
+            this.$router.push({ path: '/staff' })
+          }
+
         }
       })
     }
diff --git a/src/views/memberManage/addPersonIris.vue b/src/views/memberManage/addPersonIris.vue
index 269c83d..4317e16 100644
--- a/src/views/memberManage/addPersonIris.vue
+++ b/src/views/memberManage/addPersonIris.vue
@@ -617,6 +617,19 @@
         this.iframeMsg = res
       }
     },
+    // 注册虹膜
+    registerIris() {
+      // 如果已经保存
+      // this.isSave = true
+      if (this.isSave) {
+        this.step = '2'
+        this.irisBtnName = '初始化设备'
+        this.irisBtnDisable = true
+        this.devLoading = true
+      } else {
+        this.$message.warning('请先保存用户基本信息')
+      }
+    },
     // 保存虹膜数据
     addSuccess() {
       // this.$message.success('保存虹膜成功')
diff --git a/src/views/memberManage/listStaff.vue b/src/views/memberManage/listStaff.vue
index 0706ff5..092d85a 100644
--- a/src/views/memberManage/listStaff.vue
+++ b/src/views/memberManage/listStaff.vue
@@ -268,6 +268,26 @@
         }
       })
     },
+    registerIris(row) {
+      // const token = getToken()
+      // const id = row.id
+      // const idCardNo = row.idCardNo
+      // const baseUrl = getProject().register_url
+      // if (isIE()) {
+      //   const url = baseUrl + '?token=' + token + '_id=' + id + '_idCardNo=' + idCardNo
+      //   window.open(url, '_blank')
+      // } else {
+      //   const url = 'openIE:' + baseUrl + '?token=' + token + '_id=' + id + '_idCardNo=' + idCardNo
+      //   window.location.href = url
+      // }
+      this.$router.push({
+        path: '/addIris',
+        query: {
+          personId: row.id,
+          idCardNo: row.idCardNo
+        }
+      })
+    },
     // 批量导出
     batchExport() {
       // 全屏加载动画
diff --git a/src/views/memberManage/listVisitor.vue b/src/views/memberManage/listVisitor.vue
index b6e0a3d..e3ffc97 100644
--- a/src/views/memberManage/listVisitor.vue
+++ b/src/views/memberManage/listVisitor.vue
@@ -234,17 +234,25 @@
       })
     },
     registerIris(row) {
-      const token = getToken()
-      const id = row.id
-      const idCardNo = row.idCardNo
-      const baseUrl = getProject().register_url
-      if (isIE()) {
-        const url = baseUrl + '?token=' + token + '_id=' + id + '_idCardNo=' + idCardNo
-        window.open(url, '_blank')
-      } else {
-        const url = 'openIE:' + baseUrl + '?token=' + token + '_id=' + id + '_idCardNo=' + idCardNo
-        window.location.href = url
-      }
+      // const token = getToken()
+      // const id = row.id
+      // const idCardNo = row.idCardNo
+      // const baseUrl = getProject().register_url
+      // if (isIE()) {
+      //   const url = baseUrl + '?token=' + token + '_id=' + id + '_idCardNo=' + idCardNo
+      //   window.open(url, '_blank')
+      // } else {
+      //   const url = 'openIE:' + baseUrl + '?token=' + token + '_id=' + id + '_idCardNo=' + idCardNo
+      //   window.location.href = url
+      // }
+      this.$router.push({
+        path: '/addIris',
+        query: {
+          personId: row.id,
+          idCardNo: row.idCardNo,
+          type: 'visitor'
+        }
+      })
     },
     // 查询数据
     search() {

diff --git a/config/prod.env.js b/config/prod.env.js
index a1c6dd9..4d307cf 100644
--- a/config/prod.env.js
+++ b/config/prod.env.js
@@ -1,6 +1,6 @@
 'use strict'
 module.exports = {
   NODE_ENV: '"production"',
-  BASE_API: '"http://111.198.10.15:11802"'
+  BASE_API: '"http://198.168.0.10:20005"'
   // BASE_API: '"http://192.168.8.211:20005"'
 }
diff --git a/src/api/access.js b/src/api/access.js
index 54dda50..156c1c4 100644
--- a/src/api/access.js
+++ b/src/api/access.js
@@ -30,14 +30,15 @@
   })
 }
 // 新增授权
-export function addPermission(params) {
+export function addPermission(form) {
   return request({
     url: 'acsPermission/add',
     method: 'post',
-    params,
-    paramsSerializer: params => {
-      return qs.stringify(params, { indices: false })
-    }
+    params: {
+      doorCode: form.doorCode,
+      strategyId: form.strategyId
+    },
+    data: form.personList
   })
 }
 
diff --git a/src/assets/global_images/eye.png b/src/assets/global_images/eye.png
new file mode 100644
index 0000000..afef275
--- /dev/null
+++ b/src/assets/global_images/eye.png
Binary files differ
diff --git a/src/views/doorManage/controlDoor.vue b/src/views/doorManage/controlDoor.vue
index dc19d8e..a931668 100644
--- a/src/views/doorManage/controlDoor.vue
+++ b/src/views/doorManage/controlDoor.vue
@@ -107,6 +107,10 @@
     },
     // 保存数据
     saveData: function() {
+      if(this.doorForm.beginDateTime >= this.doorForm.endDateTime){
+        this.$message.warning("生效时间必须小于失效时间")
+        return
+      }
       this.updateData()
     },
     // 修改数据
diff --git a/src/views/memberManage/addIris.vue b/src/views/memberManage/addIris.vue
index 67e85eb..5e908e2 100644
--- a/src/views/memberManage/addIris.vue
+++ b/src/views/memberManage/addIris.vue
@@ -21,7 +21,8 @@
         image_zy1: '',
         image_yy1: ''
       },
-      iframeMsg: ''
+      iframeMsg: '',
+      type: '' // 跳转类型
     }
   },
   mounted() {
@@ -36,6 +37,9 @@
     if (this.$route.query.idCardNo) {
       this.irisForm.idCardNo = this.$route.query.idCardNo
     }
+    if (this.$route.query.type) {
+      this.type = this.$route.query.type
+    }
     // console.log(this.irisForm)
   },
   activated() {
@@ -50,6 +54,9 @@
     if (this.$route.query.idCardNo) {
       this.irisForm.idCardNo = this.$route.query.idCardNo
     }
+    if (this.$route.query.type) {
+      this.type = this.$route.query.type
+    }
     // console.log(this.irisForm)
   },
   methods: {
@@ -89,7 +96,12 @@
         if (response.code === 200) {
           this.$message.success('保存虹膜成功')
           this.resetForm()
-          this.$router.push({ path: '/staff' })
+          if (this.type === 'visitor') {
+            this.$router.push({ path: '/visitor' })
+          } else {
+            this.$router.push({ path: '/staff' })
+          }
+
         }
       })
     }
diff --git a/src/views/memberManage/addPersonIris.vue b/src/views/memberManage/addPersonIris.vue
index 269c83d..4317e16 100644
--- a/src/views/memberManage/addPersonIris.vue
+++ b/src/views/memberManage/addPersonIris.vue
@@ -617,6 +617,19 @@
         this.iframeMsg = res
       }
     },
+    // 注册虹膜
+    registerIris() {
+      // 如果已经保存
+      // this.isSave = true
+      if (this.isSave) {
+        this.step = '2'
+        this.irisBtnName = '初始化设备'
+        this.irisBtnDisable = true
+        this.devLoading = true
+      } else {
+        this.$message.warning('请先保存用户基本信息')
+      }
+    },
     // 保存虹膜数据
     addSuccess() {
       // this.$message.success('保存虹膜成功')
diff --git a/src/views/memberManage/listStaff.vue b/src/views/memberManage/listStaff.vue
index 0706ff5..092d85a 100644
--- a/src/views/memberManage/listStaff.vue
+++ b/src/views/memberManage/listStaff.vue
@@ -268,6 +268,26 @@
         }
       })
     },
+    registerIris(row) {
+      // const token = getToken()
+      // const id = row.id
+      // const idCardNo = row.idCardNo
+      // const baseUrl = getProject().register_url
+      // if (isIE()) {
+      //   const url = baseUrl + '?token=' + token + '_id=' + id + '_idCardNo=' + idCardNo
+      //   window.open(url, '_blank')
+      // } else {
+      //   const url = 'openIE:' + baseUrl + '?token=' + token + '_id=' + id + '_idCardNo=' + idCardNo
+      //   window.location.href = url
+      // }
+      this.$router.push({
+        path: '/addIris',
+        query: {
+          personId: row.id,
+          idCardNo: row.idCardNo
+        }
+      })
+    },
     // 批量导出
     batchExport() {
       // 全屏加载动画
diff --git a/src/views/memberManage/listVisitor.vue b/src/views/memberManage/listVisitor.vue
index b6e0a3d..e3ffc97 100644
--- a/src/views/memberManage/listVisitor.vue
+++ b/src/views/memberManage/listVisitor.vue
@@ -234,17 +234,25 @@
       })
     },
     registerIris(row) {
-      const token = getToken()
-      const id = row.id
-      const idCardNo = row.idCardNo
-      const baseUrl = getProject().register_url
-      if (isIE()) {
-        const url = baseUrl + '?token=' + token + '_id=' + id + '_idCardNo=' + idCardNo
-        window.open(url, '_blank')
-      } else {
-        const url = 'openIE:' + baseUrl + '?token=' + token + '_id=' + id + '_idCardNo=' + idCardNo
-        window.location.href = url
-      }
+      // const token = getToken()
+      // const id = row.id
+      // const idCardNo = row.idCardNo
+      // const baseUrl = getProject().register_url
+      // if (isIE()) {
+      //   const url = baseUrl + '?token=' + token + '_id=' + id + '_idCardNo=' + idCardNo
+      //   window.open(url, '_blank')
+      // } else {
+      //   const url = 'openIE:' + baseUrl + '?token=' + token + '_id=' + id + '_idCardNo=' + idCardNo
+      //   window.location.href = url
+      // }
+      this.$router.push({
+        path: '/addIris',
+        query: {
+          personId: row.id,
+          idCardNo: row.idCardNo,
+          type: 'visitor'
+        }
+      })
     },
     // 查询数据
     search() {
diff --git a/src/views/query/queryStaff.vue b/src/views/query/queryStaff.vue
index c5534f7..279818b 100644
--- a/src/views/query/queryStaff.vue
+++ b/src/views/query/queryStaff.vue
@@ -9,25 +9,25 @@
           <el-form-item class="selectForm-container-item">
             <dept-select v-model="listQuery.personDeptId" :need-top="false" placeholder="单位/部门" />
           </el-form-item>
-          <!--<el-form-item class="selectForm-container-item">-->
-          <!--<el-select v-model="listQuery.doorCode" placeholder="门禁" clearable value="">-->
-          <!--<el-option-->
-          <!--v-for="item in doorList"-->
-          <!--:key="item.id"-->
-          <!--:label="item.doorName"-->
-          <!-- :value="item.doorCode"/> -->
-          <!--</el-select>-->
-          <!--</el-form-item>-->
           <el-form-item class="selectForm-container-item">
-            <el-select v-model="listQuery.isAbnormal" placeholder="体温状况" clearable value="">
+            <el-select v-model="listQuery.doorCode" placeholder="门禁" clearable value="">
               <el-option
-                v-for="item in temperatureState"
-                :key="'temp_'+item.value"
-                :label="item.name"
-                :value="item.value"
-              />
+              v-for="item in doorList"
+              :key="item.id"
+              :label="item.doorName"
+               :value="item.doorCode"/>
             </el-select>
           </el-form-item>
+          <!--<el-form-item class="selectForm-container-item">-->
+            <!--<el-select v-model="listQuery.isAbnormal" placeholder="体温状况" clearable value="">-->
+              <!--<el-option-->
+                <!--v-for="item in temperatureState"-->
+                <!--:key="'temp_'+item.value"-->
+                <!--:label="item.name"-->
+                <!--:value="item.value"-->
+              <!--/>-->
+            <!--</el-select>-->
+          <!--</el-form-item>-->
           <el-form-item>
             <el-date-picker
               v-model="listQuery.beginTime"
@@ -147,11 +147,11 @@
           value: 'devCode',
           align: 'center'
         },
-        // {
-        //   text: '标签',
-        //   value: 'inoutTypeName',
-        //   align: 'center'
-        // },
+        {
+          text: '标签',
+          value: 'inoutTypeName',
+          align: 'center'
+        },
         {
           text: '时间',
           value: 'dateTime',