diff --git a/src/api/area.js b/src/api/area.js
index 9a17cfa..840acf2 100644
--- a/src/api/area.js
+++ b/src/api/area.js
@@ -105,8 +105,8 @@
 }
 
 // 根据当前子系统返回areaType
-export function getAreaTypeBySubSystem(system) {
-  switch (system.code) {
+export function getAreaTypeBySubSystem(sysCode) {
+  switch (sysCode) {
     case 'door':
       return '1'
     case 'fence':
@@ -119,3 +119,11 @@
       return ''
   }
 }
+
+// 获取虹膜设备的所在区域
+export function getIrisAreaList() {
+  return request({
+    url: '/region/getIrisAreaList',
+    method: 'get'
+  })
+}

diff --git a/src/api/area.js b/src/api/area.js
index 9a17cfa..840acf2 100644
--- a/src/api/area.js
+++ b/src/api/area.js
@@ -105,8 +105,8 @@
 }
 
 // 根据当前子系统返回areaType
-export function getAreaTypeBySubSystem(system) {
-  switch (system.code) {
+export function getAreaTypeBySubSystem(sysCode) {
+  switch (sysCode) {
     case 'door':
       return '1'
     case 'fence':
@@ -119,3 +119,11 @@
       return ''
   }
 }
+
+// 获取虹膜设备的所在区域
+export function getIrisAreaList() {
+  return request({
+    url: '/region/getIrisAreaList',
+    method: 'get'
+  })
+}
diff --git a/src/router/index.js b/src/router/index.js
index 823269b..9feb573 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -10,6 +10,7 @@
 import Layout from '../views/layout/Layout'
 import { systemRouters } from './modules/system'
 import { doorSysRouters } from './modules/doorSys'
+import { fenceSysRouters } from './modules/fenceSys'
 import { ctrlSysRouters } from './modules/ctrlSys'
 
 /**
@@ -89,6 +90,7 @@
 export const asyncRouterMap = [
   ...systemRouters,
   ...doorSysRouters,
+  ...fenceSysRouters,
   ...ctrlSysRouters,
   { path: '*', redirect: '/404', hidden: true, meta: {}}
 ]

diff --git a/src/api/area.js b/src/api/area.js
index 9a17cfa..840acf2 100644
--- a/src/api/area.js
+++ b/src/api/area.js
@@ -105,8 +105,8 @@
 }
 
 // 根据当前子系统返回areaType
-export function getAreaTypeBySubSystem(system) {
-  switch (system.code) {
+export function getAreaTypeBySubSystem(sysCode) {
+  switch (sysCode) {
     case 'door':
       return '1'
     case 'fence':
@@ -119,3 +119,11 @@
       return ''
   }
 }
+
+// 获取虹膜设备的所在区域
+export function getIrisAreaList() {
+  return request({
+    url: '/region/getIrisAreaList',
+    method: 'get'
+  })
+}
diff --git a/src/router/index.js b/src/router/index.js
index 823269b..9feb573 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -10,6 +10,7 @@
 import Layout from '../views/layout/Layout'
 import { systemRouters } from './modules/system'
 import { doorSysRouters } from './modules/doorSys'
+import { fenceSysRouters } from './modules/fenceSys'
 import { ctrlSysRouters } from './modules/ctrlSys'
 
 /**
@@ -89,6 +90,7 @@
 export const asyncRouterMap = [
   ...systemRouters,
   ...doorSysRouters,
+  ...fenceSysRouters,
   ...ctrlSysRouters,
   { path: '*', redirect: '/404', hidden: true, meta: {}}
 ]
diff --git a/src/router/modules/doorSys.js b/src/router/modules/doorSys.js
index 235bac9..1a78748 100644
--- a/src/router/modules/doorSys.js
+++ b/src/router/modules/doorSys.js
@@ -4,7 +4,7 @@
   {
     path: '/door',
     name: 'door',
-    redirect: '/visitor',
+    redirect: '/door/alarm',
     hidden: true,
     meta: {
       title: '营门管理子系统',
@@ -13,47 +13,74 @@
     }
   },
   {
-    path: '/visitor',
+    path: '/door/alarm',
     component: Layout,
-    redirect: '/visitor/add',
+    redirect: '/door/alarm/now',
+    name: 'Alarm',
+    alwaysShow: true,
+    meta: {
+      title: '报警管理',
+      icon: 'icon-alarm', // 图标
+      permission: ['/door/alarm'], // 权限名称
+      sys: '/door'
+    },
+    children: [
+      {
+        path: '/door/alarm/now',
+        name: 'AlarmNow',
+        component: () => import('@/views/alarm/alarmNow'),
+        meta: { title: '当前报警', icon: '', permission: ['/door/alarm/now'], keepAlive: true }
+      },
+      {
+        path: '/door/alarm/list',
+        name: 'AlarmList',
+        component: () => import('@/views/alarm/alarmList'),
+        meta: { title: '报警记录', icon: '', permission: ['/door/alarm/list'], keepAlive: true }
+      }
+    ]
+  },
+  {
+    path: '/door/visitor',
+    component: Layout,
+    redirect: '/door/visitor/add',
     name: 'Visitor',
     alwaysShow: true,
     meta: {
       title: '访客管理',
       icon: 'icon-visitor', // 图标
-      permission: ['/visitor'], // 权限名称
+      permission: ['/door/visitor'], // 权限名称
       sys: '/door'
     },
     children: [
       {
-        path: '/visitor/add',
+        path: '/door/visitor/add',
         name: 'VisitorAdd',
         component: () => import('@/views/visitor/visitorAdd'),
-        meta: { title: '访客登记', icon: '', permission: ['/visitor/add'], keepAlive: true }
+        meta: { title: '访客登记', icon: '', permission: ['/door/visitor/add'], keepAlive: true }
       },
       {
-        path: '/visitor/addCar',
+        path: '/door/visitor/addCar',
         name: 'VisitorAddCar',
         component: () => import('@/views/visitor/visitorAddCar'),
-        meta: { title: '访客车辆登记', icon: '', permission: ['/visitor/addCar'], keepAlive: true }
+        meta: { title: '访客车辆登记', icon: '', permission: ['/door/visitor/addCar'], keepAlive: true }
       },
       {
-        path: '/visitor/today',
+        path: '/door/visitor/today',
         name: 'VisitorToday',
         component: () => import('@/views/visitor/visitorTodayList'),
-        meta: { title: '当日来访人员', icon: '', permission: ['/visitor/today'], keepAlive: true }
+        meta: { title: '当日来访人员', icon: '', permission: ['/door/visitor/today'], keepAlive: true }
       },
       {
-        path: '/visitor/carToday',
+        path: '/door/visitor/carToday',
         name: 'VisitorCarToday',
         component: () => import('@/views/visitor/visitorCarTodayList'),
-        meta: { title: '当日来访车辆', icon: '', permission: ['/visitor/carToday'], keepAlive: true }
+        meta: { title: '当日来访车辆', icon: '', permission: ['/door/visitor/carToday'], keepAlive: true }
       },
       {
-        path: '/visitor/list',
+        path: '/door/visitor/list',
         name: 'VisitorList',
         component: () => import('@/views/visitor/visitorList'),
-        meta: { title: '来访记录', icon: '', permission: ['/visitor/list'], keepAlive: true }
+        meta: { title: '来访记录', icon: '', permission: ['/door/visitor/list'], keepAlive: true }
       }
     ]
   },
@@ -92,27 +119,6 @@
     ]
   },
   {
-    path: '/device',
-    component: Layout,
-    redirect: '/device',
-    name: 'Device',
-    alwaysShow: true,
-    meta: {
-      title: '设备管理',
-      icon: 'icon-device', // 图标
-      permission: ['/device'], // 权限名称
-      sys: '/door'
-    },
-    children: [
-      {
-        path: '/device/list',
-        name: 'DeviceList',
-        component: () => import('@/views/deviceManage/deviceList'),
-        meta: { title: '设备列表', icon: '', permission: ['/device/list'], keepAlive: true }
-      }
-    ]
-  },
-  {
     path: '/car',
     component: Layout,
     redirect: '/car',
@@ -141,6 +147,27 @@
     ]
   },
   {
+    path: '/device',
+    component: Layout,
+    redirect: '/device',
+    name: 'Device',
+    alwaysShow: true,
+    meta: {
+      title: '设备管理',
+      icon: 'icon-device', // 图标
+      permission: ['/device'], // 权限名称
+      sys: '/door'
+    },
+    children: [
+      {
+        path: '/device/list',
+        name: 'DeviceList',
+        component: () => import('@/views/deviceManage/deviceList'),
+        meta: { title: '设备列表', icon: '', permission: ['/device/list'], keepAlive: true }
+      }
+    ]
+  },
+  {
     path: '/area',
     component: Layout,
     redirect: '/area',
@@ -212,31 +239,5 @@
       }
     ]
   },
-  {
-    path: '/alarm',
-    component: Layout,
-    redirect: '/alarm',
-    name: 'Alarm',
-    alwaysShow: true,
-    meta: {
-      title: '报警管理',
-      icon: 'icon-alarm', // 图标
-      permission: ['/alarm'], // 权限名称
-      sys: '/door'
-    },
-    children: [
-      {
-        path: '/alarm/now',
-        name: 'AlarmNow',
-        component: () => import('@/views/alarm/alarmNow'),
-        meta: { title: '当前报警', icon: '', permission: ['/alarm/now'], keepAlive: true }
-      },
-      {
-        path: '/alarm/list',
-        name: 'AlarmList',
-        component: () => import('@/views/alarm/alarmList'),
-        meta: { title: '报警记录', icon: '', permission: ['/alarm/list'], keepAlive: true }
-      }
-    ]
-  }
+
 ]

diff --git a/src/api/area.js b/src/api/area.js
index 9a17cfa..840acf2 100644
--- a/src/api/area.js
+++ b/src/api/area.js
@@ -105,8 +105,8 @@
 }
 
 // 根据当前子系统返回areaType
-export function getAreaTypeBySubSystem(system) {
-  switch (system.code) {
+export function getAreaTypeBySubSystem(sysCode) {
+  switch (sysCode) {
     case 'door':
       return '1'
     case 'fence':
@@ -119,3 +119,11 @@
       return ''
   }
 }
+
+// 获取虹膜设备的所在区域
+export function getIrisAreaList() {
+  return request({
+    url: '/region/getIrisAreaList',
+    method: 'get'
+  })
+}
diff --git a/src/router/index.js b/src/router/index.js
index 823269b..9feb573 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -10,6 +10,7 @@
 import Layout from '../views/layout/Layout'
 import { systemRouters } from './modules/system'
 import { doorSysRouters } from './modules/doorSys'
+import { fenceSysRouters } from './modules/fenceSys'
 import { ctrlSysRouters } from './modules/ctrlSys'
 
 /**
@@ -89,6 +90,7 @@
 export const asyncRouterMap = [
   ...systemRouters,
   ...doorSysRouters,
+  ...fenceSysRouters,
   ...ctrlSysRouters,
   { path: '*', redirect: '/404', hidden: true, meta: {}}
 ]
diff --git a/src/router/modules/doorSys.js b/src/router/modules/doorSys.js
index 235bac9..1a78748 100644
--- a/src/router/modules/doorSys.js
+++ b/src/router/modules/doorSys.js
@@ -4,7 +4,7 @@
   {
     path: '/door',
     name: 'door',
-    redirect: '/visitor',
+    redirect: '/door/alarm',
     hidden: true,
     meta: {
       title: '营门管理子系统',
@@ -13,47 +13,74 @@
     }
   },
   {
-    path: '/visitor',
+    path: '/door/alarm',
     component: Layout,
-    redirect: '/visitor/add',
+    redirect: '/door/alarm/now',
+    name: 'Alarm',
+    alwaysShow: true,
+    meta: {
+      title: '报警管理',
+      icon: 'icon-alarm', // 图标
+      permission: ['/door/alarm'], // 权限名称
+      sys: '/door'
+    },
+    children: [
+      {
+        path: '/door/alarm/now',
+        name: 'AlarmNow',
+        component: () => import('@/views/alarm/alarmNow'),
+        meta: { title: '当前报警', icon: '', permission: ['/door/alarm/now'], keepAlive: true }
+      },
+      {
+        path: '/door/alarm/list',
+        name: 'AlarmList',
+        component: () => import('@/views/alarm/alarmList'),
+        meta: { title: '报警记录', icon: '', permission: ['/door/alarm/list'], keepAlive: true }
+      }
+    ]
+  },
+  {
+    path: '/door/visitor',
+    component: Layout,
+    redirect: '/door/visitor/add',
     name: 'Visitor',
     alwaysShow: true,
     meta: {
       title: '访客管理',
       icon: 'icon-visitor', // 图标
-      permission: ['/visitor'], // 权限名称
+      permission: ['/door/visitor'], // 权限名称
       sys: '/door'
     },
     children: [
       {
-        path: '/visitor/add',
+        path: '/door/visitor/add',
         name: 'VisitorAdd',
         component: () => import('@/views/visitor/visitorAdd'),
-        meta: { title: '访客登记', icon: '', permission: ['/visitor/add'], keepAlive: true }
+        meta: { title: '访客登记', icon: '', permission: ['/door/visitor/add'], keepAlive: true }
       },
       {
-        path: '/visitor/addCar',
+        path: '/door/visitor/addCar',
         name: 'VisitorAddCar',
         component: () => import('@/views/visitor/visitorAddCar'),
-        meta: { title: '访客车辆登记', icon: '', permission: ['/visitor/addCar'], keepAlive: true }
+        meta: { title: '访客车辆登记', icon: '', permission: ['/door/visitor/addCar'], keepAlive: true }
       },
       {
-        path: '/visitor/today',
+        path: '/door/visitor/today',
         name: 'VisitorToday',
         component: () => import('@/views/visitor/visitorTodayList'),
-        meta: { title: '当日来访人员', icon: '', permission: ['/visitor/today'], keepAlive: true }
+        meta: { title: '当日来访人员', icon: '', permission: ['/door/visitor/today'], keepAlive: true }
       },
       {
-        path: '/visitor/carToday',
+        path: '/door/visitor/carToday',
         name: 'VisitorCarToday',
         component: () => import('@/views/visitor/visitorCarTodayList'),
-        meta: { title: '当日来访车辆', icon: '', permission: ['/visitor/carToday'], keepAlive: true }
+        meta: { title: '当日来访车辆', icon: '', permission: ['/door/visitor/carToday'], keepAlive: true }
       },
       {
-        path: '/visitor/list',
+        path: '/door/visitor/list',
         name: 'VisitorList',
         component: () => import('@/views/visitor/visitorList'),
-        meta: { title: '来访记录', icon: '', permission: ['/visitor/list'], keepAlive: true }
+        meta: { title: '来访记录', icon: '', permission: ['/door/visitor/list'], keepAlive: true }
       }
     ]
   },
@@ -92,27 +119,6 @@
     ]
   },
   {
-    path: '/device',
-    component: Layout,
-    redirect: '/device',
-    name: 'Device',
-    alwaysShow: true,
-    meta: {
-      title: '设备管理',
-      icon: 'icon-device', // 图标
-      permission: ['/device'], // 权限名称
-      sys: '/door'
-    },
-    children: [
-      {
-        path: '/device/list',
-        name: 'DeviceList',
-        component: () => import('@/views/deviceManage/deviceList'),
-        meta: { title: '设备列表', icon: '', permission: ['/device/list'], keepAlive: true }
-      }
-    ]
-  },
-  {
     path: '/car',
     component: Layout,
     redirect: '/car',
@@ -141,6 +147,27 @@
     ]
   },
   {
+    path: '/device',
+    component: Layout,
+    redirect: '/device',
+    name: 'Device',
+    alwaysShow: true,
+    meta: {
+      title: '设备管理',
+      icon: 'icon-device', // 图标
+      permission: ['/device'], // 权限名称
+      sys: '/door'
+    },
+    children: [
+      {
+        path: '/device/list',
+        name: 'DeviceList',
+        component: () => import('@/views/deviceManage/deviceList'),
+        meta: { title: '设备列表', icon: '', permission: ['/device/list'], keepAlive: true }
+      }
+    ]
+  },
+  {
     path: '/area',
     component: Layout,
     redirect: '/area',
@@ -212,31 +239,5 @@
       }
     ]
   },
-  {
-    path: '/alarm',
-    component: Layout,
-    redirect: '/alarm',
-    name: 'Alarm',
-    alwaysShow: true,
-    meta: {
-      title: '报警管理',
-      icon: 'icon-alarm', // 图标
-      permission: ['/alarm'], // 权限名称
-      sys: '/door'
-    },
-    children: [
-      {
-        path: '/alarm/now',
-        name: 'AlarmNow',
-        component: () => import('@/views/alarm/alarmNow'),
-        meta: { title: '当前报警', icon: '', permission: ['/alarm/now'], keepAlive: true }
-      },
-      {
-        path: '/alarm/list',
-        name: 'AlarmList',
-        component: () => import('@/views/alarm/alarmList'),
-        meta: { title: '报警记录', icon: '', permission: ['/alarm/list'], keepAlive: true }
-      }
-    ]
-  }
+
 ]
diff --git a/src/router/modules/fenceSys.js b/src/router/modules/fenceSys.js
new file mode 100644
index 0000000..c07c0f8
--- /dev/null
+++ b/src/router/modules/fenceSys.js
@@ -0,0 +1,84 @@
+/* Layout */
+import Layout from '../../views/layout/Layout'
+export const fenceSysRouters = [
+  {
+    path: '/fence',
+    name: 'fence',
+    redirect: '/fence/alarm',
+    hidden: true,
+    meta: {
+      title: '周界管理子系统',
+      permission: ['/fence'],
+      isSys: true
+    }
+  },
+  {
+    path: '/fence/alarm',
+    component: Layout,
+    redirect: '/fence/alarm',
+    name: 'Alarm',
+    alwaysShow: true,
+    meta: {
+      title: '报警管理',
+      icon: 'icon-alarm', // 图标
+      permission: ['/fence/alarm'], // 权限名称
+      sys: '/fence'
+    },
+    children: [
+      {
+        path: '/fence/alarm/now',
+        name: 'AlarmNow',
+        component: () => import('@/views/alarm/alarmNow'),
+        meta: { title: '当前报警', icon: '', permission: ['/fence/alarm/now'], keepAlive: true }
+      },
+      {
+        path: '/fence/alarm/list',
+        name: 'AlarmList',
+        component: () => import('@/views/alarm/alarmList'),
+        meta: { title: '报警记录', icon: '', permission: ['/fence/alarm/list'], keepAlive: true }
+      }
+    ]
+  },
+  {
+    path: '/area',
+    component: Layout,
+    redirect: '/area',
+    name: 'Area',
+    alwaysShow: true,
+    meta: {
+      title: '区域管理',
+      icon: 'icon-area', // 图标
+      permission: ['/area'], // 权限名称
+      sys: '/fence'
+    },
+    children: [
+      {
+        path: '/area/defenceList',
+        name: 'DefenceList',
+        component: () => import('@/views/area/defenceList'),
+        meta: { title: '防区列表', icon: '', permission: ['/area/defenceList'], keepAlive: true }
+      }
+    ]
+  },
+  {
+    path: '/device',
+    component: Layout,
+    redirect: '/device',
+    name: 'Device',
+    alwaysShow: true,
+    meta: {
+      title: '设备管理',
+      icon: 'icon-device', // 图标
+      permission: ['/device'], // 权限名称
+      sys: '/fence'
+    },
+    children: [
+      {
+        path: '/device/list',
+        name: 'DeviceList',
+        component: () => import('@/views/deviceManage/deviceList'),
+        meta: { title: '设备列表', icon: '', permission: ['/device/list'], keepAlive: true }
+      }
+    ]
+  }
+]

diff --git a/src/api/area.js b/src/api/area.js
index 9a17cfa..840acf2 100644
--- a/src/api/area.js
+++ b/src/api/area.js
@@ -105,8 +105,8 @@
 }
 
 // 根据当前子系统返回areaType
-export function getAreaTypeBySubSystem(system) {
-  switch (system.code) {
+export function getAreaTypeBySubSystem(sysCode) {
+  switch (sysCode) {
     case 'door':
       return '1'
     case 'fence':
@@ -119,3 +119,11 @@
       return ''
   }
 }
+
+// 获取虹膜设备的所在区域
+export function getIrisAreaList() {
+  return request({
+    url: '/region/getIrisAreaList',
+    method: 'get'
+  })
+}
diff --git a/src/router/index.js b/src/router/index.js
index 823269b..9feb573 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -10,6 +10,7 @@
 import Layout from '../views/layout/Layout'
 import { systemRouters } from './modules/system'
 import { doorSysRouters } from './modules/doorSys'
+import { fenceSysRouters } from './modules/fenceSys'
 import { ctrlSysRouters } from './modules/ctrlSys'
 
 /**
@@ -89,6 +90,7 @@
 export const asyncRouterMap = [
   ...systemRouters,
   ...doorSysRouters,
+  ...fenceSysRouters,
   ...ctrlSysRouters,
   { path: '*', redirect: '/404', hidden: true, meta: {}}
 ]
diff --git a/src/router/modules/doorSys.js b/src/router/modules/doorSys.js
index 235bac9..1a78748 100644
--- a/src/router/modules/doorSys.js
+++ b/src/router/modules/doorSys.js
@@ -4,7 +4,7 @@
   {
     path: '/door',
     name: 'door',
-    redirect: '/visitor',
+    redirect: '/door/alarm',
     hidden: true,
     meta: {
       title: '营门管理子系统',
@@ -13,47 +13,74 @@
     }
   },
   {
-    path: '/visitor',
+    path: '/door/alarm',
     component: Layout,
-    redirect: '/visitor/add',
+    redirect: '/door/alarm/now',
+    name: 'Alarm',
+    alwaysShow: true,
+    meta: {
+      title: '报警管理',
+      icon: 'icon-alarm', // 图标
+      permission: ['/door/alarm'], // 权限名称
+      sys: '/door'
+    },
+    children: [
+      {
+        path: '/door/alarm/now',
+        name: 'AlarmNow',
+        component: () => import('@/views/alarm/alarmNow'),
+        meta: { title: '当前报警', icon: '', permission: ['/door/alarm/now'], keepAlive: true }
+      },
+      {
+        path: '/door/alarm/list',
+        name: 'AlarmList',
+        component: () => import('@/views/alarm/alarmList'),
+        meta: { title: '报警记录', icon: '', permission: ['/door/alarm/list'], keepAlive: true }
+      }
+    ]
+  },
+  {
+    path: '/door/visitor',
+    component: Layout,
+    redirect: '/door/visitor/add',
     name: 'Visitor',
     alwaysShow: true,
     meta: {
       title: '访客管理',
       icon: 'icon-visitor', // 图标
-      permission: ['/visitor'], // 权限名称
+      permission: ['/door/visitor'], // 权限名称
       sys: '/door'
     },
     children: [
       {
-        path: '/visitor/add',
+        path: '/door/visitor/add',
         name: 'VisitorAdd',
         component: () => import('@/views/visitor/visitorAdd'),
-        meta: { title: '访客登记', icon: '', permission: ['/visitor/add'], keepAlive: true }
+        meta: { title: '访客登记', icon: '', permission: ['/door/visitor/add'], keepAlive: true }
       },
       {
-        path: '/visitor/addCar',
+        path: '/door/visitor/addCar',
         name: 'VisitorAddCar',
         component: () => import('@/views/visitor/visitorAddCar'),
-        meta: { title: '访客车辆登记', icon: '', permission: ['/visitor/addCar'], keepAlive: true }
+        meta: { title: '访客车辆登记', icon: '', permission: ['/door/visitor/addCar'], keepAlive: true }
       },
       {
-        path: '/visitor/today',
+        path: '/door/visitor/today',
         name: 'VisitorToday',
         component: () => import('@/views/visitor/visitorTodayList'),
-        meta: { title: '当日来访人员', icon: '', permission: ['/visitor/today'], keepAlive: true }
+        meta: { title: '当日来访人员', icon: '', permission: ['/door/visitor/today'], keepAlive: true }
       },
       {
-        path: '/visitor/carToday',
+        path: '/door/visitor/carToday',
         name: 'VisitorCarToday',
         component: () => import('@/views/visitor/visitorCarTodayList'),
-        meta: { title: '当日来访车辆', icon: '', permission: ['/visitor/carToday'], keepAlive: true }
+        meta: { title: '当日来访车辆', icon: '', permission: ['/door/visitor/carToday'], keepAlive: true }
       },
       {
-        path: '/visitor/list',
+        path: '/door/visitor/list',
         name: 'VisitorList',
         component: () => import('@/views/visitor/visitorList'),
-        meta: { title: '来访记录', icon: '', permission: ['/visitor/list'], keepAlive: true }
+        meta: { title: '来访记录', icon: '', permission: ['/door/visitor/list'], keepAlive: true }
       }
     ]
   },
@@ -92,27 +119,6 @@
     ]
   },
   {
-    path: '/device',
-    component: Layout,
-    redirect: '/device',
-    name: 'Device',
-    alwaysShow: true,
-    meta: {
-      title: '设备管理',
-      icon: 'icon-device', // 图标
-      permission: ['/device'], // 权限名称
-      sys: '/door'
-    },
-    children: [
-      {
-        path: '/device/list',
-        name: 'DeviceList',
-        component: () => import('@/views/deviceManage/deviceList'),
-        meta: { title: '设备列表', icon: '', permission: ['/device/list'], keepAlive: true }
-      }
-    ]
-  },
-  {
     path: '/car',
     component: Layout,
     redirect: '/car',
@@ -141,6 +147,27 @@
     ]
   },
   {
+    path: '/device',
+    component: Layout,
+    redirect: '/device',
+    name: 'Device',
+    alwaysShow: true,
+    meta: {
+      title: '设备管理',
+      icon: 'icon-device', // 图标
+      permission: ['/device'], // 权限名称
+      sys: '/door'
+    },
+    children: [
+      {
+        path: '/device/list',
+        name: 'DeviceList',
+        component: () => import('@/views/deviceManage/deviceList'),
+        meta: { title: '设备列表', icon: '', permission: ['/device/list'], keepAlive: true }
+      }
+    ]
+  },
+  {
     path: '/area',
     component: Layout,
     redirect: '/area',
@@ -212,31 +239,5 @@
       }
     ]
   },
-  {
-    path: '/alarm',
-    component: Layout,
-    redirect: '/alarm',
-    name: 'Alarm',
-    alwaysShow: true,
-    meta: {
-      title: '报警管理',
-      icon: 'icon-alarm', // 图标
-      permission: ['/alarm'], // 权限名称
-      sys: '/door'
-    },
-    children: [
-      {
-        path: '/alarm/now',
-        name: 'AlarmNow',
-        component: () => import('@/views/alarm/alarmNow'),
-        meta: { title: '当前报警', icon: '', permission: ['/alarm/now'], keepAlive: true }
-      },
-      {
-        path: '/alarm/list',
-        name: 'AlarmList',
-        component: () => import('@/views/alarm/alarmList'),
-        meta: { title: '报警记录', icon: '', permission: ['/alarm/list'], keepAlive: true }
-      }
-    ]
-  }
+
 ]
diff --git a/src/router/modules/fenceSys.js b/src/router/modules/fenceSys.js
new file mode 100644
index 0000000..c07c0f8
--- /dev/null
+++ b/src/router/modules/fenceSys.js
@@ -0,0 +1,84 @@
+/* Layout */
+import Layout from '../../views/layout/Layout'
+export const fenceSysRouters = [
+  {
+    path: '/fence',
+    name: 'fence',
+    redirect: '/fence/alarm',
+    hidden: true,
+    meta: {
+      title: '周界管理子系统',
+      permission: ['/fence'],
+      isSys: true
+    }
+  },
+  {
+    path: '/fence/alarm',
+    component: Layout,
+    redirect: '/fence/alarm',
+    name: 'Alarm',
+    alwaysShow: true,
+    meta: {
+      title: '报警管理',
+      icon: 'icon-alarm', // 图标
+      permission: ['/fence/alarm'], // 权限名称
+      sys: '/fence'
+    },
+    children: [
+      {
+        path: '/fence/alarm/now',
+        name: 'AlarmNow',
+        component: () => import('@/views/alarm/alarmNow'),
+        meta: { title: '当前报警', icon: '', permission: ['/fence/alarm/now'], keepAlive: true }
+      },
+      {
+        path: '/fence/alarm/list',
+        name: 'AlarmList',
+        component: () => import('@/views/alarm/alarmList'),
+        meta: { title: '报警记录', icon: '', permission: ['/fence/alarm/list'], keepAlive: true }
+      }
+    ]
+  },
+  {
+    path: '/area',
+    component: Layout,
+    redirect: '/area',
+    name: 'Area',
+    alwaysShow: true,
+    meta: {
+      title: '区域管理',
+      icon: 'icon-area', // 图标
+      permission: ['/area'], // 权限名称
+      sys: '/fence'
+    },
+    children: [
+      {
+        path: '/area/defenceList',
+        name: 'DefenceList',
+        component: () => import('@/views/area/defenceList'),
+        meta: { title: '防区列表', icon: '', permission: ['/area/defenceList'], keepAlive: true }
+      }
+    ]
+  },
+  {
+    path: '/device',
+    component: Layout,
+    redirect: '/device',
+    name: 'Device',
+    alwaysShow: true,
+    meta: {
+      title: '设备管理',
+      icon: 'icon-device', // 图标
+      permission: ['/device'], // 权限名称
+      sys: '/fence'
+    },
+    children: [
+      {
+        path: '/device/list',
+        name: 'DeviceList',
+        component: () => import('@/views/deviceManage/deviceList'),
+        meta: { title: '设备列表', icon: '', permission: ['/device/list'], keepAlive: true }
+      }
+    ]
+  }
+]
diff --git a/src/utils/auth.js b/src/utils/auth.js
index 44af377..5cbe390 100644
--- a/src/utils/auth.js
+++ b/src/utils/auth.js
@@ -40,7 +40,6 @@
 
 export function setCurrentSys(currentSystem) {
   console.log('in auth setCurrentSys')
-  console.log(currentSystem)
   const currentSys = JSON.stringify(currentSystem)
   return window.localStorage.setItem(CurrentSystem, currentSys)
 }

diff --git a/src/api/area.js b/src/api/area.js
index 9a17cfa..840acf2 100644
--- a/src/api/area.js
+++ b/src/api/area.js
@@ -105,8 +105,8 @@
 }
 
 // 根据当前子系统返回areaType
-export function getAreaTypeBySubSystem(system) {
-  switch (system.code) {
+export function getAreaTypeBySubSystem(sysCode) {
+  switch (sysCode) {
     case 'door':
       return '1'
     case 'fence':
@@ -119,3 +119,11 @@
       return ''
   }
 }
+
+// 获取虹膜设备的所在区域
+export function getIrisAreaList() {
+  return request({
+    url: '/region/getIrisAreaList',
+    method: 'get'
+  })
+}
diff --git a/src/router/index.js b/src/router/index.js
index 823269b..9feb573 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -10,6 +10,7 @@
 import Layout from '../views/layout/Layout'
 import { systemRouters } from './modules/system'
 import { doorSysRouters } from './modules/doorSys'
+import { fenceSysRouters } from './modules/fenceSys'
 import { ctrlSysRouters } from './modules/ctrlSys'
 
 /**
@@ -89,6 +90,7 @@
 export const asyncRouterMap = [
   ...systemRouters,
   ...doorSysRouters,
+  ...fenceSysRouters,
   ...ctrlSysRouters,
   { path: '*', redirect: '/404', hidden: true, meta: {}}
 ]
diff --git a/src/router/modules/doorSys.js b/src/router/modules/doorSys.js
index 235bac9..1a78748 100644
--- a/src/router/modules/doorSys.js
+++ b/src/router/modules/doorSys.js
@@ -4,7 +4,7 @@
   {
     path: '/door',
     name: 'door',
-    redirect: '/visitor',
+    redirect: '/door/alarm',
     hidden: true,
     meta: {
       title: '营门管理子系统',
@@ -13,47 +13,74 @@
     }
   },
   {
-    path: '/visitor',
+    path: '/door/alarm',
     component: Layout,
-    redirect: '/visitor/add',
+    redirect: '/door/alarm/now',
+    name: 'Alarm',
+    alwaysShow: true,
+    meta: {
+      title: '报警管理',
+      icon: 'icon-alarm', // 图标
+      permission: ['/door/alarm'], // 权限名称
+      sys: '/door'
+    },
+    children: [
+      {
+        path: '/door/alarm/now',
+        name: 'AlarmNow',
+        component: () => import('@/views/alarm/alarmNow'),
+        meta: { title: '当前报警', icon: '', permission: ['/door/alarm/now'], keepAlive: true }
+      },
+      {
+        path: '/door/alarm/list',
+        name: 'AlarmList',
+        component: () => import('@/views/alarm/alarmList'),
+        meta: { title: '报警记录', icon: '', permission: ['/door/alarm/list'], keepAlive: true }
+      }
+    ]
+  },
+  {
+    path: '/door/visitor',
+    component: Layout,
+    redirect: '/door/visitor/add',
     name: 'Visitor',
     alwaysShow: true,
     meta: {
       title: '访客管理',
       icon: 'icon-visitor', // 图标
-      permission: ['/visitor'], // 权限名称
+      permission: ['/door/visitor'], // 权限名称
       sys: '/door'
     },
     children: [
       {
-        path: '/visitor/add',
+        path: '/door/visitor/add',
         name: 'VisitorAdd',
         component: () => import('@/views/visitor/visitorAdd'),
-        meta: { title: '访客登记', icon: '', permission: ['/visitor/add'], keepAlive: true }
+        meta: { title: '访客登记', icon: '', permission: ['/door/visitor/add'], keepAlive: true }
       },
       {
-        path: '/visitor/addCar',
+        path: '/door/visitor/addCar',
         name: 'VisitorAddCar',
         component: () => import('@/views/visitor/visitorAddCar'),
-        meta: { title: '访客车辆登记', icon: '', permission: ['/visitor/addCar'], keepAlive: true }
+        meta: { title: '访客车辆登记', icon: '', permission: ['/door/visitor/addCar'], keepAlive: true }
       },
       {
-        path: '/visitor/today',
+        path: '/door/visitor/today',
         name: 'VisitorToday',
         component: () => import('@/views/visitor/visitorTodayList'),
-        meta: { title: '当日来访人员', icon: '', permission: ['/visitor/today'], keepAlive: true }
+        meta: { title: '当日来访人员', icon: '', permission: ['/door/visitor/today'], keepAlive: true }
       },
       {
-        path: '/visitor/carToday',
+        path: '/door/visitor/carToday',
         name: 'VisitorCarToday',
         component: () => import('@/views/visitor/visitorCarTodayList'),
-        meta: { title: '当日来访车辆', icon: '', permission: ['/visitor/carToday'], keepAlive: true }
+        meta: { title: '当日来访车辆', icon: '', permission: ['/door/visitor/carToday'], keepAlive: true }
       },
       {
-        path: '/visitor/list',
+        path: '/door/visitor/list',
         name: 'VisitorList',
         component: () => import('@/views/visitor/visitorList'),
-        meta: { title: '来访记录', icon: '', permission: ['/visitor/list'], keepAlive: true }
+        meta: { title: '来访记录', icon: '', permission: ['/door/visitor/list'], keepAlive: true }
       }
     ]
   },
@@ -92,27 +119,6 @@
     ]
   },
   {
-    path: '/device',
-    component: Layout,
-    redirect: '/device',
-    name: 'Device',
-    alwaysShow: true,
-    meta: {
-      title: '设备管理',
-      icon: 'icon-device', // 图标
-      permission: ['/device'], // 权限名称
-      sys: '/door'
-    },
-    children: [
-      {
-        path: '/device/list',
-        name: 'DeviceList',
-        component: () => import('@/views/deviceManage/deviceList'),
-        meta: { title: '设备列表', icon: '', permission: ['/device/list'], keepAlive: true }
-      }
-    ]
-  },
-  {
     path: '/car',
     component: Layout,
     redirect: '/car',
@@ -141,6 +147,27 @@
     ]
   },
   {
+    path: '/device',
+    component: Layout,
+    redirect: '/device',
+    name: 'Device',
+    alwaysShow: true,
+    meta: {
+      title: '设备管理',
+      icon: 'icon-device', // 图标
+      permission: ['/device'], // 权限名称
+      sys: '/door'
+    },
+    children: [
+      {
+        path: '/device/list',
+        name: 'DeviceList',
+        component: () => import('@/views/deviceManage/deviceList'),
+        meta: { title: '设备列表', icon: '', permission: ['/device/list'], keepAlive: true }
+      }
+    ]
+  },
+  {
     path: '/area',
     component: Layout,
     redirect: '/area',
@@ -212,31 +239,5 @@
       }
     ]
   },
-  {
-    path: '/alarm',
-    component: Layout,
-    redirect: '/alarm',
-    name: 'Alarm',
-    alwaysShow: true,
-    meta: {
-      title: '报警管理',
-      icon: 'icon-alarm', // 图标
-      permission: ['/alarm'], // 权限名称
-      sys: '/door'
-    },
-    children: [
-      {
-        path: '/alarm/now',
-        name: 'AlarmNow',
-        component: () => import('@/views/alarm/alarmNow'),
-        meta: { title: '当前报警', icon: '', permission: ['/alarm/now'], keepAlive: true }
-      },
-      {
-        path: '/alarm/list',
-        name: 'AlarmList',
-        component: () => import('@/views/alarm/alarmList'),
-        meta: { title: '报警记录', icon: '', permission: ['/alarm/list'], keepAlive: true }
-      }
-    ]
-  }
+
 ]
diff --git a/src/router/modules/fenceSys.js b/src/router/modules/fenceSys.js
new file mode 100644
index 0000000..c07c0f8
--- /dev/null
+++ b/src/router/modules/fenceSys.js
@@ -0,0 +1,84 @@
+/* Layout */
+import Layout from '../../views/layout/Layout'
+export const fenceSysRouters = [
+  {
+    path: '/fence',
+    name: 'fence',
+    redirect: '/fence/alarm',
+    hidden: true,
+    meta: {
+      title: '周界管理子系统',
+      permission: ['/fence'],
+      isSys: true
+    }
+  },
+  {
+    path: '/fence/alarm',
+    component: Layout,
+    redirect: '/fence/alarm',
+    name: 'Alarm',
+    alwaysShow: true,
+    meta: {
+      title: '报警管理',
+      icon: 'icon-alarm', // 图标
+      permission: ['/fence/alarm'], // 权限名称
+      sys: '/fence'
+    },
+    children: [
+      {
+        path: '/fence/alarm/now',
+        name: 'AlarmNow',
+        component: () => import('@/views/alarm/alarmNow'),
+        meta: { title: '当前报警', icon: '', permission: ['/fence/alarm/now'], keepAlive: true }
+      },
+      {
+        path: '/fence/alarm/list',
+        name: 'AlarmList',
+        component: () => import('@/views/alarm/alarmList'),
+        meta: { title: '报警记录', icon: '', permission: ['/fence/alarm/list'], keepAlive: true }
+      }
+    ]
+  },
+  {
+    path: '/area',
+    component: Layout,
+    redirect: '/area',
+    name: 'Area',
+    alwaysShow: true,
+    meta: {
+      title: '区域管理',
+      icon: 'icon-area', // 图标
+      permission: ['/area'], // 权限名称
+      sys: '/fence'
+    },
+    children: [
+      {
+        path: '/area/defenceList',
+        name: 'DefenceList',
+        component: () => import('@/views/area/defenceList'),
+        meta: { title: '防区列表', icon: '', permission: ['/area/defenceList'], keepAlive: true }
+      }
+    ]
+  },
+  {
+    path: '/device',
+    component: Layout,
+    redirect: '/device',
+    name: 'Device',
+    alwaysShow: true,
+    meta: {
+      title: '设备管理',
+      icon: 'icon-device', // 图标
+      permission: ['/device'], // 权限名称
+      sys: '/fence'
+    },
+    children: [
+      {
+        path: '/device/list',
+        name: 'DeviceList',
+        component: () => import('@/views/deviceManage/deviceList'),
+        meta: { title: '设备列表', icon: '', permission: ['/device/list'], keepAlive: true }
+      }
+    ]
+  }
+]
diff --git a/src/utils/auth.js b/src/utils/auth.js
index 44af377..5cbe390 100644
--- a/src/utils/auth.js
+++ b/src/utils/auth.js
@@ -40,7 +40,6 @@
 
 export function setCurrentSys(currentSystem) {
   console.log('in auth setCurrentSys')
-  console.log(currentSystem)
   const currentSys = JSON.stringify(currentSystem)
   return window.localStorage.setItem(CurrentSystem, currentSys)
 }
diff --git a/src/views/alarm/alarmNow.vue b/src/views/alarm/alarmNow.vue
index fa8ba38..61a1a98 100644
--- a/src/views/alarm/alarmNow.vue
+++ b/src/views/alarm/alarmNow.vue
@@ -94,7 +94,7 @@
 
 <script>
 import { getAlarmNowList } from '@/api/alarm'
-import { getRegion } from '@/api/area'
+import { getRegion, getAreaTypeBySubSystem } from '@/api/area'
 import { getDetailDevice } from '@/api/device'
 import { getAlarmContent } from '@/api/allDict'
 import { formatToString } from '@/utils/calendarUtil'
@@ -136,11 +136,6 @@
           value: 'areaPosition',
           align: 'center'
         },
-        // {
-        //   text: '所属防护',
-        //   value: 'areaType',
-        //   align: 'center'
-        // },
         {
           text: '设备编号',
           value: 'devcode',
@@ -178,9 +173,15 @@
     }
   },
   created() {
+    // 当前系统
+    const currSys = this.$store.getters.currentSystem
+    // 获取当前系统对应的区域id
+    this.listQuery.areaType = getAreaTypeBySubSystem(currSys.code)
     this.fetchAlarmContentsData()
     this.fetchRegionsData()
-    this.fetchData()// 获取数据
+  },
+  activated() {
+    this.fetchData() // 获取数据
   },
   methods: {
     alarmCancel(row) {

diff --git a/src/api/area.js b/src/api/area.js
index 9a17cfa..840acf2 100644
--- a/src/api/area.js
+++ b/src/api/area.js
@@ -105,8 +105,8 @@
 }
 
 // 根据当前子系统返回areaType
-export function getAreaTypeBySubSystem(system) {
-  switch (system.code) {
+export function getAreaTypeBySubSystem(sysCode) {
+  switch (sysCode) {
     case 'door':
       return '1'
     case 'fence':
@@ -119,3 +119,11 @@
       return ''
   }
 }
+
+// 获取虹膜设备的所在区域
+export function getIrisAreaList() {
+  return request({
+    url: '/region/getIrisAreaList',
+    method: 'get'
+  })
+}
diff --git a/src/router/index.js b/src/router/index.js
index 823269b..9feb573 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -10,6 +10,7 @@
 import Layout from '../views/layout/Layout'
 import { systemRouters } from './modules/system'
 import { doorSysRouters } from './modules/doorSys'
+import { fenceSysRouters } from './modules/fenceSys'
 import { ctrlSysRouters } from './modules/ctrlSys'
 
 /**
@@ -89,6 +90,7 @@
 export const asyncRouterMap = [
   ...systemRouters,
   ...doorSysRouters,
+  ...fenceSysRouters,
   ...ctrlSysRouters,
   { path: '*', redirect: '/404', hidden: true, meta: {}}
 ]
diff --git a/src/router/modules/doorSys.js b/src/router/modules/doorSys.js
index 235bac9..1a78748 100644
--- a/src/router/modules/doorSys.js
+++ b/src/router/modules/doorSys.js
@@ -4,7 +4,7 @@
   {
     path: '/door',
     name: 'door',
-    redirect: '/visitor',
+    redirect: '/door/alarm',
     hidden: true,
     meta: {
       title: '营门管理子系统',
@@ -13,47 +13,74 @@
     }
   },
   {
-    path: '/visitor',
+    path: '/door/alarm',
     component: Layout,
-    redirect: '/visitor/add',
+    redirect: '/door/alarm/now',
+    name: 'Alarm',
+    alwaysShow: true,
+    meta: {
+      title: '报警管理',
+      icon: 'icon-alarm', // 图标
+      permission: ['/door/alarm'], // 权限名称
+      sys: '/door'
+    },
+    children: [
+      {
+        path: '/door/alarm/now',
+        name: 'AlarmNow',
+        component: () => import('@/views/alarm/alarmNow'),
+        meta: { title: '当前报警', icon: '', permission: ['/door/alarm/now'], keepAlive: true }
+      },
+      {
+        path: '/door/alarm/list',
+        name: 'AlarmList',
+        component: () => import('@/views/alarm/alarmList'),
+        meta: { title: '报警记录', icon: '', permission: ['/door/alarm/list'], keepAlive: true }
+      }
+    ]
+  },
+  {
+    path: '/door/visitor',
+    component: Layout,
+    redirect: '/door/visitor/add',
     name: 'Visitor',
     alwaysShow: true,
     meta: {
       title: '访客管理',
       icon: 'icon-visitor', // 图标
-      permission: ['/visitor'], // 权限名称
+      permission: ['/door/visitor'], // 权限名称
       sys: '/door'
     },
     children: [
       {
-        path: '/visitor/add',
+        path: '/door/visitor/add',
         name: 'VisitorAdd',
         component: () => import('@/views/visitor/visitorAdd'),
-        meta: { title: '访客登记', icon: '', permission: ['/visitor/add'], keepAlive: true }
+        meta: { title: '访客登记', icon: '', permission: ['/door/visitor/add'], keepAlive: true }
       },
       {
-        path: '/visitor/addCar',
+        path: '/door/visitor/addCar',
         name: 'VisitorAddCar',
         component: () => import('@/views/visitor/visitorAddCar'),
-        meta: { title: '访客车辆登记', icon: '', permission: ['/visitor/addCar'], keepAlive: true }
+        meta: { title: '访客车辆登记', icon: '', permission: ['/door/visitor/addCar'], keepAlive: true }
       },
       {
-        path: '/visitor/today',
+        path: '/door/visitor/today',
         name: 'VisitorToday',
         component: () => import('@/views/visitor/visitorTodayList'),
-        meta: { title: '当日来访人员', icon: '', permission: ['/visitor/today'], keepAlive: true }
+        meta: { title: '当日来访人员', icon: '', permission: ['/door/visitor/today'], keepAlive: true }
       },
       {
-        path: '/visitor/carToday',
+        path: '/door/visitor/carToday',
         name: 'VisitorCarToday',
         component: () => import('@/views/visitor/visitorCarTodayList'),
-        meta: { title: '当日来访车辆', icon: '', permission: ['/visitor/carToday'], keepAlive: true }
+        meta: { title: '当日来访车辆', icon: '', permission: ['/door/visitor/carToday'], keepAlive: true }
       },
       {
-        path: '/visitor/list',
+        path: '/door/visitor/list',
         name: 'VisitorList',
         component: () => import('@/views/visitor/visitorList'),
-        meta: { title: '来访记录', icon: '', permission: ['/visitor/list'], keepAlive: true }
+        meta: { title: '来访记录', icon: '', permission: ['/door/visitor/list'], keepAlive: true }
       }
     ]
   },
@@ -92,27 +119,6 @@
     ]
   },
   {
-    path: '/device',
-    component: Layout,
-    redirect: '/device',
-    name: 'Device',
-    alwaysShow: true,
-    meta: {
-      title: '设备管理',
-      icon: 'icon-device', // 图标
-      permission: ['/device'], // 权限名称
-      sys: '/door'
-    },
-    children: [
-      {
-        path: '/device/list',
-        name: 'DeviceList',
-        component: () => import('@/views/deviceManage/deviceList'),
-        meta: { title: '设备列表', icon: '', permission: ['/device/list'], keepAlive: true }
-      }
-    ]
-  },
-  {
     path: '/car',
     component: Layout,
     redirect: '/car',
@@ -141,6 +147,27 @@
     ]
   },
   {
+    path: '/device',
+    component: Layout,
+    redirect: '/device',
+    name: 'Device',
+    alwaysShow: true,
+    meta: {
+      title: '设备管理',
+      icon: 'icon-device', // 图标
+      permission: ['/device'], // 权限名称
+      sys: '/door'
+    },
+    children: [
+      {
+        path: '/device/list',
+        name: 'DeviceList',
+        component: () => import('@/views/deviceManage/deviceList'),
+        meta: { title: '设备列表', icon: '', permission: ['/device/list'], keepAlive: true }
+      }
+    ]
+  },
+  {
     path: '/area',
     component: Layout,
     redirect: '/area',
@@ -212,31 +239,5 @@
       }
     ]
   },
-  {
-    path: '/alarm',
-    component: Layout,
-    redirect: '/alarm',
-    name: 'Alarm',
-    alwaysShow: true,
-    meta: {
-      title: '报警管理',
-      icon: 'icon-alarm', // 图标
-      permission: ['/alarm'], // 权限名称
-      sys: '/door'
-    },
-    children: [
-      {
-        path: '/alarm/now',
-        name: 'AlarmNow',
-        component: () => import('@/views/alarm/alarmNow'),
-        meta: { title: '当前报警', icon: '', permission: ['/alarm/now'], keepAlive: true }
-      },
-      {
-        path: '/alarm/list',
-        name: 'AlarmList',
-        component: () => import('@/views/alarm/alarmList'),
-        meta: { title: '报警记录', icon: '', permission: ['/alarm/list'], keepAlive: true }
-      }
-    ]
-  }
+
 ]
diff --git a/src/router/modules/fenceSys.js b/src/router/modules/fenceSys.js
new file mode 100644
index 0000000..c07c0f8
--- /dev/null
+++ b/src/router/modules/fenceSys.js
@@ -0,0 +1,84 @@
+/* Layout */
+import Layout from '../../views/layout/Layout'
+export const fenceSysRouters = [
+  {
+    path: '/fence',
+    name: 'fence',
+    redirect: '/fence/alarm',
+    hidden: true,
+    meta: {
+      title: '周界管理子系统',
+      permission: ['/fence'],
+      isSys: true
+    }
+  },
+  {
+    path: '/fence/alarm',
+    component: Layout,
+    redirect: '/fence/alarm',
+    name: 'Alarm',
+    alwaysShow: true,
+    meta: {
+      title: '报警管理',
+      icon: 'icon-alarm', // 图标
+      permission: ['/fence/alarm'], // 权限名称
+      sys: '/fence'
+    },
+    children: [
+      {
+        path: '/fence/alarm/now',
+        name: 'AlarmNow',
+        component: () => import('@/views/alarm/alarmNow'),
+        meta: { title: '当前报警', icon: '', permission: ['/fence/alarm/now'], keepAlive: true }
+      },
+      {
+        path: '/fence/alarm/list',
+        name: 'AlarmList',
+        component: () => import('@/views/alarm/alarmList'),
+        meta: { title: '报警记录', icon: '', permission: ['/fence/alarm/list'], keepAlive: true }
+      }
+    ]
+  },
+  {
+    path: '/area',
+    component: Layout,
+    redirect: '/area',
+    name: 'Area',
+    alwaysShow: true,
+    meta: {
+      title: '区域管理',
+      icon: 'icon-area', // 图标
+      permission: ['/area'], // 权限名称
+      sys: '/fence'
+    },
+    children: [
+      {
+        path: '/area/defenceList',
+        name: 'DefenceList',
+        component: () => import('@/views/area/defenceList'),
+        meta: { title: '防区列表', icon: '', permission: ['/area/defenceList'], keepAlive: true }
+      }
+    ]
+  },
+  {
+    path: '/device',
+    component: Layout,
+    redirect: '/device',
+    name: 'Device',
+    alwaysShow: true,
+    meta: {
+      title: '设备管理',
+      icon: 'icon-device', // 图标
+      permission: ['/device'], // 权限名称
+      sys: '/fence'
+    },
+    children: [
+      {
+        path: '/device/list',
+        name: 'DeviceList',
+        component: () => import('@/views/deviceManage/deviceList'),
+        meta: { title: '设备列表', icon: '', permission: ['/device/list'], keepAlive: true }
+      }
+    ]
+  }
+]
diff --git a/src/utils/auth.js b/src/utils/auth.js
index 44af377..5cbe390 100644
--- a/src/utils/auth.js
+++ b/src/utils/auth.js
@@ -40,7 +40,6 @@
 
 export function setCurrentSys(currentSystem) {
   console.log('in auth setCurrentSys')
-  console.log(currentSystem)
   const currentSys = JSON.stringify(currentSystem)
   return window.localStorage.setItem(CurrentSystem, currentSys)
 }
diff --git a/src/views/alarm/alarmNow.vue b/src/views/alarm/alarmNow.vue
index fa8ba38..61a1a98 100644
--- a/src/views/alarm/alarmNow.vue
+++ b/src/views/alarm/alarmNow.vue
@@ -94,7 +94,7 @@
 
 <script>
 import { getAlarmNowList } from '@/api/alarm'
-import { getRegion } from '@/api/area'
+import { getRegion, getAreaTypeBySubSystem } from '@/api/area'
 import { getDetailDevice } from '@/api/device'
 import { getAlarmContent } from '@/api/allDict'
 import { formatToString } from '@/utils/calendarUtil'
@@ -136,11 +136,6 @@
           value: 'areaPosition',
           align: 'center'
         },
-        // {
-        //   text: '所属防护',
-        //   value: 'areaType',
-        //   align: 'center'
-        // },
         {
           text: '设备编号',
           value: 'devcode',
@@ -178,9 +173,15 @@
     }
   },
   created() {
+    // 当前系统
+    const currSys = this.$store.getters.currentSystem
+    // 获取当前系统对应的区域id
+    this.listQuery.areaType = getAreaTypeBySubSystem(currSys.code)
     this.fetchAlarmContentsData()
     this.fetchRegionsData()
-    this.fetchData()// 获取数据
+  },
+  activated() {
+    this.fetchData() // 获取数据
   },
   methods: {
     alarmCancel(row) {
diff --git a/src/views/ctrl/index.vue b/src/views/ctrl/index.vue
index 93efb6f..fd36f2b 100644
--- a/src/views/ctrl/index.vue
+++ b/src/views/ctrl/index.vue
@@ -129,7 +129,7 @@
     border-radius: 16px;
     float: left;
     margin: 10px;
-    box-shadow: 2px 2px 8px #666666;
+    box-shadow: 1px 1px 5px #999;
   }
   .sub-title {
     font-weight: bold;
@@ -141,8 +141,8 @@
   }
   .statis-block {
     text-align: center;
-    margin: 20px 10px 0px 10px;
-    padding: 10px;
+    margin: 0px 10px 0px 10px;
+    padding: 0px 10px 10px 10px;
     color: #fff;
     font-weight: bold;
     letter-spacing: 1px;
@@ -165,7 +165,7 @@
     margin-top: 20px;
     border-radius: 16px;
     background-color: #FFFFFF;
-    box-shadow: 2px 2px 8px #666666;
+    box-shadow: 1px 1px 5px #999;
   }
 
   #today-visitor {

diff --git a/src/api/area.js b/src/api/area.js
index 9a17cfa..840acf2 100644
--- a/src/api/area.js
+++ b/src/api/area.js
@@ -105,8 +105,8 @@
 }
 
 // 根据当前子系统返回areaType
-export function getAreaTypeBySubSystem(system) {
-  switch (system.code) {
+export function getAreaTypeBySubSystem(sysCode) {
+  switch (sysCode) {
     case 'door':
       return '1'
     case 'fence':
@@ -119,3 +119,11 @@
       return ''
   }
 }
+
+// 获取虹膜设备的所在区域
+export function getIrisAreaList() {
+  return request({
+    url: '/region/getIrisAreaList',
+    method: 'get'
+  })
+}
diff --git a/src/router/index.js b/src/router/index.js
index 823269b..9feb573 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -10,6 +10,7 @@
 import Layout from '../views/layout/Layout'
 import { systemRouters } from './modules/system'
 import { doorSysRouters } from './modules/doorSys'
+import { fenceSysRouters } from './modules/fenceSys'
 import { ctrlSysRouters } from './modules/ctrlSys'
 
 /**
@@ -89,6 +90,7 @@
 export const asyncRouterMap = [
   ...systemRouters,
   ...doorSysRouters,
+  ...fenceSysRouters,
   ...ctrlSysRouters,
   { path: '*', redirect: '/404', hidden: true, meta: {}}
 ]
diff --git a/src/router/modules/doorSys.js b/src/router/modules/doorSys.js
index 235bac9..1a78748 100644
--- a/src/router/modules/doorSys.js
+++ b/src/router/modules/doorSys.js
@@ -4,7 +4,7 @@
   {
     path: '/door',
     name: 'door',
-    redirect: '/visitor',
+    redirect: '/door/alarm',
     hidden: true,
     meta: {
       title: '营门管理子系统',
@@ -13,47 +13,74 @@
     }
   },
   {
-    path: '/visitor',
+    path: '/door/alarm',
     component: Layout,
-    redirect: '/visitor/add',
+    redirect: '/door/alarm/now',
+    name: 'Alarm',
+    alwaysShow: true,
+    meta: {
+      title: '报警管理',
+      icon: 'icon-alarm', // 图标
+      permission: ['/door/alarm'], // 权限名称
+      sys: '/door'
+    },
+    children: [
+      {
+        path: '/door/alarm/now',
+        name: 'AlarmNow',
+        component: () => import('@/views/alarm/alarmNow'),
+        meta: { title: '当前报警', icon: '', permission: ['/door/alarm/now'], keepAlive: true }
+      },
+      {
+        path: '/door/alarm/list',
+        name: 'AlarmList',
+        component: () => import('@/views/alarm/alarmList'),
+        meta: { title: '报警记录', icon: '', permission: ['/door/alarm/list'], keepAlive: true }
+      }
+    ]
+  },
+  {
+    path: '/door/visitor',
+    component: Layout,
+    redirect: '/door/visitor/add',
     name: 'Visitor',
     alwaysShow: true,
     meta: {
       title: '访客管理',
       icon: 'icon-visitor', // 图标
-      permission: ['/visitor'], // 权限名称
+      permission: ['/door/visitor'], // 权限名称
       sys: '/door'
     },
     children: [
       {
-        path: '/visitor/add',
+        path: '/door/visitor/add',
         name: 'VisitorAdd',
         component: () => import('@/views/visitor/visitorAdd'),
-        meta: { title: '访客登记', icon: '', permission: ['/visitor/add'], keepAlive: true }
+        meta: { title: '访客登记', icon: '', permission: ['/door/visitor/add'], keepAlive: true }
       },
       {
-        path: '/visitor/addCar',
+        path: '/door/visitor/addCar',
         name: 'VisitorAddCar',
         component: () => import('@/views/visitor/visitorAddCar'),
-        meta: { title: '访客车辆登记', icon: '', permission: ['/visitor/addCar'], keepAlive: true }
+        meta: { title: '访客车辆登记', icon: '', permission: ['/door/visitor/addCar'], keepAlive: true }
       },
       {
-        path: '/visitor/today',
+        path: '/door/visitor/today',
         name: 'VisitorToday',
         component: () => import('@/views/visitor/visitorTodayList'),
-        meta: { title: '当日来访人员', icon: '', permission: ['/visitor/today'], keepAlive: true }
+        meta: { title: '当日来访人员', icon: '', permission: ['/door/visitor/today'], keepAlive: true }
       },
       {
-        path: '/visitor/carToday',
+        path: '/door/visitor/carToday',
         name: 'VisitorCarToday',
         component: () => import('@/views/visitor/visitorCarTodayList'),
-        meta: { title: '当日来访车辆', icon: '', permission: ['/visitor/carToday'], keepAlive: true }
+        meta: { title: '当日来访车辆', icon: '', permission: ['/door/visitor/carToday'], keepAlive: true }
       },
       {
-        path: '/visitor/list',
+        path: '/door/visitor/list',
         name: 'VisitorList',
         component: () => import('@/views/visitor/visitorList'),
-        meta: { title: '来访记录', icon: '', permission: ['/visitor/list'], keepAlive: true }
+        meta: { title: '来访记录', icon: '', permission: ['/door/visitor/list'], keepAlive: true }
       }
     ]
   },
@@ -92,27 +119,6 @@
     ]
   },
   {
-    path: '/device',
-    component: Layout,
-    redirect: '/device',
-    name: 'Device',
-    alwaysShow: true,
-    meta: {
-      title: '设备管理',
-      icon: 'icon-device', // 图标
-      permission: ['/device'], // 权限名称
-      sys: '/door'
-    },
-    children: [
-      {
-        path: '/device/list',
-        name: 'DeviceList',
-        component: () => import('@/views/deviceManage/deviceList'),
-        meta: { title: '设备列表', icon: '', permission: ['/device/list'], keepAlive: true }
-      }
-    ]
-  },
-  {
     path: '/car',
     component: Layout,
     redirect: '/car',
@@ -141,6 +147,27 @@
     ]
   },
   {
+    path: '/device',
+    component: Layout,
+    redirect: '/device',
+    name: 'Device',
+    alwaysShow: true,
+    meta: {
+      title: '设备管理',
+      icon: 'icon-device', // 图标
+      permission: ['/device'], // 权限名称
+      sys: '/door'
+    },
+    children: [
+      {
+        path: '/device/list',
+        name: 'DeviceList',
+        component: () => import('@/views/deviceManage/deviceList'),
+        meta: { title: '设备列表', icon: '', permission: ['/device/list'], keepAlive: true }
+      }
+    ]
+  },
+  {
     path: '/area',
     component: Layout,
     redirect: '/area',
@@ -212,31 +239,5 @@
       }
     ]
   },
-  {
-    path: '/alarm',
-    component: Layout,
-    redirect: '/alarm',
-    name: 'Alarm',
-    alwaysShow: true,
-    meta: {
-      title: '报警管理',
-      icon: 'icon-alarm', // 图标
-      permission: ['/alarm'], // 权限名称
-      sys: '/door'
-    },
-    children: [
-      {
-        path: '/alarm/now',
-        name: 'AlarmNow',
-        component: () => import('@/views/alarm/alarmNow'),
-        meta: { title: '当前报警', icon: '', permission: ['/alarm/now'], keepAlive: true }
-      },
-      {
-        path: '/alarm/list',
-        name: 'AlarmList',
-        component: () => import('@/views/alarm/alarmList'),
-        meta: { title: '报警记录', icon: '', permission: ['/alarm/list'], keepAlive: true }
-      }
-    ]
-  }
+
 ]
diff --git a/src/router/modules/fenceSys.js b/src/router/modules/fenceSys.js
new file mode 100644
index 0000000..c07c0f8
--- /dev/null
+++ b/src/router/modules/fenceSys.js
@@ -0,0 +1,84 @@
+/* Layout */
+import Layout from '../../views/layout/Layout'
+export const fenceSysRouters = [
+  {
+    path: '/fence',
+    name: 'fence',
+    redirect: '/fence/alarm',
+    hidden: true,
+    meta: {
+      title: '周界管理子系统',
+      permission: ['/fence'],
+      isSys: true
+    }
+  },
+  {
+    path: '/fence/alarm',
+    component: Layout,
+    redirect: '/fence/alarm',
+    name: 'Alarm',
+    alwaysShow: true,
+    meta: {
+      title: '报警管理',
+      icon: 'icon-alarm', // 图标
+      permission: ['/fence/alarm'], // 权限名称
+      sys: '/fence'
+    },
+    children: [
+      {
+        path: '/fence/alarm/now',
+        name: 'AlarmNow',
+        component: () => import('@/views/alarm/alarmNow'),
+        meta: { title: '当前报警', icon: '', permission: ['/fence/alarm/now'], keepAlive: true }
+      },
+      {
+        path: '/fence/alarm/list',
+        name: 'AlarmList',
+        component: () => import('@/views/alarm/alarmList'),
+        meta: { title: '报警记录', icon: '', permission: ['/fence/alarm/list'], keepAlive: true }
+      }
+    ]
+  },
+  {
+    path: '/area',
+    component: Layout,
+    redirect: '/area',
+    name: 'Area',
+    alwaysShow: true,
+    meta: {
+      title: '区域管理',
+      icon: 'icon-area', // 图标
+      permission: ['/area'], // 权限名称
+      sys: '/fence'
+    },
+    children: [
+      {
+        path: '/area/defenceList',
+        name: 'DefenceList',
+        component: () => import('@/views/area/defenceList'),
+        meta: { title: '防区列表', icon: '', permission: ['/area/defenceList'], keepAlive: true }
+      }
+    ]
+  },
+  {
+    path: '/device',
+    component: Layout,
+    redirect: '/device',
+    name: 'Device',
+    alwaysShow: true,
+    meta: {
+      title: '设备管理',
+      icon: 'icon-device', // 图标
+      permission: ['/device'], // 权限名称
+      sys: '/fence'
+    },
+    children: [
+      {
+        path: '/device/list',
+        name: 'DeviceList',
+        component: () => import('@/views/deviceManage/deviceList'),
+        meta: { title: '设备列表', icon: '', permission: ['/device/list'], keepAlive: true }
+      }
+    ]
+  }
+]
diff --git a/src/utils/auth.js b/src/utils/auth.js
index 44af377..5cbe390 100644
--- a/src/utils/auth.js
+++ b/src/utils/auth.js
@@ -40,7 +40,6 @@
 
 export function setCurrentSys(currentSystem) {
   console.log('in auth setCurrentSys')
-  console.log(currentSystem)
   const currentSys = JSON.stringify(currentSystem)
   return window.localStorage.setItem(CurrentSystem, currentSys)
 }
diff --git a/src/views/alarm/alarmNow.vue b/src/views/alarm/alarmNow.vue
index fa8ba38..61a1a98 100644
--- a/src/views/alarm/alarmNow.vue
+++ b/src/views/alarm/alarmNow.vue
@@ -94,7 +94,7 @@
 
 <script>
 import { getAlarmNowList } from '@/api/alarm'
-import { getRegion } from '@/api/area'
+import { getRegion, getAreaTypeBySubSystem } from '@/api/area'
 import { getDetailDevice } from '@/api/device'
 import { getAlarmContent } from '@/api/allDict'
 import { formatToString } from '@/utils/calendarUtil'
@@ -136,11 +136,6 @@
           value: 'areaPosition',
           align: 'center'
         },
-        // {
-        //   text: '所属防护',
-        //   value: 'areaType',
-        //   align: 'center'
-        // },
         {
           text: '设备编号',
           value: 'devcode',
@@ -178,9 +173,15 @@
     }
   },
   created() {
+    // 当前系统
+    const currSys = this.$store.getters.currentSystem
+    // 获取当前系统对应的区域id
+    this.listQuery.areaType = getAreaTypeBySubSystem(currSys.code)
     this.fetchAlarmContentsData()
     this.fetchRegionsData()
-    this.fetchData()// 获取数据
+  },
+  activated() {
+    this.fetchData() // 获取数据
   },
   methods: {
     alarmCancel(row) {
diff --git a/src/views/ctrl/index.vue b/src/views/ctrl/index.vue
index 93efb6f..fd36f2b 100644
--- a/src/views/ctrl/index.vue
+++ b/src/views/ctrl/index.vue
@@ -129,7 +129,7 @@
     border-radius: 16px;
     float: left;
     margin: 10px;
-    box-shadow: 2px 2px 8px #666666;
+    box-shadow: 1px 1px 5px #999;
   }
   .sub-title {
     font-weight: bold;
@@ -141,8 +141,8 @@
   }
   .statis-block {
     text-align: center;
-    margin: 20px 10px 0px 10px;
-    padding: 10px;
+    margin: 0px 10px 0px 10px;
+    padding: 0px 10px 10px 10px;
     color: #fff;
     font-weight: bold;
     letter-spacing: 1px;
@@ -165,7 +165,7 @@
     margin-top: 20px;
     border-radius: 16px;
     background-color: #FFFFFF;
-    box-shadow: 2px 2px 8px #666666;
+    box-shadow: 1px 1px 5px #999;
   }
 
   #today-visitor {
diff --git a/src/views/ctrl/statCharts/inOutCount.vue b/src/views/ctrl/statCharts/inOutCount.vue
index 1956305..d6f3389 100644
--- a/src/views/ctrl/statCharts/inOutCount.vue
+++ b/src/views/ctrl/statCharts/inOutCount.vue
@@ -39,7 +39,7 @@
         },
         xAxisType: 'time',
         max: [4],
-        area: true,
+        area: false,
         metrics: ['staff', 'visitor', 'car', 'visitorCar'],
         dimension: ['date']
       },

diff --git a/src/api/area.js b/src/api/area.js
index 9a17cfa..840acf2 100644
--- a/src/api/area.js
+++ b/src/api/area.js
@@ -105,8 +105,8 @@
 }
 
 // 根据当前子系统返回areaType
-export function getAreaTypeBySubSystem(system) {
-  switch (system.code) {
+export function getAreaTypeBySubSystem(sysCode) {
+  switch (sysCode) {
     case 'door':
       return '1'
     case 'fence':
@@ -119,3 +119,11 @@
       return ''
   }
 }
+
+// 获取虹膜设备的所在区域
+export function getIrisAreaList() {
+  return request({
+    url: '/region/getIrisAreaList',
+    method: 'get'
+  })
+}
diff --git a/src/router/index.js b/src/router/index.js
index 823269b..9feb573 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -10,6 +10,7 @@
 import Layout from '../views/layout/Layout'
 import { systemRouters } from './modules/system'
 import { doorSysRouters } from './modules/doorSys'
+import { fenceSysRouters } from './modules/fenceSys'
 import { ctrlSysRouters } from './modules/ctrlSys'
 
 /**
@@ -89,6 +90,7 @@
 export const asyncRouterMap = [
   ...systemRouters,
   ...doorSysRouters,
+  ...fenceSysRouters,
   ...ctrlSysRouters,
   { path: '*', redirect: '/404', hidden: true, meta: {}}
 ]
diff --git a/src/router/modules/doorSys.js b/src/router/modules/doorSys.js
index 235bac9..1a78748 100644
--- a/src/router/modules/doorSys.js
+++ b/src/router/modules/doorSys.js
@@ -4,7 +4,7 @@
   {
     path: '/door',
     name: 'door',
-    redirect: '/visitor',
+    redirect: '/door/alarm',
     hidden: true,
     meta: {
       title: '营门管理子系统',
@@ -13,47 +13,74 @@
     }
   },
   {
-    path: '/visitor',
+    path: '/door/alarm',
     component: Layout,
-    redirect: '/visitor/add',
+    redirect: '/door/alarm/now',
+    name: 'Alarm',
+    alwaysShow: true,
+    meta: {
+      title: '报警管理',
+      icon: 'icon-alarm', // 图标
+      permission: ['/door/alarm'], // 权限名称
+      sys: '/door'
+    },
+    children: [
+      {
+        path: '/door/alarm/now',
+        name: 'AlarmNow',
+        component: () => import('@/views/alarm/alarmNow'),
+        meta: { title: '当前报警', icon: '', permission: ['/door/alarm/now'], keepAlive: true }
+      },
+      {
+        path: '/door/alarm/list',
+        name: 'AlarmList',
+        component: () => import('@/views/alarm/alarmList'),
+        meta: { title: '报警记录', icon: '', permission: ['/door/alarm/list'], keepAlive: true }
+      }
+    ]
+  },
+  {
+    path: '/door/visitor',
+    component: Layout,
+    redirect: '/door/visitor/add',
     name: 'Visitor',
     alwaysShow: true,
     meta: {
       title: '访客管理',
       icon: 'icon-visitor', // 图标
-      permission: ['/visitor'], // 权限名称
+      permission: ['/door/visitor'], // 权限名称
       sys: '/door'
     },
     children: [
       {
-        path: '/visitor/add',
+        path: '/door/visitor/add',
         name: 'VisitorAdd',
         component: () => import('@/views/visitor/visitorAdd'),
-        meta: { title: '访客登记', icon: '', permission: ['/visitor/add'], keepAlive: true }
+        meta: { title: '访客登记', icon: '', permission: ['/door/visitor/add'], keepAlive: true }
       },
       {
-        path: '/visitor/addCar',
+        path: '/door/visitor/addCar',
         name: 'VisitorAddCar',
         component: () => import('@/views/visitor/visitorAddCar'),
-        meta: { title: '访客车辆登记', icon: '', permission: ['/visitor/addCar'], keepAlive: true }
+        meta: { title: '访客车辆登记', icon: '', permission: ['/door/visitor/addCar'], keepAlive: true }
       },
       {
-        path: '/visitor/today',
+        path: '/door/visitor/today',
         name: 'VisitorToday',
         component: () => import('@/views/visitor/visitorTodayList'),
-        meta: { title: '当日来访人员', icon: '', permission: ['/visitor/today'], keepAlive: true }
+        meta: { title: '当日来访人员', icon: '', permission: ['/door/visitor/today'], keepAlive: true }
       },
       {
-        path: '/visitor/carToday',
+        path: '/door/visitor/carToday',
         name: 'VisitorCarToday',
         component: () => import('@/views/visitor/visitorCarTodayList'),
-        meta: { title: '当日来访车辆', icon: '', permission: ['/visitor/carToday'], keepAlive: true }
+        meta: { title: '当日来访车辆', icon: '', permission: ['/door/visitor/carToday'], keepAlive: true }
       },
       {
-        path: '/visitor/list',
+        path: '/door/visitor/list',
         name: 'VisitorList',
         component: () => import('@/views/visitor/visitorList'),
-        meta: { title: '来访记录', icon: '', permission: ['/visitor/list'], keepAlive: true }
+        meta: { title: '来访记录', icon: '', permission: ['/door/visitor/list'], keepAlive: true }
       }
     ]
   },
@@ -92,27 +119,6 @@
     ]
   },
   {
-    path: '/device',
-    component: Layout,
-    redirect: '/device',
-    name: 'Device',
-    alwaysShow: true,
-    meta: {
-      title: '设备管理',
-      icon: 'icon-device', // 图标
-      permission: ['/device'], // 权限名称
-      sys: '/door'
-    },
-    children: [
-      {
-        path: '/device/list',
-        name: 'DeviceList',
-        component: () => import('@/views/deviceManage/deviceList'),
-        meta: { title: '设备列表', icon: '', permission: ['/device/list'], keepAlive: true }
-      }
-    ]
-  },
-  {
     path: '/car',
     component: Layout,
     redirect: '/car',
@@ -141,6 +147,27 @@
     ]
   },
   {
+    path: '/device',
+    component: Layout,
+    redirect: '/device',
+    name: 'Device',
+    alwaysShow: true,
+    meta: {
+      title: '设备管理',
+      icon: 'icon-device', // 图标
+      permission: ['/device'], // 权限名称
+      sys: '/door'
+    },
+    children: [
+      {
+        path: '/device/list',
+        name: 'DeviceList',
+        component: () => import('@/views/deviceManage/deviceList'),
+        meta: { title: '设备列表', icon: '', permission: ['/device/list'], keepAlive: true }
+      }
+    ]
+  },
+  {
     path: '/area',
     component: Layout,
     redirect: '/area',
@@ -212,31 +239,5 @@
       }
     ]
   },
-  {
-    path: '/alarm',
-    component: Layout,
-    redirect: '/alarm',
-    name: 'Alarm',
-    alwaysShow: true,
-    meta: {
-      title: '报警管理',
-      icon: 'icon-alarm', // 图标
-      permission: ['/alarm'], // 权限名称
-      sys: '/door'
-    },
-    children: [
-      {
-        path: '/alarm/now',
-        name: 'AlarmNow',
-        component: () => import('@/views/alarm/alarmNow'),
-        meta: { title: '当前报警', icon: '', permission: ['/alarm/now'], keepAlive: true }
-      },
-      {
-        path: '/alarm/list',
-        name: 'AlarmList',
-        component: () => import('@/views/alarm/alarmList'),
-        meta: { title: '报警记录', icon: '', permission: ['/alarm/list'], keepAlive: true }
-      }
-    ]
-  }
+
 ]
diff --git a/src/router/modules/fenceSys.js b/src/router/modules/fenceSys.js
new file mode 100644
index 0000000..c07c0f8
--- /dev/null
+++ b/src/router/modules/fenceSys.js
@@ -0,0 +1,84 @@
+/* Layout */
+import Layout from '../../views/layout/Layout'
+export const fenceSysRouters = [
+  {
+    path: '/fence',
+    name: 'fence',
+    redirect: '/fence/alarm',
+    hidden: true,
+    meta: {
+      title: '周界管理子系统',
+      permission: ['/fence'],
+      isSys: true
+    }
+  },
+  {
+    path: '/fence/alarm',
+    component: Layout,
+    redirect: '/fence/alarm',
+    name: 'Alarm',
+    alwaysShow: true,
+    meta: {
+      title: '报警管理',
+      icon: 'icon-alarm', // 图标
+      permission: ['/fence/alarm'], // 权限名称
+      sys: '/fence'
+    },
+    children: [
+      {
+        path: '/fence/alarm/now',
+        name: 'AlarmNow',
+        component: () => import('@/views/alarm/alarmNow'),
+        meta: { title: '当前报警', icon: '', permission: ['/fence/alarm/now'], keepAlive: true }
+      },
+      {
+        path: '/fence/alarm/list',
+        name: 'AlarmList',
+        component: () => import('@/views/alarm/alarmList'),
+        meta: { title: '报警记录', icon: '', permission: ['/fence/alarm/list'], keepAlive: true }
+      }
+    ]
+  },
+  {
+    path: '/area',
+    component: Layout,
+    redirect: '/area',
+    name: 'Area',
+    alwaysShow: true,
+    meta: {
+      title: '区域管理',
+      icon: 'icon-area', // 图标
+      permission: ['/area'], // 权限名称
+      sys: '/fence'
+    },
+    children: [
+      {
+        path: '/area/defenceList',
+        name: 'DefenceList',
+        component: () => import('@/views/area/defenceList'),
+        meta: { title: '防区列表', icon: '', permission: ['/area/defenceList'], keepAlive: true }
+      }
+    ]
+  },
+  {
+    path: '/device',
+    component: Layout,
+    redirect: '/device',
+    name: 'Device',
+    alwaysShow: true,
+    meta: {
+      title: '设备管理',
+      icon: 'icon-device', // 图标
+      permission: ['/device'], // 权限名称
+      sys: '/fence'
+    },
+    children: [
+      {
+        path: '/device/list',
+        name: 'DeviceList',
+        component: () => import('@/views/deviceManage/deviceList'),
+        meta: { title: '设备列表', icon: '', permission: ['/device/list'], keepAlive: true }
+      }
+    ]
+  }
+]
diff --git a/src/utils/auth.js b/src/utils/auth.js
index 44af377..5cbe390 100644
--- a/src/utils/auth.js
+++ b/src/utils/auth.js
@@ -40,7 +40,6 @@
 
 export function setCurrentSys(currentSystem) {
   console.log('in auth setCurrentSys')
-  console.log(currentSystem)
   const currentSys = JSON.stringify(currentSystem)
   return window.localStorage.setItem(CurrentSystem, currentSys)
 }
diff --git a/src/views/alarm/alarmNow.vue b/src/views/alarm/alarmNow.vue
index fa8ba38..61a1a98 100644
--- a/src/views/alarm/alarmNow.vue
+++ b/src/views/alarm/alarmNow.vue
@@ -94,7 +94,7 @@
 
 <script>
 import { getAlarmNowList } from '@/api/alarm'
-import { getRegion } from '@/api/area'
+import { getRegion, getAreaTypeBySubSystem } from '@/api/area'
 import { getDetailDevice } from '@/api/device'
 import { getAlarmContent } from '@/api/allDict'
 import { formatToString } from '@/utils/calendarUtil'
@@ -136,11 +136,6 @@
           value: 'areaPosition',
           align: 'center'
         },
-        // {
-        //   text: '所属防护',
-        //   value: 'areaType',
-        //   align: 'center'
-        // },
         {
           text: '设备编号',
           value: 'devcode',
@@ -178,9 +173,15 @@
     }
   },
   created() {
+    // 当前系统
+    const currSys = this.$store.getters.currentSystem
+    // 获取当前系统对应的区域id
+    this.listQuery.areaType = getAreaTypeBySubSystem(currSys.code)
     this.fetchAlarmContentsData()
     this.fetchRegionsData()
-    this.fetchData()// 获取数据
+  },
+  activated() {
+    this.fetchData() // 获取数据
   },
   methods: {
     alarmCancel(row) {
diff --git a/src/views/ctrl/index.vue b/src/views/ctrl/index.vue
index 93efb6f..fd36f2b 100644
--- a/src/views/ctrl/index.vue
+++ b/src/views/ctrl/index.vue
@@ -129,7 +129,7 @@
     border-radius: 16px;
     float: left;
     margin: 10px;
-    box-shadow: 2px 2px 8px #666666;
+    box-shadow: 1px 1px 5px #999;
   }
   .sub-title {
     font-weight: bold;
@@ -141,8 +141,8 @@
   }
   .statis-block {
     text-align: center;
-    margin: 20px 10px 0px 10px;
-    padding: 10px;
+    margin: 0px 10px 0px 10px;
+    padding: 0px 10px 10px 10px;
     color: #fff;
     font-weight: bold;
     letter-spacing: 1px;
@@ -165,7 +165,7 @@
     margin-top: 20px;
     border-radius: 16px;
     background-color: #FFFFFF;
-    box-shadow: 2px 2px 8px #666666;
+    box-shadow: 1px 1px 5px #999;
   }
 
   #today-visitor {
diff --git a/src/views/ctrl/statCharts/inOutCount.vue b/src/views/ctrl/statCharts/inOutCount.vue
index 1956305..d6f3389 100644
--- a/src/views/ctrl/statCharts/inOutCount.vue
+++ b/src/views/ctrl/statCharts/inOutCount.vue
@@ -39,7 +39,7 @@
         },
         xAxisType: 'time',
         max: [4],
-        area: true,
+        area: false,
         metrics: ['staff', 'visitor', 'car', 'visitorCar'],
         dimension: ['date']
       },
diff --git a/src/views/dashboard/portal.vue b/src/views/dashboard/portal.vue
index 8ff66c7..30c3131 100644
--- a/src/views/dashboard/portal.vue
+++ b/src/views/dashboard/portal.vue
@@ -15,8 +15,8 @@
       </el-col>
       <el-col class="sub-system defence-system">
         <div class="icon-subsystem">
-          <img src="/static/images/dashboard/icon-defence.png">
-          <div>周界防卫</div>
+          <img src="/static/images/dashboard/icon-defence.png" @click="changeSubSystem('fence')">
+          <div><a @click="changeSubSystem('fence')">周界防卫</a></div>
         </div>
       </el-col>
       <el-col class="sub-system region-system">
@@ -92,22 +92,6 @@
           this.$router.replace(system[0].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])
-      }
     }
   }
 }

diff --git a/src/api/area.js b/src/api/area.js
index 9a17cfa..840acf2 100644
--- a/src/api/area.js
+++ b/src/api/area.js
@@ -105,8 +105,8 @@
 }
 
 // 根据当前子系统返回areaType
-export function getAreaTypeBySubSystem(system) {
-  switch (system.code) {
+export function getAreaTypeBySubSystem(sysCode) {
+  switch (sysCode) {
     case 'door':
       return '1'
     case 'fence':
@@ -119,3 +119,11 @@
       return ''
   }
 }
+
+// 获取虹膜设备的所在区域
+export function getIrisAreaList() {
+  return request({
+    url: '/region/getIrisAreaList',
+    method: 'get'
+  })
+}
diff --git a/src/router/index.js b/src/router/index.js
index 823269b..9feb573 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -10,6 +10,7 @@
 import Layout from '../views/layout/Layout'
 import { systemRouters } from './modules/system'
 import { doorSysRouters } from './modules/doorSys'
+import { fenceSysRouters } from './modules/fenceSys'
 import { ctrlSysRouters } from './modules/ctrlSys'
 
 /**
@@ -89,6 +90,7 @@
 export const asyncRouterMap = [
   ...systemRouters,
   ...doorSysRouters,
+  ...fenceSysRouters,
   ...ctrlSysRouters,
   { path: '*', redirect: '/404', hidden: true, meta: {}}
 ]
diff --git a/src/router/modules/doorSys.js b/src/router/modules/doorSys.js
index 235bac9..1a78748 100644
--- a/src/router/modules/doorSys.js
+++ b/src/router/modules/doorSys.js
@@ -4,7 +4,7 @@
   {
     path: '/door',
     name: 'door',
-    redirect: '/visitor',
+    redirect: '/door/alarm',
     hidden: true,
     meta: {
       title: '营门管理子系统',
@@ -13,47 +13,74 @@
     }
   },
   {
-    path: '/visitor',
+    path: '/door/alarm',
     component: Layout,
-    redirect: '/visitor/add',
+    redirect: '/door/alarm/now',
+    name: 'Alarm',
+    alwaysShow: true,
+    meta: {
+      title: '报警管理',
+      icon: 'icon-alarm', // 图标
+      permission: ['/door/alarm'], // 权限名称
+      sys: '/door'
+    },
+    children: [
+      {
+        path: '/door/alarm/now',
+        name: 'AlarmNow',
+        component: () => import('@/views/alarm/alarmNow'),
+        meta: { title: '当前报警', icon: '', permission: ['/door/alarm/now'], keepAlive: true }
+      },
+      {
+        path: '/door/alarm/list',
+        name: 'AlarmList',
+        component: () => import('@/views/alarm/alarmList'),
+        meta: { title: '报警记录', icon: '', permission: ['/door/alarm/list'], keepAlive: true }
+      }
+    ]
+  },
+  {
+    path: '/door/visitor',
+    component: Layout,
+    redirect: '/door/visitor/add',
     name: 'Visitor',
     alwaysShow: true,
     meta: {
       title: '访客管理',
       icon: 'icon-visitor', // 图标
-      permission: ['/visitor'], // 权限名称
+      permission: ['/door/visitor'], // 权限名称
       sys: '/door'
     },
     children: [
       {
-        path: '/visitor/add',
+        path: '/door/visitor/add',
         name: 'VisitorAdd',
         component: () => import('@/views/visitor/visitorAdd'),
-        meta: { title: '访客登记', icon: '', permission: ['/visitor/add'], keepAlive: true }
+        meta: { title: '访客登记', icon: '', permission: ['/door/visitor/add'], keepAlive: true }
       },
       {
-        path: '/visitor/addCar',
+        path: '/door/visitor/addCar',
         name: 'VisitorAddCar',
         component: () => import('@/views/visitor/visitorAddCar'),
-        meta: { title: '访客车辆登记', icon: '', permission: ['/visitor/addCar'], keepAlive: true }
+        meta: { title: '访客车辆登记', icon: '', permission: ['/door/visitor/addCar'], keepAlive: true }
       },
       {
-        path: '/visitor/today',
+        path: '/door/visitor/today',
         name: 'VisitorToday',
         component: () => import('@/views/visitor/visitorTodayList'),
-        meta: { title: '当日来访人员', icon: '', permission: ['/visitor/today'], keepAlive: true }
+        meta: { title: '当日来访人员', icon: '', permission: ['/door/visitor/today'], keepAlive: true }
       },
       {
-        path: '/visitor/carToday',
+        path: '/door/visitor/carToday',
         name: 'VisitorCarToday',
         component: () => import('@/views/visitor/visitorCarTodayList'),
-        meta: { title: '当日来访车辆', icon: '', permission: ['/visitor/carToday'], keepAlive: true }
+        meta: { title: '当日来访车辆', icon: '', permission: ['/door/visitor/carToday'], keepAlive: true }
       },
       {
-        path: '/visitor/list',
+        path: '/door/visitor/list',
         name: 'VisitorList',
         component: () => import('@/views/visitor/visitorList'),
-        meta: { title: '来访记录', icon: '', permission: ['/visitor/list'], keepAlive: true }
+        meta: { title: '来访记录', icon: '', permission: ['/door/visitor/list'], keepAlive: true }
       }
     ]
   },
@@ -92,27 +119,6 @@
     ]
   },
   {
-    path: '/device',
-    component: Layout,
-    redirect: '/device',
-    name: 'Device',
-    alwaysShow: true,
-    meta: {
-      title: '设备管理',
-      icon: 'icon-device', // 图标
-      permission: ['/device'], // 权限名称
-      sys: '/door'
-    },
-    children: [
-      {
-        path: '/device/list',
-        name: 'DeviceList',
-        component: () => import('@/views/deviceManage/deviceList'),
-        meta: { title: '设备列表', icon: '', permission: ['/device/list'], keepAlive: true }
-      }
-    ]
-  },
-  {
     path: '/car',
     component: Layout,
     redirect: '/car',
@@ -141,6 +147,27 @@
     ]
   },
   {
+    path: '/device',
+    component: Layout,
+    redirect: '/device',
+    name: 'Device',
+    alwaysShow: true,
+    meta: {
+      title: '设备管理',
+      icon: 'icon-device', // 图标
+      permission: ['/device'], // 权限名称
+      sys: '/door'
+    },
+    children: [
+      {
+        path: '/device/list',
+        name: 'DeviceList',
+        component: () => import('@/views/deviceManage/deviceList'),
+        meta: { title: '设备列表', icon: '', permission: ['/device/list'], keepAlive: true }
+      }
+    ]
+  },
+  {
     path: '/area',
     component: Layout,
     redirect: '/area',
@@ -212,31 +239,5 @@
       }
     ]
   },
-  {
-    path: '/alarm',
-    component: Layout,
-    redirect: '/alarm',
-    name: 'Alarm',
-    alwaysShow: true,
-    meta: {
-      title: '报警管理',
-      icon: 'icon-alarm', // 图标
-      permission: ['/alarm'], // 权限名称
-      sys: '/door'
-    },
-    children: [
-      {
-        path: '/alarm/now',
-        name: 'AlarmNow',
-        component: () => import('@/views/alarm/alarmNow'),
-        meta: { title: '当前报警', icon: '', permission: ['/alarm/now'], keepAlive: true }
-      },
-      {
-        path: '/alarm/list',
-        name: 'AlarmList',
-        component: () => import('@/views/alarm/alarmList'),
-        meta: { title: '报警记录', icon: '', permission: ['/alarm/list'], keepAlive: true }
-      }
-    ]
-  }
+
 ]
diff --git a/src/router/modules/fenceSys.js b/src/router/modules/fenceSys.js
new file mode 100644
index 0000000..c07c0f8
--- /dev/null
+++ b/src/router/modules/fenceSys.js
@@ -0,0 +1,84 @@
+/* Layout */
+import Layout from '../../views/layout/Layout'
+export const fenceSysRouters = [
+  {
+    path: '/fence',
+    name: 'fence',
+    redirect: '/fence/alarm',
+    hidden: true,
+    meta: {
+      title: '周界管理子系统',
+      permission: ['/fence'],
+      isSys: true
+    }
+  },
+  {
+    path: '/fence/alarm',
+    component: Layout,
+    redirect: '/fence/alarm',
+    name: 'Alarm',
+    alwaysShow: true,
+    meta: {
+      title: '报警管理',
+      icon: 'icon-alarm', // 图标
+      permission: ['/fence/alarm'], // 权限名称
+      sys: '/fence'
+    },
+    children: [
+      {
+        path: '/fence/alarm/now',
+        name: 'AlarmNow',
+        component: () => import('@/views/alarm/alarmNow'),
+        meta: { title: '当前报警', icon: '', permission: ['/fence/alarm/now'], keepAlive: true }
+      },
+      {
+        path: '/fence/alarm/list',
+        name: 'AlarmList',
+        component: () => import('@/views/alarm/alarmList'),
+        meta: { title: '报警记录', icon: '', permission: ['/fence/alarm/list'], keepAlive: true }
+      }
+    ]
+  },
+  {
+    path: '/area',
+    component: Layout,
+    redirect: '/area',
+    name: 'Area',
+    alwaysShow: true,
+    meta: {
+      title: '区域管理',
+      icon: 'icon-area', // 图标
+      permission: ['/area'], // 权限名称
+      sys: '/fence'
+    },
+    children: [
+      {
+        path: '/area/defenceList',
+        name: 'DefenceList',
+        component: () => import('@/views/area/defenceList'),
+        meta: { title: '防区列表', icon: '', permission: ['/area/defenceList'], keepAlive: true }
+      }
+    ]
+  },
+  {
+    path: '/device',
+    component: Layout,
+    redirect: '/device',
+    name: 'Device',
+    alwaysShow: true,
+    meta: {
+      title: '设备管理',
+      icon: 'icon-device', // 图标
+      permission: ['/device'], // 权限名称
+      sys: '/fence'
+    },
+    children: [
+      {
+        path: '/device/list',
+        name: 'DeviceList',
+        component: () => import('@/views/deviceManage/deviceList'),
+        meta: { title: '设备列表', icon: '', permission: ['/device/list'], keepAlive: true }
+      }
+    ]
+  }
+]
diff --git a/src/utils/auth.js b/src/utils/auth.js
index 44af377..5cbe390 100644
--- a/src/utils/auth.js
+++ b/src/utils/auth.js
@@ -40,7 +40,6 @@
 
 export function setCurrentSys(currentSystem) {
   console.log('in auth setCurrentSys')
-  console.log(currentSystem)
   const currentSys = JSON.stringify(currentSystem)
   return window.localStorage.setItem(CurrentSystem, currentSys)
 }
diff --git a/src/views/alarm/alarmNow.vue b/src/views/alarm/alarmNow.vue
index fa8ba38..61a1a98 100644
--- a/src/views/alarm/alarmNow.vue
+++ b/src/views/alarm/alarmNow.vue
@@ -94,7 +94,7 @@
 
 <script>
 import { getAlarmNowList } from '@/api/alarm'
-import { getRegion } from '@/api/area'
+import { getRegion, getAreaTypeBySubSystem } from '@/api/area'
 import { getDetailDevice } from '@/api/device'
 import { getAlarmContent } from '@/api/allDict'
 import { formatToString } from '@/utils/calendarUtil'
@@ -136,11 +136,6 @@
           value: 'areaPosition',
           align: 'center'
         },
-        // {
-        //   text: '所属防护',
-        //   value: 'areaType',
-        //   align: 'center'
-        // },
         {
           text: '设备编号',
           value: 'devcode',
@@ -178,9 +173,15 @@
     }
   },
   created() {
+    // 当前系统
+    const currSys = this.$store.getters.currentSystem
+    // 获取当前系统对应的区域id
+    this.listQuery.areaType = getAreaTypeBySubSystem(currSys.code)
     this.fetchAlarmContentsData()
     this.fetchRegionsData()
-    this.fetchData()// 获取数据
+  },
+  activated() {
+    this.fetchData() // 获取数据
   },
   methods: {
     alarmCancel(row) {
diff --git a/src/views/ctrl/index.vue b/src/views/ctrl/index.vue
index 93efb6f..fd36f2b 100644
--- a/src/views/ctrl/index.vue
+++ b/src/views/ctrl/index.vue
@@ -129,7 +129,7 @@
     border-radius: 16px;
     float: left;
     margin: 10px;
-    box-shadow: 2px 2px 8px #666666;
+    box-shadow: 1px 1px 5px #999;
   }
   .sub-title {
     font-weight: bold;
@@ -141,8 +141,8 @@
   }
   .statis-block {
     text-align: center;
-    margin: 20px 10px 0px 10px;
-    padding: 10px;
+    margin: 0px 10px 0px 10px;
+    padding: 0px 10px 10px 10px;
     color: #fff;
     font-weight: bold;
     letter-spacing: 1px;
@@ -165,7 +165,7 @@
     margin-top: 20px;
     border-radius: 16px;
     background-color: #FFFFFF;
-    box-shadow: 2px 2px 8px #666666;
+    box-shadow: 1px 1px 5px #999;
   }
 
   #today-visitor {
diff --git a/src/views/ctrl/statCharts/inOutCount.vue b/src/views/ctrl/statCharts/inOutCount.vue
index 1956305..d6f3389 100644
--- a/src/views/ctrl/statCharts/inOutCount.vue
+++ b/src/views/ctrl/statCharts/inOutCount.vue
@@ -39,7 +39,7 @@
         },
         xAxisType: 'time',
         max: [4],
-        area: true,
+        area: false,
         metrics: ['staff', 'visitor', 'car', 'visitorCar'],
         dimension: ['date']
       },
diff --git a/src/views/dashboard/portal.vue b/src/views/dashboard/portal.vue
index 8ff66c7..30c3131 100644
--- a/src/views/dashboard/portal.vue
+++ b/src/views/dashboard/portal.vue
@@ -15,8 +15,8 @@
       </el-col>
       <el-col class="sub-system defence-system">
         <div class="icon-subsystem">
-          <img src="/static/images/dashboard/icon-defence.png">
-          <div>周界防卫</div>
+          <img src="/static/images/dashboard/icon-defence.png" @click="changeSubSystem('fence')">
+          <div><a @click="changeSubSystem('fence')">周界防卫</a></div>
         </div>
       </el-col>
       <el-col class="sub-system region-system">
@@ -92,22 +92,6 @@
           this.$router.replace(system[0].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])
-      }
     }
   }
 }
diff --git a/src/views/deviceManage/deviceDetail.vue b/src/views/deviceManage/deviceDetail.vue
index 81d1bba..baaa6f9 100644
--- a/src/views/deviceManage/deviceDetail.vue
+++ b/src/views/deviceManage/deviceDetail.vue
@@ -1,5 +1,5 @@
 <template>
-  <el-dialog :title="textMap[dialogStatus]" :close-on-click-modal="false" :visible.sync="dialogFormVisible" width="75%" append-to-body>
+  <el-dialog :title="textMap[dialogStatus]" :close-on-click-modal="false" :visible.sync="dialogFormVisible" append-to-body>
     <el-form ref="dataForm" :model="dataForm" label-well-code="right" label-width="110px">
       <el-row :gutter="20">
         <el-col :span="12">
@@ -112,9 +112,6 @@
       authList: []
     }
   },
-  created() {
-
-  },
   methods: {
     // 初始化对话框
     initDialog: function(dialogStatus, dialogFormVisible, row = null) {

diff --git a/src/api/area.js b/src/api/area.js
index 9a17cfa..840acf2 100644
--- a/src/api/area.js
+++ b/src/api/area.js
@@ -105,8 +105,8 @@
 }
 
 // 根据当前子系统返回areaType
-export function getAreaTypeBySubSystem(system) {
-  switch (system.code) {
+export function getAreaTypeBySubSystem(sysCode) {
+  switch (sysCode) {
     case 'door':
       return '1'
     case 'fence':
@@ -119,3 +119,11 @@
       return ''
   }
 }
+
+// 获取虹膜设备的所在区域
+export function getIrisAreaList() {
+  return request({
+    url: '/region/getIrisAreaList',
+    method: 'get'
+  })
+}
diff --git a/src/router/index.js b/src/router/index.js
index 823269b..9feb573 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -10,6 +10,7 @@
 import Layout from '../views/layout/Layout'
 import { systemRouters } from './modules/system'
 import { doorSysRouters } from './modules/doorSys'
+import { fenceSysRouters } from './modules/fenceSys'
 import { ctrlSysRouters } from './modules/ctrlSys'
 
 /**
@@ -89,6 +90,7 @@
 export const asyncRouterMap = [
   ...systemRouters,
   ...doorSysRouters,
+  ...fenceSysRouters,
   ...ctrlSysRouters,
   { path: '*', redirect: '/404', hidden: true, meta: {}}
 ]
diff --git a/src/router/modules/doorSys.js b/src/router/modules/doorSys.js
index 235bac9..1a78748 100644
--- a/src/router/modules/doorSys.js
+++ b/src/router/modules/doorSys.js
@@ -4,7 +4,7 @@
   {
     path: '/door',
     name: 'door',
-    redirect: '/visitor',
+    redirect: '/door/alarm',
     hidden: true,
     meta: {
       title: '营门管理子系统',
@@ -13,47 +13,74 @@
     }
   },
   {
-    path: '/visitor',
+    path: '/door/alarm',
     component: Layout,
-    redirect: '/visitor/add',
+    redirect: '/door/alarm/now',
+    name: 'Alarm',
+    alwaysShow: true,
+    meta: {
+      title: '报警管理',
+      icon: 'icon-alarm', // 图标
+      permission: ['/door/alarm'], // 权限名称
+      sys: '/door'
+    },
+    children: [
+      {
+        path: '/door/alarm/now',
+        name: 'AlarmNow',
+        component: () => import('@/views/alarm/alarmNow'),
+        meta: { title: '当前报警', icon: '', permission: ['/door/alarm/now'], keepAlive: true }
+      },
+      {
+        path: '/door/alarm/list',
+        name: 'AlarmList',
+        component: () => import('@/views/alarm/alarmList'),
+        meta: { title: '报警记录', icon: '', permission: ['/door/alarm/list'], keepAlive: true }
+      }
+    ]
+  },
+  {
+    path: '/door/visitor',
+    component: Layout,
+    redirect: '/door/visitor/add',
     name: 'Visitor',
     alwaysShow: true,
     meta: {
       title: '访客管理',
       icon: 'icon-visitor', // 图标
-      permission: ['/visitor'], // 权限名称
+      permission: ['/door/visitor'], // 权限名称
       sys: '/door'
     },
     children: [
       {
-        path: '/visitor/add',
+        path: '/door/visitor/add',
         name: 'VisitorAdd',
         component: () => import('@/views/visitor/visitorAdd'),
-        meta: { title: '访客登记', icon: '', permission: ['/visitor/add'], keepAlive: true }
+        meta: { title: '访客登记', icon: '', permission: ['/door/visitor/add'], keepAlive: true }
       },
       {
-        path: '/visitor/addCar',
+        path: '/door/visitor/addCar',
         name: 'VisitorAddCar',
         component: () => import('@/views/visitor/visitorAddCar'),
-        meta: { title: '访客车辆登记', icon: '', permission: ['/visitor/addCar'], keepAlive: true }
+        meta: { title: '访客车辆登记', icon: '', permission: ['/door/visitor/addCar'], keepAlive: true }
       },
       {
-        path: '/visitor/today',
+        path: '/door/visitor/today',
         name: 'VisitorToday',
         component: () => import('@/views/visitor/visitorTodayList'),
-        meta: { title: '当日来访人员', icon: '', permission: ['/visitor/today'], keepAlive: true }
+        meta: { title: '当日来访人员', icon: '', permission: ['/door/visitor/today'], keepAlive: true }
       },
       {
-        path: '/visitor/carToday',
+        path: '/door/visitor/carToday',
         name: 'VisitorCarToday',
         component: () => import('@/views/visitor/visitorCarTodayList'),
-        meta: { title: '当日来访车辆', icon: '', permission: ['/visitor/carToday'], keepAlive: true }
+        meta: { title: '当日来访车辆', icon: '', permission: ['/door/visitor/carToday'], keepAlive: true }
       },
       {
-        path: '/visitor/list',
+        path: '/door/visitor/list',
         name: 'VisitorList',
         component: () => import('@/views/visitor/visitorList'),
-        meta: { title: '来访记录', icon: '', permission: ['/visitor/list'], keepAlive: true }
+        meta: { title: '来访记录', icon: '', permission: ['/door/visitor/list'], keepAlive: true }
       }
     ]
   },
@@ -92,27 +119,6 @@
     ]
   },
   {
-    path: '/device',
-    component: Layout,
-    redirect: '/device',
-    name: 'Device',
-    alwaysShow: true,
-    meta: {
-      title: '设备管理',
-      icon: 'icon-device', // 图标
-      permission: ['/device'], // 权限名称
-      sys: '/door'
-    },
-    children: [
-      {
-        path: '/device/list',
-        name: 'DeviceList',
-        component: () => import('@/views/deviceManage/deviceList'),
-        meta: { title: '设备列表', icon: '', permission: ['/device/list'], keepAlive: true }
-      }
-    ]
-  },
-  {
     path: '/car',
     component: Layout,
     redirect: '/car',
@@ -141,6 +147,27 @@
     ]
   },
   {
+    path: '/device',
+    component: Layout,
+    redirect: '/device',
+    name: 'Device',
+    alwaysShow: true,
+    meta: {
+      title: '设备管理',
+      icon: 'icon-device', // 图标
+      permission: ['/device'], // 权限名称
+      sys: '/door'
+    },
+    children: [
+      {
+        path: '/device/list',
+        name: 'DeviceList',
+        component: () => import('@/views/deviceManage/deviceList'),
+        meta: { title: '设备列表', icon: '', permission: ['/device/list'], keepAlive: true }
+      }
+    ]
+  },
+  {
     path: '/area',
     component: Layout,
     redirect: '/area',
@@ -212,31 +239,5 @@
       }
     ]
   },
-  {
-    path: '/alarm',
-    component: Layout,
-    redirect: '/alarm',
-    name: 'Alarm',
-    alwaysShow: true,
-    meta: {
-      title: '报警管理',
-      icon: 'icon-alarm', // 图标
-      permission: ['/alarm'], // 权限名称
-      sys: '/door'
-    },
-    children: [
-      {
-        path: '/alarm/now',
-        name: 'AlarmNow',
-        component: () => import('@/views/alarm/alarmNow'),
-        meta: { title: '当前报警', icon: '', permission: ['/alarm/now'], keepAlive: true }
-      },
-      {
-        path: '/alarm/list',
-        name: 'AlarmList',
-        component: () => import('@/views/alarm/alarmList'),
-        meta: { title: '报警记录', icon: '', permission: ['/alarm/list'], keepAlive: true }
-      }
-    ]
-  }
+
 ]
diff --git a/src/router/modules/fenceSys.js b/src/router/modules/fenceSys.js
new file mode 100644
index 0000000..c07c0f8
--- /dev/null
+++ b/src/router/modules/fenceSys.js
@@ -0,0 +1,84 @@
+/* Layout */
+import Layout from '../../views/layout/Layout'
+export const fenceSysRouters = [
+  {
+    path: '/fence',
+    name: 'fence',
+    redirect: '/fence/alarm',
+    hidden: true,
+    meta: {
+      title: '周界管理子系统',
+      permission: ['/fence'],
+      isSys: true
+    }
+  },
+  {
+    path: '/fence/alarm',
+    component: Layout,
+    redirect: '/fence/alarm',
+    name: 'Alarm',
+    alwaysShow: true,
+    meta: {
+      title: '报警管理',
+      icon: 'icon-alarm', // 图标
+      permission: ['/fence/alarm'], // 权限名称
+      sys: '/fence'
+    },
+    children: [
+      {
+        path: '/fence/alarm/now',
+        name: 'AlarmNow',
+        component: () => import('@/views/alarm/alarmNow'),
+        meta: { title: '当前报警', icon: '', permission: ['/fence/alarm/now'], keepAlive: true }
+      },
+      {
+        path: '/fence/alarm/list',
+        name: 'AlarmList',
+        component: () => import('@/views/alarm/alarmList'),
+        meta: { title: '报警记录', icon: '', permission: ['/fence/alarm/list'], keepAlive: true }
+      }
+    ]
+  },
+  {
+    path: '/area',
+    component: Layout,
+    redirect: '/area',
+    name: 'Area',
+    alwaysShow: true,
+    meta: {
+      title: '区域管理',
+      icon: 'icon-area', // 图标
+      permission: ['/area'], // 权限名称
+      sys: '/fence'
+    },
+    children: [
+      {
+        path: '/area/defenceList',
+        name: 'DefenceList',
+        component: () => import('@/views/area/defenceList'),
+        meta: { title: '防区列表', icon: '', permission: ['/area/defenceList'], keepAlive: true }
+      }
+    ]
+  },
+  {
+    path: '/device',
+    component: Layout,
+    redirect: '/device',
+    name: 'Device',
+    alwaysShow: true,
+    meta: {
+      title: '设备管理',
+      icon: 'icon-device', // 图标
+      permission: ['/device'], // 权限名称
+      sys: '/fence'
+    },
+    children: [
+      {
+        path: '/device/list',
+        name: 'DeviceList',
+        component: () => import('@/views/deviceManage/deviceList'),
+        meta: { title: '设备列表', icon: '', permission: ['/device/list'], keepAlive: true }
+      }
+    ]
+  }
+]
diff --git a/src/utils/auth.js b/src/utils/auth.js
index 44af377..5cbe390 100644
--- a/src/utils/auth.js
+++ b/src/utils/auth.js
@@ -40,7 +40,6 @@
 
 export function setCurrentSys(currentSystem) {
   console.log('in auth setCurrentSys')
-  console.log(currentSystem)
   const currentSys = JSON.stringify(currentSystem)
   return window.localStorage.setItem(CurrentSystem, currentSys)
 }
diff --git a/src/views/alarm/alarmNow.vue b/src/views/alarm/alarmNow.vue
index fa8ba38..61a1a98 100644
--- a/src/views/alarm/alarmNow.vue
+++ b/src/views/alarm/alarmNow.vue
@@ -94,7 +94,7 @@
 
 <script>
 import { getAlarmNowList } from '@/api/alarm'
-import { getRegion } from '@/api/area'
+import { getRegion, getAreaTypeBySubSystem } from '@/api/area'
 import { getDetailDevice } from '@/api/device'
 import { getAlarmContent } from '@/api/allDict'
 import { formatToString } from '@/utils/calendarUtil'
@@ -136,11 +136,6 @@
           value: 'areaPosition',
           align: 'center'
         },
-        // {
-        //   text: '所属防护',
-        //   value: 'areaType',
-        //   align: 'center'
-        // },
         {
           text: '设备编号',
           value: 'devcode',
@@ -178,9 +173,15 @@
     }
   },
   created() {
+    // 当前系统
+    const currSys = this.$store.getters.currentSystem
+    // 获取当前系统对应的区域id
+    this.listQuery.areaType = getAreaTypeBySubSystem(currSys.code)
     this.fetchAlarmContentsData()
     this.fetchRegionsData()
-    this.fetchData()// 获取数据
+  },
+  activated() {
+    this.fetchData() // 获取数据
   },
   methods: {
     alarmCancel(row) {
diff --git a/src/views/ctrl/index.vue b/src/views/ctrl/index.vue
index 93efb6f..fd36f2b 100644
--- a/src/views/ctrl/index.vue
+++ b/src/views/ctrl/index.vue
@@ -129,7 +129,7 @@
     border-radius: 16px;
     float: left;
     margin: 10px;
-    box-shadow: 2px 2px 8px #666666;
+    box-shadow: 1px 1px 5px #999;
   }
   .sub-title {
     font-weight: bold;
@@ -141,8 +141,8 @@
   }
   .statis-block {
     text-align: center;
-    margin: 20px 10px 0px 10px;
-    padding: 10px;
+    margin: 0px 10px 0px 10px;
+    padding: 0px 10px 10px 10px;
     color: #fff;
     font-weight: bold;
     letter-spacing: 1px;
@@ -165,7 +165,7 @@
     margin-top: 20px;
     border-radius: 16px;
     background-color: #FFFFFF;
-    box-shadow: 2px 2px 8px #666666;
+    box-shadow: 1px 1px 5px #999;
   }
 
   #today-visitor {
diff --git a/src/views/ctrl/statCharts/inOutCount.vue b/src/views/ctrl/statCharts/inOutCount.vue
index 1956305..d6f3389 100644
--- a/src/views/ctrl/statCharts/inOutCount.vue
+++ b/src/views/ctrl/statCharts/inOutCount.vue
@@ -39,7 +39,7 @@
         },
         xAxisType: 'time',
         max: [4],
-        area: true,
+        area: false,
         metrics: ['staff', 'visitor', 'car', 'visitorCar'],
         dimension: ['date']
       },
diff --git a/src/views/dashboard/portal.vue b/src/views/dashboard/portal.vue
index 8ff66c7..30c3131 100644
--- a/src/views/dashboard/portal.vue
+++ b/src/views/dashboard/portal.vue
@@ -15,8 +15,8 @@
       </el-col>
       <el-col class="sub-system defence-system">
         <div class="icon-subsystem">
-          <img src="/static/images/dashboard/icon-defence.png">
-          <div>周界防卫</div>
+          <img src="/static/images/dashboard/icon-defence.png" @click="changeSubSystem('fence')">
+          <div><a @click="changeSubSystem('fence')">周界防卫</a></div>
         </div>
       </el-col>
       <el-col class="sub-system region-system">
@@ -92,22 +92,6 @@
           this.$router.replace(system[0].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])
-      }
     }
   }
 }
diff --git a/src/views/deviceManage/deviceDetail.vue b/src/views/deviceManage/deviceDetail.vue
index 81d1bba..baaa6f9 100644
--- a/src/views/deviceManage/deviceDetail.vue
+++ b/src/views/deviceManage/deviceDetail.vue
@@ -1,5 +1,5 @@
 <template>
-  <el-dialog :title="textMap[dialogStatus]" :close-on-click-modal="false" :visible.sync="dialogFormVisible" width="75%" append-to-body>
+  <el-dialog :title="textMap[dialogStatus]" :close-on-click-modal="false" :visible.sync="dialogFormVisible" append-to-body>
     <el-form ref="dataForm" :model="dataForm" label-well-code="right" label-width="110px">
       <el-row :gutter="20">
         <el-col :span="12">
@@ -112,9 +112,6 @@
       authList: []
     }
   },
-  created() {
-
-  },
   methods: {
     // 初始化对话框
     initDialog: function(dialogStatus, dialogFormVisible, row = null) {
diff --git a/src/views/layout/components/Sidebar/index.vue b/src/views/layout/components/Sidebar/index.vue
index 861d9e4..ac36b78 100644
--- a/src/views/layout/components/Sidebar/index.vue
+++ b/src/views/layout/components/Sidebar/index.vue
@@ -9,7 +9,7 @@
       text-color="#bfcbd9"
       active-text-color="#1bb1a5"
     >
-      <sidebar-item v-for="route in permission_routers" :key="route.name" :item="route" :base-path="route.path"/>
+      <sidebar-item v-for="route in permission_routers" :key="route.path" :item="route" :base-path="route.path"/>
     </el-menu>
   </el-scrollbar>
 </template>

diff --git a/src/api/area.js b/src/api/area.js
index 9a17cfa..840acf2 100644
--- a/src/api/area.js
+++ b/src/api/area.js
@@ -105,8 +105,8 @@
 }
 
 // 根据当前子系统返回areaType
-export function getAreaTypeBySubSystem(system) {
-  switch (system.code) {
+export function getAreaTypeBySubSystem(sysCode) {
+  switch (sysCode) {
     case 'door':
       return '1'
     case 'fence':
@@ -119,3 +119,11 @@
       return ''
   }
 }
+
+// 获取虹膜设备的所在区域
+export function getIrisAreaList() {
+  return request({
+    url: '/region/getIrisAreaList',
+    method: 'get'
+  })
+}
diff --git a/src/router/index.js b/src/router/index.js
index 823269b..9feb573 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -10,6 +10,7 @@
 import Layout from '../views/layout/Layout'
 import { systemRouters } from './modules/system'
 import { doorSysRouters } from './modules/doorSys'
+import { fenceSysRouters } from './modules/fenceSys'
 import { ctrlSysRouters } from './modules/ctrlSys'
 
 /**
@@ -89,6 +90,7 @@
 export const asyncRouterMap = [
   ...systemRouters,
   ...doorSysRouters,
+  ...fenceSysRouters,
   ...ctrlSysRouters,
   { path: '*', redirect: '/404', hidden: true, meta: {}}
 ]
diff --git a/src/router/modules/doorSys.js b/src/router/modules/doorSys.js
index 235bac9..1a78748 100644
--- a/src/router/modules/doorSys.js
+++ b/src/router/modules/doorSys.js
@@ -4,7 +4,7 @@
   {
     path: '/door',
     name: 'door',
-    redirect: '/visitor',
+    redirect: '/door/alarm',
     hidden: true,
     meta: {
       title: '营门管理子系统',
@@ -13,47 +13,74 @@
     }
   },
   {
-    path: '/visitor',
+    path: '/door/alarm',
     component: Layout,
-    redirect: '/visitor/add',
+    redirect: '/door/alarm/now',
+    name: 'Alarm',
+    alwaysShow: true,
+    meta: {
+      title: '报警管理',
+      icon: 'icon-alarm', // 图标
+      permission: ['/door/alarm'], // 权限名称
+      sys: '/door'
+    },
+    children: [
+      {
+        path: '/door/alarm/now',
+        name: 'AlarmNow',
+        component: () => import('@/views/alarm/alarmNow'),
+        meta: { title: '当前报警', icon: '', permission: ['/door/alarm/now'], keepAlive: true }
+      },
+      {
+        path: '/door/alarm/list',
+        name: 'AlarmList',
+        component: () => import('@/views/alarm/alarmList'),
+        meta: { title: '报警记录', icon: '', permission: ['/door/alarm/list'], keepAlive: true }
+      }
+    ]
+  },
+  {
+    path: '/door/visitor',
+    component: Layout,
+    redirect: '/door/visitor/add',
     name: 'Visitor',
     alwaysShow: true,
     meta: {
       title: '访客管理',
       icon: 'icon-visitor', // 图标
-      permission: ['/visitor'], // 权限名称
+      permission: ['/door/visitor'], // 权限名称
       sys: '/door'
     },
     children: [
       {
-        path: '/visitor/add',
+        path: '/door/visitor/add',
         name: 'VisitorAdd',
         component: () => import('@/views/visitor/visitorAdd'),
-        meta: { title: '访客登记', icon: '', permission: ['/visitor/add'], keepAlive: true }
+        meta: { title: '访客登记', icon: '', permission: ['/door/visitor/add'], keepAlive: true }
       },
       {
-        path: '/visitor/addCar',
+        path: '/door/visitor/addCar',
         name: 'VisitorAddCar',
         component: () => import('@/views/visitor/visitorAddCar'),
-        meta: { title: '访客车辆登记', icon: '', permission: ['/visitor/addCar'], keepAlive: true }
+        meta: { title: '访客车辆登记', icon: '', permission: ['/door/visitor/addCar'], keepAlive: true }
       },
       {
-        path: '/visitor/today',
+        path: '/door/visitor/today',
         name: 'VisitorToday',
         component: () => import('@/views/visitor/visitorTodayList'),
-        meta: { title: '当日来访人员', icon: '', permission: ['/visitor/today'], keepAlive: true }
+        meta: { title: '当日来访人员', icon: '', permission: ['/door/visitor/today'], keepAlive: true }
       },
       {
-        path: '/visitor/carToday',
+        path: '/door/visitor/carToday',
         name: 'VisitorCarToday',
         component: () => import('@/views/visitor/visitorCarTodayList'),
-        meta: { title: '当日来访车辆', icon: '', permission: ['/visitor/carToday'], keepAlive: true }
+        meta: { title: '当日来访车辆', icon: '', permission: ['/door/visitor/carToday'], keepAlive: true }
       },
       {
-        path: '/visitor/list',
+        path: '/door/visitor/list',
         name: 'VisitorList',
         component: () => import('@/views/visitor/visitorList'),
-        meta: { title: '来访记录', icon: '', permission: ['/visitor/list'], keepAlive: true }
+        meta: { title: '来访记录', icon: '', permission: ['/door/visitor/list'], keepAlive: true }
       }
     ]
   },
@@ -92,27 +119,6 @@
     ]
   },
   {
-    path: '/device',
-    component: Layout,
-    redirect: '/device',
-    name: 'Device',
-    alwaysShow: true,
-    meta: {
-      title: '设备管理',
-      icon: 'icon-device', // 图标
-      permission: ['/device'], // 权限名称
-      sys: '/door'
-    },
-    children: [
-      {
-        path: '/device/list',
-        name: 'DeviceList',
-        component: () => import('@/views/deviceManage/deviceList'),
-        meta: { title: '设备列表', icon: '', permission: ['/device/list'], keepAlive: true }
-      }
-    ]
-  },
-  {
     path: '/car',
     component: Layout,
     redirect: '/car',
@@ -141,6 +147,27 @@
     ]
   },
   {
+    path: '/device',
+    component: Layout,
+    redirect: '/device',
+    name: 'Device',
+    alwaysShow: true,
+    meta: {
+      title: '设备管理',
+      icon: 'icon-device', // 图标
+      permission: ['/device'], // 权限名称
+      sys: '/door'
+    },
+    children: [
+      {
+        path: '/device/list',
+        name: 'DeviceList',
+        component: () => import('@/views/deviceManage/deviceList'),
+        meta: { title: '设备列表', icon: '', permission: ['/device/list'], keepAlive: true }
+      }
+    ]
+  },
+  {
     path: '/area',
     component: Layout,
     redirect: '/area',
@@ -212,31 +239,5 @@
       }
     ]
   },
-  {
-    path: '/alarm',
-    component: Layout,
-    redirect: '/alarm',
-    name: 'Alarm',
-    alwaysShow: true,
-    meta: {
-      title: '报警管理',
-      icon: 'icon-alarm', // 图标
-      permission: ['/alarm'], // 权限名称
-      sys: '/door'
-    },
-    children: [
-      {
-        path: '/alarm/now',
-        name: 'AlarmNow',
-        component: () => import('@/views/alarm/alarmNow'),
-        meta: { title: '当前报警', icon: '', permission: ['/alarm/now'], keepAlive: true }
-      },
-      {
-        path: '/alarm/list',
-        name: 'AlarmList',
-        component: () => import('@/views/alarm/alarmList'),
-        meta: { title: '报警记录', icon: '', permission: ['/alarm/list'], keepAlive: true }
-      }
-    ]
-  }
+
 ]
diff --git a/src/router/modules/fenceSys.js b/src/router/modules/fenceSys.js
new file mode 100644
index 0000000..c07c0f8
--- /dev/null
+++ b/src/router/modules/fenceSys.js
@@ -0,0 +1,84 @@
+/* Layout */
+import Layout from '../../views/layout/Layout'
+export const fenceSysRouters = [
+  {
+    path: '/fence',
+    name: 'fence',
+    redirect: '/fence/alarm',
+    hidden: true,
+    meta: {
+      title: '周界管理子系统',
+      permission: ['/fence'],
+      isSys: true
+    }
+  },
+  {
+    path: '/fence/alarm',
+    component: Layout,
+    redirect: '/fence/alarm',
+    name: 'Alarm',
+    alwaysShow: true,
+    meta: {
+      title: '报警管理',
+      icon: 'icon-alarm', // 图标
+      permission: ['/fence/alarm'], // 权限名称
+      sys: '/fence'
+    },
+    children: [
+      {
+        path: '/fence/alarm/now',
+        name: 'AlarmNow',
+        component: () => import('@/views/alarm/alarmNow'),
+        meta: { title: '当前报警', icon: '', permission: ['/fence/alarm/now'], keepAlive: true }
+      },
+      {
+        path: '/fence/alarm/list',
+        name: 'AlarmList',
+        component: () => import('@/views/alarm/alarmList'),
+        meta: { title: '报警记录', icon: '', permission: ['/fence/alarm/list'], keepAlive: true }
+      }
+    ]
+  },
+  {
+    path: '/area',
+    component: Layout,
+    redirect: '/area',
+    name: 'Area',
+    alwaysShow: true,
+    meta: {
+      title: '区域管理',
+      icon: 'icon-area', // 图标
+      permission: ['/area'], // 权限名称
+      sys: '/fence'
+    },
+    children: [
+      {
+        path: '/area/defenceList',
+        name: 'DefenceList',
+        component: () => import('@/views/area/defenceList'),
+        meta: { title: '防区列表', icon: '', permission: ['/area/defenceList'], keepAlive: true }
+      }
+    ]
+  },
+  {
+    path: '/device',
+    component: Layout,
+    redirect: '/device',
+    name: 'Device',
+    alwaysShow: true,
+    meta: {
+      title: '设备管理',
+      icon: 'icon-device', // 图标
+      permission: ['/device'], // 权限名称
+      sys: '/fence'
+    },
+    children: [
+      {
+        path: '/device/list',
+        name: 'DeviceList',
+        component: () => import('@/views/deviceManage/deviceList'),
+        meta: { title: '设备列表', icon: '', permission: ['/device/list'], keepAlive: true }
+      }
+    ]
+  }
+]
diff --git a/src/utils/auth.js b/src/utils/auth.js
index 44af377..5cbe390 100644
--- a/src/utils/auth.js
+++ b/src/utils/auth.js
@@ -40,7 +40,6 @@
 
 export function setCurrentSys(currentSystem) {
   console.log('in auth setCurrentSys')
-  console.log(currentSystem)
   const currentSys = JSON.stringify(currentSystem)
   return window.localStorage.setItem(CurrentSystem, currentSys)
 }
diff --git a/src/views/alarm/alarmNow.vue b/src/views/alarm/alarmNow.vue
index fa8ba38..61a1a98 100644
--- a/src/views/alarm/alarmNow.vue
+++ b/src/views/alarm/alarmNow.vue
@@ -94,7 +94,7 @@
 
 <script>
 import { getAlarmNowList } from '@/api/alarm'
-import { getRegion } from '@/api/area'
+import { getRegion, getAreaTypeBySubSystem } from '@/api/area'
 import { getDetailDevice } from '@/api/device'
 import { getAlarmContent } from '@/api/allDict'
 import { formatToString } from '@/utils/calendarUtil'
@@ -136,11 +136,6 @@
           value: 'areaPosition',
           align: 'center'
         },
-        // {
-        //   text: '所属防护',
-        //   value: 'areaType',
-        //   align: 'center'
-        // },
         {
           text: '设备编号',
           value: 'devcode',
@@ -178,9 +173,15 @@
     }
   },
   created() {
+    // 当前系统
+    const currSys = this.$store.getters.currentSystem
+    // 获取当前系统对应的区域id
+    this.listQuery.areaType = getAreaTypeBySubSystem(currSys.code)
     this.fetchAlarmContentsData()
     this.fetchRegionsData()
-    this.fetchData()// 获取数据
+  },
+  activated() {
+    this.fetchData() // 获取数据
   },
   methods: {
     alarmCancel(row) {
diff --git a/src/views/ctrl/index.vue b/src/views/ctrl/index.vue
index 93efb6f..fd36f2b 100644
--- a/src/views/ctrl/index.vue
+++ b/src/views/ctrl/index.vue
@@ -129,7 +129,7 @@
     border-radius: 16px;
     float: left;
     margin: 10px;
-    box-shadow: 2px 2px 8px #666666;
+    box-shadow: 1px 1px 5px #999;
   }
   .sub-title {
     font-weight: bold;
@@ -141,8 +141,8 @@
   }
   .statis-block {
     text-align: center;
-    margin: 20px 10px 0px 10px;
-    padding: 10px;
+    margin: 0px 10px 0px 10px;
+    padding: 0px 10px 10px 10px;
     color: #fff;
     font-weight: bold;
     letter-spacing: 1px;
@@ -165,7 +165,7 @@
     margin-top: 20px;
     border-radius: 16px;
     background-color: #FFFFFF;
-    box-shadow: 2px 2px 8px #666666;
+    box-shadow: 1px 1px 5px #999;
   }
 
   #today-visitor {
diff --git a/src/views/ctrl/statCharts/inOutCount.vue b/src/views/ctrl/statCharts/inOutCount.vue
index 1956305..d6f3389 100644
--- a/src/views/ctrl/statCharts/inOutCount.vue
+++ b/src/views/ctrl/statCharts/inOutCount.vue
@@ -39,7 +39,7 @@
         },
         xAxisType: 'time',
         max: [4],
-        area: true,
+        area: false,
         metrics: ['staff', 'visitor', 'car', 'visitorCar'],
         dimension: ['date']
       },
diff --git a/src/views/dashboard/portal.vue b/src/views/dashboard/portal.vue
index 8ff66c7..30c3131 100644
--- a/src/views/dashboard/portal.vue
+++ b/src/views/dashboard/portal.vue
@@ -15,8 +15,8 @@
       </el-col>
       <el-col class="sub-system defence-system">
         <div class="icon-subsystem">
-          <img src="/static/images/dashboard/icon-defence.png">
-          <div>周界防卫</div>
+          <img src="/static/images/dashboard/icon-defence.png" @click="changeSubSystem('fence')">
+          <div><a @click="changeSubSystem('fence')">周界防卫</a></div>
         </div>
       </el-col>
       <el-col class="sub-system region-system">
@@ -92,22 +92,6 @@
           this.$router.replace(system[0].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])
-      }
     }
   }
 }
diff --git a/src/views/deviceManage/deviceDetail.vue b/src/views/deviceManage/deviceDetail.vue
index 81d1bba..baaa6f9 100644
--- a/src/views/deviceManage/deviceDetail.vue
+++ b/src/views/deviceManage/deviceDetail.vue
@@ -1,5 +1,5 @@
 <template>
-  <el-dialog :title="textMap[dialogStatus]" :close-on-click-modal="false" :visible.sync="dialogFormVisible" width="75%" append-to-body>
+  <el-dialog :title="textMap[dialogStatus]" :close-on-click-modal="false" :visible.sync="dialogFormVisible" append-to-body>
     <el-form ref="dataForm" :model="dataForm" label-well-code="right" label-width="110px">
       <el-row :gutter="20">
         <el-col :span="12">
@@ -112,9 +112,6 @@
       authList: []
     }
   },
-  created() {
-
-  },
   methods: {
     // 初始化对话框
     initDialog: function(dialogStatus, dialogFormVisible, row = null) {
diff --git a/src/views/layout/components/Sidebar/index.vue b/src/views/layout/components/Sidebar/index.vue
index 861d9e4..ac36b78 100644
--- a/src/views/layout/components/Sidebar/index.vue
+++ b/src/views/layout/components/Sidebar/index.vue
@@ -9,7 +9,7 @@
       text-color="#bfcbd9"
       active-text-color="#1bb1a5"
     >
-      <sidebar-item v-for="route in permission_routers" :key="route.name" :item="route" :base-path="route.path"/>
+      <sidebar-item v-for="route in permission_routers" :key="route.path" :item="route" :base-path="route.path"/>
     </el-menu>
   </el-scrollbar>
 </template>
diff --git a/src/views/staff/staffAdd.vue b/src/views/staff/staffAdd.vue
index cf4fac4..3bdfea3 100644
--- a/src/views/staff/staffAdd.vue
+++ b/src/views/staff/staffAdd.vue
@@ -134,8 +134,8 @@
 import DeptSelect from '@/components/DeptSelect'
 import { detailStaff, addPerson } from '@/api/staff'
 import { getSexType } from '@/api/allDict'
+import { getIrisAreaList } from '@/api/area'
 import { getBirthdayByIdNO, getSexByIdNO } from '@/utils/dataAnalysis'
-// import { addPerson, updatePerson, personInfo, getSexType, getDutyType, getNationType, getPersonPhoto } from '@/api/person'
 import CaptureIris from './captureIris'
 
 export default {
@@ -184,7 +184,7 @@
       imageList: [],
       sexList: [], // 性别列表
       areas: [], // 重点区域复选框对应值
-      keyAreaList: [{ name: '重点区域一', value: '1' }, { name: '重点区域二', value: '2' }], // 将来从接口中获取
+      keyAreaList: [], // 将来从接口中获取
       rules: {
         name: [{ required: true, message: '姓名必填', trigger: ['blur', 'change'] }],
         deptid: [{ required: true, message: '单位/部门必选', trigger: 'change' }],
@@ -215,6 +215,7 @@
   mounted() {
     this.resetForm()
     this.fetchSexType()// 获取性别列表
+    this.fetchIrisRegions() // 获取虹膜设备关联区域的列表
 
     if (this.$route.query && this.$route.query.type) {
       const type = this.$route.query.type
@@ -247,6 +248,11 @@
         this.sexList = response.data
       })
     },
+    fetchIrisRegions() {
+      getIrisAreaList().then(response => {
+        this.keyAreaList = response.data
+      })
+    },
     fetchData(id) {
       this.formLoading = true
       // const base_url = process.env.BASE_API + '/static/'

diff --git a/src/api/area.js b/src/api/area.js
index 9a17cfa..840acf2 100644
--- a/src/api/area.js
+++ b/src/api/area.js
@@ -105,8 +105,8 @@
 }
 
 // 根据当前子系统返回areaType
-export function getAreaTypeBySubSystem(system) {
-  switch (system.code) {
+export function getAreaTypeBySubSystem(sysCode) {
+  switch (sysCode) {
     case 'door':
       return '1'
     case 'fence':
@@ -119,3 +119,11 @@
       return ''
   }
 }
+
+// 获取虹膜设备的所在区域
+export function getIrisAreaList() {
+  return request({
+    url: '/region/getIrisAreaList',
+    method: 'get'
+  })
+}
diff --git a/src/router/index.js b/src/router/index.js
index 823269b..9feb573 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -10,6 +10,7 @@
 import Layout from '../views/layout/Layout'
 import { systemRouters } from './modules/system'
 import { doorSysRouters } from './modules/doorSys'
+import { fenceSysRouters } from './modules/fenceSys'
 import { ctrlSysRouters } from './modules/ctrlSys'
 
 /**
@@ -89,6 +90,7 @@
 export const asyncRouterMap = [
   ...systemRouters,
   ...doorSysRouters,
+  ...fenceSysRouters,
   ...ctrlSysRouters,
   { path: '*', redirect: '/404', hidden: true, meta: {}}
 ]
diff --git a/src/router/modules/doorSys.js b/src/router/modules/doorSys.js
index 235bac9..1a78748 100644
--- a/src/router/modules/doorSys.js
+++ b/src/router/modules/doorSys.js
@@ -4,7 +4,7 @@
   {
     path: '/door',
     name: 'door',
-    redirect: '/visitor',
+    redirect: '/door/alarm',
     hidden: true,
     meta: {
       title: '营门管理子系统',
@@ -13,47 +13,74 @@
     }
   },
   {
-    path: '/visitor',
+    path: '/door/alarm',
     component: Layout,
-    redirect: '/visitor/add',
+    redirect: '/door/alarm/now',
+    name: 'Alarm',
+    alwaysShow: true,
+    meta: {
+      title: '报警管理',
+      icon: 'icon-alarm', // 图标
+      permission: ['/door/alarm'], // 权限名称
+      sys: '/door'
+    },
+    children: [
+      {
+        path: '/door/alarm/now',
+        name: 'AlarmNow',
+        component: () => import('@/views/alarm/alarmNow'),
+        meta: { title: '当前报警', icon: '', permission: ['/door/alarm/now'], keepAlive: true }
+      },
+      {
+        path: '/door/alarm/list',
+        name: 'AlarmList',
+        component: () => import('@/views/alarm/alarmList'),
+        meta: { title: '报警记录', icon: '', permission: ['/door/alarm/list'], keepAlive: true }
+      }
+    ]
+  },
+  {
+    path: '/door/visitor',
+    component: Layout,
+    redirect: '/door/visitor/add',
     name: 'Visitor',
     alwaysShow: true,
     meta: {
       title: '访客管理',
       icon: 'icon-visitor', // 图标
-      permission: ['/visitor'], // 权限名称
+      permission: ['/door/visitor'], // 权限名称
       sys: '/door'
     },
     children: [
       {
-        path: '/visitor/add',
+        path: '/door/visitor/add',
         name: 'VisitorAdd',
         component: () => import('@/views/visitor/visitorAdd'),
-        meta: { title: '访客登记', icon: '', permission: ['/visitor/add'], keepAlive: true }
+        meta: { title: '访客登记', icon: '', permission: ['/door/visitor/add'], keepAlive: true }
       },
       {
-        path: '/visitor/addCar',
+        path: '/door/visitor/addCar',
         name: 'VisitorAddCar',
         component: () => import('@/views/visitor/visitorAddCar'),
-        meta: { title: '访客车辆登记', icon: '', permission: ['/visitor/addCar'], keepAlive: true }
+        meta: { title: '访客车辆登记', icon: '', permission: ['/door/visitor/addCar'], keepAlive: true }
       },
       {
-        path: '/visitor/today',
+        path: '/door/visitor/today',
         name: 'VisitorToday',
         component: () => import('@/views/visitor/visitorTodayList'),
-        meta: { title: '当日来访人员', icon: '', permission: ['/visitor/today'], keepAlive: true }
+        meta: { title: '当日来访人员', icon: '', permission: ['/door/visitor/today'], keepAlive: true }
       },
       {
-        path: '/visitor/carToday',
+        path: '/door/visitor/carToday',
         name: 'VisitorCarToday',
         component: () => import('@/views/visitor/visitorCarTodayList'),
-        meta: { title: '当日来访车辆', icon: '', permission: ['/visitor/carToday'], keepAlive: true }
+        meta: { title: '当日来访车辆', icon: '', permission: ['/door/visitor/carToday'], keepAlive: true }
       },
       {
-        path: '/visitor/list',
+        path: '/door/visitor/list',
         name: 'VisitorList',
         component: () => import('@/views/visitor/visitorList'),
-        meta: { title: '来访记录', icon: '', permission: ['/visitor/list'], keepAlive: true }
+        meta: { title: '来访记录', icon: '', permission: ['/door/visitor/list'], keepAlive: true }
       }
     ]
   },
@@ -92,27 +119,6 @@
     ]
   },
   {
-    path: '/device',
-    component: Layout,
-    redirect: '/device',
-    name: 'Device',
-    alwaysShow: true,
-    meta: {
-      title: '设备管理',
-      icon: 'icon-device', // 图标
-      permission: ['/device'], // 权限名称
-      sys: '/door'
-    },
-    children: [
-      {
-        path: '/device/list',
-        name: 'DeviceList',
-        component: () => import('@/views/deviceManage/deviceList'),
-        meta: { title: '设备列表', icon: '', permission: ['/device/list'], keepAlive: true }
-      }
-    ]
-  },
-  {
     path: '/car',
     component: Layout,
     redirect: '/car',
@@ -141,6 +147,27 @@
     ]
   },
   {
+    path: '/device',
+    component: Layout,
+    redirect: '/device',
+    name: 'Device',
+    alwaysShow: true,
+    meta: {
+      title: '设备管理',
+      icon: 'icon-device', // 图标
+      permission: ['/device'], // 权限名称
+      sys: '/door'
+    },
+    children: [
+      {
+        path: '/device/list',
+        name: 'DeviceList',
+        component: () => import('@/views/deviceManage/deviceList'),
+        meta: { title: '设备列表', icon: '', permission: ['/device/list'], keepAlive: true }
+      }
+    ]
+  },
+  {
     path: '/area',
     component: Layout,
     redirect: '/area',
@@ -212,31 +239,5 @@
       }
     ]
   },
-  {
-    path: '/alarm',
-    component: Layout,
-    redirect: '/alarm',
-    name: 'Alarm',
-    alwaysShow: true,
-    meta: {
-      title: '报警管理',
-      icon: 'icon-alarm', // 图标
-      permission: ['/alarm'], // 权限名称
-      sys: '/door'
-    },
-    children: [
-      {
-        path: '/alarm/now',
-        name: 'AlarmNow',
-        component: () => import('@/views/alarm/alarmNow'),
-        meta: { title: '当前报警', icon: '', permission: ['/alarm/now'], keepAlive: true }
-      },
-      {
-        path: '/alarm/list',
-        name: 'AlarmList',
-        component: () => import('@/views/alarm/alarmList'),
-        meta: { title: '报警记录', icon: '', permission: ['/alarm/list'], keepAlive: true }
-      }
-    ]
-  }
+
 ]
diff --git a/src/router/modules/fenceSys.js b/src/router/modules/fenceSys.js
new file mode 100644
index 0000000..c07c0f8
--- /dev/null
+++ b/src/router/modules/fenceSys.js
@@ -0,0 +1,84 @@
+/* Layout */
+import Layout from '../../views/layout/Layout'
+export const fenceSysRouters = [
+  {
+    path: '/fence',
+    name: 'fence',
+    redirect: '/fence/alarm',
+    hidden: true,
+    meta: {
+      title: '周界管理子系统',
+      permission: ['/fence'],
+      isSys: true
+    }
+  },
+  {
+    path: '/fence/alarm',
+    component: Layout,
+    redirect: '/fence/alarm',
+    name: 'Alarm',
+    alwaysShow: true,
+    meta: {
+      title: '报警管理',
+      icon: 'icon-alarm', // 图标
+      permission: ['/fence/alarm'], // 权限名称
+      sys: '/fence'
+    },
+    children: [
+      {
+        path: '/fence/alarm/now',
+        name: 'AlarmNow',
+        component: () => import('@/views/alarm/alarmNow'),
+        meta: { title: '当前报警', icon: '', permission: ['/fence/alarm/now'], keepAlive: true }
+      },
+      {
+        path: '/fence/alarm/list',
+        name: 'AlarmList',
+        component: () => import('@/views/alarm/alarmList'),
+        meta: { title: '报警记录', icon: '', permission: ['/fence/alarm/list'], keepAlive: true }
+      }
+    ]
+  },
+  {
+    path: '/area',
+    component: Layout,
+    redirect: '/area',
+    name: 'Area',
+    alwaysShow: true,
+    meta: {
+      title: '区域管理',
+      icon: 'icon-area', // 图标
+      permission: ['/area'], // 权限名称
+      sys: '/fence'
+    },
+    children: [
+      {
+        path: '/area/defenceList',
+        name: 'DefenceList',
+        component: () => import('@/views/area/defenceList'),
+        meta: { title: '防区列表', icon: '', permission: ['/area/defenceList'], keepAlive: true }
+      }
+    ]
+  },
+  {
+    path: '/device',
+    component: Layout,
+    redirect: '/device',
+    name: 'Device',
+    alwaysShow: true,
+    meta: {
+      title: '设备管理',
+      icon: 'icon-device', // 图标
+      permission: ['/device'], // 权限名称
+      sys: '/fence'
+    },
+    children: [
+      {
+        path: '/device/list',
+        name: 'DeviceList',
+        component: () => import('@/views/deviceManage/deviceList'),
+        meta: { title: '设备列表', icon: '', permission: ['/device/list'], keepAlive: true }
+      }
+    ]
+  }
+]
diff --git a/src/utils/auth.js b/src/utils/auth.js
index 44af377..5cbe390 100644
--- a/src/utils/auth.js
+++ b/src/utils/auth.js
@@ -40,7 +40,6 @@
 
 export function setCurrentSys(currentSystem) {
   console.log('in auth setCurrentSys')
-  console.log(currentSystem)
   const currentSys = JSON.stringify(currentSystem)
   return window.localStorage.setItem(CurrentSystem, currentSys)
 }
diff --git a/src/views/alarm/alarmNow.vue b/src/views/alarm/alarmNow.vue
index fa8ba38..61a1a98 100644
--- a/src/views/alarm/alarmNow.vue
+++ b/src/views/alarm/alarmNow.vue
@@ -94,7 +94,7 @@
 
 <script>
 import { getAlarmNowList } from '@/api/alarm'
-import { getRegion } from '@/api/area'
+import { getRegion, getAreaTypeBySubSystem } from '@/api/area'
 import { getDetailDevice } from '@/api/device'
 import { getAlarmContent } from '@/api/allDict'
 import { formatToString } from '@/utils/calendarUtil'
@@ -136,11 +136,6 @@
           value: 'areaPosition',
           align: 'center'
         },
-        // {
-        //   text: '所属防护',
-        //   value: 'areaType',
-        //   align: 'center'
-        // },
         {
           text: '设备编号',
           value: 'devcode',
@@ -178,9 +173,15 @@
     }
   },
   created() {
+    // 当前系统
+    const currSys = this.$store.getters.currentSystem
+    // 获取当前系统对应的区域id
+    this.listQuery.areaType = getAreaTypeBySubSystem(currSys.code)
     this.fetchAlarmContentsData()
     this.fetchRegionsData()
-    this.fetchData()// 获取数据
+  },
+  activated() {
+    this.fetchData() // 获取数据
   },
   methods: {
     alarmCancel(row) {
diff --git a/src/views/ctrl/index.vue b/src/views/ctrl/index.vue
index 93efb6f..fd36f2b 100644
--- a/src/views/ctrl/index.vue
+++ b/src/views/ctrl/index.vue
@@ -129,7 +129,7 @@
     border-radius: 16px;
     float: left;
     margin: 10px;
-    box-shadow: 2px 2px 8px #666666;
+    box-shadow: 1px 1px 5px #999;
   }
   .sub-title {
     font-weight: bold;
@@ -141,8 +141,8 @@
   }
   .statis-block {
     text-align: center;
-    margin: 20px 10px 0px 10px;
-    padding: 10px;
+    margin: 0px 10px 0px 10px;
+    padding: 0px 10px 10px 10px;
     color: #fff;
     font-weight: bold;
     letter-spacing: 1px;
@@ -165,7 +165,7 @@
     margin-top: 20px;
     border-radius: 16px;
     background-color: #FFFFFF;
-    box-shadow: 2px 2px 8px #666666;
+    box-shadow: 1px 1px 5px #999;
   }
 
   #today-visitor {
diff --git a/src/views/ctrl/statCharts/inOutCount.vue b/src/views/ctrl/statCharts/inOutCount.vue
index 1956305..d6f3389 100644
--- a/src/views/ctrl/statCharts/inOutCount.vue
+++ b/src/views/ctrl/statCharts/inOutCount.vue
@@ -39,7 +39,7 @@
         },
         xAxisType: 'time',
         max: [4],
-        area: true,
+        area: false,
         metrics: ['staff', 'visitor', 'car', 'visitorCar'],
         dimension: ['date']
       },
diff --git a/src/views/dashboard/portal.vue b/src/views/dashboard/portal.vue
index 8ff66c7..30c3131 100644
--- a/src/views/dashboard/portal.vue
+++ b/src/views/dashboard/portal.vue
@@ -15,8 +15,8 @@
       </el-col>
       <el-col class="sub-system defence-system">
         <div class="icon-subsystem">
-          <img src="/static/images/dashboard/icon-defence.png">
-          <div>周界防卫</div>
+          <img src="/static/images/dashboard/icon-defence.png" @click="changeSubSystem('fence')">
+          <div><a @click="changeSubSystem('fence')">周界防卫</a></div>
         </div>
       </el-col>
       <el-col class="sub-system region-system">
@@ -92,22 +92,6 @@
           this.$router.replace(system[0].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])
-      }
     }
   }
 }
diff --git a/src/views/deviceManage/deviceDetail.vue b/src/views/deviceManage/deviceDetail.vue
index 81d1bba..baaa6f9 100644
--- a/src/views/deviceManage/deviceDetail.vue
+++ b/src/views/deviceManage/deviceDetail.vue
@@ -1,5 +1,5 @@
 <template>
-  <el-dialog :title="textMap[dialogStatus]" :close-on-click-modal="false" :visible.sync="dialogFormVisible" width="75%" append-to-body>
+  <el-dialog :title="textMap[dialogStatus]" :close-on-click-modal="false" :visible.sync="dialogFormVisible" append-to-body>
     <el-form ref="dataForm" :model="dataForm" label-well-code="right" label-width="110px">
       <el-row :gutter="20">
         <el-col :span="12">
@@ -112,9 +112,6 @@
       authList: []
     }
   },
-  created() {
-
-  },
   methods: {
     // 初始化对话框
     initDialog: function(dialogStatus, dialogFormVisible, row = null) {
diff --git a/src/views/layout/components/Sidebar/index.vue b/src/views/layout/components/Sidebar/index.vue
index 861d9e4..ac36b78 100644
--- a/src/views/layout/components/Sidebar/index.vue
+++ b/src/views/layout/components/Sidebar/index.vue
@@ -9,7 +9,7 @@
       text-color="#bfcbd9"
       active-text-color="#1bb1a5"
     >
-      <sidebar-item v-for="route in permission_routers" :key="route.name" :item="route" :base-path="route.path"/>
+      <sidebar-item v-for="route in permission_routers" :key="route.path" :item="route" :base-path="route.path"/>
     </el-menu>
   </el-scrollbar>
 </template>
diff --git a/src/views/staff/staffAdd.vue b/src/views/staff/staffAdd.vue
index cf4fac4..3bdfea3 100644
--- a/src/views/staff/staffAdd.vue
+++ b/src/views/staff/staffAdd.vue
@@ -134,8 +134,8 @@
 import DeptSelect from '@/components/DeptSelect'
 import { detailStaff, addPerson } from '@/api/staff'
 import { getSexType } from '@/api/allDict'
+import { getIrisAreaList } from '@/api/area'
 import { getBirthdayByIdNO, getSexByIdNO } from '@/utils/dataAnalysis'
-// import { addPerson, updatePerson, personInfo, getSexType, getDutyType, getNationType, getPersonPhoto } from '@/api/person'
 import CaptureIris from './captureIris'
 
 export default {
@@ -184,7 +184,7 @@
       imageList: [],
       sexList: [], // 性别列表
       areas: [], // 重点区域复选框对应值
-      keyAreaList: [{ name: '重点区域一', value: '1' }, { name: '重点区域二', value: '2' }], // 将来从接口中获取
+      keyAreaList: [], // 将来从接口中获取
       rules: {
         name: [{ required: true, message: '姓名必填', trigger: ['blur', 'change'] }],
         deptid: [{ required: true, message: '单位/部门必选', trigger: 'change' }],
@@ -215,6 +215,7 @@
   mounted() {
     this.resetForm()
     this.fetchSexType()// 获取性别列表
+    this.fetchIrisRegions() // 获取虹膜设备关联区域的列表
 
     if (this.$route.query && this.$route.query.type) {
       const type = this.$route.query.type
@@ -247,6 +248,11 @@
         this.sexList = response.data
       })
     },
+    fetchIrisRegions() {
+      getIrisAreaList().then(response => {
+        this.keyAreaList = response.data
+      })
+    },
     fetchData(id) {
       this.formLoading = true
       // const base_url = process.env.BASE_API + '/static/'
diff --git a/src/views/staff/staffDetail.vue b/src/views/staff/staffDetail.vue
index ca2dbfb..8fc4c6d 100644
--- a/src/views/staff/staffDetail.vue
+++ b/src/views/staff/staffDetail.vue
@@ -65,6 +65,16 @@
 
       <el-row v-show="isKeyPerson" :gutter="20">
         <el-col :span="24">
+          <el-form-item label="重点区域授权">
+            <el-checkbox-group v-model="areas">
+              <el-checkbox v-for="item in keyAreaList" :label="item.value" :key="item.value" :disabled="true" border>{{ item.name }}</el-checkbox>
+            </el-checkbox-group>
+          </el-form-item>
+        </el-col>
+      </el-row>
+
+      <el-row v-show="isKeyPerson" :gutter="20">
+        <el-col :span="24">
           <el-form-item label="虹膜图片">
             <el-image
               :src="dataForm.rightIris!==''?dataForm.rightIris:defaultIris"
@@ -93,6 +103,7 @@
 <script>
 
 import { detailStaff } from '@/api/staff'
+import { getIrisAreaList } from '@/api/area'
 export default {
   name: 'StaffDetail',
   data() {
@@ -122,13 +133,15 @@
       }, // 表头显示标题
       isEditMode: false,
       isKeyPerson: false,
+      areas: [], // 重点区域复选框对应值
+      keyAreaList: [],
       defaultPhoto: require('@/assets/global_images/photo.png'), // 默认图片路径
       defaultIris: require('@/assets/global_images/iris.png'), // 默认虹膜图片
       btnLoading: true // 保存按钮是否不允许点击
     }
   },
   created() {
-
+    this.fetchIrisRegions() // 获取虹膜设备关联区域的列表
   },
   methods: {
     // 初始化对话框
@@ -154,12 +167,16 @@
               photo: row.photo
             }
 
-            if (response.data.irisData !== undefined && response.data.irisData !== '') {
+            if (response.data.areaIds !== '') {
+              this.areas = response.data.areaIds.split(',')
+
               this.isKeyPerson = true
-              this.dataForm.leftIris = process.env.BASE_API + '/static/' + response.data.irisData.leftImage
-              this.dataForm.rightIris = process.env.BASE_API + '/static/' + response.data.irisData.rightImage
-              this.dataForm.leftIrisScore = response.data.irisData.leftIrisScore
-              this.dataForm.rightIrisScore = response.data.irisData.rightIrisScore
+              if (response.data.irisData !== undefined && response.data.irisData !== '') {
+                this.dataForm.leftIris = process.env.BASE_API + '/static/' + response.data.irisData.leftImage
+                this.dataForm.rightIris = process.env.BASE_API + '/static/' + response.data.irisData.rightImage
+                this.dataForm.leftIrisScore = response.data.irisData.leftIrisScore
+                this.dataForm.rightIrisScore = response.data.irisData.rightIrisScore
+              }
             } else {
               this.isKeyPerson = false
             }
@@ -167,6 +184,11 @@
         })
       }
     },
+    fetchIrisRegions() {
+      getIrisAreaList().then(response => {
+        this.keyAreaList = response.data
+      })
+    },
     // 身份证号加密显示
     encrypIdCardNo(idCard) {
       if (idCard.length > 6) {

diff --git a/src/api/area.js b/src/api/area.js
index 9a17cfa..840acf2 100644
--- a/src/api/area.js
+++ b/src/api/area.js
@@ -105,8 +105,8 @@
 }
 
 // 根据当前子系统返回areaType
-export function getAreaTypeBySubSystem(system) {
-  switch (system.code) {
+export function getAreaTypeBySubSystem(sysCode) {
+  switch (sysCode) {
     case 'door':
       return '1'
     case 'fence':
@@ -119,3 +119,11 @@
       return ''
   }
 }
+
+// 获取虹膜设备的所在区域
+export function getIrisAreaList() {
+  return request({
+    url: '/region/getIrisAreaList',
+    method: 'get'
+  })
+}
diff --git a/src/router/index.js b/src/router/index.js
index 823269b..9feb573 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -10,6 +10,7 @@
 import Layout from '../views/layout/Layout'
 import { systemRouters } from './modules/system'
 import { doorSysRouters } from './modules/doorSys'
+import { fenceSysRouters } from './modules/fenceSys'
 import { ctrlSysRouters } from './modules/ctrlSys'
 
 /**
@@ -89,6 +90,7 @@
 export const asyncRouterMap = [
   ...systemRouters,
   ...doorSysRouters,
+  ...fenceSysRouters,
   ...ctrlSysRouters,
   { path: '*', redirect: '/404', hidden: true, meta: {}}
 ]
diff --git a/src/router/modules/doorSys.js b/src/router/modules/doorSys.js
index 235bac9..1a78748 100644
--- a/src/router/modules/doorSys.js
+++ b/src/router/modules/doorSys.js
@@ -4,7 +4,7 @@
   {
     path: '/door',
     name: 'door',
-    redirect: '/visitor',
+    redirect: '/door/alarm',
     hidden: true,
     meta: {
       title: '营门管理子系统',
@@ -13,47 +13,74 @@
     }
   },
   {
-    path: '/visitor',
+    path: '/door/alarm',
     component: Layout,
-    redirect: '/visitor/add',
+    redirect: '/door/alarm/now',
+    name: 'Alarm',
+    alwaysShow: true,
+    meta: {
+      title: '报警管理',
+      icon: 'icon-alarm', // 图标
+      permission: ['/door/alarm'], // 权限名称
+      sys: '/door'
+    },
+    children: [
+      {
+        path: '/door/alarm/now',
+        name: 'AlarmNow',
+        component: () => import('@/views/alarm/alarmNow'),
+        meta: { title: '当前报警', icon: '', permission: ['/door/alarm/now'], keepAlive: true }
+      },
+      {
+        path: '/door/alarm/list',
+        name: 'AlarmList',
+        component: () => import('@/views/alarm/alarmList'),
+        meta: { title: '报警记录', icon: '', permission: ['/door/alarm/list'], keepAlive: true }
+      }
+    ]
+  },
+  {
+    path: '/door/visitor',
+    component: Layout,
+    redirect: '/door/visitor/add',
     name: 'Visitor',
     alwaysShow: true,
     meta: {
       title: '访客管理',
       icon: 'icon-visitor', // 图标
-      permission: ['/visitor'], // 权限名称
+      permission: ['/door/visitor'], // 权限名称
       sys: '/door'
     },
     children: [
       {
-        path: '/visitor/add',
+        path: '/door/visitor/add',
         name: 'VisitorAdd',
         component: () => import('@/views/visitor/visitorAdd'),
-        meta: { title: '访客登记', icon: '', permission: ['/visitor/add'], keepAlive: true }
+        meta: { title: '访客登记', icon: '', permission: ['/door/visitor/add'], keepAlive: true }
       },
       {
-        path: '/visitor/addCar',
+        path: '/door/visitor/addCar',
         name: 'VisitorAddCar',
         component: () => import('@/views/visitor/visitorAddCar'),
-        meta: { title: '访客车辆登记', icon: '', permission: ['/visitor/addCar'], keepAlive: true }
+        meta: { title: '访客车辆登记', icon: '', permission: ['/door/visitor/addCar'], keepAlive: true }
       },
       {
-        path: '/visitor/today',
+        path: '/door/visitor/today',
         name: 'VisitorToday',
         component: () => import('@/views/visitor/visitorTodayList'),
-        meta: { title: '当日来访人员', icon: '', permission: ['/visitor/today'], keepAlive: true }
+        meta: { title: '当日来访人员', icon: '', permission: ['/door/visitor/today'], keepAlive: true }
       },
       {
-        path: '/visitor/carToday',
+        path: '/door/visitor/carToday',
         name: 'VisitorCarToday',
         component: () => import('@/views/visitor/visitorCarTodayList'),
-        meta: { title: '当日来访车辆', icon: '', permission: ['/visitor/carToday'], keepAlive: true }
+        meta: { title: '当日来访车辆', icon: '', permission: ['/door/visitor/carToday'], keepAlive: true }
       },
       {
-        path: '/visitor/list',
+        path: '/door/visitor/list',
         name: 'VisitorList',
         component: () => import('@/views/visitor/visitorList'),
-        meta: { title: '来访记录', icon: '', permission: ['/visitor/list'], keepAlive: true }
+        meta: { title: '来访记录', icon: '', permission: ['/door/visitor/list'], keepAlive: true }
       }
     ]
   },
@@ -92,27 +119,6 @@
     ]
   },
   {
-    path: '/device',
-    component: Layout,
-    redirect: '/device',
-    name: 'Device',
-    alwaysShow: true,
-    meta: {
-      title: '设备管理',
-      icon: 'icon-device', // 图标
-      permission: ['/device'], // 权限名称
-      sys: '/door'
-    },
-    children: [
-      {
-        path: '/device/list',
-        name: 'DeviceList',
-        component: () => import('@/views/deviceManage/deviceList'),
-        meta: { title: '设备列表', icon: '', permission: ['/device/list'], keepAlive: true }
-      }
-    ]
-  },
-  {
     path: '/car',
     component: Layout,
     redirect: '/car',
@@ -141,6 +147,27 @@
     ]
   },
   {
+    path: '/device',
+    component: Layout,
+    redirect: '/device',
+    name: 'Device',
+    alwaysShow: true,
+    meta: {
+      title: '设备管理',
+      icon: 'icon-device', // 图标
+      permission: ['/device'], // 权限名称
+      sys: '/door'
+    },
+    children: [
+      {
+        path: '/device/list',
+        name: 'DeviceList',
+        component: () => import('@/views/deviceManage/deviceList'),
+        meta: { title: '设备列表', icon: '', permission: ['/device/list'], keepAlive: true }
+      }
+    ]
+  },
+  {
     path: '/area',
     component: Layout,
     redirect: '/area',
@@ -212,31 +239,5 @@
       }
     ]
   },
-  {
-    path: '/alarm',
-    component: Layout,
-    redirect: '/alarm',
-    name: 'Alarm',
-    alwaysShow: true,
-    meta: {
-      title: '报警管理',
-      icon: 'icon-alarm', // 图标
-      permission: ['/alarm'], // 权限名称
-      sys: '/door'
-    },
-    children: [
-      {
-        path: '/alarm/now',
-        name: 'AlarmNow',
-        component: () => import('@/views/alarm/alarmNow'),
-        meta: { title: '当前报警', icon: '', permission: ['/alarm/now'], keepAlive: true }
-      },
-      {
-        path: '/alarm/list',
-        name: 'AlarmList',
-        component: () => import('@/views/alarm/alarmList'),
-        meta: { title: '报警记录', icon: '', permission: ['/alarm/list'], keepAlive: true }
-      }
-    ]
-  }
+
 ]
diff --git a/src/router/modules/fenceSys.js b/src/router/modules/fenceSys.js
new file mode 100644
index 0000000..c07c0f8
--- /dev/null
+++ b/src/router/modules/fenceSys.js
@@ -0,0 +1,84 @@
+/* Layout */
+import Layout from '../../views/layout/Layout'
+export const fenceSysRouters = [
+  {
+    path: '/fence',
+    name: 'fence',
+    redirect: '/fence/alarm',
+    hidden: true,
+    meta: {
+      title: '周界管理子系统',
+      permission: ['/fence'],
+      isSys: true
+    }
+  },
+  {
+    path: '/fence/alarm',
+    component: Layout,
+    redirect: '/fence/alarm',
+    name: 'Alarm',
+    alwaysShow: true,
+    meta: {
+      title: '报警管理',
+      icon: 'icon-alarm', // 图标
+      permission: ['/fence/alarm'], // 权限名称
+      sys: '/fence'
+    },
+    children: [
+      {
+        path: '/fence/alarm/now',
+        name: 'AlarmNow',
+        component: () => import('@/views/alarm/alarmNow'),
+        meta: { title: '当前报警', icon: '', permission: ['/fence/alarm/now'], keepAlive: true }
+      },
+      {
+        path: '/fence/alarm/list',
+        name: 'AlarmList',
+        component: () => import('@/views/alarm/alarmList'),
+        meta: { title: '报警记录', icon: '', permission: ['/fence/alarm/list'], keepAlive: true }
+      }
+    ]
+  },
+  {
+    path: '/area',
+    component: Layout,
+    redirect: '/area',
+    name: 'Area',
+    alwaysShow: true,
+    meta: {
+      title: '区域管理',
+      icon: 'icon-area', // 图标
+      permission: ['/area'], // 权限名称
+      sys: '/fence'
+    },
+    children: [
+      {
+        path: '/area/defenceList',
+        name: 'DefenceList',
+        component: () => import('@/views/area/defenceList'),
+        meta: { title: '防区列表', icon: '', permission: ['/area/defenceList'], keepAlive: true }
+      }
+    ]
+  },
+  {
+    path: '/device',
+    component: Layout,
+    redirect: '/device',
+    name: 'Device',
+    alwaysShow: true,
+    meta: {
+      title: '设备管理',
+      icon: 'icon-device', // 图标
+      permission: ['/device'], // 权限名称
+      sys: '/fence'
+    },
+    children: [
+      {
+        path: '/device/list',
+        name: 'DeviceList',
+        component: () => import('@/views/deviceManage/deviceList'),
+        meta: { title: '设备列表', icon: '', permission: ['/device/list'], keepAlive: true }
+      }
+    ]
+  }
+]
diff --git a/src/utils/auth.js b/src/utils/auth.js
index 44af377..5cbe390 100644
--- a/src/utils/auth.js
+++ b/src/utils/auth.js
@@ -40,7 +40,6 @@
 
 export function setCurrentSys(currentSystem) {
   console.log('in auth setCurrentSys')
-  console.log(currentSystem)
   const currentSys = JSON.stringify(currentSystem)
   return window.localStorage.setItem(CurrentSystem, currentSys)
 }
diff --git a/src/views/alarm/alarmNow.vue b/src/views/alarm/alarmNow.vue
index fa8ba38..61a1a98 100644
--- a/src/views/alarm/alarmNow.vue
+++ b/src/views/alarm/alarmNow.vue
@@ -94,7 +94,7 @@
 
 <script>
 import { getAlarmNowList } from '@/api/alarm'
-import { getRegion } from '@/api/area'
+import { getRegion, getAreaTypeBySubSystem } from '@/api/area'
 import { getDetailDevice } from '@/api/device'
 import { getAlarmContent } from '@/api/allDict'
 import { formatToString } from '@/utils/calendarUtil'
@@ -136,11 +136,6 @@
           value: 'areaPosition',
           align: 'center'
         },
-        // {
-        //   text: '所属防护',
-        //   value: 'areaType',
-        //   align: 'center'
-        // },
         {
           text: '设备编号',
           value: 'devcode',
@@ -178,9 +173,15 @@
     }
   },
   created() {
+    // 当前系统
+    const currSys = this.$store.getters.currentSystem
+    // 获取当前系统对应的区域id
+    this.listQuery.areaType = getAreaTypeBySubSystem(currSys.code)
     this.fetchAlarmContentsData()
     this.fetchRegionsData()
-    this.fetchData()// 获取数据
+  },
+  activated() {
+    this.fetchData() // 获取数据
   },
   methods: {
     alarmCancel(row) {
diff --git a/src/views/ctrl/index.vue b/src/views/ctrl/index.vue
index 93efb6f..fd36f2b 100644
--- a/src/views/ctrl/index.vue
+++ b/src/views/ctrl/index.vue
@@ -129,7 +129,7 @@
     border-radius: 16px;
     float: left;
     margin: 10px;
-    box-shadow: 2px 2px 8px #666666;
+    box-shadow: 1px 1px 5px #999;
   }
   .sub-title {
     font-weight: bold;
@@ -141,8 +141,8 @@
   }
   .statis-block {
     text-align: center;
-    margin: 20px 10px 0px 10px;
-    padding: 10px;
+    margin: 0px 10px 0px 10px;
+    padding: 0px 10px 10px 10px;
     color: #fff;
     font-weight: bold;
     letter-spacing: 1px;
@@ -165,7 +165,7 @@
     margin-top: 20px;
     border-radius: 16px;
     background-color: #FFFFFF;
-    box-shadow: 2px 2px 8px #666666;
+    box-shadow: 1px 1px 5px #999;
   }
 
   #today-visitor {
diff --git a/src/views/ctrl/statCharts/inOutCount.vue b/src/views/ctrl/statCharts/inOutCount.vue
index 1956305..d6f3389 100644
--- a/src/views/ctrl/statCharts/inOutCount.vue
+++ b/src/views/ctrl/statCharts/inOutCount.vue
@@ -39,7 +39,7 @@
         },
         xAxisType: 'time',
         max: [4],
-        area: true,
+        area: false,
         metrics: ['staff', 'visitor', 'car', 'visitorCar'],
         dimension: ['date']
       },
diff --git a/src/views/dashboard/portal.vue b/src/views/dashboard/portal.vue
index 8ff66c7..30c3131 100644
--- a/src/views/dashboard/portal.vue
+++ b/src/views/dashboard/portal.vue
@@ -15,8 +15,8 @@
       </el-col>
       <el-col class="sub-system defence-system">
         <div class="icon-subsystem">
-          <img src="/static/images/dashboard/icon-defence.png">
-          <div>周界防卫</div>
+          <img src="/static/images/dashboard/icon-defence.png" @click="changeSubSystem('fence')">
+          <div><a @click="changeSubSystem('fence')">周界防卫</a></div>
         </div>
       </el-col>
       <el-col class="sub-system region-system">
@@ -92,22 +92,6 @@
           this.$router.replace(system[0].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])
-      }
     }
   }
 }
diff --git a/src/views/deviceManage/deviceDetail.vue b/src/views/deviceManage/deviceDetail.vue
index 81d1bba..baaa6f9 100644
--- a/src/views/deviceManage/deviceDetail.vue
+++ b/src/views/deviceManage/deviceDetail.vue
@@ -1,5 +1,5 @@
 <template>
-  <el-dialog :title="textMap[dialogStatus]" :close-on-click-modal="false" :visible.sync="dialogFormVisible" width="75%" append-to-body>
+  <el-dialog :title="textMap[dialogStatus]" :close-on-click-modal="false" :visible.sync="dialogFormVisible" append-to-body>
     <el-form ref="dataForm" :model="dataForm" label-well-code="right" label-width="110px">
       <el-row :gutter="20">
         <el-col :span="12">
@@ -112,9 +112,6 @@
       authList: []
     }
   },
-  created() {
-
-  },
   methods: {
     // 初始化对话框
     initDialog: function(dialogStatus, dialogFormVisible, row = null) {
diff --git a/src/views/layout/components/Sidebar/index.vue b/src/views/layout/components/Sidebar/index.vue
index 861d9e4..ac36b78 100644
--- a/src/views/layout/components/Sidebar/index.vue
+++ b/src/views/layout/components/Sidebar/index.vue
@@ -9,7 +9,7 @@
       text-color="#bfcbd9"
       active-text-color="#1bb1a5"
     >
-      <sidebar-item v-for="route in permission_routers" :key="route.name" :item="route" :base-path="route.path"/>
+      <sidebar-item v-for="route in permission_routers" :key="route.path" :item="route" :base-path="route.path"/>
     </el-menu>
   </el-scrollbar>
 </template>
diff --git a/src/views/staff/staffAdd.vue b/src/views/staff/staffAdd.vue
index cf4fac4..3bdfea3 100644
--- a/src/views/staff/staffAdd.vue
+++ b/src/views/staff/staffAdd.vue
@@ -134,8 +134,8 @@
 import DeptSelect from '@/components/DeptSelect'
 import { detailStaff, addPerson } from '@/api/staff'
 import { getSexType } from '@/api/allDict'
+import { getIrisAreaList } from '@/api/area'
 import { getBirthdayByIdNO, getSexByIdNO } from '@/utils/dataAnalysis'
-// import { addPerson, updatePerson, personInfo, getSexType, getDutyType, getNationType, getPersonPhoto } from '@/api/person'
 import CaptureIris from './captureIris'
 
 export default {
@@ -184,7 +184,7 @@
       imageList: [],
       sexList: [], // 性别列表
       areas: [], // 重点区域复选框对应值
-      keyAreaList: [{ name: '重点区域一', value: '1' }, { name: '重点区域二', value: '2' }], // 将来从接口中获取
+      keyAreaList: [], // 将来从接口中获取
       rules: {
         name: [{ required: true, message: '姓名必填', trigger: ['blur', 'change'] }],
         deptid: [{ required: true, message: '单位/部门必选', trigger: 'change' }],
@@ -215,6 +215,7 @@
   mounted() {
     this.resetForm()
     this.fetchSexType()// 获取性别列表
+    this.fetchIrisRegions() // 获取虹膜设备关联区域的列表
 
     if (this.$route.query && this.$route.query.type) {
       const type = this.$route.query.type
@@ -247,6 +248,11 @@
         this.sexList = response.data
       })
     },
+    fetchIrisRegions() {
+      getIrisAreaList().then(response => {
+        this.keyAreaList = response.data
+      })
+    },
     fetchData(id) {
       this.formLoading = true
       // const base_url = process.env.BASE_API + '/static/'
diff --git a/src/views/staff/staffDetail.vue b/src/views/staff/staffDetail.vue
index ca2dbfb..8fc4c6d 100644
--- a/src/views/staff/staffDetail.vue
+++ b/src/views/staff/staffDetail.vue
@@ -65,6 +65,16 @@
 
       <el-row v-show="isKeyPerson" :gutter="20">
         <el-col :span="24">
+          <el-form-item label="重点区域授权">
+            <el-checkbox-group v-model="areas">
+              <el-checkbox v-for="item in keyAreaList" :label="item.value" :key="item.value" :disabled="true" border>{{ item.name }}</el-checkbox>
+            </el-checkbox-group>
+          </el-form-item>
+        </el-col>
+      </el-row>
+
+      <el-row v-show="isKeyPerson" :gutter="20">
+        <el-col :span="24">
           <el-form-item label="虹膜图片">
             <el-image
               :src="dataForm.rightIris!==''?dataForm.rightIris:defaultIris"
@@ -93,6 +103,7 @@
 <script>
 
 import { detailStaff } from '@/api/staff'
+import { getIrisAreaList } from '@/api/area'
 export default {
   name: 'StaffDetail',
   data() {
@@ -122,13 +133,15 @@
       }, // 表头显示标题
       isEditMode: false,
       isKeyPerson: false,
+      areas: [], // 重点区域复选框对应值
+      keyAreaList: [],
       defaultPhoto: require('@/assets/global_images/photo.png'), // 默认图片路径
       defaultIris: require('@/assets/global_images/iris.png'), // 默认虹膜图片
       btnLoading: true // 保存按钮是否不允许点击
     }
   },
   created() {
-
+    this.fetchIrisRegions() // 获取虹膜设备关联区域的列表
   },
   methods: {
     // 初始化对话框
@@ -154,12 +167,16 @@
               photo: row.photo
             }
 
-            if (response.data.irisData !== undefined && response.data.irisData !== '') {
+            if (response.data.areaIds !== '') {
+              this.areas = response.data.areaIds.split(',')
+
               this.isKeyPerson = true
-              this.dataForm.leftIris = process.env.BASE_API + '/static/' + response.data.irisData.leftImage
-              this.dataForm.rightIris = process.env.BASE_API + '/static/' + response.data.irisData.rightImage
-              this.dataForm.leftIrisScore = response.data.irisData.leftIrisScore
-              this.dataForm.rightIrisScore = response.data.irisData.rightIrisScore
+              if (response.data.irisData !== undefined && response.data.irisData !== '') {
+                this.dataForm.leftIris = process.env.BASE_API + '/static/' + response.data.irisData.leftImage
+                this.dataForm.rightIris = process.env.BASE_API + '/static/' + response.data.irisData.rightImage
+                this.dataForm.leftIrisScore = response.data.irisData.leftIrisScore
+                this.dataForm.rightIrisScore = response.data.irisData.rightIrisScore
+              }
             } else {
               this.isKeyPerson = false
             }
@@ -167,6 +184,11 @@
         })
       }
     },
+    fetchIrisRegions() {
+      getIrisAreaList().then(response => {
+        this.keyAreaList = response.data
+      })
+    },
     // 身份证号加密显示
     encrypIdCardNo(idCard) {
       if (idCard.length > 6) {
diff --git a/src/views/staff/staffEdit.vue b/src/views/staff/staffEdit.vue
index 7f0aaab..8bfa4e3 100644
--- a/src/views/staff/staffEdit.vue
+++ b/src/views/staff/staffEdit.vue
@@ -134,6 +134,7 @@
 import DeptSelect from '@/components/DeptSelect'
 import { detailStaff, editPerson } from '@/api/staff'
 import { getSexType } from '@/api/allDict'
+import { getIrisAreaList } from '@/api/area'
 import { getBirthdayByIdNO, getSexByIdNO } from '@/utils/dataAnalysis'
 import CaptureIris from './captureIris'
 
@@ -184,7 +185,7 @@
       imageList: [],
       sexList: [], // 性别列表
       areas: [], // 重点区域复选框对应值
-      keyAreaList: [{ name: '重点区域一', value: '1' }, { name: '重点区域二', value: '2' }], // 将来从接口中获取
+      keyAreaList: [],
       rules: {
         name: [{ required: true, message: '姓名必填', trigger: ['blur', 'change'] }],
         deptid: [{ required: true, message: '单位/部门必选', trigger: 'change' }],
@@ -214,6 +215,7 @@
   },
   mounted() {
     this.fetchSexType()// 获取性别列表
+    this.fetchIrisRegions() // 获取虹膜设备关联区域的列表
   },
   activated() {
     if (this.$route.query && this.$route.query.type) {
@@ -233,6 +235,11 @@
         this.sexList = response.data
       })
     },
+    fetchIrisRegions() {
+      getIrisAreaList().then(response => {
+        this.keyAreaList = response.data
+      })
+    },
     fetchData(id) {
       this.formLoading = true
       detailStaff(id).then(response => {

diff --git a/src/api/area.js b/src/api/area.js
index 9a17cfa..840acf2 100644
--- a/src/api/area.js
+++ b/src/api/area.js
@@ -105,8 +105,8 @@
 }
 
 // 根据当前子系统返回areaType
-export function getAreaTypeBySubSystem(system) {
-  switch (system.code) {
+export function getAreaTypeBySubSystem(sysCode) {
+  switch (sysCode) {
     case 'door':
       return '1'
     case 'fence':
@@ -119,3 +119,11 @@
       return ''
   }
 }
+
+// 获取虹膜设备的所在区域
+export function getIrisAreaList() {
+  return request({
+    url: '/region/getIrisAreaList',
+    method: 'get'
+  })
+}
diff --git a/src/router/index.js b/src/router/index.js
index 823269b..9feb573 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -10,6 +10,7 @@
 import Layout from '../views/layout/Layout'
 import { systemRouters } from './modules/system'
 import { doorSysRouters } from './modules/doorSys'
+import { fenceSysRouters } from './modules/fenceSys'
 import { ctrlSysRouters } from './modules/ctrlSys'
 
 /**
@@ -89,6 +90,7 @@
 export const asyncRouterMap = [
   ...systemRouters,
   ...doorSysRouters,
+  ...fenceSysRouters,
   ...ctrlSysRouters,
   { path: '*', redirect: '/404', hidden: true, meta: {}}
 ]
diff --git a/src/router/modules/doorSys.js b/src/router/modules/doorSys.js
index 235bac9..1a78748 100644
--- a/src/router/modules/doorSys.js
+++ b/src/router/modules/doorSys.js
@@ -4,7 +4,7 @@
   {
     path: '/door',
     name: 'door',
-    redirect: '/visitor',
+    redirect: '/door/alarm',
     hidden: true,
     meta: {
       title: '营门管理子系统',
@@ -13,47 +13,74 @@
     }
   },
   {
-    path: '/visitor',
+    path: '/door/alarm',
     component: Layout,
-    redirect: '/visitor/add',
+    redirect: '/door/alarm/now',
+    name: 'Alarm',
+    alwaysShow: true,
+    meta: {
+      title: '报警管理',
+      icon: 'icon-alarm', // 图标
+      permission: ['/door/alarm'], // 权限名称
+      sys: '/door'
+    },
+    children: [
+      {
+        path: '/door/alarm/now',
+        name: 'AlarmNow',
+        component: () => import('@/views/alarm/alarmNow'),
+        meta: { title: '当前报警', icon: '', permission: ['/door/alarm/now'], keepAlive: true }
+      },
+      {
+        path: '/door/alarm/list',
+        name: 'AlarmList',
+        component: () => import('@/views/alarm/alarmList'),
+        meta: { title: '报警记录', icon: '', permission: ['/door/alarm/list'], keepAlive: true }
+      }
+    ]
+  },
+  {
+    path: '/door/visitor',
+    component: Layout,
+    redirect: '/door/visitor/add',
     name: 'Visitor',
     alwaysShow: true,
     meta: {
       title: '访客管理',
       icon: 'icon-visitor', // 图标
-      permission: ['/visitor'], // 权限名称
+      permission: ['/door/visitor'], // 权限名称
       sys: '/door'
     },
     children: [
       {
-        path: '/visitor/add',
+        path: '/door/visitor/add',
         name: 'VisitorAdd',
         component: () => import('@/views/visitor/visitorAdd'),
-        meta: { title: '访客登记', icon: '', permission: ['/visitor/add'], keepAlive: true }
+        meta: { title: '访客登记', icon: '', permission: ['/door/visitor/add'], keepAlive: true }
       },
       {
-        path: '/visitor/addCar',
+        path: '/door/visitor/addCar',
         name: 'VisitorAddCar',
         component: () => import('@/views/visitor/visitorAddCar'),
-        meta: { title: '访客车辆登记', icon: '', permission: ['/visitor/addCar'], keepAlive: true }
+        meta: { title: '访客车辆登记', icon: '', permission: ['/door/visitor/addCar'], keepAlive: true }
       },
       {
-        path: '/visitor/today',
+        path: '/door/visitor/today',
         name: 'VisitorToday',
         component: () => import('@/views/visitor/visitorTodayList'),
-        meta: { title: '当日来访人员', icon: '', permission: ['/visitor/today'], keepAlive: true }
+        meta: { title: '当日来访人员', icon: '', permission: ['/door/visitor/today'], keepAlive: true }
       },
       {
-        path: '/visitor/carToday',
+        path: '/door/visitor/carToday',
         name: 'VisitorCarToday',
         component: () => import('@/views/visitor/visitorCarTodayList'),
-        meta: { title: '当日来访车辆', icon: '', permission: ['/visitor/carToday'], keepAlive: true }
+        meta: { title: '当日来访车辆', icon: '', permission: ['/door/visitor/carToday'], keepAlive: true }
       },
       {
-        path: '/visitor/list',
+        path: '/door/visitor/list',
         name: 'VisitorList',
         component: () => import('@/views/visitor/visitorList'),
-        meta: { title: '来访记录', icon: '', permission: ['/visitor/list'], keepAlive: true }
+        meta: { title: '来访记录', icon: '', permission: ['/door/visitor/list'], keepAlive: true }
       }
     ]
   },
@@ -92,27 +119,6 @@
     ]
   },
   {
-    path: '/device',
-    component: Layout,
-    redirect: '/device',
-    name: 'Device',
-    alwaysShow: true,
-    meta: {
-      title: '设备管理',
-      icon: 'icon-device', // 图标
-      permission: ['/device'], // 权限名称
-      sys: '/door'
-    },
-    children: [
-      {
-        path: '/device/list',
-        name: 'DeviceList',
-        component: () => import('@/views/deviceManage/deviceList'),
-        meta: { title: '设备列表', icon: '', permission: ['/device/list'], keepAlive: true }
-      }
-    ]
-  },
-  {
     path: '/car',
     component: Layout,
     redirect: '/car',
@@ -141,6 +147,27 @@
     ]
   },
   {
+    path: '/device',
+    component: Layout,
+    redirect: '/device',
+    name: 'Device',
+    alwaysShow: true,
+    meta: {
+      title: '设备管理',
+      icon: 'icon-device', // 图标
+      permission: ['/device'], // 权限名称
+      sys: '/door'
+    },
+    children: [
+      {
+        path: '/device/list',
+        name: 'DeviceList',
+        component: () => import('@/views/deviceManage/deviceList'),
+        meta: { title: '设备列表', icon: '', permission: ['/device/list'], keepAlive: true }
+      }
+    ]
+  },
+  {
     path: '/area',
     component: Layout,
     redirect: '/area',
@@ -212,31 +239,5 @@
       }
     ]
   },
-  {
-    path: '/alarm',
-    component: Layout,
-    redirect: '/alarm',
-    name: 'Alarm',
-    alwaysShow: true,
-    meta: {
-      title: '报警管理',
-      icon: 'icon-alarm', // 图标
-      permission: ['/alarm'], // 权限名称
-      sys: '/door'
-    },
-    children: [
-      {
-        path: '/alarm/now',
-        name: 'AlarmNow',
-        component: () => import('@/views/alarm/alarmNow'),
-        meta: { title: '当前报警', icon: '', permission: ['/alarm/now'], keepAlive: true }
-      },
-      {
-        path: '/alarm/list',
-        name: 'AlarmList',
-        component: () => import('@/views/alarm/alarmList'),
-        meta: { title: '报警记录', icon: '', permission: ['/alarm/list'], keepAlive: true }
-      }
-    ]
-  }
+
 ]
diff --git a/src/router/modules/fenceSys.js b/src/router/modules/fenceSys.js
new file mode 100644
index 0000000..c07c0f8
--- /dev/null
+++ b/src/router/modules/fenceSys.js
@@ -0,0 +1,84 @@
+/* Layout */
+import Layout from '../../views/layout/Layout'
+export const fenceSysRouters = [
+  {
+    path: '/fence',
+    name: 'fence',
+    redirect: '/fence/alarm',
+    hidden: true,
+    meta: {
+      title: '周界管理子系统',
+      permission: ['/fence'],
+      isSys: true
+    }
+  },
+  {
+    path: '/fence/alarm',
+    component: Layout,
+    redirect: '/fence/alarm',
+    name: 'Alarm',
+    alwaysShow: true,
+    meta: {
+      title: '报警管理',
+      icon: 'icon-alarm', // 图标
+      permission: ['/fence/alarm'], // 权限名称
+      sys: '/fence'
+    },
+    children: [
+      {
+        path: '/fence/alarm/now',
+        name: 'AlarmNow',
+        component: () => import('@/views/alarm/alarmNow'),
+        meta: { title: '当前报警', icon: '', permission: ['/fence/alarm/now'], keepAlive: true }
+      },
+      {
+        path: '/fence/alarm/list',
+        name: 'AlarmList',
+        component: () => import('@/views/alarm/alarmList'),
+        meta: { title: '报警记录', icon: '', permission: ['/fence/alarm/list'], keepAlive: true }
+      }
+    ]
+  },
+  {
+    path: '/area',
+    component: Layout,
+    redirect: '/area',
+    name: 'Area',
+    alwaysShow: true,
+    meta: {
+      title: '区域管理',
+      icon: 'icon-area', // 图标
+      permission: ['/area'], // 权限名称
+      sys: '/fence'
+    },
+    children: [
+      {
+        path: '/area/defenceList',
+        name: 'DefenceList',
+        component: () => import('@/views/area/defenceList'),
+        meta: { title: '防区列表', icon: '', permission: ['/area/defenceList'], keepAlive: true }
+      }
+    ]
+  },
+  {
+    path: '/device',
+    component: Layout,
+    redirect: '/device',
+    name: 'Device',
+    alwaysShow: true,
+    meta: {
+      title: '设备管理',
+      icon: 'icon-device', // 图标
+      permission: ['/device'], // 权限名称
+      sys: '/fence'
+    },
+    children: [
+      {
+        path: '/device/list',
+        name: 'DeviceList',
+        component: () => import('@/views/deviceManage/deviceList'),
+        meta: { title: '设备列表', icon: '', permission: ['/device/list'], keepAlive: true }
+      }
+    ]
+  }
+]
diff --git a/src/utils/auth.js b/src/utils/auth.js
index 44af377..5cbe390 100644
--- a/src/utils/auth.js
+++ b/src/utils/auth.js
@@ -40,7 +40,6 @@
 
 export function setCurrentSys(currentSystem) {
   console.log('in auth setCurrentSys')
-  console.log(currentSystem)
   const currentSys = JSON.stringify(currentSystem)
   return window.localStorage.setItem(CurrentSystem, currentSys)
 }
diff --git a/src/views/alarm/alarmNow.vue b/src/views/alarm/alarmNow.vue
index fa8ba38..61a1a98 100644
--- a/src/views/alarm/alarmNow.vue
+++ b/src/views/alarm/alarmNow.vue
@@ -94,7 +94,7 @@
 
 <script>
 import { getAlarmNowList } from '@/api/alarm'
-import { getRegion } from '@/api/area'
+import { getRegion, getAreaTypeBySubSystem } from '@/api/area'
 import { getDetailDevice } from '@/api/device'
 import { getAlarmContent } from '@/api/allDict'
 import { formatToString } from '@/utils/calendarUtil'
@@ -136,11 +136,6 @@
           value: 'areaPosition',
           align: 'center'
         },
-        // {
-        //   text: '所属防护',
-        //   value: 'areaType',
-        //   align: 'center'
-        // },
         {
           text: '设备编号',
           value: 'devcode',
@@ -178,9 +173,15 @@
     }
   },
   created() {
+    // 当前系统
+    const currSys = this.$store.getters.currentSystem
+    // 获取当前系统对应的区域id
+    this.listQuery.areaType = getAreaTypeBySubSystem(currSys.code)
     this.fetchAlarmContentsData()
     this.fetchRegionsData()
-    this.fetchData()// 获取数据
+  },
+  activated() {
+    this.fetchData() // 获取数据
   },
   methods: {
     alarmCancel(row) {
diff --git a/src/views/ctrl/index.vue b/src/views/ctrl/index.vue
index 93efb6f..fd36f2b 100644
--- a/src/views/ctrl/index.vue
+++ b/src/views/ctrl/index.vue
@@ -129,7 +129,7 @@
     border-radius: 16px;
     float: left;
     margin: 10px;
-    box-shadow: 2px 2px 8px #666666;
+    box-shadow: 1px 1px 5px #999;
   }
   .sub-title {
     font-weight: bold;
@@ -141,8 +141,8 @@
   }
   .statis-block {
     text-align: center;
-    margin: 20px 10px 0px 10px;
-    padding: 10px;
+    margin: 0px 10px 0px 10px;
+    padding: 0px 10px 10px 10px;
     color: #fff;
     font-weight: bold;
     letter-spacing: 1px;
@@ -165,7 +165,7 @@
     margin-top: 20px;
     border-radius: 16px;
     background-color: #FFFFFF;
-    box-shadow: 2px 2px 8px #666666;
+    box-shadow: 1px 1px 5px #999;
   }
 
   #today-visitor {
diff --git a/src/views/ctrl/statCharts/inOutCount.vue b/src/views/ctrl/statCharts/inOutCount.vue
index 1956305..d6f3389 100644
--- a/src/views/ctrl/statCharts/inOutCount.vue
+++ b/src/views/ctrl/statCharts/inOutCount.vue
@@ -39,7 +39,7 @@
         },
         xAxisType: 'time',
         max: [4],
-        area: true,
+        area: false,
         metrics: ['staff', 'visitor', 'car', 'visitorCar'],
         dimension: ['date']
       },
diff --git a/src/views/dashboard/portal.vue b/src/views/dashboard/portal.vue
index 8ff66c7..30c3131 100644
--- a/src/views/dashboard/portal.vue
+++ b/src/views/dashboard/portal.vue
@@ -15,8 +15,8 @@
       </el-col>
       <el-col class="sub-system defence-system">
         <div class="icon-subsystem">
-          <img src="/static/images/dashboard/icon-defence.png">
-          <div>周界防卫</div>
+          <img src="/static/images/dashboard/icon-defence.png" @click="changeSubSystem('fence')">
+          <div><a @click="changeSubSystem('fence')">周界防卫</a></div>
         </div>
       </el-col>
       <el-col class="sub-system region-system">
@@ -92,22 +92,6 @@
           this.$router.replace(system[0].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])
-      }
     }
   }
 }
diff --git a/src/views/deviceManage/deviceDetail.vue b/src/views/deviceManage/deviceDetail.vue
index 81d1bba..baaa6f9 100644
--- a/src/views/deviceManage/deviceDetail.vue
+++ b/src/views/deviceManage/deviceDetail.vue
@@ -1,5 +1,5 @@
 <template>
-  <el-dialog :title="textMap[dialogStatus]" :close-on-click-modal="false" :visible.sync="dialogFormVisible" width="75%" append-to-body>
+  <el-dialog :title="textMap[dialogStatus]" :close-on-click-modal="false" :visible.sync="dialogFormVisible" append-to-body>
     <el-form ref="dataForm" :model="dataForm" label-well-code="right" label-width="110px">
       <el-row :gutter="20">
         <el-col :span="12">
@@ -112,9 +112,6 @@
       authList: []
     }
   },
-  created() {
-
-  },
   methods: {
     // 初始化对话框
     initDialog: function(dialogStatus, dialogFormVisible, row = null) {
diff --git a/src/views/layout/components/Sidebar/index.vue b/src/views/layout/components/Sidebar/index.vue
index 861d9e4..ac36b78 100644
--- a/src/views/layout/components/Sidebar/index.vue
+++ b/src/views/layout/components/Sidebar/index.vue
@@ -9,7 +9,7 @@
       text-color="#bfcbd9"
       active-text-color="#1bb1a5"
     >
-      <sidebar-item v-for="route in permission_routers" :key="route.name" :item="route" :base-path="route.path"/>
+      <sidebar-item v-for="route in permission_routers" :key="route.path" :item="route" :base-path="route.path"/>
     </el-menu>
   </el-scrollbar>
 </template>
diff --git a/src/views/staff/staffAdd.vue b/src/views/staff/staffAdd.vue
index cf4fac4..3bdfea3 100644
--- a/src/views/staff/staffAdd.vue
+++ b/src/views/staff/staffAdd.vue
@@ -134,8 +134,8 @@
 import DeptSelect from '@/components/DeptSelect'
 import { detailStaff, addPerson } from '@/api/staff'
 import { getSexType } from '@/api/allDict'
+import { getIrisAreaList } from '@/api/area'
 import { getBirthdayByIdNO, getSexByIdNO } from '@/utils/dataAnalysis'
-// import { addPerson, updatePerson, personInfo, getSexType, getDutyType, getNationType, getPersonPhoto } from '@/api/person'
 import CaptureIris from './captureIris'
 
 export default {
@@ -184,7 +184,7 @@
       imageList: [],
       sexList: [], // 性别列表
       areas: [], // 重点区域复选框对应值
-      keyAreaList: [{ name: '重点区域一', value: '1' }, { name: '重点区域二', value: '2' }], // 将来从接口中获取
+      keyAreaList: [], // 将来从接口中获取
       rules: {
         name: [{ required: true, message: '姓名必填', trigger: ['blur', 'change'] }],
         deptid: [{ required: true, message: '单位/部门必选', trigger: 'change' }],
@@ -215,6 +215,7 @@
   mounted() {
     this.resetForm()
     this.fetchSexType()// 获取性别列表
+    this.fetchIrisRegions() // 获取虹膜设备关联区域的列表
 
     if (this.$route.query && this.$route.query.type) {
       const type = this.$route.query.type
@@ -247,6 +248,11 @@
         this.sexList = response.data
       })
     },
+    fetchIrisRegions() {
+      getIrisAreaList().then(response => {
+        this.keyAreaList = response.data
+      })
+    },
     fetchData(id) {
       this.formLoading = true
       // const base_url = process.env.BASE_API + '/static/'
diff --git a/src/views/staff/staffDetail.vue b/src/views/staff/staffDetail.vue
index ca2dbfb..8fc4c6d 100644
--- a/src/views/staff/staffDetail.vue
+++ b/src/views/staff/staffDetail.vue
@@ -65,6 +65,16 @@
 
       <el-row v-show="isKeyPerson" :gutter="20">
         <el-col :span="24">
+          <el-form-item label="重点区域授权">
+            <el-checkbox-group v-model="areas">
+              <el-checkbox v-for="item in keyAreaList" :label="item.value" :key="item.value" :disabled="true" border>{{ item.name }}</el-checkbox>
+            </el-checkbox-group>
+          </el-form-item>
+        </el-col>
+      </el-row>
+
+      <el-row v-show="isKeyPerson" :gutter="20">
+        <el-col :span="24">
           <el-form-item label="虹膜图片">
             <el-image
               :src="dataForm.rightIris!==''?dataForm.rightIris:defaultIris"
@@ -93,6 +103,7 @@
 <script>
 
 import { detailStaff } from '@/api/staff'
+import { getIrisAreaList } from '@/api/area'
 export default {
   name: 'StaffDetail',
   data() {
@@ -122,13 +133,15 @@
       }, // 表头显示标题
       isEditMode: false,
       isKeyPerson: false,
+      areas: [], // 重点区域复选框对应值
+      keyAreaList: [],
       defaultPhoto: require('@/assets/global_images/photo.png'), // 默认图片路径
       defaultIris: require('@/assets/global_images/iris.png'), // 默认虹膜图片
       btnLoading: true // 保存按钮是否不允许点击
     }
   },
   created() {
-
+    this.fetchIrisRegions() // 获取虹膜设备关联区域的列表
   },
   methods: {
     // 初始化对话框
@@ -154,12 +167,16 @@
               photo: row.photo
             }
 
-            if (response.data.irisData !== undefined && response.data.irisData !== '') {
+            if (response.data.areaIds !== '') {
+              this.areas = response.data.areaIds.split(',')
+
               this.isKeyPerson = true
-              this.dataForm.leftIris = process.env.BASE_API + '/static/' + response.data.irisData.leftImage
-              this.dataForm.rightIris = process.env.BASE_API + '/static/' + response.data.irisData.rightImage
-              this.dataForm.leftIrisScore = response.data.irisData.leftIrisScore
-              this.dataForm.rightIrisScore = response.data.irisData.rightIrisScore
+              if (response.data.irisData !== undefined && response.data.irisData !== '') {
+                this.dataForm.leftIris = process.env.BASE_API + '/static/' + response.data.irisData.leftImage
+                this.dataForm.rightIris = process.env.BASE_API + '/static/' + response.data.irisData.rightImage
+                this.dataForm.leftIrisScore = response.data.irisData.leftIrisScore
+                this.dataForm.rightIrisScore = response.data.irisData.rightIrisScore
+              }
             } else {
               this.isKeyPerson = false
             }
@@ -167,6 +184,11 @@
         })
       }
     },
+    fetchIrisRegions() {
+      getIrisAreaList().then(response => {
+        this.keyAreaList = response.data
+      })
+    },
     // 身份证号加密显示
     encrypIdCardNo(idCard) {
       if (idCard.length > 6) {
diff --git a/src/views/staff/staffEdit.vue b/src/views/staff/staffEdit.vue
index 7f0aaab..8bfa4e3 100644
--- a/src/views/staff/staffEdit.vue
+++ b/src/views/staff/staffEdit.vue
@@ -134,6 +134,7 @@
 import DeptSelect from '@/components/DeptSelect'
 import { detailStaff, editPerson } from '@/api/staff'
 import { getSexType } from '@/api/allDict'
+import { getIrisAreaList } from '@/api/area'
 import { getBirthdayByIdNO, getSexByIdNO } from '@/utils/dataAnalysis'
 import CaptureIris from './captureIris'
 
@@ -184,7 +185,7 @@
       imageList: [],
       sexList: [], // 性别列表
       areas: [], // 重点区域复选框对应值
-      keyAreaList: [{ name: '重点区域一', value: '1' }, { name: '重点区域二', value: '2' }], // 将来从接口中获取
+      keyAreaList: [],
       rules: {
         name: [{ required: true, message: '姓名必填', trigger: ['blur', 'change'] }],
         deptid: [{ required: true, message: '单位/部门必选', trigger: 'change' }],
@@ -214,6 +215,7 @@
   },
   mounted() {
     this.fetchSexType()// 获取性别列表
+    this.fetchIrisRegions() // 获取虹膜设备关联区域的列表
   },
   activated() {
     if (this.$route.query && this.$route.query.type) {
@@ -233,6 +235,11 @@
         this.sexList = response.data
       })
     },
+    fetchIrisRegions() {
+      getIrisAreaList().then(response => {
+        this.keyAreaList = response.data
+      })
+    },
     fetchData(id) {
       this.formLoading = true
       detailStaff(id).then(response => {
diff --git a/src/views/staff/staffList.vue b/src/views/staff/staffList.vue
index 882a7c5..b47f910 100644
--- a/src/views/staff/staffList.vue
+++ b/src/views/staff/staffList.vue
@@ -126,9 +126,6 @@
       dialogFormVisible: false
     }
   },
-  created() {
-    this.fetchData()// 获取数据
-  },
   activated() {
     this.fetchData()
   },