diff --git a/src/api/allDict.js b/src/api/allDict.js
index 389c2b2..c567eb2 100644
--- a/src/api/allDict.js
+++ b/src/api/allDict.js
@@ -28,6 +28,15 @@
   })
 }
 
+// 车辆类别
+export function getCarType(params) {
+  return request({
+    url: '/dict/code/carType',
+    method: 'get',
+    params
+  })
+}
+
 // 设备类型
 export function getDeviceType(params) {
   return request({
@@ -52,3 +61,11 @@
     method: 'get'
   })
 }
+
+// 进出园区
+export function getInOutType() {
+  return request({
+    url: '/dict/code/inOut',
+    method: 'get'
+  })
+}

diff --git a/src/api/allDict.js b/src/api/allDict.js
index 389c2b2..c567eb2 100644
--- a/src/api/allDict.js
+++ b/src/api/allDict.js
@@ -28,6 +28,15 @@
   })
 }
 
+// 车辆类别
+export function getCarType(params) {
+  return request({
+    url: '/dict/code/carType',
+    method: 'get',
+    params
+  })
+}
+
 // 设备类型
 export function getDeviceType(params) {
   return request({
@@ -52,3 +61,11 @@
     method: 'get'
   })
 }
+
+// 进出园区
+export function getInOutType() {
+  return request({
+    url: '/dict/code/inOut',
+    method: 'get'
+  })
+}
diff --git a/src/api/car.js b/src/api/car.js
index cf638b5..fc55938 100644
--- a/src/api/car.js
+++ b/src/api/car.js
@@ -1,5 +1,5 @@
 import request from '@/utils/request'
-import qs from 'qs'
+// import qs from 'qs'
 
 // 分页查询车辆列表
 export function getCarList(params) {

diff --git a/src/api/allDict.js b/src/api/allDict.js
index 389c2b2..c567eb2 100644
--- a/src/api/allDict.js
+++ b/src/api/allDict.js
@@ -28,6 +28,15 @@
   })
 }
 
+// 车辆类别
+export function getCarType(params) {
+  return request({
+    url: '/dict/code/carType',
+    method: 'get',
+    params
+  })
+}
+
 // 设备类型
 export function getDeviceType(params) {
   return request({
@@ -52,3 +61,11 @@
     method: 'get'
   })
 }
+
+// 进出园区
+export function getInOutType() {
+  return request({
+    url: '/dict/code/inOut',
+    method: 'get'
+  })
+}
diff --git a/src/api/car.js b/src/api/car.js
index cf638b5..fc55938 100644
--- a/src/api/car.js
+++ b/src/api/car.js
@@ -1,5 +1,5 @@
 import request from '@/utils/request'
-import qs from 'qs'
+// import qs from 'qs'
 
 // 分页查询车辆列表
 export function getCarList(params) {
diff --git a/src/api/device.js b/src/api/device.js
index b3a3f84..4cf4c36 100644
--- a/src/api/device.js
+++ b/src/api/device.js
@@ -2,7 +2,7 @@
  * 设备管理接口
  */
 import request from '@/utils/request'
-import qs from 'qs'
+// import qs from 'qs'
 
 // 分页查询设备列表
 export function getDeviceList(params) {

diff --git a/src/api/allDict.js b/src/api/allDict.js
index 389c2b2..c567eb2 100644
--- a/src/api/allDict.js
+++ b/src/api/allDict.js
@@ -28,6 +28,15 @@
   })
 }
 
+// 车辆类别
+export function getCarType(params) {
+  return request({
+    url: '/dict/code/carType',
+    method: 'get',
+    params
+  })
+}
+
 // 设备类型
 export function getDeviceType(params) {
   return request({
@@ -52,3 +61,11 @@
     method: 'get'
   })
 }
+
+// 进出园区
+export function getInOutType() {
+  return request({
+    url: '/dict/code/inOut',
+    method: 'get'
+  })
+}
diff --git a/src/api/car.js b/src/api/car.js
index cf638b5..fc55938 100644
--- a/src/api/car.js
+++ b/src/api/car.js
@@ -1,5 +1,5 @@
 import request from '@/utils/request'
-import qs from 'qs'
+// import qs from 'qs'
 
 // 分页查询车辆列表
 export function getCarList(params) {
diff --git a/src/api/device.js b/src/api/device.js
index b3a3f84..4cf4c36 100644
--- a/src/api/device.js
+++ b/src/api/device.js
@@ -2,7 +2,7 @@
  * 设备管理接口
  */
 import request from '@/utils/request'
-import qs from 'qs'
+// import qs from 'qs'
 
 // 分页查询设备列表
 export function getDeviceList(params) {
diff --git a/src/api/statistics.js b/src/api/statistics.js
new file mode 100644
index 0000000..44e089f
--- /dev/null
+++ b/src/api/statistics.js
@@ -0,0 +1,22 @@
+/**
+ * 数据查询接口
+ */
+import request from '@/utils/request'
+// import qs from 'qs'
+
+export function personInOutRecord(params) {
+  return request({
+    url: '/statistics/personListPage',
+    method: 'get',
+    params
+  })
+}
+
+export function carInOutRecord(params) {
+  return request({
+    url: '/statistics/carListPage',
+    method: 'get',
+    params
+  })
+}
+

diff --git a/src/api/allDict.js b/src/api/allDict.js
index 389c2b2..c567eb2 100644
--- a/src/api/allDict.js
+++ b/src/api/allDict.js
@@ -28,6 +28,15 @@
   })
 }
 
+// 车辆类别
+export function getCarType(params) {
+  return request({
+    url: '/dict/code/carType',
+    method: 'get',
+    params
+  })
+}
+
 // 设备类型
 export function getDeviceType(params) {
   return request({
@@ -52,3 +61,11 @@
     method: 'get'
   })
 }
+
+// 进出园区
+export function getInOutType() {
+  return request({
+    url: '/dict/code/inOut',
+    method: 'get'
+  })
+}
diff --git a/src/api/car.js b/src/api/car.js
index cf638b5..fc55938 100644
--- a/src/api/car.js
+++ b/src/api/car.js
@@ -1,5 +1,5 @@
 import request from '@/utils/request'
-import qs from 'qs'
+// import qs from 'qs'
 
 // 分页查询车辆列表
 export function getCarList(params) {
diff --git a/src/api/device.js b/src/api/device.js
index b3a3f84..4cf4c36 100644
--- a/src/api/device.js
+++ b/src/api/device.js
@@ -2,7 +2,7 @@
  * 设备管理接口
  */
 import request from '@/utils/request'
-import qs from 'qs'
+// import qs from 'qs'
 
 // 分页查询设备列表
 export function getDeviceList(params) {
diff --git a/src/api/statistics.js b/src/api/statistics.js
new file mode 100644
index 0000000..44e089f
--- /dev/null
+++ b/src/api/statistics.js
@@ -0,0 +1,22 @@
+/**
+ * 数据查询接口
+ */
+import request from '@/utils/request'
+// import qs from 'qs'
+
+export function personInOutRecord(params) {
+  return request({
+    url: '/statistics/personListPage',
+    method: 'get',
+    params
+  })
+}
+
+export function carInOutRecord(params) {
+  return request({
+    url: '/statistics/carListPage',
+    method: 'get',
+    params
+  })
+}
+
diff --git a/src/api/visitor.js b/src/api/visitor.js
index 1535eed..121d5e2 100644
--- a/src/api/visitor.js
+++ b/src/api/visitor.js
@@ -1,5 +1,5 @@
 import request from '@/utils/request'
-import qs from 'qs'
+// import qs from 'qs'
 
 // 访客登记
 export function addVisitorPerson(data) {

diff --git a/src/api/allDict.js b/src/api/allDict.js
index 389c2b2..c567eb2 100644
--- a/src/api/allDict.js
+++ b/src/api/allDict.js
@@ -28,6 +28,15 @@
   })
 }
 
+// 车辆类别
+export function getCarType(params) {
+  return request({
+    url: '/dict/code/carType',
+    method: 'get',
+    params
+  })
+}
+
 // 设备类型
 export function getDeviceType(params) {
   return request({
@@ -52,3 +61,11 @@
     method: 'get'
   })
 }
+
+// 进出园区
+export function getInOutType() {
+  return request({
+    url: '/dict/code/inOut',
+    method: 'get'
+  })
+}
diff --git a/src/api/car.js b/src/api/car.js
index cf638b5..fc55938 100644
--- a/src/api/car.js
+++ b/src/api/car.js
@@ -1,5 +1,5 @@
 import request from '@/utils/request'
-import qs from 'qs'
+// import qs from 'qs'
 
 // 分页查询车辆列表
 export function getCarList(params) {
diff --git a/src/api/device.js b/src/api/device.js
index b3a3f84..4cf4c36 100644
--- a/src/api/device.js
+++ b/src/api/device.js
@@ -2,7 +2,7 @@
  * 设备管理接口
  */
 import request from '@/utils/request'
-import qs from 'qs'
+// import qs from 'qs'
 
 // 分页查询设备列表
 export function getDeviceList(params) {
diff --git a/src/api/statistics.js b/src/api/statistics.js
new file mode 100644
index 0000000..44e089f
--- /dev/null
+++ b/src/api/statistics.js
@@ -0,0 +1,22 @@
+/**
+ * 数据查询接口
+ */
+import request from '@/utils/request'
+// import qs from 'qs'
+
+export function personInOutRecord(params) {
+  return request({
+    url: '/statistics/personListPage',
+    method: 'get',
+    params
+  })
+}
+
+export function carInOutRecord(params) {
+  return request({
+    url: '/statistics/carListPage',
+    method: 'get',
+    params
+  })
+}
+
diff --git a/src/api/visitor.js b/src/api/visitor.js
index 1535eed..121d5e2 100644
--- a/src/api/visitor.js
+++ b/src/api/visitor.js
@@ -1,5 +1,5 @@
 import request from '@/utils/request'
-import qs from 'qs'
+// import qs from 'qs'
 
 // 访客登记
 export function addVisitorPerson(data) {
diff --git a/src/assets/login_images/bg-blue.png b/src/assets/login_images/bg-blue.png
new file mode 100644
index 0000000..a408d14
--- /dev/null
+++ b/src/assets/login_images/bg-blue.png
Binary files differ

diff --git a/src/api/allDict.js b/src/api/allDict.js
index 389c2b2..c567eb2 100644
--- a/src/api/allDict.js
+++ b/src/api/allDict.js
@@ -28,6 +28,15 @@
   })
 }
 
+// 车辆类别
+export function getCarType(params) {
+  return request({
+    url: '/dict/code/carType',
+    method: 'get',
+    params
+  })
+}
+
 // 设备类型
 export function getDeviceType(params) {
   return request({
@@ -52,3 +61,11 @@
     method: 'get'
   })
 }
+
+// 进出园区
+export function getInOutType() {
+  return request({
+    url: '/dict/code/inOut',
+    method: 'get'
+  })
+}
diff --git a/src/api/car.js b/src/api/car.js
index cf638b5..fc55938 100644
--- a/src/api/car.js
+++ b/src/api/car.js
@@ -1,5 +1,5 @@
 import request from '@/utils/request'
-import qs from 'qs'
+// import qs from 'qs'
 
 // 分页查询车辆列表
 export function getCarList(params) {
diff --git a/src/api/device.js b/src/api/device.js
index b3a3f84..4cf4c36 100644
--- a/src/api/device.js
+++ b/src/api/device.js
@@ -2,7 +2,7 @@
  * 设备管理接口
  */
 import request from '@/utils/request'
-import qs from 'qs'
+// import qs from 'qs'
 
 // 分页查询设备列表
 export function getDeviceList(params) {
diff --git a/src/api/statistics.js b/src/api/statistics.js
new file mode 100644
index 0000000..44e089f
--- /dev/null
+++ b/src/api/statistics.js
@@ -0,0 +1,22 @@
+/**
+ * 数据查询接口
+ */
+import request from '@/utils/request'
+// import qs from 'qs'
+
+export function personInOutRecord(params) {
+  return request({
+    url: '/statistics/personListPage',
+    method: 'get',
+    params
+  })
+}
+
+export function carInOutRecord(params) {
+  return request({
+    url: '/statistics/carListPage',
+    method: 'get',
+    params
+  })
+}
+
diff --git a/src/api/visitor.js b/src/api/visitor.js
index 1535eed..121d5e2 100644
--- a/src/api/visitor.js
+++ b/src/api/visitor.js
@@ -1,5 +1,5 @@
 import request from '@/utils/request'
-import qs from 'qs'
+// import qs from 'qs'
 
 // 访客登记
 export function addVisitorPerson(data) {
diff --git a/src/assets/login_images/bg-blue.png b/src/assets/login_images/bg-blue.png
new file mode 100644
index 0000000..a408d14
--- /dev/null
+++ b/src/assets/login_images/bg-blue.png
Binary files differ
diff --git a/src/assets/login_images/bg1.png b/src/assets/login_images/bg1.png
new file mode 100644
index 0000000..390b452
--- /dev/null
+++ b/src/assets/login_images/bg1.png
Binary files differ

diff --git a/src/api/allDict.js b/src/api/allDict.js
index 389c2b2..c567eb2 100644
--- a/src/api/allDict.js
+++ b/src/api/allDict.js
@@ -28,6 +28,15 @@
   })
 }
 
+// 车辆类别
+export function getCarType(params) {
+  return request({
+    url: '/dict/code/carType',
+    method: 'get',
+    params
+  })
+}
+
 // 设备类型
 export function getDeviceType(params) {
   return request({
@@ -52,3 +61,11 @@
     method: 'get'
   })
 }
+
+// 进出园区
+export function getInOutType() {
+  return request({
+    url: '/dict/code/inOut',
+    method: 'get'
+  })
+}
diff --git a/src/api/car.js b/src/api/car.js
index cf638b5..fc55938 100644
--- a/src/api/car.js
+++ b/src/api/car.js
@@ -1,5 +1,5 @@
 import request from '@/utils/request'
-import qs from 'qs'
+// import qs from 'qs'
 
 // 分页查询车辆列表
 export function getCarList(params) {
diff --git a/src/api/device.js b/src/api/device.js
index b3a3f84..4cf4c36 100644
--- a/src/api/device.js
+++ b/src/api/device.js
@@ -2,7 +2,7 @@
  * 设备管理接口
  */
 import request from '@/utils/request'
-import qs from 'qs'
+// import qs from 'qs'
 
 // 分页查询设备列表
 export function getDeviceList(params) {
diff --git a/src/api/statistics.js b/src/api/statistics.js
new file mode 100644
index 0000000..44e089f
--- /dev/null
+++ b/src/api/statistics.js
@@ -0,0 +1,22 @@
+/**
+ * 数据查询接口
+ */
+import request from '@/utils/request'
+// import qs from 'qs'
+
+export function personInOutRecord(params) {
+  return request({
+    url: '/statistics/personListPage',
+    method: 'get',
+    params
+  })
+}
+
+export function carInOutRecord(params) {
+  return request({
+    url: '/statistics/carListPage',
+    method: 'get',
+    params
+  })
+}
+
diff --git a/src/api/visitor.js b/src/api/visitor.js
index 1535eed..121d5e2 100644
--- a/src/api/visitor.js
+++ b/src/api/visitor.js
@@ -1,5 +1,5 @@
 import request from '@/utils/request'
-import qs from 'qs'
+// import qs from 'qs'
 
 // 访客登记
 export function addVisitorPerson(data) {
diff --git a/src/assets/login_images/bg-blue.png b/src/assets/login_images/bg-blue.png
new file mode 100644
index 0000000..a408d14
--- /dev/null
+++ b/src/assets/login_images/bg-blue.png
Binary files differ
diff --git a/src/assets/login_images/bg1.png b/src/assets/login_images/bg1.png
new file mode 100644
index 0000000..390b452
--- /dev/null
+++ b/src/assets/login_images/bg1.png
Binary files differ
diff --git a/src/router/modules/doorSys.js b/src/router/modules/doorSys.js
index 605b851..64e8d5e 100644
--- a/src/router/modules/doorSys.js
+++ b/src/router/modules/doorSys.js
@@ -166,5 +166,32 @@
         meta: { title: '车辆登记', icon: '', permission: ['/area/defenceList'], keepAlive: true }
       }
     ]
+  },
+  {
+    path: '/statistics',
+    component: Layout,
+    redirect: '/statistics',
+    name: 'Statistics',
+    alwaysShow: true,
+    meta: {
+      title: '统计管理',
+      icon: 'icon-statistics', // 图标
+      permission: ['/statistics'], // 权限名称
+      sys: '/door'
+    },
+    children: [
+      {
+        path: '/statistics/inOutPerson',
+        name: 'InOutPerson',
+        component: () => import('@/views/statistics/inOutPerson'),
+        meta: { title: '人员进出记录', icon: '', permission: ['/statistics/inOutPerson'], keepAlive: true }
+      },
+      {
+        path: '/statistics/inOutCar',
+        name: 'InOutCar',
+        component: () => import('@/views/statistics/inOutCar'),
+        meta: { title: '车辆进出记录', icon: '', permission: ['/statistics/inOutCar'], keepAlive: true }
+      }
+    ]
   }
 ]

diff --git a/src/api/allDict.js b/src/api/allDict.js
index 389c2b2..c567eb2 100644
--- a/src/api/allDict.js
+++ b/src/api/allDict.js
@@ -28,6 +28,15 @@
   })
 }
 
+// 车辆类别
+export function getCarType(params) {
+  return request({
+    url: '/dict/code/carType',
+    method: 'get',
+    params
+  })
+}
+
 // 设备类型
 export function getDeviceType(params) {
   return request({
@@ -52,3 +61,11 @@
     method: 'get'
   })
 }
+
+// 进出园区
+export function getInOutType() {
+  return request({
+    url: '/dict/code/inOut',
+    method: 'get'
+  })
+}
diff --git a/src/api/car.js b/src/api/car.js
index cf638b5..fc55938 100644
--- a/src/api/car.js
+++ b/src/api/car.js
@@ -1,5 +1,5 @@
 import request from '@/utils/request'
-import qs from 'qs'
+// import qs from 'qs'
 
 // 分页查询车辆列表
 export function getCarList(params) {
diff --git a/src/api/device.js b/src/api/device.js
index b3a3f84..4cf4c36 100644
--- a/src/api/device.js
+++ b/src/api/device.js
@@ -2,7 +2,7 @@
  * 设备管理接口
  */
 import request from '@/utils/request'
-import qs from 'qs'
+// import qs from 'qs'
 
 // 分页查询设备列表
 export function getDeviceList(params) {
diff --git a/src/api/statistics.js b/src/api/statistics.js
new file mode 100644
index 0000000..44e089f
--- /dev/null
+++ b/src/api/statistics.js
@@ -0,0 +1,22 @@
+/**
+ * 数据查询接口
+ */
+import request from '@/utils/request'
+// import qs from 'qs'
+
+export function personInOutRecord(params) {
+  return request({
+    url: '/statistics/personListPage',
+    method: 'get',
+    params
+  })
+}
+
+export function carInOutRecord(params) {
+  return request({
+    url: '/statistics/carListPage',
+    method: 'get',
+    params
+  })
+}
+
diff --git a/src/api/visitor.js b/src/api/visitor.js
index 1535eed..121d5e2 100644
--- a/src/api/visitor.js
+++ b/src/api/visitor.js
@@ -1,5 +1,5 @@
 import request from '@/utils/request'
-import qs from 'qs'
+// import qs from 'qs'
 
 // 访客登记
 export function addVisitorPerson(data) {
diff --git a/src/assets/login_images/bg-blue.png b/src/assets/login_images/bg-blue.png
new file mode 100644
index 0000000..a408d14
--- /dev/null
+++ b/src/assets/login_images/bg-blue.png
Binary files differ
diff --git a/src/assets/login_images/bg1.png b/src/assets/login_images/bg1.png
new file mode 100644
index 0000000..390b452
--- /dev/null
+++ b/src/assets/login_images/bg1.png
Binary files differ
diff --git a/src/router/modules/doorSys.js b/src/router/modules/doorSys.js
index 605b851..64e8d5e 100644
--- a/src/router/modules/doorSys.js
+++ b/src/router/modules/doorSys.js
@@ -166,5 +166,32 @@
         meta: { title: '车辆登记', icon: '', permission: ['/area/defenceList'], keepAlive: true }
       }
     ]
+  },
+  {
+    path: '/statistics',
+    component: Layout,
+    redirect: '/statistics',
+    name: 'Statistics',
+    alwaysShow: true,
+    meta: {
+      title: '统计管理',
+      icon: 'icon-statistics', // 图标
+      permission: ['/statistics'], // 权限名称
+      sys: '/door'
+    },
+    children: [
+      {
+        path: '/statistics/inOutPerson',
+        name: 'InOutPerson',
+        component: () => import('@/views/statistics/inOutPerson'),
+        meta: { title: '人员进出记录', icon: '', permission: ['/statistics/inOutPerson'], keepAlive: true }
+      },
+      {
+        path: '/statistics/inOutCar',
+        name: 'InOutCar',
+        component: () => import('@/views/statistics/inOutCar'),
+        meta: { title: '车辆进出记录', icon: '', permission: ['/statistics/inOutCar'], keepAlive: true }
+      }
+    ]
   }
 ]
diff --git a/src/router/modules/system.js b/src/router/modules/system.js
index 05f97c3..2efd4c5 100644
--- a/src/router/modules/system.js
+++ b/src/router/modules/system.js
@@ -38,12 +38,6 @@
         meta: { title: '字典管理', icon: 'function', permission: ['/dict'] }
       },
       {
-        path: '/area',
-        name: 'Area',
-        component: () => import('@/views/system/area/listArea'),
-        meta: { title: '区域管理', icon: 'function', permission: ['/area'] }
-      },
-      {
         path: '/dept',
         name: 'Dept',
         component: () => import('@/views/system/dept/listDept'),

diff --git a/src/api/allDict.js b/src/api/allDict.js
index 389c2b2..c567eb2 100644
--- a/src/api/allDict.js
+++ b/src/api/allDict.js
@@ -28,6 +28,15 @@
   })
 }
 
+// 车辆类别
+export function getCarType(params) {
+  return request({
+    url: '/dict/code/carType',
+    method: 'get',
+    params
+  })
+}
+
 // 设备类型
 export function getDeviceType(params) {
   return request({
@@ -52,3 +61,11 @@
     method: 'get'
   })
 }
+
+// 进出园区
+export function getInOutType() {
+  return request({
+    url: '/dict/code/inOut',
+    method: 'get'
+  })
+}
diff --git a/src/api/car.js b/src/api/car.js
index cf638b5..fc55938 100644
--- a/src/api/car.js
+++ b/src/api/car.js
@@ -1,5 +1,5 @@
 import request from '@/utils/request'
-import qs from 'qs'
+// import qs from 'qs'
 
 // 分页查询车辆列表
 export function getCarList(params) {
diff --git a/src/api/device.js b/src/api/device.js
index b3a3f84..4cf4c36 100644
--- a/src/api/device.js
+++ b/src/api/device.js
@@ -2,7 +2,7 @@
  * 设备管理接口
  */
 import request from '@/utils/request'
-import qs from 'qs'
+// import qs from 'qs'
 
 // 分页查询设备列表
 export function getDeviceList(params) {
diff --git a/src/api/statistics.js b/src/api/statistics.js
new file mode 100644
index 0000000..44e089f
--- /dev/null
+++ b/src/api/statistics.js
@@ -0,0 +1,22 @@
+/**
+ * 数据查询接口
+ */
+import request from '@/utils/request'
+// import qs from 'qs'
+
+export function personInOutRecord(params) {
+  return request({
+    url: '/statistics/personListPage',
+    method: 'get',
+    params
+  })
+}
+
+export function carInOutRecord(params) {
+  return request({
+    url: '/statistics/carListPage',
+    method: 'get',
+    params
+  })
+}
+
diff --git a/src/api/visitor.js b/src/api/visitor.js
index 1535eed..121d5e2 100644
--- a/src/api/visitor.js
+++ b/src/api/visitor.js
@@ -1,5 +1,5 @@
 import request from '@/utils/request'
-import qs from 'qs'
+// import qs from 'qs'
 
 // 访客登记
 export function addVisitorPerson(data) {
diff --git a/src/assets/login_images/bg-blue.png b/src/assets/login_images/bg-blue.png
new file mode 100644
index 0000000..a408d14
--- /dev/null
+++ b/src/assets/login_images/bg-blue.png
Binary files differ
diff --git a/src/assets/login_images/bg1.png b/src/assets/login_images/bg1.png
new file mode 100644
index 0000000..390b452
--- /dev/null
+++ b/src/assets/login_images/bg1.png
Binary files differ
diff --git a/src/router/modules/doorSys.js b/src/router/modules/doorSys.js
index 605b851..64e8d5e 100644
--- a/src/router/modules/doorSys.js
+++ b/src/router/modules/doorSys.js
@@ -166,5 +166,32 @@
         meta: { title: '车辆登记', icon: '', permission: ['/area/defenceList'], keepAlive: true }
       }
     ]
+  },
+  {
+    path: '/statistics',
+    component: Layout,
+    redirect: '/statistics',
+    name: 'Statistics',
+    alwaysShow: true,
+    meta: {
+      title: '统计管理',
+      icon: 'icon-statistics', // 图标
+      permission: ['/statistics'], // 权限名称
+      sys: '/door'
+    },
+    children: [
+      {
+        path: '/statistics/inOutPerson',
+        name: 'InOutPerson',
+        component: () => import('@/views/statistics/inOutPerson'),
+        meta: { title: '人员进出记录', icon: '', permission: ['/statistics/inOutPerson'], keepAlive: true }
+      },
+      {
+        path: '/statistics/inOutCar',
+        name: 'InOutCar',
+        component: () => import('@/views/statistics/inOutCar'),
+        meta: { title: '车辆进出记录', icon: '', permission: ['/statistics/inOutCar'], keepAlive: true }
+      }
+    ]
   }
 ]
diff --git a/src/router/modules/system.js b/src/router/modules/system.js
index 05f97c3..2efd4c5 100644
--- a/src/router/modules/system.js
+++ b/src/router/modules/system.js
@@ -38,12 +38,6 @@
         meta: { title: '字典管理', icon: 'function', permission: ['/dict'] }
       },
       {
-        path: '/area',
-        name: 'Area',
-        component: () => import('@/views/system/area/listArea'),
-        meta: { title: '区域管理', icon: 'function', permission: ['/area'] }
-      },
-      {
         path: '/dept',
         name: 'Dept',
         component: () => import('@/views/system/dept/listDept'),
diff --git a/src/views/car/carList.vue b/src/views/car/carList.vue
index 89555ee..bf2bb70 100644
--- a/src/views/car/carList.vue
+++ b/src/views/car/carList.vue
@@ -40,7 +40,7 @@
       </el-row>
       <el-table v-loading="listLoading" :data="list" class="table" row-class-name="small-row-class" border @selection-change="handleSelectionChange">
         <!--拥有删除权限则显示复选框-->
-<!--        <el-table-column v-if="hasPerm('/staff/delete')" align="center" type="selection" width="55"/>-->
+        <!--        <el-table-column v-if="hasPerm('/staff/delete')" align="center" type="selection" width="55"/>-->
         <!--序号列-->
         <el-table-column :index="indexMethod" align="center" type="index" label="#" width="55"/>
         <!--内容列-->

diff --git a/src/api/allDict.js b/src/api/allDict.js
index 389c2b2..c567eb2 100644
--- a/src/api/allDict.js
+++ b/src/api/allDict.js
@@ -28,6 +28,15 @@
   })
 }
 
+// 车辆类别
+export function getCarType(params) {
+  return request({
+    url: '/dict/code/carType',
+    method: 'get',
+    params
+  })
+}
+
 // 设备类型
 export function getDeviceType(params) {
   return request({
@@ -52,3 +61,11 @@
     method: 'get'
   })
 }
+
+// 进出园区
+export function getInOutType() {
+  return request({
+    url: '/dict/code/inOut',
+    method: 'get'
+  })
+}
diff --git a/src/api/car.js b/src/api/car.js
index cf638b5..fc55938 100644
--- a/src/api/car.js
+++ b/src/api/car.js
@@ -1,5 +1,5 @@
 import request from '@/utils/request'
-import qs from 'qs'
+// import qs from 'qs'
 
 // 分页查询车辆列表
 export function getCarList(params) {
diff --git a/src/api/device.js b/src/api/device.js
index b3a3f84..4cf4c36 100644
--- a/src/api/device.js
+++ b/src/api/device.js
@@ -2,7 +2,7 @@
  * 设备管理接口
  */
 import request from '@/utils/request'
-import qs from 'qs'
+// import qs from 'qs'
 
 // 分页查询设备列表
 export function getDeviceList(params) {
diff --git a/src/api/statistics.js b/src/api/statistics.js
new file mode 100644
index 0000000..44e089f
--- /dev/null
+++ b/src/api/statistics.js
@@ -0,0 +1,22 @@
+/**
+ * 数据查询接口
+ */
+import request from '@/utils/request'
+// import qs from 'qs'
+
+export function personInOutRecord(params) {
+  return request({
+    url: '/statistics/personListPage',
+    method: 'get',
+    params
+  })
+}
+
+export function carInOutRecord(params) {
+  return request({
+    url: '/statistics/carListPage',
+    method: 'get',
+    params
+  })
+}
+
diff --git a/src/api/visitor.js b/src/api/visitor.js
index 1535eed..121d5e2 100644
--- a/src/api/visitor.js
+++ b/src/api/visitor.js
@@ -1,5 +1,5 @@
 import request from '@/utils/request'
-import qs from 'qs'
+// import qs from 'qs'
 
 // 访客登记
 export function addVisitorPerson(data) {
diff --git a/src/assets/login_images/bg-blue.png b/src/assets/login_images/bg-blue.png
new file mode 100644
index 0000000..a408d14
--- /dev/null
+++ b/src/assets/login_images/bg-blue.png
Binary files differ
diff --git a/src/assets/login_images/bg1.png b/src/assets/login_images/bg1.png
new file mode 100644
index 0000000..390b452
--- /dev/null
+++ b/src/assets/login_images/bg1.png
Binary files differ
diff --git a/src/router/modules/doorSys.js b/src/router/modules/doorSys.js
index 605b851..64e8d5e 100644
--- a/src/router/modules/doorSys.js
+++ b/src/router/modules/doorSys.js
@@ -166,5 +166,32 @@
         meta: { title: '车辆登记', icon: '', permission: ['/area/defenceList'], keepAlive: true }
       }
     ]
+  },
+  {
+    path: '/statistics',
+    component: Layout,
+    redirect: '/statistics',
+    name: 'Statistics',
+    alwaysShow: true,
+    meta: {
+      title: '统计管理',
+      icon: 'icon-statistics', // 图标
+      permission: ['/statistics'], // 权限名称
+      sys: '/door'
+    },
+    children: [
+      {
+        path: '/statistics/inOutPerson',
+        name: 'InOutPerson',
+        component: () => import('@/views/statistics/inOutPerson'),
+        meta: { title: '人员进出记录', icon: '', permission: ['/statistics/inOutPerson'], keepAlive: true }
+      },
+      {
+        path: '/statistics/inOutCar',
+        name: 'InOutCar',
+        component: () => import('@/views/statistics/inOutCar'),
+        meta: { title: '车辆进出记录', icon: '', permission: ['/statistics/inOutCar'], keepAlive: true }
+      }
+    ]
   }
 ]
diff --git a/src/router/modules/system.js b/src/router/modules/system.js
index 05f97c3..2efd4c5 100644
--- a/src/router/modules/system.js
+++ b/src/router/modules/system.js
@@ -38,12 +38,6 @@
         meta: { title: '字典管理', icon: 'function', permission: ['/dict'] }
       },
       {
-        path: '/area',
-        name: 'Area',
-        component: () => import('@/views/system/area/listArea'),
-        meta: { title: '区域管理', icon: 'function', permission: ['/area'] }
-      },
-      {
         path: '/dept',
         name: 'Dept',
         component: () => import('@/views/system/dept/listDept'),
diff --git a/src/views/car/carList.vue b/src/views/car/carList.vue
index 89555ee..bf2bb70 100644
--- a/src/views/car/carList.vue
+++ b/src/views/car/carList.vue
@@ -40,7 +40,7 @@
       </el-row>
       <el-table v-loading="listLoading" :data="list" class="table" row-class-name="small-row-class" border @selection-change="handleSelectionChange">
         <!--拥有删除权限则显示复选框-->
-<!--        <el-table-column v-if="hasPerm('/staff/delete')" align="center" type="selection" width="55"/>-->
+        <!--        <el-table-column v-if="hasPerm('/staff/delete')" align="center" type="selection" width="55"/>-->
         <!--序号列-->
         <el-table-column :index="indexMethod" align="center" type="index" label="#" width="55"/>
         <!--内容列-->
diff --git a/src/views/dashboard/portal.vue b/src/views/dashboard/portal.vue
index b517742..4365c4b 100644
--- a/src/views/dashboard/portal.vue
+++ b/src/views/dashboard/portal.vue
@@ -46,7 +46,8 @@
     </div>
 
     <div class="welcome">
-      <img src="/static/images/dashboard/exit-logo.png" height="25px" @click="logout">
+      <img src="/static/images/dashboard/setting-logo.png" height="40px" style="margin-right: 20px;" @click="settingSystem">
+      <img src="/static/images/dashboard/exit-logo.png" height="40px" @click="logout">
     </div>
   </div>
 </template>
@@ -80,12 +81,28 @@
         console.log('获取子系统成功')
       })
     },
-    doorSubSystem: function() {
+    changeSubSystem(subSys) {
       this.$store.commit('SET_CHANGEFLAG', '1')
-      this.$store.commit('SET_SYSTEM', this.systems[1])
+      this.$store.commit('SET_SYSTEM', subSys)
       this.$store.dispatch('tagsView/delAllViews', true).then(({ visitedViews }) => {
-        this.$router.replace(this.systems[1].url)
+        this.$router.replace(subSys.url)
       })
+    },
+    settingSystem() {
+      const setting = this.systems.filter(subsys => {
+        return subsys.code === 'sys'
+      })
+      if (typeof setting !== 'undefined' && setting.length > 0) {
+        this.changeSubSystem(setting[0])
+      }
+    },
+    doorSubSystem() {
+      const door = this.systems.filter(subsys => {
+        return subsys.code === 'door'
+      })
+      if (typeof door !== 'undefined' && door.length > 0) {
+        this.changeSubSystem(door[0])
+      }
     }
   }
 }
@@ -147,11 +164,15 @@
   .welcome {
     position: absolute;
     right: 5vw;
-    bottom: 30px;
+    top: 30px;
     padding-left: 10px;
     cursor: pointer;
   }
 
+  .welcome img {
+    filter: drop-shadow(5px 5px 5px rgba(0, 0 , 0, 0.75));
+  }
+
   .title {
     position: absolute;
     top: 30px;

diff --git a/src/api/allDict.js b/src/api/allDict.js
index 389c2b2..c567eb2 100644
--- a/src/api/allDict.js
+++ b/src/api/allDict.js
@@ -28,6 +28,15 @@
   })
 }
 
+// 车辆类别
+export function getCarType(params) {
+  return request({
+    url: '/dict/code/carType',
+    method: 'get',
+    params
+  })
+}
+
 // 设备类型
 export function getDeviceType(params) {
   return request({
@@ -52,3 +61,11 @@
     method: 'get'
   })
 }
+
+// 进出园区
+export function getInOutType() {
+  return request({
+    url: '/dict/code/inOut',
+    method: 'get'
+  })
+}
diff --git a/src/api/car.js b/src/api/car.js
index cf638b5..fc55938 100644
--- a/src/api/car.js
+++ b/src/api/car.js
@@ -1,5 +1,5 @@
 import request from '@/utils/request'
-import qs from 'qs'
+// import qs from 'qs'
 
 // 分页查询车辆列表
 export function getCarList(params) {
diff --git a/src/api/device.js b/src/api/device.js
index b3a3f84..4cf4c36 100644
--- a/src/api/device.js
+++ b/src/api/device.js
@@ -2,7 +2,7 @@
  * 设备管理接口
  */
 import request from '@/utils/request'
-import qs from 'qs'
+// import qs from 'qs'
 
 // 分页查询设备列表
 export function getDeviceList(params) {
diff --git a/src/api/statistics.js b/src/api/statistics.js
new file mode 100644
index 0000000..44e089f
--- /dev/null
+++ b/src/api/statistics.js
@@ -0,0 +1,22 @@
+/**
+ * 数据查询接口
+ */
+import request from '@/utils/request'
+// import qs from 'qs'
+
+export function personInOutRecord(params) {
+  return request({
+    url: '/statistics/personListPage',
+    method: 'get',
+    params
+  })
+}
+
+export function carInOutRecord(params) {
+  return request({
+    url: '/statistics/carListPage',
+    method: 'get',
+    params
+  })
+}
+
diff --git a/src/api/visitor.js b/src/api/visitor.js
index 1535eed..121d5e2 100644
--- a/src/api/visitor.js
+++ b/src/api/visitor.js
@@ -1,5 +1,5 @@
 import request from '@/utils/request'
-import qs from 'qs'
+// import qs from 'qs'
 
 // 访客登记
 export function addVisitorPerson(data) {
diff --git a/src/assets/login_images/bg-blue.png b/src/assets/login_images/bg-blue.png
new file mode 100644
index 0000000..a408d14
--- /dev/null
+++ b/src/assets/login_images/bg-blue.png
Binary files differ
diff --git a/src/assets/login_images/bg1.png b/src/assets/login_images/bg1.png
new file mode 100644
index 0000000..390b452
--- /dev/null
+++ b/src/assets/login_images/bg1.png
Binary files differ
diff --git a/src/router/modules/doorSys.js b/src/router/modules/doorSys.js
index 605b851..64e8d5e 100644
--- a/src/router/modules/doorSys.js
+++ b/src/router/modules/doorSys.js
@@ -166,5 +166,32 @@
         meta: { title: '车辆登记', icon: '', permission: ['/area/defenceList'], keepAlive: true }
       }
     ]
+  },
+  {
+    path: '/statistics',
+    component: Layout,
+    redirect: '/statistics',
+    name: 'Statistics',
+    alwaysShow: true,
+    meta: {
+      title: '统计管理',
+      icon: 'icon-statistics', // 图标
+      permission: ['/statistics'], // 权限名称
+      sys: '/door'
+    },
+    children: [
+      {
+        path: '/statistics/inOutPerson',
+        name: 'InOutPerson',
+        component: () => import('@/views/statistics/inOutPerson'),
+        meta: { title: '人员进出记录', icon: '', permission: ['/statistics/inOutPerson'], keepAlive: true }
+      },
+      {
+        path: '/statistics/inOutCar',
+        name: 'InOutCar',
+        component: () => import('@/views/statistics/inOutCar'),
+        meta: { title: '车辆进出记录', icon: '', permission: ['/statistics/inOutCar'], keepAlive: true }
+      }
+    ]
   }
 ]
diff --git a/src/router/modules/system.js b/src/router/modules/system.js
index 05f97c3..2efd4c5 100644
--- a/src/router/modules/system.js
+++ b/src/router/modules/system.js
@@ -38,12 +38,6 @@
         meta: { title: '字典管理', icon: 'function', permission: ['/dict'] }
       },
       {
-        path: '/area',
-        name: 'Area',
-        component: () => import('@/views/system/area/listArea'),
-        meta: { title: '区域管理', icon: 'function', permission: ['/area'] }
-      },
-      {
         path: '/dept',
         name: 'Dept',
         component: () => import('@/views/system/dept/listDept'),
diff --git a/src/views/car/carList.vue b/src/views/car/carList.vue
index 89555ee..bf2bb70 100644
--- a/src/views/car/carList.vue
+++ b/src/views/car/carList.vue
@@ -40,7 +40,7 @@
       </el-row>
       <el-table v-loading="listLoading" :data="list" class="table" row-class-name="small-row-class" border @selection-change="handleSelectionChange">
         <!--拥有删除权限则显示复选框-->
-<!--        <el-table-column v-if="hasPerm('/staff/delete')" align="center" type="selection" width="55"/>-->
+        <!--        <el-table-column v-if="hasPerm('/staff/delete')" align="center" type="selection" width="55"/>-->
         <!--序号列-->
         <el-table-column :index="indexMethod" align="center" type="index" label="#" width="55"/>
         <!--内容列-->
diff --git a/src/views/dashboard/portal.vue b/src/views/dashboard/portal.vue
index b517742..4365c4b 100644
--- a/src/views/dashboard/portal.vue
+++ b/src/views/dashboard/portal.vue
@@ -46,7 +46,8 @@
     </div>
 
     <div class="welcome">
-      <img src="/static/images/dashboard/exit-logo.png" height="25px" @click="logout">
+      <img src="/static/images/dashboard/setting-logo.png" height="40px" style="margin-right: 20px;" @click="settingSystem">
+      <img src="/static/images/dashboard/exit-logo.png" height="40px" @click="logout">
     </div>
   </div>
 </template>
@@ -80,12 +81,28 @@
         console.log('获取子系统成功')
       })
     },
-    doorSubSystem: function() {
+    changeSubSystem(subSys) {
       this.$store.commit('SET_CHANGEFLAG', '1')
-      this.$store.commit('SET_SYSTEM', this.systems[1])
+      this.$store.commit('SET_SYSTEM', subSys)
       this.$store.dispatch('tagsView/delAllViews', true).then(({ visitedViews }) => {
-        this.$router.replace(this.systems[1].url)
+        this.$router.replace(subSys.url)
       })
+    },
+    settingSystem() {
+      const setting = this.systems.filter(subsys => {
+        return subsys.code === 'sys'
+      })
+      if (typeof setting !== 'undefined' && setting.length > 0) {
+        this.changeSubSystem(setting[0])
+      }
+    },
+    doorSubSystem() {
+      const door = this.systems.filter(subsys => {
+        return subsys.code === 'door'
+      })
+      if (typeof door !== 'undefined' && door.length > 0) {
+        this.changeSubSystem(door[0])
+      }
     }
   }
 }
@@ -147,11 +164,15 @@
   .welcome {
     position: absolute;
     right: 5vw;
-    bottom: 30px;
+    top: 30px;
     padding-left: 10px;
     cursor: pointer;
   }
 
+  .welcome img {
+    filter: drop-shadow(5px 5px 5px rgba(0, 0 , 0, 0.75));
+  }
+
   .title {
     position: absolute;
     top: 30px;
diff --git a/src/views/deviceManage/deviceDetail.vue b/src/views/deviceManage/deviceDetail.vue
index 9896899..81d1bba 100644
--- a/src/views/deviceManage/deviceDetail.vue
+++ b/src/views/deviceManage/deviceDetail.vue
@@ -122,7 +122,6 @@
       this.dialogFormVisible = dialogFormVisible
       this.resetForm()
       if (dialogStatus === 'detail') {
-
         this.isEditMode = false
 
         // 电子围栏设备有开启字段

diff --git a/src/api/allDict.js b/src/api/allDict.js
index 389c2b2..c567eb2 100644
--- a/src/api/allDict.js
+++ b/src/api/allDict.js
@@ -28,6 +28,15 @@
   })
 }
 
+// 车辆类别
+export function getCarType(params) {
+  return request({
+    url: '/dict/code/carType',
+    method: 'get',
+    params
+  })
+}
+
 // 设备类型
 export function getDeviceType(params) {
   return request({
@@ -52,3 +61,11 @@
     method: 'get'
   })
 }
+
+// 进出园区
+export function getInOutType() {
+  return request({
+    url: '/dict/code/inOut',
+    method: 'get'
+  })
+}
diff --git a/src/api/car.js b/src/api/car.js
index cf638b5..fc55938 100644
--- a/src/api/car.js
+++ b/src/api/car.js
@@ -1,5 +1,5 @@
 import request from '@/utils/request'
-import qs from 'qs'
+// import qs from 'qs'
 
 // 分页查询车辆列表
 export function getCarList(params) {
diff --git a/src/api/device.js b/src/api/device.js
index b3a3f84..4cf4c36 100644
--- a/src/api/device.js
+++ b/src/api/device.js
@@ -2,7 +2,7 @@
  * 设备管理接口
  */
 import request from '@/utils/request'
-import qs from 'qs'
+// import qs from 'qs'
 
 // 分页查询设备列表
 export function getDeviceList(params) {
diff --git a/src/api/statistics.js b/src/api/statistics.js
new file mode 100644
index 0000000..44e089f
--- /dev/null
+++ b/src/api/statistics.js
@@ -0,0 +1,22 @@
+/**
+ * 数据查询接口
+ */
+import request from '@/utils/request'
+// import qs from 'qs'
+
+export function personInOutRecord(params) {
+  return request({
+    url: '/statistics/personListPage',
+    method: 'get',
+    params
+  })
+}
+
+export function carInOutRecord(params) {
+  return request({
+    url: '/statistics/carListPage',
+    method: 'get',
+    params
+  })
+}
+
diff --git a/src/api/visitor.js b/src/api/visitor.js
index 1535eed..121d5e2 100644
--- a/src/api/visitor.js
+++ b/src/api/visitor.js
@@ -1,5 +1,5 @@
 import request from '@/utils/request'
-import qs from 'qs'
+// import qs from 'qs'
 
 // 访客登记
 export function addVisitorPerson(data) {
diff --git a/src/assets/login_images/bg-blue.png b/src/assets/login_images/bg-blue.png
new file mode 100644
index 0000000..a408d14
--- /dev/null
+++ b/src/assets/login_images/bg-blue.png
Binary files differ
diff --git a/src/assets/login_images/bg1.png b/src/assets/login_images/bg1.png
new file mode 100644
index 0000000..390b452
--- /dev/null
+++ b/src/assets/login_images/bg1.png
Binary files differ
diff --git a/src/router/modules/doorSys.js b/src/router/modules/doorSys.js
index 605b851..64e8d5e 100644
--- a/src/router/modules/doorSys.js
+++ b/src/router/modules/doorSys.js
@@ -166,5 +166,32 @@
         meta: { title: '车辆登记', icon: '', permission: ['/area/defenceList'], keepAlive: true }
       }
     ]
+  },
+  {
+    path: '/statistics',
+    component: Layout,
+    redirect: '/statistics',
+    name: 'Statistics',
+    alwaysShow: true,
+    meta: {
+      title: '统计管理',
+      icon: 'icon-statistics', // 图标
+      permission: ['/statistics'], // 权限名称
+      sys: '/door'
+    },
+    children: [
+      {
+        path: '/statistics/inOutPerson',
+        name: 'InOutPerson',
+        component: () => import('@/views/statistics/inOutPerson'),
+        meta: { title: '人员进出记录', icon: '', permission: ['/statistics/inOutPerson'], keepAlive: true }
+      },
+      {
+        path: '/statistics/inOutCar',
+        name: 'InOutCar',
+        component: () => import('@/views/statistics/inOutCar'),
+        meta: { title: '车辆进出记录', icon: '', permission: ['/statistics/inOutCar'], keepAlive: true }
+      }
+    ]
   }
 ]
diff --git a/src/router/modules/system.js b/src/router/modules/system.js
index 05f97c3..2efd4c5 100644
--- a/src/router/modules/system.js
+++ b/src/router/modules/system.js
@@ -38,12 +38,6 @@
         meta: { title: '字典管理', icon: 'function', permission: ['/dict'] }
       },
       {
-        path: '/area',
-        name: 'Area',
-        component: () => import('@/views/system/area/listArea'),
-        meta: { title: '区域管理', icon: 'function', permission: ['/area'] }
-      },
-      {
         path: '/dept',
         name: 'Dept',
         component: () => import('@/views/system/dept/listDept'),
diff --git a/src/views/car/carList.vue b/src/views/car/carList.vue
index 89555ee..bf2bb70 100644
--- a/src/views/car/carList.vue
+++ b/src/views/car/carList.vue
@@ -40,7 +40,7 @@
       </el-row>
       <el-table v-loading="listLoading" :data="list" class="table" row-class-name="small-row-class" border @selection-change="handleSelectionChange">
         <!--拥有删除权限则显示复选框-->
-<!--        <el-table-column v-if="hasPerm('/staff/delete')" align="center" type="selection" width="55"/>-->
+        <!--        <el-table-column v-if="hasPerm('/staff/delete')" align="center" type="selection" width="55"/>-->
         <!--序号列-->
         <el-table-column :index="indexMethod" align="center" type="index" label="#" width="55"/>
         <!--内容列-->
diff --git a/src/views/dashboard/portal.vue b/src/views/dashboard/portal.vue
index b517742..4365c4b 100644
--- a/src/views/dashboard/portal.vue
+++ b/src/views/dashboard/portal.vue
@@ -46,7 +46,8 @@
     </div>
 
     <div class="welcome">
-      <img src="/static/images/dashboard/exit-logo.png" height="25px" @click="logout">
+      <img src="/static/images/dashboard/setting-logo.png" height="40px" style="margin-right: 20px;" @click="settingSystem">
+      <img src="/static/images/dashboard/exit-logo.png" height="40px" @click="logout">
     </div>
   </div>
 </template>
@@ -80,12 +81,28 @@
         console.log('获取子系统成功')
       })
     },
-    doorSubSystem: function() {
+    changeSubSystem(subSys) {
       this.$store.commit('SET_CHANGEFLAG', '1')
-      this.$store.commit('SET_SYSTEM', this.systems[1])
+      this.$store.commit('SET_SYSTEM', subSys)
       this.$store.dispatch('tagsView/delAllViews', true).then(({ visitedViews }) => {
-        this.$router.replace(this.systems[1].url)
+        this.$router.replace(subSys.url)
       })
+    },
+    settingSystem() {
+      const setting = this.systems.filter(subsys => {
+        return subsys.code === 'sys'
+      })
+      if (typeof setting !== 'undefined' && setting.length > 0) {
+        this.changeSubSystem(setting[0])
+      }
+    },
+    doorSubSystem() {
+      const door = this.systems.filter(subsys => {
+        return subsys.code === 'door'
+      })
+      if (typeof door !== 'undefined' && door.length > 0) {
+        this.changeSubSystem(door[0])
+      }
     }
   }
 }
@@ -147,11 +164,15 @@
   .welcome {
     position: absolute;
     right: 5vw;
-    bottom: 30px;
+    top: 30px;
     padding-left: 10px;
     cursor: pointer;
   }
 
+  .welcome img {
+    filter: drop-shadow(5px 5px 5px rgba(0, 0 , 0, 0.75));
+  }
+
   .title {
     position: absolute;
     top: 30px;
diff --git a/src/views/deviceManage/deviceDetail.vue b/src/views/deviceManage/deviceDetail.vue
index 9896899..81d1bba 100644
--- a/src/views/deviceManage/deviceDetail.vue
+++ b/src/views/deviceManage/deviceDetail.vue
@@ -122,7 +122,6 @@
       this.dialogFormVisible = dialogFormVisible
       this.resetForm()
       if (dialogStatus === 'detail') {
-
         this.isEditMode = false
 
         // 电子围栏设备有开启字段
diff --git a/src/views/layout/components/AppHeader.vue b/src/views/layout/components/AppHeader.vue
index 92cb5c5..d187aac 100644
--- a/src/views/layout/components/AppHeader.vue
+++ b/src/views/layout/components/AppHeader.vue
@@ -1,6 +1,6 @@
 <template>
   <div :style="{backgroundImage:'url('+headerUrl+')'}" class="app-header">
-    <h3>智慧城管平台</h3>
+    <h3>{{ title }}</h3>
     <!--子系统选项-->
     <el-dropdown class="systemSelect" @command="handleCommand">
       <span class="el-dropdown-link">{{ currentSystem.name }}<i class="el-icon-arrow-down el-icon--right"/>
@@ -12,15 +12,9 @@
     <el-dropdown class="avatar-container">
       <div class="avatar-wrapper">
         <span style="line-height:50px;">欢迎您，{{ name }}</span>
-        <!--<img :src="avatar+'?imageView2/1/w/80/h/80'" class="user-avatar">-->
         <i class="el-icon-caret-bottom"/>
       </div>
       <el-dropdown-menu slot="dropdown" class="user-dropdown">
-        <!--<router-link class="inlineBlock" to="/">-->
-        <!--<el-dropdown-item>-->
-        <!--主页-->
-        <!--</el-dropdown-item>-->
-        <!--</router-link>-->
         <el-dropdown-item>
           <span style="display:block;" @click="backToIndex">回首页</span>
         </el-dropdown-item>
@@ -39,6 +33,7 @@
 <script>
 import { mapGetters } from 'vuex'
 import ResetPwd from '../../system/user/resetPwd'
+import { getProject } from '@/utils/baseConfig'
 
 export default {
   name: 'AppHeader',
@@ -46,6 +41,13 @@
   data() {
     return {
       name: this.$store.getters.name,
+      title: getProject().title,
+      systems: [
+        { code: 'door', ismenu: '0', levels: 1, name: '营门管理子系统', resourceType: '02', url: '/door' },
+        { code: 'fence', ismenu: '0', levels: 1, name: '周界防卫子系统', resourceType: '02', url: '/fence' },
+        { code: 'region', ismenu: '0', levels: 1, name: '全域监控子系统', resourceType: '02', url: '/region' },
+        { code: 'key', ismenu: '0', levels: 1, name: '重点区域管控子系统', resourceType: '02', url: '/key' }
+      ],
       showSetPwd: false,
       headerUrl: require('../../../assets/global_images/header.png')// 头部图片
     }
@@ -57,10 +59,10 @@
     ]),
     currentSystem() {
       return this.$store.getters.currentSystem
-    },
-    systems() {
-      return this.$store.getters.systems
     }
+    // systems() {
+    //   return this.$store.getters.systems
+    // }
   },
   created() {
     this.getSystems()

diff --git a/src/api/allDict.js b/src/api/allDict.js
index 389c2b2..c567eb2 100644
--- a/src/api/allDict.js
+++ b/src/api/allDict.js
@@ -28,6 +28,15 @@
   })
 }
 
+// 车辆类别
+export function getCarType(params) {
+  return request({
+    url: '/dict/code/carType',
+    method: 'get',
+    params
+  })
+}
+
 // 设备类型
 export function getDeviceType(params) {
   return request({
@@ -52,3 +61,11 @@
     method: 'get'
   })
 }
+
+// 进出园区
+export function getInOutType() {
+  return request({
+    url: '/dict/code/inOut',
+    method: 'get'
+  })
+}
diff --git a/src/api/car.js b/src/api/car.js
index cf638b5..fc55938 100644
--- a/src/api/car.js
+++ b/src/api/car.js
@@ -1,5 +1,5 @@
 import request from '@/utils/request'
-import qs from 'qs'
+// import qs from 'qs'
 
 // 分页查询车辆列表
 export function getCarList(params) {
diff --git a/src/api/device.js b/src/api/device.js
index b3a3f84..4cf4c36 100644
--- a/src/api/device.js
+++ b/src/api/device.js
@@ -2,7 +2,7 @@
  * 设备管理接口
  */
 import request from '@/utils/request'
-import qs from 'qs'
+// import qs from 'qs'
 
 // 分页查询设备列表
 export function getDeviceList(params) {
diff --git a/src/api/statistics.js b/src/api/statistics.js
new file mode 100644
index 0000000..44e089f
--- /dev/null
+++ b/src/api/statistics.js
@@ -0,0 +1,22 @@
+/**
+ * 数据查询接口
+ */
+import request from '@/utils/request'
+// import qs from 'qs'
+
+export function personInOutRecord(params) {
+  return request({
+    url: '/statistics/personListPage',
+    method: 'get',
+    params
+  })
+}
+
+export function carInOutRecord(params) {
+  return request({
+    url: '/statistics/carListPage',
+    method: 'get',
+    params
+  })
+}
+
diff --git a/src/api/visitor.js b/src/api/visitor.js
index 1535eed..121d5e2 100644
--- a/src/api/visitor.js
+++ b/src/api/visitor.js
@@ -1,5 +1,5 @@
 import request from '@/utils/request'
-import qs from 'qs'
+// import qs from 'qs'
 
 // 访客登记
 export function addVisitorPerson(data) {
diff --git a/src/assets/login_images/bg-blue.png b/src/assets/login_images/bg-blue.png
new file mode 100644
index 0000000..a408d14
--- /dev/null
+++ b/src/assets/login_images/bg-blue.png
Binary files differ
diff --git a/src/assets/login_images/bg1.png b/src/assets/login_images/bg1.png
new file mode 100644
index 0000000..390b452
--- /dev/null
+++ b/src/assets/login_images/bg1.png
Binary files differ
diff --git a/src/router/modules/doorSys.js b/src/router/modules/doorSys.js
index 605b851..64e8d5e 100644
--- a/src/router/modules/doorSys.js
+++ b/src/router/modules/doorSys.js
@@ -166,5 +166,32 @@
         meta: { title: '车辆登记', icon: '', permission: ['/area/defenceList'], keepAlive: true }
       }
     ]
+  },
+  {
+    path: '/statistics',
+    component: Layout,
+    redirect: '/statistics',
+    name: 'Statistics',
+    alwaysShow: true,
+    meta: {
+      title: '统计管理',
+      icon: 'icon-statistics', // 图标
+      permission: ['/statistics'], // 权限名称
+      sys: '/door'
+    },
+    children: [
+      {
+        path: '/statistics/inOutPerson',
+        name: 'InOutPerson',
+        component: () => import('@/views/statistics/inOutPerson'),
+        meta: { title: '人员进出记录', icon: '', permission: ['/statistics/inOutPerson'], keepAlive: true }
+      },
+      {
+        path: '/statistics/inOutCar',
+        name: 'InOutCar',
+        component: () => import('@/views/statistics/inOutCar'),
+        meta: { title: '车辆进出记录', icon: '', permission: ['/statistics/inOutCar'], keepAlive: true }
+      }
+    ]
   }
 ]
diff --git a/src/router/modules/system.js b/src/router/modules/system.js
index 05f97c3..2efd4c5 100644
--- a/src/router/modules/system.js
+++ b/src/router/modules/system.js
@@ -38,12 +38,6 @@
         meta: { title: '字典管理', icon: 'function', permission: ['/dict'] }
       },
       {
-        path: '/area',
-        name: 'Area',
-        component: () => import('@/views/system/area/listArea'),
-        meta: { title: '区域管理', icon: 'function', permission: ['/area'] }
-      },
-      {
         path: '/dept',
         name: 'Dept',
         component: () => import('@/views/system/dept/listDept'),
diff --git a/src/views/car/carList.vue b/src/views/car/carList.vue
index 89555ee..bf2bb70 100644
--- a/src/views/car/carList.vue
+++ b/src/views/car/carList.vue
@@ -40,7 +40,7 @@
       </el-row>
       <el-table v-loading="listLoading" :data="list" class="table" row-class-name="small-row-class" border @selection-change="handleSelectionChange">
         <!--拥有删除权限则显示复选框-->
-<!--        <el-table-column v-if="hasPerm('/staff/delete')" align="center" type="selection" width="55"/>-->
+        <!--        <el-table-column v-if="hasPerm('/staff/delete')" align="center" type="selection" width="55"/>-->
         <!--序号列-->
         <el-table-column :index="indexMethod" align="center" type="index" label="#" width="55"/>
         <!--内容列-->
diff --git a/src/views/dashboard/portal.vue b/src/views/dashboard/portal.vue
index b517742..4365c4b 100644
--- a/src/views/dashboard/portal.vue
+++ b/src/views/dashboard/portal.vue
@@ -46,7 +46,8 @@
     </div>
 
     <div class="welcome">
-      <img src="/static/images/dashboard/exit-logo.png" height="25px" @click="logout">
+      <img src="/static/images/dashboard/setting-logo.png" height="40px" style="margin-right: 20px;" @click="settingSystem">
+      <img src="/static/images/dashboard/exit-logo.png" height="40px" @click="logout">
     </div>
   </div>
 </template>
@@ -80,12 +81,28 @@
         console.log('获取子系统成功')
       })
     },
-    doorSubSystem: function() {
+    changeSubSystem(subSys) {
       this.$store.commit('SET_CHANGEFLAG', '1')
-      this.$store.commit('SET_SYSTEM', this.systems[1])
+      this.$store.commit('SET_SYSTEM', subSys)
       this.$store.dispatch('tagsView/delAllViews', true).then(({ visitedViews }) => {
-        this.$router.replace(this.systems[1].url)
+        this.$router.replace(subSys.url)
       })
+    },
+    settingSystem() {
+      const setting = this.systems.filter(subsys => {
+        return subsys.code === 'sys'
+      })
+      if (typeof setting !== 'undefined' && setting.length > 0) {
+        this.changeSubSystem(setting[0])
+      }
+    },
+    doorSubSystem() {
+      const door = this.systems.filter(subsys => {
+        return subsys.code === 'door'
+      })
+      if (typeof door !== 'undefined' && door.length > 0) {
+        this.changeSubSystem(door[0])
+      }
     }
   }
 }
@@ -147,11 +164,15 @@
   .welcome {
     position: absolute;
     right: 5vw;
-    bottom: 30px;
+    top: 30px;
     padding-left: 10px;
     cursor: pointer;
   }
 
+  .welcome img {
+    filter: drop-shadow(5px 5px 5px rgba(0, 0 , 0, 0.75));
+  }
+
   .title {
     position: absolute;
     top: 30px;
diff --git a/src/views/deviceManage/deviceDetail.vue b/src/views/deviceManage/deviceDetail.vue
index 9896899..81d1bba 100644
--- a/src/views/deviceManage/deviceDetail.vue
+++ b/src/views/deviceManage/deviceDetail.vue
@@ -122,7 +122,6 @@
       this.dialogFormVisible = dialogFormVisible
       this.resetForm()
       if (dialogStatus === 'detail') {
-
         this.isEditMode = false
 
         // 电子围栏设备有开启字段
diff --git a/src/views/layout/components/AppHeader.vue b/src/views/layout/components/AppHeader.vue
index 92cb5c5..d187aac 100644
--- a/src/views/layout/components/AppHeader.vue
+++ b/src/views/layout/components/AppHeader.vue
@@ -1,6 +1,6 @@
 <template>
   <div :style="{backgroundImage:'url('+headerUrl+')'}" class="app-header">
-    <h3>智慧城管平台</h3>
+    <h3>{{ title }}</h3>
     <!--子系统选项-->
     <el-dropdown class="systemSelect" @command="handleCommand">
       <span class="el-dropdown-link">{{ currentSystem.name }}<i class="el-icon-arrow-down el-icon--right"/>
@@ -12,15 +12,9 @@
     <el-dropdown class="avatar-container">
       <div class="avatar-wrapper">
         <span style="line-height:50px;">欢迎您，{{ name }}</span>
-        <!--<img :src="avatar+'?imageView2/1/w/80/h/80'" class="user-avatar">-->
         <i class="el-icon-caret-bottom"/>
       </div>
       <el-dropdown-menu slot="dropdown" class="user-dropdown">
-        <!--<router-link class="inlineBlock" to="/">-->
-        <!--<el-dropdown-item>-->
-        <!--主页-->
-        <!--</el-dropdown-item>-->
-        <!--</router-link>-->
         <el-dropdown-item>
           <span style="display:block;" @click="backToIndex">回首页</span>
         </el-dropdown-item>
@@ -39,6 +33,7 @@
 <script>
 import { mapGetters } from 'vuex'
 import ResetPwd from '../../system/user/resetPwd'
+import { getProject } from '@/utils/baseConfig'
 
 export default {
   name: 'AppHeader',
@@ -46,6 +41,13 @@
   data() {
     return {
       name: this.$store.getters.name,
+      title: getProject().title,
+      systems: [
+        { code: 'door', ismenu: '0', levels: 1, name: '营门管理子系统', resourceType: '02', url: '/door' },
+        { code: 'fence', ismenu: '0', levels: 1, name: '周界防卫子系统', resourceType: '02', url: '/fence' },
+        { code: 'region', ismenu: '0', levels: 1, name: '全域监控子系统', resourceType: '02', url: '/region' },
+        { code: 'key', ismenu: '0', levels: 1, name: '重点区域管控子系统', resourceType: '02', url: '/key' }
+      ],
       showSetPwd: false,
       headerUrl: require('../../../assets/global_images/header.png')// 头部图片
     }
@@ -57,10 +59,10 @@
     ]),
     currentSystem() {
       return this.$store.getters.currentSystem
-    },
-    systems() {
-      return this.$store.getters.systems
     }
+    // systems() {
+    //   return this.$store.getters.systems
+    // }
   },
   created() {
     this.getSystems()
diff --git a/src/views/staff/captureIris.vue b/src/views/staff/captureIris.vue
index e2c06dd..7183176 100644
--- a/src/views/staff/captureIris.vue
+++ b/src/views/staff/captureIris.vue
@@ -69,13 +69,17 @@
       dialogFormVisible: false, // 对话框是否显示
       photoLeft: '', // 图片路径
       photoRight: '',
+      scoreLeft: '0',
+      scoreRight: '0',
       defaultPhoto: require('@/assets/global_images/eye.png'), // 默认图片路径
       irisForm: {
         eyeType: '3',
         personId: '',
         idCard: '',
         image_zy: '',
-        image_yy: ''
+        image_yy: '',
+        score_zy: '0',
+        score_yy: '0'
       }, // 表单
       title: '' // 表头显示标题
     }
@@ -89,52 +93,60 @@
     WebSocketConnent() {
       this.photoLeft = ''
       this.photoRight = ''
-      const _this = this
-      this.ws = _this.$root.ws
+      this.scoreLeft = '0'
+      this.scoreRight = '0'
+      const that = this
+      this.ws = that.$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 = new WebSocket(that.$root.wsURL)
         // 注册各类回调
         this.ws.onopen = function() {
-          _this.$message.success('采集设备启动中...')
-          _this.ws.send('StartCapture' + _this.irisForm.eyeType)
+          that.$message.success('采集设备启动中...')
+          that.ws.send('StartCapture' + that.irisForm.eyeType)
         }
         this.ws.onclose = function() {
-          _this.$message.info('与ICS连接断开')
-          _this.$root.ws = null
+          that.$message.info('与ICS连接断开')
+          that.$root.ws = null
         }
         this.ws.onerror = function() {
-          _this.$message.error('与ICS通信发生错误')
+          that.$message.error('与ICS通信发生错误')
         }
-        _this.$root.ws = this.ws
+        that.$root.ws = this.ws
       } else {
         this.ws.send('StartCapture' + this.irisForm.eyeType)
       }
       this.ws.onmessage = function(receiveMsg) {
         console.log(receiveMsg)
 
-        _this.startBtnDisabeld = false
-        _this.stopBtnDisabeld = true
-        _this.eyeTypeDisabled = false
+        that.startBtnDisabeld = false
+        that.stopBtnDisabeld = true
+        that.eyeTypeDisabled = false
         if (receiveMsg.data === '设备启动失败') {
-          _this.$message.error(receiveMsg.data + '，请点击“开始采集”重试')
+          that.$message.error(receiveMsg.data + '，请点击“开始采集”重试')
         } else if (receiveMsg.data === '采集失败') {
-          _this.$message.error(receiveMsg.data)
+          that.$message.error(receiveMsg.data)
         } else if (receiveMsg.data === 'ICS错误') {
-          _this.$message.error(receiveMsg.data)
+          that.$message.error(receiveMsg.data)
         } else if (receiveMsg.data.indexOf('image') > -1) {
-          const 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
+          const imageData = receiveMsg.data.split(':')[0].replace('image', '')
+          const scoreData = receiveMsg.data.split(':')[1]
+
+          that.saveBtnDisabeld = false
+          if (that.irisForm.eyeType === '3') {
+            that.photoLeft = 'data:image/png;base64,' + imageData.split(';')[0]
+            that.photoRight = 'data:image/png;base64,' + imageData.split(';')[1]
+            that.scoreLeft = scoreData.split(';')[0]
+            that.scoreRight = scoreData.split(';')[1]
+          } else if (that.irisForm.eyeType === '2') {
+            that.photoLeft = 'data:image/png;base64,' + imageData
+            that.scoreLeft = scoreData
+          } else if (that.irisForm.eyeType === '1') {
+            that.photoRight = 'data:image/png;base64,' + imageData
+            that.scoreRight = scoreData
           }
         }
       }
@@ -172,6 +184,8 @@
       // 将虹膜照片数据发送到父组件
       this.$parent.personForm.irisData.leftImage = this.photoLeft
       this.$parent.personForm.irisData.rightImage = this.photoRight
+      this.$parent.personForm.irisData.leftIrisScore = this.scoreLeft
+      this.$parent.personForm.irisData.rightIrisScore = this.scoreRight
 
       this.$message.success('采集成功')
       this.edited = true

diff --git a/src/api/allDict.js b/src/api/allDict.js
index 389c2b2..c567eb2 100644
--- a/src/api/allDict.js
+++ b/src/api/allDict.js
@@ -28,6 +28,15 @@
   })
 }
 
+// 车辆类别
+export function getCarType(params) {
+  return request({
+    url: '/dict/code/carType',
+    method: 'get',
+    params
+  })
+}
+
 // 设备类型
 export function getDeviceType(params) {
   return request({
@@ -52,3 +61,11 @@
     method: 'get'
   })
 }
+
+// 进出园区
+export function getInOutType() {
+  return request({
+    url: '/dict/code/inOut',
+    method: 'get'
+  })
+}
diff --git a/src/api/car.js b/src/api/car.js
index cf638b5..fc55938 100644
--- a/src/api/car.js
+++ b/src/api/car.js
@@ -1,5 +1,5 @@
 import request from '@/utils/request'
-import qs from 'qs'
+// import qs from 'qs'
 
 // 分页查询车辆列表
 export function getCarList(params) {
diff --git a/src/api/device.js b/src/api/device.js
index b3a3f84..4cf4c36 100644
--- a/src/api/device.js
+++ b/src/api/device.js
@@ -2,7 +2,7 @@
  * 设备管理接口
  */
 import request from '@/utils/request'
-import qs from 'qs'
+// import qs from 'qs'
 
 // 分页查询设备列表
 export function getDeviceList(params) {
diff --git a/src/api/statistics.js b/src/api/statistics.js
new file mode 100644
index 0000000..44e089f
--- /dev/null
+++ b/src/api/statistics.js
@@ -0,0 +1,22 @@
+/**
+ * 数据查询接口
+ */
+import request from '@/utils/request'
+// import qs from 'qs'
+
+export function personInOutRecord(params) {
+  return request({
+    url: '/statistics/personListPage',
+    method: 'get',
+    params
+  })
+}
+
+export function carInOutRecord(params) {
+  return request({
+    url: '/statistics/carListPage',
+    method: 'get',
+    params
+  })
+}
+
diff --git a/src/api/visitor.js b/src/api/visitor.js
index 1535eed..121d5e2 100644
--- a/src/api/visitor.js
+++ b/src/api/visitor.js
@@ -1,5 +1,5 @@
 import request from '@/utils/request'
-import qs from 'qs'
+// import qs from 'qs'
 
 // 访客登记
 export function addVisitorPerson(data) {
diff --git a/src/assets/login_images/bg-blue.png b/src/assets/login_images/bg-blue.png
new file mode 100644
index 0000000..a408d14
--- /dev/null
+++ b/src/assets/login_images/bg-blue.png
Binary files differ
diff --git a/src/assets/login_images/bg1.png b/src/assets/login_images/bg1.png
new file mode 100644
index 0000000..390b452
--- /dev/null
+++ b/src/assets/login_images/bg1.png
Binary files differ
diff --git a/src/router/modules/doorSys.js b/src/router/modules/doorSys.js
index 605b851..64e8d5e 100644
--- a/src/router/modules/doorSys.js
+++ b/src/router/modules/doorSys.js
@@ -166,5 +166,32 @@
         meta: { title: '车辆登记', icon: '', permission: ['/area/defenceList'], keepAlive: true }
       }
     ]
+  },
+  {
+    path: '/statistics',
+    component: Layout,
+    redirect: '/statistics',
+    name: 'Statistics',
+    alwaysShow: true,
+    meta: {
+      title: '统计管理',
+      icon: 'icon-statistics', // 图标
+      permission: ['/statistics'], // 权限名称
+      sys: '/door'
+    },
+    children: [
+      {
+        path: '/statistics/inOutPerson',
+        name: 'InOutPerson',
+        component: () => import('@/views/statistics/inOutPerson'),
+        meta: { title: '人员进出记录', icon: '', permission: ['/statistics/inOutPerson'], keepAlive: true }
+      },
+      {
+        path: '/statistics/inOutCar',
+        name: 'InOutCar',
+        component: () => import('@/views/statistics/inOutCar'),
+        meta: { title: '车辆进出记录', icon: '', permission: ['/statistics/inOutCar'], keepAlive: true }
+      }
+    ]
   }
 ]
diff --git a/src/router/modules/system.js b/src/router/modules/system.js
index 05f97c3..2efd4c5 100644
--- a/src/router/modules/system.js
+++ b/src/router/modules/system.js
@@ -38,12 +38,6 @@
         meta: { title: '字典管理', icon: 'function', permission: ['/dict'] }
       },
       {
-        path: '/area',
-        name: 'Area',
-        component: () => import('@/views/system/area/listArea'),
-        meta: { title: '区域管理', icon: 'function', permission: ['/area'] }
-      },
-      {
         path: '/dept',
         name: 'Dept',
         component: () => import('@/views/system/dept/listDept'),
diff --git a/src/views/car/carList.vue b/src/views/car/carList.vue
index 89555ee..bf2bb70 100644
--- a/src/views/car/carList.vue
+++ b/src/views/car/carList.vue
@@ -40,7 +40,7 @@
       </el-row>
       <el-table v-loading="listLoading" :data="list" class="table" row-class-name="small-row-class" border @selection-change="handleSelectionChange">
         <!--拥有删除权限则显示复选框-->
-<!--        <el-table-column v-if="hasPerm('/staff/delete')" align="center" type="selection" width="55"/>-->
+        <!--        <el-table-column v-if="hasPerm('/staff/delete')" align="center" type="selection" width="55"/>-->
         <!--序号列-->
         <el-table-column :index="indexMethod" align="center" type="index" label="#" width="55"/>
         <!--内容列-->
diff --git a/src/views/dashboard/portal.vue b/src/views/dashboard/portal.vue
index b517742..4365c4b 100644
--- a/src/views/dashboard/portal.vue
+++ b/src/views/dashboard/portal.vue
@@ -46,7 +46,8 @@
     </div>
 
     <div class="welcome">
-      <img src="/static/images/dashboard/exit-logo.png" height="25px" @click="logout">
+      <img src="/static/images/dashboard/setting-logo.png" height="40px" style="margin-right: 20px;" @click="settingSystem">
+      <img src="/static/images/dashboard/exit-logo.png" height="40px" @click="logout">
     </div>
   </div>
 </template>
@@ -80,12 +81,28 @@
         console.log('获取子系统成功')
       })
     },
-    doorSubSystem: function() {
+    changeSubSystem(subSys) {
       this.$store.commit('SET_CHANGEFLAG', '1')
-      this.$store.commit('SET_SYSTEM', this.systems[1])
+      this.$store.commit('SET_SYSTEM', subSys)
       this.$store.dispatch('tagsView/delAllViews', true).then(({ visitedViews }) => {
-        this.$router.replace(this.systems[1].url)
+        this.$router.replace(subSys.url)
       })
+    },
+    settingSystem() {
+      const setting = this.systems.filter(subsys => {
+        return subsys.code === 'sys'
+      })
+      if (typeof setting !== 'undefined' && setting.length > 0) {
+        this.changeSubSystem(setting[0])
+      }
+    },
+    doorSubSystem() {
+      const door = this.systems.filter(subsys => {
+        return subsys.code === 'door'
+      })
+      if (typeof door !== 'undefined' && door.length > 0) {
+        this.changeSubSystem(door[0])
+      }
     }
   }
 }
@@ -147,11 +164,15 @@
   .welcome {
     position: absolute;
     right: 5vw;
-    bottom: 30px;
+    top: 30px;
     padding-left: 10px;
     cursor: pointer;
   }
 
+  .welcome img {
+    filter: drop-shadow(5px 5px 5px rgba(0, 0 , 0, 0.75));
+  }
+
   .title {
     position: absolute;
     top: 30px;
diff --git a/src/views/deviceManage/deviceDetail.vue b/src/views/deviceManage/deviceDetail.vue
index 9896899..81d1bba 100644
--- a/src/views/deviceManage/deviceDetail.vue
+++ b/src/views/deviceManage/deviceDetail.vue
@@ -122,7 +122,6 @@
       this.dialogFormVisible = dialogFormVisible
       this.resetForm()
       if (dialogStatus === 'detail') {
-
         this.isEditMode = false
 
         // 电子围栏设备有开启字段
diff --git a/src/views/layout/components/AppHeader.vue b/src/views/layout/components/AppHeader.vue
index 92cb5c5..d187aac 100644
--- a/src/views/layout/components/AppHeader.vue
+++ b/src/views/layout/components/AppHeader.vue
@@ -1,6 +1,6 @@
 <template>
   <div :style="{backgroundImage:'url('+headerUrl+')'}" class="app-header">
-    <h3>智慧城管平台</h3>
+    <h3>{{ title }}</h3>
     <!--子系统选项-->
     <el-dropdown class="systemSelect" @command="handleCommand">
       <span class="el-dropdown-link">{{ currentSystem.name }}<i class="el-icon-arrow-down el-icon--right"/>
@@ -12,15 +12,9 @@
     <el-dropdown class="avatar-container">
       <div class="avatar-wrapper">
         <span style="line-height:50px;">欢迎您，{{ name }}</span>
-        <!--<img :src="avatar+'?imageView2/1/w/80/h/80'" class="user-avatar">-->
         <i class="el-icon-caret-bottom"/>
       </div>
       <el-dropdown-menu slot="dropdown" class="user-dropdown">
-        <!--<router-link class="inlineBlock" to="/">-->
-        <!--<el-dropdown-item>-->
-        <!--主页-->
-        <!--</el-dropdown-item>-->
-        <!--</router-link>-->
         <el-dropdown-item>
           <span style="display:block;" @click="backToIndex">回首页</span>
         </el-dropdown-item>
@@ -39,6 +33,7 @@
 <script>
 import { mapGetters } from 'vuex'
 import ResetPwd from '../../system/user/resetPwd'
+import { getProject } from '@/utils/baseConfig'
 
 export default {
   name: 'AppHeader',
@@ -46,6 +41,13 @@
   data() {
     return {
       name: this.$store.getters.name,
+      title: getProject().title,
+      systems: [
+        { code: 'door', ismenu: '0', levels: 1, name: '营门管理子系统', resourceType: '02', url: '/door' },
+        { code: 'fence', ismenu: '0', levels: 1, name: '周界防卫子系统', resourceType: '02', url: '/fence' },
+        { code: 'region', ismenu: '0', levels: 1, name: '全域监控子系统', resourceType: '02', url: '/region' },
+        { code: 'key', ismenu: '0', levels: 1, name: '重点区域管控子系统', resourceType: '02', url: '/key' }
+      ],
       showSetPwd: false,
       headerUrl: require('../../../assets/global_images/header.png')// 头部图片
     }
@@ -57,10 +59,10 @@
     ]),
     currentSystem() {
       return this.$store.getters.currentSystem
-    },
-    systems() {
-      return this.$store.getters.systems
     }
+    // systems() {
+    //   return this.$store.getters.systems
+    // }
   },
   created() {
     this.getSystems()
diff --git a/src/views/staff/captureIris.vue b/src/views/staff/captureIris.vue
index e2c06dd..7183176 100644
--- a/src/views/staff/captureIris.vue
+++ b/src/views/staff/captureIris.vue
@@ -69,13 +69,17 @@
       dialogFormVisible: false, // 对话框是否显示
       photoLeft: '', // 图片路径
       photoRight: '',
+      scoreLeft: '0',
+      scoreRight: '0',
       defaultPhoto: require('@/assets/global_images/eye.png'), // 默认图片路径
       irisForm: {
         eyeType: '3',
         personId: '',
         idCard: '',
         image_zy: '',
-        image_yy: ''
+        image_yy: '',
+        score_zy: '0',
+        score_yy: '0'
       }, // 表单
       title: '' // 表头显示标题
     }
@@ -89,52 +93,60 @@
     WebSocketConnent() {
       this.photoLeft = ''
       this.photoRight = ''
-      const _this = this
-      this.ws = _this.$root.ws
+      this.scoreLeft = '0'
+      this.scoreRight = '0'
+      const that = this
+      this.ws = that.$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 = new WebSocket(that.$root.wsURL)
         // 注册各类回调
         this.ws.onopen = function() {
-          _this.$message.success('采集设备启动中...')
-          _this.ws.send('StartCapture' + _this.irisForm.eyeType)
+          that.$message.success('采集设备启动中...')
+          that.ws.send('StartCapture' + that.irisForm.eyeType)
         }
         this.ws.onclose = function() {
-          _this.$message.info('与ICS连接断开')
-          _this.$root.ws = null
+          that.$message.info('与ICS连接断开')
+          that.$root.ws = null
         }
         this.ws.onerror = function() {
-          _this.$message.error('与ICS通信发生错误')
+          that.$message.error('与ICS通信发生错误')
         }
-        _this.$root.ws = this.ws
+        that.$root.ws = this.ws
       } else {
         this.ws.send('StartCapture' + this.irisForm.eyeType)
       }
       this.ws.onmessage = function(receiveMsg) {
         console.log(receiveMsg)
 
-        _this.startBtnDisabeld = false
-        _this.stopBtnDisabeld = true
-        _this.eyeTypeDisabled = false
+        that.startBtnDisabeld = false
+        that.stopBtnDisabeld = true
+        that.eyeTypeDisabled = false
         if (receiveMsg.data === '设备启动失败') {
-          _this.$message.error(receiveMsg.data + '，请点击“开始采集”重试')
+          that.$message.error(receiveMsg.data + '，请点击“开始采集”重试')
         } else if (receiveMsg.data === '采集失败') {
-          _this.$message.error(receiveMsg.data)
+          that.$message.error(receiveMsg.data)
         } else if (receiveMsg.data === 'ICS错误') {
-          _this.$message.error(receiveMsg.data)
+          that.$message.error(receiveMsg.data)
         } else if (receiveMsg.data.indexOf('image') > -1) {
-          const 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
+          const imageData = receiveMsg.data.split(':')[0].replace('image', '')
+          const scoreData = receiveMsg.data.split(':')[1]
+
+          that.saveBtnDisabeld = false
+          if (that.irisForm.eyeType === '3') {
+            that.photoLeft = 'data:image/png;base64,' + imageData.split(';')[0]
+            that.photoRight = 'data:image/png;base64,' + imageData.split(';')[1]
+            that.scoreLeft = scoreData.split(';')[0]
+            that.scoreRight = scoreData.split(';')[1]
+          } else if (that.irisForm.eyeType === '2') {
+            that.photoLeft = 'data:image/png;base64,' + imageData
+            that.scoreLeft = scoreData
+          } else if (that.irisForm.eyeType === '1') {
+            that.photoRight = 'data:image/png;base64,' + imageData
+            that.scoreRight = scoreData
           }
         }
       }
@@ -172,6 +184,8 @@
       // 将虹膜照片数据发送到父组件
       this.$parent.personForm.irisData.leftImage = this.photoLeft
       this.$parent.personForm.irisData.rightImage = this.photoRight
+      this.$parent.personForm.irisData.leftIrisScore = this.scoreLeft
+      this.$parent.personForm.irisData.rightIrisScore = this.scoreRight
 
       this.$message.success('采集成功')
       this.edited = true
diff --git a/src/views/statistics/inOutCar.vue b/src/views/statistics/inOutCar.vue
new file mode 100644
index 0000000..fb3cb19
--- /dev/null
+++ b/src/views/statistics/inOutCar.vue
@@ -0,0 +1,240 @@
+<!--车辆进出列表-->
+<template>
+  <div class="app-container">
+    <!--筛选条件-->
+    <div class="search-div">
+      <div class="search-left">
+        <el-form ref="selectForm" :inline="true" :model="listQuery" class="form-container">
+          <el-row>
+            <el-col :span="4">
+              <el-form-item class="selectForm-container-item">
+                <el-input v-model.trim="listQuery.keywords" placeholder="车牌号" clearable />
+              </el-form-item>
+            </el-col>
+            <el-col :span="3">
+              <el-form-item class="selectForm-container-item">
+                <el-select v-model="listQuery.carType" placeholder="类别" clearable>
+                  <el-option v-for="item in carTypes" :key="item.value" :label="item.name" :value="item.value"/>
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="3">
+              <el-form-item class="selectForm-container-item">
+                <el-select v-model="listQuery.inOut" placeholder="进出园区" clearable>
+                  <el-option v-for="item in inOutTypes" :key="item.value" :label="item.name" :value="item.value"/>
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item class="selectForm-container-item">
+                <el-date-picker
+                  v-model="timeRange"
+                  type="daterange"
+                  range-separator="至"
+                  start-placeholder="开始日期"
+                  end-placeholder="结束日期" />
+              </el-form-item>
+            </el-col>
+
+            <el-col :span="4" class="search-right">
+              <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
+            </el-col>
+          </el-row>
+        </el-form>
+      </div>
+    </div>
+    <!--查询结果Table显示-->
+    <div>
+      <el-row class="table-title">
+        <el-col :span="6"><div class="title-header"><i class="el-icon-menu"/>数据列表</div></el-col>
+        <el-col :span="12" :offset="6" class="edit_btns">
+          <el-button class="edit_btn" size="small">导出</el-button>
+        </el-col>
+      </el-row>
+      <el-table v-loading="listLoading" :data="list" class="table" row-class-name="small-row-class" border>
+        <!--序号列-->
+        <el-table-column :index="indexMethod" align="center" type="index" label="#" width="55"/>
+        <!--内容列-->
+        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
+          <template slot-scope="scope">
+            <span v-if="column.value === 'idCard'">{{ encrypIdCardNo(scope.row[column.value]) }}</span>
+            <span v-else :class="column.class">{{ scope.row[column.value] }}</span>
+          </template>
+        </el-table-column>
+      </el-table>
+    </div>
+    <!--分页-->
+    <div class="pagination-container">
+      <el-pagination
+        v-show="total>listQuery.limit"
+        :current-page="listQuery.offset"
+        :page-sizes="[20,30,50]"
+        :page-size="listQuery.limit"
+        :total="total"
+        align="center"
+        layout="total, sizes, prev, pager, next"
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"/>
+    </div>
+  </div>
+</template>
+
+<script>
+import { formatToString } from '@/utils/calendarUtil'
+import { carInOutRecord } from '@/api/statistics'
+import { getCarType, getInOutType } from '@/api/allDict'
+
+export default {
+  name: 'InOutPerson',
+  data() {
+    return {
+      listQuery: {
+        keywords: '',
+        carType: '',
+        inOut: '',
+        beginTime: '',
+        endTime: '',
+        offset: 1,
+        limit: 20,
+        sort: '',
+        order: ''
+      }, // 筛选条件
+      columns: [
+        {
+          text: '车牌号',
+          value: 'plateNumber',
+          align: 'center'
+        },
+        {
+          text: '类别',
+          value: 'carTypeName',
+          align: 'center'
+        },
+        {
+          text: '进出园区',
+          value: 'inOutName',
+          align: 'center'
+        },
+        {
+          text: '通行时间',
+          value: 'logtime',
+          align: 'center'
+        }
+      ], // 显示列
+      list: [], // 列表数据
+      total: 0, // 数据总数
+      multipleSelection: [], // 多选选中项
+      carTypes: [],
+      inOutTypes: [],
+      timeRange: [],
+      listLoading: false, // 加载动画
+      fullscreenLoading: false, // 全屏加载动画
+      dialogFormVisible: false
+    }
+  },
+  watch: {
+    timeRange: function(newV) {
+      if (newV) {
+        this.listQuery.beginTime = formatToString(newV[0], 'DATE')
+        this.listQuery.endTime = formatToString(newV[1], 'DATE')
+      } else {
+        this.listQuery.beginTime = ''
+        this.listQuery.endTime = ''
+      }
+      this.fetchData()
+    }
+  },
+  created() {
+    this.fetchCarType()
+    this.fetchInOutType()
+    this.fetchData()// 获取数据
+  },
+  methods: {
+    // 身份证号加密显示
+    encrypIdCardNo(idCard) {
+      if (idCard.length > 6) {
+        return idCard.substr(0, 6) + '********' + idCard.substr(14)
+      } else if (idCard) {
+        return idCard
+      } else {
+        return ''
+      }
+    },
+    // 查询数据
+    search() {
+      this.fetchData(false)
+    },
+    fetchCarType() {
+      getCarType().then(response => {
+        this.carTypes = response.data
+      })
+    },
+    fetchInOutType() {
+      getInOutType().then(response => {
+        this.inOutTypes = response.data
+      })
+    },
+    // 获取列表
+    fetchData(isNowPage = true) {
+      this.listLoading = true
+      if (!isNowPage) { // 是否显示当前页，否则跳转第一页
+        this.listQuery.offset = 1
+      }
+      carInOutRecord(this.listQuery).then(response => {
+        if (response.code === 200) {
+          this.list = response.data.rows
+          this.total = parseInt(response.data.total)
+        } else {
+          this.$message.error(response.message)
+        }
+        this.listLoading = false
+      })
+    },
+    indexMethod(index) {
+      return this.listQuery.limit * (this.listQuery.offset - 1) + index + 1
+    },
+    // 改变页容量
+    handleSizeChange(val) {
+      this.listQuery.limit = val
+      this.fetchData()
+    },
+    // 改变当前页
+    handleCurrentChange(val) {
+      this.listQuery.offset = val
+      this.fetchData()
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  $tableTitleHeight:46px;
+  .app-container{
+    margin-bottom:20px
+  }
+  .table{
+    margin-bottom: 20px;
+  }
+  .pagination-container{
+    margin-bottom: 50px;
+  }
+  .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
+    }
+  }
+</style>

diff --git a/src/api/allDict.js b/src/api/allDict.js
index 389c2b2..c567eb2 100644
--- a/src/api/allDict.js
+++ b/src/api/allDict.js
@@ -28,6 +28,15 @@
   })
 }
 
+// 车辆类别
+export function getCarType(params) {
+  return request({
+    url: '/dict/code/carType',
+    method: 'get',
+    params
+  })
+}
+
 // 设备类型
 export function getDeviceType(params) {
   return request({
@@ -52,3 +61,11 @@
     method: 'get'
   })
 }
+
+// 进出园区
+export function getInOutType() {
+  return request({
+    url: '/dict/code/inOut',
+    method: 'get'
+  })
+}
diff --git a/src/api/car.js b/src/api/car.js
index cf638b5..fc55938 100644
--- a/src/api/car.js
+++ b/src/api/car.js
@@ -1,5 +1,5 @@
 import request from '@/utils/request'
-import qs from 'qs'
+// import qs from 'qs'
 
 // 分页查询车辆列表
 export function getCarList(params) {
diff --git a/src/api/device.js b/src/api/device.js
index b3a3f84..4cf4c36 100644
--- a/src/api/device.js
+++ b/src/api/device.js
@@ -2,7 +2,7 @@
  * 设备管理接口
  */
 import request from '@/utils/request'
-import qs from 'qs'
+// import qs from 'qs'
 
 // 分页查询设备列表
 export function getDeviceList(params) {
diff --git a/src/api/statistics.js b/src/api/statistics.js
new file mode 100644
index 0000000..44e089f
--- /dev/null
+++ b/src/api/statistics.js
@@ -0,0 +1,22 @@
+/**
+ * 数据查询接口
+ */
+import request from '@/utils/request'
+// import qs from 'qs'
+
+export function personInOutRecord(params) {
+  return request({
+    url: '/statistics/personListPage',
+    method: 'get',
+    params
+  })
+}
+
+export function carInOutRecord(params) {
+  return request({
+    url: '/statistics/carListPage',
+    method: 'get',
+    params
+  })
+}
+
diff --git a/src/api/visitor.js b/src/api/visitor.js
index 1535eed..121d5e2 100644
--- a/src/api/visitor.js
+++ b/src/api/visitor.js
@@ -1,5 +1,5 @@
 import request from '@/utils/request'
-import qs from 'qs'
+// import qs from 'qs'
 
 // 访客登记
 export function addVisitorPerson(data) {
diff --git a/src/assets/login_images/bg-blue.png b/src/assets/login_images/bg-blue.png
new file mode 100644
index 0000000..a408d14
--- /dev/null
+++ b/src/assets/login_images/bg-blue.png
Binary files differ
diff --git a/src/assets/login_images/bg1.png b/src/assets/login_images/bg1.png
new file mode 100644
index 0000000..390b452
--- /dev/null
+++ b/src/assets/login_images/bg1.png
Binary files differ
diff --git a/src/router/modules/doorSys.js b/src/router/modules/doorSys.js
index 605b851..64e8d5e 100644
--- a/src/router/modules/doorSys.js
+++ b/src/router/modules/doorSys.js
@@ -166,5 +166,32 @@
         meta: { title: '车辆登记', icon: '', permission: ['/area/defenceList'], keepAlive: true }
       }
     ]
+  },
+  {
+    path: '/statistics',
+    component: Layout,
+    redirect: '/statistics',
+    name: 'Statistics',
+    alwaysShow: true,
+    meta: {
+      title: '统计管理',
+      icon: 'icon-statistics', // 图标
+      permission: ['/statistics'], // 权限名称
+      sys: '/door'
+    },
+    children: [
+      {
+        path: '/statistics/inOutPerson',
+        name: 'InOutPerson',
+        component: () => import('@/views/statistics/inOutPerson'),
+        meta: { title: '人员进出记录', icon: '', permission: ['/statistics/inOutPerson'], keepAlive: true }
+      },
+      {
+        path: '/statistics/inOutCar',
+        name: 'InOutCar',
+        component: () => import('@/views/statistics/inOutCar'),
+        meta: { title: '车辆进出记录', icon: '', permission: ['/statistics/inOutCar'], keepAlive: true }
+      }
+    ]
   }
 ]
diff --git a/src/router/modules/system.js b/src/router/modules/system.js
index 05f97c3..2efd4c5 100644
--- a/src/router/modules/system.js
+++ b/src/router/modules/system.js
@@ -38,12 +38,6 @@
         meta: { title: '字典管理', icon: 'function', permission: ['/dict'] }
       },
       {
-        path: '/area',
-        name: 'Area',
-        component: () => import('@/views/system/area/listArea'),
-        meta: { title: '区域管理', icon: 'function', permission: ['/area'] }
-      },
-      {
         path: '/dept',
         name: 'Dept',
         component: () => import('@/views/system/dept/listDept'),
diff --git a/src/views/car/carList.vue b/src/views/car/carList.vue
index 89555ee..bf2bb70 100644
--- a/src/views/car/carList.vue
+++ b/src/views/car/carList.vue
@@ -40,7 +40,7 @@
       </el-row>
       <el-table v-loading="listLoading" :data="list" class="table" row-class-name="small-row-class" border @selection-change="handleSelectionChange">
         <!--拥有删除权限则显示复选框-->
-<!--        <el-table-column v-if="hasPerm('/staff/delete')" align="center" type="selection" width="55"/>-->
+        <!--        <el-table-column v-if="hasPerm('/staff/delete')" align="center" type="selection" width="55"/>-->
         <!--序号列-->
         <el-table-column :index="indexMethod" align="center" type="index" label="#" width="55"/>
         <!--内容列-->
diff --git a/src/views/dashboard/portal.vue b/src/views/dashboard/portal.vue
index b517742..4365c4b 100644
--- a/src/views/dashboard/portal.vue
+++ b/src/views/dashboard/portal.vue
@@ -46,7 +46,8 @@
     </div>
 
     <div class="welcome">
-      <img src="/static/images/dashboard/exit-logo.png" height="25px" @click="logout">
+      <img src="/static/images/dashboard/setting-logo.png" height="40px" style="margin-right: 20px;" @click="settingSystem">
+      <img src="/static/images/dashboard/exit-logo.png" height="40px" @click="logout">
     </div>
   </div>
 </template>
@@ -80,12 +81,28 @@
         console.log('获取子系统成功')
       })
     },
-    doorSubSystem: function() {
+    changeSubSystem(subSys) {
       this.$store.commit('SET_CHANGEFLAG', '1')
-      this.$store.commit('SET_SYSTEM', this.systems[1])
+      this.$store.commit('SET_SYSTEM', subSys)
       this.$store.dispatch('tagsView/delAllViews', true).then(({ visitedViews }) => {
-        this.$router.replace(this.systems[1].url)
+        this.$router.replace(subSys.url)
       })
+    },
+    settingSystem() {
+      const setting = this.systems.filter(subsys => {
+        return subsys.code === 'sys'
+      })
+      if (typeof setting !== 'undefined' && setting.length > 0) {
+        this.changeSubSystem(setting[0])
+      }
+    },
+    doorSubSystem() {
+      const door = this.systems.filter(subsys => {
+        return subsys.code === 'door'
+      })
+      if (typeof door !== 'undefined' && door.length > 0) {
+        this.changeSubSystem(door[0])
+      }
     }
   }
 }
@@ -147,11 +164,15 @@
   .welcome {
     position: absolute;
     right: 5vw;
-    bottom: 30px;
+    top: 30px;
     padding-left: 10px;
     cursor: pointer;
   }
 
+  .welcome img {
+    filter: drop-shadow(5px 5px 5px rgba(0, 0 , 0, 0.75));
+  }
+
   .title {
     position: absolute;
     top: 30px;
diff --git a/src/views/deviceManage/deviceDetail.vue b/src/views/deviceManage/deviceDetail.vue
index 9896899..81d1bba 100644
--- a/src/views/deviceManage/deviceDetail.vue
+++ b/src/views/deviceManage/deviceDetail.vue
@@ -122,7 +122,6 @@
       this.dialogFormVisible = dialogFormVisible
       this.resetForm()
       if (dialogStatus === 'detail') {
-
         this.isEditMode = false
 
         // 电子围栏设备有开启字段
diff --git a/src/views/layout/components/AppHeader.vue b/src/views/layout/components/AppHeader.vue
index 92cb5c5..d187aac 100644
--- a/src/views/layout/components/AppHeader.vue
+++ b/src/views/layout/components/AppHeader.vue
@@ -1,6 +1,6 @@
 <template>
   <div :style="{backgroundImage:'url('+headerUrl+')'}" class="app-header">
-    <h3>智慧城管平台</h3>
+    <h3>{{ title }}</h3>
     <!--子系统选项-->
     <el-dropdown class="systemSelect" @command="handleCommand">
       <span class="el-dropdown-link">{{ currentSystem.name }}<i class="el-icon-arrow-down el-icon--right"/>
@@ -12,15 +12,9 @@
     <el-dropdown class="avatar-container">
       <div class="avatar-wrapper">
         <span style="line-height:50px;">欢迎您，{{ name }}</span>
-        <!--<img :src="avatar+'?imageView2/1/w/80/h/80'" class="user-avatar">-->
         <i class="el-icon-caret-bottom"/>
       </div>
       <el-dropdown-menu slot="dropdown" class="user-dropdown">
-        <!--<router-link class="inlineBlock" to="/">-->
-        <!--<el-dropdown-item>-->
-        <!--主页-->
-        <!--</el-dropdown-item>-->
-        <!--</router-link>-->
         <el-dropdown-item>
           <span style="display:block;" @click="backToIndex">回首页</span>
         </el-dropdown-item>
@@ -39,6 +33,7 @@
 <script>
 import { mapGetters } from 'vuex'
 import ResetPwd from '../../system/user/resetPwd'
+import { getProject } from '@/utils/baseConfig'
 
 export default {
   name: 'AppHeader',
@@ -46,6 +41,13 @@
   data() {
     return {
       name: this.$store.getters.name,
+      title: getProject().title,
+      systems: [
+        { code: 'door', ismenu: '0', levels: 1, name: '营门管理子系统', resourceType: '02', url: '/door' },
+        { code: 'fence', ismenu: '0', levels: 1, name: '周界防卫子系统', resourceType: '02', url: '/fence' },
+        { code: 'region', ismenu: '0', levels: 1, name: '全域监控子系统', resourceType: '02', url: '/region' },
+        { code: 'key', ismenu: '0', levels: 1, name: '重点区域管控子系统', resourceType: '02', url: '/key' }
+      ],
       showSetPwd: false,
       headerUrl: require('../../../assets/global_images/header.png')// 头部图片
     }
@@ -57,10 +59,10 @@
     ]),
     currentSystem() {
       return this.$store.getters.currentSystem
-    },
-    systems() {
-      return this.$store.getters.systems
     }
+    // systems() {
+    //   return this.$store.getters.systems
+    // }
   },
   created() {
     this.getSystems()
diff --git a/src/views/staff/captureIris.vue b/src/views/staff/captureIris.vue
index e2c06dd..7183176 100644
--- a/src/views/staff/captureIris.vue
+++ b/src/views/staff/captureIris.vue
@@ -69,13 +69,17 @@
       dialogFormVisible: false, // 对话框是否显示
       photoLeft: '', // 图片路径
       photoRight: '',
+      scoreLeft: '0',
+      scoreRight: '0',
       defaultPhoto: require('@/assets/global_images/eye.png'), // 默认图片路径
       irisForm: {
         eyeType: '3',
         personId: '',
         idCard: '',
         image_zy: '',
-        image_yy: ''
+        image_yy: '',
+        score_zy: '0',
+        score_yy: '0'
       }, // 表单
       title: '' // 表头显示标题
     }
@@ -89,52 +93,60 @@
     WebSocketConnent() {
       this.photoLeft = ''
       this.photoRight = ''
-      const _this = this
-      this.ws = _this.$root.ws
+      this.scoreLeft = '0'
+      this.scoreRight = '0'
+      const that = this
+      this.ws = that.$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 = new WebSocket(that.$root.wsURL)
         // 注册各类回调
         this.ws.onopen = function() {
-          _this.$message.success('采集设备启动中...')
-          _this.ws.send('StartCapture' + _this.irisForm.eyeType)
+          that.$message.success('采集设备启动中...')
+          that.ws.send('StartCapture' + that.irisForm.eyeType)
         }
         this.ws.onclose = function() {
-          _this.$message.info('与ICS连接断开')
-          _this.$root.ws = null
+          that.$message.info('与ICS连接断开')
+          that.$root.ws = null
         }
         this.ws.onerror = function() {
-          _this.$message.error('与ICS通信发生错误')
+          that.$message.error('与ICS通信发生错误')
         }
-        _this.$root.ws = this.ws
+        that.$root.ws = this.ws
       } else {
         this.ws.send('StartCapture' + this.irisForm.eyeType)
       }
       this.ws.onmessage = function(receiveMsg) {
         console.log(receiveMsg)
 
-        _this.startBtnDisabeld = false
-        _this.stopBtnDisabeld = true
-        _this.eyeTypeDisabled = false
+        that.startBtnDisabeld = false
+        that.stopBtnDisabeld = true
+        that.eyeTypeDisabled = false
         if (receiveMsg.data === '设备启动失败') {
-          _this.$message.error(receiveMsg.data + '，请点击“开始采集”重试')
+          that.$message.error(receiveMsg.data + '，请点击“开始采集”重试')
         } else if (receiveMsg.data === '采集失败') {
-          _this.$message.error(receiveMsg.data)
+          that.$message.error(receiveMsg.data)
         } else if (receiveMsg.data === 'ICS错误') {
-          _this.$message.error(receiveMsg.data)
+          that.$message.error(receiveMsg.data)
         } else if (receiveMsg.data.indexOf('image') > -1) {
-          const 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
+          const imageData = receiveMsg.data.split(':')[0].replace('image', '')
+          const scoreData = receiveMsg.data.split(':')[1]
+
+          that.saveBtnDisabeld = false
+          if (that.irisForm.eyeType === '3') {
+            that.photoLeft = 'data:image/png;base64,' + imageData.split(';')[0]
+            that.photoRight = 'data:image/png;base64,' + imageData.split(';')[1]
+            that.scoreLeft = scoreData.split(';')[0]
+            that.scoreRight = scoreData.split(';')[1]
+          } else if (that.irisForm.eyeType === '2') {
+            that.photoLeft = 'data:image/png;base64,' + imageData
+            that.scoreLeft = scoreData
+          } else if (that.irisForm.eyeType === '1') {
+            that.photoRight = 'data:image/png;base64,' + imageData
+            that.scoreRight = scoreData
           }
         }
       }
@@ -172,6 +184,8 @@
       // 将虹膜照片数据发送到父组件
       this.$parent.personForm.irisData.leftImage = this.photoLeft
       this.$parent.personForm.irisData.rightImage = this.photoRight
+      this.$parent.personForm.irisData.leftIrisScore = this.scoreLeft
+      this.$parent.personForm.irisData.rightIrisScore = this.scoreRight
 
       this.$message.success('采集成功')
       this.edited = true
diff --git a/src/views/statistics/inOutCar.vue b/src/views/statistics/inOutCar.vue
new file mode 100644
index 0000000..fb3cb19
--- /dev/null
+++ b/src/views/statistics/inOutCar.vue
@@ -0,0 +1,240 @@
+<!--车辆进出列表-->
+<template>
+  <div class="app-container">
+    <!--筛选条件-->
+    <div class="search-div">
+      <div class="search-left">
+        <el-form ref="selectForm" :inline="true" :model="listQuery" class="form-container">
+          <el-row>
+            <el-col :span="4">
+              <el-form-item class="selectForm-container-item">
+                <el-input v-model.trim="listQuery.keywords" placeholder="车牌号" clearable />
+              </el-form-item>
+            </el-col>
+            <el-col :span="3">
+              <el-form-item class="selectForm-container-item">
+                <el-select v-model="listQuery.carType" placeholder="类别" clearable>
+                  <el-option v-for="item in carTypes" :key="item.value" :label="item.name" :value="item.value"/>
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="3">
+              <el-form-item class="selectForm-container-item">
+                <el-select v-model="listQuery.inOut" placeholder="进出园区" clearable>
+                  <el-option v-for="item in inOutTypes" :key="item.value" :label="item.name" :value="item.value"/>
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item class="selectForm-container-item">
+                <el-date-picker
+                  v-model="timeRange"
+                  type="daterange"
+                  range-separator="至"
+                  start-placeholder="开始日期"
+                  end-placeholder="结束日期" />
+              </el-form-item>
+            </el-col>
+
+            <el-col :span="4" class="search-right">
+              <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
+            </el-col>
+          </el-row>
+        </el-form>
+      </div>
+    </div>
+    <!--查询结果Table显示-->
+    <div>
+      <el-row class="table-title">
+        <el-col :span="6"><div class="title-header"><i class="el-icon-menu"/>数据列表</div></el-col>
+        <el-col :span="12" :offset="6" class="edit_btns">
+          <el-button class="edit_btn" size="small">导出</el-button>
+        </el-col>
+      </el-row>
+      <el-table v-loading="listLoading" :data="list" class="table" row-class-name="small-row-class" border>
+        <!--序号列-->
+        <el-table-column :index="indexMethod" align="center" type="index" label="#" width="55"/>
+        <!--内容列-->
+        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
+          <template slot-scope="scope">
+            <span v-if="column.value === 'idCard'">{{ encrypIdCardNo(scope.row[column.value]) }}</span>
+            <span v-else :class="column.class">{{ scope.row[column.value] }}</span>
+          </template>
+        </el-table-column>
+      </el-table>
+    </div>
+    <!--分页-->
+    <div class="pagination-container">
+      <el-pagination
+        v-show="total>listQuery.limit"
+        :current-page="listQuery.offset"
+        :page-sizes="[20,30,50]"
+        :page-size="listQuery.limit"
+        :total="total"
+        align="center"
+        layout="total, sizes, prev, pager, next"
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"/>
+    </div>
+  </div>
+</template>
+
+<script>
+import { formatToString } from '@/utils/calendarUtil'
+import { carInOutRecord } from '@/api/statistics'
+import { getCarType, getInOutType } from '@/api/allDict'
+
+export default {
+  name: 'InOutPerson',
+  data() {
+    return {
+      listQuery: {
+        keywords: '',
+        carType: '',
+        inOut: '',
+        beginTime: '',
+        endTime: '',
+        offset: 1,
+        limit: 20,
+        sort: '',
+        order: ''
+      }, // 筛选条件
+      columns: [
+        {
+          text: '车牌号',
+          value: 'plateNumber',
+          align: 'center'
+        },
+        {
+          text: '类别',
+          value: 'carTypeName',
+          align: 'center'
+        },
+        {
+          text: '进出园区',
+          value: 'inOutName',
+          align: 'center'
+        },
+        {
+          text: '通行时间',
+          value: 'logtime',
+          align: 'center'
+        }
+      ], // 显示列
+      list: [], // 列表数据
+      total: 0, // 数据总数
+      multipleSelection: [], // 多选选中项
+      carTypes: [],
+      inOutTypes: [],
+      timeRange: [],
+      listLoading: false, // 加载动画
+      fullscreenLoading: false, // 全屏加载动画
+      dialogFormVisible: false
+    }
+  },
+  watch: {
+    timeRange: function(newV) {
+      if (newV) {
+        this.listQuery.beginTime = formatToString(newV[0], 'DATE')
+        this.listQuery.endTime = formatToString(newV[1], 'DATE')
+      } else {
+        this.listQuery.beginTime = ''
+        this.listQuery.endTime = ''
+      }
+      this.fetchData()
+    }
+  },
+  created() {
+    this.fetchCarType()
+    this.fetchInOutType()
+    this.fetchData()// 获取数据
+  },
+  methods: {
+    // 身份证号加密显示
+    encrypIdCardNo(idCard) {
+      if (idCard.length > 6) {
+        return idCard.substr(0, 6) + '********' + idCard.substr(14)
+      } else if (idCard) {
+        return idCard
+      } else {
+        return ''
+      }
+    },
+    // 查询数据
+    search() {
+      this.fetchData(false)
+    },
+    fetchCarType() {
+      getCarType().then(response => {
+        this.carTypes = response.data
+      })
+    },
+    fetchInOutType() {
+      getInOutType().then(response => {
+        this.inOutTypes = response.data
+      })
+    },
+    // 获取列表
+    fetchData(isNowPage = true) {
+      this.listLoading = true
+      if (!isNowPage) { // 是否显示当前页，否则跳转第一页
+        this.listQuery.offset = 1
+      }
+      carInOutRecord(this.listQuery).then(response => {
+        if (response.code === 200) {
+          this.list = response.data.rows
+          this.total = parseInt(response.data.total)
+        } else {
+          this.$message.error(response.message)
+        }
+        this.listLoading = false
+      })
+    },
+    indexMethod(index) {
+      return this.listQuery.limit * (this.listQuery.offset - 1) + index + 1
+    },
+    // 改变页容量
+    handleSizeChange(val) {
+      this.listQuery.limit = val
+      this.fetchData()
+    },
+    // 改变当前页
+    handleCurrentChange(val) {
+      this.listQuery.offset = val
+      this.fetchData()
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  $tableTitleHeight:46px;
+  .app-container{
+    margin-bottom:20px
+  }
+  .table{
+    margin-bottom: 20px;
+  }
+  .pagination-container{
+    margin-bottom: 50px;
+  }
+  .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
+    }
+  }
+</style>
diff --git a/src/views/statistics/inOutPerson.vue b/src/views/statistics/inOutPerson.vue
new file mode 100644
index 0000000..4d466d9
--- /dev/null
+++ b/src/views/statistics/inOutPerson.vue
@@ -0,0 +1,245 @@
+<!--人员进出列表-->
+<template>
+  <div class="app-container">
+    <!--筛选条件-->
+    <div class="search-div">
+      <div class="search-left">
+        <el-form ref="selectForm" :inline="true" :model="listQuery" class="form-container">
+          <el-row>
+            <el-col :span="4">
+              <el-form-item class="selectForm-container-item">
+                <el-input v-model.trim="listQuery.keywords" placeholder="姓名/身份证号" clearable />
+              </el-form-item>
+            </el-col>
+            <el-col :span="3">
+              <el-form-item class="selectForm-container-item">
+                <el-select v-model="listQuery.personType" placeholder="类别" clearable>
+                  <el-option v-for="item in personTypes" :key="item.value" :label="item.name" :value="item.value"/>
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="3">
+              <el-form-item class="selectForm-container-item">
+                <el-select v-model="listQuery.inOut" placeholder="进出园区" clearable>
+                  <el-option v-for="item in inOutTypes" :key="item.value" :label="item.name" :value="item.value"/>
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item class="selectForm-container-item">
+                <el-date-picker
+                  v-model="timeRange"
+                  type="daterange"
+                  range-separator="至"
+                  start-placeholder="开始日期"
+                  end-placeholder="结束日期" />
+              </el-form-item>
+            </el-col>
+
+            <el-col :span="4" class="search-right">
+              <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
+            </el-col>
+          </el-row>
+        </el-form>
+      </div>
+    </div>
+    <!--查询结果Table显示-->
+    <div>
+      <el-row class="table-title">
+        <el-col :span="6"><div class="title-header"><i class="el-icon-menu"/>数据列表</div></el-col>
+        <el-col :span="12" :offset="6" class="edit_btns">
+          <el-button class="edit_btn" size="small">导出</el-button>
+        </el-col>
+      </el-row>
+      <el-table v-loading="listLoading" :data="list" class="table" row-class-name="small-row-class" border>
+        <!--序号列-->
+        <el-table-column :index="indexMethod" align="center" type="index" label="#" width="55"/>
+        <!--内容列-->
+        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
+          <template slot-scope="scope">
+            <span v-if="column.value === 'idCard'">{{ encrypIdCardNo(scope.row[column.value]) }}</span>
+            <span v-else :class="column.class">{{ scope.row[column.value] }}</span>
+          </template>
+        </el-table-column>
+      </el-table>
+    </div>
+    <!--分页-->
+    <div class="pagination-container">
+      <el-pagination
+        v-show="total>listQuery.limit"
+        :current-page="listQuery.offset"
+        :page-sizes="[20,30,50]"
+        :page-size="listQuery.limit"
+        :total="total"
+        align="center"
+        layout="total, sizes, prev, pager, next"
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"/>
+    </div>
+  </div>
+</template>
+
+<script>
+import { formatToString } from '@/utils/calendarUtil'
+import { personInOutRecord } from '@/api/statistics'
+import { getPersonType, getInOutType } from '@/api/allDict'
+
+export default {
+  name: 'InOutPerson',
+  data() {
+    return {
+      listQuery: {
+        keywords: '',
+        personType: '',
+        inOut: '',
+        beginTime: '',
+        endTime: '',
+        offset: 1,
+        limit: 20,
+        sort: '',
+        order: ''
+      }, // 筛选条件
+      columns: [
+        {
+          text: '姓名',
+          value: 'name',
+          align: 'center'
+        },
+        {
+          text: '身份证号',
+          value: 'idCard',
+          align: 'center'
+        },
+        {
+          text: '类别',
+          value: 'personTypeName',
+          align: 'center'
+        },
+        {
+          text: '进出园区',
+          value: 'inOutName',
+          align: 'center'
+        },
+        {
+          text: '通行时间',
+          value: 'logtime',
+          align: 'center'
+        }
+      ], // 显示列
+      list: [], // 列表数据
+      total: 0, // 数据总数
+      multipleSelection: [], // 多选选中项
+      personTypes: [],
+      inOutTypes: [],
+      timeRange: [],
+      listLoading: false, // 加载动画
+      fullscreenLoading: false, // 全屏加载动画
+      dialogFormVisible: false
+    }
+  },
+  watch: {
+    timeRange: function(newV) {
+      if (newV) {
+        this.listQuery.beginTime = formatToString(newV[0], 'DATE')
+        this.listQuery.endTime = formatToString(newV[1], 'DATE')
+      } else {
+        this.listQuery.beginTime = ''
+        this.listQuery.endTime = ''
+      }
+      this.fetchData()
+    }
+  },
+  created() {
+    this.fetchPersonType()
+    this.fetchInOutType()
+    this.fetchData()// 获取数据
+  },
+  methods: {
+    // 身份证号加密显示
+    encrypIdCardNo(idCard) {
+      if (idCard.length > 6) {
+        return idCard.substr(0, 6) + '********' + idCard.substr(14)
+      } else if (idCard) {
+        return idCard
+      } else {
+        return ''
+      }
+    },
+    // 查询数据
+    search() {
+      this.fetchData(false)
+    },
+    fetchPersonType() {
+      getPersonType().then(response => {
+        this.personTypes = response.data
+      })
+    },
+    fetchInOutType() {
+      getInOutType().then(response => {
+        this.inOutTypes = response.data
+      })
+    },
+    // 获取列表
+    fetchData(isNowPage = true) {
+      this.listLoading = true
+      if (!isNowPage) { // 是否显示当前页，否则跳转第一页
+        this.listQuery.offset = 1
+      }
+      personInOutRecord(this.listQuery).then(response => {
+        if (response.code === 200) {
+          this.list = response.data.rows
+          this.total = parseInt(response.data.total)
+        } else {
+          this.$message.error(response.message)
+        }
+        this.listLoading = false
+      })
+    },
+    indexMethod(index) {
+      return this.listQuery.limit * (this.listQuery.offset - 1) + index + 1
+    },
+    // 改变页容量
+    handleSizeChange(val) {
+      this.listQuery.limit = val
+      this.fetchData()
+    },
+    // 改变当前页
+    handleCurrentChange(val) {
+      this.listQuery.offset = val
+      this.fetchData()
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  $tableTitleHeight:46px;
+  .app-container{
+    margin-bottom:20px
+  }
+  .table{
+    margin-bottom: 20px;
+  }
+  .pagination-container{
+    margin-bottom: 50px;
+  }
+  .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
+    }
+  }
+</style>

diff --git a/src/api/allDict.js b/src/api/allDict.js
index 389c2b2..c567eb2 100644
--- a/src/api/allDict.js
+++ b/src/api/allDict.js
@@ -28,6 +28,15 @@
   })
 }
 
+// 车辆类别
+export function getCarType(params) {
+  return request({
+    url: '/dict/code/carType',
+    method: 'get',
+    params
+  })
+}
+
 // 设备类型
 export function getDeviceType(params) {
   return request({
@@ -52,3 +61,11 @@
     method: 'get'
   })
 }
+
+// 进出园区
+export function getInOutType() {
+  return request({
+    url: '/dict/code/inOut',
+    method: 'get'
+  })
+}
diff --git a/src/api/car.js b/src/api/car.js
index cf638b5..fc55938 100644
--- a/src/api/car.js
+++ b/src/api/car.js
@@ -1,5 +1,5 @@
 import request from '@/utils/request'
-import qs from 'qs'
+// import qs from 'qs'
 
 // 分页查询车辆列表
 export function getCarList(params) {
diff --git a/src/api/device.js b/src/api/device.js
index b3a3f84..4cf4c36 100644
--- a/src/api/device.js
+++ b/src/api/device.js
@@ -2,7 +2,7 @@
  * 设备管理接口
  */
 import request from '@/utils/request'
-import qs from 'qs'
+// import qs from 'qs'
 
 // 分页查询设备列表
 export function getDeviceList(params) {
diff --git a/src/api/statistics.js b/src/api/statistics.js
new file mode 100644
index 0000000..44e089f
--- /dev/null
+++ b/src/api/statistics.js
@@ -0,0 +1,22 @@
+/**
+ * 数据查询接口
+ */
+import request from '@/utils/request'
+// import qs from 'qs'
+
+export function personInOutRecord(params) {
+  return request({
+    url: '/statistics/personListPage',
+    method: 'get',
+    params
+  })
+}
+
+export function carInOutRecord(params) {
+  return request({
+    url: '/statistics/carListPage',
+    method: 'get',
+    params
+  })
+}
+
diff --git a/src/api/visitor.js b/src/api/visitor.js
index 1535eed..121d5e2 100644
--- a/src/api/visitor.js
+++ b/src/api/visitor.js
@@ -1,5 +1,5 @@
 import request from '@/utils/request'
-import qs from 'qs'
+// import qs from 'qs'
 
 // 访客登记
 export function addVisitorPerson(data) {
diff --git a/src/assets/login_images/bg-blue.png b/src/assets/login_images/bg-blue.png
new file mode 100644
index 0000000..a408d14
--- /dev/null
+++ b/src/assets/login_images/bg-blue.png
Binary files differ
diff --git a/src/assets/login_images/bg1.png b/src/assets/login_images/bg1.png
new file mode 100644
index 0000000..390b452
--- /dev/null
+++ b/src/assets/login_images/bg1.png
Binary files differ
diff --git a/src/router/modules/doorSys.js b/src/router/modules/doorSys.js
index 605b851..64e8d5e 100644
--- a/src/router/modules/doorSys.js
+++ b/src/router/modules/doorSys.js
@@ -166,5 +166,32 @@
         meta: { title: '车辆登记', icon: '', permission: ['/area/defenceList'], keepAlive: true }
       }
     ]
+  },
+  {
+    path: '/statistics',
+    component: Layout,
+    redirect: '/statistics',
+    name: 'Statistics',
+    alwaysShow: true,
+    meta: {
+      title: '统计管理',
+      icon: 'icon-statistics', // 图标
+      permission: ['/statistics'], // 权限名称
+      sys: '/door'
+    },
+    children: [
+      {
+        path: '/statistics/inOutPerson',
+        name: 'InOutPerson',
+        component: () => import('@/views/statistics/inOutPerson'),
+        meta: { title: '人员进出记录', icon: '', permission: ['/statistics/inOutPerson'], keepAlive: true }
+      },
+      {
+        path: '/statistics/inOutCar',
+        name: 'InOutCar',
+        component: () => import('@/views/statistics/inOutCar'),
+        meta: { title: '车辆进出记录', icon: '', permission: ['/statistics/inOutCar'], keepAlive: true }
+      }
+    ]
   }
 ]
diff --git a/src/router/modules/system.js b/src/router/modules/system.js
index 05f97c3..2efd4c5 100644
--- a/src/router/modules/system.js
+++ b/src/router/modules/system.js
@@ -38,12 +38,6 @@
         meta: { title: '字典管理', icon: 'function', permission: ['/dict'] }
       },
       {
-        path: '/area',
-        name: 'Area',
-        component: () => import('@/views/system/area/listArea'),
-        meta: { title: '区域管理', icon: 'function', permission: ['/area'] }
-      },
-      {
         path: '/dept',
         name: 'Dept',
         component: () => import('@/views/system/dept/listDept'),
diff --git a/src/views/car/carList.vue b/src/views/car/carList.vue
index 89555ee..bf2bb70 100644
--- a/src/views/car/carList.vue
+++ b/src/views/car/carList.vue
@@ -40,7 +40,7 @@
       </el-row>
       <el-table v-loading="listLoading" :data="list" class="table" row-class-name="small-row-class" border @selection-change="handleSelectionChange">
         <!--拥有删除权限则显示复选框-->
-<!--        <el-table-column v-if="hasPerm('/staff/delete')" align="center" type="selection" width="55"/>-->
+        <!--        <el-table-column v-if="hasPerm('/staff/delete')" align="center" type="selection" width="55"/>-->
         <!--序号列-->
         <el-table-column :index="indexMethod" align="center" type="index" label="#" width="55"/>
         <!--内容列-->
diff --git a/src/views/dashboard/portal.vue b/src/views/dashboard/portal.vue
index b517742..4365c4b 100644
--- a/src/views/dashboard/portal.vue
+++ b/src/views/dashboard/portal.vue
@@ -46,7 +46,8 @@
     </div>
 
     <div class="welcome">
-      <img src="/static/images/dashboard/exit-logo.png" height="25px" @click="logout">
+      <img src="/static/images/dashboard/setting-logo.png" height="40px" style="margin-right: 20px;" @click="settingSystem">
+      <img src="/static/images/dashboard/exit-logo.png" height="40px" @click="logout">
     </div>
   </div>
 </template>
@@ -80,12 +81,28 @@
         console.log('获取子系统成功')
       })
     },
-    doorSubSystem: function() {
+    changeSubSystem(subSys) {
       this.$store.commit('SET_CHANGEFLAG', '1')
-      this.$store.commit('SET_SYSTEM', this.systems[1])
+      this.$store.commit('SET_SYSTEM', subSys)
       this.$store.dispatch('tagsView/delAllViews', true).then(({ visitedViews }) => {
-        this.$router.replace(this.systems[1].url)
+        this.$router.replace(subSys.url)
       })
+    },
+    settingSystem() {
+      const setting = this.systems.filter(subsys => {
+        return subsys.code === 'sys'
+      })
+      if (typeof setting !== 'undefined' && setting.length > 0) {
+        this.changeSubSystem(setting[0])
+      }
+    },
+    doorSubSystem() {
+      const door = this.systems.filter(subsys => {
+        return subsys.code === 'door'
+      })
+      if (typeof door !== 'undefined' && door.length > 0) {
+        this.changeSubSystem(door[0])
+      }
     }
   }
 }
@@ -147,11 +164,15 @@
   .welcome {
     position: absolute;
     right: 5vw;
-    bottom: 30px;
+    top: 30px;
     padding-left: 10px;
     cursor: pointer;
   }
 
+  .welcome img {
+    filter: drop-shadow(5px 5px 5px rgba(0, 0 , 0, 0.75));
+  }
+
   .title {
     position: absolute;
     top: 30px;
diff --git a/src/views/deviceManage/deviceDetail.vue b/src/views/deviceManage/deviceDetail.vue
index 9896899..81d1bba 100644
--- a/src/views/deviceManage/deviceDetail.vue
+++ b/src/views/deviceManage/deviceDetail.vue
@@ -122,7 +122,6 @@
       this.dialogFormVisible = dialogFormVisible
       this.resetForm()
       if (dialogStatus === 'detail') {
-
         this.isEditMode = false
 
         // 电子围栏设备有开启字段
diff --git a/src/views/layout/components/AppHeader.vue b/src/views/layout/components/AppHeader.vue
index 92cb5c5..d187aac 100644
--- a/src/views/layout/components/AppHeader.vue
+++ b/src/views/layout/components/AppHeader.vue
@@ -1,6 +1,6 @@
 <template>
   <div :style="{backgroundImage:'url('+headerUrl+')'}" class="app-header">
-    <h3>智慧城管平台</h3>
+    <h3>{{ title }}</h3>
     <!--子系统选项-->
     <el-dropdown class="systemSelect" @command="handleCommand">
       <span class="el-dropdown-link">{{ currentSystem.name }}<i class="el-icon-arrow-down el-icon--right"/>
@@ -12,15 +12,9 @@
     <el-dropdown class="avatar-container">
       <div class="avatar-wrapper">
         <span style="line-height:50px;">欢迎您，{{ name }}</span>
-        <!--<img :src="avatar+'?imageView2/1/w/80/h/80'" class="user-avatar">-->
         <i class="el-icon-caret-bottom"/>
       </div>
       <el-dropdown-menu slot="dropdown" class="user-dropdown">
-        <!--<router-link class="inlineBlock" to="/">-->
-        <!--<el-dropdown-item>-->
-        <!--主页-->
-        <!--</el-dropdown-item>-->
-        <!--</router-link>-->
         <el-dropdown-item>
           <span style="display:block;" @click="backToIndex">回首页</span>
         </el-dropdown-item>
@@ -39,6 +33,7 @@
 <script>
 import { mapGetters } from 'vuex'
 import ResetPwd from '../../system/user/resetPwd'
+import { getProject } from '@/utils/baseConfig'
 
 export default {
   name: 'AppHeader',
@@ -46,6 +41,13 @@
   data() {
     return {
       name: this.$store.getters.name,
+      title: getProject().title,
+      systems: [
+        { code: 'door', ismenu: '0', levels: 1, name: '营门管理子系统', resourceType: '02', url: '/door' },
+        { code: 'fence', ismenu: '0', levels: 1, name: '周界防卫子系统', resourceType: '02', url: '/fence' },
+        { code: 'region', ismenu: '0', levels: 1, name: '全域监控子系统', resourceType: '02', url: '/region' },
+        { code: 'key', ismenu: '0', levels: 1, name: '重点区域管控子系统', resourceType: '02', url: '/key' }
+      ],
       showSetPwd: false,
       headerUrl: require('../../../assets/global_images/header.png')// 头部图片
     }
@@ -57,10 +59,10 @@
     ]),
     currentSystem() {
       return this.$store.getters.currentSystem
-    },
-    systems() {
-      return this.$store.getters.systems
     }
+    // systems() {
+    //   return this.$store.getters.systems
+    // }
   },
   created() {
     this.getSystems()
diff --git a/src/views/staff/captureIris.vue b/src/views/staff/captureIris.vue
index e2c06dd..7183176 100644
--- a/src/views/staff/captureIris.vue
+++ b/src/views/staff/captureIris.vue
@@ -69,13 +69,17 @@
       dialogFormVisible: false, // 对话框是否显示
       photoLeft: '', // 图片路径
       photoRight: '',
+      scoreLeft: '0',
+      scoreRight: '0',
       defaultPhoto: require('@/assets/global_images/eye.png'), // 默认图片路径
       irisForm: {
         eyeType: '3',
         personId: '',
         idCard: '',
         image_zy: '',
-        image_yy: ''
+        image_yy: '',
+        score_zy: '0',
+        score_yy: '0'
       }, // 表单
       title: '' // 表头显示标题
     }
@@ -89,52 +93,60 @@
     WebSocketConnent() {
       this.photoLeft = ''
       this.photoRight = ''
-      const _this = this
-      this.ws = _this.$root.ws
+      this.scoreLeft = '0'
+      this.scoreRight = '0'
+      const that = this
+      this.ws = that.$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 = new WebSocket(that.$root.wsURL)
         // 注册各类回调
         this.ws.onopen = function() {
-          _this.$message.success('采集设备启动中...')
-          _this.ws.send('StartCapture' + _this.irisForm.eyeType)
+          that.$message.success('采集设备启动中...')
+          that.ws.send('StartCapture' + that.irisForm.eyeType)
         }
         this.ws.onclose = function() {
-          _this.$message.info('与ICS连接断开')
-          _this.$root.ws = null
+          that.$message.info('与ICS连接断开')
+          that.$root.ws = null
         }
         this.ws.onerror = function() {
-          _this.$message.error('与ICS通信发生错误')
+          that.$message.error('与ICS通信发生错误')
         }
-        _this.$root.ws = this.ws
+        that.$root.ws = this.ws
       } else {
         this.ws.send('StartCapture' + this.irisForm.eyeType)
       }
       this.ws.onmessage = function(receiveMsg) {
         console.log(receiveMsg)
 
-        _this.startBtnDisabeld = false
-        _this.stopBtnDisabeld = true
-        _this.eyeTypeDisabled = false
+        that.startBtnDisabeld = false
+        that.stopBtnDisabeld = true
+        that.eyeTypeDisabled = false
         if (receiveMsg.data === '设备启动失败') {
-          _this.$message.error(receiveMsg.data + '，请点击“开始采集”重试')
+          that.$message.error(receiveMsg.data + '，请点击“开始采集”重试')
         } else if (receiveMsg.data === '采集失败') {
-          _this.$message.error(receiveMsg.data)
+          that.$message.error(receiveMsg.data)
         } else if (receiveMsg.data === 'ICS错误') {
-          _this.$message.error(receiveMsg.data)
+          that.$message.error(receiveMsg.data)
         } else if (receiveMsg.data.indexOf('image') > -1) {
-          const 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
+          const imageData = receiveMsg.data.split(':')[0].replace('image', '')
+          const scoreData = receiveMsg.data.split(':')[1]
+
+          that.saveBtnDisabeld = false
+          if (that.irisForm.eyeType === '3') {
+            that.photoLeft = 'data:image/png;base64,' + imageData.split(';')[0]
+            that.photoRight = 'data:image/png;base64,' + imageData.split(';')[1]
+            that.scoreLeft = scoreData.split(';')[0]
+            that.scoreRight = scoreData.split(';')[1]
+          } else if (that.irisForm.eyeType === '2') {
+            that.photoLeft = 'data:image/png;base64,' + imageData
+            that.scoreLeft = scoreData
+          } else if (that.irisForm.eyeType === '1') {
+            that.photoRight = 'data:image/png;base64,' + imageData
+            that.scoreRight = scoreData
           }
         }
       }
@@ -172,6 +184,8 @@
       // 将虹膜照片数据发送到父组件
       this.$parent.personForm.irisData.leftImage = this.photoLeft
       this.$parent.personForm.irisData.rightImage = this.photoRight
+      this.$parent.personForm.irisData.leftIrisScore = this.scoreLeft
+      this.$parent.personForm.irisData.rightIrisScore = this.scoreRight
 
       this.$message.success('采集成功')
       this.edited = true
diff --git a/src/views/statistics/inOutCar.vue b/src/views/statistics/inOutCar.vue
new file mode 100644
index 0000000..fb3cb19
--- /dev/null
+++ b/src/views/statistics/inOutCar.vue
@@ -0,0 +1,240 @@
+<!--车辆进出列表-->
+<template>
+  <div class="app-container">
+    <!--筛选条件-->
+    <div class="search-div">
+      <div class="search-left">
+        <el-form ref="selectForm" :inline="true" :model="listQuery" class="form-container">
+          <el-row>
+            <el-col :span="4">
+              <el-form-item class="selectForm-container-item">
+                <el-input v-model.trim="listQuery.keywords" placeholder="车牌号" clearable />
+              </el-form-item>
+            </el-col>
+            <el-col :span="3">
+              <el-form-item class="selectForm-container-item">
+                <el-select v-model="listQuery.carType" placeholder="类别" clearable>
+                  <el-option v-for="item in carTypes" :key="item.value" :label="item.name" :value="item.value"/>
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="3">
+              <el-form-item class="selectForm-container-item">
+                <el-select v-model="listQuery.inOut" placeholder="进出园区" clearable>
+                  <el-option v-for="item in inOutTypes" :key="item.value" :label="item.name" :value="item.value"/>
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item class="selectForm-container-item">
+                <el-date-picker
+                  v-model="timeRange"
+                  type="daterange"
+                  range-separator="至"
+                  start-placeholder="开始日期"
+                  end-placeholder="结束日期" />
+              </el-form-item>
+            </el-col>
+
+            <el-col :span="4" class="search-right">
+              <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
+            </el-col>
+          </el-row>
+        </el-form>
+      </div>
+    </div>
+    <!--查询结果Table显示-->
+    <div>
+      <el-row class="table-title">
+        <el-col :span="6"><div class="title-header"><i class="el-icon-menu"/>数据列表</div></el-col>
+        <el-col :span="12" :offset="6" class="edit_btns">
+          <el-button class="edit_btn" size="small">导出</el-button>
+        </el-col>
+      </el-row>
+      <el-table v-loading="listLoading" :data="list" class="table" row-class-name="small-row-class" border>
+        <!--序号列-->
+        <el-table-column :index="indexMethod" align="center" type="index" label="#" width="55"/>
+        <!--内容列-->
+        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
+          <template slot-scope="scope">
+            <span v-if="column.value === 'idCard'">{{ encrypIdCardNo(scope.row[column.value]) }}</span>
+            <span v-else :class="column.class">{{ scope.row[column.value] }}</span>
+          </template>
+        </el-table-column>
+      </el-table>
+    </div>
+    <!--分页-->
+    <div class="pagination-container">
+      <el-pagination
+        v-show="total>listQuery.limit"
+        :current-page="listQuery.offset"
+        :page-sizes="[20,30,50]"
+        :page-size="listQuery.limit"
+        :total="total"
+        align="center"
+        layout="total, sizes, prev, pager, next"
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"/>
+    </div>
+  </div>
+</template>
+
+<script>
+import { formatToString } from '@/utils/calendarUtil'
+import { carInOutRecord } from '@/api/statistics'
+import { getCarType, getInOutType } from '@/api/allDict'
+
+export default {
+  name: 'InOutPerson',
+  data() {
+    return {
+      listQuery: {
+        keywords: '',
+        carType: '',
+        inOut: '',
+        beginTime: '',
+        endTime: '',
+        offset: 1,
+        limit: 20,
+        sort: '',
+        order: ''
+      }, // 筛选条件
+      columns: [
+        {
+          text: '车牌号',
+          value: 'plateNumber',
+          align: 'center'
+        },
+        {
+          text: '类别',
+          value: 'carTypeName',
+          align: 'center'
+        },
+        {
+          text: '进出园区',
+          value: 'inOutName',
+          align: 'center'
+        },
+        {
+          text: '通行时间',
+          value: 'logtime',
+          align: 'center'
+        }
+      ], // 显示列
+      list: [], // 列表数据
+      total: 0, // 数据总数
+      multipleSelection: [], // 多选选中项
+      carTypes: [],
+      inOutTypes: [],
+      timeRange: [],
+      listLoading: false, // 加载动画
+      fullscreenLoading: false, // 全屏加载动画
+      dialogFormVisible: false
+    }
+  },
+  watch: {
+    timeRange: function(newV) {
+      if (newV) {
+        this.listQuery.beginTime = formatToString(newV[0], 'DATE')
+        this.listQuery.endTime = formatToString(newV[1], 'DATE')
+      } else {
+        this.listQuery.beginTime = ''
+        this.listQuery.endTime = ''
+      }
+      this.fetchData()
+    }
+  },
+  created() {
+    this.fetchCarType()
+    this.fetchInOutType()
+    this.fetchData()// 获取数据
+  },
+  methods: {
+    // 身份证号加密显示
+    encrypIdCardNo(idCard) {
+      if (idCard.length > 6) {
+        return idCard.substr(0, 6) + '********' + idCard.substr(14)
+      } else if (idCard) {
+        return idCard
+      } else {
+        return ''
+      }
+    },
+    // 查询数据
+    search() {
+      this.fetchData(false)
+    },
+    fetchCarType() {
+      getCarType().then(response => {
+        this.carTypes = response.data
+      })
+    },
+    fetchInOutType() {
+      getInOutType().then(response => {
+        this.inOutTypes = response.data
+      })
+    },
+    // 获取列表
+    fetchData(isNowPage = true) {
+      this.listLoading = true
+      if (!isNowPage) { // 是否显示当前页，否则跳转第一页
+        this.listQuery.offset = 1
+      }
+      carInOutRecord(this.listQuery).then(response => {
+        if (response.code === 200) {
+          this.list = response.data.rows
+          this.total = parseInt(response.data.total)
+        } else {
+          this.$message.error(response.message)
+        }
+        this.listLoading = false
+      })
+    },
+    indexMethod(index) {
+      return this.listQuery.limit * (this.listQuery.offset - 1) + index + 1
+    },
+    // 改变页容量
+    handleSizeChange(val) {
+      this.listQuery.limit = val
+      this.fetchData()
+    },
+    // 改变当前页
+    handleCurrentChange(val) {
+      this.listQuery.offset = val
+      this.fetchData()
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  $tableTitleHeight:46px;
+  .app-container{
+    margin-bottom:20px
+  }
+  .table{
+    margin-bottom: 20px;
+  }
+  .pagination-container{
+    margin-bottom: 50px;
+  }
+  .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
+    }
+  }
+</style>
diff --git a/src/views/statistics/inOutPerson.vue b/src/views/statistics/inOutPerson.vue
new file mode 100644
index 0000000..4d466d9
--- /dev/null
+++ b/src/views/statistics/inOutPerson.vue
@@ -0,0 +1,245 @@
+<!--人员进出列表-->
+<template>
+  <div class="app-container">
+    <!--筛选条件-->
+    <div class="search-div">
+      <div class="search-left">
+        <el-form ref="selectForm" :inline="true" :model="listQuery" class="form-container">
+          <el-row>
+            <el-col :span="4">
+              <el-form-item class="selectForm-container-item">
+                <el-input v-model.trim="listQuery.keywords" placeholder="姓名/身份证号" clearable />
+              </el-form-item>
+            </el-col>
+            <el-col :span="3">
+              <el-form-item class="selectForm-container-item">
+                <el-select v-model="listQuery.personType" placeholder="类别" clearable>
+                  <el-option v-for="item in personTypes" :key="item.value" :label="item.name" :value="item.value"/>
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="3">
+              <el-form-item class="selectForm-container-item">
+                <el-select v-model="listQuery.inOut" placeholder="进出园区" clearable>
+                  <el-option v-for="item in inOutTypes" :key="item.value" :label="item.name" :value="item.value"/>
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item class="selectForm-container-item">
+                <el-date-picker
+                  v-model="timeRange"
+                  type="daterange"
+                  range-separator="至"
+                  start-placeholder="开始日期"
+                  end-placeholder="结束日期" />
+              </el-form-item>
+            </el-col>
+
+            <el-col :span="4" class="search-right">
+              <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
+            </el-col>
+          </el-row>
+        </el-form>
+      </div>
+    </div>
+    <!--查询结果Table显示-->
+    <div>
+      <el-row class="table-title">
+        <el-col :span="6"><div class="title-header"><i class="el-icon-menu"/>数据列表</div></el-col>
+        <el-col :span="12" :offset="6" class="edit_btns">
+          <el-button class="edit_btn" size="small">导出</el-button>
+        </el-col>
+      </el-row>
+      <el-table v-loading="listLoading" :data="list" class="table" row-class-name="small-row-class" border>
+        <!--序号列-->
+        <el-table-column :index="indexMethod" align="center" type="index" label="#" width="55"/>
+        <!--内容列-->
+        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
+          <template slot-scope="scope">
+            <span v-if="column.value === 'idCard'">{{ encrypIdCardNo(scope.row[column.value]) }}</span>
+            <span v-else :class="column.class">{{ scope.row[column.value] }}</span>
+          </template>
+        </el-table-column>
+      </el-table>
+    </div>
+    <!--分页-->
+    <div class="pagination-container">
+      <el-pagination
+        v-show="total>listQuery.limit"
+        :current-page="listQuery.offset"
+        :page-sizes="[20,30,50]"
+        :page-size="listQuery.limit"
+        :total="total"
+        align="center"
+        layout="total, sizes, prev, pager, next"
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"/>
+    </div>
+  </div>
+</template>
+
+<script>
+import { formatToString } from '@/utils/calendarUtil'
+import { personInOutRecord } from '@/api/statistics'
+import { getPersonType, getInOutType } from '@/api/allDict'
+
+export default {
+  name: 'InOutPerson',
+  data() {
+    return {
+      listQuery: {
+        keywords: '',
+        personType: '',
+        inOut: '',
+        beginTime: '',
+        endTime: '',
+        offset: 1,
+        limit: 20,
+        sort: '',
+        order: ''
+      }, // 筛选条件
+      columns: [
+        {
+          text: '姓名',
+          value: 'name',
+          align: 'center'
+        },
+        {
+          text: '身份证号',
+          value: 'idCard',
+          align: 'center'
+        },
+        {
+          text: '类别',
+          value: 'personTypeName',
+          align: 'center'
+        },
+        {
+          text: '进出园区',
+          value: 'inOutName',
+          align: 'center'
+        },
+        {
+          text: '通行时间',
+          value: 'logtime',
+          align: 'center'
+        }
+      ], // 显示列
+      list: [], // 列表数据
+      total: 0, // 数据总数
+      multipleSelection: [], // 多选选中项
+      personTypes: [],
+      inOutTypes: [],
+      timeRange: [],
+      listLoading: false, // 加载动画
+      fullscreenLoading: false, // 全屏加载动画
+      dialogFormVisible: false
+    }
+  },
+  watch: {
+    timeRange: function(newV) {
+      if (newV) {
+        this.listQuery.beginTime = formatToString(newV[0], 'DATE')
+        this.listQuery.endTime = formatToString(newV[1], 'DATE')
+      } else {
+        this.listQuery.beginTime = ''
+        this.listQuery.endTime = ''
+      }
+      this.fetchData()
+    }
+  },
+  created() {
+    this.fetchPersonType()
+    this.fetchInOutType()
+    this.fetchData()// 获取数据
+  },
+  methods: {
+    // 身份证号加密显示
+    encrypIdCardNo(idCard) {
+      if (idCard.length > 6) {
+        return idCard.substr(0, 6) + '********' + idCard.substr(14)
+      } else if (idCard) {
+        return idCard
+      } else {
+        return ''
+      }
+    },
+    // 查询数据
+    search() {
+      this.fetchData(false)
+    },
+    fetchPersonType() {
+      getPersonType().then(response => {
+        this.personTypes = response.data
+      })
+    },
+    fetchInOutType() {
+      getInOutType().then(response => {
+        this.inOutTypes = response.data
+      })
+    },
+    // 获取列表
+    fetchData(isNowPage = true) {
+      this.listLoading = true
+      if (!isNowPage) { // 是否显示当前页，否则跳转第一页
+        this.listQuery.offset = 1
+      }
+      personInOutRecord(this.listQuery).then(response => {
+        if (response.code === 200) {
+          this.list = response.data.rows
+          this.total = parseInt(response.data.total)
+        } else {
+          this.$message.error(response.message)
+        }
+        this.listLoading = false
+      })
+    },
+    indexMethod(index) {
+      return this.listQuery.limit * (this.listQuery.offset - 1) + index + 1
+    },
+    // 改变页容量
+    handleSizeChange(val) {
+      this.listQuery.limit = val
+      this.fetchData()
+    },
+    // 改变当前页
+    handleCurrentChange(val) {
+      this.listQuery.offset = val
+      this.fetchData()
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  $tableTitleHeight:46px;
+  .app-container{
+    margin-bottom:20px
+  }
+  .table{
+    margin-bottom: 20px;
+  }
+  .pagination-container{
+    margin-bottom: 50px;
+  }
+  .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
+    }
+  }
+</style>
diff --git a/static/.gitkeep b/static/.gitkeep
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/static/.gitkeep

diff --git a/src/api/allDict.js b/src/api/allDict.js
index 389c2b2..c567eb2 100644
--- a/src/api/allDict.js
+++ b/src/api/allDict.js
@@ -28,6 +28,15 @@
   })
 }
 
+// 车辆类别
+export function getCarType(params) {
+  return request({
+    url: '/dict/code/carType',
+    method: 'get',
+    params
+  })
+}
+
 // 设备类型
 export function getDeviceType(params) {
   return request({
@@ -52,3 +61,11 @@
     method: 'get'
   })
 }
+
+// 进出园区
+export function getInOutType() {
+  return request({
+    url: '/dict/code/inOut',
+    method: 'get'
+  })
+}
diff --git a/src/api/car.js b/src/api/car.js
index cf638b5..fc55938 100644
--- a/src/api/car.js
+++ b/src/api/car.js
@@ -1,5 +1,5 @@
 import request from '@/utils/request'
-import qs from 'qs'
+// import qs from 'qs'
 
 // 分页查询车辆列表
 export function getCarList(params) {
diff --git a/src/api/device.js b/src/api/device.js
index b3a3f84..4cf4c36 100644
--- a/src/api/device.js
+++ b/src/api/device.js
@@ -2,7 +2,7 @@
  * 设备管理接口
  */
 import request from '@/utils/request'
-import qs from 'qs'
+// import qs from 'qs'
 
 // 分页查询设备列表
 export function getDeviceList(params) {
diff --git a/src/api/statistics.js b/src/api/statistics.js
new file mode 100644
index 0000000..44e089f
--- /dev/null
+++ b/src/api/statistics.js
@@ -0,0 +1,22 @@
+/**
+ * 数据查询接口
+ */
+import request from '@/utils/request'
+// import qs from 'qs'
+
+export function personInOutRecord(params) {
+  return request({
+    url: '/statistics/personListPage',
+    method: 'get',
+    params
+  })
+}
+
+export function carInOutRecord(params) {
+  return request({
+    url: '/statistics/carListPage',
+    method: 'get',
+    params
+  })
+}
+
diff --git a/src/api/visitor.js b/src/api/visitor.js
index 1535eed..121d5e2 100644
--- a/src/api/visitor.js
+++ b/src/api/visitor.js
@@ -1,5 +1,5 @@
 import request from '@/utils/request'
-import qs from 'qs'
+// import qs from 'qs'
 
 // 访客登记
 export function addVisitorPerson(data) {
diff --git a/src/assets/login_images/bg-blue.png b/src/assets/login_images/bg-blue.png
new file mode 100644
index 0000000..a408d14
--- /dev/null
+++ b/src/assets/login_images/bg-blue.png
Binary files differ
diff --git a/src/assets/login_images/bg1.png b/src/assets/login_images/bg1.png
new file mode 100644
index 0000000..390b452
--- /dev/null
+++ b/src/assets/login_images/bg1.png
Binary files differ
diff --git a/src/router/modules/doorSys.js b/src/router/modules/doorSys.js
index 605b851..64e8d5e 100644
--- a/src/router/modules/doorSys.js
+++ b/src/router/modules/doorSys.js
@@ -166,5 +166,32 @@
         meta: { title: '车辆登记', icon: '', permission: ['/area/defenceList'], keepAlive: true }
       }
     ]
+  },
+  {
+    path: '/statistics',
+    component: Layout,
+    redirect: '/statistics',
+    name: 'Statistics',
+    alwaysShow: true,
+    meta: {
+      title: '统计管理',
+      icon: 'icon-statistics', // 图标
+      permission: ['/statistics'], // 权限名称
+      sys: '/door'
+    },
+    children: [
+      {
+        path: '/statistics/inOutPerson',
+        name: 'InOutPerson',
+        component: () => import('@/views/statistics/inOutPerson'),
+        meta: { title: '人员进出记录', icon: '', permission: ['/statistics/inOutPerson'], keepAlive: true }
+      },
+      {
+        path: '/statistics/inOutCar',
+        name: 'InOutCar',
+        component: () => import('@/views/statistics/inOutCar'),
+        meta: { title: '车辆进出记录', icon: '', permission: ['/statistics/inOutCar'], keepAlive: true }
+      }
+    ]
   }
 ]
diff --git a/src/router/modules/system.js b/src/router/modules/system.js
index 05f97c3..2efd4c5 100644
--- a/src/router/modules/system.js
+++ b/src/router/modules/system.js
@@ -38,12 +38,6 @@
         meta: { title: '字典管理', icon: 'function', permission: ['/dict'] }
       },
       {
-        path: '/area',
-        name: 'Area',
-        component: () => import('@/views/system/area/listArea'),
-        meta: { title: '区域管理', icon: 'function', permission: ['/area'] }
-      },
-      {
         path: '/dept',
         name: 'Dept',
         component: () => import('@/views/system/dept/listDept'),
diff --git a/src/views/car/carList.vue b/src/views/car/carList.vue
index 89555ee..bf2bb70 100644
--- a/src/views/car/carList.vue
+++ b/src/views/car/carList.vue
@@ -40,7 +40,7 @@
       </el-row>
       <el-table v-loading="listLoading" :data="list" class="table" row-class-name="small-row-class" border @selection-change="handleSelectionChange">
         <!--拥有删除权限则显示复选框-->
-<!--        <el-table-column v-if="hasPerm('/staff/delete')" align="center" type="selection" width="55"/>-->
+        <!--        <el-table-column v-if="hasPerm('/staff/delete')" align="center" type="selection" width="55"/>-->
         <!--序号列-->
         <el-table-column :index="indexMethod" align="center" type="index" label="#" width="55"/>
         <!--内容列-->
diff --git a/src/views/dashboard/portal.vue b/src/views/dashboard/portal.vue
index b517742..4365c4b 100644
--- a/src/views/dashboard/portal.vue
+++ b/src/views/dashboard/portal.vue
@@ -46,7 +46,8 @@
     </div>
 
     <div class="welcome">
-      <img src="/static/images/dashboard/exit-logo.png" height="25px" @click="logout">
+      <img src="/static/images/dashboard/setting-logo.png" height="40px" style="margin-right: 20px;" @click="settingSystem">
+      <img src="/static/images/dashboard/exit-logo.png" height="40px" @click="logout">
     </div>
   </div>
 </template>
@@ -80,12 +81,28 @@
         console.log('获取子系统成功')
       })
     },
-    doorSubSystem: function() {
+    changeSubSystem(subSys) {
       this.$store.commit('SET_CHANGEFLAG', '1')
-      this.$store.commit('SET_SYSTEM', this.systems[1])
+      this.$store.commit('SET_SYSTEM', subSys)
       this.$store.dispatch('tagsView/delAllViews', true).then(({ visitedViews }) => {
-        this.$router.replace(this.systems[1].url)
+        this.$router.replace(subSys.url)
       })
+    },
+    settingSystem() {
+      const setting = this.systems.filter(subsys => {
+        return subsys.code === 'sys'
+      })
+      if (typeof setting !== 'undefined' && setting.length > 0) {
+        this.changeSubSystem(setting[0])
+      }
+    },
+    doorSubSystem() {
+      const door = this.systems.filter(subsys => {
+        return subsys.code === 'door'
+      })
+      if (typeof door !== 'undefined' && door.length > 0) {
+        this.changeSubSystem(door[0])
+      }
     }
   }
 }
@@ -147,11 +164,15 @@
   .welcome {
     position: absolute;
     right: 5vw;
-    bottom: 30px;
+    top: 30px;
     padding-left: 10px;
     cursor: pointer;
   }
 
+  .welcome img {
+    filter: drop-shadow(5px 5px 5px rgba(0, 0 , 0, 0.75));
+  }
+
   .title {
     position: absolute;
     top: 30px;
diff --git a/src/views/deviceManage/deviceDetail.vue b/src/views/deviceManage/deviceDetail.vue
index 9896899..81d1bba 100644
--- a/src/views/deviceManage/deviceDetail.vue
+++ b/src/views/deviceManage/deviceDetail.vue
@@ -122,7 +122,6 @@
       this.dialogFormVisible = dialogFormVisible
       this.resetForm()
       if (dialogStatus === 'detail') {
-
         this.isEditMode = false
 
         // 电子围栏设备有开启字段
diff --git a/src/views/layout/components/AppHeader.vue b/src/views/layout/components/AppHeader.vue
index 92cb5c5..d187aac 100644
--- a/src/views/layout/components/AppHeader.vue
+++ b/src/views/layout/components/AppHeader.vue
@@ -1,6 +1,6 @@
 <template>
   <div :style="{backgroundImage:'url('+headerUrl+')'}" class="app-header">
-    <h3>智慧城管平台</h3>
+    <h3>{{ title }}</h3>
     <!--子系统选项-->
     <el-dropdown class="systemSelect" @command="handleCommand">
       <span class="el-dropdown-link">{{ currentSystem.name }}<i class="el-icon-arrow-down el-icon--right"/>
@@ -12,15 +12,9 @@
     <el-dropdown class="avatar-container">
       <div class="avatar-wrapper">
         <span style="line-height:50px;">欢迎您，{{ name }}</span>
-        <!--<img :src="avatar+'?imageView2/1/w/80/h/80'" class="user-avatar">-->
         <i class="el-icon-caret-bottom"/>
       </div>
       <el-dropdown-menu slot="dropdown" class="user-dropdown">
-        <!--<router-link class="inlineBlock" to="/">-->
-        <!--<el-dropdown-item>-->
-        <!--主页-->
-        <!--</el-dropdown-item>-->
-        <!--</router-link>-->
         <el-dropdown-item>
           <span style="display:block;" @click="backToIndex">回首页</span>
         </el-dropdown-item>
@@ -39,6 +33,7 @@
 <script>
 import { mapGetters } from 'vuex'
 import ResetPwd from '../../system/user/resetPwd'
+import { getProject } from '@/utils/baseConfig'
 
 export default {
   name: 'AppHeader',
@@ -46,6 +41,13 @@
   data() {
     return {
       name: this.$store.getters.name,
+      title: getProject().title,
+      systems: [
+        { code: 'door', ismenu: '0', levels: 1, name: '营门管理子系统', resourceType: '02', url: '/door' },
+        { code: 'fence', ismenu: '0', levels: 1, name: '周界防卫子系统', resourceType: '02', url: '/fence' },
+        { code: 'region', ismenu: '0', levels: 1, name: '全域监控子系统', resourceType: '02', url: '/region' },
+        { code: 'key', ismenu: '0', levels: 1, name: '重点区域管控子系统', resourceType: '02', url: '/key' }
+      ],
       showSetPwd: false,
       headerUrl: require('../../../assets/global_images/header.png')// 头部图片
     }
@@ -57,10 +59,10 @@
     ]),
     currentSystem() {
       return this.$store.getters.currentSystem
-    },
-    systems() {
-      return this.$store.getters.systems
     }
+    // systems() {
+    //   return this.$store.getters.systems
+    // }
   },
   created() {
     this.getSystems()
diff --git a/src/views/staff/captureIris.vue b/src/views/staff/captureIris.vue
index e2c06dd..7183176 100644
--- a/src/views/staff/captureIris.vue
+++ b/src/views/staff/captureIris.vue
@@ -69,13 +69,17 @@
       dialogFormVisible: false, // 对话框是否显示
       photoLeft: '', // 图片路径
       photoRight: '',
+      scoreLeft: '0',
+      scoreRight: '0',
       defaultPhoto: require('@/assets/global_images/eye.png'), // 默认图片路径
       irisForm: {
         eyeType: '3',
         personId: '',
         idCard: '',
         image_zy: '',
-        image_yy: ''
+        image_yy: '',
+        score_zy: '0',
+        score_yy: '0'
       }, // 表单
       title: '' // 表头显示标题
     }
@@ -89,52 +93,60 @@
     WebSocketConnent() {
       this.photoLeft = ''
       this.photoRight = ''
-      const _this = this
-      this.ws = _this.$root.ws
+      this.scoreLeft = '0'
+      this.scoreRight = '0'
+      const that = this
+      this.ws = that.$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 = new WebSocket(that.$root.wsURL)
         // 注册各类回调
         this.ws.onopen = function() {
-          _this.$message.success('采集设备启动中...')
-          _this.ws.send('StartCapture' + _this.irisForm.eyeType)
+          that.$message.success('采集设备启动中...')
+          that.ws.send('StartCapture' + that.irisForm.eyeType)
         }
         this.ws.onclose = function() {
-          _this.$message.info('与ICS连接断开')
-          _this.$root.ws = null
+          that.$message.info('与ICS连接断开')
+          that.$root.ws = null
         }
         this.ws.onerror = function() {
-          _this.$message.error('与ICS通信发生错误')
+          that.$message.error('与ICS通信发生错误')
         }
-        _this.$root.ws = this.ws
+        that.$root.ws = this.ws
       } else {
         this.ws.send('StartCapture' + this.irisForm.eyeType)
       }
       this.ws.onmessage = function(receiveMsg) {
         console.log(receiveMsg)
 
-        _this.startBtnDisabeld = false
-        _this.stopBtnDisabeld = true
-        _this.eyeTypeDisabled = false
+        that.startBtnDisabeld = false
+        that.stopBtnDisabeld = true
+        that.eyeTypeDisabled = false
         if (receiveMsg.data === '设备启动失败') {
-          _this.$message.error(receiveMsg.data + '，请点击“开始采集”重试')
+          that.$message.error(receiveMsg.data + '，请点击“开始采集”重试')
         } else if (receiveMsg.data === '采集失败') {
-          _this.$message.error(receiveMsg.data)
+          that.$message.error(receiveMsg.data)
         } else if (receiveMsg.data === 'ICS错误') {
-          _this.$message.error(receiveMsg.data)
+          that.$message.error(receiveMsg.data)
         } else if (receiveMsg.data.indexOf('image') > -1) {
-          const 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
+          const imageData = receiveMsg.data.split(':')[0].replace('image', '')
+          const scoreData = receiveMsg.data.split(':')[1]
+
+          that.saveBtnDisabeld = false
+          if (that.irisForm.eyeType === '3') {
+            that.photoLeft = 'data:image/png;base64,' + imageData.split(';')[0]
+            that.photoRight = 'data:image/png;base64,' + imageData.split(';')[1]
+            that.scoreLeft = scoreData.split(';')[0]
+            that.scoreRight = scoreData.split(';')[1]
+          } else if (that.irisForm.eyeType === '2') {
+            that.photoLeft = 'data:image/png;base64,' + imageData
+            that.scoreLeft = scoreData
+          } else if (that.irisForm.eyeType === '1') {
+            that.photoRight = 'data:image/png;base64,' + imageData
+            that.scoreRight = scoreData
           }
         }
       }
@@ -172,6 +184,8 @@
       // 将虹膜照片数据发送到父组件
       this.$parent.personForm.irisData.leftImage = this.photoLeft
       this.$parent.personForm.irisData.rightImage = this.photoRight
+      this.$parent.personForm.irisData.leftIrisScore = this.scoreLeft
+      this.$parent.personForm.irisData.rightIrisScore = this.scoreRight
 
       this.$message.success('采集成功')
       this.edited = true
diff --git a/src/views/statistics/inOutCar.vue b/src/views/statistics/inOutCar.vue
new file mode 100644
index 0000000..fb3cb19
--- /dev/null
+++ b/src/views/statistics/inOutCar.vue
@@ -0,0 +1,240 @@
+<!--车辆进出列表-->
+<template>
+  <div class="app-container">
+    <!--筛选条件-->
+    <div class="search-div">
+      <div class="search-left">
+        <el-form ref="selectForm" :inline="true" :model="listQuery" class="form-container">
+          <el-row>
+            <el-col :span="4">
+              <el-form-item class="selectForm-container-item">
+                <el-input v-model.trim="listQuery.keywords" placeholder="车牌号" clearable />
+              </el-form-item>
+            </el-col>
+            <el-col :span="3">
+              <el-form-item class="selectForm-container-item">
+                <el-select v-model="listQuery.carType" placeholder="类别" clearable>
+                  <el-option v-for="item in carTypes" :key="item.value" :label="item.name" :value="item.value"/>
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="3">
+              <el-form-item class="selectForm-container-item">
+                <el-select v-model="listQuery.inOut" placeholder="进出园区" clearable>
+                  <el-option v-for="item in inOutTypes" :key="item.value" :label="item.name" :value="item.value"/>
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item class="selectForm-container-item">
+                <el-date-picker
+                  v-model="timeRange"
+                  type="daterange"
+                  range-separator="至"
+                  start-placeholder="开始日期"
+                  end-placeholder="结束日期" />
+              </el-form-item>
+            </el-col>
+
+            <el-col :span="4" class="search-right">
+              <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
+            </el-col>
+          </el-row>
+        </el-form>
+      </div>
+    </div>
+    <!--查询结果Table显示-->
+    <div>
+      <el-row class="table-title">
+        <el-col :span="6"><div class="title-header"><i class="el-icon-menu"/>数据列表</div></el-col>
+        <el-col :span="12" :offset="6" class="edit_btns">
+          <el-button class="edit_btn" size="small">导出</el-button>
+        </el-col>
+      </el-row>
+      <el-table v-loading="listLoading" :data="list" class="table" row-class-name="small-row-class" border>
+        <!--序号列-->
+        <el-table-column :index="indexMethod" align="center" type="index" label="#" width="55"/>
+        <!--内容列-->
+        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
+          <template slot-scope="scope">
+            <span v-if="column.value === 'idCard'">{{ encrypIdCardNo(scope.row[column.value]) }}</span>
+            <span v-else :class="column.class">{{ scope.row[column.value] }}</span>
+          </template>
+        </el-table-column>
+      </el-table>
+    </div>
+    <!--分页-->
+    <div class="pagination-container">
+      <el-pagination
+        v-show="total>listQuery.limit"
+        :current-page="listQuery.offset"
+        :page-sizes="[20,30,50]"
+        :page-size="listQuery.limit"
+        :total="total"
+        align="center"
+        layout="total, sizes, prev, pager, next"
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"/>
+    </div>
+  </div>
+</template>
+
+<script>
+import { formatToString } from '@/utils/calendarUtil'
+import { carInOutRecord } from '@/api/statistics'
+import { getCarType, getInOutType } from '@/api/allDict'
+
+export default {
+  name: 'InOutPerson',
+  data() {
+    return {
+      listQuery: {
+        keywords: '',
+        carType: '',
+        inOut: '',
+        beginTime: '',
+        endTime: '',
+        offset: 1,
+        limit: 20,
+        sort: '',
+        order: ''
+      }, // 筛选条件
+      columns: [
+        {
+          text: '车牌号',
+          value: 'plateNumber',
+          align: 'center'
+        },
+        {
+          text: '类别',
+          value: 'carTypeName',
+          align: 'center'
+        },
+        {
+          text: '进出园区',
+          value: 'inOutName',
+          align: 'center'
+        },
+        {
+          text: '通行时间',
+          value: 'logtime',
+          align: 'center'
+        }
+      ], // 显示列
+      list: [], // 列表数据
+      total: 0, // 数据总数
+      multipleSelection: [], // 多选选中项
+      carTypes: [],
+      inOutTypes: [],
+      timeRange: [],
+      listLoading: false, // 加载动画
+      fullscreenLoading: false, // 全屏加载动画
+      dialogFormVisible: false
+    }
+  },
+  watch: {
+    timeRange: function(newV) {
+      if (newV) {
+        this.listQuery.beginTime = formatToString(newV[0], 'DATE')
+        this.listQuery.endTime = formatToString(newV[1], 'DATE')
+      } else {
+        this.listQuery.beginTime = ''
+        this.listQuery.endTime = ''
+      }
+      this.fetchData()
+    }
+  },
+  created() {
+    this.fetchCarType()
+    this.fetchInOutType()
+    this.fetchData()// 获取数据
+  },
+  methods: {
+    // 身份证号加密显示
+    encrypIdCardNo(idCard) {
+      if (idCard.length > 6) {
+        return idCard.substr(0, 6) + '********' + idCard.substr(14)
+      } else if (idCard) {
+        return idCard
+      } else {
+        return ''
+      }
+    },
+    // 查询数据
+    search() {
+      this.fetchData(false)
+    },
+    fetchCarType() {
+      getCarType().then(response => {
+        this.carTypes = response.data
+      })
+    },
+    fetchInOutType() {
+      getInOutType().then(response => {
+        this.inOutTypes = response.data
+      })
+    },
+    // 获取列表
+    fetchData(isNowPage = true) {
+      this.listLoading = true
+      if (!isNowPage) { // 是否显示当前页，否则跳转第一页
+        this.listQuery.offset = 1
+      }
+      carInOutRecord(this.listQuery).then(response => {
+        if (response.code === 200) {
+          this.list = response.data.rows
+          this.total = parseInt(response.data.total)
+        } else {
+          this.$message.error(response.message)
+        }
+        this.listLoading = false
+      })
+    },
+    indexMethod(index) {
+      return this.listQuery.limit * (this.listQuery.offset - 1) + index + 1
+    },
+    // 改变页容量
+    handleSizeChange(val) {
+      this.listQuery.limit = val
+      this.fetchData()
+    },
+    // 改变当前页
+    handleCurrentChange(val) {
+      this.listQuery.offset = val
+      this.fetchData()
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  $tableTitleHeight:46px;
+  .app-container{
+    margin-bottom:20px
+  }
+  .table{
+    margin-bottom: 20px;
+  }
+  .pagination-container{
+    margin-bottom: 50px;
+  }
+  .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
+    }
+  }
+</style>
diff --git a/src/views/statistics/inOutPerson.vue b/src/views/statistics/inOutPerson.vue
new file mode 100644
index 0000000..4d466d9
--- /dev/null
+++ b/src/views/statistics/inOutPerson.vue
@@ -0,0 +1,245 @@
+<!--人员进出列表-->
+<template>
+  <div class="app-container">
+    <!--筛选条件-->
+    <div class="search-div">
+      <div class="search-left">
+        <el-form ref="selectForm" :inline="true" :model="listQuery" class="form-container">
+          <el-row>
+            <el-col :span="4">
+              <el-form-item class="selectForm-container-item">
+                <el-input v-model.trim="listQuery.keywords" placeholder="姓名/身份证号" clearable />
+              </el-form-item>
+            </el-col>
+            <el-col :span="3">
+              <el-form-item class="selectForm-container-item">
+                <el-select v-model="listQuery.personType" placeholder="类别" clearable>
+                  <el-option v-for="item in personTypes" :key="item.value" :label="item.name" :value="item.value"/>
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="3">
+              <el-form-item class="selectForm-container-item">
+                <el-select v-model="listQuery.inOut" placeholder="进出园区" clearable>
+                  <el-option v-for="item in inOutTypes" :key="item.value" :label="item.name" :value="item.value"/>
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item class="selectForm-container-item">
+                <el-date-picker
+                  v-model="timeRange"
+                  type="daterange"
+                  range-separator="至"
+                  start-placeholder="开始日期"
+                  end-placeholder="结束日期" />
+              </el-form-item>
+            </el-col>
+
+            <el-col :span="4" class="search-right">
+              <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
+            </el-col>
+          </el-row>
+        </el-form>
+      </div>
+    </div>
+    <!--查询结果Table显示-->
+    <div>
+      <el-row class="table-title">
+        <el-col :span="6"><div class="title-header"><i class="el-icon-menu"/>数据列表</div></el-col>
+        <el-col :span="12" :offset="6" class="edit_btns">
+          <el-button class="edit_btn" size="small">导出</el-button>
+        </el-col>
+      </el-row>
+      <el-table v-loading="listLoading" :data="list" class="table" row-class-name="small-row-class" border>
+        <!--序号列-->
+        <el-table-column :index="indexMethod" align="center" type="index" label="#" width="55"/>
+        <!--内容列-->
+        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
+          <template slot-scope="scope">
+            <span v-if="column.value === 'idCard'">{{ encrypIdCardNo(scope.row[column.value]) }}</span>
+            <span v-else :class="column.class">{{ scope.row[column.value] }}</span>
+          </template>
+        </el-table-column>
+      </el-table>
+    </div>
+    <!--分页-->
+    <div class="pagination-container">
+      <el-pagination
+        v-show="total>listQuery.limit"
+        :current-page="listQuery.offset"
+        :page-sizes="[20,30,50]"
+        :page-size="listQuery.limit"
+        :total="total"
+        align="center"
+        layout="total, sizes, prev, pager, next"
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"/>
+    </div>
+  </div>
+</template>
+
+<script>
+import { formatToString } from '@/utils/calendarUtil'
+import { personInOutRecord } from '@/api/statistics'
+import { getPersonType, getInOutType } from '@/api/allDict'
+
+export default {
+  name: 'InOutPerson',
+  data() {
+    return {
+      listQuery: {
+        keywords: '',
+        personType: '',
+        inOut: '',
+        beginTime: '',
+        endTime: '',
+        offset: 1,
+        limit: 20,
+        sort: '',
+        order: ''
+      }, // 筛选条件
+      columns: [
+        {
+          text: '姓名',
+          value: 'name',
+          align: 'center'
+        },
+        {
+          text: '身份证号',
+          value: 'idCard',
+          align: 'center'
+        },
+        {
+          text: '类别',
+          value: 'personTypeName',
+          align: 'center'
+        },
+        {
+          text: '进出园区',
+          value: 'inOutName',
+          align: 'center'
+        },
+        {
+          text: '通行时间',
+          value: 'logtime',
+          align: 'center'
+        }
+      ], // 显示列
+      list: [], // 列表数据
+      total: 0, // 数据总数
+      multipleSelection: [], // 多选选中项
+      personTypes: [],
+      inOutTypes: [],
+      timeRange: [],
+      listLoading: false, // 加载动画
+      fullscreenLoading: false, // 全屏加载动画
+      dialogFormVisible: false
+    }
+  },
+  watch: {
+    timeRange: function(newV) {
+      if (newV) {
+        this.listQuery.beginTime = formatToString(newV[0], 'DATE')
+        this.listQuery.endTime = formatToString(newV[1], 'DATE')
+      } else {
+        this.listQuery.beginTime = ''
+        this.listQuery.endTime = ''
+      }
+      this.fetchData()
+    }
+  },
+  created() {
+    this.fetchPersonType()
+    this.fetchInOutType()
+    this.fetchData()// 获取数据
+  },
+  methods: {
+    // 身份证号加密显示
+    encrypIdCardNo(idCard) {
+      if (idCard.length > 6) {
+        return idCard.substr(0, 6) + '********' + idCard.substr(14)
+      } else if (idCard) {
+        return idCard
+      } else {
+        return ''
+      }
+    },
+    // 查询数据
+    search() {
+      this.fetchData(false)
+    },
+    fetchPersonType() {
+      getPersonType().then(response => {
+        this.personTypes = response.data
+      })
+    },
+    fetchInOutType() {
+      getInOutType().then(response => {
+        this.inOutTypes = response.data
+      })
+    },
+    // 获取列表
+    fetchData(isNowPage = true) {
+      this.listLoading = true
+      if (!isNowPage) { // 是否显示当前页，否则跳转第一页
+        this.listQuery.offset = 1
+      }
+      personInOutRecord(this.listQuery).then(response => {
+        if (response.code === 200) {
+          this.list = response.data.rows
+          this.total = parseInt(response.data.total)
+        } else {
+          this.$message.error(response.message)
+        }
+        this.listLoading = false
+      })
+    },
+    indexMethod(index) {
+      return this.listQuery.limit * (this.listQuery.offset - 1) + index + 1
+    },
+    // 改变页容量
+    handleSizeChange(val) {
+      this.listQuery.limit = val
+      this.fetchData()
+    },
+    // 改变当前页
+    handleCurrentChange(val) {
+      this.listQuery.offset = val
+      this.fetchData()
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  $tableTitleHeight:46px;
+  .app-container{
+    margin-bottom:20px
+  }
+  .table{
+    margin-bottom: 20px;
+  }
+  .pagination-container{
+    margin-bottom: 50px;
+  }
+  .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
+    }
+  }
+</style>
diff --git a/static/.gitkeep b/static/.gitkeep
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/static/.gitkeep
diff --git a/static/images/dashboard/setting-logo.png b/static/images/dashboard/setting-logo.png
new file mode 100644
index 0000000..5e70612
--- /dev/null
+++ b/static/images/dashboard/setting-logo.png
Binary files differ

diff --git a/src/api/allDict.js b/src/api/allDict.js
index 389c2b2..c567eb2 100644
--- a/src/api/allDict.js
+++ b/src/api/allDict.js
@@ -28,6 +28,15 @@
   })
 }
 
+// 车辆类别
+export function getCarType(params) {
+  return request({
+    url: '/dict/code/carType',
+    method: 'get',
+    params
+  })
+}
+
 // 设备类型
 export function getDeviceType(params) {
   return request({
@@ -52,3 +61,11 @@
     method: 'get'
   })
 }
+
+// 进出园区
+export function getInOutType() {
+  return request({
+    url: '/dict/code/inOut',
+    method: 'get'
+  })
+}
diff --git a/src/api/car.js b/src/api/car.js
index cf638b5..fc55938 100644
--- a/src/api/car.js
+++ b/src/api/car.js
@@ -1,5 +1,5 @@
 import request from '@/utils/request'
-import qs from 'qs'
+// import qs from 'qs'
 
 // 分页查询车辆列表
 export function getCarList(params) {
diff --git a/src/api/device.js b/src/api/device.js
index b3a3f84..4cf4c36 100644
--- a/src/api/device.js
+++ b/src/api/device.js
@@ -2,7 +2,7 @@
  * 设备管理接口
  */
 import request from '@/utils/request'
-import qs from 'qs'
+// import qs from 'qs'
 
 // 分页查询设备列表
 export function getDeviceList(params) {
diff --git a/src/api/statistics.js b/src/api/statistics.js
new file mode 100644
index 0000000..44e089f
--- /dev/null
+++ b/src/api/statistics.js
@@ -0,0 +1,22 @@
+/**
+ * 数据查询接口
+ */
+import request from '@/utils/request'
+// import qs from 'qs'
+
+export function personInOutRecord(params) {
+  return request({
+    url: '/statistics/personListPage',
+    method: 'get',
+    params
+  })
+}
+
+export function carInOutRecord(params) {
+  return request({
+    url: '/statistics/carListPage',
+    method: 'get',
+    params
+  })
+}
+
diff --git a/src/api/visitor.js b/src/api/visitor.js
index 1535eed..121d5e2 100644
--- a/src/api/visitor.js
+++ b/src/api/visitor.js
@@ -1,5 +1,5 @@
 import request from '@/utils/request'
-import qs from 'qs'
+// import qs from 'qs'
 
 // 访客登记
 export function addVisitorPerson(data) {
diff --git a/src/assets/login_images/bg-blue.png b/src/assets/login_images/bg-blue.png
new file mode 100644
index 0000000..a408d14
--- /dev/null
+++ b/src/assets/login_images/bg-blue.png
Binary files differ
diff --git a/src/assets/login_images/bg1.png b/src/assets/login_images/bg1.png
new file mode 100644
index 0000000..390b452
--- /dev/null
+++ b/src/assets/login_images/bg1.png
Binary files differ
diff --git a/src/router/modules/doorSys.js b/src/router/modules/doorSys.js
index 605b851..64e8d5e 100644
--- a/src/router/modules/doorSys.js
+++ b/src/router/modules/doorSys.js
@@ -166,5 +166,32 @@
         meta: { title: '车辆登记', icon: '', permission: ['/area/defenceList'], keepAlive: true }
       }
     ]
+  },
+  {
+    path: '/statistics',
+    component: Layout,
+    redirect: '/statistics',
+    name: 'Statistics',
+    alwaysShow: true,
+    meta: {
+      title: '统计管理',
+      icon: 'icon-statistics', // 图标
+      permission: ['/statistics'], // 权限名称
+      sys: '/door'
+    },
+    children: [
+      {
+        path: '/statistics/inOutPerson',
+        name: 'InOutPerson',
+        component: () => import('@/views/statistics/inOutPerson'),
+        meta: { title: '人员进出记录', icon: '', permission: ['/statistics/inOutPerson'], keepAlive: true }
+      },
+      {
+        path: '/statistics/inOutCar',
+        name: 'InOutCar',
+        component: () => import('@/views/statistics/inOutCar'),
+        meta: { title: '车辆进出记录', icon: '', permission: ['/statistics/inOutCar'], keepAlive: true }
+      }
+    ]
   }
 ]
diff --git a/src/router/modules/system.js b/src/router/modules/system.js
index 05f97c3..2efd4c5 100644
--- a/src/router/modules/system.js
+++ b/src/router/modules/system.js
@@ -38,12 +38,6 @@
         meta: { title: '字典管理', icon: 'function', permission: ['/dict'] }
       },
       {
-        path: '/area',
-        name: 'Area',
-        component: () => import('@/views/system/area/listArea'),
-        meta: { title: '区域管理', icon: 'function', permission: ['/area'] }
-      },
-      {
         path: '/dept',
         name: 'Dept',
         component: () => import('@/views/system/dept/listDept'),
diff --git a/src/views/car/carList.vue b/src/views/car/carList.vue
index 89555ee..bf2bb70 100644
--- a/src/views/car/carList.vue
+++ b/src/views/car/carList.vue
@@ -40,7 +40,7 @@
       </el-row>
       <el-table v-loading="listLoading" :data="list" class="table" row-class-name="small-row-class" border @selection-change="handleSelectionChange">
         <!--拥有删除权限则显示复选框-->
-<!--        <el-table-column v-if="hasPerm('/staff/delete')" align="center" type="selection" width="55"/>-->
+        <!--        <el-table-column v-if="hasPerm('/staff/delete')" align="center" type="selection" width="55"/>-->
         <!--序号列-->
         <el-table-column :index="indexMethod" align="center" type="index" label="#" width="55"/>
         <!--内容列-->
diff --git a/src/views/dashboard/portal.vue b/src/views/dashboard/portal.vue
index b517742..4365c4b 100644
--- a/src/views/dashboard/portal.vue
+++ b/src/views/dashboard/portal.vue
@@ -46,7 +46,8 @@
     </div>
 
     <div class="welcome">
-      <img src="/static/images/dashboard/exit-logo.png" height="25px" @click="logout">
+      <img src="/static/images/dashboard/setting-logo.png" height="40px" style="margin-right: 20px;" @click="settingSystem">
+      <img src="/static/images/dashboard/exit-logo.png" height="40px" @click="logout">
     </div>
   </div>
 </template>
@@ -80,12 +81,28 @@
         console.log('获取子系统成功')
       })
     },
-    doorSubSystem: function() {
+    changeSubSystem(subSys) {
       this.$store.commit('SET_CHANGEFLAG', '1')
-      this.$store.commit('SET_SYSTEM', this.systems[1])
+      this.$store.commit('SET_SYSTEM', subSys)
       this.$store.dispatch('tagsView/delAllViews', true).then(({ visitedViews }) => {
-        this.$router.replace(this.systems[1].url)
+        this.$router.replace(subSys.url)
       })
+    },
+    settingSystem() {
+      const setting = this.systems.filter(subsys => {
+        return subsys.code === 'sys'
+      })
+      if (typeof setting !== 'undefined' && setting.length > 0) {
+        this.changeSubSystem(setting[0])
+      }
+    },
+    doorSubSystem() {
+      const door = this.systems.filter(subsys => {
+        return subsys.code === 'door'
+      })
+      if (typeof door !== 'undefined' && door.length > 0) {
+        this.changeSubSystem(door[0])
+      }
     }
   }
 }
@@ -147,11 +164,15 @@
   .welcome {
     position: absolute;
     right: 5vw;
-    bottom: 30px;
+    top: 30px;
     padding-left: 10px;
     cursor: pointer;
   }
 
+  .welcome img {
+    filter: drop-shadow(5px 5px 5px rgba(0, 0 , 0, 0.75));
+  }
+
   .title {
     position: absolute;
     top: 30px;
diff --git a/src/views/deviceManage/deviceDetail.vue b/src/views/deviceManage/deviceDetail.vue
index 9896899..81d1bba 100644
--- a/src/views/deviceManage/deviceDetail.vue
+++ b/src/views/deviceManage/deviceDetail.vue
@@ -122,7 +122,6 @@
       this.dialogFormVisible = dialogFormVisible
       this.resetForm()
       if (dialogStatus === 'detail') {
-
         this.isEditMode = false
 
         // 电子围栏设备有开启字段
diff --git a/src/views/layout/components/AppHeader.vue b/src/views/layout/components/AppHeader.vue
index 92cb5c5..d187aac 100644
--- a/src/views/layout/components/AppHeader.vue
+++ b/src/views/layout/components/AppHeader.vue
@@ -1,6 +1,6 @@
 <template>
   <div :style="{backgroundImage:'url('+headerUrl+')'}" class="app-header">
-    <h3>智慧城管平台</h3>
+    <h3>{{ title }}</h3>
     <!--子系统选项-->
     <el-dropdown class="systemSelect" @command="handleCommand">
       <span class="el-dropdown-link">{{ currentSystem.name }}<i class="el-icon-arrow-down el-icon--right"/>
@@ -12,15 +12,9 @@
     <el-dropdown class="avatar-container">
       <div class="avatar-wrapper">
         <span style="line-height:50px;">欢迎您，{{ name }}</span>
-        <!--<img :src="avatar+'?imageView2/1/w/80/h/80'" class="user-avatar">-->
         <i class="el-icon-caret-bottom"/>
       </div>
       <el-dropdown-menu slot="dropdown" class="user-dropdown">
-        <!--<router-link class="inlineBlock" to="/">-->
-        <!--<el-dropdown-item>-->
-        <!--主页-->
-        <!--</el-dropdown-item>-->
-        <!--</router-link>-->
         <el-dropdown-item>
           <span style="display:block;" @click="backToIndex">回首页</span>
         </el-dropdown-item>
@@ -39,6 +33,7 @@
 <script>
 import { mapGetters } from 'vuex'
 import ResetPwd from '../../system/user/resetPwd'
+import { getProject } from '@/utils/baseConfig'
 
 export default {
   name: 'AppHeader',
@@ -46,6 +41,13 @@
   data() {
     return {
       name: this.$store.getters.name,
+      title: getProject().title,
+      systems: [
+        { code: 'door', ismenu: '0', levels: 1, name: '营门管理子系统', resourceType: '02', url: '/door' },
+        { code: 'fence', ismenu: '0', levels: 1, name: '周界防卫子系统', resourceType: '02', url: '/fence' },
+        { code: 'region', ismenu: '0', levels: 1, name: '全域监控子系统', resourceType: '02', url: '/region' },
+        { code: 'key', ismenu: '0', levels: 1, name: '重点区域管控子系统', resourceType: '02', url: '/key' }
+      ],
       showSetPwd: false,
       headerUrl: require('../../../assets/global_images/header.png')// 头部图片
     }
@@ -57,10 +59,10 @@
     ]),
     currentSystem() {
       return this.$store.getters.currentSystem
-    },
-    systems() {
-      return this.$store.getters.systems
     }
+    // systems() {
+    //   return this.$store.getters.systems
+    // }
   },
   created() {
     this.getSystems()
diff --git a/src/views/staff/captureIris.vue b/src/views/staff/captureIris.vue
index e2c06dd..7183176 100644
--- a/src/views/staff/captureIris.vue
+++ b/src/views/staff/captureIris.vue
@@ -69,13 +69,17 @@
       dialogFormVisible: false, // 对话框是否显示
       photoLeft: '', // 图片路径
       photoRight: '',
+      scoreLeft: '0',
+      scoreRight: '0',
       defaultPhoto: require('@/assets/global_images/eye.png'), // 默认图片路径
       irisForm: {
         eyeType: '3',
         personId: '',
         idCard: '',
         image_zy: '',
-        image_yy: ''
+        image_yy: '',
+        score_zy: '0',
+        score_yy: '0'
       }, // 表单
       title: '' // 表头显示标题
     }
@@ -89,52 +93,60 @@
     WebSocketConnent() {
       this.photoLeft = ''
       this.photoRight = ''
-      const _this = this
-      this.ws = _this.$root.ws
+      this.scoreLeft = '0'
+      this.scoreRight = '0'
+      const that = this
+      this.ws = that.$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 = new WebSocket(that.$root.wsURL)
         // 注册各类回调
         this.ws.onopen = function() {
-          _this.$message.success('采集设备启动中...')
-          _this.ws.send('StartCapture' + _this.irisForm.eyeType)
+          that.$message.success('采集设备启动中...')
+          that.ws.send('StartCapture' + that.irisForm.eyeType)
         }
         this.ws.onclose = function() {
-          _this.$message.info('与ICS连接断开')
-          _this.$root.ws = null
+          that.$message.info('与ICS连接断开')
+          that.$root.ws = null
         }
         this.ws.onerror = function() {
-          _this.$message.error('与ICS通信发生错误')
+          that.$message.error('与ICS通信发生错误')
         }
-        _this.$root.ws = this.ws
+        that.$root.ws = this.ws
       } else {
         this.ws.send('StartCapture' + this.irisForm.eyeType)
       }
       this.ws.onmessage = function(receiveMsg) {
         console.log(receiveMsg)
 
-        _this.startBtnDisabeld = false
-        _this.stopBtnDisabeld = true
-        _this.eyeTypeDisabled = false
+        that.startBtnDisabeld = false
+        that.stopBtnDisabeld = true
+        that.eyeTypeDisabled = false
         if (receiveMsg.data === '设备启动失败') {
-          _this.$message.error(receiveMsg.data + '，请点击“开始采集”重试')
+          that.$message.error(receiveMsg.data + '，请点击“开始采集”重试')
         } else if (receiveMsg.data === '采集失败') {
-          _this.$message.error(receiveMsg.data)
+          that.$message.error(receiveMsg.data)
         } else if (receiveMsg.data === 'ICS错误') {
-          _this.$message.error(receiveMsg.data)
+          that.$message.error(receiveMsg.data)
         } else if (receiveMsg.data.indexOf('image') > -1) {
-          const 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
+          const imageData = receiveMsg.data.split(':')[0].replace('image', '')
+          const scoreData = receiveMsg.data.split(':')[1]
+
+          that.saveBtnDisabeld = false
+          if (that.irisForm.eyeType === '3') {
+            that.photoLeft = 'data:image/png;base64,' + imageData.split(';')[0]
+            that.photoRight = 'data:image/png;base64,' + imageData.split(';')[1]
+            that.scoreLeft = scoreData.split(';')[0]
+            that.scoreRight = scoreData.split(';')[1]
+          } else if (that.irisForm.eyeType === '2') {
+            that.photoLeft = 'data:image/png;base64,' + imageData
+            that.scoreLeft = scoreData
+          } else if (that.irisForm.eyeType === '1') {
+            that.photoRight = 'data:image/png;base64,' + imageData
+            that.scoreRight = scoreData
           }
         }
       }
@@ -172,6 +184,8 @@
       // 将虹膜照片数据发送到父组件
       this.$parent.personForm.irisData.leftImage = this.photoLeft
       this.$parent.personForm.irisData.rightImage = this.photoRight
+      this.$parent.personForm.irisData.leftIrisScore = this.scoreLeft
+      this.$parent.personForm.irisData.rightIrisScore = this.scoreRight
 
       this.$message.success('采集成功')
       this.edited = true
diff --git a/src/views/statistics/inOutCar.vue b/src/views/statistics/inOutCar.vue
new file mode 100644
index 0000000..fb3cb19
--- /dev/null
+++ b/src/views/statistics/inOutCar.vue
@@ -0,0 +1,240 @@
+<!--车辆进出列表-->
+<template>
+  <div class="app-container">
+    <!--筛选条件-->
+    <div class="search-div">
+      <div class="search-left">
+        <el-form ref="selectForm" :inline="true" :model="listQuery" class="form-container">
+          <el-row>
+            <el-col :span="4">
+              <el-form-item class="selectForm-container-item">
+                <el-input v-model.trim="listQuery.keywords" placeholder="车牌号" clearable />
+              </el-form-item>
+            </el-col>
+            <el-col :span="3">
+              <el-form-item class="selectForm-container-item">
+                <el-select v-model="listQuery.carType" placeholder="类别" clearable>
+                  <el-option v-for="item in carTypes" :key="item.value" :label="item.name" :value="item.value"/>
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="3">
+              <el-form-item class="selectForm-container-item">
+                <el-select v-model="listQuery.inOut" placeholder="进出园区" clearable>
+                  <el-option v-for="item in inOutTypes" :key="item.value" :label="item.name" :value="item.value"/>
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item class="selectForm-container-item">
+                <el-date-picker
+                  v-model="timeRange"
+                  type="daterange"
+                  range-separator="至"
+                  start-placeholder="开始日期"
+                  end-placeholder="结束日期" />
+              </el-form-item>
+            </el-col>
+
+            <el-col :span="4" class="search-right">
+              <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
+            </el-col>
+          </el-row>
+        </el-form>
+      </div>
+    </div>
+    <!--查询结果Table显示-->
+    <div>
+      <el-row class="table-title">
+        <el-col :span="6"><div class="title-header"><i class="el-icon-menu"/>数据列表</div></el-col>
+        <el-col :span="12" :offset="6" class="edit_btns">
+          <el-button class="edit_btn" size="small">导出</el-button>
+        </el-col>
+      </el-row>
+      <el-table v-loading="listLoading" :data="list" class="table" row-class-name="small-row-class" border>
+        <!--序号列-->
+        <el-table-column :index="indexMethod" align="center" type="index" label="#" width="55"/>
+        <!--内容列-->
+        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
+          <template slot-scope="scope">
+            <span v-if="column.value === 'idCard'">{{ encrypIdCardNo(scope.row[column.value]) }}</span>
+            <span v-else :class="column.class">{{ scope.row[column.value] }}</span>
+          </template>
+        </el-table-column>
+      </el-table>
+    </div>
+    <!--分页-->
+    <div class="pagination-container">
+      <el-pagination
+        v-show="total>listQuery.limit"
+        :current-page="listQuery.offset"
+        :page-sizes="[20,30,50]"
+        :page-size="listQuery.limit"
+        :total="total"
+        align="center"
+        layout="total, sizes, prev, pager, next"
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"/>
+    </div>
+  </div>
+</template>
+
+<script>
+import { formatToString } from '@/utils/calendarUtil'
+import { carInOutRecord } from '@/api/statistics'
+import { getCarType, getInOutType } from '@/api/allDict'
+
+export default {
+  name: 'InOutPerson',
+  data() {
+    return {
+      listQuery: {
+        keywords: '',
+        carType: '',
+        inOut: '',
+        beginTime: '',
+        endTime: '',
+        offset: 1,
+        limit: 20,
+        sort: '',
+        order: ''
+      }, // 筛选条件
+      columns: [
+        {
+          text: '车牌号',
+          value: 'plateNumber',
+          align: 'center'
+        },
+        {
+          text: '类别',
+          value: 'carTypeName',
+          align: 'center'
+        },
+        {
+          text: '进出园区',
+          value: 'inOutName',
+          align: 'center'
+        },
+        {
+          text: '通行时间',
+          value: 'logtime',
+          align: 'center'
+        }
+      ], // 显示列
+      list: [], // 列表数据
+      total: 0, // 数据总数
+      multipleSelection: [], // 多选选中项
+      carTypes: [],
+      inOutTypes: [],
+      timeRange: [],
+      listLoading: false, // 加载动画
+      fullscreenLoading: false, // 全屏加载动画
+      dialogFormVisible: false
+    }
+  },
+  watch: {
+    timeRange: function(newV) {
+      if (newV) {
+        this.listQuery.beginTime = formatToString(newV[0], 'DATE')
+        this.listQuery.endTime = formatToString(newV[1], 'DATE')
+      } else {
+        this.listQuery.beginTime = ''
+        this.listQuery.endTime = ''
+      }
+      this.fetchData()
+    }
+  },
+  created() {
+    this.fetchCarType()
+    this.fetchInOutType()
+    this.fetchData()// 获取数据
+  },
+  methods: {
+    // 身份证号加密显示
+    encrypIdCardNo(idCard) {
+      if (idCard.length > 6) {
+        return idCard.substr(0, 6) + '********' + idCard.substr(14)
+      } else if (idCard) {
+        return idCard
+      } else {
+        return ''
+      }
+    },
+    // 查询数据
+    search() {
+      this.fetchData(false)
+    },
+    fetchCarType() {
+      getCarType().then(response => {
+        this.carTypes = response.data
+      })
+    },
+    fetchInOutType() {
+      getInOutType().then(response => {
+        this.inOutTypes = response.data
+      })
+    },
+    // 获取列表
+    fetchData(isNowPage = true) {
+      this.listLoading = true
+      if (!isNowPage) { // 是否显示当前页，否则跳转第一页
+        this.listQuery.offset = 1
+      }
+      carInOutRecord(this.listQuery).then(response => {
+        if (response.code === 200) {
+          this.list = response.data.rows
+          this.total = parseInt(response.data.total)
+        } else {
+          this.$message.error(response.message)
+        }
+        this.listLoading = false
+      })
+    },
+    indexMethod(index) {
+      return this.listQuery.limit * (this.listQuery.offset - 1) + index + 1
+    },
+    // 改变页容量
+    handleSizeChange(val) {
+      this.listQuery.limit = val
+      this.fetchData()
+    },
+    // 改变当前页
+    handleCurrentChange(val) {
+      this.listQuery.offset = val
+      this.fetchData()
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  $tableTitleHeight:46px;
+  .app-container{
+    margin-bottom:20px
+  }
+  .table{
+    margin-bottom: 20px;
+  }
+  .pagination-container{
+    margin-bottom: 50px;
+  }
+  .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
+    }
+  }
+</style>
diff --git a/src/views/statistics/inOutPerson.vue b/src/views/statistics/inOutPerson.vue
new file mode 100644
index 0000000..4d466d9
--- /dev/null
+++ b/src/views/statistics/inOutPerson.vue
@@ -0,0 +1,245 @@
+<!--人员进出列表-->
+<template>
+  <div class="app-container">
+    <!--筛选条件-->
+    <div class="search-div">
+      <div class="search-left">
+        <el-form ref="selectForm" :inline="true" :model="listQuery" class="form-container">
+          <el-row>
+            <el-col :span="4">
+              <el-form-item class="selectForm-container-item">
+                <el-input v-model.trim="listQuery.keywords" placeholder="姓名/身份证号" clearable />
+              </el-form-item>
+            </el-col>
+            <el-col :span="3">
+              <el-form-item class="selectForm-container-item">
+                <el-select v-model="listQuery.personType" placeholder="类别" clearable>
+                  <el-option v-for="item in personTypes" :key="item.value" :label="item.name" :value="item.value"/>
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="3">
+              <el-form-item class="selectForm-container-item">
+                <el-select v-model="listQuery.inOut" placeholder="进出园区" clearable>
+                  <el-option v-for="item in inOutTypes" :key="item.value" :label="item.name" :value="item.value"/>
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item class="selectForm-container-item">
+                <el-date-picker
+                  v-model="timeRange"
+                  type="daterange"
+                  range-separator="至"
+                  start-placeholder="开始日期"
+                  end-placeholder="结束日期" />
+              </el-form-item>
+            </el-col>
+
+            <el-col :span="4" class="search-right">
+              <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
+            </el-col>
+          </el-row>
+        </el-form>
+      </div>
+    </div>
+    <!--查询结果Table显示-->
+    <div>
+      <el-row class="table-title">
+        <el-col :span="6"><div class="title-header"><i class="el-icon-menu"/>数据列表</div></el-col>
+        <el-col :span="12" :offset="6" class="edit_btns">
+          <el-button class="edit_btn" size="small">导出</el-button>
+        </el-col>
+      </el-row>
+      <el-table v-loading="listLoading" :data="list" class="table" row-class-name="small-row-class" border>
+        <!--序号列-->
+        <el-table-column :index="indexMethod" align="center" type="index" label="#" width="55"/>
+        <!--内容列-->
+        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
+          <template slot-scope="scope">
+            <span v-if="column.value === 'idCard'">{{ encrypIdCardNo(scope.row[column.value]) }}</span>
+            <span v-else :class="column.class">{{ scope.row[column.value] }}</span>
+          </template>
+        </el-table-column>
+      </el-table>
+    </div>
+    <!--分页-->
+    <div class="pagination-container">
+      <el-pagination
+        v-show="total>listQuery.limit"
+        :current-page="listQuery.offset"
+        :page-sizes="[20,30,50]"
+        :page-size="listQuery.limit"
+        :total="total"
+        align="center"
+        layout="total, sizes, prev, pager, next"
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"/>
+    </div>
+  </div>
+</template>
+
+<script>
+import { formatToString } from '@/utils/calendarUtil'
+import { personInOutRecord } from '@/api/statistics'
+import { getPersonType, getInOutType } from '@/api/allDict'
+
+export default {
+  name: 'InOutPerson',
+  data() {
+    return {
+      listQuery: {
+        keywords: '',
+        personType: '',
+        inOut: '',
+        beginTime: '',
+        endTime: '',
+        offset: 1,
+        limit: 20,
+        sort: '',
+        order: ''
+      }, // 筛选条件
+      columns: [
+        {
+          text: '姓名',
+          value: 'name',
+          align: 'center'
+        },
+        {
+          text: '身份证号',
+          value: 'idCard',
+          align: 'center'
+        },
+        {
+          text: '类别',
+          value: 'personTypeName',
+          align: 'center'
+        },
+        {
+          text: '进出园区',
+          value: 'inOutName',
+          align: 'center'
+        },
+        {
+          text: '通行时间',
+          value: 'logtime',
+          align: 'center'
+        }
+      ], // 显示列
+      list: [], // 列表数据
+      total: 0, // 数据总数
+      multipleSelection: [], // 多选选中项
+      personTypes: [],
+      inOutTypes: [],
+      timeRange: [],
+      listLoading: false, // 加载动画
+      fullscreenLoading: false, // 全屏加载动画
+      dialogFormVisible: false
+    }
+  },
+  watch: {
+    timeRange: function(newV) {
+      if (newV) {
+        this.listQuery.beginTime = formatToString(newV[0], 'DATE')
+        this.listQuery.endTime = formatToString(newV[1], 'DATE')
+      } else {
+        this.listQuery.beginTime = ''
+        this.listQuery.endTime = ''
+      }
+      this.fetchData()
+    }
+  },
+  created() {
+    this.fetchPersonType()
+    this.fetchInOutType()
+    this.fetchData()// 获取数据
+  },
+  methods: {
+    // 身份证号加密显示
+    encrypIdCardNo(idCard) {
+      if (idCard.length > 6) {
+        return idCard.substr(0, 6) + '********' + idCard.substr(14)
+      } else if (idCard) {
+        return idCard
+      } else {
+        return ''
+      }
+    },
+    // 查询数据
+    search() {
+      this.fetchData(false)
+    },
+    fetchPersonType() {
+      getPersonType().then(response => {
+        this.personTypes = response.data
+      })
+    },
+    fetchInOutType() {
+      getInOutType().then(response => {
+        this.inOutTypes = response.data
+      })
+    },
+    // 获取列表
+    fetchData(isNowPage = true) {
+      this.listLoading = true
+      if (!isNowPage) { // 是否显示当前页，否则跳转第一页
+        this.listQuery.offset = 1
+      }
+      personInOutRecord(this.listQuery).then(response => {
+        if (response.code === 200) {
+          this.list = response.data.rows
+          this.total = parseInt(response.data.total)
+        } else {
+          this.$message.error(response.message)
+        }
+        this.listLoading = false
+      })
+    },
+    indexMethod(index) {
+      return this.listQuery.limit * (this.listQuery.offset - 1) + index + 1
+    },
+    // 改变页容量
+    handleSizeChange(val) {
+      this.listQuery.limit = val
+      this.fetchData()
+    },
+    // 改变当前页
+    handleCurrentChange(val) {
+      this.listQuery.offset = val
+      this.fetchData()
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  $tableTitleHeight:46px;
+  .app-container{
+    margin-bottom:20px
+  }
+  .table{
+    margin-bottom: 20px;
+  }
+  .pagination-container{
+    margin-bottom: 50px;
+  }
+  .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
+    }
+  }
+</style>
diff --git a/static/.gitkeep b/static/.gitkeep
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/static/.gitkeep
diff --git a/static/images/dashboard/setting-logo.png b/static/images/dashboard/setting-logo.png
new file mode 100644
index 0000000..5e70612
--- /dev/null
+++ b/static/images/dashboard/setting-logo.png
Binary files differ
diff --git a/static/images/kaptcha.png b/static/images/kaptcha.png
new file mode 100644
index 0000000..1109352
--- /dev/null
+++ b/static/images/kaptcha.png
Binary files differ