diff --git a/src/api/statistics.js b/src/api/statistics.js
index 454c11c..e20b4c0 100644
--- a/src/api/statistics.js
+++ b/src/api/statistics.js
@@ -37,3 +37,21 @@
     params
   })
 }
+
+// 人员所处时长统计
+export function personDurationStatistics(params) {
+  return request({
+    url: '/statistics/personDurationListPage',
+    method: 'get',
+    params
+  })
+}
+
+// 车辆所处时长统计
+export function carDurationStatistics(params) {
+  return request({
+    url: '/statistics/carDurationListPage',
+    method: 'get',
+    params
+  })
+}

diff --git a/src/api/statistics.js b/src/api/statistics.js
index 454c11c..e20b4c0 100644
--- a/src/api/statistics.js
+++ b/src/api/statistics.js
@@ -37,3 +37,21 @@
     params
   })
 }
+
+// 人员所处时长统计
+export function personDurationStatistics(params) {
+  return request({
+    url: '/statistics/personDurationListPage',
+    method: 'get',
+    params
+  })
+}
+
+// 车辆所处时长统计
+export function carDurationStatistics(params) {
+  return request({
+    url: '/statistics/carDurationListPage',
+    method: 'get',
+    params
+  })
+}
diff --git a/src/router/modules/doorSys.js b/src/router/modules/doorSys.js
index 39b783b..235bac9 100644
--- a/src/router/modules/doorSys.js
+++ b/src/router/modules/doorSys.js
@@ -193,6 +193,18 @@
         meta: { title: '车辆进出记录', icon: '', permission: ['/statistics/inOutCar'], keepAlive: true }
       },
       {
+        path: '/statistics/personDuration',
+        name: 'PersonDuration',
+        component: () => import('@/views/statistics/personDuration'),
+        meta: { title: '人员所处时长统计', icon: '', permission: ['/statistics/personDuration'], keepAlive: true }
+      },
+      {
+        path: '/statistics/carDuration',
+        name: 'CarDuration',
+        component: () => import('@/views/statistics/carDuration'),
+        meta: { title: '车辆所处时长统计', icon: '', permission: ['/statistics/carDuration'], keepAlive: true }
+      },
+      {
         path: '/statistics/doorCount',
         name: 'DoorCount',
         component: () => import('@/views/statistics/doorCount'),

diff --git a/src/api/statistics.js b/src/api/statistics.js
index 454c11c..e20b4c0 100644
--- a/src/api/statistics.js
+++ b/src/api/statistics.js
@@ -37,3 +37,21 @@
     params
   })
 }
+
+// 人员所处时长统计
+export function personDurationStatistics(params) {
+  return request({
+    url: '/statistics/personDurationListPage',
+    method: 'get',
+    params
+  })
+}
+
+// 车辆所处时长统计
+export function carDurationStatistics(params) {
+  return request({
+    url: '/statistics/carDurationListPage',
+    method: 'get',
+    params
+  })
+}
diff --git a/src/router/modules/doorSys.js b/src/router/modules/doorSys.js
index 39b783b..235bac9 100644
--- a/src/router/modules/doorSys.js
+++ b/src/router/modules/doorSys.js
@@ -193,6 +193,18 @@
         meta: { title: '车辆进出记录', icon: '', permission: ['/statistics/inOutCar'], keepAlive: true }
       },
       {
+        path: '/statistics/personDuration',
+        name: 'PersonDuration',
+        component: () => import('@/views/statistics/personDuration'),
+        meta: { title: '人员所处时长统计', icon: '', permission: ['/statistics/personDuration'], keepAlive: true }
+      },
+      {
+        path: '/statistics/carDuration',
+        name: 'CarDuration',
+        component: () => import('@/views/statistics/carDuration'),
+        meta: { title: '车辆所处时长统计', icon: '', permission: ['/statistics/carDuration'], keepAlive: true }
+      },
+      {
         path: '/statistics/doorCount',
         name: 'DoorCount',
         component: () => import('@/views/statistics/doorCount'),
diff --git a/src/views/car/carAdd.vue b/src/views/car/carAdd.vue
index a3e0261..b4f2f4a 100644
--- a/src/views/car/carAdd.vue
+++ b/src/views/car/carAdd.vue
@@ -202,7 +202,7 @@
                 this.dialogFormVisible = false
               })
             } else {
-              this.$message.fail(response.message)
+              this.$message.error(response.message)
               this.btnLoading = false
             }
           }).catch(() => {

diff --git a/src/api/statistics.js b/src/api/statistics.js
index 454c11c..e20b4c0 100644
--- a/src/api/statistics.js
+++ b/src/api/statistics.js
@@ -37,3 +37,21 @@
     params
   })
 }
+
+// 人员所处时长统计
+export function personDurationStatistics(params) {
+  return request({
+    url: '/statistics/personDurationListPage',
+    method: 'get',
+    params
+  })
+}
+
+// 车辆所处时长统计
+export function carDurationStatistics(params) {
+  return request({
+    url: '/statistics/carDurationListPage',
+    method: 'get',
+    params
+  })
+}
diff --git a/src/router/modules/doorSys.js b/src/router/modules/doorSys.js
index 39b783b..235bac9 100644
--- a/src/router/modules/doorSys.js
+++ b/src/router/modules/doorSys.js
@@ -193,6 +193,18 @@
         meta: { title: '车辆进出记录', icon: '', permission: ['/statistics/inOutCar'], keepAlive: true }
       },
       {
+        path: '/statistics/personDuration',
+        name: 'PersonDuration',
+        component: () => import('@/views/statistics/personDuration'),
+        meta: { title: '人员所处时长统计', icon: '', permission: ['/statistics/personDuration'], keepAlive: true }
+      },
+      {
+        path: '/statistics/carDuration',
+        name: 'CarDuration',
+        component: () => import('@/views/statistics/carDuration'),
+        meta: { title: '车辆所处时长统计', icon: '', permission: ['/statistics/carDuration'], keepAlive: true }
+      },
+      {
         path: '/statistics/doorCount',
         name: 'DoorCount',
         component: () => import('@/views/statistics/doorCount'),
diff --git a/src/views/car/carAdd.vue b/src/views/car/carAdd.vue
index a3e0261..b4f2f4a 100644
--- a/src/views/car/carAdd.vue
+++ b/src/views/car/carAdd.vue
@@ -202,7 +202,7 @@
                 this.dialogFormVisible = false
               })
             } else {
-              this.$message.fail(response.message)
+              this.$message.error(response.message)
               this.btnLoading = false
             }
           }).catch(() => {
diff --git a/src/views/staff/captureIris.vue b/src/views/staff/captureIris.vue
index 7183176..01ef3fe 100644
--- a/src/views/staff/captureIris.vue
+++ b/src/views/staff/captureIris.vue
@@ -1,9 +1,9 @@
 <template>
   <div class="app-container">
     <el-dialog :title="title" :visible.sync="dialogFormVisible" append-to-body @close="closeDialog">
-      <el-form ref="dataForm" :model="irisForm" label-well-code="right" label-width="95px" style="margin-top: 20px">
+      <el-form ref="dataForm" :model="irisForm" label-well-code="right" label-width="0px" style="margin-top: 20px">
         <el-row type="flex" justify="center">
-          <el-col :offset="2" :span="12">
+          <el-col :span="12">
             <div class="avatar">
               <el-image
                 :src="photoRight!==''?photoRight:defaultPhoto"
@@ -24,15 +24,15 @@
           </el-col>
         </el-row>
         <el-row style="margin-top: 10px;">
-          <el-col :offset="6" :span="4">
-            <span>右眼虹膜</span>
+          <el-col :span="12" style="text-align: center">
+            <span>右眼虹膜，评分：{{ scoreRight }}</span>
           </el-col>
-          <el-col :offset="7" :span="4">
-            <span>左眼虹膜</span>
+          <el-col :span="12" style="text-align: center">
+            <span>左眼虹膜，评分：{{ scoreLeft }}</span>
           </el-col>
         </el-row>
-        <el-row >
-          <el-col :offset="5" :span="12" style="margin-top: 30px">
+        <el-row>
+          <el-col :offset="8" :span="8" style="margin-top: 30px">
             <el-form-item prop="eyeType">
               <el-select :disabled="eyeTypeDisabled" v-model="irisForm.eyeType">
                 <el-option key="3" label="双眼" value="3" />
@@ -139,24 +139,24 @@
           if (that.irisForm.eyeType === '3') {
             that.photoLeft = 'data:image/png;base64,' + imageData.split(';')[0]
             that.photoRight = 'data:image/png;base64,' + imageData.split(';')[1]
-            that.scoreLeft = scoreData.split(';')[0]
-            that.scoreRight = scoreData.split(';')[1]
+            that.scoreLeft = parseFloat(scoreData.split(';')[0]).toFixed(2)
+            that.scoreRight = parseFloat(scoreData.split(';')[1]).toFixed(2)
           } else if (that.irisForm.eyeType === '2') {
             that.photoLeft = 'data:image/png;base64,' + imageData
-            that.scoreLeft = scoreData
+            that.scoreLeft = parseFloat(scoreData).toFixed(2)
           } else if (that.irisForm.eyeType === '1') {
             that.photoRight = 'data:image/png;base64,' + imageData
-            that.scoreRight = scoreData
+            that.scoreRight = parseFloat(scoreData).toFixed(2)
           }
         }
       }
     },
     // 初始化对话框
     initDialog: function(dialogFormVisible, data, isAddPerson) {
+      this.isAddperson = isAddPerson
       this.title = '采集虹膜 - ' + data.name + ' - ' + data.idCard
       this.irisForm.idCard = data.idCard
       this.dialogFormVisible = dialogFormVisible
-      this.isAddPerson = isAddPerson
       this.WebSocketConnent()
     },
     startCapture() {
@@ -187,6 +187,11 @@
       this.$parent.personForm.irisData.leftIrisScore = this.scoreLeft
       this.$parent.personForm.irisData.rightIrisScore = this.scoreRight
 
+      // 编辑人员时，通知编辑页面人员虹膜已经重采
+      if (this.isAddperson === '0') {
+        this.$parent.reCaptureIris = '1'
+      }
+
       this.$message.success('采集成功')
       this.edited = true
       this.dialogFormVisible = false
@@ -226,11 +231,12 @@
   .avatar {
     margin: 10px;
     display: block;
+    text-align: center;
   }
   .dialog-footer{
     text-align: center;
     margin-top: 10px;
-    margin-left: 30px;
+    /*margin-left: 30px;*/
     margin-bottom: 15px;
   }
   .customWidth{

diff --git a/src/api/statistics.js b/src/api/statistics.js
index 454c11c..e20b4c0 100644
--- a/src/api/statistics.js
+++ b/src/api/statistics.js
@@ -37,3 +37,21 @@
     params
   })
 }
+
+// 人员所处时长统计
+export function personDurationStatistics(params) {
+  return request({
+    url: '/statistics/personDurationListPage',
+    method: 'get',
+    params
+  })
+}
+
+// 车辆所处时长统计
+export function carDurationStatistics(params) {
+  return request({
+    url: '/statistics/carDurationListPage',
+    method: 'get',
+    params
+  })
+}
diff --git a/src/router/modules/doorSys.js b/src/router/modules/doorSys.js
index 39b783b..235bac9 100644
--- a/src/router/modules/doorSys.js
+++ b/src/router/modules/doorSys.js
@@ -193,6 +193,18 @@
         meta: { title: '车辆进出记录', icon: '', permission: ['/statistics/inOutCar'], keepAlive: true }
       },
       {
+        path: '/statistics/personDuration',
+        name: 'PersonDuration',
+        component: () => import('@/views/statistics/personDuration'),
+        meta: { title: '人员所处时长统计', icon: '', permission: ['/statistics/personDuration'], keepAlive: true }
+      },
+      {
+        path: '/statistics/carDuration',
+        name: 'CarDuration',
+        component: () => import('@/views/statistics/carDuration'),
+        meta: { title: '车辆所处时长统计', icon: '', permission: ['/statistics/carDuration'], keepAlive: true }
+      },
+      {
         path: '/statistics/doorCount',
         name: 'DoorCount',
         component: () => import('@/views/statistics/doorCount'),
diff --git a/src/views/car/carAdd.vue b/src/views/car/carAdd.vue
index a3e0261..b4f2f4a 100644
--- a/src/views/car/carAdd.vue
+++ b/src/views/car/carAdd.vue
@@ -202,7 +202,7 @@
                 this.dialogFormVisible = false
               })
             } else {
-              this.$message.fail(response.message)
+              this.$message.error(response.message)
               this.btnLoading = false
             }
           }).catch(() => {
diff --git a/src/views/staff/captureIris.vue b/src/views/staff/captureIris.vue
index 7183176..01ef3fe 100644
--- a/src/views/staff/captureIris.vue
+++ b/src/views/staff/captureIris.vue
@@ -1,9 +1,9 @@
 <template>
   <div class="app-container">
     <el-dialog :title="title" :visible.sync="dialogFormVisible" append-to-body @close="closeDialog">
-      <el-form ref="dataForm" :model="irisForm" label-well-code="right" label-width="95px" style="margin-top: 20px">
+      <el-form ref="dataForm" :model="irisForm" label-well-code="right" label-width="0px" style="margin-top: 20px">
         <el-row type="flex" justify="center">
-          <el-col :offset="2" :span="12">
+          <el-col :span="12">
             <div class="avatar">
               <el-image
                 :src="photoRight!==''?photoRight:defaultPhoto"
@@ -24,15 +24,15 @@
           </el-col>
         </el-row>
         <el-row style="margin-top: 10px;">
-          <el-col :offset="6" :span="4">
-            <span>右眼虹膜</span>
+          <el-col :span="12" style="text-align: center">
+            <span>右眼虹膜，评分：{{ scoreRight }}</span>
           </el-col>
-          <el-col :offset="7" :span="4">
-            <span>左眼虹膜</span>
+          <el-col :span="12" style="text-align: center">
+            <span>左眼虹膜，评分：{{ scoreLeft }}</span>
           </el-col>
         </el-row>
-        <el-row >
-          <el-col :offset="5" :span="12" style="margin-top: 30px">
+        <el-row>
+          <el-col :offset="8" :span="8" style="margin-top: 30px">
             <el-form-item prop="eyeType">
               <el-select :disabled="eyeTypeDisabled" v-model="irisForm.eyeType">
                 <el-option key="3" label="双眼" value="3" />
@@ -139,24 +139,24 @@
           if (that.irisForm.eyeType === '3') {
             that.photoLeft = 'data:image/png;base64,' + imageData.split(';')[0]
             that.photoRight = 'data:image/png;base64,' + imageData.split(';')[1]
-            that.scoreLeft = scoreData.split(';')[0]
-            that.scoreRight = scoreData.split(';')[1]
+            that.scoreLeft = parseFloat(scoreData.split(';')[0]).toFixed(2)
+            that.scoreRight = parseFloat(scoreData.split(';')[1]).toFixed(2)
           } else if (that.irisForm.eyeType === '2') {
             that.photoLeft = 'data:image/png;base64,' + imageData
-            that.scoreLeft = scoreData
+            that.scoreLeft = parseFloat(scoreData).toFixed(2)
           } else if (that.irisForm.eyeType === '1') {
             that.photoRight = 'data:image/png;base64,' + imageData
-            that.scoreRight = scoreData
+            that.scoreRight = parseFloat(scoreData).toFixed(2)
           }
         }
       }
     },
     // 初始化对话框
     initDialog: function(dialogFormVisible, data, isAddPerson) {
+      this.isAddperson = isAddPerson
       this.title = '采集虹膜 - ' + data.name + ' - ' + data.idCard
       this.irisForm.idCard = data.idCard
       this.dialogFormVisible = dialogFormVisible
-      this.isAddPerson = isAddPerson
       this.WebSocketConnent()
     },
     startCapture() {
@@ -187,6 +187,11 @@
       this.$parent.personForm.irisData.leftIrisScore = this.scoreLeft
       this.$parent.personForm.irisData.rightIrisScore = this.scoreRight
 
+      // 编辑人员时，通知编辑页面人员虹膜已经重采
+      if (this.isAddperson === '0') {
+        this.$parent.reCaptureIris = '1'
+      }
+
       this.$message.success('采集成功')
       this.edited = true
       this.dialogFormVisible = false
@@ -226,11 +231,12 @@
   .avatar {
     margin: 10px;
     display: block;
+    text-align: center;
   }
   .dialog-footer{
     text-align: center;
     margin-top: 10px;
-    margin-left: 30px;
+    /*margin-left: 30px;*/
     margin-bottom: 15px;
   }
   .customWidth{
diff --git a/src/views/staff/staffDetail.vue b/src/views/staff/staffDetail.vue
index b4df0c8..ca2dbfb 100644
--- a/src/views/staff/staffDetail.vue
+++ b/src/views/staff/staffDetail.vue
@@ -64,35 +64,25 @@
       </el-row>
 
       <el-row v-show="isKeyPerson" :gutter="20">
-        <el-col :span="24" style="text-align: left;">
-          <el-form-item label="虹膜图片" style="margin-bottom: 0px;" />
-        </el-col>
-      </el-row>
-      <el-row v-show="isKeyPerson" :gutter="20">
-        <el-col :span="12">
-          <div class="avatar">
-            <el-image
-              :src="dataForm.leftIris!==''?dataForm.leftIris:defaultIris"
-              fit="cover"/>
-          </div>
-        </el-col>
-        <el-col :span="12">
-          <div class="avatar">
+        <el-col :span="24">
+          <el-form-item label="虹膜图片">
             <el-image
               :src="dataForm.rightIris!==''?dataForm.rightIris:defaultIris"
-              fit="cover"/>
-          </div>
-        </el-col>
-      </el-row>
-      <el-row v-show="isKeyPerson" :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="左眼虹膜">
-            <span>{{ dataForm.leftIrisScore }}</span>
+              fit="cover"
+              style="width: 192px; height: 128px"/>
+            <el-image
+              :src="dataForm.leftIris!==''?dataForm.leftIris:defaultIris"
+              fit="cover"
+              style="width: 192px; height: 128px"/>
           </el-form-item>
         </el-col>
-        <el-col :span="12">
-          <el-form-item label="右眼虹膜">
-            <span>{{ dataForm.rightIrisScore }}</span>
+      </el-row>
+
+      <el-row v-show="isKeyPerson" :gutter="20">
+        <el-col :span="24">
+          <el-form-item label="虹膜质量">
+            <span style="display:inline-block; width:192px; text-align: center">{{ dataForm.rightIrisScore }}</span>
+            <span style="display:inline-block; width:192px; text-align: center">{{ dataForm.leftIrisScore }}</span>
           </el-form-item>
         </el-col>
       </el-row>
@@ -148,12 +138,26 @@
       this.dialogFormVisible = dialogFormVisible
       this.dataForm.controllerLine = ''
       if (dialogStatus === 'detail') {
+        this.isEditMode = false
+
         detailStaff(row.id).then(response => {
           if (response.code === 200) {
+            this.dataForm = {
+              id: row.id,
+              name: row.name,
+              birthday: row.birthday,
+              address: row.address,
+              phone: row.phone,
+              idCard: this.encrypIdCardNo(row.idCard),
+              sex: row.sexStr,
+              deptName: row.deptName,
+              photo: row.photo
+            }
+
             if (response.data.irisData !== undefined && response.data.irisData !== '') {
               this.isKeyPerson = true
-              this.dataForm.leftIris = 'static/' + response.data.irisData.leftImage
-              this.dataForm.rightIris = 'static/' + response.data.irisData.rightImage
+              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 {
@@ -161,19 +165,6 @@
             }
           }
         })
-
-        this.dataForm = {
-          id: row.id,
-          name: row.name,
-          birthday: row.birthday,
-          address: row.address,
-          phone: row.phone,
-          idCard: this.encrypIdCardNo(row.idCard),
-          sex: row.sexStr,
-          deptName: row.deptName,
-          photo: row.photo
-        }
-        this.isEditMode = false
       }
     },
     // 身份证号加密显示

diff --git a/src/api/statistics.js b/src/api/statistics.js
index 454c11c..e20b4c0 100644
--- a/src/api/statistics.js
+++ b/src/api/statistics.js
@@ -37,3 +37,21 @@
     params
   })
 }
+
+// 人员所处时长统计
+export function personDurationStatistics(params) {
+  return request({
+    url: '/statistics/personDurationListPage',
+    method: 'get',
+    params
+  })
+}
+
+// 车辆所处时长统计
+export function carDurationStatistics(params) {
+  return request({
+    url: '/statistics/carDurationListPage',
+    method: 'get',
+    params
+  })
+}
diff --git a/src/router/modules/doorSys.js b/src/router/modules/doorSys.js
index 39b783b..235bac9 100644
--- a/src/router/modules/doorSys.js
+++ b/src/router/modules/doorSys.js
@@ -193,6 +193,18 @@
         meta: { title: '车辆进出记录', icon: '', permission: ['/statistics/inOutCar'], keepAlive: true }
       },
       {
+        path: '/statistics/personDuration',
+        name: 'PersonDuration',
+        component: () => import('@/views/statistics/personDuration'),
+        meta: { title: '人员所处时长统计', icon: '', permission: ['/statistics/personDuration'], keepAlive: true }
+      },
+      {
+        path: '/statistics/carDuration',
+        name: 'CarDuration',
+        component: () => import('@/views/statistics/carDuration'),
+        meta: { title: '车辆所处时长统计', icon: '', permission: ['/statistics/carDuration'], keepAlive: true }
+      },
+      {
         path: '/statistics/doorCount',
         name: 'DoorCount',
         component: () => import('@/views/statistics/doorCount'),
diff --git a/src/views/car/carAdd.vue b/src/views/car/carAdd.vue
index a3e0261..b4f2f4a 100644
--- a/src/views/car/carAdd.vue
+++ b/src/views/car/carAdd.vue
@@ -202,7 +202,7 @@
                 this.dialogFormVisible = false
               })
             } else {
-              this.$message.fail(response.message)
+              this.$message.error(response.message)
               this.btnLoading = false
             }
           }).catch(() => {
diff --git a/src/views/staff/captureIris.vue b/src/views/staff/captureIris.vue
index 7183176..01ef3fe 100644
--- a/src/views/staff/captureIris.vue
+++ b/src/views/staff/captureIris.vue
@@ -1,9 +1,9 @@
 <template>
   <div class="app-container">
     <el-dialog :title="title" :visible.sync="dialogFormVisible" append-to-body @close="closeDialog">
-      <el-form ref="dataForm" :model="irisForm" label-well-code="right" label-width="95px" style="margin-top: 20px">
+      <el-form ref="dataForm" :model="irisForm" label-well-code="right" label-width="0px" style="margin-top: 20px">
         <el-row type="flex" justify="center">
-          <el-col :offset="2" :span="12">
+          <el-col :span="12">
             <div class="avatar">
               <el-image
                 :src="photoRight!==''?photoRight:defaultPhoto"
@@ -24,15 +24,15 @@
           </el-col>
         </el-row>
         <el-row style="margin-top: 10px;">
-          <el-col :offset="6" :span="4">
-            <span>右眼虹膜</span>
+          <el-col :span="12" style="text-align: center">
+            <span>右眼虹膜，评分：{{ scoreRight }}</span>
           </el-col>
-          <el-col :offset="7" :span="4">
-            <span>左眼虹膜</span>
+          <el-col :span="12" style="text-align: center">
+            <span>左眼虹膜，评分：{{ scoreLeft }}</span>
           </el-col>
         </el-row>
-        <el-row >
-          <el-col :offset="5" :span="12" style="margin-top: 30px">
+        <el-row>
+          <el-col :offset="8" :span="8" style="margin-top: 30px">
             <el-form-item prop="eyeType">
               <el-select :disabled="eyeTypeDisabled" v-model="irisForm.eyeType">
                 <el-option key="3" label="双眼" value="3" />
@@ -139,24 +139,24 @@
           if (that.irisForm.eyeType === '3') {
             that.photoLeft = 'data:image/png;base64,' + imageData.split(';')[0]
             that.photoRight = 'data:image/png;base64,' + imageData.split(';')[1]
-            that.scoreLeft = scoreData.split(';')[0]
-            that.scoreRight = scoreData.split(';')[1]
+            that.scoreLeft = parseFloat(scoreData.split(';')[0]).toFixed(2)
+            that.scoreRight = parseFloat(scoreData.split(';')[1]).toFixed(2)
           } else if (that.irisForm.eyeType === '2') {
             that.photoLeft = 'data:image/png;base64,' + imageData
-            that.scoreLeft = scoreData
+            that.scoreLeft = parseFloat(scoreData).toFixed(2)
           } else if (that.irisForm.eyeType === '1') {
             that.photoRight = 'data:image/png;base64,' + imageData
-            that.scoreRight = scoreData
+            that.scoreRight = parseFloat(scoreData).toFixed(2)
           }
         }
       }
     },
     // 初始化对话框
     initDialog: function(dialogFormVisible, data, isAddPerson) {
+      this.isAddperson = isAddPerson
       this.title = '采集虹膜 - ' + data.name + ' - ' + data.idCard
       this.irisForm.idCard = data.idCard
       this.dialogFormVisible = dialogFormVisible
-      this.isAddPerson = isAddPerson
       this.WebSocketConnent()
     },
     startCapture() {
@@ -187,6 +187,11 @@
       this.$parent.personForm.irisData.leftIrisScore = this.scoreLeft
       this.$parent.personForm.irisData.rightIrisScore = this.scoreRight
 
+      // 编辑人员时，通知编辑页面人员虹膜已经重采
+      if (this.isAddperson === '0') {
+        this.$parent.reCaptureIris = '1'
+      }
+
       this.$message.success('采集成功')
       this.edited = true
       this.dialogFormVisible = false
@@ -226,11 +231,12 @@
   .avatar {
     margin: 10px;
     display: block;
+    text-align: center;
   }
   .dialog-footer{
     text-align: center;
     margin-top: 10px;
-    margin-left: 30px;
+    /*margin-left: 30px;*/
     margin-bottom: 15px;
   }
   .customWidth{
diff --git a/src/views/staff/staffDetail.vue b/src/views/staff/staffDetail.vue
index b4df0c8..ca2dbfb 100644
--- a/src/views/staff/staffDetail.vue
+++ b/src/views/staff/staffDetail.vue
@@ -64,35 +64,25 @@
       </el-row>
 
       <el-row v-show="isKeyPerson" :gutter="20">
-        <el-col :span="24" style="text-align: left;">
-          <el-form-item label="虹膜图片" style="margin-bottom: 0px;" />
-        </el-col>
-      </el-row>
-      <el-row v-show="isKeyPerson" :gutter="20">
-        <el-col :span="12">
-          <div class="avatar">
-            <el-image
-              :src="dataForm.leftIris!==''?dataForm.leftIris:defaultIris"
-              fit="cover"/>
-          </div>
-        </el-col>
-        <el-col :span="12">
-          <div class="avatar">
+        <el-col :span="24">
+          <el-form-item label="虹膜图片">
             <el-image
               :src="dataForm.rightIris!==''?dataForm.rightIris:defaultIris"
-              fit="cover"/>
-          </div>
-        </el-col>
-      </el-row>
-      <el-row v-show="isKeyPerson" :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="左眼虹膜">
-            <span>{{ dataForm.leftIrisScore }}</span>
+              fit="cover"
+              style="width: 192px; height: 128px"/>
+            <el-image
+              :src="dataForm.leftIris!==''?dataForm.leftIris:defaultIris"
+              fit="cover"
+              style="width: 192px; height: 128px"/>
           </el-form-item>
         </el-col>
-        <el-col :span="12">
-          <el-form-item label="右眼虹膜">
-            <span>{{ dataForm.rightIrisScore }}</span>
+      </el-row>
+
+      <el-row v-show="isKeyPerson" :gutter="20">
+        <el-col :span="24">
+          <el-form-item label="虹膜质量">
+            <span style="display:inline-block; width:192px; text-align: center">{{ dataForm.rightIrisScore }}</span>
+            <span style="display:inline-block; width:192px; text-align: center">{{ dataForm.leftIrisScore }}</span>
           </el-form-item>
         </el-col>
       </el-row>
@@ -148,12 +138,26 @@
       this.dialogFormVisible = dialogFormVisible
       this.dataForm.controllerLine = ''
       if (dialogStatus === 'detail') {
+        this.isEditMode = false
+
         detailStaff(row.id).then(response => {
           if (response.code === 200) {
+            this.dataForm = {
+              id: row.id,
+              name: row.name,
+              birthday: row.birthday,
+              address: row.address,
+              phone: row.phone,
+              idCard: this.encrypIdCardNo(row.idCard),
+              sex: row.sexStr,
+              deptName: row.deptName,
+              photo: row.photo
+            }
+
             if (response.data.irisData !== undefined && response.data.irisData !== '') {
               this.isKeyPerson = true
-              this.dataForm.leftIris = 'static/' + response.data.irisData.leftImage
-              this.dataForm.rightIris = 'static/' + response.data.irisData.rightImage
+              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 {
@@ -161,19 +165,6 @@
             }
           }
         })
-
-        this.dataForm = {
-          id: row.id,
-          name: row.name,
-          birthday: row.birthday,
-          address: row.address,
-          phone: row.phone,
-          idCard: this.encrypIdCardNo(row.idCard),
-          sex: row.sexStr,
-          deptName: row.deptName,
-          photo: row.photo
-        }
-        this.isEditMode = false
       }
     },
     // 身份证号加密显示
diff --git a/src/views/staff/staffEdit.vue b/src/views/staff/staffEdit.vue
index e58d3ee..1509501 100644
--- a/src/views/staff/staffEdit.vue
+++ b/src/views/staff/staffEdit.vue
@@ -21,6 +21,7 @@
                 <el-date-picker
                   v-model="personForm.birthday"
                   :editable="false"
+                  :disabled="isEditMode"
                   type="date"
                   style="width: 100%"
                   value-format="yyyy-MM-dd"
@@ -29,7 +30,7 @@
             </el-col>
             <el-col :span="12">
               <el-form-item label="性别" prop="sex">
-                <el-select v-model="personForm.sex" placeholder="性别" clearable>
+                <el-select v-model="personForm.sex" :disabled="isEditMode" placeholder="性别" clearable>
                   <el-option v-for="item in sexList" :key="item.value" :label="item.name" :value="item.value"/>
                 </el-select>
               </el-form-item>
@@ -125,7 +126,7 @@
       </el-row>
     </div>
 
-    <capture-iris ref="captureIris"/>
+    <capture-iris ref="captureIris" />
   </div>
 </template>
 
@@ -156,6 +157,7 @@
     return {
       isEditMode: false, // 是否为编辑模式，编辑模式部分字段不允许修改，且没有重置和虹膜注册功能
       isKey: false, // 是否重点区域授权人员
+      reCaptureIris: '0', // 是否重新采集了虹膜
       personForm: {
         id: '', // 人员id
         idCard: '', // 身份证号
@@ -268,7 +270,13 @@
           // 如果有虹膜数据则显示虹膜信息，可以重新采集
           if (personForm.irisData !== '') {
             this.isKey = true
-            this.personForm.irisData = personForm.irisData
+            this.personForm.irisData = {
+              id: personForm.irisData.id,
+              leftImage: process.env.BASE_API + '/static/' + personForm.irisData.leftImage,
+              rightImage: process.env.BASE_API + '/static/' + personForm.irisData.rightImage,
+              leftIrisScore: personForm.irisData.leftIrisScore,
+              rightIrisScore: personForm.irisData.rightIrisScore
+            }
           } else {
             this.isKey = false
           }
@@ -355,6 +363,10 @@
           this.personForm.photo = this.photo
         }
       }
+      // 没有重新采集虹膜，则将irisData置空
+      if (this.reCaptureIris === '0') {
+        this.personForm.irisData = ''
+      }
       this.$refs['dataForm'].validate((valid) => {
         if (valid) {
           if (this.isEditMode === true) {
@@ -363,11 +375,11 @@
                 this.$message.success(response.message)
                 this.$router.push({ path: '/staff/list' })
               } else {
-                this.$message.fail(response.message)
+                this.$message.error(response.message)
                 this.btnLoading = false
               }
             }).catch(() => {
-              this.$message.fail('保存失败')
+              this.$message.error('保存失败')
             })
           }
         }
@@ -381,7 +393,7 @@
           name: this.personForm.name,
           idCard: this.personForm.idCard
         }
-        this.$refs.captureIris.initDialog(true, data, '1')
+        this.$refs.captureIris.initDialog(true, data, '0') // 编辑人员时采集虹膜
       } else {
         this.$message.warning('请先填写用户基本信息')
       }

diff --git a/src/api/statistics.js b/src/api/statistics.js
index 454c11c..e20b4c0 100644
--- a/src/api/statistics.js
+++ b/src/api/statistics.js
@@ -37,3 +37,21 @@
     params
   })
 }
+
+// 人员所处时长统计
+export function personDurationStatistics(params) {
+  return request({
+    url: '/statistics/personDurationListPage',
+    method: 'get',
+    params
+  })
+}
+
+// 车辆所处时长统计
+export function carDurationStatistics(params) {
+  return request({
+    url: '/statistics/carDurationListPage',
+    method: 'get',
+    params
+  })
+}
diff --git a/src/router/modules/doorSys.js b/src/router/modules/doorSys.js
index 39b783b..235bac9 100644
--- a/src/router/modules/doorSys.js
+++ b/src/router/modules/doorSys.js
@@ -193,6 +193,18 @@
         meta: { title: '车辆进出记录', icon: '', permission: ['/statistics/inOutCar'], keepAlive: true }
       },
       {
+        path: '/statistics/personDuration',
+        name: 'PersonDuration',
+        component: () => import('@/views/statistics/personDuration'),
+        meta: { title: '人员所处时长统计', icon: '', permission: ['/statistics/personDuration'], keepAlive: true }
+      },
+      {
+        path: '/statistics/carDuration',
+        name: 'CarDuration',
+        component: () => import('@/views/statistics/carDuration'),
+        meta: { title: '车辆所处时长统计', icon: '', permission: ['/statistics/carDuration'], keepAlive: true }
+      },
+      {
         path: '/statistics/doorCount',
         name: 'DoorCount',
         component: () => import('@/views/statistics/doorCount'),
diff --git a/src/views/car/carAdd.vue b/src/views/car/carAdd.vue
index a3e0261..b4f2f4a 100644
--- a/src/views/car/carAdd.vue
+++ b/src/views/car/carAdd.vue
@@ -202,7 +202,7 @@
                 this.dialogFormVisible = false
               })
             } else {
-              this.$message.fail(response.message)
+              this.$message.error(response.message)
               this.btnLoading = false
             }
           }).catch(() => {
diff --git a/src/views/staff/captureIris.vue b/src/views/staff/captureIris.vue
index 7183176..01ef3fe 100644
--- a/src/views/staff/captureIris.vue
+++ b/src/views/staff/captureIris.vue
@@ -1,9 +1,9 @@
 <template>
   <div class="app-container">
     <el-dialog :title="title" :visible.sync="dialogFormVisible" append-to-body @close="closeDialog">
-      <el-form ref="dataForm" :model="irisForm" label-well-code="right" label-width="95px" style="margin-top: 20px">
+      <el-form ref="dataForm" :model="irisForm" label-well-code="right" label-width="0px" style="margin-top: 20px">
         <el-row type="flex" justify="center">
-          <el-col :offset="2" :span="12">
+          <el-col :span="12">
             <div class="avatar">
               <el-image
                 :src="photoRight!==''?photoRight:defaultPhoto"
@@ -24,15 +24,15 @@
           </el-col>
         </el-row>
         <el-row style="margin-top: 10px;">
-          <el-col :offset="6" :span="4">
-            <span>右眼虹膜</span>
+          <el-col :span="12" style="text-align: center">
+            <span>右眼虹膜，评分：{{ scoreRight }}</span>
           </el-col>
-          <el-col :offset="7" :span="4">
-            <span>左眼虹膜</span>
+          <el-col :span="12" style="text-align: center">
+            <span>左眼虹膜，评分：{{ scoreLeft }}</span>
           </el-col>
         </el-row>
-        <el-row >
-          <el-col :offset="5" :span="12" style="margin-top: 30px">
+        <el-row>
+          <el-col :offset="8" :span="8" style="margin-top: 30px">
             <el-form-item prop="eyeType">
               <el-select :disabled="eyeTypeDisabled" v-model="irisForm.eyeType">
                 <el-option key="3" label="双眼" value="3" />
@@ -139,24 +139,24 @@
           if (that.irisForm.eyeType === '3') {
             that.photoLeft = 'data:image/png;base64,' + imageData.split(';')[0]
             that.photoRight = 'data:image/png;base64,' + imageData.split(';')[1]
-            that.scoreLeft = scoreData.split(';')[0]
-            that.scoreRight = scoreData.split(';')[1]
+            that.scoreLeft = parseFloat(scoreData.split(';')[0]).toFixed(2)
+            that.scoreRight = parseFloat(scoreData.split(';')[1]).toFixed(2)
           } else if (that.irisForm.eyeType === '2') {
             that.photoLeft = 'data:image/png;base64,' + imageData
-            that.scoreLeft = scoreData
+            that.scoreLeft = parseFloat(scoreData).toFixed(2)
           } else if (that.irisForm.eyeType === '1') {
             that.photoRight = 'data:image/png;base64,' + imageData
-            that.scoreRight = scoreData
+            that.scoreRight = parseFloat(scoreData).toFixed(2)
           }
         }
       }
     },
     // 初始化对话框
     initDialog: function(dialogFormVisible, data, isAddPerson) {
+      this.isAddperson = isAddPerson
       this.title = '采集虹膜 - ' + data.name + ' - ' + data.idCard
       this.irisForm.idCard = data.idCard
       this.dialogFormVisible = dialogFormVisible
-      this.isAddPerson = isAddPerson
       this.WebSocketConnent()
     },
     startCapture() {
@@ -187,6 +187,11 @@
       this.$parent.personForm.irisData.leftIrisScore = this.scoreLeft
       this.$parent.personForm.irisData.rightIrisScore = this.scoreRight
 
+      // 编辑人员时，通知编辑页面人员虹膜已经重采
+      if (this.isAddperson === '0') {
+        this.$parent.reCaptureIris = '1'
+      }
+
       this.$message.success('采集成功')
       this.edited = true
       this.dialogFormVisible = false
@@ -226,11 +231,12 @@
   .avatar {
     margin: 10px;
     display: block;
+    text-align: center;
   }
   .dialog-footer{
     text-align: center;
     margin-top: 10px;
-    margin-left: 30px;
+    /*margin-left: 30px;*/
     margin-bottom: 15px;
   }
   .customWidth{
diff --git a/src/views/staff/staffDetail.vue b/src/views/staff/staffDetail.vue
index b4df0c8..ca2dbfb 100644
--- a/src/views/staff/staffDetail.vue
+++ b/src/views/staff/staffDetail.vue
@@ -64,35 +64,25 @@
       </el-row>
 
       <el-row v-show="isKeyPerson" :gutter="20">
-        <el-col :span="24" style="text-align: left;">
-          <el-form-item label="虹膜图片" style="margin-bottom: 0px;" />
-        </el-col>
-      </el-row>
-      <el-row v-show="isKeyPerson" :gutter="20">
-        <el-col :span="12">
-          <div class="avatar">
-            <el-image
-              :src="dataForm.leftIris!==''?dataForm.leftIris:defaultIris"
-              fit="cover"/>
-          </div>
-        </el-col>
-        <el-col :span="12">
-          <div class="avatar">
+        <el-col :span="24">
+          <el-form-item label="虹膜图片">
             <el-image
               :src="dataForm.rightIris!==''?dataForm.rightIris:defaultIris"
-              fit="cover"/>
-          </div>
-        </el-col>
-      </el-row>
-      <el-row v-show="isKeyPerson" :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="左眼虹膜">
-            <span>{{ dataForm.leftIrisScore }}</span>
+              fit="cover"
+              style="width: 192px; height: 128px"/>
+            <el-image
+              :src="dataForm.leftIris!==''?dataForm.leftIris:defaultIris"
+              fit="cover"
+              style="width: 192px; height: 128px"/>
           </el-form-item>
         </el-col>
-        <el-col :span="12">
-          <el-form-item label="右眼虹膜">
-            <span>{{ dataForm.rightIrisScore }}</span>
+      </el-row>
+
+      <el-row v-show="isKeyPerson" :gutter="20">
+        <el-col :span="24">
+          <el-form-item label="虹膜质量">
+            <span style="display:inline-block; width:192px; text-align: center">{{ dataForm.rightIrisScore }}</span>
+            <span style="display:inline-block; width:192px; text-align: center">{{ dataForm.leftIrisScore }}</span>
           </el-form-item>
         </el-col>
       </el-row>
@@ -148,12 +138,26 @@
       this.dialogFormVisible = dialogFormVisible
       this.dataForm.controllerLine = ''
       if (dialogStatus === 'detail') {
+        this.isEditMode = false
+
         detailStaff(row.id).then(response => {
           if (response.code === 200) {
+            this.dataForm = {
+              id: row.id,
+              name: row.name,
+              birthday: row.birthday,
+              address: row.address,
+              phone: row.phone,
+              idCard: this.encrypIdCardNo(row.idCard),
+              sex: row.sexStr,
+              deptName: row.deptName,
+              photo: row.photo
+            }
+
             if (response.data.irisData !== undefined && response.data.irisData !== '') {
               this.isKeyPerson = true
-              this.dataForm.leftIris = 'static/' + response.data.irisData.leftImage
-              this.dataForm.rightIris = 'static/' + response.data.irisData.rightImage
+              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 {
@@ -161,19 +165,6 @@
             }
           }
         })
-
-        this.dataForm = {
-          id: row.id,
-          name: row.name,
-          birthday: row.birthday,
-          address: row.address,
-          phone: row.phone,
-          idCard: this.encrypIdCardNo(row.idCard),
-          sex: row.sexStr,
-          deptName: row.deptName,
-          photo: row.photo
-        }
-        this.isEditMode = false
       }
     },
     // 身份证号加密显示
diff --git a/src/views/staff/staffEdit.vue b/src/views/staff/staffEdit.vue
index e58d3ee..1509501 100644
--- a/src/views/staff/staffEdit.vue
+++ b/src/views/staff/staffEdit.vue
@@ -21,6 +21,7 @@
                 <el-date-picker
                   v-model="personForm.birthday"
                   :editable="false"
+                  :disabled="isEditMode"
                   type="date"
                   style="width: 100%"
                   value-format="yyyy-MM-dd"
@@ -29,7 +30,7 @@
             </el-col>
             <el-col :span="12">
               <el-form-item label="性别" prop="sex">
-                <el-select v-model="personForm.sex" placeholder="性别" clearable>
+                <el-select v-model="personForm.sex" :disabled="isEditMode" placeholder="性别" clearable>
                   <el-option v-for="item in sexList" :key="item.value" :label="item.name" :value="item.value"/>
                 </el-select>
               </el-form-item>
@@ -125,7 +126,7 @@
       </el-row>
     </div>
 
-    <capture-iris ref="captureIris"/>
+    <capture-iris ref="captureIris" />
   </div>
 </template>
 
@@ -156,6 +157,7 @@
     return {
       isEditMode: false, // 是否为编辑模式，编辑模式部分字段不允许修改，且没有重置和虹膜注册功能
       isKey: false, // 是否重点区域授权人员
+      reCaptureIris: '0', // 是否重新采集了虹膜
       personForm: {
         id: '', // 人员id
         idCard: '', // 身份证号
@@ -268,7 +270,13 @@
           // 如果有虹膜数据则显示虹膜信息，可以重新采集
           if (personForm.irisData !== '') {
             this.isKey = true
-            this.personForm.irisData = personForm.irisData
+            this.personForm.irisData = {
+              id: personForm.irisData.id,
+              leftImage: process.env.BASE_API + '/static/' + personForm.irisData.leftImage,
+              rightImage: process.env.BASE_API + '/static/' + personForm.irisData.rightImage,
+              leftIrisScore: personForm.irisData.leftIrisScore,
+              rightIrisScore: personForm.irisData.rightIrisScore
+            }
           } else {
             this.isKey = false
           }
@@ -355,6 +363,10 @@
           this.personForm.photo = this.photo
         }
       }
+      // 没有重新采集虹膜，则将irisData置空
+      if (this.reCaptureIris === '0') {
+        this.personForm.irisData = ''
+      }
       this.$refs['dataForm'].validate((valid) => {
         if (valid) {
           if (this.isEditMode === true) {
@@ -363,11 +375,11 @@
                 this.$message.success(response.message)
                 this.$router.push({ path: '/staff/list' })
               } else {
-                this.$message.fail(response.message)
+                this.$message.error(response.message)
                 this.btnLoading = false
               }
             }).catch(() => {
-              this.$message.fail('保存失败')
+              this.$message.error('保存失败')
             })
           }
         }
@@ -381,7 +393,7 @@
           name: this.personForm.name,
           idCard: this.personForm.idCard
         }
-        this.$refs.captureIris.initDialog(true, data, '1')
+        this.$refs.captureIris.initDialog(true, data, '0') // 编辑人员时采集虹膜
       } else {
         this.$message.warning('请先填写用户基本信息')
       }
diff --git a/src/views/statistics/carDuration.vue b/src/views/statistics/carDuration.vue
new file mode 100644
index 0000000..9ab73a8
--- /dev/null
+++ b/src/views/statistics/carDuration.vue
@@ -0,0 +1,219 @@
+<!--车辆所处时长统计-->
+<template>
+  <div class="app-container">
+    <!--筛选条件-->
+    <div class="search-div">
+      <div class="search-left">
+        <el-form ref="selectForm" :inline="true" :model="listQuery" class="form-container">
+          <el-row>
+            <el-col :span="4">
+              <el-form-item class="selectForm-container-item">
+                <el-input v-model.trim="listQuery.keywords" placeholder="车牌号" clearable />
+              </el-form-item>
+            </el-col>
+            <el-col :span="3">
+              <el-form-item class="selectForm-container-item">
+                <el-select v-model="listQuery.carType" placeholder="车辆类别" clearable>
+                  <el-option v-for="item in carTypes" :key="item.value" :label="item.name" :value="item.value"/>
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item class="selectForm-container-item">
+                <el-date-picker
+                  v-model="timeRange"
+                  type="daterange"
+                  range-separator="至"
+                  start-placeholder="开始日期"
+                  end-placeholder="结束日期" />
+              </el-form-item>
+            </el-col>
+
+            <el-col :span="4" class="search-right">
+              <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
+            </el-col>
+          </el-row>
+        </el-form>
+      </div>
+    </div>
+    <!--查询结果Table显示-->
+    <div>
+      <el-row class="table-title">
+        <el-col :span="6"><div class="title-header"><i class="el-icon-menu"/>数据列表</div></el-col>
+        <el-col :span="12" :offset="6" class="edit_btns">
+          <el-button class="edit_btn" size="small">导出</el-button>
+        </el-col>
+      </el-row>
+      <el-table v-loading="listLoading" :data="list" class="table" row-class-name="small-row-class" border>
+        <!--序号列-->
+        <el-table-column :index="indexMethod" align="center" type="index" label="#" width="55"/>
+        <!--内容列-->
+        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
+          <template slot-scope="scope">
+            <span v-if="column.value === 'idCard'">{{ encrypIdCardNo(scope.row[column.value]) }}</span>
+            <span v-else :class="column.class">{{ scope.row[column.value] }}</span>
+          </template>
+        </el-table-column>
+      </el-table>
+    </div>
+    <!--分页-->
+    <div class="pagination-container">
+      <el-pagination
+        v-show="total>listQuery.limit"
+        :current-page="listQuery.offset"
+        :page-sizes="[20,30,50]"
+        :page-size="listQuery.limit"
+        :total="total"
+        align="center"
+        layout="total, sizes, prev, pager, next"
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"/>
+    </div>
+  </div>
+</template>
+
+<script>
+import { formatToString } from '@/utils/calendarUtil'
+import { carDurationStatistics } from '@/api/statistics'
+import { getCarType } from '@/api/allDict'
+
+export default {
+  name: 'CarDuration',
+  data() {
+    return {
+      listQuery: {
+        keywords: '',
+        carType: '',
+        beginTime: '',
+        endTime: '',
+        offset: 1,
+        limit: 20
+      }, // 筛选条件
+      columns: [
+        {
+          text: '车牌号',
+          value: 'plateNumber',
+          align: 'center'
+        },
+        {
+          text: '车辆类别',
+          value: 'carTypeName',
+          align: 'center'
+        },
+        {
+          text: '所处时长',
+          value: 'duration',
+          align: 'center'
+        },
+        {
+          text: '进营时间',
+          value: 'inTime',
+          align: 'center'
+        },
+        {
+          text: '出营时间',
+          value: 'outTime',
+          align: 'center'
+        }
+      ], // 显示列
+      list: [], // 列表数据
+      total: 0, // 数据总数
+      carTypes: [],
+      timeRange: [],
+      listLoading: false, // 加载动画
+      fullscreenLoading: false, // 全屏加载动画
+      dialogFormVisible: false
+    }
+  },
+  watch: {
+    timeRange: function(newV) {
+      if (newV) {
+        this.listQuery.beginTime = formatToString(newV[0], 'DATE')
+        this.listQuery.endTime = formatToString(newV[1], 'DATE')
+      } else {
+        this.listQuery.beginTime = ''
+        this.listQuery.endTime = ''
+      }
+      this.fetchData()
+    }
+  },
+  created() {
+    this.fetchCarType()
+  },
+  activated() {
+    this.fetchData()// 获取数据
+  },
+  methods: {
+    // 查询数据
+    search() {
+      this.fetchData(false)
+    },
+    fetchCarType() {
+      getCarType().then(response => {
+        this.carTypes = response.data
+      })
+    },
+    // 获取列表
+    fetchData(isNowPage = true) {
+      this.listLoading = true
+      if (!isNowPage) { // 是否显示当前页，否则跳转第一页
+        this.listQuery.offset = 1
+      }
+      carDurationStatistics(this.listQuery).then(response => {
+        if (response.code === 200) {
+          this.list = response.data.rows
+          this.total = parseInt(response.data.total)
+        } else {
+          this.$message.error(response.message)
+        }
+        this.listLoading = false
+      })
+    },
+    indexMethod(index) {
+      return this.listQuery.limit * (this.listQuery.offset - 1) + index + 1
+    },
+    // 改变页容量
+    handleSizeChange(val) {
+      this.listQuery.limit = val
+      this.fetchData()
+    },
+    // 改变当前页
+    handleCurrentChange(val) {
+      this.listQuery.offset = val
+      this.fetchData()
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  $tableTitleHeight:46px;
+  .app-container{
+    margin-bottom:20px
+  }
+  .table{
+    margin-bottom: 20px;
+  }
+  .pagination-container{
+    margin-bottom: 50px;
+  }
+  .table-title{
+    background-color:rgba(243, 243, 243, 1);
+    height: $tableTitleHeight;
+    .title-header{
+      line-height:$tableTitleHeight;
+      color: #606266;
+      font-size: 15px;
+      i{
+        margin-left: 5px;
+        margin-right: 5px;
+      }
+    }
+  }
+  .edit_btns{
+    .edit_btn{
+      float:right;
+      margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2
+    }
+  }
+</style>

diff --git a/src/api/statistics.js b/src/api/statistics.js
index 454c11c..e20b4c0 100644
--- a/src/api/statistics.js
+++ b/src/api/statistics.js
@@ -37,3 +37,21 @@
     params
   })
 }
+
+// 人员所处时长统计
+export function personDurationStatistics(params) {
+  return request({
+    url: '/statistics/personDurationListPage',
+    method: 'get',
+    params
+  })
+}
+
+// 车辆所处时长统计
+export function carDurationStatistics(params) {
+  return request({
+    url: '/statistics/carDurationListPage',
+    method: 'get',
+    params
+  })
+}
diff --git a/src/router/modules/doorSys.js b/src/router/modules/doorSys.js
index 39b783b..235bac9 100644
--- a/src/router/modules/doorSys.js
+++ b/src/router/modules/doorSys.js
@@ -193,6 +193,18 @@
         meta: { title: '车辆进出记录', icon: '', permission: ['/statistics/inOutCar'], keepAlive: true }
       },
       {
+        path: '/statistics/personDuration',
+        name: 'PersonDuration',
+        component: () => import('@/views/statistics/personDuration'),
+        meta: { title: '人员所处时长统计', icon: '', permission: ['/statistics/personDuration'], keepAlive: true }
+      },
+      {
+        path: '/statistics/carDuration',
+        name: 'CarDuration',
+        component: () => import('@/views/statistics/carDuration'),
+        meta: { title: '车辆所处时长统计', icon: '', permission: ['/statistics/carDuration'], keepAlive: true }
+      },
+      {
         path: '/statistics/doorCount',
         name: 'DoorCount',
         component: () => import('@/views/statistics/doorCount'),
diff --git a/src/views/car/carAdd.vue b/src/views/car/carAdd.vue
index a3e0261..b4f2f4a 100644
--- a/src/views/car/carAdd.vue
+++ b/src/views/car/carAdd.vue
@@ -202,7 +202,7 @@
                 this.dialogFormVisible = false
               })
             } else {
-              this.$message.fail(response.message)
+              this.$message.error(response.message)
               this.btnLoading = false
             }
           }).catch(() => {
diff --git a/src/views/staff/captureIris.vue b/src/views/staff/captureIris.vue
index 7183176..01ef3fe 100644
--- a/src/views/staff/captureIris.vue
+++ b/src/views/staff/captureIris.vue
@@ -1,9 +1,9 @@
 <template>
   <div class="app-container">
     <el-dialog :title="title" :visible.sync="dialogFormVisible" append-to-body @close="closeDialog">
-      <el-form ref="dataForm" :model="irisForm" label-well-code="right" label-width="95px" style="margin-top: 20px">
+      <el-form ref="dataForm" :model="irisForm" label-well-code="right" label-width="0px" style="margin-top: 20px">
         <el-row type="flex" justify="center">
-          <el-col :offset="2" :span="12">
+          <el-col :span="12">
             <div class="avatar">
               <el-image
                 :src="photoRight!==''?photoRight:defaultPhoto"
@@ -24,15 +24,15 @@
           </el-col>
         </el-row>
         <el-row style="margin-top: 10px;">
-          <el-col :offset="6" :span="4">
-            <span>右眼虹膜</span>
+          <el-col :span="12" style="text-align: center">
+            <span>右眼虹膜，评分：{{ scoreRight }}</span>
           </el-col>
-          <el-col :offset="7" :span="4">
-            <span>左眼虹膜</span>
+          <el-col :span="12" style="text-align: center">
+            <span>左眼虹膜，评分：{{ scoreLeft }}</span>
           </el-col>
         </el-row>
-        <el-row >
-          <el-col :offset="5" :span="12" style="margin-top: 30px">
+        <el-row>
+          <el-col :offset="8" :span="8" style="margin-top: 30px">
             <el-form-item prop="eyeType">
               <el-select :disabled="eyeTypeDisabled" v-model="irisForm.eyeType">
                 <el-option key="3" label="双眼" value="3" />
@@ -139,24 +139,24 @@
           if (that.irisForm.eyeType === '3') {
             that.photoLeft = 'data:image/png;base64,' + imageData.split(';')[0]
             that.photoRight = 'data:image/png;base64,' + imageData.split(';')[1]
-            that.scoreLeft = scoreData.split(';')[0]
-            that.scoreRight = scoreData.split(';')[1]
+            that.scoreLeft = parseFloat(scoreData.split(';')[0]).toFixed(2)
+            that.scoreRight = parseFloat(scoreData.split(';')[1]).toFixed(2)
           } else if (that.irisForm.eyeType === '2') {
             that.photoLeft = 'data:image/png;base64,' + imageData
-            that.scoreLeft = scoreData
+            that.scoreLeft = parseFloat(scoreData).toFixed(2)
           } else if (that.irisForm.eyeType === '1') {
             that.photoRight = 'data:image/png;base64,' + imageData
-            that.scoreRight = scoreData
+            that.scoreRight = parseFloat(scoreData).toFixed(2)
           }
         }
       }
     },
     // 初始化对话框
     initDialog: function(dialogFormVisible, data, isAddPerson) {
+      this.isAddperson = isAddPerson
       this.title = '采集虹膜 - ' + data.name + ' - ' + data.idCard
       this.irisForm.idCard = data.idCard
       this.dialogFormVisible = dialogFormVisible
-      this.isAddPerson = isAddPerson
       this.WebSocketConnent()
     },
     startCapture() {
@@ -187,6 +187,11 @@
       this.$parent.personForm.irisData.leftIrisScore = this.scoreLeft
       this.$parent.personForm.irisData.rightIrisScore = this.scoreRight
 
+      // 编辑人员时，通知编辑页面人员虹膜已经重采
+      if (this.isAddperson === '0') {
+        this.$parent.reCaptureIris = '1'
+      }
+
       this.$message.success('采集成功')
       this.edited = true
       this.dialogFormVisible = false
@@ -226,11 +231,12 @@
   .avatar {
     margin: 10px;
     display: block;
+    text-align: center;
   }
   .dialog-footer{
     text-align: center;
     margin-top: 10px;
-    margin-left: 30px;
+    /*margin-left: 30px;*/
     margin-bottom: 15px;
   }
   .customWidth{
diff --git a/src/views/staff/staffDetail.vue b/src/views/staff/staffDetail.vue
index b4df0c8..ca2dbfb 100644
--- a/src/views/staff/staffDetail.vue
+++ b/src/views/staff/staffDetail.vue
@@ -64,35 +64,25 @@
       </el-row>
 
       <el-row v-show="isKeyPerson" :gutter="20">
-        <el-col :span="24" style="text-align: left;">
-          <el-form-item label="虹膜图片" style="margin-bottom: 0px;" />
-        </el-col>
-      </el-row>
-      <el-row v-show="isKeyPerson" :gutter="20">
-        <el-col :span="12">
-          <div class="avatar">
-            <el-image
-              :src="dataForm.leftIris!==''?dataForm.leftIris:defaultIris"
-              fit="cover"/>
-          </div>
-        </el-col>
-        <el-col :span="12">
-          <div class="avatar">
+        <el-col :span="24">
+          <el-form-item label="虹膜图片">
             <el-image
               :src="dataForm.rightIris!==''?dataForm.rightIris:defaultIris"
-              fit="cover"/>
-          </div>
-        </el-col>
-      </el-row>
-      <el-row v-show="isKeyPerson" :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="左眼虹膜">
-            <span>{{ dataForm.leftIrisScore }}</span>
+              fit="cover"
+              style="width: 192px; height: 128px"/>
+            <el-image
+              :src="dataForm.leftIris!==''?dataForm.leftIris:defaultIris"
+              fit="cover"
+              style="width: 192px; height: 128px"/>
           </el-form-item>
         </el-col>
-        <el-col :span="12">
-          <el-form-item label="右眼虹膜">
-            <span>{{ dataForm.rightIrisScore }}</span>
+      </el-row>
+
+      <el-row v-show="isKeyPerson" :gutter="20">
+        <el-col :span="24">
+          <el-form-item label="虹膜质量">
+            <span style="display:inline-block; width:192px; text-align: center">{{ dataForm.rightIrisScore }}</span>
+            <span style="display:inline-block; width:192px; text-align: center">{{ dataForm.leftIrisScore }}</span>
           </el-form-item>
         </el-col>
       </el-row>
@@ -148,12 +138,26 @@
       this.dialogFormVisible = dialogFormVisible
       this.dataForm.controllerLine = ''
       if (dialogStatus === 'detail') {
+        this.isEditMode = false
+
         detailStaff(row.id).then(response => {
           if (response.code === 200) {
+            this.dataForm = {
+              id: row.id,
+              name: row.name,
+              birthday: row.birthday,
+              address: row.address,
+              phone: row.phone,
+              idCard: this.encrypIdCardNo(row.idCard),
+              sex: row.sexStr,
+              deptName: row.deptName,
+              photo: row.photo
+            }
+
             if (response.data.irisData !== undefined && response.data.irisData !== '') {
               this.isKeyPerson = true
-              this.dataForm.leftIris = 'static/' + response.data.irisData.leftImage
-              this.dataForm.rightIris = 'static/' + response.data.irisData.rightImage
+              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 {
@@ -161,19 +165,6 @@
             }
           }
         })
-
-        this.dataForm = {
-          id: row.id,
-          name: row.name,
-          birthday: row.birthday,
-          address: row.address,
-          phone: row.phone,
-          idCard: this.encrypIdCardNo(row.idCard),
-          sex: row.sexStr,
-          deptName: row.deptName,
-          photo: row.photo
-        }
-        this.isEditMode = false
       }
     },
     // 身份证号加密显示
diff --git a/src/views/staff/staffEdit.vue b/src/views/staff/staffEdit.vue
index e58d3ee..1509501 100644
--- a/src/views/staff/staffEdit.vue
+++ b/src/views/staff/staffEdit.vue
@@ -21,6 +21,7 @@
                 <el-date-picker
                   v-model="personForm.birthday"
                   :editable="false"
+                  :disabled="isEditMode"
                   type="date"
                   style="width: 100%"
                   value-format="yyyy-MM-dd"
@@ -29,7 +30,7 @@
             </el-col>
             <el-col :span="12">
               <el-form-item label="性别" prop="sex">
-                <el-select v-model="personForm.sex" placeholder="性别" clearable>
+                <el-select v-model="personForm.sex" :disabled="isEditMode" placeholder="性别" clearable>
                   <el-option v-for="item in sexList" :key="item.value" :label="item.name" :value="item.value"/>
                 </el-select>
               </el-form-item>
@@ -125,7 +126,7 @@
       </el-row>
     </div>
 
-    <capture-iris ref="captureIris"/>
+    <capture-iris ref="captureIris" />
   </div>
 </template>
 
@@ -156,6 +157,7 @@
     return {
       isEditMode: false, // 是否为编辑模式，编辑模式部分字段不允许修改，且没有重置和虹膜注册功能
       isKey: false, // 是否重点区域授权人员
+      reCaptureIris: '0', // 是否重新采集了虹膜
       personForm: {
         id: '', // 人员id
         idCard: '', // 身份证号
@@ -268,7 +270,13 @@
           // 如果有虹膜数据则显示虹膜信息，可以重新采集
           if (personForm.irisData !== '') {
             this.isKey = true
-            this.personForm.irisData = personForm.irisData
+            this.personForm.irisData = {
+              id: personForm.irisData.id,
+              leftImage: process.env.BASE_API + '/static/' + personForm.irisData.leftImage,
+              rightImage: process.env.BASE_API + '/static/' + personForm.irisData.rightImage,
+              leftIrisScore: personForm.irisData.leftIrisScore,
+              rightIrisScore: personForm.irisData.rightIrisScore
+            }
           } else {
             this.isKey = false
           }
@@ -355,6 +363,10 @@
           this.personForm.photo = this.photo
         }
       }
+      // 没有重新采集虹膜，则将irisData置空
+      if (this.reCaptureIris === '0') {
+        this.personForm.irisData = ''
+      }
       this.$refs['dataForm'].validate((valid) => {
         if (valid) {
           if (this.isEditMode === true) {
@@ -363,11 +375,11 @@
                 this.$message.success(response.message)
                 this.$router.push({ path: '/staff/list' })
               } else {
-                this.$message.fail(response.message)
+                this.$message.error(response.message)
                 this.btnLoading = false
               }
             }).catch(() => {
-              this.$message.fail('保存失败')
+              this.$message.error('保存失败')
             })
           }
         }
@@ -381,7 +393,7 @@
           name: this.personForm.name,
           idCard: this.personForm.idCard
         }
-        this.$refs.captureIris.initDialog(true, data, '1')
+        this.$refs.captureIris.initDialog(true, data, '0') // 编辑人员时采集虹膜
       } else {
         this.$message.warning('请先填写用户基本信息')
       }
diff --git a/src/views/statistics/carDuration.vue b/src/views/statistics/carDuration.vue
new file mode 100644
index 0000000..9ab73a8
--- /dev/null
+++ b/src/views/statistics/carDuration.vue
@@ -0,0 +1,219 @@
+<!--车辆所处时长统计-->
+<template>
+  <div class="app-container">
+    <!--筛选条件-->
+    <div class="search-div">
+      <div class="search-left">
+        <el-form ref="selectForm" :inline="true" :model="listQuery" class="form-container">
+          <el-row>
+            <el-col :span="4">
+              <el-form-item class="selectForm-container-item">
+                <el-input v-model.trim="listQuery.keywords" placeholder="车牌号" clearable />
+              </el-form-item>
+            </el-col>
+            <el-col :span="3">
+              <el-form-item class="selectForm-container-item">
+                <el-select v-model="listQuery.carType" placeholder="车辆类别" clearable>
+                  <el-option v-for="item in carTypes" :key="item.value" :label="item.name" :value="item.value"/>
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item class="selectForm-container-item">
+                <el-date-picker
+                  v-model="timeRange"
+                  type="daterange"
+                  range-separator="至"
+                  start-placeholder="开始日期"
+                  end-placeholder="结束日期" />
+              </el-form-item>
+            </el-col>
+
+            <el-col :span="4" class="search-right">
+              <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
+            </el-col>
+          </el-row>
+        </el-form>
+      </div>
+    </div>
+    <!--查询结果Table显示-->
+    <div>
+      <el-row class="table-title">
+        <el-col :span="6"><div class="title-header"><i class="el-icon-menu"/>数据列表</div></el-col>
+        <el-col :span="12" :offset="6" class="edit_btns">
+          <el-button class="edit_btn" size="small">导出</el-button>
+        </el-col>
+      </el-row>
+      <el-table v-loading="listLoading" :data="list" class="table" row-class-name="small-row-class" border>
+        <!--序号列-->
+        <el-table-column :index="indexMethod" align="center" type="index" label="#" width="55"/>
+        <!--内容列-->
+        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
+          <template slot-scope="scope">
+            <span v-if="column.value === 'idCard'">{{ encrypIdCardNo(scope.row[column.value]) }}</span>
+            <span v-else :class="column.class">{{ scope.row[column.value] }}</span>
+          </template>
+        </el-table-column>
+      </el-table>
+    </div>
+    <!--分页-->
+    <div class="pagination-container">
+      <el-pagination
+        v-show="total>listQuery.limit"
+        :current-page="listQuery.offset"
+        :page-sizes="[20,30,50]"
+        :page-size="listQuery.limit"
+        :total="total"
+        align="center"
+        layout="total, sizes, prev, pager, next"
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"/>
+    </div>
+  </div>
+</template>
+
+<script>
+import { formatToString } from '@/utils/calendarUtil'
+import { carDurationStatistics } from '@/api/statistics'
+import { getCarType } from '@/api/allDict'
+
+export default {
+  name: 'CarDuration',
+  data() {
+    return {
+      listQuery: {
+        keywords: '',
+        carType: '',
+        beginTime: '',
+        endTime: '',
+        offset: 1,
+        limit: 20
+      }, // 筛选条件
+      columns: [
+        {
+          text: '车牌号',
+          value: 'plateNumber',
+          align: 'center'
+        },
+        {
+          text: '车辆类别',
+          value: 'carTypeName',
+          align: 'center'
+        },
+        {
+          text: '所处时长',
+          value: 'duration',
+          align: 'center'
+        },
+        {
+          text: '进营时间',
+          value: 'inTime',
+          align: 'center'
+        },
+        {
+          text: '出营时间',
+          value: 'outTime',
+          align: 'center'
+        }
+      ], // 显示列
+      list: [], // 列表数据
+      total: 0, // 数据总数
+      carTypes: [],
+      timeRange: [],
+      listLoading: false, // 加载动画
+      fullscreenLoading: false, // 全屏加载动画
+      dialogFormVisible: false
+    }
+  },
+  watch: {
+    timeRange: function(newV) {
+      if (newV) {
+        this.listQuery.beginTime = formatToString(newV[0], 'DATE')
+        this.listQuery.endTime = formatToString(newV[1], 'DATE')
+      } else {
+        this.listQuery.beginTime = ''
+        this.listQuery.endTime = ''
+      }
+      this.fetchData()
+    }
+  },
+  created() {
+    this.fetchCarType()
+  },
+  activated() {
+    this.fetchData()// 获取数据
+  },
+  methods: {
+    // 查询数据
+    search() {
+      this.fetchData(false)
+    },
+    fetchCarType() {
+      getCarType().then(response => {
+        this.carTypes = response.data
+      })
+    },
+    // 获取列表
+    fetchData(isNowPage = true) {
+      this.listLoading = true
+      if (!isNowPage) { // 是否显示当前页，否则跳转第一页
+        this.listQuery.offset = 1
+      }
+      carDurationStatistics(this.listQuery).then(response => {
+        if (response.code === 200) {
+          this.list = response.data.rows
+          this.total = parseInt(response.data.total)
+        } else {
+          this.$message.error(response.message)
+        }
+        this.listLoading = false
+      })
+    },
+    indexMethod(index) {
+      return this.listQuery.limit * (this.listQuery.offset - 1) + index + 1
+    },
+    // 改变页容量
+    handleSizeChange(val) {
+      this.listQuery.limit = val
+      this.fetchData()
+    },
+    // 改变当前页
+    handleCurrentChange(val) {
+      this.listQuery.offset = val
+      this.fetchData()
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  $tableTitleHeight:46px;
+  .app-container{
+    margin-bottom:20px
+  }
+  .table{
+    margin-bottom: 20px;
+  }
+  .pagination-container{
+    margin-bottom: 50px;
+  }
+  .table-title{
+    background-color:rgba(243, 243, 243, 1);
+    height: $tableTitleHeight;
+    .title-header{
+      line-height:$tableTitleHeight;
+      color: #606266;
+      font-size: 15px;
+      i{
+        margin-left: 5px;
+        margin-right: 5px;
+      }
+    }
+  }
+  .edit_btns{
+    .edit_btn{
+      float:right;
+      margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2
+    }
+  }
+</style>
diff --git a/src/views/statistics/personDuration.vue b/src/views/statistics/personDuration.vue
new file mode 100644
index 0000000..ef0f325
--- /dev/null
+++ b/src/views/statistics/personDuration.vue
@@ -0,0 +1,234 @@
+<!--人员所处时长统计-->
+<template>
+  <div class="app-container">
+    <!--筛选条件-->
+    <div class="search-div">
+      <div class="search-left">
+        <el-form ref="selectForm" :inline="true" :model="listQuery" class="form-container">
+          <el-row>
+            <el-col :span="4">
+              <el-form-item class="selectForm-container-item">
+                <el-input v-model.trim="listQuery.keywords" placeholder="姓名/身份证号" clearable />
+              </el-form-item>
+            </el-col>
+            <el-col :span="3">
+              <el-form-item class="selectForm-container-item">
+                <el-select v-model="listQuery.personType" placeholder="类别" clearable>
+                  <el-option v-for="item in personTypes" :key="item.value" :label="item.name" :value="item.value"/>
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item class="selectForm-container-item">
+                <el-date-picker
+                  v-model="timeRange"
+                  type="daterange"
+                  range-separator="至"
+                  start-placeholder="开始日期"
+                  end-placeholder="结束日期" />
+              </el-form-item>
+            </el-col>
+
+            <el-col :span="4" class="search-right">
+              <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
+            </el-col>
+          </el-row>
+        </el-form>
+      </div>
+    </div>
+    <!--查询结果Table显示-->
+    <div>
+      <el-row class="table-title">
+        <el-col :span="6"><div class="title-header"><i class="el-icon-menu"/>数据列表</div></el-col>
+        <el-col :span="12" :offset="6" class="edit_btns">
+          <el-button class="edit_btn" size="small">导出</el-button>
+        </el-col>
+      </el-row>
+      <el-table v-loading="listLoading" :data="list" class="table" row-class-name="small-row-class" border>
+        <!--序号列-->
+        <el-table-column :index="indexMethod" align="center" type="index" label="#" width="55"/>
+        <!--内容列-->
+        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
+          <template slot-scope="scope">
+            <span v-if="column.value === 'idCard'">{{ encrypIdCardNo(scope.row[column.value]) }}</span>
+            <span v-else :class="column.class">{{ scope.row[column.value] }}</span>
+          </template>
+        </el-table-column>
+      </el-table>
+    </div>
+    <!--分页-->
+    <div class="pagination-container">
+      <el-pagination
+        v-show="total>listQuery.limit"
+        :current-page="listQuery.offset"
+        :page-sizes="[20,30,50]"
+        :page-size="listQuery.limit"
+        :total="total"
+        align="center"
+        layout="total, sizes, prev, pager, next"
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"/>
+    </div>
+  </div>
+</template>
+
+<script>
+import { formatToString } from '@/utils/calendarUtil'
+import { personDurationStatistics } from '@/api/statistics'
+import { getPersonType } from '@/api/allDict'
+
+export default {
+  name: 'PersonDuration',
+  data() {
+    return {
+      listQuery: {
+        keywords: '',
+        personType: '',
+        beginTime: '',
+        endTime: '',
+        offset: 1,
+        limit: 20
+      }, // 筛选条件
+      columns: [
+        {
+          text: '姓名',
+          value: 'name',
+          align: 'center'
+        },
+        {
+          text: '身份证号',
+          value: 'idCard',
+          align: 'center'
+        },
+        {
+          text: '类别',
+          value: 'personTypeName',
+          align: 'center'
+        },
+        {
+          text: '所处时长',
+          value: 'duration',
+          align: 'center'
+        },
+        {
+          text: '进营时间',
+          value: 'inTime',
+          align: 'center'
+        },
+        {
+          text: '出营时间',
+          value: 'outTime',
+          align: 'center'
+        }
+      ], // 显示列
+      list: [], // 列表数据
+      total: 0, // 数据总数
+      personTypes: [],
+      timeRange: [],
+      listLoading: false, // 加载动画
+      fullscreenLoading: false, // 全屏加载动画
+      dialogFormVisible: false
+    }
+  },
+  watch: {
+    timeRange: function(newV) {
+      if (newV) {
+        this.listQuery.beginTime = formatToString(newV[0], 'DATE')
+        this.listQuery.endTime = formatToString(newV[1], 'DATE')
+      } else {
+        this.listQuery.beginTime = ''
+        this.listQuery.endTime = ''
+      }
+      this.fetchData()
+    }
+  },
+  created() {
+    this.fetchPersonType()
+  },
+  activated() {
+    this.fetchData()// 获取数据
+  },
+  methods: {
+    // 身份证号加密显示
+    encrypIdCardNo(idCard) {
+      if (idCard.length > 6) {
+        return idCard.substr(0, 6) + '********' + idCard.substr(14)
+      } else if (idCard) {
+        return idCard
+      } else {
+        return ''
+      }
+    },
+    // 查询数据
+    search() {
+      this.fetchData(false)
+    },
+    fetchPersonType() {
+      getPersonType().then(response => {
+        this.personTypes = response.data
+      })
+    },
+    // 获取列表
+    fetchData(isNowPage = true) {
+      this.listLoading = true
+      if (!isNowPage) { // 是否显示当前页，否则跳转第一页
+        this.listQuery.offset = 1
+      }
+      personDurationStatistics(this.listQuery).then(response => {
+        if (response.code === 200) {
+          this.list = response.data.rows
+          this.total = parseInt(response.data.total)
+        } else {
+          this.$message.error(response.message)
+        }
+        this.listLoading = false
+      })
+    },
+    indexMethod(index) {
+      return this.listQuery.limit * (this.listQuery.offset - 1) + index + 1
+    },
+    // 改变页容量
+    handleSizeChange(val) {
+      this.listQuery.limit = val
+      this.fetchData()
+    },
+    // 改变当前页
+    handleCurrentChange(val) {
+      this.listQuery.offset = val
+      this.fetchData()
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  $tableTitleHeight:46px;
+  .app-container{
+    margin-bottom:20px
+  }
+  .table{
+    margin-bottom: 20px;
+  }
+  .pagination-container{
+    margin-bottom: 50px;
+  }
+  .table-title{
+    background-color:rgba(243, 243, 243, 1);
+    height: $tableTitleHeight;
+    .title-header{
+      line-height:$tableTitleHeight;
+      color: #606266;
+      font-size: 15px;
+      i{
+        margin-left: 5px;
+        margin-right: 5px;
+      }
+    }
+  }
+  .edit_btns{
+    .edit_btn{
+      float:right;
+      margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2
+    }
+  }
+</style>