diff --git a/src/router/modules/base.js b/src/router/modules/base.js
index b663cb5..7268361 100644
--- a/src/router/modules/base.js
+++ b/src/router/modules/base.js
@@ -57,6 +57,13 @@
         meta: { title: '编辑员工', icon: '', permission: ['/staff/update'] }
       },
       {
+        path: '/addIris',
+        name: 'AddIris',
+        hidden: true,
+        component: () => import('@/views/memberManage/addIris'),
+        meta: { title: '采集虹膜', icon: '', permission: ['/iris'] }
+      },
+      {
         path: '/addVisitor',
         name: 'AddVisiotr',
         hidden: true,

diff --git a/src/router/modules/base.js b/src/router/modules/base.js
index b663cb5..7268361 100644
--- a/src/router/modules/base.js
+++ b/src/router/modules/base.js
@@ -57,6 +57,13 @@
         meta: { title: '编辑员工', icon: '', permission: ['/staff/update'] }
       },
       {
+        path: '/addIris',
+        name: 'AddIris',
+        hidden: true,
+        component: () => import('@/views/memberManage/addIris'),
+        meta: { title: '采集虹膜', icon: '', permission: ['/iris'] }
+      },
+      {
         path: '/addVisitor',
         name: 'AddVisiotr',
         hidden: true,
diff --git a/src/views/memberManage/addIris.vue b/src/views/memberManage/addIris.vue
new file mode 100644
index 0000000..e65e74c
--- /dev/null
+++ b/src/views/memberManage/addIris.vue
@@ -0,0 +1,106 @@
+<template>
+  <div class="app-container">
+    <div class="iframeMsg">{{ iframeMsg }}</div>
+    <div>
+      <iframe name="iframeMap" scrolling="no" width="100%" height="450" frameBorder="no" src="static/eye/eye.html" style="z-index: -1;"/>
+    </div>
+  </div>
+</template>
+
+<script>
+import { saveIris } from '@/api/person'
+export default {
+  name: 'AddIris',
+  data() {
+    return {
+      irisForm: {
+        personId: '',
+        idCardNo: '',
+        image_zy0: '',
+        image_yy0: '',
+        image_zy1: '',
+        image_yy1: ''
+      },
+      iframeMsg: ''
+    }
+  },
+  mounted() {
+    // 接收iframe的传值
+    window['vueDefined'] = (receiveParams) => {
+      this.receiveParamsFromHtml(receiveParams)
+    }
+    this.resetForm()
+    if (this.$route.query.personId) {
+      this.irisForm.personId = this.$route.query.personId
+    }
+    if (this.$route.query.idCardNo) {
+      this.irisForm.idCardNo = this.$route.query.idCardNo
+    }
+    // console.log(this.irisForm)
+  },
+  activated() {
+    // 接收iframe的传值
+    window['vueDefined'] = (receiveParams) => {
+      this.receiveParamsFromHtml(receiveParams)
+    }
+    this.resetForm()
+    if (this.$route.query.personId) {
+      this.irisForm.personId = this.$route.query.personId
+    }
+    if (this.$route.query.idCardNo) {
+      this.irisForm.idCardNo = this.$route.query.idCardNo
+    }
+    // console.log(this.irisForm)
+  },
+  methods: {
+    beforeRouteLeave(to, from, next) {
+      window.frames['iframeMap'].closeDev()
+      next()
+    },
+    resetForm() {
+      this.irisForm = {
+        personId: '',
+        idCardNo: '',
+        image_zy0: '',
+        image_yy0: '',
+        image_zy1: '',
+        image_yy1: ''
+      }
+    },
+    // 接收iframe传来的消息
+    receiveParamsFromHtml(res) {
+      if (res === 'saveIrisData') {
+        this.saveIrisData()
+      } else {
+        this.iframeMsg = res
+      }
+    },
+    // 保存虹膜数据
+    saveIrisData() {
+      if (!this.irisForm.personId || !this.irisForm.idCardNo) {
+        this.$message.error('人员信息为空，请退回重试')
+        return
+      }
+      this.irisForm.image_zy0 = window.frames['iframeMap'].image0
+      this.irisForm.image_zy1 = window.frames['iframeMap'].image1
+      this.irisForm.image_yy0 = window.frames['iframeMap'].image2
+      this.irisForm.image_yy1 = window.frames['iframeMap'].image3
+      saveIris(this.irisForm).then(response => {
+        if (response.code === 200) {
+          this.$message.success('保存虹膜成功')
+          this.resetForm()
+          this.$router.push({ path: '/staff' })
+        }
+      })
+    }
+  }
+}
+</script>
+
+<style scoped>
+  .iframeMsg{
+    height: 50px;
+    text-align: center;
+    margin-top: 5px;
+  }
+</style>

diff --git a/src/router/modules/base.js b/src/router/modules/base.js
index b663cb5..7268361 100644
--- a/src/router/modules/base.js
+++ b/src/router/modules/base.js
@@ -57,6 +57,13 @@
         meta: { title: '编辑员工', icon: '', permission: ['/staff/update'] }
       },
       {
+        path: '/addIris',
+        name: 'AddIris',
+        hidden: true,
+        component: () => import('@/views/memberManage/addIris'),
+        meta: { title: '采集虹膜', icon: '', permission: ['/iris'] }
+      },
+      {
         path: '/addVisitor',
         name: 'AddVisiotr',
         hidden: true,
diff --git a/src/views/memberManage/addIris.vue b/src/views/memberManage/addIris.vue
new file mode 100644
index 0000000..e65e74c
--- /dev/null
+++ b/src/views/memberManage/addIris.vue
@@ -0,0 +1,106 @@
+<template>
+  <div class="app-container">
+    <div class="iframeMsg">{{ iframeMsg }}</div>
+    <div>
+      <iframe name="iframeMap" scrolling="no" width="100%" height="450" frameBorder="no" src="static/eye/eye.html" style="z-index: -1;"/>
+    </div>
+  </div>
+</template>
+
+<script>
+import { saveIris } from '@/api/person'
+export default {
+  name: 'AddIris',
+  data() {
+    return {
+      irisForm: {
+        personId: '',
+        idCardNo: '',
+        image_zy0: '',
+        image_yy0: '',
+        image_zy1: '',
+        image_yy1: ''
+      },
+      iframeMsg: ''
+    }
+  },
+  mounted() {
+    // 接收iframe的传值
+    window['vueDefined'] = (receiveParams) => {
+      this.receiveParamsFromHtml(receiveParams)
+    }
+    this.resetForm()
+    if (this.$route.query.personId) {
+      this.irisForm.personId = this.$route.query.personId
+    }
+    if (this.$route.query.idCardNo) {
+      this.irisForm.idCardNo = this.$route.query.idCardNo
+    }
+    // console.log(this.irisForm)
+  },
+  activated() {
+    // 接收iframe的传值
+    window['vueDefined'] = (receiveParams) => {
+      this.receiveParamsFromHtml(receiveParams)
+    }
+    this.resetForm()
+    if (this.$route.query.personId) {
+      this.irisForm.personId = this.$route.query.personId
+    }
+    if (this.$route.query.idCardNo) {
+      this.irisForm.idCardNo = this.$route.query.idCardNo
+    }
+    // console.log(this.irisForm)
+  },
+  methods: {
+    beforeRouteLeave(to, from, next) {
+      window.frames['iframeMap'].closeDev()
+      next()
+    },
+    resetForm() {
+      this.irisForm = {
+        personId: '',
+        idCardNo: '',
+        image_zy0: '',
+        image_yy0: '',
+        image_zy1: '',
+        image_yy1: ''
+      }
+    },
+    // 接收iframe传来的消息
+    receiveParamsFromHtml(res) {
+      if (res === 'saveIrisData') {
+        this.saveIrisData()
+      } else {
+        this.iframeMsg = res
+      }
+    },
+    // 保存虹膜数据
+    saveIrisData() {
+      if (!this.irisForm.personId || !this.irisForm.idCardNo) {
+        this.$message.error('人员信息为空，请退回重试')
+        return
+      }
+      this.irisForm.image_zy0 = window.frames['iframeMap'].image0
+      this.irisForm.image_zy1 = window.frames['iframeMap'].image1
+      this.irisForm.image_yy0 = window.frames['iframeMap'].image2
+      this.irisForm.image_yy1 = window.frames['iframeMap'].image3
+      saveIris(this.irisForm).then(response => {
+        if (response.code === 200) {
+          this.$message.success('保存虹膜成功')
+          this.resetForm()
+          this.$router.push({ path: '/staff' })
+        }
+      })
+    }
+  }
+}
+</script>
+
+<style scoped>
+  .iframeMsg{
+    height: 50px;
+    text-align: center;
+    margin-top: 5px;
+  }
+</style>
diff --git a/src/views/memberManage/addPerson.vue b/src/views/memberManage/addPerson.vue
index 2461895..da6fca2 100644
--- a/src/views/memberManage/addPerson.vue
+++ b/src/views/memberManage/addPerson.vue
@@ -289,10 +289,18 @@
       if (window.frames['iframeIDCard'].result) {
         this.personForm.idCardNo = window.frames['iframeIDCard'].CardNo
         this.personForm.name = window.frames['iframeIDCard'].Name
-        if (window.frames['iframeIDCard'].Sex === '2') { this.personForm.sex = '女' } else { this.personForm.sex = '男' }
+        // if (window.frames['iframeIDCard'].Sex === '2') { this.personForm.sex = '女' } else { this.personForm.sex = '男' }
+        this.personForm.sex = parseInt(window.frames['iframeIDCard'].Sex)
         this.personForm.birthday = window.frames['iframeIDCard'].Born.substring(0, 4) + '-' + window.frames['iframeIDCard'].Born.substring(4, 6) + '-' + window.frames['iframeIDCard'].Born.substring(6, 8)
         this.photo = 'data:image/png;base64,' + window.frames['iframeIDCard'].Picture
         this.personForm.nation = window.frames['iframeIDCard'].Nation + '族'
+        var nationName = window.frames['iframeIDCard'].Nation + '族'
+        for (var item of this.nationList) {
+          if (item.name === nationName) {
+            this.personForm.nation = item.value
+            break
+          }
+        }
         this.personForm.ext.certificationUnit = window.frames['iframeIDCard'].IssuedAt
         this.personForm.ext.address = window.frames['iframeIDCard'].Address
       } else {

diff --git a/src/router/modules/base.js b/src/router/modules/base.js
index b663cb5..7268361 100644
--- a/src/router/modules/base.js
+++ b/src/router/modules/base.js
@@ -57,6 +57,13 @@
         meta: { title: '编辑员工', icon: '', permission: ['/staff/update'] }
       },
       {
+        path: '/addIris',
+        name: 'AddIris',
+        hidden: true,
+        component: () => import('@/views/memberManage/addIris'),
+        meta: { title: '采集虹膜', icon: '', permission: ['/iris'] }
+      },
+      {
         path: '/addVisitor',
         name: 'AddVisiotr',
         hidden: true,
diff --git a/src/views/memberManage/addIris.vue b/src/views/memberManage/addIris.vue
new file mode 100644
index 0000000..e65e74c
--- /dev/null
+++ b/src/views/memberManage/addIris.vue
@@ -0,0 +1,106 @@
+<template>
+  <div class="app-container">
+    <div class="iframeMsg">{{ iframeMsg }}</div>
+    <div>
+      <iframe name="iframeMap" scrolling="no" width="100%" height="450" frameBorder="no" src="static/eye/eye.html" style="z-index: -1;"/>
+    </div>
+  </div>
+</template>
+
+<script>
+import { saveIris } from '@/api/person'
+export default {
+  name: 'AddIris',
+  data() {
+    return {
+      irisForm: {
+        personId: '',
+        idCardNo: '',
+        image_zy0: '',
+        image_yy0: '',
+        image_zy1: '',
+        image_yy1: ''
+      },
+      iframeMsg: ''
+    }
+  },
+  mounted() {
+    // 接收iframe的传值
+    window['vueDefined'] = (receiveParams) => {
+      this.receiveParamsFromHtml(receiveParams)
+    }
+    this.resetForm()
+    if (this.$route.query.personId) {
+      this.irisForm.personId = this.$route.query.personId
+    }
+    if (this.$route.query.idCardNo) {
+      this.irisForm.idCardNo = this.$route.query.idCardNo
+    }
+    // console.log(this.irisForm)
+  },
+  activated() {
+    // 接收iframe的传值
+    window['vueDefined'] = (receiveParams) => {
+      this.receiveParamsFromHtml(receiveParams)
+    }
+    this.resetForm()
+    if (this.$route.query.personId) {
+      this.irisForm.personId = this.$route.query.personId
+    }
+    if (this.$route.query.idCardNo) {
+      this.irisForm.idCardNo = this.$route.query.idCardNo
+    }
+    // console.log(this.irisForm)
+  },
+  methods: {
+    beforeRouteLeave(to, from, next) {
+      window.frames['iframeMap'].closeDev()
+      next()
+    },
+    resetForm() {
+      this.irisForm = {
+        personId: '',
+        idCardNo: '',
+        image_zy0: '',
+        image_yy0: '',
+        image_zy1: '',
+        image_yy1: ''
+      }
+    },
+    // 接收iframe传来的消息
+    receiveParamsFromHtml(res) {
+      if (res === 'saveIrisData') {
+        this.saveIrisData()
+      } else {
+        this.iframeMsg = res
+      }
+    },
+    // 保存虹膜数据
+    saveIrisData() {
+      if (!this.irisForm.personId || !this.irisForm.idCardNo) {
+        this.$message.error('人员信息为空，请退回重试')
+        return
+      }
+      this.irisForm.image_zy0 = window.frames['iframeMap'].image0
+      this.irisForm.image_zy1 = window.frames['iframeMap'].image1
+      this.irisForm.image_yy0 = window.frames['iframeMap'].image2
+      this.irisForm.image_yy1 = window.frames['iframeMap'].image3
+      saveIris(this.irisForm).then(response => {
+        if (response.code === 200) {
+          this.$message.success('保存虹膜成功')
+          this.resetForm()
+          this.$router.push({ path: '/staff' })
+        }
+      })
+    }
+  }
+}
+</script>
+
+<style scoped>
+  .iframeMsg{
+    height: 50px;
+    text-align: center;
+    margin-top: 5px;
+  }
+</style>
diff --git a/src/views/memberManage/addPerson.vue b/src/views/memberManage/addPerson.vue
index 2461895..da6fca2 100644
--- a/src/views/memberManage/addPerson.vue
+++ b/src/views/memberManage/addPerson.vue
@@ -289,10 +289,18 @@
       if (window.frames['iframeIDCard'].result) {
         this.personForm.idCardNo = window.frames['iframeIDCard'].CardNo
         this.personForm.name = window.frames['iframeIDCard'].Name
-        if (window.frames['iframeIDCard'].Sex === '2') { this.personForm.sex = '女' } else { this.personForm.sex = '男' }
+        // if (window.frames['iframeIDCard'].Sex === '2') { this.personForm.sex = '女' } else { this.personForm.sex = '男' }
+        this.personForm.sex = parseInt(window.frames['iframeIDCard'].Sex)
         this.personForm.birthday = window.frames['iframeIDCard'].Born.substring(0, 4) + '-' + window.frames['iframeIDCard'].Born.substring(4, 6) + '-' + window.frames['iframeIDCard'].Born.substring(6, 8)
         this.photo = 'data:image/png;base64,' + window.frames['iframeIDCard'].Picture
         this.personForm.nation = window.frames['iframeIDCard'].Nation + '族'
+        var nationName = window.frames['iframeIDCard'].Nation + '族'
+        for (var item of this.nationList) {
+          if (item.name === nationName) {
+            this.personForm.nation = item.value
+            break
+          }
+        }
         this.personForm.ext.certificationUnit = window.frames['iframeIDCard'].IssuedAt
         this.personForm.ext.address = window.frames['iframeIDCard'].Address
       } else {
diff --git a/src/views/memberManage/addPersonIris.vue b/src/views/memberManage/addPersonIris.vue
index 0512f0e..d0036b1 100644
--- a/src/views/memberManage/addPersonIris.vue
+++ b/src/views/memberManage/addPersonIris.vue
@@ -202,7 +202,7 @@
       dutyList: [], // 职务列表
       nationList: [], // 民族列表
       rules: {
-        personCode: [{ required: true, message: '员工编号必填', trigger: ['blur', 'change'] }],
+        // personCode: [{ required: true, message: '员工编号必填', trigger: ['blur', 'change'] }],
         name: [{ required: true, message: '姓名必填', trigger: ['blur', 'change'] }],
         idCardNo: [{ required: true, validator: validateIDCard, trigger: ['blur', 'change'] }],
         deptid: [{ required: true, message: '单位/部门必选', trigger: 'change' }],
@@ -295,9 +295,7 @@
       })
     },
     beforeRouteLeave(to, from, next) {
-      if (this.inited === true) {
-        window.frames['iframeMap'].closeDev()
-      }
+      window.frames['iframeMap'].closeDev()
       next()
     },
     fetchData(id) {
@@ -334,10 +332,18 @@
       if (window.frames['iframeIDCard'].result) {
         this.personForm.idCardNo = window.frames['iframeIDCard'].CardNo
         this.personForm.name = window.frames['iframeIDCard'].Name
-        if (window.frames['iframeIDCard'].Sex === '2') { this.personForm.sex = '女' } else { this.personForm.sex = '男' }
+        // if (window.frames['iframeIDCard'].Sex === '2') { this.personForm.sex = '女' } else { this.personForm.sex = '男' }
+        this.personForm.sex = parseInt(window.frames['iframeIDCard'].Sex)
         this.personForm.birthday = window.frames['iframeIDCard'].Born.substring(0, 4) + '-' + window.frames['iframeIDCard'].Born.substring(4, 6) + '-' + window.frames['iframeIDCard'].Born.substring(6, 8)
         this.photo = 'data:image/png;base64,' + window.frames['iframeIDCard'].Picture
         this.personForm.nation = window.frames['iframeIDCard'].Nation + '族'
+        var nationName = window.frames['iframeIDCard'].Nation + '族'
+        for (var item of this.nationList) {
+          if (item.name === nationName) {
+            this.personForm.nation = item.value
+            break
+          }
+        }
         this.personForm.ext.certificationUnit = window.frames['iframeIDCard'].IssuedAt
         this.personForm.ext.address = window.frames['iframeIDCard'].Address
       } else {
@@ -431,10 +437,10 @@
         }
       })
     },
-    // 注册虹膜
+    // 注册虹膜 (没用了)
     registerIris() {
       // 如果已经保存
-      this.isSave = true
+      // this.isSave = true
       if (this.isSave) {
         this.step = '2'
         this.irisBtnName = '初始化设备'
@@ -446,12 +452,13 @@
     },
     // 接收iframe传来的消息
     receiveParamsFromHtml(res) {
-      if(res === 'saveIrisData') {
+      if (res === 'saveIrisData') {
         this.saveIrisData()
-      }else{
+      } else {
         this.iframeMsg = res
       }
     },
+    // 没用了
     startCapture() {
       if (this.irisBtnName === '初始化设备') {
         this.devLoading = true
@@ -465,6 +472,7 @@
         this.saveIrisData()
       }
     },
+    // 保存虹膜数据
     saveIrisData() {
       this.irisForm.image_zy0 = window.frames['iframeMap'].image0
       this.irisForm.image_zy1 = window.frames['iframeMap'].image1
@@ -472,7 +480,6 @@
       this.irisForm.image_yy1 = window.frames['iframeMap'].image3
       this.irisForm.personId = this.personForm.id
       this.irisForm.idCardNo = this.personForm.idCardNo
-      console.log(this.irisForm)
       saveIris(this.irisForm).then(response => {
         this.step = '1'
         if (response.code === 200) {

diff --git a/src/router/modules/base.js b/src/router/modules/base.js
index b663cb5..7268361 100644
--- a/src/router/modules/base.js
+++ b/src/router/modules/base.js
@@ -57,6 +57,13 @@
         meta: { title: '编辑员工', icon: '', permission: ['/staff/update'] }
       },
       {
+        path: '/addIris',
+        name: 'AddIris',
+        hidden: true,
+        component: () => import('@/views/memberManage/addIris'),
+        meta: { title: '采集虹膜', icon: '', permission: ['/iris'] }
+      },
+      {
         path: '/addVisitor',
         name: 'AddVisiotr',
         hidden: true,
diff --git a/src/views/memberManage/addIris.vue b/src/views/memberManage/addIris.vue
new file mode 100644
index 0000000..e65e74c
--- /dev/null
+++ b/src/views/memberManage/addIris.vue
@@ -0,0 +1,106 @@
+<template>
+  <div class="app-container">
+    <div class="iframeMsg">{{ iframeMsg }}</div>
+    <div>
+      <iframe name="iframeMap" scrolling="no" width="100%" height="450" frameBorder="no" src="static/eye/eye.html" style="z-index: -1;"/>
+    </div>
+  </div>
+</template>
+
+<script>
+import { saveIris } from '@/api/person'
+export default {
+  name: 'AddIris',
+  data() {
+    return {
+      irisForm: {
+        personId: '',
+        idCardNo: '',
+        image_zy0: '',
+        image_yy0: '',
+        image_zy1: '',
+        image_yy1: ''
+      },
+      iframeMsg: ''
+    }
+  },
+  mounted() {
+    // 接收iframe的传值
+    window['vueDefined'] = (receiveParams) => {
+      this.receiveParamsFromHtml(receiveParams)
+    }
+    this.resetForm()
+    if (this.$route.query.personId) {
+      this.irisForm.personId = this.$route.query.personId
+    }
+    if (this.$route.query.idCardNo) {
+      this.irisForm.idCardNo = this.$route.query.idCardNo
+    }
+    // console.log(this.irisForm)
+  },
+  activated() {
+    // 接收iframe的传值
+    window['vueDefined'] = (receiveParams) => {
+      this.receiveParamsFromHtml(receiveParams)
+    }
+    this.resetForm()
+    if (this.$route.query.personId) {
+      this.irisForm.personId = this.$route.query.personId
+    }
+    if (this.$route.query.idCardNo) {
+      this.irisForm.idCardNo = this.$route.query.idCardNo
+    }
+    // console.log(this.irisForm)
+  },
+  methods: {
+    beforeRouteLeave(to, from, next) {
+      window.frames['iframeMap'].closeDev()
+      next()
+    },
+    resetForm() {
+      this.irisForm = {
+        personId: '',
+        idCardNo: '',
+        image_zy0: '',
+        image_yy0: '',
+        image_zy1: '',
+        image_yy1: ''
+      }
+    },
+    // 接收iframe传来的消息
+    receiveParamsFromHtml(res) {
+      if (res === 'saveIrisData') {
+        this.saveIrisData()
+      } else {
+        this.iframeMsg = res
+      }
+    },
+    // 保存虹膜数据
+    saveIrisData() {
+      if (!this.irisForm.personId || !this.irisForm.idCardNo) {
+        this.$message.error('人员信息为空，请退回重试')
+        return
+      }
+      this.irisForm.image_zy0 = window.frames['iframeMap'].image0
+      this.irisForm.image_zy1 = window.frames['iframeMap'].image1
+      this.irisForm.image_yy0 = window.frames['iframeMap'].image2
+      this.irisForm.image_yy1 = window.frames['iframeMap'].image3
+      saveIris(this.irisForm).then(response => {
+        if (response.code === 200) {
+          this.$message.success('保存虹膜成功')
+          this.resetForm()
+          this.$router.push({ path: '/staff' })
+        }
+      })
+    }
+  }
+}
+</script>
+
+<style scoped>
+  .iframeMsg{
+    height: 50px;
+    text-align: center;
+    margin-top: 5px;
+  }
+</style>
diff --git a/src/views/memberManage/addPerson.vue b/src/views/memberManage/addPerson.vue
index 2461895..da6fca2 100644
--- a/src/views/memberManage/addPerson.vue
+++ b/src/views/memberManage/addPerson.vue
@@ -289,10 +289,18 @@
       if (window.frames['iframeIDCard'].result) {
         this.personForm.idCardNo = window.frames['iframeIDCard'].CardNo
         this.personForm.name = window.frames['iframeIDCard'].Name
-        if (window.frames['iframeIDCard'].Sex === '2') { this.personForm.sex = '女' } else { this.personForm.sex = '男' }
+        // if (window.frames['iframeIDCard'].Sex === '2') { this.personForm.sex = '女' } else { this.personForm.sex = '男' }
+        this.personForm.sex = parseInt(window.frames['iframeIDCard'].Sex)
         this.personForm.birthday = window.frames['iframeIDCard'].Born.substring(0, 4) + '-' + window.frames['iframeIDCard'].Born.substring(4, 6) + '-' + window.frames['iframeIDCard'].Born.substring(6, 8)
         this.photo = 'data:image/png;base64,' + window.frames['iframeIDCard'].Picture
         this.personForm.nation = window.frames['iframeIDCard'].Nation + '族'
+        var nationName = window.frames['iframeIDCard'].Nation + '族'
+        for (var item of this.nationList) {
+          if (item.name === nationName) {
+            this.personForm.nation = item.value
+            break
+          }
+        }
         this.personForm.ext.certificationUnit = window.frames['iframeIDCard'].IssuedAt
         this.personForm.ext.address = window.frames['iframeIDCard'].Address
       } else {
diff --git a/src/views/memberManage/addPersonIris.vue b/src/views/memberManage/addPersonIris.vue
index 0512f0e..d0036b1 100644
--- a/src/views/memberManage/addPersonIris.vue
+++ b/src/views/memberManage/addPersonIris.vue
@@ -202,7 +202,7 @@
       dutyList: [], // 职务列表
       nationList: [], // 民族列表
       rules: {
-        personCode: [{ required: true, message: '员工编号必填', trigger: ['blur', 'change'] }],
+        // personCode: [{ required: true, message: '员工编号必填', trigger: ['blur', 'change'] }],
         name: [{ required: true, message: '姓名必填', trigger: ['blur', 'change'] }],
         idCardNo: [{ required: true, validator: validateIDCard, trigger: ['blur', 'change'] }],
         deptid: [{ required: true, message: '单位/部门必选', trigger: 'change' }],
@@ -295,9 +295,7 @@
       })
     },
     beforeRouteLeave(to, from, next) {
-      if (this.inited === true) {
-        window.frames['iframeMap'].closeDev()
-      }
+      window.frames['iframeMap'].closeDev()
       next()
     },
     fetchData(id) {
@@ -334,10 +332,18 @@
       if (window.frames['iframeIDCard'].result) {
         this.personForm.idCardNo = window.frames['iframeIDCard'].CardNo
         this.personForm.name = window.frames['iframeIDCard'].Name
-        if (window.frames['iframeIDCard'].Sex === '2') { this.personForm.sex = '女' } else { this.personForm.sex = '男' }
+        // if (window.frames['iframeIDCard'].Sex === '2') { this.personForm.sex = '女' } else { this.personForm.sex = '男' }
+        this.personForm.sex = parseInt(window.frames['iframeIDCard'].Sex)
         this.personForm.birthday = window.frames['iframeIDCard'].Born.substring(0, 4) + '-' + window.frames['iframeIDCard'].Born.substring(4, 6) + '-' + window.frames['iframeIDCard'].Born.substring(6, 8)
         this.photo = 'data:image/png;base64,' + window.frames['iframeIDCard'].Picture
         this.personForm.nation = window.frames['iframeIDCard'].Nation + '族'
+        var nationName = window.frames['iframeIDCard'].Nation + '族'
+        for (var item of this.nationList) {
+          if (item.name === nationName) {
+            this.personForm.nation = item.value
+            break
+          }
+        }
         this.personForm.ext.certificationUnit = window.frames['iframeIDCard'].IssuedAt
         this.personForm.ext.address = window.frames['iframeIDCard'].Address
       } else {
@@ -431,10 +437,10 @@
         }
       })
     },
-    // 注册虹膜
+    // 注册虹膜 (没用了)
     registerIris() {
       // 如果已经保存
-      this.isSave = true
+      // this.isSave = true
       if (this.isSave) {
         this.step = '2'
         this.irisBtnName = '初始化设备'
@@ -446,12 +452,13 @@
     },
     // 接收iframe传来的消息
     receiveParamsFromHtml(res) {
-      if(res === 'saveIrisData') {
+      if (res === 'saveIrisData') {
         this.saveIrisData()
-      }else{
+      } else {
         this.iframeMsg = res
       }
     },
+    // 没用了
     startCapture() {
       if (this.irisBtnName === '初始化设备') {
         this.devLoading = true
@@ -465,6 +472,7 @@
         this.saveIrisData()
       }
     },
+    // 保存虹膜数据
     saveIrisData() {
       this.irisForm.image_zy0 = window.frames['iframeMap'].image0
       this.irisForm.image_zy1 = window.frames['iframeMap'].image1
@@ -472,7 +480,6 @@
       this.irisForm.image_yy1 = window.frames['iframeMap'].image3
       this.irisForm.personId = this.personForm.id
       this.irisForm.idCardNo = this.personForm.idCardNo
-      console.log(this.irisForm)
       saveIris(this.irisForm).then(response => {
         this.step = '1'
         if (response.code === 200) {
diff --git a/src/views/memberManage/listStaff.vue b/src/views/memberManage/listStaff.vue
index 62474d0..9216c82 100644
--- a/src/views/memberManage/listStaff.vue
+++ b/src/views/memberManage/listStaff.vue
@@ -194,17 +194,24 @@
       }
     },
     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
+        }
+      })
     },
     // 批量导出
     batchExport() {