diff --git a/config/dev.env.js b/config/dev.env.js
index 3d7e78f..de005f8 100644
--- a/config/dev.env.js
+++ b/config/dev.env.js
@@ -6,6 +6,6 @@
 // 将两个配置对象合并，最终结果是 NODE_ENV：‘"development"'
 module.exports = merge(prodEnv, {
   NODE_ENV: '"development"',
-  BASE_API: '"http://localhost:8093"'
-  // BASE_API: '"http://192.168.0.18:8093"'
+  // BASE_API: '"http://111.198.10.15:20005"'
+  BASE_API: '"http://192.168.0.18:8093"'
 })

diff --git a/config/dev.env.js b/config/dev.env.js
index 3d7e78f..de005f8 100644
--- a/config/dev.env.js
+++ b/config/dev.env.js
@@ -6,6 +6,6 @@
 // 将两个配置对象合并，最终结果是 NODE_ENV：‘"development"'
 module.exports = merge(prodEnv, {
   NODE_ENV: '"development"',
-  BASE_API: '"http://localhost:8093"'
-  // BASE_API: '"http://192.168.0.18:8093"'
+  // BASE_API: '"http://111.198.10.15:20005"'
+  BASE_API: '"http://192.168.0.18:8093"'
 })
diff --git a/config/prod.env.js b/config/prod.env.js
index 610d466..a1c6dd9 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://139.198.16.38:20005"'
+  BASE_API: '"http://111.198.10.15:11802"'
   // BASE_API: '"http://192.168.8.211:20005"'
 }

diff --git a/config/dev.env.js b/config/dev.env.js
index 3d7e78f..de005f8 100644
--- a/config/dev.env.js
+++ b/config/dev.env.js
@@ -6,6 +6,6 @@
 // 将两个配置对象合并，最终结果是 NODE_ENV：‘"development"'
 module.exports = merge(prodEnv, {
   NODE_ENV: '"development"',
-  BASE_API: '"http://localhost:8093"'
-  // BASE_API: '"http://192.168.0.18:8093"'
+  // BASE_API: '"http://111.198.10.15:20005"'
+  BASE_API: '"http://192.168.0.18:8093"'
 })
diff --git a/config/prod.env.js b/config/prod.env.js
index 610d466..a1c6dd9 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://139.198.16.38:20005"'
+  BASE_API: '"http://111.198.10.15:11802"'
   // BASE_API: '"http://192.168.8.211:20005"'
 }
diff --git a/src/App.vue b/src/App.vue
index d716c90..a33b5f0 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,12 +1,39 @@
 <template>
-  <div id="app">
+  <div id="app" scrolling="no">
     <router-view/>
   </div>
 </template>
-
 <script>
 export default {
-  name: 'App'
+  name: 'App',
+  data() {
+    return {
+      beforeUnload_time: ''
+    }
+  },
+  mounted() {
+    window.addEventListener('beforeunload', e => this.beforeunloadHandler(e))
+    window.addEventListener('unload', e => this.unloadHandler(e))
+  },
+  destroyed() {
+    window.removeEventListener('beforeunload', e => this.beforeunloadHandler(e))
+    window.removeEventListener('unload', e => this.unloadHandler(e))
+  },
+  methods: {
+    beforeunloadHandler() {
+      this.beforeUnload_time = new Date().getTime()
+    },
+    unloadHandler(e) {
+      var gap_time = new Date().getTime() - this.beforeUnload_time
+      // 判断是窗口关闭还是刷新
+      if (gap_time <= 5) {
+        if (this.$root.ws !== null) {
+          this.$root.ws.close()
+          this.$root.ws = null
+        }
+      }
+    }
+  }
 }
 </script>
 <style rel="stylesheet/scss" lang="scss">

diff --git a/config/dev.env.js b/config/dev.env.js
index 3d7e78f..de005f8 100644
--- a/config/dev.env.js
+++ b/config/dev.env.js
@@ -6,6 +6,6 @@
 // 将两个配置对象合并，最终结果是 NODE_ENV：‘"development"'
 module.exports = merge(prodEnv, {
   NODE_ENV: '"development"',
-  BASE_API: '"http://localhost:8093"'
-  // BASE_API: '"http://192.168.0.18:8093"'
+  // BASE_API: '"http://111.198.10.15:20005"'
+  BASE_API: '"http://192.168.0.18:8093"'
 })
diff --git a/config/prod.env.js b/config/prod.env.js
index 610d466..a1c6dd9 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://139.198.16.38:20005"'
+  BASE_API: '"http://111.198.10.15:11802"'
   // BASE_API: '"http://192.168.8.211:20005"'
 }
diff --git a/src/App.vue b/src/App.vue
index d716c90..a33b5f0 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,12 +1,39 @@
 <template>
-  <div id="app">
+  <div id="app" scrolling="no">
     <router-view/>
   </div>
 </template>
-
 <script>
 export default {
-  name: 'App'
+  name: 'App',
+  data() {
+    return {
+      beforeUnload_time: ''
+    }
+  },
+  mounted() {
+    window.addEventListener('beforeunload', e => this.beforeunloadHandler(e))
+    window.addEventListener('unload', e => this.unloadHandler(e))
+  },
+  destroyed() {
+    window.removeEventListener('beforeunload', e => this.beforeunloadHandler(e))
+    window.removeEventListener('unload', e => this.unloadHandler(e))
+  },
+  methods: {
+    beforeunloadHandler() {
+      this.beforeUnload_time = new Date().getTime()
+    },
+    unloadHandler(e) {
+      var gap_time = new Date().getTime() - this.beforeUnload_time
+      // 判断是窗口关闭还是刷新
+      if (gap_time <= 5) {
+        if (this.$root.ws !== null) {
+          this.$root.ws.close()
+          this.$root.ws = null
+        }
+      }
+    }
+  }
 }
 </script>
 <style rel="stylesheet/scss" lang="scss">
diff --git a/src/main.js b/src/main.js
index c9354d4..6eb8d51 100644
--- a/src/main.js
+++ b/src/main.js
@@ -32,6 +32,7 @@
 Vue.prototype.hasPerm = hasPermission
 Vue.prototype.showWellType = showWellType
 Vue.prototype.showDeviceType = showDeviceType
+
 Vue.prototype.showIpConfig = showIpConfig
 Vue.prototype.isOperation = isOperation
 // 引入Element-ui
@@ -65,11 +66,18 @@
 Vue.use(VCharts)
 
 // 配置是否启用考勤功能
-export const attendanceEnable = true
+export const attendanceEnable = false
 
 new Vue({
   el: '#app',
   router,
+  data() {
+    return {
+      ws: null,
+      wsURL: 'ws://127.0.0.1:1234',
+      devInited: false
+    }
+  },
   store,
   render: h => h(App)
 })

diff --git a/config/dev.env.js b/config/dev.env.js
index 3d7e78f..de005f8 100644
--- a/config/dev.env.js
+++ b/config/dev.env.js
@@ -6,6 +6,6 @@
 // 将两个配置对象合并，最终结果是 NODE_ENV：‘"development"'
 module.exports = merge(prodEnv, {
   NODE_ENV: '"development"',
-  BASE_API: '"http://localhost:8093"'
-  // BASE_API: '"http://192.168.0.18:8093"'
+  // BASE_API: '"http://111.198.10.15:20005"'
+  BASE_API: '"http://192.168.0.18:8093"'
 })
diff --git a/config/prod.env.js b/config/prod.env.js
index 610d466..a1c6dd9 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://139.198.16.38:20005"'
+  BASE_API: '"http://111.198.10.15:11802"'
   // BASE_API: '"http://192.168.8.211:20005"'
 }
diff --git a/src/App.vue b/src/App.vue
index d716c90..a33b5f0 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,12 +1,39 @@
 <template>
-  <div id="app">
+  <div id="app" scrolling="no">
     <router-view/>
   </div>
 </template>
-
 <script>
 export default {
-  name: 'App'
+  name: 'App',
+  data() {
+    return {
+      beforeUnload_time: ''
+    }
+  },
+  mounted() {
+    window.addEventListener('beforeunload', e => this.beforeunloadHandler(e))
+    window.addEventListener('unload', e => this.unloadHandler(e))
+  },
+  destroyed() {
+    window.removeEventListener('beforeunload', e => this.beforeunloadHandler(e))
+    window.removeEventListener('unload', e => this.unloadHandler(e))
+  },
+  methods: {
+    beforeunloadHandler() {
+      this.beforeUnload_time = new Date().getTime()
+    },
+    unloadHandler(e) {
+      var gap_time = new Date().getTime() - this.beforeUnload_time
+      // 判断是窗口关闭还是刷新
+      if (gap_time <= 5) {
+        if (this.$root.ws !== null) {
+          this.$root.ws.close()
+          this.$root.ws = null
+        }
+      }
+    }
+  }
 }
 </script>
 <style rel="stylesheet/scss" lang="scss">
diff --git a/src/main.js b/src/main.js
index c9354d4..6eb8d51 100644
--- a/src/main.js
+++ b/src/main.js
@@ -32,6 +32,7 @@
 Vue.prototype.hasPerm = hasPermission
 Vue.prototype.showWellType = showWellType
 Vue.prototype.showDeviceType = showDeviceType
+
 Vue.prototype.showIpConfig = showIpConfig
 Vue.prototype.isOperation = isOperation
 // 引入Element-ui
@@ -65,11 +66,18 @@
 Vue.use(VCharts)
 
 // 配置是否启用考勤功能
-export const attendanceEnable = true
+export const attendanceEnable = false
 
 new Vue({
   el: '#app',
   router,
+  data() {
+    return {
+      ws: null,
+      wsURL: 'ws://127.0.0.1:1234',
+      devInited: false
+    }
+  },
   store,
   render: h => h(App)
 })
diff --git a/src/views/layout/components/AppHeader.vue b/src/views/layout/components/AppHeader.vue
index 6326221..bf36e89 100644
--- a/src/views/layout/components/AppHeader.vue
+++ b/src/views/layout/components/AppHeader.vue
@@ -52,6 +52,10 @@
       this.$store.dispatch('ToggleSideBar')
     },
     logout() {
+      if (this.$root.ws !== null) {
+        this.$root.ws.close()
+        this.$root.ws = null
+      }
       this.$store.dispatch('LogOut').then(() => {
         location.reload() // 为了重新实例化vue-router对象 避免bug
       })

diff --git a/config/dev.env.js b/config/dev.env.js
index 3d7e78f..de005f8 100644
--- a/config/dev.env.js
+++ b/config/dev.env.js
@@ -6,6 +6,6 @@
 // 将两个配置对象合并，最终结果是 NODE_ENV：‘"development"'
 module.exports = merge(prodEnv, {
   NODE_ENV: '"development"',
-  BASE_API: '"http://localhost:8093"'
-  // BASE_API: '"http://192.168.0.18:8093"'
+  // BASE_API: '"http://111.198.10.15:20005"'
+  BASE_API: '"http://192.168.0.18:8093"'
 })
diff --git a/config/prod.env.js b/config/prod.env.js
index 610d466..a1c6dd9 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://139.198.16.38:20005"'
+  BASE_API: '"http://111.198.10.15:11802"'
   // BASE_API: '"http://192.168.8.211:20005"'
 }
diff --git a/src/App.vue b/src/App.vue
index d716c90..a33b5f0 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,12 +1,39 @@
 <template>
-  <div id="app">
+  <div id="app" scrolling="no">
     <router-view/>
   </div>
 </template>
-
 <script>
 export default {
-  name: 'App'
+  name: 'App',
+  data() {
+    return {
+      beforeUnload_time: ''
+    }
+  },
+  mounted() {
+    window.addEventListener('beforeunload', e => this.beforeunloadHandler(e))
+    window.addEventListener('unload', e => this.unloadHandler(e))
+  },
+  destroyed() {
+    window.removeEventListener('beforeunload', e => this.beforeunloadHandler(e))
+    window.removeEventListener('unload', e => this.unloadHandler(e))
+  },
+  methods: {
+    beforeunloadHandler() {
+      this.beforeUnload_time = new Date().getTime()
+    },
+    unloadHandler(e) {
+      var gap_time = new Date().getTime() - this.beforeUnload_time
+      // 判断是窗口关闭还是刷新
+      if (gap_time <= 5) {
+        if (this.$root.ws !== null) {
+          this.$root.ws.close()
+          this.$root.ws = null
+        }
+      }
+    }
+  }
 }
 </script>
 <style rel="stylesheet/scss" lang="scss">
diff --git a/src/main.js b/src/main.js
index c9354d4..6eb8d51 100644
--- a/src/main.js
+++ b/src/main.js
@@ -32,6 +32,7 @@
 Vue.prototype.hasPerm = hasPermission
 Vue.prototype.showWellType = showWellType
 Vue.prototype.showDeviceType = showDeviceType
+
 Vue.prototype.showIpConfig = showIpConfig
 Vue.prototype.isOperation = isOperation
 // 引入Element-ui
@@ -65,11 +66,18 @@
 Vue.use(VCharts)
 
 // 配置是否启用考勤功能
-export const attendanceEnable = true
+export const attendanceEnable = false
 
 new Vue({
   el: '#app',
   router,
+  data() {
+    return {
+      ws: null,
+      wsURL: 'ws://127.0.0.1:1234',
+      devInited: false
+    }
+  },
   store,
   render: h => h(App)
 })
diff --git a/src/views/layout/components/AppHeader.vue b/src/views/layout/components/AppHeader.vue
index 6326221..bf36e89 100644
--- a/src/views/layout/components/AppHeader.vue
+++ b/src/views/layout/components/AppHeader.vue
@@ -52,6 +52,10 @@
       this.$store.dispatch('ToggleSideBar')
     },
     logout() {
+      if (this.$root.ws !== null) {
+        this.$root.ws.close()
+        this.$root.ws = null
+      }
       this.$store.dispatch('LogOut').then(() => {
         location.reload() // 为了重新实例化vue-router对象 避免bug
       })
diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index daf44ff..a57232c 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -164,6 +164,7 @@
           }
           this.$store.dispatch('Login', loginForm).then(() => {
             this.loading = false
+            this.$root.isOcxV = true
             this.$message.success('登录成功')
             this.$router.push({ path: '/' })
           }).catch(() => {

diff --git a/config/dev.env.js b/config/dev.env.js
index 3d7e78f..de005f8 100644
--- a/config/dev.env.js
+++ b/config/dev.env.js
@@ -6,6 +6,6 @@
 // 将两个配置对象合并，最终结果是 NODE_ENV：‘"development"'
 module.exports = merge(prodEnv, {
   NODE_ENV: '"development"',
-  BASE_API: '"http://localhost:8093"'
-  // BASE_API: '"http://192.168.0.18:8093"'
+  // BASE_API: '"http://111.198.10.15:20005"'
+  BASE_API: '"http://192.168.0.18:8093"'
 })
diff --git a/config/prod.env.js b/config/prod.env.js
index 610d466..a1c6dd9 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://139.198.16.38:20005"'
+  BASE_API: '"http://111.198.10.15:11802"'
   // BASE_API: '"http://192.168.8.211:20005"'
 }
diff --git a/src/App.vue b/src/App.vue
index d716c90..a33b5f0 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,12 +1,39 @@
 <template>
-  <div id="app">
+  <div id="app" scrolling="no">
     <router-view/>
   </div>
 </template>
-
 <script>
 export default {
-  name: 'App'
+  name: 'App',
+  data() {
+    return {
+      beforeUnload_time: ''
+    }
+  },
+  mounted() {
+    window.addEventListener('beforeunload', e => this.beforeunloadHandler(e))
+    window.addEventListener('unload', e => this.unloadHandler(e))
+  },
+  destroyed() {
+    window.removeEventListener('beforeunload', e => this.beforeunloadHandler(e))
+    window.removeEventListener('unload', e => this.unloadHandler(e))
+  },
+  methods: {
+    beforeunloadHandler() {
+      this.beforeUnload_time = new Date().getTime()
+    },
+    unloadHandler(e) {
+      var gap_time = new Date().getTime() - this.beforeUnload_time
+      // 判断是窗口关闭还是刷新
+      if (gap_time <= 5) {
+        if (this.$root.ws !== null) {
+          this.$root.ws.close()
+          this.$root.ws = null
+        }
+      }
+    }
+  }
 }
 </script>
 <style rel="stylesheet/scss" lang="scss">
diff --git a/src/main.js b/src/main.js
index c9354d4..6eb8d51 100644
--- a/src/main.js
+++ b/src/main.js
@@ -32,6 +32,7 @@
 Vue.prototype.hasPerm = hasPermission
 Vue.prototype.showWellType = showWellType
 Vue.prototype.showDeviceType = showDeviceType
+
 Vue.prototype.showIpConfig = showIpConfig
 Vue.prototype.isOperation = isOperation
 // 引入Element-ui
@@ -65,11 +66,18 @@
 Vue.use(VCharts)
 
 // 配置是否启用考勤功能
-export const attendanceEnable = true
+export const attendanceEnable = false
 
 new Vue({
   el: '#app',
   router,
+  data() {
+    return {
+      ws: null,
+      wsURL: 'ws://127.0.0.1:1234',
+      devInited: false
+    }
+  },
   store,
   render: h => h(App)
 })
diff --git a/src/views/layout/components/AppHeader.vue b/src/views/layout/components/AppHeader.vue
index 6326221..bf36e89 100644
--- a/src/views/layout/components/AppHeader.vue
+++ b/src/views/layout/components/AppHeader.vue
@@ -52,6 +52,10 @@
       this.$store.dispatch('ToggleSideBar')
     },
     logout() {
+      if (this.$root.ws !== null) {
+        this.$root.ws.close()
+        this.$root.ws = null
+      }
       this.$store.dispatch('LogOut').then(() => {
         location.reload() // 为了重新实例化vue-router对象 避免bug
       })
diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index daf44ff..a57232c 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -164,6 +164,7 @@
           }
           this.$store.dispatch('Login', loginForm).then(() => {
             this.loading = false
+            this.$root.isOcxV = true
             this.$message.success('登录成功')
             this.$router.push({ path: '/' })
           }).catch(() => {
diff --git a/src/views/memberManage/addIris.vue b/src/views/memberManage/addIris.vue
index e65e74c..67e85eb 100644
--- a/src/views/memberManage/addIris.vue
+++ b/src/views/memberManage/addIris.vue
@@ -2,7 +2,7 @@
   <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;"/>
+      <iframe name="iframeMap2" scrolling="no" width="100%" height="450" frameBorder="no" src="static/eye/eye.html" style="z-index: -1;"/>
     </div>
   </div>
 </template>
@@ -10,7 +10,7 @@
 <script>
 import { saveIris } from '@/api/person'
 export default {
-  name: 'AddIris',
+  name: 'AddIrisOld',
   data() {
     return {
       irisForm: {

diff --git a/config/dev.env.js b/config/dev.env.js
index 3d7e78f..de005f8 100644
--- a/config/dev.env.js
+++ b/config/dev.env.js
@@ -6,6 +6,6 @@
 // 将两个配置对象合并，最终结果是 NODE_ENV：‘"development"'
 module.exports = merge(prodEnv, {
   NODE_ENV: '"development"',
-  BASE_API: '"http://localhost:8093"'
-  // BASE_API: '"http://192.168.0.18:8093"'
+  // BASE_API: '"http://111.198.10.15:20005"'
+  BASE_API: '"http://192.168.0.18:8093"'
 })
diff --git a/config/prod.env.js b/config/prod.env.js
index 610d466..a1c6dd9 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://139.198.16.38:20005"'
+  BASE_API: '"http://111.198.10.15:11802"'
   // BASE_API: '"http://192.168.8.211:20005"'
 }
diff --git a/src/App.vue b/src/App.vue
index d716c90..a33b5f0 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,12 +1,39 @@
 <template>
-  <div id="app">
+  <div id="app" scrolling="no">
     <router-view/>
   </div>
 </template>
-
 <script>
 export default {
-  name: 'App'
+  name: 'App',
+  data() {
+    return {
+      beforeUnload_time: ''
+    }
+  },
+  mounted() {
+    window.addEventListener('beforeunload', e => this.beforeunloadHandler(e))
+    window.addEventListener('unload', e => this.unloadHandler(e))
+  },
+  destroyed() {
+    window.removeEventListener('beforeunload', e => this.beforeunloadHandler(e))
+    window.removeEventListener('unload', e => this.unloadHandler(e))
+  },
+  methods: {
+    beforeunloadHandler() {
+      this.beforeUnload_time = new Date().getTime()
+    },
+    unloadHandler(e) {
+      var gap_time = new Date().getTime() - this.beforeUnload_time
+      // 判断是窗口关闭还是刷新
+      if (gap_time <= 5) {
+        if (this.$root.ws !== null) {
+          this.$root.ws.close()
+          this.$root.ws = null
+        }
+      }
+    }
+  }
 }
 </script>
 <style rel="stylesheet/scss" lang="scss">
diff --git a/src/main.js b/src/main.js
index c9354d4..6eb8d51 100644
--- a/src/main.js
+++ b/src/main.js
@@ -32,6 +32,7 @@
 Vue.prototype.hasPerm = hasPermission
 Vue.prototype.showWellType = showWellType
 Vue.prototype.showDeviceType = showDeviceType
+
 Vue.prototype.showIpConfig = showIpConfig
 Vue.prototype.isOperation = isOperation
 // 引入Element-ui
@@ -65,11 +66,18 @@
 Vue.use(VCharts)
 
 // 配置是否启用考勤功能
-export const attendanceEnable = true
+export const attendanceEnable = false
 
 new Vue({
   el: '#app',
   router,
+  data() {
+    return {
+      ws: null,
+      wsURL: 'ws://127.0.0.1:1234',
+      devInited: false
+    }
+  },
   store,
   render: h => h(App)
 })
diff --git a/src/views/layout/components/AppHeader.vue b/src/views/layout/components/AppHeader.vue
index 6326221..bf36e89 100644
--- a/src/views/layout/components/AppHeader.vue
+++ b/src/views/layout/components/AppHeader.vue
@@ -52,6 +52,10 @@
       this.$store.dispatch('ToggleSideBar')
     },
     logout() {
+      if (this.$root.ws !== null) {
+        this.$root.ws.close()
+        this.$root.ws = null
+      }
       this.$store.dispatch('LogOut').then(() => {
         location.reload() // 为了重新实例化vue-router对象 避免bug
       })
diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index daf44ff..a57232c 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -164,6 +164,7 @@
           }
           this.$store.dispatch('Login', loginForm).then(() => {
             this.loading = false
+            this.$root.isOcxV = true
             this.$message.success('登录成功')
             this.$router.push({ path: '/' })
           }).catch(() => {
diff --git a/src/views/memberManage/addIris.vue b/src/views/memberManage/addIris.vue
index e65e74c..67e85eb 100644
--- a/src/views/memberManage/addIris.vue
+++ b/src/views/memberManage/addIris.vue
@@ -2,7 +2,7 @@
   <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;"/>
+      <iframe name="iframeMap2" scrolling="no" width="100%" height="450" frameBorder="no" src="static/eye/eye.html" style="z-index: -1;"/>
     </div>
   </div>
 </template>
@@ -10,7 +10,7 @@
 <script>
 import { saveIris } from '@/api/person'
 export default {
-  name: 'AddIris',
+  name: 'AddIrisOld',
   data() {
     return {
       irisForm: {
diff --git a/src/views/memberManage/addPersonIris.vue b/src/views/memberManage/addPersonIris.vue
index e78b02b..269c83d 100644
--- a/src/views/memberManage/addPersonIris.vue
+++ b/src/views/memberManage/addPersonIris.vue
@@ -171,7 +171,7 @@
           <el-col :span="15" style="text-align:center">
             <el-button v-show="!isEditMode" size="medium" @click="resetForm"> 重置 </el-button>
             <el-button :disabled="!canSave" type="primary" size="medium" style="margin-left: 20px;" @click="saveData"> 保存 </el-button>
-            <el-button v-show="!isEditMode" type="primary" size="medium" style="margin-left: 20px;" @click="registerIris"> 下一步，注册虹膜 </el-button>
+            <el-button v-show="!isEditMode" type="primary" size="medium" style="margin-left: 20px;" @click="registerIris"> 注册虹膜 </el-button>
           </el-col>
         </el-row>
       </div>
@@ -180,7 +180,7 @@
     <div v-if="step==='2'">
       <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;"/>
+        <iframe name="iframeMap3" scrolling="no" width="100%" height="450" frameBorder="no" src="static/eye/eyeTest.html" style="z-index: -1;"/>
       </div>
       <!-- <div
         v-loading ="devLoading"
@@ -193,22 +193,24 @@
     <div>
       <iframe :src="idsrc" name = "iframeIDCard" scrolling="no" width="100%" height="0" frameBorder="no"/>
     </div>
+    <capture-iris ref="captureIris"/>
   </div>
 </template>
 
 <script>
 import DeptSelect from '@/components/DeptSelect'
 // import { Uploadimg } from '@/api/common'
-import { addPerson, updatePerson, personInfo, getSexType, getDutyType, getNationType, saveIris } from '@/api/person'
+import { addPerson, updatePerson, personInfo, getSexType, getDutyType, getNationType } from '@/api/person'
 // import { getToken } from '@/utils/auth' // getToken from cookie
 // import { getProject } from '@/utils/baseConfig'
 import { getBirthdayByIdNO, getSexByIdNO } from '@/utils/dataAnalysis'
 // import { isIE } from '@/utils/browser'
 import { attendanceEnable } from '@/main.js'
+import CaptureIris from './captureIris'
 
 export default {
   name: 'AddPersonIris',
-  components: { DeptSelect },
+  components: { CaptureIris, DeptSelect },
   data() {
     const validateIDCard = (rule, value, callback) => {
       if (value !== '') {
@@ -589,6 +591,24 @@
         }
       })
     },
+    // 注册虹膜
+    registerIris() {
+      // 如果已经保存
+      // this.isSave = true
+      if (this.isSave) {
+        debugger
+        var row = []
+        var data = {}
+        data['id'] = this.personForm.id
+        data['name'] = this.personForm.name
+        data['idCardNo'] = this.personForm.idCardNo
+        data['isAddPerson'] = '1'
+        row.push(data)
+        this.$refs.captureIris.initDialog(true, row[0])
+      } else {
+        this.$message.warning('请先保存用户基本信息')
+      }
+    },
     // 接收iframe传来的消息
     receiveParamsFromHtml(res) {
       if (res === 'saveIrisData') {
@@ -598,35 +618,38 @@
       }
     },
     // 保存虹膜数据
-    saveIrisData() {
-      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
-      this.irisForm.personId = this.personForm.id
-      this.irisForm.idCardNo = this.personForm.idCardNo
-      saveIris(this.irisForm).then(response => {
-        this.step = '1'
-        if (response.code === 200) {
-          // this.$message.success('保存虹膜成功')
-          this.$confirm('新增成功，是否继续新增?', '提示', {
-            confirmButtonText: '是',
-            cancelButtonText: '否',
-            type: 'info'
-          }).then(() => {
-            this.personForm.id = ''
-            this.resetForm()
-            this.isSave = false
-            this.isEditMode = false
-            this.$nextTick(() => {
-              this.$refs['dataForm'].clearValidate()
-            })
-          }).catch(() => {
-            this.$router.push({ path: '/staff' })
-          })
-        }
+    addSuccess() {
+      // this.$message.success('保存虹膜成功')
+      this.$confirm('新增成功，是否继续新增?', '提示', {
+        confirmButtonText: '是',
+        cancelButtonText: '否',
+        type: 'info'
+      }).then(() => {
+        this.personForm.id = ''
+        this.resetForm()
+        this.isSave = false
+        this.isEditMode = false
+        this.$nextTick(() => {
+          this.$refs['dataForm'].clearValidate()
+        })
+      }).catch(() => {
+        this.$router.push({ path: '/staff' })
       })
     },
+    // 没用了
+    startCapture() {
+      if (this.irisBtnName === '初始化设备') {
+        this.devLoading = true
+        this.irisBtnDisable = true
+        window.frames['iframeMap'].initDev()
+      } else if (this.irisBtnName === '立即采集') {
+        this.irisBtnDisable = true
+        window.frames['iframeMap'].StartCaptureStepTwo()
+      } else if (this.irisBtnName === '保存虹膜数据') {
+        this.irisBtnDisable = true
+        this.saveIrisData()
+      }
+    },
     // 图片上传
     uploadFile(file) {
       console.log('uploadFile:' + file.file.name)

diff --git a/config/dev.env.js b/config/dev.env.js
index 3d7e78f..de005f8 100644
--- a/config/dev.env.js
+++ b/config/dev.env.js
@@ -6,6 +6,6 @@
 // 将两个配置对象合并，最终结果是 NODE_ENV：‘"development"'
 module.exports = merge(prodEnv, {
   NODE_ENV: '"development"',
-  BASE_API: '"http://localhost:8093"'
-  // BASE_API: '"http://192.168.0.18:8093"'
+  // BASE_API: '"http://111.198.10.15:20005"'
+  BASE_API: '"http://192.168.0.18:8093"'
 })
diff --git a/config/prod.env.js b/config/prod.env.js
index 610d466..a1c6dd9 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://139.198.16.38:20005"'
+  BASE_API: '"http://111.198.10.15:11802"'
   // BASE_API: '"http://192.168.8.211:20005"'
 }
diff --git a/src/App.vue b/src/App.vue
index d716c90..a33b5f0 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,12 +1,39 @@
 <template>
-  <div id="app">
+  <div id="app" scrolling="no">
     <router-view/>
   </div>
 </template>
-
 <script>
 export default {
-  name: 'App'
+  name: 'App',
+  data() {
+    return {
+      beforeUnload_time: ''
+    }
+  },
+  mounted() {
+    window.addEventListener('beforeunload', e => this.beforeunloadHandler(e))
+    window.addEventListener('unload', e => this.unloadHandler(e))
+  },
+  destroyed() {
+    window.removeEventListener('beforeunload', e => this.beforeunloadHandler(e))
+    window.removeEventListener('unload', e => this.unloadHandler(e))
+  },
+  methods: {
+    beforeunloadHandler() {
+      this.beforeUnload_time = new Date().getTime()
+    },
+    unloadHandler(e) {
+      var gap_time = new Date().getTime() - this.beforeUnload_time
+      // 判断是窗口关闭还是刷新
+      if (gap_time <= 5) {
+        if (this.$root.ws !== null) {
+          this.$root.ws.close()
+          this.$root.ws = null
+        }
+      }
+    }
+  }
 }
 </script>
 <style rel="stylesheet/scss" lang="scss">
diff --git a/src/main.js b/src/main.js
index c9354d4..6eb8d51 100644
--- a/src/main.js
+++ b/src/main.js
@@ -32,6 +32,7 @@
 Vue.prototype.hasPerm = hasPermission
 Vue.prototype.showWellType = showWellType
 Vue.prototype.showDeviceType = showDeviceType
+
 Vue.prototype.showIpConfig = showIpConfig
 Vue.prototype.isOperation = isOperation
 // 引入Element-ui
@@ -65,11 +66,18 @@
 Vue.use(VCharts)
 
 // 配置是否启用考勤功能
-export const attendanceEnable = true
+export const attendanceEnable = false
 
 new Vue({
   el: '#app',
   router,
+  data() {
+    return {
+      ws: null,
+      wsURL: 'ws://127.0.0.1:1234',
+      devInited: false
+    }
+  },
   store,
   render: h => h(App)
 })
diff --git a/src/views/layout/components/AppHeader.vue b/src/views/layout/components/AppHeader.vue
index 6326221..bf36e89 100644
--- a/src/views/layout/components/AppHeader.vue
+++ b/src/views/layout/components/AppHeader.vue
@@ -52,6 +52,10 @@
       this.$store.dispatch('ToggleSideBar')
     },
     logout() {
+      if (this.$root.ws !== null) {
+        this.$root.ws.close()
+        this.$root.ws = null
+      }
       this.$store.dispatch('LogOut').then(() => {
         location.reload() // 为了重新实例化vue-router对象 避免bug
       })
diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index daf44ff..a57232c 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -164,6 +164,7 @@
           }
           this.$store.dispatch('Login', loginForm).then(() => {
             this.loading = false
+            this.$root.isOcxV = true
             this.$message.success('登录成功')
             this.$router.push({ path: '/' })
           }).catch(() => {
diff --git a/src/views/memberManage/addIris.vue b/src/views/memberManage/addIris.vue
index e65e74c..67e85eb 100644
--- a/src/views/memberManage/addIris.vue
+++ b/src/views/memberManage/addIris.vue
@@ -2,7 +2,7 @@
   <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;"/>
+      <iframe name="iframeMap2" scrolling="no" width="100%" height="450" frameBorder="no" src="static/eye/eye.html" style="z-index: -1;"/>
     </div>
   </div>
 </template>
@@ -10,7 +10,7 @@
 <script>
 import { saveIris } from '@/api/person'
 export default {
-  name: 'AddIris',
+  name: 'AddIrisOld',
   data() {
     return {
       irisForm: {
diff --git a/src/views/memberManage/addPersonIris.vue b/src/views/memberManage/addPersonIris.vue
index e78b02b..269c83d 100644
--- a/src/views/memberManage/addPersonIris.vue
+++ b/src/views/memberManage/addPersonIris.vue
@@ -171,7 +171,7 @@
           <el-col :span="15" style="text-align:center">
             <el-button v-show="!isEditMode" size="medium" @click="resetForm"> 重置 </el-button>
             <el-button :disabled="!canSave" type="primary" size="medium" style="margin-left: 20px;" @click="saveData"> 保存 </el-button>
-            <el-button v-show="!isEditMode" type="primary" size="medium" style="margin-left: 20px;" @click="registerIris"> 下一步，注册虹膜 </el-button>
+            <el-button v-show="!isEditMode" type="primary" size="medium" style="margin-left: 20px;" @click="registerIris"> 注册虹膜 </el-button>
           </el-col>
         </el-row>
       </div>
@@ -180,7 +180,7 @@
     <div v-if="step==='2'">
       <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;"/>
+        <iframe name="iframeMap3" scrolling="no" width="100%" height="450" frameBorder="no" src="static/eye/eyeTest.html" style="z-index: -1;"/>
       </div>
       <!-- <div
         v-loading ="devLoading"
@@ -193,22 +193,24 @@
     <div>
       <iframe :src="idsrc" name = "iframeIDCard" scrolling="no" width="100%" height="0" frameBorder="no"/>
     </div>
+    <capture-iris ref="captureIris"/>
   </div>
 </template>
 
 <script>
 import DeptSelect from '@/components/DeptSelect'
 // import { Uploadimg } from '@/api/common'
-import { addPerson, updatePerson, personInfo, getSexType, getDutyType, getNationType, saveIris } from '@/api/person'
+import { addPerson, updatePerson, personInfo, getSexType, getDutyType, getNationType } from '@/api/person'
 // import { getToken } from '@/utils/auth' // getToken from cookie
 // import { getProject } from '@/utils/baseConfig'
 import { getBirthdayByIdNO, getSexByIdNO } from '@/utils/dataAnalysis'
 // import { isIE } from '@/utils/browser'
 import { attendanceEnable } from '@/main.js'
+import CaptureIris from './captureIris'
 
 export default {
   name: 'AddPersonIris',
-  components: { DeptSelect },
+  components: { CaptureIris, DeptSelect },
   data() {
     const validateIDCard = (rule, value, callback) => {
       if (value !== '') {
@@ -589,6 +591,24 @@
         }
       })
     },
+    // 注册虹膜
+    registerIris() {
+      // 如果已经保存
+      // this.isSave = true
+      if (this.isSave) {
+        debugger
+        var row = []
+        var data = {}
+        data['id'] = this.personForm.id
+        data['name'] = this.personForm.name
+        data['idCardNo'] = this.personForm.idCardNo
+        data['isAddPerson'] = '1'
+        row.push(data)
+        this.$refs.captureIris.initDialog(true, row[0])
+      } else {
+        this.$message.warning('请先保存用户基本信息')
+      }
+    },
     // 接收iframe传来的消息
     receiveParamsFromHtml(res) {
       if (res === 'saveIrisData') {
@@ -598,35 +618,38 @@
       }
     },
     // 保存虹膜数据
-    saveIrisData() {
-      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
-      this.irisForm.personId = this.personForm.id
-      this.irisForm.idCardNo = this.personForm.idCardNo
-      saveIris(this.irisForm).then(response => {
-        this.step = '1'
-        if (response.code === 200) {
-          // this.$message.success('保存虹膜成功')
-          this.$confirm('新增成功，是否继续新增?', '提示', {
-            confirmButtonText: '是',
-            cancelButtonText: '否',
-            type: 'info'
-          }).then(() => {
-            this.personForm.id = ''
-            this.resetForm()
-            this.isSave = false
-            this.isEditMode = false
-            this.$nextTick(() => {
-              this.$refs['dataForm'].clearValidate()
-            })
-          }).catch(() => {
-            this.$router.push({ path: '/staff' })
-          })
-        }
+    addSuccess() {
+      // this.$message.success('保存虹膜成功')
+      this.$confirm('新增成功，是否继续新增?', '提示', {
+        confirmButtonText: '是',
+        cancelButtonText: '否',
+        type: 'info'
+      }).then(() => {
+        this.personForm.id = ''
+        this.resetForm()
+        this.isSave = false
+        this.isEditMode = false
+        this.$nextTick(() => {
+          this.$refs['dataForm'].clearValidate()
+        })
+      }).catch(() => {
+        this.$router.push({ path: '/staff' })
       })
     },
+    // 没用了
+    startCapture() {
+      if (this.irisBtnName === '初始化设备') {
+        this.devLoading = true
+        this.irisBtnDisable = true
+        window.frames['iframeMap'].initDev()
+      } else if (this.irisBtnName === '立即采集') {
+        this.irisBtnDisable = true
+        window.frames['iframeMap'].StartCaptureStepTwo()
+      } else if (this.irisBtnName === '保存虹膜数据') {
+        this.irisBtnDisable = true
+        this.saveIrisData()
+      }
+    },
     // 图片上传
     uploadFile(file) {
       console.log('uploadFile:' + file.file.name)
diff --git a/src/views/memberManage/captureIris.vue b/src/views/memberManage/captureIris.vue
new file mode 100644
index 0000000..9637184
--- /dev/null
+++ b/src/views/memberManage/captureIris.vue
@@ -0,0 +1,232 @@
+<template>
+  <div class="app-container">
+    <el-dialog :title="title" :visible.sync="dialogFormVisible" append-to-body @close="closeDialog">
+      <el-form ref="dataForm" :model="irisForm" label-well-code="right" label-width="95px" style="margin-top: 20px">
+        <el-row type="flex" justify="center">
+          <el-col :offset="2" :span="12">
+            <div class="avatar">
+              <el-image
+                :src="photoRight!==''?photoRight:defaultPhoto"
+                fit="fill"
+                style="width: 280px; height: 195px"
+                border/>
+            </div>
+          </el-col>
+          <el-col :span="12">
+            <el-row>
+              <div class="avatar">
+                <el-image
+                  :src="photoLeft!==''?photoLeft:defaultPhoto"
+                  fit="fill"
+                  style="width: 280px; height: 195px"/>
+              </div>
+            </el-row>
+          </el-col>
+        </el-row>
+        <el-row style="margin-top: 10px;">
+          <el-col :offset="6" :span="4">
+            <span>右眼虹膜</span>
+          </el-col>
+          <el-col :offset="7" :span="4">
+            <span>左眼虹膜</span>
+          </el-col>
+        </el-row>
+        <el-row >
+          <el-col :offset="5" :span="12" style="margin-top: 30px">
+            <el-form-item prop="eyeType">
+              <el-select :disabled="eyeTypeDisabled" v-model="irisForm.eyeType">
+                <el-option key="3" label="双眼" value="3" />
+                <el-option key="2" label="左眼" value="2"/>
+                <el-option key="1" label="右眼" value="1"/>
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <div class="dialog-footer">
+        <el-button :disabled="startBtnDisabeld" type="primary" @click="startCapture">开始采集</el-button>
+        <el-button :disabled="stopBtnDisabeld" type="primary" @click="stopCapture">停止采集</el-button>
+        <el-button :disabled="saveBtnDisabeld" type="primary" @click="save">保存</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { saveIris } from '@/api/person'
+
+export default {
+  name: 'CaptureIris',
+  data() {
+    return {
+      isAddperson: '0',
+      edited: false,
+      ws: null,
+      eyeTypeDisabled: false,
+      startBtnDisabeld: true,
+      stopBtnDisabeld: false,
+      saveBtnDisabeld: true,
+      name: '',
+      dialogFormVisible: false, // 对话框是否显示
+      photoLeft: '', // 图片路径
+      photoRight: '',
+      defaultPhoto: require('../../assets/global_images/eye.png'), // 默认图片路径
+      irisForm: {
+        eyeType: '3',
+        personId: '',
+        idCardNo: '',
+        image_zy0: '',
+        image_yy0: '',
+        image_zy1: '',
+        image_yy1: ''
+      }, // 表单
+      title: '' // 表头显示标题
+    }
+  },
+  methods: {
+    closeDialog() {
+      this.photoRight = ''
+      this.photoLeft = ''
+      if (this.edited) {
+        this.edited = false
+        if (this.isAddPerson === '1') this.$parent.addSuccess()
+        else this.$parent.fetchData(true)
+      }
+      this.ws.send('Close')
+    },
+    WebSocketConnent() {
+      this.photoLeft = ''
+      this.photoRight = ''
+      var _this = this
+      this.ws = _this.$root.ws
+      this.eyeTypeDisabled = true
+      this.startBtnDisabeld = true
+      this.stopBtnDisabeld = false
+      this.saveBtnDisabeld = true
+      if (this.ws === null) {
+        this.ws = new WebSocket(_this.$root.wsURL)
+        // 注册各类回调
+        this.ws.onopen = function() {
+          _this.$message.success('采集设备启动中...')
+          _this.ws.send('StartCapture' + _this.irisForm.eyeType)
+        }
+        this.ws.onclose = function() {
+          _this.$message.info('与ICS连接断开')
+          _this.$root.ws = null
+        }
+        this.ws.onerror = function() {
+          _this.$message.error('与ICS通信发生错误')
+        }
+        _this.$root.ws = this.ws
+      } else {
+        this.ws.send('StartCapture' + this.irisForm.eyeType)
+      }
+      this.ws.onmessage = function(receiveMsg) {
+        _this.startBtnDisabeld = false
+        _this.stopBtnDisabeld = true
+        _this.eyeTypeDisabled = false
+        if (receiveMsg.data === '设备启动失败') {
+          _this.$message.error(receiveMsg.data + '，请点击“开始采集”重试')
+        } else if (receiveMsg.data === '采集失败') {
+          _this.$message.error(receiveMsg.data)
+        } else if (receiveMsg.data === 'ICS错误') {
+          _this.$message.error(receiveMsg.data)
+        } else if (receiveMsg.data.indexOf('image') > -1) {
+          var data = receiveMsg.data.replace('image', '')
+          _this.saveBtnDisabeld = false
+          if (_this.irisForm.eyeType === '3') {
+            _this.photoLeft = 'data:image/png;base64,' + data.split(';')[0]
+            _this.photoRight = 'data:image/png;base64,' + data.split(';')[1]
+          } else if (_this.irisForm.eyeType === '2') {
+            _this.photoLeft = 'data:image/png;base64,' + data
+          } else if (_this.irisForm.eyeType === '1') {
+            _this.photoRight = 'data:image/png;base64,' + data
+          }
+        }
+      }
+    },
+    // 初始化对话框
+    initDialog: function(dialogFormVisible, row, isAddPerson) {
+      this.title = '采集虹膜 - ' + row.name + ' - ' + row.idCardNo
+      this.irisForm.personId = row.id
+      this.irisForm.idCardNo = row.idCardNo
+      this.dialogFormVisible = dialogFormVisible
+      this.isAddPerson = row.isAddPerson
+      this.WebSocketConnent()
+    },
+    startCapture() {
+      this.WebSocketConnent()
+    },
+    stopCapture() {
+      this.eyeTypeDisabled = false
+      this.startBtnDisabeld = false
+      this.stopBtnDisabeld = true
+      this.saveBtnDisabeld = true
+      this.ws.send('StopCapture')
+    },
+    save() {
+      if (this.photoLeft !== '') {
+        this.irisForm.image_zy0 = this.photoLeft
+        this.irisForm.image_zy1 = this.photoLeft
+      } else {
+        this.irisForm.image_zy0 = this.photoRight
+        this.irisForm.image_zy1 = this.photoRight
+      }
+      if (this.photoRight !== '') {
+        this.irisForm.image_yy0 = this.photoRight
+        this.irisForm.image_yy1 = this.photoRight
+      } else {
+        this.irisForm.image_yy0 = this.photoLeft
+        this.irisForm.image_yy1 = this.photoLeft
+      }
+      saveIris(this.irisForm).then(response => {
+        if (response.code === 200) {
+          this.$message.success('保存虹膜成功')
+          this.edited = true
+          this.dialogFormVisible = false
+          this.closeDialog()
+        }
+      })
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  $tableTitleHeight:46px;
+  .el-select{
+    width: 100%;
+  }
+  .el-date-editor{
+    width: 100%;
+  }
+  .table-title{
+    background-color:rgba(243, 243, 243, 1);
+    height: $tableTitleHeight;
+    .title-header{
+      line-height:$tableTitleHeight;
+      color: #606266;
+      font-size: 15px;
+      i{
+        margin-left: 5px;
+        margin-right: 5px;
+      }
+    }
+  }
+  .edit_btns{
+    .edit_btn{
+      float:right;
+      margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2
+    }
+  }
+  .avatar {
+    margin: 10px;
+    display: block;
+  }
+  .dialog-footer{
+    text-align: center;
+    margin-top: 10px;
+    margin-left: 30px;
+    margin-bottom: 15px;
+  }
+</style>

diff --git a/config/dev.env.js b/config/dev.env.js
index 3d7e78f..de005f8 100644
--- a/config/dev.env.js
+++ b/config/dev.env.js
@@ -6,6 +6,6 @@
 // 将两个配置对象合并，最终结果是 NODE_ENV：‘"development"'
 module.exports = merge(prodEnv, {
   NODE_ENV: '"development"',
-  BASE_API: '"http://localhost:8093"'
-  // BASE_API: '"http://192.168.0.18:8093"'
+  // BASE_API: '"http://111.198.10.15:20005"'
+  BASE_API: '"http://192.168.0.18:8093"'
 })
diff --git a/config/prod.env.js b/config/prod.env.js
index 610d466..a1c6dd9 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://139.198.16.38:20005"'
+  BASE_API: '"http://111.198.10.15:11802"'
   // BASE_API: '"http://192.168.8.211:20005"'
 }
diff --git a/src/App.vue b/src/App.vue
index d716c90..a33b5f0 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,12 +1,39 @@
 <template>
-  <div id="app">
+  <div id="app" scrolling="no">
     <router-view/>
   </div>
 </template>
-
 <script>
 export default {
-  name: 'App'
+  name: 'App',
+  data() {
+    return {
+      beforeUnload_time: ''
+    }
+  },
+  mounted() {
+    window.addEventListener('beforeunload', e => this.beforeunloadHandler(e))
+    window.addEventListener('unload', e => this.unloadHandler(e))
+  },
+  destroyed() {
+    window.removeEventListener('beforeunload', e => this.beforeunloadHandler(e))
+    window.removeEventListener('unload', e => this.unloadHandler(e))
+  },
+  methods: {
+    beforeunloadHandler() {
+      this.beforeUnload_time = new Date().getTime()
+    },
+    unloadHandler(e) {
+      var gap_time = new Date().getTime() - this.beforeUnload_time
+      // 判断是窗口关闭还是刷新
+      if (gap_time <= 5) {
+        if (this.$root.ws !== null) {
+          this.$root.ws.close()
+          this.$root.ws = null
+        }
+      }
+    }
+  }
 }
 </script>
 <style rel="stylesheet/scss" lang="scss">
diff --git a/src/main.js b/src/main.js
index c9354d4..6eb8d51 100644
--- a/src/main.js
+++ b/src/main.js
@@ -32,6 +32,7 @@
 Vue.prototype.hasPerm = hasPermission
 Vue.prototype.showWellType = showWellType
 Vue.prototype.showDeviceType = showDeviceType
+
 Vue.prototype.showIpConfig = showIpConfig
 Vue.prototype.isOperation = isOperation
 // 引入Element-ui
@@ -65,11 +66,18 @@
 Vue.use(VCharts)
 
 // 配置是否启用考勤功能
-export const attendanceEnable = true
+export const attendanceEnable = false
 
 new Vue({
   el: '#app',
   router,
+  data() {
+    return {
+      ws: null,
+      wsURL: 'ws://127.0.0.1:1234',
+      devInited: false
+    }
+  },
   store,
   render: h => h(App)
 })
diff --git a/src/views/layout/components/AppHeader.vue b/src/views/layout/components/AppHeader.vue
index 6326221..bf36e89 100644
--- a/src/views/layout/components/AppHeader.vue
+++ b/src/views/layout/components/AppHeader.vue
@@ -52,6 +52,10 @@
       this.$store.dispatch('ToggleSideBar')
     },
     logout() {
+      if (this.$root.ws !== null) {
+        this.$root.ws.close()
+        this.$root.ws = null
+      }
       this.$store.dispatch('LogOut').then(() => {
         location.reload() // 为了重新实例化vue-router对象 避免bug
       })
diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index daf44ff..a57232c 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -164,6 +164,7 @@
           }
           this.$store.dispatch('Login', loginForm).then(() => {
             this.loading = false
+            this.$root.isOcxV = true
             this.$message.success('登录成功')
             this.$router.push({ path: '/' })
           }).catch(() => {
diff --git a/src/views/memberManage/addIris.vue b/src/views/memberManage/addIris.vue
index e65e74c..67e85eb 100644
--- a/src/views/memberManage/addIris.vue
+++ b/src/views/memberManage/addIris.vue
@@ -2,7 +2,7 @@
   <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;"/>
+      <iframe name="iframeMap2" scrolling="no" width="100%" height="450" frameBorder="no" src="static/eye/eye.html" style="z-index: -1;"/>
     </div>
   </div>
 </template>
@@ -10,7 +10,7 @@
 <script>
 import { saveIris } from '@/api/person'
 export default {
-  name: 'AddIris',
+  name: 'AddIrisOld',
   data() {
     return {
       irisForm: {
diff --git a/src/views/memberManage/addPersonIris.vue b/src/views/memberManage/addPersonIris.vue
index e78b02b..269c83d 100644
--- a/src/views/memberManage/addPersonIris.vue
+++ b/src/views/memberManage/addPersonIris.vue
@@ -171,7 +171,7 @@
           <el-col :span="15" style="text-align:center">
             <el-button v-show="!isEditMode" size="medium" @click="resetForm"> 重置 </el-button>
             <el-button :disabled="!canSave" type="primary" size="medium" style="margin-left: 20px;" @click="saveData"> 保存 </el-button>
-            <el-button v-show="!isEditMode" type="primary" size="medium" style="margin-left: 20px;" @click="registerIris"> 下一步，注册虹膜 </el-button>
+            <el-button v-show="!isEditMode" type="primary" size="medium" style="margin-left: 20px;" @click="registerIris"> 注册虹膜 </el-button>
           </el-col>
         </el-row>
       </div>
@@ -180,7 +180,7 @@
     <div v-if="step==='2'">
       <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;"/>
+        <iframe name="iframeMap3" scrolling="no" width="100%" height="450" frameBorder="no" src="static/eye/eyeTest.html" style="z-index: -1;"/>
       </div>
       <!-- <div
         v-loading ="devLoading"
@@ -193,22 +193,24 @@
     <div>
       <iframe :src="idsrc" name = "iframeIDCard" scrolling="no" width="100%" height="0" frameBorder="no"/>
     </div>
+    <capture-iris ref="captureIris"/>
   </div>
 </template>
 
 <script>
 import DeptSelect from '@/components/DeptSelect'
 // import { Uploadimg } from '@/api/common'
-import { addPerson, updatePerson, personInfo, getSexType, getDutyType, getNationType, saveIris } from '@/api/person'
+import { addPerson, updatePerson, personInfo, getSexType, getDutyType, getNationType } from '@/api/person'
 // import { getToken } from '@/utils/auth' // getToken from cookie
 // import { getProject } from '@/utils/baseConfig'
 import { getBirthdayByIdNO, getSexByIdNO } from '@/utils/dataAnalysis'
 // import { isIE } from '@/utils/browser'
 import { attendanceEnable } from '@/main.js'
+import CaptureIris from './captureIris'
 
 export default {
   name: 'AddPersonIris',
-  components: { DeptSelect },
+  components: { CaptureIris, DeptSelect },
   data() {
     const validateIDCard = (rule, value, callback) => {
       if (value !== '') {
@@ -589,6 +591,24 @@
         }
       })
     },
+    // 注册虹膜
+    registerIris() {
+      // 如果已经保存
+      // this.isSave = true
+      if (this.isSave) {
+        debugger
+        var row = []
+        var data = {}
+        data['id'] = this.personForm.id
+        data['name'] = this.personForm.name
+        data['idCardNo'] = this.personForm.idCardNo
+        data['isAddPerson'] = '1'
+        row.push(data)
+        this.$refs.captureIris.initDialog(true, row[0])
+      } else {
+        this.$message.warning('请先保存用户基本信息')
+      }
+    },
     // 接收iframe传来的消息
     receiveParamsFromHtml(res) {
       if (res === 'saveIrisData') {
@@ -598,35 +618,38 @@
       }
     },
     // 保存虹膜数据
-    saveIrisData() {
-      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
-      this.irisForm.personId = this.personForm.id
-      this.irisForm.idCardNo = this.personForm.idCardNo
-      saveIris(this.irisForm).then(response => {
-        this.step = '1'
-        if (response.code === 200) {
-          // this.$message.success('保存虹膜成功')
-          this.$confirm('新增成功，是否继续新增?', '提示', {
-            confirmButtonText: '是',
-            cancelButtonText: '否',
-            type: 'info'
-          }).then(() => {
-            this.personForm.id = ''
-            this.resetForm()
-            this.isSave = false
-            this.isEditMode = false
-            this.$nextTick(() => {
-              this.$refs['dataForm'].clearValidate()
-            })
-          }).catch(() => {
-            this.$router.push({ path: '/staff' })
-          })
-        }
+    addSuccess() {
+      // this.$message.success('保存虹膜成功')
+      this.$confirm('新增成功，是否继续新增?', '提示', {
+        confirmButtonText: '是',
+        cancelButtonText: '否',
+        type: 'info'
+      }).then(() => {
+        this.personForm.id = ''
+        this.resetForm()
+        this.isSave = false
+        this.isEditMode = false
+        this.$nextTick(() => {
+          this.$refs['dataForm'].clearValidate()
+        })
+      }).catch(() => {
+        this.$router.push({ path: '/staff' })
       })
     },
+    // 没用了
+    startCapture() {
+      if (this.irisBtnName === '初始化设备') {
+        this.devLoading = true
+        this.irisBtnDisable = true
+        window.frames['iframeMap'].initDev()
+      } else if (this.irisBtnName === '立即采集') {
+        this.irisBtnDisable = true
+        window.frames['iframeMap'].StartCaptureStepTwo()
+      } else if (this.irisBtnName === '保存虹膜数据') {
+        this.irisBtnDisable = true
+        this.saveIrisData()
+      }
+    },
     // 图片上传
     uploadFile(file) {
       console.log('uploadFile:' + file.file.name)
diff --git a/src/views/memberManage/captureIris.vue b/src/views/memberManage/captureIris.vue
new file mode 100644
index 0000000..9637184
--- /dev/null
+++ b/src/views/memberManage/captureIris.vue
@@ -0,0 +1,232 @@
+<template>
+  <div class="app-container">
+    <el-dialog :title="title" :visible.sync="dialogFormVisible" append-to-body @close="closeDialog">
+      <el-form ref="dataForm" :model="irisForm" label-well-code="right" label-width="95px" style="margin-top: 20px">
+        <el-row type="flex" justify="center">
+          <el-col :offset="2" :span="12">
+            <div class="avatar">
+              <el-image
+                :src="photoRight!==''?photoRight:defaultPhoto"
+                fit="fill"
+                style="width: 280px; height: 195px"
+                border/>
+            </div>
+          </el-col>
+          <el-col :span="12">
+            <el-row>
+              <div class="avatar">
+                <el-image
+                  :src="photoLeft!==''?photoLeft:defaultPhoto"
+                  fit="fill"
+                  style="width: 280px; height: 195px"/>
+              </div>
+            </el-row>
+          </el-col>
+        </el-row>
+        <el-row style="margin-top: 10px;">
+          <el-col :offset="6" :span="4">
+            <span>右眼虹膜</span>
+          </el-col>
+          <el-col :offset="7" :span="4">
+            <span>左眼虹膜</span>
+          </el-col>
+        </el-row>
+        <el-row >
+          <el-col :offset="5" :span="12" style="margin-top: 30px">
+            <el-form-item prop="eyeType">
+              <el-select :disabled="eyeTypeDisabled" v-model="irisForm.eyeType">
+                <el-option key="3" label="双眼" value="3" />
+                <el-option key="2" label="左眼" value="2"/>
+                <el-option key="1" label="右眼" value="1"/>
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <div class="dialog-footer">
+        <el-button :disabled="startBtnDisabeld" type="primary" @click="startCapture">开始采集</el-button>
+        <el-button :disabled="stopBtnDisabeld" type="primary" @click="stopCapture">停止采集</el-button>
+        <el-button :disabled="saveBtnDisabeld" type="primary" @click="save">保存</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { saveIris } from '@/api/person'
+
+export default {
+  name: 'CaptureIris',
+  data() {
+    return {
+      isAddperson: '0',
+      edited: false,
+      ws: null,
+      eyeTypeDisabled: false,
+      startBtnDisabeld: true,
+      stopBtnDisabeld: false,
+      saveBtnDisabeld: true,
+      name: '',
+      dialogFormVisible: false, // 对话框是否显示
+      photoLeft: '', // 图片路径
+      photoRight: '',
+      defaultPhoto: require('../../assets/global_images/eye.png'), // 默认图片路径
+      irisForm: {
+        eyeType: '3',
+        personId: '',
+        idCardNo: '',
+        image_zy0: '',
+        image_yy0: '',
+        image_zy1: '',
+        image_yy1: ''
+      }, // 表单
+      title: '' // 表头显示标题
+    }
+  },
+  methods: {
+    closeDialog() {
+      this.photoRight = ''
+      this.photoLeft = ''
+      if (this.edited) {
+        this.edited = false
+        if (this.isAddPerson === '1') this.$parent.addSuccess()
+        else this.$parent.fetchData(true)
+      }
+      this.ws.send('Close')
+    },
+    WebSocketConnent() {
+      this.photoLeft = ''
+      this.photoRight = ''
+      var _this = this
+      this.ws = _this.$root.ws
+      this.eyeTypeDisabled = true
+      this.startBtnDisabeld = true
+      this.stopBtnDisabeld = false
+      this.saveBtnDisabeld = true
+      if (this.ws === null) {
+        this.ws = new WebSocket(_this.$root.wsURL)
+        // 注册各类回调
+        this.ws.onopen = function() {
+          _this.$message.success('采集设备启动中...')
+          _this.ws.send('StartCapture' + _this.irisForm.eyeType)
+        }
+        this.ws.onclose = function() {
+          _this.$message.info('与ICS连接断开')
+          _this.$root.ws = null
+        }
+        this.ws.onerror = function() {
+          _this.$message.error('与ICS通信发生错误')
+        }
+        _this.$root.ws = this.ws
+      } else {
+        this.ws.send('StartCapture' + this.irisForm.eyeType)
+      }
+      this.ws.onmessage = function(receiveMsg) {
+        _this.startBtnDisabeld = false
+        _this.stopBtnDisabeld = true
+        _this.eyeTypeDisabled = false
+        if (receiveMsg.data === '设备启动失败') {
+          _this.$message.error(receiveMsg.data + '，请点击“开始采集”重试')
+        } else if (receiveMsg.data === '采集失败') {
+          _this.$message.error(receiveMsg.data)
+        } else if (receiveMsg.data === 'ICS错误') {
+          _this.$message.error(receiveMsg.data)
+        } else if (receiveMsg.data.indexOf('image') > -1) {
+          var data = receiveMsg.data.replace('image', '')
+          _this.saveBtnDisabeld = false
+          if (_this.irisForm.eyeType === '3') {
+            _this.photoLeft = 'data:image/png;base64,' + data.split(';')[0]
+            _this.photoRight = 'data:image/png;base64,' + data.split(';')[1]
+          } else if (_this.irisForm.eyeType === '2') {
+            _this.photoLeft = 'data:image/png;base64,' + data
+          } else if (_this.irisForm.eyeType === '1') {
+            _this.photoRight = 'data:image/png;base64,' + data
+          }
+        }
+      }
+    },
+    // 初始化对话框
+    initDialog: function(dialogFormVisible, row, isAddPerson) {
+      this.title = '采集虹膜 - ' + row.name + ' - ' + row.idCardNo
+      this.irisForm.personId = row.id
+      this.irisForm.idCardNo = row.idCardNo
+      this.dialogFormVisible = dialogFormVisible
+      this.isAddPerson = row.isAddPerson
+      this.WebSocketConnent()
+    },
+    startCapture() {
+      this.WebSocketConnent()
+    },
+    stopCapture() {
+      this.eyeTypeDisabled = false
+      this.startBtnDisabeld = false
+      this.stopBtnDisabeld = true
+      this.saveBtnDisabeld = true
+      this.ws.send('StopCapture')
+    },
+    save() {
+      if (this.photoLeft !== '') {
+        this.irisForm.image_zy0 = this.photoLeft
+        this.irisForm.image_zy1 = this.photoLeft
+      } else {
+        this.irisForm.image_zy0 = this.photoRight
+        this.irisForm.image_zy1 = this.photoRight
+      }
+      if (this.photoRight !== '') {
+        this.irisForm.image_yy0 = this.photoRight
+        this.irisForm.image_yy1 = this.photoRight
+      } else {
+        this.irisForm.image_yy0 = this.photoLeft
+        this.irisForm.image_yy1 = this.photoLeft
+      }
+      saveIris(this.irisForm).then(response => {
+        if (response.code === 200) {
+          this.$message.success('保存虹膜成功')
+          this.edited = true
+          this.dialogFormVisible = false
+          this.closeDialog()
+        }
+      })
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  $tableTitleHeight:46px;
+  .el-select{
+    width: 100%;
+  }
+  .el-date-editor{
+    width: 100%;
+  }
+  .table-title{
+    background-color:rgba(243, 243, 243, 1);
+    height: $tableTitleHeight;
+    .title-header{
+      line-height:$tableTitleHeight;
+      color: #606266;
+      font-size: 15px;
+      i{
+        margin-left: 5px;
+        margin-right: 5px;
+      }
+    }
+  }
+  .edit_btns{
+    .edit_btn{
+      float:right;
+      margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2
+    }
+  }
+  .avatar {
+    margin: 10px;
+    display: block;
+  }
+  .dialog-footer{
+    text-align: center;
+    margin-top: 10px;
+    margin-left: 30px;
+    margin-bottom: 15px;
+  }
+</style>
diff --git a/src/views/memberManage/listStaff.vue b/src/views/memberManage/listStaff.vue
index 65cfd72..0706ff5 100644
--- a/src/views/memberManage/listStaff.vue
+++ b/src/views/memberManage/listStaff.vue
@@ -1,6 +1,6 @@
 <!--员工管理-->
 <template>
-  <div class="app-container">
+  <div v-if="!$root.isOcxShow" class="app-container">
     <!--筛选条件-->
     <div class="search-div">
       <el-form ref="selectForm" :inline="true" :model="listQuery" class="form-container">
@@ -81,6 +81,7 @@
         @size-change="handleSizeChange"
         @current-change="handleCurrentChange"/>
     </div>
+    <capture-iris ref="captureIris"/>
   </div>
 </template>
 <script>
@@ -93,10 +94,11 @@
 import { downloadFile } from '@/utils/downloadUtils'
 import { attendanceEnable } from '@/main.js'
 import { initAnnualLeave } from '@/api/attendance'
+import CaptureIris from './captureIris'
 
 export default {
   name: 'ListStaff',
-  components: { DeptSelect, DownloadTemplate },
+  components: { CaptureIris, DeptSelect, DownloadTemplate },
   data() {
     return {
       listQuery: {
@@ -210,6 +212,7 @@
     this.fetchData(false)
   },
   methods: {
+    receiveParamsFromHtml(res) {},
     // 检查选择情况
     checkSelection() {
       if (this.multipleSelection.length === 0) {
@@ -253,6 +256,10 @@
         this.$message.error('至少选中一项')
       }
     },
+    registerIris(row) {
+      this.dialogFormVisible = true
+      this.$refs.captureIris.initDialog(this.dialogFormVisible, row, '0')
+    },
     initAnnualLeave() {
       initAnnualLeave().then(response => {
         if (response.code === 200) {

diff --git a/config/dev.env.js b/config/dev.env.js
index 3d7e78f..de005f8 100644
--- a/config/dev.env.js
+++ b/config/dev.env.js
@@ -6,6 +6,6 @@
 // 将两个配置对象合并，最终结果是 NODE_ENV：‘"development"'
 module.exports = merge(prodEnv, {
   NODE_ENV: '"development"',
-  BASE_API: '"http://localhost:8093"'
-  // BASE_API: '"http://192.168.0.18:8093"'
+  // BASE_API: '"http://111.198.10.15:20005"'
+  BASE_API: '"http://192.168.0.18:8093"'
 })
diff --git a/config/prod.env.js b/config/prod.env.js
index 610d466..a1c6dd9 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://139.198.16.38:20005"'
+  BASE_API: '"http://111.198.10.15:11802"'
   // BASE_API: '"http://192.168.8.211:20005"'
 }
diff --git a/src/App.vue b/src/App.vue
index d716c90..a33b5f0 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,12 +1,39 @@
 <template>
-  <div id="app">
+  <div id="app" scrolling="no">
     <router-view/>
   </div>
 </template>
-
 <script>
 export default {
-  name: 'App'
+  name: 'App',
+  data() {
+    return {
+      beforeUnload_time: ''
+    }
+  },
+  mounted() {
+    window.addEventListener('beforeunload', e => this.beforeunloadHandler(e))
+    window.addEventListener('unload', e => this.unloadHandler(e))
+  },
+  destroyed() {
+    window.removeEventListener('beforeunload', e => this.beforeunloadHandler(e))
+    window.removeEventListener('unload', e => this.unloadHandler(e))
+  },
+  methods: {
+    beforeunloadHandler() {
+      this.beforeUnload_time = new Date().getTime()
+    },
+    unloadHandler(e) {
+      var gap_time = new Date().getTime() - this.beforeUnload_time
+      // 判断是窗口关闭还是刷新
+      if (gap_time <= 5) {
+        if (this.$root.ws !== null) {
+          this.$root.ws.close()
+          this.$root.ws = null
+        }
+      }
+    }
+  }
 }
 </script>
 <style rel="stylesheet/scss" lang="scss">
diff --git a/src/main.js b/src/main.js
index c9354d4..6eb8d51 100644
--- a/src/main.js
+++ b/src/main.js
@@ -32,6 +32,7 @@
 Vue.prototype.hasPerm = hasPermission
 Vue.prototype.showWellType = showWellType
 Vue.prototype.showDeviceType = showDeviceType
+
 Vue.prototype.showIpConfig = showIpConfig
 Vue.prototype.isOperation = isOperation
 // 引入Element-ui
@@ -65,11 +66,18 @@
 Vue.use(VCharts)
 
 // 配置是否启用考勤功能
-export const attendanceEnable = true
+export const attendanceEnable = false
 
 new Vue({
   el: '#app',
   router,
+  data() {
+    return {
+      ws: null,
+      wsURL: 'ws://127.0.0.1:1234',
+      devInited: false
+    }
+  },
   store,
   render: h => h(App)
 })
diff --git a/src/views/layout/components/AppHeader.vue b/src/views/layout/components/AppHeader.vue
index 6326221..bf36e89 100644
--- a/src/views/layout/components/AppHeader.vue
+++ b/src/views/layout/components/AppHeader.vue
@@ -52,6 +52,10 @@
       this.$store.dispatch('ToggleSideBar')
     },
     logout() {
+      if (this.$root.ws !== null) {
+        this.$root.ws.close()
+        this.$root.ws = null
+      }
       this.$store.dispatch('LogOut').then(() => {
         location.reload() // 为了重新实例化vue-router对象 避免bug
       })
diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index daf44ff..a57232c 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -164,6 +164,7 @@
           }
           this.$store.dispatch('Login', loginForm).then(() => {
             this.loading = false
+            this.$root.isOcxV = true
             this.$message.success('登录成功')
             this.$router.push({ path: '/' })
           }).catch(() => {
diff --git a/src/views/memberManage/addIris.vue b/src/views/memberManage/addIris.vue
index e65e74c..67e85eb 100644
--- a/src/views/memberManage/addIris.vue
+++ b/src/views/memberManage/addIris.vue
@@ -2,7 +2,7 @@
   <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;"/>
+      <iframe name="iframeMap2" scrolling="no" width="100%" height="450" frameBorder="no" src="static/eye/eye.html" style="z-index: -1;"/>
     </div>
   </div>
 </template>
@@ -10,7 +10,7 @@
 <script>
 import { saveIris } from '@/api/person'
 export default {
-  name: 'AddIris',
+  name: 'AddIrisOld',
   data() {
     return {
       irisForm: {
diff --git a/src/views/memberManage/addPersonIris.vue b/src/views/memberManage/addPersonIris.vue
index e78b02b..269c83d 100644
--- a/src/views/memberManage/addPersonIris.vue
+++ b/src/views/memberManage/addPersonIris.vue
@@ -171,7 +171,7 @@
           <el-col :span="15" style="text-align:center">
             <el-button v-show="!isEditMode" size="medium" @click="resetForm"> 重置 </el-button>
             <el-button :disabled="!canSave" type="primary" size="medium" style="margin-left: 20px;" @click="saveData"> 保存 </el-button>
-            <el-button v-show="!isEditMode" type="primary" size="medium" style="margin-left: 20px;" @click="registerIris"> 下一步，注册虹膜 </el-button>
+            <el-button v-show="!isEditMode" type="primary" size="medium" style="margin-left: 20px;" @click="registerIris"> 注册虹膜 </el-button>
           </el-col>
         </el-row>
       </div>
@@ -180,7 +180,7 @@
     <div v-if="step==='2'">
       <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;"/>
+        <iframe name="iframeMap3" scrolling="no" width="100%" height="450" frameBorder="no" src="static/eye/eyeTest.html" style="z-index: -1;"/>
       </div>
       <!-- <div
         v-loading ="devLoading"
@@ -193,22 +193,24 @@
     <div>
       <iframe :src="idsrc" name = "iframeIDCard" scrolling="no" width="100%" height="0" frameBorder="no"/>
     </div>
+    <capture-iris ref="captureIris"/>
   </div>
 </template>
 
 <script>
 import DeptSelect from '@/components/DeptSelect'
 // import { Uploadimg } from '@/api/common'
-import { addPerson, updatePerson, personInfo, getSexType, getDutyType, getNationType, saveIris } from '@/api/person'
+import { addPerson, updatePerson, personInfo, getSexType, getDutyType, getNationType } from '@/api/person'
 // import { getToken } from '@/utils/auth' // getToken from cookie
 // import { getProject } from '@/utils/baseConfig'
 import { getBirthdayByIdNO, getSexByIdNO } from '@/utils/dataAnalysis'
 // import { isIE } from '@/utils/browser'
 import { attendanceEnable } from '@/main.js'
+import CaptureIris from './captureIris'
 
 export default {
   name: 'AddPersonIris',
-  components: { DeptSelect },
+  components: { CaptureIris, DeptSelect },
   data() {
     const validateIDCard = (rule, value, callback) => {
       if (value !== '') {
@@ -589,6 +591,24 @@
         }
       })
     },
+    // 注册虹膜
+    registerIris() {
+      // 如果已经保存
+      // this.isSave = true
+      if (this.isSave) {
+        debugger
+        var row = []
+        var data = {}
+        data['id'] = this.personForm.id
+        data['name'] = this.personForm.name
+        data['idCardNo'] = this.personForm.idCardNo
+        data['isAddPerson'] = '1'
+        row.push(data)
+        this.$refs.captureIris.initDialog(true, row[0])
+      } else {
+        this.$message.warning('请先保存用户基本信息')
+      }
+    },
     // 接收iframe传来的消息
     receiveParamsFromHtml(res) {
       if (res === 'saveIrisData') {
@@ -598,35 +618,38 @@
       }
     },
     // 保存虹膜数据
-    saveIrisData() {
-      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
-      this.irisForm.personId = this.personForm.id
-      this.irisForm.idCardNo = this.personForm.idCardNo
-      saveIris(this.irisForm).then(response => {
-        this.step = '1'
-        if (response.code === 200) {
-          // this.$message.success('保存虹膜成功')
-          this.$confirm('新增成功，是否继续新增?', '提示', {
-            confirmButtonText: '是',
-            cancelButtonText: '否',
-            type: 'info'
-          }).then(() => {
-            this.personForm.id = ''
-            this.resetForm()
-            this.isSave = false
-            this.isEditMode = false
-            this.$nextTick(() => {
-              this.$refs['dataForm'].clearValidate()
-            })
-          }).catch(() => {
-            this.$router.push({ path: '/staff' })
-          })
-        }
+    addSuccess() {
+      // this.$message.success('保存虹膜成功')
+      this.$confirm('新增成功，是否继续新增?', '提示', {
+        confirmButtonText: '是',
+        cancelButtonText: '否',
+        type: 'info'
+      }).then(() => {
+        this.personForm.id = ''
+        this.resetForm()
+        this.isSave = false
+        this.isEditMode = false
+        this.$nextTick(() => {
+          this.$refs['dataForm'].clearValidate()
+        })
+      }).catch(() => {
+        this.$router.push({ path: '/staff' })
       })
     },
+    // 没用了
+    startCapture() {
+      if (this.irisBtnName === '初始化设备') {
+        this.devLoading = true
+        this.irisBtnDisable = true
+        window.frames['iframeMap'].initDev()
+      } else if (this.irisBtnName === '立即采集') {
+        this.irisBtnDisable = true
+        window.frames['iframeMap'].StartCaptureStepTwo()
+      } else if (this.irisBtnName === '保存虹膜数据') {
+        this.irisBtnDisable = true
+        this.saveIrisData()
+      }
+    },
     // 图片上传
     uploadFile(file) {
       console.log('uploadFile:' + file.file.name)
diff --git a/src/views/memberManage/captureIris.vue b/src/views/memberManage/captureIris.vue
new file mode 100644
index 0000000..9637184
--- /dev/null
+++ b/src/views/memberManage/captureIris.vue
@@ -0,0 +1,232 @@
+<template>
+  <div class="app-container">
+    <el-dialog :title="title" :visible.sync="dialogFormVisible" append-to-body @close="closeDialog">
+      <el-form ref="dataForm" :model="irisForm" label-well-code="right" label-width="95px" style="margin-top: 20px">
+        <el-row type="flex" justify="center">
+          <el-col :offset="2" :span="12">
+            <div class="avatar">
+              <el-image
+                :src="photoRight!==''?photoRight:defaultPhoto"
+                fit="fill"
+                style="width: 280px; height: 195px"
+                border/>
+            </div>
+          </el-col>
+          <el-col :span="12">
+            <el-row>
+              <div class="avatar">
+                <el-image
+                  :src="photoLeft!==''?photoLeft:defaultPhoto"
+                  fit="fill"
+                  style="width: 280px; height: 195px"/>
+              </div>
+            </el-row>
+          </el-col>
+        </el-row>
+        <el-row style="margin-top: 10px;">
+          <el-col :offset="6" :span="4">
+            <span>右眼虹膜</span>
+          </el-col>
+          <el-col :offset="7" :span="4">
+            <span>左眼虹膜</span>
+          </el-col>
+        </el-row>
+        <el-row >
+          <el-col :offset="5" :span="12" style="margin-top: 30px">
+            <el-form-item prop="eyeType">
+              <el-select :disabled="eyeTypeDisabled" v-model="irisForm.eyeType">
+                <el-option key="3" label="双眼" value="3" />
+                <el-option key="2" label="左眼" value="2"/>
+                <el-option key="1" label="右眼" value="1"/>
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <div class="dialog-footer">
+        <el-button :disabled="startBtnDisabeld" type="primary" @click="startCapture">开始采集</el-button>
+        <el-button :disabled="stopBtnDisabeld" type="primary" @click="stopCapture">停止采集</el-button>
+        <el-button :disabled="saveBtnDisabeld" type="primary" @click="save">保存</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { saveIris } from '@/api/person'
+
+export default {
+  name: 'CaptureIris',
+  data() {
+    return {
+      isAddperson: '0',
+      edited: false,
+      ws: null,
+      eyeTypeDisabled: false,
+      startBtnDisabeld: true,
+      stopBtnDisabeld: false,
+      saveBtnDisabeld: true,
+      name: '',
+      dialogFormVisible: false, // 对话框是否显示
+      photoLeft: '', // 图片路径
+      photoRight: '',
+      defaultPhoto: require('../../assets/global_images/eye.png'), // 默认图片路径
+      irisForm: {
+        eyeType: '3',
+        personId: '',
+        idCardNo: '',
+        image_zy0: '',
+        image_yy0: '',
+        image_zy1: '',
+        image_yy1: ''
+      }, // 表单
+      title: '' // 表头显示标题
+    }
+  },
+  methods: {
+    closeDialog() {
+      this.photoRight = ''
+      this.photoLeft = ''
+      if (this.edited) {
+        this.edited = false
+        if (this.isAddPerson === '1') this.$parent.addSuccess()
+        else this.$parent.fetchData(true)
+      }
+      this.ws.send('Close')
+    },
+    WebSocketConnent() {
+      this.photoLeft = ''
+      this.photoRight = ''
+      var _this = this
+      this.ws = _this.$root.ws
+      this.eyeTypeDisabled = true
+      this.startBtnDisabeld = true
+      this.stopBtnDisabeld = false
+      this.saveBtnDisabeld = true
+      if (this.ws === null) {
+        this.ws = new WebSocket(_this.$root.wsURL)
+        // 注册各类回调
+        this.ws.onopen = function() {
+          _this.$message.success('采集设备启动中...')
+          _this.ws.send('StartCapture' + _this.irisForm.eyeType)
+        }
+        this.ws.onclose = function() {
+          _this.$message.info('与ICS连接断开')
+          _this.$root.ws = null
+        }
+        this.ws.onerror = function() {
+          _this.$message.error('与ICS通信发生错误')
+        }
+        _this.$root.ws = this.ws
+      } else {
+        this.ws.send('StartCapture' + this.irisForm.eyeType)
+      }
+      this.ws.onmessage = function(receiveMsg) {
+        _this.startBtnDisabeld = false
+        _this.stopBtnDisabeld = true
+        _this.eyeTypeDisabled = false
+        if (receiveMsg.data === '设备启动失败') {
+          _this.$message.error(receiveMsg.data + '，请点击“开始采集”重试')
+        } else if (receiveMsg.data === '采集失败') {
+          _this.$message.error(receiveMsg.data)
+        } else if (receiveMsg.data === 'ICS错误') {
+          _this.$message.error(receiveMsg.data)
+        } else if (receiveMsg.data.indexOf('image') > -1) {
+          var data = receiveMsg.data.replace('image', '')
+          _this.saveBtnDisabeld = false
+          if (_this.irisForm.eyeType === '3') {
+            _this.photoLeft = 'data:image/png;base64,' + data.split(';')[0]
+            _this.photoRight = 'data:image/png;base64,' + data.split(';')[1]
+          } else if (_this.irisForm.eyeType === '2') {
+            _this.photoLeft = 'data:image/png;base64,' + data
+          } else if (_this.irisForm.eyeType === '1') {
+            _this.photoRight = 'data:image/png;base64,' + data
+          }
+        }
+      }
+    },
+    // 初始化对话框
+    initDialog: function(dialogFormVisible, row, isAddPerson) {
+      this.title = '采集虹膜 - ' + row.name + ' - ' + row.idCardNo
+      this.irisForm.personId = row.id
+      this.irisForm.idCardNo = row.idCardNo
+      this.dialogFormVisible = dialogFormVisible
+      this.isAddPerson = row.isAddPerson
+      this.WebSocketConnent()
+    },
+    startCapture() {
+      this.WebSocketConnent()
+    },
+    stopCapture() {
+      this.eyeTypeDisabled = false
+      this.startBtnDisabeld = false
+      this.stopBtnDisabeld = true
+      this.saveBtnDisabeld = true
+      this.ws.send('StopCapture')
+    },
+    save() {
+      if (this.photoLeft !== '') {
+        this.irisForm.image_zy0 = this.photoLeft
+        this.irisForm.image_zy1 = this.photoLeft
+      } else {
+        this.irisForm.image_zy0 = this.photoRight
+        this.irisForm.image_zy1 = this.photoRight
+      }
+      if (this.photoRight !== '') {
+        this.irisForm.image_yy0 = this.photoRight
+        this.irisForm.image_yy1 = this.photoRight
+      } else {
+        this.irisForm.image_yy0 = this.photoLeft
+        this.irisForm.image_yy1 = this.photoLeft
+      }
+      saveIris(this.irisForm).then(response => {
+        if (response.code === 200) {
+          this.$message.success('保存虹膜成功')
+          this.edited = true
+          this.dialogFormVisible = false
+          this.closeDialog()
+        }
+      })
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  $tableTitleHeight:46px;
+  .el-select{
+    width: 100%;
+  }
+  .el-date-editor{
+    width: 100%;
+  }
+  .table-title{
+    background-color:rgba(243, 243, 243, 1);
+    height: $tableTitleHeight;
+    .title-header{
+      line-height:$tableTitleHeight;
+      color: #606266;
+      font-size: 15px;
+      i{
+        margin-left: 5px;
+        margin-right: 5px;
+      }
+    }
+  }
+  .edit_btns{
+    .edit_btn{
+      float:right;
+      margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2
+    }
+  }
+  .avatar {
+    margin: 10px;
+    display: block;
+  }
+  .dialog-footer{
+    text-align: center;
+    margin-top: 10px;
+    margin-left: 30px;
+    margin-bottom: 15px;
+  }
+</style>
diff --git a/src/views/memberManage/listStaff.vue b/src/views/memberManage/listStaff.vue
index 65cfd72..0706ff5 100644
--- a/src/views/memberManage/listStaff.vue
+++ b/src/views/memberManage/listStaff.vue
@@ -1,6 +1,6 @@
 <!--员工管理-->
 <template>
-  <div class="app-container">
+  <div v-if="!$root.isOcxShow" class="app-container">
     <!--筛选条件-->
     <div class="search-div">
       <el-form ref="selectForm" :inline="true" :model="listQuery" class="form-container">
@@ -81,6 +81,7 @@
         @size-change="handleSizeChange"
         @current-change="handleCurrentChange"/>
     </div>
+    <capture-iris ref="captureIris"/>
   </div>
 </template>
 <script>
@@ -93,10 +94,11 @@
 import { downloadFile } from '@/utils/downloadUtils'
 import { attendanceEnable } from '@/main.js'
 import { initAnnualLeave } from '@/api/attendance'
+import CaptureIris from './captureIris'
 
 export default {
   name: 'ListStaff',
-  components: { DeptSelect, DownloadTemplate },
+  components: { CaptureIris, DeptSelect, DownloadTemplate },
   data() {
     return {
       listQuery: {
@@ -210,6 +212,7 @@
     this.fetchData(false)
   },
   methods: {
+    receiveParamsFromHtml(res) {},
     // 检查选择情况
     checkSelection() {
       if (this.multipleSelection.length === 0) {
@@ -253,6 +256,10 @@
         this.$message.error('至少选中一项')
       }
     },
+    registerIris(row) {
+      this.dialogFormVisible = true
+      this.$refs.captureIris.initDialog(this.dialogFormVisible, row, '0')
+    },
     initAnnualLeave() {
       initAnnualLeave().then(response => {
         if (response.code === 200) {
diff --git a/static/eye/eye.html b/static/eye/eye.html
index 011d956..0860cce 100644
--- a/static/eye/eye.html
+++ b/static/eye/eye.html
@@ -3,10 +3,10 @@
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
 </head>
 
-<!-- 通过页面调用初始化失败，只能在进入页面时通过该行代码进行设备初始化 -->
+<!-- 通过页面调用初始化失败，只能在进入页面时通过该行代码进行设备初始化 onbeforeunload="closeDev()" -->
 <body onload="window.setTimeout(initDev,1000);">
 
-<div style="margin-top:5px;text-align:center;" onbeforeunload="closeDev()">
+<div style="margin-top:5px;text-align:center;">
     <object id="IrisDevCtrl_Ocx" name="IrisDevCtrl_Ocx" width="600px" height="240px" classid="clsid:D0D52D8E-12AD-4C93-BF38-24D90C3398F2"
             CODEBASE="./getcert.CAB#version=1,0,0,23">
     </object>
@@ -72,6 +72,9 @@
     }
 
     function initDev(){
+      // console.log("开始初始化");
+      //   var re = closeDev();
+      //   console.log("关闭结果："+re);
         var brightness=document.getElementById("brightness").value;
         var initDevParam={"log":"1","white_brightness":brightness};
         var initDevParamString=JSON.stringify(initDevParam);
@@ -80,18 +83,20 @@
         var result = IrisDevCtrl_Obj.IrisInit(initDevParamString);
 
         if(result===0) {
-          invockIframeMethod("采集设备初始化成功");
+          invockIframeMethod("init success");
         } else {
-          invockIframeMethod("初始化失败，请重连采集设备并点击初始化设备按钮");
+          invockIframeMethod("init failed");
         }
     }
 
     function closeDev(){
+      IrisDevCtrl_Obj = document.getElementById("IrisDevCtrl_Ocx");
         var result = IrisDevCtrl_Obj.IrisClose();
         if(result===0)
           invockIframeMethod("关闭成功");
         else
           invockIframeMethod("关闭失败");
+        return result;
     }
 
     function startDev(){

diff --git a/config/dev.env.js b/config/dev.env.js
index 3d7e78f..de005f8 100644
--- a/config/dev.env.js
+++ b/config/dev.env.js
@@ -6,6 +6,6 @@
 // 将两个配置对象合并，最终结果是 NODE_ENV：‘"development"'
 module.exports = merge(prodEnv, {
   NODE_ENV: '"development"',
-  BASE_API: '"http://localhost:8093"'
-  // BASE_API: '"http://192.168.0.18:8093"'
+  // BASE_API: '"http://111.198.10.15:20005"'
+  BASE_API: '"http://192.168.0.18:8093"'
 })
diff --git a/config/prod.env.js b/config/prod.env.js
index 610d466..a1c6dd9 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://139.198.16.38:20005"'
+  BASE_API: '"http://111.198.10.15:11802"'
   // BASE_API: '"http://192.168.8.211:20005"'
 }
diff --git a/src/App.vue b/src/App.vue
index d716c90..a33b5f0 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,12 +1,39 @@
 <template>
-  <div id="app">
+  <div id="app" scrolling="no">
     <router-view/>
   </div>
 </template>
-
 <script>
 export default {
-  name: 'App'
+  name: 'App',
+  data() {
+    return {
+      beforeUnload_time: ''
+    }
+  },
+  mounted() {
+    window.addEventListener('beforeunload', e => this.beforeunloadHandler(e))
+    window.addEventListener('unload', e => this.unloadHandler(e))
+  },
+  destroyed() {
+    window.removeEventListener('beforeunload', e => this.beforeunloadHandler(e))
+    window.removeEventListener('unload', e => this.unloadHandler(e))
+  },
+  methods: {
+    beforeunloadHandler() {
+      this.beforeUnload_time = new Date().getTime()
+    },
+    unloadHandler(e) {
+      var gap_time = new Date().getTime() - this.beforeUnload_time
+      // 判断是窗口关闭还是刷新
+      if (gap_time <= 5) {
+        if (this.$root.ws !== null) {
+          this.$root.ws.close()
+          this.$root.ws = null
+        }
+      }
+    }
+  }
 }
 </script>
 <style rel="stylesheet/scss" lang="scss">
diff --git a/src/main.js b/src/main.js
index c9354d4..6eb8d51 100644
--- a/src/main.js
+++ b/src/main.js
@@ -32,6 +32,7 @@
 Vue.prototype.hasPerm = hasPermission
 Vue.prototype.showWellType = showWellType
 Vue.prototype.showDeviceType = showDeviceType
+
 Vue.prototype.showIpConfig = showIpConfig
 Vue.prototype.isOperation = isOperation
 // 引入Element-ui
@@ -65,11 +66,18 @@
 Vue.use(VCharts)
 
 // 配置是否启用考勤功能
-export const attendanceEnable = true
+export const attendanceEnable = false
 
 new Vue({
   el: '#app',
   router,
+  data() {
+    return {
+      ws: null,
+      wsURL: 'ws://127.0.0.1:1234',
+      devInited: false
+    }
+  },
   store,
   render: h => h(App)
 })
diff --git a/src/views/layout/components/AppHeader.vue b/src/views/layout/components/AppHeader.vue
index 6326221..bf36e89 100644
--- a/src/views/layout/components/AppHeader.vue
+++ b/src/views/layout/components/AppHeader.vue
@@ -52,6 +52,10 @@
       this.$store.dispatch('ToggleSideBar')
     },
     logout() {
+      if (this.$root.ws !== null) {
+        this.$root.ws.close()
+        this.$root.ws = null
+      }
       this.$store.dispatch('LogOut').then(() => {
         location.reload() // 为了重新实例化vue-router对象 避免bug
       })
diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index daf44ff..a57232c 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -164,6 +164,7 @@
           }
           this.$store.dispatch('Login', loginForm).then(() => {
             this.loading = false
+            this.$root.isOcxV = true
             this.$message.success('登录成功')
             this.$router.push({ path: '/' })
           }).catch(() => {
diff --git a/src/views/memberManage/addIris.vue b/src/views/memberManage/addIris.vue
index e65e74c..67e85eb 100644
--- a/src/views/memberManage/addIris.vue
+++ b/src/views/memberManage/addIris.vue
@@ -2,7 +2,7 @@
   <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;"/>
+      <iframe name="iframeMap2" scrolling="no" width="100%" height="450" frameBorder="no" src="static/eye/eye.html" style="z-index: -1;"/>
     </div>
   </div>
 </template>
@@ -10,7 +10,7 @@
 <script>
 import { saveIris } from '@/api/person'
 export default {
-  name: 'AddIris',
+  name: 'AddIrisOld',
   data() {
     return {
       irisForm: {
diff --git a/src/views/memberManage/addPersonIris.vue b/src/views/memberManage/addPersonIris.vue
index e78b02b..269c83d 100644
--- a/src/views/memberManage/addPersonIris.vue
+++ b/src/views/memberManage/addPersonIris.vue
@@ -171,7 +171,7 @@
           <el-col :span="15" style="text-align:center">
             <el-button v-show="!isEditMode" size="medium" @click="resetForm"> 重置 </el-button>
             <el-button :disabled="!canSave" type="primary" size="medium" style="margin-left: 20px;" @click="saveData"> 保存 </el-button>
-            <el-button v-show="!isEditMode" type="primary" size="medium" style="margin-left: 20px;" @click="registerIris"> 下一步，注册虹膜 </el-button>
+            <el-button v-show="!isEditMode" type="primary" size="medium" style="margin-left: 20px;" @click="registerIris"> 注册虹膜 </el-button>
           </el-col>
         </el-row>
       </div>
@@ -180,7 +180,7 @@
     <div v-if="step==='2'">
       <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;"/>
+        <iframe name="iframeMap3" scrolling="no" width="100%" height="450" frameBorder="no" src="static/eye/eyeTest.html" style="z-index: -1;"/>
       </div>
       <!-- <div
         v-loading ="devLoading"
@@ -193,22 +193,24 @@
     <div>
       <iframe :src="idsrc" name = "iframeIDCard" scrolling="no" width="100%" height="0" frameBorder="no"/>
     </div>
+    <capture-iris ref="captureIris"/>
   </div>
 </template>
 
 <script>
 import DeptSelect from '@/components/DeptSelect'
 // import { Uploadimg } from '@/api/common'
-import { addPerson, updatePerson, personInfo, getSexType, getDutyType, getNationType, saveIris } from '@/api/person'
+import { addPerson, updatePerson, personInfo, getSexType, getDutyType, getNationType } from '@/api/person'
 // import { getToken } from '@/utils/auth' // getToken from cookie
 // import { getProject } from '@/utils/baseConfig'
 import { getBirthdayByIdNO, getSexByIdNO } from '@/utils/dataAnalysis'
 // import { isIE } from '@/utils/browser'
 import { attendanceEnable } from '@/main.js'
+import CaptureIris from './captureIris'
 
 export default {
   name: 'AddPersonIris',
-  components: { DeptSelect },
+  components: { CaptureIris, DeptSelect },
   data() {
     const validateIDCard = (rule, value, callback) => {
       if (value !== '') {
@@ -589,6 +591,24 @@
         }
       })
     },
+    // 注册虹膜
+    registerIris() {
+      // 如果已经保存
+      // this.isSave = true
+      if (this.isSave) {
+        debugger
+        var row = []
+        var data = {}
+        data['id'] = this.personForm.id
+        data['name'] = this.personForm.name
+        data['idCardNo'] = this.personForm.idCardNo
+        data['isAddPerson'] = '1'
+        row.push(data)
+        this.$refs.captureIris.initDialog(true, row[0])
+      } else {
+        this.$message.warning('请先保存用户基本信息')
+      }
+    },
     // 接收iframe传来的消息
     receiveParamsFromHtml(res) {
       if (res === 'saveIrisData') {
@@ -598,35 +618,38 @@
       }
     },
     // 保存虹膜数据
-    saveIrisData() {
-      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
-      this.irisForm.personId = this.personForm.id
-      this.irisForm.idCardNo = this.personForm.idCardNo
-      saveIris(this.irisForm).then(response => {
-        this.step = '1'
-        if (response.code === 200) {
-          // this.$message.success('保存虹膜成功')
-          this.$confirm('新增成功，是否继续新增?', '提示', {
-            confirmButtonText: '是',
-            cancelButtonText: '否',
-            type: 'info'
-          }).then(() => {
-            this.personForm.id = ''
-            this.resetForm()
-            this.isSave = false
-            this.isEditMode = false
-            this.$nextTick(() => {
-              this.$refs['dataForm'].clearValidate()
-            })
-          }).catch(() => {
-            this.$router.push({ path: '/staff' })
-          })
-        }
+    addSuccess() {
+      // this.$message.success('保存虹膜成功')
+      this.$confirm('新增成功，是否继续新增?', '提示', {
+        confirmButtonText: '是',
+        cancelButtonText: '否',
+        type: 'info'
+      }).then(() => {
+        this.personForm.id = ''
+        this.resetForm()
+        this.isSave = false
+        this.isEditMode = false
+        this.$nextTick(() => {
+          this.$refs['dataForm'].clearValidate()
+        })
+      }).catch(() => {
+        this.$router.push({ path: '/staff' })
       })
     },
+    // 没用了
+    startCapture() {
+      if (this.irisBtnName === '初始化设备') {
+        this.devLoading = true
+        this.irisBtnDisable = true
+        window.frames['iframeMap'].initDev()
+      } else if (this.irisBtnName === '立即采集') {
+        this.irisBtnDisable = true
+        window.frames['iframeMap'].StartCaptureStepTwo()
+      } else if (this.irisBtnName === '保存虹膜数据') {
+        this.irisBtnDisable = true
+        this.saveIrisData()
+      }
+    },
     // 图片上传
     uploadFile(file) {
       console.log('uploadFile:' + file.file.name)
diff --git a/src/views/memberManage/captureIris.vue b/src/views/memberManage/captureIris.vue
new file mode 100644
index 0000000..9637184
--- /dev/null
+++ b/src/views/memberManage/captureIris.vue
@@ -0,0 +1,232 @@
+<template>
+  <div class="app-container">
+    <el-dialog :title="title" :visible.sync="dialogFormVisible" append-to-body @close="closeDialog">
+      <el-form ref="dataForm" :model="irisForm" label-well-code="right" label-width="95px" style="margin-top: 20px">
+        <el-row type="flex" justify="center">
+          <el-col :offset="2" :span="12">
+            <div class="avatar">
+              <el-image
+                :src="photoRight!==''?photoRight:defaultPhoto"
+                fit="fill"
+                style="width: 280px; height: 195px"
+                border/>
+            </div>
+          </el-col>
+          <el-col :span="12">
+            <el-row>
+              <div class="avatar">
+                <el-image
+                  :src="photoLeft!==''?photoLeft:defaultPhoto"
+                  fit="fill"
+                  style="width: 280px; height: 195px"/>
+              </div>
+            </el-row>
+          </el-col>
+        </el-row>
+        <el-row style="margin-top: 10px;">
+          <el-col :offset="6" :span="4">
+            <span>右眼虹膜</span>
+          </el-col>
+          <el-col :offset="7" :span="4">
+            <span>左眼虹膜</span>
+          </el-col>
+        </el-row>
+        <el-row >
+          <el-col :offset="5" :span="12" style="margin-top: 30px">
+            <el-form-item prop="eyeType">
+              <el-select :disabled="eyeTypeDisabled" v-model="irisForm.eyeType">
+                <el-option key="3" label="双眼" value="3" />
+                <el-option key="2" label="左眼" value="2"/>
+                <el-option key="1" label="右眼" value="1"/>
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <div class="dialog-footer">
+        <el-button :disabled="startBtnDisabeld" type="primary" @click="startCapture">开始采集</el-button>
+        <el-button :disabled="stopBtnDisabeld" type="primary" @click="stopCapture">停止采集</el-button>
+        <el-button :disabled="saveBtnDisabeld" type="primary" @click="save">保存</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { saveIris } from '@/api/person'
+
+export default {
+  name: 'CaptureIris',
+  data() {
+    return {
+      isAddperson: '0',
+      edited: false,
+      ws: null,
+      eyeTypeDisabled: false,
+      startBtnDisabeld: true,
+      stopBtnDisabeld: false,
+      saveBtnDisabeld: true,
+      name: '',
+      dialogFormVisible: false, // 对话框是否显示
+      photoLeft: '', // 图片路径
+      photoRight: '',
+      defaultPhoto: require('../../assets/global_images/eye.png'), // 默认图片路径
+      irisForm: {
+        eyeType: '3',
+        personId: '',
+        idCardNo: '',
+        image_zy0: '',
+        image_yy0: '',
+        image_zy1: '',
+        image_yy1: ''
+      }, // 表单
+      title: '' // 表头显示标题
+    }
+  },
+  methods: {
+    closeDialog() {
+      this.photoRight = ''
+      this.photoLeft = ''
+      if (this.edited) {
+        this.edited = false
+        if (this.isAddPerson === '1') this.$parent.addSuccess()
+        else this.$parent.fetchData(true)
+      }
+      this.ws.send('Close')
+    },
+    WebSocketConnent() {
+      this.photoLeft = ''
+      this.photoRight = ''
+      var _this = this
+      this.ws = _this.$root.ws
+      this.eyeTypeDisabled = true
+      this.startBtnDisabeld = true
+      this.stopBtnDisabeld = false
+      this.saveBtnDisabeld = true
+      if (this.ws === null) {
+        this.ws = new WebSocket(_this.$root.wsURL)
+        // 注册各类回调
+        this.ws.onopen = function() {
+          _this.$message.success('采集设备启动中...')
+          _this.ws.send('StartCapture' + _this.irisForm.eyeType)
+        }
+        this.ws.onclose = function() {
+          _this.$message.info('与ICS连接断开')
+          _this.$root.ws = null
+        }
+        this.ws.onerror = function() {
+          _this.$message.error('与ICS通信发生错误')
+        }
+        _this.$root.ws = this.ws
+      } else {
+        this.ws.send('StartCapture' + this.irisForm.eyeType)
+      }
+      this.ws.onmessage = function(receiveMsg) {
+        _this.startBtnDisabeld = false
+        _this.stopBtnDisabeld = true
+        _this.eyeTypeDisabled = false
+        if (receiveMsg.data === '设备启动失败') {
+          _this.$message.error(receiveMsg.data + '，请点击“开始采集”重试')
+        } else if (receiveMsg.data === '采集失败') {
+          _this.$message.error(receiveMsg.data)
+        } else if (receiveMsg.data === 'ICS错误') {
+          _this.$message.error(receiveMsg.data)
+        } else if (receiveMsg.data.indexOf('image') > -1) {
+          var data = receiveMsg.data.replace('image', '')
+          _this.saveBtnDisabeld = false
+          if (_this.irisForm.eyeType === '3') {
+            _this.photoLeft = 'data:image/png;base64,' + data.split(';')[0]
+            _this.photoRight = 'data:image/png;base64,' + data.split(';')[1]
+          } else if (_this.irisForm.eyeType === '2') {
+            _this.photoLeft = 'data:image/png;base64,' + data
+          } else if (_this.irisForm.eyeType === '1') {
+            _this.photoRight = 'data:image/png;base64,' + data
+          }
+        }
+      }
+    },
+    // 初始化对话框
+    initDialog: function(dialogFormVisible, row, isAddPerson) {
+      this.title = '采集虹膜 - ' + row.name + ' - ' + row.idCardNo
+      this.irisForm.personId = row.id
+      this.irisForm.idCardNo = row.idCardNo
+      this.dialogFormVisible = dialogFormVisible
+      this.isAddPerson = row.isAddPerson
+      this.WebSocketConnent()
+    },
+    startCapture() {
+      this.WebSocketConnent()
+    },
+    stopCapture() {
+      this.eyeTypeDisabled = false
+      this.startBtnDisabeld = false
+      this.stopBtnDisabeld = true
+      this.saveBtnDisabeld = true
+      this.ws.send('StopCapture')
+    },
+    save() {
+      if (this.photoLeft !== '') {
+        this.irisForm.image_zy0 = this.photoLeft
+        this.irisForm.image_zy1 = this.photoLeft
+      } else {
+        this.irisForm.image_zy0 = this.photoRight
+        this.irisForm.image_zy1 = this.photoRight
+      }
+      if (this.photoRight !== '') {
+        this.irisForm.image_yy0 = this.photoRight
+        this.irisForm.image_yy1 = this.photoRight
+      } else {
+        this.irisForm.image_yy0 = this.photoLeft
+        this.irisForm.image_yy1 = this.photoLeft
+      }
+      saveIris(this.irisForm).then(response => {
+        if (response.code === 200) {
+          this.$message.success('保存虹膜成功')
+          this.edited = true
+          this.dialogFormVisible = false
+          this.closeDialog()
+        }
+      })
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  $tableTitleHeight:46px;
+  .el-select{
+    width: 100%;
+  }
+  .el-date-editor{
+    width: 100%;
+  }
+  .table-title{
+    background-color:rgba(243, 243, 243, 1);
+    height: $tableTitleHeight;
+    .title-header{
+      line-height:$tableTitleHeight;
+      color: #606266;
+      font-size: 15px;
+      i{
+        margin-left: 5px;
+        margin-right: 5px;
+      }
+    }
+  }
+  .edit_btns{
+    .edit_btn{
+      float:right;
+      margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2
+    }
+  }
+  .avatar {
+    margin: 10px;
+    display: block;
+  }
+  .dialog-footer{
+    text-align: center;
+    margin-top: 10px;
+    margin-left: 30px;
+    margin-bottom: 15px;
+  }
+</style>
diff --git a/src/views/memberManage/listStaff.vue b/src/views/memberManage/listStaff.vue
index 65cfd72..0706ff5 100644
--- a/src/views/memberManage/listStaff.vue
+++ b/src/views/memberManage/listStaff.vue
@@ -1,6 +1,6 @@
 <!--员工管理-->
 <template>
-  <div class="app-container">
+  <div v-if="!$root.isOcxShow" class="app-container">
     <!--筛选条件-->
     <div class="search-div">
       <el-form ref="selectForm" :inline="true" :model="listQuery" class="form-container">
@@ -81,6 +81,7 @@
         @size-change="handleSizeChange"
         @current-change="handleCurrentChange"/>
     </div>
+    <capture-iris ref="captureIris"/>
   </div>
 </template>
 <script>
@@ -93,10 +94,11 @@
 import { downloadFile } from '@/utils/downloadUtils'
 import { attendanceEnable } from '@/main.js'
 import { initAnnualLeave } from '@/api/attendance'
+import CaptureIris from './captureIris'
 
 export default {
   name: 'ListStaff',
-  components: { DeptSelect, DownloadTemplate },
+  components: { CaptureIris, DeptSelect, DownloadTemplate },
   data() {
     return {
       listQuery: {
@@ -210,6 +212,7 @@
     this.fetchData(false)
   },
   methods: {
+    receiveParamsFromHtml(res) {},
     // 检查选择情况
     checkSelection() {
       if (this.multipleSelection.length === 0) {
@@ -253,6 +256,10 @@
         this.$message.error('至少选中一项')
       }
     },
+    registerIris(row) {
+      this.dialogFormVisible = true
+      this.$refs.captureIris.initDialog(this.dialogFormVisible, row, '0')
+    },
     initAnnualLeave() {
       initAnnualLeave().then(response => {
         if (response.code === 200) {
diff --git a/static/eye/eye.html b/static/eye/eye.html
index 011d956..0860cce 100644
--- a/static/eye/eye.html
+++ b/static/eye/eye.html
@@ -3,10 +3,10 @@
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
 </head>
 
-<!-- 通过页面调用初始化失败，只能在进入页面时通过该行代码进行设备初始化 -->
+<!-- 通过页面调用初始化失败，只能在进入页面时通过该行代码进行设备初始化 onbeforeunload="closeDev()" -->
 <body onload="window.setTimeout(initDev,1000);">
 
-<div style="margin-top:5px;text-align:center;" onbeforeunload="closeDev()">
+<div style="margin-top:5px;text-align:center;">
     <object id="IrisDevCtrl_Ocx" name="IrisDevCtrl_Ocx" width="600px" height="240px" classid="clsid:D0D52D8E-12AD-4C93-BF38-24D90C3398F2"
             CODEBASE="./getcert.CAB#version=1,0,0,23">
     </object>
@@ -72,6 +72,9 @@
     }
 
     function initDev(){
+      // console.log("开始初始化");
+      //   var re = closeDev();
+      //   console.log("关闭结果："+re);
         var brightness=document.getElementById("brightness").value;
         var initDevParam={"log":"1","white_brightness":brightness};
         var initDevParamString=JSON.stringify(initDevParam);
@@ -80,18 +83,20 @@
         var result = IrisDevCtrl_Obj.IrisInit(initDevParamString);
 
         if(result===0) {
-          invockIframeMethod("采集设备初始化成功");
+          invockIframeMethod("init success");
         } else {
-          invockIframeMethod("初始化失败，请重连采集设备并点击初始化设备按钮");
+          invockIframeMethod("init failed");
         }
     }
 
     function closeDev(){
+      IrisDevCtrl_Obj = document.getElementById("IrisDevCtrl_Ocx");
         var result = IrisDevCtrl_Obj.IrisClose();
         if(result===0)
           invockIframeMethod("关闭成功");
         else
           invockIframeMethod("关闭失败");
+        return result;
     }
 
     function startDev(){
diff --git a/static/eye/eyeTest.html b/static/eye/eyeTest.html
new file mode 100644
index 0000000..9ed7e20
--- /dev/null
+++ b/static/eye/eyeTest.html
@@ -0,0 +1,245 @@
+<html>
+<head>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+</head>
+
+<body onload="window.setTimeout(initDev,1000);">
+<!--window.setTimeout(initDev,1000);-->
+
+<div style="margin-top:10px;text-align:center;">
+    <object id="IrisDevCtrl_Ocx" name="IrisDevCtrl_Ocx" width="620px" height="230px" classid="clsid:D0D52D8E-12AD-4C93-BF38-24D90C3398F2"
+            CODEBASE="./getcert.CAB#version=1,0,0,23">
+    </object>
+</div>
+  <div style="margin-top:15px;">
+    <div style="width: 280px; text-align: center;float: left">
+      <span style="font-size: 12px;font-family: 'Microsoft YaHei';" >左眼虹膜  </span>
+      <span style="font-size: 12px;font-family: 'Microsoft YaHei';" id="leftText"></span>
+      <span style="font-size: 12px;font-family: 'Microsoft YaHei';" id="left"></span>
+    </div>
+    <div style="width: 270px; text-align: center;float: left">
+      <span  style="font-size: 12px;font-family: 'Microsoft YaHei';" >右眼虹膜  </span>
+      <span style="font-size: 12px;font-family: 'Microsoft YaHei';" id="rightText"></span>
+      <span  style="font-size: 12px;font-family: 'Microsoft YaHei';" id="right"></span>
+    </div>
+  </div>
+
+<div style="margin-top:20px;text-align:center;">
+    <input hidden type="text" id="brightness" value="240" style="width:70px;"/>
+</div>
+
+
+</body>
+<script type="text/javascript" src="jquery-1.4.4.min.js"></script>
+<script type="text/JavaScript" language="javascript">
+
+    // var inited=false;
+    var IrisDevCtrl_Obj = null;
+    var imageLeft=null;
+    var imageRight=null;
+    var qL=null;
+    var qR=null;
+    var devCode=null;
+    var usedTime=null;
+    var captureTypeS=1;//1是采集需要显示质量，2是识别和验证
+    var sn=null;
+    var isForcce=false;
+
+    //初始化设备
+    function initDev(){
+       console.log("开始初始化");
+        var initDevParam={"log":"1","white_brightness":"240"};
+        var initDevParamString=JSON.stringify(initDevParam);
+        // sn = IrisDevCtrl_Obj.GetDeviceSn();
+        IrisDevCtrl_Obj = document.getElementById("IrisDevCtrl_Ocx");
+        var result = IrisDevCtrl_Obj.IrisInit(initDevParamString);
+        if(result===0) {
+          //通知vue，初始化成功
+          invockIframeMethod("init success");
+        }
+        else {
+          //通知vue，初始化失败
+          invockIframeMethod("init failure");
+        }
+    }
+
+    function invockIframeMethod(msg) {
+      // 是用widow调用vue绑定的vueDefinedMyProp方法
+      window.parent['vueDefined'](msg);
+    }
+
+    function closeDev(){
+        var result = IrisDevCtrl_Obj.IrisClose();
+
+        // if(result===0)
+        //     alert("关闭成功");
+        // else
+        //     alert("关闭失败");
+    }
+
+    // function startDev(){
+    //
+    //     var brightness=document.getElementById("eyeType").value;
+    //     var initDevParam= {"eyeType":brightness};
+    //     var initDevParamString=JSON.stringify(initDevParam);
+    //
+    //     var result = IrisDevCtrl_Obj.StartCapture(initDevParamString);
+    // }
+
+    //立即采集
+    function StartCapture(eyeType, captureType){
+
+      isForcce = false;
+      captureTypeS = captureType
+      if(captureType === 1) {
+        document.getElementById('leftText').innerHTML = " 质量：";
+        document.getElementById('rightText').innerHTML = " 质量：";
+        document.getElementById('left').innerHTML = "";
+        document.getElementById('right').innerHTML = "";
+      }
+        // var eyeType=document.getElementById("eyeType").value;
+        // alert(eyeType);
+        var param= {"eyeType":eyeType};
+        var paramString=JSON.stringify(param);
+        var result = IrisDevCtrl_Obj.StartCapture(paramString);
+        if(result !== 0){
+          invockIframeMethod("capture failure");
+        } else {
+          isForcce = false;
+        }
+
+    }
+
+    // function  StartCaptureForce(eyeType, captureType) {
+    //   captureTypeS = captureType
+    //   if(captureType === 1) {
+    //     document.getElementById('leftText').innerHTML = " 质量：";
+    //     document.getElementById('rightText').innerHTML = " 质量：";
+    //   }
+    //   // var eyeType=document.getElementById("eyeType").value;
+    //   // alert(eyeType);
+    //   var param= {"eyeType":eyeType};
+    //   var paramString=JSON.stringify(param);
+    //   var result = IrisDevCtrl_Obj.StartCaptureForce(paramString);
+    //   if(result !== 0){
+    //     invockIframeMethod("capture failure");
+    //   } else {
+    //     isForcce = true;
+    //   }
+    // }
+
+    //采集成功回调
+    function OnCapture(result,sIrisInfo){
+
+      var reJson = eval("(" + sIrisInfo + ")");
+      if(result===0) {
+        if(captureTypeS === 1) {
+          // if(isForcce === false) {
+          //   document.getElementById('left').innerHTML = parseInt(reJson.zy_xxzlpf)/10 + "";
+          //   document.getElementById('right').innerHTML = parseInt(reJson.yy_xxzlpf)/10 + "";
+          //   qL=parseInt(reJson.zy_xxzlpf)/10 + "";
+          //   qR=parseInt(reJson.yy_xxzlpf)/10 + "";
+          // } else {
+          //   document.getElementById('left').innerHTML = "<5";
+          //   document.getElementById('right').innerHTML = "<5";
+          //   qL="<5";
+          //   qR="<5";
+          // }
+          document.getElementById('left').innerHTML = "<5";
+          document.getElementById('right').innerHTML = "<5";
+          qL="<5";
+          qR="<5";
+        }
+        imageLeft= reJson.hmzp_zy;
+        imageRight= reJson.hmzp_yy;
+        devCode =reJson.sbbh;
+        usedTime=reJson.cjtphs;
+
+        //通知vue，采集成功
+        invockIframeMethod("captured");
+      }
+      else if(result===-1){
+        invockIframeMethod("capture failure");
+      }
+      else if(result===-2){
+        if(captureTypeS === 1) {
+          devCode =reJson.sbbh;
+          document.getElementById('left').innerHTML = "<5";
+          document.getElementById('right').innerHTML = "<5";
+          qL="<5";
+          qR="<5";
+        }
+        invockIframeMethod("capture failure");
+      }
+    }
+    function getDeviceSn() {
+      sn = IrisDevCtrl_Obj.GetDeivceSn();
+    }
+    function stopDev(){
+        var result = IrisDevCtrl_Obj.StopCapture();
+    }
+
+    function reset(){
+      document.getElementById('leftText').innerHTML = "";
+      document.getElementById('rightText').innerHTML = "";
+      document.getElementById('left').innerHTML = "";
+      document.getElementById('right').innerHTML = "";
+      var result = IrisDevCtrl_Obj.ReSet();
+    }
+
+    function getParam(params){
+        var url = location.href;
+        var paraString = url.substring(url.indexOf("?") + 1, url.length).split("_");
+        var paraObj = { };
+        for (i = 0; j = paraString[i]; i++) {
+            paraObj[j.substring(0, j.indexOf("=")).toLowerCase()] = j.substring(j.indexOf("=") + 1, j.length);
+        }
+        var returnValue = paraObj[params.toLowerCase()];
+        if (typeof (returnValue) == "undefined") {
+            return "";
+        } else {
+            return returnValue;
+        }
+    }
+
+    function sendBmp(imageLeft,imageRight){
+        //var token=getParam("token");
+        var personId=parent.getParam("id");
+        var idCardNo=getParam("idCardNo");
+
+		    var personId="3";
+		    var token="3888c8d7-b753-41f7-a3ea-11855413662c";
+
+        $.ajax({
+            url:addDataUrl,
+            type:"POST",
+            data:{
+                "personId":personId,
+                "idCardNo":idCardNo,
+                "image_zy0":image0,
+                "image_yy0":image1,
+                "image_zy1":image2,
+                "image_yy1":image3
+            },
+            //processData:false,//告诉jquery不要处理发送的数据
+            //contentType:false,//告诉jquery不要设置content-Type请求头
+            beforeSend:function(request){
+                request.setRequestHeader("token",token);
+            },
+            success:function(data){
+                alert(data.message);
+            },
+            error:function(data){
+
+            }
+        });
+
+    }
+
+</script>
+
+<script type="text/JavaScript" FOR="IrisDevCtrl_Ocx" event="OnCapture(result,sIrisInfo)">
+    OnCapture(result,sIrisInfo);
+</script>
+
+</html>