diff --git a/package.json b/package.json
index 8350900..ee5ebcf 100644
--- a/package.json
+++ b/package.json
@@ -23,6 +23,7 @@
     "event-source-polyfill": "^1.0.5",
     "js-cookie": "2.2.0",
     "jsencrypt": "^3.0.0-rc.1",
+    "leaflet": "^1.7.1",
     "mockjs": "1.0.1-beta3",
     "moment": "^2.24.0",
     "normalize.css": "7.0.0",

diff --git a/package.json b/package.json
index 8350900..ee5ebcf 100644
--- a/package.json
+++ b/package.json
@@ -23,6 +23,7 @@
     "event-source-polyfill": "^1.0.5",
     "js-cookie": "2.2.0",
     "jsencrypt": "^3.0.0-rc.1",
+    "leaflet": "^1.7.1",
     "mockjs": "1.0.1-beta3",
     "moment": "^2.24.0",
     "normalize.css": "7.0.0",
diff --git a/src/main.js b/src/main.js
index 536ffcb..25de869 100644
--- a/src/main.js
+++ b/src/main.js
@@ -16,8 +16,8 @@
 import '@/permission' // permission control
 
 
-import 'leaflet/dist/leaflet.css'
-import L from "leaflet"
+// import 'leaflet/dist/leaflet.css'
+// import L from "leaflet"
 
 /**
  * This project originally used easy-mock to simulate data,

diff --git a/package.json b/package.json
index 8350900..ee5ebcf 100644
--- a/package.json
+++ b/package.json
@@ -23,6 +23,7 @@
     "event-source-polyfill": "^1.0.5",
     "js-cookie": "2.2.0",
     "jsencrypt": "^3.0.0-rc.1",
+    "leaflet": "^1.7.1",
     "mockjs": "1.0.1-beta3",
     "moment": "^2.24.0",
     "normalize.css": "7.0.0",
diff --git a/src/main.js b/src/main.js
index 536ffcb..25de869 100644
--- a/src/main.js
+++ b/src/main.js
@@ -16,8 +16,8 @@
 import '@/permission' // permission control
 
 
-import 'leaflet/dist/leaflet.css'
-import L from "leaflet"
+// import 'leaflet/dist/leaflet.css'
+// import L from "leaflet"
 
 /**
  * This project originally used easy-mock to simulate data,
diff --git a/src/views/leaflet-test/overview-leaflet.vue b/src/views/leaflet-test/overview-leaflet.vue
deleted file mode 100644
index 3267e9c..0000000
--- a/src/views/leaflet-test/overview-leaflet.vue
+++ /dev/null
@@ -1,217 +0,0 @@
-<template>
-  <div>
-    <div v-loading="loading" class="overview-map-container">
-      <!--地图-->
-      <!--<div id="container" class="map" tabindex="0"/>-->
-      <div id="map"></div>
-    </div>
-  </div>
-</template>
-
-<script>
-import _ from 'lodash'
-// import icon from '/static/images/well/0100.png'
-// import { getAllMarker } from '@/api/overview'
-// import { getMarkerInfo } from '@/api/marker'
-// import { lazyAMapApiLoaderInstance } from 'vue-amap'
-
-export default {
-  name: 'OverviewLeaflet',
-  data () {
-    return {
-      loading: false,
-      icon: 'static/images/well/0100.png',
-      map: null,
-      msg: 'Welcome to Your Vue.js App'
-    }
-  },
-  mounted() {
-    this.initMap()
-  },
-  methods: {
-    initMap() {
-      let map = L.map("map", {
-        minZoom: 3,
-        maxZoom: 14,
-        center: [39.550339, 116.114129],
-        zoom: 12,
-        zoomControl: false,
-        attributionControl: false,
-        crs: L.CRS.EPSG3857
-      });
-      this.map = map　　　　//data上需要挂载
-      window.map = map
-      L.tileLayer(
-        "http://webrd01.is.autonavi.com/appmaptile?lang=zh_cn&size=1&scale=1&style=7&x={x}&y={y}&z={z}"
-      ).addTo(map)
-      let greenIcon = L.icon({
-        iconUrl: this.icon,
-        // shadowUrl: iconShadow,
-        iconSize:     [30, 50], // size of the icon
-        // shadowSize:   [50, 64], // size of the shadow
-        iconAnchor:   [15, 50], // point of the icon which will correspond to marker's location
-        // shadowAnchor: [15, 64],  // the same for the shadow
-        popupAnchor:  [0, -40] // point from which the popup should open relative to the iconAnchor
-      })
-      var marker = L.marker([39.550339, 116.114129],{
-        icon: greenIcon
-      }).addTo(map).bindPopup("I am a green leaf.")
-
-
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss">
-  #map {
-    width: 100%;
-    height: calc(100vh);
-  }
-// 查询框
-.map-search-div{
-  position: absolute;
-  z-index: 100;
-  padding: 5px 20px;
-  background-color: rgba(244, 244, 244, 0.9);
-  /*left: 90px;*/
-  .el-form-item{
-    margin-bottom: 0px;
-  }
-}
-// 报警列表
-.map-alarm-div{
-  position: absolute;
-  z-index: 100;
-  background-color: rgba(255, 234, 241,0.8);
-  top: 60px;
-  left: 10px;
-  .map-alarm-div-header{
-    line-height: 40px;
-    width: 504px;
-    padding-left: 10px;
-    .icon-right{
-      position: absolute;
-      right: 15px;
-    }
-    .icon-right:hover{
-      color: #409EFF;
-      cursor: pointer;
-    }
-  }
-  .el-scrollbar {
-    /*height: 200px;*/
-    width: 100%;
-  }
-  .moredatascollor{
-    height: 200px;
-  }
-  .el-scrollbar__wrap {
-    overflow-y: auto;
-    overflow-x: hidden;
-    margin-bottom: 0px !important;
-}
-
-.el-table th{
-/*background-color: rgba(255, 229, 230, 0.8);*/
-    padding: 7px 0px;
-  }
-  .el-table td{
-    /*background-color: rgba(255, 234, 241, 0.8);*/
-    padding: 5px 0px;
-    /*line-height: 1;*/
-  }
-  // .el-table td:hover{
-    /*background-color: rgba(255, 234, 241, 0.8);*/
-  // }
-  .transition-box {
-    margin-bottom: 10px;
-    width: 200px;
-    height: 100px;
-    border-radius: 4px;
-    background-color: #409EFF;
-    text-align: center;
-    color: #fff;
-    padding: 40px 20px;
-    box-sizing: border-box;
-    margin-right: 20px;
-  }
-}
-// 刷新框
-.refresh-div{
-  position: absolute;
-  right: 10px;
-  top: 7px;
-  z-index: 100;
-  padding: 10px;
-  color: #ce8b74;
-  font-size: 14px;
-  background-color: rgba(244, 233, 230, 1.0);
-  .font-red{
-    color: red;
-    font-weight: bold;
-  }
-  .el-icon-refresh:hover{
-    color: red;
-    font-weight: bold;
-    cursor: pointer;
-  }
-}
-// 地图
-.overview-map-container{
-  width: 100%;
-  padding: 5px;
-  .map-demo{
-    width: 100%;
-    height: calc(100vh - 78px);
-    .svg-icon{
-      width: 20px;
-      height: 20px;
-    }
-    .alarm-icon{
-      width:30px;
-      height: 30px;
-    }
-    .nomal-info-window{
-      background-color: pink;
-    }
-    .info-window{
-      max-width: 250px;
-      /*background-color: lightcyan;*/
-      .info-header{
-        padding: 10px 10px 5px 10px;
-        line-height: 30px;
-        font-weight: bold;
-        /*background-color: #eaf4ff;*/
-      }
-      .info-body{
-        padding: 5px 10px 10px 10px;
-        line-height: 23px;
-        font-size: 14px;
-      }
-    }
-    .alarm-window{
-      max-width: 250px;
-      /*background-color: #ffeaf1;*/
-      .alarm-header {
-        padding: 10px 10px 5px 10px;
-        line-height: 30px;
-        color: red;
-        font-weight: bold;
-        /*background-color: #ffecec;*/
-      }
-      .alarm-body{
-        padding: 5px 10px 10px 10px;
-        line-height: 23px;
-        font-size: 14px;
-        .alarm-red{
-          color: #ff0000;
-        }
-      }
-    }
-  }
-}
-  .el-divider--horizontal{
-    margin: 5px 0;
-  }
-</style>

diff --git a/package.json b/package.json
index 8350900..ee5ebcf 100644
--- a/package.json
+++ b/package.json
@@ -23,6 +23,7 @@
     "event-source-polyfill": "^1.0.5",
     "js-cookie": "2.2.0",
     "jsencrypt": "^3.0.0-rc.1",
+    "leaflet": "^1.7.1",
     "mockjs": "1.0.1-beta3",
     "moment": "^2.24.0",
     "normalize.css": "7.0.0",
diff --git a/src/main.js b/src/main.js
index 536ffcb..25de869 100644
--- a/src/main.js
+++ b/src/main.js
@@ -16,8 +16,8 @@
 import '@/permission' // permission control
 
 
-import 'leaflet/dist/leaflet.css'
-import L from "leaflet"
+// import 'leaflet/dist/leaflet.css'
+// import L from "leaflet"
 
 /**
  * This project originally used easy-mock to simulate data,
diff --git a/src/views/leaflet-test/overview-leaflet.vue b/src/views/leaflet-test/overview-leaflet.vue
deleted file mode 100644
index 3267e9c..0000000
--- a/src/views/leaflet-test/overview-leaflet.vue
+++ /dev/null
@@ -1,217 +0,0 @@
-<template>
-  <div>
-    <div v-loading="loading" class="overview-map-container">
-      <!--地图-->
-      <!--<div id="container" class="map" tabindex="0"/>-->
-      <div id="map"></div>
-    </div>
-  </div>
-</template>
-
-<script>
-import _ from 'lodash'
-// import icon from '/static/images/well/0100.png'
-// import { getAllMarker } from '@/api/overview'
-// import { getMarkerInfo } from '@/api/marker'
-// import { lazyAMapApiLoaderInstance } from 'vue-amap'
-
-export default {
-  name: 'OverviewLeaflet',
-  data () {
-    return {
-      loading: false,
-      icon: 'static/images/well/0100.png',
-      map: null,
-      msg: 'Welcome to Your Vue.js App'
-    }
-  },
-  mounted() {
-    this.initMap()
-  },
-  methods: {
-    initMap() {
-      let map = L.map("map", {
-        minZoom: 3,
-        maxZoom: 14,
-        center: [39.550339, 116.114129],
-        zoom: 12,
-        zoomControl: false,
-        attributionControl: false,
-        crs: L.CRS.EPSG3857
-      });
-      this.map = map　　　　//data上需要挂载
-      window.map = map
-      L.tileLayer(
-        "http://webrd01.is.autonavi.com/appmaptile?lang=zh_cn&size=1&scale=1&style=7&x={x}&y={y}&z={z}"
-      ).addTo(map)
-      let greenIcon = L.icon({
-        iconUrl: this.icon,
-        // shadowUrl: iconShadow,
-        iconSize:     [30, 50], // size of the icon
-        // shadowSize:   [50, 64], // size of the shadow
-        iconAnchor:   [15, 50], // point of the icon which will correspond to marker's location
-        // shadowAnchor: [15, 64],  // the same for the shadow
-        popupAnchor:  [0, -40] // point from which the popup should open relative to the iconAnchor
-      })
-      var marker = L.marker([39.550339, 116.114129],{
-        icon: greenIcon
-      }).addTo(map).bindPopup("I am a green leaf.")
-
-
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss">
-  #map {
-    width: 100%;
-    height: calc(100vh);
-  }
-// 查询框
-.map-search-div{
-  position: absolute;
-  z-index: 100;
-  padding: 5px 20px;
-  background-color: rgba(244, 244, 244, 0.9);
-  /*left: 90px;*/
-  .el-form-item{
-    margin-bottom: 0px;
-  }
-}
-// 报警列表
-.map-alarm-div{
-  position: absolute;
-  z-index: 100;
-  background-color: rgba(255, 234, 241,0.8);
-  top: 60px;
-  left: 10px;
-  .map-alarm-div-header{
-    line-height: 40px;
-    width: 504px;
-    padding-left: 10px;
-    .icon-right{
-      position: absolute;
-      right: 15px;
-    }
-    .icon-right:hover{
-      color: #409EFF;
-      cursor: pointer;
-    }
-  }
-  .el-scrollbar {
-    /*height: 200px;*/
-    width: 100%;
-  }
-  .moredatascollor{
-    height: 200px;
-  }
-  .el-scrollbar__wrap {
-    overflow-y: auto;
-    overflow-x: hidden;
-    margin-bottom: 0px !important;
-}
-
-.el-table th{
-/*background-color: rgba(255, 229, 230, 0.8);*/
-    padding: 7px 0px;
-  }
-  .el-table td{
-    /*background-color: rgba(255, 234, 241, 0.8);*/
-    padding: 5px 0px;
-    /*line-height: 1;*/
-  }
-  // .el-table td:hover{
-    /*background-color: rgba(255, 234, 241, 0.8);*/
-  // }
-  .transition-box {
-    margin-bottom: 10px;
-    width: 200px;
-    height: 100px;
-    border-radius: 4px;
-    background-color: #409EFF;
-    text-align: center;
-    color: #fff;
-    padding: 40px 20px;
-    box-sizing: border-box;
-    margin-right: 20px;
-  }
-}
-// 刷新框
-.refresh-div{
-  position: absolute;
-  right: 10px;
-  top: 7px;
-  z-index: 100;
-  padding: 10px;
-  color: #ce8b74;
-  font-size: 14px;
-  background-color: rgba(244, 233, 230, 1.0);
-  .font-red{
-    color: red;
-    font-weight: bold;
-  }
-  .el-icon-refresh:hover{
-    color: red;
-    font-weight: bold;
-    cursor: pointer;
-  }
-}
-// 地图
-.overview-map-container{
-  width: 100%;
-  padding: 5px;
-  .map-demo{
-    width: 100%;
-    height: calc(100vh - 78px);
-    .svg-icon{
-      width: 20px;
-      height: 20px;
-    }
-    .alarm-icon{
-      width:30px;
-      height: 30px;
-    }
-    .nomal-info-window{
-      background-color: pink;
-    }
-    .info-window{
-      max-width: 250px;
-      /*background-color: lightcyan;*/
-      .info-header{
-        padding: 10px 10px 5px 10px;
-        line-height: 30px;
-        font-weight: bold;
-        /*background-color: #eaf4ff;*/
-      }
-      .info-body{
-        padding: 5px 10px 10px 10px;
-        line-height: 23px;
-        font-size: 14px;
-      }
-    }
-    .alarm-window{
-      max-width: 250px;
-      /*background-color: #ffeaf1;*/
-      .alarm-header {
-        padding: 10px 10px 5px 10px;
-        line-height: 30px;
-        color: red;
-        font-weight: bold;
-        /*background-color: #ffecec;*/
-      }
-      .alarm-body{
-        padding: 5px 10px 10px 10px;
-        line-height: 23px;
-        font-size: 14px;
-        .alarm-red{
-          color: #ff0000;
-        }
-      }
-    }
-  }
-}
-  .el-divider--horizontal{
-    margin: 5px 0;
-  }
-</style>
diff --git a/src/views/memberManage/addPerson.vue b/src/views/memberManage/addPerson.vue
index 02a9a5b..133316f 100644
--- a/src/views/memberManage/addPerson.vue
+++ b/src/views/memberManage/addPerson.vue
@@ -452,7 +452,7 @@
       var _this = this
       this.ws = _this.$root.ws
       if (this.ws === null) {
-        this.ws = new WebSocket(_this.$root.wsURL)
+        this.ws = new WebSocket('ws://127.0.0.1:1234')
         // 注册各类回调
         this.ws.onopen = function() {
           _this.ws.send('ReadIdCard')

diff --git a/package.json b/package.json
index 8350900..ee5ebcf 100644
--- a/package.json
+++ b/package.json
@@ -23,6 +23,7 @@
     "event-source-polyfill": "^1.0.5",
     "js-cookie": "2.2.0",
     "jsencrypt": "^3.0.0-rc.1",
+    "leaflet": "^1.7.1",
     "mockjs": "1.0.1-beta3",
     "moment": "^2.24.0",
     "normalize.css": "7.0.0",
diff --git a/src/main.js b/src/main.js
index 536ffcb..25de869 100644
--- a/src/main.js
+++ b/src/main.js
@@ -16,8 +16,8 @@
 import '@/permission' // permission control
 
 
-import 'leaflet/dist/leaflet.css'
-import L from "leaflet"
+// import 'leaflet/dist/leaflet.css'
+// import L from "leaflet"
 
 /**
  * This project originally used easy-mock to simulate data,
diff --git a/src/views/leaflet-test/overview-leaflet.vue b/src/views/leaflet-test/overview-leaflet.vue
deleted file mode 100644
index 3267e9c..0000000
--- a/src/views/leaflet-test/overview-leaflet.vue
+++ /dev/null
@@ -1,217 +0,0 @@
-<template>
-  <div>
-    <div v-loading="loading" class="overview-map-container">
-      <!--地图-->
-      <!--<div id="container" class="map" tabindex="0"/>-->
-      <div id="map"></div>
-    </div>
-  </div>
-</template>
-
-<script>
-import _ from 'lodash'
-// import icon from '/static/images/well/0100.png'
-// import { getAllMarker } from '@/api/overview'
-// import { getMarkerInfo } from '@/api/marker'
-// import { lazyAMapApiLoaderInstance } from 'vue-amap'
-
-export default {
-  name: 'OverviewLeaflet',
-  data () {
-    return {
-      loading: false,
-      icon: 'static/images/well/0100.png',
-      map: null,
-      msg: 'Welcome to Your Vue.js App'
-    }
-  },
-  mounted() {
-    this.initMap()
-  },
-  methods: {
-    initMap() {
-      let map = L.map("map", {
-        minZoom: 3,
-        maxZoom: 14,
-        center: [39.550339, 116.114129],
-        zoom: 12,
-        zoomControl: false,
-        attributionControl: false,
-        crs: L.CRS.EPSG3857
-      });
-      this.map = map　　　　//data上需要挂载
-      window.map = map
-      L.tileLayer(
-        "http://webrd01.is.autonavi.com/appmaptile?lang=zh_cn&size=1&scale=1&style=7&x={x}&y={y}&z={z}"
-      ).addTo(map)
-      let greenIcon = L.icon({
-        iconUrl: this.icon,
-        // shadowUrl: iconShadow,
-        iconSize:     [30, 50], // size of the icon
-        // shadowSize:   [50, 64], // size of the shadow
-        iconAnchor:   [15, 50], // point of the icon which will correspond to marker's location
-        // shadowAnchor: [15, 64],  // the same for the shadow
-        popupAnchor:  [0, -40] // point from which the popup should open relative to the iconAnchor
-      })
-      var marker = L.marker([39.550339, 116.114129],{
-        icon: greenIcon
-      }).addTo(map).bindPopup("I am a green leaf.")
-
-
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss">
-  #map {
-    width: 100%;
-    height: calc(100vh);
-  }
-// 查询框
-.map-search-div{
-  position: absolute;
-  z-index: 100;
-  padding: 5px 20px;
-  background-color: rgba(244, 244, 244, 0.9);
-  /*left: 90px;*/
-  .el-form-item{
-    margin-bottom: 0px;
-  }
-}
-// 报警列表
-.map-alarm-div{
-  position: absolute;
-  z-index: 100;
-  background-color: rgba(255, 234, 241,0.8);
-  top: 60px;
-  left: 10px;
-  .map-alarm-div-header{
-    line-height: 40px;
-    width: 504px;
-    padding-left: 10px;
-    .icon-right{
-      position: absolute;
-      right: 15px;
-    }
-    .icon-right:hover{
-      color: #409EFF;
-      cursor: pointer;
-    }
-  }
-  .el-scrollbar {
-    /*height: 200px;*/
-    width: 100%;
-  }
-  .moredatascollor{
-    height: 200px;
-  }
-  .el-scrollbar__wrap {
-    overflow-y: auto;
-    overflow-x: hidden;
-    margin-bottom: 0px !important;
-}
-
-.el-table th{
-/*background-color: rgba(255, 229, 230, 0.8);*/
-    padding: 7px 0px;
-  }
-  .el-table td{
-    /*background-color: rgba(255, 234, 241, 0.8);*/
-    padding: 5px 0px;
-    /*line-height: 1;*/
-  }
-  // .el-table td:hover{
-    /*background-color: rgba(255, 234, 241, 0.8);*/
-  // }
-  .transition-box {
-    margin-bottom: 10px;
-    width: 200px;
-    height: 100px;
-    border-radius: 4px;
-    background-color: #409EFF;
-    text-align: center;
-    color: #fff;
-    padding: 40px 20px;
-    box-sizing: border-box;
-    margin-right: 20px;
-  }
-}
-// 刷新框
-.refresh-div{
-  position: absolute;
-  right: 10px;
-  top: 7px;
-  z-index: 100;
-  padding: 10px;
-  color: #ce8b74;
-  font-size: 14px;
-  background-color: rgba(244, 233, 230, 1.0);
-  .font-red{
-    color: red;
-    font-weight: bold;
-  }
-  .el-icon-refresh:hover{
-    color: red;
-    font-weight: bold;
-    cursor: pointer;
-  }
-}
-// 地图
-.overview-map-container{
-  width: 100%;
-  padding: 5px;
-  .map-demo{
-    width: 100%;
-    height: calc(100vh - 78px);
-    .svg-icon{
-      width: 20px;
-      height: 20px;
-    }
-    .alarm-icon{
-      width:30px;
-      height: 30px;
-    }
-    .nomal-info-window{
-      background-color: pink;
-    }
-    .info-window{
-      max-width: 250px;
-      /*background-color: lightcyan;*/
-      .info-header{
-        padding: 10px 10px 5px 10px;
-        line-height: 30px;
-        font-weight: bold;
-        /*background-color: #eaf4ff;*/
-      }
-      .info-body{
-        padding: 5px 10px 10px 10px;
-        line-height: 23px;
-        font-size: 14px;
-      }
-    }
-    .alarm-window{
-      max-width: 250px;
-      /*background-color: #ffeaf1;*/
-      .alarm-header {
-        padding: 10px 10px 5px 10px;
-        line-height: 30px;
-        color: red;
-        font-weight: bold;
-        /*background-color: #ffecec;*/
-      }
-      .alarm-body{
-        padding: 5px 10px 10px 10px;
-        line-height: 23px;
-        font-size: 14px;
-        .alarm-red{
-          color: #ff0000;
-        }
-      }
-    }
-  }
-}
-  .el-divider--horizontal{
-    margin: 5px 0;
-  }
-</style>
diff --git a/src/views/memberManage/addPerson.vue b/src/views/memberManage/addPerson.vue
index 02a9a5b..133316f 100644
--- a/src/views/memberManage/addPerson.vue
+++ b/src/views/memberManage/addPerson.vue
@@ -452,7 +452,7 @@
       var _this = this
       this.ws = _this.$root.ws
       if (this.ws === null) {
-        this.ws = new WebSocket(_this.$root.wsURL)
+        this.ws = new WebSocket('ws://127.0.0.1:1234')
         // 注册各类回调
         this.ws.onopen = function() {
           _this.ws.send('ReadIdCard')
diff --git a/src/views/memberManage/addPersonIris.vue b/src/views/memberManage/addPersonIris.vue
index bae024b..a0bd9ee 100644
--- a/src/views/memberManage/addPersonIris.vue
+++ b/src/views/memberManage/addPersonIris.vue
@@ -492,7 +492,7 @@
       var _this = this
       this.ws = _this.$root.ws
       if (this.ws === null) {
-        this.ws = new WebSocket(_this.$root.wsURL)
+        this.ws = new WebSocket('ws://127.0.0.1:1234')
         // 注册各类回调
         this.ws.onopen = function() {
           _this.ws.send('ReadIdCard')

diff --git a/package.json b/package.json
index 8350900..ee5ebcf 100644
--- a/package.json
+++ b/package.json
@@ -23,6 +23,7 @@
     "event-source-polyfill": "^1.0.5",
     "js-cookie": "2.2.0",
     "jsencrypt": "^3.0.0-rc.1",
+    "leaflet": "^1.7.1",
     "mockjs": "1.0.1-beta3",
     "moment": "^2.24.0",
     "normalize.css": "7.0.0",
diff --git a/src/main.js b/src/main.js
index 536ffcb..25de869 100644
--- a/src/main.js
+++ b/src/main.js
@@ -16,8 +16,8 @@
 import '@/permission' // permission control
 
 
-import 'leaflet/dist/leaflet.css'
-import L from "leaflet"
+// import 'leaflet/dist/leaflet.css'
+// import L from "leaflet"
 
 /**
  * This project originally used easy-mock to simulate data,
diff --git a/src/views/leaflet-test/overview-leaflet.vue b/src/views/leaflet-test/overview-leaflet.vue
deleted file mode 100644
index 3267e9c..0000000
--- a/src/views/leaflet-test/overview-leaflet.vue
+++ /dev/null
@@ -1,217 +0,0 @@
-<template>
-  <div>
-    <div v-loading="loading" class="overview-map-container">
-      <!--地图-->
-      <!--<div id="container" class="map" tabindex="0"/>-->
-      <div id="map"></div>
-    </div>
-  </div>
-</template>
-
-<script>
-import _ from 'lodash'
-// import icon from '/static/images/well/0100.png'
-// import { getAllMarker } from '@/api/overview'
-// import { getMarkerInfo } from '@/api/marker'
-// import { lazyAMapApiLoaderInstance } from 'vue-amap'
-
-export default {
-  name: 'OverviewLeaflet',
-  data () {
-    return {
-      loading: false,
-      icon: 'static/images/well/0100.png',
-      map: null,
-      msg: 'Welcome to Your Vue.js App'
-    }
-  },
-  mounted() {
-    this.initMap()
-  },
-  methods: {
-    initMap() {
-      let map = L.map("map", {
-        minZoom: 3,
-        maxZoom: 14,
-        center: [39.550339, 116.114129],
-        zoom: 12,
-        zoomControl: false,
-        attributionControl: false,
-        crs: L.CRS.EPSG3857
-      });
-      this.map = map　　　　//data上需要挂载
-      window.map = map
-      L.tileLayer(
-        "http://webrd01.is.autonavi.com/appmaptile?lang=zh_cn&size=1&scale=1&style=7&x={x}&y={y}&z={z}"
-      ).addTo(map)
-      let greenIcon = L.icon({
-        iconUrl: this.icon,
-        // shadowUrl: iconShadow,
-        iconSize:     [30, 50], // size of the icon
-        // shadowSize:   [50, 64], // size of the shadow
-        iconAnchor:   [15, 50], // point of the icon which will correspond to marker's location
-        // shadowAnchor: [15, 64],  // the same for the shadow
-        popupAnchor:  [0, -40] // point from which the popup should open relative to the iconAnchor
-      })
-      var marker = L.marker([39.550339, 116.114129],{
-        icon: greenIcon
-      }).addTo(map).bindPopup("I am a green leaf.")
-
-
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss">
-  #map {
-    width: 100%;
-    height: calc(100vh);
-  }
-// 查询框
-.map-search-div{
-  position: absolute;
-  z-index: 100;
-  padding: 5px 20px;
-  background-color: rgba(244, 244, 244, 0.9);
-  /*left: 90px;*/
-  .el-form-item{
-    margin-bottom: 0px;
-  }
-}
-// 报警列表
-.map-alarm-div{
-  position: absolute;
-  z-index: 100;
-  background-color: rgba(255, 234, 241,0.8);
-  top: 60px;
-  left: 10px;
-  .map-alarm-div-header{
-    line-height: 40px;
-    width: 504px;
-    padding-left: 10px;
-    .icon-right{
-      position: absolute;
-      right: 15px;
-    }
-    .icon-right:hover{
-      color: #409EFF;
-      cursor: pointer;
-    }
-  }
-  .el-scrollbar {
-    /*height: 200px;*/
-    width: 100%;
-  }
-  .moredatascollor{
-    height: 200px;
-  }
-  .el-scrollbar__wrap {
-    overflow-y: auto;
-    overflow-x: hidden;
-    margin-bottom: 0px !important;
-}
-
-.el-table th{
-/*background-color: rgba(255, 229, 230, 0.8);*/
-    padding: 7px 0px;
-  }
-  .el-table td{
-    /*background-color: rgba(255, 234, 241, 0.8);*/
-    padding: 5px 0px;
-    /*line-height: 1;*/
-  }
-  // .el-table td:hover{
-    /*background-color: rgba(255, 234, 241, 0.8);*/
-  // }
-  .transition-box {
-    margin-bottom: 10px;
-    width: 200px;
-    height: 100px;
-    border-radius: 4px;
-    background-color: #409EFF;
-    text-align: center;
-    color: #fff;
-    padding: 40px 20px;
-    box-sizing: border-box;
-    margin-right: 20px;
-  }
-}
-// 刷新框
-.refresh-div{
-  position: absolute;
-  right: 10px;
-  top: 7px;
-  z-index: 100;
-  padding: 10px;
-  color: #ce8b74;
-  font-size: 14px;
-  background-color: rgba(244, 233, 230, 1.0);
-  .font-red{
-    color: red;
-    font-weight: bold;
-  }
-  .el-icon-refresh:hover{
-    color: red;
-    font-weight: bold;
-    cursor: pointer;
-  }
-}
-// 地图
-.overview-map-container{
-  width: 100%;
-  padding: 5px;
-  .map-demo{
-    width: 100%;
-    height: calc(100vh - 78px);
-    .svg-icon{
-      width: 20px;
-      height: 20px;
-    }
-    .alarm-icon{
-      width:30px;
-      height: 30px;
-    }
-    .nomal-info-window{
-      background-color: pink;
-    }
-    .info-window{
-      max-width: 250px;
-      /*background-color: lightcyan;*/
-      .info-header{
-        padding: 10px 10px 5px 10px;
-        line-height: 30px;
-        font-weight: bold;
-        /*background-color: #eaf4ff;*/
-      }
-      .info-body{
-        padding: 5px 10px 10px 10px;
-        line-height: 23px;
-        font-size: 14px;
-      }
-    }
-    .alarm-window{
-      max-width: 250px;
-      /*background-color: #ffeaf1;*/
-      .alarm-header {
-        padding: 10px 10px 5px 10px;
-        line-height: 30px;
-        color: red;
-        font-weight: bold;
-        /*background-color: #ffecec;*/
-      }
-      .alarm-body{
-        padding: 5px 10px 10px 10px;
-        line-height: 23px;
-        font-size: 14px;
-        .alarm-red{
-          color: #ff0000;
-        }
-      }
-    }
-  }
-}
-  .el-divider--horizontal{
-    margin: 5px 0;
-  }
-</style>
diff --git a/src/views/memberManage/addPerson.vue b/src/views/memberManage/addPerson.vue
index 02a9a5b..133316f 100644
--- a/src/views/memberManage/addPerson.vue
+++ b/src/views/memberManage/addPerson.vue
@@ -452,7 +452,7 @@
       var _this = this
       this.ws = _this.$root.ws
       if (this.ws === null) {
-        this.ws = new WebSocket(_this.$root.wsURL)
+        this.ws = new WebSocket('ws://127.0.0.1:1234')
         // 注册各类回调
         this.ws.onopen = function() {
           _this.ws.send('ReadIdCard')
diff --git a/src/views/memberManage/addPersonIris.vue b/src/views/memberManage/addPersonIris.vue
index bae024b..a0bd9ee 100644
--- a/src/views/memberManage/addPersonIris.vue
+++ b/src/views/memberManage/addPersonIris.vue
@@ -492,7 +492,7 @@
       var _this = this
       this.ws = _this.$root.ws
       if (this.ws === null) {
-        this.ws = new WebSocket(_this.$root.wsURL)
+        this.ws = new WebSocket('ws://127.0.0.1:1234')
         // 注册各类回调
         this.ws.onopen = function() {
           _this.ws.send('ReadIdCard')
diff --git a/src/views/memberManage/captureIris.vue b/src/views/memberManage/captureIris.vue
index 3446e83..e2aa61b 100644
--- a/src/views/memberManage/captureIris.vue
+++ b/src/views/memberManage/captureIris.vue
@@ -24,11 +24,11 @@
           </el-col>
         </el-row>
         <el-row style="margin-top: 10px;">
-          <el-col :offset="6" :span="4">
-            <span>右眼虹膜</span>
+          <el-col :offset="5" :span="5">
+            <span>{{ leftImageText }}</span>
           </el-col>
-          <el-col :offset="7" :span="4">
-            <span>左眼虹膜</span>
+          <el-col :offset="6" :span="5">
+            <span>{{ rightImageText }}</span>
           </el-col>
         </el-row>
         <el-row >
@@ -70,6 +70,8 @@
       dialogFormVisible: false, // 对话框是否显示
       photoLeft: '', // 图片路径
       photoRight: '',
+      leftImageText: '左眼虹膜',
+      rightImageText: '右眼虹膜',
       defaultPhoto: require('../../assets/global_images/eye.png'), // 默认图片路径
       irisForm: {
         eyeType: '3',
@@ -108,7 +110,7 @@
       this.stopBtnDisabeld = false
       this.saveBtnDisabeld = true
       if (this.ws === null) {
-        this.ws = new WebSocket(_this.$root.wsURL)
+        this.ws = new WebSocket('ws://127.0.0.1:1234')
         // 注册各类回调
         this.ws.onopen = function() {
           _this.$message.success('采集设备启动中...')
@@ -136,15 +138,20 @@
         } else if (receiveMsg.data === 'ICS错误') {
           _this.$message.error(receiveMsg.data)
         } else if (receiveMsg.data.indexOf('image') > -1) {
-          var data = receiveMsg.data.replace('image', '')
+          var data = receiveMsg.data.split(':')[0].replace('image', '') // 图片数据
+          var qualityScore = receiveMsg.data.split(':')[1]
           _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]
+            _this.leftImageText = '左眼虹膜 质量分数：'+ qualityScore.split(';')[0].substr(0,2)
+            _this.rightImageText = '右眼虹膜 质量分数：'+ qualityScore.split(';')[1].substr(0,2)
           } else if (_this.irisForm.eyeType === '2') {
             _this.photoLeft = 'data:image/png;base64,' + data
+            _this.leftImageText = '左眼虹膜 质量分数：'+ qualityScore.substr(0,2)
           } else if (_this.irisForm.eyeType === '1') {
             _this.photoRight = 'data:image/png;base64,' + data
+            _this.rightImageText = '右眼虹膜 质量分数：'+ qualityScore.substr(0,2)
           }
         }
       }
@@ -159,6 +166,8 @@
       this.WebSocketConnent()
     },
     startCapture() {
+      this.leftImageText = '左眼虹膜'
+      this.rightImageText = '右眼虹膜'
       this.WebSocketConnent()
     },
     stopCapture() {